Merge pull request #7 from redmatrix/master

updating from original codebase

124 files changed, 23747 insertions, 21709 deletions

diff --git a/.openshift/README.md b/.openshift/README.md
index 68061ca57..535b9bdd1 100644
--- a/.openshift/README.md
+++ b/.openshift/README.md
@@ -1,3 +1,92 @@
+#Hubzilla on OpenShift
+You will notice a new .openshift folder when you fetch from upstream, i.e. from https://github.com/redmatrix/hubzilla.git , which contains a deploy script to set up Hubzilla on OpenShift.
+
+Create an account on OpenShift, then use the registration e-mail and password to create your first Hubzilla instance. Install git and RedHat's command line tools - rhc - if you have not already done so.
+
+```
+rhc app-create your_app_name php-5.4 mysql-5.5 cron phpmyadmin --namespace your_domain --from-code https://github.com/redmatrix/hubzilla.git -l your@email.address -p your_account_password
+```
+
+Make a note of the database username and password OpenShift creates for your instance, and use these at https://your_app_name-your_domain.rhcloud.com/ to complete the setup.
+
+NOTE: PostgreSQL is NOT supported by the deploy script yet.
+
+Update
+To update, consider your own workflow first. I have forked Hubzilla code into my GitHub account to be able to try things out, this remote repo is called origin. Here is how I fetch new code from upstream, merge into my local repo, then push the updated code both into origin and the remote repo called openshift.
+
+```
+git fetch upstream;git checkout master;git merge upstream/master;git push origin;git push openshift HEAD
+```
+
+##Administration
+Symptoms of need for MySQL database administration are:
+- you can visit your domain and see the Hubzilla frontpage, but trying to login throws you back to login. This can mean your session table is marked as crashed.
+- you can login, but your channel posts are not visible. This can mean your item table is marked as crashed.
+- you can login and you can see your channel posts, but apparently nobody is getting your posts, comments, likes and so on. This can mean your outq table is marked as crashed.
+
+You can check your OpenShift logs by doing
+
+```
+rhc tail -a your_app_name -n your_domain -l your@email.address -p your_account_password 
+```
+
+and you might be able to confirm the above suspicions about crashed tables, or other problems you need to fix. 
+
+###How to fix crashed tables in MySQL
+Using MySQL and the MyISAM database engine can result in table indexes coming out of sync, and you have at least two options for fixing tables marked as crashed.
+- Use the database username and password OpenShift creates for your instance at https://your_app_name-your_domain.rhcloud.com/phpmyadmin/ to login via the web into your phpMyAdmin web interface, click your database in the left column, in the right column scroll down to the bottom of the list of tables and click the checkbox for marking all tables, then select Check tables from the drop down menu. This will check the tables for problems, and you can then checkmark only those tables with problems, and select Repair table from the same drop down menu at the bottom.
+- You can login to your instance with SSH - see OpenShift for details - then
+
+```
+cd mysql/data/your_database
+myisamchk -r *.MYI
+```
+
+or if you get
+
+```
+Can't create new tempfile
+```
+
+check your OpenShift's gear quota with
+
+```
+quota -gus
+```
+
+and if you are short on space, then locally (not SSH) do
+
+```
+rhc app-tidy your_app_name -l your_login -p your_password
+```
+
+to have rhc delete temporary files and OpenShift logs to free space first, then check the size of your local repo dir and execute
+
+```
+git gc
+```
+
+against it and check the size again, and then to minimize your remote repo connect via SSH to your application gear and execute the same command against it by changing to the remote repo directory - your repo should be in
+
+```
+~/git/your_app_name.git
+```
+
+(if not, do find -size +1M to find it), then do
+
+```
+cd ~/mysql/data/yourdatabase
+myisamchk -r -v -f*.MYI
+```
+
+and hopefully your database tables are now okay.
+
+##NOTES
+Note 1: definitely DO turn off feeds and discovery by default if you are on the Free or Bronze plan on OpenShift with a single 1Gb gear by visiting https://your-app-name.rhcloud.com/admin/site when logged in as administrator of your Hubzilla site.
+Note 2: DO add the above defaults into the deploy script.
+Note 3: DO add git gc to the deploy script to clean up git.
+Note 4: MAYBE DO add myisamchk - only checking? to the end of the deploy script.
+
 The OpenShift `php` cartridge documentation can be found at:
 http://openshift.github.io/documentation/oo_cartridge_guide.html#php
 
diff --git a/.openshift/action_hooks/deploy b/.openshift/action_hooks/deploy
index 1256cc0c1..9e3413f98 100755
--- a/.openshift/action_hooks/deploy
+++ b/.openshift/action_hooks/deploy
@@ -155,7 +155,7 @@ fi
 
 echo "Now chmod 777 -R poller"
 
-chmod -R 777 ${OPENSHIFT_REPO}.openshift/cron/minutely/poller
+chmod -R 777 ${OPENSHIFT_REPO_DIR}.openshift/cron/minutely/poller
 
 echo "chmod done, permissions set to 777 on poller script."
 
@@ -176,3 +176,21 @@ echo "chmod done, permissions set to 777 on poller script."
 ### fi
 
 ####
+
+# Hubzilla configuration - changes to default settings
+# to make Hubzilla on OpenShift a more pleasant experience 
+echo "Changing default configuration to conserve space"
+cd ${OPENSHIFT_REPO_DIR}
+util/config system expire_delivery_reports 3
+util/config system feed_contacts 0
+util/config system disable_discover_tab 1
+
+# Hubzill addons
+echo "Try to add or update Hubzilla addons"
+cd ${OPENSHIFT_REPO_DIR}
+util/add_addon_repo https://github.com/redmatrix/hubzilla-addons.git HubzillaAddons 
+
+# Hubzilla themes
+echo "Try to add or update Hubzilla themes"
+cd ${OPENSHIFT_REPO_DIR}
+util/add_theme_repo https://github.com/DeadSuperHero/redmatrix-themes.git DeadSuperHeroThemes 
diff --git a/README.md b/README.md
index 7fbc14219..bd95cd674 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+![Hubzilla](images/hubzilla-banner.png)
 
 Hubzilla - Community Server
 ===========================
@@ -5,7 +6,6 @@ Hubzilla - Community Server
 Help us redefine the web - using integrated and united community websites. 
 --------------------------------------------------------------------------
 
-![Hubzilla](images/hubzilla_house_arrows.png)
 
 **What are Hubs?**
 
diff --git a/app/grid.apd b/app/grid.apd
new file mode 100644
index 000000000..bc77aa6f1
--- /dev/null
+++ b/app/grid.apd
@@ -0,0 +1,4 @@
+url: $baseurl/network
+requires: local_channel
+name: Grid
+photo: $baseurl/images/hubzilla_logo_6.png
diff --git a/app/matrix.apd b/app/matrix.apd
deleted file mode 100644
index 68188bfd3..000000000
--- a/app/matrix.apd
+++ /dev/null
@@ -1,4 +0,0 @@
-url: $baseurl/network
-requires: local_channel
-name: Matrix
-photo: $baseurl/app/matrix.png
diff --git a/app/matrix.png b/app/matrix.png
deleted file mode 100644
index aba2c35dd..000000000
--- a/app/matrix.png
+++ /dev/null
diff --git a/boot.php b/boot.php
index 3afb7704b..cdf3c302b 100755
--- a/boot.php
+++ b/boot.php
@@ -50,7 +50,7 @@ define ( 'PLATFORM_NAME',           'hubzilla' );
 define ( 'RED_VERSION',             trim(file_get_contents('version.inc')) . 'H');
 define ( 'ZOT_REVISION',            1     );
 
-define ( 'DB_UPDATE_VERSION',       1156  );
+define ( 'DB_UPDATE_VERSION',       1158  );
 
 /**
  * @brief Constant with a HTML line break.
diff --git a/doc/Hubzilla_on_OpenShift.bb b/doc/Hubzilla_on_OpenShift.bb
new file mode 100644
index 000000000..db61c3a48
--- /dev/null
+++ b/doc/Hubzilla_on_OpenShift.bb
@@ -0,0 +1,103 @@
+[b]Hubzilla on OpenShift[/b]
+You will notice a new .openshift folder when you fetch from upstream, i.e. from [url=https://github.com/redmatrix/hubzilla.git]https://github.com/redmatrix/hubzilla.git[/url] , which contains a deploy script to set up Hubzilla on OpenShift with plugins and extra themes.
+
+Create an account on OpenShift, then use the registration e-mail and password to create your first Hubzilla instance. Install git and RedHat's command line tools - rhc - if you have not already done so.
+
+[code]rhc app-create your_app_name php-5.4 mysql-5.5 cron phpmyadmin --namespace your_domain --from-code https://github.com/redmatrix/hubzilla.git -l your@email.address -p your_account_password
+[/code]
+
+Make a note of the database username and password OpenShift creates for your instance, and use these at [url=https://your_app_name-your_domain.rhcloud.com/]https://your_app_name-your_domain.rhcloud.com/[/url] to complete the setup.
+
+NOTE: PostgreSQL is NOT supported by the deploy script yet, see [zrl=https://zot-mor.rhcloud.com/display/3c7035f2a6febf87057d84ea0ae511223e9b38dc27913177bc0df053edecac7c@zot-mor.rhcloud.com?zid=haakon%40zot-mor.rhcloud.com]this thread[/zrl].
+
+[b]Update[/b]
+To update, consider your own workflow first. I have forked Hubzilla code into my GitHub account to be able to try things out, this remote repo is called origin. Here is how I fetch new code from upstream, merge into my local repo, then push the updated code both into origin and the remote repo called openshift.
+
+[code]git fetch upstream;git checkout master;git merge upstream/master;git push origin;git push openshift HEAD
+[/code]
+
+[b]Administration[/b]
+Symptoms of need for MySQL database administration are:
+[list]
+[*] you can visit your domain and see the Hubzilla frontpage, but trying to login throws you back to login. This can mean your session table is marked as crashed.
+[*] you can login, but your channel posts are not visible. This can mean your item table is marked as crashed.
+[*] you can login and you can see your channel posts, but apparently nobody is getting your posts, comments, likes and so on. This can mean your outq table is marked as crashed.
+[/list]
+
+You can check your OpenShift logs by doing
+
+[code]
+rhc tail -a your_app_name -n your_domain -l your@email.address -p your_account_password
+[/code]
+
+and you might be able to confirm the above suspicions about crashed tables, or other problems you need to fix.
+
+[b]How to fix crashed tables in MySQL[/b]
+Using MySQL and the MyISAM database engine can result in table indexes coming out of sync, and you have at least two options for fixing tables marked as crashed.
+[list]
+[*] Use the database username and password OpenShift creates for your instance at [url=https://your_app_name-your_domain.rhcloud.com/phpmyadmin/]https://your_app_name-your_domain.rhcloud.com/phpmyadmin/[/url] to login via the web into your phpMyAdmin web interface, click your database in the left column, in the right column scroll down to the bottom of the list of tables and click the checkbox for marking all tables, then select Check tables from the drop down menu. This will check the tables for problems, and you can then checkmark only those tables with problems, and select Repair table from the same drop down menu at the bottom.
+[*] You can port-forward the MySQL database service to your own machine and use the MySQL client called mysqlcheck to check, repair and optimize your database or individual database tables without stopping the MySQL service on OpenShift. Run the following in two separate console windows. 
+
+To port-forward do
+
+[code]rhc port-forward -a your_app_name -n your_domain -l your@email.address -p your_password[/code]
+
+in one console window, then do either -o for optimize, -c for check or -r for repair, like this
+
+[code]mysqlcheck -h 127.0.0.1 -r your_app_name -u your_app_admin_name -p[/code]
+
+and give the app's password at the prompt. If all goes well you should see a number of table names with an OK behind them. 
+
+You can now
+[code]Press CTRL-C to terminate port forwarding[/code]
+[*] You can do
+
+[code]rhc cartridge stop mysql-5.5 -a your_app_name[/code]
+
+to stop the MySQL service running in your app on OpenShift before running myisamchk - which should only be run when MySQL is stopped, and then
+login to your instance with SSH - see OpenShift for details - and do 
+
+[code]cd mysql/data/your_database
+myisamchk -r *.MYI[/code]
+
+or if you get
+
+[code]Can't create new tempfile[/code]
+
+check your OpenShift's gear quota with
+
+[code]quota -gus[/code]
+
+and if you are short on space, then locally (not SSH) do
+
+[code]rhc app-tidy your_app_name -l your_login -p your_password[/code]
+
+to have rhc delete temporary files and OpenShift logs to free space first, then check the size of your local repo dir and execute
+
+[code]git gc[/code]
+
+against it and check the size again, and then to minimize your remote repo connect via SSH to your application gear and execute the same command against it by changing to the remote repo directory - your repo should be in
+
+[code]~/git/your_app_name.git[/code]
+
+(if not, do find -size +1M to find it), then do
+
+[code]
+cd
+cd mysql/data/yourdatabase
+myisamchk -r -v -f*.MYI[/code]
+
+and hopefully your database tables are now okay.
+You can now start the MySQL service on OpenShift by locally doing
+
+[code]rhc cartridge start mysql-5.5 -a your_app_name[/code]
+[/list]
+
+[b]Notes[/b]
+[list]
+[*] definitely DO turn off feeds and discovery by default and limit delivery reports from 30 days to 3 days if you are on the Free or Bronze plan on OpenShift with a single 1Gb gear by visiting [observer.baseurl]/admin/site when logged in as administrator of your Hubzilla site. 
+[*] The above defaults have been added into the deploy script.
+[*] DO add git gc to the deploy script
+[*] MAYBE DO add myisamchk - only checking? to the end of the deploy script.
+[*] mysqlcheck is similar in function to myisamchk, but works differently. The main operational difference is that mysqlcheck must be used when the mysqld server is running, whereas myisamchk should be used when it is not. The benefit of using mysqlcheck is that you do not have to stop the server to perform table maintenance - this means this documenation should be fixed.  
+[/list]
diff --git a/doc/README.md b/doc/README.md
index 90585a906..10fba445b 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -5,7 +5,7 @@ Hubzilla
 ###Websites. Redefined.
 
 
-![Hubzilla](images/ghash-32.png)
+![Hubzilla](../images/hz-32.png)
 
 **What are Hubs?**
 
@@ -39,4 +39,4 @@ Possible website applications include
 
 
 
-This project is under development and is not yet available for general use.  
\ No newline at end of file
+This project is under development and is not yet available for general use.  
diff --git a/doc/Widgets.md b/doc/Widgets.md
index a225f5ef3..7acd9241b 100644
--- a/doc/Widgets.md
+++ b/doc/Widgets.md
@@ -88,7 +88,7 @@ Some/many of these widgets have restrictions which may restrict the type of page
 * photo_rand - display a random photo from one of your photo albums. Photo permissions are honoured
     * args: 
     * album - album name (very strongly recommended if you have lots of photos)
-    * scale - typically 0 (original size), 1 (640px), or 2 (320px)
+    * scale - typically 0 (original size), 1 (1024px), 2, (640px), or 3 (320px)
     * style - CSS style string
 	* channel_id - if not your own
 <br />&nbsp;<br />
diff --git a/doc/admins.bb b/doc/admins.bb
index d4e90c8a3..c77b004a4 100644
--- a/doc/admins.bb
+++ b/doc/admins.bb
@@ -4,9 +4,11 @@
 
 [zrl=[baseurl]/help/install]Install[/zrl]
 [zrl=[baseurl]/help/red2pi]Installing $Projectname on the Raspberry Pi[/zrl]
+[zrl=[baseurl]/help/Hubzilla_on_OpenShift]$Projectname on OpenShift[/zrl]
 [zrl=[baseurl]/help/troubleshooting]Troubleshooting Tips[/zrl]
 [zrl=[baseurl]/help/hidden_configs]Tweaking $Projectname's Hidden Configurations[/zrl]
 [zrl=[baseurl]/help/faq_admins]FAQ For Admins[/zrl]
 [zrl=[baseurl]/help/service_classes]Service Classes[/zrl]
+[zrl=[baseurl]/help/theme_management]Theme Management[/zrl]
 
 
diff --git a/doc/api_posting.bb b/doc/api_posting.bb
index fa9558268..c708ad143 100644
--- a/doc/api_posting.bb
+++ b/doc/api_posting.bb
@@ -4,19 +4,20 @@ The API allows you to post to the red# by HTTP POST request. Below you see an ex
 
 [code]curl -ssl -u [color=blue]$E-Mail[/color]:[color=blue]$Password[/color] -d "[color=blue]$Parameters[/color]" [url][observer=1][observer.baseurl][/observer][observer=0]example.com[/observer]/api/statuses/update
 [/url][/code]
-[table][tr][td]$E-Mail:[/td][td]The E-Mail Adress you use to login[/td][/tr]
+[table][tr][td]$E-Mail:[/td][td]The E-Mail Address you use to login, or the channel nickname (without the hostname)[/td][/tr]
 [tr][td]$Password:[/td][td]The Password you use to login[/td][/tr]
 [tr][td]$Parameters:[/td][td]That's the interesting part, here you insert the content you want to send using the following parameters:[/td][/tr][/table]
 
 [ul]
 [*]title: the title of the posting
-[*]channel: the channel you want to post to 
+[*]channel: the channel you want to post to (do not use this parameter with HTTP Basic auth)
 [*]category: a comma-seperated list of categories for the posting
 [*]status: the content of the posting, formatted with BBCode
                                 OR
 [*]htmlstatus:the content of the posting, formatted in HTML.
 [/ul]
 
+To post to a specific channel, replace the email address with the channel nickname. If you supply the channel parameter, it has to match the "email", but is superfluous anyway.
 
 Instead of calling [observer=1][observer.baseurl][/observer][observer=0]example.com[/observer]/api/statuses/update which returns a json (you could also add .json on the end to clarify) output, you can use [observer.baseurl]/api/statuses/update.xml to get an xml formatted return.
 
diff --git a/doc/features.bb b/doc/features.bb
index 06b7fb6b0..2abf0ec30 100644
--- a/doc/features.bb
+++ b/doc/features.bb
@@ -85,11 +85,9 @@ Share and save/manage bookmarks from links provided in conversations.
  

 [b]Private Message Encryption and Privacy Concerns[/b]

 

-Messages marked [b]private[/b] are encrypted with AES-CBC 256-bit symmetric cipher, which is then protected (encrypted in turn) by public key cryptography, based on 4096-bit RSA keys, associated with the channel that is sending the message.  

+Private mail is stored in an obscured format. While this is not bullet-proof it typically prevents casual snooping by the site administrator or ISP.  

 

-These private messages are also stored in an encrypted form on remote systems. 

-

-Each$Projectname channel has it's own unique set of private and associated public RSA 4096-bit keys, generated when the channels is first created.

+Each $Projectname channel has it's own unique set of private and associated public RSA 4096-bit keys, generated when the channels is first created. This is used to protect private messages and posts in transit.

 

 Additionally, messages may be created utilising "end-to-end encryption" which cannot be read by $Projectname operators or ISPs or anybody who does not know the passcode. 

 

diff --git a/doc/html/index.php b/doc/html/index.php
index 4ef28aada..2e1b4277c 100644
--- a/doc/html/index.php
+++ b/doc/html/index.php
@@ -1,17 +1,11 @@
 <!DOCTYPE html>
 <html>
 <head>
-<<<<<<< HEAD
-	<title>Hubzilla Doxygen API Documentation</title>
-</head>
-<body>
-<h1>Hubzilla Doxygen API Documentation not rendered</h1>
-=======
 	<title>$Projectname Doxygen API Documentation</title>
 </head>
 <body>
 <h1>$Projectname Doxygen API Documentation not rendered</h1>
->>>>>>> f866a42a42b9e12756353f5bb39a0f31a64bb26a
+
 To get the Doxygen API Documentation you must render it with the program <a href="http://www.doxygen.org">Doxygen</a> (included in most distributions).
 <pre>
 $ doxygen util/Doxyfile
diff --git a/doc/theme_management.bb b/doc/theme_management.bb
new file mode 100644
index 000000000..5691f7c48
--- /dev/null
+++ b/doc/theme_management.bb
@@ -0,0 +1,10 @@
+[h1]Theme Management[/h1]

+$Projectname allows hub admins to easily add and update themes hosted in common git repositories.

+[h2]Add new theme repo to your hub[/h2]

+1. Navigate to your hub web root 

+[code]root@hub:~# cd /var/www[/code] 

+2. Add the theme repo and give it a name 

+[code][nobb]root@hub:/var/www# util/add_theme_repo https://github.com/username/theme-repo.git UniqueThemeRepoName[/nobb][/code] 

+[h2]Update existing theme repo[/h2]

+Update the repo by using 

+[code]root@hub:/var/www# util/update_theme_repo UniqueThemeRepoName[/code]

diff --git a/doc/to_do_code.bb b/doc/to_do_code.bb
index f66797d8b..57f4b2e01 100644
--- a/doc/to_do_code.bb
+++ b/doc/to_do_code.bb
@@ -5,8 +5,8 @@ We need much more than this, but here are areas where developers can help. Pleas
 [li]Documentation - see Red Documentation Project To-Do List[/li]

 [li]Include TOS link in registration/verification email[/li]

 [li]Auto preview posts/comments (configurable timer kicks in the preview if not 0)[/li]

+[li]SAML 2.0 and OpenID Connect provider functionality[/li]

 [li]Create bug tracker module[/li]

-[li]delivery tracking/reporting[/li]

 [li]Filing posts - provide a dropdown menu integrated with the 'post actions menu'[/li]

 [li]integrate Mozilla Persona (possibly via plugin) https://github.com/mozilla/id-specs/blob/prod/browserid/index.md and become an idP[/li]

 [li]translation plugins - moses or apertium[/li]

@@ -15,9 +15,9 @@ We need much more than this, but here are areas where developers can help. Pleas
 [li]Finish the anti-spam bayesian engine[/li]

 [li]implement an email permission denied bounce message from the sys channel[/li]

 [li]provide a way for xchans with a certain network type to upgrade (unknown to rss, rss to statusnet, friendica-over-diaspora to friendica, for instance) based on new knowledge and/or redmatrix ability[/li]

-[li](done - HZ) If DAV folders exist, add an option to the Settings page to set a default folder for attachment uploads.[/li] 

 [li]Integrate the &quot;open site&quot; list with the register page[/li]

 [li]Support comments and member notes on documentation pages (to achieve an effect similar to php.net)[/li]

+[li]Support comments on webpages[/li]

 [li]implement oembed provider interface[/li]

 [li]refactor the oembed client interface so that we can safely sandbox remote content[/li]

 [li]Many modern social apps now have both a profile photo and a "cover photo". Add support for this. [/li]

@@ -26,21 +26,17 @@ We need much more than this, but here are areas where developers can help. Pleas
 [li]restricted access OAuth clients[/li]

 [li](Advanced) create a UI for building Comanche pages[/li]

 [li](less advanced) create a way to preview Comanche results on a preview page while editing on another page[/li]

-[li](done - HZ) Extend WebDAV to provide desktop access to photo albums[/li]

 [li]External post connectors - create standard interface[/li]

 [li]External post connectors, add popular services[/li]

 [li](in progress Habeas Codice) service classes - provide a pluggable subscription payment gateway for premium accounts[/li]

 [li](in progress Habeas Codice) service classes - account overview page showing resources consumed by channel. With special consideration this page can also be accessed at a meta level by the site admin to drill down on problematic accounts/channels.[/li]

 [li]implement CalDAV/CardDAV sync[/li]

 [li]Uploads - integrate #^[url=https://github.com/blueimp/jQuery-File-Upload]https://github.com/blueimp/jQuery-File-Upload[/url][/li]

-[li]Import/export - include events, things, etc.[/li]

 [li]API extensions, for Twitter API - search, friending, threading. For Red API, lots of stuff[/li]

-[li]OAuth permission extensions[/li]

 [li]Import channel from Diaspora/Friendica (Diaspora partially done)[/li]

 [li]MediaGoblin photo "crosspost" connector[/li]

 [li]Create management page/UI for extensible profile fields[/li]

 [li]Create interface to include/exclude and re-order standard profile fields[/li]

-[li]Provide a mechanism to share page design elements in posts (just like apps) (done)[/li]

 [li]App taxonomy[/li]

 [li]Customisable App collection pages[/li]

 [li]replace the tinymce visual editor and/or make the visual editor pluggable and responsive to different output formats. We probably want library/bbedit for bbcode. This needs a fair bit of work to catch up with our &quot;enhanced bbcode&quot;, but start with images, links, bold and highlight and work from there.[/li]

diff --git a/images/hubzilla-banner.png b/images/hubzilla-banner.png
new file mode 100644
index 000000000..055a2a19e
--- /dev/null
+++ b/images/hubzilla-banner.png
diff --git a/images/hz-white-16.png b/images/hz-white-16.png
new file mode 100644
index 000000000..2f8f71c24
--- /dev/null
+++ b/images/hz-white-16.png
diff --git a/images/hz-white-32.png b/images/hz-white-32.png
new file mode 100644
index 000000000..0549ca850
--- /dev/null
+++ b/images/hz-white-32.png
diff --git a/images/hz-white-64.png b/images/hz-white-64.png
new file mode 100644
index 000000000..793a15789
--- /dev/null
+++ b/images/hz-white-64.png
diff --git a/include/ItemObject.php b/include/ItemObject.php
index 5296a1cf0..c5c2cb2e6 100644
--- a/include/ItemObject.php
+++ b/include/ItemObject.php
@@ -278,13 +278,19 @@ class Item extends BaseObject {
 		
 		$children = $this->get_children();
 
+		$has_tags = (($body['tags'] || $body['categories'] || $body['mentions'] || $body['attachments'] || $body['folders']) ? true : false);
+
 		$tmp_item = array(
 			'template' => $this->get_template(),
 			'mode' => $mode,			
 			'type' => implode("",array_slice(explode("/",$item['verb']),-1)),
-			'tags' => array(),
-			'body' => $body,
-			'text' => strip_tags($body),
+			'body' => $body['html'],
+			'tags' => $body['tags'],
+			'categories' => $body['categories'],
+			'mentions' => $body['mentions'],
+			'attachments' => $body['attachments'],
+			'folders' => $body['folders'],
+			'text' => strip_tags($body['html']),
 			'id' => $this->get_id(),
 			'mid' => $item['mid'],
 			'isevent' => $isevent,
@@ -325,6 +331,8 @@ class Item extends BaseObject {
 			'owner_url' => $this->get_owner_url(),
 			'owner_photo' => $this->get_owner_photo(),
 			'owner_name' => $this->get_owner_name(),
+			'photo' => $body['photo'],
+			'has_tags' => $has_tags,
 
 // Item toolbar buttons
 			'like'      => $like,
diff --git a/include/RedDAV/RedBrowser.php b/include/RedDAV/RedBrowser.php
index d74bba220..efea5d92f 100644
--- a/include/RedDAV/RedBrowser.php
+++ b/include/RedDAV/RedBrowser.php
@@ -217,31 +217,6 @@ class RedBrowser extends DAV\Browser\Plugin {
 			$f[] = $ft;
 		}
 
-		// Storage and quota for the account (all channels of the owner of this directory)!
-		$limit = service_class_fetch($owner, 'attach_upload_limit');
-		$r = q("SELECT SUM(filesize) AS total FROM attach WHERE aid = %d",
-			intval($this->auth->channel_account_id)
-		);
-		$used = $r[0]['total'];
-		if ($used) {
-			$quotaDesc = t('%1$s used');
-			$quotaDesc = sprintf($quotaDesc,
-				userReadableSize($used));
-		}
-		if ($limit && $used) {
-			$quotaDesc = t('%1$s used of %2$s (%3$s&#37;)');
-			$quotaDesc = sprintf($quotaDesc,
-				userReadableSize($used),
-				userReadableSize($limit),
-				round($used / $limit, 1));
-		}
-
-		// prepare quota for template
-		$quota = array();
-		$quota['used'] = $used;
-		$quota['limit'] = $limit;
-		$quota['desc'] = $quotaDesc;
-
 		$output = '';
 		if ($this->enablePost) {
 			$this->server->broadcastEvent('onHTMLActionsPanel', array($parent, &$output));
@@ -249,7 +224,6 @@ class RedBrowser extends DAV\Browser\Plugin {
 
 		$html .= replace_macros(get_markup_template('cloud.tpl'), array(
 				'$header' => t('Files') . ": " . $this->escapeHTML($path) . "/",
-				'$quota' => $quota,
 				'$total' => t('Total'),
 				'$actionspanel' => $output,
 				'$shared' => t('Shared'),
@@ -298,11 +272,38 @@ class RedBrowser extends DAV\Browser\Plugin {
 		if (get_class($node) === 'Sabre\\DAV\\SimpleCollection')
 			return;
 
+		// Storage and quota for the account (all channels of the owner of this directory)!
+		$limit = service_class_fetch($owner, 'attach_upload_limit');
+		$r = q("SELECT SUM(filesize) AS total FROM attach WHERE aid = %d",
+			intval($this->auth->channel_account_id)
+		);
+		$used = $r[0]['total'];
+		if ($used) {
+			$quotaDesc = t('You are using %1$s of your available file storage.');
+			$quotaDesc = sprintf($quotaDesc,
+				userReadableSize($used));
+		}
+		if ($limit && $used) {
+			$quotaDesc = t('You are using %1$s of %2$s available file storage. (%3$s&#37;)');
+			$quotaDesc = sprintf($quotaDesc,
+				userReadableSize($used),
+				userReadableSize($limit),
+				round($used / $limit, 1) * 100);
+		}
+
+		// prepare quota for template
+		$quota = array();
+		$quota['used'] = $used;
+		$quota['limit'] = $limit;
+		$quota['desc'] = $quotaDesc;
+		$quota['warning'] = ((($limit) && ((round($used / $limit, 1) * 100) >= 90)) ? t('WARNING:') : ''); // 10485760 bytes = 100MB
+
 		$output .= replace_macros(get_markup_template('cloud_actionspanel.tpl'), array(
 				'$folder_header' => t('Create new folder'),
 				'$folder_submit' => t('Create'),
 				'$upload_header' => t('Upload file'),
-				'$upload_submit' => t('Upload')
+				'$upload_submit' => t('Upload'),
+				'$quota' => $quota
 			));
 	}
 
diff --git a/include/api.php b/include/api.php
index a77bf15f7..16dbb569b 100644
--- a/include/api.php
+++ b/include/api.php
@@ -8,6 +8,7 @@ require_once("html2plain.php");
 require_once('include/security.php');
 require_once('include/photos.php');
 require_once('include/items.php');
+require_once('include/attach.php');
 
 	/*
 	 *
@@ -619,6 +620,36 @@ require_once('include/items.php');
 	}
 	api_register_func('api/red/channel/stream','api_channel_stream', true);
 
+	function api_attach_list(&$a,$type) {
+		logger('api_user: ' . api_user());
+		json_return_and_die(attach_list_files(api_user(),get_observer_hash(),'','','','created asc'));
+	}
+	api_register_func('api/red/files','api_attach_list', true);
+
+
+	function api_file_detail(&$a,$type) {
+		if (api_user()===false) return false;
+		if(! $_REQUEST['file_id']) return false;
+		$r = q("select * from attach where uid = %d and hash = '%s' limit 1",
+			intval(api_user()),
+			dbesc($_REQUEST['file_id'])
+		);
+		if($r) {
+			if($r[0]['is_dir'])
+				$r[0]['data'] = '';
+			elseif(intval($r[0]['os_storage'])) 
+				$r[0]['data'] = base64_encode(file_get_contents(dbunescbin($r[0]['data'])));
+			else
+				$r[0]['data'] = base64_encode(dbunescbin($r[0]['data']));
+				
+			$ret = array('attach' => $r[0]);
+			json_return_and_die($ret);
+		}
+		killme();
+	}
+
+	api_register_func('api/red/file', 'api_file_detail', true);
+
 
 	function api_albums(&$a,$type) {
 		json_return_and_die(photos_albums_list($a->get_channel(),$a->get_observer()));
@@ -1456,7 +1487,7 @@ require_once('include/items.php');
 	 * 
 	 */
 
-// FIXME
+
 	function api_statuses_mentions(&$a, $type){
 		if (api_user()===false) return false;
 				
@@ -1481,39 +1512,25 @@ require_once('include/items.php');
 		$myurl = str_replace(array('www.','.'),array('','\\.'),$myurl);
 		$diasp_url = str_replace('/channel/','/u/',$myurl);
 
-		if (get_config('system','use_fulltext_engine'))
-						$sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where (MATCH(`author-link`) AGAINST ('".'"%s"'."' in boolean mode) or MATCH(`tag`) AGAINST ('".'"%s"'."' in boolean mode) or MATCH(tag) AGAINST ('".'"%s"'."' in boolean mode))) ",
-								dbesc(protect_sprintf($myurl)),
-								dbesc(protect_sprintf($myurl)),
-								dbesc(protect_sprintf($diasp_url))
-						);
-				else
-						$sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where ( `author-link` like '%s' or `tag` like '%s' or tag like '%s' )) ",
-								dbesc(protect_sprintf('%' . $myurl)),
-								dbesc(protect_sprintf('%' . $myurl . ']%')),
-								dbesc(protect_sprintf('%' . $diasp_url . ']%'))
-						);
-
+		$sql_extra .= " AND item_mentionsme = 1 ";
 		if ($max_id > 0)
-			$sql_extra .= ' AND `item`.`id` <= '.intval($max_id);
+			$sql_extra .= " AND item.id <= " . intval($max_id) . " ";
 
-		$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
-			`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
-			`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn_id`, `contact`.`self`,
-			`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
-			FROM `item`, `contact`
-			WHERE `item`.`uid` = %d
-			AND `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`deleted` = 0
-			AND `contact`.`id` = `item`.`contact-id`
-			AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-			$sql_extra
-			AND `item`.`id`>%d
-			ORDER BY `item`.`received` DESC LIMIT %d ,%d ",
-			intval($user_info['uid']),
+		require_once('include/security.php');
+		$item_normal = item_normal();
+
+        $r = q("select * from item where uid = " . intval(api_user()) . "
+			$item_normal $sql_extra
+			AND id > %d group by mid
+			order by received desc LIMIT %d OFFSET %d ",
 			intval($since_id),
-			intval($start),	intval($count)
+			intval($count),
+			intval($start)
 		);
 
+		xchan_query($r,true);
+
+
 		$ret = api_format_items($r,$user_info);
 
 
diff --git a/include/apps.php b/include/apps.php
index 661fc2163..0a62dc5a8 100644
--- a/include/apps.php
+++ b/include/apps.php
@@ -130,7 +130,7 @@ function translate_system_apps(&$arr) {
 		'Address Book' => t('Address Book'),
 		'Login' => t('Login'),
 		'Channel Manager' => t('Channel Manager'), 
-		'Matrix' => t('Matrix'), 
+		'Grid' => t('Grid'), 
 		'Settings' => t('Settings'),
 		'Files' => t('Files'),
 		'Webpages' => t('Webpages'),
@@ -176,14 +176,19 @@ function app_render($papp,$mode = 'view') {
 
 	$installed = false;
 
-	if(! $papp['photo'])
-		$papp['photo'] = z_root() . '/' . get_default_profile_photo(80);
-	
 	if(! $papp)
 		return;
 
+	if(! $papp['photo'])
+		$papp['photo'] = z_root() . '/' . get_default_profile_photo(80);
+
+			
+
 	$papp['papp'] = papp_encode($papp);
 
+	if(! strstr($papp['url'],'://'))
+		$papp['url'] = z_root() . ((strpos($papp['url'],'/') === 0) ? '' : '/') . $papp['url'];
+
 	foreach($papp as $k => $v) {
 		if(strpos($v,'http') === 0 && $k != 'papp')
 			$papp[$k] = zid($v);
diff --git a/include/attach.php b/include/attach.php
index 39fdb5c3a..f5d2c69b6 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -181,7 +181,7 @@ function attach_list_files($channel_id, $observer, $hash = '', $filename = '', $
 
 	$ret = array('success' => false);
 
-	if(! perm_is_allowed($channel_id,$observer, 'read_storage')) {
+	if(! perm_is_allowed($channel_id,$observer, 'view_storage')) {
 		$ret['message'] = t('Permission denied.');
 		return $ret;
 	}
@@ -203,7 +203,7 @@ function attach_list_files($channel_id, $observer, $hash = '', $filename = '', $
 
 	// Retrieve all columns except 'data'
 
-	$r = q("select id, aid, uid, hash, filename, filetype, filesize, revision, folder, os_storage, is_dir, is_photo, flags, created, edited, allow_cid, allow_gid, deny_cid, deny_gid from attach where uid = %d $sql_extra $orderby $limit",
+	$r = q("select id, aid, uid, hash, filename, filetype, filesize, revision, folder, os_storage, is_dir, is_photo, flags, created, edited, allow_cid, allow_gid, deny_cid, deny_gid from attach where uid = %d $sql_extra ORDER BY $orderby $limit",
 		intval($channel_id)
 	);
 
@@ -405,7 +405,6 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
 
 	require_once('include/photos.php');
 
-
 	call_hooks('photo_upload_begin',$arr);
 
 	$ret = array('success' => false);
@@ -416,6 +415,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
 	$newalbum = (($arr) ? $arr['newalbum'] : '');
 	$hash = (($arr && $arr['hash']) ? $arr['hash'] : null);
 	$upload_path = (($arr && $arr['directory']) ? $arr['directory'] : '');
+	$visible = (($arr && $arr['visible']) ? $arr['visible'] : '');
 
 	$observer = array();
 
@@ -447,11 +447,33 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
 
 	// revise or update must provide $arr['hash'] of the thing to revise/update
 
+	// By default remove $src when finished
+
+	$remove_when_processed = true;
+
 	if($options === 'import') {		
 		$src      = $arr['src'];
 		$filename = $arr['filename'];
 		$filesize = @filesize($src);
+
 		$hash     = $arr['resource_id'];
+
+		if(array_key_exists('hash',$arr))
+			$hash = $arr['hash'];
+		if(array_key_exists('type',$arr))
+			$type = $arr['type'];
+
+		if($arr['preserve_original'])
+			$remove_when_processed = false;
+
+		// if importing a directory, just do it now and go home - we're done.
+
+		if(array_key_exists('is_dir',$arr) && intval($arr['is_dir'])) {
+			$x = attach_mkdir($channel,$observer_hash,$arr);
+			if($x['message'])
+				logger('import_directory: ' . $x['message']);
+			return;
+		}
 	}
 	elseif($options !== 'update') {
 		$f = array('src' => '', 'filename' => '', 'filesize' => 0, 'type' => '');
@@ -530,10 +552,20 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
 	$pathname = '';
 
 	if($is_photo) {
-		if($newalbum)
+		if($newalbum) {
 			$pathname = filepath_macro($newalbum);
-		else
+		}
+		elseif(array_key_exists('folder',$arr)) {
+			$x = q("select filename from attach where hash = '%s' and uid = %d limit 1",
+				dbesc($arr['folder']),
+				intval($channel['channel_id'])
+			);
+			if($x)
+				$pathname = $x[0]['filename'];
+		}
+		else {
 			$pathname = filepath_macro($album);
+		}
 	}
 	else {
 		$pathname = filepath_macro($upload_path);
@@ -563,7 +595,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
 		}
 	}
 	else {
-		$folder_hash = '';
+		$folder_hash = ((($arr) && array_key_exists('folder',$arr)) ? $arr['folder'] : '');
 	}		
 
 	if((! $options) || ($options === 'import')) {
@@ -630,7 +662,8 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
 
 		if(($maxfilesize) && ($filesize > $maxfilesize)) {
 			$ret['message'] = sprintf( t('File exceeds size limit of %d'), $maxfilesize);
-			@unlink($src);
+			if($remove_when_processed)
+				@unlink($src);
 			call_hooks('photo_upload_end',$ret);
 			return $ret;
 		}
@@ -643,7 +676,9 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
 			);
 			if(($r) &&  (($r[0]['total'] + $filesize) > ($limit - $existing_size))) {
 				$ret['message'] = upgrade_message(true) . sprintf(t("You have reached your limit of %1$.0f Mbytes attachment storage."), $limit / 1024000);
-				@unlink($src);
+				if($remove_when_processed)
+					@unlink($src);
+
 				call_hooks('photo_upload_end',$ret);
 				return $ret;
 			}
@@ -757,7 +792,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
 
 	if($is_photo) {
 
-		$args = array( 'source' => $source, 'visible' => 0, 'resource_id' => $hash, 'album' => basename($pathname), 'os_path' => $os_basepath . $os_relpath, 'filename' => $filename, 'getimagesize' => $gis, 'directory' => $direct);
+		$args = array( 'source' => $source, 'visible' => $visible, 'resource_id' => $hash, 'album' => basename($pathname), 'os_path' => $os_basepath . $os_relpath, 'filename' => $filename, 'getimagesize' => $gis, 'directory' => $direct);
 		if($arr['contact_allow'])
 			$args['contact_allow'] = $arr['contact_allow'];
 		if($arr['group_allow'])
@@ -780,13 +815,19 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
 		if($arr['item'])
 			$args['item'] = $arr['item'];
 
+		if($arr['body'])
+			$args['body'] = $arr['body'];
+
+		if($arr['description'])
+			$args['description'] = $arr['description'];
+
 		$p = photo_upload($channel,$observer,$args);
 		if($p['success']) {
 			$ret['body'] = $p['body'];
 		}
 	}
 
-	if($options !== 'update')
+	if(($options !== 'update') && ($remove_when_processed))
 		@unlink($src);
 
 	if(! $r) {
@@ -959,7 +1000,6 @@ function attach_mkdir($channel, $observer_hash, $arr = null) {
 				intval($channel['channel_id']),
 				dbesc($lfile)
 			);
-
 			if(! $r) {
 				logger('attach_mkdir: hash ' . $lfile . ' not found in ' . $lpath);
 				$ret['message'] = t('Path not found.');
@@ -1195,7 +1235,7 @@ function attach_delete($channel_id, $resource, $is_photo = 0) {
 	$channel_address = (($c) ? $c[0]['channel_address'] : 'notfound');
 	$photo_sql = (($is_photo) ? " and is_photo = 1 " : '');
 
-	$r = q("SELECT hash, flags, is_dir, folder FROM attach WHERE hash = '%s' AND uid = %d $photo_sql limit 1",
+	$r = q("SELECT hash, flags, is_dir, is_photo, folder FROM attach WHERE hash = '%s' AND uid = %d $photo_sql limit 1",
 		dbesc($resource),
 		intval($channel_id)
 	);
@@ -1241,6 +1281,20 @@ function attach_delete($channel_id, $resource, $is_photo = 0) {
 		intval($channel_id)
 	);
 
+	if($r[0]['is_photo']) {
+		$x = q("select id, item_hidden from item where resource_id = '%s' and resource_type = 'photo' and uid = %d",
+			dbesc($resource),
+			intval($channel_id)
+		);
+		if($x) {
+			drop_item($x[0]['id'],false,(($x[0]['item_hidden']) ? DROPITEM_NORMAL : DROPITEM_PHASE1),true);
+		}
+		q("DELETE FROM photo WHERE uid = %d AND resource_id = '%s'",
+			intval($channel_id),
+			dbesc($resource)
+		);
+	}
+			
 	// update the parent folder's lastmodified timestamp
 	$e = q("UPDATE attach SET edited = '%s' WHERE hash = '%s' AND uid = %d",
 		dbesc(datetime_convert()),
diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 692128087..d10ed57eb 100644
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -305,6 +305,16 @@ function bb2diaspora_itembody($item, $force_update = false) {
 
 	$matches = array();
 
+	//if we have a photo item just prepend the photo bbcode to item['body']
+	$is_photo = (($item['obj_type'] == ACTIVITY_OBJ_PHOTO) ? true : false);
+	if($is_photo) {
+		$object = json_decode($item['object'],true);
+		if($object['link'][2]) {
+			$photo_bb = '[zrl=' . rawurldecode($object['id']) . ']' . '[zmg=' . $object['link'][2]['width'] . 'x' . $object['link'][2]['height'] . ']' . rawurldecode($object['link'][2]['href']) . '[/zmg]' . '[/zrl]';
+			$item['body'] = (($item['body']) ? $photo_bb . $item['body'] : $photo_bb);
+		}
+	}
+
 	if(($item['diaspora_meta']) && (! $force_update)) {
 		$diaspora_meta = json_decode($item['diaspora_meta'],true);
 		if($diaspora_meta) {
diff --git a/include/bbcode.php b/include/bbcode.php
index db5824237..1092c08a3 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -570,7 +570,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false)
 	$urlchars = '[a-zA-Z0-9\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\+\,\@]';
 
 	if (strpos($Text,'http') !== false) {
-		$Text = preg_replace("/([^\]\='".'"'."\/]|^|\#\^)(https?\:\/\/$urlchars+)/ism", '$1<a href="$2" >$2</a>', $Text);
+		$Text = preg_replace("/([^\]\='".'"'."\/]|^|\#\^)(https?\:\/\/$urlchars+)/ism", '$1<a href="$2" target="_newwin" >$2</a>', $Text);
 	}
 
 	if (strpos($Text,'[/share]') !== false) {
@@ -582,21 +582,21 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false)
 		}
 	}
 	if (strpos($Text,'[/url]') !== false) {
-		$Text = preg_replace("/\#\^\[url\]([$URLSearchString]*)\[\/url\]/ism", '<span class="bookmark-identifier">#^</span><a class="bookmark" href="$1" >$1</a>', $Text);
-		$Text = preg_replace("/\#\^\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '<span class="bookmark-identifier">#^</span><a class="bookmark" href="$1" >$2</a>', $Text);
-		$Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/ism", '<a href="$1" >$1</a>', $Text);
-		$Text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '<a href="$1" >$2</a>', $Text);
+		$Text = preg_replace("/\#\^\[url\]([$URLSearchString]*)\[\/url\]/ism", '<span class="bookmark-identifier">#^</span><a class="bookmark" href="$1" target="_newwin" >$1</a>', $Text);
+		$Text = preg_replace("/\#\^\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '<span class="bookmark-identifier">#^</span><a class="bookmark" href="$1" target="_newwin" >$2</a>', $Text);
+		$Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/ism", '<a href="$1" target="_newwin" >$1</a>', $Text);
+		$Text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '<a href="$1" target="_newwin" >$2</a>', $Text);
 	}
 	if (strpos($Text,'[/zrl]') !== false) {
-		$Text = preg_replace("/\#\^\[zrl\]([$URLSearchString]*)\[\/zrl\]/ism", '<span class="bookmark-identifier">#^</span><a class="zrl bookmark" href="$1" >$1</a>', $Text);
-		$Text = preg_replace("/\#\^\[zrl\=([$URLSearchString]*)\](.*?)\[\/zrl\]/ism", '<span class="bookmark-identifier">#^</span><a class="zrl bookmark" href="$1" >$2</a>', $Text);
-		$Text = preg_replace("/\[zrl\]([$URLSearchString]*)\[\/zrl\]/ism", '<a class="zrl" href="$1" >$1</a>', $Text);
-		$Text = preg_replace("/\[zrl\=([$URLSearchString]*)\](.*?)\[\/zrl\]/ism", '<a class="zrl" href="$1" >$2</a>', $Text);
+		$Text = preg_replace("/\#\^\[zrl\]([$URLSearchString]*)\[\/zrl\]/ism", '<span class="bookmark-identifier">#^</span><a class="zrl bookmark" href="$1" target="_newwin" >$1</a>', $Text);
+		$Text = preg_replace("/\#\^\[zrl\=([$URLSearchString]*)\](.*?)\[\/zrl\]/ism", '<span class="bookmark-identifier">#^</span><a class="zrl bookmark" href="$1" target="_newwin" >$2</a>', $Text);
+		$Text = preg_replace("/\[zrl\]([$URLSearchString]*)\[\/zrl\]/ism", '<a class="zrl" href="$1" target="_newwin" >$1</a>', $Text);
+		$Text = preg_replace("/\[zrl\=([$URLSearchString]*)\](.*?)\[\/zrl\]/ism", '<a class="zrl" href="$1" target="_newwin" >$2</a>', $Text);
 	}
 	// Perform MAIL Search
 	if (strpos($Text,'[/mail]') !== false) {
-		$Text = preg_replace("/\[mail\]([$MAILSearchString]*)\[\/mail\]/", '<a href="mailto:$1">$1</a>', $Text);
-		$Text = preg_replace("/\[mail\=([$MAILSearchString]*)\](.*?)\[\/mail\]/", '<a href="mailto:$1">$2</a>', $Text);
+		$Text = preg_replace("/\[mail\]([$MAILSearchString]*)\[\/mail\]/", '<a href="mailto:$1" target="_newwin" >$1</a>', $Text);
+		$Text = preg_replace("/\[mail\=([$MAILSearchString]*)\](.*?)\[\/mail\]/", '<a href="mailto:$1" target="_newwin" >$2</a>', $Text);
 	}
 
 	// leave open the posibility of [map=something]
@@ -885,17 +885,17 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false)
 
 	// if video couldn't be embedded, link to it instead.
 	if (strpos($Text,'[/video]') !== false) {
-		$Text = preg_replace("/\[video\](.*?)\[\/video\]/", '<a href="$1">$1</a>', $Text);
+		$Text = preg_replace("/\[video\](.*?)\[\/video\]/", '<a href="$1" target="_newwin" >$1</a>', $Text);
 	}
 	if (strpos($Text,'[/audio]') !== false) {
-		$Text = preg_replace("/\[audio\](.*?)\[\/audio\]/", '<a href="$1">$1</a>', $Text);
+		$Text = preg_replace("/\[audio\](.*?)\[\/audio\]/", '<a href="$1" target="_newwin" >$1</a>', $Text);
 	}
 
 	if (strpos($Text,'[/zvideo]') !== false) {
-		$Text = preg_replace("/\[zvideo\](.*?)\[\/zvideo\]/", '<a class="zid" href="$1">$1</a>', $Text);
+		$Text = preg_replace("/\[zvideo\](.*?)\[\/zvideo\]/", '<a class="zid" href="$1" target="_newwin" >$1</a>', $Text);
 	}
 	if (strpos($Text,'[/zaudio]') !== false) {
-		$Text = preg_replace("/\[zaudio\](.*?)\[\/zaudio\]/", '<a class="zid" href="$1">$1</a>', $Text);
+		$Text = preg_replace("/\[zaudio\](.*?)\[\/zaudio\]/", '<a class="zid" href="$1" target="_newwin" >$1</a>', $Text);
 	}
 
 	if ($tryoembed){
@@ -904,7 +904,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false)
 		}
 	} else {
 		if (strpos($Text,'[/iframe]') !== false) {
-			$Text = preg_replace("/\[iframe\](.*?)\[\/iframe\]/ism", '<a href="$1">$1</a>', $Text);
+			$Text = preg_replace("/\[iframe\](.*?)\[\/iframe\]/ism", '<a href="$1" target="_newwin" >$1</a>', $Text);
 		}
 	}
 
diff --git a/include/conversation.php b/include/conversation.php
index 0f6f8685b..c2d9641ba 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -629,11 +629,6 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $
 				if($item['author-link'] && (! $item['author-name']))
 					$profile_name = $item['author-link'];
 
-
-				$tags=array();
-				$hashtags = array();
-				$mentions = array();
-
 				$sp = false;
 				$profile_link = best_link_url($item,$sp);
 				if($sp)
@@ -678,14 +673,17 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $
 
 				$unverified = '';
 
-				$tags=array();
-				$terms = get_terms_oftype($item['term'],array(TERM_HASHTAG,TERM_MENTION,TERM_UNKNOWN));
-				if(count($terms))
-					foreach($terms as $tag)
-						$tags[] = format_term_for_display($tag);
+//				$tags=array();
+//				$terms = get_terms_oftype($item['term'],array(TERM_HASHTAG,TERM_MENTION,TERM_UNKNOWN));
+//				if(count($terms))
+//					foreach($terms as $tag)
+//						$tags[] = format_term_for_display($tag);
 
 				$body = prepare_body($item,true);
 
+				$is_photo = ((($item['resource_type'] == 'photo') && (feature_enabled($profile_owner,'large_photos'))) ? true : false);
+				$has_tags = (($body['tags'] || $body['categories'] || $body['mentions'] || $body['attachments'] || $body['folders']) ? true : false);
+
 				$tmp_item = array(
 					'template' => $tpl,
 					'toplevel' => 'toplevel_item',
@@ -699,10 +697,12 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $
 					'lock' => $lock,
 					'thumb' => $profile_avatar,
 					'title' => $item['title'],
-					'body' => $body,
-					'tags' => $tags,
-					'hashtags' => $hashtags,
-					'mentions' => $mentions,
+					'body' => $body['html'],
+					'tags' => $body['tags'],
+					'categories' => $body['categories'],
+					'mentions' => $body['mentions'],
+					'attachments' => $body['attachments'],
+					'folders' => $body['folders'],
 					'verified' => $verified,
 					'unverified' => $unverified,
 					'forged' => $forged,
@@ -712,7 +712,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $
 					'has_folders' => ((count($folders)) ? 'true' : ''),
 					'categories' => $categories,
 					'folders' => $folders,
-					'text' => strip_tags($body),
+					'text' => strip_tags($body['html']),
 					'ago' => relative_date($item['created']),
 					'app' => $item['app'],
 					'str_app' => sprintf( t('from %s'), $item['app']),
@@ -738,6 +738,8 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $
 					'previewing' => $previewing,
 					'wait' => t('Please wait'),
 					'thread_level' => 1,
+					'is_photo' => $is_photo,
+					'has_tags' => $has_tags,
 				);
 
 				$arr = array('item' => $item, 'output' => $tmp_item);
@@ -1164,6 +1166,10 @@ function status_editor($a, $x, $popup = false) {
 	if($defexpire)
 		$defexpire = datetime_convert('UTC',date_default_timezone_get(),$defexpire,'Y-m-d H:i');
 
+	$defpublish = ((($z = get_pconfig($x['profile_uid'], 'system', 'default_post_publish')) && (! $webpage)) ? $z : '');
+	if($defpublish)
+		$defpublish = datetime_convert('UTC',date_default_timezone_get(),$defpublish,'Y-m-d H:i');
+
 	$cipher = get_pconfig($x['profile_uid'], 'system', 'default_cipher');
 	if(! $cipher)
 		$cipher = 'aes256';
@@ -1235,6 +1241,9 @@ function status_editor($a, $x, $popup = false) {
 		'$defexpire' => $defexpire,
 		'$feature_expire' => ((feature_enabled($x['profile_uid'], 'content_expire') && (! $webpage)) ? true : false),
 		'$expires' => t('Set expiration date'),
+		'$defpublish' => $defpublish,
+		'$feature_future' => ((feature_enabled($x['profile_uid'], 'delayed_posting') && (! $webpage)) ? true : false),
+		'$future_txt' => t('Set publish date'),
 		'$feature_encrypt' => ((feature_enabled($x['profile_uid'], 'content_encrypt') && (! $webpage)) ? true : false),
 		'$encrypt' => t('Encrypt text'),
 		'$cipher' => $cipher,
@@ -1414,7 +1423,7 @@ function prepare_page($item) {
 		'$auth_url' => (($naked) ? '' : zid($item['author']['xchan_url'])),
 		'$date' => (($naked) ? '' : datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'Y-m-d H:i')),
 		'$title' => smilies(bbcode($item['title'])),
-		'$body' => $body,
+		'$body' => $body['html'],
 		'$preview' => $preview,
 		'$link' => $link,
 	));
diff --git a/include/deliver.php b/include/deliver.php
index a338d1a89..11c1b249e 100644
--- a/include/deliver.php
+++ b/include/deliver.php
@@ -138,14 +138,16 @@ function deliver_run($argv, $argc) {
 					if($dresult && is_array($dresult)) {
 						foreach($dresult as $xx) {
 							if(is_array($xx) && array_key_exists('message_id',$xx)) {
-								q("insert into dreport ( dreport_mid, dreport_site, dreport_recip, dreport_result, dreport_time, dreport_xchan ) values ( '%s', '%s','%s','%s','%s','%s' ) ",
-									dbesc($xx['message_id']),
-									dbesc($xx['location']),
-									dbesc($xx['recipient']),
-									dbesc($xx['status']),
-									dbesc(datetime_convert($xx['date'])),
-									dbesc($xx['sender'])
-								);
+								if(delivery_report_is_storable($xx)) {
+									q("insert into dreport ( dreport_mid, dreport_site, dreport_recip, dreport_result, dreport_time, dreport_xchan ) values ( '%s', '%s','%s','%s','%s','%s' ) ",
+										dbesc($xx['message_id']),
+										dbesc($xx['location']),
+										dbesc($xx['recipient']),
+										dbesc($xx['status']),
+										dbesc(datetime_convert($xx['date'])),
+										dbesc($xx['sender'])
+									);
+								}
 							}
 						}
 					}
diff --git a/include/dir_fns.php b/include/dir_fns.php
index e466b7404..ecc5f6d96 100644
--- a/include/dir_fns.php
+++ b/include/dir_fns.php
@@ -178,9 +178,10 @@ function sync_directories($dirmode) {
 			'site_directory' => DIRECTORY_FALLBACK_MASTER . '/dirsearch',
 			'site_realm' => DIRECTORY_REALM,
 			'site_valid' => 1
+			
 		);
 		$x = q("insert into site ( site_url, site_flags, site_update, site_directory, site_realm, site_valid )
-			values ( '%s', %d', '%s', '%s', '%s' ) ",
+			values ( '%s', %d, '%s', '%s', '%s', %d ) ",
 			dbesc($r[0]['site_url']),
 			intval($r[0]['site_flags']),
 			dbesc($r[0]['site_update']),
diff --git a/include/enotify.php b/include/enotify.php
index 80afe8ed6..bbddcdd14 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -97,7 +97,7 @@ function notification($params) {
 
 	if ($params['type'] == NOTIFY_MAIL) {
 		logger('notification: mail');
-		$subject = 	sprintf( t('[Red:Notify] New mail received at %s'),$sitename);
+		$subject = 	sprintf( t('[Hubzilla:Notify] New mail received at %s'),$sitename);
 
 		$preamble = sprintf( t('%1$s, %2$s sent you a new private message at %3$s.'),$recip['channel_name'], $sender['xchan_name'],$sitename);
 		$epreamble = sprintf( t('%1$s sent you %2$s.'),'[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]', '[zrl=$itemlink]' . t('a private message') . '[/zrl]');
@@ -183,7 +183,7 @@ function notification($params) {
 		// Before this we have the name of the replier on the subject rendering 
 		// differents subjects for messages on the same thread.
 
-		$subject = sprintf( t('[Red:Notify] Comment to conversation #%1$d by %2$s'), $parent_id, $sender['xchan_name']);
+		$subject = sprintf( t('[Hubzilla:Notify] Comment to conversation #%1$d by %2$s'), $parent_id, $sender['xchan_name']);
 		$preamble = sprintf( t('%1$s, %2$s commented on an item/conversation you have been following.'), $recip['channel_name'], $sender['xchan_name']); 
 		$epreamble = $dest_str; 
 
@@ -193,7 +193,7 @@ function notification($params) {
 	}
 
 	if($params['type'] == NOTIFY_WALL) {
-		$subject = sprintf( t('[Red:Notify] %s posted to your profile wall') , $sender['xchan_name']);
+		$subject = sprintf( t('[Hubzilla:Notify] %s posted to your profile wall') , $sender['xchan_name']);
 
 		$preamble = sprintf( t('%1$s, %2$s posted to your profile wall at %3$s') , $recip['channel_name'], $sender['xchan_name'], $sitename);
 
@@ -221,7 +221,7 @@ function notification($params) {
 			return;
 		}
 	
-		$subject =	sprintf( t('[Red:Notify] %s tagged you') , $sender['xchan_name']);
+		$subject =	sprintf( t('[Hubzilla:Notify] %s tagged you') , $sender['xchan_name']);
 		$preamble = sprintf( t('%1$s, %2$s tagged you at %3$s') , $recip['channel_name'], $sender['xchan_name'], $sitename);
 		$epreamble = sprintf( t('%1$s, %2$s [zrl=%3$s]tagged you[/zrl].') ,
 			$recip['channel_name'],
@@ -235,7 +235,7 @@ function notification($params) {
 	}
 
 	if ($params['type'] == NOTIFY_POKE) {
-		$subject =	sprintf( t('[Red:Notify] %1$s poked you') , $sender['xchan_name']);
+		$subject =	sprintf( t('[Hubzilla:Notify] %1$s poked you') , $sender['xchan_name']);
 		$preamble = sprintf( t('%1$s, %2$s poked you at %3$s') , $recip['channel_name'], $sender['xchan_name'], $sitename);
 		$epreamble = sprintf( t('%1$s, %2$s [zrl=%2$s]poked you[/zrl].') ,
 			$recip['channel_name'], 
@@ -253,7 +253,7 @@ function notification($params) {
 	}
 
 	if ($params['type'] == NOTIFY_TAGSHARE) {
-		$subject =	sprintf( t('[Red:Notify] %s tagged your post') , $sender['xchan_name']);
+		$subject =	sprintf( t('[Hubzilla:Notify] %s tagged your post') , $sender['xchan_name']);
 		$preamble = sprintf( t('%1$s, %2$s tagged your post at %3$s') , $recip['channel_name'],$sender['xchan_name'], $sitename);
 		$epreamble = sprintf( t('%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]') ,
 			$recip['channel_name'],
@@ -267,7 +267,7 @@ function notification($params) {
 	}
 
 	if ($params['type'] == NOTIFY_INTRO) {
-		$subject = sprintf( t('[Red:Notify] Introduction received'));
+		$subject = sprintf( t('[Hubzilla:Notify] Introduction received'));
 		$preamble = sprintf( t('%1$s, you\'ve received an new connection request from \'%2$s\' at %3$s'), $recip['channel_name'], $sender['xchan_name'], $sitename); 
 		$epreamble = sprintf( t('%1$s, you\'ve received [zrl=%2$s]a new connection request[/zrl] from %3$s.'),
 			$recip['channel_name'],
@@ -282,7 +282,7 @@ function notification($params) {
 	}
 
 	if ($params['type'] == NOTIFY_SUGGEST) {
-		$subject = sprintf( t('[Red:Notify] Friend suggestion received'));
+		$subject = sprintf( t('[Hubzilla:Notify] Friend suggestion received'));
 		$preamble = sprintf( t('%1$s, you\'ve received a friend suggestion from \'%2$s\' at %3$s'), $recip['channel_name'], $sender['xchan_name'], $sitename); 
 		$epreamble = sprintf( t('%1$s, you\'ve received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from %4$s.'),
 			$recip['channel_name'],
@@ -508,7 +508,7 @@ function notification($params) {
 					$private_activity = true;
 				case NOTIFY_MAIL:
 					$datarray['textversion'] = $datarray['htmlversion'] = $datarray['title'] = '';
-					$datarray['subject'] = preg_replace('/' . preg_quote(t('[Red:Notify]')) . '/','$0*',$datarray['subject']);
+					$datarray['subject'] = preg_replace('/' . preg_quote(t('[Hubzilla:Notify]')) . '/','$0*',$datarray['subject']);
 					break;
 				default:
 					break;
diff --git a/include/features.php b/include/features.php
index a6c4757cd..74ae7b3d7 100644
--- a/include/features.php
+++ b/include/features.php
@@ -55,10 +55,11 @@ function get_features() {
 			t('Post Composition Features'),
 //			array('richtext',       t('Richtext Editor'),			t('Enable richtext editor'),false),
 			array('markdown',       t('Use Markdown'),              t('Allow use of "Markdown" to format posts'),false),
-			array('large_photos',   t('Large Photos'),              t('Include large (640px) photo thumbnails in posts. If not enabled, use small (320px) photo thumbnails'),false),
+			array('large_photos',   t('Large Photos'),              t('Include large (1024px) photo thumbnails in posts. If not enabled, use small (640px) photo thumbnails'),false),
 			array('channel_sources', t('Channel Sources'),          t('Automatically import channel content from other channels or feeds'),false),
 			array('content_encrypt', t('Even More Encryption'),          t('Allow optional encryption of content end-to-end with a shared secret key'),false),
-			array('consensus_tools', t('Enable voting tools'),      t('Provide a class of post which others can vote on'),false),
+			array('consensus_tools', t('Enable Voting Tools'),      t('Provide a class of post which others can vote on'),false),
+			array('delayed_posting', t('Delayed Posting'),      t('Allow posts to be published at a later date'),false),
 
 		),
 
diff --git a/include/follow.php b/include/follow.php
index 960138743..40ad2c299 100644
--- a/include/follow.php
+++ b/include/follow.php
@@ -133,27 +133,27 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
 		$their_perms = 0;
 		$xchan_hash = '';
 
+
 		$r = q("select * from xchan where xchan_hash = '%s' or xchan_url = '%s' limit 1",
 			dbesc($url),
 			dbesc($url)
 		);
 
+
 		if(! $r) {
 			// attempt network auto-discovery
 			if(strpos($url,'@') && (! $is_http)) {
-				$r = discover_by_webbie($url);
+				$d = discover_by_webbie($url);
 			}
 			elseif($is_http) {
-				$r = discover_by_url($url);
-				$r['allowed'] = intval(get_config('system','feed_contacts'));
-			}
-			if($r) {
-				$r['channel_id'] = $uid;
-				call_hooks('follow_allow',$r);
-				if(! $r['allowed']) {
+				if(get_config('system','feed_contacts'))
+					$d = discover_by_url($url);
+				else {
 					$result['message'] = t('Protocol disabled.');
 					return $result;
 				}
+			}
+			if($d) {
 				$r = q("select * from xchan where xchan_hash = '%s' or xchan_url = '%s' limit 1",
 					dbesc($url),
 					dbesc($url)
@@ -172,6 +172,16 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
 		return $result;
 	}
 
+	$x = array('channel_id' => $uid, 'follow_address' => $url, 'xchan' => $r[0], 'allowed' => 1);
+
+	call_hooks('follow_allow',$x);
+
+	if(! $x['allowed']) {
+		$result['message'] = t('Protocol disabled.');
+		return $result;
+	}
+
+
 	if((local_channel()) && $uid == local_channel()) {
 		$aid = get_account_id();
 		$hash = get_observer_hash();
@@ -251,7 +261,7 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
 	);
 	if($r) {
 		$result['abook'] = $r[0];
-		proc_run('php', 'include/notifier.php', 'permission_update', $result['abook']['abook_id']);
+		proc_run('php', 'include/notifier.php', 'permission_create', $result['abook']['abook_id']);
 	}
 
 	$arr = array('channel_id' => $uid, 'abook' => $result['abook']);
diff --git a/include/identity.php b/include/identity.php
index 47738a8fa..0c4a9df45 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -631,6 +631,30 @@ function identity_basic_export($channel_id, $items = false) {
 	if($r)
 		$ret['likes'] = $r;
 
+
+	$r = q("select * from conv where uid = %d",
+		intval($channel_id)
+	);
+	if($r) {
+		for($x = 0; $x < count($r); $x ++) {
+			$r[$x]['subject'] = base64url_decode(str_rot47($r[$x]['subject']));
+		}		
+		$ret['conv'] = $r;
+	}
+
+
+	$r = q("select * from mail where mail.uid = %d",
+		intval($channel_id)
+	);
+	if($r) {
+		$m = array();
+		foreach($r as $rr) {
+			xchan_mail_query($rr);
+			$m[] = mail_encode($rr,true);
+		}
+		$ret['mail'] = $m;
+	}
+
 	$r = q("select item_id.*, item.mid from item_id left join item on item_id.iid = item.id where item_id.uid = %d",
 		intval($channel_id)
 	);
diff --git a/include/import.php b/include/import.php
index ad8bcd84e..0fd1ab2a5 100644
--- a/include/import.php
+++ b/include/import.php
@@ -790,7 +790,7 @@ function import_likes($channel,$likes) {
 			if($r)
 				continue;
 
-			dbesc_array($config);
+			dbesc_array($like);
 			$r = dbq("INSERT INTO likes (`" 
 				. implode("`, `", array_keys($like)) 
 				. "`) VALUES ('" 
@@ -800,6 +800,71 @@ function import_likes($channel,$likes) {
 	}	
 }
 
+function import_conv($channel,$convs) {
+	if($channel && $convs) {
+		foreach($convs as $conv) {
+			if($conv['deleted']) {
+				q("delete from conv where guid = '%s' and uid = %d limit 1",
+					dbesc($conv['guid']),
+					intval($channel['channel_id'])
+				);
+				continue;
+			}
+			
+			unset($conv['id']);
+
+			$conv['uid'] = $channel['channel_id'];
+			$conv['subject'] = str_rot47(base64url_encode($conv['subject']));
+
+			$r = q("select id from conv where guid = '%s' and uid = %d limit 1",
+				dbesc($conv['guid']),
+				intval($channel['channel_id'])
+			);
+			if($r)
+				continue;
+
+			dbesc_array($conv);
+			$r = dbq("INSERT INTO conv (`" 
+				. implode("`, `", array_keys($conv)) 
+				. "`) VALUES ('" 
+				. implode("', '", array_values($conv)) 
+				. "')" );
+		}
+	}	
+}
+
+
+
+function import_mail($channel,$mails) {
+	if($channel && $mails) {
+		foreach($mails as $mail) {
+			if(array_key_exists('flags',$mail) && in_array('deleted',$mail['flags'])) {
+				q("delete from mail where mid = '%s' and uid = %d limit 1",
+					dbesc($mail['message_id']),
+					intval($channel['channel_id'])
+				);
+				continue;
+			}
+			if(array_key_exists('flags',$mail) && in_array('recalled',$mail['flags'])) {
+				q("update mail set mail_recalled = 1 where mid = '%s' and uid = %d limit 1",
+					dbesc($mail['message_id']),
+					intval($channel['channel_id'])
+				);
+				continue;
+			}
+
+			$m = get_mail_elements($mail);
+			if(! $m)
+				continue;
+
+			$m['aid'] = $channel['channel_account_id'];
+			$m['uid'] = $channel['channel_id'];
+			mail_store($m);
+ 		}
+	}	
+}
+
+
 
 
 
diff --git a/include/items.php b/include/items.php
index e7cc02579..08be981e7 100755
--- a/include/items.php
+++ b/include/items.php
@@ -1559,7 +1559,7 @@ function encode_item_flags($item) {
 	return $ret;
 }
 
-function encode_mail($item) {
+function encode_mail($item,$extended = false) {
 	$x = array();
 	$x['type'] = 'mail';
 	$x['encoding'] = 'zot';
@@ -1592,6 +1592,18 @@ function encode_mail($item) {
 		$x['body']  = '';
 	}
 
+	if($extended) {
+		$x['conv_guid'] = $item['conv_guid'];
+		if(intval($item['mail_deleted']))
+			$x['flags'][] = 'deleted';
+		if(intval($item['mail_replied']))
+			$x['flags'][] = 'replied';
+		if(intval($item['mail_isreply']))
+			$x['flags'][] = 'isreply';
+		if(intval($item['mail_seen']))
+			$x['flags'][] = 'seen';
+	}
+
 	return $x;
 }
 
@@ -1604,6 +1616,8 @@ function get_mail_elements($x) {
 	$arr['body']         = (($x['body']) ? htmlspecialchars($x['body'], ENT_COMPAT,'UTF-8',false) : '');
 	$arr['title']        = (($x['title'])? htmlspecialchars($x['title'],ENT_COMPAT,'UTF-8',false) : '');
 
+	$arr['conv_guid']    = (($x['conv_guid'])? htmlspecialchars($x['conv_guid'],ENT_COMPAT,'UTF-8',false) : '');
+
 	$arr['created']      = datetime_convert('UTC','UTC',$x['created']);
 	if((! array_key_exists('expires',$x)) || ($x['expires'] === NULL_DATE))
 		$arr['expires'] = NULL_DATE;
@@ -1616,6 +1630,18 @@ function get_mail_elements($x) {
 		if(in_array('recalled',$x['flags'])) {
 			$arr['mail_recalled'] = 1;
 		}
+		if(in_array('replied',$x['flags'])) {
+			$arr['mail_replied'] = 1;
+		}
+		if(in_array('isreply',$x['flags'])) {
+			$arr['mail_isreply'] = 1;
+		}
+		if(in_array('seen',$x['flags'])) {
+			$arr['mail_seen'] = 1;
+		}
+		if(in_array('deleted',$x['flags'])) {
+			$arr['mail_deleted'] = 1;
+		}
 	}
 
 	$key = get_config('system','pubkey');
@@ -1630,6 +1656,7 @@ function get_mail_elements($x) {
 	if($arr['created'] > datetime_convert())
 		$arr['created']  = datetime_convert();
 
+
 	$arr['mid']          = (($x['message_id'])     ? htmlspecialchars($x['message_id'],     ENT_COMPAT,'UTF-8',false) : '');
 	$arr['parent_mid']   = (($x['message_parent']) ? htmlspecialchars($x['message_parent'], ENT_COMPAT,'UTF-8',false) : '');
 
@@ -3510,6 +3537,7 @@ function mail_store($arr) {
 	$arr['title']         = ((x($arr,'title'))         ? trim($arr['title'])         : '');
 	$arr['parent_mid']    = ((x($arr,'parent_mid'))    ? notags(trim($arr['parent_mid']))    : '');
 	$arr['body']          = ((x($arr,'body'))          ? trim($arr['body'])                  : '');
+	$arr['conv_guid']     = ((x($arr,'conv_guid'))     ? trim($arr['conv_guid'])             : '');
 
 	$arr['mail_flags']    = ((x($arr,'mail_flags'))    ? intval($arr['mail_flags'])          : 0 );
 
diff --git a/include/message.php b/include/message.php
index 4b0236db8..820d814b6 100644
--- a/include/message.php
+++ b/include/message.php
@@ -28,8 +28,6 @@ function send_message($uid = 0, $recipient='', $body='', $subject='', $replyto='
 //		$expires = datetime_convert(date_default_timezone_get(),'UTC',$expires);
 
 
-
-
 	if($uid) {
 		$r = q("select * from channel where channel_id = %d limit 1",
 			intval($uid)
@@ -49,18 +47,20 @@ function send_message($uid = 0, $recipient='', $body='', $subject='', $replyto='
 
 	// look for any existing conversation structure
 
+	$conv_guid = '';
 
 	if(strlen($replyto)) {
-		$r = q("select convid from mail where channel_id = %d and ( mid = '%s' or parent_mid = '%s' ) limit 1",
+		$r = q("select conv_guid from mail where channel_id = %d and ( mid = '%s' or parent_mid = '%s' ) limit 1",
 			intval(local_channel()),
 			dbesc($replyto),
 			dbesc($replyto)
 		);
-		if($r)
-			$convid = $r[0]['convid'];
+		if($r) {
+			$conv_guid = $r[0]['conv_guid'];
+		}
 	}		
 
-	if(! $convid) {
+	if(! $conv_guid) {
 
 		// create a new conversation
 
@@ -93,16 +93,28 @@ function send_message($uid = 0, $recipient='', $body='', $subject='', $replyto='
 			dbesc($conv_guid),
 			intval(local_channel())
 		);
-		if($r)
-			$convid = $r[0]['id'];
+		if($r) {
+			$retconv = $r[0];
+			$retconv['subject'] = base64url_decode(str_rot47($retconv['subject']));
+		}
+	}
+
+	if(! $retconv) {
+		$r = q("select * from conv where guid = '%s' and uid = %d limit 1",
+			dbesc($conv_guid),
+			intval(local_channel())
+		);
+		if($r) {
+			$retconv = $r[0];
+			$retconv['subject'] = base64url_decode(str_rot47($retconv['subject']));
+		}
 	}
 
-	if(! $convid) {
+	if(! $retconv) {
 		$ret['message'] = 'conversation not found';
 		return $ret;
 	}
 
-
 	// generate a unique message_id
 
 	do {
@@ -174,10 +186,10 @@ function send_message($uid = 0, $recipient='', $body='', $subject='', $replyto='
 	
 
 
-	$r = q("INSERT INTO mail ( account_id, convid, mail_obscured, channel_id, from_xchan, to_xchan, title, body, attach, mid, parent_mid, created, expires )
-		VALUES ( %d, %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )",
+	$r = q("INSERT INTO mail ( account_id, conv_guid, mail_obscured, channel_id, from_xchan, to_xchan, title, body, attach, mid, parent_mid, created, expires )
+		VALUES ( %d, '%s', %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )",
 		intval($channel['channel_account_id']),
-		intval($convid),
+		dbesc($conv_guid),
 		intval(1),
 		intval($channel['channel_id']),
 		dbesc($channel['channel_hash']),
@@ -197,8 +209,11 @@ function send_message($uid = 0, $recipient='', $body='', $subject='', $replyto='
 		dbesc($mid),
 		intval($channel['channel_id'])
 	);
-	if($r)
+	if($r) {
 		$post_id = $r[0]['id'];
+		$retmail = $r[0];
+		xchan_mail_query($retmail);
+	}
 	else {
 		$ret['message'] = t('Stored post could not be verified.');
 		return $ret;
@@ -242,6 +257,9 @@ function send_message($uid = 0, $recipient='', $body='', $subject='', $replyto='
 
 	$ret['success'] = true;
 	$ret['message_item'] = intval($post_id);
+	$ret['conv'] = $retconv;
+	$ret['mail'] = $retmail;
+
 	return $ret;
 
 }
@@ -367,30 +385,67 @@ function private_messages_fetch_message($channel_id, $messageitem_id, $updatesee
 
 function private_messages_drop($channel_id, $messageitem_id, $drop_conversation = false) {
 
+
+	$x = q("select * from mail where id = %d and channel_id = %d limit 1",
+		intval($messageitem_id),
+		intval($channel_id)
+	);
+	if(! $x)
+		return false;
+
+	$conversation = null;
+
+	if($x[0]['conv_guid']) {
+		$y = q("select * from conv where guid = '%s' and uid = %d limit 1",
+			dbesc($x[0]['conv_guid']),
+			intval($channel_id)
+		);
+		if($y) {
+			$conversation = $y[0];
+			$conversation['subject'] = base64url_decode(str_rot47($conversation['subject']));
+		}
+	}
+
 	if($drop_conversation) {
-		// find the parent_id
-		$p = q("SELECT parent_mid FROM mail WHERE id = %d AND channel_id = %d LIMIT 1",
-			intval($messageitem_id),
+		$m = array();
+		$m['conv'] = array($conversation);
+		$m['conv'][0]['deleted'] = 1;
+
+		$z = q("select * from mail where parent_mid = '%s' and channel_id = %d",
+			dbesc($x[0]['parent_mid']),
 			intval($channel_id)
 		);
-		if($p) {
-			$r = q("DELETE FROM mail WHERE parent_mid = '%s' AND channel_id = %d ",
-				dbesc($p[0]['parent_mid']),
+		if($z) {
+			q("delete from conv where guid = '%s' and uid = %d limit 1",
+				dbesc($x[0]['conv_guid']),
+				intval($channel_id)
+			);		
+			$m['mail'] = array();
+			foreach($z as $zz) {
+				xchan_mail_query($zz);
+				$zz['mail_deleted'] = 1;
+				$m['mail'][] = encode_mail($zz,true);
+			}
+			q("DELETE FROM mail WHERE parent_mid = '%s' AND channel_id = %d ",
+				dbesc($x[0]['parent_mid']),
 				intval($channel_id)
 			);
-			if($r)
-				return true;
 		}
+		build_sync_packet($channel_id,$m);
+		return true;
 	}
 	else {
+		xchan_mail_query($x[0]);
+		$x[0]['mail_deleted'] = true;		
 		$r = q("DELETE FROM mail WHERE id = %d AND channel_id = %d",
 			intval($messageitem_id),
 			intval($channel_id)
 		);
-		if($r)
-			return true;
+		build_sync_packet($channel_id,array('mail' => array(encode_mail($x,true))));
+		return true;
 	}
 	return false;
+
 }
 
 
diff --git a/include/network.php b/include/network.php
index 41e1ff37c..c67c019ef 100644
--- a/include/network.php
+++ b/include/network.php
@@ -586,7 +586,7 @@ function scale_external_images($s, $include_link = true, $scale_replace = false)
 			
 			if(substr($mtch[1],0,1) == '=') {
 				$owidth = intval(substr($mtch[2],1));
-				if(intval($owidth) > 0 && intval($owidth) < 640)
+				if(intval($owidth) > 0 && intval($owidth) < 1024)
 					continue;
 			}
 
@@ -624,9 +624,9 @@ function scale_external_images($s, $include_link = true, $scale_replace = false)
 					$orig_width = $ph->getWidth();
 					$orig_height = $ph->getHeight();
 
-					if($orig_width > 640 || $orig_height > 640) {
+					if($orig_width > 1024 || $orig_height > 1024) {
 						$tag = (($match[1] == 'z') ? 'zmg' : 'img');
-						$ph->scaleImage(640);
+						$ph->scaleImage(1024);
 						$new_width = $ph->getWidth();
 						$new_height = $ph->getHeight();
 						logger('scale_external_images: ' . $orig_width . '->' . $new_width . 'w ' . $orig_height . '->' . $new_height . 'h' . ' match: ' . $mtch[0], LOGGER_DEBUG);
@@ -1677,13 +1677,40 @@ function format_and_send_email($sender,$xchan,$item) {
 			'additionalMailHeader' => '',
 		));
 
+}
+
 
+function do_delivery($deliveries) {
 
+	if(! (is_array($deliveries) && count($deliveries)))
+		return;
 
+	$interval = ((get_config('system','delivery_interval') !== false) 
+			? intval(get_config('system','delivery_interval')) : 2 );
 
+	$deliveries_per_process = intval(get_config('system','delivery_batch_count'));
 
+	if($deliveries_per_process <= 0)
+		$deliveries_per_process = 1;
 
 
+	$deliver = array();
+	foreach($deliveries as $d) {
 
+		$deliver[] = $d;
+
+		if(count($deliver) >= $deliveries_per_process) {
+			proc_run('php','include/deliver.php',$deliver);
+			$deliver = array();
+			if($interval)
+				@time_sleep_until(microtime(true) + (float) $interval);
+		}
+	}
+
+	// catch any stragglers
+
+	if($deliver)
+		proc_run('php','include/deliver.php',$deliver);
+	
 
 }
diff --git a/include/notifier.php b/include/notifier.php
index db1aa9690..0b29146c1 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -96,7 +96,19 @@ function notifier_run($argv, $argc){
 	require_once('include/identity.php');
 	$sys = get_sys_channel();
 
-	if($cmd == 'permission_update') {
+	$deliveries = array();
+
+	$dead_hubs = array();
+
+	$dh = q("select site_url from site where site_dead = 1");
+	if(dh) {
+		foreach($dh as $dead) {
+			$dead_hubs[] = $dead['site_url'];
+		}
+	}
+
+
+	if($cmd == 'permission_update' || $cmd == 'permission_create') {
 		// Get the recipient	
 		$r = q("select abook.*, hubloc.* from abook 
 			left join hubloc on hubloc_hash = abook_xchan
@@ -113,8 +125,16 @@ function notifier_run($argv, $argc){
 				intval($r[0]['abook_channel'])
 			);
 			if($s) {
-				$perm_update = array('sender' => $s[0], 'recipient' => $r[0], 'success' => false);
-				call_hooks('permissions_update',$perm_update);
+				$perm_update = array('sender' => $s[0], 'recipient' => $r[0], 'success' => false, 'deliveries' => '');
+
+				if($cmd == 'permission_create')
+					call_hooks('permissions_create',$perm_update);
+				else
+					call_hooks('permissions_update',$perm_update);
+
+				if($perm_update['success'] && $perm_update['deliveries'])
+					$deliveries[] = $perm_update['deliveries'];
+
 				if(! $perm_update['success']) {
 					// send a refresh message to each hub they have registered here	
 					$h = q("select * from hubloc where hubloc_hash = '%s' 
@@ -125,36 +145,40 @@ function notifier_run($argv, $argc){
 					);
 					if($h) {
 						foreach($h as $hh) {
+							if(in_array($hh['hubloc_url'],$dead_hubs)) {
+								logger('skipping dead hub: ' . $hh['hubloc_url'], LOGGER_DEBUG);
+									continue;
+							}
+
 							$data = zot_build_packet($s[0],'refresh',array(array(
 								'guid' => $hh['hubloc_guid'],
 								'guid_sig' => $hh['hubloc_guid_sig'],
 								'url' => $hh['hubloc_url'])
 							));
 							if($data) {
-								$result = zot_zot($hh['hubloc_callback'],$data);
-
-								// if immediate delivery failed, stick it in the queue to try again later.
-
-								if(! $result['success']) {
-									$hash = random_string();
-									q("insert into outq ( outq_hash, outq_account, outq_channel, outq_driver, outq_posturl, outq_async, outq_created, outq_updated, outq_notify, outq_msg ) 
-										values ( '%s', %d, %d, '%s', '%s', %d, '%s', '%s', '%s', '%s' )",
-                						dbesc($hash),
-										intval($s[0]['channel_account_id']),
-										intval($s[0]['channel_id']),
-										dbesc('zot'),
-										dbesc($hh['hubloc_callback']),
-										intval(1),
-										dbesc(datetime_convert()),
-										dbesc(datetime_convert()),
-										dbesc($data),
-										dbesc('')
-									);
-								}
+								$hash = random_string();
+								q("insert into outq ( outq_hash, outq_account, outq_channel, outq_driver, outq_posturl, outq_async, outq_created, outq_updated, outq_notify, outq_msg ) 
+									values ( '%s', %d, %d, '%s', '%s', %d, '%s', '%s', '%s', '%s' )",
+                					dbesc($hash),
+									intval($s[0]['channel_account_id']),
+									intval($s[0]['channel_id']),
+									dbesc('zot'),
+									dbesc($hh['hubloc_callback']),
+									intval(1),
+									dbesc(datetime_convert()),
+									dbesc(datetime_convert()),
+									dbesc($data),
+									dbesc('')
+								);
+								$deliveries[] = $hash;
 							}
-						}	
+						}
+
 					}
 				}
+
+				if($deliveries) 
+					do_delivery($deliveries);
 			}
 		}
 		return;
@@ -342,7 +366,7 @@ function notifier_run($argv, $argc){
 			logger('notifier: target item not forwardable: type ' . $target_item['item_type'], LOGGER_DEBUG);
 			return;
 		}
-		if(intval($target_item['item_unpublished']) || intval($target_item['item_delayed_publish'])) {
+		if(intval($target_item['item_unpublished']) || intval($target_item['item_delayed'])) {
 			logger('notifier: target item not published, so not forwardable', LOGGER_DEBUG);
 			return;
 		}
@@ -524,14 +548,6 @@ function notifier_run($argv, $argc){
 
 	$hubs = $r;
 
-	$dead_hubs = array();
-
-	$dh = q("select site_url from site where site_dead = 1");
-	if(dh) {
-		foreach($dh as $dead) {
-			$dead_hubs[] = $dead['site_url'];
-		}
-	}
 
 
 	/**
@@ -571,15 +587,6 @@ function notifier_run($argv, $argc){
 
 	logger('notifier: will notify/deliver to these hubs: ' . print_r($hublist,true), LOGGER_DEBUG);
 			 
-	$interval = ((get_config('system','delivery_interval') !== false) 
-			? intval(get_config('system','delivery_interval')) : 2 );
-
-	$deliveries_per_process = intval(get_config('system','delivery_batch_count'));
-
-	if($deliveries_per_process <= 0)
-		$deliveries_per_process = 1;
-
-	$deliveries = array();
 
 	foreach($dhubs as $hub) {
 
@@ -687,29 +694,11 @@ function notifier_run($argv, $argc){
 	if($normal_mode) {
 		$x = q("select * from hook where hook = 'notifier_normal'");
 		if($x)
-			proc_run('php','deliver_hooks.php', $target_item['id']);
+			proc_run('php','include/deliver_hooks.php', $target_item['id']);
 	}
 
-	if($deliveries) {
-		$deliver = array();
-
-		foreach($deliveries as $d) {
-
-			$deliver[] = $d;
-
-			if(count($deliver) >= $deliveries_per_process) {
-				proc_run('php','include/deliver.php',$deliver);
-				$deliver = array();
-				if($interval)
-					@time_sleep_until(microtime(true) + (float) $interval);
-			}
-		}
-	}
-
-	// catch any stragglers
-
-	if($deliver)
-		proc_run('php','include/deliver.php',$deliver);
+	if($deliveries)
+		do_delivery($deliveries);
 
 	logger('notifier: basic loop complete.', LOGGER_DEBUG);
 
diff --git a/include/photos.php b/include/photos.php
index 49aab6865..a8619c372 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -7,6 +7,7 @@
 require_once('include/permissions.php');
 require_once('include/items.php');
 require_once('include/photo/photo_driver.php');
+require_once('include/text.php');
 
 /**
  * @brief
@@ -18,6 +19,8 @@ require_once('include/photo/photo_driver.php');
  */
 function photo_upload($channel, $observer, $args) {
 
+	$a = get_app();
+
 	$ret = array('success' => false);
 	$channel_id = $channel['channel_id'];
 	$account_id = $channel['channel_account_id'];
@@ -185,31 +188,66 @@ function photo_upload($channel, $observer, $args) {
 	if($args['description'])
 		$p['description'] = $args['description'];
 
-	$r1 = $ph->save($p);
-	if(! $r1)
-		$errors = true;
+	$link   = array();
 
+	$r0 = $ph->save($p);
+	$link[0] = array(
+		'rel'  => 'alternate',
+		'type' => 'text/html',
+		'href' => $url = rawurlencode(z_root() . '/photo/' . $photo_hash . '-0.' . $ph->getExt()),
+		'width' => $ph->getWidth(),
+		'height' => $ph->getHeight()
+	);
+	if(! $r0)
+		$errors = true;
 
 	unset($p['os_storage']);
 	unset($p['os_path']);
 
-	if(($width > 640 || $height > 640) && (! $errors)) {
+	if(($width > 1024 || $height > 1024) && (! $errors))
+		$ph->scaleImage(1024);
+
+	$p['scale'] = 1;
+	$r1 = $ph->save($p);
+	$link[1] = array(
+		'rel'  => 'alternate',
+		'type' => 'text/html',
+		'href' => $url = rawurlencode(z_root() . '/photo/' . $photo_hash . '-1.' . $ph->getExt()),
+		'width' => $ph->getWidth(),
+		'height' => $ph->getHeight()
+	);
+	if(! $r1)
+		$errors = true;
+	
+	if(($width > 640 || $height > 640) && (! $errors)) 
 		$ph->scaleImage(640);
-		$p['scale'] = 1;
-		$r2 = $ph->save($p);
-		$smallest = 1;
-		if(! $r2)
-			$errors = true;
-	}
 
-	if(($width > 320 || $height > 320) && (! $errors)) {
+	$p['scale'] = 2;
+	$r2 = $ph->save($p);
+	$link[2] = array(
+		'rel'  => 'alternate',
+		'type' => 'text/html',
+		'href' => $url = rawurlencode(z_root() . '/photo/' . $photo_hash . '-2.' . $ph->getExt()),
+		'width' => $ph->getWidth(),
+		'height' => $ph->getHeight()
+	);
+	if(! $r2)
+		$errors = true;
+
+	if(($width > 320 || $height > 320) && (! $errors)) 
 		$ph->scaleImage(320);
-		$p['scale'] = 2;
-		$r3 = $ph->save($p);
-		$smallest = 2;
-		if(! $r3)
-			$errors = true;
-	}
+
+	$p['scale'] = 3;
+	$r3 = $ph->save($p);
+	$link[3] = array(
+		'rel'  => 'alternate',
+		'type' => 'text/html',
+		'href' => $url = rawurlencode(z_root() . '/photo/' . $photo_hash . '-3.' . $ph->getExt()),
+		'width' => $ph->getWidth(),
+		'height' => $ph->getHeight()
+	);
+	if(! $r3)
+		$errors = true;
 
 	if($errors) {
 		q("delete from photo where resource_id = '%s' and uid = %d",
@@ -222,12 +260,6 @@ function photo_upload($channel, $observer, $args) {
 		return $ret;
 	}
 
-	// This will be the width and height of the smallest representation
-
-	$width_x_height = $ph->getWidth() . 'x' . $ph->getHeight();
-
-	// Create item container
-
 	$item_hidden = (($visible) ? 0 : 1 );
 
 	$lat = $lon = null;
@@ -239,6 +271,40 @@ function photo_upload($channel, $observer, $args) {
 		}
 	}
 
+	$title = (($args['description']) ? $args['description'] : $args['filename']);
+
+	$large_photos = feature_enabled($channel['channel_id'], 'large_photos');
+
+	linkify_tags($a, $args['body'], $channel_id);
+
+	if($large_photos) {
+		$scale = 1;
+		$width = $link[1]['width'];
+		$height = $link[1]['height'];
+		$tag = (($r1) ? '[zmg=' . $width . 'x' . $height . ']' : '[zmg]');
+
+
+	}
+	else {
+		$scale = 2;
+		$width = $link[2]['width'];
+		$height = $link[2]['height'];
+		$tag = (($r2) ? '[zmg=' . $width . 'x' . $height . ']' : '[zmg]');
+	}
+
+	// Create item object
+	$object = array(
+		'type'   => ACTIVITY_OBJ_PHOTO,
+		'title'  => $title,
+		'id'     => rawurlencode(z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo_hash),
+		'link'   => $link
+	);
+
+	$body = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo_hash . ']' 
+		. $tag . z_root() . "/photo/{$photo_hash}-{$scale}." . $ph->getExt() . '[/zmg]' 
+		. '[/zrl]';
+
+	// Create item container
 	if($args['item']) {
 		foreach($args['item'] as $i) {
 
@@ -247,13 +313,13 @@ function photo_upload($channel, $observer, $args) {
 
 			if($item['mid'] === $item['parent_mid']) {
 
-				$item['body'] = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo_hash . ']' 
-					. $tag . z_root() . "/photo/{$photo_hash}-{$smallest}.".$ph->getExt() . '[/zmg]'
-					. '[/zrl]';
+				$item['body'] = (($object) ? $args['body'] : $body . "\r\n" . $args['body']);
+				$item['obj_type'] = (($object) ? ACTIVITY_OBJ_PHOTO : '');
+				$item['object']	= (($object) ? json_encode($object) : '');
 
 				if($item['author_xchan'] === $channel['channel_hash']) {
-	              	$item['sig'] = base64url_encode(rsa_sign($item['body'],$channel['channel_prvkey']));
-	                $item['item_verified']  = 1;
+					$item['sig'] = base64url_encode(rsa_sign($item['body'],$channel['channel_prvkey']));
+					$item['item_verified']  = 1;
 				}
 				else {
 					$item['sig'] = '';
@@ -281,7 +347,6 @@ function photo_upload($channel, $observer, $args) {
 		}
 	}
 	else {
-		$title = '';
 		$mid = item_message_id();
 
 		$arr = array();
@@ -304,33 +369,14 @@ function photo_upload($channel, $observer, $args) {
 		$arr['deny_cid']        = $ac['deny_cid'];
 		$arr['deny_gid']        = $ac['deny_gid'];
 		$arr['verb']            = ACTIVITY_POST;
+		$arr['obj_type']	= (($object) ? ACTIVITY_OBJ_PHOTO : '');
+		$arr['object']		= (($object) ? json_encode($object) : '');
 		$arr['item_wall']       = 1;
 		$arr['item_origin']     = 1;
 		$arr['item_thread_top'] = 1;
 		$arr['item_private']    = intval($acl->is_private());
 		$arr['plink']           = z_root() . '/channel/' . $channel['channel_address'] . '/?f=&mid=' . $arr['mid'];
-
-		// We should also put a width_x_height on large photos. Left as an exercise for 
-		// devs looking for simple stuff to fix.
-
-		$larger = feature_enabled($channel['channel_id'], 'large_photos');
-		if($larger) {
-			$tag = '[zmg]';
-			if($r2)
-				$smallest = 1;
-			else
-				$smallest = 0;
-		}
-		else {
-			if ($width_x_height)
-				$tag = '[zmg=' . $width_x_height. ']';
-			else
-				$tag = '[zmg]';
-		}
-
-		$arr['body'] = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo_hash . ']' 
-			. $tag . z_root() . "/photo/{$photo_hash}-{$smallest}.".$ph->getExt() . '[/zmg]'
-			. '[/zrl]';
+		$arr['body']		= (($object) ? $args['body'] : $body . "\r\n" . $args['body']);
 
 		$result = item_store($arr);
 		$item_id = $result['item_id'];
@@ -341,7 +387,7 @@ function photo_upload($channel, $observer, $args) {
 
 	$ret['success'] = true;
 	$ret['item'] = $arr;
-	$ret['body'] = $arr['body'];
+	$ret['body'] = $body;
 	$ret['resource_id'] = $photo_hash;
 	$ret['photoitem_id'] = $item_id;
 
diff --git a/include/plugin.php b/include/plugin.php
index 4d8405b62..8749f3fbf 100755
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -504,18 +504,21 @@ function script_path() {
 		$scheme = 'https';
 	else
 		$scheme = 'http';
+	
+	// Some proxy setups may require using http_host
 
-	if(x($_SERVER,'SERVER_NAME')) {
-		$hostname = $_SERVER['SERVER_NAME'];
+	if(intval(get_app()->config['system']['script_path_use_http_host']))
+		$server_var = 'HTTP_HOST';
+	else
+		$server_var = 'SERVER_NAME';
+
+
+	if(x($_SERVER,$server_var)) {
+		$hostname = $_SERVER[$server_var];
 	}
 	else {
 		return z_root();
 	}
-
-	if(x($_SERVER,'SERVER_PORT') && $_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443) {
-		$hostname .= ':' . $_SERVER['SERVER_PORT'];
-	}
-
 	return $scheme . '://' . $hostname;
 }
 
diff --git a/include/text.php b/include/text.php
index b1af62fc5..c30be77b8 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1216,36 +1216,15 @@ function theme_attachments(&$item) {
 	if(is_array($arr) && count($arr)) {
 		$attaches = array();
 		foreach($arr as $r) {
-			$icon = '';
-			$icontype = substr($r['type'],0,strpos($r['type'],'/'));
 
-			/**
-			 * @FIXME This should probably be a giant "if" statement in the
-			 * template so that we don't have icon names embedded in php code.
-			 */
-
-			switch($icontype) {
-				case 'video':
-					$icon = 'icon-facetime-video';
-					break;
-				case 'audio':
-					$icon = 'icon-volume-up';
-					break;
-				case 'image':
-					$icon = 'icon-picture';
-					break;
-				case 'text':
-					$icon = 'icon-align-justify';
-					break;
-				default:
-					$icon = 'icon-question';
-					break;
-			}
-
-			$title = htmlspecialchars($r['title'], ENT_COMPAT,'UTF-8');
-			if(! $title)
-				$title = t('unknown.???');
-			$title .= ' ' . (($r['length']) ? $r['length'] . ' ' . t('bytes') : '');
+			$icon = getIconFromType($r['type']);
+			$label = (($r['title']) ? urldecode(htmlspecialchars($r['title'], ENT_COMPAT, 'UTF-8')) : t('Unknown Attachment'));
+			
+			//some feeds provide an attachment where title an empty space
+			if($label  == ' ')
+				$label = t('Unknown Attachment');
+ 			
+			$title = t('Attachment') . ' - ' . (($r['length']) ? userReadableSize($r['length']) : t('Size Unknown'));
 
 			require_once('include/identity.php');
 			if(is_foreigner($item['author_xchan']))
@@ -1253,14 +1232,14 @@ function theme_attachments(&$item) {
 			else
 				$url = z_root() . '/magic?f=&hash=' . $item['author_xchan'] . '&dest=' . $r['href'] . '/' . $r['revision'];
 
-			$s .= '<a href="' . $url . '" title="' . $title . '" class="attachlink"  >' . $icon . '</a>';
-			$attaches[] = array('title' => $title, 'url' => $url, 'icon' => $icon );
+			//$s .= '<a href="' . $url . '" title="' . $title . '" class="attachlink"  >' . $icon . '</a>';
+			$attaches[] = array('label' => $label, 'url' => $url, 'icon' => $icon, 'title' => $title);
 		}
-	}
 
-	$s = replace_macros(get_markup_template('item_attach.tpl'), array(
-		'$attaches' => $attaches
-	));
+		$s = replace_macros(get_markup_template('item_attach.tpl'), array(
+			'$attaches' => $attaches
+		));
+	}
 
 	return $s;
 }
@@ -1279,11 +1258,12 @@ function format_categories(&$item,$writeable) {
 			$removelink = (($writeable) ?  z_root() . '/filerm/' . $item['id'] . '?f=&cat=' . urlencode($t['term']) : '');
 			$categories[] = array('term' => $term, 'writeable' => $writeable, 'removelink' => $removelink, 'url' => zid($t['url']));
 		}
+
+		$s = replace_macros(get_markup_template('item_categories.tpl'),array(
+			'$remove' => t('remove category'),
+			'$categories' => $categories
+		));
 	}
-	$s = replace_macros(get_markup_template('item_categories.tpl'),array(
-		'$remove' => t('remove category'),
-		'$categories' => $categories
-	));
 
 	return $s;
 }
@@ -1294,6 +1274,7 @@ function format_categories(&$item,$writeable) {
  * @param[in] array &$item
  * @return string HTML link of hashtag
  */
+
 function format_hashtags(&$item) {
 	$s = '';
 
@@ -1354,11 +1335,12 @@ function format_filer(&$item) {
 			$removelink = z_root() . '/filerm/' . $item['id'] . '?f=&term=' . urlencode($t['term']);
 			$categories[] = array('term' => $term, 'removelink' => $removelink);
 		}
+
+		$s = replace_macros(get_markup_template('item_filer.tpl'),array(
+			'$remove' => t('remove from file'),
+			'$categories' => $categories
+		));
 	}
-	$s = replace_macros(get_markup_template('item_filer.tpl'),array(
-		'$remove' => t('remove from file'),
-		'$categories' => $categories
-	));
 
 	return $s;
 }
@@ -1381,6 +1363,7 @@ function generate_named_map($location) {
 
 
 function prepare_body(&$item,$attach = false) {
+	require_once('include/identity.php');
 
 //	if($item['html']) {
 //		$s = bb_observer($item['html']);
@@ -1391,9 +1374,35 @@ function prepare_body(&$item,$attach = false) {
 		$s = prepare_text($item['body'],$item['mimetype'], false);
 //	}
 
-	$prep_arr = array('item' => $item, 'html' => $s);
+
+	$photo = '';
+	$is_photo = (($item['obj_type'] === ACTIVITY_OBJ_PHOTO) ? true : false);
+
+	if($is_photo) {
+		$object = json_decode($item['object'],true);
+
+		// if original photo width is <= 640px prepend it to item body
+		if($object['link'][0]['width'] && $object['link'][0]['width'] <= 640) {
+			$s = '<div class="inline-photo-item-wrapper"><a href="' . zid(rawurldecode($object['id'])) . '" target="_newwin"><img class="inline-photo-item" style="max-width:' . $object['link'][0]['width'] . 'px; width:100%; height:auto;" src="' . zid(rawurldecode($object['link'][0]['href'])) . '"></a></div>' . $s;
+		}
+
+		// if original photo width is > 640px make it a cover photo
+		if($object['link'][0]['width'] && $object['link'][0]['width'] > 640) {
+			$scale = ((($object['link'][1]['width'] == 1024) || ($object['link'][1]['height'] == 1024)) ? 1 : 0);
+			$photo = '<a href="' . zid(rawurldecode($object['id'])) . '" target="_newwin"><img style="max-width:' . $object['link'][$scale]['width'] . 'px; width:100%; height:auto;" src="' . zid(rawurldecode($object['link'][$scale]['href'])) . '"></a>';
+		}
+	}
+
+	$prep_arr = array(
+		'item' => $item,
+		'html' => $s,
+		'photo' => $photo
+	);
+
 	call_hooks('prepare_body', $prep_arr);
+
 	$s = $prep_arr['html'];
+	$photo = $prep_arr['photo'];
 
 //	q("update item set html = '%s' where id = %d",
 //		dbesc($s),
@@ -1409,21 +1418,21 @@ function prepare_body(&$item,$attach = false) {
 		if($x) {
 			$s = preg_replace('/\<div class\=\"map\"\>/','$0' . $x,$s);
 		}
-	}		 
+	}
 
-	$s .= theme_attachments($item);
+	$attachments = theme_attachments($item);
 
 	$writeable = ((get_observer_hash() == $item['owner_xchan']) ? true : false);
 
-	$s .= format_hashtags($item);
+	$tags = format_hashtags($item);
 
 	if($item['resource_type'])
-		$s .= format_mentions($item);
+		$mentions = format_mentions($item);
 
-	$s .= format_categories($item,$writeable);
+	$categories = format_categories($item,$writeable);
 
 	if(local_channel() == $item['uid'])
-		$s .= format_filer($item);
+		$filer = format_filer($item);
 
 	$s = sslify($s);
 
@@ -1456,9 +1465,22 @@ function prepare_body(&$item,$attach = false) {
 		$s = substr($s, 0, $pos).$authorreplace.substr($s, $pos+strlen($authorsearch));
 	}
 
-	$prep_arr = array('item' => $item, 'html' => $s);
+	$prep_arr = array(
+		'item' => $item,
+		'photo' => $photo,
+		'html' => $s,
+		'categories' => $categories,
+		'folders' => $filer,
+		'tags' => $tags,
+		'mentions' => $mentions,
+		'attachments' => $attachments
+	);
+
 	call_hooks('prepare_body_final', $prep_arr);
-	return $prep_arr['html'];
+
+	unset($prep_arr['item']);
+
+	return $prep_arr;
 }
 
 /**
@@ -1975,15 +1997,15 @@ function xchan_query(&$items,$abook = true,$effective_uid = 0) {
 	if(count($arr)) {
 		if($abook) {
 			$chans = q("select * from xchan left join hubloc on hubloc_hash = xchan_hash left join abook on abook_xchan = xchan_hash and abook_channel = %d
-				where xchan_hash in (" . implode(',', $arr) . ") and hubloc_primary = 1",
+				where xchan_hash in (" . protect_sprintf(implode(',', $arr)) . ") and hubloc_primary = 1",
 				intval($item['uid'])
 			);
 		}
 		else {
 			$chans = q("select xchan.*,hubloc.* from xchan left join hubloc on hubloc_hash = xchan_hash
-				where xchan_hash in (" . implode(',', $arr) . ") and hubloc_primary = 1");
+				where xchan_hash in (" . protect_sprintf(implode(',', $arr)) . ") and hubloc_primary = 1");
 		}
-		$xchans = q("select * from xchan where xchan_hash in (" . implode(',',$arr) . ") and xchan_network in ('rss','unknown')");
+		$xchans = q("select * from xchan where xchan_hash in (" . protect_sprintf(implode(',',$arr)) . ") and xchan_network in ('rss','unknown')");
 		if(! $chans)
 			$chans = $xchans;
 		else
@@ -2221,7 +2243,7 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag, $d
 		}
 		if($tag == '#getzot') {
 			$basetag = 'getzot'; 
-			$url = 'https://redmatrix.me';
+			$url = 'http://hubzilla.org';
 			$newtag = '#[zrl=' . $url . ']' . $basetag . '[/zrl]';
 			$body = str_replace($tag,$newtag,$body);
 			$replaced = true;
@@ -2490,6 +2512,7 @@ function linkify_tags($a, &$body, $uid, $diaspora = false) {
  *
  * @param string $type mime type
  * @return string
+ * @todo rename to get_icon_from_type()
  */
 function getIconFromType($type) {
 	$iconMap = array(
@@ -2542,6 +2565,7 @@ function getIconFromType($type) {
  *
  * @param int $size filesize in bytes
  * @return string human readable formatted filesize
+ * @todo rename to user_readable_size()
  */
 function userReadableSize($size) {
 	$ret = '';
@@ -2564,3 +2588,47 @@ function str_rot47($str) {
 		'!"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~',
 		'PQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~!"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNO');
 }
+
+
+function string_replace($old,$new,&$s) {
+
+	$x = str_replace($old,$new,$s);
+	$replaced = false;
+	if($x !== $s) {
+		$replaced = true;
+	}
+	$s = $x;
+	return $replaced;
+}
+
+
+function json_url_replace($old,$new,&$s) {
+
+	$old = str_replace('/','\\/',$old);
+	$new = str_replace('/','\\/',$new);
+
+	$x = str_replace($old,$new,$s);
+	$replaced = false;
+	if($x !== $s) {
+		$replaced = true;
+	}
+	$s = $x;
+	return $replaced;
+}
+		
+
+function item_url_replace($channel,&$item,$old,$new) {
+	
+	if($item['attach'])
+		json_url_replace($old,$new,$item['attach']);
+	if($item['object'])
+		json_url_replace($old,$new,$item['object']);
+	if($item['target'])
+		json_url_replace($old,$new,$item['target']);
+
+	if(string_replace($old,$new,$item['body'])) {
+		$item['sig'] = base64url_encode(rsa_sign($item['body'],$channel['channel_prvkey']));
+		$item['item_verified']  = 1;
+	}
+
+}
diff --git a/include/widgets.php b/include/widgets.php
index 9c8596a66..3e6fdb04c 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -565,12 +565,6 @@ function widget_mailmenu($arr) {
 
 	return replace_macros(get_markup_template('message_side.tpl'), array(
 		'$title' => t('Private Mail Menu'),
-		'$check'=>array(
-			'label' => t('Check Mail'),
-			'url' => $a->get_baseurl(true) . '/mail/combined',
-			'sel' => (argv(1) == ''),
-		),
-
 		'$combined'=>array(
 			'label' => t('Combined View'),
 			'url' => $a->get_baseurl(true) . '/mail/combined',
diff --git a/include/zot.php b/include/zot.php
index dd9222bf3..793eb6b39 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -503,7 +503,7 @@ function zot_refresh($them, $channel = null, $force = false) {
 
 					if($new_connection) {
 						if($new_perms != $previous_perms)
-							proc_run('php','include/notifier.php','permission_update',$new_connection[0]['abook_id']);
+							proc_run('php','include/notifier.php','permission_create',$new_connection[0]['abook_id']);
 						require_once('include/enotify.php');
 						notification(array(
 							'type'       => NOTIFY_INTRO,
@@ -965,7 +965,7 @@ function zot_process_response($hub, $arr, $outq) {
 
 	if(is_array($x) && array_key_exists('delivery_report',$x) && is_array($x['delivery_report'])) {
 		foreach($x['delivery_report'] as $xx) {
-			if(is_array($xx) && array_key_exists('message_id',$xx)) {
+			if(is_array($xx) && array_key_exists('message_id',$xx) && delivery_report_is_storable($xx)) {
 				q("insert into dreport ( dreport_mid, dreport_site, dreport_recip, dreport_result, dreport_time, dreport_xchan ) values ( '%s', '%s','%s','%s','%s','%s' ) ",
 					dbesc($xx['message_id']),
 					dbesc($xx['location']),
@@ -2739,6 +2739,7 @@ function import_site($arr, $pubkey) {
 	$sellpage = htmlspecialchars($arr['sellpage'],ENT_COMPAT,'UTF-8',false);
 	$site_location = htmlspecialchars($arr['location'],ENT_COMPAT,'UTF-8',false);
 	$site_realm = htmlspecialchars($arr['realm'],ENT_COMPAT,'UTF-8',false);
+	$site_project = htmlspecialchars($arr['project'],ENT_COMPAT,'UTF-8',false);
 
 	// You can have one and only one primary directory per realm.
 	// Downgrade any others claiming to be primary. As they have
@@ -2757,13 +2758,15 @@ function import_site($arr, $pubkey) {
 			|| ($siterecord['site_sellpage'] != $sellpage)
 			|| ($siterecord['site_location'] != $site_location)
 			|| ($siterecord['site_register'] != $register_policy)
+			|| ($siterecord['site_project'] != $site_project)
 			|| ($siterecord['site_realm'] != $site_realm)) {
 			$update = true;
 
 //			logger('import_site: input: ' . print_r($arr,true));
 //			logger('import_site: stored: ' . print_r($siterecord,true));
 
-			$r = q("update site set site_dead = 0, site_location = '%s', site_flags = %d, site_access = %d, site_directory = '%s', site_register = %d, site_update = '%s', site_sellpage = '%s', site_realm = '%s', site_type = %d
+
+			$r = q("update site set site_dead = 0, site_location = '%s', site_flags = %d, site_access = %d, site_directory = '%s', site_register = %d, site_update = '%s', site_sellpage = '%s', site_realm = '%s', site_type = %d, site_project = '%s'
 				where site_url = '%s'",
 				dbesc($site_location),
 				intval($site_directory),
@@ -2774,6 +2777,7 @@ function import_site($arr, $pubkey) {
 				dbesc($sellpage),
 				dbesc($site_realm),
 				intval(SITE_TYPE_ZOT),
+				dbesc($site_project),
 				dbesc($url)
 			);
 			if(! $r) {
@@ -2790,8 +2794,9 @@ function import_site($arr, $pubkey) {
 	}
 	else {
 		$update = true;
-		$r = q("insert into site ( site_location, site_url, site_access, site_flags, site_update, site_directory, site_register, site_sellpage, site_realm, site_type )
-			values ( '%s', '%s', %d, %d, '%s', '%s', %d, '%s', '%s', %d )",
+
+		$r = q("insert into site ( site_location, site_url, site_access, site_flags, site_update, site_directory, site_register, site_sellpage, site_realm, site_type, site_project )
+			values ( '%s', '%s', %d, %d, '%s', '%s', %d, '%s', '%s', %d, '%s' )",
 			dbesc($site_location),
 			dbesc($url),
 			intval($access_policy),
@@ -2801,7 +2806,8 @@ function import_site($arr, $pubkey) {
 			intval($register_policy),
 			dbesc($sellpage),
 			dbesc($site_realm),
-			intval(SITE_TYPE_ZOT)
+			intval(SITE_TYPE_ZOT),
+			dbesc($site_project)
 		);
 		if(! $r) {
 			logger('import_site: record create failed. ' . print_r($arr,true));
@@ -3002,6 +3008,12 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) {
 		if(array_key_exists('chatroom',$arr) && $arr['chatroom'])
 			sync_chatrooms($channel,$arr['chatroom']);
 
+		if(array_key_exists('conv',$arr) && $arr['conv'])
+			import_conv($channel,$arr['conv']);
+
+		if(array_key_exists('mail',$arr) && $arr['mail'])
+			import_mail($channel,$arr['mail']);
+
 		if(array_key_exists('event',$arr) && $arr['event'])
 			sync_events($channel,$arr['event']);
 
@@ -3804,6 +3816,7 @@ function zotinfo($arr) {
 		$ret['site']['sellpage'] = get_config('system','sellpage');
 		$ret['site']['location'] = get_config('system','site_location');
 		$ret['site']['realm'] = get_directory_realm();
+		$ret['site']['project'] = PLATFORM_NAME;
 
 	}
 
@@ -3876,3 +3889,45 @@ function check_zotinfo($channel,$locations,&$ret) {
 		}
 	}
 }
+
+function delivery_report_is_storable($dr) {
+
+	call_hooks('dreport_is_storable',$dr);
+
+	// let plugins accept or reject - if neither, continue on
+	if(array_key_exists('accept',$dr) && intval($dr['accept']))
+		return true;
+	if(array_key_exists('reject',$dr) && intval($dr['reject']))
+		return false;
+
+	if(! ($dr['sender']))
+		return false;
+
+	// Is the sender one of our channels?
+
+	$c = q("select channel_id from channel where channel_hash = '%s' limit 1",
+		dbesc($dr['sender'])
+	);
+	if(! $c)
+		return false;
+
+	// is the recipient one of our connections, or do we want to store every report? 
+
+	$r = explode(' ', $dr['recipient']);
+	$rxchan = $r[0];
+	$pcf = get_pconfig($c[0]['channel_id'],'system','dreport_store_all');
+	if($pcf)
+		return true;
+
+	$r = q("select abook_id from abook where abook_xchan = '%s' and abook_channel = %d limit 1",
+		dbesc($rxchan),
+		intval($c[0]['channel_id'])
+	);
+	if($r)
+		return true;
+
+	return false;
+
+}
+
+
diff --git a/install/INSTALL.txt b/install/INSTALL.txt
index 65df17fdd..c81510522 100644
--- a/install/INSTALL.txt
+++ b/install/INSTALL.txt
@@ -147,7 +147,12 @@ use SSL, your webserver must not listen on port 443 at all.
 
 
 3. Create an empty database and note the access details (hostname, username, 
-password, database name).
+password, database name). The MySQL client libraries will fallback to socket 
+communication if the hostname is 'localhost' and some people have reported
+issues with the socket implementation. Use it if your requirements mandate. 
+Otherwise if the database is served on the local server, use '127.0.0.1' for
+the hostname. See https://dev.mysql.com/doc/refman/5.0/en/connecting.html
+for more information. 
 
 4. If you know in advance that it will be impossible for the web server to 
 write or create files in your web directory, create an empty file called 
diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql
index 0e626752d..3dab6c822 100644
--- a/install/schema_mysql.sql
+++ b/install/schema_mysql.sql
@@ -731,6 +731,7 @@ CREATE TABLE IF NOT EXISTS `likes` (
 CREATE TABLE IF NOT EXISTS `mail` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `convid` int(10) unsigned NOT NULL DEFAULT '0',
+  `conv_guid` char(255) NOT NULL DEFAULT '',
   `mail_flags` int(10) unsigned NOT NULL DEFAULT '0',
   `from_xchan` char(255) NOT NULL DEFAULT '',
   `to_xchan` char(255) NOT NULL DEFAULT '',
@@ -761,6 +762,7 @@ CREATE TABLE IF NOT EXISTS `mail` (
   KEY `parent_mid` (`parent_mid`),
   KEY `expires` (`expires`),
   KEY `convid` (`convid`),
+  KEY `conv_guid` (`conv_guid`),
   KEY `mail_deleted` (`mail_deleted`),
   KEY `mail_replied` (`mail_replied`),
   KEY `mail_isreply` (`mail_isreply`),
@@ -1132,6 +1134,7 @@ CREATE TABLE IF NOT EXISTS `site` (
   `site_valid` smallint NOT NULL DEFAULT '0',
   `site_dead` smallint NOT NULL DEFAULT '0',
   `site_type` smallint NOT NULL DEFAULT '0',
+  `site_project` char(255) NOT NULL DEFAULT '',
   PRIMARY KEY (`site_url`),
   KEY `site_flags` (`site_flags`),
   KEY `site_update` (`site_update`),
@@ -1143,7 +1146,8 @@ CREATE TABLE IF NOT EXISTS `site` (
   KEY `site_realm` (`site_realm`),
   KEY `site_valid` (`site_valid`),
   KEY `site_dead` (`site_dead`),
-  KEY `site_type` (`site_type`)
+  KEY `site_type` (`site_type`),
+  KEY `site_project` (`site_project`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 CREATE TABLE IF NOT EXISTS `source` (
diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql
index f378a3e3d..70a7a576a 100644
--- a/install/schema_postgres.sql
+++ b/install/schema_postgres.sql
@@ -728,6 +728,7 @@ create index "likes_target_id" on likes ("target_id");
 CREATE TABLE "mail" (
   "id" serial  NOT NULL,
   "convid" bigint  NOT NULL DEFAULT '0',
+  "conv_guid" text NOT NULL,
   "mail_flags" bigint  NOT NULL DEFAULT '0',
   "from_xchan" text NOT NULL DEFAULT '',
   "to_xchan" text NOT NULL DEFAULT '',
@@ -750,6 +751,7 @@ CREATE TABLE "mail" (
   PRIMARY KEY ("id")
 );
 create index "mail_convid" on mail ("convid");
+create index "mail_conv_guid" on mail ("conv_guid");
 create index "mail_created" on mail ("created");
 create index "mail_flags" on mail ("mail_flags");
 create index "mail_account_id" on mail ("account_id");
@@ -1123,6 +1125,7 @@ CREATE TABLE "site" (
   "site_valid" smallint NOT NULL DEFAULT '0',
   "site_dead" smallint NOT NULL DEFAULT '0',
   "site_type" smallint NOT NULL DEFAULT '0',
+  "site_project" text NOT NULL DEFAULT '',
   PRIMARY KEY ("site_url")
 );
 create index "site_flags" on site ("site_flags");
@@ -1135,6 +1138,7 @@ create index "site_realm" on site ("site_realm");
 create index "site_valid" on site ("site_valid");
 create index "site_dead" on site ("site_dead");
 create index "site_type" on site ("site_type");
+create index "site_project" on site ("site_project");
 
 CREATE TABLE "source" (
   "src_id" serial  NOT NULL,
diff --git a/install/update.php b/install/update.php
index ace5239b5..d6b543466 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1156 );
+define( 'UPDATE_VERSION' , 1158 );
 
 /**
  *
@@ -1885,3 +1885,35 @@ function update_r1155() {
 	return UPDATE_FAILED;
 }
 
+
+function update_r1156() {
+	$r1 = q("ALTER TABLE mail ADD conv_guid CHAR( 255 ) NOT NULL DEFAULT '' ");
+	$r2 = q("create index conv_guid on mail ( conv_guid ) ");
+
+	$r3 = q("select mail.id, mail.convid, conv.guid from mail left join conv on mail.convid = conv.id where true");
+	if($r3) {
+		foreach($r3 as $rr) {
+			if($rr['convid']) {
+				q("update mail set conv_guid = '%s' where id = %d",
+					dbesc($rr['guid']),
+					intval($rr['id'])
+				);
+			}
+		}
+	}
+		
+    if($r1 && $r2)
+        return UPDATE_SUCCESS;
+	return UPDATE_FAILED;
+}
+
+function update_r1157() {
+	$r1 = q("alter table site add site_project char(255) not null default '' ");
+    $r2 = q("create index site_project on site ( site_project ) ");
+    if($r1 && $r2)
+        return UPDATE_SUCCESS;
+    return UPDATE_FAILED;
+
+}
+
+
diff --git a/mod/channel.php b/mod/channel.php
index f1b74136e..0af2666cc 100644
--- a/mod/channel.php
+++ b/mod/channel.php
@@ -173,7 +173,7 @@ function channel_content(&$a, $update = 0, $load = false) {
 			$r = q("SELECT distinct parent AS `item_id`, created from item
 				left join abook on ( item.owner_xchan = abook.abook_xchan $abook_uids )
 				WHERE uid = %d $item_normal
-				AND item_wall = 1 AND item_unseen = 1
+				AND item_wall = 1 $simple_update
 				AND (abook.abook_blocked = 0 or abook.abook_flags is null)
 				$sql_extra
 				ORDER BY created DESC",
diff --git a/mod/chat.php b/mod/chat.php
index ef9089b6f..79a5c050b 100644
--- a/mod/chat.php
+++ b/mod/chat.php
@@ -59,6 +59,9 @@ function chat_post(&$a) {
 
 	$arr = $acl->get();
 	$arr['name'] = $room;
+	$arr['expire'] = intval($_POST['chat_expire']);
+	if(intval($arr['expire']) < 0)
+		$arr['expire'] = 0;
 
 	chatroom_create($channel,$arr);
 
@@ -204,6 +207,7 @@ function chat_content(&$a) {
 		$o = replace_macros(get_markup_template('chatroom_new.tpl'),array(
 			'$header' => t('New Chatroom'),
 			'$name' => array('room_name',t('Chatroom Name'),'', ''),
+			'$chat_expire' => array('chat_expire',t('Expiration of chats (minutes)'),120,''),
 			'$permissions' =>  t('Permissions'),
 			'$acl' => populate_acl($channel_acl,false),
 			'$submit' => t('Submit')
diff --git a/mod/connedit.php b/mod/connedit.php
index 75a5fd719..65eba885a 100644
--- a/mod/connedit.php
+++ b/mod/connedit.php
@@ -190,7 +190,7 @@ function connedit_post(&$a) {
 		}
 	}
 
-	$abook_pending = $new_friend ? 0 : $orig_record[0]['abook_pending'];
+	$abook_pending = (($new_friend) ? 0 : $orig_record[0]['abook_pending']);
 
 	$r = q("UPDATE abook SET abook_profile = '%s', abook_my_perms = %d , abook_closeness = %d, abook_pending = %d,
 		abook_incl = '%s', abook_excl = '%s'
@@ -214,7 +214,6 @@ function connedit_post(&$a) {
 
 	}
 
-
 	if($r)
 		info( t('Connection updated.') . EOL);
 	else
@@ -222,7 +221,7 @@ function connedit_post(&$a) {
 
 	if($a->poi && $a->poi['abook_my_perms'] != $abook_my_perms 
 		&& (! intval($a->poi['abook_self']))) {
-		proc_run('php', 'include/notifier.php', 'permission_update', $contact_id);
+		proc_run('php', 'include/notifier.php', (($new_friend) ? 'permission_create' : 'permission_update'), $contact_id);
 	}
 
 	if($new_friend) {
diff --git a/mod/dirsearch.php b/mod/dirsearch.php
index ec730b28d..937564a79 100644
--- a/mod/dirsearch.php
+++ b/mod/dirsearch.php
@@ -436,9 +436,9 @@ function list_public_sites() {
 				$register = 'closed';
 
 			if(strpos($rr['site_url'],'https://') !== false)
-				$ret['sites'][] = array('url' => $rr['site_url'], 'access' => $access, 'register' => $register, 'sellpage' => $rr['site_sellpage'], 'location' => $rr['site_location']);
+				$ret['sites'][] = array('url' => $rr['site_url'], 'access' => $access, 'register' => $register, 'sellpage' => $rr['site_sellpage'], 'location' => $rr['site_location'], 'project' => $rr['site_project']);
 			else
-				$insecure[] = array('url' => $rr['site_url'], 'access' => $access, 'register' => $register, 'sellpage' => $rr['site_sellpage'], 'location' => $rr['site_location']);
+				$insecure[] = array('url' => $rr['site_url'], 'access' => $access, 'register' => $register, 'sellpage' => $rr['site_sellpage'], 'location' => $rr['site_location'], 'project' => $rr['site_project']);
 		}
 		if($insecure) {
 			$ret['sites'] = array_merge($ret['sites'],$insecure);
diff --git a/mod/editpost.php b/mod/editpost.php
index d4dc35ef8..1bee16ee7 100644
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -129,7 +129,7 @@ function editpost_content(&$a) {
 		'$consensus' => intval($itm[0]['item_consensus']),
 		'$wait' => t('Please wait'),
 		'$permset' => t('Permission settings'),
-		'$ptyp' => $itm[0]['type'],
+		'$ptyp' => $itm[0]['obj_type'],
 		'$content' => undo_post_tagging($itm[0]['body']),
 		'$post_id' => $post_id,
 		'$parent' => (($itm[0]['parent'] != $itm[0]['id']) ? $itm[0]['parent'] : ''),
diff --git a/mod/home.php b/mod/home.php
index 242b2dcec..bf2463bbc 100644
--- a/mod/home.php
+++ b/mod/home.php
@@ -59,12 +59,14 @@ function home_content(&$a, $update = 0, $load = false) {
 				return $o;
 			}
 		}
+		if(strpos($frontpage,'http') !== 0)
+			$frontpage = z_root() . '/' . $frontpage;
 		if(intval(get_config('system','mirror_frontpage'))) {
-			$o = '<html><head><title>' . t('$Projectname') . '</title></head><body style="margin: 0; padding: 0; border: none;" ><iframe src="' . z_root() . '/' . $frontpage . '" width="100%" height="100%" style="margin: 0; padding: 0; border: none;" ></iframe></body></html>';
+			$o = '<html><head><title>' . t('$Projectname') . '</title></head><body style="margin: 0; padding: 0; border: none;" ><iframe src="' . $frontpage . '" width="100%" height="100%" style="margin: 0; padding: 0; border: none;" ></iframe></body></html>';
 			echo $o;
 			killme();
 		}
-		goaway(z_root() . '/' . $frontpage);
+		goaway($frontpage);
 	}
 
 
diff --git a/mod/import.php b/mod/import.php
index b6e36d734..72d8f92e9 100644
--- a/mod/import.php
+++ b/mod/import.php
@@ -441,6 +441,12 @@ function import_post(&$a) {
 	if(is_array($data['chatroom']))
 		import_chatrooms($channel,$data['chatroom']);
 
+	if(is_array($data['conv']))
+		import_conv($channel,$data['conv']);
+
+	if(is_array($data['mail']))
+		import_mail($channel,$data['mail']);
+
 	if(is_array($data['event']))
 		import_events($channel,$data['event']);
 
diff --git a/mod/item.php b/mod/item.php
index 7488e709b..4dcf8edd7 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -96,7 +96,7 @@ function item_post(&$a) {
 	$owner_hash = null;
 
 	$message_id  = ((x($_REQUEST,'message_id') && $api_source)  ? strip_tags($_REQUEST['message_id'])       : '');
-	$created     = ((x($_REQUEST,'created'))     ? datetime_convert('UTC','UTC',$_REQUEST['created']) : datetime_convert());
+	$created     = ((x($_REQUEST,'created'))     ? datetime_convert(date_default_timezone_get(),'UTC',$_REQUEST['created']) : datetime_convert());
 	$post_id     = ((x($_REQUEST,'post_id'))     ? intval($_REQUEST['post_id'])        : 0);
 	$app         = ((x($_REQUEST,'source'))      ? strip_tags($_REQUEST['source'])     : '');
 	$return_path = ((x($_REQUEST,'return'))      ? $_REQUEST['return']                 : '');
@@ -107,7 +107,6 @@ function item_post(&$a) {
 	$layout_mid  = ((x($_REQUEST,'layout_mid'))  ? escape_tags($_REQUEST['layout_mid']): '');
 	$plink       = ((x($_REQUEST,'permalink'))   ? escape_tags($_REQUEST['permalink']) : '');
 	$obj_type    = ((x($_REQUEST,'obj_type'))    ? escape_tags($_REQUEST['obj_type'])  : ACTIVITY_OBJ_NOTE);
-
 	// allow API to bulk load a bunch of imported items with sending out a bunch of posts. 
 	$nopush      = ((x($_REQUEST,'nopush'))      ? intval($_REQUEST['nopush'])         : 0);
 
diff --git a/mod/mail.php b/mod/mail.php
index 525127a71..884c41565 100644
--- a/mod/mail.php
+++ b/mod/mail.php
@@ -97,7 +97,11 @@ function mail_post(&$a) {
 	
 	$ret = send_message(0, $recipient, $body, $subject, $replyto, $expires);
 
-	if(! $ret['success']) {
+	if($ret['success']) {
+		xchan_mail_query($ret['mail']);
+		build_sync_packet(0,array('conv' => array($ret['conv']),'mail' => array(encode_mail($ret['mail'],true))));
+	}
+	else {
 		notice($ret['message']);
 	}
 
@@ -149,6 +153,14 @@ function mail_content(&$a) {
 			intval(argv(3)),
 			intval(local_channel())
 		);
+		$x = q("select * from mail where id = %d and channel_id = %d",
+			intval(argv(3)),
+			intval(local_channel())
+		);
+		if($x) {
+			build_sync_packet(local_channel(),array('mail' => encode_mail($x[0],true)));
+		}
+
 		proc_run('php','include/notifier.php','mail',intval(argv(3)));
 
 		if($r) {
@@ -185,68 +197,48 @@ function mail_content(&$a) {
 
 		$a->page['htmlhead'] .= $header;
 
-	
-		$preselect = (isset($a->argv[2])?array($a->argv[2]):false);
-		$prename = $preurl = $preid = '';
-			
+		$prename = '';
+		$preid = '';
+
 		if(x($_REQUEST,'hash')) {
+
 			$r = q("select abook.*, xchan.* from abook left join xchan on abook_xchan = xchan_hash
 				where abook_channel = %d and abook_xchan = '%s' limit 1",
 				intval(local_channel()),
 				dbesc($_REQUEST['hash'])
 			);
-			if($r) {
-				$prename = $r[0]['xchan_name'];
-				$preurl = $r[0]['xchan_url'];
-				$preid = $r[0]['abook_id'];
-				$preselect = array($preid);
-			}
-		}
 
+			if(!$r) {
+				$r = q("select * from xchan where xchan_hash = '%s' and xchan_network = 'zot' limit 1",
+					dbesc($_REQUEST['hash'])
+				);
+			}
 
-		if($preselect) {
-			$r = q("select abook.*, xchan.* from abook left join xchan on abook_xchan = xchan_hash
-				where abook_channel = %d and abook_id = %d limit 1",
-				intval(local_channel()),
-				intval(argv(2))
-			);
 			if($r) {
-				$prename = $r[0]['xchan_name'];
+				$prename = (($r[0]['abook_id']) ? $r[0]['xchan_name'] : $r[0]['xchan_addr']);
 				$preurl = $r[0]['xchan_url'];
-				$preid = $r[0]['abook_id'];
+				$preid = (($r[0]['abook_id']) ? ($r[0]['xchan_hash']) : '');
+			}
+			else {
+				notice( t('Requested channel is not in this network') . EOL );
 			}
-		}	 
-
-		$prefill = (($preselect) ? $prename  : '');
 
-		if(! $prefill) {
-			if(array_key_exists('to',$_REQUEST))
-				$prefill = $_REQUEST['to'];
 		}
 
-		// the ugly select box
-		
-		$select = contact_select('messageto','message-to-select', $preselect, 4, true, false, false, 10);
-
 		$tpl = get_markup_template('prv_message.tpl');
 		$o .= replace_macros($tpl,array(
+			'$new' => true,
 			'$header' => t('Send Private Message'),
 			'$to' => t('To:'),
-			'$showinputs' => 'true', 
-			'$prefill' => $prefill,
-			'$autocomp' => $autocomp,
+			'$prefill' => $prename,
 			'$preid' => $preid,
 			'$subject' => t('Subject:'),
 			'$subjtxt' => ((x($_REQUEST,'subject')) ? strip_tags($_REQUEST['subject']) : ''),
 			'$text' => ((x($_REQUEST,'body')) ? htmlspecialchars($_REQUEST['body'], ENT_COMPAT, 'UTF-8') : ''),
-			'$readonly' => '',
 			'$yourmessage' => t('Your message:'),
-			'$select' => $select,
 			'$parent' => '',
-			'$upload' => t('Upload photo'),
 			'$attach' => t('Attach file'),
 			'$insert' => t('Insert web link'),
-			'$wait' => t('Please wait'),
 			'$submit' => t('Send'),
 			'$defexpire' => '',
 			'$feature_expire' => ((feature_enabled(local_channel(),'content_expire')) ? true : false),
@@ -254,8 +246,6 @@ function mail_content(&$a) {
 			'$feature_encrypt' => ((feature_enabled(local_channel(),'content_encrypt')) ? true : false),
 			'$encrypt' => t('Encrypt text'),
 			'$cipher' => $cipher,
-
-
 		));
 
 		return $o;
@@ -285,7 +275,14 @@ function mail_content(&$a) {
 //	if( local_channel() && feature_enabled(local_channel(),'richtext') )
 //		$plaintext = false;
 
-	$messages = private_messages_fetch_conversation(local_channel(), $mid, true);
+
+
+	if($mailbox == 'combined') {
+		$messages = private_messages_fetch_conversation(local_channel(), $mid, true);
+	}
+	else {
+		$messages = private_messages_fetch_message(local_channel(), $mid, true);
+	}
 
 	if(! $messages) {
 		//info( t('Message not found.') . EOL);
@@ -347,10 +344,6 @@ function mail_content(&$a) {
 
 	$recp = (($message['from_xchan'] === $channel['channel_hash']) ? 'to' : 'from');
 
-// FIXME - move this HTML to template
-
-	$select = $message[$recp]['xchan_name'] . '<input type="hidden" name="messageto" value="' . $message[$recp]['xchan_hash'] . '" />';
-	$parent = '<input type="hidden" name="replyto" value="' . $message['parent_mid'] . '" />';
 	$tpl = get_markup_template('mail_display.tpl');
 	$o = replace_macros($tpl, array(
 		'$mailbox' => $mailbox,
@@ -366,19 +359,16 @@ function mail_content(&$a) {
 		// reply
 		'$header' => t('Send Reply'),
 		'$to' => t('To:'),
-		'$showinputs' => '',
+		'$reply' => true,
 		'$subject' => t('Subject:'),
 		'$subjtxt' => $message['title'],
-		'$readonly' => 'readonly="readonly"',
-		'$yourmessage' => t('Your message:'),
+		'$yourmessage' => sprintf(t('Your message for %s (%s):'), $message[$recp]['xchan_name'], $message[$recp]['xchan_addr']),
 		'$text' => '',
-		'$select' => $select,
-		'$parent' => $parent,
-		'$upload' => t('Upload photo'),
+		'$parent' => $message['parent_mid'],
+		'$recphash' => $message[$recp]['xchan_hash'],
 		'$attach' => t('Attach file'),
 		'$insert' => t('Insert web link'),
 		'$submit' => t('Submit'),
-		'$wait' => t('Please wait'),
 		'$defexpire' => '',
 		'$feature_expire' => ((feature_enabled(local_channel(),'content_expire')) ? true : false),
 		'$expires' => t('Set expiration date'),
diff --git a/mod/photos.php b/mod/photos.php
index cd293b39d..33a895fdf 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -149,8 +149,9 @@ function photos_post(&$a) {
 			if($r) {
 				foreach($r as $i) {
 					attach_delete($page_owner_uid, $i['resource_id'], 1 );
-					drop_item($i['id'],false,DROPITEM_PHASE1,true /* force removal of linked items */);
-					proc_run('php','include/notifier.php','drop',$i['id']);
+		// This is now being done in attach_delete()
+		//			drop_item($i['id'],false,DROPITEM_PHASE1,true /* force removal of linked items */);
+		//			proc_run('php','include/notifier.php','drop',$i['id']);
 				}
 			}
 
@@ -182,12 +183,14 @@ function photos_post(&$a) {
 		);
 
 		if($r) {
+/*
 			q("DELETE FROM `photo` WHERE `uid` = %d AND `resource_id` = '%s'",
 				intval($page_owner_uid),
 				dbesc($r[0]['resource_id'])
 			);
+*/
 			attach_delete($page_owner_uid, $r[0]['resource_id'], 1 );
-
+/*
 			$i = q("SELECT * FROM `item` WHERE `resource_id` = '%s' AND resource_type = 'photo' and `uid` = %d LIMIT 1",
 				dbesc($r[0]['resource_id']),
 				intval($page_owner_uid)
@@ -196,6 +199,7 @@ function photos_post(&$a) {
 				drop_item($i[0]['id'],true,DROPITEM_PHASE1);
 				$url = $a->get_baseurl();
 			}
+*/
 		}
 
 		goaway($a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'] . '/album/' . $_SESSION['album_return']);
@@ -229,15 +233,46 @@ function photos_post(&$a) {
 				intval($page_owner_uid)
 			);
 			if(count($r)) {
-				$ph = photo_factory(dbunescbin($r[0]['data']), $r[0]['type']);
+				$d = (($r[0]['os_storage']) ? @file_get_contents($r[0]['data']) : dbunescbin($r[0]['data']));
+				$ph = photo_factory($d, $r[0]['type']);
 				if($ph->is_valid()) {
 					$rotate_deg = ( (intval($_POST['rotate']) == 1) ? 270 : 90 );
 					$ph->rotate($rotate_deg);
 
 					$width  = $ph->getWidth();
 					$height = $ph->getHeight();
+					
+					if(intval($r[0]['os_storage'])) {
+						@file_put_contents($r[0]['data'],$ph->imageString());
+						$data = $r[0]['data'];
+						$fsize = @filesize($r[0]['data']);
+						q("update attach set filesize = %d where hash = '%s' and uid = %d limit 1",
+							intval($fsize),
+							dbesc($resource_id),
+							intval($page_owner_uid)
+						);
+					}
+					else {
+						$data = $ph->imageString();
+						$fsize = strlen($data);
+					}
+
+					$x = q("update photo set data = '%s', `size` = %d, height = %d, width = %d where `resource_id` = '%s' and uid = %d and scale = 0",
+						dbescbin($data),
+						intval($fsize),
+						intval($height),
+						intval($width),
+						dbesc($resource_id),
+						intval($page_owner_uid)
+					);
+
+					if($width > 1024 || $height > 1024) 
+						$ph->scaleImage(1024);
+
+					$width  = $ph->getWidth();
+					$height = $ph->getHeight();
 
-					$x = q("update photo set data = '%s', height = %d, width = %d where `resource_id` = '%s' and uid = %d and scale = 0",
+					$x = q("update photo set data = '%s', height = %d, width = %d where `resource_id` = '%s' and uid = %d and scale = 1",
 						dbescbin($ph->imageString()),
 						intval($height),
 						intval($width),
@@ -245,38 +280,40 @@ function photos_post(&$a) {
 						intval($page_owner_uid)
 					);
 
-					if($width > 640 || $height > 640) {
+
+					if($width > 640 || $height > 640) 
 						$ph->scaleImage(640);
-						$width  = $ph->getWidth();
-						$height = $ph->getHeight();
-		
-						$x = q("update photo set data = '%s', height = %d, width = %d where `resource_id` = '%s' and uid = %d and scale = 1",
-							dbescbin($ph->imageString()),
-							intval($height),
-							intval($width),
-							dbesc($resource_id),
-							intval($page_owner_uid)
-						);
-					}
 
-					if($width > 320 || $height > 320) {
+					$width  = $ph->getWidth();
+					$height = $ph->getHeight();
+
+					$x = q("update photo set data = '%s', height = %d, width = %d where `resource_id` = '%s' and uid = %d and scale = 2",
+						dbescbin($ph->imageString()),
+						intval($height),
+						intval($width),
+						dbesc($resource_id),
+						intval($page_owner_uid)
+					);
+
+
+					if($width > 320 || $height > 320) 
 						$ph->scaleImage(320);
-						$width  = $ph->getWidth();
-						$height = $ph->getHeight();
 
-						$x = q("update photo set data = '%s', height = %d, width = %d where `resource_id` = '%s' and uid = %d and scale = 2",
-							dbescbin($ph->imageString()),
-							intval($height),
-							intval($width),
-							dbesc($resource_id),
-							intval($page_owner_uid)
-						);
-					}	
+					$width  = $ph->getWidth();
+					$height = $ph->getHeight();
+
+					$x = q("update photo set data = '%s', height = %d, width = %d where `resource_id` = '%s' and uid = %d and scale = 3",
+						dbescbin($ph->imageString()),
+						intval($height),
+						intval($width),
+						dbesc($resource_id),
+						intval($page_owner_uid)
+					);
 				}
 			}
 		}
 
-		$p = q("SELECT * FROM `photo` WHERE `resource_id` = '%s' AND `uid` = %d ORDER BY `scale` DESC",
+		$p = q("SELECT type, is_nsfw, description, resource_id, scale, allow_cid, allow_gid, deny_cid, deny_gid FROM photo WHERE resource_id = '%s' AND uid = %d ORDER BY scale DESC",
 			dbesc($resource_id),
 			intval($page_owner_uid)
 		);
@@ -586,7 +623,9 @@ function photos_content(&$a) {
 			'$nickname' => $a->data['channel']['channel_address'],
 			'$newalbum_label' => t('Enter an album name'),
 			'$newalbum_placeholder' => t('or select an existing album (doubleclick)'),
-			'$visible' => array('visible', t('Create a status post for this upload'), 0, '', array(t('No'), t('Yes'))),
+			'$visible' => array('visible', t('Create a status post for this upload'), 0,'', array(t('No'), t('Yes')), 'onclick="showHideBodyTextarea();"'),
+			'$caption' => array('description', t('Caption (optional):')),
+			'$body' => array('body', t('Description (optional):'),'', 'Description will only appear in the status post'),
 			'$albums' => $albums['albums'],
 			'$selname' => $selname,
 			'$permissions' => t('Permissions'),
@@ -982,13 +1021,13 @@ function photos_content(&$a) {
 			$likebuttons = '';
 
 			if($can_post || $can_comment) {
-				$likebuttons = replace_macros($like_tpl,array(
-					'$id' => $link_item['id'],
-					'$likethis' => t("I like this \x28toggle\x29"),
-					'$nolike' => t("I don't like this \x28toggle\x29"),
-					'$share' => t('Share'),
-					'$wait' => t('Please wait')
-				));
+				$likebuttons = array(
+					'id' => $link_item['id'],
+					'likethis' => t("I like this \x28toggle\x29"),
+					'nolike' => t("I don't like this \x28toggle\x29"),
+					'share' => t('Share'),
+					'wait' => t('Please wait')
+				);
 			}
 
 			$comments = '';
diff --git a/mod/pubsites.php b/mod/pubsites.php
index 62990c70c..726c681fa 100644
--- a/mod/pubsites.php
+++ b/mod/pubsites.php
@@ -23,12 +23,12 @@ function pubsites_content(&$a) {
 		$j = json_decode($ret['body'],true);
 		if($j) {
 			$rate_meta = ((local_channel()) ? '<td>' . t('Rate this hub') . '</td>' : '');
-			$o .= '<table border="1"><tr><td>' . t('Site URL') . '</td><td>' . t('Access Type') . '</td><td>' . t('Registration Policy') . '</td><td>' . t('Location') . '</td><td>' . t('View hub ratings') . '</td>' . $rate_meta . '</tr>';
+			$o .= '<table border="1"><tr><td>' . t('Site URL') . '</td><td>' . t('Access Type') . '</td><td>' . t('Registration Policy') . '</td><td>' . t('Location') . '</td><td>' . t('Project') . '</td><td>' . t('View hub ratings') . '</td>' . $rate_meta . '</tr>';
 			if($j['sites']) {
 				foreach($j['sites'] as $jj) {
 					$host = strtolower(substr($jj['url'],strpos($jj['url'],'://')+3));
 					$rate_links = ((local_channel()) ? '<td><a href="rate?f=&target=' . $host . '" class="btn-btn-default"><i class="icon-check"></i> ' . t('Rate') . '</a></td>' : '');
-					$o .= '<tr><td>' . '<a href="'. (($jj['sellpage']) ? $jj['sellpage'] : $jj['url'] . '/register' ) . '" >' . $jj['url'] . '</a>' . '</td><td>' . $jj['access'] . '</td><td>' . $jj['register'] . '</td><td>' . $jj['location'] . '</td><td><a href="ratings/' . $host . '" class="btn-btn-default"><i class="icon-eye-open"></i> ' . t('View ratings') . '</a></td>' . $rate_links . '</tr>';
+					$o .= '<tr><td>' . '<a href="'. (($jj['sellpage']) ? $jj['sellpage'] : $jj['url'] . '/register' ) . '" >' . $jj['url'] . '</a>' . '</td><td>' . $jj['access'] . '</td><td>' . $jj['register'] . '</td><td>' . $jj['location'] . '</td><td>' . $jj['project'] . '</td><td><a href="ratings/' . $host . '" class="btn-btn-default"><i class="icon-eye-open"></i> ' . t('View ratings') . '</a></td>' . $rate_links . '</tr>';
 				}
 			}
 	
diff --git a/mod/search.php b/mod/search.php
index ce8357fb9..a0085fca9 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -35,6 +35,8 @@ function search_content(&$a,$update = 0, $load = false) {
 
 	$o = '<div id="live-search"></div>' . "\r\n";
 
+        $o = '<div class="generic-content-wrapper-styled">' . "\r\n";
+
 	$o .= '<h3>' . t('Search') . '</h3>';
 
 	if(x($a->data,'search'))
@@ -212,6 +214,8 @@ function search_content(&$a,$update = 0, $load = false) {
 
 	$o .= conversation($a,$items,'search',$update,'client');
 
+	$o .= '</div>';
+
 	return $o;
 }
 
diff --git a/mod/setup.php b/mod/setup.php
index 15820f14e..e5ac25965 100755
--- a/mod/setup.php
+++ b/mod/setup.php
@@ -292,7 +292,7 @@ function setup_content(&$a) {
 
 		case 2: { // Database config
 
-			$dbhost = ((x($_POST,'dbhost')) ? notags(trim($_POST['dbhost'])) : 'localhost');
+			$dbhost = ((x($_POST,'dbhost')) ? notags(trim($_POST['dbhost'])) : '127.0.0.1');
 			$dbuser = notags(trim($_POST['dbuser']));
 			$dbport = intval(notags(trim($_POST['dbport'])));
 			$dbpass = notags(trim($_POST['dbpass']));
@@ -312,7 +312,7 @@ function setup_content(&$a) {
 
 				'$status' => $wizard_status,
 
-				'$dbhost' => array('dbhost', t('Database Server Name'), $dbhost, t('Default is localhost')),
+				'$dbhost' => array('dbhost', t('Database Server Name'), $dbhost, t('Default is 127.0.0.1')),
 				'$dbport' => array('dbport', t('Database Port'), $dbport, t('Communication port number - use 0 for default')),
 				'$dbuser' => array('dbuser', t('Database Login Name'), $dbuser, ''),
 				'$dbpass' => array('dbpass', t('Database Login Password'), $dbpass, ''),
@@ -334,7 +334,7 @@ function setup_content(&$a) {
 		}; break;
 		case 3: { // Site settings
 			require_once('include/datetime.php');
-			$dbhost = ((x($_POST,'dbhost')) ? notags(trim($_POST['dbhost'])) : 'localhost');
+			$dbhost = ((x($_POST,'dbhost')) ? notags(trim($_POST['dbhost'])) : '127.0.0.1');
 			$dbport = intval(notags(trim($_POST['dbuser'])));
 			$dbuser = notags(trim($_POST['dbuser']));
 			$dbpass = notags(trim($_POST['dbpass']));
diff --git a/mod/siteinfo.php b/mod/siteinfo.php
index 14aaef144..2fffccc73 100644
--- a/mod/siteinfo.php
+++ b/mod/siteinfo.php
@@ -165,7 +165,7 @@ function siteinfo_content(&$a) {
 		'$loadavg_all' => $loadavg[0] . ', ' . $loadavg[1] . ', ' . $loadavg[2],		
 		'$commit' => $commit,
 		'$web_location' => t('Running at web location') . ' ' . z_root(),
-		'$visit' => t('Please visit <a href="https://redmatrix.me">redmatrix.me</a> to learn more about $Projectname.'),
+		'$visit' => t('Please visit <a href="http://hubzilla.org">hubzilla.org</a> to learn more about $Projectname.'),
 		'$bug_text' => t('Bug reports and issues: please visit'),
 		'$bug_link_url' => 'https://github.com/redmatrix/hubzilla/issues',
 		'$bug_link_text' => t('$projectname issues'),
diff --git a/mod/zfinger.php b/mod/zfinger.php
index fb3333280..fff7c9e1b 100644
--- a/mod/zfinger.php
+++ b/mod/zfinger.php
@@ -9,5 +9,4 @@ function zfinger_init(&$a) {
 	$x = zotinfo($_REQUEST);
 	json_return_and_die($x);
 
-
 }
diff --git a/util/hmessages.po b/util/hmessages.po
index 338635b74..40152108c 100644
--- a/util/hmessages.po
+++ b/util/hmessages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2015-09-23.1164\n"
+"Project-Id-Version: 2015-10-23.1194\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-26 22:48-0700\n"
+"POT-Creation-Date: 2015-10-23 00:03-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,6 +17,32 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: ../../include/bb2diaspora.php:388
+msgid "Attachments:"
+msgstr ""
+
+#: ../../include/bb2diaspora.php:474 ../../include/event.php:22
+msgid "l F d, Y \\@ g:i A"
+msgstr ""
+
+#: ../../include/bb2diaspora.php:476
+msgid "$Projectname event notification:"
+msgstr ""
+
+#: ../../include/bb2diaspora.php:480 ../../include/event.php:30
+msgid "Starts:"
+msgstr ""
+
+#: ../../include/bb2diaspora.php:488 ../../include/event.php:40
+msgid "Finishes:"
+msgstr ""
+
+#: ../../include/bb2diaspora.php:496 ../../include/event.php:50
+#: ../../include/identity.php:1016 ../../mod/directory.php:302
+#: ../../mod/events.php:701
+msgid "Location:"
+msgstr ""
+
 #: ../../include/Import/import_diaspora.php:17
 msgid "No username found in import file."
 msgstr ""
@@ -25,16 +51,16 @@ msgstr ""
 msgid "Unable to create a unique channel address. Import failed."
 msgstr ""
 
-#: ../../include/Import/import_diaspora.php:143 ../../mod/import.php:480
+#: ../../include/Import/import_diaspora.php:143 ../../mod/import.php:486
 msgid "Import completed."
 msgstr ""
 
 #: ../../include/RedDAV/RedBrowser.php:107
-#: ../../include/RedDAV/RedBrowser.php:265
+#: ../../include/RedDAV/RedBrowser.php:239
 msgid "parent"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:131 ../../include/text.php:2497
+#: ../../include/RedDAV/RedBrowser.php:131 ../../include/text.php:2509
 msgid "Collection"
 msgstr ""
 
@@ -58,72 +84,62 @@ msgstr ""
 msgid "Schedule Outbox"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:164 ../../include/conversation.php:1021
-#: ../../include/apps.php:355 ../../include/apps.php:410
-#: ../../mod/photos.php:720 ../../mod/photos.php:1159
+#: ../../include/RedDAV/RedBrowser.php:164 ../../include/apps.php:360
+#: ../../include/apps.php:415 ../../include/conversation.php:1023
+#: ../../mod/photos.php:756 ../../mod/photos.php:1195
 msgid "Unknown"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:227
-#, php-format
-msgid "%1$s used"
-msgstr ""
-
-#: ../../include/RedDAV/RedBrowser.php:232
-#, php-format
-msgid "%1$s used of %2$s (%3$s&#37;)"
-msgstr ""
-
-#: ../../include/RedDAV/RedBrowser.php:251 ../../include/conversation.php:1611
-#: ../../include/apps.php:135 ../../include/nav.php:93
+#: ../../include/RedDAV/RedBrowser.php:226 ../../include/apps.php:135
+#: ../../include/conversation.php:1613 ../../include/nav.php:93
 #: ../../mod/fbrowser.php:114
 msgid "Files"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:253
+#: ../../include/RedDAV/RedBrowser.php:227
 msgid "Total"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:255
+#: ../../include/RedDAV/RedBrowser.php:229
 msgid "Shared"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:256
+#: ../../include/RedDAV/RedBrowser.php:230
 #: ../../include/RedDAV/RedBrowser.php:303 ../../mod/layouts.php:175
 #: ../../mod/menu.php:114 ../../mod/new_channel.php:121
 #: ../../mod/webpages.php:180 ../../mod/blocks.php:152
 msgid "Create"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:257
-#: ../../include/RedDAV/RedBrowser.php:305 ../../mod/photos.php:745
-#: ../../mod/photos.php:1278 ../../mod/profile_photo.php:450
+#: ../../include/RedDAV/RedBrowser.php:231
+#: ../../include/RedDAV/RedBrowser.php:305 ../../mod/photos.php:781
+#: ../../mod/photos.php:1314 ../../mod/profile_photo.php:450
 msgid "Upload"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:261 ../../mod/admin.php:948
+#: ../../include/RedDAV/RedBrowser.php:235 ../../mod/admin.php:948
 #: ../../mod/settings.php:585 ../../mod/settings.php:611
 #: ../../mod/sharedwithme.php:95
 msgid "Name"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:262
+#: ../../include/RedDAV/RedBrowser.php:236
 msgid "Type"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:263 ../../mod/sharedwithme.php:97
+#: ../../include/RedDAV/RedBrowser.php:237 ../../mod/sharedwithme.php:97
 msgid "Size"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:264 ../../mod/sharedwithme.php:98
+#: ../../include/RedDAV/RedBrowser.php:238 ../../mod/sharedwithme.php:98
 msgid "Last Modified"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:266 ../../include/menu.php:108
+#: ../../include/RedDAV/RedBrowser.php:240 ../../include/menu.php:108
 #: ../../include/page_widgets.php:8 ../../include/page_widgets.php:36
-#: ../../include/apps.php:254 ../../include/ItemObject.php:100
-#: ../../mod/layouts.php:183 ../../mod/editpost.php:113
-#: ../../mod/editblock.php:135 ../../mod/menu.php:108
+#: ../../include/apps.php:259 ../../include/ItemObject.php:100
+#: ../../mod/layouts.php:183 ../../mod/editblock.php:135
+#: ../../mod/editpost.php:113 ../../mod/menu.php:108
 #: ../../mod/webpages.php:181 ../../mod/blocks.php:153 ../../mod/thing.php:257
 #: ../../mod/settings.php:645 ../../mod/connections.php:235
 #: ../../mod/connections.php:248 ../../mod/connections.php:267
@@ -131,16 +147,30 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:267 ../../include/conversation.php:662
-#: ../../include/apps.php:255 ../../include/ItemObject.php:120
-#: ../../mod/connedit.php:547 ../../mod/editblock.php:181
-#: ../../mod/admin.php:783 ../../mod/admin.php:942 ../../mod/photos.php:1090
+#: ../../include/RedDAV/RedBrowser.php:241 ../../include/apps.php:260
+#: ../../include/ItemObject.php:120 ../../include/conversation.php:657
+#: ../../mod/connedit.php:546 ../../mod/photos.php:1126
+#: ../../mod/editblock.php:181 ../../mod/admin.php:783 ../../mod/admin.php:942
 #: ../../mod/webpages.php:183 ../../mod/blocks.php:155 ../../mod/thing.php:258
 #: ../../mod/settings.php:646 ../../mod/editlayout.php:179
 #: ../../mod/editwebpage.php:223 ../../mod/group.php:173
 msgid "Delete"
 msgstr ""
 
+#: ../../include/RedDAV/RedBrowser.php:282
+#, php-format
+msgid "You are using %1$s of your available file storage."
+msgstr ""
+
+#: ../../include/RedDAV/RedBrowser.php:287
+#, php-format
+msgid "You are using %1$s of %2$s available file storage. (%3$s&#37;)"
+msgstr ""
+
+#: ../../include/RedDAV/RedBrowser.php:299
+msgid "WARNING:"
+msgstr ""
+
 #: ../../include/RedDAV/RedBrowser.php:302
 msgid "Create new folder"
 msgstr ""
@@ -294,39 +324,39 @@ msgstr ""
 msgid "Room not found."
 msgstr ""
 
-#: ../../include/chat.php:133 ../../include/photos.php:26
-#: ../../include/attach.php:137 ../../include/attach.php:185
-#: ../../include/attach.php:248 ../../include/attach.php:262
-#: ../../include/attach.php:269 ../../include/attach.php:334
-#: ../../include/attach.php:348 ../../include/attach.php:355
-#: ../../include/attach.php:433 ../../include/attach.php:840
-#: ../../include/attach.php:911 ../../include/attach.php:1064
-#: ../../include/items.php:4342 ../../mod/achievements.php:30
+#: ../../include/chat.php:133 ../../include/items.php:4376
+#: ../../include/photos.php:26 ../../include/attach.php:137
+#: ../../include/attach.php:185 ../../include/attach.php:248
+#: ../../include/attach.php:262 ../../include/attach.php:269
+#: ../../include/attach.php:334 ../../include/attach.php:348
+#: ../../include/attach.php:355 ../../include/attach.php:433
+#: ../../include/attach.php:875 ../../include/attach.php:946
+#: ../../include/attach.php:1098 ../../mod/achievements.php:30
 #: ../../mod/fsuggest.php:78 ../../mod/authtest.php:13
 #: ../../mod/bookmarks.php:48 ../../mod/block.php:22 ../../mod/block.php:72
 #: ../../mod/id.php:71 ../../mod/like.php:177 ../../mod/common.php:35
-#: ../../mod/mitem.php:111 ../../mod/connedit.php:348 ../../mod/mood.php:112
-#: ../../mod/filestorage.php:18 ../../mod/filestorage.php:73
-#: ../../mod/filestorage.php:88 ../../mod/filestorage.php:115
-#: ../../mod/layouts.php:69 ../../mod/layouts.php:76 ../../mod/layouts.php:87
-#: ../../mod/poke.php:133 ../../mod/network.php:12 ../../mod/chat.php:91
-#: ../../mod/chat.php:96 ../../mod/message.php:16 ../../mod/channel.php:100
-#: ../../mod/channel.php:215 ../../mod/channel.php:255
-#: ../../mod/editpost.php:13 ../../mod/editblock.php:65 ../../mod/item.php:206
-#: ../../mod/item.php:214 ../../mod/item.php:992 ../../mod/appman.php:66
-#: ../../mod/profile.php:64 ../../mod/profile.php:72 ../../mod/menu.php:74
-#: ../../mod/page.php:31 ../../mod/page.php:86 ../../mod/new_channel.php:68
+#: ../../mod/mitem.php:111 ../../mod/connedit.php:347 ../../mod/mood.php:112
+#: ../../mod/photos.php:70 ../../mod/filestorage.php:18
+#: ../../mod/filestorage.php:73 ../../mod/filestorage.php:88
+#: ../../mod/filestorage.php:115 ../../mod/layouts.php:69
+#: ../../mod/layouts.php:76 ../../mod/layouts.php:87 ../../mod/poke.php:133
+#: ../../mod/network.php:12 ../../mod/chat.php:94 ../../mod/chat.php:99
+#: ../../mod/rate.php:111 ../../mod/mail.php:118 ../../mod/editblock.php:65
+#: ../../mod/editpost.php:13 ../../mod/appman.php:66 ../../mod/profile.php:64
+#: ../../mod/profile.php:72 ../../mod/menu.php:74 ../../mod/page.php:31
+#: ../../mod/page.php:86 ../../mod/new_channel.php:68
 #: ../../mod/new_channel.php:99 ../../mod/notifications.php:66
-#: ../../mod/pdledit.php:21 ../../mod/photos.php:70 ../../mod/rate.php:110
-#: ../../mod/events.php:256 ../../mod/profile_photo.php:338
-#: ../../mod/profile_photo.php:351 ../../mod/mail.php:114
-#: ../../mod/webpages.php:69 ../../mod/register.php:72 ../../mod/blocks.php:69
-#: ../../mod/blocks.php:76 ../../mod/service_limits.php:7
-#: ../../mod/sources.php:66 ../../mod/regmod.php:17 ../../mod/thing.php:271
-#: ../../mod/thing.php:291 ../../mod/thing.php:328 ../../mod/invite.php:13
-#: ../../mod/invite.php:104 ../../mod/viewsrc.php:14
-#: ../../mod/settings.php:565 ../../mod/manage.php:6 ../../mod/api.php:26
-#: ../../mod/api.php:31 ../../mod/connections.php:29
+#: ../../mod/pdledit.php:21 ../../mod/events.php:256
+#: ../../mod/profile_photo.php:338 ../../mod/profile_photo.php:351
+#: ../../mod/item.php:205 ../../mod/item.php:213 ../../mod/item.php:1002
+#: ../../mod/message.php:16 ../../mod/webpages.php:69
+#: ../../mod/register.php:72 ../../mod/blocks.php:69 ../../mod/blocks.php:76
+#: ../../mod/service_limits.php:7 ../../mod/sources.php:66
+#: ../../mod/regmod.php:17 ../../mod/channel.php:100 ../../mod/channel.php:214
+#: ../../mod/channel.php:254 ../../mod/thing.php:271 ../../mod/thing.php:291
+#: ../../mod/thing.php:328 ../../mod/invite.php:13 ../../mod/invite.php:104
+#: ../../mod/viewsrc.php:14 ../../mod/settings.php:565 ../../mod/manage.php:6
+#: ../../mod/api.php:26 ../../mod/api.php:31 ../../mod/connections.php:29
 #: ../../mod/editlayout.php:63 ../../mod/editlayout.php:87
 #: ../../mod/editwebpage.php:64 ../../mod/editwebpage.php:86
 #: ../../mod/editwebpage.php:101 ../../mod/editwebpage.php:125
@@ -355,7 +385,7 @@ msgstr ""
 msgid "Required"
 msgstr ""
 
-#: ../../include/datetime.php:262 ../../boot.php:2306
+#: ../../include/datetime.php:262 ../../boot.php:2312
 msgid "never"
 msgstr ""
 
@@ -539,8 +569,8 @@ msgstr ""
 
 #: ../../include/features.php:58
 msgid ""
-"Include large (640px) photo thumbnails in posts. If not enabled, use small "
-"(320px) photo thumbnails"
+"Include large (1024px) photo thumbnails in posts. If not enabled, use small "
+"(640px) photo thumbnails"
 msgstr ""
 
 #: ../../include/features.php:59 ../../include/widgets.php:545
@@ -698,12 +728,12 @@ msgstr ""
 msgid "Delete this item?"
 msgstr ""
 
-#: ../../include/js_strings.php:6 ../../include/ItemObject.php:673
-#: ../../mod/photos.php:1008 ../../mod/photos.php:1126
+#: ../../include/js_strings.php:6 ../../include/ItemObject.php:681
+#: ../../mod/photos.php:1044 ../../mod/photos.php:1162
 msgid "Comment"
 msgstr ""
 
-#: ../../include/js_strings.php:7 ../../include/ItemObject.php:390
+#: ../../include/js_strings.php:7 ../../include/ItemObject.php:398
 msgid "[+] show all"
 msgstr ""
 
@@ -755,8 +785,8 @@ msgstr ""
 msgid "Rate This Channel (this is public)"
 msgstr ""
 
-#: ../../include/js_strings.php:20 ../../mod/connedit.php:667
-#: ../../mod/rate.php:156
+#: ../../include/js_strings.php:20 ../../mod/connedit.php:666
+#: ../../mod/rate.php:157
 msgid "Rating"
 msgstr ""
 
@@ -764,17 +794,18 @@ msgstr ""
 msgid "Describe (optional)"
 msgstr ""
 
-#: ../../include/js_strings.php:22 ../../include/ItemObject.php:674
+#: ../../include/js_strings.php:22 ../../include/ItemObject.php:682
 #: ../../mod/fsuggest.php:108 ../../mod/mitem.php:231
-#: ../../mod/connedit.php:688 ../../mod/mood.php:135 ../../mod/pconfig.php:108
-#: ../../mod/filestorage.php:156 ../../mod/poke.php:171 ../../mod/chat.php:181
-#: ../../mod/chat.php:209 ../../mod/admin.php:411 ../../mod/admin.php:776
-#: ../../mod/admin.php:940 ../../mod/admin.php:1072 ../../mod/admin.php:1266
-#: ../../mod/admin.php:1351 ../../mod/appman.php:99 ../../mod/pdledit.php:58
-#: ../../mod/photos.php:598 ../../mod/photos.php:969 ../../mod/photos.php:1009
-#: ../../mod/photos.php:1127 ../../mod/rate.php:167 ../../mod/events.php:534
-#: ../../mod/events.php:710 ../../mod/mail.php:364 ../../mod/sources.php:104
-#: ../../mod/sources.php:138 ../../mod/import.php:511 ../../mod/thing.php:313
+#: ../../mod/connedit.php:687 ../../mod/mood.php:135 ../../mod/pconfig.php:108
+#: ../../mod/photos.php:634 ../../mod/photos.php:1005
+#: ../../mod/photos.php:1045 ../../mod/photos.php:1163
+#: ../../mod/filestorage.php:156 ../../mod/poke.php:171 ../../mod/chat.php:184
+#: ../../mod/chat.php:213 ../../mod/rate.php:168 ../../mod/mail.php:371
+#: ../../mod/admin.php:411 ../../mod/admin.php:776 ../../mod/admin.php:940
+#: ../../mod/admin.php:1072 ../../mod/admin.php:1266 ../../mod/admin.php:1351
+#: ../../mod/appman.php:99 ../../mod/pdledit.php:58 ../../mod/events.php:534
+#: ../../mod/events.php:710 ../../mod/sources.php:104
+#: ../../mod/sources.php:138 ../../mod/import.php:517 ../../mod/thing.php:313
 #: ../../mod/thing.php:359 ../../mod/invite.php:142 ../../mod/settings.php:583
 #: ../../mod/settings.php:695 ../../mod/settings.php:723
 #: ../../mod/settings.php:746 ../../mod/settings.php:831
@@ -1083,7 +1114,7 @@ msgstr ""
 
 #: ../../include/contact_selectors.php:79 ../../mod/id.php:15
 #: ../../mod/id.php:16 ../../mod/admin.php:779 ../../mod/admin.php:788
-#: ../../boot.php:1499
+#: ../../boot.php:1505
 msgid "Email"
 msgstr ""
 
@@ -1134,8 +1165,8 @@ msgstr ""
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr ""
 
-#: ../../include/Contact.php:101 ../../include/conversation.php:947
-#: ../../include/identity.php:941 ../../include/widgets.php:136
+#: ../../include/Contact.php:101 ../../include/identity.php:965
+#: ../../include/conversation.php:949 ../../include/widgets.php:136
 #: ../../include/widgets.php:174 ../../mod/directory.php:316
 #: ../../mod/match.php:64 ../../mod/suggest.php:52
 msgid "Connect"
@@ -1159,678 +1190,659 @@ msgstr ""
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr ""
 
-#: ../../include/conversation.php:120 ../../include/text.php:1832
-#: ../../mod/like.php:361 ../../mod/tagger.php:43 ../../mod/subthread.php:72
-#: ../../mod/subthread.php:172
-msgid "photo"
+#: ../../include/items.php:423 ../../mod/like.php:280 ../../mod/dreport.php:6
+#: ../../mod/dreport.php:45 ../../mod/subthread.php:49 ../../mod/group.php:68
+#: ../../mod/profperm.php:23 ../../mod/import_items.php:114
+#: ../../index.php:360
+msgid "Permission denied"
 msgstr ""
 
-#: ../../include/conversation.php:123 ../../include/text.php:1835
-#: ../../include/event.php:896 ../../mod/like.php:363 ../../mod/tagger.php:47
-#: ../../mod/events.php:245
-msgid "event"
+#: ../../include/items.php:1128 ../../include/items.php:1174
+msgid "(Unknown)"
 msgstr ""
 
-#: ../../include/conversation.php:126 ../../mod/like.php:113
-msgid "channel"
+#: ../../include/items.php:1371
+msgid "Visible to anybody on the internet."
 msgstr ""
 
-#: ../../include/conversation.php:148 ../../include/text.php:1838
-#: ../../mod/like.php:361 ../../mod/subthread.php:72
-#: ../../mod/subthread.php:172
-msgid "status"
+#: ../../include/items.php:1373
+msgid "Visible to you only."
 msgstr ""
 
-#: ../../include/conversation.php:150 ../../include/text.php:1840
-#: ../../mod/tagger.php:53
-msgid "comment"
+#: ../../include/items.php:1375
+msgid "Visible to anybody in this network."
 msgstr ""
 
-#: ../../include/conversation.php:164 ../../mod/like.php:410
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
+#: ../../include/items.php:1377
+msgid "Visible to anybody authenticated."
 msgstr ""
 
-#: ../../include/conversation.php:167 ../../mod/like.php:412
+#: ../../include/items.php:1379
 #, php-format
-msgid "%1$s doesn't like %2$s's %3$s"
+msgid "Visible to anybody on %s."
 msgstr ""
 
-#: ../../include/conversation.php:204
-#, php-format
-msgid "%1$s is now connected with %2$s"
+#: ../../include/items.php:1381
+msgid "Visible to all connections."
 msgstr ""
 
-#: ../../include/conversation.php:239
-#, php-format
-msgid "%1$s poked %2$s"
+#: ../../include/items.php:1383
+msgid "Visible to approved connections."
 msgstr ""
 
-#: ../../include/conversation.php:243 ../../include/text.php:933
-msgid "poked"
+#: ../../include/items.php:1385
+msgid "Visible to specific connections."
 msgstr ""
 
-#: ../../include/conversation.php:260 ../../mod/mood.php:63
-#, php-format
-msgctxt "mood"
-msgid "%1$s is %2$s"
+#: ../../include/items.php:4297 ../../mod/display.php:36
+#: ../../mod/filestorage.php:27 ../../mod/admin.php:127
+#: ../../mod/admin.php:979 ../../mod/admin.php:1179 ../../mod/thing.php:86
+#: ../../mod/viewsrc.php:20
+msgid "Item not found."
 msgstr ""
 
-#: ../../include/conversation.php:574 ../../mod/photos.php:1024
-msgctxt "title"
-msgid "Likes"
+#: ../../include/items.php:4806 ../../mod/group.php:38 ../../mod/group.php:137
+msgid "Collection not found."
 msgstr ""
 
-#: ../../include/conversation.php:574 ../../mod/photos.php:1024
-msgctxt "title"
-msgid "Dislikes"
+#: ../../include/items.php:4822
+msgid "Collection is empty."
 msgstr ""
 
-#: ../../include/conversation.php:575 ../../mod/photos.php:1025
-msgctxt "title"
-msgid "Agree"
+#: ../../include/items.php:4829
+#, php-format
+msgid "Collection: %s"
 msgstr ""
 
-#: ../../include/conversation.php:575 ../../mod/photos.php:1025
-msgctxt "title"
-msgid "Disagree"
+#: ../../include/items.php:4839 ../../mod/connedit.php:657
+#, php-format
+msgid "Connection: %s"
 msgstr ""
 
-#: ../../include/conversation.php:575 ../../mod/photos.php:1025
-msgctxt "title"
-msgid "Abstain"
+#: ../../include/items.php:4841
+msgid "Connection not found."
 msgstr ""
 
-#: ../../include/conversation.php:576 ../../mod/photos.php:1026
-msgctxt "title"
-msgid "Attending"
+#: ../../include/api.php:1321
+msgid "Public Timeline"
 msgstr ""
 
-#: ../../include/conversation.php:576 ../../mod/photos.php:1026
-msgctxt "title"
-msgid "Not attending"
+#: ../../include/network.php:635
+msgid "view full size"
 msgstr ""
 
-#: ../../include/conversation.php:576 ../../mod/photos.php:1026
-msgctxt "title"
-msgid "Might attend"
+#: ../../include/network.php:1613 ../../include/enotify.php:57
+msgid "$Projectname Notification"
 msgstr ""
 
-#: ../../include/conversation.php:661 ../../include/ItemObject.php:126
-msgid "Select"
+#: ../../include/network.php:1614 ../../include/enotify.php:58
+msgid "$projectname"
 msgstr ""
 
-#: ../../include/conversation.php:669 ../../include/ItemObject.php:89
-msgid "Private Message"
+#: ../../include/network.php:1616 ../../include/enotify.php:60
+msgid "Thank You,"
 msgstr ""
 
-#: ../../include/conversation.php:676 ../../include/ItemObject.php:227
-msgid "Message signature validated"
+#: ../../include/network.php:1618 ../../include/enotify.php:62
+#, php-format
+msgid "%s Administrator"
 msgstr ""
 
-#: ../../include/conversation.php:677 ../../include/ItemObject.php:228
-msgid "Message signature incorrect"
+#: ../../include/network.php:1660 ../../include/account.php:316
+#: ../../include/account.php:343 ../../include/account.php:403
+msgid "Administrator"
+msgstr ""
+
+#: ../../include/network.php:1674
+msgid "No Subject"
 msgstr ""
 
-#: ../../include/conversation.php:694
+#: ../../include/bookmarks.php:35
 #, php-format
-msgid "View %s's profile @ %s"
+msgid "%1$s's bookmarks"
 msgstr ""
 
-#: ../../include/conversation.php:709
-msgid "Categories:"
+#: ../../include/acl_selectors.php:239
+msgid "Visible to your default audience"
 msgstr ""
 
-#: ../../include/conversation.php:710
-msgid "Filed under:"
+#: ../../include/acl_selectors.php:240
+msgid "Show"
 msgstr ""
 
-#: ../../include/conversation.php:718 ../../include/ItemObject.php:314
-#, php-format
-msgid "from %s"
+#: ../../include/acl_selectors.php:241
+msgid "Don't show"
 msgstr ""
 
-#: ../../include/conversation.php:721 ../../include/ItemObject.php:317
-#, php-format
-msgid "last edited: %s"
+#: ../../include/acl_selectors.php:247 ../../mod/photos.php:628
+#: ../../mod/photos.php:998 ../../mod/filestorage.php:147
+#: ../../mod/chat.php:211 ../../mod/events.php:708 ../../mod/thing.php:310
+#: ../../mod/thing.php:356
+msgid "Permissions"
 msgstr ""
 
-#: ../../include/conversation.php:722 ../../include/ItemObject.php:318
-#, php-format
-msgid "Expires: %s"
+#: ../../include/acl_selectors.php:248 ../../include/ItemObject.php:369
+#: ../../mod/photos.php:1215
+msgid "Close"
 msgstr ""
 
-#: ../../include/conversation.php:737
-msgid "View in context"
+#: ../../include/import.php:23
+msgid ""
+"Cannot create a duplicate channel identifier on this system. Import failed."
 msgstr ""
 
-#: ../../include/conversation.php:739 ../../include/conversation.php:1212
-#: ../../include/ItemObject.php:366 ../../mod/editpost.php:130
-#: ../../mod/editblock.php:150 ../../mod/photos.php:990 ../../mod/mail.php:237
-#: ../../mod/mail.php:365 ../../mod/editlayout.php:148
-#: ../../mod/editwebpage.php:190
-msgid "Please wait"
+#: ../../include/import.php:70
+msgid "Channel clone failed. Import failed."
 msgstr ""
 
-#: ../../include/conversation.php:848
-msgid "remove"
+#: ../../include/import.php:80 ../../mod/import.php:138
+msgid "Cloned channel not found. Import failed."
 msgstr ""
 
-#: ../../include/conversation.php:852 ../../include/nav.php:241
-msgid "Loading..."
+#: ../../include/photos.php:109
+#, php-format
+msgid "Image exceeds website size limit of %lu bytes"
 msgstr ""
 
-#: ../../include/conversation.php:853
-msgid "Delete Selected Items"
+#: ../../include/photos.php:116
+msgid "Image file is empty."
 msgstr ""
 
-#: ../../include/conversation.php:941
-msgid "View Source"
+#: ../../include/photos.php:143 ../../mod/profile_photo.php:222
+msgid "Unable to process image"
 msgstr ""
 
-#: ../../include/conversation.php:942
-msgid "Follow Thread"
+#: ../../include/photos.php:232
+msgid "Photo storage failed."
 msgstr ""
 
-#: ../../include/conversation.php:943
-msgid "View Status"
+#: ../../include/photos.php:452 ../../include/conversation.php:1609
+msgid "Photo Albums"
 msgstr ""
 
-#: ../../include/conversation.php:944 ../../include/nav.php:86
-#: ../../mod/connedit.php:494
-msgid "View Profile"
+#: ../../include/photos.php:456
+msgid "Upload New Photos"
 msgstr ""
 
-#: ../../include/conversation.php:945
-msgid "View Photos"
+#: ../../include/notify.php:20
+msgid "created a new post"
 msgstr ""
 
-#: ../../include/conversation.php:946
-msgid "Activity/Posts"
+#: ../../include/notify.php:21
+#, php-format
+msgid "commented on %s's post"
 msgstr ""
 
-#: ../../include/conversation.php:948
-msgid "Edit Connection"
+#: ../../include/page_widgets.php:6
+msgid "New Page"
 msgstr ""
 
-#: ../../include/conversation.php:949
-msgid "Send PM"
+#: ../../include/page_widgets.php:39 ../../mod/layouts.php:188
+#: ../../mod/webpages.php:187 ../../mod/blocks.php:159
+msgid "View"
 msgstr ""
 
-#: ../../include/conversation.php:950 ../../include/apps.php:145
-msgid "Poke"
+#: ../../include/page_widgets.php:40 ../../include/ItemObject.php:691
+#: ../../include/conversation.php:1160 ../../mod/photos.php:1046
+#: ../../mod/editblock.php:171 ../../mod/editpost.php:150
+#: ../../mod/events.php:707 ../../mod/webpages.php:188
+#: ../../mod/editwebpage.php:212
+msgid "Preview"
 msgstr ""
 
-#: ../../include/conversation.php:1064
-#, php-format
-msgid "%s likes this."
+#: ../../include/page_widgets.php:41 ../../mod/webpages.php:189
+msgid "Actions"
 msgstr ""
 
-#: ../../include/conversation.php:1064
-#, php-format
-msgid "%s doesn't like this."
+#: ../../include/page_widgets.php:42 ../../mod/webpages.php:190
+msgid "Page Link"
 msgstr ""
 
-#: ../../include/conversation.php:1068
-#, php-format
-msgid "<span  %1$s>%2$d people</span> like this."
-msgid_plural "<span  %1$s>%2$d people</span> like this."
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/page_widgets.php:43
+msgid "Title"
+msgstr ""
 
-#: ../../include/conversation.php:1070
-#, php-format
-msgid "<span  %1$s>%2$d people</span> don't like this."
-msgid_plural "<span  %1$s>%2$d people</span> don't like this."
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/page_widgets.php:44 ../../mod/layouts.php:181
+#: ../../mod/menu.php:110 ../../mod/webpages.php:192 ../../mod/blocks.php:150
+msgid "Created"
+msgstr ""
 
-#: ../../include/conversation.php:1076
-msgid "and"
+#: ../../include/page_widgets.php:45 ../../mod/layouts.php:182
+#: ../../mod/menu.php:111 ../../mod/webpages.php:193 ../../mod/blocks.php:151
+msgid "Edited"
 msgstr ""
 
-#: ../../include/conversation.php:1079
-#, php-format
-msgid ", and %d other people"
-msgid_plural ", and %d other people"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/photo/photo_driver.php:705 ../../mod/photos.php:94
+#: ../../mod/photos.php:696 ../../mod/profile_photo.php:146
+#: ../../mod/profile_photo.php:236 ../../mod/profile_photo.php:376
+msgid "Profile Photos"
+msgstr ""
 
-#: ../../include/conversation.php:1080
-#, php-format
-msgid "%s like this."
+#: ../../include/profile_selectors.php:6
+#: ../../include/profile_selectors.php:23 ../../mod/id.php:103
+msgid "Male"
 msgstr ""
 
-#: ../../include/conversation.php:1080
-#, php-format
-msgid "%s don't like this."
+#: ../../include/profile_selectors.php:6
+#: ../../include/profile_selectors.php:23 ../../mod/id.php:105
+msgid "Female"
 msgstr ""
 
-#: ../../include/conversation.php:1143
-msgid "Visible to <strong>everybody</strong>"
+#: ../../include/profile_selectors.php:6
+msgid "Currently Male"
 msgstr ""
 
-#: ../../include/conversation.php:1144 ../../mod/mail.php:170
-#: ../../mod/mail.php:299
-msgid "Please enter a link URL:"
+#: ../../include/profile_selectors.php:6
+msgid "Currently Female"
 msgstr ""
 
-#: ../../include/conversation.php:1145
-msgid "Please enter a video link/URL:"
+#: ../../include/profile_selectors.php:6
+msgid "Mostly Male"
 msgstr ""
 
-#: ../../include/conversation.php:1146
-msgid "Please enter an audio link/URL:"
+#: ../../include/profile_selectors.php:6
+msgid "Mostly Female"
 msgstr ""
 
-#: ../../include/conversation.php:1147
-msgid "Tag term:"
+#: ../../include/profile_selectors.php:6
+msgid "Transgender"
 msgstr ""
 
-#: ../../include/conversation.php:1148 ../../mod/filer.php:48
-msgid "Save to Folder:"
+#: ../../include/profile_selectors.php:6
+msgid "Intersex"
 msgstr ""
 
-#: ../../include/conversation.php:1149
-msgid "Where are you right now?"
+#: ../../include/profile_selectors.php:6
+msgid "Transsexual"
 msgstr ""
 
-#: ../../include/conversation.php:1150 ../../mod/editpost.php:54
-#: ../../mod/mail.php:171 ../../mod/mail.php:300
-msgid "Expires YYYY-MM-DD HH:MM"
+#: ../../include/profile_selectors.php:6
+msgid "Hermaphrodite"
 msgstr ""
 
-#: ../../include/conversation.php:1158 ../../include/page_widgets.php:40
-#: ../../include/ItemObject.php:683 ../../mod/editpost.php:150
-#: ../../mod/editblock.php:171 ../../mod/photos.php:1010
-#: ../../mod/events.php:707 ../../mod/webpages.php:188
-#: ../../mod/editwebpage.php:212
-msgid "Preview"
+#: ../../include/profile_selectors.php:6
+msgid "Neuter"
 msgstr ""
 
-#: ../../include/conversation.php:1177 ../../mod/layouts.php:184
-#: ../../mod/photos.php:989 ../../mod/webpages.php:182
-#: ../../mod/blocks.php:154
-msgid "Share"
+#: ../../include/profile_selectors.php:6
+msgid "Non-specific"
 msgstr ""
 
-#: ../../include/conversation.php:1179
-msgid "Page link name"
+#: ../../include/profile_selectors.php:6
+msgid "Undecided"
 msgstr ""
 
-#: ../../include/conversation.php:1182
-msgid "Post as"
+#: ../../include/profile_selectors.php:42
+#: ../../include/profile_selectors.php:61
+msgid "Males"
 msgstr ""
 
-#: ../../include/conversation.php:1184 ../../include/ItemObject.php:675
-#: ../../mod/editpost.php:114 ../../mod/editblock.php:136
-#: ../../mod/editlayout.php:135 ../../mod/editwebpage.php:177
-msgid "Bold"
+#: ../../include/profile_selectors.php:42
+#: ../../include/profile_selectors.php:61
+msgid "Females"
 msgstr ""
 
-#: ../../include/conversation.php:1185 ../../include/ItemObject.php:676
-#: ../../mod/editpost.php:115 ../../mod/editblock.php:137
-#: ../../mod/editlayout.php:136 ../../mod/editwebpage.php:178
-msgid "Italic"
+#: ../../include/profile_selectors.php:42
+msgid "Gay"
 msgstr ""
 
-#: ../../include/conversation.php:1186 ../../include/ItemObject.php:677
-#: ../../mod/editpost.php:116 ../../mod/editblock.php:138
-#: ../../mod/editlayout.php:137 ../../mod/editwebpage.php:179
-msgid "Underline"
+#: ../../include/profile_selectors.php:42
+msgid "Lesbian"
 msgstr ""
 
-#: ../../include/conversation.php:1187 ../../include/ItemObject.php:678
-#: ../../mod/editpost.php:117 ../../mod/editblock.php:139
-#: ../../mod/editlayout.php:138 ../../mod/editwebpage.php:180
-msgid "Quote"
+#: ../../include/profile_selectors.php:42
+msgid "No Preference"
 msgstr ""
 
-#: ../../include/conversation.php:1188 ../../include/ItemObject.php:679
-#: ../../mod/editpost.php:118 ../../mod/editblock.php:140
-#: ../../mod/editlayout.php:139 ../../mod/editwebpage.php:181
-msgid "Code"
+#: ../../include/profile_selectors.php:42
+msgid "Bisexual"
 msgstr ""
 
-#: ../../include/conversation.php:1189 ../../mod/editpost.php:119
-#: ../../mod/editblock.php:142 ../../mod/mail.php:234 ../../mod/mail.php:361
-#: ../../mod/editlayout.php:140 ../../mod/editwebpage.php:182
-msgid "Upload photo"
+#: ../../include/profile_selectors.php:42
+msgid "Autosexual"
 msgstr ""
 
-#: ../../include/conversation.php:1190
-msgid "upload photo"
+#: ../../include/profile_selectors.php:42
+msgid "Abstinent"
 msgstr ""
 
-#: ../../include/conversation.php:1191 ../../mod/editpost.php:120
-#: ../../mod/editblock.php:143 ../../mod/mail.php:235 ../../mod/mail.php:362
-#: ../../mod/editlayout.php:141 ../../mod/editwebpage.php:183
-msgid "Attach file"
+#: ../../include/profile_selectors.php:42
+msgid "Virgin"
 msgstr ""
 
-#: ../../include/conversation.php:1192
-msgid "attach file"
+#: ../../include/profile_selectors.php:42
+msgid "Deviant"
 msgstr ""
 
-#: ../../include/conversation.php:1193 ../../mod/editpost.php:121
-#: ../../mod/editblock.php:144 ../../mod/mail.php:236 ../../mod/mail.php:363
-#: ../../mod/editlayout.php:142 ../../mod/editwebpage.php:184
-msgid "Insert web link"
+#: ../../include/profile_selectors.php:42
+msgid "Fetish"
 msgstr ""
 
-#: ../../include/conversation.php:1194
-msgid "web link"
+#: ../../include/profile_selectors.php:42
+msgid "Oodles"
 msgstr ""
 
-#: ../../include/conversation.php:1195
-msgid "Insert video link"
+#: ../../include/profile_selectors.php:42
+msgid "Nonsexual"
 msgstr ""
 
-#: ../../include/conversation.php:1196
-msgid "video link"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Single"
 msgstr ""
 
-#: ../../include/conversation.php:1197
-msgid "Insert audio link"
+#: ../../include/profile_selectors.php:80
+msgid "Lonely"
 msgstr ""
 
-#: ../../include/conversation.php:1198
-msgid "audio link"
+#: ../../include/profile_selectors.php:80
+msgid "Available"
 msgstr ""
 
-#: ../../include/conversation.php:1199 ../../mod/editpost.php:125
-#: ../../mod/editblock.php:148 ../../mod/editlayout.php:146
-#: ../../mod/editwebpage.php:188
-msgid "Set your location"
+#: ../../include/profile_selectors.php:80
+msgid "Unavailable"
 msgstr ""
 
-#: ../../include/conversation.php:1200
-msgid "set location"
+#: ../../include/profile_selectors.php:80
+msgid "Has crush"
 msgstr ""
 
-#: ../../include/conversation.php:1201 ../../mod/editpost.php:127
-msgid "Toggle voting"
+#: ../../include/profile_selectors.php:80
+msgid "Infatuated"
 msgstr ""
 
-#: ../../include/conversation.php:1204 ../../mod/editpost.php:126
-#: ../../mod/editblock.php:149 ../../mod/editlayout.php:147
-#: ../../mod/editwebpage.php:189
-msgid "Clear browser location"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Dating"
 msgstr ""
 
-#: ../../include/conversation.php:1205
-msgid "clear location"
+#: ../../include/profile_selectors.php:80
+msgid "Unfaithful"
 msgstr ""
 
-#: ../../include/conversation.php:1207 ../../mod/editpost.php:142
-#: ../../mod/editblock.php:162 ../../mod/editwebpage.php:205
-msgid "Title (optional)"
+#: ../../include/profile_selectors.php:80
+msgid "Sex Addict"
 msgstr ""
 
-#: ../../include/conversation.php:1211 ../../mod/editpost.php:144
-#: ../../mod/editblock.php:165 ../../mod/editlayout.php:163
-#: ../../mod/editwebpage.php:207
-msgid "Categories (optional, comma-separated list)"
+#: ../../include/profile_selectors.php:80 ../../include/identity.php:390
+#: ../../include/identity.php:391 ../../include/identity.php:398
+#: ../../include/widgets.php:429 ../../mod/connedit.php:568
+#: ../../mod/settings.php:337 ../../mod/settings.php:341
+#: ../../mod/settings.php:342 ../../mod/settings.php:345
+#: ../../mod/settings.php:356
+msgid "Friends"
 msgstr ""
 
-#: ../../include/conversation.php:1213 ../../mod/editpost.php:131
-#: ../../mod/editblock.php:151 ../../mod/editlayout.php:149
-#: ../../mod/editwebpage.php:191
-msgid "Permission settings"
+#: ../../include/profile_selectors.php:80
+msgid "Friends/Benefits"
 msgstr ""
 
-#: ../../include/conversation.php:1214
-msgid "permissions"
+#: ../../include/profile_selectors.php:80
+msgid "Casual"
 msgstr ""
 
-#: ../../include/conversation.php:1222 ../../mod/editpost.php:139
-#: ../../mod/editblock.php:159 ../../mod/editlayout.php:156
-#: ../../mod/editwebpage.php:200
-msgid "Public post"
+#: ../../include/profile_selectors.php:80
+msgid "Engaged"
 msgstr ""
 
-#: ../../include/conversation.php:1224 ../../mod/editpost.php:145
-#: ../../mod/editblock.php:166 ../../mod/editlayout.php:164
-#: ../../mod/editwebpage.php:208
-msgid "Example: bob@example.com, mary@example.com"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Married"
 msgstr ""
 
-#: ../../include/conversation.php:1237 ../../mod/editpost.php:156
-#: ../../mod/editblock.php:176 ../../mod/mail.php:241 ../../mod/mail.php:368
-#: ../../mod/editlayout.php:173 ../../mod/editwebpage.php:217
-msgid "Set expiration date"
+#: ../../include/profile_selectors.php:80
+msgid "Imaginarily married"
 msgstr ""
 
-#: ../../include/conversation.php:1239 ../../include/ItemObject.php:686
-#: ../../mod/editpost.php:158 ../../mod/mail.php:243 ../../mod/mail.php:370
-msgid "Encrypt text"
+#: ../../include/profile_selectors.php:80
+msgid "Partners"
 msgstr ""
 
-#: ../../include/conversation.php:1241 ../../mod/editpost.php:160
-#: ../../mod/events.php:691
-msgid "OK"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Cohabiting"
 msgstr ""
 
-#: ../../include/conversation.php:1242 ../../mod/fbrowser.php:82
-#: ../../mod/fbrowser.php:117 ../../mod/editpost.php:161
-#: ../../mod/events.php:690 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134
-#: ../../mod/settings.php:584 ../../mod/settings.php:610
-msgid "Cancel"
+#: ../../include/profile_selectors.php:80
+msgid "Common law"
 msgstr ""
 
-#: ../../include/conversation.php:1485
-msgid "Discover"
+#: ../../include/profile_selectors.php:80
+msgid "Happy"
 msgstr ""
 
-#: ../../include/conversation.php:1488
-msgid "Imported public streams"
+#: ../../include/profile_selectors.php:80
+msgid "Not looking"
 msgstr ""
 
-#: ../../include/conversation.php:1493
-msgid "Commented Order"
+#: ../../include/profile_selectors.php:80
+msgid "Swinger"
 msgstr ""
 
-#: ../../include/conversation.php:1496
-msgid "Sort by Comment Date"
+#: ../../include/profile_selectors.php:80
+msgid "Betrayed"
 msgstr ""
 
-#: ../../include/conversation.php:1500
-msgid "Posted Order"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Separated"
 msgstr ""
 
-#: ../../include/conversation.php:1503
-msgid "Sort by Post Date"
+#: ../../include/profile_selectors.php:80
+msgid "Unstable"
 msgstr ""
 
-#: ../../include/conversation.php:1508 ../../include/widgets.php:94
-msgid "Personal"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Divorced"
 msgstr ""
 
-#: ../../include/conversation.php:1511
-msgid "Posts that mention or involve you"
+#: ../../include/profile_selectors.php:80
+msgid "Imaginarily divorced"
 msgstr ""
 
-#: ../../include/conversation.php:1517 ../../mod/menu.php:112
-#: ../../mod/connections.php:72 ../../mod/connections.php:82
-msgid "New"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Widowed"
 msgstr ""
 
-#: ../../include/conversation.php:1520
-msgid "Activity Stream - by date"
+#: ../../include/profile_selectors.php:80
+msgid "Uncertain"
 msgstr ""
 
-#: ../../include/conversation.php:1526
-msgid "Starred"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "It's complicated"
 msgstr ""
 
-#: ../../include/conversation.php:1529
-msgid "Favourite Posts"
+#: ../../include/profile_selectors.php:80
+msgid "Don't care"
 msgstr ""
 
-#: ../../include/conversation.php:1536
-msgid "Spam"
+#: ../../include/profile_selectors.php:80
+msgid "Ask me"
 msgstr ""
 
-#: ../../include/conversation.php:1539
-msgid "Posts flagged as SPAM"
+#: ../../include/oembed.php:213
+msgid "Embedded content"
 msgstr ""
 
-#: ../../include/conversation.php:1583 ../../mod/admin.php:947
-msgid "Channel"
+#: ../../include/oembed.php:222
+msgid "Embedding disabled"
 msgstr ""
 
-#: ../../include/conversation.php:1586
-msgid "Status Messages and Posts"
+#: ../../include/event.php:766
+msgid "This event has been added to your calendar."
 msgstr ""
 
-#: ../../include/conversation.php:1595
-msgid "About"
+#: ../../include/event.php:896 ../../include/text.php:1846
+#: ../../include/conversation.php:123 ../../mod/like.php:363
+#: ../../mod/tagger.php:47 ../../mod/events.php:245
+msgid "event"
 msgstr ""
 
-#: ../../include/conversation.php:1598
-msgid "Profile Details"
+#: ../../include/event.php:953
+msgid "Not specified"
 msgstr ""
 
-#: ../../include/conversation.php:1604 ../../include/apps.php:139
-#: ../../include/nav.php:92 ../../mod/fbrowser.php:25
-msgid "Photos"
+#: ../../include/event.php:954
+msgid "Needs Action"
 msgstr ""
 
-#: ../../include/conversation.php:1607 ../../include/photos.php:422
-msgid "Photo Albums"
+#: ../../include/event.php:955
+msgid "Completed"
 msgstr ""
 
-#: ../../include/conversation.php:1614
-msgid "Files and Storage"
+#: ../../include/event.php:956
+msgid "In Process"
 msgstr ""
 
-#: ../../include/conversation.php:1624 ../../include/conversation.php:1627
-msgid "Chatrooms"
+#: ../../include/event.php:957
+msgid "Cancelled"
+msgstr ""
+
+#: ../../include/apps.php:128
+msgid "Site Admin"
 msgstr ""
 
-#: ../../include/conversation.php:1637 ../../include/apps.php:129
+#: ../../include/apps.php:129 ../../include/conversation.php:1639
 #: ../../include/nav.php:103
 msgid "Bookmarks"
 msgstr ""
 
-#: ../../include/conversation.php:1640
-msgid "Saved Bookmarks"
+#: ../../include/apps.php:130
+msgid "Address Book"
+msgstr ""
+
+#: ../../include/apps.php:131 ../../include/nav.php:111 ../../boot.php:1503
+msgid "Login"
+msgstr ""
+
+#: ../../include/apps.php:132 ../../include/nav.php:200
+#: ../../mod/manage.php:160
+msgid "Channel Manager"
 msgstr ""
 
-#: ../../include/conversation.php:1647 ../../include/apps.php:136
+#: ../../include/apps.php:133 ../../include/nav.php:174
+msgid "Grid"
+msgstr ""
+
+#: ../../include/apps.php:134 ../../include/widgets.php:553
+#: ../../include/nav.php:202 ../../mod/admin.php:1033 ../../mod/admin.php:1233
+msgid "Settings"
+msgstr ""
+
+#: ../../include/apps.php:136 ../../include/conversation.php:1649
 #: ../../include/nav.php:107 ../../mod/webpages.php:178
 msgid "Webpages"
 msgstr ""
 
-#: ../../include/conversation.php:1650
-msgid "Manage Webpages"
+#: ../../include/apps.php:137 ../../include/nav.php:177
+msgid "Channel Home"
 msgstr ""
 
-#: ../../include/conversation.php:1679 ../../include/ItemObject.php:175
-#: ../../include/ItemObject.php:187 ../../mod/photos.php:1043
-#: ../../mod/photos.php:1055
-msgid "View all"
+#: ../../include/apps.php:138 ../../include/identity.php:1250
+#: ../../include/identity.php:1367 ../../mod/profperm.php:112
+msgid "Profile"
 msgstr ""
 
-#: ../../include/conversation.php:1703 ../../include/taxonomy.php:403
-#: ../../include/identity.php:1252 ../../include/ItemObject.php:179
-#: ../../mod/photos.php:1047
-msgctxt "noun"
-msgid "Like"
-msgid_plural "Likes"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/apps.php:139 ../../include/conversation.php:1606
+#: ../../include/nav.php:92 ../../mod/fbrowser.php:25
+msgid "Photos"
+msgstr ""
 
-#: ../../include/conversation.php:1706 ../../include/ItemObject.php:184
-#: ../../mod/photos.php:1052
-msgctxt "noun"
-msgid "Dislike"
-msgid_plural "Dislikes"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/apps.php:140 ../../include/nav.php:196
+#: ../../mod/events.php:526
+msgid "Events"
+msgstr ""
 
-#: ../../include/conversation.php:1709
-msgctxt "noun"
-msgid "Attending"
-msgid_plural "Attending"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/apps.php:141 ../../include/nav.php:162
+msgid "Directory"
+msgstr ""
 
-#: ../../include/conversation.php:1712
-msgctxt "noun"
-msgid "Not Attending"
-msgid_plural "Not Attending"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/apps.php:142 ../../include/nav.php:154 ../../mod/help.php:202
+#: ../../mod/help.php:207 ../../mod/layouts.php:176
+msgid "Help"
+msgstr ""
 
-#: ../../include/conversation.php:1715
-msgctxt "noun"
-msgid "Undecided"
-msgid_plural "Undecided"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/apps.php:143 ../../include/nav.php:188
+msgid "Mail"
+msgstr ""
 
-#: ../../include/conversation.php:1718
-msgctxt "noun"
-msgid "Agree"
-msgid_plural "Agrees"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/apps.php:144 ../../mod/mood.php:131
+msgid "Mood"
+msgstr ""
 
-#: ../../include/conversation.php:1721
-msgctxt "noun"
-msgid "Disagree"
-msgid_plural "Disagrees"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/apps.php:145 ../../include/conversation.php:952
+msgid "Poke"
+msgstr ""
 
-#: ../../include/conversation.php:1724
-msgctxt "noun"
-msgid "Abstain"
-msgid_plural "Abstains"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/apps.php:146 ../../include/nav.php:97
+msgid "Chat"
+msgstr ""
 
-#: ../../include/api.php:1290
-msgid "Public Timeline"
+#: ../../include/apps.php:147 ../../include/text.php:857
+#: ../../include/text.php:869 ../../include/nav.php:159
+#: ../../mod/search.php:38
+msgid "Search"
 msgstr ""
 
-#: ../../include/photos.php:109
-#, php-format
-msgid "Image exceeds website size limit of %lu bytes"
+#: ../../include/apps.php:148
+msgid "Probe"
 msgstr ""
 
-#: ../../include/photos.php:116
-msgid "Image file is empty."
+#: ../../include/apps.php:149
+msgid "Suggest"
 msgstr ""
 
-#: ../../include/photos.php:143 ../../mod/profile_photo.php:222
-msgid "Unable to process image"
+#: ../../include/apps.php:150
+msgid "Random Channel"
 msgstr ""
 
-#: ../../include/photos.php:219
-msgid "Photo storage failed."
+#: ../../include/apps.php:151
+msgid "Invite"
 msgstr ""
 
-#: ../../include/photos.php:426
-msgid "Upload New Photos"
+#: ../../include/apps.php:152
+msgid "Features"
 msgstr ""
 
-#: ../../include/enotify.php:57 ../../include/network.php:1613
-msgid "$Projectname Notification"
+#: ../../include/apps.php:153 ../../mod/id.php:28
+msgid "Language"
 msgstr ""
 
-#: ../../include/enotify.php:58 ../../include/network.php:1614
-msgid "$projectname"
+#: ../../include/apps.php:154
+msgid "Post"
 msgstr ""
 
-#: ../../include/enotify.php:60 ../../include/network.php:1616
-msgid "Thank You,"
+#: ../../include/apps.php:155 ../../mod/id.php:17 ../../mod/id.php:18
+#: ../../mod/id.php:19
+msgid "Profile Photo"
 msgstr ""
 
-#: ../../include/enotify.php:62 ../../include/network.php:1618
-#, php-format
-msgid "%s Administrator"
+#: ../../include/apps.php:252 ../../mod/settings.php:84
+#: ../../mod/settings.php:609
+msgid "Update"
+msgstr ""
+
+#: ../../include/apps.php:252
+msgid "Install"
+msgstr ""
+
+#: ../../include/apps.php:257
+msgid "Purchase"
+msgstr ""
+
+#: ../../include/auth.php:131
+msgid "Logged out."
+msgstr ""
+
+#: ../../include/auth.php:272
+msgid "Failed authentication"
+msgstr ""
+
+#: ../../include/auth.php:286 ../../mod/openid.php:189
+msgid "Login failed."
 msgstr ""
 
 #: ../../include/enotify.php:96
@@ -1840,7 +1852,7 @@ msgstr ""
 
 #: ../../include/enotify.php:100
 #, php-format
-msgid "[Red:Notify] New mail received at %s"
+msgid "[Hubzilla:Notify] New mail received at %s"
 msgstr ""
 
 #: ../../include/enotify.php:102
@@ -1879,7 +1891,7 @@ msgstr ""
 
 #: ../../include/enotify.php:186
 #, php-format
-msgid "[Red:Notify] Comment to conversation #%1$d by %2$s"
+msgid "[Hubzilla:Notify] Comment to conversation #%1$d by %2$s"
 msgstr ""
 
 #: ../../include/enotify.php:187
@@ -1896,7 +1908,7 @@ msgstr ""
 
 #: ../../include/enotify.php:196
 #, php-format
-msgid "[Red:Notify] %s posted to your profile wall"
+msgid "[Hubzilla:Notify] %s posted to your profile wall"
 msgstr ""
 
 #: ../../include/enotify.php:198
@@ -1911,7 +1923,7 @@ msgstr ""
 
 #: ../../include/enotify.php:224
 #, php-format
-msgid "[Red:Notify] %s tagged you"
+msgid "[Hubzilla:Notify] %s tagged you"
 msgstr ""
 
 #: ../../include/enotify.php:225
@@ -1926,7 +1938,7 @@ msgstr ""
 
 #: ../../include/enotify.php:238
 #, php-format
-msgid "[Red:Notify] %1$s poked you"
+msgid "[Hubzilla:Notify] %1$s poked you"
 msgstr ""
 
 #: ../../include/enotify.php:239
@@ -1941,7 +1953,7 @@ msgstr ""
 
 #: ../../include/enotify.php:256
 #, php-format
-msgid "[Red:Notify] %s tagged your post"
+msgid "[Hubzilla:Notify] %s tagged your post"
 msgstr ""
 
 #: ../../include/enotify.php:257
@@ -1955,7 +1967,7 @@ msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
 msgstr ""
 
 #: ../../include/enotify.php:270
-msgid "[Red:Notify] Introduction received"
+msgid "[Hubzilla:Notify] Introduction received"
 msgstr ""
 
 #: ../../include/enotify.php:271
@@ -1980,7 +1992,7 @@ msgid "Please visit %s to approve or reject the connection request."
 msgstr ""
 
 #: ../../include/enotify.php:285
-msgid "[Red:Notify] Friend suggestion received"
+msgid "[Hubzilla:Notify] Friend suggestion received"
 msgstr ""
 
 #: ../../include/enotify.php:286
@@ -2007,26 +2019,247 @@ msgstr ""
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr ""
 
-#: ../../include/enotify.php:508
-msgid "[Red:Notify]"
+#: ../../include/enotify.php:511
+msgid "[Hubzilla:Notify]"
 msgstr ""
 
-#: ../../include/network.php:635
-msgid "view full size"
+#: ../../include/ItemObject.php:89 ../../include/conversation.php:664
+msgid "Private Message"
 msgstr ""
 
-#: ../../include/network.php:1660 ../../include/account.php:314
-#: ../../include/account.php:341 ../../include/account.php:401
-msgid "Administrator"
+#: ../../include/ItemObject.php:126 ../../include/conversation.php:656
+msgid "Select"
 msgstr ""
 
-#: ../../include/network.php:1674
-msgid "No Subject"
+#: ../../include/ItemObject.php:130
+msgid "Save to Folder"
 msgstr ""
 
-#: ../../include/bookmarks.php:35
+#: ../../include/ItemObject.php:151
+msgid "I will attend"
+msgstr ""
+
+#: ../../include/ItemObject.php:151
+msgid "I will not attend"
+msgstr ""
+
+#: ../../include/ItemObject.php:151
+msgid "I might attend"
+msgstr ""
+
+#: ../../include/ItemObject.php:161
+msgid "I agree"
+msgstr ""
+
+#: ../../include/ItemObject.php:161
+msgid "I disagree"
+msgstr ""
+
+#: ../../include/ItemObject.php:161
+msgid "I abstain"
+msgstr ""
+
+#: ../../include/ItemObject.php:175 ../../include/ItemObject.php:187
+#: ../../include/conversation.php:1681 ../../mod/photos.php:1079
+#: ../../mod/photos.php:1091
+msgid "View all"
+msgstr ""
+
+#: ../../include/ItemObject.php:179 ../../include/identity.php:1276
+#: ../../include/taxonomy.php:403 ../../include/conversation.php:1705
+#: ../../mod/photos.php:1083
+msgctxt "noun"
+msgid "Like"
+msgid_plural "Likes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/ItemObject.php:184 ../../include/conversation.php:1708
+#: ../../mod/photos.php:1088
+msgctxt "noun"
+msgid "Dislike"
+msgid_plural "Dislikes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/ItemObject.php:212
+msgid "Add Star"
+msgstr ""
+
+#: ../../include/ItemObject.php:213
+msgid "Remove Star"
+msgstr ""
+
+#: ../../include/ItemObject.php:214
+msgid "Toggle Star Status"
+msgstr ""
+
+#: ../../include/ItemObject.php:218
+msgid "starred"
+msgstr ""
+
+#: ../../include/ItemObject.php:227 ../../include/conversation.php:671
+msgid "Message signature validated"
+msgstr ""
+
+#: ../../include/ItemObject.php:228 ../../include/conversation.php:672
+msgid "Message signature incorrect"
+msgstr ""
+
+#: ../../include/ItemObject.php:236
+msgid "Add Tag"
+msgstr ""
+
+#: ../../include/ItemObject.php:254 ../../mod/photos.php:1023
+msgid "I like this (toggle)"
+msgstr ""
+
+#: ../../include/ItemObject.php:254 ../../include/taxonomy.php:317
+msgid "like"
+msgstr ""
+
+#: ../../include/ItemObject.php:255 ../../mod/photos.php:1024
+msgid "I don't like this (toggle)"
+msgstr ""
+
+#: ../../include/ItemObject.php:255 ../../include/taxonomy.php:318
+msgid "dislike"
+msgstr ""
+
+#: ../../include/ItemObject.php:259
+msgid "Share This"
+msgstr ""
+
+#: ../../include/ItemObject.php:259
+msgid "share"
+msgstr ""
+
+#: ../../include/ItemObject.php:276
 #, php-format
-msgid "%1$s's bookmarks"
+msgid "%d comment"
+msgid_plural "%d comments"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/ItemObject.php:301 ../../include/ItemObject.php:302
+#, php-format
+msgid "View %s's profile - %s"
+msgstr ""
+
+#: ../../include/ItemObject.php:305
+msgid "to"
+msgstr ""
+
+#: ../../include/ItemObject.php:306
+msgid "via"
+msgstr ""
+
+#: ../../include/ItemObject.php:307
+msgid "Wall-to-Wall"
+msgstr ""
+
+#: ../../include/ItemObject.php:308
+msgid "via Wall-To-Wall:"
+msgstr ""
+
+#: ../../include/ItemObject.php:311
+msgid "Delivery Report"
+msgstr ""
+
+#: ../../include/ItemObject.php:320 ../../include/conversation.php:718
+#, php-format
+msgid "from %s"
+msgstr ""
+
+#: ../../include/ItemObject.php:323 ../../include/conversation.php:721
+#, php-format
+msgid "last edited: %s"
+msgstr ""
+
+#: ../../include/ItemObject.php:324 ../../include/conversation.php:722
+#, php-format
+msgid "Expires: %s"
+msgstr ""
+
+#: ../../include/ItemObject.php:347
+msgid "Save Bookmarks"
+msgstr ""
+
+#: ../../include/ItemObject.php:348
+msgid "Add to Calendar"
+msgstr ""
+
+#: ../../include/ItemObject.php:357
+msgid "Mark all seen"
+msgstr ""
+
+#: ../../include/ItemObject.php:363 ../../mod/photos.php:1209
+msgctxt "noun"
+msgid "Likes"
+msgstr ""
+
+#: ../../include/ItemObject.php:364 ../../mod/photos.php:1210
+msgctxt "noun"
+msgid "Dislikes"
+msgstr ""
+
+#: ../../include/ItemObject.php:374 ../../include/conversation.php:739
+#: ../../include/conversation.php:1214 ../../mod/photos.php:1026
+#: ../../mod/editblock.php:150 ../../mod/editpost.php:130
+#: ../../mod/editlayout.php:148 ../../mod/editwebpage.php:190
+msgid "Please wait"
+msgstr ""
+
+#: ../../include/ItemObject.php:679 ../../mod/photos.php:1042
+#: ../../mod/photos.php:1160
+msgid "This is you"
+msgstr ""
+
+#: ../../include/ItemObject.php:683 ../../include/conversation.php:1186
+#: ../../mod/editblock.php:136 ../../mod/editpost.php:114
+#: ../../mod/editlayout.php:135 ../../mod/editwebpage.php:177
+msgid "Bold"
+msgstr ""
+
+#: ../../include/ItemObject.php:684 ../../include/conversation.php:1187
+#: ../../mod/editblock.php:137 ../../mod/editpost.php:115
+#: ../../mod/editlayout.php:136 ../../mod/editwebpage.php:178
+msgid "Italic"
+msgstr ""
+
+#: ../../include/ItemObject.php:685 ../../include/conversation.php:1188
+#: ../../mod/editblock.php:138 ../../mod/editpost.php:116
+#: ../../mod/editlayout.php:137 ../../mod/editwebpage.php:179
+msgid "Underline"
+msgstr ""
+
+#: ../../include/ItemObject.php:686 ../../include/conversation.php:1189
+#: ../../mod/editblock.php:139 ../../mod/editpost.php:117
+#: ../../mod/editlayout.php:138 ../../mod/editwebpage.php:180
+msgid "Quote"
+msgstr ""
+
+#: ../../include/ItemObject.php:687 ../../include/conversation.php:1190
+#: ../../mod/editblock.php:140 ../../mod/editpost.php:118
+#: ../../mod/editlayout.php:139 ../../mod/editwebpage.php:181
+msgid "Code"
+msgstr ""
+
+#: ../../include/ItemObject.php:688
+msgid "Image"
+msgstr ""
+
+#: ../../include/ItemObject.php:689
+msgid "Insert Link"
+msgstr ""
+
+#: ../../include/ItemObject.php:690
+msgid "Video"
+msgstr ""
+
+#: ../../include/ItemObject.php:694 ../../include/conversation.php:1241
+#: ../../mod/mail.php:247 ../../mod/mail.php:376 ../../mod/editpost.php:158
+msgid "Encrypt text"
 msgstr ""
 
 #: ../../include/text.php:391
@@ -2068,12 +2301,6 @@ msgstr[1] ""
 msgid "View Connections"
 msgstr ""
 
-#: ../../include/text.php:857 ../../include/text.php:869
-#: ../../include/apps.php:147 ../../include/nav.php:159
-#: ../../mod/search.php:38
-msgid "Search"
-msgstr ""
-
 #: ../../include/text.php:858 ../../include/text.php:870
 #: ../../include/widgets.php:191 ../../mod/filer.php:49
 #: ../../mod/admin.php:1411 ../../mod/admin.php:1431 ../../mod/rbmark.php:28
@@ -2085,6 +2312,10 @@ msgstr ""
 msgid "poke"
 msgstr ""
 
+#: ../../include/text.php:933 ../../include/conversation.php:243
+msgid "poked"
+msgstr ""
+
 #: ../../include/text.php:934
 msgid "ping"
 msgstr ""
@@ -2213,638 +2444,93 @@ msgstr ""
 msgid "May"
 msgstr ""
 
-#: ../../include/text.php:1247
-msgid "unknown.???"
+#: ../../include/text.php:1221 ../../include/text.php:1225
+msgid "Unknown Attachment"
+msgstr ""
+
+#: ../../include/text.php:1227
+msgid "Attachment"
 msgstr ""
 
-#: ../../include/text.php:1248
-msgid "bytes"
+#: ../../include/text.php:1227
+msgid "Size Unknown"
 msgstr ""
 
-#: ../../include/text.php:1284
+#: ../../include/text.php:1263
 msgid "remove category"
 msgstr ""
 
-#: ../../include/text.php:1359
+#: ../../include/text.php:1340
 msgid "remove from file"
 msgstr ""
 
-#: ../../include/text.php:1443 ../../include/text.php:1454
+#: ../../include/text.php:1441 ../../include/text.php:1452
 msgid "Click to open/close"
 msgstr ""
 
-#: ../../include/text.php:1609 ../../mod/events.php:497
+#: ../../include/text.php:1620 ../../mod/events.php:497
 msgid "Link to Source"
 msgstr ""
 
-#: ../../include/text.php:1630 ../../include/text.php:1701
+#: ../../include/text.php:1641 ../../include/text.php:1712
 msgid "default"
 msgstr ""
 
-#: ../../include/text.php:1638
+#: ../../include/text.php:1649
 msgid "Page layout"
 msgstr ""
 
-#: ../../include/text.php:1638
+#: ../../include/text.php:1649
 msgid "You can create your own with the layouts tool"
 msgstr ""
 
-#: ../../include/text.php:1679
+#: ../../include/text.php:1690
 msgid "Page content type"
 msgstr ""
 
-#: ../../include/text.php:1713
+#: ../../include/text.php:1724
 msgid "Select an alternate language"
 msgstr ""
 
-#: ../../include/text.php:1845
-msgid "activity"
-msgstr ""
-
-#: ../../include/text.php:2140
-msgid "Design Tools"
-msgstr ""
-
-#: ../../include/text.php:2143 ../../mod/blocks.php:147
-msgid "Blocks"
-msgstr ""
-
-#: ../../include/text.php:2144 ../../mod/menu.php:103
-msgid "Menus"
-msgstr ""
-
-#: ../../include/text.php:2145 ../../mod/layouts.php:174
-msgid "Layouts"
-msgstr ""
-
-#: ../../include/text.php:2146
-msgid "Pages"
-msgstr ""
-
-#: ../../include/acl_selectors.php:239
-msgid "Visible to your default audience"
-msgstr ""
-
-#: ../../include/acl_selectors.php:240
-msgid "Show"
-msgstr ""
-
-#: ../../include/acl_selectors.php:241
-msgid "Don't show"
-msgstr ""
-
-#: ../../include/acl_selectors.php:247 ../../mod/filestorage.php:147
-#: ../../mod/chat.php:207 ../../mod/photos.php:592 ../../mod/photos.php:962
-#: ../../mod/events.php:708 ../../mod/thing.php:310 ../../mod/thing.php:356
-msgid "Permissions"
-msgstr ""
-
-#: ../../include/acl_selectors.php:248 ../../include/ItemObject.php:361
-#: ../../mod/photos.php:1179
-msgid "Close"
-msgstr ""
-
-#: ../../include/attach.php:243 ../../include/attach.php:329
-msgid "Item was not found."
-msgstr ""
-
-#: ../../include/attach.php:471
-msgid "No source file."
-msgstr ""
-
-#: ../../include/attach.php:489
-msgid "Cannot locate file to replace"
-msgstr ""
-
-#: ../../include/attach.php:507
-msgid "Cannot locate file to revise/update"
-msgstr ""
-
-#: ../../include/attach.php:632
-#, php-format
-msgid "File exceeds size limit of %d"
-msgstr ""
-
-#: ../../include/attach.php:645
-#, php-format
-msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
-msgstr ""
-
-#: ../../include/attach.php:793
-msgid "File upload failed. Possible system limit or action terminated."
-msgstr ""
-
-#: ../../include/attach.php:806
-msgid "Stored file could not be verified. Upload failed."
-msgstr ""
-
-#: ../../include/attach.php:854 ../../include/attach.php:870
-msgid "Path not available."
-msgstr ""
-
-#: ../../include/attach.php:916 ../../include/attach.php:1069
-msgid "Empty pathname"
-msgstr ""
-
-#: ../../include/attach.php:942
-msgid "duplicate filename or path"
-msgstr ""
-
-#: ../../include/attach.php:965
-msgid "Path not found."
-msgstr ""
-
-#: ../../include/attach.php:1023
-msgid "mkdir failed."
-msgstr ""
-
-#: ../../include/attach.php:1027
-msgid "database storage failed."
-msgstr ""
-
-#: ../../include/attach.php:1075
-msgid "Empty path"
-msgstr ""
-
-#: ../../include/import.php:23
-msgid ""
-"Cannot create a duplicate channel identifier on this system. Import failed."
-msgstr ""
-
-#: ../../include/import.php:70
-msgid "Channel clone failed. Import failed."
-msgstr ""
-
-#: ../../include/import.php:80 ../../mod/import.php:138
-msgid "Cloned channel not found. Import failed."
-msgstr ""
-
-#: ../../include/notify.php:20
-msgid "created a new post"
-msgstr ""
-
-#: ../../include/notify.php:21
-#, php-format
-msgid "commented on %s's post"
-msgstr ""
-
-#: ../../include/page_widgets.php:6
-msgid "New Page"
-msgstr ""
-
-#: ../../include/page_widgets.php:39 ../../mod/layouts.php:188
-#: ../../mod/webpages.php:187 ../../mod/blocks.php:159
-msgid "View"
-msgstr ""
-
-#: ../../include/page_widgets.php:41 ../../mod/webpages.php:189
-msgid "Actions"
-msgstr ""
-
-#: ../../include/page_widgets.php:42 ../../mod/webpages.php:190
-msgid "Page Link"
-msgstr ""
-
-#: ../../include/page_widgets.php:43
-msgid "Title"
-msgstr ""
-
-#: ../../include/page_widgets.php:44 ../../mod/layouts.php:181
-#: ../../mod/menu.php:110 ../../mod/webpages.php:192 ../../mod/blocks.php:150
-msgid "Created"
-msgstr ""
-
-#: ../../include/page_widgets.php:45 ../../mod/layouts.php:182
-#: ../../mod/menu.php:111 ../../mod/webpages.php:193 ../../mod/blocks.php:151
-msgid "Edited"
-msgstr ""
-
-#: ../../include/photo/photo_driver.php:705 ../../mod/photos.php:94
-#: ../../mod/photos.php:660 ../../mod/profile_photo.php:146
-#: ../../mod/profile_photo.php:236 ../../mod/profile_photo.php:376
-msgid "Profile Photos"
-msgstr ""
-
-#: ../../include/profile_selectors.php:6
-#: ../../include/profile_selectors.php:23 ../../mod/id.php:103
-msgid "Male"
-msgstr ""
-
-#: ../../include/profile_selectors.php:6
-#: ../../include/profile_selectors.php:23 ../../mod/id.php:105
-msgid "Female"
-msgstr ""
-
-#: ../../include/profile_selectors.php:6
-msgid "Currently Male"
-msgstr ""
-
-#: ../../include/profile_selectors.php:6
-msgid "Currently Female"
-msgstr ""
-
-#: ../../include/profile_selectors.php:6
-msgid "Mostly Male"
-msgstr ""
-
-#: ../../include/profile_selectors.php:6
-msgid "Mostly Female"
-msgstr ""
-
-#: ../../include/profile_selectors.php:6
-msgid "Transgender"
-msgstr ""
-
-#: ../../include/profile_selectors.php:6
-msgid "Intersex"
-msgstr ""
-
-#: ../../include/profile_selectors.php:6
-msgid "Transsexual"
-msgstr ""
-
-#: ../../include/profile_selectors.php:6
-msgid "Hermaphrodite"
-msgstr ""
-
-#: ../../include/profile_selectors.php:6
-msgid "Neuter"
-msgstr ""
-
-#: ../../include/profile_selectors.php:6
-msgid "Non-specific"
-msgstr ""
-
-#: ../../include/profile_selectors.php:6
-msgid "Undecided"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-#: ../../include/profile_selectors.php:61
-msgid "Males"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-#: ../../include/profile_selectors.php:61
-msgid "Females"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Gay"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Lesbian"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "No Preference"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Bisexual"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Autosexual"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Abstinent"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Virgin"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Deviant"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Fetish"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Oodles"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Nonsexual"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Single"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-msgid "Lonely"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-msgid "Available"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-msgid "Unavailable"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-msgid "Has crush"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-msgid "Infatuated"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Dating"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-msgid "Unfaithful"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-msgid "Sex Addict"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80 ../../include/identity.php:390
-#: ../../include/identity.php:391 ../../include/identity.php:398
-#: ../../include/widgets.php:429 ../../mod/connedit.php:569
-#: ../../mod/settings.php:337 ../../mod/settings.php:341
-#: ../../mod/settings.php:342 ../../mod/settings.php:345
-#: ../../mod/settings.php:356
-msgid "Friends"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-msgid "Friends/Benefits"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-msgid "Casual"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-msgid "Engaged"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Married"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-msgid "Imaginarily married"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-msgid "Partners"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Cohabiting"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-msgid "Common law"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-msgid "Happy"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-msgid "Not looking"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-msgid "Swinger"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-msgid "Betrayed"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Separated"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-msgid "Unstable"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Divorced"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-msgid "Imaginarily divorced"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Widowed"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-msgid "Uncertain"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "It's complicated"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-msgid "Don't care"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-msgid "Ask me"
-msgstr ""
-
-#: ../../include/oembed.php:213
-msgid "Embedded content"
-msgstr ""
-
-#: ../../include/oembed.php:222
-msgid "Embedding disabled"
-msgstr ""
-
-#: ../../include/event.php:22 ../../include/bb2diaspora.php:459
-msgid "l F d, Y \\@ g:i A"
-msgstr ""
-
-#: ../../include/event.php:30 ../../include/bb2diaspora.php:465
-msgid "Starts:"
-msgstr ""
-
-#: ../../include/event.php:40 ../../include/bb2diaspora.php:473
-msgid "Finishes:"
-msgstr ""
-
-#: ../../include/event.php:50 ../../include/bb2diaspora.php:481
-#: ../../include/identity.php:992 ../../mod/directory.php:302
-#: ../../mod/events.php:701
-msgid "Location:"
-msgstr ""
-
-#: ../../include/event.php:766
-msgid "This event has been added to your calendar."
-msgstr ""
-
-#: ../../include/event.php:953
-msgid "Not specified"
-msgstr ""
-
-#: ../../include/event.php:954
-msgid "Needs Action"
-msgstr ""
-
-#: ../../include/event.php:955
-msgid "Completed"
-msgstr ""
-
-#: ../../include/event.php:956
-msgid "In Process"
-msgstr ""
-
-#: ../../include/event.php:957
-msgid "Cancelled"
-msgstr ""
-
-#: ../../include/apps.php:128
-msgid "Site Admin"
-msgstr ""
-
-#: ../../include/apps.php:130
-msgid "Address Book"
-msgstr ""
-
-#: ../../include/apps.php:131 ../../include/nav.php:111 ../../boot.php:1497
-msgid "Login"
-msgstr ""
-
-#: ../../include/apps.php:132 ../../include/nav.php:200
-#: ../../mod/manage.php:160
-msgid "Channel Manager"
-msgstr ""
-
-#: ../../include/apps.php:133
-msgid "Matrix"
-msgstr ""
-
-#: ../../include/apps.php:134 ../../include/widgets.php:553
-#: ../../include/nav.php:202 ../../mod/admin.php:1033 ../../mod/admin.php:1233
-msgid "Settings"
-msgstr ""
-
-#: ../../include/apps.php:137 ../../include/nav.php:177
-msgid "Channel Home"
-msgstr ""
-
-#: ../../include/apps.php:138 ../../include/identity.php:1226
-#: ../../include/identity.php:1343 ../../mod/profperm.php:112
-msgid "Profile"
-msgstr ""
-
-#: ../../include/apps.php:140 ../../include/nav.php:196
-#: ../../mod/events.php:526
-msgid "Events"
-msgstr ""
-
-#: ../../include/apps.php:141 ../../include/nav.php:162
-msgid "Directory"
-msgstr ""
-
-#: ../../include/apps.php:142 ../../include/nav.php:154 ../../mod/help.php:202
-#: ../../mod/help.php:207 ../../mod/layouts.php:176
-msgid "Help"
-msgstr ""
-
-#: ../../include/apps.php:143 ../../include/nav.php:188
-msgid "Mail"
-msgstr ""
-
-#: ../../include/apps.php:144 ../../mod/mood.php:131
-msgid "Mood"
-msgstr ""
-
-#: ../../include/apps.php:146 ../../include/nav.php:97
-msgid "Chat"
-msgstr ""
-
-#: ../../include/apps.php:148
-msgid "Probe"
-msgstr ""
-
-#: ../../include/apps.php:149
-msgid "Suggest"
-msgstr ""
-
-#: ../../include/apps.php:150
-msgid "Random Channel"
-msgstr ""
-
-#: ../../include/apps.php:151
-msgid "Invite"
-msgstr ""
-
-#: ../../include/apps.php:152
-msgid "Features"
-msgstr ""
-
-#: ../../include/apps.php:153 ../../mod/id.php:28
-msgid "Language"
-msgstr ""
-
-#: ../../include/apps.php:154
-msgid "Post"
-msgstr ""
-
-#: ../../include/apps.php:155 ../../mod/id.php:17 ../../mod/id.php:18
-#: ../../mod/id.php:19
-msgid "Profile Photo"
+#: ../../include/text.php:1843 ../../include/conversation.php:120
+#: ../../mod/like.php:361 ../../mod/tagger.php:43 ../../mod/subthread.php:72
+#: ../../mod/subthread.php:172
+msgid "photo"
 msgstr ""
 
-#: ../../include/apps.php:247 ../../mod/settings.php:84
-#: ../../mod/settings.php:609
-msgid "Update"
+#: ../../include/text.php:1849 ../../include/conversation.php:148
+#: ../../mod/like.php:361 ../../mod/subthread.php:72
+#: ../../mod/subthread.php:172
+msgid "status"
 msgstr ""
 
-#: ../../include/apps.php:247
-msgid "Install"
+#: ../../include/text.php:1851 ../../include/conversation.php:150
+#: ../../mod/tagger.php:53
+msgid "comment"
 msgstr ""
 
-#: ../../include/apps.php:252
-msgid "Purchase"
+#: ../../include/text.php:1856
+msgid "activity"
 msgstr ""
 
-#: ../../include/auth.php:131
-msgid "Logged out."
+#: ../../include/text.php:2151
+msgid "Design Tools"
 msgstr ""
 
-#: ../../include/auth.php:272
-msgid "Failed authentication"
+#: ../../include/text.php:2154 ../../mod/blocks.php:147
+msgid "Blocks"
 msgstr ""
 
-#: ../../include/auth.php:286 ../../mod/openid.php:189
-msgid "Login failed."
+#: ../../include/text.php:2155 ../../mod/menu.php:103
+msgid "Menus"
 msgstr ""
 
-#: ../../include/bb2diaspora.php:373
-msgid "Attachments:"
+#: ../../include/text.php:2156 ../../mod/layouts.php:174
+msgid "Layouts"
 msgstr ""
 
-#: ../../include/bb2diaspora.php:461
-msgid "$Projectname event notification:"
+#: ../../include/text.php:2157
+msgid "Pages"
 msgstr ""
 
 #: ../../include/bbcode.php:123 ../../include/bbcode.php:793
@@ -2938,47 +2624,47 @@ msgstr ""
 msgid "Failed to store account information."
 msgstr ""
 
-#: ../../include/account.php:246
+#: ../../include/account.php:248
 #, php-format
 msgid "Registration confirmation for %s"
 msgstr ""
 
-#: ../../include/account.php:312
+#: ../../include/account.php:314
 #, php-format
 msgid "Registration request at %s"
 msgstr ""
 
-#: ../../include/account.php:336
+#: ../../include/account.php:338
 msgid "your registration password"
 msgstr ""
 
-#: ../../include/account.php:339 ../../include/account.php:399
+#: ../../include/account.php:341 ../../include/account.php:401
 #, php-format
 msgid "Registration details for %s"
 msgstr ""
 
-#: ../../include/account.php:408
+#: ../../include/account.php:410
 msgid "Account approved."
 msgstr ""
 
-#: ../../include/account.php:447
+#: ../../include/account.php:449
 #, php-format
 msgid "Registration revoked for %s"
 msgstr ""
 
-#: ../../include/account.php:492
+#: ../../include/account.php:494
 msgid "Account verified. Please login."
 msgstr ""
 
-#: ../../include/account.php:705 ../../include/account.php:707
+#: ../../include/account.php:707 ../../include/account.php:709
 msgid "Click here to upgrade."
 msgstr ""
 
-#: ../../include/account.php:713
+#: ../../include/account.php:715
 msgid "This action exceeds the limits set by your subscription plan."
 msgstr ""
 
-#: ../../include/account.php:718
+#: ../../include/account.php:720
 msgid "This action is not available under your subscription plan."
 msgstr ""
 
@@ -2998,7 +2684,7 @@ msgstr ""
 msgid "Channel was deleted and no longer exists."
 msgstr ""
 
-#: ../../include/follow.php:154
+#: ../../include/follow.php:152 ../../include/follow.php:180
 msgid "Protocol disabled."
 msgstr ""
 
@@ -3006,15 +2692,15 @@ msgstr ""
 msgid "Channel discovery failed."
 msgstr ""
 
-#: ../../include/follow.php:186
+#: ../../include/follow.php:196
 msgid "local account not found."
 msgstr ""
 
-#: ../../include/follow.php:210
+#: ../../include/follow.php:220
 msgid "Cannot connect to yourself."
 msgstr ""
 
-#: ../../include/security.php:345
+#: ../../include/security.php:381
 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."
@@ -3129,83 +2815,37 @@ msgstr ""
 msgid "add"
 msgstr ""
 
-#: ../../include/taxonomy.php:229 ../../include/taxonomy.php:250
-msgid "Tags"
-msgstr ""
-
-#: ../../include/taxonomy.php:294
-msgid "Keywords"
-msgstr ""
-
-#: ../../include/taxonomy.php:315
-msgid "have"
-msgstr ""
-
-#: ../../include/taxonomy.php:315
-msgid "has"
-msgstr ""
-
-#: ../../include/taxonomy.php:316
-msgid "want"
-msgstr ""
-
-#: ../../include/taxonomy.php:316
-msgid "wants"
-msgstr ""
-
-#: ../../include/taxonomy.php:317 ../../include/ItemObject.php:254
-msgid "like"
-msgstr ""
-
-#: ../../include/taxonomy.php:317
-msgid "likes"
-msgstr ""
-
-#: ../../include/taxonomy.php:318 ../../include/ItemObject.php:255
-msgid "dislike"
+#: ../../include/zot.php:683
+msgid "Invalid data packet"
 msgstr ""
 
-#: ../../include/taxonomy.php:318
-msgid "dislikes"
+#: ../../include/zot.php:699
+msgid "Unable to verify channel signature"
 msgstr ""
 
-#: ../../include/dir_fns.php:126
-msgid "Directory Options"
+#: ../../include/zot.php:2235
+#, php-format
+msgid "Unable to verify site signature for %s"
 msgstr ""
 
-#: ../../include/dir_fns.php:128
-msgid "Safe Mode"
+#: ../../include/zot.php:3555
+msgid "invalid target signature"
 msgstr ""
 
-#: ../../include/dir_fns.php:128 ../../include/dir_fns.php:129
-#: ../../include/dir_fns.php:130 ../../mod/removeme.php:60
-#: ../../mod/mitem.php:154 ../../mod/mitem.php:155 ../../mod/mitem.php:228
-#: ../../mod/mitem.php:229 ../../mod/connedit.php:631
-#: ../../mod/connedit.php:659 ../../mod/filestorage.php:151
-#: ../../mod/filestorage.php:159 ../../mod/admin.php:386 ../../mod/menu.php:96
-#: ../../mod/menu.php:153 ../../mod/photos.php:589 ../../mod/settings.php:574
-#: ../../mod/api.php:106 ../../view/theme/redbasic/php/config.php:104
-#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1501
-msgid "No"
+#: ../../include/message.php:18
+msgid "No recipient provided."
 msgstr ""
 
-#: ../../include/dir_fns.php:128 ../../include/dir_fns.php:129
-#: ../../include/dir_fns.php:130 ../../mod/removeme.php:60
-#: ../../mod/mitem.php:154 ../../mod/mitem.php:155 ../../mod/mitem.php:228
-#: ../../mod/mitem.php:229 ../../mod/filestorage.php:151
-#: ../../mod/filestorage.php:159 ../../mod/admin.php:388 ../../mod/menu.php:96
-#: ../../mod/menu.php:153 ../../mod/photos.php:589 ../../mod/settings.php:574
-#: ../../mod/api.php:105 ../../view/theme/redbasic/php/config.php:104
-#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1501
-msgid "Yes"
+#: ../../include/message.php:23
+msgid "[no subject]"
 msgstr ""
 
-#: ../../include/dir_fns.php:129
-msgid "Public Forums Only"
+#: ../../include/message.php:43
+msgid "Unable to determine sender."
 msgstr ""
 
-#: ../../include/dir_fns.php:130
-msgid "This Website Only"
+#: ../../include/message.php:218
+msgid "Stored post could not be verified."
 msgstr ""
 
 #: ../../include/identity.php:32
@@ -3245,11 +2885,11 @@ msgstr ""
 msgid "Default Profile"
 msgstr ""
 
-#: ../../include/identity.php:745
+#: ../../include/identity.php:769
 msgid "Requested channel is not available."
 msgstr ""
 
-#: ../../include/identity.php:791 ../../mod/achievements.php:11
+#: ../../include/identity.php:815 ../../mod/achievements.php:11
 #: ../../mod/filestorage.php:54 ../../mod/hcard.php:8 ../../mod/layouts.php:29
 #: ../../mod/editblock.php:29 ../../mod/profile.php:16
 #: ../../mod/webpages.php:29 ../../mod/blocks.php:29
@@ -3258,418 +2898,769 @@ msgstr ""
 msgid "Requested profile is not available."
 msgstr ""
 
-#: ../../include/identity.php:954 ../../mod/profiles.php:774
+#: ../../include/identity.php:978 ../../mod/profiles.php:774
 msgid "Change profile photo"
 msgstr ""
 
-#: ../../include/identity.php:960
+#: ../../include/identity.php:984
 msgid "Profiles"
 msgstr ""
 
-#: ../../include/identity.php:960
+#: ../../include/identity.php:984
 msgid "Manage/edit profiles"
 msgstr ""
 
-#: ../../include/identity.php:961 ../../mod/profiles.php:775
+#: ../../include/identity.php:985 ../../mod/profiles.php:775
 msgid "Create New Profile"
 msgstr ""
 
-#: ../../include/identity.php:964 ../../include/nav.php:90
+#: ../../include/identity.php:988 ../../include/nav.php:90
 msgid "Edit Profile"
 msgstr ""
 
-#: ../../include/identity.php:976 ../../mod/profiles.php:786
+#: ../../include/identity.php:1000 ../../mod/profiles.php:786
 msgid "Profile Image"
 msgstr ""
 
-#: ../../include/identity.php:979
+#: ../../include/identity.php:1003
 msgid "visible to everybody"
 msgstr ""
 
-#: ../../include/identity.php:980 ../../mod/profiles.php:669
+#: ../../include/identity.php:1004 ../../mod/profiles.php:669
 #: ../../mod/profiles.php:790
 msgid "Edit visibility"
 msgstr ""
 
-#: ../../include/identity.php:996 ../../include/identity.php:1236
+#: ../../include/identity.php:1020 ../../include/identity.php:1260
 msgid "Gender:"
 msgstr ""
 
-#: ../../include/identity.php:997 ../../include/identity.php:1280
+#: ../../include/identity.php:1021 ../../include/identity.php:1304
 msgid "Status:"
 msgstr ""
 
-#: ../../include/identity.php:998 ../../include/identity.php:1291
+#: ../../include/identity.php:1022 ../../include/identity.php:1315
 msgid "Homepage:"
 msgstr ""
 
-#: ../../include/identity.php:999
+#: ../../include/identity.php:1023
 msgid "Online Now"
 msgstr ""
 
-#: ../../include/identity.php:1083 ../../include/identity.php:1161
+#: ../../include/identity.php:1107 ../../include/identity.php:1185
 #: ../../mod/ping.php:318
 msgid "g A l F d"
 msgstr ""
 
-#: ../../include/identity.php:1084 ../../include/identity.php:1162
+#: ../../include/identity.php:1108 ../../include/identity.php:1186
 msgid "F d"
 msgstr ""
 
-#: ../../include/identity.php:1129 ../../include/identity.php:1201
+#: ../../include/identity.php:1153 ../../include/identity.php:1225
 #: ../../mod/ping.php:341
 msgid "[today]"
 msgstr ""
 
-#: ../../include/identity.php:1140
+#: ../../include/identity.php:1164
 msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../include/identity.php:1141
+#: ../../include/identity.php:1165
 msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../include/identity.php:1194
+#: ../../include/identity.php:1218
 msgid "[No description]"
 msgstr ""
 
-#: ../../include/identity.php:1212
+#: ../../include/identity.php:1236
 msgid "Event Reminders"
 msgstr ""
 
-#: ../../include/identity.php:1213
+#: ../../include/identity.php:1237
 msgid "Events this week:"
 msgstr ""
 
-#: ../../include/identity.php:1234 ../../mod/settings.php:1026
+#: ../../include/identity.php:1258 ../../mod/settings.php:1026
 msgid "Full Name:"
 msgstr ""
 
-#: ../../include/identity.php:1241
+#: ../../include/identity.php:1265
 msgid "Like this channel"
 msgstr ""
 
-#: ../../include/identity.php:1265
+#: ../../include/identity.php:1289
 msgid "j F, Y"
 msgstr ""
 
-#: ../../include/identity.php:1266
+#: ../../include/identity.php:1290
 msgid "j F"
 msgstr ""
 
-#: ../../include/identity.php:1273
+#: ../../include/identity.php:1297
 msgid "Birthday:"
 msgstr ""
 
-#: ../../include/identity.php:1277 ../../mod/directory.php:297
+#: ../../include/identity.php:1301 ../../mod/directory.php:297
 msgid "Age:"
 msgstr ""
 
-#: ../../include/identity.php:1286
+#: ../../include/identity.php:1310
 #, php-format
 msgid "for %1$d %2$s"
 msgstr ""
 
-#: ../../include/identity.php:1289 ../../mod/profiles.php:691
+#: ../../include/identity.php:1313 ../../mod/profiles.php:691
 msgid "Sexual Preference:"
 msgstr ""
 
-#: ../../include/identity.php:1293 ../../mod/directory.php:313
+#: ../../include/identity.php:1317 ../../mod/directory.php:313
 #: ../../mod/profiles.php:693
 msgid "Hometown:"
 msgstr ""
 
-#: ../../include/identity.php:1295
+#: ../../include/identity.php:1319
 msgid "Tags:"
 msgstr ""
 
-#: ../../include/identity.php:1297 ../../mod/profiles.php:694
+#: ../../include/identity.php:1321 ../../mod/profiles.php:694
 msgid "Political Views:"
 msgstr ""
 
-#: ../../include/identity.php:1299
+#: ../../include/identity.php:1323
 msgid "Religion:"
 msgstr ""
 
-#: ../../include/identity.php:1301 ../../mod/directory.php:315
+#: ../../include/identity.php:1325 ../../mod/directory.php:315
 msgid "About:"
 msgstr ""
 
-#: ../../include/identity.php:1303
+#: ../../include/identity.php:1327
 msgid "Hobbies/Interests:"
 msgstr ""
 
-#: ../../include/identity.php:1305 ../../mod/profiles.php:697
+#: ../../include/identity.php:1329 ../../mod/profiles.php:697
 msgid "Likes:"
 msgstr ""
 
-#: ../../include/identity.php:1307 ../../mod/profiles.php:698
+#: ../../include/identity.php:1331 ../../mod/profiles.php:698
 msgid "Dislikes:"
 msgstr ""
 
-#: ../../include/identity.php:1309
+#: ../../include/identity.php:1333
 msgid "Contact information and Social Networks:"
 msgstr ""
 
-#: ../../include/identity.php:1311
+#: ../../include/identity.php:1335
 msgid "My other channels:"
 msgstr ""
 
-#: ../../include/identity.php:1313
+#: ../../include/identity.php:1337
 msgid "Musical interests:"
 msgstr ""
 
-#: ../../include/identity.php:1315
+#: ../../include/identity.php:1339
 msgid "Books, literature:"
 msgstr ""
 
-#: ../../include/identity.php:1317
+#: ../../include/identity.php:1341
 msgid "Television:"
 msgstr ""
 
-#: ../../include/identity.php:1319
+#: ../../include/identity.php:1343
 msgid "Film/dance/culture/entertainment:"
 msgstr ""
 
-#: ../../include/identity.php:1321
+#: ../../include/identity.php:1345
 msgid "Love/Romance:"
 msgstr ""
 
-#: ../../include/identity.php:1323
+#: ../../include/identity.php:1347
 msgid "Work/employment:"
 msgstr ""
 
-#: ../../include/identity.php:1325
+#: ../../include/identity.php:1349
 msgid "School/education:"
 msgstr ""
 
-#: ../../include/identity.php:1345
+#: ../../include/identity.php:1369
 msgid "Like this thing"
 msgstr ""
 
-#: ../../include/message.php:18
-msgid "No recipient provided."
+#: ../../include/taxonomy.php:229 ../../include/taxonomy.php:250
+msgid "Tags"
 msgstr ""
 
-#: ../../include/message.php:23
-msgid "[no subject]"
+#: ../../include/taxonomy.php:294
+msgid "Keywords"
 msgstr ""
 
-#: ../../include/message.php:45
-msgid "Unable to determine sender."
+#: ../../include/taxonomy.php:315
+msgid "have"
 msgstr ""
 
-#: ../../include/message.php:203
-msgid "Stored post could not be verified."
+#: ../../include/taxonomy.php:315
+msgid "has"
 msgstr ""
 
-#: ../../include/ItemObject.php:130
-msgid "Save to Folder"
+#: ../../include/taxonomy.php:316
+msgid "want"
 msgstr ""
 
-#: ../../include/ItemObject.php:151
-msgid "I will attend"
+#: ../../include/taxonomy.php:316
+msgid "wants"
 msgstr ""
 
-#: ../../include/ItemObject.php:151
-msgid "I will not attend"
+#: ../../include/taxonomy.php:317
+msgid "likes"
 msgstr ""
 
-#: ../../include/ItemObject.php:151
-msgid "I might attend"
+#: ../../include/taxonomy.php:318
+msgid "dislikes"
 msgstr ""
 
-#: ../../include/ItemObject.php:161
-msgid "I agree"
+#: ../../include/attach.php:243 ../../include/attach.php:329
+msgid "Item was not found."
 msgstr ""
 
-#: ../../include/ItemObject.php:161
-msgid "I disagree"
+#: ../../include/attach.php:493
+msgid "No source file."
 msgstr ""
 
-#: ../../include/ItemObject.php:161
-msgid "I abstain"
+#: ../../include/attach.php:511
+msgid "Cannot locate file to replace"
 msgstr ""
 
-#: ../../include/ItemObject.php:212
-msgid "Add Star"
+#: ../../include/attach.php:529
+msgid "Cannot locate file to revise/update"
 msgstr ""
 
-#: ../../include/ItemObject.php:213
-msgid "Remove Star"
+#: ../../include/attach.php:664
+#, php-format
+msgid "File exceeds size limit of %d"
 msgstr ""
 
-#: ../../include/ItemObject.php:214
-msgid "Toggle Star Status"
+#: ../../include/attach.php:678
+#, php-format
+msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
 msgstr ""
 
-#: ../../include/ItemObject.php:218
-msgid "starred"
+#: ../../include/attach.php:828
+msgid "File upload failed. Possible system limit or action terminated."
 msgstr ""
 
-#: ../../include/ItemObject.php:236
-msgid "Add Tag"
+#: ../../include/attach.php:841
+msgid "Stored file could not be verified. Upload failed."
 msgstr ""
 
-#: ../../include/ItemObject.php:254 ../../mod/photos.php:987
-msgid "I like this (toggle)"
+#: ../../include/attach.php:889 ../../include/attach.php:905
+msgid "Path not available."
 msgstr ""
 
-#: ../../include/ItemObject.php:255 ../../mod/photos.php:988
-msgid "I don't like this (toggle)"
+#: ../../include/attach.php:951 ../../include/attach.php:1103
+msgid "Empty pathname"
 msgstr ""
 
-#: ../../include/ItemObject.php:259
-msgid "Share This"
+#: ../../include/attach.php:977
+msgid "duplicate filename or path"
 msgstr ""
 
-#: ../../include/ItemObject.php:259
-msgid "share"
+#: ../../include/attach.php:999
+msgid "Path not found."
 msgstr ""
 
-#: ../../include/ItemObject.php:276
+#: ../../include/attach.php:1057
+msgid "mkdir failed."
+msgstr ""
+
+#: ../../include/attach.php:1061
+msgid "database storage failed."
+msgstr ""
+
+#: ../../include/attach.php:1109
+msgid "Empty path"
+msgstr ""
+
+#: ../../include/conversation.php:126 ../../mod/like.php:113
+msgid "channel"
+msgstr ""
+
+#: ../../include/conversation.php:164 ../../mod/like.php:410
 #, php-format
-msgid "%d comment"
-msgid_plural "%d comments"
-msgstr[0] ""
-msgstr[1] ""
+msgid "%1$s likes %2$s's %3$s"
+msgstr ""
 
-#: ../../include/ItemObject.php:295 ../../include/ItemObject.php:296
+#: ../../include/conversation.php:167 ../../mod/like.php:412
 #, php-format
-msgid "View %s's profile - %s"
+msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""
 
-#: ../../include/ItemObject.php:299
-msgid "to"
+#: ../../include/conversation.php:204
+#, php-format
+msgid "%1$s is now connected with %2$s"
 msgstr ""
 
-#: ../../include/ItemObject.php:300
-msgid "via"
+#: ../../include/conversation.php:239
+#, php-format
+msgid "%1$s poked %2$s"
 msgstr ""
 
-#: ../../include/ItemObject.php:301
-msgid "Wall-to-Wall"
+#: ../../include/conversation.php:260 ../../mod/mood.php:63
+#, php-format
+msgctxt "mood"
+msgid "%1$s is %2$s"
 msgstr ""
 
-#: ../../include/ItemObject.php:302
-msgid "via Wall-To-Wall:"
+#: ../../include/conversation.php:574 ../../mod/photos.php:1060
+msgctxt "title"
+msgid "Likes"
 msgstr ""
 
-#: ../../include/ItemObject.php:305
-msgid "Delivery Report"
+#: ../../include/conversation.php:574 ../../mod/photos.php:1060
+msgctxt "title"
+msgid "Dislikes"
 msgstr ""
 
-#: ../../include/ItemObject.php:339
-msgid "Save Bookmarks"
+#: ../../include/conversation.php:575 ../../mod/photos.php:1061
+msgctxt "title"
+msgid "Agree"
 msgstr ""
 
-#: ../../include/ItemObject.php:340
-msgid "Add to Calendar"
+#: ../../include/conversation.php:575 ../../mod/photos.php:1061
+msgctxt "title"
+msgid "Disagree"
 msgstr ""
 
-#: ../../include/ItemObject.php:349
-msgid "Mark all seen"
+#: ../../include/conversation.php:575 ../../mod/photos.php:1061
+msgctxt "title"
+msgid "Abstain"
 msgstr ""
 
-#: ../../include/ItemObject.php:355 ../../mod/photos.php:1173
-msgctxt "noun"
-msgid "Likes"
+#: ../../include/conversation.php:576 ../../mod/photos.php:1062
+msgctxt "title"
+msgid "Attending"
 msgstr ""
 
-#: ../../include/ItemObject.php:356 ../../mod/photos.php:1174
-msgctxt "noun"
-msgid "Dislikes"
+#: ../../include/conversation.php:576 ../../mod/photos.php:1062
+msgctxt "title"
+msgid "Not attending"
 msgstr ""
 
-#: ../../include/ItemObject.php:671 ../../mod/photos.php:1006
-#: ../../mod/photos.php:1124
-msgid "This is you"
+#: ../../include/conversation.php:576 ../../mod/photos.php:1062
+msgctxt "title"
+msgid "Might attend"
 msgstr ""
 
-#: ../../include/ItemObject.php:680
-msgid "Image"
+#: ../../include/conversation.php:692
+#, php-format
+msgid "View %s's profile @ %s"
 msgstr ""
 
-#: ../../include/ItemObject.php:681
-msgid "Insert Link"
+#: ../../include/conversation.php:709
+msgid "Categories:"
 msgstr ""
 
-#: ../../include/ItemObject.php:682
-msgid "Video"
+#: ../../include/conversation.php:710
+msgid "Filed under:"
 msgstr ""
 
-#: ../../include/items.php:423 ../../mod/like.php:280 ../../mod/dreport.php:6
-#: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/profperm.php:23
-#: ../../mod/import_items.php:114 ../../index.php:360
-msgid "Permission denied"
+#: ../../include/conversation.php:737
+msgid "View in context"
 msgstr ""
 
-#: ../../include/items.php:1128 ../../include/items.php:1174
-msgid "(Unknown)"
+#: ../../include/conversation.php:850
+msgid "remove"
 msgstr ""
 
-#: ../../include/items.php:1371
-msgid "Visible to anybody on the internet."
+#: ../../include/conversation.php:854 ../../include/nav.php:241
+msgid "Loading..."
 msgstr ""
 
-#: ../../include/items.php:1373
-msgid "Visible to you only."
+#: ../../include/conversation.php:855
+msgid "Delete Selected Items"
 msgstr ""
 
-#: ../../include/items.php:1375
-msgid "Visible to anybody in this network."
+#: ../../include/conversation.php:943
+msgid "View Source"
 msgstr ""
 
-#: ../../include/items.php:1377
-msgid "Visible to anybody authenticated."
+#: ../../include/conversation.php:944
+msgid "Follow Thread"
 msgstr ""
 
-#: ../../include/items.php:1379
-#, php-format
-msgid "Visible to anybody on %s."
+#: ../../include/conversation.php:945
+msgid "View Status"
 msgstr ""
 
-#: ../../include/items.php:1381
-msgid "Visible to all connections."
+#: ../../include/conversation.php:946 ../../include/nav.php:86
+#: ../../mod/connedit.php:493
+msgid "View Profile"
 msgstr ""
 
-#: ../../include/items.php:1383
-msgid "Visible to approved connections."
+#: ../../include/conversation.php:947
+msgid "View Photos"
 msgstr ""
 
-#: ../../include/items.php:1385
-msgid "Visible to specific connections."
+#: ../../include/conversation.php:948
+msgid "Activity/Posts"
 msgstr ""
 
-#: ../../include/items.php:4263 ../../mod/display.php:36
-#: ../../mod/filestorage.php:27 ../../mod/admin.php:127
-#: ../../mod/admin.php:979 ../../mod/admin.php:1179 ../../mod/thing.php:86
-#: ../../mod/viewsrc.php:20
-msgid "Item not found."
+#: ../../include/conversation.php:950
+msgid "Edit Connection"
 msgstr ""
 
-#: ../../include/items.php:4772 ../../mod/group.php:38 ../../mod/group.php:137
-msgid "Collection not found."
+#: ../../include/conversation.php:951
+msgid "Send PM"
 msgstr ""
 
-#: ../../include/items.php:4788
-msgid "Collection is empty."
+#: ../../include/conversation.php:1066
+#, php-format
+msgid "%s likes this."
 msgstr ""
 
-#: ../../include/items.php:4795
+#: ../../include/conversation.php:1066
 #, php-format
-msgid "Collection: %s"
+msgid "%s doesn't like this."
 msgstr ""
 
-#: ../../include/items.php:4805 ../../mod/connedit.php:658
+#: ../../include/conversation.php:1070
 #, php-format
-msgid "Connection: %s"
+msgid "<span  %1$s>%2$d people</span> like this."
+msgid_plural "<span  %1$s>%2$d people</span> like this."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1072
+#, php-format
+msgid "<span  %1$s>%2$d people</span> don't like this."
+msgid_plural "<span  %1$s>%2$d people</span> don't like this."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1078
+msgid "and"
 msgstr ""
 
-#: ../../include/items.php:4807
-msgid "Connection not found."
+#: ../../include/conversation.php:1081
+#, php-format
+msgid ", and %d other people"
+msgid_plural ", and %d other people"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1082
+#, php-format
+msgid "%s like this."
+msgstr ""
+
+#: ../../include/conversation.php:1082
+#, php-format
+msgid "%s don't like this."
 msgstr ""
 
+#: ../../include/conversation.php:1145
+msgid "Visible to <strong>everybody</strong>"
+msgstr ""
+
+#: ../../include/conversation.php:1146 ../../mod/mail.php:194
+#: ../../mod/mail.php:308
+msgid "Please enter a link URL:"
+msgstr ""
+
+#: ../../include/conversation.php:1147
+msgid "Please enter a video link/URL:"
+msgstr ""
+
+#: ../../include/conversation.php:1148
+msgid "Please enter an audio link/URL:"
+msgstr ""
+
+#: ../../include/conversation.php:1149
+msgid "Tag term:"
+msgstr ""
+
+#: ../../include/conversation.php:1150 ../../mod/filer.php:48
+msgid "Save to Folder:"
+msgstr ""
+
+#: ../../include/conversation.php:1151
+msgid "Where are you right now?"
+msgstr ""
+
+#: ../../include/conversation.php:1152 ../../mod/mail.php:195
+#: ../../mod/mail.php:309 ../../mod/editpost.php:54
+msgid "Expires YYYY-MM-DD HH:MM"
+msgstr ""
+
+#: ../../include/conversation.php:1179 ../../mod/photos.php:1025
+#: ../../mod/layouts.php:184 ../../mod/webpages.php:182
+#: ../../mod/blocks.php:154
+msgid "Share"
+msgstr ""
+
+#: ../../include/conversation.php:1181
+msgid "Page link name"
+msgstr ""
+
+#: ../../include/conversation.php:1184
+msgid "Post as"
+msgstr ""
+
+#: ../../include/conversation.php:1191 ../../mod/editblock.php:142
+#: ../../mod/editpost.php:119 ../../mod/editlayout.php:140
+#: ../../mod/editwebpage.php:182
+msgid "Upload photo"
+msgstr ""
+
+#: ../../include/conversation.php:1192
+msgid "upload photo"
+msgstr ""
+
+#: ../../include/conversation.php:1193 ../../mod/mail.php:240
+#: ../../mod/mail.php:369 ../../mod/editblock.php:143
+#: ../../mod/editpost.php:120 ../../mod/editlayout.php:141
+#: ../../mod/editwebpage.php:183
+msgid "Attach file"
+msgstr ""
+
+#: ../../include/conversation.php:1194
+msgid "attach file"
+msgstr ""
+
+#: ../../include/conversation.php:1195 ../../mod/mail.php:241
+#: ../../mod/mail.php:370 ../../mod/editblock.php:144
+#: ../../mod/editpost.php:121 ../../mod/editlayout.php:142
+#: ../../mod/editwebpage.php:184
+msgid "Insert web link"
+msgstr ""
+
+#: ../../include/conversation.php:1196
+msgid "web link"
+msgstr ""
+
+#: ../../include/conversation.php:1197
+msgid "Insert video link"
+msgstr ""
+
+#: ../../include/conversation.php:1198
+msgid "video link"
+msgstr ""
+
+#: ../../include/conversation.php:1199
+msgid "Insert audio link"
+msgstr ""
+
+#: ../../include/conversation.php:1200
+msgid "audio link"
+msgstr ""
+
+#: ../../include/conversation.php:1201 ../../mod/editblock.php:148
+#: ../../mod/editpost.php:125 ../../mod/editlayout.php:146
+#: ../../mod/editwebpage.php:188
+msgid "Set your location"
+msgstr ""
+
+#: ../../include/conversation.php:1202
+msgid "set location"
+msgstr ""
+
+#: ../../include/conversation.php:1203 ../../mod/editpost.php:127
+msgid "Toggle voting"
+msgstr ""
+
+#: ../../include/conversation.php:1206 ../../mod/editblock.php:149
+#: ../../mod/editpost.php:126 ../../mod/editlayout.php:147
+#: ../../mod/editwebpage.php:189
+msgid "Clear browser location"
+msgstr ""
+
+#: ../../include/conversation.php:1207
+msgid "clear location"
+msgstr ""
+
+#: ../../include/conversation.php:1209 ../../mod/editblock.php:162
+#: ../../mod/editpost.php:142 ../../mod/editwebpage.php:205
+msgid "Title (optional)"
+msgstr ""
+
+#: ../../include/conversation.php:1213 ../../mod/editblock.php:165
+#: ../../mod/editpost.php:144 ../../mod/editlayout.php:163
+#: ../../mod/editwebpage.php:207
+msgid "Categories (optional, comma-separated list)"
+msgstr ""
+
+#: ../../include/conversation.php:1215 ../../mod/editblock.php:151
+#: ../../mod/editpost.php:131 ../../mod/editlayout.php:149
+#: ../../mod/editwebpage.php:191
+msgid "Permission settings"
+msgstr ""
+
+#: ../../include/conversation.php:1216
+msgid "permissions"
+msgstr ""
+
+#: ../../include/conversation.php:1224 ../../mod/editblock.php:159
+#: ../../mod/editpost.php:139 ../../mod/editlayout.php:156
+#: ../../mod/editwebpage.php:200
+msgid "Public post"
+msgstr ""
+
+#: ../../include/conversation.php:1226 ../../mod/editblock.php:166
+#: ../../mod/editpost.php:145 ../../mod/editlayout.php:164
+#: ../../mod/editwebpage.php:208
+msgid "Example: bob@example.com, mary@example.com"
+msgstr ""
+
+#: ../../include/conversation.php:1239 ../../mod/mail.php:245
+#: ../../mod/mail.php:374 ../../mod/editblock.php:176
+#: ../../mod/editpost.php:156 ../../mod/editlayout.php:173
+#: ../../mod/editwebpage.php:217
+msgid "Set expiration date"
+msgstr ""
+
+#: ../../include/conversation.php:1243 ../../mod/editpost.php:160
+#: ../../mod/events.php:691
+msgid "OK"
+msgstr ""
+
+#: ../../include/conversation.php:1244 ../../mod/fbrowser.php:82
+#: ../../mod/fbrowser.php:117 ../../mod/editpost.php:161
+#: ../../mod/events.php:690 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134
+#: ../../mod/settings.php:584 ../../mod/settings.php:610
+msgid "Cancel"
+msgstr ""
+
+#: ../../include/conversation.php:1487
+msgid "Discover"
+msgstr ""
+
+#: ../../include/conversation.php:1490
+msgid "Imported public streams"
+msgstr ""
+
+#: ../../include/conversation.php:1495
+msgid "Commented Order"
+msgstr ""
+
+#: ../../include/conversation.php:1498
+msgid "Sort by Comment Date"
+msgstr ""
+
+#: ../../include/conversation.php:1502
+msgid "Posted Order"
+msgstr ""
+
+#: ../../include/conversation.php:1505
+msgid "Sort by Post Date"
+msgstr ""
+
+#: ../../include/conversation.php:1510 ../../include/widgets.php:94
+msgid "Personal"
+msgstr ""
+
+#: ../../include/conversation.php:1513
+msgid "Posts that mention or involve you"
+msgstr ""
+
+#: ../../include/conversation.php:1519 ../../mod/menu.php:112
+#: ../../mod/connections.php:72 ../../mod/connections.php:82
+msgid "New"
+msgstr ""
+
+#: ../../include/conversation.php:1522
+msgid "Activity Stream - by date"
+msgstr ""
+
+#: ../../include/conversation.php:1528
+msgid "Starred"
+msgstr ""
+
+#: ../../include/conversation.php:1531
+msgid "Favourite Posts"
+msgstr ""
+
+#: ../../include/conversation.php:1538
+msgid "Spam"
+msgstr ""
+
+#: ../../include/conversation.php:1541
+msgid "Posts flagged as SPAM"
+msgstr ""
+
+#: ../../include/conversation.php:1585 ../../mod/admin.php:947
+msgid "Channel"
+msgstr ""
+
+#: ../../include/conversation.php:1588
+msgid "Status Messages and Posts"
+msgstr ""
+
+#: ../../include/conversation.php:1597
+msgid "About"
+msgstr ""
+
+#: ../../include/conversation.php:1600
+msgid "Profile Details"
+msgstr ""
+
+#: ../../include/conversation.php:1616
+msgid "Files and Storage"
+msgstr ""
+
+#: ../../include/conversation.php:1626 ../../include/conversation.php:1629
+msgid "Chatrooms"
+msgstr ""
+
+#: ../../include/conversation.php:1642
+msgid "Saved Bookmarks"
+msgstr ""
+
+#: ../../include/conversation.php:1652
+msgid "Manage Webpages"
+msgstr ""
+
+#: ../../include/conversation.php:1711
+msgctxt "noun"
+msgid "Attending"
+msgid_plural "Attending"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1714
+msgctxt "noun"
+msgid "Not Attending"
+msgid_plural "Not Attending"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1717
+msgctxt "noun"
+msgid "Undecided"
+msgid_plural "Undecided"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1720
+msgctxt "noun"
+msgid "Agree"
+msgid_plural "Agrees"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1723
+msgctxt "noun"
+msgid "Disagree"
+msgid_plural "Disagrees"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1726
+msgctxt "noun"
+msgid "Abstain"
+msgid_plural "Abstains"
+msgstr[0] ""
+msgstr[1] ""
+
 #: ../../include/widgets.php:91 ../../include/nav.php:157
 #: ../../mod/apps.php:36
 msgid "Apps"
@@ -3728,19 +3719,19 @@ msgstr ""
 msgid "Archives"
 msgstr ""
 
-#: ../../include/widgets.php:427 ../../mod/connedit.php:567
+#: ../../include/widgets.php:427 ../../mod/connedit.php:566
 msgid "Me"
 msgstr ""
 
-#: ../../include/widgets.php:428 ../../mod/connedit.php:568
+#: ../../include/widgets.php:428 ../../mod/connedit.php:567
 msgid "Family"
 msgstr ""
 
-#: ../../include/widgets.php:430 ../../mod/connedit.php:570
+#: ../../include/widgets.php:430 ../../mod/connedit.php:569
 msgid "Acquaintances"
 msgstr ""
 
-#: ../../include/widgets.php:431 ../../mod/connedit.php:571
+#: ../../include/widgets.php:431 ../../mod/connedit.php:570
 #: ../../mod/connections.php:88 ../../mod/connections.php:103
 msgid "All"
 msgstr ""
@@ -3777,7 +3768,7 @@ msgstr ""
 msgid "Export channel"
 msgstr ""
 
-#: ../../include/widgets.php:529 ../../mod/connedit.php:658
+#: ../../include/widgets.php:529 ../../mod/connedit.php:657
 msgid "Connection Default Permissions"
 msgstr ""
 
@@ -3790,174 +3781,153 @@ msgid "Private Mail Menu"
 msgstr ""
 
 #: ../../include/widgets.php:569
-msgid "Check Mail"
-msgstr ""
-
-#: ../../include/widgets.php:575
 msgid "Combined View"
 msgstr ""
 
-#: ../../include/widgets.php:580 ../../include/nav.php:191
+#: ../../include/widgets.php:574 ../../include/nav.php:191
 msgid "Inbox"
 msgstr ""
 
-#: ../../include/widgets.php:585 ../../include/nav.php:192
+#: ../../include/widgets.php:579 ../../include/nav.php:192
 msgid "Outbox"
 msgstr ""
 
-#: ../../include/widgets.php:590 ../../include/nav.php:193
+#: ../../include/widgets.php:584 ../../include/nav.php:193
 msgid "New Message"
 msgstr ""
 
-#: ../../include/widgets.php:609 ../../include/widgets.php:621
+#: ../../include/widgets.php:603 ../../include/widgets.php:615
 msgid "Conversations"
 msgstr ""
 
-#: ../../include/widgets.php:613
+#: ../../include/widgets.php:607
 msgid "Received Messages"
 msgstr ""
 
-#: ../../include/widgets.php:617
+#: ../../include/widgets.php:611
 msgid "Sent Messages"
 msgstr ""
 
-#: ../../include/widgets.php:631
+#: ../../include/widgets.php:625
 msgid "No messages."
 msgstr ""
 
-#: ../../include/widgets.php:648
+#: ../../include/widgets.php:643
 msgid "Delete conversation"
 msgstr ""
 
-#: ../../include/widgets.php:650
+#: ../../include/widgets.php:645
 msgid "D, d M Y - g:i A"
 msgstr ""
 
-#: ../../include/widgets.php:738
+#: ../../include/widgets.php:734
 msgid "Chat Rooms"
 msgstr ""
 
-#: ../../include/widgets.php:758
+#: ../../include/widgets.php:754
 msgid "Bookmarked Chatrooms"
 msgstr ""
 
-#: ../../include/widgets.php:778
+#: ../../include/widgets.php:774
 msgid "Suggested Chatrooms"
 msgstr ""
 
-#: ../../include/widgets.php:905 ../../include/widgets.php:963
+#: ../../include/widgets.php:901 ../../include/widgets.php:959
 msgid "photo/image"
 msgstr ""
 
-#: ../../include/widgets.php:1058 ../../include/widgets.php:1060
+#: ../../include/widgets.php:1054 ../../include/widgets.php:1056
 msgid "Rate Me"
 msgstr ""
 
-#: ../../include/widgets.php:1064
+#: ../../include/widgets.php:1060
 msgid "View Ratings"
 msgstr ""
 
-#: ../../include/widgets.php:1075
+#: ../../include/widgets.php:1071
 msgid "Public Hubs"
 msgstr ""
 
-#: ../../include/widgets.php:1123
+#: ../../include/widgets.php:1119
 msgid "Forums"
 msgstr ""
 
-#: ../../include/widgets.php:1150
+#: ../../include/widgets.php:1146
 msgid "Tasks"
 msgstr ""
 
-#: ../../include/widgets.php:1159
+#: ../../include/widgets.php:1155
 msgid "Documentation"
 msgstr ""
 
-#: ../../include/widgets.php:1161
+#: ../../include/widgets.php:1157
 msgid "Project/Site Information"
 msgstr ""
 
-#: ../../include/widgets.php:1162
+#: ../../include/widgets.php:1158
 msgid "For Members"
 msgstr ""
 
-#: ../../include/widgets.php:1163
+#: ../../include/widgets.php:1159
 msgid "For Administrators"
 msgstr ""
 
-#: ../../include/widgets.php:1164
+#: ../../include/widgets.php:1160
 msgid "For Developers"
 msgstr ""
 
-#: ../../include/widgets.php:1189 ../../mod/admin.php:410
+#: ../../include/widgets.php:1185 ../../mod/admin.php:410
 msgid "Site"
 msgstr ""
 
-#: ../../include/widgets.php:1190
+#: ../../include/widgets.php:1186
 msgid "Accounts"
 msgstr ""
 
-#: ../../include/widgets.php:1191 ../../mod/admin.php:939
+#: ../../include/widgets.php:1187 ../../mod/admin.php:939
 msgid "Channels"
 msgstr ""
 
-#: ../../include/widgets.php:1192 ../../mod/admin.php:1031
+#: ../../include/widgets.php:1188 ../../mod/admin.php:1031
 #: ../../mod/admin.php:1071
 msgid "Plugins"
 msgstr ""
 
-#: ../../include/widgets.php:1193 ../../mod/admin.php:1231
+#: ../../include/widgets.php:1189 ../../mod/admin.php:1231
 #: ../../mod/admin.php:1265
 msgid "Themes"
 msgstr ""
 
-#: ../../include/widgets.php:1194
+#: ../../include/widgets.php:1190
 msgid "Inspect queue"
 msgstr ""
 
-#: ../../include/widgets.php:1195
+#: ../../include/widgets.php:1191
 msgid "Profile Config"
 msgstr ""
 
-#: ../../include/widgets.php:1196
+#: ../../include/widgets.php:1192
 msgid "DB updates"
 msgstr ""
 
-#: ../../include/widgets.php:1214 ../../include/widgets.php:1220
+#: ../../include/widgets.php:1210 ../../include/widgets.php:1216
 #: ../../mod/admin.php:1350
 msgid "Logs"
 msgstr ""
 
-#: ../../include/widgets.php:1218 ../../include/nav.php:210
+#: ../../include/widgets.php:1214 ../../include/nav.php:210
 msgid "Admin"
 msgstr ""
 
-#: ../../include/widgets.php:1219
+#: ../../include/widgets.php:1215
 msgid "Plugin Features"
 msgstr ""
 
-#: ../../include/widgets.php:1221
+#: ../../include/widgets.php:1217
 msgid "User registrations waiting for confirmation"
 msgstr ""
 
-#: ../../include/zot.php:677
-msgid "Invalid data packet"
-msgstr ""
-
-#: ../../include/zot.php:693
-msgid "Unable to verify channel signature"
-msgstr ""
-
-#: ../../include/zot.php:2213
-#, php-format
-msgid "Unable to verify site signature for %s"
-msgstr ""
-
-#: ../../include/zot.php:3511
-msgid "invalid target signature"
-msgstr ""
-
-#: ../../include/nav.php:82 ../../include/nav.php:114 ../../boot.php:1496
+#: ../../include/nav.php:82 ../../include/nav.php:114 ../../boot.php:1502
 msgid "Logout"
 msgstr ""
 
@@ -4030,7 +4000,7 @@ msgstr ""
 msgid "Home Page"
 msgstr ""
 
-#: ../../include/nav.php:149 ../../mod/register.php:224 ../../boot.php:1473
+#: ../../include/nav.php:149 ../../mod/register.php:224 ../../boot.php:1479
 msgid "Register"
 msgstr ""
 
@@ -4055,10 +4025,6 @@ msgid "Channel Directory"
 msgstr ""
 
 #: ../../include/nav.php:174
-msgid "Grid"
-msgstr ""
-
-#: ../../include/nav.php:174
 msgid "Your grid"
 msgstr ""
 
@@ -4138,6 +4104,47 @@ msgstr ""
 msgid "Please wait..."
 msgstr ""
 
+#: ../../include/dir_fns.php:126
+msgid "Directory Options"
+msgstr ""
+
+#: ../../include/dir_fns.php:128
+msgid "Safe Mode"
+msgstr ""
+
+#: ../../include/dir_fns.php:128 ../../include/dir_fns.php:129
+#: ../../include/dir_fns.php:130 ../../mod/removeme.php:60
+#: ../../mod/mitem.php:154 ../../mod/mitem.php:155 ../../mod/mitem.php:228
+#: ../../mod/mitem.php:229 ../../mod/connedit.php:630
+#: ../../mod/connedit.php:658 ../../mod/photos.php:625
+#: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159
+#: ../../mod/admin.php:386 ../../mod/menu.php:96 ../../mod/menu.php:153
+#: ../../mod/settings.php:574 ../../mod/api.php:106
+#: ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1507
+msgid "No"
+msgstr ""
+
+#: ../../include/dir_fns.php:128 ../../include/dir_fns.php:129
+#: ../../include/dir_fns.php:130 ../../mod/removeme.php:60
+#: ../../mod/mitem.php:154 ../../mod/mitem.php:155 ../../mod/mitem.php:228
+#: ../../mod/mitem.php:229 ../../mod/photos.php:625
+#: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159
+#: ../../mod/admin.php:388 ../../mod/menu.php:96 ../../mod/menu.php:153
+#: ../../mod/settings.php:574 ../../mod/api.php:105
+#: ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1507
+msgid "Yes"
+msgstr ""
+
+#: ../../include/dir_fns.php:129
+msgid "Public Forums Only"
+msgstr ""
+
+#: ../../include/dir_fns.php:130
+msgid "This Website Only"
+msgstr ""
+
 #: ../../mod/achievements.php:34
 msgid "Some blurb about what to do when you're new here"
 msgstr ""
@@ -4159,8 +4166,8 @@ msgstr ""
 msgid "Suggest a friend for %s"
 msgstr ""
 
-#: ../../mod/directory.php:59 ../../mod/display.php:13 ../../mod/search.php:13
-#: ../../mod/photos.php:453 ../../mod/ratings.php:82
+#: ../../mod/directory.php:59 ../../mod/display.php:13
+#: ../../mod/photos.php:489 ../../mod/search.php:13 ../../mod/ratings.php:82
 #: ../../mod/viewconnections.php:17
 msgid "Public access denied."
 msgstr ""
@@ -4705,247 +4712,247 @@ msgstr ""
 msgid "Could not locate selected profile."
 msgstr ""
 
-#: ../../mod/connedit.php:219
+#: ../../mod/connedit.php:218
 msgid "Connection updated."
 msgstr ""
 
-#: ../../mod/connedit.php:221
+#: ../../mod/connedit.php:220
 msgid "Failed to update connection record."
 msgstr ""
 
-#: ../../mod/connedit.php:268
+#: ../../mod/connedit.php:267
 msgid "is now connected to"
 msgstr ""
 
-#: ../../mod/connedit.php:391
+#: ../../mod/connedit.php:390
 msgid "Could not access address book record."
 msgstr ""
 
-#: ../../mod/connedit.php:405
+#: ../../mod/connedit.php:404
 msgid "Refresh failed - channel is currently unavailable."
 msgstr ""
 
-#: ../../mod/connedit.php:414 ../../mod/connedit.php:423
-#: ../../mod/connedit.php:432 ../../mod/connedit.php:441
-#: ../../mod/connedit.php:454
+#: ../../mod/connedit.php:413 ../../mod/connedit.php:422
+#: ../../mod/connedit.php:431 ../../mod/connedit.php:440
+#: ../../mod/connedit.php:453
 msgid "Unable to set address book parameters."
 msgstr ""
 
-#: ../../mod/connedit.php:478
+#: ../../mod/connedit.php:477
 msgid "Connection has been removed."
 msgstr ""
 
-#: ../../mod/connedit.php:497
+#: ../../mod/connedit.php:496
 #, php-format
 msgid "View %s's profile"
 msgstr ""
 
-#: ../../mod/connedit.php:501
+#: ../../mod/connedit.php:500
 msgid "Refresh Permissions"
 msgstr ""
 
-#: ../../mod/connedit.php:504
+#: ../../mod/connedit.php:503
 msgid "Fetch updated permissions"
 msgstr ""
 
-#: ../../mod/connedit.php:508
+#: ../../mod/connedit.php:507
 msgid "Recent Activity"
 msgstr ""
 
-#: ../../mod/connedit.php:511
+#: ../../mod/connedit.php:510
 msgid "View recent posts and comments"
 msgstr ""
 
-#: ../../mod/connedit.php:515 ../../mod/admin.php:785
+#: ../../mod/connedit.php:514 ../../mod/admin.php:785
 msgid "Unblock"
 msgstr ""
 
-#: ../../mod/connedit.php:515 ../../mod/admin.php:784
+#: ../../mod/connedit.php:514 ../../mod/admin.php:784
 msgid "Block"
 msgstr ""
 
-#: ../../mod/connedit.php:518
+#: ../../mod/connedit.php:517
 msgid "Block (or Unblock) all communications with this connection"
 msgstr ""
 
-#: ../../mod/connedit.php:519
+#: ../../mod/connedit.php:518
 msgid "This connection is blocked!"
 msgstr ""
 
-#: ../../mod/connedit.php:523
+#: ../../mod/connedit.php:522
 msgid "Unignore"
 msgstr ""
 
-#: ../../mod/connedit.php:523 ../../mod/notifications.php:51
+#: ../../mod/connedit.php:522 ../../mod/notifications.php:51
 msgid "Ignore"
 msgstr ""
 
-#: ../../mod/connedit.php:526
+#: ../../mod/connedit.php:525
 msgid "Ignore (or Unignore) all inbound communications from this connection"
 msgstr ""
 
-#: ../../mod/connedit.php:527
+#: ../../mod/connedit.php:526
 msgid "This connection is ignored!"
 msgstr ""
 
-#: ../../mod/connedit.php:531
+#: ../../mod/connedit.php:530
 msgid "Unarchive"
 msgstr ""
 
-#: ../../mod/connedit.php:531
+#: ../../mod/connedit.php:530
 msgid "Archive"
 msgstr ""
 
-#: ../../mod/connedit.php:534
+#: ../../mod/connedit.php:533
 msgid ""
 "Archive (or Unarchive) this connection - mark channel dead but keep content"
 msgstr ""
 
-#: ../../mod/connedit.php:535
+#: ../../mod/connedit.php:534
 msgid "This connection is archived!"
 msgstr ""
 
-#: ../../mod/connedit.php:539
+#: ../../mod/connedit.php:538
 msgid "Unhide"
 msgstr ""
 
-#: ../../mod/connedit.php:539
+#: ../../mod/connedit.php:538
 msgid "Hide"
 msgstr ""
 
-#: ../../mod/connedit.php:542
+#: ../../mod/connedit.php:541
 msgid "Hide or Unhide this connection from your other connections"
 msgstr ""
 
-#: ../../mod/connedit.php:543
+#: ../../mod/connedit.php:542
 msgid "This connection is hidden!"
 msgstr ""
 
-#: ../../mod/connedit.php:550
+#: ../../mod/connedit.php:549
 msgid "Delete this connection"
 msgstr ""
 
-#: ../../mod/connedit.php:631
+#: ../../mod/connedit.php:630
 msgid "Approve this connection"
 msgstr ""
 
-#: ../../mod/connedit.php:631
+#: ../../mod/connedit.php:630
 msgid "Accept connection to allow communication"
 msgstr ""
 
-#: ../../mod/connedit.php:636
+#: ../../mod/connedit.php:635
 msgid "Set Affinity"
 msgstr ""
 
-#: ../../mod/connedit.php:639
+#: ../../mod/connedit.php:638
 msgid "Set Profile"
 msgstr ""
 
-#: ../../mod/connedit.php:642
+#: ../../mod/connedit.php:641
 msgid "Set Affinity & Profile"
 msgstr ""
 
-#: ../../mod/connedit.php:659
+#: ../../mod/connedit.php:658
 msgid "Apply these permissions automatically"
 msgstr ""
 
-#: ../../mod/connedit.php:661
+#: ../../mod/connedit.php:660
 msgid "This connection's address is"
 msgstr ""
 
-#: ../../mod/connedit.php:664
+#: ../../mod/connedit.php:663
 msgid ""
 "The permissions indicated on this page will be applied to all new "
 "connections."
 msgstr ""
 
-#: ../../mod/connedit.php:666
+#: ../../mod/connedit.php:665
 msgid "Slide to adjust your degree of friendship"
 msgstr ""
 
-#: ../../mod/connedit.php:668
+#: ../../mod/connedit.php:667
 msgid "Slide to adjust your rating"
 msgstr ""
 
-#: ../../mod/connedit.php:669 ../../mod/connedit.php:674
+#: ../../mod/connedit.php:668 ../../mod/connedit.php:673
 msgid "Optionally explain your rating"
 msgstr ""
 
-#: ../../mod/connedit.php:671
+#: ../../mod/connedit.php:670
 msgid "Custom Filter"
 msgstr ""
 
-#: ../../mod/connedit.php:672
+#: ../../mod/connedit.php:671
 msgid "Only import posts with this text"
 msgstr ""
 
-#: ../../mod/connedit.php:672 ../../mod/connedit.php:673
+#: ../../mod/connedit.php:671 ../../mod/connedit.php:672
 msgid ""
 "words one per line or #tags or /patterns/, leave blank to import all posts"
 msgstr ""
 
-#: ../../mod/connedit.php:673
+#: ../../mod/connedit.php:672
 msgid "Do not import posts with this text"
 msgstr ""
 
-#: ../../mod/connedit.php:675
+#: ../../mod/connedit.php:674
 msgid "This information is public!"
 msgstr ""
 
-#: ../../mod/connedit.php:680
+#: ../../mod/connedit.php:679
 msgid "Connection Pending Approval"
 msgstr ""
 
-#: ../../mod/connedit.php:681
+#: ../../mod/connedit.php:680
 msgid "Connection Request"
 msgstr ""
 
-#: ../../mod/connedit.php:682
+#: ../../mod/connedit.php:681
 #, php-format
 msgid ""
 "(%s) would like to connect with you. Please approve this connection to allow "
 "communication."
 msgstr ""
 
-#: ../../mod/connedit.php:683 ../../mod/admin.php:781
+#: ../../mod/connedit.php:682 ../../mod/admin.php:781
 msgid "Approve"
 msgstr ""
 
-#: ../../mod/connedit.php:684
+#: ../../mod/connedit.php:683
 msgid "Approve Later"
 msgstr ""
 
-#: ../../mod/connedit.php:687
+#: ../../mod/connedit.php:686
 msgid "inherited"
 msgstr ""
 
-#: ../../mod/connedit.php:689
+#: ../../mod/connedit.php:688
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr ""
 
-#: ../../mod/connedit.php:691
+#: ../../mod/connedit.php:690
 msgid "Their Settings"
 msgstr ""
 
-#: ../../mod/connedit.php:692
+#: ../../mod/connedit.php:691
 msgid "My Settings"
 msgstr ""
 
-#: ../../mod/connedit.php:694
+#: ../../mod/connedit.php:693
 msgid "Individual Permissions"
 msgstr ""
 
-#: ../../mod/connedit.php:695
+#: ../../mod/connedit.php:694
 msgid ""
 "Some permissions may be inherited from your channel's <a href=\"settings"
 "\"><strong>privacy settings</strong></a>, which have higher priority than "
 "individual settings. You can <strong>not</strong> change those settings here."
 msgstr ""
 
-#: ../../mod/connedit.php:696
+#: ../../mod/connedit.php:695
 msgid ""
 "Some permissions may be inherited from your channel's <a href=\"settings"
 "\"><strong>privacy settings</strong></a>, which have higher priority than "
@@ -4953,7 +4960,7 @@ msgid ""
 "any impact unless the inherited setting changes."
 msgstr ""
 
-#: ../../mod/connedit.php:697
+#: ../../mod/connedit.php:696
 msgid "Last update:"
 msgstr ""
 
@@ -4980,49 +4987,163 @@ msgid ""
 "to correctly use this feature."
 msgstr ""
 
-#: ../../mod/pubsites.php:16
-msgid "Public Sites"
+#: ../../mod/photos.php:79
+msgid "Page owner information could not be retrieved."
 msgstr ""
 
-#: ../../mod/pubsites.php:19
-msgid ""
-"The listed sites allow public registration for the $Projectname network. All "
-"sites in the network are interlinked so membership on any of them conveys "
-"membership in the network as a whole. Some sites may require subscription or "
-"provide tiered service plans. The provider links <strong>may</strong> "
-"provide additional details."
+#: ../../mod/photos.php:100
+msgid "Album not found."
 msgstr ""
 
-#: ../../mod/pubsites.php:25
-msgid "Rate this hub"
+#: ../../mod/photos.php:127
+msgid "Delete Album"
 msgstr ""
 
-#: ../../mod/pubsites.php:26
-msgid "Site URL"
+#: ../../mod/photos.php:171 ../../mod/photos.php:1006
+msgid "Delete Photo"
 msgstr ""
 
-#: ../../mod/pubsites.php:26
-msgid "Access Type"
+#: ../../mod/photos.php:500
+msgid "No photos selected"
 msgstr ""
 
-#: ../../mod/pubsites.php:26
-msgid "Registration Policy"
+#: ../../mod/photos.php:549
+msgid "Access to this item is restricted."
 msgstr ""
 
-#: ../../mod/pubsites.php:26 ../../mod/profiles.php:454
-msgid "Location"
+#: ../../mod/photos.php:588
+#, php-format
+msgid "%1$.2f MB of %2$.2f MB photo storage used."
 msgstr ""
 
-#: ../../mod/pubsites.php:26
-msgid "View hub ratings"
+#: ../../mod/photos.php:591
+#, php-format
+msgid "%1$.2f MB photo storage used."
 msgstr ""
 
-#: ../../mod/pubsites.php:30
-msgid "Rate"
+#: ../../mod/photos.php:619
+msgid "Upload Photos"
 msgstr ""
 
-#: ../../mod/pubsites.php:31
-msgid "View ratings"
+#: ../../mod/photos.php:623
+msgid "Enter an album name"
+msgstr ""
+
+#: ../../mod/photos.php:624
+msgid "or select an existing album (doubleclick)"
+msgstr ""
+
+#: ../../mod/photos.php:625
+msgid "Create a status post for this upload"
+msgstr ""
+
+#: ../../mod/photos.php:652
+msgid "Album name could not be decoded"
+msgstr ""
+
+#: ../../mod/photos.php:696 ../../mod/photos.php:1233
+#: ../../mod/photos.php:1250
+msgid "Contact Photos"
+msgstr ""
+
+#: ../../mod/photos.php:724
+msgid "Show Newest First"
+msgstr ""
+
+#: ../../mod/photos.php:726
+msgid "Show Oldest First"
+msgstr ""
+
+#: ../../mod/photos.php:750 ../../mod/photos.php:1283
+msgid "View Photo"
+msgstr ""
+
+#: ../../mod/photos.php:779
+msgid "Edit Album"
+msgstr ""
+
+#: ../../mod/photos.php:824
+msgid "Permission denied. Access to this item may be restricted."
+msgstr ""
+
+#: ../../mod/photos.php:826
+msgid "Photo not available"
+msgstr ""
+
+#: ../../mod/photos.php:884
+msgid "Use as profile photo"
+msgstr ""
+
+#: ../../mod/photos.php:891
+msgid "Private Photo"
+msgstr ""
+
+#: ../../mod/photos.php:902 ../../mod/events.php:528
+msgid "Previous"
+msgstr ""
+
+#: ../../mod/photos.php:906
+msgid "View Full Size"
+msgstr ""
+
+#: ../../mod/photos.php:911 ../../mod/events.php:529 ../../mod/setup.php:285
+msgid "Next"
+msgstr ""
+
+#: ../../mod/photos.php:951 ../../mod/tagrm.php:133
+msgid "Remove"
+msgstr ""
+
+#: ../../mod/photos.php:985
+msgid "Edit photo"
+msgstr ""
+
+#: ../../mod/photos.php:987
+msgid "Rotate CW (right)"
+msgstr ""
+
+#: ../../mod/photos.php:988
+msgid "Rotate CCW (left)"
+msgstr ""
+
+#: ../../mod/photos.php:991
+msgid "Enter a new album name"
+msgstr ""
+
+#: ../../mod/photos.php:992
+msgid "or select an existing one (doubleclick)"
+msgstr ""
+
+#: ../../mod/photos.php:995
+msgid "Caption"
+msgstr ""
+
+#: ../../mod/photos.php:997
+msgid "Add a Tag"
+msgstr ""
+
+#: ../../mod/photos.php:1001
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
+msgstr ""
+
+#: ../../mod/photos.php:1004
+msgid "Flag as adult in album view"
+msgstr ""
+
+#: ../../mod/photos.php:1196
+msgid "In This Photo:"
+msgstr ""
+
+#: ../../mod/photos.php:1201
+msgid "Map"
+msgstr ""
+
+#: ../../mod/photos.php:1289
+msgid "View Album"
+msgstr ""
+
+#: ../../mod/photos.php:1312
+msgid "Recent Photos"
 msgstr ""
 
 #: ../../mod/filestorage.php:82
@@ -5069,6 +5190,10 @@ msgstr ""
 msgid "Notify your contacts about this file"
 msgstr ""
 
+#: ../../mod/regdir.php:45 ../../mod/dirsearch.php:21
+msgid "This site is not a directory server"
+msgstr ""
+
 #: ../../mod/layouts.php:121 ../../mod/layouts.php:179
 #: ../../mod/editlayout.php:161
 msgid "Layout Name"
@@ -5142,39 +5267,43 @@ msgstr ""
 msgid "You must be logged in to see this page."
 msgstr ""
 
-#: ../../mod/chat.php:171
+#: ../../mod/chat.php:174
 msgid "Room not found"
 msgstr ""
 
-#: ../../mod/chat.php:182
+#: ../../mod/chat.php:185
 msgid "Leave Room"
 msgstr ""
 
-#: ../../mod/chat.php:183
+#: ../../mod/chat.php:186
 msgid "Delete This Room"
 msgstr ""
 
-#: ../../mod/chat.php:184
+#: ../../mod/chat.php:187
 msgid "I am away right now"
 msgstr ""
 
-#: ../../mod/chat.php:185
+#: ../../mod/chat.php:188
 msgid "I am online"
 msgstr ""
 
-#: ../../mod/chat.php:187
+#: ../../mod/chat.php:190
 msgid "Bookmark this room"
 msgstr ""
 
-#: ../../mod/chat.php:205 ../../mod/chat.php:227
+#: ../../mod/chat.php:208 ../../mod/chat.php:231
 msgid "New Chatroom"
 msgstr ""
 
-#: ../../mod/chat.php:206
+#: ../../mod/chat.php:209
 msgid "Chatroom Name"
 msgstr ""
 
-#: ../../mod/chat.php:223
+#: ../../mod/chat.php:210
+msgid "Expiration of chats (minutes)"
+msgstr ""
+
+#: ../../mod/chat.php:227
 #, php-format
 msgid "%1$s's Chatrooms"
 msgstr ""
@@ -5189,133 +5318,210 @@ msgstr ""
 msgid "Search results for: %s"
 msgstr ""
 
-#: ../../mod/message.php:34
+#: ../../mod/rate.php:158
+msgid "Website:"
+msgstr ""
+
+#: ../../mod/rate.php:161
+#, php-format
+msgid "Remote Channel [%s] (not yet known on this site)"
+msgstr ""
+
+#: ../../mod/rate.php:162
+msgid "Rating (this information is public)"
+msgstr ""
+
+#: ../../mod/rate.php:163
+msgid "Optionally explain your rating (this information is public)"
+msgstr ""
+
+#: ../../mod/mail.php:33
+msgid "Unable to lookup recipient."
+msgstr ""
+
+#: ../../mod/mail.php:41
+msgid "Unable to communicate with requested channel."
+msgstr ""
+
+#: ../../mod/mail.php:48
+msgid "Cannot verify requested channel."
+msgstr ""
+
+#: ../../mod/mail.php:74
+msgid "Selected channel has private message restrictions. Send failed."
+msgstr ""
+
+#: ../../mod/mail.php:132
+msgid "Messages"
+msgstr ""
+
+#: ../../mod/mail.php:167
+msgid "Message recalled."
+msgstr ""
+
+#: ../../mod/mail.php:180
 msgid "Conversation removed."
 msgstr ""
 
-#: ../../mod/channel.php:97
-msgid "Insufficient permissions.  Request redirected to profile page."
+#: ../../mod/mail.php:223
+msgid "Requested channel is not in this network"
 msgstr ""
 
-#: ../../mod/editpost.php:20 ../../mod/editblock.php:78
-#: ../../mod/editblock.php:94 ../../mod/editlayout.php:76
-#: ../../mod/editwebpage.php:77
-msgid "Item not found"
+#: ../../mod/mail.php:231
+msgid "Send Private Message"
 msgstr ""
 
-#: ../../mod/editpost.php:31
-msgid "Item is not editable"
+#: ../../mod/mail.php:232 ../../mod/mail.php:361
+msgid "To:"
 msgstr ""
 
-#: ../../mod/editpost.php:55
-msgid "Delete item?"
+#: ../../mod/mail.php:235 ../../mod/mail.php:363
+msgid "Subject:"
 msgstr ""
 
-#: ../../mod/editpost.php:122 ../../mod/editblock.php:145
-#: ../../mod/editlayout.php:143 ../../mod/editwebpage.php:185
-msgid "Insert YouTube video"
+#: ../../mod/mail.php:238 ../../mod/invite.php:131
+msgid "Your message:"
 msgstr ""
 
-#: ../../mod/editpost.php:123 ../../mod/editblock.php:146
-#: ../../mod/editlayout.php:144 ../../mod/editwebpage.php:186
-msgid "Insert Vorbis [.ogg] video"
+#: ../../mod/mail.php:242
+msgid "Send"
 msgstr ""
 
-#: ../../mod/editpost.php:124 ../../mod/editblock.php:147
-#: ../../mod/editlayout.php:145 ../../mod/editwebpage.php:187
-msgid "Insert Vorbis [.ogg] audio"
+#: ../../mod/mail.php:333
+msgid "Delete message"
 msgstr ""
 
-#: ../../mod/editpost.php:165 ../../mod/rpost.php:128
-msgid "Edit post"
+#: ../../mod/mail.php:334
+msgid "Delivery report"
+msgstr ""
+
+#: ../../mod/mail.php:335
+msgid "Recall message"
 msgstr ""
 
-#: ../../mod/dreport.php:15
+#: ../../mod/mail.php:337
+msgid "Message has been recalled."
+msgstr ""
+
+#: ../../mod/mail.php:354
+msgid "Delete Conversation"
+msgstr ""
+
+#: ../../mod/mail.php:356
+msgid ""
+"No secure communications available. You <strong>may</strong> be able to "
+"respond from the sender's profile page."
+msgstr ""
+
+#: ../../mod/mail.php:360
+msgid "Send Reply"
+msgstr ""
+
+#: ../../mod/mail.php:365
+#, php-format
+msgid "Your message for %s (%s):"
+msgstr ""
+
+#: ../../mod/dreport.php:23
 msgid "Invalid message"
 msgstr ""
 
-#: ../../mod/dreport.php:25
+#: ../../mod/dreport.php:55
 msgid "no results"
 msgstr ""
 
-#: ../../mod/dreport.php:30
+#: ../../mod/dreport.php:60
 #, php-format
 msgid "Delivery report for %1$s"
 msgstr ""
 
-#: ../../mod/dreport.php:39
+#: ../../mod/dreport.php:74
 msgid "channel sync processed"
 msgstr ""
 
-#: ../../mod/dreport.php:43
+#: ../../mod/dreport.php:78
 msgid "queued"
 msgstr ""
 
-#: ../../mod/dreport.php:47
+#: ../../mod/dreport.php:82
 msgid "posted"
 msgstr ""
 
-#: ../../mod/dreport.php:51
+#: ../../mod/dreport.php:86
 msgid "accepted for delivery"
 msgstr ""
 
-#: ../../mod/dreport.php:55
+#: ../../mod/dreport.php:90
 msgid "updated"
 msgstr ""
 
-#: ../../mod/dreport.php:58
+#: ../../mod/dreport.php:93
 msgid "update ignored"
 msgstr ""
 
-#: ../../mod/dreport.php:61
+#: ../../mod/dreport.php:96
 msgid "permission denied"
 msgstr ""
 
-#: ../../mod/editblock.php:118
-msgid "Delete block?"
+#: ../../mod/dreport.php:100
+msgid "recipient not found"
 msgstr ""
 
-#: ../../mod/editblock.php:180
-msgid "Edit Block"
+#: ../../mod/dreport.php:103
+msgid "mail recalled"
 msgstr ""
 
-#: ../../mod/home.php:57 ../../mod/home.php:63 ../../mod/siteinfo.php:157
-msgid "$Projectname"
+#: ../../mod/dreport.php:106
+msgid "duplicate mail received"
 msgstr ""
 
-#: ../../mod/home.php:73
-#, php-format
-msgid "Welcome to %s"
+#: ../../mod/dreport.php:109
+msgid "mail delivered"
 msgstr ""
 
-#: ../../mod/item.php:174
-msgid "Unable to locate original post."
+#: ../../mod/editblock.php:78 ../../mod/editblock.php:94
+#: ../../mod/editpost.php:20 ../../mod/editlayout.php:76
+#: ../../mod/editwebpage.php:77
+msgid "Item not found"
 msgstr ""
 
-#: ../../mod/item.php:407
-msgid "Empty post discarded."
+#: ../../mod/editblock.php:118
+msgid "Delete block?"
 msgstr ""
 
-#: ../../mod/item.php:447
-msgid "Executable content type not permitted to this channel."
+#: ../../mod/editblock.php:145 ../../mod/editpost.php:122
+#: ../../mod/editlayout.php:143 ../../mod/editwebpage.php:185
+msgid "Insert YouTube video"
 msgstr ""
 
-#: ../../mod/item.php:896
-msgid "System error. Post not saved."
+#: ../../mod/editblock.php:146 ../../mod/editpost.php:123
+#: ../../mod/editlayout.php:144 ../../mod/editwebpage.php:186
+msgid "Insert Vorbis [.ogg] video"
 msgstr ""
 
-#: ../../mod/item.php:1163
-msgid "Unable to obtain post information from database."
+#: ../../mod/editblock.php:147 ../../mod/editpost.php:124
+#: ../../mod/editlayout.php:145 ../../mod/editwebpage.php:187
+msgid "Insert Vorbis [.ogg] audio"
 msgstr ""
 
-#: ../../mod/item.php:1170
-#, php-format
-msgid "You have reached your limit of %1$.0f top level posts."
+#: ../../mod/editblock.php:180
+msgid "Edit Block"
 msgstr ""
 
-#: ../../mod/item.php:1177
-#, php-format
-msgid "You have reached your limit of %1$.0f webpages."
+#: ../../mod/dirsearch.php:29
+msgid "This directory server requires an access token"
+msgstr ""
+
+#: ../../mod/editpost.php:31
+msgid "Item is not editable"
+msgstr ""
+
+#: ../../mod/editpost.php:55
+msgid "Delete item?"
+msgstr ""
+
+#: ../../mod/editpost.php:165 ../../mod/rpost.php:128
+msgid "Edit post"
 msgstr ""
 
 #: ../../mod/oexchange.php:23
@@ -6331,7 +6537,7 @@ msgid ""
 "Password reset failed."
 msgstr ""
 
-#: ../../mod/lostpass.php:86 ../../boot.php:1505
+#: ../../mod/lostpass.php:86 ../../boot.php:1511
 msgid "Password Reset"
 msgstr ""
 
@@ -6380,186 +6586,19 @@ msgstr ""
 msgid "Reset"
 msgstr ""
 
-#: ../../mod/photos.php:79
-msgid "Page owner information could not be retrieved."
-msgstr ""
-
-#: ../../mod/photos.php:100
-msgid "Album not found."
-msgstr ""
-
-#: ../../mod/photos.php:127
-msgid "Delete Album"
-msgstr ""
-
-#: ../../mod/photos.php:170 ../../mod/photos.php:970
-msgid "Delete Photo"
-msgstr ""
-
-#: ../../mod/photos.php:464
-msgid "No photos selected"
-msgstr ""
-
-#: ../../mod/photos.php:513
-msgid "Access to this item is restricted."
-msgstr ""
-
-#: ../../mod/photos.php:552
-#, php-format
-msgid "%1$.2f MB of %2$.2f MB photo storage used."
+#: ../../mod/home.php:57 ../../mod/home.php:65 ../../mod/siteinfo.php:157
+msgid "$Projectname"
 msgstr ""
 
-#: ../../mod/photos.php:555
+#: ../../mod/home.php:75
 #, php-format
-msgid "%1$.2f MB photo storage used."
-msgstr ""
-
-#: ../../mod/photos.php:583
-msgid "Upload Photos"
-msgstr ""
-
-#: ../../mod/photos.php:587
-msgid "Enter an album name"
-msgstr ""
-
-#: ../../mod/photos.php:588
-msgid "or select an existing album (doubleclick)"
-msgstr ""
-
-#: ../../mod/photos.php:589
-msgid "Create a status post for this upload"
-msgstr ""
-
-#: ../../mod/photos.php:616
-msgid "Album name could not be decoded"
-msgstr ""
-
-#: ../../mod/photos.php:660 ../../mod/photos.php:1197
-#: ../../mod/photos.php:1214
-msgid "Contact Photos"
-msgstr ""
-
-#: ../../mod/photos.php:688
-msgid "Show Newest First"
-msgstr ""
-
-#: ../../mod/photos.php:690
-msgid "Show Oldest First"
-msgstr ""
-
-#: ../../mod/photos.php:714 ../../mod/photos.php:1247
-msgid "View Photo"
-msgstr ""
-
-#: ../../mod/photos.php:743
-msgid "Edit Album"
-msgstr ""
-
-#: ../../mod/photos.php:788
-msgid "Permission denied. Access to this item may be restricted."
-msgstr ""
-
-#: ../../mod/photos.php:790
-msgid "Photo not available"
-msgstr ""
-
-#: ../../mod/photos.php:848
-msgid "Use as profile photo"
-msgstr ""
-
-#: ../../mod/photos.php:855
-msgid "Private Photo"
-msgstr ""
-
-#: ../../mod/photos.php:866 ../../mod/events.php:528
-msgid "Previous"
-msgstr ""
-
-#: ../../mod/photos.php:870
-msgid "View Full Size"
-msgstr ""
-
-#: ../../mod/photos.php:875 ../../mod/events.php:529 ../../mod/setup.php:285
-msgid "Next"
-msgstr ""
-
-#: ../../mod/photos.php:915 ../../mod/tagrm.php:133
-msgid "Remove"
-msgstr ""
-
-#: ../../mod/photos.php:949
-msgid "Edit photo"
-msgstr ""
-
-#: ../../mod/photos.php:951
-msgid "Rotate CW (right)"
-msgstr ""
-
-#: ../../mod/photos.php:952
-msgid "Rotate CCW (left)"
-msgstr ""
-
-#: ../../mod/photos.php:955
-msgid "Enter a new album name"
-msgstr ""
-
-#: ../../mod/photos.php:956
-msgid "or select an existing one (doubleclick)"
-msgstr ""
-
-#: ../../mod/photos.php:959
-msgid "Caption"
-msgstr ""
-
-#: ../../mod/photos.php:961
-msgid "Add a Tag"
-msgstr ""
-
-#: ../../mod/photos.php:965
-msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
-msgstr ""
-
-#: ../../mod/photos.php:968
-msgid "Flag as adult in album view"
-msgstr ""
-
-#: ../../mod/photos.php:1160
-msgid "In This Photo:"
-msgstr ""
-
-#: ../../mod/photos.php:1165
-msgid "Map"
-msgstr ""
-
-#: ../../mod/photos.php:1253
-msgid "View Album"
-msgstr ""
-
-#: ../../mod/photos.php:1276
-msgid "Recent Photos"
+msgid "Welcome to %s"
 msgstr ""
 
 #: ../../mod/dav.php:121
 msgid "$Projectname channel"
 msgstr ""
 
-#: ../../mod/rate.php:157
-msgid "Website:"
-msgstr ""
-
-#: ../../mod/rate.php:160
-#, php-format
-msgid "Remote Channel [%s] (not yet known on this site)"
-msgstr ""
-
-#: ../../mod/rate.php:161
-msgid "Rating (this information is public)"
-msgstr ""
-
-#: ../../mod/rate.php:162
-msgid "Optionally explain your rating (this information is public)"
-msgstr ""
-
 #: ../../mod/events.php:21
 msgid "Calendar entries imported."
 msgstr ""
@@ -6818,82 +6857,34 @@ msgstr ""
 msgid "Description: "
 msgstr ""
 
-#: ../../mod/regdir.php:45 ../../mod/dirsearch.php:21
-msgid "This site is not a directory server"
-msgstr ""
-
-#: ../../mod/mail.php:33
-msgid "Unable to lookup recipient."
-msgstr ""
-
-#: ../../mod/mail.php:41
-msgid "Unable to communicate with requested channel."
-msgstr ""
-
-#: ../../mod/mail.php:48
-msgid "Cannot verify requested channel."
-msgstr ""
-
-#: ../../mod/mail.php:74
-msgid "Selected channel has private message restrictions. Send failed."
-msgstr ""
-
-#: ../../mod/mail.php:128
-msgid "Messages"
-msgstr ""
-
-#: ../../mod/mail.php:138
-msgid "Message deleted."
-msgstr ""
-
-#: ../../mod/mail.php:154
-msgid "Message recalled."
-msgstr ""
-
-#: ../../mod/mail.php:221
-msgid "Send Private Message"
-msgstr ""
-
-#: ../../mod/mail.php:222 ../../mod/mail.php:352
-msgid "To:"
-msgstr ""
-
-#: ../../mod/mail.php:227 ../../mod/mail.php:341 ../../mod/mail.php:354
-msgid "Subject:"
-msgstr ""
-
-#: ../../mod/mail.php:231 ../../mod/mail.php:357 ../../mod/invite.php:131
-msgid "Your message:"
-msgstr ""
-
-#: ../../mod/mail.php:238
-msgid "Send"
+#: ../../mod/item.php:173
+msgid "Unable to locate original post."
 msgstr ""
 
-#: ../../mod/mail.php:322
-msgid "Delete message"
+#: ../../mod/item.php:417
+msgid "Empty post discarded."
 msgstr ""
 
-#: ../../mod/mail.php:323
-msgid "Recall message"
+#: ../../mod/item.php:457
+msgid "Executable content type not permitted to this channel."
 msgstr ""
 
-#: ../../mod/mail.php:325
-msgid "Message has been recalled."
+#: ../../mod/item.php:906
+msgid "System error. Post not saved."
 msgstr ""
 
-#: ../../mod/mail.php:345
-msgid "Delete Conversation"
+#: ../../mod/item.php:1173
+msgid "Unable to obtain post information from database."
 msgstr ""
 
-#: ../../mod/mail.php:347
-msgid ""
-"No secure communications available. You <strong>may</strong> be able to "
-"respond from the sender's profile page."
+#: ../../mod/item.php:1180
+#, php-format
+msgid "You have reached your limit of %1$.0f top level posts."
 msgstr ""
 
-#: ../../mod/mail.php:351
-msgid "Send Reply"
+#: ../../mod/item.php:1187
+#, php-format
+msgid "You have reached your limit of %1$.0f webpages."
 msgstr ""
 
 #: ../../mod/webpages.php:191
@@ -7022,6 +7013,55 @@ msgstr ""
 msgid "Item not available."
 msgstr ""
 
+#: ../../mod/pubsites.php:16
+msgid "Public Sites"
+msgstr ""
+
+#: ../../mod/pubsites.php:19
+msgid ""
+"The listed sites allow public registration for the $Projectname network. All "
+"sites in the network are interlinked so membership on any of them conveys "
+"membership in the network as a whole. Some sites may require subscription or "
+"provide tiered service plans. The provider links <strong>may</strong> "
+"provide additional details."
+msgstr ""
+
+#: ../../mod/pubsites.php:25
+msgid "Rate this hub"
+msgstr ""
+
+#: ../../mod/pubsites.php:26
+msgid "Site URL"
+msgstr ""
+
+#: ../../mod/pubsites.php:26
+msgid "Access Type"
+msgstr ""
+
+#: ../../mod/pubsites.php:26
+msgid "Registration Policy"
+msgstr ""
+
+#: ../../mod/pubsites.php:26 ../../mod/profiles.php:454
+msgid "Location"
+msgstr ""
+
+#: ../../mod/pubsites.php:26
+msgid "Project"
+msgstr ""
+
+#: ../../mod/pubsites.php:26
+msgid "View hub ratings"
+msgstr ""
+
+#: ../../mod/pubsites.php:30
+msgid "Rate"
+msgstr ""
+
+#: ../../mod/pubsites.php:31
+msgid "View ratings"
+msgstr ""
+
 #: ../../mod/sources.php:32
 msgid "Failed to create source. No channel selected."
 msgstr ""
@@ -7126,8 +7166,8 @@ msgstr ""
 msgid "Authenticate"
 msgstr ""
 
-#: ../../mod/dirsearch.php:29
-msgid "This directory server requires an access token"
+#: ../../mod/channel.php:97
+msgid "Insufficient permissions.  Request redirected to profile page."
 msgstr ""
 
 #: ../../mod/siteinfo.php:111
@@ -7167,7 +7207,7 @@ msgstr ""
 
 #: ../../mod/siteinfo.php:168
 msgid ""
-"Please visit <a href=\"https://redmatrix.me\">redmatrix.me</a> to learn more "
+"Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more "
 "about $Projectname."
 msgstr ""
 
@@ -7214,42 +7254,42 @@ msgstr ""
 msgid "No channel. Import failed."
 msgstr ""
 
-#: ../../mod/import.php:493
+#: ../../mod/import.php:499
 msgid "You must be logged in to use this feature."
 msgstr ""
 
-#: ../../mod/import.php:498
+#: ../../mod/import.php:504
 msgid "Import Channel"
 msgstr ""
 
-#: ../../mod/import.php:499
+#: ../../mod/import.php:505
 msgid ""
 "Use this form to import an existing channel from a different server/hub. You "
 "may retrieve the channel identity from the old server/hub via the network or "
 "provide an export file."
 msgstr ""
 
-#: ../../mod/import.php:500 ../../mod/import_items.php:121
+#: ../../mod/import.php:506 ../../mod/import_items.php:121
 msgid "File to Upload"
 msgstr ""
 
-#: ../../mod/import.php:501
+#: ../../mod/import.php:507
 msgid "Or provide the old server/hub details"
 msgstr ""
 
-#: ../../mod/import.php:502
+#: ../../mod/import.php:508
 msgid "Your old identity address (xyz@example.com)"
 msgstr ""
 
-#: ../../mod/import.php:503
+#: ../../mod/import.php:509
 msgid "Your old login email address"
 msgstr ""
 
-#: ../../mod/import.php:504
+#: ../../mod/import.php:510
 msgid "Your old login password"
 msgstr ""
 
-#: ../../mod/import.php:505
+#: ../../mod/import.php:511
 msgid ""
 "For either option, please choose whether to make this hub your new primary "
 "address, or whether your old location should continue this role. You will be "
@@ -7257,16 +7297,16 @@ msgid ""
 "location for files, photos, and media."
 msgstr ""
 
-#: ../../mod/import.php:506
+#: ../../mod/import.php:512
 msgid "Make this hub my primary location"
 msgstr ""
 
-#: ../../mod/import.php:507
+#: ../../mod/import.php:513
 msgid ""
 "Import existing posts if possible (experimental - limited by available memory"
 msgstr ""
 
-#: ../../mod/import.php:508
+#: ../../mod/import.php:514
 msgid ""
 "This process may take several minutes to complete. Please submit the form "
 "only once and leave this page open until finished."
@@ -8330,7 +8370,7 @@ msgid "Database Server Name"
 msgstr ""
 
 #: ../../mod/setup.php:315
-msgid "Default is localhost"
+msgid "Default is 127.0.0.1"
 msgstr ""
 
 #: ../../mod/setup.php:316
@@ -9120,51 +9160,51 @@ msgstr ""
 msgid "Set size of followup author photos"
 msgstr ""
 
-#: ../../boot.php:1302
+#: ../../boot.php:1308
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: ../../boot.php:1305
+#: ../../boot.php:1311
 #, php-format
 msgid "Update Error at %s"
 msgstr ""
 
-#: ../../boot.php:1472
+#: ../../boot.php:1478
 msgid ""
 "Create an account to access services and applications within the Hubzilla"
 msgstr ""
 
-#: ../../boot.php:1500
+#: ../../boot.php:1506
 msgid "Password"
 msgstr ""
 
-#: ../../boot.php:1501
+#: ../../boot.php:1507
 msgid "Remember me"
 msgstr ""
 
-#: ../../boot.php:1504
+#: ../../boot.php:1510
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:2130
+#: ../../boot.php:2136
 msgid "toggle mobile"
 msgstr ""
 
-#: ../../boot.php:2265
+#: ../../boot.php:2271
 msgid "Website SSL certificate is not valid. Please correct."
 msgstr ""
 
-#: ../../boot.php:2268
+#: ../../boot.php:2274
 #, php-format
 msgid "[hubzilla] Website SSL error for %s"
 msgstr ""
 
-#: ../../boot.php:2305
+#: ../../boot.php:2311
 msgid "Cron/Scheduled tasks not running."
 msgstr ""
 
-#: ../../boot.php:2309
+#: ../../boot.php:2315
 #, php-format
 msgid "[hubzilla] Cron tasks not running on %s"
 msgstr ""
diff --git a/util/messages.po b/util/messages.po
index 341c042bb..6380cdfac 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2015-09-25.1166\n"
+"Project-Id-Version: 2015-10-17.1188\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-25 00:05-0700\n"
+"POT-Creation-Date: 2015-10-17 16:47-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -416,7 +416,7 @@ msgstr ""
 msgid "Edited"
 msgstr ""
 
-#: ../../include/api.php:1234
+#: ../../include/api.php:1267
 msgid "Public Timeline"
 msgstr ""
 
@@ -828,7 +828,8 @@ msgstr ""
 msgid "April"
 msgstr ""
 
-#: ../../include/text.php:1201
+#: ../../include/text.php:1201 ../../mod/uexport.php:58
+#: ../../mod/uexport.php:59
 msgid "May"
 msgstr ""
 
@@ -1374,7 +1375,7 @@ msgstr ""
 
 #: ../../include/widgets.php:136 ../../include/widgets.php:175
 #: ../../include/Contact.php:107 ../../include/conversation.php:956
-#: ../../include/identity.php:933 ../../mod/directory.php:316
+#: ../../include/identity.php:956 ../../mod/directory.php:316
 #: ../../mod/match.php:64 ../../mod/suggest.php:52
 msgid "Connect"
 msgstr ""
@@ -1551,7 +1552,7 @@ msgid "Finishes:"
 msgstr ""
 
 #: ../../include/event.php:50 ../../include/bb2diaspora.php:481
-#: ../../include/identity.php:984 ../../mod/directory.php:302
+#: ../../include/identity.php:1007 ../../mod/directory.php:302
 #: ../../mod/events.php:684
 msgid "Location:"
 msgstr ""
@@ -1855,7 +1856,7 @@ msgid "View all"
 msgstr ""
 
 #: ../../include/ItemObject.php:179 ../../include/taxonomy.php:396
-#: ../../include/conversation.php:1712 ../../include/identity.php:1243
+#: ../../include/conversation.php:1712 ../../include/identity.php:1266
 #: ../../mod/photos.php:1019
 msgctxt "noun"
 msgid "Like"
@@ -2107,7 +2108,7 @@ msgstr ""
 msgid "Manage/Edit profiles"
 msgstr ""
 
-#: ../../include/nav.php:95 ../../include/identity.php:956
+#: ../../include/nav.php:95 ../../include/identity.php:979
 msgid "Edit Profile"
 msgstr ""
 
@@ -3037,14 +3038,14 @@ msgstr ""
 msgid "Visible to specific connections."
 msgstr ""
 
-#: ../../include/items.php:4286 ../../mod/thing.php:74
+#: ../../include/items.php:4310 ../../mod/thing.php:74
 #: ../../mod/filestorage.php:27 ../../mod/viewsrc.php:20
 #: ../../mod/admin.php:167 ../../mod/admin.php:1025 ../../mod/admin.php:1225
 #: ../../mod/display.php:36
 msgid "Item not found."
 msgstr ""
 
-#: ../../include/items.php:4359 ../../include/attach.php:137
+#: ../../include/items.php:4383 ../../include/attach.php:137
 #: ../../include/attach.php:184 ../../include/attach.php:247
 #: ../../include/attach.php:261 ../../include/attach.php:305
 #: ../../include/attach.php:319 ../../include/attach.php:350
@@ -3087,38 +3088,38 @@ msgstr ""
 msgid "Permission denied."
 msgstr ""
 
-#: ../../include/items.php:4763 ../../mod/group.php:38 ../../mod/group.php:140
+#: ../../include/items.php:4787 ../../mod/group.php:38 ../../mod/group.php:140
 #: ../../mod/bulksetclose.php:51
 msgid "Collection not found."
 msgstr ""
 
-#: ../../include/items.php:4779
+#: ../../include/items.php:4803
 msgid "Collection is empty."
 msgstr ""
 
-#: ../../include/items.php:4786
+#: ../../include/items.php:4810
 #, php-format
 msgid "Collection: %s"
 msgstr ""
 
-#: ../../include/items.php:4796 ../../mod/connedit.php:674
+#: ../../include/items.php:4820 ../../mod/connedit.php:674
 #, php-format
 msgid "Connection: %s"
 msgstr ""
 
-#: ../../include/items.php:4798
+#: ../../include/items.php:4822
 msgid "Connection not found."
 msgstr ""
 
-#: ../../include/zot.php:678
+#: ../../include/zot.php:684
 msgid "Invalid data packet"
 msgstr ""
 
-#: ../../include/zot.php:694
+#: ../../include/zot.php:700
 msgid "Unable to verify channel signature"
 msgstr ""
 
-#: ../../include/zot.php:2184
+#: ../../include/zot.php:2208
 #, php-format
 msgid "Unable to verify site signature for %s"
 msgstr ""
@@ -3316,11 +3317,11 @@ msgstr ""
 msgid "Default Profile"
 msgstr ""
 
-#: ../../include/identity.php:736
+#: ../../include/identity.php:759
 msgid "Requested channel is not available."
 msgstr ""
 
-#: ../../include/identity.php:783 ../../mod/profile.php:16
+#: ../../include/identity.php:806 ../../mod/profile.php:16
 #: ../../mod/achievements.php:11 ../../mod/webpages.php:29
 #: ../../mod/connect.php:13 ../../mod/hcard.php:8 ../../mod/blocks.php:29
 #: ../../mod/editlayout.php:27 ../../mod/editwebpage.php:28
@@ -3329,193 +3330,193 @@ msgstr ""
 msgid "Requested profile is not available."
 msgstr ""
 
-#: ../../include/identity.php:946 ../../mod/profiles.php:774
+#: ../../include/identity.php:969 ../../mod/profiles.php:774
 msgid "Change profile photo"
 msgstr ""
 
-#: ../../include/identity.php:952
+#: ../../include/identity.php:975
 msgid "Profiles"
 msgstr ""
 
-#: ../../include/identity.php:952
+#: ../../include/identity.php:975
 msgid "Manage/edit profiles"
 msgstr ""
 
-#: ../../include/identity.php:953 ../../mod/profiles.php:775
+#: ../../include/identity.php:976 ../../mod/profiles.php:775
 msgid "Create New Profile"
 msgstr ""
 
-#: ../../include/identity.php:968 ../../mod/profiles.php:786
+#: ../../include/identity.php:991 ../../mod/profiles.php:786
 msgid "Profile Image"
 msgstr ""
 
-#: ../../include/identity.php:971
+#: ../../include/identity.php:994
 msgid "visible to everybody"
 msgstr ""
 
-#: ../../include/identity.php:972 ../../mod/profiles.php:669
+#: ../../include/identity.php:995 ../../mod/profiles.php:669
 #: ../../mod/profiles.php:790
 msgid "Edit visibility"
 msgstr ""
 
-#: ../../include/identity.php:988 ../../include/identity.php:1227
+#: ../../include/identity.php:1011 ../../include/identity.php:1250
 msgid "Gender:"
 msgstr ""
 
-#: ../../include/identity.php:989 ../../include/identity.php:1271
+#: ../../include/identity.php:1012 ../../include/identity.php:1294
 msgid "Status:"
 msgstr ""
 
-#: ../../include/identity.php:990 ../../include/identity.php:1282
+#: ../../include/identity.php:1013 ../../include/identity.php:1305
 msgid "Homepage:"
 msgstr ""
 
-#: ../../include/identity.php:991
+#: ../../include/identity.php:1014
 msgid "Online Now"
 msgstr ""
 
-#: ../../include/identity.php:1074 ../../include/identity.php:1152
+#: ../../include/identity.php:1097 ../../include/identity.php:1175
 #: ../../mod/ping.php:324
 msgid "g A l F d"
 msgstr ""
 
-#: ../../include/identity.php:1075 ../../include/identity.php:1153
+#: ../../include/identity.php:1098 ../../include/identity.php:1176
 msgid "F d"
 msgstr ""
 
-#: ../../include/identity.php:1120 ../../include/identity.php:1192
+#: ../../include/identity.php:1143 ../../include/identity.php:1215
 #: ../../mod/ping.php:346
 msgid "[today]"
 msgstr ""
 
-#: ../../include/identity.php:1131
+#: ../../include/identity.php:1154
 msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../include/identity.php:1132
+#: ../../include/identity.php:1155
 msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../include/identity.php:1185
+#: ../../include/identity.php:1208
 msgid "[No description]"
 msgstr ""
 
-#: ../../include/identity.php:1203
+#: ../../include/identity.php:1226
 msgid "Event Reminders"
 msgstr ""
 
-#: ../../include/identity.php:1204
+#: ../../include/identity.php:1227
 msgid "Events this week:"
 msgstr ""
 
-#: ../../include/identity.php:1217 ../../include/identity.php:1334
+#: ../../include/identity.php:1240 ../../include/identity.php:1357
 #: ../../include/apps.php:138 ../../mod/profperm.php:112
 msgid "Profile"
 msgstr ""
 
-#: ../../include/identity.php:1225 ../../mod/settings.php:1056
+#: ../../include/identity.php:1248 ../../mod/settings.php:1056
 msgid "Full Name:"
 msgstr ""
 
-#: ../../include/identity.php:1232
+#: ../../include/identity.php:1255
 msgid "Like this channel"
 msgstr ""
 
-#: ../../include/identity.php:1256
+#: ../../include/identity.php:1279
 msgid "j F, Y"
 msgstr ""
 
-#: ../../include/identity.php:1257
+#: ../../include/identity.php:1280
 msgid "j F"
 msgstr ""
 
-#: ../../include/identity.php:1264
+#: ../../include/identity.php:1287
 msgid "Birthday:"
 msgstr ""
 
-#: ../../include/identity.php:1268 ../../mod/directory.php:297
+#: ../../include/identity.php:1291 ../../mod/directory.php:297
 msgid "Age:"
 msgstr ""
 
-#: ../../include/identity.php:1277
+#: ../../include/identity.php:1300
 #, php-format
 msgid "for %1$d %2$s"
 msgstr ""
 
-#: ../../include/identity.php:1280 ../../mod/profiles.php:691
+#: ../../include/identity.php:1303 ../../mod/profiles.php:691
 msgid "Sexual Preference:"
 msgstr ""
 
-#: ../../include/identity.php:1284 ../../mod/directory.php:313
+#: ../../include/identity.php:1307 ../../mod/directory.php:313
 #: ../../mod/profiles.php:693
 msgid "Hometown:"
 msgstr ""
 
-#: ../../include/identity.php:1286
+#: ../../include/identity.php:1309
 msgid "Tags:"
 msgstr ""
 
-#: ../../include/identity.php:1288 ../../mod/profiles.php:694
+#: ../../include/identity.php:1311 ../../mod/profiles.php:694
 msgid "Political Views:"
 msgstr ""
 
-#: ../../include/identity.php:1290
+#: ../../include/identity.php:1313
 msgid "Religion:"
 msgstr ""
 
-#: ../../include/identity.php:1292 ../../mod/directory.php:315
+#: ../../include/identity.php:1315 ../../mod/directory.php:315
 msgid "About:"
 msgstr ""
 
-#: ../../include/identity.php:1294
+#: ../../include/identity.php:1317
 msgid "Hobbies/Interests:"
 msgstr ""
 
-#: ../../include/identity.php:1296 ../../mod/profiles.php:697
+#: ../../include/identity.php:1319 ../../mod/profiles.php:697
 msgid "Likes:"
 msgstr ""
 
-#: ../../include/identity.php:1298 ../../mod/profiles.php:698
+#: ../../include/identity.php:1321 ../../mod/profiles.php:698
 msgid "Dislikes:"
 msgstr ""
 
-#: ../../include/identity.php:1300
+#: ../../include/identity.php:1323
 msgid "Contact information and Social Networks:"
 msgstr ""
 
-#: ../../include/identity.php:1302
+#: ../../include/identity.php:1325
 msgid "My other channels:"
 msgstr ""
 
-#: ../../include/identity.php:1304
+#: ../../include/identity.php:1327
 msgid "Musical interests:"
 msgstr ""
 
-#: ../../include/identity.php:1306
+#: ../../include/identity.php:1329
 msgid "Books, literature:"
 msgstr ""
 
-#: ../../include/identity.php:1308
+#: ../../include/identity.php:1331
 msgid "Television:"
 msgstr ""
 
-#: ../../include/identity.php:1310
+#: ../../include/identity.php:1333
 msgid "Film/dance/culture/entertainment:"
 msgstr ""
 
-#: ../../include/identity.php:1312
+#: ../../include/identity.php:1335
 msgid "Love/Romance:"
 msgstr ""
 
-#: ../../include/identity.php:1314
+#: ../../include/identity.php:1337
 msgid "Work/employment:"
 msgstr ""
 
-#: ../../include/identity.php:1316
+#: ../../include/identity.php:1339
 msgid "School/education:"
 msgstr ""
 
-#: ../../include/identity.php:1336
+#: ../../include/identity.php:1359
 msgid "Like this thing"
 msgstr ""
 
@@ -4602,7 +4603,7 @@ msgstr ""
 msgid "No installed plugins/addons/apps"
 msgstr ""
 
-#: ../../mod/siteinfo.php:155 ../../mod/home.php:58 ../../mod/home.php:64
+#: ../../mod/siteinfo.php:155 ../../mod/home.php:58 ../../mod/home.php:66
 msgid "$Projectname"
 msgstr ""
 
@@ -6521,30 +6522,6 @@ msgstr ""
 msgid "%1$s tagged %2$s's %3$s with %4$s"
 msgstr ""
 
-#: ../../mod/uexport.php:45 ../../mod/uexport.php:46
-msgid "Export Channel"
-msgstr ""
-
-#: ../../mod/uexport.php:47
-msgid ""
-"Export your basic channel information to a small file.  This acts as a "
-"backup of your connections, permissions, profile and basic data, which can "
-"be used to import your data to a new hub, but\tdoes not contain your content."
-msgstr ""
-
-#: ../../mod/uexport.php:48
-msgid "Export Content"
-msgstr ""
-
-#: ../../mod/uexport.php:49
-msgid ""
-"Export your channel information and all the content to a JSON backup. This "
-"backs up all of your connections, permissions, profile data and all of your "
-"content, but is generally not suitable for importing a channel to a new hub "
-"as this file may be VERY large.  Please be patient - it may take several "
-"minutes for this download to begin."
-msgstr ""
-
 #: ../../mod/viewconnections.php:62
 msgid "No connections."
 msgstr ""
@@ -8155,6 +8132,113 @@ msgstr ""
 msgid "D, d M Y - g:i A"
 msgstr ""
 
+#: ../../mod/uexport.php:50 ../../mod/uexport.php:51
+msgid "Export Channel"
+msgstr ""
+
+#: ../../mod/uexport.php:52
+msgid ""
+"Export your basic channel information to a file.  This acts as a backup of "
+"your connections, permissions, profile and basic data, which can be used to "
+"import your data to a new server hub, but does not contain your content."
+msgstr ""
+
+#: ../../mod/uexport.php:53
+msgid "Export Content"
+msgstr ""
+
+#: ../../mod/uexport.php:54
+msgid ""
+"Export your channel information and recent content to a JSON backup that can "
+"be restored or imported to another server hub. This backs up all of your "
+"connections, permissions, profile data and several months of posts. This "
+"file may be VERY large.  Please be patient - it may take several minutes for "
+"this download to begin."
+msgstr ""
+
+#: ../../mod/uexport.php:55
+msgid "Export your posts from a given year or month:"
+msgstr ""
+
+#: ../../mod/uexport.php:57
+msgid ""
+"You may also export your posts and conversations for a particular year or "
+"month. Click on one of the recent years or months below."
+msgstr ""
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Jan"
+msgstr ""
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Feb"
+msgstr ""
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Mar"
+msgstr ""
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Apr"
+msgstr ""
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Jun"
+msgstr ""
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Jul"
+msgstr ""
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Aug"
+msgstr ""
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Sep"
+msgstr ""
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Oct"
+msgstr ""
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Nov"
+msgstr ""
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Dec"
+msgstr ""
+
+#: ../../mod/uexport.php:60
+msgid ""
+"If the export fails (possibly due to memory exhaustion on your server hub), "
+"please try again selecting a more limited date range."
+msgstr ""
+
+#: ../../mod/uexport.php:61
+#, php-format
+msgid ""
+"Or adjust the date in your browser location bar to select other dates. For "
+"example the year 2013; <a href=\"%1$s/2013\">%1$s/2013</a> or the month "
+"September 2013; <a href=\"%1$s/2013/9\">%1$s/2013/9</a>"
+msgstr ""
+
+#: ../../mod/uexport.php:62
+msgid "Please visit"
+msgstr ""
+
+#: ../../mod/uexport.php:62
+msgid "on another hub to import the backup files(s)."
+msgstr ""
+
+#: ../../mod/uexport.php:63
+msgid ""
+"We advise you to clone the channel on the new hub first and than to import "
+"the backup file(s) (from the same channel) in chronological order. Importing "
+"the backup files into another channel will certainly give permission issues."
+msgstr ""
+
 #: ../../mod/mood.php:131
 msgid "Set your current mood and tell your friends"
 msgstr ""
@@ -8672,7 +8756,7 @@ msgstr ""
 msgid "Download PDL file"
 msgstr ""
 
-#: ../../mod/home.php:73
+#: ../../mod/home.php:75
 #, php-format
 msgid "Welcome to %s"
 msgstr ""
diff --git a/version.inc b/version.inc
index e3915d929..a451b30bc 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-10-01.1172
+2015-10-25.1196
diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index c6d99e7ae..abffe2f78 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -87,6 +87,10 @@ code {
 	font-size: unset;
 }
 
+.panel-group {
+	margin-bottom: 0px;
+}
+
 /* Bootstrap assumes that checkboxes are on the left of labels, while it's usually the opposite in Red */
 .field.checkbox input[type="checkbox"] { margin-left: 0px; }
 .field.checkbox label { padding-left: 0px; font-weight: 700}
diff --git a/view/css/conversation.css b/view/css/conversation.css
index e409cf4cf..6f1d4b899 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -83,15 +83,6 @@ code {
 	margin-right: 10px;
 }
 
-.wall-item-photo-wrapper {
-	margin-top: 0px;
-	margin-bottom: 20px;
-}
-
-.comment .wall-item-photo-wrapper {
-	margin-bottom: 15px;
-}
-
 .wall-item-wrapper {
 	margin-left:10px;
 }
@@ -153,27 +144,8 @@ a.wall-item-name-link {
 	word-wrap: break-word;
 }
 
-.body-tag, .filesavetags, .categorytags {
-	opacity: 0.5;
-	filter:alpha(opacity=50);
-}
-
-.body-tag:hover, .filesavetags:hover, .categorytags:hover {
-	opacity: 1.0 !important;
-	filter:alpha(opacity=100) !important;
-}
-
-.body-tag {
-	margin-top: 10px;
-}
-
-.categorytags {
-	margin-top: 10px;
-}
-
-.wall-item-tools {
-	width: 100%;
-	margin-top: 10px;
+.body-tags {
+	margin-top: 5px;
 }
 
 .item-tool {
diff --git a/view/css/mod_chat.css b/view/css/mod_chat.css
index 58680baec..99037aeef 100644
--- a/view/css/mod_chat.css
+++ b/view/css/mod_chat.css
@@ -6,7 +6,7 @@
  #chatTopBar {
 	 float: left;
 	 height: 400px;
-	 width: 650px;
+	 width: 400px;
 	 overflow-y: auto;
  }
  
diff --git a/view/css/mod_connections.css b/view/css/mod_connections.css
index 097027179..d5c9b3d4f 100644
--- a/view/css/mod_connections.css
+++ b/view/css/mod_connections.css
@@ -1,4 +1,3 @@
-
 .search-input {
 	padding: 4px 12px;
 	margin: 3px;
@@ -111,8 +110,8 @@
 
 .contact-entry-wrapper {
 	float: left;
-	width: 120px;
-	height: 150px;
+	width: auto;
+	height: auto;
 	padding: 10px;
 	margin: 8px 10px 0 0;
 	border-top: 1px solid #eee;
@@ -137,9 +136,14 @@
 	margin-left: 0px;
 	margin-right: 10px;
 	margin-bottom: 10px;
-	width: 120px;
-	height: 36px;
+	width: 147px;
+	height: auto;
 	overflow: hidden;
+	white-space: nowrap;
+}
+
+.contact-entry-name-end {
+	clear:both;
 }
 
 .contact-entry-end {
diff --git a/view/css/mod_directory.css b/view/css/mod_directory.css
index 8e55ac3be..5a2b8d443 100644
--- a/view/css/mod_directory.css
+++ b/view/css/mod_directory.css
@@ -29,3 +29,6 @@
 	margin-top: -2px;
 }
 
+.directory-collapse {
+		overflow: auto;
+}
diff --git a/view/css/mod_mail.css b/view/css/mod_mail.css
index f0f4458fa..5fd646765 100644
--- a/view/css/mod_mail.css
+++ b/view/css/mod_mail.css
@@ -1,50 +1,26 @@
-/* message/new */
-
-#prvmail-to-label,
-#prvmail-subject-label,
-#prvmail-expires-label,
-#prvmail-message-label {
-	margin-bottom: 10px;
-	margin-top: 20px;
-}
-
-#prvmail-submit {
+.mail-conv-sender {
 	float: left;
-	margin-top: 10px;
-	margin-right: 30px;
+	margin-right: 10px;
+	margin-bottom: 10px;
 }
 
-#prvmail-upload-wrapper,
-#prvmail-attach-wrapper,
-#prvmail-link-wrapper,
-#prvmail-expire-wrapper,
-#prvmail-encrypt-wrapper,
-#prvmail-rotator-wrapper {
-	float: left;
-	margin-top: 10px;
-	cursor: pointer;
+.mail-conv-sender img{
+	width: 32px;
+	height: 32px;
 }
 
-/* message/id */
-
-.mail-conv-outside-wrapper {
-	display: table;
-	table-layout: fixed;
+.mail-conv-sender-name {
+	font-weight: bold;
 }
 
-.mail-conv-sender {
-	display: table-cell;
-	vertical-align: top;
-	margin-right: 10px;
+.mail-conv-body {
+	margin-bottom: 10px;
 }
 
-.mail-conv-sender-name {
-	font-weight: bold;
+.mail-conv-body img {
+	max-width: 100%;
 }
 
-.mail-conv-detail {
-	display: table-cell;
-	vertical-align: top;
-	width: 100%;
-	padding-left: 10px;
+#prvmail-rotator {
+	margin: 15px;
 }
diff --git a/view/css/mod_photos.css b/view/css/mod_photos.css
index 7718289c3..ae250bc1c 100644
--- a/view/css/mod_photos.css
+++ b/view/css/mod_photos.css
@@ -33,4 +33,4 @@
 	position: absolute;
 	left: -9999px;
 	top: -9999px;
-}
\ No newline at end of file
+}
diff --git a/view/es/hmessages.po b/view/es/hmessages.po
index bb0ba9839..e5fcd799e 100644
--- a/view/es/hmessages.po
+++ b/view/es/hmessages.po
@@ -1,20 +1,20 @@
-# Red Matrix Project
-# Copyright (C) 2012-2014 the Red Matrix Project
+# Hubzilla Project
+# Copyright (C) 2012-2014 the Hubzilla Project
 # This file is distributed under the same license as the Red package.
 # 
 # Translators:
-# boquiabierto <adrian@grell.es>, 2013-2014
 # Alfonso <admin@alfonsomh.eu>, 2015
 # jeroenpraat <jeroenpraat@xs4all.nl>, 2015
 # Manuel Jiménez Friaza <mjfriaza@openmailbox.org>, 2015
 # Rafael, 2015
+# Rafael, 2015
 # tony baldwin <tonybaldwin@gmx.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Redmatrix\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-11 00:05-0700\n"
-"PO-Revision-Date: 2015-09-14 18:21+0000\n"
+"POT-Creation-Date: 2015-10-23 00:03-0700\n"
+"PO-Revision-Date: 2015-10-25 19:03+0000\n"
 "Last-Translator: Manuel Jiménez Friaza <mjfriaza@openmailbox.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/Friendica/red-matrix/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -23,231 +23,361 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../include/dba/dba_driver.php:141
-#, php-format
-msgid "Cannot locate DNS info for database server '%s'"
-msgstr "No se ha podido localizar información de DNS para el servidor de base de datos “%s”"
+#: ../../include/bb2diaspora.php:388
+msgid "Attachments:"
+msgstr "Ficheros adjuntos:"
 
-#: ../../include/photo/photo_driver.php:687 ../../mod/profile_photo.php:143
-#: ../../mod/profile_photo.php:302 ../../mod/profile_photo.php:424
-#: ../../mod/photos.php:92 ../../mod/photos.php:637
-msgid "Profile Photos"
-msgstr "Fotos de perfil"
-
-#: ../../include/menu.php:107 ../../include/page_widgets.php:8
-#: ../../include/page_widgets.php:36 ../../include/RedDAV/RedBrowser.php:266
-#: ../../include/ItemObject.php:100 ../../include/apps.php:254
-#: ../../mod/webpages.php:181 ../../mod/thing.php:255
-#: ../../mod/connections.php:242 ../../mod/connections.php:255
-#: ../../mod/connections.php:274 ../../mod/blocks.php:153
-#: ../../mod/editpost.php:106 ../../mod/editlayout.php:133
-#: ../../mod/editwebpage.php:178 ../../mod/editblock.php:134
-#: ../../mod/menu.php:106 ../../mod/settings.php:650 ../../mod/layouts.php:183
-msgid "Edit"
-msgstr "Editar"
+#: ../../include/bb2diaspora.php:474 ../../include/event.php:22
+msgid "l F d, Y \\@ g:i A"
+msgstr "l d de F, Y \\@ G:i"
 
-#: ../../include/contact_selectors.php:56
-msgid "Frequently"
-msgstr "Frecuentemente"
+#: ../../include/bb2diaspora.php:476
+msgid "$Projectname event notification:"
+msgstr "Notificación de eventos de $Projectname:"
 
-#: ../../include/contact_selectors.php:57
-msgid "Hourly"
-msgstr "Cada hora"
+#: ../../include/bb2diaspora.php:480 ../../include/event.php:30
+msgid "Starts:"
+msgstr "Comienza:"
 
-#: ../../include/contact_selectors.php:58
-msgid "Twice daily"
-msgstr "Dos veces al día"
+#: ../../include/bb2diaspora.php:488 ../../include/event.php:40
+msgid "Finishes:"
+msgstr "Finaliza:"
 
-#: ../../include/contact_selectors.php:59
-msgid "Daily"
-msgstr "Diariamente"
+#: ../../include/bb2diaspora.php:496 ../../include/event.php:50
+#: ../../include/identity.php:1016 ../../mod/directory.php:302
+#: ../../mod/events.php:701
+msgid "Location:"
+msgstr "Ubicación:"
 
-#: ../../include/contact_selectors.php:60
-msgid "Weekly"
-msgstr "Semanalmente"
+#: ../../include/Import/import_diaspora.php:17
+msgid "No username found in import file."
+msgstr "No se ha encontrado el nombre de usuario en el fichero importado."
 
-#: ../../include/contact_selectors.php:61
-msgid "Monthly"
-msgstr "Mensualmente"
+#: ../../include/Import/import_diaspora.php:42 ../../include/import.php:44
+msgid "Unable to create a unique channel address. Import failed."
+msgstr "No se ha podido crear una dirección de canal única. Ha fallado la importación."
 
-#: ../../include/contact_selectors.php:76
-msgid "Friendica"
-msgstr "Friendica"
+#: ../../include/Import/import_diaspora.php:143 ../../mod/import.php:486
+msgid "Import completed."
+msgstr "Importación completada."
 
-#: ../../include/contact_selectors.php:77
-msgid "OStatus"
-msgstr "OStatus"
+#: ../../include/RedDAV/RedBrowser.php:107
+#: ../../include/RedDAV/RedBrowser.php:239
+msgid "parent"
+msgstr "padre"
 
-#: ../../include/contact_selectors.php:78
-msgid "RSS/Atom"
-msgstr "RSS/Atom"
+#: ../../include/RedDAV/RedBrowser.php:131 ../../include/text.php:2509
+msgid "Collection"
+msgstr "Colección"
 
-#: ../../include/contact_selectors.php:79 ../../mod/admin.php:822
-#: ../../mod/admin.php:831 ../../mod/id.php:15 ../../mod/id.php:16
-#: ../../boot.php:1552
-msgid "Email"
-msgstr "Correo electrónico"
+#: ../../include/RedDAV/RedBrowser.php:134
+msgid "Principal"
+msgstr "Principal"
 
-#: ../../include/contact_selectors.php:80
-msgid "Diaspora"
-msgstr "Diaspora"
+#: ../../include/RedDAV/RedBrowser.php:137
+msgid "Addressbook"
+msgstr "Libreta de direcciones"
 
-#: ../../include/contact_selectors.php:81
-msgid "Facebook"
-msgstr "Facebook"
+#: ../../include/RedDAV/RedBrowser.php:140
+msgid "Calendar"
+msgstr "Calendario"
 
-#: ../../include/contact_selectors.php:82
-msgid "Zot!"
-msgstr "Zot!"
+#: ../../include/RedDAV/RedBrowser.php:143
+msgid "Schedule Inbox"
+msgstr "Programar bandeja de entrada"
 
-#: ../../include/contact_selectors.php:83
-msgid "LinkedIn"
-msgstr "LinkedIn"
+#: ../../include/RedDAV/RedBrowser.php:146
+msgid "Schedule Outbox"
+msgstr "Programar bandeja de salida"
 
-#: ../../include/contact_selectors.php:84
-msgid "XMPP/IM"
-msgstr "XMPP/IM"
+#: ../../include/RedDAV/RedBrowser.php:164 ../../include/apps.php:360
+#: ../../include/apps.php:415 ../../include/conversation.php:1023
+#: ../../mod/photos.php:756 ../../mod/photos.php:1195
+msgid "Unknown"
+msgstr "Desconocido"
 
-#: ../../include/contact_selectors.php:85
-msgid "MySpace"
-msgstr "MySpace"
+#: ../../include/RedDAV/RedBrowser.php:226 ../../include/apps.php:135
+#: ../../include/conversation.php:1613 ../../include/nav.php:93
+#: ../../mod/fbrowser.php:114
+msgid "Files"
+msgstr "Ficheros"
 
-#: ../../include/notify.php:23
-msgid "created a new post"
-msgstr "ha creado una nueva entrada"
+#: ../../include/RedDAV/RedBrowser.php:227
+msgid "Total"
+msgstr "Total"
+
+#: ../../include/RedDAV/RedBrowser.php:229
+msgid "Shared"
+msgstr "Compartido"
+
+#: ../../include/RedDAV/RedBrowser.php:230
+#: ../../include/RedDAV/RedBrowser.php:303 ../../mod/layouts.php:175
+#: ../../mod/menu.php:114 ../../mod/new_channel.php:121
+#: ../../mod/webpages.php:180 ../../mod/blocks.php:152
+msgid "Create"
+msgstr "Crear"
+
+#: ../../include/RedDAV/RedBrowser.php:231
+#: ../../include/RedDAV/RedBrowser.php:305 ../../mod/photos.php:781
+#: ../../mod/photos.php:1314 ../../mod/profile_photo.php:450
+msgid "Upload"
+msgstr "Subir"
+
+#: ../../include/RedDAV/RedBrowser.php:235 ../../mod/admin.php:948
+#: ../../mod/settings.php:585 ../../mod/settings.php:611
+#: ../../mod/sharedwithme.php:95
+msgid "Name"
+msgstr "Nombre"
+
+#: ../../include/RedDAV/RedBrowser.php:236
+msgid "Type"
+msgstr "Tipo"
+
+#: ../../include/RedDAV/RedBrowser.php:237 ../../mod/sharedwithme.php:97
+msgid "Size"
+msgstr "Tamaño"
 
-#: ../../include/notify.php:24
+#: ../../include/RedDAV/RedBrowser.php:238 ../../mod/sharedwithme.php:98
+msgid "Last Modified"
+msgstr "Última modificación"
+
+#: ../../include/RedDAV/RedBrowser.php:240 ../../include/menu.php:108
+#: ../../include/page_widgets.php:8 ../../include/page_widgets.php:36
+#: ../../include/apps.php:259 ../../include/ItemObject.php:100
+#: ../../mod/layouts.php:183 ../../mod/editblock.php:135
+#: ../../mod/editpost.php:113 ../../mod/menu.php:108
+#: ../../mod/webpages.php:181 ../../mod/blocks.php:153 ../../mod/thing.php:257
+#: ../../mod/settings.php:645 ../../mod/connections.php:235
+#: ../../mod/connections.php:248 ../../mod/connections.php:267
+#: ../../mod/editlayout.php:134 ../../mod/editwebpage.php:176
+msgid "Edit"
+msgstr "Editar"
+
+#: ../../include/RedDAV/RedBrowser.php:241 ../../include/apps.php:260
+#: ../../include/ItemObject.php:120 ../../include/conversation.php:657
+#: ../../mod/connedit.php:546 ../../mod/photos.php:1126
+#: ../../mod/editblock.php:181 ../../mod/admin.php:783 ../../mod/admin.php:942
+#: ../../mod/webpages.php:183 ../../mod/blocks.php:155 ../../mod/thing.php:258
+#: ../../mod/settings.php:646 ../../mod/editlayout.php:179
+#: ../../mod/editwebpage.php:223 ../../mod/group.php:173
+msgid "Delete"
+msgstr "Eliminar"
+
+#: ../../include/RedDAV/RedBrowser.php:282
 #, php-format
-msgid "commented on %s's post"
-msgstr "ha comentado la entrada de %s"
+msgid "You are using %1$s of your available file storage."
+msgstr "Está usando %1$s de su espacio disponible para ficheros."
 
-#: ../../include/Import/import_diaspora.php:17
-msgid "No username found in import file."
-msgstr "No se ha encontrado el nombre de usuario en el fichero importado."
+#: ../../include/RedDAV/RedBrowser.php:287
+#, php-format
+msgid "You are using %1$s of %2$s available file storage. (%3$s&#37;)"
+msgstr "Está usando %1$s de %2$s que tiene a su disposición para ficheros. (%3$s&#37;)"
 
-#: ../../include/Import/import_diaspora.php:42 ../../mod/import.php:156
-msgid "Unable to create a unique channel address. Import failed."
-msgstr "No se ha podido crear una dirección de canal única. Ha fallado la importación."
+#: ../../include/RedDAV/RedBrowser.php:299
+msgid "WARNING:"
+msgstr "ATENCIÓN:"
 
-#: ../../include/Import/import_diaspora.php:140 ../../mod/import.php:562
-msgid "Import completed."
-msgstr "Importación completada."
+#: ../../include/RedDAV/RedBrowser.php:302
+msgid "Create new folder"
+msgstr "Crear nueva carpeta"
 
-#: ../../include/group.php:26
-msgid ""
-"A deleted group with this name was revived. Existing item permissions "
-"<strong>may</strong> apply to this group and any future members. If this is "
-"not what you intended, please create another group with a different name."
-msgstr "Un grupo suprimido con este nombre ha sido restablecido. <strong>Es posible</strong> que los permisos existentes  sean aplicados a este grupo y sus futuros miembros. Si no quiere esto por favor cree otro grupo con un nombre diferente."
+#: ../../include/RedDAV/RedBrowser.php:304
+msgid "Upload file"
+msgstr "Subir fichero"
 
-#: ../../include/group.php:235
-msgid "Default privacy group for new contacts"
-msgstr "Privacidad de grupo por defecto para nuevos contactos "
+#: ../../include/permissions.php:26
+msgid "Can view my normal stream and posts"
+msgstr "Pueden verse mi flujo de actividad y publicaciones normales"
 
-#: ../../include/group.php:254 ../../mod/admin.php:831
-msgid "All Channels"
-msgstr "Todos los canales"
+#: ../../include/permissions.php:27
+msgid "Can view my default channel profile"
+msgstr "Puede verse mi perfil de canal predeterminado."
 
-#: ../../include/group.php:276
-msgid "edit"
-msgstr "editar"
+#: ../../include/permissions.php:28
+msgid "Can view my connections"
+msgstr "Pueden verse mis conexiones"
 
-#: ../../include/group.php:298
-msgid "Collections"
-msgstr "Colecciones"
+#: ../../include/permissions.php:29
+msgid "Can view my file storage and photos"
+msgstr "Pueden verse mi repositorio de ficheros y mis fotos"
 
-#: ../../include/group.php:299
-msgid "Edit collection"
-msgstr "Editar colección"
+#: ../../include/permissions.php:30
+msgid "Can view my webpages"
+msgstr "Pueden verse mis páginas web"
 
-#: ../../include/group.php:300
-msgid "Add new collection"
-msgstr "Añadir nueva colección"
+#: ../../include/permissions.php:33
+msgid "Can send me their channel stream and posts"
+msgstr "Me pueden enviar sus entradas y flujo de actividad del canal"
 
-#: ../../include/group.php:301
-msgid "Channels not in any collection"
-msgstr "El canal no se encuentra en ninguna colección"
+#: ../../include/permissions.php:34
+msgid "Can post on my channel page (\"wall\")"
+msgstr "Pueden crearse entradas en mi página de inicio del canal (“muro”)"
 
-#: ../../include/group.php:303 ../../include/widgets.php:275
-msgid "add"
-msgstr "añadir"
+#: ../../include/permissions.php:35
+msgid "Can comment on or like my posts"
+msgstr "Pueden publicarse comentarios en mis publicaciones o marcar mis entradas con 'me gusta'."
 
-#: ../../include/account.php:27
-msgid "Not a valid email address"
-msgstr "Dirección de correo no válida"
+#: ../../include/permissions.php:36
+msgid "Can send me private mail messages"
+msgstr "Se me pueden enviar mensajes privados"
 
-#: ../../include/account.php:29
-msgid "Your email domain is not among those allowed on this site"
-msgstr "Su dirección de correo no pertenece a los dominios permitidos en este sitio."
+#: ../../include/permissions.php:37
+msgid "Can like/dislike stuff"
+msgstr "Puede marcarse contenido como me gusta/no me gusta"
 
-#: ../../include/account.php:35
-msgid "Your email address is already registered at this site."
-msgstr "Su dirección de correo está ya registrada en este sitio."
+#: ../../include/permissions.php:37
+msgid "Profiles and things other than posts/comments"
+msgstr "Perfiles y otras cosas aparte de publicaciones/comentarios"
 
-#: ../../include/account.php:67
-msgid "An invitation is required."
-msgstr "Es obligatorio que le inviten."
+#: ../../include/permissions.php:39
+msgid "Can forward to all my channel contacts via post @mentions"
+msgstr "Puede enviarse una entrada a todos mis contactos del canal mediante una @mención"
 
-#: ../../include/account.php:71
-msgid "Invitation could not be verified."
-msgstr "No se ha podido verificar su invitación."
+#: ../../include/permissions.php:39
+msgid "Advanced - useful for creating group forum channels"
+msgstr "Avanzado - útil para crear canales de foros de discusión o grupos"
 
-#: ../../include/account.php:121
-msgid "Please enter the required information."
-msgstr "Por favor introduzca la información requerida."
+#: ../../include/permissions.php:40
+msgid "Can chat with me (when available)"
+msgstr "Se puede charlar conmigo (cuando esté disponible)"
 
-#: ../../include/account.php:188
-msgid "Failed to store account information."
-msgstr "La información de la cuenta no se ha podido guardar."
+#: ../../include/permissions.php:41
+msgid "Can write to my file storage and photos"
+msgstr "Puede escribirse en mi repositorio de ficheros y fotos"
 
-#: ../../include/account.php:246
-#, php-format
-msgid "Registration confirmation for %s"
-msgstr "Confirmación de registro para %s"
+#: ../../include/permissions.php:42
+msgid "Can edit my webpages"
+msgstr "Pueden editarse mis páginas web"
 
-#: ../../include/account.php:312
-#, php-format
-msgid "Registration request at %s"
-msgstr "Solicitud de registro en %s"
+#: ../../include/permissions.php:44
+msgid "Can source my public posts in derived channels"
+msgstr "Pueden utilizarse mis publicaciones públicas como origen de contenidos  en canales derivados"
 
-#: ../../include/account.php:314 ../../include/account.php:341
-#: ../../include/account.php:401 ../../include/network.php:1632
-msgid "Administrator"
-msgstr "Administrador"
+#: ../../include/permissions.php:44
+msgid "Somewhat advanced - very useful in open communities"
+msgstr "Algo avanzado - muy útil en comunidades abiertas"
 
-#: ../../include/account.php:336
-msgid "your registration password"
-msgstr "su contraseña de registro"
+#: ../../include/permissions.php:46
+msgid "Can administer my channel resources"
+msgstr "Pueden administrarse mis recursos del canal"
 
-#: ../../include/account.php:339 ../../include/account.php:399
-#, php-format
-msgid "Registration details for %s"
-msgstr "Detalles del registro de %s"
+#: ../../include/permissions.php:46
+msgid ""
+"Extremely advanced. Leave this alone unless you know what you are doing"
+msgstr "Muy avanzado. Déjelo a no ser que sepa bien lo que está haciendo."
 
-#: ../../include/account.php:408
-msgid "Account approved."
-msgstr "Cuenta aprobada."
+#: ../../include/permissions.php:867
+msgid "Social Networking"
+msgstr "Redes sociales"
 
-#: ../../include/account.php:447
-#, php-format
-msgid "Registration revoked for %s"
-msgstr "Registro revocado para %s"
+#: ../../include/permissions.php:867 ../../include/permissions.php:868
+#: ../../include/permissions.php:869
+msgid "Mostly Public"
+msgstr "Público en su mayor parte"
 
-#: ../../include/account.php:492
-msgid "Account verified. Please login."
-msgstr "Cuenta verificada. Por favor, inicie sesión."
+#: ../../include/permissions.php:867 ../../include/permissions.php:868
+#: ../../include/permissions.php:869
+msgid "Restricted"
+msgstr "Restringido"
 
-#: ../../include/account.php:705 ../../include/account.php:707
-msgid "Click here to upgrade."
-msgstr "Pulse aquí para actualizar"
+#: ../../include/permissions.php:867 ../../include/permissions.php:868
+msgid "Private"
+msgstr "Privado"
 
-#: ../../include/account.php:713
-msgid "This action exceeds the limits set by your subscription plan."
-msgstr "Esta acción supera los límites establecidos por su plan de suscripción "
+#: ../../include/permissions.php:868
+msgid "Community Forum"
+msgstr "Foro de discusión"
 
-#: ../../include/account.php:718
-msgid "This action is not available under your subscription plan."
-msgstr "Esta acción no está disponible en su plan de suscripción."
+#: ../../include/permissions.php:869
+msgid "Feed Republish"
+msgstr "Republicar un \"feed\""
+
+#: ../../include/permissions.php:870
+msgid "Special Purpose"
+msgstr "Propósito especial"
+
+#: ../../include/permissions.php:870
+msgid "Celebrity/Soapbox"
+msgstr "Página para fans"
+
+#: ../../include/permissions.php:870
+msgid "Group Repository"
+msgstr "Repositorio de grupo"
+
+#: ../../include/permissions.php:871 ../../include/profile_selectors.php:6
+#: ../../include/profile_selectors.php:23
+#: ../../include/profile_selectors.php:61
+#: ../../include/profile_selectors.php:97
+msgid "Other"
+msgstr "Otro"
+
+#: ../../include/permissions.php:871
+msgid "Custom/Expert Mode"
+msgstr "Modo personalizado/experto"
+
+#: ../../include/chat.php:23
+msgid "Missing room name"
+msgstr "Sala de chat sin nombre"
+
+#: ../../include/chat.php:32
+msgid "Duplicate room name"
+msgstr "Nombre de sala duplicado."
+
+#: ../../include/chat.php:82 ../../include/chat.php:90
+msgid "Invalid room specifier."
+msgstr "Especificador de sala no válido."
+
+#: ../../include/chat.php:122
+msgid "Room not found."
+msgstr "Sala no encontrada."
+
+#: ../../include/chat.php:133 ../../include/items.php:4376
+#: ../../include/photos.php:26 ../../include/attach.php:137
+#: ../../include/attach.php:185 ../../include/attach.php:248
+#: ../../include/attach.php:262 ../../include/attach.php:269
+#: ../../include/attach.php:334 ../../include/attach.php:348
+#: ../../include/attach.php:355 ../../include/attach.php:433
+#: ../../include/attach.php:875 ../../include/attach.php:946
+#: ../../include/attach.php:1098 ../../mod/achievements.php:30
+#: ../../mod/fsuggest.php:78 ../../mod/authtest.php:13
+#: ../../mod/bookmarks.php:48 ../../mod/block.php:22 ../../mod/block.php:72
+#: ../../mod/id.php:71 ../../mod/like.php:177 ../../mod/common.php:35
+#: ../../mod/mitem.php:111 ../../mod/connedit.php:347 ../../mod/mood.php:112
+#: ../../mod/photos.php:70 ../../mod/filestorage.php:18
+#: ../../mod/filestorage.php:73 ../../mod/filestorage.php:88
+#: ../../mod/filestorage.php:115 ../../mod/layouts.php:69
+#: ../../mod/layouts.php:76 ../../mod/layouts.php:87 ../../mod/poke.php:133
+#: ../../mod/network.php:12 ../../mod/chat.php:94 ../../mod/chat.php:99
+#: ../../mod/rate.php:111 ../../mod/mail.php:118 ../../mod/editblock.php:65
+#: ../../mod/editpost.php:13 ../../mod/appman.php:66 ../../mod/profile.php:64
+#: ../../mod/profile.php:72 ../../mod/menu.php:74 ../../mod/page.php:31
+#: ../../mod/page.php:86 ../../mod/new_channel.php:68
+#: ../../mod/new_channel.php:99 ../../mod/notifications.php:66
+#: ../../mod/pdledit.php:21 ../../mod/events.php:256
+#: ../../mod/profile_photo.php:338 ../../mod/profile_photo.php:351
+#: ../../mod/item.php:205 ../../mod/item.php:213 ../../mod/item.php:1002
+#: ../../mod/message.php:16 ../../mod/webpages.php:69
+#: ../../mod/register.php:72 ../../mod/blocks.php:69 ../../mod/blocks.php:76
+#: ../../mod/service_limits.php:7 ../../mod/sources.php:66
+#: ../../mod/regmod.php:17 ../../mod/channel.php:100 ../../mod/channel.php:214
+#: ../../mod/channel.php:254 ../../mod/thing.php:271 ../../mod/thing.php:291
+#: ../../mod/thing.php:328 ../../mod/invite.php:13 ../../mod/invite.php:104
+#: ../../mod/viewsrc.php:14 ../../mod/settings.php:565 ../../mod/manage.php:6
+#: ../../mod/api.php:26 ../../mod/api.php:31 ../../mod/connections.php:29
+#: ../../mod/editlayout.php:63 ../../mod/editlayout.php:87
+#: ../../mod/editwebpage.php:64 ../../mod/editwebpage.php:86
+#: ../../mod/editwebpage.php:101 ../../mod/editwebpage.php:125
+#: ../../mod/group.php:9 ../../mod/viewconnections.php:22
+#: ../../mod/viewconnections.php:27 ../../mod/locs.php:82
+#: ../../mod/setup.php:227 ../../mod/sharedwithme.php:7
+#: ../../mod/suggest.php:26 ../../mod/profiles.php:188
+#: ../../mod/profiles.php:576 ../../index.php:178 ../../index.php:361
+msgid "Permission denied."
+msgstr "Acceso denegado."
+
+#: ../../include/chat.php:143
+msgid "Room is full"
+msgstr "La sala está llena."
 
 #: ../../include/datetime.php:48
 msgid "Miscellaneous"
@@ -257,12 +387,12 @@ msgstr "Varios"
 msgid "YYYY-MM-DD or MM-DD"
 msgstr "AAAA-MM-DD o MM-DD"
 
-#: ../../include/datetime.php:235 ../../mod/events.php:672
-#: ../../mod/appman.php:91 ../../mod/appman.php:92
+#: ../../include/datetime.php:235 ../../mod/appman.php:91
+#: ../../mod/appman.php:92 ../../mod/events.php:689
 msgid "Required"
 msgstr "Obligatorio"
 
-#: ../../include/datetime.php:262 ../../boot.php:2353
+#: ../../include/datetime.php:262 ../../boot.php:2312
 msgid "never"
 msgstr "nunca"
 
@@ -342,92 +472,262 @@ msgstr "Cumpleaños de %1$s"
 msgid "Happy Birthday %1$s"
 msgstr "Feliz cumpleaños %1$s"
 
-#: ../../include/dir_fns.php:126
-msgid "Directory Options"
-msgstr "Opciones del directorio"
+#: ../../include/features.php:38
+msgid "General Features"
+msgstr "Características generales"
 
-#: ../../include/dir_fns.php:128
-msgid "Safe Mode"
-msgstr "Modo seguro"
+#: ../../include/features.php:40
+msgid "Content Expiration"
+msgstr "Caducidad del contenido"
 
-#: ../../include/dir_fns.php:128 ../../include/dir_fns.php:129
-#: ../../include/dir_fns.php:130 ../../mod/api.php:106
-#: ../../mod/photos.php:568 ../../mod/mitem.php:159 ../../mod/mitem.php:160
-#: ../../mod/mitem.php:232 ../../mod/mitem.php:233 ../../mod/menu.php:94
-#: ../../mod/menu.php:151 ../../mod/filestorage.php:151
-#: ../../mod/filestorage.php:159 ../../mod/admin.php:428
-#: ../../mod/settings.php:579 ../../mod/removeme.php:60
-#: ../../mod/connedit.php:647 ../../mod/connedit.php:675
-#: ../../view/theme/redbasic/php/config.php:104
-#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1554
-msgid "No"
-msgstr "No"
+#: ../../include/features.php:40
+msgid "Remove posts/comments and/or private messages at a future time"
+msgstr "Eliminar publicaciones/comentarios y/o mensajes privados más adelante"
 
-#: ../../include/dir_fns.php:128 ../../include/dir_fns.php:129
-#: ../../include/dir_fns.php:130 ../../mod/api.php:105
-#: ../../mod/photos.php:568 ../../mod/mitem.php:159 ../../mod/mitem.php:160
-#: ../../mod/mitem.php:232 ../../mod/mitem.php:233 ../../mod/menu.php:94
-#: ../../mod/menu.php:151 ../../mod/filestorage.php:151
-#: ../../mod/filestorage.php:159 ../../mod/admin.php:430
-#: ../../mod/settings.php:579 ../../mod/removeme.php:60
-#: ../../view/theme/redbasic/php/config.php:104
-#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1554
-msgid "Yes"
-msgstr "Sí"
+#: ../../include/features.php:41
+msgid "Multiple Profiles"
+msgstr "Múltiples perfiles"
 
-#: ../../include/dir_fns.php:129
-msgid "Public Forums Only"
-msgstr "Solo foros públicos"
+#: ../../include/features.php:41
+msgid "Ability to create multiple profiles"
+msgstr "Capacidad de crear múltiples perfiles"
 
-#: ../../include/dir_fns.php:130
-msgid "This Website Only"
-msgstr "Solo este sitio web"
+#: ../../include/features.php:42
+msgid "Advanced Profiles"
+msgstr "Perfiles avanzados"
 
-#: ../../include/page_widgets.php:6
-msgid "New Page"
-msgstr "Nueva página"
+#: ../../include/features.php:42
+msgid "Additional profile sections and selections"
+msgstr "Secciones y selecciones de perfil adicionales"
 
-#: ../../include/page_widgets.php:39 ../../mod/webpages.php:187
-#: ../../mod/blocks.php:159 ../../mod/layouts.php:188
-msgid "View"
-msgstr "Ver"
+#: ../../include/features.php:43
+msgid "Profile Import/Export"
+msgstr "Importar/Exportar perfil"
 
-#: ../../include/page_widgets.php:40 ../../include/ItemObject.php:677
-#: ../../include/conversation.php:1166 ../../mod/webpages.php:188
-#: ../../mod/events.php:690 ../../mod/editpost.php:143
-#: ../../mod/photos.php:982 ../../mod/editwebpage.php:214
-#: ../../mod/editblock.php:170
-msgid "Preview"
-msgstr "Previsualizar"
+#: ../../include/features.php:43
+msgid "Save and load profile details across sites/channels"
+msgstr "Guardar y cargar detalles del perfil a través de sitios/canales"
 
-#: ../../include/page_widgets.php:41 ../../mod/webpages.php:189
-msgid "Actions"
-msgstr "Acciones"
+#: ../../include/features.php:44
+msgid "Web Pages"
+msgstr "Páginas web"
 
-#: ../../include/page_widgets.php:42 ../../mod/webpages.php:190
-msgid "Page Link"
-msgstr "Vínculo de la página"
+#: ../../include/features.php:44
+msgid "Provide managed web pages on your channel"
+msgstr "Proveer páginas web gestionadas en su canal"
 
-#: ../../include/page_widgets.php:43
-msgid "Title"
-msgstr "Título"
+#: ../../include/features.php:45
+msgid "Private Notes"
+msgstr "Notas privadas"
 
-#: ../../include/page_widgets.php:44 ../../mod/webpages.php:192
-#: ../../mod/blocks.php:150 ../../mod/menu.php:108 ../../mod/layouts.php:181
-msgid "Created"
-msgstr "Creado"
+#: ../../include/features.php:45
+msgid "Enables a tool to store notes and reminders"
+msgstr "Activar una herramienta para almacenar notas y recordatorios"
 
-#: ../../include/page_widgets.php:45 ../../mod/webpages.php:193
-#: ../../mod/blocks.php:151 ../../mod/menu.php:109 ../../mod/layouts.php:182
-msgid "Edited"
-msgstr "Editado"
+#: ../../include/features.php:46
+msgid "Navigation Channel Select"
+msgstr "Navegación por el selector de canales"
 
-#: ../../include/api.php:1234
-msgid "Public Timeline"
-msgstr "Cronología pública"
+#: ../../include/features.php:46
+msgid "Change channels directly from within the navigation dropdown menu"
+msgstr "Cambiar de canales directamente desde el menú de navegación desplegable"
+
+#: ../../include/features.php:47
+msgid "Photo Location"
+msgstr "Ubicación de las fotos"
 
-#: ../../include/comanche.php:34 ../../mod/admin.php:390
-#: ../../view/theme/apw/php/config.php:185
+#: ../../include/features.php:47
+msgid "If location data is available on uploaded photos, link this to a map."
+msgstr "Si los datos de ubicación están disponibles en las fotos subidas, enlazar estas a un mapa."
+
+#: ../../include/features.php:49
+msgid "Expert Mode"
+msgstr "Modo de experto"
+
+#: ../../include/features.php:49
+msgid "Enable Expert Mode to provide advanced configuration options"
+msgstr "Habilitar el modo de experto para acceder a opciones avanzadas de configuración"
+
+#: ../../include/features.php:50
+msgid "Premium Channel"
+msgstr "Canal premium"
+
+#: ../../include/features.php:50
+msgid ""
+"Allows you to set restrictions and terms on those that connect with your "
+"channel"
+msgstr "Les permite configurar restricciones y normas de uso a aquellos que conectan con su canal"
+
+#: ../../include/features.php:55
+msgid "Post Composition Features"
+msgstr "Características de composición de entradas"
+
+#: ../../include/features.php:57
+msgid "Use Markdown"
+msgstr "Usar Markdown"
+
+#: ../../include/features.php:57
+msgid "Allow use of \"Markdown\" to format posts"
+msgstr "Permitir el uso de \"Markdown\" para formatear publicaciones"
+
+#: ../../include/features.php:58
+msgid "Large Photos"
+msgstr "Fotos de gran tamaño"
+
+#: ../../include/features.php:58
+msgid ""
+"Include large (1024px) photo thumbnails in posts. If not enabled, use small "
+"(640px) photo thumbnails"
+msgstr "Incluir miniaturas de fotos grandes (1024px) en publicaciones. Si no está habilitado, usar miniaturas pequeñas (6400px)"
+
+#: ../../include/features.php:59 ../../include/widgets.php:545
+#: ../../mod/sources.php:88
+msgid "Channel Sources"
+msgstr "Orígenes de los contenidos del canal"
+
+#: ../../include/features.php:59
+msgid "Automatically import channel content from other channels or feeds"
+msgstr "Importar automáticamente contenido de otros canales o \"feeds\""
+
+#: ../../include/features.php:60
+msgid "Even More Encryption"
+msgstr "Más cifrado todavía"
+
+#: ../../include/features.php:60
+msgid ""
+"Allow optional encryption of content end-to-end with a shared secret key"
+msgstr "Permitir cifrado adicional de contenido \"punto-a-punto\" con una clave secreta compartida."
+
+#: ../../include/features.php:61
+msgid "Enable voting tools"
+msgstr "Activar herramientas de votación"
+
+#: ../../include/features.php:61
+msgid "Provide a class of post which others can vote on"
+msgstr "Proveer una clase de publicación en la que otros puedan votar"
+
+#: ../../include/features.php:67
+msgid "Network and Stream Filtering"
+msgstr "Filtrado del contenido"
+
+#: ../../include/features.php:68
+msgid "Search by Date"
+msgstr "Buscar por fecha"
+
+#: ../../include/features.php:68
+msgid "Ability to select posts by date ranges"
+msgstr "Capacidad de seleccionar entradas por rango de fechas"
+
+#: ../../include/features.php:69
+msgid "Collections Filter"
+msgstr "Filtrado de colecciones"
+
+#: ../../include/features.php:69
+msgid "Enable widget to display Network posts only from selected collections"
+msgstr "Habilitar la muestra de entradas eligiendo colecciones"
+
+#: ../../include/features.php:70 ../../include/widgets.php:273
+msgid "Saved Searches"
+msgstr "Búsquedas guardadas"
+
+#: ../../include/features.php:70
+msgid "Save search terms for re-use"
+msgstr "Guardar términos de búsqueda para su reutilización"
+
+#: ../../include/features.php:71
+msgid "Network Personal Tab"
+msgstr "Actividad personal"
+
+#: ../../include/features.php:71
+msgid "Enable tab to display only Network posts that you've interacted on"
+msgstr "Habilitar una pestaña en la cual se muestren solo las entradas en las que ha participado."
+
+#: ../../include/features.php:72
+msgid "Network New Tab"
+msgstr "Contenido nuevo"
+
+#: ../../include/features.php:72
+msgid "Enable tab to display all new Network activity"
+msgstr "Habilitar una pestaña en la que se muestre solo el contenido nuevo"
+
+#: ../../include/features.php:73
+msgid "Affinity Tool"
+msgstr "Herramienta de afinidad"
+
+#: ../../include/features.php:73
+msgid "Filter stream activity by depth of relationships"
+msgstr "Filtrar la actividad del flujo por profundidad de relaciones"
+
+#: ../../include/features.php:74
+msgid "Connection Filtering"
+msgstr "Filtrado de conexiones"
+
+#: ../../include/features.php:74
+msgid "Filter incoming posts from connections based on keywords/content"
+msgstr "Filtrar publicaciones entrantes de conexiones por palabras clave o contenido"
+
+#: ../../include/features.php:75
+msgid "Suggest Channels"
+msgstr "Sugerir canales"
+
+#: ../../include/features.php:75
+msgid "Show channel suggestions"
+msgstr "Mostrar sugerencias de canales"
+
+#: ../../include/features.php:80
+msgid "Post/Comment Tools"
+msgstr "Herramientas de entradas/comentarios"
+
+#: ../../include/features.php:81
+msgid "Tagging"
+msgstr "Etiquetado"
+
+#: ../../include/features.php:81
+msgid "Ability to tag existing posts"
+msgstr "Capacidad de etiquetar entradas existentes"
+
+#: ../../include/features.php:82
+msgid "Post Categories"
+msgstr "Categorías de entradas"
+
+#: ../../include/features.php:82
+msgid "Add categories to your posts"
+msgstr "Añadir categorías a sus publicaciones"
+
+#: ../../include/features.php:83 ../../include/contact_widgets.php:57
+#: ../../include/widgets.php:303
+msgid "Saved Folders"
+msgstr "Carpetas guardadas"
+
+#: ../../include/features.php:83
+msgid "Ability to file posts under folders"
+msgstr "Capacidad de archivar entradas en carpetas"
+
+#: ../../include/features.php:84
+msgid "Dislike Posts"
+msgstr "Desagrado de publicaciones"
+
+#: ../../include/features.php:84
+msgid "Ability to dislike posts/comments"
+msgstr "Capacidad de mostrar desacuerdo con el contenido de  entradas y comentarios"
+
+#: ../../include/features.php:85
+msgid "Star Posts"
+msgstr "Entradas destacadas"
+
+#: ../../include/features.php:85
+msgid "Ability to mark special posts with a star indicator"
+msgstr "Capacidad de marcar entradas destacadas con un indicador de estrella"
+
+#: ../../include/features.php:86
+msgid "Tag Cloud"
+msgstr "Nube de etiquetas"
+
+#: ../../include/features.php:86
+msgid "Provide a personal tag cloud on your channel page"
+msgstr "Proveer nube de etiquetas personal en su página de canal"
+
+#: ../../include/comanche.php:34 ../../mod/admin.php:348
 msgid "Default"
 msgstr "Predeterminado"
 
@@ -435,12 +735,12 @@ msgstr "Predeterminado"
 msgid "Delete this item?"
 msgstr "¿Borrar este elemento?"
 
-#: ../../include/js_strings.php:6 ../../include/ItemObject.php:667
-#: ../../mod/photos.php:980 ../../mod/photos.php:1098
+#: ../../include/js_strings.php:6 ../../include/ItemObject.php:681
+#: ../../mod/photos.php:1044 ../../mod/photos.php:1162
 msgid "Comment"
 msgstr "Comentar"
 
-#: ../../include/js_strings.php:7 ../../include/ItemObject.php:384
+#: ../../include/js_strings.php:7 ../../include/ItemObject.php:398
 msgid "[+] show all"
 msgstr "[+] mostrar todo:"
 
@@ -462,9 +762,9 @@ msgstr "Contraseña demasiado corta"
 
 #: ../../include/js_strings.php:12
 msgid "Passwords do not match"
-msgstr "Las contraseñas no cinciden"
+msgstr "Las contraseñas no coinciden"
 
-#: ../../include/js_strings.php:13 ../../mod/photos.php:40
+#: ../../include/js_strings.php:13 ../../mod/photos.php:41
 msgid "everybody"
 msgstr "cualquiera"
 
@@ -492,8 +792,8 @@ msgstr "Nada nuevo por aquí"
 msgid "Rate This Channel (this is public)"
 msgstr "Valorar este canal (esto es público)"
 
-#: ../../include/js_strings.php:20 ../../mod/rate.php:156
-#: ../../mod/connedit.php:683
+#: ../../include/js_strings.php:20 ../../mod/connedit.php:666
+#: ../../mod/rate.php:157
 msgid "Rating"
 msgstr "Valoración"
 
@@ -501,27 +801,25 @@ msgstr "Valoración"
 msgid "Describe (optional)"
 msgstr "Describir (opcional)"
 
-#: ../../include/js_strings.php:22 ../../include/ItemObject.php:668
-#: ../../mod/xchan.php:11 ../../mod/connect.php:93 ../../mod/thing.php:303
-#: ../../mod/thing.php:346 ../../mod/events.php:511 ../../mod/events.php:693
-#: ../../mod/group.php:81 ../../mod/photos.php:577 ../../mod/photos.php:654
-#: ../../mod/photos.php:941 ../../mod/photos.php:981 ../../mod/photos.php:1099
-#: ../../mod/pdledit.php:58 ../../mod/import.php:592 ../../mod/chat.php:177
-#: ../../mod/chat.php:211 ../../mod/mitem.php:235 ../../mod/rate.php:167
-#: ../../mod/invite.php:142 ../../mod/locs.php:105 ../../mod/sources.php:104
-#: ../../mod/sources.php:138 ../../mod/filestorage.php:156
-#: ../../mod/fsuggest.php:108 ../../mod/poke.php:166
-#: ../../mod/profiles.php:667 ../../mod/setup.php:327 ../../mod/setup.php:367
-#: ../../mod/admin.php:453 ../../mod/admin.php:819 ../../mod/admin.php:986
-#: ../../mod/admin.php:1118 ../../mod/admin.php:1312 ../../mod/admin.php:1397
-#: ../../mod/settings.php:588 ../../mod/settings.php:692
-#: ../../mod/settings.php:718 ../../mod/settings.php:746
-#: ../../mod/settings.php:769 ../../mod/settings.php:854
-#: ../../mod/settings.php:1050 ../../mod/mood.php:134
-#: ../../mod/connedit.php:704 ../../mod/mail.php:355 ../../mod/appman.php:99
-#: ../../mod/pconfig.php:108 ../../mod/poll.php:68
-#: ../../mod/bulksetclose.php:24 ../../view/theme/apw/php/config.php:256
-#: ../../view/theme/redbasic/php/config.php:99
+#: ../../include/js_strings.php:22 ../../include/ItemObject.php:682
+#: ../../mod/fsuggest.php:108 ../../mod/mitem.php:231
+#: ../../mod/connedit.php:687 ../../mod/mood.php:135 ../../mod/pconfig.php:108
+#: ../../mod/photos.php:634 ../../mod/photos.php:1005
+#: ../../mod/photos.php:1045 ../../mod/photos.php:1163
+#: ../../mod/filestorage.php:156 ../../mod/poke.php:171 ../../mod/chat.php:184
+#: ../../mod/chat.php:213 ../../mod/rate.php:168 ../../mod/mail.php:371
+#: ../../mod/admin.php:411 ../../mod/admin.php:776 ../../mod/admin.php:940
+#: ../../mod/admin.php:1072 ../../mod/admin.php:1266 ../../mod/admin.php:1351
+#: ../../mod/appman.php:99 ../../mod/pdledit.php:58 ../../mod/events.php:534
+#: ../../mod/events.php:710 ../../mod/sources.php:104
+#: ../../mod/sources.php:138 ../../mod/import.php:517 ../../mod/thing.php:313
+#: ../../mod/thing.php:359 ../../mod/invite.php:142 ../../mod/settings.php:583
+#: ../../mod/settings.php:695 ../../mod/settings.php:723
+#: ../../mod/settings.php:746 ../../mod/settings.php:831
+#: ../../mod/settings.php:1020 ../../mod/xchan.php:11 ../../mod/group.php:81
+#: ../../mod/connect.php:93 ../../mod/locs.php:108 ../../mod/setup.php:331
+#: ../../mod/setup.php:371 ../../mod/profiles.php:667
+#: ../../mod/import_items.php:122 ../../view/theme/redbasic/php/config.php:99
 msgid "Submit"
 msgstr "Enviar"
 
@@ -543,7 +841,7 @@ msgstr "timeago.prefixFromNow"
 
 #: ../../include/js_strings.php:28
 msgid "ago"
-msgstr "de su publicación"
+msgstr "antes"
 
 #: ../../include/js_strings.php:29
 msgid "from now"
@@ -606,965 +904,953 @@ msgstr " "
 msgid "timeago.numbers"
 msgstr "timeago.numbers"
 
-#: ../../include/text.php:391
-msgid "prev"
-msgstr "anterior"
-
-#: ../../include/text.php:393
-msgid "first"
-msgstr "primera"
-
-#: ../../include/text.php:422
-msgid "last"
-msgstr "última"
-
-#: ../../include/text.php:425
-msgid "next"
-msgstr "próxima"
-
-#: ../../include/text.php:435
-msgid "older"
-msgstr "más antiguas"
-
-#: ../../include/text.php:437
-msgid "newer"
-msgstr "más recientes"
-
-#: ../../include/text.php:830
-msgid "No connections"
-msgstr "Sin conexiones"
-
-#: ../../include/text.php:844
-#, php-format
-msgid "%d Connection"
-msgid_plural "%d Connections"
-msgstr[0] "%d Conexión"
-msgstr[1] "%d Conexiones"
-
-#: ../../include/text.php:857 ../../mod/viewconnections.php:104
-msgid "View Connections"
-msgstr "Ver conexiones"
-
-#: ../../include/text.php:914 ../../include/text.php:926
-#: ../../include/nav.php:165 ../../include/apps.php:147
-#: ../../mod/search.php:38
-msgid "Search"
-msgstr "Buscar"
-
-#: ../../include/text.php:915 ../../include/text.php:927
-#: ../../include/widgets.php:192 ../../mod/rbmark.php:28
-#: ../../mod/rbmark.php:98 ../../mod/filer.php:50 ../../mod/admin.php:1457
-#: ../../mod/admin.php:1477
-msgid "Save"
-msgstr "Guardar"
-
-#: ../../include/text.php:990
-msgid "poke"
-msgstr "dar un toque"
-
-#: ../../include/text.php:990 ../../include/conversation.php:243
-msgid "poked"
-msgstr "ha recibido un toque"
-
-#: ../../include/text.php:991
-msgid "ping"
-msgstr "avisar"
-
-#: ../../include/text.php:991
-msgid "pinged"
-msgstr "avisado/a"
-
-#: ../../include/text.php:992
-msgid "prod"
-msgstr "incitar"
-
-#: ../../include/text.php:992
-msgid "prodded"
-msgstr "incitado/a"
-
-#: ../../include/text.php:993
-msgid "slap"
-msgstr "abofetear"
+#: ../../include/js_strings.php:44 ../../include/text.php:1144
+msgid "January"
+msgstr "enero"
 
-#: ../../include/text.php:993
-msgid "slapped"
-msgstr "abofeteado/a"
+#: ../../include/js_strings.php:45 ../../include/text.php:1144
+msgid "February"
+msgstr "febrero"
 
-#: ../../include/text.php:994
-msgid "finger"
-msgstr "señalar"
+#: ../../include/js_strings.php:46 ../../include/text.php:1144
+msgid "March"
+msgstr "marzo"
 
-#: ../../include/text.php:994
-msgid "fingered"
-msgstr "señalado/a"
+#: ../../include/js_strings.php:47 ../../include/text.php:1144
+msgid "April"
+msgstr "abril"
 
-#: ../../include/text.php:995
-msgid "rebuff"
-msgstr "desairar"
+#: ../../include/js_strings.php:48
+msgctxt "long"
+msgid "May"
+msgstr "mayo"
 
-#: ../../include/text.php:995
-msgid "rebuffed"
-msgstr "desairado/a"
+#: ../../include/js_strings.php:49 ../../include/text.php:1144
+msgid "June"
+msgstr "junio"
 
-#: ../../include/text.php:1005
-msgid "happy"
-msgstr "feliz"
+#: ../../include/js_strings.php:50 ../../include/text.php:1144
+msgid "July"
+msgstr "julio"
 
-#: ../../include/text.php:1006
-msgid "sad"
-msgstr "triste"
+#: ../../include/js_strings.php:51 ../../include/text.php:1144
+msgid "August"
+msgstr "agosto"
 
-#: ../../include/text.php:1007
-msgid "mellow"
-msgstr "amable"
+#: ../../include/js_strings.php:52 ../../include/text.php:1144
+msgid "September"
+msgstr "septiembre"
 
-#: ../../include/text.php:1008
-msgid "tired"
-msgstr "cansado/a"
+#: ../../include/js_strings.php:53 ../../include/text.php:1144
+msgid "October"
+msgstr "octubre"
 
-#: ../../include/text.php:1009
-msgid "perky"
-msgstr "fesco/a"
+#: ../../include/js_strings.php:54 ../../include/text.php:1144
+msgid "November"
+msgstr "noviembre"
 
-#: ../../include/text.php:1010
-msgid "angry"
-msgstr "enfadado/a"
+#: ../../include/js_strings.php:55 ../../include/text.php:1144
+msgid "December"
+msgstr "diciembre"
 
-#: ../../include/text.php:1011
-msgid "stupified"
-msgstr "estupefacto/a"
+#: ../../include/js_strings.php:56
+msgid "Jan"
+msgstr "Ene"
 
-#: ../../include/text.php:1012
-msgid "puzzled"
-msgstr "perplejo/a"
+#: ../../include/js_strings.php:57
+msgid "Feb"
+msgstr "Feb"
 
-#: ../../include/text.php:1013
-msgid "interested"
-msgstr "interesado/a"
+#: ../../include/js_strings.php:58
+msgid "Mar"
+msgstr "Mar"
 
-#: ../../include/text.php:1014
-msgid "bitter"
-msgstr "amargado/a"
+#: ../../include/js_strings.php:59
+msgid "Apr"
+msgstr "Abr"
 
-#: ../../include/text.php:1015
-msgid "cheerful"
-msgstr "alegre"
+#: ../../include/js_strings.php:60
+msgctxt "short"
+msgid "May"
+msgstr "May"
 
-#: ../../include/text.php:1016
-msgid "alive"
-msgstr "vivo/a"
+#: ../../include/js_strings.php:61
+msgid "Jun"
+msgstr "Jun"
 
-#: ../../include/text.php:1017
-msgid "annoyed"
-msgstr "molesto/a"
+#: ../../include/js_strings.php:62
+msgid "Jul"
+msgstr "Jul"
 
-#: ../../include/text.php:1018
-msgid "anxious"
-msgstr "ansioso/a"
+#: ../../include/js_strings.php:63
+msgid "Aug"
+msgstr "Ago"
 
-#: ../../include/text.php:1019
-msgid "cranky"
-msgstr "de mal humor"
+#: ../../include/js_strings.php:64
+msgid "Sep"
+msgstr "Sep"
 
-#: ../../include/text.php:1020
-msgid "disturbed"
-msgstr "perturbado/a"
+#: ../../include/js_strings.php:65
+msgid "Oct"
+msgstr "Oct"
 
-#: ../../include/text.php:1021
-msgid "frustrated"
-msgstr "frustrado/a"
+#: ../../include/js_strings.php:66
+msgid "Nov"
+msgstr "Nov"
 
-#: ../../include/text.php:1022
-msgid "depressed"
-msgstr "deprimido/a"
+#: ../../include/js_strings.php:67
+msgid "Dec"
+msgstr "Dic"
 
-#: ../../include/text.php:1023
-msgid "motivated"
-msgstr "motivado/a"
-
-#: ../../include/text.php:1024
-msgid "relaxed"
-msgstr "relajado/a"
-
-#: ../../include/text.php:1025
-msgid "surprised"
-msgstr "sorprendido/a"
+#: ../../include/js_strings.php:68 ../../include/text.php:1140
+msgid "Sunday"
+msgstr "domingo"
 
-#: ../../include/text.php:1197
+#: ../../include/js_strings.php:69 ../../include/text.php:1140
 msgid "Monday"
 msgstr "lunes"
 
-#: ../../include/text.php:1197
+#: ../../include/js_strings.php:70 ../../include/text.php:1140
 msgid "Tuesday"
 msgstr "martes"
 
-#: ../../include/text.php:1197
+#: ../../include/js_strings.php:71 ../../include/text.php:1140
 msgid "Wednesday"
 msgstr "miércoles"
 
-#: ../../include/text.php:1197
+#: ../../include/js_strings.php:72 ../../include/text.php:1140
 msgid "Thursday"
 msgstr "jueves"
 
-#: ../../include/text.php:1197
+#: ../../include/js_strings.php:73 ../../include/text.php:1140
 msgid "Friday"
 msgstr "viernes"
 
-#: ../../include/text.php:1197
+#: ../../include/js_strings.php:74 ../../include/text.php:1140
 msgid "Saturday"
 msgstr "sábado"
 
-#: ../../include/text.php:1197
-msgid "Sunday"
-msgstr "domingo"
-
-#: ../../include/text.php:1201
-msgid "January"
-msgstr "enero"
-
-#: ../../include/text.php:1201
-msgid "February"
-msgstr "febrero"
+#: ../../include/js_strings.php:75
+msgid "Sun"
+msgstr "Dom"
 
-#: ../../include/text.php:1201
-msgid "March"
-msgstr "marzo"
+#: ../../include/js_strings.php:76
+msgid "Mon"
+msgstr "Lun"
 
-#: ../../include/text.php:1201
-msgid "April"
-msgstr "abril"
+#: ../../include/js_strings.php:77
+msgid "Tue"
+msgstr "Mar"
 
-#: ../../include/text.php:1201
-msgid "May"
-msgstr "mayo"
+#: ../../include/js_strings.php:78
+msgid "Wed"
+msgstr "Mié"
 
-#: ../../include/text.php:1201
-msgid "June"
-msgstr "junio"
+#: ../../include/js_strings.php:79
+msgid "Thu"
+msgstr "Jue"
 
-#: ../../include/text.php:1201
-msgid "July"
-msgstr "julio"
+#: ../../include/js_strings.php:80
+msgid "Fri"
+msgstr "Vie"
 
-#: ../../include/text.php:1201
-msgid "August"
-msgstr "agosto"
+#: ../../include/js_strings.php:81
+msgid "Sat"
+msgstr "Sáb"
 
-#: ../../include/text.php:1201
-msgid "September"
-msgstr "septiembre"
+#: ../../include/js_strings.php:82
+msgctxt "calendar"
+msgid "today"
+msgstr "hoy"
 
-#: ../../include/text.php:1201
-msgid "October"
-msgstr "octubre"
+#: ../../include/js_strings.php:83
+msgctxt "calendar"
+msgid "month"
+msgstr "mes"
 
-#: ../../include/text.php:1201
-msgid "November"
-msgstr "noviembre"
+#: ../../include/js_strings.php:84
+msgctxt "calendar"
+msgid "week"
+msgstr "semana"
 
-#: ../../include/text.php:1201
-msgid "December"
-msgstr "diciembre"
+#: ../../include/js_strings.php:85
+msgctxt "calendar"
+msgid "day"
+msgstr "día"
 
-#: ../../include/text.php:1306
-msgid "unknown.???"
-msgstr "desconocido???"
+#: ../../include/js_strings.php:86
+msgctxt "calendar"
+msgid "All day"
+msgstr "Todos los días"
 
-#: ../../include/text.php:1307
-msgid "bytes"
-msgstr "bytes"
+#: ../../include/contact_selectors.php:56
+msgid "Frequently"
+msgstr "Frecuentemente"
 
-#: ../../include/text.php:1343
-msgid "remove category"
-msgstr "eliminar categoría"
+#: ../../include/contact_selectors.php:57
+msgid "Hourly"
+msgstr "Cada hora"
 
-#: ../../include/text.php:1418
-msgid "remove from file"
-msgstr "eliminar del fichero"
+#: ../../include/contact_selectors.php:58
+msgid "Twice daily"
+msgstr "Dos veces al día"
 
-#: ../../include/text.php:1494 ../../include/text.php:1505
-msgid "Click to open/close"
-msgstr "Pulsar para abrir/cerrar"
+#: ../../include/contact_selectors.php:59
+msgid "Daily"
+msgstr "Diariamente"
 
-#: ../../include/text.php:1661 ../../mod/events.php:474
-msgid "Link to Source"
-msgstr "Enlazar con la entrada en su ubicación original"
+#: ../../include/contact_selectors.php:60
+msgid "Weekly"
+msgstr "Semanalmente"
 
-#: ../../include/text.php:1682 ../../include/text.php:1753
-msgid "default"
-msgstr "por defecto"
+#: ../../include/contact_selectors.php:61
+msgid "Monthly"
+msgstr "Mensualmente"
 
-#: ../../include/text.php:1690
-msgid "Page layout"
-msgstr "Formato de la página"
+#: ../../include/contact_selectors.php:76
+msgid "Friendica"
+msgstr "Friendica"
 
-#: ../../include/text.php:1690
-msgid "You can create your own with the layouts tool"
-msgstr "Puede crear su propio formato gráfico con las herramientas de diseño"
+#: ../../include/contact_selectors.php:77
+msgid "OStatus"
+msgstr "OStatus"
 
-#: ../../include/text.php:1731
-msgid "Page content type"
-msgstr "Tipo de contenido de página"
+#: ../../include/contact_selectors.php:78
+msgid "RSS/Atom"
+msgstr "RSS/Atom"
 
-#: ../../include/text.php:1765
-msgid "Select an alternate language"
-msgstr "Selecciona un idioma alternativo"
+#: ../../include/contact_selectors.php:79 ../../mod/id.php:15
+#: ../../mod/id.php:16 ../../mod/admin.php:779 ../../mod/admin.php:788
+#: ../../boot.php:1505
+msgid "Email"
+msgstr "Correo electrónico"
 
-#: ../../include/text.php:1884 ../../include/diaspora.php:2119
-#: ../../include/conversation.php:120 ../../mod/like.php:349
-#: ../../mod/subthread.php:72 ../../mod/subthread.php:174
-#: ../../mod/tagger.php:43
-msgid "photo"
-msgstr "foto"
+#: ../../include/contact_selectors.php:80
+msgid "Diaspora"
+msgstr "Diaspora"
 
-#: ../../include/text.php:1887 ../../include/conversation.php:123
-#: ../../mod/like.php:351 ../../mod/tagger.php:47
-msgid "event"
-msgstr "evento"
+#: ../../include/contact_selectors.php:81
+msgid "Facebook"
+msgstr "Facebook"
 
-#: ../../include/text.php:1890 ../../include/diaspora.php:2119
-#: ../../include/conversation.php:148 ../../mod/like.php:349
-#: ../../mod/subthread.php:72 ../../mod/subthread.php:174
-msgid "status"
-msgstr "estado"
+#: ../../include/contact_selectors.php:82
+msgid "Zot!"
+msgstr "Zot!"
 
-#: ../../include/text.php:1892 ../../include/conversation.php:150
-#: ../../mod/tagger.php:53
-msgid "comment"
-msgstr "comentario"
+#: ../../include/contact_selectors.php:83
+msgid "LinkedIn"
+msgstr "LinkedIn"
 
-#: ../../include/text.php:1897
-msgid "activity"
-msgstr "actividad"
+#: ../../include/contact_selectors.php:84
+msgid "XMPP/IM"
+msgstr "XMPP/IM"
 
-#: ../../include/text.php:2192
-msgid "Design Tools"
-msgstr "Herramientas de diseño"
+#: ../../include/contact_selectors.php:85
+msgid "MySpace"
+msgstr "MySpace"
 
-#: ../../include/text.php:2195 ../../mod/blocks.php:147
-msgid "Blocks"
-msgstr "Bloques"
+#: ../../include/activities.php:42
+msgid " and "
+msgstr "y"
 
-#: ../../include/text.php:2196 ../../mod/menu.php:101
-msgid "Menus"
-msgstr "Menús"
+#: ../../include/activities.php:50
+msgid "public profile"
+msgstr "perfil público"
 
-#: ../../include/text.php:2197 ../../mod/layouts.php:174
-msgid "Layouts"
-msgstr "Formato gráfico"
+#: ../../include/activities.php:59
+#, php-format
+msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
+msgstr "%1$s cambió %2$s a &ldquo;%3$s&rdquo;"
 
-#: ../../include/text.php:2198
-msgid "Pages"
-msgstr "Páginas"
+#: ../../include/activities.php:60
+#, php-format
+msgid "Visit %1$s's %2$s"
+msgstr "Visitar %2$s de %1$s"
 
-#: ../../include/text.php:2549 ../../include/RedDAV/RedBrowser.php:131
-msgid "Collection"
-msgstr "Colección"
+#: ../../include/activities.php:63
+#, php-format
+msgid "%1$s has an updated %2$s, changing %3$s."
+msgstr "%1$s actualizó %2$s,  %3$s cambió."
 
-#: ../../include/RedDAV/RedBrowser.php:107
-#: ../../include/RedDAV/RedBrowser.php:265
-msgid "parent"
-msgstr "padre"
+#: ../../include/Contact.php:101 ../../include/identity.php:965
+#: ../../include/conversation.php:949 ../../include/widgets.php:136
+#: ../../include/widgets.php:174 ../../mod/directory.php:316
+#: ../../mod/match.php:64 ../../mod/suggest.php:52
+msgid "Connect"
+msgstr "Conectar"
 
-#: ../../include/RedDAV/RedBrowser.php:134
-msgid "Principal"
-msgstr "Principal"
+#: ../../include/Contact.php:118
+msgid "New window"
+msgstr "Nueva ventana"
 
-#: ../../include/RedDAV/RedBrowser.php:137
-msgid "Addressbook"
-msgstr "Libreta de direcciones"
+#: ../../include/Contact.php:119
+msgid "Open the selected location in a different window or browser tab"
+msgstr "Abrir la ubicación seleccionada en una ventana o pestaña aparte"
 
-#: ../../include/RedDAV/RedBrowser.php:140
-msgid "Calendar"
-msgstr "Calendario"
+#: ../../include/Contact.php:237
+#, php-format
+msgid "User '%s' deleted"
+msgstr "El usuario '%s' ha sido eliminado"
 
-#: ../../include/RedDAV/RedBrowser.php:143
-msgid "Schedule Inbox"
-msgstr "Programar bandeja de entrada"
+#: ../../include/dba/dba_driver.php:141
+#, php-format
+msgid "Cannot locate DNS info for database server '%s'"
+msgstr "No se ha podido localizar información de DNS para el servidor de base de datos “%s”"
 
-#: ../../include/RedDAV/RedBrowser.php:146
-msgid "Schedule Outbox"
-msgstr "Programar bandeja de salida"
+#: ../../include/items.php:423 ../../mod/like.php:280 ../../mod/dreport.php:6
+#: ../../mod/dreport.php:45 ../../mod/subthread.php:49 ../../mod/group.php:68
+#: ../../mod/profperm.php:23 ../../mod/import_items.php:114
+#: ../../index.php:360
+msgid "Permission denied"
+msgstr "Permiso denegado"
 
-#: ../../include/RedDAV/RedBrowser.php:164 ../../include/conversation.php:1030
-#: ../../include/apps.php:336 ../../include/apps.php:387
-#: ../../mod/photos.php:693 ../../mod/photos.php:1131
-msgid "Unknown"
-msgstr "Desconocido"
+#: ../../include/items.php:1128 ../../include/items.php:1174
+msgid "(Unknown)"
+msgstr "(Desconocido)"
 
-#: ../../include/RedDAV/RedBrowser.php:227
-#, php-format
-msgid "%1$s used"
-msgstr "%1$s usado"
+#: ../../include/items.php:1371
+msgid "Visible to anybody on the internet."
+msgstr "Visible para cualquiera en internet."
 
-#: ../../include/RedDAV/RedBrowser.php:232
-#, php-format
-msgid "%1$s used of %2$s (%3$s&#37;)"
-msgstr "%1$s usado de %2$s (%3$s&#37;)"
+#: ../../include/items.php:1373
+msgid "Visible to you only."
+msgstr "Visible sólo para usted."
 
-#: ../../include/RedDAV/RedBrowser.php:251 ../../include/nav.php:98
-#: ../../include/conversation.php:1620 ../../include/apps.php:135
-#: ../../mod/fbrowser.php:114
-msgid "Files"
-msgstr "Ficheros"
+#: ../../include/items.php:1375
+msgid "Visible to anybody in this network."
+msgstr "Visible para cualquiera en esta red."
 
-#: ../../include/RedDAV/RedBrowser.php:253
-msgid "Total"
-msgstr "Total"
+#: ../../include/items.php:1377
+msgid "Visible to anybody authenticated."
+msgstr "Visible para cualquiera que haya sido autenticado."
 
-#: ../../include/RedDAV/RedBrowser.php:255
-msgid "Shared"
-msgstr "Compartido"
+#: ../../include/items.php:1379
+#, php-format
+msgid "Visible to anybody on %s."
+msgstr "Visible para cualquiera en %s."
 
-#: ../../include/RedDAV/RedBrowser.php:256
-#: ../../include/RedDAV/RedBrowser.php:303 ../../mod/webpages.php:180
-#: ../../mod/blocks.php:152 ../../mod/menu.php:112
-#: ../../mod/new_channel.php:121 ../../mod/layouts.php:175
-msgid "Create"
-msgstr "Crear"
+#: ../../include/items.php:1381
+msgid "Visible to all connections."
+msgstr "Visible para todas las conexiones."
 
-#: ../../include/RedDAV/RedBrowser.php:257
-#: ../../include/RedDAV/RedBrowser.php:305 ../../mod/profile_photo.php:362
-#: ../../mod/photos.php:718 ../../mod/photos.php:1248
-msgid "Upload"
-msgstr "Subir"
+#: ../../include/items.php:1383
+msgid "Visible to approved connections."
+msgstr "Visible para las conexiones permitidas."
 
-#: ../../include/RedDAV/RedBrowser.php:261 ../../mod/admin.php:994
-#: ../../mod/settings.php:590 ../../mod/settings.php:616
-#: ../../mod/sharedwithme.php:95
-msgid "Name"
-msgstr "Nombre"
+#: ../../include/items.php:1385
+msgid "Visible to specific connections."
+msgstr "Visible para conexiones específicas."
 
-#: ../../include/RedDAV/RedBrowser.php:262
-msgid "Type"
-msgstr "Tipo"
+#: ../../include/items.php:4297 ../../mod/display.php:36
+#: ../../mod/filestorage.php:27 ../../mod/admin.php:127
+#: ../../mod/admin.php:979 ../../mod/admin.php:1179 ../../mod/thing.php:86
+#: ../../mod/viewsrc.php:20
+msgid "Item not found."
+msgstr "Elemento no encontrado."
 
-#: ../../include/RedDAV/RedBrowser.php:263 ../../mod/sharedwithme.php:97
-msgid "Size"
-msgstr "Tamaño"
+#: ../../include/items.php:4806 ../../mod/group.php:38 ../../mod/group.php:137
+msgid "Collection not found."
+msgstr "Colección no encontrada."
 
-#: ../../include/RedDAV/RedBrowser.php:264 ../../mod/sharedwithme.php:98
-msgid "Last Modified"
-msgstr "Última modificación"
+#: ../../include/items.php:4822
+msgid "Collection is empty."
+msgstr "La colección está vacía."
 
-#: ../../include/RedDAV/RedBrowser.php:267 ../../include/ItemObject.php:120
-#: ../../include/conversation.php:671 ../../include/apps.php:255
-#: ../../mod/webpages.php:183 ../../mod/thing.php:256 ../../mod/group.php:176
-#: ../../mod/blocks.php:155 ../../mod/photos.php:1062
-#: ../../mod/editlayout.php:178 ../../mod/editwebpage.php:225
-#: ../../mod/editblock.php:180 ../../mod/admin.php:826 ../../mod/admin.php:988
-#: ../../mod/settings.php:651 ../../mod/connedit.php:563
-msgid "Delete"
-msgstr "Borrar"
+#: ../../include/items.php:4829
+#, php-format
+msgid "Collection: %s"
+msgstr "Colección: %s"
 
-#: ../../include/RedDAV/RedBrowser.php:302
-msgid "Create new folder"
-msgstr "Crear nueva carpeta"
+#: ../../include/items.php:4839 ../../mod/connedit.php:657
+#, php-format
+msgid "Connection: %s"
+msgstr "Conexión: %s"
 
-#: ../../include/RedDAV/RedBrowser.php:304
-msgid "Upload file"
-msgstr "Subir fichero"
+#: ../../include/items.php:4841
+msgid "Connection not found."
+msgstr "Conexión no encontrada"
 
-#: ../../include/bookmarks.php:35
-#, php-format
-msgid "%1$s's bookmarks"
-msgstr "Marcadores de %1$s"
+#: ../../include/api.php:1321
+msgid "Public Timeline"
+msgstr "Cronología pública"
 
 #: ../../include/network.php:635
 msgid "view full size"
 msgstr "Ver en el tamaño original"
 
-#: ../../include/network.php:1585 ../../include/enotify.php:58
+#: ../../include/network.php:1613 ../../include/enotify.php:57
 msgid "$Projectname Notification"
 msgstr "Notificación de $Projectname"
 
-#: ../../include/network.php:1586 ../../include/enotify.php:59
-#: ../../include/diaspora.php:2522 ../../include/diaspora.php:2533
-#: ../../mod/p.php:46
+#: ../../include/network.php:1614 ../../include/enotify.php:58
 msgid "$projectname"
 msgstr "$projectname"
 
-#: ../../include/network.php:1588 ../../include/enotify.php:61
+#: ../../include/network.php:1616 ../../include/enotify.php:60
 msgid "Thank You,"
 msgstr "Gracias,"
 
-#: ../../include/network.php:1590 ../../include/enotify.php:63
+#: ../../include/network.php:1618 ../../include/enotify.php:62
 #, php-format
 msgid "%s Administrator"
 msgstr "%s Administrador"
 
-#: ../../include/network.php:1646
+#: ../../include/network.php:1660 ../../include/account.php:316
+#: ../../include/account.php:343 ../../include/account.php:403
+msgid "Administrator"
+msgstr "Administrador"
+
+#: ../../include/network.php:1674
 msgid "No Subject"
 msgstr "Sin asunto"
 
-#: ../../include/features.php:38
-msgid "General Features"
-msgstr "Características generales"
+#: ../../include/bookmarks.php:35
+#, php-format
+msgid "%1$s's bookmarks"
+msgstr "Marcadores de %1$s"
 
-#: ../../include/features.php:40
-msgid "Content Expiration"
-msgstr "Caducidad del contenido"
+#: ../../include/acl_selectors.php:239
+msgid "Visible to your default audience"
+msgstr "Visible para su público predeterminado."
 
-#: ../../include/features.php:40
-msgid "Remove posts/comments and/or private messages at a future time"
-msgstr "Eliminar publicaciones/comentarios y/o mensajes privados más adelante"
+#: ../../include/acl_selectors.php:240
+msgid "Show"
+msgstr "Mostrar"
 
-#: ../../include/features.php:41
-msgid "Multiple Profiles"
-msgstr "Múltiples perfiles"
+#: ../../include/acl_selectors.php:241
+msgid "Don't show"
+msgstr "No mostrar"
 
-#: ../../include/features.php:41
-msgid "Ability to create multiple profiles"
-msgstr "Capacidad de crear múltiples perfiles"
+#: ../../include/acl_selectors.php:247 ../../mod/photos.php:628
+#: ../../mod/photos.php:998 ../../mod/filestorage.php:147
+#: ../../mod/chat.php:211 ../../mod/events.php:708 ../../mod/thing.php:310
+#: ../../mod/thing.php:356
+msgid "Permissions"
+msgstr "Permisos"
 
-#: ../../include/features.php:42
-msgid "Advanced Profiles"
-msgstr "Perfiles avanzados"
+#: ../../include/acl_selectors.php:248 ../../include/ItemObject.php:369
+#: ../../mod/photos.php:1215
+msgid "Close"
+msgstr "Cerrar"
 
-#: ../../include/features.php:42
-msgid "Additional profile sections and selections"
-msgstr "Secciones y selecciones de perfil adicionales"
+#: ../../include/import.php:23
+msgid ""
+"Cannot create a duplicate channel identifier on this system. Import failed."
+msgstr "No se ha podido crear un canal con un identificador que ya existe en este sistema. La importación ha fallado."
 
-#: ../../include/features.php:43
-msgid "Profile Import/Export"
-msgstr "Importar/Exportar perfil"
+#: ../../include/import.php:70
+msgid "Channel clone failed. Import failed."
+msgstr "La clonación del canal no ha salido bien. La importación ha fallado."
 
-#: ../../include/features.php:43
-msgid "Save and load profile details across sites/channels"
-msgstr "Guardar y cargar detalles del perfil a través de sitios/canales"
+#: ../../include/import.php:80 ../../mod/import.php:138
+msgid "Cloned channel not found. Import failed."
+msgstr "No se ha podido importar el canal porque el canal clonado no se ha encontrado."
 
-#: ../../include/features.php:44
-msgid "Web Pages"
-msgstr "Páginas web"
+#: ../../include/photos.php:109
+#, php-format
+msgid "Image exceeds website size limit of %lu bytes"
+msgstr "La imagen excede el límite de %lu bytes del sitio"
 
-#: ../../include/features.php:44
-msgid "Provide managed web pages on your channel"
-msgstr "Proveer páginas web gestionadas en su canal"
+#: ../../include/photos.php:116
+msgid "Image file is empty."
+msgstr "El fichero de imagen está vacío. "
 
-#: ../../include/features.php:45
-msgid "Private Notes"
-msgstr "Notas privadas"
+#: ../../include/photos.php:143 ../../mod/profile_photo.php:222
+msgid "Unable to process image"
+msgstr "No ha sido posible procesar la imagen"
 
-#: ../../include/features.php:45
-msgid "Enables a tool to store notes and reminders"
-msgstr "Activar una herramienta para almacenar notas y recordatorios"
+#: ../../include/photos.php:232
+msgid "Photo storage failed."
+msgstr "La foto no ha podido ser guardada."
 
-#: ../../include/features.php:46
-msgid "Navigation Channel Select"
-msgstr "Navegación por el selector de canales"
+#: ../../include/photos.php:452 ../../include/conversation.php:1609
+msgid "Photo Albums"
+msgstr "Álbumes de fotos"
 
-#: ../../include/features.php:46
-msgid "Change channels directly from within the navigation dropdown menu"
-msgstr "Cambiar canales directamente desde el menú de navegación desplegable"
+#: ../../include/photos.php:456
+msgid "Upload New Photos"
+msgstr "Subir nuevas fotos"
 
-#: ../../include/features.php:47
-msgid "Photo Location"
-msgstr "Ubicación de las fotos"
+#: ../../include/notify.php:20
+msgid "created a new post"
+msgstr "ha creado una nueva entrada"
 
-#: ../../include/features.php:47
-msgid "If location data is available on uploaded photos, link this to a map."
-msgstr "Si los datos de ubicación están disponibles en las fotos subidas, enlaza estas a un mapa."
+#: ../../include/notify.php:21
+#, php-format
+msgid "commented on %s's post"
+msgstr "ha comentado la entrada de %s"
 
-#: ../../include/features.php:49
-msgid "Expert Mode"
-msgstr "Modo de experto"
+#: ../../include/page_widgets.php:6
+msgid "New Page"
+msgstr "Nueva página"
 
-#: ../../include/features.php:49
-msgid "Enable Expert Mode to provide advanced configuration options"
-msgstr "Habilitar el modo de experto para acceder a opciones avanzadas de configuración"
+#: ../../include/page_widgets.php:39 ../../mod/layouts.php:188
+#: ../../mod/webpages.php:187 ../../mod/blocks.php:159
+msgid "View"
+msgstr "Ver"
 
-#: ../../include/features.php:50
-msgid "Premium Channel"
-msgstr "Canal premium"
+#: ../../include/page_widgets.php:40 ../../include/ItemObject.php:691
+#: ../../include/conversation.php:1160 ../../mod/photos.php:1046
+#: ../../mod/editblock.php:171 ../../mod/editpost.php:150
+#: ../../mod/events.php:707 ../../mod/webpages.php:188
+#: ../../mod/editwebpage.php:212
+msgid "Preview"
+msgstr "Previsualizar"
 
-#: ../../include/features.php:50
-msgid ""
-"Allows you to set restrictions and terms on those that connect with your "
-"channel"
-msgstr "Les permite configurar restricciones y normas de uso a aquellos que conectan con su canal"
+#: ../../include/page_widgets.php:41 ../../mod/webpages.php:189
+msgid "Actions"
+msgstr "Acciones"
 
-#: ../../include/features.php:55
-msgid "Post Composition Features"
-msgstr "Características de composición de entradas"
+#: ../../include/page_widgets.php:42 ../../mod/webpages.php:190
+msgid "Page Link"
+msgstr "Vínculo de la página"
 
-#: ../../include/features.php:57
-msgid "Use Markdown"
-msgstr "Usar Markdown"
+#: ../../include/page_widgets.php:43
+msgid "Title"
+msgstr "Título"
 
-#: ../../include/features.php:57
-msgid "Allow use of \"Markdown\" to format posts"
-msgstr "Permitir el uso de \"Markdown\" para formatear publicaciones"
+#: ../../include/page_widgets.php:44 ../../mod/layouts.php:181
+#: ../../mod/menu.php:110 ../../mod/webpages.php:192 ../../mod/blocks.php:150
+msgid "Created"
+msgstr "Creado"
 
-#: ../../include/features.php:58
-msgid "Large Photos"
-msgstr "Fotos de gran tamaño"
+#: ../../include/page_widgets.php:45 ../../mod/layouts.php:182
+#: ../../mod/menu.php:111 ../../mod/webpages.php:193 ../../mod/blocks.php:151
+msgid "Edited"
+msgstr "Editado"
 
-#: ../../include/features.php:58
-msgid ""
-"Include large (640px) photo thumbnails in posts. If not enabled, use small "
-"(320px) photo thumbnails"
-msgstr "Incluir miniaturas de fotos grandes (640px) en publicaciones. Si no está habilitado, usar miniaturas pequeñas (320px)"
+#: ../../include/photo/photo_driver.php:705 ../../mod/photos.php:94
+#: ../../mod/photos.php:696 ../../mod/profile_photo.php:146
+#: ../../mod/profile_photo.php:236 ../../mod/profile_photo.php:376
+msgid "Profile Photos"
+msgstr "Fotos del perfil"
 
-#: ../../include/features.php:59 ../../include/widgets.php:548
-#: ../../mod/sources.php:88
-msgid "Channel Sources"
-msgstr "Orígenes de los contenidos del canal"
+#: ../../include/profile_selectors.php:6
+#: ../../include/profile_selectors.php:23 ../../mod/id.php:103
+msgid "Male"
+msgstr "Hombre"
 
-#: ../../include/features.php:59
-msgid "Automatically import channel content from other channels or feeds"
-msgstr "Importar automáticamente contenido de otros canales o \"feeds\""
+#: ../../include/profile_selectors.php:6
+#: ../../include/profile_selectors.php:23 ../../mod/id.php:105
+msgid "Female"
+msgstr "Mujer"
 
-#: ../../include/features.php:60
-msgid "Even More Encryption"
-msgstr "Más cifrado todavía"
+#: ../../include/profile_selectors.php:6
+msgid "Currently Male"
+msgstr "Actualmente hombre"
 
-#: ../../include/features.php:60
-msgid ""
-"Allow optional encryption of content end-to-end with a shared secret key"
-msgstr "Permitir cifrado adicional de contenido punto-a-punto con una clave secreta compartida."
+#: ../../include/profile_selectors.php:6
+msgid "Currently Female"
+msgstr "Actualmente mujer"
 
-#: ../../include/features.php:61
-msgid "Enable voting tools"
-msgstr "Activar herramientas de votación"
+#: ../../include/profile_selectors.php:6
+msgid "Mostly Male"
+msgstr "Generalmente hombre"
 
-#: ../../include/features.php:61
-msgid "Provide a class of post which others can vote on"
-msgstr "Proveer una clase de publicación en la que otros puedan votar"
+#: ../../include/profile_selectors.php:6
+msgid "Mostly Female"
+msgstr "Generalmente mujer"
 
-#: ../../include/features.php:67
-msgid "Network and Stream Filtering"
-msgstr "Filtrado del contenido"
+#: ../../include/profile_selectors.php:6
+msgid "Transgender"
+msgstr "Transgénero"
 
-#: ../../include/features.php:68
-msgid "Search by Date"
-msgstr "Buscar por fecha"
+#: ../../include/profile_selectors.php:6
+msgid "Intersex"
+msgstr "Intersexual"
 
-#: ../../include/features.php:68
-msgid "Ability to select posts by date ranges"
-msgstr "Capacidad de seleccionar entradas por rango de fechas"
+#: ../../include/profile_selectors.php:6
+msgid "Transsexual"
+msgstr "Transexual"
 
-#: ../../include/features.php:69
-msgid "Collections Filter"
-msgstr "Filtrado de colecciones"
+#: ../../include/profile_selectors.php:6
+msgid "Hermaphrodite"
+msgstr "Hermafrodita"
 
-#: ../../include/features.php:69
-msgid "Enable widget to display Network posts only from selected collections"
-msgstr "Habilitar la muestra de entradas eligiendo colecciones"
+#: ../../include/profile_selectors.php:6
+msgid "Neuter"
+msgstr "Neutral"
 
-#: ../../include/features.php:70 ../../include/widgets.php:274
-msgid "Saved Searches"
-msgstr "Búsquedas guardadas"
+#: ../../include/profile_selectors.php:6
+msgid "Non-specific"
+msgstr "No especificado"
 
-#: ../../include/features.php:70
-msgid "Save search terms for re-use"
-msgstr "Guardar términos de búsqueda para su reutilización"
+#: ../../include/profile_selectors.php:6
+msgid "Undecided"
+msgstr "Indeciso/a"
 
-#: ../../include/features.php:71
-msgid "Network Personal Tab"
-msgstr "Pestaña de red personal"
+#: ../../include/profile_selectors.php:42
+#: ../../include/profile_selectors.php:61
+msgid "Males"
+msgstr "Hombres"
 
-#: ../../include/features.php:71
-msgid "Enable tab to display only Network posts that you've interacted on"
-msgstr "Habilitar una pestaña en la cual se muestren solo las entradas en las que ha participado."
+#: ../../include/profile_selectors.php:42
+#: ../../include/profile_selectors.php:61
+msgid "Females"
+msgstr "Mujeres"
 
-#: ../../include/features.php:72
-msgid "Network New Tab"
-msgstr "Nueva pestaña de red"
+#: ../../include/profile_selectors.php:42
+msgid "Gay"
+msgstr "Homosexual"
 
-#: ../../include/features.php:72
-msgid "Enable tab to display all new Network activity"
-msgstr "Habilitar una pestaña en la que se muestre toda la actividad de la red"
+#: ../../include/profile_selectors.php:42
+msgid "Lesbian"
+msgstr "Lesbiana"
 
-#: ../../include/features.php:73
-msgid "Affinity Tool"
-msgstr "Herramienta de afinidad"
+#: ../../include/profile_selectors.php:42
+msgid "No Preference"
+msgstr "Sin preferencias"
 
-#: ../../include/features.php:73
-msgid "Filter stream activity by depth of relationships"
-msgstr "Filtrar la actividad del flujo por profundidad de relaciones"
+#: ../../include/profile_selectors.php:42
+msgid "Bisexual"
+msgstr "Bisexual"
 
-#: ../../include/features.php:74
-msgid "Connection Filtering"
-msgstr "Filtrado de conexiones"
+#: ../../include/profile_selectors.php:42
+msgid "Autosexual"
+msgstr "Autosexual"
 
-#: ../../include/features.php:74
-msgid "Filter incoming posts from connections based on keywords/content"
-msgstr "Filtrar publicaciones entrantes de conexiones basadas en palabras clave / contenido"
+#: ../../include/profile_selectors.php:42
+msgid "Abstinent"
+msgstr "Casto/a"
 
-#: ../../include/features.php:75
-msgid "Suggest Channels"
-msgstr "Sugerir canales"
+#: ../../include/profile_selectors.php:42
+msgid "Virgin"
+msgstr "Virgen"
 
-#: ../../include/features.php:75
-msgid "Show channel suggestions"
-msgstr "Mostrar sugerencias de canales"
+#: ../../include/profile_selectors.php:42
+msgid "Deviant"
+msgstr "Fuera de lo común"
 
-#: ../../include/features.php:80
-msgid "Post/Comment Tools"
-msgstr "Herramientas de entradas/comentarios"
+#: ../../include/profile_selectors.php:42
+msgid "Fetish"
+msgstr "Fetichista"
 
-#: ../../include/features.php:81
-msgid "Tagging"
-msgstr "Etiquetado"
+#: ../../include/profile_selectors.php:42
+msgid "Oodles"
+msgstr "Orgías"
 
-#: ../../include/features.php:81
-msgid "Ability to tag existing posts"
-msgstr "Capacidad de etiquetar entradas existentes"
+#: ../../include/profile_selectors.php:42
+msgid "Nonsexual"
+msgstr "Asexual"
 
-#: ../../include/features.php:82
-msgid "Post Categories"
-msgstr "Categorías de entradas"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Single"
+msgstr "Soltero/a"
 
-#: ../../include/features.php:82
-msgid "Add categories to your posts"
-msgstr "Añadir categorías a sus publicaciones"
+#: ../../include/profile_selectors.php:80
+msgid "Lonely"
+msgstr "Solo/a"
 
-#: ../../include/features.php:83 ../../include/widgets.php:304
-#: ../../include/contact_widgets.php:57
-msgid "Saved Folders"
-msgstr "Carpetas guardadas"
+#: ../../include/profile_selectors.php:80
+msgid "Available"
+msgstr "Disponible"
 
-#: ../../include/features.php:83
-msgid "Ability to file posts under folders"
-msgstr "Capacidad de archivar entradas en carpetas"
+#: ../../include/profile_selectors.php:80
+msgid "Unavailable"
+msgstr "No disponible"
 
-#: ../../include/features.php:84
-msgid "Dislike Posts"
-msgstr "Desagrado de publicaciones"
+#: ../../include/profile_selectors.php:80
+msgid "Has crush"
+msgstr "Enamorado/a"
 
-#: ../../include/features.php:84
-msgid "Ability to dislike posts/comments"
-msgstr "Capacidad de mostrar desacuerdo con el contenido de  entradas y comentarios"
+#: ../../include/profile_selectors.php:80
+msgid "Infatuated"
+msgstr "Apasionado/a"
 
-#: ../../include/features.php:85
-msgid "Star Posts"
-msgstr "Entradas destacadas"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Dating"
+msgstr "Saliendo con alguien"
 
-#: ../../include/features.php:85
-msgid "Ability to mark special posts with a star indicator"
-msgstr "Capacidad de marcar entradas destacadas con un indicador de estrella"
+#: ../../include/profile_selectors.php:80
+msgid "Unfaithful"
+msgstr "Infiel"
 
-#: ../../include/features.php:86
-msgid "Tag Cloud"
-msgstr "Nube de etiquetas"
+#: ../../include/profile_selectors.php:80
+msgid "Sex Addict"
+msgstr "Con adicción al sexo"
 
-#: ../../include/features.php:86
-msgid "Provide a personal tag cloud on your channel page"
-msgstr "Proveer nube de etiquetas personal en su página de canal"
+#: ../../include/profile_selectors.php:80 ../../include/identity.php:390
+#: ../../include/identity.php:391 ../../include/identity.php:398
+#: ../../include/widgets.php:429 ../../mod/connedit.php:568
+#: ../../mod/settings.php:337 ../../mod/settings.php:341
+#: ../../mod/settings.php:342 ../../mod/settings.php:345
+#: ../../mod/settings.php:356
+msgid "Friends"
+msgstr "Amigos"
 
-#: ../../include/widgets.php:35 ../../include/taxonomy.php:264
-#: ../../include/contact_widgets.php:92
-msgid "Categories"
-msgstr "Categorías"
+#: ../../include/profile_selectors.php:80
+msgid "Friends/Benefits"
+msgstr "Amigos con algo extra"
 
-#: ../../include/widgets.php:91 ../../include/nav.php:163
-#: ../../mod/apps.php:36
-msgid "Apps"
-msgstr "Aplicaciones"
+#: ../../include/profile_selectors.php:80
+msgid "Casual"
+msgstr "Casual"
 
-#: ../../include/widgets.php:92
-msgid "System"
-msgstr "Sistema"
+#: ../../include/profile_selectors.php:80
+msgid "Engaged"
+msgstr "Prometido/a"
 
-#: ../../include/widgets.php:94 ../../include/conversation.php:1515
-msgid "Personal"
-msgstr "Personales"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Married"
+msgstr "Casado/a"
 
-#: ../../include/widgets.php:95
-msgid "Create Personal App"
-msgstr "Crear una aplicación personal"
+#: ../../include/profile_selectors.php:80
+msgid "Imaginarily married"
+msgstr "Casado/a en sueños"
 
-#: ../../include/widgets.php:96
-msgid "Edit Personal App"
-msgstr "Editar una aplicación personal"
+#: ../../include/profile_selectors.php:80
+msgid "Partners"
+msgstr "Pareja"
 
-#: ../../include/widgets.php:136 ../../include/widgets.php:175
-#: ../../include/Contact.php:107 ../../include/conversation.php:956
-#: ../../include/identity.php:933 ../../mod/directory.php:316
-#: ../../mod/match.php:64 ../../mod/suggest.php:52
-msgid "Connect"
-msgstr "Conectar"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Cohabiting"
+msgstr "Cohabitando"
 
-#: ../../include/widgets.php:138 ../../mod/suggest.php:54
-msgid "Ignore/Hide"
-msgstr "Ignorar/Ocultar"
+#: ../../include/profile_selectors.php:80
+msgid "Common law"
+msgstr "Matrimonio tradicional"
 
-#: ../../include/widgets.php:143 ../../mod/connections.php:128
-msgid "Suggestions"
-msgstr "Sugerencias"
+#: ../../include/profile_selectors.php:80
+msgid "Happy"
+msgstr "Felíz"
 
-#: ../../include/widgets.php:144
-msgid "See more..."
-msgstr "Ver más..."
+#: ../../include/profile_selectors.php:80
+msgid "Not looking"
+msgstr "No estoy buscando"
 
-#: ../../include/widgets.php:166
-#, php-format
-msgid "You have %1$.0f of %2$.0f allowed connections."
-msgstr "Tiene %1$.0f de %2$.0f conexiones permitidas."
+#: ../../include/profile_selectors.php:80
+msgid "Swinger"
+msgstr "Libertino"
 
-#: ../../include/widgets.php:172
-msgid "Add New Connection"
-msgstr "Añadir nueva conexión"
+#: ../../include/profile_selectors.php:80
+msgid "Betrayed"
+msgstr "Engañado/a"
 
-#: ../../include/widgets.php:173
-msgid "Enter the channel address"
-msgstr "Introducir la dirección del canal"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Separated"
+msgstr "Separado/a"
 
-#: ../../include/widgets.php:174
-msgid "Example: bob@example.com, http://example.com/barbara"
-msgstr "Ejemplo: paco@ejemplo.com, http://ejemplo.com/paco"
+#: ../../include/profile_selectors.php:80
+msgid "Unstable"
+msgstr "Inestable"
 
-#: ../../include/widgets.php:190
-msgid "Notes"
-msgstr "Notas"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Divorced"
+msgstr "Divorciado/a"
 
-#: ../../include/widgets.php:266
-msgid "Remove term"
-msgstr "Eliminar término"
+#: ../../include/profile_selectors.php:80
+msgid "Imaginarily divorced"
+msgstr "Divorciado/a en sueños"
 
-#: ../../include/widgets.php:307 ../../include/contact_widgets.php:60
-#: ../../include/contact_widgets.php:95
-msgid "Everything"
-msgstr "Todo"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Widowed"
+msgstr "Viudo/a"
 
-#: ../../include/widgets.php:349
-msgid "Archives"
-msgstr "Hemeroteca"
+#: ../../include/profile_selectors.php:80
+msgid "Uncertain"
+msgstr "Indeterminado"
 
-#: ../../include/widgets.php:429 ../../mod/connedit.php:583
-msgid "Me"
-msgstr "Yo"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "It's complicated"
+msgstr "Es complicado"
 
-#: ../../include/widgets.php:430 ../../mod/connedit.php:584
-msgid "Family"
-msgstr "Familia"
+#: ../../include/profile_selectors.php:80
+msgid "Don't care"
+msgstr "No me importa"
 
-#: ../../include/widgets.php:431 ../../include/identity.php:394
-#: ../../include/identity.php:395 ../../include/identity.php:402
-#: ../../include/profile_selectors.php:80 ../../mod/settings.php:345
-#: ../../mod/settings.php:349 ../../mod/settings.php:350
-#: ../../mod/settings.php:353 ../../mod/settings.php:364
-#: ../../mod/connedit.php:585
-msgid "Friends"
-msgstr "Amigos"
+#: ../../include/profile_selectors.php:80
+msgid "Ask me"
+msgstr "Pregúnteme"
 
-#: ../../include/widgets.php:432 ../../mod/connedit.php:586
-msgid "Acquaintances"
-msgstr "Conocidos/as"
+#: ../../include/oembed.php:213
+msgid "Embedded content"
+msgstr "Contenido incorporado"
 
-#: ../../include/widgets.php:433 ../../mod/connections.php:91
-#: ../../mod/connections.php:106 ../../mod/connedit.php:587
-msgid "All"
-msgstr "Todas"
+#: ../../include/oembed.php:222
+msgid "Embedding disabled"
+msgstr "Incrustación deshabilitada"
 
-#: ../../include/widgets.php:452
-msgid "Refresh"
-msgstr "Recargar"
+#: ../../include/event.php:766
+msgid "This event has been added to your calendar."
+msgstr "Este evento ha sido añadido a su calendario."
 
-#: ../../include/widgets.php:487
-msgid "Account settings"
-msgstr "Configuración de la cuenta"
+#: ../../include/event.php:896 ../../include/text.php:1846
+#: ../../include/conversation.php:123 ../../mod/like.php:363
+#: ../../mod/tagger.php:47 ../../mod/events.php:245
+msgid "event"
+msgstr "evento"
 
-#: ../../include/widgets.php:493
-msgid "Channel settings"
-msgstr "Configuración del canal"
+#: ../../include/event.php:953
+msgid "Not specified"
+msgstr "Sin especificar"
 
-#: ../../include/widgets.php:499
-msgid "Additional features"
-msgstr "Características adicionales"
+#: ../../include/event.php:954
+msgid "Needs Action"
+msgstr "Necesita de una intervención"
 
-#: ../../include/widgets.php:505
-msgid "Feature/Addon settings"
-msgstr "Configuración de características o complementos"
+#: ../../include/event.php:955
+msgid "Completed"
+msgstr "Completado/a"
 
-#: ../../include/widgets.php:511
-msgid "Display settings"
-msgstr "Ajustes de visualización"
+#: ../../include/event.php:956
+msgid "In Process"
+msgstr "En proceso"
 
-#: ../../include/widgets.php:517
-msgid "Connected apps"
-msgstr "Aplicaciones conectadas"
+#: ../../include/event.php:957
+msgid "Cancelled"
+msgstr "Cancelado/a"
 
-#: ../../include/widgets.php:523
-msgid "Export channel"
-msgstr "Exportar canal"
+#: ../../include/apps.php:128
+msgid "Site Admin"
+msgstr "Adminstrador del sitio"
 
-#: ../../include/widgets.php:532 ../../mod/connedit.php:674
-msgid "Connection Default Permissions"
-msgstr "Permisos predeterminados de conexión"
+#: ../../include/apps.php:129 ../../include/conversation.php:1639
+#: ../../include/nav.php:103
+msgid "Bookmarks"
+msgstr "Marcadores"
 
-#: ../../include/widgets.php:540
-msgid "Premium Channel Settings"
-msgstr "Configuración del canal premium"
+#: ../../include/apps.php:130
+msgid "Address Book"
+msgstr "Libreta de direcciones"
+
+#: ../../include/apps.php:131 ../../include/nav.php:111 ../../boot.php:1503
+msgid "Login"
+msgstr "Iniciar sesión"
+
+#: ../../include/apps.php:132 ../../include/nav.php:200
+#: ../../mod/manage.php:160
+msgid "Channel Manager"
+msgstr "Administración de canales"
 
-#: ../../include/widgets.php:556 ../../include/nav.php:208
-#: ../../include/apps.php:134 ../../mod/admin.php:1079
-#: ../../mod/admin.php:1279
+#: ../../include/apps.php:133 ../../include/nav.php:174
+msgid "Grid"
+msgstr "Red"
+
+#: ../../include/apps.php:134 ../../include/widgets.php:553
+#: ../../include/nav.php:202 ../../mod/admin.php:1033 ../../mod/admin.php:1233
 msgid "Settings"
 msgstr "Ajustes"
 
-#: ../../include/widgets.php:569 ../../mod/message.php:31
-#: ../../mod/mail.php:128
-msgid "Messages"
-msgstr "Mensajes"
+#: ../../include/apps.php:136 ../../include/conversation.php:1649
+#: ../../include/nav.php:107 ../../mod/webpages.php:178
+msgid "Webpages"
+msgstr "Páginas web"
 
-#: ../../include/widgets.php:572
-msgid "Check Mail"
-msgstr "Comprobar correo"
+#: ../../include/apps.php:137 ../../include/nav.php:177
+msgid "Channel Home"
+msgstr "Mi canal"
 
-#: ../../include/widgets.php:577 ../../include/nav.php:199
-msgid "New Message"
-msgstr "Nuevo mensaje"
+#: ../../include/apps.php:138 ../../include/identity.php:1250
+#: ../../include/identity.php:1367 ../../mod/profperm.php:112
+msgid "Profile"
+msgstr "Perfil"
 
-#: ../../include/widgets.php:652
-msgid "Chat Rooms"
-msgstr "Salas de chat"
+#: ../../include/apps.php:139 ../../include/conversation.php:1606
+#: ../../include/nav.php:92 ../../mod/fbrowser.php:25
+msgid "Photos"
+msgstr "Fotos"
 
-#: ../../include/widgets.php:672
-msgid "Bookmarked Chatrooms"
-msgstr "Salas de chat preferidas"
+#: ../../include/apps.php:140 ../../include/nav.php:196
+#: ../../mod/events.php:526
+msgid "Events"
+msgstr "Eventos"
 
-#: ../../include/widgets.php:692
-msgid "Suggested Chatrooms"
-msgstr "Salas de chat sugeridas"
+#: ../../include/apps.php:141 ../../include/nav.php:162
+msgid "Directory"
+msgstr "Directorio"
 
-#: ../../include/widgets.php:819 ../../include/widgets.php:877
-msgid "photo/image"
-msgstr "foto/imagen"
+#: ../../include/apps.php:142 ../../include/nav.php:154 ../../mod/help.php:202
+#: ../../mod/help.php:207 ../../mod/layouts.php:176
+msgid "Help"
+msgstr "Ayuda"
 
-#: ../../include/widgets.php:972 ../../include/widgets.php:974
-msgid "Rate Me"
-msgstr "Valorar este canal"
+#: ../../include/apps.php:143 ../../include/nav.php:188
+msgid "Mail"
+msgstr "Correo"
 
-#: ../../include/widgets.php:978
-msgid "View Ratings"
-msgstr "Mostrar las valoraciones"
+#: ../../include/apps.php:144 ../../mod/mood.php:131
+msgid "Mood"
+msgstr "Estado de ánimo"
 
-#: ../../include/widgets.php:989
-msgid "Public Hubs"
-msgstr "Servidores públicos"
+#: ../../include/apps.php:145 ../../include/conversation.php:952
+msgid "Poke"
+msgstr "Toques y otras cosas"
 
-#: ../../include/event.php:22 ../../include/bb2diaspora.php:459
-msgid "l F d, Y \\@ g:i A"
-msgstr "l d de F, Y \\@ G:i"
+#: ../../include/apps.php:146 ../../include/nav.php:97
+msgid "Chat"
+msgstr "Chat"
 
-#: ../../include/event.php:30 ../../include/bb2diaspora.php:465
-msgid "Starts:"
-msgstr "Comienza:"
+#: ../../include/apps.php:147 ../../include/text.php:857
+#: ../../include/text.php:869 ../../include/nav.php:159
+#: ../../mod/search.php:38
+msgid "Search"
+msgstr "Buscar"
 
-#: ../../include/event.php:40 ../../include/bb2diaspora.php:473
-msgid "Finishes:"
-msgstr "Finaliza:"
+#: ../../include/apps.php:148
+msgid "Probe"
+msgstr "Probar"
 
-#: ../../include/event.php:50 ../../include/bb2diaspora.php:481
-#: ../../include/identity.php:984 ../../mod/directory.php:302
-#: ../../mod/events.php:684
-msgid "Location:"
-msgstr "Ubicación:"
+#: ../../include/apps.php:149
+msgid "Suggest"
+msgstr "Sugerir"
 
-#: ../../include/event.php:549
-msgid "This event has been added to your calendar."
-msgstr "Este evento ha sido añadido a su calendario."
+#: ../../include/apps.php:150
+msgid "Random Channel"
+msgstr "Canal aleatorio"
+
+#: ../../include/apps.php:151
+msgid "Invite"
+msgstr "Invitar"
+
+#: ../../include/apps.php:152
+msgid "Features"
+msgstr "Características"
+
+#: ../../include/apps.php:153 ../../mod/id.php:28
+msgid "Language"
+msgstr "Idioma"
+
+#: ../../include/apps.php:154
+msgid "Post"
+msgstr "Publicación"
+
+#: ../../include/apps.php:155 ../../mod/id.php:17 ../../mod/id.php:18
+#: ../../mod/id.php:19
+msgid "Profile Photo"
+msgstr "Foto del perfil"
+
+#: ../../include/apps.php:252 ../../mod/settings.php:84
+#: ../../mod/settings.php:609
+msgid "Update"
+msgstr "Actualizar"
+
+#: ../../include/apps.php:252
+msgid "Install"
+msgstr "Instalar"
+
+#: ../../include/apps.php:257
+msgid "Purchase"
+msgstr "Comprar"
+
+#: ../../include/auth.php:131
+msgid "Logged out."
+msgstr "Desconectado/a."
+
+#: ../../include/auth.php:272
+msgid "Failed authentication"
+msgstr "Autenticación fallida."
+
+#: ../../include/auth.php:286 ../../mod/openid.php:189
+msgid "Login failed."
+msgstr "El acceso ha fallado."
 
 #: ../../include/enotify.php:96
 #, php-format
@@ -1573,8 +1859,8 @@ msgstr "%s <!item_type!>"
 
 #: ../../include/enotify.php:100
 #, php-format
-msgid "[Red:Notify] New mail received at %s"
-msgstr "[Red:Aviso] Nuevo correo recibido en %s"
+msgid "[Hubzilla:Notify] New mail received at %s"
+msgstr "[Hubzilla:Aviso] Nuevo mensaje en %s"
 
 #: ../../include/enotify.php:102
 #, php-format
@@ -1598,27 +1884,27 @@ msgstr "Por favor visite %s para ver y/o responder a su mensaje privado."
 #: ../../include/enotify.php:158
 #, php-format
 msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
-msgstr "%1$s, %2$s comentó en [zrl=%3$s]a %4$s[/zrl]"
+msgstr "%1$s, %2$s ha comentado [zrl=%3$s]%4$s[/zrl]"
 
 #: ../../include/enotify.php:166
 #, php-format
 msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
-msgstr "%1$s, %2$s comentó en [zrl=%3$s]%4$s de %5$s[/zrl]"
+msgstr "%1$s, %2$s ha comentado [zrl=%3$s]%5$s de %4$s[/zrl] "
 
 #: ../../include/enotify.php:175
 #, php-format
 msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
-msgstr "%1$s, %2$s comentó en [zrl=%3$s]su %4$s[/zrl]"
+msgstr "%1$s, %2$s ha comentado [zrl=%3$s]%4$s creado por usted[/zrl]"
 
 #: ../../include/enotify.php:186
 #, php-format
-msgid "[Red:Notify] Comment to conversation #%1$d by %2$s"
-msgstr "[Red:Aviso] Nuevo comentario de %2$s en la conversación #%1$d"
+msgid "[Hubzilla:Notify] Comment to conversation #%1$d by %2$s"
+msgstr "[Hubzilla:Aviso] Nuevo comentario de %2$s a la conversación #%1$d"
 
 #: ../../include/enotify.php:187
 #, php-format
 msgid "%1$s, %2$s commented on an item/conversation you have been following."
-msgstr "%1$s, %2$s comentó un elemento/conversación que ha estado siguiendo."
+msgstr "%1$s, %2$s ha comentado un elemento/conversación que ha estado siguiendo."
 
 #: ../../include/enotify.php:190 ../../include/enotify.php:205
 #: ../../include/enotify.php:231 ../../include/enotify.php:249
@@ -1629,23 +1915,23 @@ msgstr "Para ver o comentar la conversación, visite %s"
 
 #: ../../include/enotify.php:196
 #, php-format
-msgid "[Red:Notify] %s posted to your profile wall"
-msgstr "[Red:Aviso] %s escribió en su página de perfil"
+msgid "[Hubzilla:Notify] %s posted to your profile wall"
+msgstr "[Hubzilla:Aviso] %s ha publicado una entrada en su página de inicio del perfil"
 
 #: ../../include/enotify.php:198
 #, php-format
 msgid "%1$s, %2$s posted to your profile wall at %3$s"
-msgstr "%1$s, %2$s publicó en su página de perfil en %3$s"
+msgstr "%1$s, %2$s publicó en su página del perfil en %3$s"
 
 #: ../../include/enotify.php:200
 #, php-format
 msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
-msgstr "%1$s, %2$s publicó en [zrl=%3$s]su página de perfil[/zrl]"
+msgstr "%1$s, %2$s publicó en [zrl=%3$s]su página del perfil[/zrl]"
 
 #: ../../include/enotify.php:224
 #, php-format
-msgid "[Red:Notify] %s tagged you"
-msgstr "[Red:Aviso] %s le etiquetó"
+msgid "[Hubzilla:Notify] %s tagged you"
+msgstr "[Hubzilla:Aviso] %s le ha etiquetado"
 
 #: ../../include/enotify.php:225
 #, php-format
@@ -1659,8 +1945,8 @@ msgstr "%1$s, %2$s [zrl=%3$s]le etiquetó[/zrl]."
 
 #: ../../include/enotify.php:238
 #, php-format
-msgid "[Red:Notify] %1$s poked you"
-msgstr "[Red:Aviso]  %1$s le ha dado un toque"
+msgid "[Hubzilla:Notify] %1$s poked you"
+msgstr "[Hubzilla:Aviso] %1$s le ha dado un toque"
 
 #: ../../include/enotify.php:239
 #, php-format
@@ -1674,13 +1960,13 @@ msgstr "%1$s, %2$s [zrl=%2$s]le dio un toque[/zrl]."
 
 #: ../../include/enotify.php:256
 #, php-format
-msgid "[Red:Notify] %s tagged your post"
-msgstr "[Red:Aviso]  %s etiquetó su entrada"
+msgid "[Hubzilla:Notify] %s tagged your post"
+msgstr "[Hubzilla:Aviso] %s ha etiquetado su publicación"
 
 #: ../../include/enotify.php:257
 #, php-format
 msgid "%1$s, %2$s tagged your post at %3$s"
-msgstr "%1$s, %2$s etiquetó su publicación en %3$s"
+msgstr "%1$s, %2$s ha etiquetado su publicación en %3$s"
 
 #: ../../include/enotify.php:258
 #, php-format
@@ -1688,8 +1974,8 @@ msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
 msgstr "%1$s, %2$s etiquetó [zrl=%3$s]su publicación[/zrl]"
 
 #: ../../include/enotify.php:270
-msgid "[Red:Notify] Introduction received"
-msgstr "[Red:Aviso] Solicitud de conexión recibida"
+msgid "[Hubzilla:Notify] Introduction received"
+msgstr "[Hubzilla:Aviso] Ha recibido una solicitud de conexión"
 
 #: ../../include/enotify.php:271
 #, php-format
@@ -1713,8 +1999,8 @@ msgid "Please visit %s to approve or reject the connection request."
 msgstr "Por favor, visite %s para permitir o rechazar la solicitad de conexión."
 
 #: ../../include/enotify.php:285
-msgid "[Red:Notify] Friend suggestion received"
-msgstr "[Red:Aviso] recibió una sugerencia de conexión"
+msgid "[Hubzilla:Notify] Friend suggestion received"
+msgstr "[Hubzilla:Aviso] Ha recibido una sugerencia de amistad"
 
 #: ../../include/enotify.php:286
 #, php-format
@@ -1741,89 +2027,15 @@ msgstr "Foto:"
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr "Por favor, visite %s para aprobar o rechazar la sugerencia."
 
-#: ../../include/enotify.php:508
-msgid "[Red:Notify]"
-msgstr "[Red:Aviso]"
-
-#: ../../include/message.php:18
-msgid "No recipient provided."
-msgstr "No se ha especificado ningún destinatario."
-
-#: ../../include/message.php:23
-msgid "[no subject]"
-msgstr "[sin asunto]"
-
-#: ../../include/message.php:45
-msgid "Unable to determine sender."
-msgstr "No ha sido posible determinar el remitente. "
-
-#: ../../include/message.php:200
-msgid "Stored post could not be verified."
-msgstr "No se han podido verificar las entradas guardadas."
+#: ../../include/enotify.php:511
+msgid "[Hubzilla:Notify]"
+msgstr "[Hubzilla:Aviso]"
 
-#: ../../include/diaspora.php:2148 ../../include/conversation.php:164
-#: ../../mod/like.php:397
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
-msgstr "a %1$s le gusta el %3$s de %2$s"
-
-#: ../../include/diaspora.php:2494
-msgid "Please choose"
-msgstr "Por favor, elija"
-
-#: ../../include/diaspora.php:2496
-msgid "Agree"
-msgstr "De acuerdo"
-
-#: ../../include/diaspora.php:2498
-msgid "Disagree"
-msgstr "En desacuerdo"
-
-#: ../../include/diaspora.php:2500
-msgid "Abstain"
-msgstr "Abstención"
-
-#: ../../include/follow.php:28
-msgid "Channel is blocked on this site."
-msgstr "El canal está bloqueado en este sitio."
-
-#: ../../include/follow.php:33
-msgid "Channel location missing."
-msgstr "Falta la ubicación del canal."
-
-#: ../../include/follow.php:83
-msgid "Response from remote channel was incomplete."
-msgstr "Respuesta incompleta del canal."
-
-#: ../../include/follow.php:100
-msgid "Channel was deleted and no longer exists."
-msgstr "El canal ha sido eliminado y ya no existe."
-
-#: ../../include/follow.php:135 ../../include/follow.php:206
-msgid "Protocol disabled."
-msgstr "Protocolo deshabilitado."
-
-#: ../../include/follow.php:144
-msgid "Protocol blocked for this channel."
-msgstr "Protocolo bloqueado para este canal."
-
-#: ../../include/follow.php:179
-msgid "Channel discovery failed."
-msgstr "El intento de acceder al canal ha fallado."
-
-#: ../../include/follow.php:195
-msgid "local account not found."
-msgstr "No se ha encontrado la cuenta local."
-
-#: ../../include/follow.php:224
-msgid "Cannot connect to yourself."
-msgstr "No puede conectarse consigo mismo."
-
-#: ../../include/ItemObject.php:89 ../../include/conversation.php:678
+#: ../../include/ItemObject.php:89 ../../include/conversation.php:664
 msgid "Private Message"
 msgstr "Mensaje Privado"
 
-#: ../../include/ItemObject.php:126 ../../include/conversation.php:670
+#: ../../include/ItemObject.php:126 ../../include/conversation.php:656
 msgid "Select"
 msgstr "Seleccionar"
 
@@ -1856,22 +2068,22 @@ msgid "I abstain"
 msgstr "Me abstengo"
 
 #: ../../include/ItemObject.php:175 ../../include/ItemObject.php:187
-#: ../../include/conversation.php:1688 ../../mod/photos.php:1015
-#: ../../mod/photos.php:1027
+#: ../../include/conversation.php:1681 ../../mod/photos.php:1079
+#: ../../mod/photos.php:1091
 msgid "View all"
 msgstr "Ver todo"
 
-#: ../../include/ItemObject.php:179 ../../include/taxonomy.php:396
-#: ../../include/conversation.php:1712 ../../include/identity.php:1243
-#: ../../mod/photos.php:1019
+#: ../../include/ItemObject.php:179 ../../include/identity.php:1276
+#: ../../include/taxonomy.php:403 ../../include/conversation.php:1705
+#: ../../mod/photos.php:1083
 msgctxt "noun"
 msgid "Like"
 msgid_plural "Likes"
 msgstr[0] "Me gusta"
 msgstr[1] "Me gusta"
 
-#: ../../include/ItemObject.php:184 ../../include/conversation.php:1715
-#: ../../mod/photos.php:1024
+#: ../../include/ItemObject.php:184 ../../include/conversation.php:1708
+#: ../../mod/photos.php:1088
 msgctxt "noun"
 msgid "Dislike"
 msgid_plural "Dislikes"
@@ -1894,11 +2106,11 @@ msgstr "Activar o desactivar el estado de entrada preferida"
 msgid "starred"
 msgstr "preferidas"
 
-#: ../../include/ItemObject.php:227 ../../include/conversation.php:685
+#: ../../include/ItemObject.php:227 ../../include/conversation.php:671
 msgid "Message signature validated"
 msgstr "Firma de mensaje validada"
 
-#: ../../include/ItemObject.php:228 ../../include/conversation.php:686
+#: ../../include/ItemObject.php:228 ../../include/conversation.php:672
 msgid "Message signature incorrect"
 msgstr "Firma de mensaje incorrecta"
 
@@ -1906,19 +2118,19 @@ msgstr "Firma de mensaje incorrecta"
 msgid "Add Tag"
 msgstr "Añadir etiqueta"
 
-#: ../../include/ItemObject.php:254 ../../mod/photos.php:959
+#: ../../include/ItemObject.php:254 ../../mod/photos.php:1023
 msgid "I like this (toggle)"
 msgstr "me gusta (cambiar)"
 
-#: ../../include/ItemObject.php:254 ../../include/taxonomy.php:310
+#: ../../include/ItemObject.php:254 ../../include/taxonomy.php:317
 msgid "like"
 msgstr "me gusta"
 
-#: ../../include/ItemObject.php:255 ../../mod/photos.php:960
+#: ../../include/ItemObject.php:255 ../../mod/photos.php:1024
 msgid "I don't like this (toggle)"
 msgstr "No me gusta esto (cambiar)"
 
-#: ../../include/ItemObject.php:255 ../../include/taxonomy.php:311
+#: ../../include/ItemObject.php:255 ../../include/taxonomy.php:318
 msgid "dislike"
 msgstr "no me gusta"
 
@@ -1937,623 +2149,1069 @@ msgid_plural "%d comments"
 msgstr[0] "%d comentario"
 msgstr[1] "%d comentarios"
 
-#: ../../include/ItemObject.php:294 ../../include/ItemObject.php:295
+#: ../../include/ItemObject.php:301 ../../include/ItemObject.php:302
 #, php-format
 msgid "View %s's profile - %s"
 msgstr "Ver el perfil de %s - %s"
 
-#: ../../include/ItemObject.php:298
+#: ../../include/ItemObject.php:305
 msgid "to"
 msgstr "a"
 
-#: ../../include/ItemObject.php:299
+#: ../../include/ItemObject.php:306
 msgid "via"
 msgstr "mediante"
 
-#: ../../include/ItemObject.php:300
+#: ../../include/ItemObject.php:307
 msgid "Wall-to-Wall"
-msgstr "De página de perfil a página de perfil (de Muro a Muro)"
+msgstr "De página del perfil a página del perfil (de Muro a Muro)"
 
-#: ../../include/ItemObject.php:301
+#: ../../include/ItemObject.php:308
 msgid "via Wall-To-Wall:"
-msgstr "Mediante el procedimiento página de perfil a página de perfil (de Muro a Muro)"
+msgstr "Mediante el procedimiento página del perfil a página del perfil (de Muro a Muro)"
+
+#: ../../include/ItemObject.php:311
+msgid "Delivery Report"
+msgstr "Informe de transmisión"
 
-#: ../../include/ItemObject.php:312 ../../include/conversation.php:727
+#: ../../include/ItemObject.php:320 ../../include/conversation.php:718
 #, php-format
 msgid "from %s"
 msgstr "desde %s"
 
-#: ../../include/ItemObject.php:315 ../../include/conversation.php:730
+#: ../../include/ItemObject.php:323 ../../include/conversation.php:721
 #, php-format
 msgid "last edited: %s"
 msgstr "último cambio: %s"
 
-#: ../../include/ItemObject.php:316 ../../include/conversation.php:731
+#: ../../include/ItemObject.php:324 ../../include/conversation.php:722
 #, php-format
 msgid "Expires: %s"
 msgstr "Caduca: %s"
 
-#: ../../include/ItemObject.php:337
+#: ../../include/ItemObject.php:347
 msgid "Save Bookmarks"
 msgstr "Guardar en Marcadores"
 
-#: ../../include/ItemObject.php:338
+#: ../../include/ItemObject.php:348
 msgid "Add to Calendar"
 msgstr "Añadir al calendario"
 
-#: ../../include/ItemObject.php:347
+#: ../../include/ItemObject.php:357
 msgid "Mark all seen"
 msgstr "Marcar todo como visto"
 
-#: ../../include/ItemObject.php:353 ../../mod/photos.php:1145
+#: ../../include/ItemObject.php:363 ../../mod/photos.php:1209
 msgctxt "noun"
 msgid "Likes"
 msgstr "Me gusta"
 
-#: ../../include/ItemObject.php:354 ../../mod/photos.php:1146
+#: ../../include/ItemObject.php:364 ../../mod/photos.php:1210
 msgctxt "noun"
 msgid "Dislikes"
 msgstr "No me gusta"
 
-#: ../../include/ItemObject.php:359 ../../include/acl_selectors.php:249
-#: ../../mod/photos.php:1151
-msgid "Close"
-msgstr "Cerrar"
-
-#: ../../include/ItemObject.php:364 ../../include/conversation.php:748
-#: ../../include/conversation.php:1220 ../../mod/editpost.php:123
-#: ../../mod/photos.php:962 ../../mod/editlayout.php:147
-#: ../../mod/editwebpage.php:192 ../../mod/editblock.php:149
-#: ../../mod/mail.php:241 ../../mod/mail.php:356
+#: ../../include/ItemObject.php:374 ../../include/conversation.php:739
+#: ../../include/conversation.php:1214 ../../mod/photos.php:1026
+#: ../../mod/editblock.php:150 ../../mod/editpost.php:130
+#: ../../mod/editlayout.php:148 ../../mod/editwebpage.php:190
 msgid "Please wait"
-msgstr "Espera por favor"
+msgstr "Espere por favor"
 
-#: ../../include/ItemObject.php:665 ../../mod/photos.php:978
-#: ../../mod/photos.php:1096
+#: ../../include/ItemObject.php:679 ../../mod/photos.php:1042
+#: ../../mod/photos.php:1160
 msgid "This is you"
 msgstr "Este es usted"
 
-#: ../../include/ItemObject.php:669 ../../include/conversation.php:1192
-#: ../../mod/editpost.php:107 ../../mod/editlayout.php:134
-#: ../../mod/editwebpage.php:179 ../../mod/editblock.php:135
+#: ../../include/ItemObject.php:683 ../../include/conversation.php:1186
+#: ../../mod/editblock.php:136 ../../mod/editpost.php:114
+#: ../../mod/editlayout.php:135 ../../mod/editwebpage.php:177
 msgid "Bold"
 msgstr "Negrita"
 
-#: ../../include/ItemObject.php:670 ../../include/conversation.php:1193
-#: ../../mod/editpost.php:108 ../../mod/editlayout.php:135
-#: ../../mod/editwebpage.php:180 ../../mod/editblock.php:136
+#: ../../include/ItemObject.php:684 ../../include/conversation.php:1187
+#: ../../mod/editblock.php:137 ../../mod/editpost.php:115
+#: ../../mod/editlayout.php:136 ../../mod/editwebpage.php:178
 msgid "Italic"
 msgstr "Itálico "
 
-#: ../../include/ItemObject.php:671 ../../include/conversation.php:1194
-#: ../../mod/editpost.php:109 ../../mod/editlayout.php:136
-#: ../../mod/editwebpage.php:181 ../../mod/editblock.php:137
+#: ../../include/ItemObject.php:685 ../../include/conversation.php:1188
+#: ../../mod/editblock.php:138 ../../mod/editpost.php:116
+#: ../../mod/editlayout.php:137 ../../mod/editwebpage.php:179
 msgid "Underline"
 msgstr "Subrayar"
 
-#: ../../include/ItemObject.php:672 ../../include/conversation.php:1195
-#: ../../mod/editpost.php:110 ../../mod/editlayout.php:137
-#: ../../mod/editwebpage.php:182 ../../mod/editblock.php:138
+#: ../../include/ItemObject.php:686 ../../include/conversation.php:1189
+#: ../../mod/editblock.php:139 ../../mod/editpost.php:117
+#: ../../mod/editlayout.php:138 ../../mod/editwebpage.php:180
 msgid "Quote"
 msgstr "Citar"
 
-#: ../../include/ItemObject.php:673 ../../include/conversation.php:1196
-#: ../../mod/editpost.php:111 ../../mod/editlayout.php:138
-#: ../../mod/editwebpage.php:183 ../../mod/editblock.php:139
+#: ../../include/ItemObject.php:687 ../../include/conversation.php:1190
+#: ../../mod/editblock.php:140 ../../mod/editpost.php:118
+#: ../../mod/editlayout.php:139 ../../mod/editwebpage.php:181
 msgid "Code"
 msgstr "Código"
 
-#: ../../include/ItemObject.php:674
+#: ../../include/ItemObject.php:688
 msgid "Image"
 msgstr "Imagen"
 
-#: ../../include/ItemObject.php:675
+#: ../../include/ItemObject.php:689
 msgid "Insert Link"
 msgstr "Insertar enlace"
 
-#: ../../include/ItemObject.php:676
+#: ../../include/ItemObject.php:690
 msgid "Video"
 msgstr "Vídeo"
 
-#: ../../include/ItemObject.php:680 ../../include/conversation.php:1247
-#: ../../mod/editpost.php:151 ../../mod/mail.php:247 ../../mod/mail.php:361
+#: ../../include/ItemObject.php:694 ../../include/conversation.php:1241
+#: ../../mod/mail.php:247 ../../mod/mail.php:376 ../../mod/editpost.php:158
 msgid "Encrypt text"
 msgstr "Cifrar texto"
 
-#: ../../include/Contact.php:124
-msgid "New window"
-msgstr "Nueva ventana"
+#: ../../include/text.php:391
+msgid "prev"
+msgstr "anterior"
 
-#: ../../include/Contact.php:125
-msgid "Open the selected location in a different window or browser tab"
-msgstr "Abrir la ubicación seleccionada en una ventana o pestaña aparte"
+#: ../../include/text.php:393
+msgid "first"
+msgstr "primera"
+
+#: ../../include/text.php:422
+msgid "last"
+msgstr "última"
+
+#: ../../include/text.php:425
+msgid "next"
+msgstr "próxima"
+
+#: ../../include/text.php:435
+msgid "older"
+msgstr "más antiguas"
 
-#: ../../include/Contact.php:212
+#: ../../include/text.php:437
+msgid "newer"
+msgstr "más recientes"
+
+#: ../../include/text.php:775
+msgid "No connections"
+msgstr "Sin conexiones"
+
+#: ../../include/text.php:787
 #, php-format
-msgid "User '%s' deleted"
-msgstr "El usuario '%s' ha sido eliminado"
+msgid "%d Connection"
+msgid_plural "%d Connections"
+msgstr[0] "%d Conexión"
+msgstr[1] "%d Conexiones"
 
-#: ../../include/bb2diaspora.php:373
-msgid "Attachments:"
-msgstr "Ficheros adjuntos:"
+#: ../../include/text.php:800 ../../mod/viewconnections.php:101
+msgid "View Connections"
+msgstr "Ver conexiones"
 
-#: ../../include/bb2diaspora.php:461
-msgid "$Projectname event notification:"
-msgstr "Notificación de eventos de $Projectname:"
+#: ../../include/text.php:858 ../../include/text.php:870
+#: ../../include/widgets.php:191 ../../mod/filer.php:49
+#: ../../mod/admin.php:1411 ../../mod/admin.php:1431 ../../mod/rbmark.php:28
+#: ../../mod/rbmark.php:98
+msgid "Save"
+msgstr "Guardar"
 
-#: ../../include/nav.php:87 ../../include/nav.php:120 ../../boot.php:1549
-msgid "Logout"
-msgstr "Finalizar sesión"
+#: ../../include/text.php:933
+msgid "poke"
+msgstr "un toque"
 
-#: ../../include/nav.php:87 ../../include/nav.php:120
-msgid "End this session"
-msgstr "Finalizar esta sesión"
+#: ../../include/text.php:933 ../../include/conversation.php:243
+msgid "poked"
+msgstr "ha recibido un toque"
 
-#: ../../include/nav.php:90 ../../include/nav.php:151
-msgid "Home"
-msgstr "Inicio"
+#: ../../include/text.php:934
+msgid "ping"
+msgstr "un \"ping\""
 
-#: ../../include/nav.php:90
-msgid "Your posts and conversations"
-msgstr "Sus entradas y conversaciones"
+#: ../../include/text.php:934
+msgid "pinged"
+msgstr "avisado/a"
 
-#: ../../include/nav.php:91 ../../include/conversation.php:953
-#: ../../mod/connedit.php:510
-msgid "View Profile"
-msgstr "Ver el perfil"
+#: ../../include/text.php:935
+msgid "prod"
+msgstr "una incitación"
 
-#: ../../include/nav.php:91
-msgid "Your profile page"
-msgstr "Su página de perfil"
+#: ../../include/text.php:935
+msgid "prodded"
+msgstr "ha recibido una incitación"
 
-#: ../../include/nav.php:93
-msgid "Edit Profiles"
-msgstr "Editar perfiles"
+#: ../../include/text.php:936
+msgid "slap"
+msgstr "una bofetada"
 
-#: ../../include/nav.php:93
-msgid "Manage/Edit profiles"
-msgstr "Administrar/editar perfiles"
+#: ../../include/text.php:936
+msgid "slapped"
+msgstr "ha recibido una bofetada"
 
-#: ../../include/nav.php:95 ../../include/identity.php:956
-msgid "Edit Profile"
-msgstr "Editar perfil"
+#: ../../include/text.php:937
+msgid "finger"
+msgstr "un \"finger\""
 
-#: ../../include/nav.php:95
-msgid "Edit your profile"
-msgstr "Editar su perfil"
+#: ../../include/text.php:937
+msgid "fingered"
+msgstr "ha recibido un \"finger\""
 
-#: ../../include/nav.php:97 ../../include/conversation.php:1611
-#: ../../include/apps.php:139 ../../mod/fbrowser.php:25
-msgid "Photos"
-msgstr "Fotos"
+#: ../../include/text.php:938
+msgid "rebuff"
+msgstr "un rechazo"
 
-#: ../../include/nav.php:97
-msgid "Your photos"
-msgstr "Sus fotos"
+#: ../../include/text.php:938
+msgid "rebuffed"
+msgstr "ha sido rechazado/a"
 
-#: ../../include/nav.php:98
-msgid "Your files"
-msgstr "Sus ficheros"
+#: ../../include/text.php:948
+msgid "happy"
+msgstr "feliz"
 
-#: ../../include/nav.php:103 ../../include/apps.php:146
-msgid "Chat"
-msgstr "Chat"
+#: ../../include/text.php:949
+msgid "sad"
+msgstr "triste"
 
-#: ../../include/nav.php:103
-msgid "Your chatrooms"
-msgstr "Sus salas de chat"
+#: ../../include/text.php:950
+msgid "mellow"
+msgstr "amable"
 
-#: ../../include/nav.php:109 ../../include/conversation.php:1646
-#: ../../include/apps.php:129
-msgid "Bookmarks"
-msgstr "Marcadores"
+#: ../../include/text.php:951
+msgid "tired"
+msgstr "cansado/a"
 
-#: ../../include/nav.php:109
-msgid "Your bookmarks"
-msgstr "Sus marcadores"
+#: ../../include/text.php:952
+msgid "perky"
+msgstr "fresco/a"
 
-#: ../../include/nav.php:113 ../../include/conversation.php:1656
-#: ../../include/apps.php:136 ../../mod/webpages.php:178
-msgid "Webpages"
-msgstr "Páginas web"
+#: ../../include/text.php:953
+msgid "angry"
+msgstr "enfadado/a"
 
-#: ../../include/nav.php:113
-msgid "Your webpages"
-msgstr "Sus páginas web"
+#: ../../include/text.php:954
+msgid "stupified"
+msgstr "estupefacto/a"
 
-#: ../../include/nav.php:117 ../../include/apps.php:131 ../../boot.php:1550
-msgid "Login"
-msgstr "Iniciar sesión"
+#: ../../include/text.php:955
+msgid "puzzled"
+msgstr "perplejo/a"
 
-#: ../../include/nav.php:117
-msgid "Sign in"
-msgstr "Acceder"
+#: ../../include/text.php:956
+msgid "interested"
+msgstr "interesado/a"
 
-#: ../../include/nav.php:134
-#, php-format
-msgid "%s - click to logout"
-msgstr "%s - pulsar para finalizar sesión"
+#: ../../include/text.php:957
+msgid "bitter"
+msgstr "amargado/a"
 
-#: ../../include/nav.php:137
-msgid "Remote authentication"
-msgstr "Acceder desde su servidor"
+#: ../../include/text.php:958
+msgid "cheerful"
+msgstr "alegre"
 
-#: ../../include/nav.php:137
-msgid "Click to authenticate to your home hub"
-msgstr "Pulsar para identificarse en su servidor de inicio"
+#: ../../include/text.php:959
+msgid "alive"
+msgstr "vivo/a"
 
-#: ../../include/nav.php:151
-msgid "Home Page"
-msgstr "Página de inicio"
+#: ../../include/text.php:960
+msgid "annoyed"
+msgstr "molesto/a"
 
-#: ../../include/nav.php:155 ../../mod/register.php:224 ../../boot.php:1526
-msgid "Register"
-msgstr "Registrarse"
+#: ../../include/text.php:961
+msgid "anxious"
+msgstr "ansioso/a"
 
-#: ../../include/nav.php:155
-msgid "Create an account"
-msgstr "Crear una cuenta"
+#: ../../include/text.php:962
+msgid "cranky"
+msgstr "de mal humor"
 
-#: ../../include/nav.php:160 ../../include/apps.php:142 ../../mod/help.php:67
-#: ../../mod/help.php:72 ../../mod/layouts.php:176
-msgid "Help"
-msgstr "Ayuda"
+#: ../../include/text.php:963
+msgid "disturbed"
+msgstr "perturbado/a"
 
-#: ../../include/nav.php:160
-msgid "Help and documentation"
-msgstr "Ayuda y documentación"
+#: ../../include/text.php:964
+msgid "frustrated"
+msgstr "frustrado/a"
 
-#: ../../include/nav.php:163
-msgid "Applications, utilities, links, games"
-msgstr "Aplicaciones, utilidades, enlaces, juegos"
+#: ../../include/text.php:965
+msgid "depressed"
+msgstr "deprimido/a"
 
-#: ../../include/nav.php:165
-msgid "Search site content"
-msgstr "Buscar contenido del sitio"
+#: ../../include/text.php:966
+msgid "motivated"
+msgstr "motivado/a"
 
-#: ../../include/nav.php:168 ../../include/apps.php:141
-msgid "Directory"
-msgstr "Directorio"
+#: ../../include/text.php:967
+msgid "relaxed"
+msgstr "relajado/a"
 
-#: ../../include/nav.php:168
-msgid "Channel Directory"
-msgstr "Directorio de canales"
+#: ../../include/text.php:968
+msgid "surprised"
+msgstr "sorprendido/a"
 
-#: ../../include/nav.php:180 ../../include/apps.php:133
-msgid "Matrix"
-msgstr "RedMatrix"
+#: ../../include/text.php:1144
+msgid "May"
+msgstr "mayo"
 
-#: ../../include/nav.php:180
-msgid "Your matrix"
-msgstr "Su red"
+#: ../../include/text.php:1221 ../../include/text.php:1225
+msgid "Unknown Attachment"
+msgstr "Adjunto no reconocido"
 
-#: ../../include/nav.php:181
-msgid "Mark all matrix notifications seen"
-msgstr "Marcar todas las notificaciones de la red como leídas"
+#: ../../include/text.php:1227
+msgid "Attachment"
+msgstr "Fichero adjunto"
 
-#: ../../include/nav.php:183 ../../include/apps.php:137
-msgid "Channel Home"
-msgstr "Mi canal"
+#: ../../include/text.php:1227
+msgid "Size Unknown"
+msgstr "Tamaño desconocido"
 
-#: ../../include/nav.php:183
-msgid "Channel home"
-msgstr "Mi canal"
+#: ../../include/text.php:1263
+msgid "remove category"
+msgstr "eliminar categoría"
 
-#: ../../include/nav.php:184
-msgid "Mark all channel notifications seen"
-msgstr "Marcar todas las notificaciones del canal como leídas"
+#: ../../include/text.php:1340
+msgid "remove from file"
+msgstr "eliminar del fichero"
 
-#: ../../include/nav.php:187 ../../mod/connections.php:267
-msgid "Connections"
-msgstr "Conexiones"
+#: ../../include/text.php:1441 ../../include/text.php:1452
+msgid "Click to open/close"
+msgstr "Pulsar para abrir/cerrar"
 
-#: ../../include/nav.php:190
-msgid "Notices"
-msgstr "Avisos"
+#: ../../include/text.php:1620 ../../mod/events.php:497
+msgid "Link to Source"
+msgstr "Enlazar con la entrada en su ubicación original"
 
-#: ../../include/nav.php:190
-msgid "Notifications"
-msgstr "Notificaciones"
+#: ../../include/text.php:1641 ../../include/text.php:1712
+msgid "default"
+msgstr "por defecto"
 
-#: ../../include/nav.php:191
-msgid "See all notifications"
-msgstr "Ver todas las notificaciones"
+#: ../../include/text.php:1649
+msgid "Page layout"
+msgstr "Formato de la página"
 
-#: ../../include/nav.php:192 ../../mod/notifications.php:99
-msgid "Mark all system notifications seen"
-msgstr "Marcar todas las notificaciones de sistema como leídas"
+#: ../../include/text.php:1649
+msgid "You can create your own with the layouts tool"
+msgstr "Puede crear su propio formato gráfico con las herramientas de diseño"
 
-#: ../../include/nav.php:194 ../../include/apps.php:143
-msgid "Mail"
-msgstr "Correo"
+#: ../../include/text.php:1690
+msgid "Page content type"
+msgstr "Tipo de contenido de página"
 
-#: ../../include/nav.php:194
-msgid "Private mail"
-msgstr "Correo privado"
+#: ../../include/text.php:1724
+msgid "Select an alternate language"
+msgstr "Seleccionar un idioma alternativo"
 
-#: ../../include/nav.php:195
-msgid "See all private messages"
-msgstr "Ver todas los mensajes privados"
+#: ../../include/text.php:1843 ../../include/conversation.php:120
+#: ../../mod/like.php:361 ../../mod/tagger.php:43 ../../mod/subthread.php:72
+#: ../../mod/subthread.php:172
+msgid "photo"
+msgstr "foto"
 
-#: ../../include/nav.php:196
-msgid "Mark all private messages seen"
-msgstr "Marcar todos los mensajes privados como leídos"
+#: ../../include/text.php:1849 ../../include/conversation.php:148
+#: ../../mod/like.php:361 ../../mod/subthread.php:72
+#: ../../mod/subthread.php:172
+msgid "status"
+msgstr "el mensaje de estado"
 
-#: ../../include/nav.php:197
-msgid "Inbox"
-msgstr "Bandeja de entrada"
+#: ../../include/text.php:1851 ../../include/conversation.php:150
+#: ../../mod/tagger.php:53
+msgid "comment"
+msgstr "comentario"
 
-#: ../../include/nav.php:198
-msgid "Outbox"
-msgstr "Bandeja de salida"
+#: ../../include/text.php:1856
+msgid "activity"
+msgstr "actividad"
 
-#: ../../include/nav.php:202 ../../include/apps.php:140
-#: ../../mod/events.php:503
-msgid "Events"
-msgstr "Eventos"
+#: ../../include/text.php:2151
+msgid "Design Tools"
+msgstr "Herramientas de diseño"
 
-#: ../../include/nav.php:202
-msgid "Event Calendar"
-msgstr "Calendario de eventos"
+#: ../../include/text.php:2154 ../../mod/blocks.php:147
+msgid "Blocks"
+msgstr "Bloques"
 
-#: ../../include/nav.php:203
-msgid "See all events"
-msgstr "Ver todos los eventos"
+#: ../../include/text.php:2155 ../../mod/menu.php:103
+msgid "Menus"
+msgstr "Menús"
 
-#: ../../include/nav.php:204
-msgid "Mark all events seen"
-msgstr "Marcar todos los eventos como leidos"
+#: ../../include/text.php:2156 ../../mod/layouts.php:174
+msgid "Layouts"
+msgstr "Formato gráfico"
 
-#: ../../include/nav.php:206 ../../include/apps.php:132
-#: ../../mod/manage.php:166
-msgid "Channel Manager"
-msgstr "Administración de canales"
+#: ../../include/text.php:2157
+msgid "Pages"
+msgstr "Páginas"
 
-#: ../../include/nav.php:206
-msgid "Manage Your Channels"
-msgstr "Gestionar sus canales"
+#: ../../include/bbcode.php:123 ../../include/bbcode.php:793
+#: ../../include/bbcode.php:796 ../../include/bbcode.php:801
+#: ../../include/bbcode.php:804 ../../include/bbcode.php:807
+#: ../../include/bbcode.php:810 ../../include/bbcode.php:815
+#: ../../include/bbcode.php:818 ../../include/bbcode.php:823
+#: ../../include/bbcode.php:826 ../../include/bbcode.php:829
+#: ../../include/bbcode.php:832
+msgid "Image/photo"
+msgstr "Imagen/foto"
 
-#: ../../include/nav.php:208
-msgid "Account/Channel Settings"
-msgstr "Ajustes de cuenta/canales"
+#: ../../include/bbcode.php:162 ../../include/bbcode.php:843
+msgid "Encrypted content"
+msgstr "Contenido cifrado"
 
-#: ../../include/nav.php:216 ../../mod/admin.php:120
-msgid "Admin"
-msgstr "Administrador"
+#: ../../include/bbcode.php:179
+#, php-format
+msgid "Install %s element: "
+msgstr "Instalar el elemento %s:"
 
-#: ../../include/nav.php:216
-msgid "Site Setup and Configuration"
-msgstr "Ajustes y configuración del sitio"
+#: ../../include/bbcode.php:183
+#, php-format
+msgid ""
+"This post contains an installable %s element, however you lack permissions "
+"to install it on this site."
+msgstr "Esta entrada contiene el elemento instalable %s, sin embargo le faltan permisos para instalarlo en este sitio."
 
-#: ../../include/nav.php:247 ../../include/conversation.php:861
-msgid "Loading..."
-msgstr "Cargando..."
+#: ../../include/bbcode.php:193 ../../mod/impel.php:37
+msgid "webpage"
+msgstr "página web"
 
-#: ../../include/nav.php:252
-msgid "@name, #tag, content"
-msgstr "@nombre, #etiqueta, contenido"
+#: ../../include/bbcode.php:196 ../../mod/impel.php:47
+msgid "layout"
+msgstr "disposición"
 
-#: ../../include/nav.php:253
-msgid "Please wait..."
-msgstr "Espere por favor…"
+#: ../../include/bbcode.php:199 ../../mod/impel.php:42
+msgid "block"
+msgstr "bloque"
 
-#: ../../include/taxonomy.php:222 ../../include/taxonomy.php:243
-msgid "Tags"
-msgstr "Etiquetas"
+#: ../../include/bbcode.php:202 ../../mod/impel.php:54
+msgid "menu"
+msgstr "menú"
 
-#: ../../include/taxonomy.php:287
-msgid "Keywords"
-msgstr "Palabras clave"
+#: ../../include/bbcode.php:257
+#, php-format
+msgid "%1$s wrote the following %2$s %3$s"
+msgstr "%1$s escribió la siguiente %2$s %3$s"
 
-#: ../../include/taxonomy.php:308
-msgid "have"
-msgstr "tener"
+#: ../../include/bbcode.php:259 ../../mod/tagger.php:51
+msgid "post"
+msgstr "entrada"
 
-#: ../../include/taxonomy.php:308
-msgid "has"
-msgstr "tiene"
+#: ../../include/bbcode.php:547
+msgid "Different viewers will see this text differently"
+msgstr "Visitantes diferentes verán este texto de forma distinta"
 
-#: ../../include/taxonomy.php:309
-msgid "want"
-msgstr "quiero"
+#: ../../include/bbcode.php:754
+msgid "$1 spoiler"
+msgstr "$1 spoiler"
 
-#: ../../include/taxonomy.php:309
-msgid "wants"
-msgstr "quiere"
+#: ../../include/bbcode.php:781
+msgid "$1 wrote:"
+msgstr "$1 escribió"
 
-#: ../../include/taxonomy.php:310
-msgid "likes"
-msgstr "le gusta"
+#: ../../include/account.php:27
+msgid "Not a valid email address"
+msgstr "Dirección de correo no válida"
 
-#: ../../include/taxonomy.php:311
-msgid "dislikes"
-msgstr "no le gusta"
+#: ../../include/account.php:29
+msgid "Your email domain is not among those allowed on this site"
+msgstr "Su dirección de correo no pertenece a ninguno de los dominios permitidos en este sitio."
 
-#: ../../include/activities.php:39
-msgid " and "
-msgstr "y"
+#: ../../include/account.php:35
+msgid "Your email address is already registered at this site."
+msgstr "Su dirección de correo está ya registrada en este sitio."
 
-#: ../../include/activities.php:47
-msgid "public profile"
-msgstr "perfil público"
+#: ../../include/account.php:67
+msgid "An invitation is required."
+msgstr "Es obligatorio que le inviten."
+
+#: ../../include/account.php:71
+msgid "Invitation could not be verified."
+msgstr "No se ha podido verificar su invitación."
+
+#: ../../include/account.php:121
+msgid "Please enter the required information."
+msgstr "Por favor introduzca la información requerida."
+
+#: ../../include/account.php:188
+msgid "Failed to store account information."
+msgstr "La información de la cuenta no se ha podido guardar."
 
-#: ../../include/activities.php:56
+#: ../../include/account.php:248
 #, php-format
-msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
-msgstr "%1$s cambió %2$s a &ldquo;%3$s&rdquo;"
+msgid "Registration confirmation for %s"
+msgstr "Confirmación de registro para %s"
 
-#: ../../include/activities.php:57
+#: ../../include/account.php:314
 #, php-format
-msgid "Visit %1$s's %2$s"
-msgstr "Visitar %2$s de %1$s"
+msgid "Registration request at %s"
+msgstr "Solicitud de registro en %s"
 
-#: ../../include/activities.php:60
+#: ../../include/account.php:338
+msgid "your registration password"
+msgstr "su contraseña de registro"
+
+#: ../../include/account.php:341 ../../include/account.php:401
 #, php-format
-msgid "%1$s has an updated %2$s, changing %3$s."
-msgstr "%1$s actualizó %2$s,  %3$s cambió."
+msgid "Registration details for %s"
+msgstr "Detalles del registro de %s"
+
+#: ../../include/account.php:410
+msgid "Account approved."
+msgstr "Cuenta aprobada."
+
+#: ../../include/account.php:449
+#, php-format
+msgid "Registration revoked for %s"
+msgstr "Registro revocado para %s"
+
+#: ../../include/account.php:494
+msgid "Account verified. Please login."
+msgstr "Cuenta verificada. Por favor, inicie sesión."
+
+#: ../../include/account.php:707 ../../include/account.php:709
+msgid "Click here to upgrade."
+msgstr "Pulse aquí para actualizar"
+
+#: ../../include/account.php:715
+msgid "This action exceeds the limits set by your subscription plan."
+msgstr "Esta acción supera los límites establecidos por su plan de suscripción "
+
+#: ../../include/account.php:720
+msgid "This action is not available under your subscription plan."
+msgstr "Esta acción no está disponible en su plan de suscripción."
+
+#: ../../include/follow.php:28
+msgid "Channel is blocked on this site."
+msgstr "El canal está bloqueado en este sitio."
+
+#: ../../include/follow.php:33
+msgid "Channel location missing."
+msgstr "Falta la ubicación del canal."
 
-#: ../../include/security.php:349
+#: ../../include/follow.php:82
+msgid "Response from remote channel was incomplete."
+msgstr "Respuesta incompleta del canal."
+
+#: ../../include/follow.php:99
+msgid "Channel was deleted and no longer exists."
+msgstr "El canal ha sido eliminado y ya no existe."
+
+#: ../../include/follow.php:152 ../../include/follow.php:180
+msgid "Protocol disabled."
+msgstr "Protocolo deshabilitado."
+
+#: ../../include/follow.php:170
+msgid "Channel discovery failed."
+msgstr "El intento de acceder al canal ha fallado."
+
+#: ../../include/follow.php:196
+msgid "local account not found."
+msgstr "No se ha encontrado la cuenta local."
+
+#: ../../include/follow.php:220
+msgid "Cannot connect to yourself."
+msgstr "No puede conectarse consigo mismo."
+
+#: ../../include/security.php:381
 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 "El \"token\" de seguridad del formulario no es correcto. Esto ha ocurrido probablemente porque el formulario ha estado abierto demasiado tiempo (>3 horas) antes de ser enviado"
 
-#: ../../include/permissions.php:26
-msgid "Can view my normal stream and posts"
-msgstr "Pueden verse mi flujo de actividad y publicaciones normales"
+#: ../../include/contact_widgets.php:14
+#, php-format
+msgid "%d invitation available"
+msgid_plural "%d invitations available"
+msgstr[0] "%d invitación pendiente"
+msgstr[1] "%d invitaciones disponibles"
 
-#: ../../include/permissions.php:27
-msgid "Can view my default channel profile"
-msgstr "Puede verse mi perfil de canal predeterminado."
+#: ../../include/contact_widgets.php:19 ../../mod/admin.php:415
+msgid "Advanced"
+msgstr "Avanzado"
 
-#: ../../include/permissions.php:28
-msgid "Can view my photo albums"
-msgstr "Pueden verse mis álbumes de fotos"
+#: ../../include/contact_widgets.php:22
+msgid "Find Channels"
+msgstr "Encontrar canales"
 
-#: ../../include/permissions.php:29
-msgid "Can view my connections"
-msgstr "Pueden verse mis conexiones"
+#: ../../include/contact_widgets.php:23
+msgid "Enter name or interest"
+msgstr "Introducir nombre o interés"
 
-#: ../../include/permissions.php:30
-msgid "Can view my file storage"
-msgstr "Pueden verse mis ficheros compartidos"
+#: ../../include/contact_widgets.php:24
+msgid "Connect/Follow"
+msgstr "Conectar/Seguir"
 
-#: ../../include/permissions.php:31
-msgid "Can view my webpages"
-msgstr "Pueden verse mis páginas web"
+#: ../../include/contact_widgets.php:25
+msgid "Examples: Robert Morgenstein, Fishing"
+msgstr "Ejemplos: José Fernández, Pesca"
 
-#: ../../include/permissions.php:34
-msgid "Can send me their channel stream and posts"
-msgstr "Me pueden enviar sus entradas y flujo de actividad su canal"
+#: ../../include/contact_widgets.php:26 ../../mod/directory.php:379
+#: ../../mod/directory.php:384 ../../mod/connections.php:266
+msgid "Find"
+msgstr "Encontrar"
 
-#: ../../include/permissions.php:35
-msgid "Can post on my channel page (\"wall\")"
-msgstr "Pueden crear entradas en mi página de inicio del canal (“muro”)"
+#: ../../include/contact_widgets.php:27 ../../mod/directory.php:383
+#: ../../mod/suggest.php:60
+msgid "Channel Suggestions"
+msgstr "Sugerencias de canales"
 
-#: ../../include/permissions.php:36
-msgid "Can comment on or like my posts"
-msgstr "Pueden publicarse comentarios en mis publicaciones o marcar mis entradas con 'me gusta'."
+#: ../../include/contact_widgets.php:29
+msgid "Random Profile"
+msgstr "Perfil aleatorio"
 
-#: ../../include/permissions.php:37
-msgid "Can send me private mail messages"
-msgstr "Se me pueden enviar mensajes privados"
+#: ../../include/contact_widgets.php:30
+msgid "Invite Friends"
+msgstr "Invitar a amigos"
 
-#: ../../include/permissions.php:38
-msgid "Can post photos to my photo albums"
-msgstr "Pueden publicarse fotos en mis álbumes"
+#: ../../include/contact_widgets.php:32
+msgid "Advanced example: name=fred and country=iceland"
+msgstr "Ejemplo avanzado: nombre=juan y país=españa"
 
-#: ../../include/permissions.php:39
-msgid "Can like/dislike stuff"
-msgstr "Puede marcarse contenido como me gustar/no me gusta."
+#: ../../include/contact_widgets.php:60 ../../include/contact_widgets.php:98
+#: ../../include/widgets.php:306
+msgid "Everything"
+msgstr "Todo"
 
-#: ../../include/permissions.php:39
-msgid "Profiles and things other than posts/comments"
-msgstr "Perfiles y otras cosas aparte de publicaciones/comentarios"
+#: ../../include/contact_widgets.php:95 ../../include/taxonomy.php:271
+#: ../../include/widgets.php:35
+msgid "Categories"
+msgstr "Categorías"
 
-#: ../../include/permissions.php:41
-msgid "Can forward to all my channel contacts via post @mentions"
-msgstr "Puede enviarse una entrada a todos mis contactos del canal mediante una @mención"
+#: ../../include/contact_widgets.php:128
+#, php-format
+msgid "%d connection in common"
+msgid_plural "%d connections in common"
+msgstr[0] "%d conexión en común"
+msgstr[1] "%d conexiones en común"
 
-#: ../../include/permissions.php:41
-msgid "Advanced - useful for creating group forum channels"
-msgstr "Avanzado - útil para crear canales de foro o grupos"
+#: ../../include/contact_widgets.php:133
+msgid "show more"
+msgstr "mostrar más"
 
-#: ../../include/permissions.php:42
-msgid "Can chat with me (when available)"
-msgstr "Se puede charlar conmigo (cuando esté disponible)"
+#: ../../include/group.php:26
+msgid ""
+"A deleted group with this name was revived. Existing item permissions "
+"<strong>may</strong> apply to this group and any future members. If this is "
+"not what you intended, please create another group with a different name."
+msgstr "Un grupo suprimido con este nombre ha sido restablecido. <strong>Es posible</strong> que los permisos existentes  sean aplicados a este grupo y sus futuros miembros. Si no quiere esto, por favor cree otro grupo con un nombre diferente."
 
-#: ../../include/permissions.php:43
-msgid "Can write to my file storage"
-msgstr "Puede escribirse en mi carpeta de ficheros"
+#: ../../include/group.php:232
+msgid "Add new connections to this collection (privacy group)"
+msgstr "Añadir nuevas conexiones a esta colección (privacidad del grupo)"
 
-#: ../../include/permissions.php:44
-msgid "Can edit my webpages"
-msgstr "Puede editar mis páginas web"
+#: ../../include/group.php:251 ../../mod/admin.php:788
+msgid "All Channels"
+msgstr "Todos los canales"
 
-#: ../../include/permissions.php:46
-msgid "Can source my public posts in derived channels"
-msgstr "Pueden utilizarse mis publicaciones públicas como origen de contenidos  en canales derivados"
+#: ../../include/group.php:273
+msgid "edit"
+msgstr "editar"
 
-#: ../../include/permissions.php:46
-msgid "Somewhat advanced - very useful in open communities"
-msgstr "Algo avanzado - muy útil en comunidades abiertas"
+#: ../../include/group.php:295
+msgid "Collections"
+msgstr "Colecciones"
 
-#: ../../include/permissions.php:48
-msgid "Can administer my channel resources"
-msgstr "Pueden administrarse mis recursos del canal"
+#: ../../include/group.php:296
+msgid "Edit collection"
+msgstr "Editar colección"
+
+#: ../../include/group.php:297
+msgid "Add new collection"
+msgstr "Añadir nueva colección"
+
+#: ../../include/group.php:298
+msgid "Channels not in any collection"
+msgstr "El canal no se encuentra en ninguna colección"
+
+#: ../../include/group.php:300 ../../include/widgets.php:274
+msgid "add"
+msgstr "añadir"
+
+#: ../../include/zot.php:683
+msgid "Invalid data packet"
+msgstr "Paquete de datos no válido"
+
+#: ../../include/zot.php:699
+msgid "Unable to verify channel signature"
+msgstr "No ha sido posible de verificar la firma del canal"
+
+#: ../../include/zot.php:2235
+#, php-format
+msgid "Unable to verify site signature for %s"
+msgstr "No ha sido posible de verificar la firma del sitio para %s"
+
+#: ../../include/zot.php:3555
+msgid "invalid target signature"
+msgstr "La firma recibida no es válida"
+
+#: ../../include/message.php:18
+msgid "No recipient provided."
+msgstr "No se ha especificado ningún destinatario."
 
-#: ../../include/permissions.php:48
+#: ../../include/message.php:23
+msgid "[no subject]"
+msgstr "[sin asunto]"
+
+#: ../../include/message.php:43
+msgid "Unable to determine sender."
+msgstr "No ha sido posible determinar el remitente. "
+
+#: ../../include/message.php:218
+msgid "Stored post could not be verified."
+msgstr "No se han podido verificar las entradas guardadas."
+
+#: ../../include/identity.php:32
+msgid "Unable to obtain identity information from database"
+msgstr "No ha sido posible obtener información sobre la identidad desde la base de datos"
+
+#: ../../include/identity.php:66
+msgid "Empty name"
+msgstr "Nombre vacío"
+
+#: ../../include/identity.php:69
+msgid "Name too long"
+msgstr "Nombre demasiado largo"
+
+#: ../../include/identity.php:181
+msgid "No account identifier"
+msgstr "Ningún identificador de la cuenta"
+
+#: ../../include/identity.php:193
+msgid "Nickname is required."
+msgstr "Se requiere un sobrenombre (alias)."
+
+#: ../../include/identity.php:207
+msgid "Reserved nickname. Please choose another."
+msgstr "Sobrenombre en uso. Por favor, elija otro."
+
+#: ../../include/identity.php:212
 msgid ""
-"Extremely advanced. Leave this alone unless you know what you are doing"
-msgstr "Muy avanzado. Déjelo a no ser que sepa bien lo que está haciendo."
+"Nickname has unsupported characters or is already being used on this site."
+msgstr "El alias contiene caracteres no admitidos o está ya en uso por otros usuarios de este sitio."
 
-#: ../../include/permissions.php:893
-msgid "Social Networking"
-msgstr "Redes sociales"
+#: ../../include/identity.php:288
+msgid "Unable to retrieve created identity"
+msgstr "No ha sido posible recuperar la identidad creada"
 
-#: ../../include/permissions.php:893 ../../include/permissions.php:894
-#: ../../include/permissions.php:895
-msgid "Mostly Public"
-msgstr "Público en su mayor parte"
+#: ../../include/identity.php:346
+msgid "Default Profile"
+msgstr "Perfil principal"
 
-#: ../../include/permissions.php:893 ../../include/permissions.php:894
-#: ../../include/permissions.php:895
-msgid "Restricted"
-msgstr "Restringido"
+#: ../../include/identity.php:769
+msgid "Requested channel is not available."
+msgstr "El canal solicitado no está disponible."
 
-#: ../../include/permissions.php:893 ../../include/permissions.php:894
-msgid "Private"
-msgstr "Privado"
+#: ../../include/identity.php:815 ../../mod/achievements.php:11
+#: ../../mod/filestorage.php:54 ../../mod/hcard.php:8 ../../mod/layouts.php:29
+#: ../../mod/editblock.php:29 ../../mod/profile.php:16
+#: ../../mod/webpages.php:29 ../../mod/blocks.php:29
+#: ../../mod/editlayout.php:27 ../../mod/editwebpage.php:28
+#: ../../mod/connect.php:13
+msgid "Requested profile is not available."
+msgstr "El perfil solicitado no está disponible."
 
-#: ../../include/permissions.php:894
-msgid "Community Forum"
-msgstr "Foro de discusión"
+#: ../../include/identity.php:978 ../../mod/profiles.php:774
+msgid "Change profile photo"
+msgstr "Cambiar la foto del perfil"
 
-#: ../../include/permissions.php:895
-msgid "Feed Republish"
-msgstr "Republicar un \"feed\""
+#: ../../include/identity.php:984
+msgid "Profiles"
+msgstr "Perfiles"
 
-#: ../../include/permissions.php:896
-msgid "Special Purpose"
-msgstr "Propósito especial"
+#: ../../include/identity.php:984
+msgid "Manage/edit profiles"
+msgstr "Administrar/editar perfiles"
 
-#: ../../include/permissions.php:896
-msgid "Celebrity/Soapbox"
-msgstr "Página para fans"
+#: ../../include/identity.php:985 ../../mod/profiles.php:775
+msgid "Create New Profile"
+msgstr "Crear un nuevo perfil"
 
-#: ../../include/permissions.php:896
-msgid "Group Repository"
-msgstr "Repositorio de grupo"
+#: ../../include/identity.php:988 ../../include/nav.php:90
+msgid "Edit Profile"
+msgstr "Editar el perfil"
 
-#: ../../include/permissions.php:897 ../../include/profile_selectors.php:6
-#: ../../include/profile_selectors.php:23
-#: ../../include/profile_selectors.php:61
-#: ../../include/profile_selectors.php:97
-msgid "Other"
-msgstr "Otro"
+#: ../../include/identity.php:1000 ../../mod/profiles.php:786
+msgid "Profile Image"
+msgstr "Imagen del perfil"
 
-#: ../../include/permissions.php:897
-msgid "Custom/Expert Mode"
-msgstr "Modo personalizado/experto"
+#: ../../include/identity.php:1003
+msgid "visible to everybody"
+msgstr "visible para cualquiera"
+
+#: ../../include/identity.php:1004 ../../mod/profiles.php:669
+#: ../../mod/profiles.php:790
+msgid "Edit visibility"
+msgstr "Editar visibilidad"
+
+#: ../../include/identity.php:1020 ../../include/identity.php:1260
+msgid "Gender:"
+msgstr "Género:"
+
+#: ../../include/identity.php:1021 ../../include/identity.php:1304
+msgid "Status:"
+msgstr "Estado:"
+
+#: ../../include/identity.php:1022 ../../include/identity.php:1315
+msgid "Homepage:"
+msgstr "Página personal:"
+
+#: ../../include/identity.php:1023
+msgid "Online Now"
+msgstr "Ahora en línea"
+
+#: ../../include/identity.php:1107 ../../include/identity.php:1185
+#: ../../mod/ping.php:318
+msgid "g A l F d"
+msgstr "g A l d F"
+
+#: ../../include/identity.php:1108 ../../include/identity.php:1186
+msgid "F d"
+msgstr "d F"
+
+#: ../../include/identity.php:1153 ../../include/identity.php:1225
+#: ../../mod/ping.php:341
+msgid "[today]"
+msgstr "[hoy]"
+
+#: ../../include/identity.php:1164
+msgid "Birthday Reminders"
+msgstr "Recordatorios de cumpleaños"
+
+#: ../../include/identity.php:1165
+msgid "Birthdays this week:"
+msgstr "Cumpleaños de esta semana:"
+
+#: ../../include/identity.php:1218
+msgid "[No description]"
+msgstr "[Sin descripción]"
+
+#: ../../include/identity.php:1236
+msgid "Event Reminders"
+msgstr "Recordatorios de eventos"
+
+#: ../../include/identity.php:1237
+msgid "Events this week:"
+msgstr "Eventos de esta semana:"
+
+#: ../../include/identity.php:1258 ../../mod/settings.php:1026
+msgid "Full Name:"
+msgstr "Nombre completo:"
+
+#: ../../include/identity.php:1265
+msgid "Like this channel"
+msgstr "Me gusta este canal"
+
+#: ../../include/identity.php:1289
+msgid "j F, Y"
+msgstr "j F Y"
+
+#: ../../include/identity.php:1290
+msgid "j F"
+msgstr "j F"
+
+#: ../../include/identity.php:1297
+msgid "Birthday:"
+msgstr "Cumpleaños:"
+
+#: ../../include/identity.php:1301 ../../mod/directory.php:297
+msgid "Age:"
+msgstr "Edad:"
+
+#: ../../include/identity.php:1310
+#, php-format
+msgid "for %1$d %2$s"
+msgstr "por %1$d %2$s"
+
+#: ../../include/identity.php:1313 ../../mod/profiles.php:691
+msgid "Sexual Preference:"
+msgstr "Orientación sexual:"
+
+#: ../../include/identity.php:1317 ../../mod/directory.php:313
+#: ../../mod/profiles.php:693
+msgid "Hometown:"
+msgstr "Ciudad de origen:"
+
+#: ../../include/identity.php:1319
+msgid "Tags:"
+msgstr "Etiquetas:"
+
+#: ../../include/identity.php:1321 ../../mod/profiles.php:694
+msgid "Political Views:"
+msgstr "Posición política:"
+
+#: ../../include/identity.php:1323
+msgid "Religion:"
+msgstr "Religión:"
+
+#: ../../include/identity.php:1325 ../../mod/directory.php:315
+msgid "About:"
+msgstr "Sobre mí:"
+
+#: ../../include/identity.php:1327
+msgid "Hobbies/Interests:"
+msgstr "Aficciones/Intereses:"
+
+#: ../../include/identity.php:1329 ../../mod/profiles.php:697
+msgid "Likes:"
+msgstr "Me gusta:"
+
+#: ../../include/identity.php:1331 ../../mod/profiles.php:698
+msgid "Dislikes:"
+msgstr "No me gusta:"
+
+#: ../../include/identity.php:1333
+msgid "Contact information and Social Networks:"
+msgstr "Información de contacto y redes sociales:"
+
+#: ../../include/identity.php:1335
+msgid "My other channels:"
+msgstr "Mis otros canales:"
+
+#: ../../include/identity.php:1337
+msgid "Musical interests:"
+msgstr "Intereses musicales:"
+
+#: ../../include/identity.php:1339
+msgid "Books, literature:"
+msgstr "Libros, literatura:"
+
+#: ../../include/identity.php:1341
+msgid "Television:"
+msgstr "Televisión:"
+
+#: ../../include/identity.php:1343
+msgid "Film/dance/culture/entertainment:"
+msgstr "Cine/danza/cultura/entretenimiento:"
+
+#: ../../include/identity.php:1345
+msgid "Love/Romance:"
+msgstr "Vida sentimental/amorosa:"
+
+#: ../../include/identity.php:1347
+msgid "Work/employment:"
+msgstr "Trabajo:"
+
+#: ../../include/identity.php:1349
+msgid "School/education:"
+msgstr "Estudios:"
+
+#: ../../include/identity.php:1369
+msgid "Like this thing"
+msgstr "Me gusta esto"
+
+#: ../../include/taxonomy.php:229 ../../include/taxonomy.php:250
+msgid "Tags"
+msgstr "Etiquetas"
+
+#: ../../include/taxonomy.php:294
+msgid "Keywords"
+msgstr "Palabras clave"
+
+#: ../../include/taxonomy.php:315
+msgid "have"
+msgstr "tener"
+
+#: ../../include/taxonomy.php:315
+msgid "has"
+msgstr "tiene"
+
+#: ../../include/taxonomy.php:316
+msgid "want"
+msgstr "quiero"
+
+#: ../../include/taxonomy.php:316
+msgid "wants"
+msgstr "quiere"
+
+#: ../../include/taxonomy.php:317
+msgid "likes"
+msgstr "le gusta"
+
+#: ../../include/taxonomy.php:318
+msgid "dislikes"
+msgstr "no le gusta"
+
+#: ../../include/attach.php:243 ../../include/attach.php:329
+msgid "Item was not found."
+msgstr "Elemento no encontrado."
+
+#: ../../include/attach.php:493
+msgid "No source file."
+msgstr "Ningún fichero de origen"
+
+#: ../../include/attach.php:511
+msgid "Cannot locate file to replace"
+msgstr "No se puede localizar el fichero que va a ser sustituido."
+
+#: ../../include/attach.php:529
+msgid "Cannot locate file to revise/update"
+msgstr "No se puede localizar el fichero para revisar/actualizar"
+
+#: ../../include/attach.php:664
+#, php-format
+msgid "File exceeds size limit of %d"
+msgstr "El fichero supera el limite de tamaño de %d"
+
+#: ../../include/attach.php:678
+#, php-format
+msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
+msgstr "Ha alcanzado su límite de %1$.0f Mbytes de almacenamiento de adjuntos."
+
+#: ../../include/attach.php:828
+msgid "File upload failed. Possible system limit or action terminated."
+msgstr "Error de carga, posiblemente por limite del sistema o porque la acción ha finalizado."
+
+#: ../../include/attach.php:841
+msgid "Stored file could not be verified. Upload failed."
+msgstr "El fichero almacenado no ha podido ser verificado. El envío ha fallado."
+
+#: ../../include/attach.php:889 ../../include/attach.php:905
+msgid "Path not available."
+msgstr "Ruta no disponible."
+
+#: ../../include/attach.php:951 ../../include/attach.php:1103
+msgid "Empty pathname"
+msgstr "Ruta vacía"
+
+#: ../../include/attach.php:977
+msgid "duplicate filename or path"
+msgstr "Nombre duplicado de ruta o fichero"
+
+#: ../../include/attach.php:999
+msgid "Path not found."
+msgstr "Ruta no encontrada"
+
+#: ../../include/attach.php:1057
+msgid "mkdir failed."
+msgstr "mkdir ha fallado."
+
+#: ../../include/attach.php:1061
+msgid "database storage failed."
+msgstr "el almacenamiento en la base de datos ha fallado."
+
+#: ../../include/attach.php:1109
+msgid "Empty path"
+msgstr "Ruta vacía"
 
 #: ../../include/conversation.php:126 ../../mod/like.php:113
 msgid "channel"
 msgstr "canal"
 
-#: ../../include/conversation.php:167 ../../mod/like.php:399
+#: ../../include/conversation.php:164 ../../mod/like.php:410
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
+msgstr "a %1$s le gusta %3$s de %2$s"
+
+#: ../../include/conversation.php:167 ../../mod/like.php:412
 #, php-format
 msgid "%1$s doesn't like %2$s's %3$s"
-msgstr "a %1$s no le gusta el %3$s de %2$s"
+msgstr "a %1$s no le gusta %3$s de %2$s"
 
 #: ../../include/conversation.php:204
 #, php-format
 msgid "%1$s is now connected with %2$s"
-msgstr "%1$s ahora está conectado con %2$s"
+msgstr "%1$s ahora está conectado/a con %2$s"
 
 #: ../../include/conversation.php:239
 #, php-format
 msgid "%1$s poked %2$s"
-msgstr "%1$s dio un toque a %2$s"
+msgstr "%1$s ha dado un toque a %2$s"
 
 #: ../../include/conversation.php:260 ../../mod/mood.php:63
 #, php-format
@@ -2561,1420 +3219,964 @@ msgctxt "mood"
 msgid "%1$s is %2$s"
 msgstr "%1$s está %2$s"
 
-#: ../../include/conversation.php:583 ../../mod/photos.php:996
+#: ../../include/conversation.php:574 ../../mod/photos.php:1060
 msgctxt "title"
 msgid "Likes"
 msgstr "Me gusta"
 
-#: ../../include/conversation.php:583 ../../mod/photos.php:996
+#: ../../include/conversation.php:574 ../../mod/photos.php:1060
 msgctxt "title"
 msgid "Dislikes"
 msgstr "No me gusta"
 
-#: ../../include/conversation.php:584 ../../mod/photos.php:997
+#: ../../include/conversation.php:575 ../../mod/photos.php:1061
 msgctxt "title"
 msgid "Agree"
 msgstr "De acuerdo"
 
-#: ../../include/conversation.php:584 ../../mod/photos.php:997
+#: ../../include/conversation.php:575 ../../mod/photos.php:1061
 msgctxt "title"
 msgid "Disagree"
 msgstr "En desacuerdo"
 
-#: ../../include/conversation.php:584 ../../mod/photos.php:997
+#: ../../include/conversation.php:575 ../../mod/photos.php:1061
 msgctxt "title"
 msgid "Abstain"
 msgstr "Abstención"
 
-#: ../../include/conversation.php:585 ../../mod/photos.php:998
+#: ../../include/conversation.php:576 ../../mod/photos.php:1062
 msgctxt "title"
 msgid "Attending"
-msgstr "Participar"
+msgstr "Participaré"
 
-#: ../../include/conversation.php:585 ../../mod/photos.php:998
+#: ../../include/conversation.php:576 ../../mod/photos.php:1062
 msgctxt "title"
 msgid "Not attending"
-msgstr "No participar"
+msgstr "No participaré"
 
-#: ../../include/conversation.php:585 ../../mod/photos.php:998
+#: ../../include/conversation.php:576 ../../mod/photos.php:1062
 msgctxt "title"
 msgid "Might attend"
 msgstr "Quizá participe"
 
-#: ../../include/conversation.php:703
+#: ../../include/conversation.php:692
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr "Ver el perfil @ %s de %s"
 
-#: ../../include/conversation.php:718
+#: ../../include/conversation.php:709
 msgid "Categories:"
 msgstr "Categorías:"
 
-#: ../../include/conversation.php:719
+#: ../../include/conversation.php:710
 msgid "Filed under:"
 msgstr "Archivado bajo:"
 
-#: ../../include/conversation.php:746
+#: ../../include/conversation.php:737
 msgid "View in context"
 msgstr "Mostrar en su contexto"
 
-#: ../../include/conversation.php:857
+#: ../../include/conversation.php:850
 msgid "remove"
 msgstr "eliminar"
 
-#: ../../include/conversation.php:862
+#: ../../include/conversation.php:854 ../../include/nav.php:241
+msgid "Loading..."
+msgstr "Cargando..."
+
+#: ../../include/conversation.php:855
 msgid "Delete Selected Items"
 msgstr "Eliminar elementos seleccionados"
 
-#: ../../include/conversation.php:950
+#: ../../include/conversation.php:943
 msgid "View Source"
 msgstr "Ver la fuente original de la entrada"
 
-#: ../../include/conversation.php:951
+#: ../../include/conversation.php:944
 msgid "Follow Thread"
 msgstr "Seguir el hilo"
 
-#: ../../include/conversation.php:952
+#: ../../include/conversation.php:945
 msgid "View Status"
-msgstr "Ver estado"
+msgstr "Estado actual"
 
-#: ../../include/conversation.php:954
+#: ../../include/conversation.php:946 ../../include/nav.php:86
+#: ../../mod/connedit.php:493
+msgid "View Profile"
+msgstr "Ver el perfil"
+
+#: ../../include/conversation.php:947
 msgid "View Photos"
 msgstr "Ver fotos"
 
-#: ../../include/conversation.php:955
-msgid "Matrix Activity"
-msgstr "Actividad en la red de esta conexión"
+#: ../../include/conversation.php:948
+msgid "Activity/Posts"
+msgstr "Actividad y entradas"
 
-#: ../../include/conversation.php:957
-msgid "Edit Contact"
-msgstr "Editar contacto"
+#: ../../include/conversation.php:950
+msgid "Edit Connection"
+msgstr "Editar conexión"
 
-#: ../../include/conversation.php:958
+#: ../../include/conversation.php:951
 msgid "Send PM"
-msgstr "Enviar Mensaje Privado"
-
-#: ../../include/conversation.php:959 ../../include/apps.php:145
-msgid "Poke"
-msgstr "Dar un toque"
+msgstr "Enviar un mensaje privado"
 
-#: ../../include/conversation.php:1073
+#: ../../include/conversation.php:1066
 #, php-format
 msgid "%s likes this."
 msgstr "a %s le gusta esto."
 
-#: ../../include/conversation.php:1073
+#: ../../include/conversation.php:1066
 #, php-format
 msgid "%s doesn't like this."
 msgstr "a %s no le gusta esto."
 
-#: ../../include/conversation.php:1077
+#: ../../include/conversation.php:1070
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgid_plural "<span  %1$s>%2$d people</span> like this."
 msgstr[0] "a <span %1$s>%2$d personas</span> le gusta esto."
 msgstr[1] "a <span  %1$s>%2$d personas</span> les gusta esto."
 
-#: ../../include/conversation.php:1079
+#: ../../include/conversation.php:1072
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this."
 msgid_plural "<span  %1$s>%2$d people</span> don't like this."
 msgstr[0] "a <span %1$s>%2$d personas</span> no les gusta esto."
 msgstr[1] "a <span  %1$s>%2$d personas</span> no les gusta esto."
 
-#: ../../include/conversation.php:1085
+#: ../../include/conversation.php:1078
 msgid "and"
 msgstr "y"
 
-#: ../../include/conversation.php:1088
+#: ../../include/conversation.php:1081
 #, php-format
 msgid ", and %d other people"
 msgid_plural ", and %d other people"
 msgstr[0] ", y %d persona más"
 msgstr[1] ", y %d personas más"
 
-#: ../../include/conversation.php:1089
+#: ../../include/conversation.php:1082
 #, php-format
 msgid "%s like this."
 msgstr "a %s le gusta esto."
 
-#: ../../include/conversation.php:1089
+#: ../../include/conversation.php:1082
 #, php-format
 msgid "%s don't like this."
 msgstr "a %s no le gusta esto."
 
-#: ../../include/conversation.php:1151
+#: ../../include/conversation.php:1145
 msgid "Visible to <strong>everybody</strong>"
 msgstr "Visible para <strong>cualquiera</strong>"
 
-#: ../../include/conversation.php:1152 ../../mod/mail.php:174
-#: ../../mod/mail.php:289
+#: ../../include/conversation.php:1146 ../../mod/mail.php:194
+#: ../../mod/mail.php:308
 msgid "Please enter a link URL:"
 msgstr "Por favor, introduzca la dirección del enlace:"
 
-#: ../../include/conversation.php:1153
+#: ../../include/conversation.php:1147
 msgid "Please enter a video link/URL:"
 msgstr "Por favor, introduzca un enlace de vídeo:"
 
-#: ../../include/conversation.php:1154
+#: ../../include/conversation.php:1148
 msgid "Please enter an audio link/URL:"
 msgstr "Por favor, introduzca un enlace de audio:"
 
-#: ../../include/conversation.php:1155
+#: ../../include/conversation.php:1149
 msgid "Tag term:"
 msgstr "Término de la etiqueta:"
 
-#: ../../include/conversation.php:1156 ../../mod/filer.php:49
+#: ../../include/conversation.php:1150 ../../mod/filer.php:48
 msgid "Save to Folder:"
 msgstr "Guardar en carpeta:"
 
-#: ../../include/conversation.php:1157
+#: ../../include/conversation.php:1151
 msgid "Where are you right now?"
 msgstr "¿Donde está ahora?"
 
-#: ../../include/conversation.php:1158 ../../mod/editpost.php:47
-#: ../../mod/mail.php:175 ../../mod/mail.php:290
+#: ../../include/conversation.php:1152 ../../mod/mail.php:195
+#: ../../mod/mail.php:309 ../../mod/editpost.php:54
 msgid "Expires YYYY-MM-DD HH:MM"
 msgstr "Caduca YYYY-MM-DD HH:MM"
 
-#: ../../include/conversation.php:1185 ../../mod/webpages.php:182
-#: ../../mod/blocks.php:154 ../../mod/photos.php:961 ../../mod/layouts.php:184
+#: ../../include/conversation.php:1179 ../../mod/photos.php:1025
+#: ../../mod/layouts.php:184 ../../mod/webpages.php:182
+#: ../../mod/blocks.php:154
 msgid "Share"
 msgstr "Compartir"
 
-#: ../../include/conversation.php:1187
+#: ../../include/conversation.php:1181
 msgid "Page link name"
 msgstr "Nombre de enlace de página"
 
-#: ../../include/conversation.php:1190
+#: ../../include/conversation.php:1184
 msgid "Post as"
 msgstr "Publicar como"
 
-#: ../../include/conversation.php:1197 ../../mod/editpost.php:112
-#: ../../mod/editlayout.php:139 ../../mod/editwebpage.php:184
-#: ../../mod/editblock.php:141 ../../mod/mail.php:238 ../../mod/mail.php:352
+#: ../../include/conversation.php:1191 ../../mod/editblock.php:142
+#: ../../mod/editpost.php:119 ../../mod/editlayout.php:140
+#: ../../mod/editwebpage.php:182
 msgid "Upload photo"
 msgstr "Subir foto"
 
-#: ../../include/conversation.php:1198
+#: ../../include/conversation.php:1192
 msgid "upload photo"
 msgstr "subir foto"
 
-#: ../../include/conversation.php:1199 ../../mod/editpost.php:113
-#: ../../mod/editlayout.php:140 ../../mod/editwebpage.php:185
-#: ../../mod/editblock.php:142 ../../mod/mail.php:239 ../../mod/mail.php:353
+#: ../../include/conversation.php:1193 ../../mod/mail.php:240
+#: ../../mod/mail.php:369 ../../mod/editblock.php:143
+#: ../../mod/editpost.php:120 ../../mod/editlayout.php:141
+#: ../../mod/editwebpage.php:183
 msgid "Attach file"
 msgstr "Adjuntar fichero"
 
-#: ../../include/conversation.php:1200
+#: ../../include/conversation.php:1194
 msgid "attach file"
 msgstr "adjuntar fichero"
 
-#: ../../include/conversation.php:1201 ../../mod/editpost.php:114
-#: ../../mod/editlayout.php:141 ../../mod/editwebpage.php:186
-#: ../../mod/editblock.php:143 ../../mod/mail.php:240 ../../mod/mail.php:354
+#: ../../include/conversation.php:1195 ../../mod/mail.php:241
+#: ../../mod/mail.php:370 ../../mod/editblock.php:144
+#: ../../mod/editpost.php:121 ../../mod/editlayout.php:142
+#: ../../mod/editwebpage.php:184
 msgid "Insert web link"
 msgstr "Insertar enlace web"
 
-#: ../../include/conversation.php:1202
+#: ../../include/conversation.php:1196
 msgid "web link"
 msgstr "enlace web"
 
-#: ../../include/conversation.php:1203
+#: ../../include/conversation.php:1197
 msgid "Insert video link"
 msgstr "Insertar enlace de vídeo"
 
-#: ../../include/conversation.php:1204
+#: ../../include/conversation.php:1198
 msgid "video link"
 msgstr "enlace de vídeo"
 
-#: ../../include/conversation.php:1205
+#: ../../include/conversation.php:1199
 msgid "Insert audio link"
 msgstr "Insertar enlace de audio"
 
-#: ../../include/conversation.php:1206
+#: ../../include/conversation.php:1200
 msgid "audio link"
 msgstr "enlace de audio"
 
-#: ../../include/conversation.php:1207 ../../mod/editpost.php:118
-#: ../../mod/editlayout.php:145 ../../mod/editwebpage.php:190
-#: ../../mod/editblock.php:147
+#: ../../include/conversation.php:1201 ../../mod/editblock.php:148
+#: ../../mod/editpost.php:125 ../../mod/editlayout.php:146
+#: ../../mod/editwebpage.php:188
 msgid "Set your location"
 msgstr "Configure su localización"
 
-#: ../../include/conversation.php:1208
+#: ../../include/conversation.php:1202
 msgid "set location"
 msgstr "configure localización"
 
-#: ../../include/conversation.php:1209 ../../mod/editpost.php:120
+#: ../../include/conversation.php:1203 ../../mod/editpost.php:127
 msgid "Toggle voting"
 msgstr "Cambiar votación"
 
-#: ../../include/conversation.php:1212 ../../mod/editpost.php:119
-#: ../../mod/editlayout.php:146 ../../mod/editwebpage.php:191
-#: ../../mod/editblock.php:148
+#: ../../include/conversation.php:1206 ../../mod/editblock.php:149
+#: ../../mod/editpost.php:126 ../../mod/editlayout.php:147
+#: ../../mod/editwebpage.php:189
 msgid "Clear browser location"
 msgstr "Eliminar localización del navegador"
 
-#: ../../include/conversation.php:1213
+#: ../../include/conversation.php:1207
 msgid "clear location"
 msgstr "eliminar localización"
 
-#: ../../include/conversation.php:1215 ../../mod/editpost.php:135
-#: ../../mod/editwebpage.php:207 ../../mod/editblock.php:161
+#: ../../include/conversation.php:1209 ../../mod/editblock.php:162
+#: ../../mod/editpost.php:142 ../../mod/editwebpage.php:205
 msgid "Title (optional)"
 msgstr "Título (opcional)"
 
-#: ../../include/conversation.php:1219 ../../mod/editpost.php:137
-#: ../../mod/editlayout.php:162 ../../mod/editwebpage.php:209
-#: ../../mod/editblock.php:164
+#: ../../include/conversation.php:1213 ../../mod/editblock.php:165
+#: ../../mod/editpost.php:144 ../../mod/editlayout.php:163
+#: ../../mod/editwebpage.php:207
 msgid "Categories (optional, comma-separated list)"
 msgstr "Categorías (opcional, lista separada por comas)"
 
-#: ../../include/conversation.php:1221 ../../mod/editpost.php:124
-#: ../../mod/editlayout.php:148 ../../mod/editwebpage.php:193
-#: ../../mod/editblock.php:150
+#: ../../include/conversation.php:1215 ../../mod/editblock.php:151
+#: ../../mod/editpost.php:131 ../../mod/editlayout.php:149
+#: ../../mod/editwebpage.php:191
 msgid "Permission settings"
 msgstr "Configuración de permisos"
 
-#: ../../include/conversation.php:1222
+#: ../../include/conversation.php:1216
 msgid "permissions"
 msgstr "permisos"
 
-#: ../../include/conversation.php:1230 ../../mod/editpost.php:132
-#: ../../mod/editlayout.php:155 ../../mod/editwebpage.php:202
-#: ../../mod/editblock.php:158
+#: ../../include/conversation.php:1224 ../../mod/editblock.php:159
+#: ../../mod/editpost.php:139 ../../mod/editlayout.php:156
+#: ../../mod/editwebpage.php:200
 msgid "Public post"
 msgstr "Entrada pública"
 
-#: ../../include/conversation.php:1232 ../../mod/editpost.php:138
-#: ../../mod/editlayout.php:163 ../../mod/editwebpage.php:210
-#: ../../mod/editblock.php:165
+#: ../../include/conversation.php:1226 ../../mod/editblock.php:166
+#: ../../mod/editpost.php:145 ../../mod/editlayout.php:164
+#: ../../mod/editwebpage.php:208
 msgid "Example: bob@example.com, mary@example.com"
 msgstr "Ejemplo: roberto@ejemplo.com, maría@ejemplo.com"
 
-#: ../../include/conversation.php:1245 ../../mod/editpost.php:149
-#: ../../mod/editlayout.php:172 ../../mod/editwebpage.php:219
-#: ../../mod/editblock.php:175 ../../mod/mail.php:245 ../../mod/mail.php:359
+#: ../../include/conversation.php:1239 ../../mod/mail.php:245
+#: ../../mod/mail.php:374 ../../mod/editblock.php:176
+#: ../../mod/editpost.php:156 ../../mod/editlayout.php:173
+#: ../../mod/editwebpage.php:217
 msgid "Set expiration date"
 msgstr "Configurar fecha de caducidad"
 
-#: ../../include/conversation.php:1249 ../../mod/events.php:674
-#: ../../mod/editpost.php:153
+#: ../../include/conversation.php:1243 ../../mod/editpost.php:160
+#: ../../mod/events.php:691
 msgid "OK"
 msgstr "OK"
 
-#: ../../include/conversation.php:1250 ../../mod/tagrm.php:11
-#: ../../mod/tagrm.php:134 ../../mod/events.php:673 ../../mod/fbrowser.php:82
-#: ../../mod/fbrowser.php:117 ../../mod/editpost.php:154
-#: ../../mod/settings.php:589 ../../mod/settings.php:615
+#: ../../include/conversation.php:1244 ../../mod/fbrowser.php:82
+#: ../../mod/fbrowser.php:117 ../../mod/editpost.php:161
+#: ../../mod/events.php:690 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134
+#: ../../mod/settings.php:584 ../../mod/settings.php:610
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../../include/conversation.php:1492
+#: ../../include/conversation.php:1487
 msgid "Discover"
 msgstr "Descubrir"
 
-#: ../../include/conversation.php:1495
+#: ../../include/conversation.php:1490
 msgid "Imported public streams"
 msgstr "Flujos públicos importados"
 
-#: ../../include/conversation.php:1500
+#: ../../include/conversation.php:1495
 msgid "Commented Order"
 msgstr "Comentarios recientes"
 
-#: ../../include/conversation.php:1503
+#: ../../include/conversation.php:1498
 msgid "Sort by Comment Date"
 msgstr "Ordenar por fecha de comentario"
 
-#: ../../include/conversation.php:1507
+#: ../../include/conversation.php:1502
 msgid "Posted Order"
 msgstr "Publicaciones recientes"
 
-#: ../../include/conversation.php:1510
+#: ../../include/conversation.php:1505
 msgid "Sort by Post Date"
 msgstr "Ordenar por fecha de publicación"
 
-#: ../../include/conversation.php:1518
+#: ../../include/conversation.php:1510 ../../include/widgets.php:94
+msgid "Personal"
+msgstr "Personales"
+
+#: ../../include/conversation.php:1513
 msgid "Posts that mention or involve you"
 msgstr "Publicaciones que le mencionan o involucran"
 
-#: ../../include/conversation.php:1524 ../../mod/connections.php:72
-#: ../../mod/connections.php:85 ../../mod/menu.php:110
+#: ../../include/conversation.php:1519 ../../mod/menu.php:112
+#: ../../mod/connections.php:72 ../../mod/connections.php:82
 msgid "New"
 msgstr "Nuevas"
 
-#: ../../include/conversation.php:1527
+#: ../../include/conversation.php:1522
 msgid "Activity Stream - by date"
 msgstr "Flujo de actividad - por fecha"
 
-#: ../../include/conversation.php:1533
+#: ../../include/conversation.php:1528
 msgid "Starred"
 msgstr "Preferidas"
 
-#: ../../include/conversation.php:1536
+#: ../../include/conversation.php:1531
 msgid "Favourite Posts"
 msgstr "Publicaciones favoritas"
 
-#: ../../include/conversation.php:1543
+#: ../../include/conversation.php:1538
 msgid "Spam"
 msgstr "Correo basura"
 
-#: ../../include/conversation.php:1546
+#: ../../include/conversation.php:1541
 msgid "Posts flagged as SPAM"
 msgstr "Publicaciones marcadas como basura"
 
-#: ../../include/conversation.php:1590 ../../mod/admin.php:993
+#: ../../include/conversation.php:1585 ../../mod/admin.php:947
 msgid "Channel"
 msgstr "Canal"
 
-#: ../../include/conversation.php:1593
+#: ../../include/conversation.php:1588
 msgid "Status Messages and Posts"
 msgstr "Mensajes de estado y publicaciones"
 
-#: ../../include/conversation.php:1602
+#: ../../include/conversation.php:1597
 msgid "About"
 msgstr "Sobre mí"
 
-#: ../../include/conversation.php:1605
+#: ../../include/conversation.php:1600
 msgid "Profile Details"
 msgstr "Detalles del perfil"
 
-#: ../../include/conversation.php:1614 ../../include/photos.php:359
-msgid "Photo Albums"
-msgstr "Álbumes de fotos"
-
-#: ../../include/conversation.php:1623
+#: ../../include/conversation.php:1616
 msgid "Files and Storage"
-msgstr "Ficheros y carpetas"
+msgstr "Ficheros y repositorio"
 
-#: ../../include/conversation.php:1633 ../../include/conversation.php:1636
+#: ../../include/conversation.php:1626 ../../include/conversation.php:1629
 msgid "Chatrooms"
 msgstr "Salas de chat"
 
-#: ../../include/conversation.php:1649
+#: ../../include/conversation.php:1642
 msgid "Saved Bookmarks"
 msgstr "Marcadores guardados"
 
-#: ../../include/conversation.php:1659
+#: ../../include/conversation.php:1652
 msgid "Manage Webpages"
 msgstr "Administrar páginas web"
 
-#: ../../include/conversation.php:1718
+#: ../../include/conversation.php:1711
 msgctxt "noun"
 msgid "Attending"
 msgid_plural "Attending"
-msgstr[0] "Asistir"
-msgstr[1] "Participar"
+msgstr[0] "Participando"
+msgstr[1] "Participaré"
 
-#: ../../include/conversation.php:1721
+#: ../../include/conversation.php:1714
 msgctxt "noun"
 msgid "Not Attending"
 msgid_plural "Not Attending"
-msgstr[0] "No asistir"
-msgstr[1] "No participar"
+msgstr[0] "No participando"
+msgstr[1] "No participaré"
 
-#: ../../include/conversation.php:1724
+#: ../../include/conversation.php:1717
 msgctxt "noun"
 msgid "Undecided"
 msgid_plural "Undecided"
 msgstr[0] "Indeciso/a"
 msgstr[1] "Indecisos/as"
 
-#: ../../include/conversation.php:1727
+#: ../../include/conversation.php:1720
 msgctxt "noun"
 msgid "Agree"
 msgid_plural "Agrees"
 msgstr[0] "Está de acuerdo"
-msgstr[1] "Están de acuerdo"
+msgstr[1] "De acuerdo"
 
-#: ../../include/conversation.php:1730
+#: ../../include/conversation.php:1723
 msgctxt "noun"
 msgid "Disagree"
 msgid_plural "Disagrees"
 msgstr[0] "No está de acuerdo"
-msgstr[1] "No están de acuerdo"
+msgstr[1] "En desacuerdo"
 
-#: ../../include/conversation.php:1733
+#: ../../include/conversation.php:1726
 msgctxt "noun"
 msgid "Abstain"
 msgid_plural "Abstains"
 msgstr[0] "se abstiene"
 msgstr[1] "Se abstienen"
 
-#: ../../include/items.php:413 ../../mod/like.php:273
-#: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/profperm.php:23
-#: ../../mod/bulksetclose.php:11 ../../index.php:392
-msgid "Permission denied"
-msgstr "Permiso denegado"
-
-#: ../../include/items.php:1038 ../../include/items.php:1084
-msgid "(Unknown)"
-msgstr "(Desconocido)"
-
-#: ../../include/items.php:1310
-msgid "Visible to anybody on the internet."
-msgstr "Visible para cualquiera en internet."
-
-#: ../../include/items.php:1312
-msgid "Visible to you only."
-msgstr "Visible sólo para usted."
-
-#: ../../include/items.php:1314
-msgid "Visible to anybody in this network."
-msgstr "Visible para cualquiera en esta red."
-
-#: ../../include/items.php:1316
-msgid "Visible to anybody authenticated."
-msgstr "Visible para cualquiera que haya sido autenticado."
-
-#: ../../include/items.php:1318
-#, php-format
-msgid "Visible to anybody on %s."
-msgstr "Visible para cualquiera en %s."
-
-#: ../../include/items.php:1320
-msgid "Visible to all connections."
-msgstr "Visible para todas las conexiones."
-
-#: ../../include/items.php:1322
-msgid "Visible to approved connections."
-msgstr "Visible para las conexiones permitidas."
-
-#: ../../include/items.php:1324
-msgid "Visible to specific connections."
-msgstr "Visible para conexiones específicas."
-
-#: ../../include/items.php:4223 ../../mod/thing.php:74
-#: ../../mod/filestorage.php:27 ../../mod/viewsrc.php:20
-#: ../../mod/admin.php:167 ../../mod/admin.php:1025 ../../mod/admin.php:1225
-#: ../../mod/display.php:36
-msgid "Item not found."
-msgstr "Elemento no encontrado."
-
-#: ../../include/items.php:4296 ../../include/attach.php:137
-#: ../../include/attach.php:184 ../../include/attach.php:247
-#: ../../include/attach.php:261 ../../include/attach.php:305
-#: ../../include/attach.php:319 ../../include/attach.php:350
-#: ../../include/attach.php:546 ../../include/attach.php:618
-#: ../../include/chat.php:131 ../../include/photos.php:26
-#: ../../mod/profile.php:64 ../../mod/profile.php:72
-#: ../../mod/achievements.php:30 ../../mod/manage.php:6 ../../mod/api.php:26
-#: ../../mod/api.php:31 ../../mod/webpages.php:69 ../../mod/thing.php:269
-#: ../../mod/thing.php:284 ../../mod/thing.php:318
-#: ../../mod/profile_photo.php:264 ../../mod/profile_photo.php:277
-#: ../../mod/block.php:22 ../../mod/block.php:72 ../../mod/like.php:178
-#: ../../mod/events.php:249 ../../mod/group.php:9 ../../mod/item.php:206
-#: ../../mod/item.php:214 ../../mod/item.php:1005 ../../mod/network.php:12
-#: ../../mod/common.php:35 ../../mod/connections.php:29
-#: ../../mod/blocks.php:69 ../../mod/blocks.php:76 ../../mod/editpost.php:13
-#: ../../mod/photos.php:69 ../../mod/pdledit.php:21 ../../mod/authtest.php:13
-#: ../../mod/editlayout.php:63 ../../mod/editlayout.php:87
-#: ../../mod/chat.php:90 ../../mod/chat.php:95 ../../mod/mitem.php:111
-#: ../../mod/editwebpage.php:64 ../../mod/editwebpage.php:86
-#: ../../mod/editwebpage.php:101 ../../mod/editwebpage.php:125
-#: ../../mod/rate.php:110 ../../mod/editblock.php:65 ../../mod/invite.php:13
-#: ../../mod/invite.php:104 ../../mod/locs.php:77 ../../mod/sources.php:66
-#: ../../mod/menu.php:72 ../../mod/filestorage.php:18
-#: ../../mod/filestorage.php:73 ../../mod/filestorage.php:88
-#: ../../mod/filestorage.php:115 ../../mod/fsuggest.php:78
-#: ../../mod/poke.php:128 ../../mod/profiles.php:188
-#: ../../mod/profiles.php:576 ../../mod/viewsrc.php:14 ../../mod/setup.php:223
-#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27
-#: ../../mod/register.php:72 ../../mod/settings.php:570 ../../mod/id.php:71
-#: ../../mod/message.php:16 ../../mod/mood.php:111 ../../mod/connedit.php:348
-#: ../../mod/mail.php:114 ../../mod/notifications.php:66
-#: ../../mod/regmod.php:17 ../../mod/new_channel.php:68
-#: ../../mod/new_channel.php:99 ../../mod/appman.php:66
-#: ../../mod/layouts.php:69 ../../mod/layouts.php:76 ../../mod/layouts.php:87
-#: ../../mod/page.php:31 ../../mod/page.php:86 ../../mod/bookmarks.php:46
-#: ../../mod/channel.php:100 ../../mod/channel.php:219
-#: ../../mod/channel.php:262 ../../mod/suggest.php:26
-#: ../../mod/service_limits.php:7 ../../mod/sharedwithme.php:7
-#: ../../index.php:182 ../../index.php:393
-msgid "Permission denied."
-msgstr "Acceso denegado."
-
-#: ../../include/items.php:4700 ../../mod/group.php:38 ../../mod/group.php:140
-#: ../../mod/bulksetclose.php:51
-msgid "Collection not found."
-msgstr "Colección no encontrada."
+#: ../../include/widgets.php:91 ../../include/nav.php:157
+#: ../../mod/apps.php:36
+msgid "Apps"
+msgstr "Aplicaciones"
 
-#: ../../include/items.php:4716
-msgid "Collection is empty."
-msgstr "La colección está vacía."
+#: ../../include/widgets.php:92
+msgid "System"
+msgstr "Sistema"
 
-#: ../../include/items.php:4723
-#, php-format
-msgid "Collection: %s"
-msgstr "Colección: %s"
+#: ../../include/widgets.php:95
+msgid "Create Personal App"
+msgstr "Crear una aplicación personal"
 
-#: ../../include/items.php:4733 ../../mod/connedit.php:674
-#, php-format
-msgid "Connection: %s"
-msgstr "Conexión: %s"
+#: ../../include/widgets.php:96
+msgid "Edit Personal App"
+msgstr "Editar una aplicación personal"
 
-#: ../../include/items.php:4735
-msgid "Connection not found."
-msgstr "Conexión no encontrada"
+#: ../../include/widgets.php:138 ../../mod/suggest.php:54
+msgid "Ignore/Hide"
+msgstr "Ignorar/Ocultar"
 
-#: ../../include/zot.php:675
-msgid "Invalid data packet"
-msgstr "Paquete de datos no válido"
+#: ../../include/widgets.php:143 ../../mod/connections.php:125
+msgid "Suggestions"
+msgstr "Sugerencias"
 
-#: ../../include/zot.php:691
-msgid "Unable to verify channel signature"
-msgstr "No ha sido posible de verificar la signatura del canal"
+#: ../../include/widgets.php:144
+msgid "See more..."
+msgstr "Ver más..."
 
-#: ../../include/zot.php:2142
+#: ../../include/widgets.php:165
 #, php-format
-msgid "Unable to verify site signature for %s"
-msgstr "No ha sido posible de verificar la signatura del sitio para %s"
-
-#: ../../include/oembed.php:183
-msgid "Embedded content"
-msgstr "Contenido incorporado"
-
-#: ../../include/oembed.php:192
-msgid "Embedding disabled"
-msgstr "Incrustación deshabilitada"
+msgid "You have %1$.0f of %2$.0f allowed connections."
+msgstr "Tiene %1$.0f de %2$.0f conexiones permitidas."
 
-#: ../../include/auth.php:131
-msgid "Logged out."
-msgstr "Desconectado."
+#: ../../include/widgets.php:171
+msgid "Add New Connection"
+msgstr "Añadir nueva conexión"
 
-#: ../../include/auth.php:272
-msgid "Failed authentication"
-msgstr "Autenticación fallida."
+#: ../../include/widgets.php:172
+msgid "Enter the channel address"
+msgstr "Introducir la dirección del canal"
 
-#: ../../include/auth.php:286 ../../mod/openid.php:190
-msgid "Login failed."
-msgstr "El acceso ha fallado."
+#: ../../include/widgets.php:173
+msgid "Example: bob@example.com, http://example.com/barbara"
+msgstr "Ejemplo: paco@ejemplo.com, http://ejemplo.com/paco"
 
-#: ../../include/contact_widgets.php:14
-#, php-format
-msgid "%d invitation available"
-msgid_plural "%d invitations available"
-msgstr[0] "%d invitación pendiente"
-msgstr[1] "%d invitaciones disponibles"
+#: ../../include/widgets.php:189
+msgid "Notes"
+msgstr "Notas"
 
-#: ../../include/contact_widgets.php:19 ../../mod/admin.php:457
-msgid "Advanced"
-msgstr "Avanzado"
+#: ../../include/widgets.php:265
+msgid "Remove term"
+msgstr "Eliminar término"
 
-#: ../../include/contact_widgets.php:22
-msgid "Find Channels"
-msgstr "Encontrar canales"
+#: ../../include/widgets.php:348
+msgid "Archives"
+msgstr "Hemeroteca"
 
-#: ../../include/contact_widgets.php:23
-msgid "Enter name or interest"
-msgstr "Introducir nombre o interés"
+#: ../../include/widgets.php:427 ../../mod/connedit.php:566
+msgid "Me"
+msgstr "Yo"
 
-#: ../../include/contact_widgets.php:24
-msgid "Connect/Follow"
-msgstr "Conectar/Seguir"
+#: ../../include/widgets.php:428 ../../mod/connedit.php:567
+msgid "Family"
+msgstr "Familia"
 
-#: ../../include/contact_widgets.php:25
-msgid "Examples: Robert Morgenstein, Fishing"
-msgstr "Ejemplos: José Fernández, Pesca"
+#: ../../include/widgets.php:430 ../../mod/connedit.php:569
+msgid "Acquaintances"
+msgstr "Conocidos/as"
 
-#: ../../include/contact_widgets.php:26 ../../mod/directory.php:379
-#: ../../mod/directory.php:384 ../../mod/connections.php:273
-msgid "Find"
-msgstr "Encontrar"
+#: ../../include/widgets.php:431 ../../mod/connedit.php:570
+#: ../../mod/connections.php:88 ../../mod/connections.php:103
+msgid "All"
+msgstr "Todas"
 
-#: ../../include/contact_widgets.php:27 ../../mod/directory.php:383
-#: ../../mod/suggest.php:60
-msgid "Channel Suggestions"
-msgstr "Sugerencias de canales"
+#: ../../include/widgets.php:450
+msgid "Refresh"
+msgstr "Recargar"
 
-#: ../../include/contact_widgets.php:29
-msgid "Random Profile"
-msgstr "Perfil aleatorio"
+#: ../../include/widgets.php:484
+msgid "Account settings"
+msgstr "Configuración de la cuenta"
 
-#: ../../include/contact_widgets.php:30
-msgid "Invite Friends"
-msgstr "Invitar a amigos"
+#: ../../include/widgets.php:490
+msgid "Channel settings"
+msgstr "Configuración del canal"
 
-#: ../../include/contact_widgets.php:32
-msgid "Advanced example: name=fred and country=iceland"
-msgstr "Ejemplo avanzado: nombre=juan y país=españa"
+#: ../../include/widgets.php:496
+msgid "Additional features"
+msgstr "Características adicionales"
 
-#: ../../include/contact_widgets.php:125
-#, php-format
-msgid "%d connection in common"
-msgid_plural "%d connections in common"
-msgstr[0] "%d conexión en común"
-msgstr[1] "%d conexiones en común"
+#: ../../include/widgets.php:502
+msgid "Feature/Addon settings"
+msgstr "Configuración de características o complementos"
 
-#: ../../include/contact_widgets.php:130
-msgid "show more"
-msgstr "mostrar más"
+#: ../../include/widgets.php:508
+msgid "Display settings"
+msgstr "Ajustes de visualización"
 
-#: ../../include/acl_selectors.php:240
-msgid "Visible to your default audience"
-msgstr "Visible para su público predeterminado."
+#: ../../include/widgets.php:514
+msgid "Connected apps"
+msgstr "Aplicaciones conectadas"
 
-#: ../../include/acl_selectors.php:241
-msgid "Show"
-msgstr "Mostrar"
+#: ../../include/widgets.php:520
+msgid "Export channel"
+msgstr "Exportar canal"
 
-#: ../../include/acl_selectors.php:242
-msgid "Don't show"
-msgstr "No mostrar"
+#: ../../include/widgets.php:529 ../../mod/connedit.php:657
+msgid "Connection Default Permissions"
+msgstr "Permisos predeterminados de conexión"
 
-#: ../../include/acl_selectors.php:248 ../../mod/events.php:691
-#: ../../mod/photos.php:571 ../../mod/photos.php:934 ../../mod/chat.php:209
-#: ../../mod/filestorage.php:147
-msgid "Permissions"
-msgstr "Permisos"
+#: ../../include/widgets.php:537
+msgid "Premium Channel Settings"
+msgstr "Configuración del canal premium"
 
-#: ../../include/attach.php:242 ../../include/attach.php:300
-msgid "Item was not found."
-msgstr "Elemento no encontrado."
+#: ../../include/widgets.php:567
+msgid "Private Mail Menu"
+msgstr "Menú de correo privado"
 
-#: ../../include/attach.php:363
-msgid "No source file."
-msgstr "Ningún fichero de origen"
+#: ../../include/widgets.php:569
+msgid "Combined View"
+msgstr "Vista combinada"
 
-#: ../../include/attach.php:381
-msgid "Cannot locate file to replace"
-msgstr "No se puede localizar el fichero que va a ser sustituido."
+#: ../../include/widgets.php:574 ../../include/nav.php:191
+msgid "Inbox"
+msgstr "Bandeja de entrada"
 
-#: ../../include/attach.php:399
-msgid "Cannot locate file to revise/update"
-msgstr "No se puede localizar el fichero para revisar/actualizar"
+#: ../../include/widgets.php:579 ../../include/nav.php:192
+msgid "Outbox"
+msgstr "Bandeja de salida"
 
-#: ../../include/attach.php:410
-#, php-format
-msgid "File exceeds size limit of %d"
-msgstr "El fichero supera el limite de tamaño de %d"
+#: ../../include/widgets.php:584 ../../include/nav.php:193
+msgid "New Message"
+msgstr "Nuevo mensaje"
 
-#: ../../include/attach.php:422
-#, php-format
-msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
-msgstr "Ha alcanzado su límite de %1$.0f Mbytes de almacenamiento de adjuntos."
+#: ../../include/widgets.php:603 ../../include/widgets.php:615
+msgid "Conversations"
+msgstr "Conversaciones"
 
-#: ../../include/attach.php:505
-msgid "File upload failed. Possible system limit or action terminated."
-msgstr "Error de carga, posiblemente por limite de sistema o porque la acción ha finalizado."
+#: ../../include/widgets.php:607
+msgid "Received Messages"
+msgstr "Mensajes recibidos"
 
-#: ../../include/attach.php:517
-msgid "Stored file could not be verified. Upload failed."
-msgstr "El fichero almacenado no ha podido ser verificado. El envío ha fallado."
+#: ../../include/widgets.php:611
+msgid "Sent Messages"
+msgstr "Enviar mensajes"
 
-#: ../../include/attach.php:561 ../../include/attach.php:578
-msgid "Path not available."
-msgstr "Ruta no disponible."
+#: ../../include/widgets.php:625
+msgid "No messages."
+msgstr "Sin mensajes."
 
-#: ../../include/attach.php:623
-msgid "Empty pathname"
-msgstr "Ruta vacía"
+#: ../../include/widgets.php:643
+msgid "Delete conversation"
+msgstr "Eliminar conversación"
 
-#: ../../include/attach.php:639
-msgid "duplicate filename or path"
-msgstr "Nombre de ruta o fichero duplicados"
+#: ../../include/widgets.php:645
+msgid "D, d M Y - g:i A"
+msgstr "D d M Y - G:i"
 
-#: ../../include/attach.php:663
-msgid "Path not found."
-msgstr "Ruta no encontrada"
+#: ../../include/widgets.php:734
+msgid "Chat Rooms"
+msgstr "Salas de chat"
 
-#: ../../include/attach.php:714
-msgid "mkdir failed."
-msgstr "mkdir ha fallado."
+#: ../../include/widgets.php:754
+msgid "Bookmarked Chatrooms"
+msgstr "Salas de chat preferidas"
 
-#: ../../include/attach.php:718
-msgid "database storage failed."
-msgstr "el almacenamiento en la base de datos ha fallado."
+#: ../../include/widgets.php:774
+msgid "Suggested Chatrooms"
+msgstr "Salas de chat sugeridas"
 
-#: ../../include/identity.php:33
-msgid "Unable to obtain identity information from database"
-msgstr "No ha sido posible obtener los datos de identidad desde la base de datos"
+#: ../../include/widgets.php:901 ../../include/widgets.php:959
+msgid "photo/image"
+msgstr "foto/imagen"
 
-#: ../../include/identity.php:67
-msgid "Empty name"
-msgstr "Nombre vacío"
+#: ../../include/widgets.php:1054 ../../include/widgets.php:1056
+msgid "Rate Me"
+msgstr "Valorar este canal"
 
-#: ../../include/identity.php:70
-msgid "Name too long"
-msgstr "Nombre demasiado largo"
+#: ../../include/widgets.php:1060
+msgid "View Ratings"
+msgstr "Mostrar las valoraciones"
 
-#: ../../include/identity.php:186
-msgid "No account identifier"
-msgstr "Ningún identificador de la cuenta"
+#: ../../include/widgets.php:1071
+msgid "Public Hubs"
+msgstr "Servidores públicos"
 
-#: ../../include/identity.php:198
-msgid "Nickname is required."
-msgstr "Se requiere un sobrenombre (alias)."
+#: ../../include/widgets.php:1119
+msgid "Forums"
+msgstr "Foros"
 
-#: ../../include/identity.php:212
-msgid "Reserved nickname. Please choose another."
-msgstr "Sobrenombre en uso. Por favor, elija otro."
+#: ../../include/widgets.php:1146
+msgid "Tasks"
+msgstr "Actividad"
 
-#: ../../include/identity.php:217 ../../include/dimport.php:34
-msgid ""
-"Nickname has unsupported characters or is already being used on this site."
-msgstr "El alias contiene caracteres no admitidos o está ya en uso por otros usuarios de este sitio."
+#: ../../include/widgets.php:1155
+msgid "Documentation"
+msgstr "Documentación"
 
-#: ../../include/identity.php:292
-msgid "Unable to retrieve created identity"
-msgstr "No ha sido posible recuperar la identidad creada"
+#: ../../include/widgets.php:1157
+msgid "Project/Site Information"
+msgstr "Información sobre el proyecto o sitio"
 
-#: ../../include/identity.php:350
-msgid "Default Profile"
-msgstr "Perfil principal"
+#: ../../include/widgets.php:1158
+msgid "For Members"
+msgstr "Para los usuarios"
 
-#: ../../include/identity.php:736
-msgid "Requested channel is not available."
-msgstr "El canal solicitado no está disponible."
+#: ../../include/widgets.php:1159
+msgid "For Administrators"
+msgstr "Para los administradores"
 
-#: ../../include/identity.php:783 ../../mod/profile.php:16
-#: ../../mod/achievements.php:11 ../../mod/webpages.php:29
-#: ../../mod/connect.php:13 ../../mod/hcard.php:8 ../../mod/blocks.php:29
-#: ../../mod/editlayout.php:27 ../../mod/editwebpage.php:28
-#: ../../mod/editblock.php:29 ../../mod/filestorage.php:54
-#: ../../mod/layouts.php:29
-msgid "Requested profile is not available."
-msgstr "El perfil solicitado no está disponible."
+#: ../../include/widgets.php:1160
+msgid "For Developers"
+msgstr "Para los desarrolladores"
 
-#: ../../include/identity.php:946 ../../mod/profiles.php:774
-msgid "Change profile photo"
-msgstr "Cambiar foto de perfil"
+#: ../../include/widgets.php:1185 ../../mod/admin.php:410
+msgid "Site"
+msgstr "Sitio"
 
-#: ../../include/identity.php:952
-msgid "Profiles"
-msgstr "Perfiles"
+#: ../../include/widgets.php:1186
+msgid "Accounts"
+msgstr "Cuentas"
 
-#: ../../include/identity.php:952
-msgid "Manage/edit profiles"
-msgstr "Administrar/editar perfiles"
+#: ../../include/widgets.php:1187 ../../mod/admin.php:939
+msgid "Channels"
+msgstr "Canales"
 
-#: ../../include/identity.php:953 ../../mod/profiles.php:775
-msgid "Create New Profile"
-msgstr "Crear nuevo perfil"
+#: ../../include/widgets.php:1188 ../../mod/admin.php:1031
+#: ../../mod/admin.php:1071
+msgid "Plugins"
+msgstr "Extensiones"
 
-#: ../../include/identity.php:968 ../../mod/profiles.php:786
-msgid "Profile Image"
-msgstr "Imagen de perfil"
+#: ../../include/widgets.php:1189 ../../mod/admin.php:1231
+#: ../../mod/admin.php:1265
+msgid "Themes"
+msgstr "Temas"
 
-#: ../../include/identity.php:971
-msgid "visible to everybody"
-msgstr "visible para cualquiera"
+#: ../../include/widgets.php:1190
+msgid "Inspect queue"
+msgstr "Examinar la cola"
 
-#: ../../include/identity.php:972 ../../mod/profiles.php:669
-#: ../../mod/profiles.php:790
-msgid "Edit visibility"
-msgstr "Editar visibilidad"
+#: ../../include/widgets.php:1191
+msgid "Profile Config"
+msgstr "Ajustes del perfil"
 
-#: ../../include/identity.php:988 ../../include/identity.php:1227
-msgid "Gender:"
-msgstr "Género:"
+#: ../../include/widgets.php:1192
+msgid "DB updates"
+msgstr "Actualizaciones de la base de datos"
 
-#: ../../include/identity.php:989 ../../include/identity.php:1271
-msgid "Status:"
-msgstr "Estado:"
+#: ../../include/widgets.php:1210 ../../include/widgets.php:1216
+#: ../../mod/admin.php:1350
+msgid "Logs"
+msgstr "Informes"
 
-#: ../../include/identity.php:990 ../../include/identity.php:1282
-msgid "Homepage:"
-msgstr "Página personal:"
+#: ../../include/widgets.php:1214 ../../include/nav.php:210
+msgid "Admin"
+msgstr "Administrador"
 
-#: ../../include/identity.php:991
-msgid "Online Now"
-msgstr "Ahora en línea"
+#: ../../include/widgets.php:1215
+msgid "Plugin Features"
+msgstr "Ajustes de la extensión"
 
-#: ../../include/identity.php:1074 ../../include/identity.php:1152
-#: ../../mod/ping.php:324
-msgid "g A l F d"
-msgstr "g A l d F"
+#: ../../include/widgets.php:1217
+msgid "User registrations waiting for confirmation"
+msgstr "Registros de usuarios pendientes de confirmación"
 
-#: ../../include/identity.php:1075 ../../include/identity.php:1153
-msgid "F d"
-msgstr "d F"
+#: ../../include/nav.php:82 ../../include/nav.php:114 ../../boot.php:1502
+msgid "Logout"
+msgstr "Finalizar sesión"
 
-#: ../../include/identity.php:1120 ../../include/identity.php:1192
-#: ../../mod/ping.php:346
-msgid "[today]"
-msgstr "[hoy]"
+#: ../../include/nav.php:82 ../../include/nav.php:114
+msgid "End this session"
+msgstr "Finalizar esta sesión"
 
-#: ../../include/identity.php:1131
-msgid "Birthday Reminders"
-msgstr "Recordatorios de cumpleaños"
+#: ../../include/nav.php:85 ../../include/nav.php:145
+msgid "Home"
+msgstr "Inicio"
 
-#: ../../include/identity.php:1132
-msgid "Birthdays this week:"
-msgstr "Cumpleaños esta semana:"
+#: ../../include/nav.php:85
+msgid "Your posts and conversations"
+msgstr "Sus entradas y conversaciones"
 
-#: ../../include/identity.php:1185
-msgid "[No description]"
-msgstr "[Sin descripción]"
+#: ../../include/nav.php:86
+msgid "Your profile page"
+msgstr "Su página del perfil"
 
-#: ../../include/identity.php:1203
-msgid "Event Reminders"
-msgstr "Recordatorios de eventos"
+#: ../../include/nav.php:88
+msgid "Edit Profiles"
+msgstr "Editar perfiles"
 
-#: ../../include/identity.php:1204
-msgid "Events this week:"
-msgstr "Eventos de esta semana:"
+#: ../../include/nav.php:88
+msgid "Manage/Edit profiles"
+msgstr "Administrar/editar perfiles"
 
-#: ../../include/identity.php:1217 ../../include/identity.php:1334
-#: ../../include/apps.php:138 ../../mod/profperm.php:112
-msgid "Profile"
-msgstr "Perfil"
+#: ../../include/nav.php:90
+msgid "Edit your profile"
+msgstr "Editar su perfil"
 
-#: ../../include/identity.php:1225 ../../mod/settings.php:1056
-msgid "Full Name:"
-msgstr "Nombre completo:"
+#: ../../include/nav.php:92
+msgid "Your photos"
+msgstr "Sus fotos"
 
-#: ../../include/identity.php:1232
-msgid "Like this channel"
-msgstr "Me gusta este canal"
+#: ../../include/nav.php:93
+msgid "Your files"
+msgstr "Sus ficheros"
 
-#: ../../include/identity.php:1256
-msgid "j F, Y"
-msgstr "j F Y"
+#: ../../include/nav.php:97
+msgid "Your chatrooms"
+msgstr "Sus salas de chat"
 
-#: ../../include/identity.php:1257
-msgid "j F"
-msgstr "j F"
+#: ../../include/nav.php:103
+msgid "Your bookmarks"
+msgstr "Sus marcadores"
 
-#: ../../include/identity.php:1264
-msgid "Birthday:"
-msgstr "Cumpleaños:"
+#: ../../include/nav.php:107
+msgid "Your webpages"
+msgstr "Sus páginas web"
 
-#: ../../include/identity.php:1268 ../../mod/directory.php:297
-msgid "Age:"
-msgstr "Edad:"
+#: ../../include/nav.php:111
+msgid "Sign in"
+msgstr "Acceder"
 
-#: ../../include/identity.php:1277
+#: ../../include/nav.php:128
 #, php-format
-msgid "for %1$d %2$s"
-msgstr "por %1$d %2$s"
-
-#: ../../include/identity.php:1280 ../../mod/profiles.php:691
-msgid "Sexual Preference:"
-msgstr "Orientación sexual:"
-
-#: ../../include/identity.php:1284 ../../mod/directory.php:313
-#: ../../mod/profiles.php:693
-msgid "Hometown:"
-msgstr "Ciudad de origen:"
-
-#: ../../include/identity.php:1286
-msgid "Tags:"
-msgstr "Etiquetas:"
-
-#: ../../include/identity.php:1288 ../../mod/profiles.php:694
-msgid "Political Views:"
-msgstr "Posición política:"
-
-#: ../../include/identity.php:1290
-msgid "Religion:"
-msgstr "Religión:"
-
-#: ../../include/identity.php:1292 ../../mod/directory.php:315
-msgid "About:"
-msgstr "Sobre mí:"
-
-#: ../../include/identity.php:1294
-msgid "Hobbies/Interests:"
-msgstr "Aficciones/Intereses:"
-
-#: ../../include/identity.php:1296 ../../mod/profiles.php:697
-msgid "Likes:"
-msgstr "Me gusta:"
-
-#: ../../include/identity.php:1298 ../../mod/profiles.php:698
-msgid "Dislikes:"
-msgstr "No me gusta:"
-
-#: ../../include/identity.php:1300
-msgid "Contact information and Social Networks:"
-msgstr "Información de contacto y redes sociales:"
-
-#: ../../include/identity.php:1302
-msgid "My other channels:"
-msgstr "Mis otros canales:"
-
-#: ../../include/identity.php:1304
-msgid "Musical interests:"
-msgstr "Intereses musicales:"
-
-#: ../../include/identity.php:1306
-msgid "Books, literature:"
-msgstr "Libros, literatura:"
-
-#: ../../include/identity.php:1308
-msgid "Television:"
-msgstr "Televisión:"
-
-#: ../../include/identity.php:1310
-msgid "Film/dance/culture/entertainment:"
-msgstr "Cine/danza/cultura/entretenimiento:"
-
-#: ../../include/identity.php:1312
-msgid "Love/Romance:"
-msgstr "Vida sentimental/amorosa:"
-
-#: ../../include/identity.php:1314
-msgid "Work/employment:"
-msgstr "Trabajo:"
-
-#: ../../include/identity.php:1316
-msgid "School/education:"
-msgstr "Estudios:"
-
-#: ../../include/identity.php:1336
-msgid "Like this thing"
-msgstr "Me gusta esto"
-
-#: ../../include/profile_selectors.php:6
-#: ../../include/profile_selectors.php:23 ../../mod/id.php:103
-msgid "Male"
-msgstr "Hombre"
-
-#: ../../include/profile_selectors.php:6
-#: ../../include/profile_selectors.php:23 ../../mod/id.php:105
-msgid "Female"
-msgstr "Mujer"
-
-#: ../../include/profile_selectors.php:6
-msgid "Currently Male"
-msgstr "Actualmente hombre"
-
-#: ../../include/profile_selectors.php:6
-msgid "Currently Female"
-msgstr "Actualmente mujer"
-
-#: ../../include/profile_selectors.php:6
-msgid "Mostly Male"
-msgstr "Generalmente hombre"
-
-#: ../../include/profile_selectors.php:6
-msgid "Mostly Female"
-msgstr "Generalmente mujer"
-
-#: ../../include/profile_selectors.php:6
-msgid "Transgender"
-msgstr "Transgénero"
-
-#: ../../include/profile_selectors.php:6
-msgid "Intersex"
-msgstr "Intersexual"
-
-#: ../../include/profile_selectors.php:6
-msgid "Transsexual"
-msgstr "Transexual"
-
-#: ../../include/profile_selectors.php:6
-msgid "Hermaphrodite"
-msgstr "Hermafrodita"
-
-#: ../../include/profile_selectors.php:6
-msgid "Neuter"
-msgstr "Neutral"
-
-#: ../../include/profile_selectors.php:6
-msgid "Non-specific"
-msgstr "No especificado"
-
-#: ../../include/profile_selectors.php:6
-msgid "Undecided"
-msgstr "Indeciso"
-
-#: ../../include/profile_selectors.php:42
-#: ../../include/profile_selectors.php:61
-msgid "Males"
-msgstr "Hombres"
-
-#: ../../include/profile_selectors.php:42
-#: ../../include/profile_selectors.php:61
-msgid "Females"
-msgstr "Mujeres"
-
-#: ../../include/profile_selectors.php:42
-msgid "Gay"
-msgstr "Gay"
-
-#: ../../include/profile_selectors.php:42
-msgid "Lesbian"
-msgstr "Lesbiana"
-
-#: ../../include/profile_selectors.php:42
-msgid "No Preference"
-msgstr "Sin preferencias"
-
-#: ../../include/profile_selectors.php:42
-msgid "Bisexual"
-msgstr "Bisexual"
-
-#: ../../include/profile_selectors.php:42
-msgid "Autosexual"
-msgstr "Autosexual"
-
-#: ../../include/profile_selectors.php:42
-msgid "Abstinent"
-msgstr "Casto"
-
-#: ../../include/profile_selectors.php:42
-msgid "Virgin"
-msgstr "Virgen"
-
-#: ../../include/profile_selectors.php:42
-msgid "Deviant"
-msgstr "Fuera de lo común"
-
-#: ../../include/profile_selectors.php:42
-msgid "Fetish"
-msgstr "Fetichista"
-
-#: ../../include/profile_selectors.php:42
-msgid "Oodles"
-msgstr "Orgías"
-
-#: ../../include/profile_selectors.php:42
-msgid "Nonsexual"
-msgstr "Asexual"
-
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Single"
-msgstr "Soltero/a"
-
-#: ../../include/profile_selectors.php:80
-msgid "Lonely"
-msgstr "Solo/a"
-
-#: ../../include/profile_selectors.php:80
-msgid "Available"
-msgstr "Disponible"
-
-#: ../../include/profile_selectors.php:80
-msgid "Unavailable"
-msgstr "No disponible"
-
-#: ../../include/profile_selectors.php:80
-msgid "Has crush"
-msgstr "Enamorado/a"
-
-#: ../../include/profile_selectors.php:80
-msgid "Infatuated"
-msgstr "Apasionado"
-
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Dating"
-msgstr "Saliendo con alguien"
-
-#: ../../include/profile_selectors.php:80
-msgid "Unfaithful"
-msgstr "Infiel"
-
-#: ../../include/profile_selectors.php:80
-msgid "Sex Addict"
-msgstr "Con adicción al sexo"
-
-#: ../../include/profile_selectors.php:80
-msgid "Friends/Benefits"
-msgstr "Amistad beneficiosa"
-
-#: ../../include/profile_selectors.php:80
-msgid "Casual"
-msgstr "Casual"
-
-#: ../../include/profile_selectors.php:80
-msgid "Engaged"
-msgstr "Prometido/a"
-
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Married"
-msgstr "Casado/a"
-
-#: ../../include/profile_selectors.php:80
-msgid "Imaginarily married"
-msgstr "Casado/a en sueños"
-
-#: ../../include/profile_selectors.php:80
-msgid "Partners"
-msgstr "Pareja"
-
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Cohabiting"
-msgstr "Cohabitando"
-
-#: ../../include/profile_selectors.php:80
-msgid "Common law"
-msgstr "Matrimonio tradicional"
-
-#: ../../include/profile_selectors.php:80
-msgid "Happy"
-msgstr "Felíz"
-
-#: ../../include/profile_selectors.php:80
-msgid "Not looking"
-msgstr "No estoy buscando"
-
-#: ../../include/profile_selectors.php:80
-msgid "Swinger"
-msgstr "Infiel"
-
-#: ../../include/profile_selectors.php:80
-msgid "Betrayed"
-msgstr "Engañado/a"
-
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Separated"
-msgstr "Separado/a"
-
-#: ../../include/profile_selectors.php:80
-msgid "Unstable"
-msgstr "Inestable"
-
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Divorced"
-msgstr "Divorciado/a"
-
-#: ../../include/profile_selectors.php:80
-msgid "Imaginarily divorced"
-msgstr "Divorciado/a en sueños"
-
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Widowed"
-msgstr "Viudo/a"
-
-#: ../../include/profile_selectors.php:80
-msgid "Uncertain"
-msgstr "Indeterminado"
-
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "It's complicated"
-msgstr "Es complicado"
-
-#: ../../include/profile_selectors.php:80
-msgid "Don't care"
-msgstr "No me importa"
-
-#: ../../include/profile_selectors.php:80
-msgid "Ask me"
-msgstr "Pregúnteme"
-
-#: ../../include/apps.php:128
-msgid "Site Admin"
-msgstr "Adminstrador del sitio"
-
-#: ../../include/apps.php:130
-msgid "Address Book"
-msgstr "Libreta de direcciones"
-
-#: ../../include/apps.php:144 ../../mod/mood.php:130
-msgid "Mood"
-msgstr "Estado de ánimo"
+msgid "%s - click to logout"
+msgstr "%s - pulsar para finalizar sesión"
 
-#: ../../include/apps.php:148
-msgid "Probe"
-msgstr "Probar"
+#: ../../include/nav.php:131
+msgid "Remote authentication"
+msgstr "Acceder desde su servidor"
 
-#: ../../include/apps.php:149
-msgid "Suggest"
-msgstr "Sugerir"
+#: ../../include/nav.php:131
+msgid "Click to authenticate to your home hub"
+msgstr "Pulsar para identificarse en su servidor de inicio"
 
-#: ../../include/apps.php:150
-msgid "Random Channel"
-msgstr "Canal aleatorio"
+#: ../../include/nav.php:145
+msgid "Home Page"
+msgstr "Página de inicio"
 
-#: ../../include/apps.php:151
-msgid "Invite"
-msgstr "Invitar"
+#: ../../include/nav.php:149 ../../mod/register.php:224 ../../boot.php:1479
+msgid "Register"
+msgstr "Registrarse"
 
-#: ../../include/apps.php:152
-msgid "Features"
-msgstr "Características"
+#: ../../include/nav.php:149
+msgid "Create an account"
+msgstr "Crear una cuenta"
 
-#: ../../include/apps.php:153 ../../mod/id.php:28
-msgid "Language"
-msgstr "Idioma"
+#: ../../include/nav.php:154
+msgid "Help and documentation"
+msgstr "Ayuda y documentación"
 
-#: ../../include/apps.php:154
-msgid "Post"
-msgstr "Publicación"
+#: ../../include/nav.php:157
+msgid "Applications, utilities, links, games"
+msgstr "Aplicaciones, utilidades, enlaces, juegos"
 
-#: ../../include/apps.php:155 ../../mod/id.php:17 ../../mod/id.php:18
-#: ../../mod/id.php:19
-msgid "Profile Photo"
-msgstr "Foto de perfil"
+#: ../../include/nav.php:159
+msgid "Search site @name, #tag, ?docs, content"
+msgstr "Buscar en el sitio por @nombre, #etiqueta, ?ayuda o contenido"
 
-#: ../../include/apps.php:247 ../../mod/settings.php:84
-#: ../../mod/settings.php:614
-msgid "Update"
-msgstr "Actualizar"
+#: ../../include/nav.php:162
+msgid "Channel Directory"
+msgstr "Directorio de canales"
 
-#: ../../include/apps.php:247
-msgid "Install"
-msgstr "Instalar"
+#: ../../include/nav.php:174
+msgid "Your grid"
+msgstr "Mi red"
 
-#: ../../include/apps.php:252
-msgid "Purchase"
-msgstr "Comprar"
+#: ../../include/nav.php:175
+msgid "Mark all grid notifications seen"
+msgstr "Marcar todas las notificaciones de la red como vistas"
 
-#: ../../include/bbcode.php:122 ../../include/bbcode.php:768
-#: ../../include/bbcode.php:771 ../../include/bbcode.php:776
-#: ../../include/bbcode.php:779 ../../include/bbcode.php:782
-#: ../../include/bbcode.php:785 ../../include/bbcode.php:790
-#: ../../include/bbcode.php:793 ../../include/bbcode.php:798
-#: ../../include/bbcode.php:801 ../../include/bbcode.php:804
-#: ../../include/bbcode.php:807
-msgid "Image/photo"
-msgstr "Imagen/foto"
+#: ../../include/nav.php:177
+msgid "Channel home"
+msgstr "Mi canal"
 
-#: ../../include/bbcode.php:161 ../../include/bbcode.php:818
-msgid "Encrypted content"
-msgstr "Contenido cifrado"
+#: ../../include/nav.php:178
+msgid "Mark all channel notifications seen"
+msgstr "Marcar todas las notificaciones del canal como leídas"
 
-#: ../../include/bbcode.php:178
-#, php-format
-msgid "Install %s element: "
-msgstr "Instalar el elemento %s:"
+#: ../../include/nav.php:181 ../../mod/connections.php:260
+msgid "Connections"
+msgstr "Conexiones"
 
-#: ../../include/bbcode.php:182
-#, php-format
-msgid ""
-"This post contains an installable %s element, however you lack permissions "
-"to install it on this site."
-msgstr "Esta entrada contiene el elemento instalable %s, sin embargo le faltan permisos para instalarlo en este sitio."
+#: ../../include/nav.php:184
+msgid "Notices"
+msgstr "Avisos"
 
-#: ../../include/bbcode.php:192 ../../mod/impel.php:37
-msgid "webpage"
-msgstr "página web"
+#: ../../include/nav.php:184
+msgid "Notifications"
+msgstr "Notificaciones"
 
-#: ../../include/bbcode.php:195 ../../mod/impel.php:47
-msgid "layout"
-msgstr "disposición"
+#: ../../include/nav.php:185
+msgid "See all notifications"
+msgstr "Ver todas las notificaciones"
 
-#: ../../include/bbcode.php:198 ../../mod/impel.php:42
-msgid "block"
-msgstr "bloque"
+#: ../../include/nav.php:186 ../../mod/notifications.php:99
+msgid "Mark all system notifications seen"
+msgstr "Marcar todas las notificaciones de sistema como leídas"
 
-#: ../../include/bbcode.php:201 ../../mod/impel.php:54
-msgid "menu"
-msgstr "menú"
+#: ../../include/nav.php:188
+msgid "Private mail"
+msgstr "Correo privado"
 
-#: ../../include/bbcode.php:215
-msgid "QR code"
-msgstr "Código QR"
+#: ../../include/nav.php:189
+msgid "See all private messages"
+msgstr "Ver todas los mensajes privados"
 
-#: ../../include/bbcode.php:266
-#, php-format
-msgid "%1$s wrote the following %2$s %3$s"
-msgstr "%1$s escribió la siguiente %2$s %3$s"
+#: ../../include/nav.php:190
+msgid "Mark all private messages seen"
+msgstr "Marcar todos los mensajes privados como leídos"
 
-#: ../../include/bbcode.php:268 ../../mod/tagger.php:51
-msgid "post"
-msgstr "entrada"
+#: ../../include/nav.php:196
+msgid "Event Calendar"
+msgstr "Calendario de eventos"
 
-#: ../../include/bbcode.php:518
-msgid "Different viewers will see this text differently"
-msgstr "Visitantes diferentes verán este texto de forma diferente"
+#: ../../include/nav.php:197
+msgid "See all events"
+msgstr "Ver todos los eventos"
 
-#: ../../include/bbcode.php:729
-msgid "$1 spoiler"
-msgstr "$1 spoiler"
+#: ../../include/nav.php:198
+msgid "Mark all events seen"
+msgstr "Marcar todos los eventos como leidos"
 
-#: ../../include/bbcode.php:756
-msgid "$1 wrote:"
-msgstr "$1 escribió"
+#: ../../include/nav.php:200
+msgid "Manage Your Channels"
+msgstr "Gestionar sus canales"
 
-#: ../../include/chat.php:23
-msgid "Missing room name"
-msgstr "Nombre de sala desaparecido."
+#: ../../include/nav.php:202
+msgid "Account/Channel Settings"
+msgstr "Ajustes de cuenta/canales"
 
-#: ../../include/chat.php:32
-msgid "Duplicate room name"
-msgstr "Nombre de sala duplicado."
+#: ../../include/nav.php:210
+msgid "Site Setup and Configuration"
+msgstr "Ajustes y configuración del sitio"
 
-#: ../../include/chat.php:82 ../../include/chat.php:90
-msgid "Invalid room specifier."
-msgstr "Especificador de sala no válido."
+#: ../../include/nav.php:246
+msgid "@name, #tag, ?doc, content"
+msgstr "@nombre, #etiqueta, ?ayuda, contenido"
 
-#: ../../include/chat.php:120
-msgid "Room not found."
-msgstr "Sala no encontrada."
+#: ../../include/nav.php:247
+msgid "Please wait..."
+msgstr "Espere por favor…"
 
-#: ../../include/chat.php:141
-msgid "Room is full"
-msgstr "La sala está llena."
+#: ../../include/dir_fns.php:126
+msgid "Directory Options"
+msgstr "Opciones del directorio"
 
-#: ../../include/photos.php:94
-#, php-format
-msgid "Image exceeds website size limit of %lu bytes"
-msgstr "La imagen es demasiado grande (%lu demás)"
+#: ../../include/dir_fns.php:128
+msgid "Safe Mode"
+msgstr "Modo seguro"
 
-#: ../../include/photos.php:101
-msgid "Image file is empty."
-msgstr "El fichero de imagen está vacío. "
+#: ../../include/dir_fns.php:128 ../../include/dir_fns.php:129
+#: ../../include/dir_fns.php:130 ../../mod/removeme.php:60
+#: ../../mod/mitem.php:154 ../../mod/mitem.php:155 ../../mod/mitem.php:228
+#: ../../mod/mitem.php:229 ../../mod/connedit.php:630
+#: ../../mod/connedit.php:658 ../../mod/photos.php:625
+#: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159
+#: ../../mod/admin.php:386 ../../mod/menu.php:96 ../../mod/menu.php:153
+#: ../../mod/settings.php:574 ../../mod/api.php:106
+#: ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1507
+msgid "No"
+msgstr "No"
 
-#: ../../include/photos.php:128 ../../mod/profile_photo.php:217
-msgid "Unable to process image"
-msgstr "No ha sido posible procesar la imagen"
+#: ../../include/dir_fns.php:128 ../../include/dir_fns.php:129
+#: ../../include/dir_fns.php:130 ../../mod/removeme.php:60
+#: ../../mod/mitem.php:154 ../../mod/mitem.php:155 ../../mod/mitem.php:228
+#: ../../mod/mitem.php:229 ../../mod/photos.php:625
+#: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159
+#: ../../mod/admin.php:388 ../../mod/menu.php:96 ../../mod/menu.php:153
+#: ../../mod/settings.php:574 ../../mod/api.php:105
+#: ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1507
+msgid "Yes"
+msgstr "Sí"
 
-#: ../../include/photos.php:199
-msgid "Photo storage failed."
-msgstr "La foto no ha podido ser guardada."
+#: ../../include/dir_fns.php:129
+msgid "Public Forums Only"
+msgstr "Solo foros públicos"
 
-#: ../../include/photos.php:363
-msgid "Upload New Photos"
-msgstr "Subir nuevas fotos"
+#: ../../include/dir_fns.php:130
+msgid "This Website Only"
+msgstr "Solo este sitio web"
 
 #: ../../mod/achievements.php:34
 msgid "Some blurb about what to do when you're new here"
-msgstr "Algunas propuestas para el nuevo usuario sobre qué se puede hacer  aquí"
-
-#: ../../mod/manage.php:136
-#, php-format
-msgid "You have created %1$.0f of %2$.0f allowed channels."
-msgstr "Ha creado %1$.0f de %2$.0f canales permitidos."
-
-#: ../../mod/manage.php:144
-msgid "Create a new channel"
-msgstr "Crear un nuevo canal"
+msgstr "Algunas propuestas para el nuevo usuario sobre qué se puede hacer aquí"
 
-#: ../../mod/manage.php:167
-msgid "Current Channel"
-msgstr "Canal actual"
-
-#: ../../mod/manage.php:169
-msgid "Switch to one of your channels by selecting it."
-msgstr "Cambiar a uno de sus canales seleccionándolo."
-
-#: ../../mod/manage.php:170
-msgid "Default Channel"
-msgstr "Canal principal"
+#: ../../mod/fsuggest.php:20 ../../mod/fsuggest.php:92
+msgid "Contact not found."
+msgstr "Contacto no encontrado"
 
-#: ../../mod/manage.php:171
-msgid "Make Default"
-msgstr "Convertir en predeterminado"
+#: ../../mod/fsuggest.php:63
+msgid "Friend suggestion sent."
+msgstr "Enviar sugerencia a un amigo."
 
-#: ../../mod/manage.php:174
-#, php-format
-msgid "%d new messages"
-msgstr "%d mensajes nuevos"
+#: ../../mod/fsuggest.php:97
+msgid "Suggest Friends"
+msgstr "Sugerir amigos"
 
-#: ../../mod/manage.php:175
+#: ../../mod/fsuggest.php:99
 #, php-format
-msgid "%d new introductions"
-msgstr "%d nuevas isolicitudes de conexión"
-
-#: ../../mod/manage.php:177
-msgid "Delegated Channels"
-msgstr "Canales delegados"
+msgid "Suggest a friend for %s"
+msgstr "Sugerir un amigo a %s"
 
-#: ../../mod/directory.php:59 ../../mod/photos.php:441 ../../mod/search.php:13
-#: ../../mod/ratings.php:82 ../../mod/viewconnections.php:17
-#: ../../mod/display.php:13
+#: ../../mod/directory.php:59 ../../mod/display.php:13
+#: ../../mod/photos.php:489 ../../mod/search.php:13 ../../mod/ratings.php:82
+#: ../../mod/viewconnections.php:17
 msgid "Public access denied."
 msgstr "Acceso público denegado."
 
@@ -3997,7 +4199,7 @@ msgstr "Estado:"
 msgid "Homepage: "
 msgstr "Página personal:"
 
-#: ../../mod/directory.php:308 ../../mod/events.php:682
+#: ../../mod/directory.php:308 ../../mod/events.php:699
 msgid "Description:"
 msgstr "Descripción:"
 
@@ -4061,257 +4263,107 @@ msgstr "De más antiguo a más nuevo"
 msgid "No entries (some entries may be hidden)."
 msgstr "Sin entradas (algunas entradas pueden estar ocultas)."
 
-#: ../../mod/xchan.php:6
-msgid "Xchan Lookup"
-msgstr "Búsqueda de canales"
-
-#: ../../mod/xchan.php:9
-msgid "Lookup xchan beginning with (or webbie): "
-msgstr "Buscar un canal (o un \"webbie\") que comience por:"
-
-#: ../../mod/xchan.php:37 ../../mod/mitem.php:116 ../../mod/menu.php:160
-msgid "Not found."
-msgstr "No encontrado."
-
-#: ../../mod/api.php:76 ../../mod/api.php:102
-msgid "Authorize application connection"
-msgstr "Autorizar una conexión de aplicación"
-
-#: ../../mod/api.php:77
-msgid "Return to your app and insert this Securty Code:"
-msgstr "Volver a su aplicación e introducir este código de seguridad:"
-
-#: ../../mod/api.php:89
-msgid "Please login to continue."
-msgstr "Por favor inicia sesión para continuar."
-
-#: ../../mod/api.php:104
-msgid ""
-"Do you want to authorize this application to access your posts and contacts,"
-" and/or create new posts for you?"
-msgstr "¿Desea autorizar a esta aplicación a acceder a sus publicaciones y contactos, y/o crear nuevas publicaciones por usted?"
-
-#: ../../mod/webpages.php:191
-msgid "Page Title"
-msgstr "Título de página"
-
-#: ../../mod/follow.php:25
-msgid "Channel added."
-msgstr "Canal añadido."
-
-#: ../../mod/tagrm.php:44 ../../mod/tagrm.php:94
-msgid "Tag removed"
-msgstr "Etiqueta eliminada."
-
-#: ../../mod/tagrm.php:119
-msgid "Remove Item Tag"
-msgstr "Eliminar etiqueta del elemento."
-
-#: ../../mod/tagrm.php:121
-msgid "Select a tag to remove: "
-msgstr "Seleccionar una etiqueta para eliminar:"
-
-#: ../../mod/tagrm.php:133 ../../mod/photos.php:887
-msgid "Remove"
-msgstr "Eliminar"
-
-#: ../../mod/connect.php:56 ../../mod/connect.php:104
-msgid "Continue"
-msgstr "Continuar"
-
-#: ../../mod/connect.php:85
-msgid "Premium Channel Setup"
-msgstr "Configuración del canal premium"
-
-#: ../../mod/connect.php:87
-msgid "Enable premium channel connection restrictions"
-msgstr "Habilitar restricciones de conexión del canal premium"
-
-#: ../../mod/connect.php:88
-msgid ""
-"Please enter your restrictions or conditions, such as paypal receipt, usage "
-"guidelines, etc."
-msgstr "Por favor introduzca sus restricciones o condiciones, como recibo paypal, normas de uso, etc."
-
-#: ../../mod/connect.php:90 ../../mod/connect.php:110
-msgid ""
-"This channel may require additional steps or acknowledgement of the "
-"following conditions prior to connecting:"
-msgstr "Este canal puede requerir antes de conectar unos pasos adicionales o el conocimiento de las siguientes condiciones:"
-
-#: ../../mod/connect.php:91
-msgid ""
-"Potential connections will then see the following text before proceeding:"
-msgstr "Las posibles conexiones verán por tanto el siguiente texto antes de proceder:"
-
-#: ../../mod/connect.php:92 ../../mod/connect.php:113
-msgid ""
-"By continuing, I certify that I have complied with any instructions provided"
-" on this page."
-msgstr "Al continuar, certifico que he cumplido con todas las intrucciones proporcionadas en esta página."
-
-#: ../../mod/connect.php:101
-msgid "(No specific instructions have been provided by the channel owner.)"
-msgstr "(No ha sido proporcionada ninguna instrucción específica por el propietario del canal.)"
-
-#: ../../mod/connect.php:109
-msgid "Restricted or Premium Channel"
-msgstr "Canal premium o restringido"
-
-#: ../../mod/thing.php:94
-msgid "Thing updated"
-msgstr "Elemento actualizado."
-
-#: ../../mod/thing.php:167
-msgid "Object store: failed"
-msgstr "Guardar objeto: ha fallado"
-
-#: ../../mod/thing.php:171
-msgid "Thing added"
-msgstr "Elemento añadido"
-
-#: ../../mod/thing.php:203
-#, php-format
-msgid "OBJ: %1$s %2$s %3$s"
-msgstr "OBJ: %1$s %2$s %3$s"
-
-#: ../../mod/thing.php:254
-msgid "Show Thing"
-msgstr "Mostrar elemento"
-
-#: ../../mod/thing.php:261
-msgid "item not found."
-msgstr "elemento no encontrado."
-
-#: ../../mod/thing.php:289
-msgid "Edit Thing"
-msgstr "Editar elemento"
-
-#: ../../mod/thing.php:291 ../../mod/thing.php:338
-msgid "Select a profile"
-msgstr "Seleccionar un perfil"
-
-#: ../../mod/thing.php:295 ../../mod/thing.php:341
-msgid "Post an activity"
-msgstr "Publicar una actividad"
-
-#: ../../mod/thing.php:295 ../../mod/thing.php:341
-msgid "Only sends to viewers of the applicable profile"
-msgstr "Sólo envíos a espectadores del perfil pertinente."
-
-#: ../../mod/thing.php:297 ../../mod/thing.php:343
-msgid "Name of thing e.g. something"
-msgstr "Nombre del elemento p. ej.:. \"algo\""
-
-#: ../../mod/thing.php:299 ../../mod/thing.php:344
-msgid "URL of thing (optional)"
-msgstr "Dirección del elemento (opcional)"
+#: ../../mod/bookmarks.php:40
+msgid "Bookmark added"
+msgstr "Marcador añadido"
 
-#: ../../mod/thing.php:301 ../../mod/thing.php:345
-msgid "URL for photo of thing (optional)"
-msgstr "Dirección para la foto o elemento (opcional)"
+#: ../../mod/bookmarks.php:62
+msgid "My Bookmarks"
+msgstr "Mis Marcadores"
 
-#: ../../mod/thing.php:336
-msgid "Add Thing to your Profile"
-msgstr "Añadir elemento a su perfil"
+#: ../../mod/bookmarks.php:73
+msgid "My Connections Bookmarks"
+msgstr "Marcadores de mis conexiones"
 
-#: ../../mod/attach.php:9
-msgid "Item not available."
-msgstr "Elemento no disponible"
+#: ../../mod/openid.php:26
+msgid "OpenID protocol error. No ID returned."
+msgstr "Error del protocolo OpenID. Ningún ID recibido como respuesta."
 
-#: ../../mod/probe.php:24 ../../mod/probe.php:30
+#: ../../mod/openid.php:72 ../../mod/openid.php:179 ../../mod/post.php:285
 #, php-format
-msgid "Fetching URL returns error: %1$s"
-msgstr "Al intentar obtener la dirección, retorna el error: %1$s"
-
-#: ../../mod/profile_photo.php:108
-msgid "Image uploaded but image cropping failed."
-msgstr "Imagen actualizada, pero el recorte de la imagen ha fallado. "
+msgid "Welcome %s. Remote authentication successful."
+msgstr "Bienvenido %s. La identificación desde su servidor se ha llevado a cabo correctamente."
 
-#: ../../mod/profile_photo.php:162
-msgid "Image resize failed."
-msgstr "El ajuste del tamaño de la imagen ha fallado."
+#: ../../mod/block.php:27 ../../mod/page.php:36
+msgid "Invalid item."
+msgstr "Elemento no válido."
 
-#: ../../mod/profile_photo.php:206
-msgid ""
-"Shift-reload the page or clear browser cache if the new photo does not "
-"display immediately."
-msgstr "Recargue la página o limpie el caché del navegador si la nueva foto no se muestra inmediatamente."
+#: ../../mod/block.php:39 ../../mod/page.php:52 ../../mod/wall_upload.php:29
+msgid "Channel not found."
+msgstr "Canal no encontrado."
 
-#: ../../mod/profile_photo.php:233
-#, php-format
-msgid "Image exceeds size limit of %d"
-msgstr "La imagen supera el tamaño límite de %d"
+#: ../../mod/block.php:75 ../../mod/display.php:110 ../../mod/help.php:214
+#: ../../mod/page.php:89 ../../index.php:237
+msgid "Page not found."
+msgstr "Página no encontrada."
 
-#: ../../mod/profile_photo.php:242
-msgid "Unable to process image."
-msgstr "No ha sido posible procesar la imagen."
+#: ../../mod/id.php:11
+msgid "First Name"
+msgstr "Nombre"
 
-#: ../../mod/profile_photo.php:291 ../../mod/profile_photo.php:340
-msgid "Photo not available."
-msgstr "Foto no disponible."
+#: ../../mod/id.php:12
+msgid "Last Name"
+msgstr "Apellido"
 
-#: ../../mod/profile_photo.php:359
-msgid "Upload File:"
-msgstr "Subir fichero:"
+#: ../../mod/id.php:13
+msgid "Nickname"
+msgstr "Sobrenombre o Alias"
 
-#: ../../mod/profile_photo.php:360
-msgid "Select a profile:"
-msgstr "Seleccionar un perfil:"
+#: ../../mod/id.php:14
+msgid "Full Name"
+msgstr "Nombre completo"
 
-#: ../../mod/profile_photo.php:361
-msgid "Upload Profile Photo"
-msgstr "Subir foto de perfil"
+#: ../../mod/id.php:20
+msgid "Profile Photo 16px"
+msgstr "Foto del perfil 16px"
 
-#: ../../mod/profile_photo.php:366 ../../mod/settings.php:995
-msgid "or"
-msgstr "o"
+#: ../../mod/id.php:21
+msgid "Profile Photo 32px"
+msgstr "Foto del perfil 32px"
 
-#: ../../mod/profile_photo.php:366
-msgid "skip this step"
-msgstr "Omitir este paso"
+#: ../../mod/id.php:22
+msgid "Profile Photo 48px"
+msgstr "Foto del perfil 48px"
 
-#: ../../mod/profile_photo.php:366
-msgid "select a photo from your photo albums"
-msgstr "Seleccione una foto de sus álbumes de fotos"
+#: ../../mod/id.php:23
+msgid "Profile Photo 64px"
+msgstr "Foto del perfil 64px"
 
-#: ../../mod/profile_photo.php:382
-msgid "Crop Image"
-msgstr "Recortar imagen"
+#: ../../mod/id.php:24
+msgid "Profile Photo 80px"
+msgstr "Foto del perfil 80px"
 
-#: ../../mod/profile_photo.php:383
-msgid "Please adjust the image cropping for optimum viewing."
-msgstr "Por favor ajuste el recorte de la imagen para una visión óptima."
+#: ../../mod/id.php:25
+msgid "Profile Photo 128px"
+msgstr "Foto del perfil 128px"
 
-#: ../../mod/profile_photo.php:385
-msgid "Done Editing"
-msgstr "Edición completada"
+#: ../../mod/id.php:26
+msgid "Timezone"
+msgstr "Zona horaria"
 
-#: ../../mod/profile_photo.php:428
-msgid "Image uploaded successfully."
-msgstr "Imagen subida correctamente."
+#: ../../mod/id.php:27
+msgid "Homepage URL"
+msgstr "Dirección de la página personal"
 
-#: ../../mod/profile_photo.php:430
-msgid "Image upload failed."
-msgstr "Subida de imagen fallida."
+#: ../../mod/id.php:29
+msgid "Birth Year"
+msgstr "Año de nacimiento"
 
-#: ../../mod/profile_photo.php:439
-#, php-format
-msgid "Image size reduction [%s] failed."
-msgstr "La reducción de la imagen [%s] ha fallado."
+#: ../../mod/id.php:30
+msgid "Birth Month"
+msgstr "Mes de nacimiento"
 
-#: ../../mod/block.php:27 ../../mod/page.php:36
-msgid "Invalid item."
-msgstr "Elemento no válido."
+#: ../../mod/id.php:31
+msgid "Birth Day"
+msgstr "Día de nacimiento"
 
-#: ../../mod/block.php:39 ../../mod/wall_upload.php:29 ../../mod/page.php:52
-msgid "Channel not found."
-msgstr "Canal no encontrado."
+#: ../../mod/id.php:32
+msgid "Birthdate"
+msgstr "Fecha de nacimiento"
 
-#: ../../mod/block.php:75 ../../mod/display.php:110 ../../mod/help.php:79
-#: ../../mod/page.php:89 ../../index.php:241
-msgid "Page not found."
-msgstr "Página no encontrada."
+#: ../../mod/id.php:33 ../../mod/profiles.php:431
+msgid "Gender"
+msgstr "Género"
 
 #: ../../mod/like.php:15
 msgid "Like/Dislike"
@@ -4327,392 +4379,130 @@ msgid ""
 "href=\"register\">register as a new $Projectname member</a> to continue."
 msgstr "Por favor, <a href=\"rmagic\">identifíquese con su $Projectname ID</a> o <a href=\"register\">rregístrese como un nuevo $Projectname member</a> para continuar."
 
-#: ../../mod/like.php:101 ../../mod/like.php:128 ../../mod/like.php:166
+#: ../../mod/like.php:101 ../../mod/like.php:127 ../../mod/like.php:165
 msgid "Invalid request."
 msgstr "Solicitud incorrecta."
 
-#: ../../mod/like.php:143
+#: ../../mod/like.php:142
 msgid "thing"
 msgstr "elemento"
 
-#: ../../mod/like.php:189
+#: ../../mod/like.php:188
 msgid "Channel unavailable."
 msgstr "Canal no disponible."
 
-#: ../../mod/like.php:231
+#: ../../mod/like.php:236
 msgid "Previous action reversed."
 msgstr "Acción anterior revocada."
 
-#: ../../mod/like.php:401
+#: ../../mod/like.php:414
 #, php-format
 msgid "%1$s agrees with %2$s's %3$s"
-msgstr "%1$s está de acuerdo con %3$s de %2$s"
+msgstr "%3$s de %2$s: %1$s está de acuerdo"
 
-#: ../../mod/like.php:403
+#: ../../mod/like.php:416
 #, php-format
 msgid "%1$s doesn't agree with %2$s's %3$s"
-msgstr "%1$s no está de acuerdo con %3$s de %2$s"
+msgstr "%3$s de %2$s: %1$s no está de acuerdo"
 
-#: ../../mod/like.php:405
+#: ../../mod/like.php:418
 #, php-format
 msgid "%1$s abstains from a decision on %2$s's %3$s"
-msgstr "%1$s se abstiene en %3$s de %2$s"
+msgstr "%3$s de %2$s: %1$s se abstiene"
 
-#: ../../mod/like.php:407
+#: ../../mod/like.php:420
 #, php-format
 msgid "%1$s is attending %2$s's %3$s"
-msgstr "%1$s participará en el %3$s de %2$s"
+msgstr "%3$s de %2$s: %1$s participa"
 
-#: ../../mod/like.php:409
+#: ../../mod/like.php:422
 #, php-format
 msgid "%1$s is not attending %2$s's %3$s"
-msgstr "%1$s no participará en el %3$s de %2$s"
+msgstr "%3$s de %2$s: %1$s no participa"
 
-#: ../../mod/like.php:411
+#: ../../mod/like.php:424
 #, php-format
 msgid "%1$s may attend %2$s's %3$s"
-msgstr "%1$s tal vez participe en el %3$s de %2$s"
+msgstr "%3$s de %2$s: %1$s quizá participe"
 
-#: ../../mod/like.php:507
+#: ../../mod/like.php:520
 msgid "Action completed."
 msgstr "Acción completada."
 
-#: ../../mod/like.php:508
+#: ../../mod/like.php:521
 msgid "Thank you."
 msgstr "Gracias."
 
-#: ../../mod/events.php:21
-msgid "Calendar entries imported."
-msgstr "Entradas de calendario importadas."
-
-#: ../../mod/events.php:23
-msgid "No calendar entries found."
-msgstr "No encontradas entradas de calendario."
-
-#: ../../mod/events.php:101
-msgid "Event can not end before it has started."
-msgstr "Un evento no puede terminar antes de que haya comenzado."
-
-#: ../../mod/events.php:103 ../../mod/events.php:112 ../../mod/events.php:130
-msgid "Unable to generate preview."
-msgstr "No se puede crear la vista previa."
-
-#: ../../mod/events.php:110
-msgid "Event title and start time are required."
-msgstr "Se requieren el título del evento y su hora de inicio."
-
-#: ../../mod/events.php:128
-msgid "Event not found."
-msgstr "Evento no encontrado."
-
-#: ../../mod/events.php:426
-msgid "l, F j"
-msgstr "l j F"
-
-#: ../../mod/events.php:448
-msgid "Edit event"
-msgstr "Editar evento"
-
-#: ../../mod/events.php:449
-msgid "Delete event"
-msgstr "Borrar evento"
-
-#: ../../mod/events.php:483
-msgid "calendar"
-msgstr "calendario"
-
-#: ../../mod/events.php:504
-msgid "Create New Event"
-msgstr "Crear Nuevo Evento"
-
-#: ../../mod/events.php:505 ../../mod/photos.php:839
-msgid "Previous"
-msgstr "Anterior"
-
-#: ../../mod/events.php:506 ../../mod/photos.php:848 ../../mod/setup.php:281
-msgid "Next"
-msgstr "Siguiente"
-
-#: ../../mod/events.php:507
-msgid "Export"
-msgstr "Exportar"
-
-#: ../../mod/events.php:510
-msgid "Import"
-msgstr "Importar"
-
-#: ../../mod/events.php:541
-msgid "Event removed"
-msgstr "Evento borrado"
-
-#: ../../mod/events.php:544
-msgid "Failed to remove event"
-msgstr "Error al borrar el evento"
-
-#: ../../mod/events.php:664
-msgid "Event details"
-msgstr "Detalles del evento"
-
-#: ../../mod/events.php:665
-msgid "Starting date and Title are required."
-msgstr "Se requieren fecha y título."
-
-#: ../../mod/events.php:667
-msgid "Categories (comma-separated list)"
-msgstr "Categorías (lista separada por comas)"
-
-#: ../../mod/events.php:669
-msgid "Event Starts:"
-msgstr "Inicio del evento:"
-
-#: ../../mod/events.php:676
-msgid "Finish date/time is not known or not relevant"
-msgstr "La fecha / hora de finalización no se conocen o no son relevantes"
-
-#: ../../mod/events.php:678
-msgid "Event Finishes:"
-msgstr "Finalización del evento:"
-
-#: ../../mod/events.php:680 ../../mod/events.php:681
-msgid "Adjust for viewer timezone"
-msgstr "Ajustar para obtener el visor de zona horaria"
+#: ../../mod/uexport.php:51 ../../mod/uexport.php:52
+msgid "Export Channel"
+msgstr "Exportar el canal"
 
-#: ../../mod/events.php:680
+#: ../../mod/uexport.php:53
 msgid ""
-"Important for events that happen in a particular place. Not practical for "
-"global holidays."
-msgstr "Importante para los eventos que suceden en un lugar determinado. No es práctico para los globales."
+"Export your basic channel information to a file.  This acts as a backup of "
+"your connections, permissions, profile and basic data, which can be used to "
+"import your data to a new server hub, but does not contain your content."
+msgstr "Exportar la información básica del canal a un fichero. Este equivale a una copia de seguridad de sus conexiones, el perfil y datos fundamentales, que puede usarse para importar sus datos a un nuevo servidor, pero no incluye su contenido."
 
-#: ../../mod/events.php:686
-msgid "Title:"
-msgstr "Título:"
-
-#: ../../mod/events.php:688
-msgid "Share this event"
-msgstr "Compartir este evento"
-
-#: ../../mod/subthread.php:103
-#, php-format
-msgid "%1$s is following %2$s's %3$s"
-msgstr "%1$s está siguiendo %2$s de %3$s"
-
-#: ../../mod/pubsites.php:16
-msgid "Public Sites"
-msgstr "Sitios públicos"
+#: ../../mod/uexport.php:54
+msgid "Export Content"
+msgstr "Exportar contenidos"
 
-#: ../../mod/pubsites.php:19
+#: ../../mod/uexport.php:55
 msgid ""
-"The listed sites allow public registration for the $Projectname network. All"
-" sites in the network are interlinked so membership on any of them conveys "
-"membership in the network as a whole. Some sites may require subscription or"
-" provide tiered service plans. The provider links <strong>may</strong> "
-"provide additional details."
-msgstr "Los sitios listados permiten el registro público de la red $Projectname. Todos los sitios de la red están vinculados entre sí por lo que sus miembros, en ninguna de ellos, indican la pertenencia a la red en su conjunto. Algunos sitios pueden requerir suscripción o proporcionar planes de servicio por niveles. Los enlaces de los proveedores <strong> pueden </strong> proporcionar detalles adicionales."
-
-#: ../../mod/pubsites.php:25
-msgid "Rate this hub"
-msgstr "Valorar este sitio"
-
-#: ../../mod/pubsites.php:26
-msgid "Site URL"
-msgstr "Dirección del sitio"
-
-#: ../../mod/pubsites.php:26
-msgid "Access Type"
-msgstr "Tipo de Acceso"
-
-#: ../../mod/pubsites.php:26
-msgid "Registration Policy"
-msgstr "Normas de Registro"
-
-#: ../../mod/pubsites.php:26 ../../mod/profiles.php:454
-msgid "Location"
-msgstr "Localización"
-
-#: ../../mod/pubsites.php:26
-msgid "View hub ratings"
-msgstr "Ver las valoraciones del sitio"
-
-#: ../../mod/pubsites.php:30
-msgid "Rate"
-msgstr "Valorar"
-
-#: ../../mod/pubsites.php:31
-msgid "View ratings"
-msgstr "Ver valoraciones"
-
-#: ../../mod/rpost.php:131 ../../mod/editpost.php:158
-msgid "Edit post"
-msgstr "Editar entrada"
-
-#: ../../mod/dav.php:121
-msgid "$Projectname channel"
-msgstr "canal $Projectname"
-
-#: ../../mod/group.php:20
-msgid "Collection created."
-msgstr "Colección creada."
-
-#: ../../mod/group.php:26
-msgid "Could not create collection."
-msgstr "No se puede crear colección."
-
-#: ../../mod/group.php:54
-msgid "Collection updated."
-msgstr "Colección actualizada."
-
-#: ../../mod/group.php:86
-msgid "Create a collection of channels."
-msgstr "Crear una colección de canales."
-
-#: ../../mod/group.php:87 ../../mod/group.php:183
-msgid "Collection Name: "
-msgstr "Nombre de la colección:"
-
-#: ../../mod/group.php:89 ../../mod/group.php:186
-msgid "Members are visible to other channels"
-msgstr "Los miembros son visibles para otros canales"
-
-#: ../../mod/group.php:107
-msgid "Collection removed."
-msgstr "Colección eliminada."
-
-#: ../../mod/group.php:109
-msgid "Unable to remove collection."
-msgstr "No ha sido posible de eliminar la colección."
-
-#: ../../mod/group.php:182
-msgid "Collection Editor"
-msgstr "Editor de colecciones"
-
-#: ../../mod/group.php:196 ../../mod/bulksetclose.php:89
-msgid "Members"
-msgstr "Miembros"
-
-#: ../../mod/group.php:198 ../../mod/bulksetclose.php:91
-msgid "All Connected Channels"
-msgstr "Todos los canales conectados"
-
-#: ../../mod/group.php:233 ../../mod/bulksetclose.php:126
-msgid "Click on a channel to add or remove."
-msgstr "Haga clic en un canal para agregarlo o quitarlo."
+"Export your channel information and recent content to a JSON backup that can"
+" be restored or imported to another server hub. This backs up all of your "
+"connections, permissions, profile data and several months of posts. This "
+"file may be VERY large.  Please be patient - it may take several minutes for"
+" this download to begin."
+msgstr "Exportar la información sobre su canal y el contenido reciente a un fichero de respaldo JSON, que puede ser restaurado o importado a otro servidor. Este fichero incluye todas sus conexiones, permisos, datos del perfil y publicaciones de varios meses. Puede llegar a ser MUY grande. Por favor, sea paciente, la descarga puede tardar varios minutos en comenzar."
+
+#: ../../mod/uexport.php:56
+msgid "Export your posts from a given year."
+msgstr "Exporta sus entradas de un año dado."
+
+#: ../../mod/uexport.php:58
+msgid ""
+"You may also export your posts and conversations for a particular year or "
+"month. Adjust the date in your browser location bar to select other dates. "
+"If the export fails (possibly due to memory exhaustion on your server hub), "
+"please try again selecting a more limited date range."
+msgstr "También puede exportar sus mensajes y conversaciones durante un año o mes en particular. Ajuste la fecha en la barra de direcciones del navegador para seleccionar otras fechas. Si la exportación falla (posiblemente debido al agotamiento de la memoria del servidor hub), por favor, intente de nuevo la selección de un rango de fechas más pequeño."
 
-#: ../../mod/siteinfo.php:112
+#: ../../mod/uexport.php:59
 #, php-format
-msgid "Version %s"
-msgstr "Versión %s"
-
-#: ../../mod/siteinfo.php:133
-msgid "Installed plugins/addons/apps:"
-msgstr "Extensiones/Aplicaciones instaladas:"
-
-#: ../../mod/siteinfo.php:146
-msgid "No installed plugins/addons/apps"
-msgstr "Extensiones/Aplicaciones no instaladas:"
-
-#: ../../mod/siteinfo.php:155 ../../mod/home.php:58 ../../mod/home.php:64
-msgid "$Projectname"
-msgstr "$Projectname"
-
-#: ../../mod/siteinfo.php:156
 msgid ""
-"This is a hub of $Projectname - a global cooperative network of "
-"decentralized privacy enhanced websites."
-msgstr "Este es un sitio integrado en $Projectname - una red cooperativa mundial de sitios web descentralizados de privacidad mejorada."
+"To select all posts for a given year, such as this year, visit <a "
+"href=\"%1$s\">%2$s</a>"
+msgstr "Para seleccionar todos los mensajes de un año determinado, como este año, visite <a href=\"%1$s\">%2$s</a>"
 
-#: ../../mod/siteinfo.php:158
-msgid "Tag: "
-msgstr "Etiqueta:"
-
-#: ../../mod/siteinfo.php:160
-msgid "Last background fetch: "
-msgstr "Última actualización en segundo plano:"
-
-#: ../../mod/siteinfo.php:163
-msgid "Running at web location"
-msgstr "Corriendo en el sitio web"
-
-#: ../../mod/siteinfo.php:164
+#: ../../mod/uexport.php:60
+#, php-format
 msgid ""
-"Please visit <a href=\"https://redmatrix.me\">redmatrix.me</a> to learn more"
-" about $Projectname."
-msgstr "Por favor, visite <a href=\"https://redmatrix.me\">redmatrix.me </a> para aprender más sobre $Projectname."
+"To select all posts for a given month, such as January of this year, visit "
+"<a href=\"%1$s\">%2$s</a>"
+msgstr "Para seleccionar todos los mensajes de un mes determinado, como el de enero de este año, visite <a href=\"%1$s\">%2$s</a>"
 
-#: ../../mod/siteinfo.php:165
-msgid "Bug reports and issues: please visit"
-msgstr "Informes de errores e incidencias: por, favor visite"
-
-#: ../../mod/siteinfo.php:167
-msgid "$projectname issues"
-msgstr "Problemas en $projectname"
-
-#: ../../mod/siteinfo.php:168
+#: ../../mod/uexport.php:61
+#, php-format
 msgid ""
-"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot "
-"com"
-msgstr "Sugerencias, elogios, etc - por favor, un correo electrónico a \"redmatrix\" en librelist - punto com"
-
-#: ../../mod/siteinfo.php:170
-msgid "Site Administrators"
-msgstr "Administradores del sitio"
-
-#: ../../mod/item.php:174
-msgid "Unable to locate original post."
-msgstr "No ha sido posible encontrar la entrada original."
+"These content files may be imported or restored by visiting <a "
+"href=\"%1$s\">%2$s</a> on any site containing your channel. For best results"
+" please import or restore these in date order (oldest first)."
+msgstr "Estos ficheros pueden ser importados o restaurados visitando <a href=\"%1$s\">%2$s</a> o cualquier sitio que contenga su canal. Para obtener los mejores resultados, por favor, importar o restaurar estos ficheros en orden de fecha (la más antigua primero)."
 
-#: ../../mod/item.php:440
-msgid "Empty post discarded."
-msgstr "Desechada entrada vacía."
-
-#: ../../mod/item.php:480
-msgid "Executable content type not permitted to this channel."
-msgstr "Contenido de tipo ejecutable no permitido en este canal."
-
-#: ../../mod/item.php:914
-msgid "System error. Post not saved."
-msgstr "Error del sistema. Entrada no salvada."
-
-#: ../../mod/item.php:1146
-msgid "Unable to obtain post information from database."
-msgstr "No ha sido posible obtener información de la entrada en la base de datos."
+#: ../../mod/chatsvc.php:111
+msgid "Away"
+msgstr "Ausente"
 
-#: ../../mod/item.php:1153
-#, php-format
-msgid "You have reached your limit of %1$.0f top level posts."
-msgstr "Ha alcanzado su límite de %1$.0f tope máximo de entradas"
+#: ../../mod/chatsvc.php:115
+msgid "Online"
+msgstr "Conectado/a"
 
-#: ../../mod/item.php:1160
+#: ../../mod/tagger.php:96
 #, php-format
-msgid "You have reached your limit of %1$.0f webpages."
-msgstr "Ha alcanzado su límite de %1$.0f páginas web."
-
-#: ../../mod/network.php:91
-msgid "No such group"
-msgstr "No se encuentra el grupo"
-
-#: ../../mod/network.php:129
-msgid "No such channel"
-msgstr "No se encuentra el  canal"
-
-#: ../../mod/network.php:143
-msgid "Search Results For:"
-msgstr "Buscar resultados para:"
-
-#: ../../mod/network.php:198
-msgid "Collection is empty"
-msgstr "La colección está vacía"
-
-#: ../../mod/network.php:207
-msgid "Collection: "
-msgstr "Colección:"
-
-#: ../../mod/network.php:226
-msgid "Connection: "
-msgstr "Conexión:"
-
-#: ../../mod/network.php:233
-msgid "Invalid connection."
-msgstr "Conexión no válida."
+msgid "%1$s tagged %2$s's %3$s with %4$s"
+msgstr "%1$s ha etiquetado la %3$s de %2$s con %4$s"
 
 #: ../../mod/common.php:10
 msgid "No channel."
@@ -4726,518 +4516,79 @@ msgstr "Conexiones comunes"
 msgid "No connections in common."
 msgstr "Ninguna  conexión en común."
 
-#: ../../mod/regdir.php:45 ../../mod/dirsearch.php:21
-msgid "This site is not a directory server"
-msgstr "Este sitio no es un servidor de directorio"
-
-#: ../../mod/connections.php:52 ../../mod/connections.php:153
-msgid "Blocked"
-msgstr "Bloqueadas"
-
-#: ../../mod/connections.php:57 ../../mod/connections.php:160
-msgid "Ignored"
-msgstr "Ignoradas"
-
-#: ../../mod/connections.php:62 ../../mod/connections.php:174
-msgid "Hidden"
-msgstr "Ocultas"
-
-#: ../../mod/connections.php:67 ../../mod/connections.php:167
-msgid "Archived"
-msgstr "Archivadas"
-
-#: ../../mod/connections.php:131
-msgid "Suggest new connections"
-msgstr "Sugerir nuevas conexiones"
-
-#: ../../mod/connections.php:134
-msgid "New Connections"
-msgstr "Nuevas conexiones"
-
-#: ../../mod/connections.php:137
-msgid "Show pending (new) connections"
-msgstr "Mostrar conexiones (nuevas) pendientes"
-
-#: ../../mod/connections.php:140 ../../mod/profperm.php:139
-msgid "All Connections"
-msgstr "Todas las conexiones"
-
-#: ../../mod/connections.php:143
-msgid "Show all connections"
-msgstr "Mostrar todas las conexiones"
-
-#: ../../mod/connections.php:146
-msgid "Unblocked"
-msgstr "Desbloqueadas"
-
-#: ../../mod/connections.php:149
-msgid "Only show unblocked connections"
-msgstr "Mostrar solo las conexiones desbloqueadas"
-
-#: ../../mod/connections.php:156
-msgid "Only show blocked connections"
-msgstr "Mostrar solo las conexiones bloqueadas"
-
-#: ../../mod/connections.php:163
-msgid "Only show ignored connections"
-msgstr "Mostrar solo conexiones ignoradas"
-
-#: ../../mod/connections.php:170
-msgid "Only show archived connections"
-msgstr "Mostrar solo las conexiones archivadas"
-
-#: ../../mod/connections.php:177
-msgid "Only show hidden connections"
-msgstr "Mostrar solo las conexiones ocultas"
-
-#: ../../mod/connections.php:232
-#, php-format
-msgid "%1$s [%2$s]"
-msgstr "%1$s [%2$s]"
-
-#: ../../mod/connections.php:233
-msgid "Edit connection"
-msgstr "Editar conexión"
-
-#: ../../mod/connections.php:271
-msgid "Search your connections"
-msgstr "Buscar sus conexiones"
-
-#: ../../mod/connections.php:272
-msgid "Finding: "
-msgstr "Búsqueda:"
-
-#: ../../mod/blocks.php:95 ../../mod/blocks.php:148
-msgid "Block Name"
-msgstr "Nombre del bloque"
-
-#: ../../mod/blocks.php:149
-msgid "Block Title"
-msgstr "Título del bloque"
-
-#: ../../mod/editpost.php:20 ../../mod/editlayout.php:76
-#: ../../mod/editwebpage.php:77 ../../mod/editblock.php:78
-#: ../../mod/editblock.php:94
-msgid "Item not found"
-msgstr "Elemento no encontrado"
-
-#: ../../mod/editpost.php:31
-msgid "Item is not editable"
-msgstr "El elemento no es editable"
-
-#: ../../mod/editpost.php:48
-msgid "Delete item?"
-msgstr "¿Borrar el elemento?"
-
-#: ../../mod/editpost.php:115 ../../mod/editlayout.php:142
-#: ../../mod/editwebpage.php:187 ../../mod/editblock.php:144
-msgid "Insert YouTube video"
-msgstr "Insertar vídeo de YouTube"
-
-#: ../../mod/editpost.php:116 ../../mod/editlayout.php:143
-#: ../../mod/editwebpage.php:188 ../../mod/editblock.php:145
-msgid "Insert Vorbis [.ogg] video"
-msgstr "Insertar vídeo Vorbis [.ogg]"
-
-#: ../../mod/editpost.php:117 ../../mod/editlayout.php:144
-#: ../../mod/editwebpage.php:189 ../../mod/editblock.php:146
-msgid "Insert Vorbis [.ogg] audio"
-msgstr "Insertar audio Vorbis [.ogg]"
-
-#: ../../mod/cloud.php:120
-msgid "$Projectname - Guests: Username: {your email address}, Password: +++"
-msgstr "$Projectname - Invitados: Nombre de usuario: {su dirección de correo electrónico}, Contraseña: +++"
-
-#: ../../mod/photos.php:78
-msgid "Page owner information could not be retrieved."
-msgstr "La información del propietario de la página no pudo ser recuperada."
-
-#: ../../mod/photos.php:98
-msgid "Album not found."
-msgstr "Álbum no encontrado."
-
-#: ../../mod/photos.php:120 ../../mod/photos.php:655
-msgid "Delete Album"
-msgstr "Borrar álbum"
-
-#: ../../mod/photos.php:160 ../../mod/photos.php:942
-msgid "Delete Photo"
-msgstr "Borrar foto"
-
-#: ../../mod/photos.php:452
-msgid "No photos selected"
-msgstr "No hay fotos seleccionadas"
-
-#: ../../mod/photos.php:496
-msgid "Access to this item is restricted."
-msgstr "El acceso a este elemento está restringido."
-
-#: ../../mod/photos.php:535
-#, php-format
-msgid "%1$.2f MB of %2$.2f MB photo storage used."
-msgstr "%1$.2f MB de %2$.2f MB de almacenamiento de fotos utilizado."
-
-#: ../../mod/photos.php:538
-#, php-format
-msgid "%1$.2f MB photo storage used."
-msgstr "%1$.2f MB de almacenamiento de fotos utilizado."
-
-#: ../../mod/photos.php:562
-msgid "Upload Photos"
-msgstr "Subir fotos"
-
-#: ../../mod/photos.php:566 ../../mod/photos.php:648 ../../mod/photos.php:927
-msgid "Enter a new album name"
-msgstr "Introducir un nuevo nombre de álbum"
-
-#: ../../mod/photos.php:567 ../../mod/photos.php:649 ../../mod/photos.php:928
-msgid "or select an existing one (doubleclick)"
-msgstr "o seleccionar uno (doble click) existente"
-
-#: ../../mod/photos.php:568
-msgid "Create a status post for this upload"
-msgstr "Crear una entrada de estado para esta subida"
-
-#: ../../mod/photos.php:596
-msgid "Album name could not be decoded"
-msgstr "El nombre del álbum no ha podido ser descifrado"
-
-#: ../../mod/photos.php:637 ../../mod/photos.php:1169
-#: ../../mod/photos.php:1185
-msgid "Contact Photos"
-msgstr "Fotos de contacto"
-
-#: ../../mod/photos.php:661
-msgid "Show Newest First"
-msgstr "Mostrar lo más reciente primero"
-
-#: ../../mod/photos.php:663
-msgid "Show Oldest First"
-msgstr "Mostrar lo más antiguo primero"
-
-#: ../../mod/photos.php:687 ../../mod/photos.php:1217
-msgid "View Photo"
-msgstr "Ver foto"
-
-#: ../../mod/photos.php:716
-msgid "Edit Album"
-msgstr "Editar álbum"
-
-#: ../../mod/photos.php:761
-msgid "Permission denied. Access to this item may be restricted."
-msgstr "Permiso denegado. El acceso a este elemento puede estar restringido."
-
-#: ../../mod/photos.php:763
-msgid "Photo not available"
-msgstr "Foto no disponible"
-
-#: ../../mod/photos.php:821
-msgid "Use as profile photo"
-msgstr "Usar como foto de perfil"
-
-#: ../../mod/photos.php:828
-msgid "Private Photo"
-msgstr "Foto privada"
-
-#: ../../mod/photos.php:843
-msgid "View Full Size"
-msgstr "Ver tamaño completo"
-
-#: ../../mod/photos.php:921
-msgid "Edit photo"
-msgstr "Editar foto"
-
-#: ../../mod/photos.php:923
-msgid "Rotate CW (right)"
-msgstr "Girar CW (a la derecha)"
-
-#: ../../mod/photos.php:924
-msgid "Rotate CCW (left)"
-msgstr "Girar CCW (a la izquierda)"
-
-#: ../../mod/photos.php:931
-msgid "Caption"
-msgstr "Título"
-
-#: ../../mod/photos.php:933
-msgid "Add a Tag"
-msgstr "Añadir una etiqueta"
-
-#: ../../mod/photos.php:937
-msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
-msgstr "Ejemplo: @bob, @Barbara_Gómez, @juan@ejemplo.com"
-
-#: ../../mod/photos.php:940
-msgid "Flag as adult in album view"
-msgstr "Marcar como \"solo para adultos\" en el álbum"
-
-#: ../../mod/photos.php:1132
-msgid "In This Photo:"
-msgstr "En esta foto:"
-
-#: ../../mod/photos.php:1137
-msgid "Map"
-msgstr "Mapa"
-
-#: ../../mod/photos.php:1223
-msgid "View Album"
-msgstr "Ver álbum"
-
-#: ../../mod/photos.php:1246
-msgid "Recent Photos"
-msgstr "Fotos recientes"
-
-#: ../../mod/search.php:206
-#, php-format
-msgid "Items tagged with: %s"
-msgstr "elementos etiquetados con: %s"
-
-#: ../../mod/search.php:208
-#, php-format
-msgid "Search results for: %s"
-msgstr "Resultados de la búsqueda para: %s"
-
-#: ../../mod/match.php:22
-msgid "Profile Match"
-msgstr "Perfil compatible"
-
-#: ../../mod/match.php:31
-msgid "No keywords to match. Please add keywords to your default profile."
-msgstr "No hay palabras clave en el perfil principal para poder encontrar perfiles compatibles. Por favor, añada palabras clave a su perfil principal."
-
-#: ../../mod/match.php:63
-msgid "is interested in:"
-msgstr "está interesado en:"
-
-#: ../../mod/match.php:70
-msgid "No matches"
-msgstr "No se han encontrado perfiles compatibles"
-
-#: ../../mod/chatsvc.php:111
-msgid "Away"
-msgstr "Ausente"
-
-#: ../../mod/chatsvc.php:115
-msgid "Online"
-msgstr "Conectado"
-
-#: ../../mod/rbmark.php:88
-msgid "Select a bookmark folder"
-msgstr "Seleccionar una carpeta de marcadores"
-
-#: ../../mod/rbmark.php:93
-msgid "Save Bookmark"
-msgstr "Guardar marcador"
-
-#: ../../mod/rbmark.php:94
-msgid "URL of bookmark"
-msgstr "Dirección del marcador"
-
-#: ../../mod/rbmark.php:95 ../../mod/appman.php:93
-msgid "Description"
-msgstr "Descripción"
-
-#: ../../mod/rbmark.php:99
-msgid "Or enter new bookmark folder name"
-msgstr "O introduzca un nuevo nombre para la carpeta de marcadores"
-
-#: ../../mod/notify.php:53 ../../mod/notifications.php:94
-msgid "No more system notifications."
-msgstr "No hay más notificaciones del sistema"
-
-#: ../../mod/notify.php:57 ../../mod/notifications.php:98
-msgid "System Notifications"
-msgstr "Notificaciones de sistema"
-
-#: ../../mod/acl.php:231
-msgid "network"
-msgstr "red"
-
-#: ../../mod/acl.php:241
-msgid "RSS"
-msgstr "RSS"
-
-#: ../../mod/pdledit.php:13
-msgid "Layout updated."
-msgstr "Formato actualizado"
-
-#: ../../mod/pdledit.php:28 ../../mod/pdledit.php:53
-msgid "Edit System Page Description"
-msgstr "Editor del Sistema de Descripción de Páginas"
-
-#: ../../mod/pdledit.php:48
-msgid "Layout not found."
-msgstr "Formato no encontrado"
-
-#: ../../mod/pdledit.php:54
-msgid "Module Name:"
-msgstr "Nombre del módulo:"
-
-#: ../../mod/pdledit.php:55
-msgid "Layout Help"
-msgstr "Ayuda para el diseño de la página"
-
-#: ../../mod/filer.php:49
-msgid "- select -"
-msgstr "- seleccionar -"
-
-#: ../../mod/import.php:25
-#, php-format
-msgid "Your service plan only allows %d channels."
-msgstr "Su paquete de servicios solo permite %d canales."
-
-#: ../../mod/import.php:60
-msgid "Nothing to import."
-msgstr "No hay nada para importar."
-
-#: ../../mod/import.php:84
-msgid "Unable to download data from old server"
-msgstr "No se han podido descargar datos de su antiguo servidor"
-
-#: ../../mod/import.php:90
-msgid "Imported file is empty."
-msgstr "El fichero importado está vacío."
-
-#: ../../mod/import.php:110
-msgid "The data provided is not compatible with this project."
-msgstr "Los datos proporcionados no son compatibles con este proyecto."
+#: ../../mod/ping.php:260
+msgid "sent you a private message"
+msgstr "le ha enviado un mensaje privado"
 
-#: ../../mod/import.php:115
-#, php-format
-msgid "Warning: Database versions differ by %1$d updates."
-msgstr "Atención: Las versiones de la base de datos difieren en %1$d actualizaciones."
+#: ../../mod/ping.php:308
+msgid "added your channel"
+msgstr "añadió este canal a sus conexiones"
 
-#: ../../mod/import.php:135
-msgid ""
-"Cannot create a duplicate channel identifier on this system. Import failed."
-msgstr "No se ha podido crear el canal porque el identificador del canal no se ha podido duplicar en este servidor."
+#: ../../mod/ping.php:350
+msgid "posted an event"
+msgstr "publicó un evento"
 
-#: ../../mod/import.php:176
-msgid "Channel clone failed. Import failed."
-msgstr "No se ha podido importar el canal porque el canal no se ha podido clonar."
+#: ../../mod/help.php:147
+msgid "Documentation Search"
+msgstr "Búsqueda de Documentación"
 
-#: ../../mod/import.php:186
-msgid "Cloned channel not found. Import failed."
-msgstr "No se ha podido importar el canal porque el canal clonado no se ha encontrado."
+#: ../../mod/help.php:184 ../../mod/help.php:190 ../../mod/help.php:196
+msgid "Help:"
+msgstr "Ayuda:"
 
-#: ../../mod/import.php:574
-msgid "You must be logged in to use this feature."
-msgstr "Debe estar registrado para poder usar esta funcionalidad."
+#: ../../mod/help.php:211 ../../index.php:234
+msgid "Not Found"
+msgstr "No encontrado"
 
-#: ../../mod/import.php:579
-msgid "Import Channel"
-msgstr "Importar canal"
+#: ../../mod/help.php:235
+msgid "$Projectname Documentation"
+msgstr "Documentación de $Projectname"
 
-#: ../../mod/import.php:580
+#: ../../mod/removeme.php:29
 msgid ""
-"Use this form to import an existing channel from a different server/hub. You"
-" may retrieve the channel identity from the old server/hub via the network "
-"or provide an export file."
-msgstr "Emplee este formulario para importar un canal desde un servidor/hub diferente. Puede recuperar el canal desde el antiguo servidor/hub a través de la red o proporcionando un fichero de exportación."
-
-#: ../../mod/import.php:581
-msgid "File to Upload"
-msgstr "Fichero para subir"
-
-#: ../../mod/import.php:582
-msgid "Or provide the old server/hub details"
-msgstr "O proporcione los detalles de su antiguo servidor/hub"
+"Channel removals are not allowed within 48 hours of changing the account "
+"password."
+msgstr "La eliminación de canales no está permitida hasta pasadas 48 horas desde el último cambio de contraseña."
 
-#: ../../mod/import.php:583
-msgid "Your old identity address (xyz@example.com)"
-msgstr "Su identidad en el antiguo servidor  (canal@ejemplo.com)"
+#: ../../mod/removeme.php:57
+msgid "Remove This Channel"
+msgstr "Eliminar este canal"
 
-#: ../../mod/import.php:584
-msgid "Your old login email address"
-msgstr "Su antigua dirección de correo electrónico"
+#: ../../mod/removeme.php:58 ../../mod/removeaccount.php:58
+msgid "WARNING: "
+msgstr "ATENCIÓN:"
 
-#: ../../mod/import.php:585
-msgid "Your old login password"
-msgstr "Su antigua contraseña"
+#: ../../mod/removeme.php:58
+msgid "This channel will be completely removed from the network. "
+msgstr "Este canal va a ser completamente eliminado de la red."
 
-#: ../../mod/import.php:586
-msgid ""
-"For either option, please choose whether to make this hub your new primary "
-"address, or whether your old location should continue this role. You will be"
-" able to post from either location, but only one can be marked as the "
-"primary location for files, photos, and media."
-msgstr "Para cualquiera de las opciones, elija si hacer de este servidor su nueva dirección primaria, o si su antigua ubicación debe continuar con este papel. Usted podrá publicar desde cualquier ubicación, pero sólo una puede estar marcada como la ubicación principal para los ficheros, fotos y otras imágenes o vídeos."
+#: ../../mod/removeme.php:58 ../../mod/removeaccount.php:58
+msgid "This action is permanent and can not be undone!"
+msgstr "¡Esta acción tiene carácter definitivo y no se puede deshacer!"
 
-#: ../../mod/import.php:587
-msgid "Make this hub my primary location"
-msgstr "Convertir este servidor en mi ubicación primaria"
+#: ../../mod/removeme.php:59 ../../mod/removeaccount.php:59
+msgid "Please enter your password for verification:"
+msgstr "Por favor, introduzca su contraseña para su verificación:"
 
-#: ../../mod/import.php:588
-msgid ""
-"Import existing posts if possible (experimental - limited by available "
-"memory"
-msgstr "Importar el contenido publicado si es posible (experimental - limitado por la memoria disponible"
+#: ../../mod/removeme.php:60
+msgid "Remove this channel and all its clones from the network"
+msgstr "Eliminar este canal y todos sus clones de la red"
 
-#: ../../mod/import.php:589
+#: ../../mod/removeme.php:60
 msgid ""
-"This process may take several minutes to complete. Please submit the form "
-"only once and leave this page open until finished."
-msgstr "Este proceso puede tardar varios minutos en completarse. Por favor envíe el formulario una sola vez y mantenga esta página abierta hasta que termine."
-
-#: ../../mod/editlayout.php:111
-msgid "Delete layout?"
-msgstr "¿Borrar formato?"
-
-#: ../../mod/editlayout.php:158 ../../mod/layouts.php:124
-msgid "Layout Description (Optional)"
-msgstr "Descripción del formato gráfico (opcional)"
-
-#: ../../mod/editlayout.php:160 ../../mod/layouts.php:121
-#: ../../mod/layouts.php:179
-msgid "Layout Name"
-msgstr "Nombre del formato"
-
-#: ../../mod/editlayout.php:177
-msgid "Edit Layout"
-msgstr "Modificar formato"
-
-#: ../../mod/chat.php:19 ../../mod/channel.php:25
-msgid "You must be logged in to see this page."
-msgstr "Debe haber iniciado sesión para poder ver esta página."
-
-#: ../../mod/chat.php:167
-msgid "Room not found"
-msgstr "Sala no encontrada"
-
-#: ../../mod/chat.php:178
-msgid "Leave Room"
-msgstr "Abandonar sala"
-
-#: ../../mod/chat.php:179
-msgid "Delete This Room"
-msgstr "Eliminar esta sala"
-
-#: ../../mod/chat.php:180
-msgid "I am away right now"
-msgstr "Estoy ausente momentáneamente"
-
-#: ../../mod/chat.php:181
-msgid "I am online"
-msgstr "Estoy conectado"
-
-#: ../../mod/chat.php:183
-msgid "Bookmark this room"
-msgstr "Añadir esta sala a Marcadores"
-
-#: ../../mod/chat.php:207 ../../mod/chat.php:229
-msgid "New Chatroom"
-msgstr "Nueva sala de chat"
+"By default only the instance of the channel located on this hub will be "
+"removed from the network"
+msgstr "Por defecto, solo la instancia del canal alojado en este servidor será eliminado de la red"
 
-#: ../../mod/chat.php:208
-msgid "Chatroom Name"
-msgstr "Nombre de sala de chat"
+#: ../../mod/removeme.php:61 ../../mod/settings.php:1109
+msgid "Remove Channel"
+msgstr "Eliminar el canal"
 
-#: ../../mod/chat.php:225
-#, php-format
-msgid "%1$s's Chatrooms"
-msgstr "Sala de chat de %1$s"
+#: ../../mod/filer.php:48
+msgid "- select -"
+msgstr "- seleccionar -"
 
-#: ../../mod/mitem.php:24 ../../mod/menu.php:138
+#: ../../mod/mitem.php:24 ../../mod/menu.php:140
 msgid "Menu not found."
 msgstr "Menú no encontrado"
 
@@ -5253,472 +4604,556 @@ msgstr "No es posible actualizar el elemento del menú."
 msgid "Unable to add menu element."
 msgstr "No es posible añadir el elemento al menú"
 
-#: ../../mod/mitem.php:154 ../../mod/mitem.php:226
+#: ../../mod/mitem.php:116 ../../mod/menu.php:162 ../../mod/xchan.php:37
+msgid "Not found."
+msgstr "No encontrado."
+
+#: ../../mod/mitem.php:149 ../../mod/mitem.php:222
 msgid "Menu Item Permissions"
 msgstr "Permisos del elemento del menú"
 
-#: ../../mod/mitem.php:155 ../../mod/mitem.php:227 ../../mod/settings.php:1083
+#: ../../mod/mitem.php:150 ../../mod/mitem.php:223 ../../mod/settings.php:1053
 msgid "(click to open/close)"
-msgstr "(pulse para abrir/cerrar)"
+msgstr "(pulsar para abrir o cerrar)"
 
-#: ../../mod/mitem.php:157 ../../mod/mitem.php:173
+#: ../../mod/mitem.php:152 ../../mod/mitem.php:168
 msgid "Link Name"
 msgstr "Nombre del enlace"
 
-#: ../../mod/mitem.php:158 ../../mod/mitem.php:231
+#: ../../mod/mitem.php:153 ../../mod/mitem.php:227
 msgid "Link or Submenu Target"
 msgstr "Destino del enlace o submenú"
 
-#: ../../mod/mitem.php:158
+#: ../../mod/mitem.php:153
 msgid "Enter URL of the link or select a menu name to create a submenu"
-msgstr "Introduzca la dirección del enlace o seleccione el nombre de un submenú"
+msgstr "Introducir la dirección del enlace o seleccionar el nombre de un submenú"
 
-#: ../../mod/mitem.php:159 ../../mod/mitem.php:232
+#: ../../mod/mitem.php:154 ../../mod/mitem.php:228
 msgid "Use magic-auth if available"
-msgstr "Use la autenticación mágica si está disponible"
+msgstr "Usar la autenticación mágica si está disponible"
 
-#: ../../mod/mitem.php:160 ../../mod/mitem.php:233
+#: ../../mod/mitem.php:155 ../../mod/mitem.php:229
 msgid "Open link in new window"
 msgstr "Abrir el enlace en una nueva ventana"
 
-#: ../../mod/mitem.php:161 ../../mod/mitem.php:234
+#: ../../mod/mitem.php:156 ../../mod/mitem.php:230
 msgid "Order in list"
 msgstr "Orden en la lista"
 
-#: ../../mod/mitem.php:161 ../../mod/mitem.php:234
+#: ../../mod/mitem.php:156 ../../mod/mitem.php:230
 msgid "Higher numbers will sink to bottom of listing"
 msgstr "Los números más altos irán al final de la lista"
 
-#: ../../mod/mitem.php:162
+#: ../../mod/mitem.php:157
 msgid "Submit and finish"
 msgstr "Enviar y terminar"
 
-#: ../../mod/mitem.php:163
+#: ../../mod/mitem.php:158
 msgid "Submit and continue"
 msgstr "Enviar y continuar"
 
-#: ../../mod/mitem.php:171
+#: ../../mod/mitem.php:166
 msgid "Menu:"
 msgstr "Menú:"
 
-#: ../../mod/mitem.php:174
+#: ../../mod/mitem.php:169
 msgid "Link Target"
 msgstr "Destino del enlace"
 
-#: ../../mod/mitem.php:177
+#: ../../mod/mitem.php:172
 msgid "Edit menu"
 msgstr "Editar menú"
 
-#: ../../mod/mitem.php:180
+#: ../../mod/mitem.php:175
 msgid "Edit element"
-msgstr "Editar elemento"
+msgstr "Editar el elemento"
 
-#: ../../mod/mitem.php:181
+#: ../../mod/mitem.php:176
 msgid "Drop element"
 msgstr "Eliminar el elemento"
 
-#: ../../mod/mitem.php:182
+#: ../../mod/mitem.php:177
 msgid "New element"
 msgstr "Nuevo elemento"
 
-#: ../../mod/mitem.php:183
+#: ../../mod/mitem.php:178
 msgid "Edit this menu container"
 msgstr "Modificar el contenedor del menú"
 
-#: ../../mod/mitem.php:184
+#: ../../mod/mitem.php:179
 msgid "Add menu element"
 msgstr "Añadir un elemento al menú"
 
-#: ../../mod/mitem.php:185
+#: ../../mod/mitem.php:180
 msgid "Delete this menu item"
 msgstr "Eliminar este elemento del menú"
 
-#: ../../mod/mitem.php:186
+#: ../../mod/mitem.php:181
 msgid "Edit this menu item"
 msgstr "Modificar este elemento del menú"
 
-#: ../../mod/mitem.php:203
+#: ../../mod/mitem.php:198
 msgid "Menu item not found."
 msgstr "Este elemento del menú no se ha encontrado"
 
-#: ../../mod/mitem.php:215
+#: ../../mod/mitem.php:211
 msgid "Menu item deleted."
 msgstr "Este elemento del menú ha sido borrado"
 
-#: ../../mod/mitem.php:217
+#: ../../mod/mitem.php:213
 msgid "Menu item could not be deleted."
 msgstr "Este elemento del menú no puede ser borrado."
 
-#: ../../mod/mitem.php:224
+#: ../../mod/mitem.php:220
 msgid "Edit Menu Element"
 msgstr "Editar elemento del menú"
 
-#: ../../mod/mitem.php:230
+#: ../../mod/mitem.php:226
 msgid "Link text"
 msgstr "Texto del enlace"
 
-#: ../../mod/editwebpage.php:152
-msgid "Delete webpage?"
-msgstr "¿Eliminar página web?"
+#: ../../mod/connedit.php:75
+msgid "Could not access contact record."
+msgstr "No se ha podido acceder al registro de contacto."
 
-#: ../../mod/editwebpage.php:173
-msgid "Page link title"
-msgstr "Título del enlace de la página"
+#: ../../mod/connedit.php:99
+msgid "Could not locate selected profile."
+msgstr "No se ha podido localizar el perfil seleccionado."
 
-#: ../../mod/editwebpage.php:224
-msgid "Edit Webpage"
-msgstr "Editar página web"
+#: ../../mod/connedit.php:218
+msgid "Connection updated."
+msgstr "Conexión actualizada."
 
-#: ../../mod/dirsearch.php:29
-msgid "This directory server requires an access token"
-msgstr "El servidor de este directorio necesita un \"token\" de acceso"
+#: ../../mod/connedit.php:220
+msgid "Failed to update connection record."
+msgstr "Error al actualizar el registro de la conexión."
 
-#: ../../mod/lostpass.php:15
-msgid "No valid account found."
-msgstr "No se ha encontrado una cuenta válida."
+#: ../../mod/connedit.php:267
+msgid "is now connected to"
+msgstr "ahora está conectado/a"
 
-#: ../../mod/lostpass.php:29
-msgid "Password reset request issued. Check your email."
-msgstr "Se ha recibido una solicitud de restablecimiento de contraseña. Consulte su correo electrónico."
+#: ../../mod/connedit.php:390
+msgid "Could not access address book record."
+msgstr "No se pudo acceder a la entrada en su libreta de direcciones."
 
-#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:103
-#, php-format
-msgid "Site Member (%s)"
-msgstr "Usuario del sitio (%s)"
+#: ../../mod/connedit.php:404
+msgid "Refresh failed - channel is currently unavailable."
+msgstr "Recarga fallida - no se puede encontrar el canal en este momento."
 
-#: ../../mod/lostpass.php:40
+#: ../../mod/connedit.php:413 ../../mod/connedit.php:422
+#: ../../mod/connedit.php:431 ../../mod/connedit.php:440
+#: ../../mod/connedit.php:453
+msgid "Unable to set address book parameters."
+msgstr "No ha sido posible establecer los parámetros de la libreta de direcciones."
+
+#: ../../mod/connedit.php:477
+msgid "Connection has been removed."
+msgstr "La conexión ha sido eliminada."
+
+#: ../../mod/connedit.php:496
 #, php-format
-msgid "Password reset requested at %s"
-msgstr "Se ha solicitado restablecer la contraseña en %s"
+msgid "View %s's profile"
+msgstr "Ver el perfil de %s"
 
-#: ../../mod/lostpass.php:63
-msgid ""
-"Request could not be verified. (You may have previously submitted it.) "
-"Password reset failed."
-msgstr "La solicitud no ha podido ser verificada. (Puede que la haya enviado con anterioridad) El restablecimiento de la contraseña ha fallado."
+#: ../../mod/connedit.php:500
+msgid "Refresh Permissions"
+msgstr "Recargar los permisos"
 
-#: ../../mod/lostpass.php:86 ../../boot.php:1558
-msgid "Password Reset"
-msgstr "Restablecer la contraseña"
+#: ../../mod/connedit.php:503
+msgid "Fetch updated permissions"
+msgstr "Obtener los permisos actualizados"
 
-#: ../../mod/lostpass.php:87
-msgid "Your password has been reset as requested."
-msgstr "Su contraseña ha sido restablecida según lo solicitó."
+#: ../../mod/connedit.php:507
+msgid "Recent Activity"
+msgstr "Actividad reciente"
 
-#: ../../mod/lostpass.php:88
-msgid "Your new password is"
-msgstr "Su nueva contraseña es"
+#: ../../mod/connedit.php:510
+msgid "View recent posts and comments"
+msgstr "Ver publicaciones y comentarios recientes"
 
-#: ../../mod/lostpass.php:89
-msgid "Save or copy your new password - and then"
-msgstr "Guarde o copie su nueva contraseña - y después"
+#: ../../mod/connedit.php:514 ../../mod/admin.php:785
+msgid "Unblock"
+msgstr "Desbloquear"
 
-#: ../../mod/lostpass.php:90
-msgid "click here to login"
-msgstr "Pulse aquí para conectarse"
+#: ../../mod/connedit.php:514 ../../mod/admin.php:784
+msgid "Block"
+msgstr "Bloquear"
 
-#: ../../mod/lostpass.php:91
-msgid ""
-"Your password may be changed from the <em>Settings</em> page after "
-"successful login."
-msgstr "Puede cambiar la contraseña en la página <em>Ajustes</em> una vez iniciada la sesión."
+#: ../../mod/connedit.php:517
+msgid "Block (or Unblock) all communications with this connection"
+msgstr "Bloquear (o desbloquear) todas las comunicaciones con esta conexión"
 
-#: ../../mod/lostpass.php:108
-#, php-format
-msgid "Your password has changed at %s"
-msgstr "Su contraseña en %s ha sido cambiada"
+#: ../../mod/connedit.php:518
+msgid "This connection is blocked!"
+msgstr "¡Esta conexión está bloqueada!"
 
-#: ../../mod/lostpass.php:123
-msgid "Forgot your Password?"
-msgstr "¿Ha olvidado su contraseña?"
+#: ../../mod/connedit.php:522
+msgid "Unignore"
+msgstr "Dejar de ignorar"
 
-#: ../../mod/lostpass.php:124
-msgid ""
-"Enter your email address and submit to have your password reset. Then check "
-"your email for further instructions."
-msgstr "Introduzca y envíe su dirección de correo electrónico para el restablecimiento de su contraseña. Luego revise su correo para obtener más instrucciones."
+#: ../../mod/connedit.php:522 ../../mod/notifications.php:51
+msgid "Ignore"
+msgstr "Ignorar"
 
-#: ../../mod/lostpass.php:125
-msgid "Email Address"
-msgstr "Dirección de correo electrónico"
+#: ../../mod/connedit.php:525
+msgid "Ignore (or Unignore) all inbound communications from this connection"
+msgstr "Ignorar (o dejar de ignorar) todas las comunicaciones entrantes de esta conexión"
 
-#: ../../mod/lostpass.php:126
-msgid "Reset"
-msgstr "Reiniciar"
+#: ../../mod/connedit.php:526
+msgid "This connection is ignored!"
+msgstr "¡Esta conexión es ignorada!"
 
-#: ../../mod/rate.php:157
-msgid "Website:"
-msgstr "Sitio web:"
+#: ../../mod/connedit.php:530
+msgid "Unarchive"
+msgstr "Desarchivar"
 
-#: ../../mod/rate.php:160
-#, php-format
-msgid "Remote Channel [%s] (not yet known on this site)"
-msgstr "Canal remoto [%s] (aún no es conocido en este sitio)"
+#: ../../mod/connedit.php:530
+msgid "Archive"
+msgstr "Archivar"
 
-#: ../../mod/rate.php:161
-msgid "Rating (this information is public)"
-msgstr "Valoración (esta información es pública)"
+#: ../../mod/connedit.php:533
+msgid ""
+"Archive (or Unarchive) this connection - mark channel dead but keep content"
+msgstr "Archiva (o desarchiva) esta conexión - marca el canal como muerto aunque mantiene sus contenidos"
 
-#: ../../mod/rate.php:162
-msgid "Optionally explain your rating (this information is public)"
-msgstr "Opcionalmente puede explicar su valoración (esta información es pública)"
+#: ../../mod/connedit.php:534
+msgid "This connection is archived!"
+msgstr "¡Esta conexión esta archivada!"
 
-#: ../../mod/editblock.php:117
-msgid "Delete block?"
-msgstr "¿Borrar este bloque?"
+#: ../../mod/connedit.php:538
+msgid "Unhide"
+msgstr "Mostrar"
 
-#: ../../mod/editblock.php:179
-msgid "Edit Block"
-msgstr "Modificar este bloque"
+#: ../../mod/connedit.php:538
+msgid "Hide"
+msgstr "Ocultar"
 
-#: ../../mod/invite.php:25
-msgid "Total invitation limit exceeded."
-msgstr "Se ha superado el límite máximo de invitaciones."
+#: ../../mod/connedit.php:541
+msgid "Hide or Unhide this connection from your other connections"
+msgstr "Ocultar o mostrar esta conexión a sus otras conexiones"
 
-#: ../../mod/invite.php:49
-#, php-format
-msgid "%s : Not a valid email address."
-msgstr "%s : No es una dirección de correo electrónico válida. "
+#: ../../mod/connedit.php:542
+msgid "This connection is hidden!"
+msgstr "¡Esta conexión está oculta!"
 
-#: ../../mod/invite.php:76
-msgid "Please join us on Red"
-msgstr "Únase a nosotros en RedMatrix"
+#: ../../mod/connedit.php:549
+msgid "Delete this connection"
+msgstr "Eliminar esta conexión"
 
-#: ../../mod/invite.php:87
-msgid "Invitation limit exceeded. Please contact your site administrator."
-msgstr "Excedido el límite de invitaciones. Por favor, contacte con el Administrador de su sitio."
+#: ../../mod/connedit.php:630
+msgid "Approve this connection"
+msgstr "Aprobar esta conexión"
 
-#: ../../mod/invite.php:92
-#, php-format
-msgid "%s : Message delivery failed."
-msgstr "%s : Falló la entrega del mensaje."
+#: ../../mod/connedit.php:630
+msgid "Accept connection to allow communication"
+msgstr "Aceptar la conexión para permitir la comunicación"
 
-#: ../../mod/invite.php:96
-#, php-format
-msgid "%d message sent."
-msgid_plural "%d messages sent."
-msgstr[0] "%d mensajes enviados."
-msgstr[1] "%d mensajes enviados."
+#: ../../mod/connedit.php:635
+msgid "Set Affinity"
+msgstr "Ajustar la afinidad"
 
-#: ../../mod/invite.php:115
-msgid "You have no more invitations available"
-msgstr "No tiene más invitaciones disponibles"
+#: ../../mod/connedit.php:638
+msgid "Set Profile"
+msgstr "Ajustar el perfil"
 
-#: ../../mod/invite.php:129
-msgid "Send invitations"
-msgstr "Enviar invitaciones"
+#: ../../mod/connedit.php:641
+msgid "Set Affinity & Profile"
+msgstr "Ajustar la afinidad y el perfil"
 
-#: ../../mod/invite.php:130
-msgid "Enter email addresses, one per line:"
-msgstr "Introduzca las direcciones de correo electrónica, una por línea:"
+#: ../../mod/connedit.php:658
+msgid "Apply these permissions automatically"
+msgstr "Aplicar estos permisos automaticamente"
 
-#: ../../mod/invite.php:131 ../../mod/mail.php:235 ../../mod/mail.php:348
-msgid "Your message:"
-msgstr "Su mensaje:"
+#: ../../mod/connedit.php:660
+msgid "This connection's address is"
+msgstr "La dirección de esta conexión es"
 
-#: ../../mod/invite.php:132
-msgid "Please join my community on $Projectname."
-msgstr "Por favor, únase a mi comunidad en $Projectname."
+#: ../../mod/connedit.php:663
+msgid ""
+"The permissions indicated on this page will be applied to all new "
+"connections."
+msgstr "Los permisos indicados en esta página serán aplicados en todas las nuevas conexiones."
 
-#: ../../mod/invite.php:134
-msgid "You will need to supply this invitation code: "
-msgstr "Debe proporcionar este código de invitación:"
+#: ../../mod/connedit.php:665
+msgid "Slide to adjust your degree of friendship"
+msgstr "Deslizar para ajustar el grado de amistad"
 
-#: ../../mod/invite.php:135
+#: ../../mod/connedit.php:667
+msgid "Slide to adjust your rating"
+msgstr "Deslizar para ajustar su valoración"
+
+#: ../../mod/connedit.php:668 ../../mod/connedit.php:673
+msgid "Optionally explain your rating"
+msgstr "Opcionalmente, puede explicar su valoración"
+
+#: ../../mod/connedit.php:670
+msgid "Custom Filter"
+msgstr "Filtro personalizado"
+
+#: ../../mod/connedit.php:671
+msgid "Only import posts with this text"
+msgstr "Importar solo entradas que contengan este texto"
+
+#: ../../mod/connedit.php:671 ../../mod/connedit.php:672
 msgid ""
-"1. Register at any $Projectname location (they are all inter-connected)"
-msgstr "1. Regístrese en cualquier lugar del $Projectname (están todos interconectados)"
+"words one per line or #tags or /patterns/, leave blank to import all posts"
+msgstr "palabras, una por línea, o #etiquetas o /patrones/, dejar en blanco para importar todas las entradas"
 
-#: ../../mod/invite.php:137
-msgid "2. Enter my $Projectname network address into the site searchbar."
-msgstr "2. Introduzca mi dirección $Projectname en la caja de búsqueda del sitio."
+#: ../../mod/connedit.php:672
+msgid "Do not import posts with this text"
+msgstr "No importar entradas que contengan este texto"
 
-#: ../../mod/invite.php:138
-msgid "or visit "
-msgstr "o visite"
+#: ../../mod/connedit.php:674
+msgid "This information is public!"
+msgstr "¡Esta información es pública!"
 
-#: ../../mod/invite.php:140
-msgid "3. Click [Connect]"
-msgstr "3. Pulse [conectar]"
+#: ../../mod/connedit.php:679
+msgid "Connection Pending Approval"
+msgstr "Conexión pendiente de aprobación"
 
-#: ../../mod/locs.php:21 ../../mod/locs.php:52
-msgid "Location not found."
-msgstr "Localización no encontrada."
+#: ../../mod/connedit.php:680
+msgid "Connection Request"
+msgstr "Solicitud de conexión"
 
-#: ../../mod/locs.php:56
-msgid "Primary location cannot be removed."
-msgstr "La localización primaria no puede ser eliminada."
+#: ../../mod/connedit.php:681
+#, php-format
+msgid ""
+"(%s) would like to connect with you. Please approve this connection to allow"
+" communication."
+msgstr "(%s) desearía conectar con usted. por favor, apruebe esta conexión para permitir la comunicación."
 
-#: ../../mod/locs.php:88
-msgid "No locations found."
-msgstr "Ninguna localización encontrada."
+#: ../../mod/connedit.php:682 ../../mod/admin.php:781
+msgid "Approve"
+msgstr "Aprobar"
 
-#: ../../mod/locs.php:101
-msgid "Manage Channel Locations"
-msgstr "Gestionar localizaciones del canal"
+#: ../../mod/connedit.php:683
+msgid "Approve Later"
+msgstr "Aprobar más tarde"
 
-#: ../../mod/locs.php:102
-msgid "Location (address)"
-msgstr "Localización (dirección)"
+#: ../../mod/connedit.php:686
+msgid "inherited"
+msgstr "heredado"
 
-#: ../../mod/locs.php:103
-msgid "Primary Location"
-msgstr "Localización primaria"
+#: ../../mod/connedit.php:688
+#, php-format
+msgid ""
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
+msgstr "Por favor, escoja el perfil que quiere mostrar a %s cuando esté viendo su perfil de forma segura."
 
-#: ../../mod/locs.php:104
-msgid "Drop location"
-msgstr "Eliminar localización"
+#: ../../mod/connedit.php:690
+msgid "Their Settings"
+msgstr "Sus ajustes"
 
-#: ../../mod/sources.php:32
-msgid "Failed to create source. No channel selected."
-msgstr "Imposible crear el origen de los clontenidos. Ningún canal ha sido seleccionado."
+#: ../../mod/connedit.php:691
+msgid "My Settings"
+msgstr "Mis ajustes"
 
-#: ../../mod/sources.php:45
-msgid "Source created."
-msgstr "Fuente creada."
+#: ../../mod/connedit.php:693
+msgid "Individual Permissions"
+msgstr "Permisos individuales"
 
-#: ../../mod/sources.php:57
-msgid "Source updated."
-msgstr "Fuente actualizada."
+#: ../../mod/connedit.php:694
+msgid ""
+"Some permissions may be inherited from your channel's <a "
+"href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
+"priority than individual settings. You can <strong>not</strong> change those"
+" settings here."
+msgstr "Algunos permisos pueden ser heredados de los <a href=\"settings\"><strong>ajustes de privacidad</strong></a> de sus canales, los cuales tienen una prioridad más alta que los ajustes individuales. <strong>No</strong> puede cambiar estos ajustes aquí."
 
-#: ../../mod/sources.php:82
-msgid "*"
-msgstr "*"
+#: ../../mod/connedit.php:695
+msgid ""
+"Some permissions may be inherited from your channel's <a "
+"href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
+"priority than individual settings. You can change those settings here but "
+"they wont have any impact unless the inherited setting changes."
+msgstr "Algunos permisos pueden ser heredados de los <a href=\"settings\"><strong>ajustes de privacidad</strong></a> de sus canales, los cuales tienen una prioridad más alta que los ajustes individuales. Puede cambiar estos ajustes aquí, pero no tendrán ningún consecuencia hasta que cambie los ajustes heredados."
 
-#: ../../mod/sources.php:89
-msgid "Manage remote sources of content for your channel."
-msgstr "Gestionar contenido de origen remoto para su canal."
+#: ../../mod/connedit.php:696
+msgid "Last update:"
+msgstr "Última actualización:"
 
-#: ../../mod/sources.php:90 ../../mod/sources.php:100
-msgid "New Source"
-msgstr "Nueva fuente"
+#: ../../mod/mood.php:132
+msgid "Set your current mood and tell your friends"
+msgstr "Describir su estado de ánimo para comunicárselo a sus amigos"
 
-#: ../../mod/sources.php:101 ../../mod/sources.php:133
+#: ../../mod/magic.php:69
+msgid "Hub not found."
+msgstr "Servidor no encontrado"
+
+#: ../../mod/pconfig.php:27 ../../mod/pconfig.php:60
+msgid "This setting requires special processing and editing has been blocked."
+msgstr "Este ajuste necesita de un proceso especial y la edición ha sido bloqueada."
+
+#: ../../mod/pconfig.php:49
+msgid "Configuration Editor"
+msgstr "Editor de configuración"
+
+#: ../../mod/pconfig.php:50
 msgid ""
-"Import all or selected content from the following channel into this channel "
-"and distribute it according to your channel settings."
-msgstr "Importar todo el contenido o una selección de los siguientes canales en este canal, y distribuirlo de acuerdo con sus ajustes."
+"Warning: Changing some settings could render your channel inoperable. Please"
+" leave this page unless you are comfortable with and knowledgeable about how"
+" to correctly use this feature."
+msgstr "Atención: El cambio de algunos ajustes puede volver inutilizable su canal. Por favor, abandone la página excepto que esté seguro y sepa cómo usar correctamente esta característica."
 
-#: ../../mod/sources.php:102 ../../mod/sources.php:134
-msgid "Only import content with these words (one per line)"
-msgstr "Importar solo contenido que contenga estas palabras (una por línea)"
+#: ../../mod/photos.php:79
+msgid "Page owner information could not be retrieved."
+msgstr "La información del propietario de la página no pudo ser recuperada."
 
-#: ../../mod/sources.php:102 ../../mod/sources.php:134
-msgid "Leave blank to import all public content"
-msgstr "Dejar en blanco para importar todo el contenido público"
+#: ../../mod/photos.php:100
+msgid "Album not found."
+msgstr "Álbum no encontrado."
 
-#: ../../mod/sources.php:103 ../../mod/sources.php:137
-#: ../../mod/new_channel.php:112
-msgid "Channel Name"
-msgstr "Nombre del canal"
+#: ../../mod/photos.php:127
+msgid "Delete Album"
+msgstr "Borrar álbum"
 
-#: ../../mod/sources.php:123 ../../mod/sources.php:150
-msgid "Source not found."
-msgstr "Fuente no encontrada"
+#: ../../mod/photos.php:171 ../../mod/photos.php:1006
+msgid "Delete Photo"
+msgstr "Borrar foto"
 
-#: ../../mod/sources.php:130
-msgid "Edit Source"
-msgstr "Editar fuente"
+#: ../../mod/photos.php:500
+msgid "No photos selected"
+msgstr "No hay fotos seleccionadas"
 
-#: ../../mod/sources.php:131
-msgid "Delete Source"
-msgstr "Eliminar fuente"
+#: ../../mod/photos.php:549
+msgid "Access to this item is restricted."
+msgstr "El acceso a este elemento está restringido."
 
-#: ../../mod/sources.php:158
-msgid "Source removed"
-msgstr "Fuente eliminada"
+#: ../../mod/photos.php:588
+#, php-format
+msgid "%1$.2f MB of %2$.2f MB photo storage used."
+msgstr "%1$.2f MB de %2$.2f MB de almacenamiento de fotos utilizado."
 
-#: ../../mod/sources.php:160
-msgid "Unable to remove source."
-msgstr "Imposible eliminar la fuente."
+#: ../../mod/photos.php:591
+#, php-format
+msgid "%1$.2f MB photo storage used."
+msgstr "%1$.2f MB de almacenamiento de fotos utilizado."
 
-#: ../../mod/menu.php:45
-msgid "Unable to update menu."
-msgstr "No se puede actualizar el menú."
+#: ../../mod/photos.php:619
+msgid "Upload Photos"
+msgstr "Subir fotos"
 
-#: ../../mod/menu.php:56
-msgid "Unable to create menu."
-msgstr "No se puede crear el menú."
+#: ../../mod/photos.php:623
+msgid "Enter an album name"
+msgstr "Introducir un nombre de álbum"
 
-#: ../../mod/menu.php:92 ../../mod/menu.php:104
-msgid "Menu Name"
-msgstr "Nombre del menú"
+#: ../../mod/photos.php:624
+msgid "or select an existing album (doubleclick)"
+msgstr "o seleccionar uno existente (doble click)"
 
-#: ../../mod/menu.php:92
-msgid "Unique name (not visible on webpage) - required"
-msgstr "Nombre único (no será visible en la página web) - requerido"
+#: ../../mod/photos.php:625
+msgid "Create a status post for this upload"
+msgstr "Crear una entrada de estado para esta subida"
 
-#: ../../mod/menu.php:93 ../../mod/menu.php:105
-msgid "Menu Title"
-msgstr "Título del menú"
+#: ../../mod/photos.php:652
+msgid "Album name could not be decoded"
+msgstr "El nombre del álbum no ha podido ser descifrado"
 
-#: ../../mod/menu.php:93
-msgid "Visible on webpage - leave empty for no title"
-msgstr "Visible en la página web - no ponga nada si no desea un título"
+#: ../../mod/photos.php:696 ../../mod/photos.php:1233
+#: ../../mod/photos.php:1250
+msgid "Contact Photos"
+msgstr "Fotos de contacto"
 
-#: ../../mod/menu.php:94
-msgid "Allow Bookmarks"
-msgstr "Permitir marcadores"
+#: ../../mod/photos.php:724
+msgid "Show Newest First"
+msgstr "Mostrar lo más reciente primero"
 
-#: ../../mod/menu.php:94 ../../mod/menu.php:151
-msgid "Menu may be used to store saved bookmarks"
-msgstr "El menú se puede usar para guardar marcadores"
+#: ../../mod/photos.php:726
+msgid "Show Oldest First"
+msgstr "Mostrar lo más antiguo primero"
 
-#: ../../mod/menu.php:95 ../../mod/menu.php:153
-msgid "Submit and proceed"
-msgstr "Enviar y proceder"
+#: ../../mod/photos.php:750 ../../mod/photos.php:1283
+msgid "View Photo"
+msgstr "Ver foto"
 
-#: ../../mod/menu.php:107
-msgid "Drop"
+#: ../../mod/photos.php:779
+msgid "Edit Album"
+msgstr "Editar álbum"
+
+#: ../../mod/photos.php:824
+msgid "Permission denied. Access to this item may be restricted."
+msgstr "Permiso denegado. El acceso a este elemento puede estar restringido."
+
+#: ../../mod/photos.php:826
+msgid "Photo not available"
+msgstr "Foto no disponible"
+
+#: ../../mod/photos.php:884
+msgid "Use as profile photo"
+msgstr "Usar como foto del perfil"
+
+#: ../../mod/photos.php:891
+msgid "Private Photo"
+msgstr "Foto privada"
+
+#: ../../mod/photos.php:902 ../../mod/events.php:528
+msgid "Previous"
+msgstr "Anterior"
+
+#: ../../mod/photos.php:906
+msgid "View Full Size"
+msgstr "Ver tamaño completo"
+
+#: ../../mod/photos.php:911 ../../mod/events.php:529 ../../mod/setup.php:285
+msgid "Next"
+msgstr "Siguiente"
+
+#: ../../mod/photos.php:951 ../../mod/tagrm.php:133
+msgid "Remove"
 msgstr "Eliminar"
 
-#: ../../mod/menu.php:111
-msgid "Bookmarks allowed"
-msgstr "Marcadores permitidos"
+#: ../../mod/photos.php:985
+msgid "Edit photo"
+msgstr "Editar foto"
 
-#: ../../mod/menu.php:113
-msgid "Delete this menu"
-msgstr "Borrar este menú"
+#: ../../mod/photos.php:987
+msgid "Rotate CW (right)"
+msgstr "Girar CW (a la derecha)"
 
-#: ../../mod/menu.php:114 ../../mod/menu.php:148
-msgid "Edit menu contents"
-msgstr "Editar los contenidos del menú"
+#: ../../mod/photos.php:988
+msgid "Rotate CCW (left)"
+msgstr "Girar CCW (a la izquierda)"
 
-#: ../../mod/menu.php:115
-msgid "Edit this menu"
-msgstr "Modificar este menú"
+#: ../../mod/photos.php:991
+msgid "Enter a new album name"
+msgstr "Introducir un nuevo nombre de álbum"
 
-#: ../../mod/menu.php:130
-msgid "Menu could not be deleted."
-msgstr "El menú no puede ser eliminado."
+#: ../../mod/photos.php:992
+msgid "or select an existing one (doubleclick)"
+msgstr "o seleccionar uno (doble click) existente"
 
-#: ../../mod/menu.php:143
-msgid "Edit Menu"
-msgstr "Modificar el menú"
+#: ../../mod/photos.php:995
+msgid "Caption"
+msgstr "Título"
 
-#: ../../mod/menu.php:147
-msgid "Add or remove entries to this menu"
-msgstr "Añadir o quitar entradas en este menú"
+#: ../../mod/photos.php:997
+msgid "Add a Tag"
+msgstr "Añadir una etiqueta"
 
-#: ../../mod/menu.php:149
-msgid "Menu name"
-msgstr "Nombre del menú"
+#: ../../mod/photos.php:1001
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
+msgstr "Ejemplos: @eva, @Carmen_Osuna, @jaime@ejemplo.com"
 
-#: ../../mod/menu.php:149
-msgid "Must be unique, only seen by you"
-msgstr "Debe ser único, solo será visible para usted"
+#: ../../mod/photos.php:1004
+msgid "Flag as adult in album view"
+msgstr "Marcar como \"solo para adultos\" en el álbum"
 
-#: ../../mod/menu.php:150
-msgid "Menu title"
-msgstr "Título del menú"
+#: ../../mod/photos.php:1196
+msgid "In This Photo:"
+msgstr "En esta foto:"
 
-#: ../../mod/menu.php:150
-msgid "Menu title as seen by others"
-msgstr "El título del menú tal como será visto por los demás"
+#: ../../mod/photos.php:1201
+msgid "Map"
+msgstr "Mapa"
 
-#: ../../mod/menu.php:151
-msgid "Allow bookmarks"
-msgstr "Permitir marcadores"
+#: ../../mod/photos.php:1289
+msgid "View Album"
+msgstr "Ver álbum"
+
+#: ../../mod/photos.php:1312
+msgid "Recent Photos"
+msgstr "Fotos recientes"
 
 #: ../../mod/filestorage.php:82
 msgid "Permission Denied."
@@ -5764,1609 +5199,1703 @@ msgstr "Mostrar la dirección de este fichero"
 msgid "Notify your contacts about this file"
 msgstr "Avisar a sus contactos sobre este fichero"
 
-#: ../../mod/fsuggest.php:20 ../../mod/fsuggest.php:92
-msgid "Contact not found."
-msgstr "Contacto no encontrado"
+#: ../../mod/regdir.php:45 ../../mod/dirsearch.php:21
+msgid "This site is not a directory server"
+msgstr "Este sitio no es un servidor de directorio"
 
-#: ../../mod/fsuggest.php:63
-msgid "Friend suggestion sent."
-msgstr "Enviar sugerencia a un amigo."
+#: ../../mod/layouts.php:121 ../../mod/layouts.php:179
+#: ../../mod/editlayout.php:161
+msgid "Layout Name"
+msgstr "Nombre del formato"
 
-#: ../../mod/fsuggest.php:97
-msgid "Suggest Friends"
-msgstr "Sugerir amigos"
+#: ../../mod/layouts.php:124 ../../mod/editlayout.php:159
+msgid "Layout Description (Optional)"
+msgstr "Descripción del formato gráfico (opcional)"
 
-#: ../../mod/fsuggest.php:99
-#, php-format
-msgid "Suggest a friend for %s"
-msgstr "Sugerir un amigo a %s"
+#: ../../mod/layouts.php:176
+msgid "Comanche page description language help"
+msgstr "Página de ayuda del lenguaje de descripción de páginas (PDL) Comanche"
 
-#: ../../mod/magic.php:69
-msgid "Hub not found."
-msgstr "Servidor no encontrado"
+#: ../../mod/layouts.php:180
+msgid "Layout Description"
+msgstr "Descripción del formato"
 
-#: ../../mod/poke.php:159
+#: ../../mod/layouts.php:185
+msgid "Download PDL file"
+msgstr "Descargar el fichero PDL"
+
+#: ../../mod/poke.php:164
 msgid "Poke/Prod"
-msgstr "Dar un toque/Incitar"
+msgstr "Toque/Incitación"
 
-#: ../../mod/poke.php:160
+#: ../../mod/poke.php:165
 msgid "poke, prod or do other things to somebody"
 msgstr "dar un toque, incitar u otras cosas a alguien"
 
-#: ../../mod/poke.php:161
+#: ../../mod/poke.php:166
 msgid "Recipient"
 msgstr "Destinatario"
 
-#: ../../mod/poke.php:162
+#: ../../mod/poke.php:167
 msgid "Choose what you wish to do to recipient"
 msgstr "Elegir qué desea enviar al destinatario"
 
-#: ../../mod/poke.php:165
+#: ../../mod/poke.php:170
 msgid "Make this post private"
 msgstr "Convertir en privado este envío"
 
-#: ../../mod/profperm.php:29 ../../mod/profperm.php:58
-msgid "Invalid profile identifier."
-msgstr "Identificador de perfil no válido"
-
-#: ../../mod/profperm.php:110
-msgid "Profile Visibility Editor"
-msgstr "Editor de visibilidad del perfil"
-
-#: ../../mod/profperm.php:114
-msgid "Click on a contact to add or remove."
-msgstr "Pulsar en un contacto para añadir o eliminar."
-
-#: ../../mod/profperm.php:123
-msgid "Visible To"
-msgstr "Visible para"
-
-#: ../../mod/impel.php:191
-#, php-format
-msgid "%s element installed"
-msgstr "%s elemento instalado"
-
-#: ../../mod/impel.php:194
-#, php-format
-msgid "%s element installation failed"
-msgstr "Elemento con instalación fallida: %s"
-
-#: ../../mod/profiles.php:18 ../../mod/profiles.php:174
-#: ../../mod/profiles.php:231 ../../mod/profiles.php:600
-msgid "Profile not found."
-msgstr "Perfil no encontrado."
-
-#: ../../mod/profiles.php:38
-msgid "Profile deleted."
-msgstr "Perfil eliminado."
-
-#: ../../mod/profiles.php:56 ../../mod/profiles.php:92
-msgid "Profile-"
-msgstr "Perfil-"
-
-#: ../../mod/profiles.php:77 ../../mod/profiles.php:120
-msgid "New profile created."
-msgstr "Creado el nuevo perfil."
-
-#: ../../mod/profiles.php:98
-msgid "Profile unavailable to clone."
-msgstr "Perfil no disponible para clonar."
-
-#: ../../mod/profiles.php:136
-msgid "Profile unavailable to export."
-msgstr "Perfil no disponible para exportar."
-
-#: ../../mod/profiles.php:241
-msgid "Profile Name is required."
-msgstr "Se necesita el nombre del perfil."
-
-#: ../../mod/profiles.php:404
-msgid "Marital Status"
-msgstr "Estado civil"
-
-#: ../../mod/profiles.php:408
-msgid "Romantic Partner"
-msgstr "Pareja sentimental"
-
-#: ../../mod/profiles.php:412
-msgid "Likes"
-msgstr "Me gusta"
-
-#: ../../mod/profiles.php:416
-msgid "Dislikes"
-msgstr "No me gusta"
-
-#: ../../mod/profiles.php:420
-msgid "Work/Employment"
-msgstr "Trabajo:"
-
-#: ../../mod/profiles.php:423
-msgid "Religion"
-msgstr "Religión"
-
-#: ../../mod/profiles.php:427
-msgid "Political Views"
-msgstr "Ideas políticas"
-
-#: ../../mod/profiles.php:431 ../../mod/id.php:33
-msgid "Gender"
-msgstr "Género"
-
-#: ../../mod/profiles.php:435
-msgid "Sexual Preference"
-msgstr "Preferencia sexual"
-
-#: ../../mod/profiles.php:439
-msgid "Homepage"
-msgstr "Página personal"
-
-#: ../../mod/profiles.php:443
-msgid "Interests"
-msgstr "Intereses"
-
-#: ../../mod/profiles.php:447 ../../mod/admin.php:994
-msgid "Address"
-msgstr "Dirección"
-
-#: ../../mod/profiles.php:537
-msgid "Profile updated."
-msgstr "Perfil actualizado."
-
-#: ../../mod/profiles.php:626
-msgid "Hide your contact/friend list from viewers of this profile?"
-msgstr "¿Ocultar su lista de contactos a los visitantes de este perfil?"
-
-#: ../../mod/profiles.php:666
-msgid "Edit Profile Details"
-msgstr "Modificar los detalles de este perfil"
-
-#: ../../mod/profiles.php:668
-msgid "View this profile"
-msgstr "Ver este perfil"
-
-#: ../../mod/profiles.php:670
-msgid "Change Profile Photo"
-msgstr "Cambiar la foto del perfil"
-
-#: ../../mod/profiles.php:671
-msgid "Create a new profile using these settings"
-msgstr "Crear un nuevo perfil usando estos ajustes"
-
-#: ../../mod/profiles.php:672
-msgid "Clone this profile"
-msgstr "Clonar este perfil"
-
-#: ../../mod/profiles.php:673
-msgid "Delete this profile"
-msgstr "Eliminar este perfil"
-
-#: ../../mod/profiles.php:675
-msgid "Import profile from file"
-msgstr "Importar perfil desde un fichero"
-
-#: ../../mod/profiles.php:676
-msgid "Export profile to file"
-msgstr "Exportar perfil a un fichero"
-
-#: ../../mod/profiles.php:677
-msgid "Profile Name:"
-msgstr "Nombre del perfil:"
-
-#: ../../mod/profiles.php:678
-msgid "Your Full Name:"
-msgstr "Su nombre completo:"
-
-#: ../../mod/profiles.php:679
-msgid "Title/Description:"
-msgstr "Título/Descripción:"
-
-#: ../../mod/profiles.php:680
-msgid "Your Gender:"
-msgstr "Su género:"
-
-#: ../../mod/profiles.php:681
-msgid "Birthday :"
-msgstr "Cumpleaños:"
-
-#: ../../mod/profiles.php:682
-msgid "Street Address:"
-msgstr "Calle:"
-
-#: ../../mod/profiles.php:683
-msgid "Locality/City:"
-msgstr "Ciudad:"
-
-#: ../../mod/profiles.php:684
-msgid "Postal/Zip Code:"
-msgstr "Código postal:"
-
-#: ../../mod/profiles.php:685
-msgid "Country:"
-msgstr "País:"
-
-#: ../../mod/profiles.php:686
-msgid "Region/State:"
-msgstr "Región/Estado:"
-
-#: ../../mod/profiles.php:687
-msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
-msgstr "<span class=\"heart\">&hearts;</span> Estado sentimental:"
-
-#: ../../mod/profiles.php:688
-msgid "Who: (if applicable)"
-msgstr "Quién: (si es aplicable)"
-
-#: ../../mod/profiles.php:689
-msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
-msgstr "Por ejemplo: ana123, María González, sara@ejemplo.com"
-
-#: ../../mod/profiles.php:690
-msgid "Since [date]:"
-msgstr "Desde [fecha]:"
-
-#: ../../mod/profiles.php:692
-msgid "Homepage URL:"
-msgstr "Dirección de la página personal:"
-
-#: ../../mod/profiles.php:695
-msgid "Religious Views:"
-msgstr "Creencias religiosas:"
-
-#: ../../mod/profiles.php:696
-msgid "Keywords:"
-msgstr "Palabras clave:"
-
-#: ../../mod/profiles.php:699
-msgid "Example: fishing photography software"
-msgstr "Por ejemplo: software de fotografía submarina"
-
-#: ../../mod/profiles.php:700
-msgid "Used in directory listings"
-msgstr "Visible en el directorio público del canal"
+#: ../../mod/network.php:91
+msgid "No such group"
+msgstr "No se encuentra el grupo"
 
-#: ../../mod/profiles.php:701
-msgid "Tell us about yourself..."
-msgstr "Háblenos de usted..."
+#: ../../mod/network.php:131
+msgid "No such channel"
+msgstr "No se encuentra el  canal"
 
-#: ../../mod/profiles.php:702
-msgid "Hobbies/Interests"
-msgstr "Aficiones/Intereses"
+#: ../../mod/network.php:136
+msgid "forum"
+msgstr "foro"
 
-#: ../../mod/profiles.php:703
-msgid "Contact information and Social Networks"
-msgstr "Información de contacto y redes sociales"
+#: ../../mod/network.php:148
+msgid "Search Results For:"
+msgstr "Buscar resultados para:"
 
-#: ../../mod/profiles.php:704
-msgid "My other channels"
-msgstr "Mis otros canales"
+#: ../../mod/network.php:207
+msgid "Collection is empty"
+msgstr "La colección está vacía"
 
-#: ../../mod/profiles.php:705
-msgid "Musical interests"
-msgstr "Preferencias musicales"
+#: ../../mod/network.php:216
+msgid "Collection: "
+msgstr "Colección:"
 
-#: ../../mod/profiles.php:706
-msgid "Books, literature"
-msgstr "Libros, literatura"
+#: ../../mod/network.php:242
+msgid "Invalid connection."
+msgstr "Conexión no válida."
 
-#: ../../mod/profiles.php:707
-msgid "Television"
-msgstr "Televisión"
+#: ../../mod/chat.php:19 ../../mod/channel.php:25
+msgid "You must be logged in to see this page."
+msgstr "Debe haber iniciado sesión para poder ver esta página."
 
-#: ../../mod/profiles.php:708
-msgid "Film/dance/culture/entertainment"
-msgstr "Cine/danza/cultura/entretenimiento"
+#: ../../mod/chat.php:174
+msgid "Room not found"
+msgstr "Sala no encontrada"
 
-#: ../../mod/profiles.php:709
-msgid "Love/romance"
-msgstr "Vida sentimental/amorosa"
+#: ../../mod/chat.php:185
+msgid "Leave Room"
+msgstr "Abandonar la sala"
 
-#: ../../mod/profiles.php:710
-msgid "Work/employment"
-msgstr "Trabajo"
+#: ../../mod/chat.php:186
+msgid "Delete This Room"
+msgstr "Eliminar esta sala"
 
-#: ../../mod/profiles.php:711
-msgid "School/education"
-msgstr "Estudios"
+#: ../../mod/chat.php:187
+msgid "I am away right now"
+msgstr "Estoy ausente momentáneamente"
 
-#: ../../mod/profiles.php:717
-msgid "This is your default profile."
-msgstr "Este es su perfil principal."
+#: ../../mod/chat.php:188
+msgid "I am online"
+msgstr "Estoy conectado/a"
 
-#: ../../mod/profiles.php:728
-msgid "Age: "
-msgstr "Edad:"
+#: ../../mod/chat.php:190
+msgid "Bookmark this room"
+msgstr "Añadir esta sala a Marcadores"
 
-#: ../../mod/profiles.php:771
-msgid "Edit/Manage Profiles"
-msgstr "Modificar/gestionar perfiles"
+#: ../../mod/chat.php:208 ../../mod/chat.php:231
+msgid "New Chatroom"
+msgstr "Nueva sala de chat"
 
-#: ../../mod/profiles.php:772
-msgid "Add profile things"
-msgstr "Añadir cosas al perfil"
+#: ../../mod/chat.php:209
+msgid "Chatroom Name"
+msgstr "Nombre de la sala de chat"
 
-#: ../../mod/profiles.php:773
-msgid "Include desirable objects in your profile"
-msgstr "Añadir objetos interesantes en su perfil"
+#: ../../mod/chat.php:210
+msgid "Expiration of chats (minutes)"
+msgstr "Tiempo de expiración de los mensajes en los chats (en minutos)"
 
-#: ../../mod/ratings.php:69
-msgid "No ratings"
-msgstr "Ninguna valoración"
+#: ../../mod/chat.php:227
+#, php-format
+msgid "%1$s's Chatrooms"
+msgstr "Salas de chat de %1$s"
 
-#: ../../mod/ratings.php:99
-msgid "Ratings"
-msgstr "Valoraciones"
+#: ../../mod/search.php:209
+#, php-format
+msgid "Items tagged with: %s"
+msgstr "elementos etiquetados con: %s"
 
-#: ../../mod/ratings.php:100
-msgid "Rating: "
-msgstr "Valoración:"
+#: ../../mod/search.php:211
+#, php-format
+msgid "Search results for: %s"
+msgstr "Resultados de la búsqueda para: %s"
 
-#: ../../mod/ratings.php:101
-msgid "Website: "
+#: ../../mod/rate.php:158
+msgid "Website:"
 msgstr "Sitio web:"
 
-#: ../../mod/ratings.php:103
-msgid "Description: "
-msgstr "Descripción:"
-
-#: ../../mod/viewsrc.php:38
-msgid "Source of Item"
-msgstr "Origen del elemento"
-
-#: ../../mod/setup.php:187
-msgid "$Projectname Server - Setup"
-msgstr "Servidor $Projectname  - Instalación"
-
-#: ../../mod/setup.php:191
-msgid "Could not connect to database."
-msgstr "No se ha podido conectar a la base de datos."
-
-#: ../../mod/setup.php:195
-msgid ""
-"Could not connect to specified site URL. Possible SSL certificate or DNS "
-"issue."
-msgstr "No se puede conectar con la dirección del sitio indicada. Podría tratarse de un problema de SSL o DNS."
-
-#: ../../mod/setup.php:202
-msgid "Could not create table."
-msgstr "No se puede crear la tabla."
-
-#: ../../mod/setup.php:207
-msgid "Your site database has been installed."
-msgstr "La base de datos del sitio ha sido instalada."
-
-#: ../../mod/setup.php:211
-msgid ""
-"You may need to import the file \"install/schema_xxx.sql\" manually using a "
-"database client."
-msgstr "Podría tener que importar manualmente el fichero \"install/schema_xxx.sql\" usando un cliente de base de datos."
-
-#: ../../mod/setup.php:212 ../../mod/setup.php:280 ../../mod/setup.php:730
-msgid "Please see the file \"install/INSTALL.txt\"."
-msgstr "Por favor, lea el fichero \"install/INSTALL.txt\"."
-
-#: ../../mod/setup.php:277
-msgid "System check"
-msgstr "Verificación del sistema"
-
-#: ../../mod/setup.php:282
-msgid "Check again"
-msgstr "Verificar de nuevo"
-
-#: ../../mod/setup.php:304
-msgid "Database connection"
-msgstr "Conexión a la base de datos"
-
-#: ../../mod/setup.php:305
-msgid ""
-"In order to install $Projectname we need to know how to connect to your "
-"database."
-msgstr "Para instalar $Projectname es necesario saber cómo conectar con su base de datos."
-
-#: ../../mod/setup.php:306
-msgid ""
-"Please contact your hosting provider or site administrator if you have "
-"questions about these settings."
-msgstr "Por favor, contacte con el proveedor de servicios o el administrador del sitio si tiene dudas sobre estos ajustes."
-
-#: ../../mod/setup.php:307
-msgid ""
-"The database you specify below should already exist. If it does not, please "
-"create it before continuing."
-msgstr "La base de datos que especifique a continuación debe existir ya. Si no es así, por favor, créela antes de seguir."
-
-#: ../../mod/setup.php:311
-msgid "Database Server Name"
-msgstr "Nombre del servidor de base de datos"
-
-#: ../../mod/setup.php:311
-msgid "Default is localhost"
-msgstr "Por defecto es localhost"
-
-#: ../../mod/setup.php:312
-msgid "Database Port"
-msgstr "Puerto de la base de datos"
-
-#: ../../mod/setup.php:312
-msgid "Communication port number - use 0 for default"
-msgstr "Número del puerto de comunicaciones - use 0 como valor por defecto"
-
-#: ../../mod/setup.php:313
-msgid "Database Login Name"
-msgstr "Nombre de acceso a la base de datos"
-
-#: ../../mod/setup.php:314
-msgid "Database Login Password"
-msgstr "Contraseña de acceso a la base de datos"
-
-#: ../../mod/setup.php:315
-msgid "Database Name"
-msgstr "Nombre de la base de datos"
-
-#: ../../mod/setup.php:316
-msgid "Database Type"
-msgstr "Tipo de base de datos"
-
-#: ../../mod/setup.php:318 ../../mod/setup.php:359
-msgid "Site administrator email address"
-msgstr "Dirección de correo electrónico del administrador del sitio"
-
-#: ../../mod/setup.php:318 ../../mod/setup.php:359
-msgid ""
-"Your account email address must match this in order to use the web admin "
-"panel."
-msgstr "Su cuenta deberá usar la misma dirección de correo electrónico para poder utilizar el panel de administración web."
-
-#: ../../mod/setup.php:319 ../../mod/setup.php:361
-msgid "Website URL"
-msgstr "Dirección del sitio web"
-
-#: ../../mod/setup.php:319 ../../mod/setup.php:361
-msgid "Please use SSL (https) URL if available."
-msgstr "Por favor, use SSL (https) si está disponible."
-
-#: ../../mod/setup.php:321 ../../mod/setup.php:363
-msgid "Please select a default timezone for your website"
-msgstr "Por favor, selecciones la zona horaria por defecto de su sitio web"
-
-#: ../../mod/setup.php:348
-msgid "Site settings"
-msgstr "Ajustes del sitio"
-
-#: ../../mod/setup.php:413
-msgid "Could not find a command line version of PHP in the web server PATH."
-msgstr "No se puede encontrar una versión en línea de comandos de PHP en la ruta del servidor web."
-
-#: ../../mod/setup.php:414
-msgid ""
-"If you don't have a command line version of PHP installed on server, you "
-"will not be able to run background polling via cron."
-msgstr "Si no tiene instalada la versión de línea de comandos de PHP en su servidor, no podrá ejecutar votaciones en segundo plano vía cron."
-
-#: ../../mod/setup.php:418
-msgid "PHP executable path"
-msgstr "ruta del ejecutable PHP"
-
-#: ../../mod/setup.php:418
-msgid ""
-"Enter full path to php executable. You can leave this blank to continue the "
-"installation."
-msgstr "Introducir la ruta completa del ejecutable PHP. Puede dejar la línea en blanco para continuar la instalación."
-
-#: ../../mod/setup.php:423
-msgid "Command line PHP"
-msgstr "PHP en línea de comandos"
-
-#: ../../mod/setup.php:432
-msgid ""
-"The command line version of PHP on your system does not have "
-"\"register_argc_argv\" enabled."
-msgstr "La línea de comandos PHP de su sistema no tiene activado \"register_argc_argv\"."
-
-#: ../../mod/setup.php:433
-msgid "This is required for message delivery to work."
-msgstr "Esto es necesario para que funcione la entrega de mensajes."
-
-#: ../../mod/setup.php:436
-msgid "PHP register_argc_argv"
-msgstr "PHP register_argc_argv"
-
-#: ../../mod/setup.php:454
+#: ../../mod/rate.php:161
 #, php-format
-msgid ""
-"Your max allowed total upload size is set to %s. Maximum size of one file to"
-" upload is set to %s. You are allowed to upload up to %d files at once."
-msgstr "La carga máxima que se le permite subir está establecida en %s. El tamaño máximo de un fichero está establecido en %s. Está permitido subir hasta un máximo de %d ficheros de una sola vez."
-
-#: ../../mod/setup.php:459
-msgid "You can adjust these settings in the servers php.ini."
-msgstr "Puede ajustar estos valores en el fichero php.ini de su servidor."
-
-#: ../../mod/setup.php:461
-msgid "PHP upload limits"
-msgstr "Límites PHP de subida"
-
-#: ../../mod/setup.php:484
-msgid ""
-"Error: the \"openssl_pkey_new\" function on this system is not able to "
-"generate encryption keys"
-msgstr "Error: La función \"openssl_pkey_new\" en este sistema no es capaz de general claves de cifrado."
-
-#: ../../mod/setup.php:485
-msgid ""
-"If running under Windows, please see "
-"\"http://www.php.net/manual/en/openssl.installation.php\"."
-msgstr "si está en un servidor Windows, por favor, lea \"http://www.php.net/manual/en/openssl.installation.php\"."
-
-#: ../../mod/setup.php:488
-msgid "Generate encryption keys"
-msgstr "Generar claves de cifrado"
-
-#: ../../mod/setup.php:500
-msgid "libCurl PHP module"
-msgstr "módulo libCurl PHP"
+msgid "Remote Channel [%s] (not yet known on this site)"
+msgstr "Canal remoto [%s] (aún no es conocido en este sitio)"
 
-#: ../../mod/setup.php:501
-msgid "GD graphics PHP module"
-msgstr "módulo PHP GD graphics"
+#: ../../mod/rate.php:162
+msgid "Rating (this information is public)"
+msgstr "Valoración (esta información es pública)"
 
-#: ../../mod/setup.php:502
-msgid "OpenSSL PHP module"
-msgstr "módulo PHP OpenSSL"
+#: ../../mod/rate.php:163
+msgid "Optionally explain your rating (this information is public)"
+msgstr "Opcionalmente puede explicar su valoración (esta información es pública)"
 
-#: ../../mod/setup.php:503
-msgid "mysqli or postgres PHP module"
-msgstr "módulo PHP mysqli o postgres"
+#: ../../mod/mail.php:33
+msgid "Unable to lookup recipient."
+msgstr "Imposible asociar a un destinatario."
 
-#: ../../mod/setup.php:504
-msgid "mb_string PHP module"
-msgstr "módulo PHP mb_string"
+#: ../../mod/mail.php:41
+msgid "Unable to communicate with requested channel."
+msgstr "Imposible comunicar con el canal solicitado."
 
-#: ../../mod/setup.php:505
-msgid "mcrypt PHP module"
-msgstr "módulo PHP mcrypt "
+#: ../../mod/mail.php:48
+msgid "Cannot verify requested channel."
+msgstr "No se puede verificar el canal solicitado."
 
-#: ../../mod/setup.php:506
-msgid "xml PHP module"
-msgstr "módulo PHP xml"
+#: ../../mod/mail.php:74
+msgid "Selected channel has private message restrictions. Send failed."
+msgstr "El canal seleccionado tiene restricciones sobre los mensajes privados. El envío falló."
 
-#: ../../mod/setup.php:510 ../../mod/setup.php:512
-msgid "Apache mod_rewrite module"
-msgstr "módulo Apache mod_rewrite "
+#: ../../mod/mail.php:132
+msgid "Messages"
+msgstr "Mensajes"
 
-#: ../../mod/setup.php:510
-msgid ""
-"Error: Apache webserver mod-rewrite module is required but not installed."
-msgstr "Error: se necesita el módulo del servidor web Apache mod-rewrite pero no está instalado."
+#: ../../mod/mail.php:167
+msgid "Message recalled."
+msgstr "Mensaje revocado."
 
-#: ../../mod/setup.php:516 ../../mod/setup.php:519
-msgid "proc_open"
-msgstr "proc_open"
+#: ../../mod/mail.php:180
+msgid "Conversation removed."
+msgstr "Conversación eliminada."
 
-#: ../../mod/setup.php:516
-msgid ""
-"Error: proc_open is required but is either not installed or has been "
-"disabled in php.ini"
-msgstr "Error: se necesita proc_open pero o no está instalado o ha sido desactivado en el fichero php.ini"
+#: ../../mod/mail.php:223
+msgid "Requested channel is not in this network"
+msgstr "El canal solicitado no existe en esta red"
 
-#: ../../mod/setup.php:524
-msgid "Error: libCURL PHP module required but not installed."
-msgstr "Error: se necesita el módulo PHP libCURL pero no está instalado."
+#: ../../mod/mail.php:231
+msgid "Send Private Message"
+msgstr "Enviar un mensaje privado"
 
-#: ../../mod/setup.php:528
-msgid ""
-"Error: GD graphics PHP module with JPEG support required but not installed."
-msgstr "Error: el módulo PHP GD graphics es necesario, pero no está instalado."
+#: ../../mod/mail.php:232 ../../mod/mail.php:361
+msgid "To:"
+msgstr "Para:"
 
-#: ../../mod/setup.php:532
-msgid "Error: openssl PHP module required but not installed."
-msgstr "Error: el módulo PHP openssl es necesario, pero no está instalado."
+#: ../../mod/mail.php:235 ../../mod/mail.php:363
+msgid "Subject:"
+msgstr "Asunto:"
 
-#: ../../mod/setup.php:536
-msgid ""
-"Error: mysqli or postgres PHP module required but neither are installed."
-msgstr "Error: el módulo PHP mysqli o postgres es necesario pero no ninguno de los dos está instalado."
+#: ../../mod/mail.php:238 ../../mod/invite.php:131
+msgid "Your message:"
+msgstr "Su mensaje:"
 
-#: ../../mod/setup.php:540
-msgid "Error: mb_string PHP module required but not installed."
-msgstr "Error: el módulo PHP mb_string es necesario, pero no está instalado."
+#: ../../mod/mail.php:242
+msgid "Send"
+msgstr "Enviar"
 
-#: ../../mod/setup.php:544
-msgid "Error: mcrypt PHP module required but not installed."
-msgstr "Error: el módulo PHP mcrypt es necesario, pero no está instalado."
+#: ../../mod/mail.php:333
+msgid "Delete message"
+msgstr "Borrar mensaje"
 
-#: ../../mod/setup.php:548
-msgid "Error: xml PHP module required for DAV but not installed."
-msgstr "Error: el módulo PHP xml es necesario para DAV, pero no está instalado."
+#: ../../mod/mail.php:334
+msgid "Delivery report"
+msgstr "Informe de transmisión"
 
-#: ../../mod/setup.php:566
-msgid ""
-"The web installer needs to be able to create a file called \".htconfig.php\""
-" in the top folder of your web server and it is unable to do so."
-msgstr "El instalador web no ha podido crear un fichero llamado “.htconfig.php” en la carpeta base de su servidor."
+#: ../../mod/mail.php:335
+msgid "Recall message"
+msgstr "Revocar el mensaje"
 
-#: ../../mod/setup.php:567
-msgid ""
-"This is most often a permission setting, as the web server may not be able "
-"to write files in your folder - even if you can."
-msgstr "Esto está generalmente ligado a un problema de permisos, a causa del cual el servidor web tiene prohibido modificar ficheros en su carpeta - incluso si usted mismo tiene esos permisos."
+#: ../../mod/mail.php:337
+msgid "Message has been recalled."
+msgstr "El mensaje ha sido revocado."
 
-#: ../../mod/setup.php:568
-msgid ""
-"At the end of this procedure, we will give you a text to save in a file "
-"named .htconfig.php in your Red top folder."
-msgstr "Al término de este procedimiento, podemos crear un fichero de texto para guardar con el nombre .htconfig.php en el directorio raíz de su instalación de Red."
+#: ../../mod/mail.php:354
+msgid "Delete Conversation"
+msgstr "Eliminar Conversación"
 
-#: ../../mod/setup.php:569
+#: ../../mod/mail.php:356
 msgid ""
-"You can alternatively skip this procedure and perform a manual installation."
-" Please see the file \"install/INSTALL.txt\" for instructions."
-msgstr "Como alternativa, puede dejar este procedimiento e intentar realizar una instalación manual. Lea, por favor, el fichero\"install/INSTALL.txt\" para las instrucciones."
-
-#: ../../mod/setup.php:572
-msgid ".htconfig.php is writable"
-msgstr ".htconfig.php tiene permisos de escritura"
+"No secure communications available. You <strong>may</strong> be able to "
+"respond from the sender's profile page."
+msgstr "Comunicación segura no disponible. Pero <strong>puede</strong> responder desde la página del perfil del remitente."
 
-#: ../../mod/setup.php:586
-msgid ""
-"Red uses the Smarty3 template engine to render its web views. Smarty3 "
-"compiles templates to PHP to speed up rendering."
-msgstr "Red hace uso del motor de plantillas Smarty3 para diseñar sus plantillas gráficas. Smarty3 es más rápido porque compila las plantillas de páginas directamente en PHP."
+#: ../../mod/mail.php:360
+msgid "Send Reply"
+msgstr "Responder"
 
-#: ../../mod/setup.php:587
+#: ../../mod/mail.php:365
 #, php-format
-msgid ""
-"In order to store these compiled templates, the web server needs to have "
-"write access to the directory %s under the Red top level folder."
-msgstr "Para poder guardar las plantillas compiladas, el servidor web necesita permisos para acceder al subdirectorio %s en el directorio de instalación de Red."
+msgid "Your message for %s (%s):"
+msgstr "Su mensaje para %s (%s):"
 
-#: ../../mod/setup.php:588 ../../mod/setup.php:609
-msgid ""
-"Please ensure that the user that your web server runs as (e.g. www-data) has"
-" write access to this folder."
-msgstr "Por favor, asegúrese de que el servidor web está siendo ejecutado por un usuario que tenga permisos de escritura sobre esta carpeta (por ejemplo, www-data)."
+#: ../../mod/dreport.php:23
+msgid "Invalid message"
+msgstr "Mensaje no válido"
 
-#: ../../mod/setup.php:589
-#, php-format
-msgid ""
-"Note: as a security measure, you should give the web server write access to "
-"%s only--not the template files (.tpl) that it contains."
-msgstr "Nota: como medida de seguridad, debe dar al servidor web permisos de escritura solo sobre %s -no al fichero de plantilla (.tpl) que contiene."
+#: ../../mod/dreport.php:55
+msgid "no results"
+msgstr "sin resultados"
 
-#: ../../mod/setup.php:592
+#: ../../mod/dreport.php:60
 #, php-format
-msgid "%s is writable"
-msgstr "%s tiene permisos de escritura"
+msgid "Delivery report for %1$s"
+msgstr "Informe de entrega para %1$s"
 
-#: ../../mod/setup.php:608
-msgid ""
-"Red uses the store directory to save uploaded files. The web server needs to"
-" have write access to the store directory under the Red top level folder"
-msgstr "Red guarda los ficheros descargados en la carpeta \"store\". El servidor web necesita tener permisos de escritura sobre esa carpeta, en el directorio de instalación."
+#: ../../mod/dreport.php:74
+msgid "channel sync processed"
+msgstr "se ha realizado la sincronización del canal"
 
-#: ../../mod/setup.php:612
-msgid "store is writable"
-msgstr "\"store\" tiene permisos de escritura"
+#: ../../mod/dreport.php:78
+msgid "queued"
+msgstr "encolado"
 
-#: ../../mod/setup.php:645
-msgid ""
-"SSL certificate cannot be validated. Fix certificate or disable https access"
-" to this site."
-msgstr "El certificado SSL no ha podido ser validado. Corrija este problema o desactive el acceso https a este sitio."
+#: ../../mod/dreport.php:82
+msgid "posted"
+msgstr "enviado"
 
-#: ../../mod/setup.php:646
-msgid ""
-"If you have https access to your website or allow connections to TCP port "
-"443 (the https: port), you MUST use a browser-valid certificate. You MUST "
-"NOT use self-signed certificates!"
-msgstr "Si su servidor soporta conexiones cifradas SSL o si permite conexiones al puerto TCP 443 (el puerto usado por el protocolo https), debe utilizar un certificado válido. No debe usar un certificado firmado por usted mismo."
+#: ../../mod/dreport.php:86
+msgid "accepted for delivery"
+msgstr "aceptado para el envío"
 
-#: ../../mod/setup.php:647
-msgid ""
-"This restriction is incorporated because public posts from you may for "
-"example contain references to images on your own hub."
-msgstr "Se ha incorporado esta restricción para evitar que sus publicaciones públicas hagan referencia a imágenes en su propio servidor."
+#: ../../mod/dreport.php:90
+msgid "updated"
+msgstr "actualizado"
 
-#: ../../mod/setup.php:648
-msgid ""
-"If your certificate is not recognized, members of other sites (who may "
-"themselves have valid certificates) will get a warning message on their own "
-"site complaining about security issues."
-msgstr "Si su certificado no ha sido reconocido, los miembros de otros sitios (con certificados válidos) recibirán mensajes de aviso en sus propios sitios web."
+#: ../../mod/dreport.php:93
+msgid "update ignored"
+msgstr "actualización ignorada"
 
-#: ../../mod/setup.php:649
-msgid ""
-"This can cause usability issues elsewhere (not just on your own site) so we "
-"must insist on this requirement."
-msgstr "Por razones de compatibilidad (sobre el conjunto de la red, no solo sobre su propio sitio), debemos insistir en estos requisitos."
+#: ../../mod/dreport.php:96
+msgid "permission denied"
+msgstr "permiso denegado"
 
-#: ../../mod/setup.php:650
-msgid ""
-"Providers are available that issue free certificates which are browser-"
-"valid."
-msgstr "Existen varias Autoridades de Certificación que le pueden proporcionar certificados válidos."
+#: ../../mod/dreport.php:100
+msgid "recipient not found"
+msgstr "destinatario no encontrado"
 
-#: ../../mod/setup.php:652
-msgid "SSL certificate validation"
-msgstr "validación del certificado SSL"
+#: ../../mod/dreport.php:103
+msgid "mail recalled"
+msgstr "mensaje de correo revocado"
 
-#: ../../mod/setup.php:658
-msgid ""
-"Url rewrite in .htaccess is not working. Check your server "
-"configuration.Test: "
-msgstr "No se pueden reescribir las direcciones web en .htaccess. Compruebe la configuración de su servidor:"
-
-#: ../../mod/setup.php:661
-msgid "Url rewrite is working"
-msgstr "La reescritura de la direcciones funciona correctamente"
-
-#: ../../mod/setup.php:670
-msgid ""
-"The database configuration file \".htconfig.php\" could not be written. "
-"Please use the enclosed text to create a configuration file in your web "
-"server root."
-msgstr "El fichero de configuración de la base de datos .htconfig.php no se ha podido modificar. Por favor, copie el texto generado en un fichero con ese nombre en el directorio raíz de su servidor."
+#: ../../mod/dreport.php:106
+msgid "duplicate mail received"
+msgstr "se ha recibido mensaje duplicado"
 
-#: ../../mod/setup.php:694
-msgid "Errors encountered creating database tables."
-msgstr "Se han encontrado errores al crear las tablas de la base de datos."
+#: ../../mod/dreport.php:109
+msgid "mail delivered"
+msgstr "correo enviado"
 
-#: ../../mod/setup.php:728
-msgid "<h1>What next</h1>"
-msgstr "<h1>Siguiente paso</h1>"
+#: ../../mod/editblock.php:78 ../../mod/editblock.php:94
+#: ../../mod/editpost.php:20 ../../mod/editlayout.php:76
+#: ../../mod/editwebpage.php:77
+msgid "Item not found"
+msgstr "Elemento no encontrado"
 
-#: ../../mod/setup.php:729
-msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the "
-"poller."
-msgstr "IMPORTANTE: Debe crear [manualmente] una tarea programada para las actualizaciones."
+#: ../../mod/editblock.php:118
+msgid "Delete block?"
+msgstr "¿Borrar bloque?"
 
-#: ../../mod/openid.php:26
-msgid "OpenID protocol error. No ID returned."
-msgstr "Error del protocolo OpenID. Ningún ID recibido como respuesta."
+#: ../../mod/editblock.php:145 ../../mod/editpost.php:122
+#: ../../mod/editlayout.php:143 ../../mod/editwebpage.php:185
+msgid "Insert YouTube video"
+msgstr "Insertar vídeo de YouTube"
 
-#: ../../mod/openid.php:72 ../../mod/openid.php:180 ../../mod/post.php:286
-#, php-format
-msgid "Welcome %s. Remote authentication successful."
-msgstr "Bienvenido %s. La identificación desde su servidor se ha llevado a cabo correctamente."
+#: ../../mod/editblock.php:146 ../../mod/editpost.php:123
+#: ../../mod/editlayout.php:144 ../../mod/editwebpage.php:186
+msgid "Insert Vorbis [.ogg] video"
+msgstr "Insertar vídeo Vorbis [.ogg]"
 
-#: ../../mod/tagger.php:96
-#, php-format
-msgid "%1$s tagged %2$s's %3$s with %4$s"
-msgstr "%1$s ha etiquetado el %3$s de %2$s con %4$s"
+#: ../../mod/editblock.php:147 ../../mod/editpost.php:124
+#: ../../mod/editlayout.php:145 ../../mod/editwebpage.php:187
+msgid "Insert Vorbis [.ogg] audio"
+msgstr "Insertar audio Vorbis [.ogg]"
 
-#: ../../mod/uexport.php:45 ../../mod/uexport.php:46
-msgid "Export Channel"
-msgstr "Exportar el canal"
+#: ../../mod/editblock.php:180
+msgid "Edit Block"
+msgstr "Modificar este bloque"
 
-#: ../../mod/uexport.php:47
-msgid ""
-"Export your basic channel information to a small file.  This acts as a "
-"backup of your connections, permissions, profile and basic data, which can "
-"be used to import your data to a new hub, but\tdoes not contain your "
-"content."
-msgstr "Exportar la base de datos de su canal a un pequeño fichero. Este podrá servir como una copia de seguridad de sus conexiones, permisos, perfil y datos básicos, que podrá importar a un nuevo canal, pero sin sus contenidos."
+#: ../../mod/dirsearch.php:29
+msgid "This directory server requires an access token"
+msgstr "El servidor de este directorio necesita un \"token\" de acceso"
 
-#: ../../mod/uexport.php:48
-msgid "Export Content"
-msgstr "Exportar contenidos"
+#: ../../mod/editpost.php:31
+msgid "Item is not editable"
+msgstr "El elemento no es editable"
 
-#: ../../mod/uexport.php:49
-msgid ""
-"Export your channel information and all the content to a JSON backup. This "
-"backs up all of your connections, permissions, profile data and all of your "
-"content, but is generally not suitable for importing a channel to a new hub "
-"as this file may be VERY large.  Please be patient - it may take several "
-"minutes for this download to begin."
-msgstr "Exportar toda la información del canal y todo su contenido a un fichero JSON. Este contendrá todas sus conexiones, permisos, información del perfil y todo su contenido, Sin embargo, a menudo, no será una buena solución para importarlo en una nueva instancia, pues el fichero será MUY voluminoso. Por favor, tenga paciencia - pueden pasar muchos minutos antes de que comience la carga."
+#: ../../mod/editpost.php:55
+msgid "Delete item?"
+msgstr "¿Borrar elemento?"
 
-#: ../../mod/viewconnections.php:62
-msgid "No connections."
-msgstr "Sin conexiones."
+#: ../../mod/editpost.php:165 ../../mod/rpost.php:128
+msgid "Edit post"
+msgstr "Editar la entrada"
 
-#: ../../mod/viewconnections.php:75
-#, php-format
-msgid "Visit %s's profile [%s]"
-msgstr "Visitar el perfil de %s [%s]"
+#: ../../mod/oexchange.php:23
+msgid "Unable to find your hub."
+msgstr "No se puede encontrar su servidor."
 
-#: ../../mod/zfinger.php:23
-msgid "invalid target signature"
-msgstr "La firma recibida no es válida"
+#: ../../mod/oexchange.php:37
+msgid "Post successful."
+msgstr "Enviado con éxito."
 
 #: ../../mod/admin.php:52
 msgid "Theme settings updated."
 msgstr "Ajustes del tema actualizados."
 
-#: ../../mod/admin.php:93 ../../mod/admin.php:452
-msgid "Site"
-msgstr "Sitio"
-
-#: ../../mod/admin.php:94
-msgid "Accounts"
-msgstr "Cuentas"
-
-#: ../../mod/admin.php:95 ../../mod/admin.php:985
-msgid "Channels"
-msgstr "Canales"
-
-#: ../../mod/admin.php:96 ../../mod/admin.php:1077 ../../mod/admin.php:1117
-msgid "Plugins"
-msgstr "Extensiones"
-
-#: ../../mod/admin.php:97 ../../mod/admin.php:1277 ../../mod/admin.php:1311
-msgid "Themes"
-msgstr "Temas"
-
-#: ../../mod/admin.php:98
-msgid "Inspect queue"
-msgstr "Examinar la cola"
-
-#: ../../mod/admin.php:100
-msgid "Profile Config"
-msgstr "Ajustes del perfil"
-
-#: ../../mod/admin.php:101
-msgid "DB updates"
-msgstr "Actualizaciones de la base de datos"
-
-#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1396
-msgid "Logs"
-msgstr "Informes"
-
-#: ../../mod/admin.php:121
-msgid "Plugin Features"
-msgstr "Ajustes de la extensión"
-
-#: ../../mod/admin.php:123
-msgid "User registrations waiting for confirmation"
-msgstr "Registros de usuarios pendientes de confirmación"
-
-#: ../../mod/admin.php:200
+#: ../../mod/admin.php:160
 msgid "# Accounts"
 msgstr "# Cuentas"
 
-#: ../../mod/admin.php:201
+#: ../../mod/admin.php:161
 msgid "# blocked accounts"
 msgstr "# cuentas bloqueadas"
 
-#: ../../mod/admin.php:202
+#: ../../mod/admin.php:162
 msgid "# expired accounts"
 msgstr "# cuentas caducadas"
 
-#: ../../mod/admin.php:203
+#: ../../mod/admin.php:163
 msgid "# expiring accounts"
 msgstr "# cuentas que caducan"
 
-#: ../../mod/admin.php:216
+#: ../../mod/admin.php:174
 msgid "# Channels"
 msgstr "# Canales"
 
-#: ../../mod/admin.php:217
+#: ../../mod/admin.php:175
 msgid "# primary"
 msgstr "# primario"
 
-#: ../../mod/admin.php:218
+#: ../../mod/admin.php:176
 msgid "# clones"
 msgstr "# clones"
 
-#: ../../mod/admin.php:224
+#: ../../mod/admin.php:182
 msgid "Message queues"
 msgstr "Mensajes en cola"
 
-#: ../../mod/admin.php:240 ../../mod/admin.php:451 ../../mod/admin.php:548
-#: ../../mod/admin.php:817 ../../mod/admin.php:984 ../../mod/admin.php:1076
-#: ../../mod/admin.php:1116 ../../mod/admin.php:1276 ../../mod/admin.php:1310
-#: ../../mod/admin.php:1395
+#: ../../mod/admin.php:198 ../../mod/admin.php:409 ../../mod/admin.php:506
+#: ../../mod/admin.php:774 ../../mod/admin.php:938 ../../mod/admin.php:1030
+#: ../../mod/admin.php:1070 ../../mod/admin.php:1230 ../../mod/admin.php:1264
+#: ../../mod/admin.php:1349
 msgid "Administration"
 msgstr "Administración"
 
-#: ../../mod/admin.php:241
+#: ../../mod/admin.php:199
 msgid "Summary"
 msgstr "Sumario"
 
-#: ../../mod/admin.php:244
+#: ../../mod/admin.php:202
 msgid "Registered accounts"
 msgstr "Cuentas registradas"
 
-#: ../../mod/admin.php:245 ../../mod/admin.php:552
+#: ../../mod/admin.php:203 ../../mod/admin.php:510
 msgid "Pending registrations"
 msgstr "Registros pendientes"
 
-#: ../../mod/admin.php:246
+#: ../../mod/admin.php:204
 msgid "Registered channels"
 msgstr "Canales registrados"
 
-#: ../../mod/admin.php:247 ../../mod/admin.php:553
+#: ../../mod/admin.php:205 ../../mod/admin.php:511
 msgid "Active plugins"
 msgstr "Extensiones activas"
 
-#: ../../mod/admin.php:248
+#: ../../mod/admin.php:206
 msgid "Version"
 msgstr "Versión"
 
-#: ../../mod/admin.php:363
+#: ../../mod/admin.php:321
 msgid "Site settings updated."
 msgstr "Ajustes del sitio actualizados."
 
-#: ../../mod/admin.php:400 ../../mod/settings.php:813
+#: ../../mod/admin.php:358 ../../mod/settings.php:790
 msgid "mobile"
 msgstr "móvil"
 
-#: ../../mod/admin.php:402
+#: ../../mod/admin.php:360
 msgid "experimental"
 msgstr "experimental"
 
-#: ../../mod/admin.php:404
+#: ../../mod/admin.php:362
 msgid "unsupported"
 msgstr "no soportado"
 
-#: ../../mod/admin.php:429
+#: ../../mod/admin.php:387
 msgid "Yes - with approval"
 msgstr "Sí - con aprobación"
 
-#: ../../mod/admin.php:435
+#: ../../mod/admin.php:393
 msgid "My site is not a public server"
 msgstr "Mi sitio no es un servidor público"
 
-#: ../../mod/admin.php:436
+#: ../../mod/admin.php:394
 msgid "My site has paid access only"
 msgstr "Mi sitio es un servicio de pago"
 
-#: ../../mod/admin.php:437
+#: ../../mod/admin.php:395
 msgid "My site has free access only"
 msgstr "Mi sitio es un servicio gratuito"
 
-#: ../../mod/admin.php:438
+#: ../../mod/admin.php:396
 msgid "My site offers free accounts with optional paid upgrades"
 msgstr "Mi sitio ofrece cuentas gratuitas con opciones extra de pago"
 
-#: ../../mod/admin.php:454 ../../mod/register.php:207
+#: ../../mod/admin.php:412 ../../mod/register.php:207
 msgid "Registration"
 msgstr "Registro"
 
-#: ../../mod/admin.php:455
+#: ../../mod/admin.php:413
 msgid "File upload"
 msgstr "Fichero subido"
 
-#: ../../mod/admin.php:456
+#: ../../mod/admin.php:414
 msgid "Policies"
 msgstr "Políticas"
 
-#: ../../mod/admin.php:461
+#: ../../mod/admin.php:419
 msgid "Site name"
 msgstr "Nombre del sitio"
 
-#: ../../mod/admin.php:462
+#: ../../mod/admin.php:420
 msgid "Banner/Logo"
 msgstr "Banner/Logo"
 
-#: ../../mod/admin.php:463
+#: ../../mod/admin.php:421
 msgid "Administrator Information"
 msgstr "Información del Administrador"
 
-#: ../../mod/admin.php:463
+#: ../../mod/admin.php:421
 msgid ""
 "Contact information for site administrators.  Displayed on siteinfo page.  "
 "BBCode can be used here"
 msgstr "Información de contacto de los administradores del sitio. Visible en la página \"siteinfo\". Se puede usar BBCode"
 
-#: ../../mod/admin.php:464
+#: ../../mod/admin.php:422
 msgid "System language"
 msgstr "Idioma del sistema"
 
-#: ../../mod/admin.php:465
+#: ../../mod/admin.php:423
 msgid "System theme"
 msgstr "Tema gráfico del sistema"
 
-#: ../../mod/admin.php:465
+#: ../../mod/admin.php:423
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
-msgstr "Tema del sistema por defecto - se puede cambiar por cada perfil de usuario - <a href='#' id='cnftheme'>modificar ajustes del tema</a>"
+msgstr "Tema del sistema por defecto - se puede cambiar por cada perfil de usuario - <a href='#' id='cnftheme'>modificar los ajustes del tema</a>"
 
-#: ../../mod/admin.php:466
+#: ../../mod/admin.php:424
 msgid "Mobile system theme"
 msgstr "Tema del sistema para móviles"
 
-#: ../../mod/admin.php:466
+#: ../../mod/admin.php:424
 msgid "Theme for mobile devices"
-msgstr "Tema para aparatos móviles"
+msgstr "Tema para dispositivos móviles"
 
-#: ../../mod/admin.php:468
-msgid "Enable Diaspora Protocol"
-msgstr "Activar el protocolo de la red social Diaspora"
-
-#: ../../mod/admin.php:468
-msgid "Communicate with Diaspora and Friendica - experimental"
-msgstr "Comunicar con Diaspora y Friendica - experimental"
-
-#: ../../mod/admin.php:469
+#: ../../mod/admin.php:426
 msgid "Allow Feeds as Connections"
 msgstr "Permitir flujos RSS como conexiones"
 
-#: ../../mod/admin.php:469
+#: ../../mod/admin.php:426
 msgid "(Heavy system resource usage)"
 msgstr "(Uso intenso de los recursos del sistema)"
 
-#: ../../mod/admin.php:470
+#: ../../mod/admin.php:427
 msgid "Maximum image size"
-msgstr "Tamaño máximo de imagen"
+msgstr "Tamaño máximo de la imagen"
 
-#: ../../mod/admin.php:470
+#: ../../mod/admin.php:427
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr "Tamaño máximo en bytes de la imagen subida. Por defecto, es 0, lo que significa que no hay límites."
 
-#: ../../mod/admin.php:471
+#: ../../mod/admin.php:428
 msgid "Does this site allow new member registration?"
 msgstr "¿Debe este sitio permitir el registro de nuevos miembros?"
 
-#: ../../mod/admin.php:472
+#: ../../mod/admin.php:429
 msgid "Which best describes the types of account offered by this hub?"
 msgstr "¿Cómo describiría el tipo de servicio ofrecido por este servidor?"
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:430
 msgid "Register text"
 msgstr "Texto del registro"
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:430
 msgid "Will be displayed prominently on the registration page."
 msgstr "Se mostrará de forma destacada en la página de registro."
 
-#: ../../mod/admin.php:474
+#: ../../mod/admin.php:431
 msgid "Site homepage to show visitors (default: login box)"
 msgstr "Página personal que se mostrará a los visitantes (por defecto: la página de identificación)"
 
-#: ../../mod/admin.php:474
+#: ../../mod/admin.php:431
 msgid ""
 "example: 'public' to show public stream, 'page/sys/home' to show a system "
 "webpage called 'home' or 'include:home.html' to include a file."
 msgstr "ejemplo: 'public' para mostrar contenido público de los usuarios, 'page/sys/home' para mostrar la página web definida como \"home\" o 'include:home.html' para mostrar el contenido de un fichero."
 
-#: ../../mod/admin.php:475
+#: ../../mod/admin.php:432
 msgid "Preserve site homepage URL"
 msgstr "Preservar la dirección de la página personal"
 
-#: ../../mod/admin.php:475
+#: ../../mod/admin.php:432
 msgid ""
 "Present the site homepage in a frame at the original location instead of "
 "redirecting"
 msgstr "Presenta la página personal del sitio en un marco en la ubicación original, en vez de redirigirla."
 
-#: ../../mod/admin.php:476
+#: ../../mod/admin.php:433
 msgid "Accounts abandoned after x days"
-msgstr "Cuentas abandonados después de x días"
+msgstr "Cuentas abandonadas después de x días"
 
-#: ../../mod/admin.php:476
+#: ../../mod/admin.php:433
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr "Para evitar consumir recursos del sistema intentando poner al día las cuentas abandonadas. Introduzca 0 para no tener límite de tiempo."
 
-#: ../../mod/admin.php:477
+#: ../../mod/admin.php:434
 msgid "Allowed friend domains"
 msgstr "Dominios amigos permitidos"
 
-#: ../../mod/admin.php:477
+#: ../../mod/admin.php:434
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr "Lista separada por comas de dominios a los que está permitido establecer relaciones de amistad con este sitio. Se permiten comodines. Dejar en claro para aceptar cualquier dominio."
 
-#: ../../mod/admin.php:478
+#: ../../mod/admin.php:435
 msgid "Allowed email domains"
 msgstr "Se aceptan dominios de correo electrónico"
 
-#: ../../mod/admin.php:478
+#: ../../mod/admin.php:435
 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 "Lista separada por comas de los dominios de los que se acepta una dirección de correo electrónico para registros en este sitio. Se permiten comodines. Dejar en claro para aceptar cualquier dominio. "
 
-#: ../../mod/admin.php:479
+#: ../../mod/admin.php:436
 msgid "Not allowed email domains"
 msgstr "No se permiten dominios de correo electrónico"
 
-#: ../../mod/admin.php:479
+#: ../../mod/admin.php:436
 msgid ""
 "Comma separated list of domains which are not allowed in email addresses for"
 " registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains, unless allowed domains have been defined."
 msgstr "Lista separada por comas de los dominios de los que no se acepta una dirección de correo electrónico para registros en este sitio. Se permiten comodines. Dejar en claro para no aceptar cualquier dominio, excepto los que se hayan autorizado."
 
-#: ../../mod/admin.php:480
+#: ../../mod/admin.php:437
 msgid "Block public"
-msgstr "Bloquear página pública"
+msgstr "Bloquear páginas públicas"
 
-#: ../../mod/admin.php:480
+#: ../../mod/admin.php:437
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently logged in."
-msgstr "Activar para bloquear el acceso público a todas las páginas públicas personales en este sitio salvo que estén identificadas en el sistema."
+msgstr "Activar para bloquear el acceso a todas las páginas públicas personales en este sitio, salvo que estén identificadas en el sistema."
 
-#: ../../mod/admin.php:481
+#: ../../mod/admin.php:438
 msgid "Verify Email Addresses"
-msgstr "Verificar direcciones de correo electrónico"
+msgstr "Verificar las direcciones de correo electrónico"
 
-#: ../../mod/admin.php:481
+#: ../../mod/admin.php:438
 msgid ""
 "Check to verify email addresses used in account registration (recommended)."
 msgstr "Activar para la verificación de la dirección de correo electrónico en el registro de una cuenta (recomendado)."
 
-#: ../../mod/admin.php:482
+#: ../../mod/admin.php:439
 msgid "Force publish"
 msgstr "Forzar la publicación"
 
-#: ../../mod/admin.php:482
+#: ../../mod/admin.php:439
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr "Intentar forzar todos los perfiles para que sean listados en el directorio de este sitio."
 
-#: ../../mod/admin.php:483
+#: ../../mod/admin.php:440
 msgid "Disable discovery tab"
 msgstr "Desactivar la pestaña \"Descubrir\""
 
-#: ../../mod/admin.php:483
+#: ../../mod/admin.php:440
 msgid ""
 "Remove the tab in the network view with public content pulled from sources "
 "chosen for this site."
 msgstr "Quitar la pestaña para ver contenido público extraído de las fuentes elegidas por este sitio."
 
-#: ../../mod/admin.php:484
+#: ../../mod/admin.php:441
 msgid "login on Homepage"
 msgstr "acceso a la página personal"
 
-#: ../../mod/admin.php:484
+#: ../../mod/admin.php:441
 msgid ""
 "Present a login box to visitors on the home page if no other content has "
 "been configured."
 msgstr "Presentar a los visitantes una casilla de identificación en la página de inicio, si no se ha configurado otro tipo de contenido."
 
-#: ../../mod/admin.php:486
+#: ../../mod/admin.php:443
 msgid "Proxy user"
 msgstr "Usuario del proxy"
 
-#: ../../mod/admin.php:487
+#: ../../mod/admin.php:444
 msgid "Proxy URL"
 msgstr "Dirección del proxy"
 
-#: ../../mod/admin.php:488
+#: ../../mod/admin.php:445
 msgid "Network timeout"
 msgstr "Tiempo de espera de la red"
 
-#: ../../mod/admin.php:488
+#: ../../mod/admin.php:445
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr "Valor en segundos. Poner a 0 para que no haya tiempo límite (no recomendado)"
 
-#: ../../mod/admin.php:489
+#: ../../mod/admin.php:446
 msgid "Delivery interval"
 msgstr "Intervalo de entrega"
 
-#: ../../mod/admin.php:489
+#: ../../mod/admin.php:446
 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 "Retrasar los procesos de entrega en segundo plano por esta cantidad de segundos para reducir la carga del sistema. Recomendado: 4-5 para hosts compartidos, 2-3 para servidores virtuales privados, 0-1 para grandes servidores dedicados."
+msgstr "Retrasar los procesos de transmisión en segundo plano por esta cantidad de segundos para reducir la carga del sistema. Recomendado: 4-5 para sitios compartidos, 2-3 para servidores virtuales privados, 0-1 para grandes servidores dedicados."
 
-#: ../../mod/admin.php:490
+#: ../../mod/admin.php:447
+msgid "Deliveries per process"
+msgstr "Intentos de envío por proceso"
+
+#: ../../mod/admin.php:447
+msgid ""
+"Number of deliveries to attempt in a single operating system process. Adjust"
+" if necessary to tune system performance. Recommend: 1-5."
+msgstr "Numero de envíos a intentar en un único proceso del sistema operativo. Ajustar si es necesario mejorar el rendimiento. Se recomienda: 1-5."
+
+#: ../../mod/admin.php:448
 msgid "Poll interval"
 msgstr "Intervalo de sondeo"
 
-#: ../../mod/admin.php:490
+#: ../../mod/admin.php:448
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
-msgstr "Retrasar el sondeo en segundo plano en esta cantidad de segundo para reducir la carga del sistema. Si es 0, use el intervalo de entrega."
+msgstr "Retrasar el sondeo en segundo plano, en esta cantidad de segundos, para reducir la carga del sistema. Si es 0, usar el intervalo de transmisión."
 
-#: ../../mod/admin.php:491
+#: ../../mod/admin.php:449
 msgid "Maximum Load Average"
 msgstr "Carga media máxima"
 
-#: ../../mod/admin.php:491
+#: ../../mod/admin.php:449
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
-msgstr "Carga máxima del sistema antes de que los procesos de entrega y sondeo se hayan retardado - por defecto, 50."
+msgstr "Carga máxima del sistema antes de que los procesos de transmisión y sondeo se hayan retardado - por defecto, 50."
 
-#: ../../mod/admin.php:492
+#: ../../mod/admin.php:450
 msgid "Expiration period in days for imported (matrix/network) content"
 msgstr "Periodo de caducidad en días para el contenido importado (red)"
 
-#: ../../mod/admin.php:492
+#: ../../mod/admin.php:450
 msgid "0 for no expiration of imported content"
 msgstr "0 para que no caduque el contenido importado"
 
-#: ../../mod/admin.php:540
+#: ../../mod/admin.php:498
 msgid "No server found"
 msgstr "Servidor no encontrado"
 
-#: ../../mod/admin.php:547 ../../mod/admin.php:831
+#: ../../mod/admin.php:505 ../../mod/admin.php:788
 msgid "ID"
 msgstr "ID"
 
-#: ../../mod/admin.php:547
+#: ../../mod/admin.php:505
 msgid "for channel"
 msgstr "por canal"
 
-#: ../../mod/admin.php:547
+#: ../../mod/admin.php:505
 msgid "on server"
 msgstr "en el servidor"
 
-#: ../../mod/admin.php:547
+#: ../../mod/admin.php:505
 msgid "Status"
 msgstr "Estado"
 
-#: ../../mod/admin.php:549
+#: ../../mod/admin.php:507
 msgid "Server"
 msgstr "Servidor"
 
-#: ../../mod/admin.php:566
+#: ../../mod/admin.php:524
 msgid "Update has been marked successful"
 msgstr "La actualización ha sido marcada como exitosa"
 
-#: ../../mod/admin.php:576
+#: ../../mod/admin.php:534
 #, php-format
 msgid "Executing %s failed. Check system logs."
 msgstr "La ejecución de %s ha fallado. Mirar en los informes del sistema."
 
-#: ../../mod/admin.php:579
+#: ../../mod/admin.php:537
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr "La actualización de %s se ha realizado exitosamente."
 
-#: ../../mod/admin.php:583
+#: ../../mod/admin.php:541
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr "La actualización de %s no ha devuelto ningún estado. No se sabe si ha tenido éxito."
 
-#: ../../mod/admin.php:586
+#: ../../mod/admin.php:544
 #, php-format
 msgid "Update function %s could not be found."
 msgstr "No se encuentra la función de actualización de %s."
 
-#: ../../mod/admin.php:602
+#: ../../mod/admin.php:560
 msgid "No failed updates."
 msgstr "No ha fallado ninguna actualización."
 
-#: ../../mod/admin.php:606
+#: ../../mod/admin.php:564
 msgid "Failed Updates"
 msgstr "Han fallado las actualizaciones"
 
-#: ../../mod/admin.php:608
+#: ../../mod/admin.php:566
 msgid "Mark success (if update was manually applied)"
 msgstr "Marcar como exitosa (si la actualización se ha hecho manualmente)"
 
-#: ../../mod/admin.php:609
+#: ../../mod/admin.php:567
 msgid "Attempt to execute this update step automatically"
 msgstr "Intentar ejecutar este paso de actualización automáticamente"
 
-#: ../../mod/admin.php:641
+#: ../../mod/admin.php:599
 msgid "Queue Statistics"
 msgstr "Estadísticas de la cola"
 
-#: ../../mod/admin.php:642
+#: ../../mod/admin.php:600
 msgid "Total Entries"
 msgstr "Total de entradas"
 
-#: ../../mod/admin.php:643
+#: ../../mod/admin.php:601
 msgid "Priority"
 msgstr "Prioridad"
 
-#: ../../mod/admin.php:644
+#: ../../mod/admin.php:602
 msgid "Destination URL"
 msgstr "Dirección de destino"
 
-#: ../../mod/admin.php:645
+#: ../../mod/admin.php:603
 msgid "Mark hub permanently offline"
 msgstr "Marcar el servidor como permanentemente fuera de línea"
 
-#: ../../mod/admin.php:646
+#: ../../mod/admin.php:604
 msgid "Empty queue for this hub"
 msgstr "Vaciar la cola para este servidor"
 
-#: ../../mod/admin.php:647
+#: ../../mod/admin.php:605
 msgid "Last known contact"
 msgstr "Último contacto conocido"
 
-#: ../../mod/admin.php:683
+#: ../../mod/admin.php:641
 #, php-format
 msgid "%s account blocked/unblocked"
 msgid_plural "%s account blocked/unblocked"
 msgstr[0] "%s cuenta bloqueada/desbloqueada"
 msgstr[1] "%s cuenta bloqueada/desbloqueada"
 
-#: ../../mod/admin.php:691
+#: ../../mod/admin.php:649
 #, php-format
 msgid "%s account deleted"
 msgid_plural "%s accounts deleted"
 msgstr[0] "%s cuentas eliminadas"
 msgstr[1] "%s cuentas eliminadas"
 
-#: ../../mod/admin.php:727
+#: ../../mod/admin.php:685
 msgid "Account not found"
 msgstr "Cuenta no encontrada"
 
-#: ../../mod/admin.php:739
+#: ../../mod/admin.php:697
 #, php-format
 msgid "Account '%s' deleted"
 msgstr "La cuenta '%s' ha sido eliminada"
 
-#: ../../mod/admin.php:747
+#: ../../mod/admin.php:705
 #, php-format
 msgid "Account '%s' blocked"
 msgstr "La cuenta '%s' ha sido bloqueada"
 
-#: ../../mod/admin.php:755
+#: ../../mod/admin.php:713
 #, php-format
 msgid "Account '%s' unblocked"
 msgstr "La cuenta '%s' ha sido desbloqueada"
 
-#: ../../mod/admin.php:818 ../../mod/admin.php:830
+#: ../../mod/admin.php:775 ../../mod/admin.php:787
 msgid "Users"
 msgstr "Usuarios"
 
-#: ../../mod/admin.php:820 ../../mod/admin.php:987
+#: ../../mod/admin.php:777 ../../mod/admin.php:941
 msgid "select all"
 msgstr "seleccionar todo"
 
-#: ../../mod/admin.php:821
+#: ../../mod/admin.php:778
 msgid "User registrations waiting for confirm"
 msgstr "Registros de usuario en espera de aprobación"
 
-#: ../../mod/admin.php:822
+#: ../../mod/admin.php:779
 msgid "Request date"
 msgstr "Fecha de solicitud"
 
-#: ../../mod/admin.php:823
+#: ../../mod/admin.php:780
 msgid "No registrations."
 msgstr "Sin registros."
 
-#: ../../mod/admin.php:824 ../../mod/connedit.php:699
-msgid "Approve"
-msgstr "Aprobar"
-
-#: ../../mod/admin.php:825
+#: ../../mod/admin.php:782
 msgid "Deny"
 msgstr "Rechazar"
 
-#: ../../mod/admin.php:827 ../../mod/connedit.php:531
-msgid "Block"
-msgstr "Bloquear"
-
-#: ../../mod/admin.php:828 ../../mod/connedit.php:531
-msgid "Unblock"
-msgstr "Desbloquear"
-
-#: ../../mod/admin.php:831
+#: ../../mod/admin.php:788
 msgid "Register date"
 msgstr "Fecha de registro"
 
-#: ../../mod/admin.php:831
+#: ../../mod/admin.php:788
 msgid "Last login"
 msgstr "Último acceso"
 
-#: ../../mod/admin.php:831
+#: ../../mod/admin.php:788
 msgid "Expires"
 msgstr "Caduca"
 
-#: ../../mod/admin.php:831
+#: ../../mod/admin.php:788
 msgid "Service Class"
 msgstr "Clase de servicio"
 
-#: ../../mod/admin.php:833
+#: ../../mod/admin.php:790
 msgid ""
 "Selected accounts will be deleted!\\n\\nEverything these accounts had posted"
 " on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "¡Las cuentas seleccionadas van a ser eliminadas!\\n\\n¡Todo lo que estas cuentas han publicado en este sitio será borrado de forma permanente!\\n\\n¿Está seguro de querer hacerlo?"
 
-#: ../../mod/admin.php:834
+#: ../../mod/admin.php:791
 msgid ""
 "The account {0} will be deleted!\\n\\nEverything this account has posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "¡La cuenta {0} va a ser eliminada!\\n\\n¡Todo lo que esta cuenta ha publicado en este sitio será borrado de forma permanente!\\n\\n¿Está seguro de querer hacerlo?"
 
-#: ../../mod/admin.php:870
+#: ../../mod/admin.php:827
 #, php-format
 msgid "%s channel censored/uncensored"
 msgid_plural "%s channels censored/uncensored"
 msgstr[0] "%s canales censurados/no censurados"
 msgstr[1] "%s canales censurados/no censurados"
 
-#: ../../mod/admin.php:879
+#: ../../mod/admin.php:836
 #, php-format
 msgid "%s channel code allowed/disallowed"
 msgid_plural "%s channels code allowed/disallowed"
 msgstr[0] "%s código permitido/no permitido al canal"
 msgstr[1] "%s código permitido/no permitido al canal"
 
-#: ../../mod/admin.php:886
+#: ../../mod/admin.php:843
 #, php-format
 msgid "%s channel deleted"
 msgid_plural "%s channels deleted"
 msgstr[0] "%s canales eliminados"
 msgstr[1] "%s canales eliminados"
 
-#: ../../mod/admin.php:906
+#: ../../mod/admin.php:863
 msgid "Channel not found"
 msgstr "Canal no encontrado"
 
-#: ../../mod/admin.php:917
+#: ../../mod/admin.php:874
 #, php-format
 msgid "Channel '%s' deleted"
 msgstr "Canal '%s' eliminado"
 
-#: ../../mod/admin.php:929
+#: ../../mod/admin.php:886
 #, php-format
 msgid "Channel '%s' censored"
 msgstr "Canal '%s' censurado"
 
-#: ../../mod/admin.php:929
+#: ../../mod/admin.php:886
 #, php-format
 msgid "Channel '%s' uncensored"
 msgstr "Canal '%s' no censurado"
 
-#: ../../mod/admin.php:940
+#: ../../mod/admin.php:897
 #, php-format
 msgid "Channel '%s' code allowed"
 msgstr "Código permitido al canal '%s'"
 
-#: ../../mod/admin.php:940
+#: ../../mod/admin.php:897
 #, php-format
 msgid "Channel '%s' code disallowed"
 msgstr "Código no permitido al canal '%s'"
 
-#: ../../mod/admin.php:989
+#: ../../mod/admin.php:943
 msgid "Censor"
 msgstr "Censurar"
 
-#: ../../mod/admin.php:990
+#: ../../mod/admin.php:944
 msgid "Uncensor"
 msgstr "No censurar"
 
-#: ../../mod/admin.php:991
+#: ../../mod/admin.php:945
 msgid "Allow Code"
 msgstr "Permitir código"
 
-#: ../../mod/admin.php:992
+#: ../../mod/admin.php:946
 msgid "Disallow Code"
 msgstr "No permitir código"
 
-#: ../../mod/admin.php:994
+#: ../../mod/admin.php:948
 msgid "UID"
 msgstr "UID"
 
-#: ../../mod/admin.php:996
+#: ../../mod/admin.php:948 ../../mod/profiles.php:447
+msgid "Address"
+msgstr "Dirección"
+
+#: ../../mod/admin.php:950
 msgid ""
 "Selected channels will be deleted!\\n\\nEverything that was posted in these "
 "channels on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Los canales seleccionados se eliminarán!\\n\\nTodo lo publicado por estos canales en este sitio se borrarán definitivamente!\\n\\n¿Está seguro de querer hacerlo?"
 
-#: ../../mod/admin.php:997
+#: ../../mod/admin.php:951
 msgid ""
 "The channel {0} will be deleted!\\n\\nEverything that was posted in this "
 "channel on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "El canal {0} va a ser eliminado!\\n\\nTodo lo publicado por el canal en este sitio se borrará definitivamente!\\n\\n¿Está seguro de querer hacerlo?"
 
-#: ../../mod/admin.php:1037
+#: ../../mod/admin.php:991
 #, php-format
 msgid "Plugin %s disabled."
 msgstr "Extensión %s desactivada."
 
-#: ../../mod/admin.php:1041
+#: ../../mod/admin.php:995
 #, php-format
 msgid "Plugin %s enabled."
 msgstr "Extensión %s activada."
 
-#: ../../mod/admin.php:1051 ../../mod/admin.php:1249
+#: ../../mod/admin.php:1005 ../../mod/admin.php:1203
 msgid "Disable"
 msgstr "Desactivar"
 
-#: ../../mod/admin.php:1054 ../../mod/admin.php:1251
+#: ../../mod/admin.php:1008 ../../mod/admin.php:1205
 msgid "Enable"
 msgstr "Activar"
 
-#: ../../mod/admin.php:1078 ../../mod/admin.php:1278
+#: ../../mod/admin.php:1032 ../../mod/admin.php:1232
 msgid "Toggle"
 msgstr "Cambiar"
 
-#: ../../mod/admin.php:1086 ../../mod/admin.php:1288
+#: ../../mod/admin.php:1040 ../../mod/admin.php:1242
 msgid "Author: "
 msgstr "Autor:"
 
-#: ../../mod/admin.php:1087 ../../mod/admin.php:1289
+#: ../../mod/admin.php:1041 ../../mod/admin.php:1243
 msgid "Maintainer: "
 msgstr "Mantenedor:"
 
-#: ../../mod/admin.php:1214
+#: ../../mod/admin.php:1168
 msgid "No themes found."
 msgstr "No se han encontrado temas."
 
-#: ../../mod/admin.php:1270
+#: ../../mod/admin.php:1224
 msgid "Screenshot"
 msgstr "Instantánea de pantalla"
 
-#: ../../mod/admin.php:1316
+#: ../../mod/admin.php:1270
 msgid "[Experimental]"
 msgstr "[Experimental]"
 
-#: ../../mod/admin.php:1317
+#: ../../mod/admin.php:1271
 msgid "[Unsupported]"
 msgstr "[No soportado]"
 
-#: ../../mod/admin.php:1341
+#: ../../mod/admin.php:1295
 msgid "Log settings updated."
 msgstr "Actualizado el informe de configuraciones."
 
-#: ../../mod/admin.php:1398
+#: ../../mod/admin.php:1352
 msgid "Clear"
 msgstr "Vaciar"
 
-#: ../../mod/admin.php:1404
+#: ../../mod/admin.php:1358
 msgid "Debugging"
 msgstr "Depuración"
 
-#: ../../mod/admin.php:1405
+#: ../../mod/admin.php:1359
 msgid "Log file"
 msgstr "Fichero de informe"
 
-#: ../../mod/admin.php:1405
+#: ../../mod/admin.php:1359
 msgid ""
 "Must be writable by web server. Relative to your Red top-level directory."
-msgstr "Debe tener permisos de escritura para el servidor web. Ruta relativa al directorio raíz de Red."
+msgstr "Debe tener permisos de escritura por el servidor web. La ruta es relativa al directorio de instalación de Hubzilla."
 
-#: ../../mod/admin.php:1406
+#: ../../mod/admin.php:1360
 msgid "Log level"
 msgstr "Nivel de depuración"
 
-#: ../../mod/admin.php:1452
+#: ../../mod/admin.php:1406
 msgid "New Profile Field"
 msgstr "Nuevo campo en el perfil"
 
-#: ../../mod/admin.php:1453 ../../mod/admin.php:1473
+#: ../../mod/admin.php:1407 ../../mod/admin.php:1427
 msgid "Field nickname"
 msgstr "Alias del campo"
 
-#: ../../mod/admin.php:1453 ../../mod/admin.php:1473
+#: ../../mod/admin.php:1407 ../../mod/admin.php:1427
 msgid "System name of field"
 msgstr "Nombre del campo en el sistema"
 
-#: ../../mod/admin.php:1454 ../../mod/admin.php:1474
+#: ../../mod/admin.php:1408 ../../mod/admin.php:1428
 msgid "Input type"
 msgstr "Tipo de entrada"
 
-#: ../../mod/admin.php:1455 ../../mod/admin.php:1475
+#: ../../mod/admin.php:1409 ../../mod/admin.php:1429
 msgid "Field Name"
 msgstr "Nombre del campo"
 
-#: ../../mod/admin.php:1455 ../../mod/admin.php:1475
+#: ../../mod/admin.php:1409 ../../mod/admin.php:1429
 msgid "Label on profile pages"
-msgstr "Etiqueta a mostrar en las páginas del perfil"
+msgstr "Etiqueta a mostrar en la página del perfil"
 
-#: ../../mod/admin.php:1456 ../../mod/admin.php:1476
+#: ../../mod/admin.php:1410 ../../mod/admin.php:1430
 msgid "Help text"
 msgstr "Texto de ayuda"
 
-#: ../../mod/admin.php:1456 ../../mod/admin.php:1476
+#: ../../mod/admin.php:1410 ../../mod/admin.php:1430
 msgid "Additional info (optional)"
 msgstr "Información adicional (opcional)"
 
-#: ../../mod/admin.php:1466
+#: ../../mod/admin.php:1420
 msgid "Field definition not found"
 msgstr "Definición del campo no encontrada"
 
-#: ../../mod/admin.php:1472
+#: ../../mod/admin.php:1426
 msgid "Edit Profile Field"
 msgstr "Modificar el campo del perfil"
 
-#: ../../mod/oexchange.php:23
-msgid "Unable to find your hub."
-msgstr "No se puede encontrar su servidor."
+#: ../../mod/appman.php:28 ../../mod/appman.php:44
+msgid "App installed."
+msgstr "Aplicación instalada."
 
-#: ../../mod/oexchange.php:37
-msgid "Post successful."
-msgstr "Enviado con éxito."
+#: ../../mod/appman.php:37
+msgid "Malformed app."
+msgstr "Aplicación con errores"
+
+#: ../../mod/appman.php:80
+msgid "Embed code"
+msgstr "Código incorporado"
+
+#: ../../mod/appman.php:86
+msgid "Edit App"
+msgstr "Modificar la aplicación"
+
+#: ../../mod/appman.php:86
+msgid "Create App"
+msgstr "Crear una aplicación"
+
+#: ../../mod/appman.php:91
+msgid "Name of app"
+msgstr "Nombre de la aplicación"
+
+#: ../../mod/appman.php:92
+msgid "Location (URL) of app"
+msgstr "Ubicación (URL) de la aplicación"
+
+#: ../../mod/appman.php:93 ../../mod/rbmark.php:95
+msgid "Description"
+msgstr "Descripción"
+
+#: ../../mod/appman.php:94
+msgid "Photo icon URL"
+msgstr "Dirección del icono que se va a utilizar para esta foto"
+
+#: ../../mod/appman.php:94
+msgid "80 x 80 pixels - optional"
+msgstr "80 x 80 pixels - opcional"
+
+#: ../../mod/appman.php:95
+msgid "Version ID"
+msgstr "Versión"
+
+#: ../../mod/appman.php:96
+msgid "Price of app"
+msgstr "Precio de la aplicación"
+
+#: ../../mod/appman.php:97
+msgid "Location (URL) to purchase app"
+msgstr "Ubicación (URL) donde adquirir la aplicación"
+
+#: ../../mod/menu.php:45
+msgid "Unable to update menu."
+msgstr "No se puede actualizar el menú."
+
+#: ../../mod/menu.php:56
+msgid "Unable to create menu."
+msgstr "No se puede crear el menú."
+
+#: ../../mod/menu.php:94 ../../mod/menu.php:106
+msgid "Menu Name"
+msgstr "Nombre del menú"
+
+#: ../../mod/menu.php:94
+msgid "Unique name (not visible on webpage) - required"
+msgstr "Nombre único (no será visible en la página web) - requerido"
+
+#: ../../mod/menu.php:95 ../../mod/menu.php:107
+msgid "Menu Title"
+msgstr "Título del menú"
+
+#: ../../mod/menu.php:95
+msgid "Visible on webpage - leave empty for no title"
+msgstr "Visible en la página web - no ponga nada si no desea un título"
+
+#: ../../mod/menu.php:96
+msgid "Allow Bookmarks"
+msgstr "Permitir marcadores"
+
+#: ../../mod/menu.php:96 ../../mod/menu.php:153
+msgid "Menu may be used to store saved bookmarks"
+msgstr "El menú se puede usar para guardar marcadores"
+
+#: ../../mod/menu.php:97 ../../mod/menu.php:155
+msgid "Submit and proceed"
+msgstr "Enviar y proceder"
+
+#: ../../mod/menu.php:109
+msgid "Drop"
+msgstr "Eliminar"
+
+#: ../../mod/menu.php:113
+msgid "Bookmarks allowed"
+msgstr "Marcadores permitidos"
+
+#: ../../mod/menu.php:115
+msgid "Delete this menu"
+msgstr "Borrar este menú"
+
+#: ../../mod/menu.php:116 ../../mod/menu.php:150
+msgid "Edit menu contents"
+msgstr "Editar los contenidos del menú"
+
+#: ../../mod/menu.php:117
+msgid "Edit this menu"
+msgstr "Modificar este menú"
+
+#: ../../mod/menu.php:132
+msgid "Menu could not be deleted."
+msgstr "El menú no puede ser eliminado."
+
+#: ../../mod/menu.php:145
+msgid "Edit Menu"
+msgstr "Modificar el menú"
+
+#: ../../mod/menu.php:149
+msgid "Add or remove entries to this menu"
+msgstr "Añadir o quitar entradas en este menú"
+
+#: ../../mod/menu.php:151
+msgid "Menu name"
+msgstr "Nombre del menú"
+
+#: ../../mod/menu.php:151
+msgid "Must be unique, only seen by you"
+msgstr "Debe ser único, solo será visible para usted"
+
+#: ../../mod/menu.php:152
+msgid "Menu title"
+msgstr "Título del menú"
+
+#: ../../mod/menu.php:152
+msgid "Menu title as seen by others"
+msgstr "El título del menú tal como será visto por los demás"
+
+#: ../../mod/menu.php:153
+msgid "Allow bookmarks"
+msgstr "Permitir marcadores"
+
+#: ../../mod/notify.php:53 ../../mod/notifications.php:94
+msgid "No more system notifications."
+msgstr "No hay más notificaciones del sistema"
+
+#: ../../mod/notify.php:57 ../../mod/notifications.php:98
+msgid "System Notifications"
+msgstr "Notificaciones de sistema"
+
+#: ../../mod/page.php:126
+msgid ""
+"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
+"tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,"
+" quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo "
+"consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse "
+"cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat "
+"non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+msgstr "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+
+#: ../../mod/new_channel.php:109
+msgid "Add a Channel"
+msgstr "Añadir un canal"
+
+#: ../../mod/new_channel.php:110
+msgid ""
+"A channel is your own collection of related web pages. A channel can be used"
+" to hold social network profiles, blogs, conversation groups and forums, "
+"celebrity pages, and much more. You may create as many channels as your "
+"service provider allows."
+msgstr "Un canal está formado por su propia colección de páginas web relacionadas. Se puede utilizar para almacenar los perfiles sociales de la red, blogs, grupos de conversación y foros, páginas de famosos y mucho más. Puede crear tantos canales como su proveedor de servicio permita."
+
+#: ../../mod/new_channel.php:112 ../../mod/sources.php:103
+#: ../../mod/sources.php:137
+msgid "Channel Name"
+msgstr "Nombre del canal"
+
+#: ../../mod/new_channel.php:113
+msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "
+msgstr "Ejemplos: \"Juan García\", \"Isabel y sus caballos\", \"Fútbol\", \"Grupo de parapente\" "
+
+#: ../../mod/new_channel.php:114
+msgid "Choose a short nickname"
+msgstr "Elija un alias corto"
+
+#: ../../mod/new_channel.php:115
+msgid ""
+"Your nickname will be used to create an easily remembered channel address "
+"(like an email address) which you can share with others."
+msgstr "Su alias podrá usarse para crear una dirección de canal fácilmente memorizable (como una dirección de correo electrónico) que puede ser compartido con otros."
+
+#: ../../mod/new_channel.php:116
+msgid "Or <a href=\"import\">import an existing channel</a> from another location"
+msgstr "O <a href=\"import\">importar un canal existente</a> de otro lugar"
+
+#: ../../mod/new_channel.php:118
+msgid ""
+"Please choose a channel type (such as social networking or community forum) "
+"and privacy requirements so we can select the best permissions for you"
+msgstr "Elija el tipo de canal (como red social o foro de discusión) y la privacidad que requiera, así podremos seleccionar el mejor conjunto de permisos para usted"
+
+#: ../../mod/new_channel.php:119
+msgid "Channel Type"
+msgstr "Tipo de canal"
+
+#: ../../mod/new_channel.php:119
+msgid "Read more about roles"
+msgstr "Leer más sobre los roles"
+
+#: ../../mod/notifications.php:26
+msgid "Invalid request identifier."
+msgstr "Petición inválida del identificador."
+
+#: ../../mod/notifications.php:35
+msgid "Discard"
+msgstr "Descartar"
+
+#: ../../mod/pdledit.php:13
+msgid "Layout updated."
+msgstr "Formato actualizado"
+
+#: ../../mod/pdledit.php:28 ../../mod/pdledit.php:53
+msgid "Edit System Page Description"
+msgstr "Editor del Sistema de Descripción de Páginas"
+
+#: ../../mod/pdledit.php:48
+msgid "Layout not found."
+msgstr "Formato no encontrado"
+
+#: ../../mod/pdledit.php:54
+msgid "Module Name:"
+msgstr "Nombre del módulo:"
+
+#: ../../mod/pdledit.php:55
+msgid "Layout Help"
+msgstr "Ayuda para el diseño de la página"
+
+#: ../../mod/subthread.php:102
+#, php-format
+msgid "%1$s is following %2$s's %3$s"
+msgstr "%1$s está siguiendo %2$s de %3$s"
+
+#: ../../mod/lostpass.php:15
+msgid "No valid account found."
+msgstr "No se ha encontrado una cuenta válida."
+
+#: ../../mod/lostpass.php:29
+msgid "Password reset request issued. Check your email."
+msgstr "Se ha recibido una solicitud de restablecimiento de contraseña. Consulte su correo electrónico."
+
+#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:103
+#, php-format
+msgid "Site Member (%s)"
+msgstr "Usuario del sitio (%s)"
+
+#: ../../mod/lostpass.php:40
+#, php-format
+msgid "Password reset requested at %s"
+msgstr "Se ha solicitado restablecer la contraseña en %s"
+
+#: ../../mod/lostpass.php:63
+msgid ""
+"Request could not be verified. (You may have previously submitted it.) "
+"Password reset failed."
+msgstr "La solicitud no ha podido ser verificada. (Puede que la haya enviado con anterioridad) El restablecimiento de la contraseña ha fallado."
+
+#: ../../mod/lostpass.php:86 ../../boot.php:1511
+msgid "Password Reset"
+msgstr "Restablecer la contraseña"
+
+#: ../../mod/lostpass.php:87
+msgid "Your password has been reset as requested."
+msgstr "Su contraseña ha sido restablecida según lo solicitó."
+
+#: ../../mod/lostpass.php:88
+msgid "Your new password is"
+msgstr "Su nueva contraseña es"
+
+#: ../../mod/lostpass.php:89
+msgid "Save or copy your new password - and then"
+msgstr "Guarde o copie su nueva contraseña - y después"
+
+#: ../../mod/lostpass.php:90
+msgid "click here to login"
+msgstr "pulse aquí para conectarse"
+
+#: ../../mod/lostpass.php:91
+msgid ""
+"Your password may be changed from the <em>Settings</em> page after "
+"successful login."
+msgstr "Puede cambiar la contraseña en la página <em>Ajustes</em> una vez iniciada la sesión."
+
+#: ../../mod/lostpass.php:108
+#, php-format
+msgid "Your password has changed at %s"
+msgstr "Su contraseña en %s ha sido cambiada"
+
+#: ../../mod/lostpass.php:123
+msgid "Forgot your Password?"
+msgstr "¿Ha olvidado su contraseña?"
+
+#: ../../mod/lostpass.php:124
+msgid ""
+"Enter your email address and submit to have your password reset. Then check "
+"your email for further instructions."
+msgstr "Introduzca y envíe su dirección de correo electrónico para el restablecimiento de su contraseña. Luego revise su correo para obtener más instrucciones."
+
+#: ../../mod/lostpass.php:125
+msgid "Email Address"
+msgstr "Dirección de correo electrónico"
+
+#: ../../mod/lostpass.php:126
+msgid "Reset"
+msgstr "Reiniciar"
+
+#: ../../mod/home.php:57 ../../mod/home.php:65 ../../mod/siteinfo.php:157
+msgid "$Projectname"
+msgstr "$Projectname"
+
+#: ../../mod/home.php:75
+#, php-format
+msgid "Welcome to %s"
+msgstr "Bienvenido a %s"
+
+#: ../../mod/dav.php:121
+msgid "$Projectname channel"
+msgstr "Canal $Projectname"
+
+#: ../../mod/events.php:21
+msgid "Calendar entries imported."
+msgstr "Entradas de calendario importadas."
+
+#: ../../mod/events.php:23
+msgid "No calendar entries found."
+msgstr "No se han encontrado entradas de calendario."
+
+#: ../../mod/events.php:96
+msgid "Event can not end before it has started."
+msgstr "Un evento no puede terminar antes de que haya comenzado."
+
+#: ../../mod/events.php:98 ../../mod/events.php:107 ../../mod/events.php:127
+msgid "Unable to generate preview."
+msgstr "No se puede crear la vista previa."
+
+#: ../../mod/events.php:105
+msgid "Event title and start time are required."
+msgstr "Se requieren el título del evento y su hora de inicio."
+
+#: ../../mod/events.php:125 ../../mod/events.php:250
+msgid "Event not found."
+msgstr "Evento no encontrado."
+
+#: ../../mod/events.php:448
+msgid "l, F j"
+msgstr "l j F"
+
+#: ../../mod/events.php:470
+msgid "Edit event"
+msgstr "Editar evento"
+
+#: ../../mod/events.php:472
+msgid "Delete event"
+msgstr "Borrar evento"
+
+#: ../../mod/events.php:506
+msgid "calendar"
+msgstr "calendario"
+
+#: ../../mod/events.php:527
+msgid "Create New Event"
+msgstr "Crear un nuevo evento"
+
+#: ../../mod/events.php:530
+msgid "Export"
+msgstr "Exportar"
+
+#: ../../mod/events.php:533
+msgid "Import"
+msgstr "Importar"
+
+#: ../../mod/events.php:564
+msgid "Event removed"
+msgstr "Evento borrado"
+
+#: ../../mod/events.php:567
+msgid "Failed to remove event"
+msgstr "Error al eliminar el evento"
+
+#: ../../mod/events.php:681
+msgid "Event details"
+msgstr "Detalles del evento"
+
+#: ../../mod/events.php:682
+msgid "Starting date and Title are required."
+msgstr "Se requieren fecha y título."
+
+#: ../../mod/events.php:684
+msgid "Categories (comma-separated list)"
+msgstr "Categorías (lista separada por comas)"
+
+#: ../../mod/events.php:686
+msgid "Event Starts:"
+msgstr "Inicio del evento:"
+
+#: ../../mod/events.php:693
+msgid "Finish date/time is not known or not relevant"
+msgstr "La fecha / hora de finalización no se conocen o no son relevantes"
+
+#: ../../mod/events.php:695
+msgid "Event Finishes:"
+msgstr "Finalización del evento:"
+
+#: ../../mod/events.php:697 ../../mod/events.php:698
+msgid "Adjust for viewer timezone"
+msgstr "Ajustar para obtener el visor de zona horaria"
+
+#: ../../mod/events.php:697
+msgid ""
+"Important for events that happen in a particular place. Not practical for "
+"global holidays."
+msgstr "Importante para los eventos que suceden en un lugar determinado. No es práctico para los globales."
+
+#: ../../mod/events.php:703
+msgid "Title:"
+msgstr "Título:"
+
+#: ../../mod/events.php:705
+msgid "Share this event"
+msgstr "Compartir este evento"
+
+#: ../../mod/impel.php:192
+#, php-format
+msgid "%s element installed"
+msgstr "%s elemento instalado"
+
+#: ../../mod/impel.php:195
+#, php-format
+msgid "%s element installation failed"
+msgstr "Elemento con instalación fallida: %s"
+
+#: ../../mod/probe.php:24 ../../mod/probe.php:30
+#, php-format
+msgid "Fetching URL returns error: %1$s"
+msgstr "Al intentar obtener la dirección, retorna el error: %1$s"
+
+#: ../../mod/match.php:22
+msgid "Profile Match"
+msgstr "Perfil compatible"
+
+#: ../../mod/match.php:31
+msgid "No keywords to match. Please add keywords to your default profile."
+msgstr "No hay palabras clave en el perfil principal para poder encontrar perfiles compatibles. Por favor, añada palabras clave a su perfil principal."
+
+#: ../../mod/match.php:63
+msgid "is interested in:"
+msgstr "está interesado en:"
+
+#: ../../mod/match.php:70
+msgid "No matches"
+msgstr "No se han encontrado perfiles compatibles"
+
+#: ../../mod/profile_photo.php:111
+msgid "Image uploaded but image cropping failed."
+msgstr "Imagen actualizada, pero el recorte de la imagen ha fallado. "
+
+#: ../../mod/profile_photo.php:165
+msgid "Image resize failed."
+msgstr "El ajuste del tamaño de la imagen ha fallado."
+
+#: ../../mod/profile_photo.php:209
+msgid ""
+"Shift-reload the page or clear browser cache if the new photo does not "
+"display immediately."
+msgstr "Recargue la página o limpie el caché del navegador si la nueva foto no se muestra inmediatamente."
+
+#: ../../mod/profile_photo.php:247
+msgid "Image upload failed."
+msgstr "Subida de imagen fallida."
+
+#: ../../mod/profile_photo.php:266
+msgid "Unable to process image."
+msgstr "No ha sido posible procesar la imagen."
+
+#: ../../mod/profile_photo.php:294
+msgid "female"
+msgstr "mujer"
+
+#: ../../mod/profile_photo.php:295
+#, php-format
+msgid "%1$s updated her %2$s"
+msgstr "%1$s ha actualizado su %2$s"
+
+#: ../../mod/profile_photo.php:296
+msgid "male"
+msgstr "hombre"
+
+#: ../../mod/profile_photo.php:297
+#, php-format
+msgid "%1$s updated his %2$s"
+msgstr "%1$s ha actualizado su %2$s"
+
+#: ../../mod/profile_photo.php:299
+#, php-format
+msgid "%1$s updated their %2$s"
+msgstr "%1$s ha actualizado sus %2$s"
+
+#: ../../mod/profile_photo.php:301
+msgid "profile photo"
+msgstr "foto del perfil"
+
+#: ../../mod/profile_photo.php:365 ../../mod/profile_photo.php:406
+msgid "Photo not available."
+msgstr "Foto no disponible."
+
+#: ../../mod/profile_photo.php:447
+msgid "Upload File:"
+msgstr "Subir fichero:"
+
+#: ../../mod/profile_photo.php:448
+msgid "Select a profile:"
+msgstr "Seleccionar un perfil:"
+
+#: ../../mod/profile_photo.php:449
+msgid "Upload Profile Photo"
+msgstr "Subir foto del perfil"
+
+#: ../../mod/profile_photo.php:454 ../../mod/settings.php:972
+msgid "or"
+msgstr "o"
+
+#: ../../mod/profile_photo.php:454
+msgid "skip this step"
+msgstr "Omitir este paso"
+
+#: ../../mod/profile_photo.php:454
+msgid "select a photo from your photo albums"
+msgstr "Seleccione una foto de sus álbumes de fotos"
+
+#: ../../mod/profile_photo.php:470
+msgid "Crop Image"
+msgstr "Recortar imagen"
+
+#: ../../mod/profile_photo.php:471
+msgid "Please adjust the image cropping for optimum viewing."
+msgstr "Por favor ajuste el recorte de la imagen para una visión óptima."
+
+#: ../../mod/profile_photo.php:473
+msgid "Done Editing"
+msgstr "Edición completada"
+
+#: ../../mod/follow.php:25
+msgid "Channel added."
+msgstr "Canal añadido."
+
+#: ../../mod/tagrm.php:44 ../../mod/tagrm.php:94
+msgid "Tag removed"
+msgstr "Etiqueta eliminada."
+
+#: ../../mod/tagrm.php:119
+msgid "Remove Item Tag"
+msgstr "Eliminar etiqueta del elemento."
+
+#: ../../mod/tagrm.php:121
+msgid "Select a tag to remove: "
+msgstr "Seleccionar una etiqueta para eliminar:"
+
+#: ../../mod/ratings.php:69
+msgid "No ratings"
+msgstr "Ninguna valoración"
+
+#: ../../mod/ratings.php:99
+msgid "Ratings"
+msgstr "Valoraciones"
+
+#: ../../mod/ratings.php:100
+msgid "Rating: "
+msgstr "Valoración:"
+
+#: ../../mod/ratings.php:101
+msgid "Website: "
+msgstr "Sitio web:"
+
+#: ../../mod/ratings.php:103
+msgid "Description: "
+msgstr "Descripción:"
+
+#: ../../mod/item.php:173
+msgid "Unable to locate original post."
+msgstr "No ha sido posible encontrar la entrada original."
+
+#: ../../mod/item.php:417
+msgid "Empty post discarded."
+msgstr "La entrada vacía ha sido desechada."
+
+#: ../../mod/item.php:457
+msgid "Executable content type not permitted to this channel."
+msgstr "Contenido de tipo ejecutable no permitido en este canal."
+
+#: ../../mod/item.php:906
+msgid "System error. Post not saved."
+msgstr "Error del sistema. La entrada no se ha podido salvar."
+
+#: ../../mod/item.php:1173
+msgid "Unable to obtain post information from database."
+msgstr "No ha sido posible obtener información de la entrada en la base de datos."
+
+#: ../../mod/item.php:1180
+#, php-format
+msgid "You have reached your limit of %1$.0f top level posts."
+msgstr "Ha alcanzado su límite de %1$.0f entradas en la página principal."
+
+#: ../../mod/item.php:1187
+#, php-format
+msgid "You have reached your limit of %1$.0f webpages."
+msgstr "Ha alcanzado su límite de %1$.0f páginas web."
+
+#: ../../mod/webpages.php:191
+msgid "Page Title"
+msgstr "Título de página"
 
 #: ../../mod/register.php:44
 msgid "Maximum daily site registrations exceeded. Please try again tomorrow."
@@ -7443,6 +6972,14 @@ msgstr "Elija una contraseña"
 msgid "Please re-enter your password"
 msgstr "Por favor, vuelva a escribir su contraseña"
 
+#: ../../mod/blocks.php:95 ../../mod/blocks.php:148
+msgid "Block Name"
+msgstr "Nombre del bloque"
+
+#: ../../mod/blocks.php:149
+msgid "Block Title"
+msgstr "Título del bloque"
+
 #: ../../mod/removeaccount.php:30
 msgid ""
 "Account removals are not allowed within 48 hours of changing the account "
@@ -7453,24 +6990,12 @@ msgstr "La eliminación de cuentas no está permitida hasta después de que haya
 msgid "Remove This Account"
 msgstr "Eliminar esta cuenta"
 
-#: ../../mod/removeaccount.php:58 ../../mod/removeme.php:58
-msgid "WARNING: "
-msgstr "ATENCIÓN:"
-
 #: ../../mod/removeaccount.php:58
 msgid ""
 "This account and all its channels will be completely removed from the "
 "network. "
 msgstr "Esta cuenta y todos sus canales van a ser eliminados de la red."
 
-#: ../../mod/removeaccount.php:58 ../../mod/removeme.php:58
-msgid "This action is permanent and can not be undone!"
-msgstr "¡Esta acción tiene carácter definitivo y no se puede deshacer!"
-
-#: ../../mod/removeaccount.php:59 ../../mod/removeme.php:59
-msgid "Please enter your password for verification:"
-msgstr "Por favor, introduzca su contraseña para su verificación:"
-
 #: ../../mod/removeaccount.php:60
 msgid ""
 "Remove this account, all its channels and all its channel clones from the "
@@ -7483,27 +7008,124 @@ msgid ""
 "removed from the network"
 msgstr "Por defecto, solo las instancias de los canales ubicados en este servidor serán eliminados de la red"
 
-#: ../../mod/removeaccount.php:61 ../../mod/settings.php:720
+#: ../../mod/removeaccount.php:61 ../../mod/settings.php:697
 msgid "Remove Account"
 msgstr "Eliminar cuenta"
 
-#: ../../mod/help.php:49 ../../mod/help.php:55 ../../mod/help.php:61
-msgid "Help:"
-msgstr "Ayuda:"
+#: ../../mod/service_limits.php:19
+msgid "No service class restrictions found."
+msgstr "No se han encontrado restricciones sobre esta clase de servicio."
 
-#: ../../mod/help.php:76 ../../index.php:238
-msgid "Not Found"
-msgstr "No encontrado"
+#: ../../mod/attach.php:9
+msgid "Item not available."
+msgstr "Elemento no disponible"
 
-#: ../../mod/help.php:100
-msgid "$Projectname Documentation"
-msgstr "Documentación de $Projectname"
+#: ../../mod/pubsites.php:16
+msgid "Public Sites"
+msgstr "Sitios públicos"
 
-#: ../../mod/update_channel.php:43 ../../mod/update_display.php:25
-#: ../../mod/update_network.php:23 ../../mod/update_search.php:46
-#: ../../mod/update_home.php:21 ../../mod/update_public.php:21
-msgid "[Embedded content - reload page to view]"
-msgstr "[Contenido incorporado - recargue la página para poder verlo]"
+#: ../../mod/pubsites.php:19
+msgid ""
+"The listed sites allow public registration for the $Projectname network. All"
+" sites in the network are interlinked so membership on any of them conveys "
+"membership in the network as a whole. Some sites may require subscription or"
+" provide tiered service plans. The provider links <strong>may</strong> "
+"provide additional details."
+msgstr "Los sitios listados permiten el registro público en la red $Projectname. Todos los sitios de la red están vinculados entre sí, por lo que sus miembros, en ninguno de ellos, indican la pertenencia a la red en su conjunto. Algunos sitios pueden requerir suscripción o proporcionar planes de servicio por niveles. Los enlaces de los proveedores <strong> pueden </strong> proporcionar detalles adicionales."
+
+#: ../../mod/pubsites.php:25
+msgid "Rate this hub"
+msgstr "Valorar este sitio"
+
+#: ../../mod/pubsites.php:26
+msgid "Site URL"
+msgstr "Dirección del sitio"
+
+#: ../../mod/pubsites.php:26
+msgid "Access Type"
+msgstr "Tipo de acceso"
+
+#: ../../mod/pubsites.php:26
+msgid "Registration Policy"
+msgstr "Normas de registro"
+
+#: ../../mod/pubsites.php:26 ../../mod/profiles.php:454
+msgid "Location"
+msgstr "Localización"
+
+#: ../../mod/pubsites.php:26
+msgid "Project"
+msgstr "Proyecto"
+
+#: ../../mod/pubsites.php:26
+msgid "View hub ratings"
+msgstr "Ver las valoraciones del sitio"
+
+#: ../../mod/pubsites.php:30
+msgid "Rate"
+msgstr "Valorar"
+
+#: ../../mod/pubsites.php:31
+msgid "View ratings"
+msgstr "Ver valoraciones"
+
+#: ../../mod/sources.php:32
+msgid "Failed to create source. No channel selected."
+msgstr "Imposible crear el origen de los contenidos. Ningún canal ha sido seleccionado."
+
+#: ../../mod/sources.php:45
+msgid "Source created."
+msgstr "Fuente creada."
+
+#: ../../mod/sources.php:57
+msgid "Source updated."
+msgstr "Fuente actualizada."
+
+#: ../../mod/sources.php:82
+msgid "*"
+msgstr "*"
+
+#: ../../mod/sources.php:89
+msgid "Manage remote sources of content for your channel."
+msgstr "Gestionar contenido de origen remoto para su canal."
+
+#: ../../mod/sources.php:90 ../../mod/sources.php:100
+msgid "New Source"
+msgstr "Nueva fuente"
+
+#: ../../mod/sources.php:101 ../../mod/sources.php:133
+msgid ""
+"Import all or selected content from the following channel into this channel "
+"and distribute it according to your channel settings."
+msgstr "Importar todo el contenido o una selección de los siguientes canales en este canal y distribuirlo de acuerdo con sus ajustes."
+
+#: ../../mod/sources.php:102 ../../mod/sources.php:134
+msgid "Only import content with these words (one per line)"
+msgstr "Importar solo contenido que contenga estas palabras (una por línea)"
+
+#: ../../mod/sources.php:102 ../../mod/sources.php:134
+msgid "Leave blank to import all public content"
+msgstr "Dejar en blanco para importar todo el contenido público"
+
+#: ../../mod/sources.php:123 ../../mod/sources.php:150
+msgid "Source not found."
+msgstr "Fuente no encontrada"
+
+#: ../../mod/sources.php:130
+msgid "Edit Source"
+msgstr "Editar fuente"
+
+#: ../../mod/sources.php:131
+msgid "Delete Source"
+msgstr "Eliminar fuente"
+
+#: ../../mod/sources.php:158
+msgid "Source removed"
+msgstr "Fuente eliminada"
+
+#: ../../mod/sources.php:160
+msgid "Unable to remove source."
+msgstr "Imposible eliminar la fuente."
 
 #: ../../mod/lockview.php:37
 msgid "Remote privacy information not available."
@@ -7513,6 +7135,325 @@ msgstr "La información privada remota no está disponible."
 msgid "Visible to:"
 msgstr "Visible para:"
 
+#: ../../mod/acl.php:222
+msgid "network"
+msgstr "red"
+
+#: ../../mod/acl.php:232
+msgid "RSS"
+msgstr "RSS"
+
+#: ../../mod/regmod.php:11
+msgid "Please login."
+msgstr "Por favor, inicie sesión."
+
+#: ../../mod/rmagic.php:40
+msgid ""
+"We encountered a problem while logging in with the OpenID you provided. "
+"Please check the correct spelling of the ID."
+msgstr "Encontramos un problema durante el inicio de sesión con la OpenID que proporcionó. Por favor, compruebe que la ID está correctamente escrita."
+
+#: ../../mod/rmagic.php:40
+msgid "The error message was:"
+msgstr "El mensaje de error fue:"
+
+#: ../../mod/rmagic.php:44
+msgid "Authentication failed."
+msgstr "Falló la autenticación."
+
+#: ../../mod/rmagic.php:84
+msgid "Remote Authentication"
+msgstr "Acceso desde su servidor"
+
+#: ../../mod/rmagic.php:85
+msgid "Enter your channel address (e.g. channel@example.com)"
+msgstr "Introduzca la dirección del canal (p.ej. canal@ejemplo.com)"
+
+#: ../../mod/rmagic.php:86
+msgid "Authenticate"
+msgstr "Acceder"
+
+#: ../../mod/channel.php:97
+msgid "Insufficient permissions.  Request redirected to profile page."
+msgstr "Permisos insuficientes. Petición redirigida a la página del perfil."
+
+#: ../../mod/siteinfo.php:111
+#, php-format
+msgid "Version %s"
+msgstr "Versión %s"
+
+#: ../../mod/siteinfo.php:132
+msgid "Installed plugins/addons/apps:"
+msgstr "Extensiones/Aplicaciones instaladas:"
+
+#: ../../mod/siteinfo.php:145
+msgid "No installed plugins/addons/apps"
+msgstr "Extensiones/Aplicaciones no instaladas:"
+
+#: ../../mod/siteinfo.php:158
+msgid ""
+"This is a hub of $Projectname - a global cooperative network of "
+"decentralized privacy enhanced websites."
+msgstr "Este es un sitio integrado en $Projectname - una red cooperativa mundial de sitios web descentralizados de privacidad mejorada."
+
+#: ../../mod/siteinfo.php:160
+msgid "Tag: "
+msgstr "Etiqueta:"
+
+#: ../../mod/siteinfo.php:162
+msgid "Last background fetch: "
+msgstr "Última actualización en segundo plano:"
+
+#: ../../mod/siteinfo.php:164
+msgid "Current load average: "
+msgstr "Carga media actual:"
+
+#: ../../mod/siteinfo.php:167
+msgid "Running at web location"
+msgstr "Corriendo en el sitio web"
+
+#: ../../mod/siteinfo.php:168
+msgid ""
+"Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more "
+"about $Projectname."
+msgstr "Por favor, visite <a href=\"http://hubzilla.org\">hubzilla.org</a> para más información sobre $Projectname."
+
+#: ../../mod/siteinfo.php:169
+msgid "Bug reports and issues: please visit"
+msgstr "Informes de errores e incidencias: por, favor visite"
+
+#: ../../mod/siteinfo.php:171
+msgid "$projectname issues"
+msgstr "Problemas en $projectname"
+
+#: ../../mod/siteinfo.php:172
+msgid ""
+"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot "
+"com"
+msgstr "Sugerencias, elogios, etc - por favor, un correo electrónico a \"redmatrix\" en librelist - punto com"
+
+#: ../../mod/siteinfo.php:174
+msgid "Site Administrators"
+msgstr "Administradores del sitio"
+
+#: ../../mod/import.php:27
+#, php-format
+msgid "Your service plan only allows %d channels."
+msgstr "Su paquete de servicios solo permite %d canales."
+
+#: ../../mod/import.php:65 ../../mod/import_items.php:38
+msgid "Nothing to import."
+msgstr "No hay nada para importar."
+
+#: ../../mod/import.php:89 ../../mod/import_items.php:62
+msgid "Unable to download data from old server"
+msgstr "No se han podido descargar datos de su antiguo servidor"
+
+#: ../../mod/import.php:95 ../../mod/import_items.php:68
+msgid "Imported file is empty."
+msgstr "El fichero importado está vacío."
+
+#: ../../mod/import.php:115 ../../mod/import_items.php:82
+#, php-format
+msgid "Warning: Database versions differ by %1$d updates."
+msgstr "Atención: Las versiones de la base de datos difieren en %1$d actualizaciones."
+
+#: ../../mod/import.php:148
+msgid "No channel. Import failed."
+msgstr "No hay canal. La importación ha fallado"
+
+#: ../../mod/import.php:499
+msgid "You must be logged in to use this feature."
+msgstr "Debe estar registrado para poder usar esta funcionalidad."
+
+#: ../../mod/import.php:504
+msgid "Import Channel"
+msgstr "Importar canal"
+
+#: ../../mod/import.php:505
+msgid ""
+"Use this form to import an existing channel from a different server/hub. You"
+" may retrieve the channel identity from the old server/hub via the network "
+"or provide an export file."
+msgstr "Emplee este formulario para importar un canal desde un servidor/hub diferente. Puede recuperar el canal desde el antiguo servidor/hub a través de la red o proporcionando un fichero de exportación."
+
+#: ../../mod/import.php:506 ../../mod/import_items.php:121
+msgid "File to Upload"
+msgstr "Fichero para subir"
+
+#: ../../mod/import.php:507
+msgid "Or provide the old server/hub details"
+msgstr "O proporcione los detalles de su antiguo servidor/hub"
+
+#: ../../mod/import.php:508
+msgid "Your old identity address (xyz@example.com)"
+msgstr "Su identidad en el antiguo servidor  (canal@ejemplo.com)"
+
+#: ../../mod/import.php:509
+msgid "Your old login email address"
+msgstr "Su antigua dirección de correo electrónico"
+
+#: ../../mod/import.php:510
+msgid "Your old login password"
+msgstr "Su antigua contraseña"
+
+#: ../../mod/import.php:511
+msgid ""
+"For either option, please choose whether to make this hub your new primary "
+"address, or whether your old location should continue this role. You will be"
+" able to post from either location, but only one can be marked as the "
+"primary location for files, photos, and media."
+msgstr "Para cualquiera de las opciones, elija si hacer de este servidor su nueva dirección primaria, o si su antigua ubicación debe continuar con este papel. Usted podrá publicar desde cualquier ubicación, pero sólo una puede estar marcada como la ubicación principal para los ficheros, fotos y otras imágenes o vídeos."
+
+#: ../../mod/import.php:512
+msgid "Make this hub my primary location"
+msgstr "Convertir este servidor en mi ubicación primaria"
+
+#: ../../mod/import.php:513
+msgid ""
+"Import existing posts if possible (experimental - limited by available "
+"memory"
+msgstr "Importar el contenido publicado si es posible (experimental - limitado por la memoria disponible"
+
+#: ../../mod/import.php:514
+msgid ""
+"This process may take several minutes to complete. Please submit the form "
+"only once and leave this page open until finished."
+msgstr "Este proceso puede tardar varios minutos en completarse. Por favor envíe el formulario una sola vez y mantenga esta página abierta hasta que termine."
+
+#: ../../mod/thing.php:111
+msgid "Thing updated"
+msgstr "Elemento actualizado."
+
+#: ../../mod/thing.php:163
+msgid "Object store: failed"
+msgstr "Guardar objeto: ha fallado"
+
+#: ../../mod/thing.php:167
+msgid "Thing added"
+msgstr "Elemento añadido"
+
+#: ../../mod/thing.php:193
+#, php-format
+msgid "OBJ: %1$s %2$s %3$s"
+msgstr "OBJ: %1$s %2$s %3$s"
+
+#: ../../mod/thing.php:256
+msgid "Show Thing"
+msgstr "Mostrar elemento"
+
+#: ../../mod/thing.php:263
+msgid "item not found."
+msgstr "elemento no encontrado."
+
+#: ../../mod/thing.php:296
+msgid "Edit Thing"
+msgstr "Editar elemento"
+
+#: ../../mod/thing.php:298 ../../mod/thing.php:348
+msgid "Select a profile"
+msgstr "Seleccionar un perfil"
+
+#: ../../mod/thing.php:302 ../../mod/thing.php:351
+msgid "Post an activity"
+msgstr "Publicar una actividad"
+
+#: ../../mod/thing.php:302 ../../mod/thing.php:351
+msgid "Only sends to viewers of the applicable profile"
+msgstr "Sólo enviar a espectadores del perfil pertinente."
+
+#: ../../mod/thing.php:304 ../../mod/thing.php:353
+msgid "Name of thing e.g. something"
+msgstr "Nombre del elemento, p. ej.:. \"algo\""
+
+#: ../../mod/thing.php:306 ../../mod/thing.php:354
+msgid "URL of thing (optional)"
+msgstr "Dirección del elemento (opcional)"
+
+#: ../../mod/thing.php:308 ../../mod/thing.php:355
+msgid "URL for photo of thing (optional)"
+msgstr "Dirección para la foto o elemento (opcional)"
+
+#: ../../mod/thing.php:346
+msgid "Add Thing to your Profile"
+msgstr "Añadir alguna cosa a su perfil"
+
+#: ../../mod/invite.php:25
+msgid "Total invitation limit exceeded."
+msgstr "Se ha superado el límite máximo de invitaciones."
+
+#: ../../mod/invite.php:49
+#, php-format
+msgid "%s : Not a valid email address."
+msgstr "%s : No es una dirección de correo electrónico válida. "
+
+#: ../../mod/invite.php:76
+msgid "Please join us on $Projectname"
+msgstr "Únase a nosotros en $Projectname"
+
+#: ../../mod/invite.php:87
+msgid "Invitation limit exceeded. Please contact your site administrator."
+msgstr "Excedido el límite de invitaciones. Por favor, contacte con el Administrador de su sitio."
+
+#: ../../mod/invite.php:92
+#, php-format
+msgid "%s : Message delivery failed."
+msgstr "%s : Falló el envío del mensaje."
+
+#: ../../mod/invite.php:96
+#, php-format
+msgid "%d message sent."
+msgid_plural "%d messages sent."
+msgstr[0] "%d mensajes enviados."
+msgstr[1] "%d mensajes enviados."
+
+#: ../../mod/invite.php:115
+msgid "You have no more invitations available"
+msgstr "No tiene más invitaciones disponibles"
+
+#: ../../mod/invite.php:129
+msgid "Send invitations"
+msgstr "Enviar invitaciones"
+
+#: ../../mod/invite.php:130
+msgid "Enter email addresses, one per line:"
+msgstr "Introduzca las direcciones de correo electrónica, una por línea:"
+
+#: ../../mod/invite.php:132
+msgid "Please join my community on $Projectname."
+msgstr "Por favor, únase a mi comunidad en $Projectname."
+
+#: ../../mod/invite.php:134
+msgid "You will need to supply this invitation code: "
+msgstr "Debe proporcionar este código de invitación:"
+
+#: ../../mod/invite.php:135
+msgid ""
+"1. Register at any $Projectname location (they are all inter-connected)"
+msgstr "1. Regístrese en cualquier lugar de $Projectname (están todos interconectados)"
+
+#: ../../mod/invite.php:137
+msgid "2. Enter my $Projectname network address into the site searchbar."
+msgstr "2. Introduzca mi dirección $Projectname en la caja de búsqueda del sitio."
+
+#: ../../mod/invite.php:138
+msgid "or visit "
+msgstr "o visite"
+
+#: ../../mod/invite.php:140
+msgid "3. Click [Connect]"
+msgstr "3. Pulse [conectar]"
+
+#: ../../mod/update_channel.php:43 ../../mod/update_display.php:25
+#: ../../mod/update_home.php:21 ../../mod/update_network.php:23
+#: ../../mod/update_search.php:46 ../../mod/update_public.php:21
+msgid "[Embedded content - reload page to view]"
+msgstr "[Contenido incorporado - recargue la página para poder verlo]"
+
+#: ../../mod/viewsrc.php:40
+msgid "Source of Item"
+msgstr "Origen del elemento"
+
 #: ../../mod/settings.php:76
 msgid "Name is required"
 msgstr "El nombre es obligatorio"
@@ -7521,1228 +7462,1265 @@ msgstr "El nombre es obligatorio"
 msgid "Key and Secret are required"
 msgstr "Clave y Secreto son obligatorios"
 
-#: ../../mod/settings.php:130
-msgid "Diaspora Policy Settings updated."
-msgstr "Configuración de directivas de Diaspora actualizada."
-
-#: ../../mod/settings.php:238
+#: ../../mod/settings.php:231
 msgid "Passwords do not match. Password unchanged."
 msgstr "Las contraseñas no coinciden. La contraseña no se ha cambiado."
 
-#: ../../mod/settings.php:242
+#: ../../mod/settings.php:235
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr "No se permiten contraseñas vacías. La contraseña no se ha cambiado."
 
-#: ../../mod/settings.php:256
+#: ../../mod/settings.php:249
 msgid "Password changed."
-msgstr "Constraseña cambiada."
+msgstr "Contraseña cambiada."
 
-#: ../../mod/settings.php:258
+#: ../../mod/settings.php:251
 msgid "Password update failed. Please try again."
 msgstr "La actualización de la contraseña ha fallado. Por favor, inténtalo de nuevo."
 
-#: ../../mod/settings.php:272
+#: ../../mod/settings.php:265
 msgid "Not valid email."
 msgstr "Correo electrónico no válido."
 
-#: ../../mod/settings.php:275
+#: ../../mod/settings.php:268
 msgid "Protected email address. Cannot change to that email."
 msgstr "Dirección de correo electrónico protegida. No se puede cambiar a ella."
 
-#: ../../mod/settings.php:284
+#: ../../mod/settings.php:277
 msgid "System failure storing new email. Please try again."
 msgstr "Fallo de sistema al guardar el nuevo correo electrónico. Por favor, inténtelo de nuevo."
 
-#: ../../mod/settings.php:523
+#: ../../mod/settings.php:518
 msgid "Settings updated."
 msgstr "Ajustes actualizados."
 
-#: ../../mod/settings.php:587 ../../mod/settings.php:613
-#: ../../mod/settings.php:649
+#: ../../mod/settings.php:582 ../../mod/settings.php:608
+#: ../../mod/settings.php:644
 msgid "Add application"
 msgstr "Añadir aplicación"
 
-#: ../../mod/settings.php:590
+#: ../../mod/settings.php:585
 msgid "Name of application"
 msgstr "Nombre de la aplicación"
 
-#: ../../mod/settings.php:591 ../../mod/settings.php:617
+#: ../../mod/settings.php:586 ../../mod/settings.php:612
 msgid "Consumer Key"
 msgstr "Clave de consumidor"
 
-#: ../../mod/settings.php:591 ../../mod/settings.php:592
+#: ../../mod/settings.php:586 ../../mod/settings.php:587
 msgid "Automatically generated - change if desired. Max length 20"
 msgstr "Generado automáticamente - si lo desea,  cámbielo. Longitud máxima: 20"
 
-#: ../../mod/settings.php:592 ../../mod/settings.php:618
+#: ../../mod/settings.php:587 ../../mod/settings.php:613
 msgid "Consumer Secret"
 msgstr "Clave secreta de consumidor"
 
-#: ../../mod/settings.php:593 ../../mod/settings.php:619
+#: ../../mod/settings.php:588 ../../mod/settings.php:614
 msgid "Redirect"
 msgstr "Redirigir"
 
-#: ../../mod/settings.php:593
+#: ../../mod/settings.php:588
 msgid ""
 "Redirect URI - leave blank unless your application specifically requires "
 "this"
 msgstr "URI de redirección - dejar en blanco a menos que su aplicación específicamente lo requiera"
 
-#: ../../mod/settings.php:594 ../../mod/settings.php:620
+#: ../../mod/settings.php:589 ../../mod/settings.php:615
 msgid "Icon url"
-msgstr "dirección del icono"
+msgstr "Dirección del icono"
 
-#: ../../mod/settings.php:594
+#: ../../mod/settings.php:589
 msgid "Optional"
 msgstr "Opcional"
 
-#: ../../mod/settings.php:605
+#: ../../mod/settings.php:600
 msgid "You can't edit this application."
 msgstr "No puede modificar esta aplicación."
 
-#: ../../mod/settings.php:648
+#: ../../mod/settings.php:643
 msgid "Connected Apps"
 msgstr "Aplicaciones conectadas"
 
-#: ../../mod/settings.php:652
+#: ../../mod/settings.php:647
 msgid "Client key starts with"
 msgstr "La clave de cliente empieza por"
 
-#: ../../mod/settings.php:653
+#: ../../mod/settings.php:648
 msgid "No name"
 msgstr "Sin nombre"
 
-#: ../../mod/settings.php:654
+#: ../../mod/settings.php:649
 msgid "Remove authorization"
 msgstr "Eliminar autorización"
 
-#: ../../mod/settings.php:668
+#: ../../mod/settings.php:662
 msgid "No feature settings configured"
 msgstr "No se ha establecido la configuración de características"
 
-#: ../../mod/settings.php:685
+#: ../../mod/settings.php:669
 msgid "Feature/Addon Settings"
 msgstr "Ajustes de la característica o el complemento"
 
-#: ../../mod/settings.php:687
-msgid "Settings for the built-in Diaspora emulator"
-msgstr "Configuración para el emulador de Diaspora incorporado"
-
-#: ../../mod/settings.php:688
-msgid "Allow any Diaspora member to comment on your public posts"
-msgstr "Permitir a cualquier miembro de Diaspora comentar en sus publicaciones públicas"
-
-#: ../../mod/settings.php:689
-msgid "Enable the Diaspora protocol for this channel"
-msgstr "Activar el protocolo de Diaspora para este canal"
-
-#: ../../mod/settings.php:690
-msgid "Diaspora Policy Settings"
-msgstr "Configuración de directivas de Diaspora"
-
-#: ../../mod/settings.php:691
-msgid "Prevent your hashtags from being redirected to other sites"
-msgstr "Impedir que sus \"hashtags\" sean redirigidos a otros sitios "
-
-#: ../../mod/settings.php:715
+#: ../../mod/settings.php:692
 msgid "Account Settings"
 msgstr "Configuración de la cuenta"
 
-#: ../../mod/settings.php:716
+#: ../../mod/settings.php:693
 msgid "Enter New Password:"
 msgstr "Introduzca la nueva contraseña:"
 
-#: ../../mod/settings.php:717
+#: ../../mod/settings.php:694
 msgid "Confirm New Password:"
 msgstr "Confirme la nueva contraseña:"
 
-#: ../../mod/settings.php:717
+#: ../../mod/settings.php:694
 msgid "Leave password fields blank unless changing"
 msgstr "Dejar en blanco los campos de contraseña a menos que cambie"
 
-#: ../../mod/settings.php:719 ../../mod/settings.php:1057
+#: ../../mod/settings.php:696 ../../mod/settings.php:1027
 msgid "Email Address:"
 msgstr "Dirección de correo electrónico:"
 
-#: ../../mod/settings.php:721
+#: ../../mod/settings.php:698
 msgid "Remove this account including all its channels"
 msgstr "Eliminar esta cuenta incluyendo todos sus canales"
 
-#: ../../mod/settings.php:737
+#: ../../mod/settings.php:714
 msgid "Off"
 msgstr "Desactivado"
 
-#: ../../mod/settings.php:737
+#: ../../mod/settings.php:714
 msgid "On"
 msgstr "Activado"
 
-#: ../../mod/settings.php:744
+#: ../../mod/settings.php:721
 msgid "Additional Features"
 msgstr "Características adicionales"
 
-#: ../../mod/settings.php:768
+#: ../../mod/settings.php:745
 msgid "Connector Settings"
 msgstr "Configuración del conector"
 
-#: ../../mod/settings.php:807
+#: ../../mod/settings.php:784
 msgid "No special theme for mobile devices"
 msgstr "Sin tema especial para dispositivos móviles"
 
-#: ../../mod/settings.php:810
+#: ../../mod/settings.php:787
 #, php-format
 msgid "%s - (Experimental)"
 msgstr "%s - (Experimental)"
 
-#: ../../mod/settings.php:849
+#: ../../mod/settings.php:826
 msgid "Display Settings"
 msgstr "Ajustes de visualización"
 
-#: ../../mod/settings.php:850
+#: ../../mod/settings.php:827
 msgid "Theme Settings"
 msgstr "Ajustes del tema"
 
-#: ../../mod/settings.php:851
+#: ../../mod/settings.php:828
 msgid "Custom Theme Settings"
 msgstr "Ajustes personalizados del tema"
 
-#: ../../mod/settings.php:852
+#: ../../mod/settings.php:829
 msgid "Content Settings"
 msgstr "Ajustes del contenido"
 
-#: ../../mod/settings.php:858
+#: ../../mod/settings.php:835
 msgid "Display Theme:"
 msgstr "Tema gráfico del perfil:"
 
-#: ../../mod/settings.php:859
+#: ../../mod/settings.php:836
 msgid "Mobile Theme:"
 msgstr "Tema para el móvil:"
 
-#: ../../mod/settings.php:860
+#: ../../mod/settings.php:837
 msgid "Enable user zoom on mobile devices"
 msgstr "Habilitar zoom de usuario en dispositivos móviles"
 
-#: ../../mod/settings.php:861
+#: ../../mod/settings.php:838
 msgid "Update browser every xx seconds"
 msgstr "Actualizar navegador cada xx segundos"
 
-#: ../../mod/settings.php:861
+#: ../../mod/settings.php:838
 msgid "Minimum of 10 seconds, no maximum"
 msgstr "Mínimo de 10 segundos, sin máximo"
 
-#: ../../mod/settings.php:862
+#: ../../mod/settings.php:839
 msgid "Maximum number of conversations to load at any time:"
 msgstr "Máximo número de conversaciones a cargar en cualquier momento:"
 
-#: ../../mod/settings.php:862
+#: ../../mod/settings.php:839
 msgid "Maximum of 100 items"
 msgstr "Máximo de 100 elementos"
 
-#: ../../mod/settings.php:863
+#: ../../mod/settings.php:840
 msgid "Show emoticons (smilies) as images"
 msgstr "Mostrar emoticonos (smilies) como imágenes"
 
-#: ../../mod/settings.php:864
+#: ../../mod/settings.php:841
 msgid "Link post titles to source"
 msgstr "Enlazar título de la publicación a la fuente original"
 
-#: ../../mod/settings.php:865
+#: ../../mod/settings.php:842
 msgid "System Page Layout Editor - (advanced)"
 msgstr "Editor de diseño de página del sistema - (avanzado)"
 
-#: ../../mod/settings.php:868
+#: ../../mod/settings.php:845
 msgid "Use blog/list mode on channel page"
 msgstr "Usar modo blog/lista en la página de inicio del canal"
 
-#: ../../mod/settings.php:868 ../../mod/settings.php:869
+#: ../../mod/settings.php:845 ../../mod/settings.php:846
 msgid "(comments displayed separately)"
 msgstr "(comentarios mostrados de forma separada)"
 
-#: ../../mod/settings.php:869
+#: ../../mod/settings.php:846
 msgid "Use blog/list mode on matrix page"
 msgstr "Mostrar la red en modo blog/lista"
 
-#: ../../mod/settings.php:870
+#: ../../mod/settings.php:847
 msgid "Channel page max height of content (in pixels)"
 msgstr "Altura máxima del contenido de la página del canal (en píxeles)"
 
-#: ../../mod/settings.php:870 ../../mod/settings.php:871
+#: ../../mod/settings.php:847 ../../mod/settings.php:848
 msgid "click to expand content exceeding this height"
-msgstr "Pulsa para expandir el contenido que excede esta altura"
+msgstr "Pulsar para expandir el contenido que exceda de esta altura"
 
-#: ../../mod/settings.php:871
+#: ../../mod/settings.php:848
 msgid "Matrix page max height of content (in pixels)"
-msgstr "Altura máxima del contenido de la página de la red (en píxeles)"
+msgstr "Altura máxima del contenido de la página de su red (en píxeles)"
 
-#: ../../mod/settings.php:905
+#: ../../mod/settings.php:882
 msgid "Nobody except yourself"
-msgstr "Nadie excepto tú"
+msgstr "Nadie excepto usted"
 
-#: ../../mod/settings.php:906
+#: ../../mod/settings.php:883
 msgid "Only those you specifically allow"
 msgstr "Solo aquellos a los que usted permita explícitamente"
 
-#: ../../mod/settings.php:907
+#: ../../mod/settings.php:884
 msgid "Approved connections"
 msgstr "Conexiones aprobadas"
 
-#: ../../mod/settings.php:908
+#: ../../mod/settings.php:885
 msgid "Any connections"
 msgstr "Cualquier conexión"
 
-#: ../../mod/settings.php:909
+#: ../../mod/settings.php:886
 msgid "Anybody on this website"
 msgstr "Cualquiera en este sitio web"
 
-#: ../../mod/settings.php:910
+#: ../../mod/settings.php:887
 msgid "Anybody in this network"
 msgstr "Cualquiera en esta red"
 
-#: ../../mod/settings.php:911
+#: ../../mod/settings.php:888
 msgid "Anybody authenticated"
 msgstr "Cualquiera que esté autenticado"
 
-#: ../../mod/settings.php:912
+#: ../../mod/settings.php:889
 msgid "Anybody on the internet"
 msgstr "Cualquiera en internet"
 
-#: ../../mod/settings.php:986
+#: ../../mod/settings.php:963
 msgid "Publish your default profile in the network directory"
 msgstr "Publicar su perfil principal en el directorio de la red"
 
-#: ../../mod/settings.php:991
+#: ../../mod/settings.php:968
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr "¿Nos permite sugerirle como amigo potencial a los nuevos miembros?"
 
-#: ../../mod/settings.php:1000
+#: ../../mod/settings.php:977
 msgid "Your channel address is"
 msgstr "Su dirección de canal es"
 
-#: ../../mod/settings.php:1048
+#: ../../mod/settings.php:1018
 msgid "Channel Settings"
 msgstr "Ajustes del canal"
 
-#: ../../mod/settings.php:1055
+#: ../../mod/settings.php:1025
 msgid "Basic Settings"
 msgstr "Configuración básica"
 
-#: ../../mod/settings.php:1058
+#: ../../mod/settings.php:1028
 msgid "Your Timezone:"
 msgstr "Su zona horaria:"
 
-#: ../../mod/settings.php:1059
+#: ../../mod/settings.php:1029
 msgid "Default Post Location:"
 msgstr "Ubicación de publicación predeterminada:"
 
-#: ../../mod/settings.php:1059
+#: ../../mod/settings.php:1029
 msgid "Geographical location to display on your posts"
 msgstr "Ubicación geográfica que debe mostrarse en sus publicaciones"
 
-#: ../../mod/settings.php:1060
+#: ../../mod/settings.php:1030
 msgid "Use Browser Location:"
 msgstr "Usar la localización del navegador:"
 
-#: ../../mod/settings.php:1062
+#: ../../mod/settings.php:1032
 msgid "Adult Content"
 msgstr "Contenido solo para adultos"
 
-#: ../../mod/settings.php:1062
+#: ../../mod/settings.php:1032
 msgid ""
 "This channel frequently or regularly publishes adult content. (Please tag "
 "any adult material and/or nudity with #NSFW)"
 msgstr "Este canal publica contenido solo para adultos con frecuencia o regularmente. (Por favor etiquete cualquier material para adultos con la etiqueta #NSFW)"
 
-#: ../../mod/settings.php:1064
+#: ../../mod/settings.php:1034
 msgid "Security and Privacy Settings"
 msgstr "Configuración de seguridad y privacidad"
 
-#: ../../mod/settings.php:1066
+#: ../../mod/settings.php:1036
 msgid "Your permissions are already configured. Click to view/adjust"
 msgstr "Sus permisos ya están configurados. Pulse para ver/ajustar"
 
-#: ../../mod/settings.php:1068
+#: ../../mod/settings.php:1038
 msgid "Hide my online presence"
-msgstr "Ocultra mi presencia en línea"
+msgstr "Ocultar mi presencia en línea"
 
-#: ../../mod/settings.php:1068
+#: ../../mod/settings.php:1038
 msgid "Prevents displaying in your profile that you are online"
 msgstr "Evitar mostrar en su perfil que está en línea"
 
-#: ../../mod/settings.php:1070
+#: ../../mod/settings.php:1040
 msgid "Simple Privacy Settings:"
 msgstr "Configuración de privacidad sencilla:"
 
-#: ../../mod/settings.php:1071
+#: ../../mod/settings.php:1041
 msgid ""
 "Very Public - <em>extremely permissive (should be used with caution)</em>"
 msgstr "Muy Público - <em>extremadamente permisivo (debería ser usado con precaución)</em>"
 
-#: ../../mod/settings.php:1072
+#: ../../mod/settings.php:1042
 msgid ""
 "Typical - <em>default public, privacy when desired (similar to social "
 "network permissions but with improved privacy)</em>"
 msgstr "Típico - <em>por defecto público, privado cuando se desee (similar a los permisos de una red social pero con privacidad mejorada)</em>"
 
-#: ../../mod/settings.php:1073
+#: ../../mod/settings.php:1043
 msgid "Private - <em>default private, never open or public</em>"
 msgstr "Privado - <em>por defecto, privado, nunca abierto o público</em>"
 
-#: ../../mod/settings.php:1074
+#: ../../mod/settings.php:1044
 msgid "Blocked - <em>default blocked to/from everybody</em>"
 msgstr "Bloqueado - <em>por defecto, bloqueado/a para cualquiera</em>"
 
-#: ../../mod/settings.php:1076
+#: ../../mod/settings.php:1046
 msgid "Allow others to tag your posts"
 msgstr "Permitir a otros etiquetar sus publicaciones"
 
-#: ../../mod/settings.php:1076
+#: ../../mod/settings.php:1046
 msgid ""
 "Often used by the community to retro-actively flag inappropriate content"
 msgstr "A menudo usado por la comunidad para marcar contenido inapropiado de forma retroactiva."
 
-#: ../../mod/settings.php:1078
+#: ../../mod/settings.php:1048
 msgid "Advanced Privacy Settings"
 msgstr "Configuración de privacidad avanzada"
 
-#: ../../mod/settings.php:1080
+#: ../../mod/settings.php:1050
 msgid "Expire other channel content after this many days"
 msgstr "Caducar contenido de otro canal después de este número de días"
 
-#: ../../mod/settings.php:1080
+#: ../../mod/settings.php:1050
 msgid "0 or blank prevents expiration"
 msgstr "0 o en claro evitan la caducidad"
 
-#: ../../mod/settings.php:1081
+#: ../../mod/settings.php:1051
 msgid "Maximum Friend Requests/Day:"
 msgstr "Máximo de solicitudes de amistad por día:"
 
-#: ../../mod/settings.php:1081
+#: ../../mod/settings.php:1051
 msgid "May reduce spam activity"
 msgstr "Podría reducir la actividad de spam"
 
-#: ../../mod/settings.php:1082
+#: ../../mod/settings.php:1052
 msgid "Default Post Permissions"
-msgstr "Permidos de publicación predeterminados"
+msgstr "Permisos de publicación predeterminados"
 
-#: ../../mod/settings.php:1087
+#: ../../mod/settings.php:1057
 msgid "Channel permissions category:"
 msgstr "Categoría de permisos del canal:"
 
-#: ../../mod/settings.php:1093
+#: ../../mod/settings.php:1063
 msgid "Maximum private messages per day from unknown people:"
 msgstr "Máximo de mensajes privados por día de gente desconocida:"
 
-#: ../../mod/settings.php:1093
+#: ../../mod/settings.php:1063
 msgid "Useful to reduce spamming"
 msgstr "Útil para reducir el envío de correo no deseado"
 
-#: ../../mod/settings.php:1096
+#: ../../mod/settings.php:1066
 msgid "Notification Settings"
 msgstr "Configuración de notificaciones"
 
-#: ../../mod/settings.php:1097
+#: ../../mod/settings.php:1067
 msgid "By default post a status message when:"
 msgstr "Por defecto, enviar un mensaje de estado cuando:"
 
-#: ../../mod/settings.php:1098
+#: ../../mod/settings.php:1068
 msgid "accepting a friend request"
 msgstr "acepte una solicitud de amistad"
 
-#: ../../mod/settings.php:1099
+#: ../../mod/settings.php:1069
 msgid "joining a forum/community"
 msgstr "al unirse a un foro o comunidad"
 
-#: ../../mod/settings.php:1100
+#: ../../mod/settings.php:1070
 msgid "making an <em>interesting</em> profile change"
 msgstr "realice un cambio <em>interesante</em> en su perfil"
 
-#: ../../mod/settings.php:1101
+#: ../../mod/settings.php:1071
 msgid "Send a notification email when:"
 msgstr "Enviar una notificación por correo electrónico cuando:"
 
-#: ../../mod/settings.php:1102
+#: ../../mod/settings.php:1072
 msgid "You receive a connection request"
 msgstr "Reciba una solicitud de conexión"
 
-#: ../../mod/settings.php:1103
+#: ../../mod/settings.php:1073
 msgid "Your connections are confirmed"
 msgstr "Sus conexiones hayan sido confirmadas"
 
-#: ../../mod/settings.php:1104
+#: ../../mod/settings.php:1074
 msgid "Someone writes on your profile wall"
 msgstr "Alguien escriba en la página de su perfil (muro)"
 
-#: ../../mod/settings.php:1105
+#: ../../mod/settings.php:1075
 msgid "Someone writes a followup comment"
 msgstr "Alguien escriba un comentario sobre sus publicaciones"
 
-#: ../../mod/settings.php:1106
+#: ../../mod/settings.php:1076
 msgid "You receive a private message"
 msgstr "Reciba un mensaje privado"
 
-#: ../../mod/settings.php:1107
+#: ../../mod/settings.php:1077
 msgid "You receive a friend suggestion"
 msgstr "Reciba una sugerencia de amistad"
 
-#: ../../mod/settings.php:1108
+#: ../../mod/settings.php:1078
 msgid "You are tagged in a post"
 msgstr "Usted sea etiquetado en una publicación"
 
-#: ../../mod/settings.php:1109
+#: ../../mod/settings.php:1079
 msgid "You are poked/prodded/etc. in a post"
-msgstr "Recibir un toque o incitación en una publicación"
+msgstr "Reciba un toque o incitación en una entrada"
 
-#: ../../mod/settings.php:1112
+#: ../../mod/settings.php:1082
 msgid "Show visual notifications including:"
 msgstr "Mostrar notificaciones visuales que incluyan:"
 
-#: ../../mod/settings.php:1114
+#: ../../mod/settings.php:1084
 msgid "Unseen matrix activity"
 msgstr "Actividad no vista en la red"
 
-#: ../../mod/settings.php:1115
+#: ../../mod/settings.php:1085
 msgid "Unseen channel activity"
 msgstr "Actividad no vista en el canal"
 
-#: ../../mod/settings.php:1116
+#: ../../mod/settings.php:1086
 msgid "Unseen private messages"
 msgstr "Mensajes privados no leídos"
 
-#: ../../mod/settings.php:1116 ../../mod/settings.php:1121
-#: ../../mod/settings.php:1122 ../../mod/settings.php:1123
+#: ../../mod/settings.php:1086 ../../mod/settings.php:1091
+#: ../../mod/settings.php:1092 ../../mod/settings.php:1093
 msgid "Recommended"
 msgstr "Recomendado"
 
-#: ../../mod/settings.php:1117
+#: ../../mod/settings.php:1087
 msgid "Upcoming events"
 msgstr "Próximos eventos"
 
-#: ../../mod/settings.php:1118
+#: ../../mod/settings.php:1088
 msgid "Events today"
 msgstr "Eventos de hoy"
 
-#: ../../mod/settings.php:1119
+#: ../../mod/settings.php:1089
 msgid "Upcoming birthdays"
 msgstr "Próximos cumpleaños"
 
-#: ../../mod/settings.php:1119
+#: ../../mod/settings.php:1089
 msgid "Not available in all themes"
 msgstr "No disponible en todos los temas"
 
-#: ../../mod/settings.php:1120
+#: ../../mod/settings.php:1090
 msgid "System (personal) notifications"
 msgstr "Notificaciones del sistema (personales)"
 
-#: ../../mod/settings.php:1121
+#: ../../mod/settings.php:1091
 msgid "System info messages"
 msgstr "Mensajes de información del sistema"
 
-#: ../../mod/settings.php:1122
+#: ../../mod/settings.php:1092
 msgid "System critical alerts"
 msgstr "Alertas críticas del sistema"
 
-#: ../../mod/settings.php:1123
+#: ../../mod/settings.php:1093
 msgid "New connections"
 msgstr "Nuevas conexiones"
 
-#: ../../mod/settings.php:1124
+#: ../../mod/settings.php:1094
 msgid "System Registrations"
 msgstr "Registros del sistema"
 
-#: ../../mod/settings.php:1125
+#: ../../mod/settings.php:1095
 msgid ""
 "Also show new wall posts, private messages and connections under Notices"
 msgstr "Mostrar también en Avisos las nuevas publicaciones, los mensajes privados y las conexiones"
 
-#: ../../mod/settings.php:1127
+#: ../../mod/settings.php:1097
 msgid "Notify me of events this many days in advance"
 msgstr "Avisarme de los eventos con algunos días de antelación"
 
-#: ../../mod/settings.php:1127
+#: ../../mod/settings.php:1097
 msgid "Must be greater than 0"
 msgstr "Debe ser mayor que 0"
 
-#: ../../mod/settings.php:1129
+#: ../../mod/settings.php:1099
 msgid "Advanced Account/Page Type Settings"
 msgstr "Ajustes avanzados de la cuenta y de los tipos de página"
 
-#: ../../mod/settings.php:1130
+#: ../../mod/settings.php:1100
 msgid "Change the behaviour of this account for special situations"
 msgstr "Cambiar el comportamiento de esta cuenta en situaciones especiales"
 
-#: ../../mod/settings.php:1133
+#: ../../mod/settings.php:1103
 msgid ""
 "Please enable expert mode (in <a href=\"settings/features\">Settings > "
 "Additional features</a>) to adjust!"
 msgstr "Activar modo experto (en <a href=\"settings/features\">Ajustes > Características Adicionales</a>) para ajustar."
 
-#: ../../mod/settings.php:1134
+#: ../../mod/settings.php:1104
 msgid "Miscellaneous Settings"
 msgstr "Ajustes diversos"
 
-#: ../../mod/settings.php:1136
+#: ../../mod/settings.php:1105
+msgid "Default photo upload folder"
+msgstr "Carpeta por defecto de las fotos subidas"
+
+#: ../../mod/settings.php:1106
+msgid "Default file upload folder"
+msgstr "Carpeta por defecto de los archivos subidos"
+
+#: ../../mod/settings.php:1108
 msgid "Personal menu to display in your channel pages"
 msgstr "Menú personal que debe mostrarse en las páginas de su canal"
 
-#: ../../mod/settings.php:1137 ../../mod/removeme.php:61
-msgid "Remove Channel"
-msgstr "Eliminar canal"
-
-#: ../../mod/settings.php:1138
+#: ../../mod/settings.php:1110
 msgid "Remove this channel."
 msgstr "Eliminar este canal."
 
-#: ../../mod/id.php:11
-msgid "First Name"
-msgstr "Nombre"
+#: ../../mod/xchan.php:6
+msgid "Xchan Lookup"
+msgstr "Búsqueda de canales"
 
-#: ../../mod/id.php:12
-msgid "Last Name"
-msgstr "Apellido"
+#: ../../mod/xchan.php:9
+msgid "Lookup xchan beginning with (or webbie): "
+msgstr "Buscar un canal (o un \"webbie\") que comience por:"
 
-#: ../../mod/id.php:13
-msgid "Nickname"
-msgstr "Sobrenombre o Alias"
+#: ../../mod/manage.php:130
+#, php-format
+msgid "You have created %1$.0f of %2$.0f allowed channels."
+msgstr "Ha creado %1$.0f de %2$.0f canales permitidos."
 
-#: ../../mod/id.php:14
-msgid "Full Name"
-msgstr "Nombre completo"
+#: ../../mod/manage.php:138
+msgid "Create a new channel"
+msgstr "Crear un nuevo canal"
 
-#: ../../mod/id.php:20
-msgid "Profile Photo 16px"
-msgstr "Foto de perfil 16px"
+#: ../../mod/manage.php:161
+msgid "Current Channel"
+msgstr "Canal actual"
 
-#: ../../mod/id.php:21
-msgid "Profile Photo 32px"
-msgstr "Foto de perfil 32px"
+#: ../../mod/manage.php:163
+msgid "Switch to one of your channels by selecting it."
+msgstr "Cambiar a uno de sus canales seleccionándolo."
 
-#: ../../mod/id.php:22
-msgid "Profile Photo 48px"
-msgstr "Foto de perfil 48px"
+#: ../../mod/manage.php:164
+msgid "Default Channel"
+msgstr "Canal principal"
 
-#: ../../mod/id.php:23
-msgid "Profile Photo 64px"
-msgstr "Foto de perfil 64px"
+#: ../../mod/manage.php:165
+msgid "Make Default"
+msgstr "Convertir en predeterminado"
 
-#: ../../mod/id.php:24
-msgid "Profile Photo 80px"
-msgstr "Foto de perfil 80px"
+#: ../../mod/manage.php:168
+#, php-format
+msgid "%d new messages"
+msgstr "%d mensajes nuevos"
 
-#: ../../mod/id.php:25
-msgid "Profile Photo 128px"
-msgstr "Foto de perfil 128px"
+#: ../../mod/manage.php:169
+#, php-format
+msgid "%d new introductions"
+msgstr "%d nuevas isolicitudes de conexión"
 
-#: ../../mod/id.php:26
-msgid "Timezone"
-msgstr "Zona horaria"
+#: ../../mod/manage.php:171
+msgid "Delegated Channels"
+msgstr "Canales delegados"
 
-#: ../../mod/id.php:27
-msgid "Homepage URL"
-msgstr "Dirección de la página personal"
+#: ../../mod/api.php:76 ../../mod/api.php:102
+msgid "Authorize application connection"
+msgstr "Autorizar una conexión de aplicación"
 
-#: ../../mod/id.php:29
-msgid "Birth Year"
-msgstr "Año de nacimiento"
+#: ../../mod/api.php:77
+msgid "Return to your app and insert this Securty Code:"
+msgstr "Volver a su aplicación e introducir este código de seguridad:"
 
-#: ../../mod/id.php:30
-msgid "Birth Month"
-msgstr "Mes de nacimiento"
+#: ../../mod/api.php:89
+msgid "Please login to continue."
+msgstr "Por favor inicia sesión para continuar."
 
-#: ../../mod/id.php:31
-msgid "Birth Day"
-msgstr "Día de nacimiento"
+#: ../../mod/api.php:104
+msgid ""
+"Do you want to authorize this application to access your posts and contacts,"
+" and/or create new posts for you?"
+msgstr "¿Desea autorizar a esta aplicación a acceder a sus publicaciones y contactos, y/o crear nuevas publicaciones por usted?"
 
-#: ../../mod/id.php:32
-msgid "Birthdate"
-msgstr "Fecha de nacimiento"
+#: ../../mod/connections.php:52 ../../mod/connections.php:150
+msgid "Blocked"
+msgstr "Bloqueadas"
 
-#: ../../mod/message.php:41
-msgid "Conversation removed."
-msgstr "Conversación eliminada."
+#: ../../mod/connections.php:57 ../../mod/connections.php:157
+msgid "Ignored"
+msgstr "Ignoradas"
 
-#: ../../mod/message.php:56
-msgid "No messages."
-msgstr "Sin mensajes."
+#: ../../mod/connections.php:62 ../../mod/connections.php:171
+msgid "Hidden"
+msgstr "Ocultas"
 
-#: ../../mod/message.php:72 ../../mod/mail.php:336
-msgid "Delete conversation"
-msgstr "Eliminar conversación"
+#: ../../mod/connections.php:67 ../../mod/connections.php:164
+msgid "Archived"
+msgstr "Archivadas"
 
-#: ../../mod/message.php:74
-msgid "D, d M Y - g:i A"
-msgstr "D d M Y - G:i"
+#: ../../mod/connections.php:128
+msgid "Suggest new connections"
+msgstr "Sugerir nuevas conexiones"
 
-#: ../../mod/mood.php:131
-msgid "Set your current mood and tell your friends"
-msgstr "Describir su estado de ánimo para comunicárselo a sus amigos"
+#: ../../mod/connections.php:131
+msgid "New Connections"
+msgstr "Nuevas conexiones"
 
-#: ../../mod/vote.php:97
-msgid "Total votes"
-msgstr "Total de votos"
+#: ../../mod/connections.php:134
+msgid "Show pending (new) connections"
+msgstr "Mostrar conexiones (nuevas) pendientes"
 
-#: ../../mod/vote.php:98
-msgid "Average Rating"
-msgstr "Valoración media"
+#: ../../mod/connections.php:137 ../../mod/profperm.php:139
+msgid "All Connections"
+msgstr "Todas las conexiones"
 
-#: ../../mod/removeme.php:29
-msgid ""
-"Channel removals are not allowed within 48 hours of changing the account "
-"password."
-msgstr "La eliminación de canales no está permitida hasta pasadas 48 horas desde el último cambio de contraseña."
+#: ../../mod/connections.php:140
+msgid "Show all connections"
+msgstr "Mostrar todas las conexiones"
 
-#: ../../mod/removeme.php:57
-msgid "Remove This Channel"
-msgstr "Eliminar este canal"
+#: ../../mod/connections.php:143
+msgid "Unblocked"
+msgstr "Desbloqueadas"
 
-#: ../../mod/removeme.php:58
-msgid "This channel will be completely removed from the network. "
-msgstr "Este canal va a ser completamente eliminado de la red."
+#: ../../mod/connections.php:146
+msgid "Only show unblocked connections"
+msgstr "Mostrar solo las conexiones desbloqueadas"
 
-#: ../../mod/removeme.php:60
-msgid "Remove this channel and all its clones from the network"
-msgstr "Eliminar este canal y todos sus clones de la red"
+#: ../../mod/connections.php:153
+msgid "Only show blocked connections"
+msgstr "Mostrar solo las conexiones bloqueadas"
 
-#: ../../mod/removeme.php:60
-msgid ""
-"By default only the instance of the channel located on this hub will be "
-"removed from the network"
-msgstr "Por defecto, solo la instancia del canal alojado en este servidor será eliminado de la red"
+#: ../../mod/connections.php:160
+msgid "Only show ignored connections"
+msgstr "Mostrar solo conexiones ignoradas"
 
-#: ../../mod/connedit.php:75
-msgid "Could not access contact record."
-msgstr "No se ha podido acceder al registro de contacto."
+#: ../../mod/connections.php:167
+msgid "Only show archived connections"
+msgstr "Mostrar solo las conexiones archivadas"
 
-#: ../../mod/connedit.php:99
-msgid "Could not locate selected profile."
-msgstr "No se ha podido localizar el perfil seleccionado."
+#: ../../mod/connections.php:174
+msgid "Only show hidden connections"
+msgstr "Mostrar solo las conexiones ocultas"
 
-#: ../../mod/connedit.php:219
-msgid "Connection updated."
-msgstr "Conexión actualizada."
+#: ../../mod/connections.php:225
+#, php-format
+msgid "%1$s [%2$s]"
+msgstr "%1$s [%2$s]"
 
-#: ../../mod/connedit.php:221
-msgid "Failed to update connection record."
-msgstr "Error al actualizar el registro de la conexión."
+#: ../../mod/connections.php:226
+msgid "Edit connection"
+msgstr "Editar conexión"
 
-#: ../../mod/connedit.php:267
-msgid "is now connected to"
-msgstr "ahora está conectado a"
+#: ../../mod/connections.php:264
+msgid "Search your connections"
+msgstr "Buscar sus conexiones"
 
-#: ../../mod/connedit.php:392
-msgid "Could not access address book record."
-msgstr "No se pudo acceder a la entrada en su libreta de direcciones."
+#: ../../mod/connections.php:265
+msgid "Finding: "
+msgstr "Búsqueda:"
 
-#: ../../mod/connedit.php:406
-msgid "Refresh failed - channel is currently unavailable."
-msgstr "Recarga fallida - no se puede encontrar actualmente el canal"
+#: ../../mod/editlayout.php:112
+msgid "Delete layout?"
+msgstr "¿Borrar el formato?"
 
-#: ../../mod/connedit.php:418 ../../mod/connedit.php:430
-#: ../../mod/connedit.php:442 ../../mod/connedit.php:454
-#: ../../mod/connedit.php:470
-msgid "Unable to set address book parameters."
-msgstr "No ha sido posible establecer los parámetros de la libreta de direcciones."
+#: ../../mod/editlayout.php:178
+msgid "Edit Layout"
+msgstr "Modificar el formato"
 
-#: ../../mod/connedit.php:494
-msgid "Connection has been removed."
-msgstr "La conexión ha sido eliminada."
+#: ../../mod/editwebpage.php:153
+msgid "Delete webpage?"
+msgstr "¿Eliminar la página web?"
 
-#: ../../mod/connedit.php:513
-#, php-format
-msgid "View %s's profile"
-msgstr "Ver el perfil de %s"
+#: ../../mod/editwebpage.php:172
+msgid "Page link title"
+msgstr "Título del enlace de la página"
 
-#: ../../mod/connedit.php:517
-msgid "Refresh Permissions"
-msgstr "Recargar los permisos"
+#: ../../mod/editwebpage.php:222
+msgid "Edit Webpage"
+msgstr "Editar la página web"
 
-#: ../../mod/connedit.php:520
-msgid "Fetch updated permissions"
-msgstr "Obtener los permisos actualizados"
+#: ../../mod/group.php:20
+msgid "Collection created."
+msgstr "La colección ha sido creada."
 
-#: ../../mod/connedit.php:524
-msgid "Recent Activity"
-msgstr "Actividad reciente"
+#: ../../mod/group.php:26
+msgid "Could not create collection."
+msgstr "No se puede crear la colección."
 
-#: ../../mod/connedit.php:527
-msgid "View recent posts and comments"
-msgstr "Ver publicaciones y comentarios recientes"
+#: ../../mod/group.php:54
+msgid "Collection updated."
+msgstr "La colección ha sido actualizada."
 
-#: ../../mod/connedit.php:534
-msgid "Block (or Unblock) all communications with this connection"
-msgstr "Bloquear (o desbloquear) todas las comunicaciones con esta conexión"
+#: ../../mod/group.php:86
+msgid "Create a collection of channels."
+msgstr "Crear una colección de canales."
 
-#: ../../mod/connedit.php:535
-msgid "This connection is blocked!"
-msgstr "¡Esta conexión está bloqueada!"
+#: ../../mod/group.php:87 ../../mod/group.php:180
+msgid "Collection Name: "
+msgstr "Nombre de la colección:"
 
-#: ../../mod/connedit.php:539
-msgid "Unignore"
-msgstr "Dejar de ignorar"
+#: ../../mod/group.php:89 ../../mod/group.php:183
+msgid "Members are visible to other channels"
+msgstr "Los miembros son visibles para otros canales"
 
-#: ../../mod/connedit.php:539 ../../mod/notifications.php:51
-msgid "Ignore"
-msgstr "Ignorar"
+#: ../../mod/group.php:107
+msgid "Collection removed."
+msgstr "La colección ha sido eliminada."
 
-#: ../../mod/connedit.php:542
-msgid "Ignore (or Unignore) all inbound communications from this connection"
-msgstr "Ignorar (o dejar de ignorar) todas las comunicaciones entrantes de esta conexión"
+#: ../../mod/group.php:109
+msgid "Unable to remove collection."
+msgstr "No ha sido posible de eliminar la colección."
 
-#: ../../mod/connedit.php:543
-msgid "This connection is ignored!"
-msgstr "¡Esta conexión es ignorada!"
+#: ../../mod/group.php:179
+msgid "Collection Editor"
+msgstr "Editor de colecciones"
 
-#: ../../mod/connedit.php:547
-msgid "Unarchive"
-msgstr "Desarchivar"
+#: ../../mod/group.php:193
+msgid "Members"
+msgstr "Miembros"
 
-#: ../../mod/connedit.php:547
-msgid "Archive"
-msgstr "Archivar"
+#: ../../mod/group.php:195
+msgid "All Connected Channels"
+msgstr "Todos los canales conectados"
 
-#: ../../mod/connedit.php:550
-msgid ""
-"Archive (or Unarchive) this connection - mark channel dead but keep content"
-msgstr "Archiva (o desarchiva) esta conexión - marca el canal como muerto aunque mantiene sus contenidos"
+#: ../../mod/group.php:227
+msgid "Click on a channel to add or remove."
+msgstr "Haga clic en un canal para agregarlo o quitarlo."
 
-#: ../../mod/connedit.php:551
-msgid "This connection is archived!"
-msgstr "¡Esta conexión esta archivada!"
+#: ../../mod/connect.php:56 ../../mod/connect.php:104
+msgid "Continue"
+msgstr "Continuar"
 
-#: ../../mod/connedit.php:555
-msgid "Unhide"
-msgstr "Mostrar"
+#: ../../mod/connect.php:85
+msgid "Premium Channel Setup"
+msgstr "Configuración del canal premium"
 
-#: ../../mod/connedit.php:555
-msgid "Hide"
-msgstr "Ocultar"
+#: ../../mod/connect.php:87
+msgid "Enable premium channel connection restrictions"
+msgstr "Habilitar restricciones de conexión del canal premium"
 
-#: ../../mod/connedit.php:558
-msgid "Hide or Unhide this connection from your other connections"
-msgstr "Ocultar o mostrar esta conexión a sus otras conexiones"
+#: ../../mod/connect.php:88
+msgid ""
+"Please enter your restrictions or conditions, such as paypal receipt, usage "
+"guidelines, etc."
+msgstr "Por favor introduzca sus restricciones o condiciones, como recibo de paypal, normas de uso, etc."
 
-#: ../../mod/connedit.php:559
-msgid "This connection is hidden!"
-msgstr "¡Esta conexión está oculta!"
+#: ../../mod/connect.php:90 ../../mod/connect.php:110
+msgid ""
+"This channel may require additional steps or acknowledgement of the "
+"following conditions prior to connecting:"
+msgstr "Este canal puede requerir antes de conectar unos pasos adicionales o el conocimiento de las siguientes condiciones:"
 
-#: ../../mod/connedit.php:566
-msgid "Delete this connection"
-msgstr "Eliminar esta conexión"
+#: ../../mod/connect.php:91
+msgid ""
+"Potential connections will then see the following text before proceeding:"
+msgstr "Las posibles conexiones verán, por tanto, el siguiente texto antes de proceder:"
 
-#: ../../mod/connedit.php:647
-msgid "Approve this connection"
-msgstr "Aprobar esta conexión"
+#: ../../mod/connect.php:92 ../../mod/connect.php:113
+msgid ""
+"By continuing, I certify that I have complied with any instructions provided"
+" on this page."
+msgstr "Al continuar, certifico que he cumplido con todas las instrucciones proporcionadas en esta página."
 
-#: ../../mod/connedit.php:647
-msgid "Accept connection to allow communication"
-msgstr "Aceptar la conexión para permitir la comunicación"
+#: ../../mod/connect.php:101
+msgid "(No specific instructions have been provided by the channel owner.)"
+msgstr "(No ha sido proporcionada ninguna instrucción específica por el propietario del canal.)"
 
-#: ../../mod/connedit.php:652
-msgid "Set Affinity"
-msgstr "Ajustar Afinidad"
+#: ../../mod/connect.php:109
+msgid "Restricted or Premium Channel"
+msgstr "Canal premium o restringido"
 
-#: ../../mod/connedit.php:655
-msgid "Set Profile"
-msgstr "Ajustar Perfil"
+#: ../../mod/viewconnections.php:59
+msgid "No connections."
+msgstr "Sin conexiones."
 
-#: ../../mod/connedit.php:658
-msgid "Set Affinity & Profile"
-msgstr "Ajustar Afinidad y Perfil"
+#: ../../mod/viewconnections.php:72
+#, php-format
+msgid "Visit %s's profile [%s]"
+msgstr "Visitar el perfil de %s [%s]"
 
-#: ../../mod/connedit.php:675
-msgid "Apply these permissions automatically"
-msgstr "Aplicar estos permisos automaticamente"
+#: ../../mod/locs.php:21 ../../mod/locs.php:49
+msgid "Location not found."
+msgstr "Localización no encontrada."
 
-#: ../../mod/connedit.php:677
-msgid "This connection's address is"
-msgstr "La dirección de esta conexión es"
+#: ../../mod/locs.php:57
+msgid "Location lookup failed."
+msgstr "Ha fallado la búsqueda de la ubicación."
 
-#: ../../mod/connedit.php:680
+#: ../../mod/locs.php:61
 msgid ""
-"The permissions indicated on this page will be applied to all new "
-"connections."
-msgstr "Los permisos indicados en esta página serán aplicados en todas las nuevas conexiones."
+"Please select another location to become primary before removing the primary"
+" location."
+msgstr "Por favor, seleccione otra ubicación para convertirla en primaria antes de retirar la ubicación principal."
 
-#: ../../mod/connedit.php:682
-msgid "Slide to adjust your degree of friendship"
-msgstr "Deslizar para ajustar el grado de amistad"
+#: ../../mod/locs.php:93
+msgid "No locations found."
+msgstr "Ninguna localización encontrada."
 
-#: ../../mod/connedit.php:684
-msgid "Slide to adjust your rating"
-msgstr "Deslizar para ajustar su valoración"
+#: ../../mod/locs.php:104
+msgid "Manage Channel Locations"
+msgstr "Gestionar localizaciones del canal"
 
-#: ../../mod/connedit.php:685 ../../mod/connedit.php:690
-msgid "Optionally explain your rating"
-msgstr "Opcionalmente, puede explicar su valoración"
+#: ../../mod/locs.php:105
+msgid "Location (address)"
+msgstr "Localización (dirección)"
 
-#: ../../mod/connedit.php:687
-msgid "Custom Filter"
-msgstr "Filtro Personalizado"
+#: ../../mod/locs.php:106
+msgid "Primary Location"
+msgstr "Localización primaria"
 
-#: ../../mod/connedit.php:688
-msgid "Only import posts with this text"
-msgstr "Importar solo entradas que contengan este texto"
+#: ../../mod/locs.php:107
+msgid "Drop location"
+msgstr "Eliminar localización"
 
-#: ../../mod/connedit.php:688 ../../mod/connedit.php:689
+#: ../../mod/post.php:234
 msgid ""
-"words one per line or #tags or /patterns/, leave blank to import all posts"
-msgstr "Palabras, una por línea o #etiquetas o /patrones/, dejar en blanco para importar todas las entradas"
-
-#: ../../mod/connedit.php:689
-msgid "Do not import posts with this text"
-msgstr "No importar entradas que contienen este texto"
-
-#: ../../mod/connedit.php:691
-msgid "This information is public!"
-msgstr "¡Esta información es pública!"
+"Remote authentication blocked. You are logged into this site locally. Please"
+" logout and retry."
+msgstr "La autenticación desde su servidor está bloqueada. Ha iniciado sesión localmente. Por favor, salga de la sesión y vuelva a intentarlo."
 
-#: ../../mod/connedit.php:696
-msgid "Connection Pending Approval"
-msgstr "Conexión pendiente de aprobación"
+#: ../../mod/setup.php:191
+msgid "$Projectname Server - Setup"
+msgstr "Servidor $Projectname  - Instalación"
 
-#: ../../mod/connedit.php:697
-msgid "Connection Request"
-msgstr "Solicitud de conexión"
+#: ../../mod/setup.php:195
+msgid "Could not connect to database."
+msgstr "No se ha podido conectar a la base de datos."
 
-#: ../../mod/connedit.php:698
-#, php-format
+#: ../../mod/setup.php:199
 msgid ""
-"(%s) would like to connect with you. Please approve this connection to allow"
-" communication."
-msgstr "(%s) desearía conectar con usted. por favor, apruebe esta conexión para permitir la comunicación."
+"Could not connect to specified site URL. Possible SSL certificate or DNS "
+"issue."
+msgstr "No se puede conectar con la dirección del sitio indicada. Podría tratarse de un problema de SSL o DNS."
 
-#: ../../mod/connedit.php:700
-msgid "Approve Later"
-msgstr "Aprobar más tarde"
+#: ../../mod/setup.php:206
+msgid "Could not create table."
+msgstr "No se puede crear la tabla."
 
-#: ../../mod/connedit.php:703
-msgid "inherited"
-msgstr "heredado"
+#: ../../mod/setup.php:211
+msgid "Your site database has been installed."
+msgstr "La base de datos del sitio ha sido instalada."
 
-#: ../../mod/connedit.php:705
-#, php-format
+#: ../../mod/setup.php:215
 msgid ""
-"Please choose the profile you would like to display to %s when viewing your "
-"profile securely."
-msgstr "Por favor, escoja el perfil que quiere mostrar a %s cuando esté viendo su perfil de forma segura."
+"You may need to import the file \"install/schema_xxx.sql\" manually using a "
+"database client."
+msgstr "Podría tener que importar manualmente el fichero \"install/schema_xxx.sql\" usando un cliente de base de datos."
 
-#: ../../mod/connedit.php:707
-msgid "Their Settings"
-msgstr "Sus ajustes"
+#: ../../mod/setup.php:216 ../../mod/setup.php:284 ../../mod/setup.php:734
+msgid "Please see the file \"install/INSTALL.txt\"."
+msgstr "Por favor, lea el fichero \"install/INSTALL.txt\"."
 
-#: ../../mod/connedit.php:708
-msgid "My Settings"
-msgstr "Mis ajustes"
+#: ../../mod/setup.php:281
+msgid "System check"
+msgstr "Verificación del sistema"
 
-#: ../../mod/connedit.php:710
-msgid "Individual Permissions"
-msgstr "Permisos individuales"
+#: ../../mod/setup.php:286
+msgid "Check again"
+msgstr "Verificar de nuevo"
 
-#: ../../mod/connedit.php:711
-msgid ""
-"Some permissions may be inherited from your channel's <a "
-"href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
-"priority than individual settings. You can <strong>not</strong> change those"
-" settings here."
-msgstr "Algunos permisos pueden ser heredados de los <a href=\"settings\"><strong>ajustes de privacidad</strong></a> de sus canales, los cuales tienen una prioridad más alta que los ajustes individuales. <strong>No</strong> puede cambiar estos ajustes aquí."
+#: ../../mod/setup.php:308
+msgid "Database connection"
+msgstr "Conexión a la base de datos"
 
-#: ../../mod/connedit.php:712
+#: ../../mod/setup.php:309
 msgid ""
-"Some permissions may be inherited from your channel's <a "
-"href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
-"priority than individual settings. You can change those settings here but "
-"they wont have any impact unless the inherited setting changes."
-msgstr "Algunos permisos pueden ser heredados de los <a href=\"settings\"><strong>ajustes de privacidad</strong></a> de sus canales, los cuales tienen una prioridad más alta que los ajustes individuales. Puede cambiar estos ajustes aquí, pero no tendrán ningún impacto hasta que cambie los ajustes heredados."
-
-#: ../../mod/connedit.php:713
-msgid "Last update:"
-msgstr "Última actualización:"
+"In order to install $Projectname we need to know how to connect to your "
+"database."
+msgstr "Para instalar $Projectname es necesario saber cómo conectar con su base de datos."
 
-#: ../../mod/rmagic.php:40
+#: ../../mod/setup.php:310
 msgid ""
-"We encountered a problem while logging in with the OpenID you provided. "
-"Please check the correct spelling of the ID."
-msgstr "Encontramos un problema durante el inicio de sesión con la OpenID que proporcionó. por favor, compruebe que la ID está correctamente escrita."
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
+msgstr "Por favor, contacte con el proveedor de servicios o el administrador del sitio si tiene dudas sobre estos ajustes."
 
-#: ../../mod/rmagic.php:40
-msgid "The error message was:"
-msgstr "El mensaje de error fue:"
+#: ../../mod/setup.php:311
+msgid ""
+"The database you specify below should already exist. If it does not, please "
+"create it before continuing."
+msgstr "La base de datos que especifique a continuación debe existir ya. Si no es así, por favor, créela antes de seguir."
 
-#: ../../mod/rmagic.php:44
-msgid "Authentication failed."
-msgstr "Falló la autenticación."
+#: ../../mod/setup.php:315
+msgid "Database Server Name"
+msgstr "Nombre del servidor de base de datos"
 
-#: ../../mod/rmagic.php:84
-msgid "Remote Authentication"
-msgstr "Acceso desde su servidor"
+#: ../../mod/setup.php:315
+msgid "Default is 127.0.0.1"
+msgstr "De forma predeterminada es 127.0.0.1"
 
-#: ../../mod/rmagic.php:85
-msgid "Enter your channel address (e.g. channel@example.com)"
-msgstr "Introduzca la dirección del canal (p.ej. canal@ejemplo.com)"
+#: ../../mod/setup.php:316
+msgid "Database Port"
+msgstr "Puerto de la base de datos"
 
-#: ../../mod/rmagic.php:86
-msgid "Authenticate"
-msgstr "Acceder"
+#: ../../mod/setup.php:316
+msgid "Communication port number - use 0 for default"
+msgstr "Número del puerto de comunicaciones - use 0 como valor por defecto"
 
-#: ../../mod/mail.php:33
-msgid "Unable to lookup recipient."
-msgstr "Imposible asociar a un destinatario."
+#: ../../mod/setup.php:317
+msgid "Database Login Name"
+msgstr "Usuario de la base de datos"
 
-#: ../../mod/mail.php:41
-msgid "Unable to communicate with requested channel."
-msgstr "Imposible comunicar con el canal solicitado."
+#: ../../mod/setup.php:318
+msgid "Database Login Password"
+msgstr "Contraseña de acceso a la base de datos"
 
-#: ../../mod/mail.php:48
-msgid "Cannot verify requested channel."
-msgstr "No se puede verificar el canal solicitado."
+#: ../../mod/setup.php:319
+msgid "Database Name"
+msgstr "Nombre de la base de datos"
 
-#: ../../mod/mail.php:74
-msgid "Selected channel has private message restrictions. Send failed."
-msgstr "El canal seleccionado tiene restricciones sobre los mensajes privados. El envío falló."
+#: ../../mod/setup.php:320
+msgid "Database Type"
+msgstr "Tipo de base de datos"
 
-#: ../../mod/mail.php:139
-msgid "Message deleted."
-msgstr "Mensaje eliminado."
+#: ../../mod/setup.php:322 ../../mod/setup.php:363
+msgid "Site administrator email address"
+msgstr "Dirección de correo electrónico del administrador del sitio"
 
-#: ../../mod/mail.php:156
-msgid "Message recalled."
-msgstr "Mensaje recuperado."
+#: ../../mod/setup.php:322 ../../mod/setup.php:363
+msgid ""
+"Your account email address must match this in order to use the web admin "
+"panel."
+msgstr "Su cuenta deberá usar la misma dirección de correo electrónico para poder utilizar el panel de administración web."
 
-#: ../../mod/mail.php:225
-msgid "Send Private Message"
-msgstr "Enviar un mensaje privado"
+#: ../../mod/setup.php:323 ../../mod/setup.php:365
+msgid "Website URL"
+msgstr "Dirección del sitio web"
 
-#: ../../mod/mail.php:226 ../../mod/mail.php:343
-msgid "To:"
-msgstr "Para:"
+#: ../../mod/setup.php:323 ../../mod/setup.php:365
+msgid "Please use SSL (https) URL if available."
+msgstr "Por favor, use SSL (https) si está disponible."
 
-#: ../../mod/mail.php:231 ../../mod/mail.php:345
-msgid "Subject:"
-msgstr "Asunto:"
+#: ../../mod/setup.php:325 ../../mod/setup.php:367
+msgid "Please select a default timezone for your website"
+msgstr "Por favor, selecciones la zona horaria por defecto de su sitio web"
 
-#: ../../mod/mail.php:242
-msgid "Send"
-msgstr "Enviar"
+#: ../../mod/setup.php:352
+msgid "Site settings"
+msgstr "Ajustes del sitio"
 
-#: ../../mod/mail.php:269
-msgid "Message not found."
-msgstr "No se encuentra el mensaje."
+#: ../../mod/setup.php:417
+msgid "Could not find a command line version of PHP in the web server PATH."
+msgstr "No se puede encontrar una versión en línea de comandos de PHP en la ruta del servidor web."
 
-#: ../../mod/mail.php:312
-msgid "Delete message"
-msgstr "Mensaje eliminado"
+#: ../../mod/setup.php:418
+msgid ""
+"If you don't have a command line version of PHP installed on server, you "
+"will not be able to run background polling via cron."
+msgstr "Si no tiene instalada la versión de línea de comandos de PHP en su servidor, no podrá ejecutar sondeos en segundo plano mediante cron."
 
-#: ../../mod/mail.php:313
-msgid "Recall message"
-msgstr "Recuperar el mensaje"
+#: ../../mod/setup.php:422
+msgid "PHP executable path"
+msgstr "Ruta del ejecutable PHP"
 
-#: ../../mod/mail.php:315
-msgid "Message has been recalled."
-msgstr "El mensaje ha sido recuperado."
+#: ../../mod/setup.php:422
+msgid ""
+"Enter full path to php executable. You can leave this blank to continue the "
+"installation."
+msgstr "Introducir la ruta completa del ejecutable PHP. Puede dejar la línea en blanco para continuar la instalación."
 
-#: ../../mod/mail.php:332
-msgid "Private Conversation"
-msgstr "Conversación privada"
+#: ../../mod/setup.php:427
+msgid "Command line PHP"
+msgstr "PHP en línea de comandos"
 
-#: ../../mod/mail.php:338
+#: ../../mod/setup.php:436
 msgid ""
-"No secure communications available. You <strong>may</strong> be able to "
-"respond from the sender's profile page."
-msgstr "Comunicación segura no disponible. Pero <strong>puede</strong> responder desde la página de perfil del remitente."
+"The command line version of PHP on your system does not have "
+"\"register_argc_argv\" enabled."
+msgstr "La línea de comandos PHP de su sistema no tiene activado \"register_argc_argv\"."
 
-#: ../../mod/mail.php:342
-msgid "Send Reply"
-msgstr "Responder"
+#: ../../mod/setup.php:437
+msgid "This is required for message delivery to work."
+msgstr "Esto es necesario para que funcione la transmisión de mensajes."
 
-#: ../../mod/notifications.php:26
-msgid "Invalid request identifier."
-msgstr "Petición inválida del identificador."
+#: ../../mod/setup.php:440
+msgid "PHP register_argc_argv"
+msgstr "PHP register_argc_argv"
 
-#: ../../mod/notifications.php:35
-msgid "Discard"
-msgstr "Descartar"
+#: ../../mod/setup.php:458
+#, php-format
+msgid ""
+"Your max allowed total upload size is set to %s. Maximum size of one file to"
+" upload is set to %s. You are allowed to upload up to %d files at once."
+msgstr "La carga máxima que se le permite subir está establecida en %s. El tamaño máximo de un fichero está establecido en %s. Está permitido subir hasta un máximo de %d ficheros de una sola vez."
 
-#: ../../mod/regmod.php:11
-msgid "Please login."
-msgstr "Por favor, inicie sesión."
+#: ../../mod/setup.php:463
+msgid "You can adjust these settings in the servers php.ini."
+msgstr "Puede ajustar estos valores en el fichero php.ini de su servidor."
 
-#: ../../mod/post.php:235
-msgid ""
-"Remote authentication blocked. You are logged into this site locally. Please"
-" logout and retry."
-msgstr "La autenticación desde su servidor está bloqueada. Ha iniciado sesión localmente. Por favor, salga de la sesión y vuelva a intentarlo."
+#: ../../mod/setup.php:465
+msgid "PHP upload limits"
+msgstr "Límites PHP de subida"
 
-#: ../../mod/new_channel.php:109
-msgid "Add a Channel"
-msgstr "Añadir un canal"
+#: ../../mod/setup.php:488
+msgid ""
+"Error: the \"openssl_pkey_new\" function on this system is not able to "
+"generate encryption keys"
+msgstr "Error: La función \"openssl_pkey_new\" en este sistema no es capaz de general claves de cifrado."
 
-#: ../../mod/new_channel.php:110
+#: ../../mod/setup.php:489
 msgid ""
-"A channel is your own collection of related web pages. A channel can be used"
-" to hold social network profiles, blogs, conversation groups and forums, "
-"celebrity pages, and much more. You may create as many channels as your "
-"service provider allows."
-msgstr "Un canal está formado por su propia colección de páginas web relacionadas. Se puede utilizar para almacenar los perfiles sociales de la red, blogs, grupos de conversación y foros, páginas de famosos y mucho más. Puede crear tantos canales como su proveedor de servicio permita."
+"If running under Windows, please see "
+"\"http://www.php.net/manual/en/openssl.installation.php\"."
+msgstr "Si está en un servidor Windows, por favor, lea \"http://www.php.net/manual/en/openssl.installation.php\"."
 
-#: ../../mod/new_channel.php:113
-msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "
-msgstr "Ejemplos: \"Juan García\", \"Isabel y sus caballos\", \"Fútbol\", \"Grupo de parapente\" "
+#: ../../mod/setup.php:492
+msgid "Generate encryption keys"
+msgstr "Generar claves de cifrado"
 
-#: ../../mod/new_channel.php:114
-msgid "Choose a short nickname"
-msgstr "Elija un alias corto"
+#: ../../mod/setup.php:504
+msgid "libCurl PHP module"
+msgstr "módulo libCurl PHP"
 
-#: ../../mod/new_channel.php:115
-msgid ""
-"Your nickname will be used to create an easily remembered channel address "
-"(like an email address) which you can share with others."
-msgstr "Su alias podrá usarse para crear una dirección de canal fácilmente memorizable (como una dirección de correo electrónico) que puede ser compartido con otros."
+#: ../../mod/setup.php:505
+msgid "GD graphics PHP module"
+msgstr "módulo PHP GD graphics"
 
-#: ../../mod/new_channel.php:116
-msgid "Or <a href=\"import\">import an existing channel</a> from another location"
-msgstr "O <a href=\"import\">importar un canal existente</a> de otro lugar"
+#: ../../mod/setup.php:506
+msgid "OpenSSL PHP module"
+msgstr "módulo PHP OpenSSL"
 
-#: ../../mod/new_channel.php:118
-msgid ""
-"Please choose a channel type (such as social networking or community forum) "
-"and privacy requirements so we can select the best permissions for you"
-msgstr "Elija el tipo de canal (como red social o foro de discusión) y la privacidad que requiera, así podremos seleccionar el mejor conjunto de permisos para usted"
+#: ../../mod/setup.php:507
+msgid "mysqli or postgres PHP module"
+msgstr "módulo PHP mysqli o postgres"
 
-#: ../../mod/new_channel.php:119
-msgid "Channel Type"
-msgstr "Tipo de canal"
+#: ../../mod/setup.php:508
+msgid "mb_string PHP module"
+msgstr "módulo PHP mb_string"
 
-#: ../../mod/new_channel.php:119
-msgid "Read more about roles"
-msgstr "Leer más sobre los roles"
+#: ../../mod/setup.php:509
+msgid "mcrypt PHP module"
+msgstr "módulo PHP mcrypt "
 
-#: ../../mod/appman.php:28 ../../mod/appman.php:44
-msgid "App installed."
-msgstr "Aplicación instalada."
+#: ../../mod/setup.php:510
+msgid "xml PHP module"
+msgstr "módulo PHP xml"
 
-#: ../../mod/appman.php:37
-msgid "Malformed app."
-msgstr "Aplicación con errores"
+#: ../../mod/setup.php:514 ../../mod/setup.php:516
+msgid "Apache mod_rewrite module"
+msgstr "módulo Apache mod_rewrite "
 
-#: ../../mod/appman.php:80
-msgid "Embed code"
-msgstr "código incorporado"
+#: ../../mod/setup.php:514
+msgid ""
+"Error: Apache webserver mod-rewrite module is required but not installed."
+msgstr "Error: se necesita el módulo del servidor web Apache mod-rewrite pero no está instalado."
 
-#: ../../mod/appman.php:86
-msgid "Edit App"
-msgstr "Modificar la aplicación"
+#: ../../mod/setup.php:520 ../../mod/setup.php:523
+msgid "proc_open"
+msgstr "proc_open"
 
-#: ../../mod/appman.php:86
-msgid "Create App"
-msgstr "Crear una aplicación"
+#: ../../mod/setup.php:520
+msgid ""
+"Error: proc_open is required but is either not installed or has been "
+"disabled in php.ini"
+msgstr "Error: se necesita proc_open pero o no está instalado o ha sido desactivado en el fichero php.ini"
 
-#: ../../mod/appman.php:91
-msgid "Name of app"
-msgstr "Nombre de la aplicación"
+#: ../../mod/setup.php:528
+msgid "Error: libCURL PHP module required but not installed."
+msgstr "Error: se necesita el módulo PHP libCURL pero no está instalado."
 
-#: ../../mod/appman.php:92
-msgid "Location (URL) of app"
-msgstr "Ubicación (URL) de la aplicación"
+#: ../../mod/setup.php:532
+msgid ""
+"Error: GD graphics PHP module with JPEG support required but not installed."
+msgstr "Error: el módulo PHP GD graphics es necesario, pero no está instalado."
 
-#: ../../mod/appman.php:94
-msgid "Photo icon URL"
-msgstr "Dirección del icono que se va a utilizar para esta foto"
+#: ../../mod/setup.php:536
+msgid "Error: openssl PHP module required but not installed."
+msgstr "Error: el módulo PHP openssl es necesario, pero no está instalado."
 
-#: ../../mod/appman.php:94
-msgid "80 x 80 pixels - optional"
-msgstr "80 x 80 pixels - opcional"
+#: ../../mod/setup.php:540
+msgid ""
+"Error: mysqli or postgres PHP module required but neither are installed."
+msgstr "Error: el módulo PHP mysqli o postgres es necesario pero ninguno de los dos está instalado."
 
-#: ../../mod/appman.php:95
-msgid "Version ID"
-msgstr "Versión"
+#: ../../mod/setup.php:544
+msgid "Error: mb_string PHP module required but not installed."
+msgstr "Error: el módulo PHP mb_string es necesario, pero no está instalado."
 
-#: ../../mod/appman.php:96
-msgid "Price of app"
-msgstr "Precio de la aplicación"
+#: ../../mod/setup.php:548
+msgid "Error: mcrypt PHP module required but not installed."
+msgstr "Error: el módulo PHP mcrypt es necesario, pero no está instalado."
 
-#: ../../mod/appman.php:97
-msgid "Location (URL) to purchase app"
-msgstr "Ubicación (URL) donde adquirir la aplicación"
+#: ../../mod/setup.php:552
+msgid "Error: xml PHP module required for DAV but not installed."
+msgstr "Error: el módulo PHP xml es necesario para DAV, pero no está instalado."
 
-#: ../../mod/ping.php:263
-msgid "sent you a private message"
-msgstr "enviarle un mensaje privado"
+#: ../../mod/setup.php:570
+msgid ""
+"The web installer needs to be able to create a file called \".htconfig.php\""
+" in the top folder of your web server and it is unable to do so."
+msgstr "El instalador web no ha podido crear un fichero llamado “.htconfig.php” en la carpeta base de su servidor."
 
-#: ../../mod/ping.php:314
-msgid "added your channel"
-msgstr "añadió este canal a sus conexiones"
+#: ../../mod/setup.php:571
+msgid ""
+"This is most often a permission setting, as the web server may not be able "
+"to write files in your folder - even if you can."
+msgstr "Esto está generalmente ligado a un problema de permisos, a causa del cual el servidor web tiene prohibido modificar ficheros en su carpeta - incluso si usted mismo tiene esos permisos."
 
-#: ../../mod/ping.php:355
-msgid "posted an event"
-msgstr "publicó un evento"
+#: ../../mod/setup.php:572
+msgid ""
+"At the end of this procedure, we will give you a text to save in a file "
+"named .htconfig.php in your Red top folder."
+msgstr "Al término de este procedimiento, podemos crear un fichero de texto para guardar con el nombre .htconfig.php en el directorio raíz de su instalación de Hubzilla."
 
-#: ../../mod/layouts.php:176
-msgid "Comanche page description language help"
-msgstr "Página de ayuda del lenguaje de descripción de páginas (PDL) Comanche"
+#: ../../mod/setup.php:573
+msgid ""
+"You can alternatively skip this procedure and perform a manual installation."
+" Please see the file \"install/INSTALL.txt\" for instructions."
+msgstr "Como alternativa, puede dejar este procedimiento e intentar realizar una instalación manual. Lea, por favor, el fichero\"install/INSTALL.txt\" para las instrucciones."
 
-#: ../../mod/layouts.php:180
-msgid "Layout Description"
-msgstr "Descripción del formato"
+#: ../../mod/setup.php:576
+msgid ".htconfig.php is writable"
+msgstr ".htconfig.php tiene permisos de escritura"
 
-#: ../../mod/layouts.php:185
-msgid "Download PDL file"
-msgstr "Descargar el fichero PDL"
+#: ../../mod/setup.php:590
+msgid ""
+"Red uses the Smarty3 template engine to render its web views. Smarty3 "
+"compiles templates to PHP to speed up rendering."
+msgstr "Hubzilla hace uso del motor de plantillas Smarty3 para diseñar sus plantillas gráficas. Smarty3 es más rápido porque compila las plantillas de páginas directamente en PHP."
 
-#: ../../mod/home.php:73
+#: ../../mod/setup.php:591
 #, php-format
-msgid "Welcome to %s"
-msgstr "Bienvenido a %s"
+msgid ""
+"In order to store these compiled templates, the web server needs to have "
+"write access to the directory %s under the Red top level folder."
+msgstr "Para poder guardar las plantillas compiladas, el servidor web necesita permisos para acceder al subdirectorio %s en el directorio de instalación de Hubzilla."
 
-#: ../../mod/page.php:126
-msgid "Lorem Ipsum"
-msgstr "Lorem Ipsum"
+#: ../../mod/setup.php:592 ../../mod/setup.php:613
+msgid ""
+"Please ensure that the user that your web server runs as (e.g. www-data) has"
+" write access to this folder."
+msgstr "Por favor, asegúrese de que el servidor web está siendo ejecutado por un usuario que tenga permisos de escritura sobre esta carpeta (por ejemplo, www-data)."
 
-#: ../../mod/bookmarks.php:38
-msgid "Bookmark added"
-msgstr "Marcador añadido"
+#: ../../mod/setup.php:593
+#, php-format
+msgid ""
+"Note: as a security measure, you should give the web server write access to "
+"%s only--not the template files (.tpl) that it contains."
+msgstr "Nota: como medida de seguridad, debe dar al servidor web permisos de escritura solo sobre %s - no sobre el fichero de plantilla (.tpl) que contiene."
 
-#: ../../mod/bookmarks.php:60
-msgid "My Bookmarks"
-msgstr "Mis Marcadores"
+#: ../../mod/setup.php:596
+#, php-format
+msgid "%s is writable"
+msgstr "%s tiene permisos de escritura"
 
-#: ../../mod/bookmarks.php:71
-msgid "My Connections Bookmarks"
-msgstr "Marcadores de mis conexiones"
+#: ../../mod/setup.php:612
+msgid ""
+"Red uses the store directory to save uploaded files. The web server needs to"
+" have write access to the store directory under the Red top level folder"
+msgstr "Red guarda los ficheros descargados en la carpeta \"store\". El servidor web necesita tener permisos de escritura sobre esa carpeta, en el directorio de instalación."
 
-#: ../../mod/channel.php:97
-msgid "Insufficient permissions.  Request redirected to profile page."
-msgstr "Permisos insuficientes. Petición redirigida a la página del perfil."
+#: ../../mod/setup.php:616
+msgid "store is writable"
+msgstr "\"store\" tiene permisos de escritura"
 
-#: ../../mod/pconfig.php:27 ../../mod/pconfig.php:60
-msgid "This setting requires special processing and editing has been blocked."
-msgstr "Este ajuste necesita de un proceso especial y la edición ha sido bloqueada."
+#: ../../mod/setup.php:649
+msgid ""
+"SSL certificate cannot be validated. Fix certificate or disable https access"
+" to this site."
+msgstr "El certificado SSL no ha podido ser validado. Corrija este problema o desactive el acceso https a este sitio."
 
-#: ../../mod/pconfig.php:49
-msgid "Configuration Editor"
-msgstr "Editor de configuración"
+#: ../../mod/setup.php:650
+msgid ""
+"If you have https access to your website or allow connections to TCP port "
+"443 (the https: port), you MUST use a browser-valid certificate. You MUST "
+"NOT use self-signed certificates!"
+msgstr "Si su servidor soporta conexiones cifradas SSL o si permite conexiones al puerto TCP 443 (el puerto usado por el protocolo https), debe utilizar un certificado válido. No debe usar un certificado firmado por usted mismo."
 
-#: ../../mod/pconfig.php:50
+#: ../../mod/setup.php:651
 msgid ""
-"Warning: Changing some settings could render your channel inoperable. Please"
-" leave this page unless you are comfortable with and knowledgeable about how"
-" to correctly use this feature."
-msgstr "Atención: El cambio de algunos ajustes puede volver inoperante su canal. Por favor, abandone la página excepto que esté seguro y sepa cómo usar correctamente esta característica."
+"This restriction is incorporated because public posts from you may for "
+"example contain references to images on your own hub."
+msgstr "Se ha incorporado esta restricción para evitar que sus publicaciones públicas hagan referencia a imágenes en su propio servidor."
 
-#: ../../mod/suggest.php:35
+#: ../../mod/setup.php:652
 msgid ""
-"No suggestions available. If this is a new site, please try again in 24 "
-"hours."
-msgstr "No hay sugerencias disponibles. Si es un sitio nuevo, espere 24 horas y pruebe de nuevo."
+"If your certificate is not recognized, members of other sites (who may "
+"themselves have valid certificates) will get a warning message on their own "
+"site complaining about security issues."
+msgstr "Si su certificado no ha sido reconocido, los miembros de otros sitios (con certificados válidos) recibirán mensajes de aviso en sus propios sitios web."
 
-#: ../../mod/poll.php:64
-msgid "Poll"
-msgstr "Sondear"
+#: ../../mod/setup.php:653
+msgid ""
+"This can cause usability issues elsewhere (not just on your own site) so we "
+"must insist on this requirement."
+msgstr "Por razones de compatibilidad (sobre el conjunto de la red, no solo sobre su propio sitio), debemos insistir en estos requisitos."
 
-#: ../../mod/poll.php:69
-msgid "View Results"
-msgstr "Mostrar resultados"
+#: ../../mod/setup.php:654
+msgid ""
+"Providers are available that issue free certificates which are browser-"
+"valid."
+msgstr "Existen varias Autoridades de Certificación que le pueden proporcionar certificados válidos."
 
-#: ../../mod/service_limits.php:19
-msgid "No service class restrictions found."
-msgstr "No se han encontrado restricciones sobre esta clase de servicio."
+#: ../../mod/setup.php:656
+msgid "SSL certificate validation"
+msgstr "validación del certificado SSL"
+
+#: ../../mod/setup.php:662
+msgid ""
+"Url rewrite in .htaccess is not working. Check your server "
+"configuration.Test: "
+msgstr "No se pueden reescribir las direcciones web en .htaccess. Compruebe la configuración de su servidor:"
+
+#: ../../mod/setup.php:665
+msgid "Url rewrite is working"
+msgstr "La reescritura de las direcciones funciona correctamente"
+
+#: ../../mod/setup.php:674
+msgid ""
+"The database configuration file \".htconfig.php\" could not be written. "
+"Please use the enclosed text to create a configuration file in your web "
+"server root."
+msgstr "El fichero de configuración de la base de datos .htconfig.php no se ha podido modificar. Por favor, copie el texto generado en un fichero con ese nombre en el directorio raíz de su servidor."
+
+#: ../../mod/setup.php:698
+msgid "Errors encountered creating database tables."
+msgstr "Se han encontrado errores al crear las tablas de la base de datos."
+
+#: ../../mod/setup.php:732
+msgid "<h1>What next</h1>"
+msgstr "<h1>Siguiente paso</h1>"
+
+#: ../../mod/setup.php:733
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the "
+"poller."
+msgstr "IMPORTANTE: Debe crear [manualmente] una tarea programada para el \"poller\"."
 
 #: ../../mod/sharedwithme.php:94
 msgid "Files: shared with me"
@@ -8754,158 +8732,319 @@ msgstr "NUEVO"
 
 #: ../../mod/sharedwithme.php:99
 msgid "Remove all files"
-msgstr "Borrar todos los ficheros"
+msgstr "Eliminar todos los ficheros"
 
 #: ../../mod/sharedwithme.php:100
 msgid "Remove this file"
-msgstr "Borrar este fichero"
+msgstr "Eliminar este fichero"
 
-#: ../../view/theme/apw/php/config.php:202
-#: ../../view/theme/apw/php/config.php:236
-msgid "Schema Default"
-msgstr "Esquema predeterminado"
+#: ../../mod/suggest.php:35
+msgid ""
+"No suggestions available. If this is a new site, please try again in 24 "
+"hours."
+msgstr "No hay sugerencias disponibles. Si es un sitio nuevo, espere 24 horas y pruebe de nuevo."
 
-#: ../../view/theme/apw/php/config.php:203
-msgid "Sans-Serif"
-msgstr "Sans-Serif"
+#: ../../mod/profiles.php:18 ../../mod/profiles.php:174
+#: ../../mod/profiles.php:231 ../../mod/profiles.php:600
+msgid "Profile not found."
+msgstr "Perfil no encontrado."
 
-#: ../../view/theme/apw/php/config.php:204
-msgid "Monospace"
-msgstr "Monospace"
+#: ../../mod/profiles.php:38
+msgid "Profile deleted."
+msgstr "Perfil eliminado."
 
-#: ../../view/theme/apw/php/config.php:259
-#: ../../view/theme/redbasic/php/config.php:102
-msgid "Theme settings"
-msgstr "Ajustes del tema"
+#: ../../mod/profiles.php:56 ../../mod/profiles.php:92
+msgid "Profile-"
+msgstr "Perfil-"
 
-#: ../../view/theme/apw/php/config.php:260
-msgid "Set scheme"
-msgstr "Ajustar esquema"
+#: ../../mod/profiles.php:77 ../../mod/profiles.php:120
+msgid "New profile created."
+msgstr "El nuevo perfil ha sido creado."
 
-#: ../../view/theme/apw/php/config.php:261
-#: ../../view/theme/redbasic/php/config.php:124
-msgid "Set font-size for posts and comments"
-msgstr "Ajustar el tamaño del tipo de letra para entradas y comentarios"
+#: ../../mod/profiles.php:98
+msgid "Profile unavailable to clone."
+msgstr "Perfil no disponible para clonar."
 
-#: ../../view/theme/apw/php/config.php:262
-msgid "Set font face"
-msgstr "Ajustar el tipo de letra"
+#: ../../mod/profiles.php:136
+msgid "Profile unavailable to export."
+msgstr "Perfil no disponible para exportar."
 
-#: ../../view/theme/apw/php/config.php:263
-msgid "Set iconset"
-msgstr "Ajustar el conjunto de iconos"
+#: ../../mod/profiles.php:241
+msgid "Profile Name is required."
+msgstr "Se necesita el nombre del perfil."
 
-#: ../../view/theme/apw/php/config.php:264
-msgid "Set big shadow size, default 15px 15px 15px"
-msgstr "Ajustar el sombreado grande, por defecto 15px 15px 15px"
+#: ../../mod/profiles.php:404
+msgid "Marital Status"
+msgstr "Estado civil"
 
-#: ../../view/theme/apw/php/config.php:265
-msgid "Set small shadow size, default 5px 5px 5px"
-msgstr "Ajustar el sombreado pequeño, por defecto 5px 5px 5px"
+#: ../../mod/profiles.php:408
+msgid "Romantic Partner"
+msgstr "Pareja sentimental"
 
-#: ../../view/theme/apw/php/config.php:266
-msgid "Set shadow color, default #000"
-msgstr "Ajustar el color del sombreado, predeterminado a #000"
+#: ../../mod/profiles.php:412
+msgid "Likes"
+msgstr "Me gusta"
 
-#: ../../view/theme/apw/php/config.php:267
-msgid "Set radius size, default 5px"
-msgstr "Ajusta el tamaño del radio, predeterminado a 5px"
+#: ../../mod/profiles.php:416
+msgid "Dislikes"
+msgstr "No me gusta"
 
-#: ../../view/theme/apw/php/config.php:268
-msgid "Set line-height for posts and comments"
-msgstr "Ajustar la altura de linea para entradas y comentarios"
+#: ../../mod/profiles.php:420
+msgid "Work/Employment"
+msgstr "Trabajo:"
 
-#: ../../view/theme/apw/php/config.php:269
-msgid "Set background image"
-msgstr "Ajustar la imagen de fondo"
+#: ../../mod/profiles.php:423
+msgid "Religion"
+msgstr "Religión"
 
-#: ../../view/theme/apw/php/config.php:270
-msgid "Set background attachment"
-msgstr "Ajustar el fondo adjuntado"
+#: ../../mod/profiles.php:427
+msgid "Political Views"
+msgstr "Ideas políticas"
 
-#: ../../view/theme/apw/php/config.php:271
-msgid "Set background color"
-msgstr "Ajustar el color de fondo"
+#: ../../mod/profiles.php:435
+msgid "Sexual Preference"
+msgstr "Preferencia sexual"
 
-#: ../../view/theme/apw/php/config.php:272
-msgid "Set section background image"
-msgstr "Ajustar la imagen de la sección del fondo"
+#: ../../mod/profiles.php:439
+msgid "Homepage"
+msgstr "Página personal"
 
-#: ../../view/theme/apw/php/config.php:273
-msgid "Set section background color"
-msgstr "Ajustar el color de la sección del fondo"
+#: ../../mod/profiles.php:443
+msgid "Interests"
+msgstr "Intereses"
 
-#: ../../view/theme/apw/php/config.php:274
-msgid "Set color of items - use hex"
-msgstr "Ajustar el color de los elementos - utilizar código hexadecimal"
+#: ../../mod/profiles.php:537
+msgid "Profile updated."
+msgstr "Perfil actualizado."
 
-#: ../../view/theme/apw/php/config.php:275
-msgid "Set color of links - use hex"
-msgstr "Ajusta el color de los enlaces - utilizar código hexadecimal"
+#: ../../mod/profiles.php:626
+msgid "Hide your contact/friend list from viewers of this profile?"
+msgstr "¿Ocultar su lista de contactos a los visitantes de este perfil?"
 
-#: ../../view/theme/apw/php/config.php:276
-msgid "Set max-width for items.  Default 400px"
-msgstr "Ajustar la anchura máxima para los elementos. Predeterminado a 400px"
+#: ../../mod/profiles.php:666
+msgid "Edit Profile Details"
+msgstr "Modificar los detalles de este perfil"
 
-#: ../../view/theme/apw/php/config.php:277
-msgid "Set min-width for items.  Default 240px"
-msgstr "Ajustar la anchura mínima para los elementos. Predeterminado a 240px"
+#: ../../mod/profiles.php:668
+msgid "View this profile"
+msgstr "Ver este perfil"
 
-#: ../../view/theme/apw/php/config.php:278
-msgid "Set the generic content wrapper width.  Default 48%"
-msgstr "Ajustar el ancho de la envoltura del contenido genérico. Predeterminado 48%"
+#: ../../mod/profiles.php:670
+msgid "Change Profile Photo"
+msgstr "Cambiar la foto del perfil"
 
-#: ../../view/theme/apw/php/config.php:279
-msgid "Set color of fonts - use hex"
-msgstr "Ajustar el color del tipo de letra - utiliza código hexadecimal"
+#: ../../mod/profiles.php:671
+msgid "Create a new profile using these settings"
+msgstr "Crear un nuevo perfil usando estos ajustes"
 
-#: ../../view/theme/apw/php/config.php:280
-msgid "Set background-size element"
-msgstr "Ajustar el tamaño de fondo del elemento"
+#: ../../mod/profiles.php:672
+msgid "Clone this profile"
+msgstr "Clonar este perfil"
 
-#: ../../view/theme/apw/php/config.php:281
-msgid "Item opacity"
-msgstr "Opacidad del elemento"
+#: ../../mod/profiles.php:673
+msgid "Delete this profile"
+msgstr "Eliminar este perfil"
 
-#: ../../view/theme/apw/php/config.php:282
-msgid "Display post previews only"
-msgstr "Mostrar solo las previsualizaciones de las entradas"
+#: ../../mod/profiles.php:675
+msgid "Import profile from file"
+msgstr "Importar perfil desde un fichero"
 
-#: ../../view/theme/apw/php/config.php:283
-msgid "Display side bar on channel page"
-msgstr "Muestra la barra lateral en la página del canal"
+#: ../../mod/profiles.php:676
+msgid "Export profile to file"
+msgstr "Exportar perfil a un fichero"
 
-#: ../../view/theme/apw/php/config.php:284
-msgid "Colour of the navigation bar"
-msgstr "Color de la barra de navegación"
+#: ../../mod/profiles.php:677
+msgid "Profile Name:"
+msgstr "Nombre del perfil:"
 
-#: ../../view/theme/apw/php/config.php:285
-msgid "Item float"
-msgstr "Elemento flotante"
+#: ../../mod/profiles.php:678
+msgid "Your Full Name:"
+msgstr "Su nombre completo:"
 
-#: ../../view/theme/apw/php/config.php:286
-msgid "Left offset of the section element"
-msgstr "Desplazamiento izquierdo del elemento de la sección"
+#: ../../mod/profiles.php:679
+msgid "Title/Description:"
+msgstr "Título/Descripción:"
+
+#: ../../mod/profiles.php:680
+msgid "Your Gender:"
+msgstr "Su género:"
+
+#: ../../mod/profiles.php:681
+msgid "Birthday :"
+msgstr "Cumpleaños:"
 
-#: ../../view/theme/apw/php/config.php:287
-msgid "Right offset of the section element"
-msgstr "Desplazamiento derecho del elemento de la sección"
+#: ../../mod/profiles.php:682
+msgid "Street Address:"
+msgstr "Calle:"
 
-#: ../../view/theme/apw/php/config.php:288
-msgid "Section width"
-msgstr "Ancho de la sección"
+#: ../../mod/profiles.php:683
+msgid "Locality/City:"
+msgstr "Ciudad:"
 
-#: ../../view/theme/apw/php/config.php:289
-msgid "Left offset of the aside"
-msgstr "Desplazamiento izquierdo del lateral"
+#: ../../mod/profiles.php:684
+msgid "Postal/Zip Code:"
+msgstr "Código postal:"
 
-#: ../../view/theme/apw/php/config.php:290
-msgid "Right offset of the aside element"
-msgstr "Desplazamiento derecho del elemento lateral"
+#: ../../mod/profiles.php:685
+msgid "Country:"
+msgstr "País:"
+
+#: ../../mod/profiles.php:686
+msgid "Region/State:"
+msgstr "Región/Estado:"
+
+#: ../../mod/profiles.php:687
+msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
+msgstr "<span class=\"heart\">&hearts;</span> Estado sentimental:"
+
+#: ../../mod/profiles.php:688
+msgid "Who: (if applicable)"
+msgstr "Quién: (si es aplicable)"
+
+#: ../../mod/profiles.php:689
+msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
+msgstr "Por ejemplo: ana123, María González, sara@ejemplo.com"
+
+#: ../../mod/profiles.php:690
+msgid "Since [date]:"
+msgstr "Desde [fecha]:"
+
+#: ../../mod/profiles.php:692
+msgid "Homepage URL:"
+msgstr "Dirección de la página personal:"
+
+#: ../../mod/profiles.php:695
+msgid "Religious Views:"
+msgstr "Creencias religiosas:"
+
+#: ../../mod/profiles.php:696
+msgid "Keywords:"
+msgstr "Palabras clave:"
+
+#: ../../mod/profiles.php:699
+msgid "Example: fishing photography software"
+msgstr "Por ejemplo: software de fotografía submarina"
+
+#: ../../mod/profiles.php:700
+msgid "Used in directory listings"
+msgstr "Visible en el directorio público del canal"
+
+#: ../../mod/profiles.php:701
+msgid "Tell us about yourself..."
+msgstr "Háblenos de usted..."
+
+#: ../../mod/profiles.php:702
+msgid "Hobbies/Interests"
+msgstr "Aficiones/Intereses"
+
+#: ../../mod/profiles.php:703
+msgid "Contact information and Social Networks"
+msgstr "Información de contacto y redes sociales"
+
+#: ../../mod/profiles.php:704
+msgid "My other channels"
+msgstr "Mis otros canales"
+
+#: ../../mod/profiles.php:705
+msgid "Musical interests"
+msgstr "Preferencias musicales"
+
+#: ../../mod/profiles.php:706
+msgid "Books, literature"
+msgstr "Libros, literatura"
+
+#: ../../mod/profiles.php:707
+msgid "Television"
+msgstr "Televisión"
+
+#: ../../mod/profiles.php:708
+msgid "Film/dance/culture/entertainment"
+msgstr "Cine/danza/cultura/entretenimiento"
+
+#: ../../mod/profiles.php:709
+msgid "Love/romance"
+msgstr "Vida sentimental/amorosa"
+
+#: ../../mod/profiles.php:710
+msgid "Work/employment"
+msgstr "Trabajo"
+
+#: ../../mod/profiles.php:711
+msgid "School/education"
+msgstr "Estudios"
+
+#: ../../mod/profiles.php:717
+msgid "This is your default profile."
+msgstr "Este es su perfil principal."
+
+#: ../../mod/profiles.php:728
+msgid "Age: "
+msgstr "Edad:"
+
+#: ../../mod/profiles.php:771
+msgid "Edit/Manage Profiles"
+msgstr "Modificar/gestionar perfiles"
+
+#: ../../mod/profiles.php:772
+msgid "Add profile things"
+msgstr "Añadir cosas al perfil"
+
+#: ../../mod/profiles.php:773
+msgid "Include desirable objects in your profile"
+msgstr "Añadir objetos interesantes en su perfil"
+
+#: ../../mod/profperm.php:29 ../../mod/profperm.php:58
+msgid "Invalid profile identifier."
+msgstr "Identificador del perfil no válido"
+
+#: ../../mod/profperm.php:110
+msgid "Profile Visibility Editor"
+msgstr "Editor de visibilidad del perfil"
+
+#: ../../mod/profperm.php:114
+msgid "Click on a contact to add or remove."
+msgstr "Pulsar en un contacto para añadirlo o eliminarlo."
+
+#: ../../mod/profperm.php:123
+msgid "Visible To"
+msgstr "Visible para"
+
+#: ../../mod/rbmark.php:88
+msgid "Select a bookmark folder"
+msgstr "Seleccionar una carpeta de marcadores"
+
+#: ../../mod/rbmark.php:93
+msgid "Save Bookmark"
+msgstr "Guardar marcador"
+
+#: ../../mod/rbmark.php:94
+msgid "URL of bookmark"
+msgstr "Dirección del marcador"
+
+#: ../../mod/rbmark.php:99
+msgid "Or enter new bookmark folder name"
+msgstr "O introduzca un nuevo nombre para la carpeta de marcadores"
+
+#: ../../mod/import_items.php:101
+msgid "Import completed"
+msgstr "Importación completada"
+
+#: ../../mod/import_items.php:119
+msgid "Import Items"
+msgstr "Importar elementos"
+
+#: ../../mod/import_items.php:120
+msgid ""
+"Use this form to import existing posts and content from an export file."
+msgstr "Utilice este formulario para importar entradas existentes y contenido desde un archivo de exportación."
 
 #: ../../view/theme/redbasic/php/config.php:82
-msgid "Light (Red Matrix default)"
-msgstr "Ligero (predeterminado de RedMatrix)"
+msgid "Focus (Hubzilla default)"
+msgstr "Focus (predefinido)"
+
+#: ../../view/theme/redbasic/php/config.php:102
+msgid "Theme settings"
+msgstr "Ajustes del tema"
 
 #: ../../view/theme/redbasic/php/config.php:103
 msgid "Select scheme"
@@ -8995,6 +9134,10 @@ msgstr "Ajustar el tamaño de letra para toda la aplicación"
 msgid "Example: 14px"
 msgstr "Ejemplo: 14px"
 
+#: ../../view/theme/redbasic/php/config.php:124
+msgid "Set font-size for posts and comments"
+msgstr "Ajustar el tamaño del tipo de letra para entradas y comentarios"
+
 #: ../../view/theme/redbasic/php/config.php:125
 msgid "Set font-color for posts and comments"
 msgstr "Establecer el color de la letra para publicaciones y comentarios"
@@ -9016,8 +9159,8 @@ msgid "Leave empty for default width"
 msgstr "Dejar en blanco para la anchura predeterminada"
 
 #: ../../view/theme/redbasic/php/config.php:129
-msgid "Center page content"
-msgstr "Contenido del centro de la página"
+msgid "Left align page content"
+msgstr "Alinear a la izquierda el contenido de la página"
 
 #: ../../view/theme/redbasic/php/config.php:130
 msgid "Set minimum opacity of nav bar - to hide it"
@@ -9031,51 +9174,51 @@ msgstr "Ajustar el tamaño de la foto del autor de la conversación"
 msgid "Set size of followup author photos"
 msgstr "Ajustar el tamaño de foto de los seguidores del autor"
 
-#: ../../boot.php:1355
+#: ../../boot.php:1308
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "La actualización %s ha fallado. Mire el informe de errores."
 
-#: ../../boot.php:1358
+#: ../../boot.php:1311
 #, php-format
 msgid "Update Error at %s"
-msgstr "Error de Actualización en %s"
+msgstr "Error de actualización en %s"
 
-#: ../../boot.php:1525
+#: ../../boot.php:1478
 msgid ""
-"Create an account to access services and applications within the Red Matrix"
-msgstr "Crear una cuenta para acceder a los servicios y aplicaciones dentro de la red"
+"Create an account to access services and applications within the Hubzilla"
+msgstr "Crear una cuenta para acceder a los servicios y aplicaciones dentro de Hubzilla"
 
-#: ../../boot.php:1553
+#: ../../boot.php:1506
 msgid "Password"
 msgstr "Contraseña"
 
-#: ../../boot.php:1554
+#: ../../boot.php:1507
 msgid "Remember me"
 msgstr "Recordarme"
 
-#: ../../boot.php:1557
+#: ../../boot.php:1510
 msgid "Forgot your password?"
 msgstr "¿Olvidó su contraseña?"
 
-#: ../../boot.php:2177
+#: ../../boot.php:2136
 msgid "toggle mobile"
 msgstr "cambiar a modo móvil"
 
-#: ../../boot.php:2312
+#: ../../boot.php:2271
 msgid "Website SSL certificate is not valid. Please correct."
-msgstr "El certificado SSL del sitio web no es válido. Por favor, corríjalo."
+msgstr "El certificado SSL del sitio web no es válido. Por favor, solucione el problema."
 
-#: ../../boot.php:2315
+#: ../../boot.php:2274
 #, php-format
-msgid "[red] Website SSL error for %s"
-msgstr "[red] Error SSL del sitio web en %s"
+msgid "[hubzilla] Website SSL error for %s"
+msgstr "[hubzilla] Error SSL del sitio web en %s"
 
-#: ../../boot.php:2352
+#: ../../boot.php:2311
 msgid "Cron/Scheduled tasks not running."
-msgstr "Las tareas del Planificador/Cron no se están funcionando."
+msgstr "Las tareas del Planificador/Cron no están funcionando."
 
-#: ../../boot.php:2356
+#: ../../boot.php:2315
 #, php-format
-msgid "[red] Cron tasks not running on %s"
-msgstr "[red] Las tareas de Cron no están funcionando en %s"
+msgid "[hubzilla] Cron tasks not running on %s"
+msgstr "[hubzilla] Las tareas de Cron no están funcionando en %s"
diff --git a/view/es/hstrings.php b/view/es/hstrings.php
index 1d91ed820..d82902fe3 100644
--- a/view/es/hstrings.php
+++ b/view/es/hstrings.php
@@ -5,57 +5,76 @@ function string_plural_select_es($n){
 	return ($n != 1);;
 }}
 ;
-$a->strings["Cannot locate DNS info for database server '%s'"] = "No se ha podido localizar información de DNS para el servidor de base de datos “%s”";
-$a->strings["Profile Photos"] = "Fotos de perfil";
-$a->strings["Edit"] = "Editar";
-$a->strings["Frequently"] = "Frecuentemente";
-$a->strings["Hourly"] = "Cada hora";
-$a->strings["Twice daily"] = "Dos veces al día";
-$a->strings["Daily"] = "Diariamente";
-$a->strings["Weekly"] = "Semanalmente";
-$a->strings["Monthly"] = "Mensualmente";
-$a->strings["Friendica"] = "Friendica";
-$a->strings["OStatus"] = "OStatus";
-$a->strings["RSS/Atom"] = "RSS/Atom";
-$a->strings["Email"] = "Correo electrónico";
-$a->strings["Diaspora"] = "Diaspora";
-$a->strings["Facebook"] = "Facebook";
-$a->strings["Zot!"] = "Zot!";
-$a->strings["LinkedIn"] = "LinkedIn";
-$a->strings["XMPP/IM"] = "XMPP/IM";
-$a->strings["MySpace"] = "MySpace";
-$a->strings["created a new post"] = "ha creado una nueva entrada";
-$a->strings["commented on %s's post"] = "ha comentado la entrada de %s";
+$a->strings["Attachments:"] = "Ficheros adjuntos:";
+$a->strings["l F d, Y \\@ g:i A"] = "l d de F, Y \\@ G:i";
+$a->strings["\$Projectname event notification:"] = "Notificación de eventos de \$Projectname:";
+$a->strings["Starts:"] = "Comienza:";
+$a->strings["Finishes:"] = "Finaliza:";
+$a->strings["Location:"] = "Ubicación:";
 $a->strings["No username found in import file."] = "No se ha encontrado el nombre de usuario en el fichero importado.";
 $a->strings["Unable to create a unique channel address. Import failed."] = "No se ha podido crear una dirección de canal única. Ha fallado la importación.";
 $a->strings["Import completed."] = "Importación completada.";
-$a->strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Un grupo suprimido con este nombre ha sido restablecido. <strong>Es posible</strong> que los permisos existentes  sean aplicados a este grupo y sus futuros miembros. Si no quiere esto por favor cree otro grupo con un nombre diferente.";
-$a->strings["Default privacy group for new contacts"] = "Privacidad de grupo por defecto para nuevos contactos ";
-$a->strings["All Channels"] = "Todos los canales";
-$a->strings["edit"] = "editar";
-$a->strings["Collections"] = "Colecciones";
-$a->strings["Edit collection"] = "Editar colección";
-$a->strings["Add new collection"] = "Añadir nueva colección";
-$a->strings["Channels not in any collection"] = "El canal no se encuentra en ninguna colección";
-$a->strings["add"] = "añadir";
-$a->strings["Not a valid email address"] = "Dirección de correo no válida";
-$a->strings["Your email domain is not among those allowed on this site"] = "Su dirección de correo no pertenece a los dominios permitidos en este sitio.";
-$a->strings["Your email address is already registered at this site."] = "Su dirección de correo está ya registrada en este sitio.";
-$a->strings["An invitation is required."] = "Es obligatorio que le inviten.";
-$a->strings["Invitation could not be verified."] = "No se ha podido verificar su invitación.";
-$a->strings["Please enter the required information."] = "Por favor introduzca la información requerida.";
-$a->strings["Failed to store account information."] = "La información de la cuenta no se ha podido guardar.";
-$a->strings["Registration confirmation for %s"] = "Confirmación de registro para %s";
-$a->strings["Registration request at %s"] = "Solicitud de registro en %s";
-$a->strings["Administrator"] = "Administrador";
-$a->strings["your registration password"] = "su contraseña de registro";
-$a->strings["Registration details for %s"] = "Detalles del registro de %s";
-$a->strings["Account approved."] = "Cuenta aprobada.";
-$a->strings["Registration revoked for %s"] = "Registro revocado para %s";
-$a->strings["Account verified. Please login."] = "Cuenta verificada. Por favor, inicie sesión.";
-$a->strings["Click here to upgrade."] = "Pulse aquí para actualizar";
-$a->strings["This action exceeds the limits set by your subscription plan."] = "Esta acción supera los límites establecidos por su plan de suscripción ";
-$a->strings["This action is not available under your subscription plan."] = "Esta acción no está disponible en su plan de suscripción.";
+$a->strings["parent"] = "padre";
+$a->strings["Collection"] = "Colección";
+$a->strings["Principal"] = "Principal";
+$a->strings["Addressbook"] = "Libreta de direcciones";
+$a->strings["Calendar"] = "Calendario";
+$a->strings["Schedule Inbox"] = "Programar bandeja de entrada";
+$a->strings["Schedule Outbox"] = "Programar bandeja de salida";
+$a->strings["Unknown"] = "Desconocido";
+$a->strings["Files"] = "Ficheros";
+$a->strings["Total"] = "Total";
+$a->strings["Shared"] = "Compartido";
+$a->strings["Create"] = "Crear";
+$a->strings["Upload"] = "Subir";
+$a->strings["Name"] = "Nombre";
+$a->strings["Type"] = "Tipo";
+$a->strings["Size"] = "Tamaño";
+$a->strings["Last Modified"] = "Última modificación";
+$a->strings["Edit"] = "Editar";
+$a->strings["Delete"] = "Eliminar";
+$a->strings["You are using %1\$s of your available file storage."] = "Está usando %1\$s de su espacio disponible para ficheros.";
+$a->strings["You are using %1\$s of %2\$s available file storage. (%3\$s&#37;)"] = "Está usando %1\$s de %2\$s que tiene a su disposición para ficheros. (%3\$s&#37;)";
+$a->strings["WARNING:"] = "ATENCIÓN:";
+$a->strings["Create new folder"] = "Crear nueva carpeta";
+$a->strings["Upload file"] = "Subir fichero";
+$a->strings["Can view my normal stream and posts"] = "Pueden verse mi flujo de actividad y publicaciones normales";
+$a->strings["Can view my default channel profile"] = "Puede verse mi perfil de canal predeterminado.";
+$a->strings["Can view my connections"] = "Pueden verse mis conexiones";
+$a->strings["Can view my file storage and photos"] = "Pueden verse mi repositorio de ficheros y mis fotos";
+$a->strings["Can view my webpages"] = "Pueden verse mis páginas web";
+$a->strings["Can send me their channel stream and posts"] = "Me pueden enviar sus entradas y flujo de actividad del canal";
+$a->strings["Can post on my channel page (\"wall\")"] = "Pueden crearse entradas en mi página de inicio del canal (“muro”)";
+$a->strings["Can comment on or like my posts"] = "Pueden publicarse comentarios en mis publicaciones o marcar mis entradas con 'me gusta'.";
+$a->strings["Can send me private mail messages"] = "Se me pueden enviar mensajes privados";
+$a->strings["Can like/dislike stuff"] = "Puede marcarse contenido como me gusta/no me gusta";
+$a->strings["Profiles and things other than posts/comments"] = "Perfiles y otras cosas aparte de publicaciones/comentarios";
+$a->strings["Can forward to all my channel contacts via post @mentions"] = "Puede enviarse una entrada a todos mis contactos del canal mediante una @mención";
+$a->strings["Advanced - useful for creating group forum channels"] = "Avanzado - útil para crear canales de foros de discusión o grupos";
+$a->strings["Can chat with me (when available)"] = "Se puede charlar conmigo (cuando esté disponible)";
+$a->strings["Can write to my file storage and photos"] = "Puede escribirse en mi repositorio de ficheros y fotos";
+$a->strings["Can edit my webpages"] = "Pueden editarse mis páginas web";
+$a->strings["Can source my public posts in derived channels"] = "Pueden utilizarse mis publicaciones públicas como origen de contenidos  en canales derivados";
+$a->strings["Somewhat advanced - very useful in open communities"] = "Algo avanzado - muy útil en comunidades abiertas";
+$a->strings["Can administer my channel resources"] = "Pueden administrarse mis recursos del canal";
+$a->strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Muy avanzado. Déjelo a no ser que sepa bien lo que está haciendo.";
+$a->strings["Social Networking"] = "Redes sociales";
+$a->strings["Mostly Public"] = "Público en su mayor parte";
+$a->strings["Restricted"] = "Restringido";
+$a->strings["Private"] = "Privado";
+$a->strings["Community Forum"] = "Foro de discusión";
+$a->strings["Feed Republish"] = "Republicar un \"feed\"";
+$a->strings["Special Purpose"] = "Propósito especial";
+$a->strings["Celebrity/Soapbox"] = "Página para fans";
+$a->strings["Group Repository"] = "Repositorio de grupo";
+$a->strings["Other"] = "Otro";
+$a->strings["Custom/Expert Mode"] = "Modo personalizado/experto";
+$a->strings["Missing room name"] = "Sala de chat sin nombre";
+$a->strings["Duplicate room name"] = "Nombre de sala duplicado.";
+$a->strings["Invalid room specifier."] = "Especificador de sala no válido.";
+$a->strings["Room not found."] = "Sala no encontrada.";
+$a->strings["Permission denied."] = "Acceso denegado.";
+$a->strings["Room is full"] = "La sala está llena.";
 $a->strings["Miscellaneous"] = "Varios";
 $a->strings["YYYY-MM-DD or MM-DD"] = "AAAA-MM-DD o MM-DD";
 $a->strings["Required"] = "Obligatorio";
@@ -78,175 +97,6 @@ $a->strings["seconds"] = "segundos";
 $a->strings["__ctx:e.g. 22 hours ago, 1 minute ago__ %1\$d %2\$s ago"] = "hace %1\$d %2\$s";
 $a->strings["%1\$s's birthday"] = "Cumpleaños de %1\$s";
 $a->strings["Happy Birthday %1\$s"] = "Feliz cumpleaños %1\$s";
-$a->strings["Directory Options"] = "Opciones del directorio";
-$a->strings["Safe Mode"] = "Modo seguro";
-$a->strings["No"] = "No";
-$a->strings["Yes"] = "Sí";
-$a->strings["Public Forums Only"] = "Solo foros públicos";
-$a->strings["This Website Only"] = "Solo este sitio web";
-$a->strings["New Page"] = "Nueva página";
-$a->strings["View"] = "Ver";
-$a->strings["Preview"] = "Previsualizar";
-$a->strings["Actions"] = "Acciones";
-$a->strings["Page Link"] = "Vínculo de la página";
-$a->strings["Title"] = "Título";
-$a->strings["Created"] = "Creado";
-$a->strings["Edited"] = "Editado";
-$a->strings["Public Timeline"] = "Cronología pública";
-$a->strings["Default"] = "Predeterminado";
-$a->strings["Delete this item?"] = "¿Borrar este elemento?";
-$a->strings["Comment"] = "Comentar";
-$a->strings["[+] show all"] = "[+] mostrar todo:";
-$a->strings["[-] show less"] = "[-] mostrar menos";
-$a->strings["[+] expand"] = "[+] expandir";
-$a->strings["[-] collapse"] = "[-] contraer";
-$a->strings["Password too short"] = "Contraseña demasiado corta";
-$a->strings["Passwords do not match"] = "Las contraseñas no cinciden";
-$a->strings["everybody"] = "cualquiera";
-$a->strings["Secret Passphrase"] = "Contraseña secreta";
-$a->strings["Passphrase hint"] = "Pista de contraseña";
-$a->strings["Notice: Permissions have changed but have not yet been submitted."] = "Aviso: los permisos han cambiado pero aún no han sido enviados.";
-$a->strings["close all"] = "cerrar todo";
-$a->strings["Nothing new here"] = "Nada nuevo por aquí";
-$a->strings["Rate This Channel (this is public)"] = "Valorar este canal (esto es público)";
-$a->strings["Rating"] = "Valoración";
-$a->strings["Describe (optional)"] = "Describir (opcional)";
-$a->strings["Submit"] = "Enviar";
-$a->strings["Please enter a link URL"] = "Por favor, introduzca una dirección de enlace";
-$a->strings["Unsaved changes. Are you sure you wish to leave this page?"] = "Cambios no guardados. ¿Está seguro de que desea abandonar la página?";
-$a->strings["timeago.prefixAgo"] = "timeago.prefixAgo";
-$a->strings["timeago.prefixFromNow"] = "timeago.prefixFromNow";
-$a->strings["ago"] = "de su publicación";
-$a->strings["from now"] = "desde ahora";
-$a->strings["less than a minute"] = "menos de un minuto";
-$a->strings["about a minute"] = "alrededor de un minuto";
-$a->strings["%d minutes"] = "%d minutos";
-$a->strings["about an hour"] = "alrededor de una hora";
-$a->strings["about %d hours"] = "alrededor de %d horas";
-$a->strings["a day"] = "un día";
-$a->strings["%d days"] = "%d días";
-$a->strings["about a month"] = "alrededor de un mes";
-$a->strings["%d months"] = "%d meses";
-$a->strings["about a year"] = "alrededor de un año";
-$a->strings["%d years"] = "%d años";
-$a->strings[" "] = " ";
-$a->strings["timeago.numbers"] = "timeago.numbers";
-$a->strings["prev"] = "anterior";
-$a->strings["first"] = "primera";
-$a->strings["last"] = "última";
-$a->strings["next"] = "próxima";
-$a->strings["older"] = "más antiguas";
-$a->strings["newer"] = "más recientes";
-$a->strings["No connections"] = "Sin conexiones";
-$a->strings["%d Connection"] = array(
-	0 => "%d Conexión",
-	1 => "%d Conexiones",
-);
-$a->strings["View Connections"] = "Ver conexiones";
-$a->strings["Search"] = "Buscar";
-$a->strings["Save"] = "Guardar";
-$a->strings["poke"] = "dar un toque";
-$a->strings["poked"] = "ha recibido un toque";
-$a->strings["ping"] = "avisar";
-$a->strings["pinged"] = "avisado/a";
-$a->strings["prod"] = "incitar";
-$a->strings["prodded"] = "incitado/a";
-$a->strings["slap"] = "abofetear";
-$a->strings["slapped"] = "abofeteado/a";
-$a->strings["finger"] = "señalar";
-$a->strings["fingered"] = "señalado/a";
-$a->strings["rebuff"] = "desairar";
-$a->strings["rebuffed"] = "desairado/a";
-$a->strings["happy"] = "feliz";
-$a->strings["sad"] = "triste";
-$a->strings["mellow"] = "amable";
-$a->strings["tired"] = "cansado/a";
-$a->strings["perky"] = "fesco/a";
-$a->strings["angry"] = "enfadado/a";
-$a->strings["stupified"] = "estupefacto/a";
-$a->strings["puzzled"] = "perplejo/a";
-$a->strings["interested"] = "interesado/a";
-$a->strings["bitter"] = "amargado/a";
-$a->strings["cheerful"] = "alegre";
-$a->strings["alive"] = "vivo/a";
-$a->strings["annoyed"] = "molesto/a";
-$a->strings["anxious"] = "ansioso/a";
-$a->strings["cranky"] = "de mal humor";
-$a->strings["disturbed"] = "perturbado/a";
-$a->strings["frustrated"] = "frustrado/a";
-$a->strings["depressed"] = "deprimido/a";
-$a->strings["motivated"] = "motivado/a";
-$a->strings["relaxed"] = "relajado/a";
-$a->strings["surprised"] = "sorprendido/a";
-$a->strings["Monday"] = "lunes";
-$a->strings["Tuesday"] = "martes";
-$a->strings["Wednesday"] = "miércoles";
-$a->strings["Thursday"] = "jueves";
-$a->strings["Friday"] = "viernes";
-$a->strings["Saturday"] = "sábado";
-$a->strings["Sunday"] = "domingo";
-$a->strings["January"] = "enero";
-$a->strings["February"] = "febrero";
-$a->strings["March"] = "marzo";
-$a->strings["April"] = "abril";
-$a->strings["May"] = "mayo";
-$a->strings["June"] = "junio";
-$a->strings["July"] = "julio";
-$a->strings["August"] = "agosto";
-$a->strings["September"] = "septiembre";
-$a->strings["October"] = "octubre";
-$a->strings["November"] = "noviembre";
-$a->strings["December"] = "diciembre";
-$a->strings["unknown.???"] = "desconocido???";
-$a->strings["bytes"] = "bytes";
-$a->strings["remove category"] = "eliminar categoría";
-$a->strings["remove from file"] = "eliminar del fichero";
-$a->strings["Click to open/close"] = "Pulsar para abrir/cerrar";
-$a->strings["Link to Source"] = "Enlazar con la entrada en su ubicación original";
-$a->strings["default"] = "por defecto";
-$a->strings["Page layout"] = "Formato de la página";
-$a->strings["You can create your own with the layouts tool"] = "Puede crear su propio formato gráfico con las herramientas de diseño";
-$a->strings["Page content type"] = "Tipo de contenido de página";
-$a->strings["Select an alternate language"] = "Selecciona un idioma alternativo";
-$a->strings["photo"] = "foto";
-$a->strings["event"] = "evento";
-$a->strings["status"] = "estado";
-$a->strings["comment"] = "comentario";
-$a->strings["activity"] = "actividad";
-$a->strings["Design Tools"] = "Herramientas de diseño";
-$a->strings["Blocks"] = "Bloques";
-$a->strings["Menus"] = "Menús";
-$a->strings["Layouts"] = "Formato gráfico";
-$a->strings["Pages"] = "Páginas";
-$a->strings["Collection"] = "Colección";
-$a->strings["parent"] = "padre";
-$a->strings["Principal"] = "Principal";
-$a->strings["Addressbook"] = "Libreta de direcciones";
-$a->strings["Calendar"] = "Calendario";
-$a->strings["Schedule Inbox"] = "Programar bandeja de entrada";
-$a->strings["Schedule Outbox"] = "Programar bandeja de salida";
-$a->strings["Unknown"] = "Desconocido";
-$a->strings["%1\$s used"] = "%1\$s usado";
-$a->strings["%1\$s used of %2\$s (%3\$s&#37;)"] = "%1\$s usado de %2\$s (%3\$s&#37;)";
-$a->strings["Files"] = "Ficheros";
-$a->strings["Total"] = "Total";
-$a->strings["Shared"] = "Compartido";
-$a->strings["Create"] = "Crear";
-$a->strings["Upload"] = "Subir";
-$a->strings["Name"] = "Nombre";
-$a->strings["Type"] = "Tipo";
-$a->strings["Size"] = "Tamaño";
-$a->strings["Last Modified"] = "Última modificación";
-$a->strings["Delete"] = "Borrar";
-$a->strings["Create new folder"] = "Crear nueva carpeta";
-$a->strings["Upload file"] = "Subir fichero";
-$a->strings["%1\$s's bookmarks"] = "Marcadores de %1\$s";
-$a->strings["view full size"] = "Ver en el tamaño original";
-$a->strings["\$Projectname Notification"] = "Notificación de \$Projectname";
-$a->strings["\$projectname"] = "\$projectname";
-$a->strings["Thank You,"] = "Gracias,";
-$a->strings["%s Administrator"] = "%s Administrador";
-$a->strings["No Subject"] = "Sin asunto";
 $a->strings["General Features"] = "Características generales";
 $a->strings["Content Expiration"] = "Caducidad del contenido";
 $a->strings["Remove posts/comments and/or private messages at a future time"] = "Eliminar publicaciones/comentarios y/o mensajes privados más adelante";
@@ -261,9 +111,9 @@ $a->strings["Provide managed web pages on your channel"] = "Proveer páginas web
 $a->strings["Private Notes"] = "Notas privadas";
 $a->strings["Enables a tool to store notes and reminders"] = "Activar una herramienta para almacenar notas y recordatorios";
 $a->strings["Navigation Channel Select"] = "Navegación por el selector de canales";
-$a->strings["Change channels directly from within the navigation dropdown menu"] = "Cambiar canales directamente desde el menú de navegación desplegable";
+$a->strings["Change channels directly from within the navigation dropdown menu"] = "Cambiar de canales directamente desde el menú de navegación desplegable";
 $a->strings["Photo Location"] = "Ubicación de las fotos";
-$a->strings["If location data is available on uploaded photos, link this to a map."] = "Si los datos de ubicación están disponibles en las fotos subidas, enlaza estas a un mapa.";
+$a->strings["If location data is available on uploaded photos, link this to a map."] = "Si los datos de ubicación están disponibles en las fotos subidas, enlazar estas a un mapa.";
 $a->strings["Expert Mode"] = "Modo de experto";
 $a->strings["Enable Expert Mode to provide advanced configuration options"] = "Habilitar el modo de experto para acceder a opciones avanzadas de configuración";
 $a->strings["Premium Channel"] = "Canal premium";
@@ -272,11 +122,11 @@ $a->strings["Post Composition Features"] = "Características de composición de
 $a->strings["Use Markdown"] = "Usar Markdown";
 $a->strings["Allow use of \"Markdown\" to format posts"] = "Permitir el uso de \"Markdown\" para formatear publicaciones";
 $a->strings["Large Photos"] = "Fotos de gran tamaño";
-$a->strings["Include large (640px) photo thumbnails in posts. If not enabled, use small (320px) photo thumbnails"] = "Incluir miniaturas de fotos grandes (640px) en publicaciones. Si no está habilitado, usar miniaturas pequeñas (320px)";
+$a->strings["Include large (1024px) photo thumbnails in posts. If not enabled, use small (640px) photo thumbnails"] = "Incluir miniaturas de fotos grandes (1024px) en publicaciones. Si no está habilitado, usar miniaturas pequeñas (6400px)";
 $a->strings["Channel Sources"] = "Orígenes de los contenidos del canal";
 $a->strings["Automatically import channel content from other channels or feeds"] = "Importar automáticamente contenido de otros canales o \"feeds\"";
 $a->strings["Even More Encryption"] = "Más cifrado todavía";
-$a->strings["Allow optional encryption of content end-to-end with a shared secret key"] = "Permitir cifrado adicional de contenido punto-a-punto con una clave secreta compartida.";
+$a->strings["Allow optional encryption of content end-to-end with a shared secret key"] = "Permitir cifrado adicional de contenido \"punto-a-punto\" con una clave secreta compartida.";
 $a->strings["Enable voting tools"] = "Activar herramientas de votación";
 $a->strings["Provide a class of post which others can vote on"] = "Proveer una clase de publicación en la que otros puedan votar";
 $a->strings["Network and Stream Filtering"] = "Filtrado del contenido";
@@ -286,14 +136,14 @@ $a->strings["Collections Filter"] = "Filtrado de colecciones";
 $a->strings["Enable widget to display Network posts only from selected collections"] = "Habilitar la muestra de entradas eligiendo colecciones";
 $a->strings["Saved Searches"] = "Búsquedas guardadas";
 $a->strings["Save search terms for re-use"] = "Guardar términos de búsqueda para su reutilización";
-$a->strings["Network Personal Tab"] = "Pestaña de red personal";
+$a->strings["Network Personal Tab"] = "Actividad personal";
 $a->strings["Enable tab to display only Network posts that you've interacted on"] = "Habilitar una pestaña en la cual se muestren solo las entradas en las que ha participado.";
-$a->strings["Network New Tab"] = "Nueva pestaña de red";
-$a->strings["Enable tab to display all new Network activity"] = "Habilitar una pestaña en la que se muestre toda la actividad de la red";
+$a->strings["Network New Tab"] = "Contenido nuevo";
+$a->strings["Enable tab to display all new Network activity"] = "Habilitar una pestaña en la que se muestre solo el contenido nuevo";
 $a->strings["Affinity Tool"] = "Herramienta de afinidad";
 $a->strings["Filter stream activity by depth of relationships"] = "Filtrar la actividad del flujo por profundidad de relaciones";
 $a->strings["Connection Filtering"] = "Filtrado de conexiones";
-$a->strings["Filter incoming posts from connections based on keywords/content"] = "Filtrar publicaciones entrantes de conexiones basadas en palabras clave / contenido";
+$a->strings["Filter incoming posts from connections based on keywords/content"] = "Filtrar publicaciones entrantes de conexiones por palabras clave o contenido";
 $a->strings["Suggest Channels"] = "Sugerir canales";
 $a->strings["Show channel suggestions"] = "Mostrar sugerencias de canales";
 $a->strings["Post/Comment Tools"] = "Herramientas de entradas/comentarios";
@@ -309,109 +159,298 @@ $a->strings["Star Posts"] = "Entradas destacadas";
 $a->strings["Ability to mark special posts with a star indicator"] = "Capacidad de marcar entradas destacadas con un indicador de estrella";
 $a->strings["Tag Cloud"] = "Nube de etiquetas";
 $a->strings["Provide a personal tag cloud on your channel page"] = "Proveer nube de etiquetas personal en su página de canal";
-$a->strings["Categories"] = "Categorías";
-$a->strings["Apps"] = "Aplicaciones";
-$a->strings["System"] = "Sistema";
-$a->strings["Personal"] = "Personales";
-$a->strings["Create Personal App"] = "Crear una aplicación personal";
-$a->strings["Edit Personal App"] = "Editar una aplicación personal";
+$a->strings["Default"] = "Predeterminado";
+$a->strings["Delete this item?"] = "¿Borrar este elemento?";
+$a->strings["Comment"] = "Comentar";
+$a->strings["[+] show all"] = "[+] mostrar todo:";
+$a->strings["[-] show less"] = "[-] mostrar menos";
+$a->strings["[+] expand"] = "[+] expandir";
+$a->strings["[-] collapse"] = "[-] contraer";
+$a->strings["Password too short"] = "Contraseña demasiado corta";
+$a->strings["Passwords do not match"] = "Las contraseñas no coinciden";
+$a->strings["everybody"] = "cualquiera";
+$a->strings["Secret Passphrase"] = "Contraseña secreta";
+$a->strings["Passphrase hint"] = "Pista de contraseña";
+$a->strings["Notice: Permissions have changed but have not yet been submitted."] = "Aviso: los permisos han cambiado pero aún no han sido enviados.";
+$a->strings["close all"] = "cerrar todo";
+$a->strings["Nothing new here"] = "Nada nuevo por aquí";
+$a->strings["Rate This Channel (this is public)"] = "Valorar este canal (esto es público)";
+$a->strings["Rating"] = "Valoración";
+$a->strings["Describe (optional)"] = "Describir (opcional)";
+$a->strings["Submit"] = "Enviar";
+$a->strings["Please enter a link URL"] = "Por favor, introduzca una dirección de enlace";
+$a->strings["Unsaved changes. Are you sure you wish to leave this page?"] = "Cambios no guardados. ¿Está seguro de que desea abandonar la página?";
+$a->strings["timeago.prefixAgo"] = "timeago.prefixAgo";
+$a->strings["timeago.prefixFromNow"] = "timeago.prefixFromNow";
+$a->strings["ago"] = "antes";
+$a->strings["from now"] = "desde ahora";
+$a->strings["less than a minute"] = "menos de un minuto";
+$a->strings["about a minute"] = "alrededor de un minuto";
+$a->strings["%d minutes"] = "%d minutos";
+$a->strings["about an hour"] = "alrededor de una hora";
+$a->strings["about %d hours"] = "alrededor de %d horas";
+$a->strings["a day"] = "un día";
+$a->strings["%d days"] = "%d días";
+$a->strings["about a month"] = "alrededor de un mes";
+$a->strings["%d months"] = "%d meses";
+$a->strings["about a year"] = "alrededor de un año";
+$a->strings["%d years"] = "%d años";
+$a->strings[" "] = " ";
+$a->strings["timeago.numbers"] = "timeago.numbers";
+$a->strings["January"] = "enero";
+$a->strings["February"] = "febrero";
+$a->strings["March"] = "marzo";
+$a->strings["April"] = "abril";
+$a->strings["__ctx:long__ May"] = "mayo";
+$a->strings["June"] = "junio";
+$a->strings["July"] = "julio";
+$a->strings["August"] = "agosto";
+$a->strings["September"] = "septiembre";
+$a->strings["October"] = "octubre";
+$a->strings["November"] = "noviembre";
+$a->strings["December"] = "diciembre";
+$a->strings["Jan"] = "Ene";
+$a->strings["Feb"] = "Feb";
+$a->strings["Mar"] = "Mar";
+$a->strings["Apr"] = "Abr";
+$a->strings["__ctx:short__ May"] = "May";
+$a->strings["Jun"] = "Jun";
+$a->strings["Jul"] = "Jul";
+$a->strings["Aug"] = "Ago";
+$a->strings["Sep"] = "Sep";
+$a->strings["Oct"] = "Oct";
+$a->strings["Nov"] = "Nov";
+$a->strings["Dec"] = "Dic";
+$a->strings["Sunday"] = "domingo";
+$a->strings["Monday"] = "lunes";
+$a->strings["Tuesday"] = "martes";
+$a->strings["Wednesday"] = "miércoles";
+$a->strings["Thursday"] = "jueves";
+$a->strings["Friday"] = "viernes";
+$a->strings["Saturday"] = "sábado";
+$a->strings["Sun"] = "Dom";
+$a->strings["Mon"] = "Lun";
+$a->strings["Tue"] = "Mar";
+$a->strings["Wed"] = "Mié";
+$a->strings["Thu"] = "Jue";
+$a->strings["Fri"] = "Vie";
+$a->strings["Sat"] = "Sáb";
+$a->strings["__ctx:calendar__ today"] = "hoy";
+$a->strings["__ctx:calendar__ month"] = "mes";
+$a->strings["__ctx:calendar__ week"] = "semana";
+$a->strings["__ctx:calendar__ day"] = "día";
+$a->strings["__ctx:calendar__ All day"] = "Todos los días";
+$a->strings["Frequently"] = "Frecuentemente";
+$a->strings["Hourly"] = "Cada hora";
+$a->strings["Twice daily"] = "Dos veces al día";
+$a->strings["Daily"] = "Diariamente";
+$a->strings["Weekly"] = "Semanalmente";
+$a->strings["Monthly"] = "Mensualmente";
+$a->strings["Friendica"] = "Friendica";
+$a->strings["OStatus"] = "OStatus";
+$a->strings["RSS/Atom"] = "RSS/Atom";
+$a->strings["Email"] = "Correo electrónico";
+$a->strings["Diaspora"] = "Diaspora";
+$a->strings["Facebook"] = "Facebook";
+$a->strings["Zot!"] = "Zot!";
+$a->strings["LinkedIn"] = "LinkedIn";
+$a->strings["XMPP/IM"] = "XMPP/IM";
+$a->strings["MySpace"] = "MySpace";
+$a->strings[" and "] = "y";
+$a->strings["public profile"] = "perfil público";
+$a->strings["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "%1\$s cambió %2\$s a &ldquo;%3\$s&rdquo;";
+$a->strings["Visit %1\$s's %2\$s"] = "Visitar %2\$s de %1\$s";
+$a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s actualizó %2\$s,  %3\$s cambió.";
 $a->strings["Connect"] = "Conectar";
-$a->strings["Ignore/Hide"] = "Ignorar/Ocultar";
-$a->strings["Suggestions"] = "Sugerencias";
-$a->strings["See more..."] = "Ver más...";
-$a->strings["You have %1$.0f of %2$.0f allowed connections."] = "Tiene %1$.0f de %2$.0f conexiones permitidas.";
-$a->strings["Add New Connection"] = "Añadir nueva conexión";
-$a->strings["Enter the channel address"] = "Introducir la dirección del canal";
-$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Ejemplo: paco@ejemplo.com, http://ejemplo.com/paco";
-$a->strings["Notes"] = "Notas";
-$a->strings["Remove term"] = "Eliminar término";
-$a->strings["Everything"] = "Todo";
-$a->strings["Archives"] = "Hemeroteca";
-$a->strings["Me"] = "Yo";
-$a->strings["Family"] = "Familia";
+$a->strings["New window"] = "Nueva ventana";
+$a->strings["Open the selected location in a different window or browser tab"] = "Abrir la ubicación seleccionada en una ventana o pestaña aparte";
+$a->strings["User '%s' deleted"] = "El usuario '%s' ha sido eliminado";
+$a->strings["Cannot locate DNS info for database server '%s'"] = "No se ha podido localizar información de DNS para el servidor de base de datos “%s”";
+$a->strings["Permission denied"] = "Permiso denegado";
+$a->strings["(Unknown)"] = "(Desconocido)";
+$a->strings["Visible to anybody on the internet."] = "Visible para cualquiera en internet.";
+$a->strings["Visible to you only."] = "Visible sólo para usted.";
+$a->strings["Visible to anybody in this network."] = "Visible para cualquiera en esta red.";
+$a->strings["Visible to anybody authenticated."] = "Visible para cualquiera que haya sido autenticado.";
+$a->strings["Visible to anybody on %s."] = "Visible para cualquiera en %s.";
+$a->strings["Visible to all connections."] = "Visible para todas las conexiones.";
+$a->strings["Visible to approved connections."] = "Visible para las conexiones permitidas.";
+$a->strings["Visible to specific connections."] = "Visible para conexiones específicas.";
+$a->strings["Item not found."] = "Elemento no encontrado.";
+$a->strings["Collection not found."] = "Colección no encontrada.";
+$a->strings["Collection is empty."] = "La colección está vacía.";
+$a->strings["Collection: %s"] = "Colección: %s";
+$a->strings["Connection: %s"] = "Conexión: %s";
+$a->strings["Connection not found."] = "Conexión no encontrada";
+$a->strings["Public Timeline"] = "Cronología pública";
+$a->strings["view full size"] = "Ver en el tamaño original";
+$a->strings["\$Projectname Notification"] = "Notificación de \$Projectname";
+$a->strings["\$projectname"] = "\$projectname";
+$a->strings["Thank You,"] = "Gracias,";
+$a->strings["%s Administrator"] = "%s Administrador";
+$a->strings["Administrator"] = "Administrador";
+$a->strings["No Subject"] = "Sin asunto";
+$a->strings["%1\$s's bookmarks"] = "Marcadores de %1\$s";
+$a->strings["Visible to your default audience"] = "Visible para su público predeterminado.";
+$a->strings["Show"] = "Mostrar";
+$a->strings["Don't show"] = "No mostrar";
+$a->strings["Permissions"] = "Permisos";
+$a->strings["Close"] = "Cerrar";
+$a->strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "No se ha podido crear un canal con un identificador que ya existe en este sistema. La importación ha fallado.";
+$a->strings["Channel clone failed. Import failed."] = "La clonación del canal no ha salido bien. La importación ha fallado.";
+$a->strings["Cloned channel not found. Import failed."] = "No se ha podido importar el canal porque el canal clonado no se ha encontrado.";
+$a->strings["Image exceeds website size limit of %lu bytes"] = "La imagen excede el límite de %lu bytes del sitio";
+$a->strings["Image file is empty."] = "El fichero de imagen está vacío. ";
+$a->strings["Unable to process image"] = "No ha sido posible procesar la imagen";
+$a->strings["Photo storage failed."] = "La foto no ha podido ser guardada.";
+$a->strings["Photo Albums"] = "Álbumes de fotos";
+$a->strings["Upload New Photos"] = "Subir nuevas fotos";
+$a->strings["created a new post"] = "ha creado una nueva entrada";
+$a->strings["commented on %s's post"] = "ha comentado la entrada de %s";
+$a->strings["New Page"] = "Nueva página";
+$a->strings["View"] = "Ver";
+$a->strings["Preview"] = "Previsualizar";
+$a->strings["Actions"] = "Acciones";
+$a->strings["Page Link"] = "Vínculo de la página";
+$a->strings["Title"] = "Título";
+$a->strings["Created"] = "Creado";
+$a->strings["Edited"] = "Editado";
+$a->strings["Profile Photos"] = "Fotos del perfil";
+$a->strings["Male"] = "Hombre";
+$a->strings["Female"] = "Mujer";
+$a->strings["Currently Male"] = "Actualmente hombre";
+$a->strings["Currently Female"] = "Actualmente mujer";
+$a->strings["Mostly Male"] = "Generalmente hombre";
+$a->strings["Mostly Female"] = "Generalmente mujer";
+$a->strings["Transgender"] = "Transgénero";
+$a->strings["Intersex"] = "Intersexual";
+$a->strings["Transsexual"] = "Transexual";
+$a->strings["Hermaphrodite"] = "Hermafrodita";
+$a->strings["Neuter"] = "Neutral";
+$a->strings["Non-specific"] = "No especificado";
+$a->strings["Undecided"] = "Indeciso/a";
+$a->strings["Males"] = "Hombres";
+$a->strings["Females"] = "Mujeres";
+$a->strings["Gay"] = "Homosexual";
+$a->strings["Lesbian"] = "Lesbiana";
+$a->strings["No Preference"] = "Sin preferencias";
+$a->strings["Bisexual"] = "Bisexual";
+$a->strings["Autosexual"] = "Autosexual";
+$a->strings["Abstinent"] = "Casto/a";
+$a->strings["Virgin"] = "Virgen";
+$a->strings["Deviant"] = "Fuera de lo común";
+$a->strings["Fetish"] = "Fetichista";
+$a->strings["Oodles"] = "Orgías";
+$a->strings["Nonsexual"] = "Asexual";
+$a->strings["Single"] = "Soltero/a";
+$a->strings["Lonely"] = "Solo/a";
+$a->strings["Available"] = "Disponible";
+$a->strings["Unavailable"] = "No disponible";
+$a->strings["Has crush"] = "Enamorado/a";
+$a->strings["Infatuated"] = "Apasionado/a";
+$a->strings["Dating"] = "Saliendo con alguien";
+$a->strings["Unfaithful"] = "Infiel";
+$a->strings["Sex Addict"] = "Con adicción al sexo";
 $a->strings["Friends"] = "Amigos";
-$a->strings["Acquaintances"] = "Conocidos/as";
-$a->strings["All"] = "Todas";
-$a->strings["Refresh"] = "Recargar";
-$a->strings["Account settings"] = "Configuración de la cuenta";
-$a->strings["Channel settings"] = "Configuración del canal";
-$a->strings["Additional features"] = "Características adicionales";
-$a->strings["Feature/Addon settings"] = "Configuración de características o complementos";
-$a->strings["Display settings"] = "Ajustes de visualización";
-$a->strings["Connected apps"] = "Aplicaciones conectadas";
-$a->strings["Export channel"] = "Exportar canal";
-$a->strings["Connection Default Permissions"] = "Permisos predeterminados de conexión";
-$a->strings["Premium Channel Settings"] = "Configuración del canal premium";
-$a->strings["Settings"] = "Ajustes";
-$a->strings["Messages"] = "Mensajes";
-$a->strings["Check Mail"] = "Comprobar correo";
-$a->strings["New Message"] = "Nuevo mensaje";
-$a->strings["Chat Rooms"] = "Salas de chat";
-$a->strings["Bookmarked Chatrooms"] = "Salas de chat preferidas";
-$a->strings["Suggested Chatrooms"] = "Salas de chat sugeridas";
-$a->strings["photo/image"] = "foto/imagen";
-$a->strings["Rate Me"] = "Valorar este canal";
-$a->strings["View Ratings"] = "Mostrar las valoraciones";
-$a->strings["Public Hubs"] = "Servidores públicos";
-$a->strings["l F d, Y \\@ g:i A"] = "l d de F, Y \\@ G:i";
-$a->strings["Starts:"] = "Comienza:";
-$a->strings["Finishes:"] = "Finaliza:";
-$a->strings["Location:"] = "Ubicación:";
+$a->strings["Friends/Benefits"] = "Amigos con algo extra";
+$a->strings["Casual"] = "Casual";
+$a->strings["Engaged"] = "Prometido/a";
+$a->strings["Married"] = "Casado/a";
+$a->strings["Imaginarily married"] = "Casado/a en sueños";
+$a->strings["Partners"] = "Pareja";
+$a->strings["Cohabiting"] = "Cohabitando";
+$a->strings["Common law"] = "Matrimonio tradicional";
+$a->strings["Happy"] = "Felíz";
+$a->strings["Not looking"] = "No estoy buscando";
+$a->strings["Swinger"] = "Libertino";
+$a->strings["Betrayed"] = "Engañado/a";
+$a->strings["Separated"] = "Separado/a";
+$a->strings["Unstable"] = "Inestable";
+$a->strings["Divorced"] = "Divorciado/a";
+$a->strings["Imaginarily divorced"] = "Divorciado/a en sueños";
+$a->strings["Widowed"] = "Viudo/a";
+$a->strings["Uncertain"] = "Indeterminado";
+$a->strings["It's complicated"] = "Es complicado";
+$a->strings["Don't care"] = "No me importa";
+$a->strings["Ask me"] = "Pregúnteme";
+$a->strings["Embedded content"] = "Contenido incorporado";
+$a->strings["Embedding disabled"] = "Incrustación deshabilitada";
 $a->strings["This event has been added to your calendar."] = "Este evento ha sido añadido a su calendario.";
+$a->strings["event"] = "evento";
+$a->strings["Not specified"] = "Sin especificar";
+$a->strings["Needs Action"] = "Necesita de una intervención";
+$a->strings["Completed"] = "Completado/a";
+$a->strings["In Process"] = "En proceso";
+$a->strings["Cancelled"] = "Cancelado/a";
+$a->strings["Site Admin"] = "Adminstrador del sitio";
+$a->strings["Bookmarks"] = "Marcadores";
+$a->strings["Address Book"] = "Libreta de direcciones";
+$a->strings["Login"] = "Iniciar sesión";
+$a->strings["Channel Manager"] = "Administración de canales";
+$a->strings["Grid"] = "Red";
+$a->strings["Settings"] = "Ajustes";
+$a->strings["Webpages"] = "Páginas web";
+$a->strings["Channel Home"] = "Mi canal";
+$a->strings["Profile"] = "Perfil";
+$a->strings["Photos"] = "Fotos";
+$a->strings["Events"] = "Eventos";
+$a->strings["Directory"] = "Directorio";
+$a->strings["Help"] = "Ayuda";
+$a->strings["Mail"] = "Correo";
+$a->strings["Mood"] = "Estado de ánimo";
+$a->strings["Poke"] = "Toques y otras cosas";
+$a->strings["Chat"] = "Chat";
+$a->strings["Search"] = "Buscar";
+$a->strings["Probe"] = "Probar";
+$a->strings["Suggest"] = "Sugerir";
+$a->strings["Random Channel"] = "Canal aleatorio";
+$a->strings["Invite"] = "Invitar";
+$a->strings["Features"] = "Características";
+$a->strings["Language"] = "Idioma";
+$a->strings["Post"] = "Publicación";
+$a->strings["Profile Photo"] = "Foto del perfil";
+$a->strings["Update"] = "Actualizar";
+$a->strings["Install"] = "Instalar";
+$a->strings["Purchase"] = "Comprar";
+$a->strings["Logged out."] = "Desconectado/a.";
+$a->strings["Failed authentication"] = "Autenticación fallida.";
+$a->strings["Login failed."] = "El acceso ha fallado.";
 $a->strings["%s <!item_type!>"] = "%s <!item_type!>";
-$a->strings["[Red:Notify] New mail received at %s"] = "[Red:Aviso] Nuevo correo recibido en %s";
+$a->strings["[Hubzilla:Notify] New mail received at %s"] = "[Hubzilla:Aviso] Nuevo mensaje en %s";
 $a->strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s le ha enviado un nuevo mensaje privado en %3\$s.";
 $a->strings["%1\$s sent you %2\$s."] = "%1\$s le envió %2\$s.";
 $a->strings["a private message"] = "un mensaje privado";
 $a->strings["Please visit %s to view and/or reply to your private messages."] = "Por favor visite %s para ver y/o responder a su mensaje privado.";
-$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s, %2\$s comentó en [zrl=%3\$s]a %4\$s[/zrl]";
-$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s, %2\$s comentó en [zrl=%3\$s]%4\$s de %5\$s[/zrl]";
-$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s comentó en [zrl=%3\$s]su %4\$s[/zrl]";
-$a->strings["[Red:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Red:Aviso] Nuevo comentario de %2\$s en la conversación #%1\$d";
-$a->strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = "%1\$s, %2\$s comentó un elemento/conversación que ha estado siguiendo.";
+$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s, %2\$s ha comentado [zrl=%3\$s]%4\$s[/zrl]";
+$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s, %2\$s ha comentado [zrl=%3\$s]%5\$s de %4\$s[/zrl] ";
+$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s ha comentado [zrl=%3\$s]%4\$s creado por usted[/zrl]";
+$a->strings["[Hubzilla:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Hubzilla:Aviso] Nuevo comentario de %2\$s a la conversación #%1\$d";
+$a->strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = "%1\$s, %2\$s ha comentado un elemento/conversación que ha estado siguiendo.";
 $a->strings["Please visit %s to view and/or reply to the conversation."] = "Para ver o comentar la conversación, visite %s";
-$a->strings["[Red:Notify] %s posted to your profile wall"] = "[Red:Aviso] %s escribió en su página de perfil";
-$a->strings["%1\$s, %2\$s posted to your profile wall at %3\$s"] = "%1\$s, %2\$s publicó en su página de perfil en %3\$s";
-$a->strings["%1\$s, %2\$s posted to [zrl=%3\$s]your wall[/zrl]"] = "%1\$s, %2\$s publicó en [zrl=%3\$s]su página de perfil[/zrl]";
-$a->strings["[Red:Notify] %s tagged you"] = "[Red:Aviso] %s le etiquetó";
+$a->strings["[Hubzilla:Notify] %s posted to your profile wall"] = "[Hubzilla:Aviso] %s ha publicado una entrada en su página de inicio del perfil";
+$a->strings["%1\$s, %2\$s posted to your profile wall at %3\$s"] = "%1\$s, %2\$s publicó en su página del perfil en %3\$s";
+$a->strings["%1\$s, %2\$s posted to [zrl=%3\$s]your wall[/zrl]"] = "%1\$s, %2\$s publicó en [zrl=%3\$s]su página del perfil[/zrl]";
+$a->strings["[Hubzilla:Notify] %s tagged you"] = "[Hubzilla:Aviso] %s le ha etiquetado";
 $a->strings["%1\$s, %2\$s tagged you at %3\$s"] = "%1\$s, %2\$s le etiquetó en %3\$s";
 $a->strings["%1\$s, %2\$s [zrl=%3\$s]tagged you[/zrl]."] = "%1\$s, %2\$s [zrl=%3\$s]le etiquetó[/zrl].";
-$a->strings["[Red:Notify] %1\$s poked you"] = "[Red:Aviso]  %1\$s le ha dado un toque";
+$a->strings["[Hubzilla:Notify] %1\$s poked you"] = "[Hubzilla:Aviso] %1\$s le ha dado un toque";
 $a->strings["%1\$s, %2\$s poked you at %3\$s"] = "%1\$s, %2\$s le dio un toque en %3\$s";
 $a->strings["%1\$s, %2\$s [zrl=%2\$s]poked you[/zrl]."] = "%1\$s, %2\$s [zrl=%2\$s]le dio un toque[/zrl].";
-$a->strings["[Red:Notify] %s tagged your post"] = "[Red:Aviso]  %s etiquetó su entrada";
-$a->strings["%1\$s, %2\$s tagged your post at %3\$s"] = "%1\$s, %2\$s etiquetó su publicación en %3\$s";
+$a->strings["[Hubzilla:Notify] %s tagged your post"] = "[Hubzilla:Aviso] %s ha etiquetado su publicación";
+$a->strings["%1\$s, %2\$s tagged your post at %3\$s"] = "%1\$s, %2\$s ha etiquetado su publicación en %3\$s";
 $a->strings["%1\$s, %2\$s tagged [zrl=%3\$s]your post[/zrl]"] = "%1\$s, %2\$s etiquetó [zrl=%3\$s]su publicación[/zrl]";
-$a->strings["[Red:Notify] Introduction received"] = "[Red:Aviso] Solicitud de conexión recibida";
+$a->strings["[Hubzilla:Notify] Introduction received"] = "[Hubzilla:Aviso] Ha recibido una solicitud de conexión";
 $a->strings["%1\$s, you've received an new connection request from '%2\$s' at %3\$s"] = "%1\$s, ha recibido una nueva solicitud de conexión de '%2\$s' en  %3\$s";
 $a->strings["%1\$s, you've received [zrl=%2\$s]a new connection request[/zrl] from %3\$s."] = "%1\$s, ha recibido [zrl=%2\$s]una nueva solicitud de conexión[/zrl] de %3\$s.";
 $a->strings["You may visit their profile at %s"] = "Puede visitar su perfil en %s";
 $a->strings["Please visit %s to approve or reject the connection request."] = "Por favor, visite %s para permitir o rechazar la solicitad de conexión.";
-$a->strings["[Red:Notify] Friend suggestion received"] = "[Red:Aviso] recibió una sugerencia de conexión";
+$a->strings["[Hubzilla:Notify] Friend suggestion received"] = "[Hubzilla:Aviso] Ha recibido una sugerencia de amistad";
 $a->strings["%1\$s, you've received a friend suggestion from '%2\$s' at %3\$s"] = "%1\$s, ha recibido una sugerencia de conexión de '%2\$s' en %3\$s";
 $a->strings["%1\$s, you've received [zrl=%2\$s]a friend suggestion[/zrl] for %3\$s from %4\$s."] = "%1\$s, ha recibido [zrl=%2\$s]una sugerencia de conexión[/zrl] para %3\$s de %4\$s.";
 $a->strings["Name:"] = "Nombre:";
 $a->strings["Photo:"] = "Foto:";
 $a->strings["Please visit %s to approve or reject the suggestion."] = "Por favor, visite %s para aprobar o rechazar la sugerencia.";
-$a->strings["[Red:Notify]"] = "[Red:Aviso]";
-$a->strings["No recipient provided."] = "No se ha especificado ningún destinatario.";
-$a->strings["[no subject]"] = "[sin asunto]";
-$a->strings["Unable to determine sender."] = "No ha sido posible determinar el remitente. ";
-$a->strings["Stored post could not be verified."] = "No se han podido verificar las entradas guardadas.";
-$a->strings["%1\$s likes %2\$s's %3\$s"] = "a %1\$s le gusta el %3\$s de %2\$s";
-$a->strings["Please choose"] = "Por favor, elija";
-$a->strings["Agree"] = "De acuerdo";
-$a->strings["Disagree"] = "En desacuerdo";
-$a->strings["Abstain"] = "Abstención";
-$a->strings["Channel is blocked on this site."] = "El canal está bloqueado en este sitio.";
-$a->strings["Channel location missing."] = "Falta la ubicación del canal.";
-$a->strings["Response from remote channel was incomplete."] = "Respuesta incompleta del canal.";
-$a->strings["Channel was deleted and no longer exists."] = "El canal ha sido eliminado y ya no existe.";
-$a->strings["Protocol disabled."] = "Protocolo deshabilitado.";
-$a->strings["Protocol blocked for this channel."] = "Protocolo bloqueado para este canal.";
-$a->strings["Channel discovery failed."] = "El intento de acceder al canal ha fallado.";
-$a->strings["local account not found."] = "No se ha encontrado la cuenta local.";
-$a->strings["Cannot connect to yourself."] = "No puede conectarse consigo mismo.";
+$a->strings["[Hubzilla:Notify]"] = "[Hubzilla:Aviso]";
 $a->strings["Private Message"] = "Mensaje Privado";
 $a->strings["Select"] = "Seleccionar";
 $a->strings["Save to Folder"] = "Guardar en carpeta";
@@ -450,8 +489,9 @@ $a->strings["%d comment"] = array(
 $a->strings["View %s's profile - %s"] = "Ver el perfil de %s - %s";
 $a->strings["to"] = "a";
 $a->strings["via"] = "mediante";
-$a->strings["Wall-to-Wall"] = "De página de perfil a página de perfil (de Muro a Muro)";
-$a->strings["via Wall-To-Wall:"] = "Mediante el procedimiento página de perfil a página de perfil (de Muro a Muro)";
+$a->strings["Wall-to-Wall"] = "De página del perfil a página del perfil (de Muro a Muro)";
+$a->strings["via Wall-To-Wall:"] = "Mediante el procedimiento página del perfil a página del perfil (de Muro a Muro)";
+$a->strings["Delivery Report"] = "Informe de transmisión";
 $a->strings["from %s"] = "desde %s";
 $a->strings["last edited: %s"] = "último cambio: %s";
 $a->strings["Expires: %s"] = "Caduca: %s";
@@ -460,8 +500,7 @@ $a->strings["Add to Calendar"] = "Añadir al calendario";
 $a->strings["Mark all seen"] = "Marcar todo como visto";
 $a->strings["__ctx:noun__ Likes"] = "Me gusta";
 $a->strings["__ctx:noun__ Dislikes"] = "No me gusta";
-$a->strings["Close"] = "Cerrar";
-$a->strings["Please wait"] = "Espera por favor";
+$a->strings["Please wait"] = "Espere por favor";
 $a->strings["This is you"] = "Este es usted";
 $a->strings["Bold"] = "Negrita";
 $a->strings["Italic"] = "Itálico ";
@@ -472,73 +511,208 @@ $a->strings["Image"] = "Imagen";
 $a->strings["Insert Link"] = "Insertar enlace";
 $a->strings["Video"] = "Vídeo";
 $a->strings["Encrypt text"] = "Cifrar texto";
-$a->strings["New window"] = "Nueva ventana";
-$a->strings["Open the selected location in a different window or browser tab"] = "Abrir la ubicación seleccionada en una ventana o pestaña aparte";
-$a->strings["User '%s' deleted"] = "El usuario '%s' ha sido eliminado";
-$a->strings["Attachments:"] = "Ficheros adjuntos:";
-$a->strings["\$Projectname event notification:"] = "Notificación de eventos de \$Projectname:";
-$a->strings["Logout"] = "Finalizar sesión";
-$a->strings["End this session"] = "Finalizar esta sesión";
-$a->strings["Home"] = "Inicio";
-$a->strings["Your posts and conversations"] = "Sus entradas y conversaciones";
-$a->strings["View Profile"] = "Ver el perfil";
-$a->strings["Your profile page"] = "Su página de perfil";
-$a->strings["Edit Profiles"] = "Editar perfiles";
-$a->strings["Manage/Edit profiles"] = "Administrar/editar perfiles";
-$a->strings["Edit Profile"] = "Editar perfil";
-$a->strings["Edit your profile"] = "Editar su perfil";
-$a->strings["Photos"] = "Fotos";
-$a->strings["Your photos"] = "Sus fotos";
-$a->strings["Your files"] = "Sus ficheros";
-$a->strings["Chat"] = "Chat";
-$a->strings["Your chatrooms"] = "Sus salas de chat";
-$a->strings["Bookmarks"] = "Marcadores";
-$a->strings["Your bookmarks"] = "Sus marcadores";
-$a->strings["Webpages"] = "Páginas web";
-$a->strings["Your webpages"] = "Sus páginas web";
-$a->strings["Login"] = "Iniciar sesión";
-$a->strings["Sign in"] = "Acceder";
-$a->strings["%s - click to logout"] = "%s - pulsar para finalizar sesión";
-$a->strings["Remote authentication"] = "Acceder desde su servidor";
-$a->strings["Click to authenticate to your home hub"] = "Pulsar para identificarse en su servidor de inicio";
-$a->strings["Home Page"] = "Página de inicio";
-$a->strings["Register"] = "Registrarse";
-$a->strings["Create an account"] = "Crear una cuenta";
-$a->strings["Help"] = "Ayuda";
-$a->strings["Help and documentation"] = "Ayuda y documentación";
-$a->strings["Applications, utilities, links, games"] = "Aplicaciones, utilidades, enlaces, juegos";
-$a->strings["Search site content"] = "Buscar contenido del sitio";
-$a->strings["Directory"] = "Directorio";
-$a->strings["Channel Directory"] = "Directorio de canales";
-$a->strings["Matrix"] = "RedMatrix";
-$a->strings["Your matrix"] = "Su red";
-$a->strings["Mark all matrix notifications seen"] = "Marcar todas las notificaciones de la red como leídas";
-$a->strings["Channel Home"] = "Mi canal";
-$a->strings["Channel home"] = "Mi canal";
-$a->strings["Mark all channel notifications seen"] = "Marcar todas las notificaciones del canal como leídas";
-$a->strings["Connections"] = "Conexiones";
-$a->strings["Notices"] = "Avisos";
-$a->strings["Notifications"] = "Notificaciones";
-$a->strings["See all notifications"] = "Ver todas las notificaciones";
-$a->strings["Mark all system notifications seen"] = "Marcar todas las notificaciones de sistema como leídas";
-$a->strings["Mail"] = "Correo";
-$a->strings["Private mail"] = "Correo privado";
-$a->strings["See all private messages"] = "Ver todas los mensajes privados";
-$a->strings["Mark all private messages seen"] = "Marcar todos los mensajes privados como leídos";
-$a->strings["Inbox"] = "Bandeja de entrada";
-$a->strings["Outbox"] = "Bandeja de salida";
-$a->strings["Events"] = "Eventos";
-$a->strings["Event Calendar"] = "Calendario de eventos";
-$a->strings["See all events"] = "Ver todos los eventos";
-$a->strings["Mark all events seen"] = "Marcar todos los eventos como leidos";
-$a->strings["Channel Manager"] = "Administración de canales";
-$a->strings["Manage Your Channels"] = "Gestionar sus canales";
-$a->strings["Account/Channel Settings"] = "Ajustes de cuenta/canales";
-$a->strings["Admin"] = "Administrador";
-$a->strings["Site Setup and Configuration"] = "Ajustes y configuración del sitio";
-$a->strings["Loading..."] = "Cargando...";
-$a->strings["@name, #tag, content"] = "@nombre, #etiqueta, contenido";
-$a->strings["Please wait..."] = "Espere por favor…";
+$a->strings["prev"] = "anterior";
+$a->strings["first"] = "primera";
+$a->strings["last"] = "última";
+$a->strings["next"] = "próxima";
+$a->strings["older"] = "más antiguas";
+$a->strings["newer"] = "más recientes";
+$a->strings["No connections"] = "Sin conexiones";
+$a->strings["%d Connection"] = array(
+	0 => "%d Conexión",
+	1 => "%d Conexiones",
+);
+$a->strings["View Connections"] = "Ver conexiones";
+$a->strings["Save"] = "Guardar";
+$a->strings["poke"] = "un toque";
+$a->strings["poked"] = "ha recibido un toque";
+$a->strings["ping"] = "un \"ping\"";
+$a->strings["pinged"] = "avisado/a";
+$a->strings["prod"] = "una incitación";
+$a->strings["prodded"] = "ha recibido una incitación";
+$a->strings["slap"] = "una bofetada";
+$a->strings["slapped"] = "ha recibido una bofetada";
+$a->strings["finger"] = "un \"finger\"";
+$a->strings["fingered"] = "ha recibido un \"finger\"";
+$a->strings["rebuff"] = "un rechazo";
+$a->strings["rebuffed"] = "ha sido rechazado/a";
+$a->strings["happy"] = "feliz";
+$a->strings["sad"] = "triste";
+$a->strings["mellow"] = "amable";
+$a->strings["tired"] = "cansado/a";
+$a->strings["perky"] = "fresco/a";
+$a->strings["angry"] = "enfadado/a";
+$a->strings["stupified"] = "estupefacto/a";
+$a->strings["puzzled"] = "perplejo/a";
+$a->strings["interested"] = "interesado/a";
+$a->strings["bitter"] = "amargado/a";
+$a->strings["cheerful"] = "alegre";
+$a->strings["alive"] = "vivo/a";
+$a->strings["annoyed"] = "molesto/a";
+$a->strings["anxious"] = "ansioso/a";
+$a->strings["cranky"] = "de mal humor";
+$a->strings["disturbed"] = "perturbado/a";
+$a->strings["frustrated"] = "frustrado/a";
+$a->strings["depressed"] = "deprimido/a";
+$a->strings["motivated"] = "motivado/a";
+$a->strings["relaxed"] = "relajado/a";
+$a->strings["surprised"] = "sorprendido/a";
+$a->strings["May"] = "mayo";
+$a->strings["Unknown Attachment"] = "Adjunto no reconocido";
+$a->strings["Attachment"] = "Fichero adjunto";
+$a->strings["Size Unknown"] = "Tamaño desconocido";
+$a->strings["remove category"] = "eliminar categoría";
+$a->strings["remove from file"] = "eliminar del fichero";
+$a->strings["Click to open/close"] = "Pulsar para abrir/cerrar";
+$a->strings["Link to Source"] = "Enlazar con la entrada en su ubicación original";
+$a->strings["default"] = "por defecto";
+$a->strings["Page layout"] = "Formato de la página";
+$a->strings["You can create your own with the layouts tool"] = "Puede crear su propio formato gráfico con las herramientas de diseño";
+$a->strings["Page content type"] = "Tipo de contenido de página";
+$a->strings["Select an alternate language"] = "Seleccionar un idioma alternativo";
+$a->strings["photo"] = "foto";
+$a->strings["status"] = "el mensaje de estado";
+$a->strings["comment"] = "comentario";
+$a->strings["activity"] = "actividad";
+$a->strings["Design Tools"] = "Herramientas de diseño";
+$a->strings["Blocks"] = "Bloques";
+$a->strings["Menus"] = "Menús";
+$a->strings["Layouts"] = "Formato gráfico";
+$a->strings["Pages"] = "Páginas";
+$a->strings["Image/photo"] = "Imagen/foto";
+$a->strings["Encrypted content"] = "Contenido cifrado";
+$a->strings["Install %s element: "] = "Instalar el elemento %s:";
+$a->strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Esta entrada contiene el elemento instalable %s, sin embargo le faltan permisos para instalarlo en este sitio.";
+$a->strings["webpage"] = "página web";
+$a->strings["layout"] = "disposición";
+$a->strings["block"] = "bloque";
+$a->strings["menu"] = "menú";
+$a->strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s escribió la siguiente %2\$s %3\$s";
+$a->strings["post"] = "entrada";
+$a->strings["Different viewers will see this text differently"] = "Visitantes diferentes verán este texto de forma distinta";
+$a->strings["$1 spoiler"] = "$1 spoiler";
+$a->strings["$1 wrote:"] = "$1 escribió";
+$a->strings["Not a valid email address"] = "Dirección de correo no válida";
+$a->strings["Your email domain is not among those allowed on this site"] = "Su dirección de correo no pertenece a ninguno de los dominios permitidos en este sitio.";
+$a->strings["Your email address is already registered at this site."] = "Su dirección de correo está ya registrada en este sitio.";
+$a->strings["An invitation is required."] = "Es obligatorio que le inviten.";
+$a->strings["Invitation could not be verified."] = "No se ha podido verificar su invitación.";
+$a->strings["Please enter the required information."] = "Por favor introduzca la información requerida.";
+$a->strings["Failed to store account information."] = "La información de la cuenta no se ha podido guardar.";
+$a->strings["Registration confirmation for %s"] = "Confirmación de registro para %s";
+$a->strings["Registration request at %s"] = "Solicitud de registro en %s";
+$a->strings["your registration password"] = "su contraseña de registro";
+$a->strings["Registration details for %s"] = "Detalles del registro de %s";
+$a->strings["Account approved."] = "Cuenta aprobada.";
+$a->strings["Registration revoked for %s"] = "Registro revocado para %s";
+$a->strings["Account verified. Please login."] = "Cuenta verificada. Por favor, inicie sesión.";
+$a->strings["Click here to upgrade."] = "Pulse aquí para actualizar";
+$a->strings["This action exceeds the limits set by your subscription plan."] = "Esta acción supera los límites establecidos por su plan de suscripción ";
+$a->strings["This action is not available under your subscription plan."] = "Esta acción no está disponible en su plan de suscripción.";
+$a->strings["Channel is blocked on this site."] = "El canal está bloqueado en este sitio.";
+$a->strings["Channel location missing."] = "Falta la ubicación del canal.";
+$a->strings["Response from remote channel was incomplete."] = "Respuesta incompleta del canal.";
+$a->strings["Channel was deleted and no longer exists."] = "El canal ha sido eliminado y ya no existe.";
+$a->strings["Protocol disabled."] = "Protocolo deshabilitado.";
+$a->strings["Channel discovery failed."] = "El intento de acceder al canal ha fallado.";
+$a->strings["local account not found."] = "No se ha encontrado la cuenta local.";
+$a->strings["Cannot connect to yourself."] = "No puede conectarse consigo mismo.";
+$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "El \"token\" de seguridad del formulario no es correcto. Esto ha ocurrido probablemente porque el formulario ha estado abierto demasiado tiempo (>3 horas) antes de ser enviado";
+$a->strings["%d invitation available"] = array(
+	0 => "%d invitación pendiente",
+	1 => "%d invitaciones disponibles",
+);
+$a->strings["Advanced"] = "Avanzado";
+$a->strings["Find Channels"] = "Encontrar canales";
+$a->strings["Enter name or interest"] = "Introducir nombre o interés";
+$a->strings["Connect/Follow"] = "Conectar/Seguir";
+$a->strings["Examples: Robert Morgenstein, Fishing"] = "Ejemplos: José Fernández, Pesca";
+$a->strings["Find"] = "Encontrar";
+$a->strings["Channel Suggestions"] = "Sugerencias de canales";
+$a->strings["Random Profile"] = "Perfil aleatorio";
+$a->strings["Invite Friends"] = "Invitar a amigos";
+$a->strings["Advanced example: name=fred and country=iceland"] = "Ejemplo avanzado: nombre=juan y país=españa";
+$a->strings["Everything"] = "Todo";
+$a->strings["Categories"] = "Categorías";
+$a->strings["%d connection in common"] = array(
+	0 => "%d conexión en común",
+	1 => "%d conexiones en común",
+);
+$a->strings["show more"] = "mostrar más";
+$a->strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Un grupo suprimido con este nombre ha sido restablecido. <strong>Es posible</strong> que los permisos existentes  sean aplicados a este grupo y sus futuros miembros. Si no quiere esto, por favor cree otro grupo con un nombre diferente.";
+$a->strings["Add new connections to this collection (privacy group)"] = "Añadir nuevas conexiones a esta colección (privacidad del grupo)";
+$a->strings["All Channels"] = "Todos los canales";
+$a->strings["edit"] = "editar";
+$a->strings["Collections"] = "Colecciones";
+$a->strings["Edit collection"] = "Editar colección";
+$a->strings["Add new collection"] = "Añadir nueva colección";
+$a->strings["Channels not in any collection"] = "El canal no se encuentra en ninguna colección";
+$a->strings["add"] = "añadir";
+$a->strings["Invalid data packet"] = "Paquete de datos no válido";
+$a->strings["Unable to verify channel signature"] = "No ha sido posible de verificar la firma del canal";
+$a->strings["Unable to verify site signature for %s"] = "No ha sido posible de verificar la firma del sitio para %s";
+$a->strings["invalid target signature"] = "La firma recibida no es válida";
+$a->strings["No recipient provided."] = "No se ha especificado ningún destinatario.";
+$a->strings["[no subject]"] = "[sin asunto]";
+$a->strings["Unable to determine sender."] = "No ha sido posible determinar el remitente. ";
+$a->strings["Stored post could not be verified."] = "No se han podido verificar las entradas guardadas.";
+$a->strings["Unable to obtain identity information from database"] = "No ha sido posible obtener información sobre la identidad desde la base de datos";
+$a->strings["Empty name"] = "Nombre vacío";
+$a->strings["Name too long"] = "Nombre demasiado largo";
+$a->strings["No account identifier"] = "Ningún identificador de la cuenta";
+$a->strings["Nickname is required."] = "Se requiere un sobrenombre (alias).";
+$a->strings["Reserved nickname. Please choose another."] = "Sobrenombre en uso. Por favor, elija otro.";
+$a->strings["Nickname has unsupported characters or is already being used on this site."] = "El alias contiene caracteres no admitidos o está ya en uso por otros usuarios de este sitio.";
+$a->strings["Unable to retrieve created identity"] = "No ha sido posible recuperar la identidad creada";
+$a->strings["Default Profile"] = "Perfil principal";
+$a->strings["Requested channel is not available."] = "El canal solicitado no está disponible.";
+$a->strings["Requested profile is not available."] = "El perfil solicitado no está disponible.";
+$a->strings["Change profile photo"] = "Cambiar la foto del perfil";
+$a->strings["Profiles"] = "Perfiles";
+$a->strings["Manage/edit profiles"] = "Administrar/editar perfiles";
+$a->strings["Create New Profile"] = "Crear un nuevo perfil";
+$a->strings["Edit Profile"] = "Editar el perfil";
+$a->strings["Profile Image"] = "Imagen del perfil";
+$a->strings["visible to everybody"] = "visible para cualquiera";
+$a->strings["Edit visibility"] = "Editar visibilidad";
+$a->strings["Gender:"] = "Género:";
+$a->strings["Status:"] = "Estado:";
+$a->strings["Homepage:"] = "Página personal:";
+$a->strings["Online Now"] = "Ahora en línea";
+$a->strings["g A l F d"] = "g A l d F";
+$a->strings["F d"] = "d F";
+$a->strings["[today]"] = "[hoy]";
+$a->strings["Birthday Reminders"] = "Recordatorios de cumpleaños";
+$a->strings["Birthdays this week:"] = "Cumpleaños de esta semana:";
+$a->strings["[No description]"] = "[Sin descripción]";
+$a->strings["Event Reminders"] = "Recordatorios de eventos";
+$a->strings["Events this week:"] = "Eventos de esta semana:";
+$a->strings["Full Name:"] = "Nombre completo:";
+$a->strings["Like this channel"] = "Me gusta este canal";
+$a->strings["j F, Y"] = "j F Y";
+$a->strings["j F"] = "j F";
+$a->strings["Birthday:"] = "Cumpleaños:";
+$a->strings["Age:"] = "Edad:";
+$a->strings["for %1\$d %2\$s"] = "por %1\$d %2\$s";
+$a->strings["Sexual Preference:"] = "Orientación sexual:";
+$a->strings["Hometown:"] = "Ciudad de origen:";
+$a->strings["Tags:"] = "Etiquetas:";
+$a->strings["Political Views:"] = "Posición política:";
+$a->strings["Religion:"] = "Religión:";
+$a->strings["About:"] = "Sobre mí:";
+$a->strings["Hobbies/Interests:"] = "Aficciones/Intereses:";
+$a->strings["Likes:"] = "Me gusta:";
+$a->strings["Dislikes:"] = "No me gusta:";
+$a->strings["Contact information and Social Networks:"] = "Información de contacto y redes sociales:";
+$a->strings["My other channels:"] = "Mis otros canales:";
+$a->strings["Musical interests:"] = "Intereses musicales:";
+$a->strings["Books, literature:"] = "Libros, literatura:";
+$a->strings["Television:"] = "Televisión:";
+$a->strings["Film/dance/culture/entertainment:"] = "Cine/danza/cultura/entretenimiento:";
+$a->strings["Love/Romance:"] = "Vida sentimental/amorosa:";
+$a->strings["Work/employment:"] = "Trabajo:";
+$a->strings["School/education:"] = "Estudios:";
+$a->strings["Like this thing"] = "Me gusta esto";
 $a->strings["Tags"] = "Etiquetas";
 $a->strings["Keywords"] = "Palabras clave";
 $a->strings["have"] = "tener";
@@ -547,72 +721,50 @@ $a->strings["want"] = "quiero";
 $a->strings["wants"] = "quiere";
 $a->strings["likes"] = "le gusta";
 $a->strings["dislikes"] = "no le gusta";
-$a->strings[" and "] = "y";
-$a->strings["public profile"] = "perfil público";
-$a->strings["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "%1\$s cambió %2\$s a &ldquo;%3\$s&rdquo;";
-$a->strings["Visit %1\$s's %2\$s"] = "Visitar %2\$s de %1\$s";
-$a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s actualizó %2\$s,  %3\$s cambió.";
-$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "El \"token\" de seguridad del formulario no es correcto. Esto ha ocurrido probablemente porque el formulario ha estado abierto demasiado tiempo (>3 horas) antes de ser enviado";
-$a->strings["Can view my normal stream and posts"] = "Pueden verse mi flujo de actividad y publicaciones normales";
-$a->strings["Can view my default channel profile"] = "Puede verse mi perfil de canal predeterminado.";
-$a->strings["Can view my photo albums"] = "Pueden verse mis álbumes de fotos";
-$a->strings["Can view my connections"] = "Pueden verse mis conexiones";
-$a->strings["Can view my file storage"] = "Pueden verse mis ficheros compartidos";
-$a->strings["Can view my webpages"] = "Pueden verse mis páginas web";
-$a->strings["Can send me their channel stream and posts"] = "Me pueden enviar sus entradas y flujo de actividad su canal";
-$a->strings["Can post on my channel page (\"wall\")"] = "Pueden crear entradas en mi página de inicio del canal (“muro”)";
-$a->strings["Can comment on or like my posts"] = "Pueden publicarse comentarios en mis publicaciones o marcar mis entradas con 'me gusta'.";
-$a->strings["Can send me private mail messages"] = "Se me pueden enviar mensajes privados";
-$a->strings["Can post photos to my photo albums"] = "Pueden publicarse fotos en mis álbumes";
-$a->strings["Can like/dislike stuff"] = "Puede marcarse contenido como me gustar/no me gusta.";
-$a->strings["Profiles and things other than posts/comments"] = "Perfiles y otras cosas aparte de publicaciones/comentarios";
-$a->strings["Can forward to all my channel contacts via post @mentions"] = "Puede enviarse una entrada a todos mis contactos del canal mediante una @mención";
-$a->strings["Advanced - useful for creating group forum channels"] = "Avanzado - útil para crear canales de foro o grupos";
-$a->strings["Can chat with me (when available)"] = "Se puede charlar conmigo (cuando esté disponible)";
-$a->strings["Can write to my file storage"] = "Puede escribirse en mi carpeta de ficheros";
-$a->strings["Can edit my webpages"] = "Puede editar mis páginas web";
-$a->strings["Can source my public posts in derived channels"] = "Pueden utilizarse mis publicaciones públicas como origen de contenidos  en canales derivados";
-$a->strings["Somewhat advanced - very useful in open communities"] = "Algo avanzado - muy útil en comunidades abiertas";
-$a->strings["Can administer my channel resources"] = "Pueden administrarse mis recursos del canal";
-$a->strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Muy avanzado. Déjelo a no ser que sepa bien lo que está haciendo.";
-$a->strings["Social Networking"] = "Redes sociales";
-$a->strings["Mostly Public"] = "Público en su mayor parte";
-$a->strings["Restricted"] = "Restringido";
-$a->strings["Private"] = "Privado";
-$a->strings["Community Forum"] = "Foro de discusión";
-$a->strings["Feed Republish"] = "Republicar un \"feed\"";
-$a->strings["Special Purpose"] = "Propósito especial";
-$a->strings["Celebrity/Soapbox"] = "Página para fans";
-$a->strings["Group Repository"] = "Repositorio de grupo";
-$a->strings["Other"] = "Otro";
-$a->strings["Custom/Expert Mode"] = "Modo personalizado/experto";
+$a->strings["Item was not found."] = "Elemento no encontrado.";
+$a->strings["No source file."] = "Ningún fichero de origen";
+$a->strings["Cannot locate file to replace"] = "No se puede localizar el fichero que va a ser sustituido.";
+$a->strings["Cannot locate file to revise/update"] = "No se puede localizar el fichero para revisar/actualizar";
+$a->strings["File exceeds size limit of %d"] = "El fichero supera el limite de tamaño de %d";
+$a->strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Ha alcanzado su límite de %1$.0f Mbytes de almacenamiento de adjuntos.";
+$a->strings["File upload failed. Possible system limit or action terminated."] = "Error de carga, posiblemente por limite del sistema o porque la acción ha finalizado.";
+$a->strings["Stored file could not be verified. Upload failed."] = "El fichero almacenado no ha podido ser verificado. El envío ha fallado.";
+$a->strings["Path not available."] = "Ruta no disponible.";
+$a->strings["Empty pathname"] = "Ruta vacía";
+$a->strings["duplicate filename or path"] = "Nombre duplicado de ruta o fichero";
+$a->strings["Path not found."] = "Ruta no encontrada";
+$a->strings["mkdir failed."] = "mkdir ha fallado.";
+$a->strings["database storage failed."] = "el almacenamiento en la base de datos ha fallado.";
+$a->strings["Empty path"] = "Ruta vacía";
 $a->strings["channel"] = "canal";
-$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "a %1\$s no le gusta el %3\$s de %2\$s";
-$a->strings["%1\$s is now connected with %2\$s"] = "%1\$s ahora está conectado con %2\$s";
-$a->strings["%1\$s poked %2\$s"] = "%1\$s dio un toque a %2\$s";
+$a->strings["%1\$s likes %2\$s's %3\$s"] = "a %1\$s le gusta %3\$s de %2\$s";
+$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "a %1\$s no le gusta %3\$s de %2\$s";
+$a->strings["%1\$s is now connected with %2\$s"] = "%1\$s ahora está conectado/a con %2\$s";
+$a->strings["%1\$s poked %2\$s"] = "%1\$s ha dado un toque a %2\$s";
 $a->strings["__ctx:mood__ %1\$s is %2\$s"] = "%1\$s está %2\$s";
 $a->strings["__ctx:title__ Likes"] = "Me gusta";
 $a->strings["__ctx:title__ Dislikes"] = "No me gusta";
 $a->strings["__ctx:title__ Agree"] = "De acuerdo";
 $a->strings["__ctx:title__ Disagree"] = "En desacuerdo";
 $a->strings["__ctx:title__ Abstain"] = "Abstención";
-$a->strings["__ctx:title__ Attending"] = "Participar";
-$a->strings["__ctx:title__ Not attending"] = "No participar";
+$a->strings["__ctx:title__ Attending"] = "Participaré";
+$a->strings["__ctx:title__ Not attending"] = "No participaré";
 $a->strings["__ctx:title__ Might attend"] = "Quizá participe";
 $a->strings["View %s's profile @ %s"] = "Ver el perfil @ %s de %s";
 $a->strings["Categories:"] = "Categorías:";
 $a->strings["Filed under:"] = "Archivado bajo:";
 $a->strings["View in context"] = "Mostrar en su contexto";
 $a->strings["remove"] = "eliminar";
+$a->strings["Loading..."] = "Cargando...";
 $a->strings["Delete Selected Items"] = "Eliminar elementos seleccionados";
 $a->strings["View Source"] = "Ver la fuente original de la entrada";
 $a->strings["Follow Thread"] = "Seguir el hilo";
-$a->strings["View Status"] = "Ver estado";
+$a->strings["View Status"] = "Estado actual";
+$a->strings["View Profile"] = "Ver el perfil";
 $a->strings["View Photos"] = "Ver fotos";
-$a->strings["Matrix Activity"] = "Actividad en la red de esta conexión";
-$a->strings["Edit Contact"] = "Editar contacto";
-$a->strings["Send PM"] = "Enviar Mensaje Privado";
-$a->strings["Poke"] = "Dar un toque";
+$a->strings["Activity/Posts"] = "Actividad y entradas";
+$a->strings["Edit Connection"] = "Editar conexión";
+$a->strings["Send PM"] = "Enviar un mensaje privado";
 $a->strings["%s likes this."] = "a %s le gusta esto.";
 $a->strings["%s doesn't like this."] = "a %s no le gusta esto.";
 $a->strings["<span  %1\$s>%2\$d people</span> like this."] = array(
@@ -671,6 +823,7 @@ $a->strings["Commented Order"] = "Comentarios recientes";
 $a->strings["Sort by Comment Date"] = "Ordenar por fecha de comentario";
 $a->strings["Posted Order"] = "Publicaciones recientes";
 $a->strings["Sort by Post Date"] = "Ordenar por fecha de publicación";
+$a->strings["Personal"] = "Personales";
 $a->strings["Posts that mention or involve you"] = "Publicaciones que le mencionan o involucran";
 $a->strings["New"] = "Nuevas";
 $a->strings["Activity Stream - by date"] = "Flujo de actividad - por fecha";
@@ -682,18 +835,17 @@ $a->strings["Channel"] = "Canal";
 $a->strings["Status Messages and Posts"] = "Mensajes de estado y publicaciones";
 $a->strings["About"] = "Sobre mí";
 $a->strings["Profile Details"] = "Detalles del perfil";
-$a->strings["Photo Albums"] = "Álbumes de fotos";
-$a->strings["Files and Storage"] = "Ficheros y carpetas";
+$a->strings["Files and Storage"] = "Ficheros y repositorio";
 $a->strings["Chatrooms"] = "Salas de chat";
 $a->strings["Saved Bookmarks"] = "Marcadores guardados";
 $a->strings["Manage Webpages"] = "Administrar páginas web";
 $a->strings["__ctx:noun__ Attending"] = array(
-	0 => "Asistir",
-	1 => "Participar",
+	0 => "Participando",
+	1 => "Participaré",
 );
 $a->strings["__ctx:noun__ Not Attending"] = array(
-	0 => "No asistir",
-	1 => "No participar",
+	0 => "No participando",
+	1 => "No participaré",
 );
 $a->strings["__ctx:noun__ Undecided"] = array(
 	0 => "Indeciso/a",
@@ -701,239 +853,136 @@ $a->strings["__ctx:noun__ Undecided"] = array(
 );
 $a->strings["__ctx:noun__ Agree"] = array(
 	0 => "Está de acuerdo",
-	1 => "Están de acuerdo",
+	1 => "De acuerdo",
 );
 $a->strings["__ctx:noun__ Disagree"] = array(
 	0 => "No está de acuerdo",
-	1 => "No están de acuerdo",
+	1 => "En desacuerdo",
 );
 $a->strings["__ctx:noun__ Abstain"] = array(
 	0 => "se abstiene",
 	1 => "Se abstienen",
 );
-$a->strings["Permission denied"] = "Permiso denegado";
-$a->strings["(Unknown)"] = "(Desconocido)";
-$a->strings["Visible to anybody on the internet."] = "Visible para cualquiera en internet.";
-$a->strings["Visible to you only."] = "Visible sólo para usted.";
-$a->strings["Visible to anybody in this network."] = "Visible para cualquiera en esta red.";
-$a->strings["Visible to anybody authenticated."] = "Visible para cualquiera que haya sido autenticado.";
-$a->strings["Visible to anybody on %s."] = "Visible para cualquiera en %s.";
-$a->strings["Visible to all connections."] = "Visible para todas las conexiones.";
-$a->strings["Visible to approved connections."] = "Visible para las conexiones permitidas.";
-$a->strings["Visible to specific connections."] = "Visible para conexiones específicas.";
-$a->strings["Item not found."] = "Elemento no encontrado.";
-$a->strings["Permission denied."] = "Acceso denegado.";
-$a->strings["Collection not found."] = "Colección no encontrada.";
-$a->strings["Collection is empty."] = "La colección está vacía.";
-$a->strings["Collection: %s"] = "Colección: %s";
-$a->strings["Connection: %s"] = "Conexión: %s";
-$a->strings["Connection not found."] = "Conexión no encontrada";
-$a->strings["Invalid data packet"] = "Paquete de datos no válido";
-$a->strings["Unable to verify channel signature"] = "No ha sido posible de verificar la signatura del canal";
-$a->strings["Unable to verify site signature for %s"] = "No ha sido posible de verificar la signatura del sitio para %s";
-$a->strings["Embedded content"] = "Contenido incorporado";
-$a->strings["Embedding disabled"] = "Incrustación deshabilitada";
-$a->strings["Logged out."] = "Desconectado.";
-$a->strings["Failed authentication"] = "Autenticación fallida.";
-$a->strings["Login failed."] = "El acceso ha fallado.";
-$a->strings["%d invitation available"] = array(
-	0 => "%d invitación pendiente",
-	1 => "%d invitaciones disponibles",
-);
-$a->strings["Advanced"] = "Avanzado";
-$a->strings["Find Channels"] = "Encontrar canales";
-$a->strings["Enter name or interest"] = "Introducir nombre o interés";
-$a->strings["Connect/Follow"] = "Conectar/Seguir";
-$a->strings["Examples: Robert Morgenstein, Fishing"] = "Ejemplos: José Fernández, Pesca";
-$a->strings["Find"] = "Encontrar";
-$a->strings["Channel Suggestions"] = "Sugerencias de canales";
-$a->strings["Random Profile"] = "Perfil aleatorio";
-$a->strings["Invite Friends"] = "Invitar a amigos";
-$a->strings["Advanced example: name=fred and country=iceland"] = "Ejemplo avanzado: nombre=juan y país=españa";
-$a->strings["%d connection in common"] = array(
-	0 => "%d conexión en común",
-	1 => "%d conexiones en común",
-);
-$a->strings["show more"] = "mostrar más";
-$a->strings["Visible to your default audience"] = "Visible para su público predeterminado.";
-$a->strings["Show"] = "Mostrar";
-$a->strings["Don't show"] = "No mostrar";
-$a->strings["Permissions"] = "Permisos";
-$a->strings["Item was not found."] = "Elemento no encontrado.";
-$a->strings["No source file."] = "Ningún fichero de origen";
-$a->strings["Cannot locate file to replace"] = "No se puede localizar el fichero que va a ser sustituido.";
-$a->strings["Cannot locate file to revise/update"] = "No se puede localizar el fichero para revisar/actualizar";
-$a->strings["File exceeds size limit of %d"] = "El fichero supera el limite de tamaño de %d";
-$a->strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Ha alcanzado su límite de %1$.0f Mbytes de almacenamiento de adjuntos.";
-$a->strings["File upload failed. Possible system limit or action terminated."] = "Error de carga, posiblemente por limite de sistema o porque la acción ha finalizado.";
-$a->strings["Stored file could not be verified. Upload failed."] = "El fichero almacenado no ha podido ser verificado. El envío ha fallado.";
-$a->strings["Path not available."] = "Ruta no disponible.";
-$a->strings["Empty pathname"] = "Ruta vacía";
-$a->strings["duplicate filename or path"] = "Nombre de ruta o fichero duplicados";
-$a->strings["Path not found."] = "Ruta no encontrada";
-$a->strings["mkdir failed."] = "mkdir ha fallado.";
-$a->strings["database storage failed."] = "el almacenamiento en la base de datos ha fallado.";
-$a->strings["Unable to obtain identity information from database"] = "No ha sido posible obtener los datos de identidad desde la base de datos";
-$a->strings["Empty name"] = "Nombre vacío";
-$a->strings["Name too long"] = "Nombre demasiado largo";
-$a->strings["No account identifier"] = "Ningún identificador de la cuenta";
-$a->strings["Nickname is required."] = "Se requiere un sobrenombre (alias).";
-$a->strings["Reserved nickname. Please choose another."] = "Sobrenombre en uso. Por favor, elija otro.";
-$a->strings["Nickname has unsupported characters or is already being used on this site."] = "El alias contiene caracteres no admitidos o está ya en uso por otros usuarios de este sitio.";
-$a->strings["Unable to retrieve created identity"] = "No ha sido posible recuperar la identidad creada";
-$a->strings["Default Profile"] = "Perfil principal";
-$a->strings["Requested channel is not available."] = "El canal solicitado no está disponible.";
-$a->strings["Requested profile is not available."] = "El perfil solicitado no está disponible.";
-$a->strings["Change profile photo"] = "Cambiar foto de perfil";
-$a->strings["Profiles"] = "Perfiles";
-$a->strings["Manage/edit profiles"] = "Administrar/editar perfiles";
-$a->strings["Create New Profile"] = "Crear nuevo perfil";
-$a->strings["Profile Image"] = "Imagen de perfil";
-$a->strings["visible to everybody"] = "visible para cualquiera";
-$a->strings["Edit visibility"] = "Editar visibilidad";
-$a->strings["Gender:"] = "Género:";
-$a->strings["Status:"] = "Estado:";
-$a->strings["Homepage:"] = "Página personal:";
-$a->strings["Online Now"] = "Ahora en línea";
-$a->strings["g A l F d"] = "g A l d F";
-$a->strings["F d"] = "d F";
-$a->strings["[today]"] = "[hoy]";
-$a->strings["Birthday Reminders"] = "Recordatorios de cumpleaños";
-$a->strings["Birthdays this week:"] = "Cumpleaños esta semana:";
-$a->strings["[No description]"] = "[Sin descripción]";
-$a->strings["Event Reminders"] = "Recordatorios de eventos";
-$a->strings["Events this week:"] = "Eventos de esta semana:";
-$a->strings["Profile"] = "Perfil";
-$a->strings["Full Name:"] = "Nombre completo:";
-$a->strings["Like this channel"] = "Me gusta este canal";
-$a->strings["j F, Y"] = "j F Y";
-$a->strings["j F"] = "j F";
-$a->strings["Birthday:"] = "Cumpleaños:";
-$a->strings["Age:"] = "Edad:";
-$a->strings["for %1\$d %2\$s"] = "por %1\$d %2\$s";
-$a->strings["Sexual Preference:"] = "Orientación sexual:";
-$a->strings["Hometown:"] = "Ciudad de origen:";
-$a->strings["Tags:"] = "Etiquetas:";
-$a->strings["Political Views:"] = "Posición política:";
-$a->strings["Religion:"] = "Religión:";
-$a->strings["About:"] = "Sobre mí:";
-$a->strings["Hobbies/Interests:"] = "Aficciones/Intereses:";
-$a->strings["Likes:"] = "Me gusta:";
-$a->strings["Dislikes:"] = "No me gusta:";
-$a->strings["Contact information and Social Networks:"] = "Información de contacto y redes sociales:";
-$a->strings["My other channels:"] = "Mis otros canales:";
-$a->strings["Musical interests:"] = "Intereses musicales:";
-$a->strings["Books, literature:"] = "Libros, literatura:";
-$a->strings["Television:"] = "Televisión:";
-$a->strings["Film/dance/culture/entertainment:"] = "Cine/danza/cultura/entretenimiento:";
-$a->strings["Love/Romance:"] = "Vida sentimental/amorosa:";
-$a->strings["Work/employment:"] = "Trabajo:";
-$a->strings["School/education:"] = "Estudios:";
-$a->strings["Like this thing"] = "Me gusta esto";
-$a->strings["Male"] = "Hombre";
-$a->strings["Female"] = "Mujer";
-$a->strings["Currently Male"] = "Actualmente hombre";
-$a->strings["Currently Female"] = "Actualmente mujer";
-$a->strings["Mostly Male"] = "Generalmente hombre";
-$a->strings["Mostly Female"] = "Generalmente mujer";
-$a->strings["Transgender"] = "Transgénero";
-$a->strings["Intersex"] = "Intersexual";
-$a->strings["Transsexual"] = "Transexual";
-$a->strings["Hermaphrodite"] = "Hermafrodita";
-$a->strings["Neuter"] = "Neutral";
-$a->strings["Non-specific"] = "No especificado";
-$a->strings["Undecided"] = "Indeciso";
-$a->strings["Males"] = "Hombres";
-$a->strings["Females"] = "Mujeres";
-$a->strings["Gay"] = "Gay";
-$a->strings["Lesbian"] = "Lesbiana";
-$a->strings["No Preference"] = "Sin preferencias";
-$a->strings["Bisexual"] = "Bisexual";
-$a->strings["Autosexual"] = "Autosexual";
-$a->strings["Abstinent"] = "Casto";
-$a->strings["Virgin"] = "Virgen";
-$a->strings["Deviant"] = "Fuera de lo común";
-$a->strings["Fetish"] = "Fetichista";
-$a->strings["Oodles"] = "Orgías";
-$a->strings["Nonsexual"] = "Asexual";
-$a->strings["Single"] = "Soltero/a";
-$a->strings["Lonely"] = "Solo/a";
-$a->strings["Available"] = "Disponible";
-$a->strings["Unavailable"] = "No disponible";
-$a->strings["Has crush"] = "Enamorado/a";
-$a->strings["Infatuated"] = "Apasionado";
-$a->strings["Dating"] = "Saliendo con alguien";
-$a->strings["Unfaithful"] = "Infiel";
-$a->strings["Sex Addict"] = "Con adicción al sexo";
-$a->strings["Friends/Benefits"] = "Amistad beneficiosa";
-$a->strings["Casual"] = "Casual";
-$a->strings["Engaged"] = "Prometido/a";
-$a->strings["Married"] = "Casado/a";
-$a->strings["Imaginarily married"] = "Casado/a en sueños";
-$a->strings["Partners"] = "Pareja";
-$a->strings["Cohabiting"] = "Cohabitando";
-$a->strings["Common law"] = "Matrimonio tradicional";
-$a->strings["Happy"] = "Felíz";
-$a->strings["Not looking"] = "No estoy buscando";
-$a->strings["Swinger"] = "Infiel";
-$a->strings["Betrayed"] = "Engañado/a";
-$a->strings["Separated"] = "Separado/a";
-$a->strings["Unstable"] = "Inestable";
-$a->strings["Divorced"] = "Divorciado/a";
-$a->strings["Imaginarily divorced"] = "Divorciado/a en sueños";
-$a->strings["Widowed"] = "Viudo/a";
-$a->strings["Uncertain"] = "Indeterminado";
-$a->strings["It's complicated"] = "Es complicado";
-$a->strings["Don't care"] = "No me importa";
-$a->strings["Ask me"] = "Pregúnteme";
-$a->strings["Site Admin"] = "Adminstrador del sitio";
-$a->strings["Address Book"] = "Libreta de direcciones";
-$a->strings["Mood"] = "Estado de ánimo";
-$a->strings["Probe"] = "Probar";
-$a->strings["Suggest"] = "Sugerir";
-$a->strings["Random Channel"] = "Canal aleatorio";
-$a->strings["Invite"] = "Invitar";
-$a->strings["Features"] = "Características";
-$a->strings["Language"] = "Idioma";
-$a->strings["Post"] = "Publicación";
-$a->strings["Profile Photo"] = "Foto de perfil";
-$a->strings["Update"] = "Actualizar";
-$a->strings["Install"] = "Instalar";
-$a->strings["Purchase"] = "Comprar";
-$a->strings["Image/photo"] = "Imagen/foto";
-$a->strings["Encrypted content"] = "Contenido cifrado";
-$a->strings["Install %s element: "] = "Instalar el elemento %s:";
-$a->strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Esta entrada contiene el elemento instalable %s, sin embargo le faltan permisos para instalarlo en este sitio.";
-$a->strings["webpage"] = "página web";
-$a->strings["layout"] = "disposición";
-$a->strings["block"] = "bloque";
-$a->strings["menu"] = "menú";
-$a->strings["QR code"] = "Código QR";
-$a->strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s escribió la siguiente %2\$s %3\$s";
-$a->strings["post"] = "entrada";
-$a->strings["Different viewers will see this text differently"] = "Visitantes diferentes verán este texto de forma diferente";
-$a->strings["$1 spoiler"] = "$1 spoiler";
-$a->strings["$1 wrote:"] = "$1 escribió";
-$a->strings["Missing room name"] = "Nombre de sala desaparecido.";
-$a->strings["Duplicate room name"] = "Nombre de sala duplicado.";
-$a->strings["Invalid room specifier."] = "Especificador de sala no válido.";
-$a->strings["Room not found."] = "Sala no encontrada.";
-$a->strings["Room is full"] = "La sala está llena.";
-$a->strings["Image exceeds website size limit of %lu bytes"] = "La imagen es demasiado grande (%lu demás)";
-$a->strings["Image file is empty."] = "El fichero de imagen está vacío. ";
-$a->strings["Unable to process image"] = "No ha sido posible procesar la imagen";
-$a->strings["Photo storage failed."] = "La foto no ha podido ser guardada.";
-$a->strings["Upload New Photos"] = "Subir nuevas fotos";
-$a->strings["Some blurb about what to do when you're new here"] = "Algunas propuestas para el nuevo usuario sobre qué se puede hacer  aquí";
-$a->strings["You have created %1$.0f of %2$.0f allowed channels."] = "Ha creado %1$.0f de %2$.0f canales permitidos.";
-$a->strings["Create a new channel"] = "Crear un nuevo canal";
-$a->strings["Current Channel"] = "Canal actual";
-$a->strings["Switch to one of your channels by selecting it."] = "Cambiar a uno de sus canales seleccionándolo.";
-$a->strings["Default Channel"] = "Canal principal";
-$a->strings["Make Default"] = "Convertir en predeterminado";
-$a->strings["%d new messages"] = "%d mensajes nuevos";
-$a->strings["%d new introductions"] = "%d nuevas isolicitudes de conexión";
-$a->strings["Delegated Channels"] = "Canales delegados";
+$a->strings["Apps"] = "Aplicaciones";
+$a->strings["System"] = "Sistema";
+$a->strings["Create Personal App"] = "Crear una aplicación personal";
+$a->strings["Edit Personal App"] = "Editar una aplicación personal";
+$a->strings["Ignore/Hide"] = "Ignorar/Ocultar";
+$a->strings["Suggestions"] = "Sugerencias";
+$a->strings["See more..."] = "Ver más...";
+$a->strings["You have %1$.0f of %2$.0f allowed connections."] = "Tiene %1$.0f de %2$.0f conexiones permitidas.";
+$a->strings["Add New Connection"] = "Añadir nueva conexión";
+$a->strings["Enter the channel address"] = "Introducir la dirección del canal";
+$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Ejemplo: paco@ejemplo.com, http://ejemplo.com/paco";
+$a->strings["Notes"] = "Notas";
+$a->strings["Remove term"] = "Eliminar término";
+$a->strings["Archives"] = "Hemeroteca";
+$a->strings["Me"] = "Yo";
+$a->strings["Family"] = "Familia";
+$a->strings["Acquaintances"] = "Conocidos/as";
+$a->strings["All"] = "Todas";
+$a->strings["Refresh"] = "Recargar";
+$a->strings["Account settings"] = "Configuración de la cuenta";
+$a->strings["Channel settings"] = "Configuración del canal";
+$a->strings["Additional features"] = "Características adicionales";
+$a->strings["Feature/Addon settings"] = "Configuración de características o complementos";
+$a->strings["Display settings"] = "Ajustes de visualización";
+$a->strings["Connected apps"] = "Aplicaciones conectadas";
+$a->strings["Export channel"] = "Exportar canal";
+$a->strings["Connection Default Permissions"] = "Permisos predeterminados de conexión";
+$a->strings["Premium Channel Settings"] = "Configuración del canal premium";
+$a->strings["Private Mail Menu"] = "Menú de correo privado";
+$a->strings["Combined View"] = "Vista combinada";
+$a->strings["Inbox"] = "Bandeja de entrada";
+$a->strings["Outbox"] = "Bandeja de salida";
+$a->strings["New Message"] = "Nuevo mensaje";
+$a->strings["Conversations"] = "Conversaciones";
+$a->strings["Received Messages"] = "Mensajes recibidos";
+$a->strings["Sent Messages"] = "Enviar mensajes";
+$a->strings["No messages."] = "Sin mensajes.";
+$a->strings["Delete conversation"] = "Eliminar conversación";
+$a->strings["D, d M Y - g:i A"] = "D d M Y - G:i";
+$a->strings["Chat Rooms"] = "Salas de chat";
+$a->strings["Bookmarked Chatrooms"] = "Salas de chat preferidas";
+$a->strings["Suggested Chatrooms"] = "Salas de chat sugeridas";
+$a->strings["photo/image"] = "foto/imagen";
+$a->strings["Rate Me"] = "Valorar este canal";
+$a->strings["View Ratings"] = "Mostrar las valoraciones";
+$a->strings["Public Hubs"] = "Servidores públicos";
+$a->strings["Forums"] = "Foros";
+$a->strings["Tasks"] = "Actividad";
+$a->strings["Documentation"] = "Documentación";
+$a->strings["Project/Site Information"] = "Información sobre el proyecto o sitio";
+$a->strings["For Members"] = "Para los usuarios";
+$a->strings["For Administrators"] = "Para los administradores";
+$a->strings["For Developers"] = "Para los desarrolladores";
+$a->strings["Site"] = "Sitio";
+$a->strings["Accounts"] = "Cuentas";
+$a->strings["Channels"] = "Canales";
+$a->strings["Plugins"] = "Extensiones";
+$a->strings["Themes"] = "Temas";
+$a->strings["Inspect queue"] = "Examinar la cola";
+$a->strings["Profile Config"] = "Ajustes del perfil";
+$a->strings["DB updates"] = "Actualizaciones de la base de datos";
+$a->strings["Logs"] = "Informes";
+$a->strings["Admin"] = "Administrador";
+$a->strings["Plugin Features"] = "Ajustes de la extensión";
+$a->strings["User registrations waiting for confirmation"] = "Registros de usuarios pendientes de confirmación";
+$a->strings["Logout"] = "Finalizar sesión";
+$a->strings["End this session"] = "Finalizar esta sesión";
+$a->strings["Home"] = "Inicio";
+$a->strings["Your posts and conversations"] = "Sus entradas y conversaciones";
+$a->strings["Your profile page"] = "Su página del perfil";
+$a->strings["Edit Profiles"] = "Editar perfiles";
+$a->strings["Manage/Edit profiles"] = "Administrar/editar perfiles";
+$a->strings["Edit your profile"] = "Editar su perfil";
+$a->strings["Your photos"] = "Sus fotos";
+$a->strings["Your files"] = "Sus ficheros";
+$a->strings["Your chatrooms"] = "Sus salas de chat";
+$a->strings["Your bookmarks"] = "Sus marcadores";
+$a->strings["Your webpages"] = "Sus páginas web";
+$a->strings["Sign in"] = "Acceder";
+$a->strings["%s - click to logout"] = "%s - pulsar para finalizar sesión";
+$a->strings["Remote authentication"] = "Acceder desde su servidor";
+$a->strings["Click to authenticate to your home hub"] = "Pulsar para identificarse en su servidor de inicio";
+$a->strings["Home Page"] = "Página de inicio";
+$a->strings["Register"] = "Registrarse";
+$a->strings["Create an account"] = "Crear una cuenta";
+$a->strings["Help and documentation"] = "Ayuda y documentación";
+$a->strings["Applications, utilities, links, games"] = "Aplicaciones, utilidades, enlaces, juegos";
+$a->strings["Search site @name, #tag, ?docs, content"] = "Buscar en el sitio por @nombre, #etiqueta, ?ayuda o contenido";
+$a->strings["Channel Directory"] = "Directorio de canales";
+$a->strings["Your grid"] = "Mi red";
+$a->strings["Mark all grid notifications seen"] = "Marcar todas las notificaciones de la red como vistas";
+$a->strings["Channel home"] = "Mi canal";
+$a->strings["Mark all channel notifications seen"] = "Marcar todas las notificaciones del canal como leídas";
+$a->strings["Connections"] = "Conexiones";
+$a->strings["Notices"] = "Avisos";
+$a->strings["Notifications"] = "Notificaciones";
+$a->strings["See all notifications"] = "Ver todas las notificaciones";
+$a->strings["Mark all system notifications seen"] = "Marcar todas las notificaciones de sistema como leídas";
+$a->strings["Private mail"] = "Correo privado";
+$a->strings["See all private messages"] = "Ver todas los mensajes privados";
+$a->strings["Mark all private messages seen"] = "Marcar todos los mensajes privados como leídos";
+$a->strings["Event Calendar"] = "Calendario de eventos";
+$a->strings["See all events"] = "Ver todos los eventos";
+$a->strings["Mark all events seen"] = "Marcar todos los eventos como leidos";
+$a->strings["Manage Your Channels"] = "Gestionar sus canales";
+$a->strings["Account/Channel Settings"] = "Ajustes de cuenta/canales";
+$a->strings["Site Setup and Configuration"] = "Ajustes y configuración del sitio";
+$a->strings["@name, #tag, ?doc, content"] = "@nombre, #etiqueta, ?ayuda, contenido";
+$a->strings["Please wait..."] = "Espere por favor…";
+$a->strings["Directory Options"] = "Opciones del directorio";
+$a->strings["Safe Mode"] = "Modo seguro";
+$a->strings["No"] = "No";
+$a->strings["Yes"] = "Sí";
+$a->strings["Public Forums Only"] = "Solo foros públicos";
+$a->strings["This Website Only"] = "Solo este sitio web";
+$a->strings["Some blurb about what to do when you're new here"] = "Algunas propuestas para el nuevo usuario sobre qué se puede hacer aquí";
+$a->strings["Contact not found."] = "Contacto no encontrado";
+$a->strings["Friend suggestion sent."] = "Enviar sugerencia a un amigo.";
+$a->strings["Suggest Friends"] = "Sugerir amigos";
+$a->strings["Suggest a friend for %s"] = "Sugerir un amigo a %s";
 $a->strings["Public access denied."] = "Acceso público denegado.";
 $a->strings["%d rating"] = array(
 	0 => "%d valoración",
@@ -958,65 +1007,31 @@ $a->strings["Reverse Alphabetic"] = "Alfabético inverso";
 $a->strings["Newest to Oldest"] = "De más nuevo a más antiguo";
 $a->strings["Oldest to Newest"] = "De más antiguo a más nuevo";
 $a->strings["No entries (some entries may be hidden)."] = "Sin entradas (algunas entradas pueden estar ocultas).";
-$a->strings["Xchan Lookup"] = "Búsqueda de canales";
-$a->strings["Lookup xchan beginning with (or webbie): "] = "Buscar un canal (o un \"webbie\") que comience por:";
-$a->strings["Not found."] = "No encontrado.";
-$a->strings["Authorize application connection"] = "Autorizar una conexión de aplicación";
-$a->strings["Return to your app and insert this Securty Code:"] = "Volver a su aplicación e introducir este código de seguridad:";
-$a->strings["Please login to continue."] = "Por favor inicia sesión para continuar.";
-$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "¿Desea autorizar a esta aplicación a acceder a sus publicaciones y contactos, y/o crear nuevas publicaciones por usted?";
-$a->strings["Page Title"] = "Título de página";
-$a->strings["Channel added."] = "Canal añadido.";
-$a->strings["Tag removed"] = "Etiqueta eliminada.";
-$a->strings["Remove Item Tag"] = "Eliminar etiqueta del elemento.";
-$a->strings["Select a tag to remove: "] = "Seleccionar una etiqueta para eliminar:";
-$a->strings["Remove"] = "Eliminar";
-$a->strings["Continue"] = "Continuar";
-$a->strings["Premium Channel Setup"] = "Configuración del canal premium";
-$a->strings["Enable premium channel connection restrictions"] = "Habilitar restricciones de conexión del canal premium";
-$a->strings["Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc."] = "Por favor introduzca sus restricciones o condiciones, como recibo paypal, normas de uso, etc.";
-$a->strings["This channel may require additional steps or acknowledgement of the following conditions prior to connecting:"] = "Este canal puede requerir antes de conectar unos pasos adicionales o el conocimiento de las siguientes condiciones:";
-$a->strings["Potential connections will then see the following text before proceeding:"] = "Las posibles conexiones verán por tanto el siguiente texto antes de proceder:";
-$a->strings["By continuing, I certify that I have complied with any instructions provided on this page."] = "Al continuar, certifico que he cumplido con todas las intrucciones proporcionadas en esta página.";
-$a->strings["(No specific instructions have been provided by the channel owner.)"] = "(No ha sido proporcionada ninguna instrucción específica por el propietario del canal.)";
-$a->strings["Restricted or Premium Channel"] = "Canal premium o restringido";
-$a->strings["Thing updated"] = "Elemento actualizado.";
-$a->strings["Object store: failed"] = "Guardar objeto: ha fallado";
-$a->strings["Thing added"] = "Elemento añadido";
-$a->strings["OBJ: %1\$s %2\$s %3\$s"] = "OBJ: %1\$s %2\$s %3\$s";
-$a->strings["Show Thing"] = "Mostrar elemento";
-$a->strings["item not found."] = "elemento no encontrado.";
-$a->strings["Edit Thing"] = "Editar elemento";
-$a->strings["Select a profile"] = "Seleccionar un perfil";
-$a->strings["Post an activity"] = "Publicar una actividad";
-$a->strings["Only sends to viewers of the applicable profile"] = "Sólo envíos a espectadores del perfil pertinente.";
-$a->strings["Name of thing e.g. something"] = "Nombre del elemento p. ej.:. \"algo\"";
-$a->strings["URL of thing (optional)"] = "Dirección del elemento (opcional)";
-$a->strings["URL for photo of thing (optional)"] = "Dirección para la foto o elemento (opcional)";
-$a->strings["Add Thing to your Profile"] = "Añadir elemento a su perfil";
-$a->strings["Item not available."] = "Elemento no disponible";
-$a->strings["Fetching URL returns error: %1\$s"] = "Al intentar obtener la dirección, retorna el error: %1\$s";
-$a->strings["Image uploaded but image cropping failed."] = "Imagen actualizada, pero el recorte de la imagen ha fallado. ";
-$a->strings["Image resize failed."] = "El ajuste del tamaño de la imagen ha fallado.";
-$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Recargue la página o limpie el caché del navegador si la nueva foto no se muestra inmediatamente.";
-$a->strings["Image exceeds size limit of %d"] = "La imagen supera el tamaño límite de %d";
-$a->strings["Unable to process image."] = "No ha sido posible procesar la imagen.";
-$a->strings["Photo not available."] = "Foto no disponible.";
-$a->strings["Upload File:"] = "Subir fichero:";
-$a->strings["Select a profile:"] = "Seleccionar un perfil:";
-$a->strings["Upload Profile Photo"] = "Subir foto de perfil";
-$a->strings["or"] = "o";
-$a->strings["skip this step"] = "Omitir este paso";
-$a->strings["select a photo from your photo albums"] = "Seleccione una foto de sus álbumes de fotos";
-$a->strings["Crop Image"] = "Recortar imagen";
-$a->strings["Please adjust the image cropping for optimum viewing."] = "Por favor ajuste el recorte de la imagen para una visión óptima.";
-$a->strings["Done Editing"] = "Edición completada";
-$a->strings["Image uploaded successfully."] = "Imagen subida correctamente.";
-$a->strings["Image upload failed."] = "Subida de imagen fallida.";
-$a->strings["Image size reduction [%s] failed."] = "La reducción de la imagen [%s] ha fallado.";
+$a->strings["Bookmark added"] = "Marcador añadido";
+$a->strings["My Bookmarks"] = "Mis Marcadores";
+$a->strings["My Connections Bookmarks"] = "Marcadores de mis conexiones";
+$a->strings["OpenID protocol error. No ID returned."] = "Error del protocolo OpenID. Ningún ID recibido como respuesta.";
+$a->strings["Welcome %s. Remote authentication successful."] = "Bienvenido %s. La identificación desde su servidor se ha llevado a cabo correctamente.";
 $a->strings["Invalid item."] = "Elemento no válido.";
 $a->strings["Channel not found."] = "Canal no encontrado.";
 $a->strings["Page not found."] = "Página no encontrada.";
+$a->strings["First Name"] = "Nombre";
+$a->strings["Last Name"] = "Apellido";
+$a->strings["Nickname"] = "Sobrenombre o Alias";
+$a->strings["Full Name"] = "Nombre completo";
+$a->strings["Profile Photo 16px"] = "Foto del perfil 16px";
+$a->strings["Profile Photo 32px"] = "Foto del perfil 32px";
+$a->strings["Profile Photo 48px"] = "Foto del perfil 48px";
+$a->strings["Profile Photo 64px"] = "Foto del perfil 64px";
+$a->strings["Profile Photo 80px"] = "Foto del perfil 80px";
+$a->strings["Profile Photo 128px"] = "Foto del perfil 128px";
+$a->strings["Timezone"] = "Zona horaria";
+$a->strings["Homepage URL"] = "Dirección de la página personal";
+$a->strings["Birth Year"] = "Año de nacimiento";
+$a->strings["Birth Month"] = "Mes de nacimiento";
+$a->strings["Birth Day"] = "Día de nacimiento";
+$a->strings["Birthdate"] = "Fecha de nacimiento";
+$a->strings["Gender"] = "Género";
 $a->strings["Like/Dislike"] = "Me gusta/No me gusta";
 $a->strings["This action is restricted to members."] = "Esta acción está restringida solo para miembros.";
 $a->strings["Please <a href=\"rmagic\">login with your \$Projectname ID</a> or <a href=\"register\">register as a new \$Projectname member</a> to continue."] = "Por favor, <a href=\"rmagic\">identifíquese con su \$Projectname ID</a> o <a href=\"register\">rregístrese como un nuevo \$Projectname member</a> para continuar.";
@@ -1024,125 +1039,142 @@ $a->strings["Invalid request."] = "Solicitud incorrecta.";
 $a->strings["thing"] = "elemento";
 $a->strings["Channel unavailable."] = "Canal no disponible.";
 $a->strings["Previous action reversed."] = "Acción anterior revocada.";
-$a->strings["%1\$s agrees with %2\$s's %3\$s"] = "%1\$s está de acuerdo con %3\$s de %2\$s";
-$a->strings["%1\$s doesn't agree with %2\$s's %3\$s"] = "%1\$s no está de acuerdo con %3\$s de %2\$s";
-$a->strings["%1\$s abstains from a decision on %2\$s's %3\$s"] = "%1\$s se abstiene en %3\$s de %2\$s";
-$a->strings["%1\$s is attending %2\$s's %3\$s"] = "%1\$s participará en el %3\$s de %2\$s";
-$a->strings["%1\$s is not attending %2\$s's %3\$s"] = "%1\$s no participará en el %3\$s de %2\$s";
-$a->strings["%1\$s may attend %2\$s's %3\$s"] = "%1\$s tal vez participe en el %3\$s de %2\$s";
+$a->strings["%1\$s agrees with %2\$s's %3\$s"] = "%3\$s de %2\$s: %1\$s está de acuerdo";
+$a->strings["%1\$s doesn't agree with %2\$s's %3\$s"] = "%3\$s de %2\$s: %1\$s no está de acuerdo";
+$a->strings["%1\$s abstains from a decision on %2\$s's %3\$s"] = "%3\$s de %2\$s: %1\$s se abstiene";
+$a->strings["%1\$s is attending %2\$s's %3\$s"] = "%3\$s de %2\$s: %1\$s participa";
+$a->strings["%1\$s is not attending %2\$s's %3\$s"] = "%3\$s de %2\$s: %1\$s no participa";
+$a->strings["%1\$s may attend %2\$s's %3\$s"] = "%3\$s de %2\$s: %1\$s quizá participe";
 $a->strings["Action completed."] = "Acción completada.";
 $a->strings["Thank you."] = "Gracias.";
-$a->strings["Calendar entries imported."] = "Entradas de calendario importadas.";
-$a->strings["No calendar entries found."] = "No encontradas entradas de calendario.";
-$a->strings["Event can not end before it has started."] = "Un evento no puede terminar antes de que haya comenzado.";
-$a->strings["Unable to generate preview."] = "No se puede crear la vista previa.";
-$a->strings["Event title and start time are required."] = "Se requieren el título del evento y su hora de inicio.";
-$a->strings["Event not found."] = "Evento no encontrado.";
-$a->strings["l, F j"] = "l j F";
-$a->strings["Edit event"] = "Editar evento";
-$a->strings["Delete event"] = "Borrar evento";
-$a->strings["calendar"] = "calendario";
-$a->strings["Create New Event"] = "Crear Nuevo Evento";
-$a->strings["Previous"] = "Anterior";
-$a->strings["Next"] = "Siguiente";
-$a->strings["Export"] = "Exportar";
-$a->strings["Import"] = "Importar";
-$a->strings["Event removed"] = "Evento borrado";
-$a->strings["Failed to remove event"] = "Error al borrar el evento";
-$a->strings["Event details"] = "Detalles del evento";
-$a->strings["Starting date and Title are required."] = "Se requieren fecha y título.";
-$a->strings["Categories (comma-separated list)"] = "Categorías (lista separada por comas)";
-$a->strings["Event Starts:"] = "Inicio del evento:";
-$a->strings["Finish date/time is not known or not relevant"] = "La fecha / hora de finalización no se conocen o no son relevantes";
-$a->strings["Event Finishes:"] = "Finalización del evento:";
-$a->strings["Adjust for viewer timezone"] = "Ajustar para obtener el visor de zona horaria";
-$a->strings["Important for events that happen in a particular place. Not practical for global holidays."] = "Importante para los eventos que suceden en un lugar determinado. No es práctico para los globales.";
-$a->strings["Title:"] = "Título:";
-$a->strings["Share this event"] = "Compartir este evento";
-$a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s está siguiendo %2\$s de %3\$s";
-$a->strings["Public Sites"] = "Sitios públicos";
-$a->strings["The listed sites allow public registration for the \$Projectname network. All sites in the network are interlinked so membership on any of them conveys membership in the network as a whole. Some sites may require subscription or provide tiered service plans. The provider links <strong>may</strong> provide additional details."] = "Los sitios listados permiten el registro público de la red \$Projectname. Todos los sitios de la red están vinculados entre sí por lo que sus miembros, en ninguna de ellos, indican la pertenencia a la red en su conjunto. Algunos sitios pueden requerir suscripción o proporcionar planes de servicio por niveles. Los enlaces de los proveedores <strong> pueden </strong> proporcionar detalles adicionales.";
-$a->strings["Rate this hub"] = "Valorar este sitio";
-$a->strings["Site URL"] = "Dirección del sitio";
-$a->strings["Access Type"] = "Tipo de Acceso";
-$a->strings["Registration Policy"] = "Normas de Registro";
-$a->strings["Location"] = "Localización";
-$a->strings["View hub ratings"] = "Ver las valoraciones del sitio";
-$a->strings["Rate"] = "Valorar";
-$a->strings["View ratings"] = "Ver valoraciones";
-$a->strings["Edit post"] = "Editar entrada";
-$a->strings["\$Projectname channel"] = "canal \$Projectname";
-$a->strings["Collection created."] = "Colección creada.";
-$a->strings["Could not create collection."] = "No se puede crear colección.";
-$a->strings["Collection updated."] = "Colección actualizada.";
-$a->strings["Create a collection of channels."] = "Crear una colección de canales.";
-$a->strings["Collection Name: "] = "Nombre de la colección:";
-$a->strings["Members are visible to other channels"] = "Los miembros son visibles para otros canales";
-$a->strings["Collection removed."] = "Colección eliminada.";
-$a->strings["Unable to remove collection."] = "No ha sido posible de eliminar la colección.";
-$a->strings["Collection Editor"] = "Editor de colecciones";
-$a->strings["Members"] = "Miembros";
-$a->strings["All Connected Channels"] = "Todos los canales conectados";
-$a->strings["Click on a channel to add or remove."] = "Haga clic en un canal para agregarlo o quitarlo.";
-$a->strings["Version %s"] = "Versión %s";
-$a->strings["Installed plugins/addons/apps:"] = "Extensiones/Aplicaciones instaladas:";
-$a->strings["No installed plugins/addons/apps"] = "Extensiones/Aplicaciones no instaladas:";
-$a->strings["\$Projectname"] = "\$Projectname";
-$a->strings["This is a hub of \$Projectname - a global cooperative network of decentralized privacy enhanced websites."] = "Este es un sitio integrado en \$Projectname - una red cooperativa mundial de sitios web descentralizados de privacidad mejorada.";
-$a->strings["Tag: "] = "Etiqueta:";
-$a->strings["Last background fetch: "] = "Última actualización en segundo plano:";
-$a->strings["Running at web location"] = "Corriendo en el sitio web";
-$a->strings["Please visit <a href=\"https://redmatrix.me\">redmatrix.me</a> to learn more about \$Projectname."] = "Por favor, visite <a href=\"https://redmatrix.me\">redmatrix.me </a> para aprender más sobre \$Projectname.";
-$a->strings["Bug reports and issues: please visit"] = "Informes de errores e incidencias: por, favor visite";
-$a->strings["\$projectname issues"] = "Problemas en \$projectname";
-$a->strings["Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"] = "Sugerencias, elogios, etc - por favor, un correo electrónico a \"redmatrix\" en librelist - punto com";
-$a->strings["Site Administrators"] = "Administradores del sitio";
-$a->strings["Unable to locate original post."] = "No ha sido posible encontrar la entrada original.";
-$a->strings["Empty post discarded."] = "Desechada entrada vacía.";
-$a->strings["Executable content type not permitted to this channel."] = "Contenido de tipo ejecutable no permitido en este canal.";
-$a->strings["System error. Post not saved."] = "Error del sistema. Entrada no salvada.";
-$a->strings["Unable to obtain post information from database."] = "No ha sido posible obtener información de la entrada en la base de datos.";
-$a->strings["You have reached your limit of %1$.0f top level posts."] = "Ha alcanzado su límite de %1$.0f tope máximo de entradas";
-$a->strings["You have reached your limit of %1$.0f webpages."] = "Ha alcanzado su límite de %1$.0f páginas web.";
-$a->strings["No such group"] = "No se encuentra el grupo";
-$a->strings["No such channel"] = "No se encuentra el  canal";
-$a->strings["Search Results For:"] = "Buscar resultados para:";
-$a->strings["Collection is empty"] = "La colección está vacía";
-$a->strings["Collection: "] = "Colección:";
-$a->strings["Connection: "] = "Conexión:";
-$a->strings["Invalid connection."] = "Conexión no válida.";
+$a->strings["Export Channel"] = "Exportar el canal";
+$a->strings["Export your basic channel information to a file.  This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new server hub, but does not contain your content."] = "Exportar la información básica del canal a un fichero. Este equivale a una copia de seguridad de sus conexiones, el perfil y datos fundamentales, que puede usarse para importar sus datos a un nuevo servidor, pero no incluye su contenido.";
+$a->strings["Export Content"] = "Exportar contenidos";
+$a->strings["Export your channel information and recent content to a JSON backup that can be restored or imported to another server hub. This backs up all of your connections, permissions, profile data and several months of posts. This file may be VERY large.  Please be patient - it may take several minutes for this download to begin."] = "Exportar la información sobre su canal y el contenido reciente a un fichero de respaldo JSON, que puede ser restaurado o importado a otro servidor. Este fichero incluye todas sus conexiones, permisos, datos del perfil y publicaciones de varios meses. Puede llegar a ser MUY grande. Por favor, sea paciente, la descarga puede tardar varios minutos en comenzar.";
+$a->strings["Export your posts from a given year."] = "Exporta sus entradas de un año dado.";
+$a->strings["You may also export your posts and conversations for a particular year or month. Adjust the date in your browser location bar to select other dates. If the export fails (possibly due to memory exhaustion on your server hub), please try again selecting a more limited date range."] = "También puede exportar sus mensajes y conversaciones durante un año o mes en particular. Ajuste la fecha en la barra de direcciones del navegador para seleccionar otras fechas. Si la exportación falla (posiblemente debido al agotamiento de la memoria del servidor hub), por favor, intente de nuevo la selección de un rango de fechas más pequeño.";
+$a->strings["To select all posts for a given year, such as this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "Para seleccionar todos los mensajes de un año determinado, como este año, visite <a href=\"%1\$s\">%2\$s</a>";
+$a->strings["To select all posts for a given month, such as January of this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "Para seleccionar todos los mensajes de un mes determinado, como el de enero de este año, visite <a href=\"%1\$s\">%2\$s</a>";
+$a->strings["These content files may be imported or restored by visiting <a href=\"%1\$s\">%2\$s</a> on any site containing your channel. For best results please import or restore these in date order (oldest first)."] = "Estos ficheros pueden ser importados o restaurados visitando <a href=\"%1\$s\">%2\$s</a> o cualquier sitio que contenga su canal. Para obtener los mejores resultados, por favor, importar o restaurar estos ficheros en orden de fecha (la más antigua primero).";
+$a->strings["Away"] = "Ausente";
+$a->strings["Online"] = "Conectado/a";
+$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s ha etiquetado la %3\$s de %2\$s con %4\$s";
 $a->strings["No channel."] = "Ningún canal.";
 $a->strings["Common connections"] = "Conexiones comunes";
 $a->strings["No connections in common."] = "Ninguna  conexión en común.";
-$a->strings["This site is not a directory server"] = "Este sitio no es un servidor de directorio";
-$a->strings["Blocked"] = "Bloqueadas";
-$a->strings["Ignored"] = "Ignoradas";
-$a->strings["Hidden"] = "Ocultas";
-$a->strings["Archived"] = "Archivadas";
-$a->strings["Suggest new connections"] = "Sugerir nuevas conexiones";
-$a->strings["New Connections"] = "Nuevas conexiones";
-$a->strings["Show pending (new) connections"] = "Mostrar conexiones (nuevas) pendientes";
-$a->strings["All Connections"] = "Todas las conexiones";
-$a->strings["Show all connections"] = "Mostrar todas las conexiones";
-$a->strings["Unblocked"] = "Desbloqueadas";
-$a->strings["Only show unblocked connections"] = "Mostrar solo las conexiones desbloqueadas";
-$a->strings["Only show blocked connections"] = "Mostrar solo las conexiones bloqueadas";
-$a->strings["Only show ignored connections"] = "Mostrar solo conexiones ignoradas";
-$a->strings["Only show archived connections"] = "Mostrar solo las conexiones archivadas";
-$a->strings["Only show hidden connections"] = "Mostrar solo las conexiones ocultas";
-$a->strings["%1\$s [%2\$s]"] = "%1\$s [%2\$s]";
-$a->strings["Edit connection"] = "Editar conexión";
-$a->strings["Search your connections"] = "Buscar sus conexiones";
-$a->strings["Finding: "] = "Búsqueda:";
-$a->strings["Block Name"] = "Nombre del bloque";
-$a->strings["Block Title"] = "Título del bloque";
-$a->strings["Item not found"] = "Elemento no encontrado";
-$a->strings["Item is not editable"] = "El elemento no es editable";
-$a->strings["Delete item?"] = "¿Borrar el elemento?";
-$a->strings["Insert YouTube video"] = "Insertar vídeo de YouTube";
-$a->strings["Insert Vorbis [.ogg] video"] = "Insertar vídeo Vorbis [.ogg]";
-$a->strings["Insert Vorbis [.ogg] audio"] = "Insertar audio Vorbis [.ogg]";
-$a->strings["\$Projectname - Guests: Username: {your email address}, Password: +++"] = "\$Projectname - Invitados: Nombre de usuario: {su dirección de correo electrónico}, Contraseña: +++";
+$a->strings["sent you a private message"] = "le ha enviado un mensaje privado";
+$a->strings["added your channel"] = "añadió este canal a sus conexiones";
+$a->strings["posted an event"] = "publicó un evento";
+$a->strings["Documentation Search"] = "Búsqueda de Documentación";
+$a->strings["Help:"] = "Ayuda:";
+$a->strings["Not Found"] = "No encontrado";
+$a->strings["\$Projectname Documentation"] = "Documentación de \$Projectname";
+$a->strings["Channel removals are not allowed within 48 hours of changing the account password."] = "La eliminación de canales no está permitida hasta pasadas 48 horas desde el último cambio de contraseña.";
+$a->strings["Remove This Channel"] = "Eliminar este canal";
+$a->strings["WARNING: "] = "ATENCIÓN:";
+$a->strings["This channel will be completely removed from the network. "] = "Este canal va a ser completamente eliminado de la red.";
+$a->strings["This action is permanent and can not be undone!"] = "¡Esta acción tiene carácter definitivo y no se puede deshacer!";
+$a->strings["Please enter your password for verification:"] = "Por favor, introduzca su contraseña para su verificación:";
+$a->strings["Remove this channel and all its clones from the network"] = "Eliminar este canal y todos sus clones de la red";
+$a->strings["By default only the instance of the channel located on this hub will be removed from the network"] = "Por defecto, solo la instancia del canal alojado en este servidor será eliminado de la red";
+$a->strings["Remove Channel"] = "Eliminar el canal";
+$a->strings["- select -"] = "- seleccionar -";
+$a->strings["Menu not found."] = "Menú no encontrado";
+$a->strings["Unable to create element."] = "Imposible crear el elemento.";
+$a->strings["Unable to update menu element."] = "No es posible actualizar el elemento del menú.";
+$a->strings["Unable to add menu element."] = "No es posible añadir el elemento al menú";
+$a->strings["Not found."] = "No encontrado.";
+$a->strings["Menu Item Permissions"] = "Permisos del elemento del menú";
+$a->strings["(click to open/close)"] = "(pulsar para abrir o cerrar)";
+$a->strings["Link Name"] = "Nombre del enlace";
+$a->strings["Link or Submenu Target"] = "Destino del enlace o submenú";
+$a->strings["Enter URL of the link or select a menu name to create a submenu"] = "Introducir la dirección del enlace o seleccionar el nombre de un submenú";
+$a->strings["Use magic-auth if available"] = "Usar la autenticación mágica si está disponible";
+$a->strings["Open link in new window"] = "Abrir el enlace en una nueva ventana";
+$a->strings["Order in list"] = "Orden en la lista";
+$a->strings["Higher numbers will sink to bottom of listing"] = "Los números más altos irán al final de la lista";
+$a->strings["Submit and finish"] = "Enviar y terminar";
+$a->strings["Submit and continue"] = "Enviar y continuar";
+$a->strings["Menu:"] = "Menú:";
+$a->strings["Link Target"] = "Destino del enlace";
+$a->strings["Edit menu"] = "Editar menú";
+$a->strings["Edit element"] = "Editar el elemento";
+$a->strings["Drop element"] = "Eliminar el elemento";
+$a->strings["New element"] = "Nuevo elemento";
+$a->strings["Edit this menu container"] = "Modificar el contenedor del menú";
+$a->strings["Add menu element"] = "Añadir un elemento al menú";
+$a->strings["Delete this menu item"] = "Eliminar este elemento del menú";
+$a->strings["Edit this menu item"] = "Modificar este elemento del menú";
+$a->strings["Menu item not found."] = "Este elemento del menú no se ha encontrado";
+$a->strings["Menu item deleted."] = "Este elemento del menú ha sido borrado";
+$a->strings["Menu item could not be deleted."] = "Este elemento del menú no puede ser borrado.";
+$a->strings["Edit Menu Element"] = "Editar elemento del menú";
+$a->strings["Link text"] = "Texto del enlace";
+$a->strings["Could not access contact record."] = "No se ha podido acceder al registro de contacto.";
+$a->strings["Could not locate selected profile."] = "No se ha podido localizar el perfil seleccionado.";
+$a->strings["Connection updated."] = "Conexión actualizada.";
+$a->strings["Failed to update connection record."] = "Error al actualizar el registro de la conexión.";
+$a->strings["is now connected to"] = "ahora está conectado/a";
+$a->strings["Could not access address book record."] = "No se pudo acceder a la entrada en su libreta de direcciones.";
+$a->strings["Refresh failed - channel is currently unavailable."] = "Recarga fallida - no se puede encontrar el canal en este momento.";
+$a->strings["Unable to set address book parameters."] = "No ha sido posible establecer los parámetros de la libreta de direcciones.";
+$a->strings["Connection has been removed."] = "La conexión ha sido eliminada.";
+$a->strings["View %s's profile"] = "Ver el perfil de %s";
+$a->strings["Refresh Permissions"] = "Recargar los permisos";
+$a->strings["Fetch updated permissions"] = "Obtener los permisos actualizados";
+$a->strings["Recent Activity"] = "Actividad reciente";
+$a->strings["View recent posts and comments"] = "Ver publicaciones y comentarios recientes";
+$a->strings["Unblock"] = "Desbloquear";
+$a->strings["Block"] = "Bloquear";
+$a->strings["Block (or Unblock) all communications with this connection"] = "Bloquear (o desbloquear) todas las comunicaciones con esta conexión";
+$a->strings["This connection is blocked!"] = "¡Esta conexión está bloqueada!";
+$a->strings["Unignore"] = "Dejar de ignorar";
+$a->strings["Ignore"] = "Ignorar";
+$a->strings["Ignore (or Unignore) all inbound communications from this connection"] = "Ignorar (o dejar de ignorar) todas las comunicaciones entrantes de esta conexión";
+$a->strings["This connection is ignored!"] = "¡Esta conexión es ignorada!";
+$a->strings["Unarchive"] = "Desarchivar";
+$a->strings["Archive"] = "Archivar";
+$a->strings["Archive (or Unarchive) this connection - mark channel dead but keep content"] = "Archiva (o desarchiva) esta conexión - marca el canal como muerto aunque mantiene sus contenidos";
+$a->strings["This connection is archived!"] = "¡Esta conexión esta archivada!";
+$a->strings["Unhide"] = "Mostrar";
+$a->strings["Hide"] = "Ocultar";
+$a->strings["Hide or Unhide this connection from your other connections"] = "Ocultar o mostrar esta conexión a sus otras conexiones";
+$a->strings["This connection is hidden!"] = "¡Esta conexión está oculta!";
+$a->strings["Delete this connection"] = "Eliminar esta conexión";
+$a->strings["Approve this connection"] = "Aprobar esta conexión";
+$a->strings["Accept connection to allow communication"] = "Aceptar la conexión para permitir la comunicación";
+$a->strings["Set Affinity"] = "Ajustar la afinidad";
+$a->strings["Set Profile"] = "Ajustar el perfil";
+$a->strings["Set Affinity & Profile"] = "Ajustar la afinidad y el perfil";
+$a->strings["Apply these permissions automatically"] = "Aplicar estos permisos automaticamente";
+$a->strings["This connection's address is"] = "La dirección de esta conexión es";
+$a->strings["The permissions indicated on this page will be applied to all new connections."] = "Los permisos indicados en esta página serán aplicados en todas las nuevas conexiones.";
+$a->strings["Slide to adjust your degree of friendship"] = "Deslizar para ajustar el grado de amistad";
+$a->strings["Slide to adjust your rating"] = "Deslizar para ajustar su valoración";
+$a->strings["Optionally explain your rating"] = "Opcionalmente, puede explicar su valoración";
+$a->strings["Custom Filter"] = "Filtro personalizado";
+$a->strings["Only import posts with this text"] = "Importar solo entradas que contengan este texto";
+$a->strings["words one per line or #tags or /patterns/, leave blank to import all posts"] = "palabras, una por línea, o #etiquetas o /patrones/, dejar en blanco para importar todas las entradas";
+$a->strings["Do not import posts with this text"] = "No importar entradas que contengan este texto";
+$a->strings["This information is public!"] = "¡Esta información es pública!";
+$a->strings["Connection Pending Approval"] = "Conexión pendiente de aprobación";
+$a->strings["Connection Request"] = "Solicitud de conexión";
+$a->strings["(%s) would like to connect with you. Please approve this connection to allow communication."] = "(%s) desearía conectar con usted. por favor, apruebe esta conexión para permitir la comunicación.";
+$a->strings["Approve"] = "Aprobar";
+$a->strings["Approve Later"] = "Aprobar más tarde";
+$a->strings["inherited"] = "heredado";
+$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Por favor, escoja el perfil que quiere mostrar a %s cuando esté viendo su perfil de forma segura.";
+$a->strings["Their Settings"] = "Sus ajustes";
+$a->strings["My Settings"] = "Mis ajustes";
+$a->strings["Individual Permissions"] = "Permisos individuales";
+$a->strings["Some permissions may be inherited from your channel's <a href=\"settings\"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can <strong>not</strong> change those settings here."] = "Algunos permisos pueden ser heredados de los <a href=\"settings\"><strong>ajustes de privacidad</strong></a> de sus canales, los cuales tienen una prioridad más alta que los ajustes individuales. <strong>No</strong> puede cambiar estos ajustes aquí.";
+$a->strings["Some permissions may be inherited from your channel's <a href=\"settings\"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can change those settings here but they wont have any impact unless the inherited setting changes."] = "Algunos permisos pueden ser heredados de los <a href=\"settings\"><strong>ajustes de privacidad</strong></a> de sus canales, los cuales tienen una prioridad más alta que los ajustes individuales. Puede cambiar estos ajustes aquí, pero no tendrán ningún consecuencia hasta que cambie los ajustes heredados.";
+$a->strings["Last update:"] = "Última actualización:";
+$a->strings["Set your current mood and tell your friends"] = "Describir su estado de ánimo para comunicárselo a sus amigos";
+$a->strings["Hub not found."] = "Servidor no encontrado";
+$a->strings["This setting requires special processing and editing has been blocked."] = "Este ajuste necesita de un proceso especial y la edición ha sido bloqueada.";
+$a->strings["Configuration Editor"] = "Editor de configuración";
+$a->strings["Warning: Changing some settings could render your channel inoperable. Please leave this page unless you are comfortable with and knowledgeable about how to correctly use this feature."] = "Atención: El cambio de algunos ajustes puede volver inutilizable su canal. Por favor, abandone la página excepto que esté seguro y sepa cómo usar correctamente esta característica.";
 $a->strings["Page owner information could not be retrieved."] = "La información del propietario de la página no pudo ser recuperada.";
 $a->strings["Album not found."] = "Álbum no encontrado.";
 $a->strings["Delete Album"] = "Borrar álbum";
@@ -1152,8 +1184,8 @@ $a->strings["Access to this item is restricted."] = "El acceso a este elemento e
 $a->strings["%1$.2f MB of %2$.2f MB photo storage used."] = "%1$.2f MB de %2$.2f MB de almacenamiento de fotos utilizado.";
 $a->strings["%1$.2f MB photo storage used."] = "%1$.2f MB de almacenamiento de fotos utilizado.";
 $a->strings["Upload Photos"] = "Subir fotos";
-$a->strings["Enter a new album name"] = "Introducir un nuevo nombre de álbum";
-$a->strings["or select an existing one (doubleclick)"] = "o seleccionar uno (doble click) existente";
+$a->strings["Enter an album name"] = "Introducir un nombre de álbum";
+$a->strings["or select an existing album (doubleclick)"] = "o seleccionar uno existente (doble click)";
 $a->strings["Create a status post for this upload"] = "Crear una entrada de estado para esta subida";
 $a->strings["Album name could not be decoded"] = "El nombre del álbum no ha podido ser descifrado";
 $a->strings["Contact Photos"] = "Fotos de contacto";
@@ -1163,197 +1195,25 @@ $a->strings["View Photo"] = "Ver foto";
 $a->strings["Edit Album"] = "Editar álbum";
 $a->strings["Permission denied. Access to this item may be restricted."] = "Permiso denegado. El acceso a este elemento puede estar restringido.";
 $a->strings["Photo not available"] = "Foto no disponible";
-$a->strings["Use as profile photo"] = "Usar como foto de perfil";
+$a->strings["Use as profile photo"] = "Usar como foto del perfil";
 $a->strings["Private Photo"] = "Foto privada";
+$a->strings["Previous"] = "Anterior";
 $a->strings["View Full Size"] = "Ver tamaño completo";
+$a->strings["Next"] = "Siguiente";
+$a->strings["Remove"] = "Eliminar";
 $a->strings["Edit photo"] = "Editar foto";
 $a->strings["Rotate CW (right)"] = "Girar CW (a la derecha)";
 $a->strings["Rotate CCW (left)"] = "Girar CCW (a la izquierda)";
+$a->strings["Enter a new album name"] = "Introducir un nuevo nombre de álbum";
+$a->strings["or select an existing one (doubleclick)"] = "o seleccionar uno (doble click) existente";
 $a->strings["Caption"] = "Título";
 $a->strings["Add a Tag"] = "Añadir una etiqueta";
-$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com"] = "Ejemplo: @bob, @Barbara_Gómez, @juan@ejemplo.com";
+$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com"] = "Ejemplos: @eva, @Carmen_Osuna, @jaime@ejemplo.com";
 $a->strings["Flag as adult in album view"] = "Marcar como \"solo para adultos\" en el álbum";
 $a->strings["In This Photo:"] = "En esta foto:";
 $a->strings["Map"] = "Mapa";
 $a->strings["View Album"] = "Ver álbum";
 $a->strings["Recent Photos"] = "Fotos recientes";
-$a->strings["Items tagged with: %s"] = "elementos etiquetados con: %s";
-$a->strings["Search results for: %s"] = "Resultados de la búsqueda para: %s";
-$a->strings["Profile Match"] = "Perfil compatible";
-$a->strings["No keywords to match. Please add keywords to your default profile."] = "No hay palabras clave en el perfil principal para poder encontrar perfiles compatibles. Por favor, añada palabras clave a su perfil principal.";
-$a->strings["is interested in:"] = "está interesado en:";
-$a->strings["No matches"] = "No se han encontrado perfiles compatibles";
-$a->strings["Away"] = "Ausente";
-$a->strings["Online"] = "Conectado";
-$a->strings["Select a bookmark folder"] = "Seleccionar una carpeta de marcadores";
-$a->strings["Save Bookmark"] = "Guardar marcador";
-$a->strings["URL of bookmark"] = "Dirección del marcador";
-$a->strings["Description"] = "Descripción";
-$a->strings["Or enter new bookmark folder name"] = "O introduzca un nuevo nombre para la carpeta de marcadores";
-$a->strings["No more system notifications."] = "No hay más notificaciones del sistema";
-$a->strings["System Notifications"] = "Notificaciones de sistema";
-$a->strings["network"] = "red";
-$a->strings["RSS"] = "RSS";
-$a->strings["Layout updated."] = "Formato actualizado";
-$a->strings["Edit System Page Description"] = "Editor del Sistema de Descripción de Páginas";
-$a->strings["Layout not found."] = "Formato no encontrado";
-$a->strings["Module Name:"] = "Nombre del módulo:";
-$a->strings["Layout Help"] = "Ayuda para el diseño de la página";
-$a->strings["- select -"] = "- seleccionar -";
-$a->strings["Your service plan only allows %d channels."] = "Su paquete de servicios solo permite %d canales.";
-$a->strings["Nothing to import."] = "No hay nada para importar.";
-$a->strings["Unable to download data from old server"] = "No se han podido descargar datos de su antiguo servidor";
-$a->strings["Imported file is empty."] = "El fichero importado está vacío.";
-$a->strings["The data provided is not compatible with this project."] = "Los datos proporcionados no son compatibles con este proyecto.";
-$a->strings["Warning: Database versions differ by %1\$d updates."] = "Atención: Las versiones de la base de datos difieren en %1\$d actualizaciones.";
-$a->strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "No se ha podido crear el canal porque el identificador del canal no se ha podido duplicar en este servidor.";
-$a->strings["Channel clone failed. Import failed."] = "No se ha podido importar el canal porque el canal no se ha podido clonar.";
-$a->strings["Cloned channel not found. Import failed."] = "No se ha podido importar el canal porque el canal clonado no se ha encontrado.";
-$a->strings["You must be logged in to use this feature."] = "Debe estar registrado para poder usar esta funcionalidad.";
-$a->strings["Import Channel"] = "Importar canal";
-$a->strings["Use this form to import an existing channel from a different server/hub. You may retrieve the channel identity from the old server/hub via the network or provide an export file."] = "Emplee este formulario para importar un canal desde un servidor/hub diferente. Puede recuperar el canal desde el antiguo servidor/hub a través de la red o proporcionando un fichero de exportación.";
-$a->strings["File to Upload"] = "Fichero para subir";
-$a->strings["Or provide the old server/hub details"] = "O proporcione los detalles de su antiguo servidor/hub";
-$a->strings["Your old identity address (xyz@example.com)"] = "Su identidad en el antiguo servidor  (canal@ejemplo.com)";
-$a->strings["Your old login email address"] = "Su antigua dirección de correo electrónico";
-$a->strings["Your old login password"] = "Su antigua contraseña";
-$a->strings["For either option, please choose whether to make this hub your new primary address, or whether your old location should continue this role. You will be able to post from either location, but only one can be marked as the primary location for files, photos, and media."] = "Para cualquiera de las opciones, elija si hacer de este servidor su nueva dirección primaria, o si su antigua ubicación debe continuar con este papel. Usted podrá publicar desde cualquier ubicación, pero sólo una puede estar marcada como la ubicación principal para los ficheros, fotos y otras imágenes o vídeos.";
-$a->strings["Make this hub my primary location"] = "Convertir este servidor en mi ubicación primaria";
-$a->strings["Import existing posts if possible (experimental - limited by available memory"] = "Importar el contenido publicado si es posible (experimental - limitado por la memoria disponible";
-$a->strings["This process may take several minutes to complete. Please submit the form only once and leave this page open until finished."] = "Este proceso puede tardar varios minutos en completarse. Por favor envíe el formulario una sola vez y mantenga esta página abierta hasta que termine.";
-$a->strings["Delete layout?"] = "¿Borrar formato?";
-$a->strings["Layout Description (Optional)"] = "Descripción del formato gráfico (opcional)";
-$a->strings["Layout Name"] = "Nombre del formato";
-$a->strings["Edit Layout"] = "Modificar formato";
-$a->strings["You must be logged in to see this page."] = "Debe haber iniciado sesión para poder ver esta página.";
-$a->strings["Room not found"] = "Sala no encontrada";
-$a->strings["Leave Room"] = "Abandonar sala";
-$a->strings["Delete This Room"] = "Eliminar esta sala";
-$a->strings["I am away right now"] = "Estoy ausente momentáneamente";
-$a->strings["I am online"] = "Estoy conectado";
-$a->strings["Bookmark this room"] = "Añadir esta sala a Marcadores";
-$a->strings["New Chatroom"] = "Nueva sala de chat";
-$a->strings["Chatroom Name"] = "Nombre de sala de chat";
-$a->strings["%1\$s's Chatrooms"] = "Sala de chat de %1\$s";
-$a->strings["Menu not found."] = "Menú no encontrado";
-$a->strings["Unable to create element."] = "Imposible crear el elemento.";
-$a->strings["Unable to update menu element."] = "No es posible actualizar el elemento del menú.";
-$a->strings["Unable to add menu element."] = "No es posible añadir el elemento al menú";
-$a->strings["Menu Item Permissions"] = "Permisos del elemento del menú";
-$a->strings["(click to open/close)"] = "(pulse para abrir/cerrar)";
-$a->strings["Link Name"] = "Nombre del enlace";
-$a->strings["Link or Submenu Target"] = "Destino del enlace o submenú";
-$a->strings["Enter URL of the link or select a menu name to create a submenu"] = "Introduzca la dirección del enlace o seleccione el nombre de un submenú";
-$a->strings["Use magic-auth if available"] = "Use la autenticación mágica si está disponible";
-$a->strings["Open link in new window"] = "Abrir el enlace en una nueva ventana";
-$a->strings["Order in list"] = "Orden en la lista";
-$a->strings["Higher numbers will sink to bottom of listing"] = "Los números más altos irán al final de la lista";
-$a->strings["Submit and finish"] = "Enviar y terminar";
-$a->strings["Submit and continue"] = "Enviar y continuar";
-$a->strings["Menu:"] = "Menú:";
-$a->strings["Link Target"] = "Destino del enlace";
-$a->strings["Edit menu"] = "Editar menú";
-$a->strings["Edit element"] = "Editar elemento";
-$a->strings["Drop element"] = "Eliminar el elemento";
-$a->strings["New element"] = "Nuevo elemento";
-$a->strings["Edit this menu container"] = "Modificar el contenedor del menú";
-$a->strings["Add menu element"] = "Añadir un elemento al menú";
-$a->strings["Delete this menu item"] = "Eliminar este elemento del menú";
-$a->strings["Edit this menu item"] = "Modificar este elemento del menú";
-$a->strings["Menu item not found."] = "Este elemento del menú no se ha encontrado";
-$a->strings["Menu item deleted."] = "Este elemento del menú ha sido borrado";
-$a->strings["Menu item could not be deleted."] = "Este elemento del menú no puede ser borrado.";
-$a->strings["Edit Menu Element"] = "Editar elemento del menú";
-$a->strings["Link text"] = "Texto del enlace";
-$a->strings["Delete webpage?"] = "¿Eliminar página web?";
-$a->strings["Page link title"] = "Título del enlace de la página";
-$a->strings["Edit Webpage"] = "Editar página web";
-$a->strings["This directory server requires an access token"] = "El servidor de este directorio necesita un \"token\" de acceso";
-$a->strings["No valid account found."] = "No se ha encontrado una cuenta válida.";
-$a->strings["Password reset request issued. Check your email."] = "Se ha recibido una solicitud de restablecimiento de contraseña. Consulte su correo electrónico.";
-$a->strings["Site Member (%s)"] = "Usuario del sitio (%s)";
-$a->strings["Password reset requested at %s"] = "Se ha solicitado restablecer la contraseña en %s";
-$a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "La solicitud no ha podido ser verificada. (Puede que la haya enviado con anterioridad) El restablecimiento de la contraseña ha fallado.";
-$a->strings["Password Reset"] = "Restablecer la contraseña";
-$a->strings["Your password has been reset as requested."] = "Su contraseña ha sido restablecida según lo solicitó.";
-$a->strings["Your new password is"] = "Su nueva contraseña es";
-$a->strings["Save or copy your new password - and then"] = "Guarde o copie su nueva contraseña - y después";
-$a->strings["click here to login"] = "Pulse aquí para conectarse";
-$a->strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "Puede cambiar la contraseña en la página <em>Ajustes</em> una vez iniciada la sesión.";
-$a->strings["Your password has changed at %s"] = "Su contraseña en %s ha sido cambiada";
-$a->strings["Forgot your Password?"] = "¿Ha olvidado su contraseña?";
-$a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Introduzca y envíe su dirección de correo electrónico para el restablecimiento de su contraseña. Luego revise su correo para obtener más instrucciones.";
-$a->strings["Email Address"] = "Dirección de correo electrónico";
-$a->strings["Reset"] = "Reiniciar";
-$a->strings["Website:"] = "Sitio web:";
-$a->strings["Remote Channel [%s] (not yet known on this site)"] = "Canal remoto [%s] (aún no es conocido en este sitio)";
-$a->strings["Rating (this information is public)"] = "Valoración (esta información es pública)";
-$a->strings["Optionally explain your rating (this information is public)"] = "Opcionalmente puede explicar su valoración (esta información es pública)";
-$a->strings["Delete block?"] = "¿Borrar este bloque?";
-$a->strings["Edit Block"] = "Modificar este bloque";
-$a->strings["Total invitation limit exceeded."] = "Se ha superado el límite máximo de invitaciones.";
-$a->strings["%s : Not a valid email address."] = "%s : No es una dirección de correo electrónico válida. ";
-$a->strings["Please join us on Red"] = "Únase a nosotros en RedMatrix";
-$a->strings["Invitation limit exceeded. Please contact your site administrator."] = "Excedido el límite de invitaciones. Por favor, contacte con el Administrador de su sitio.";
-$a->strings["%s : Message delivery failed."] = "%s : Falló la entrega del mensaje.";
-$a->strings["%d message sent."] = array(
-	0 => "%d mensajes enviados.",
-	1 => "%d mensajes enviados.",
-);
-$a->strings["You have no more invitations available"] = "No tiene más invitaciones disponibles";
-$a->strings["Send invitations"] = "Enviar invitaciones";
-$a->strings["Enter email addresses, one per line:"] = "Introduzca las direcciones de correo electrónica, una por línea:";
-$a->strings["Your message:"] = "Su mensaje:";
-$a->strings["Please join my community on \$Projectname."] = "Por favor, únase a mi comunidad en \$Projectname.";
-$a->strings["You will need to supply this invitation code: "] = "Debe proporcionar este código de invitación:";
-$a->strings["1. Register at any \$Projectname location (they are all inter-connected)"] = "1. Regístrese en cualquier lugar del \$Projectname (están todos interconectados)";
-$a->strings["2. Enter my \$Projectname network address into the site searchbar."] = "2. Introduzca mi dirección \$Projectname en la caja de búsqueda del sitio.";
-$a->strings["or visit "] = "o visite";
-$a->strings["3. Click [Connect]"] = "3. Pulse [conectar]";
-$a->strings["Location not found."] = "Localización no encontrada.";
-$a->strings["Primary location cannot be removed."] = "La localización primaria no puede ser eliminada.";
-$a->strings["No locations found."] = "Ninguna localización encontrada.";
-$a->strings["Manage Channel Locations"] = "Gestionar localizaciones del canal";
-$a->strings["Location (address)"] = "Localización (dirección)";
-$a->strings["Primary Location"] = "Localización primaria";
-$a->strings["Drop location"] = "Eliminar localización";
-$a->strings["Failed to create source. No channel selected."] = "Imposible crear el origen de los clontenidos. Ningún canal ha sido seleccionado.";
-$a->strings["Source created."] = "Fuente creada.";
-$a->strings["Source updated."] = "Fuente actualizada.";
-$a->strings["*"] = "*";
-$a->strings["Manage remote sources of content for your channel."] = "Gestionar contenido de origen remoto para su canal.";
-$a->strings["New Source"] = "Nueva fuente";
-$a->strings["Import all or selected content from the following channel into this channel and distribute it according to your channel settings."] = "Importar todo el contenido o una selección de los siguientes canales en este canal, y distribuirlo de acuerdo con sus ajustes.";
-$a->strings["Only import content with these words (one per line)"] = "Importar solo contenido que contenga estas palabras (una por línea)";
-$a->strings["Leave blank to import all public content"] = "Dejar en blanco para importar todo el contenido público";
-$a->strings["Channel Name"] = "Nombre del canal";
-$a->strings["Source not found."] = "Fuente no encontrada";
-$a->strings["Edit Source"] = "Editar fuente";
-$a->strings["Delete Source"] = "Eliminar fuente";
-$a->strings["Source removed"] = "Fuente eliminada";
-$a->strings["Unable to remove source."] = "Imposible eliminar la fuente.";
-$a->strings["Unable to update menu."] = "No se puede actualizar el menú.";
-$a->strings["Unable to create menu."] = "No se puede crear el menú.";
-$a->strings["Menu Name"] = "Nombre del menú";
-$a->strings["Unique name (not visible on webpage) - required"] = "Nombre único (no será visible en la página web) - requerido";
-$a->strings["Menu Title"] = "Título del menú";
-$a->strings["Visible on webpage - leave empty for no title"] = "Visible en la página web - no ponga nada si no desea un título";
-$a->strings["Allow Bookmarks"] = "Permitir marcadores";
-$a->strings["Menu may be used to store saved bookmarks"] = "El menú se puede usar para guardar marcadores";
-$a->strings["Submit and proceed"] = "Enviar y proceder";
-$a->strings["Drop"] = "Eliminar";
-$a->strings["Bookmarks allowed"] = "Marcadores permitidos";
-$a->strings["Delete this menu"] = "Borrar este menú";
-$a->strings["Edit menu contents"] = "Editar los contenidos del menú";
-$a->strings["Edit this menu"] = "Modificar este menú";
-$a->strings["Menu could not be deleted."] = "El menú no puede ser eliminado.";
-$a->strings["Edit Menu"] = "Modificar el menú";
-$a->strings["Add or remove entries to this menu"] = "Añadir o quitar entradas en este menú";
-$a->strings["Menu name"] = "Nombre del menú";
-$a->strings["Must be unique, only seen by you"] = "Debe ser único, solo será visible para usted";
-$a->strings["Menu title"] = "Título del menú";
-$a->strings["Menu title as seen by others"] = "El título del menú tal como será visto por los demás";
-$a->strings["Allow bookmarks"] = "Permitir marcadores";
 $a->strings["Permission Denied."] = "Permiso denegado";
 $a->strings["File not found."] = "Fichero no encontrado.";
 $a->strings["Edit file permissions"] = "Modificar los permisos del fichero";
@@ -1365,198 +1225,89 @@ $a->strings["Copy/paste this URL to link file from a web page"] = "Copiar/pegar
 $a->strings["Share this file"] = "Compartir este fichero";
 $a->strings["Show URL to this file"] = "Mostrar la dirección de este fichero";
 $a->strings["Notify your contacts about this file"] = "Avisar a sus contactos sobre este fichero";
-$a->strings["Contact not found."] = "Contacto no encontrado";
-$a->strings["Friend suggestion sent."] = "Enviar sugerencia a un amigo.";
-$a->strings["Suggest Friends"] = "Sugerir amigos";
-$a->strings["Suggest a friend for %s"] = "Sugerir un amigo a %s";
-$a->strings["Hub not found."] = "Servidor no encontrado";
-$a->strings["Poke/Prod"] = "Dar un toque/Incitar";
+$a->strings["This site is not a directory server"] = "Este sitio no es un servidor de directorio";
+$a->strings["Layout Name"] = "Nombre del formato";
+$a->strings["Layout Description (Optional)"] = "Descripción del formato gráfico (opcional)";
+$a->strings["Comanche page description language help"] = "Página de ayuda del lenguaje de descripción de páginas (PDL) Comanche";
+$a->strings["Layout Description"] = "Descripción del formato";
+$a->strings["Download PDL file"] = "Descargar el fichero PDL";
+$a->strings["Poke/Prod"] = "Toque/Incitación";
 $a->strings["poke, prod or do other things to somebody"] = "dar un toque, incitar u otras cosas a alguien";
 $a->strings["Recipient"] = "Destinatario";
 $a->strings["Choose what you wish to do to recipient"] = "Elegir qué desea enviar al destinatario";
 $a->strings["Make this post private"] = "Convertir en privado este envío";
-$a->strings["Invalid profile identifier."] = "Identificador de perfil no válido";
-$a->strings["Profile Visibility Editor"] = "Editor de visibilidad del perfil";
-$a->strings["Click on a contact to add or remove."] = "Pulsar en un contacto para añadir o eliminar.";
-$a->strings["Visible To"] = "Visible para";
-$a->strings["%s element installed"] = "%s elemento instalado";
-$a->strings["%s element installation failed"] = "Elemento con instalación fallida: %s";
-$a->strings["Profile not found."] = "Perfil no encontrado.";
-$a->strings["Profile deleted."] = "Perfil eliminado.";
-$a->strings["Profile-"] = "Perfil-";
-$a->strings["New profile created."] = "Creado el nuevo perfil.";
-$a->strings["Profile unavailable to clone."] = "Perfil no disponible para clonar.";
-$a->strings["Profile unavailable to export."] = "Perfil no disponible para exportar.";
-$a->strings["Profile Name is required."] = "Se necesita el nombre del perfil.";
-$a->strings["Marital Status"] = "Estado civil";
-$a->strings["Romantic Partner"] = "Pareja sentimental";
-$a->strings["Likes"] = "Me gusta";
-$a->strings["Dislikes"] = "No me gusta";
-$a->strings["Work/Employment"] = "Trabajo:";
-$a->strings["Religion"] = "Religión";
-$a->strings["Political Views"] = "Ideas políticas";
-$a->strings["Gender"] = "Género";
-$a->strings["Sexual Preference"] = "Preferencia sexual";
-$a->strings["Homepage"] = "Página personal";
-$a->strings["Interests"] = "Intereses";
-$a->strings["Address"] = "Dirección";
-$a->strings["Profile updated."] = "Perfil actualizado.";
-$a->strings["Hide your contact/friend list from viewers of this profile?"] = "¿Ocultar su lista de contactos a los visitantes de este perfil?";
-$a->strings["Edit Profile Details"] = "Modificar los detalles de este perfil";
-$a->strings["View this profile"] = "Ver este perfil";
-$a->strings["Change Profile Photo"] = "Cambiar la foto del perfil";
-$a->strings["Create a new profile using these settings"] = "Crear un nuevo perfil usando estos ajustes";
-$a->strings["Clone this profile"] = "Clonar este perfil";
-$a->strings["Delete this profile"] = "Eliminar este perfil";
-$a->strings["Import profile from file"] = "Importar perfil desde un fichero";
-$a->strings["Export profile to file"] = "Exportar perfil a un fichero";
-$a->strings["Profile Name:"] = "Nombre del perfil:";
-$a->strings["Your Full Name:"] = "Su nombre completo:";
-$a->strings["Title/Description:"] = "Título/Descripción:";
-$a->strings["Your Gender:"] = "Su género:";
-$a->strings["Birthday :"] = "Cumpleaños:";
-$a->strings["Street Address:"] = "Calle:";
-$a->strings["Locality/City:"] = "Ciudad:";
-$a->strings["Postal/Zip Code:"] = "Código postal:";
-$a->strings["Country:"] = "País:";
-$a->strings["Region/State:"] = "Región/Estado:";
-$a->strings["<span class=\"heart\">&hearts;</span> Marital Status:"] = "<span class=\"heart\">&hearts;</span> Estado sentimental:";
-$a->strings["Who: (if applicable)"] = "Quién: (si es aplicable)";
-$a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Por ejemplo: ana123, María González, sara@ejemplo.com";
-$a->strings["Since [date]:"] = "Desde [fecha]:";
-$a->strings["Homepage URL:"] = "Dirección de la página personal:";
-$a->strings["Religious Views:"] = "Creencias religiosas:";
-$a->strings["Keywords:"] = "Palabras clave:";
-$a->strings["Example: fishing photography software"] = "Por ejemplo: software de fotografía submarina";
-$a->strings["Used in directory listings"] = "Visible en el directorio público del canal";
-$a->strings["Tell us about yourself..."] = "Háblenos de usted...";
-$a->strings["Hobbies/Interests"] = "Aficiones/Intereses";
-$a->strings["Contact information and Social Networks"] = "Información de contacto y redes sociales";
-$a->strings["My other channels"] = "Mis otros canales";
-$a->strings["Musical interests"] = "Preferencias musicales";
-$a->strings["Books, literature"] = "Libros, literatura";
-$a->strings["Television"] = "Televisión";
-$a->strings["Film/dance/culture/entertainment"] = "Cine/danza/cultura/entretenimiento";
-$a->strings["Love/romance"] = "Vida sentimental/amorosa";
-$a->strings["Work/employment"] = "Trabajo";
-$a->strings["School/education"] = "Estudios";
-$a->strings["This is your default profile."] = "Este es su perfil principal.";
-$a->strings["Age: "] = "Edad:";
-$a->strings["Edit/Manage Profiles"] = "Modificar/gestionar perfiles";
-$a->strings["Add profile things"] = "Añadir cosas al perfil";
-$a->strings["Include desirable objects in your profile"] = "Añadir objetos interesantes en su perfil";
-$a->strings["No ratings"] = "Ninguna valoración";
-$a->strings["Ratings"] = "Valoraciones";
-$a->strings["Rating: "] = "Valoración:";
-$a->strings["Website: "] = "Sitio web:";
-$a->strings["Description: "] = "Descripción:";
-$a->strings["Source of Item"] = "Origen del elemento";
-$a->strings["\$Projectname Server - Setup"] = "Servidor \$Projectname  - Instalación";
-$a->strings["Could not connect to database."] = "No se ha podido conectar a la base de datos.";
-$a->strings["Could not connect to specified site URL. Possible SSL certificate or DNS issue."] = "No se puede conectar con la dirección del sitio indicada. Podría tratarse de un problema de SSL o DNS.";
-$a->strings["Could not create table."] = "No se puede crear la tabla.";
-$a->strings["Your site database has been installed."] = "La base de datos del sitio ha sido instalada.";
-$a->strings["You may need to import the file \"install/schema_xxx.sql\" manually using a database client."] = "Podría tener que importar manualmente el fichero \"install/schema_xxx.sql\" usando un cliente de base de datos.";
-$a->strings["Please see the file \"install/INSTALL.txt\"."] = "Por favor, lea el fichero \"install/INSTALL.txt\".";
-$a->strings["System check"] = "Verificación del sistema";
-$a->strings["Check again"] = "Verificar de nuevo";
-$a->strings["Database connection"] = "Conexión a la base de datos";
-$a->strings["In order to install \$Projectname we need to know how to connect to your database."] = "Para instalar \$Projectname es necesario saber cómo conectar con su base de datos.";
-$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Por favor, contacte con el proveedor de servicios o el administrador del sitio si tiene dudas sobre estos ajustes.";
-$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "La base de datos que especifique a continuación debe existir ya. Si no es así, por favor, créela antes de seguir.";
-$a->strings["Database Server Name"] = "Nombre del servidor de base de datos";
-$a->strings["Default is localhost"] = "Por defecto es localhost";
-$a->strings["Database Port"] = "Puerto de la base de datos";
-$a->strings["Communication port number - use 0 for default"] = "Número del puerto de comunicaciones - use 0 como valor por defecto";
-$a->strings["Database Login Name"] = "Nombre de acceso a la base de datos";
-$a->strings["Database Login Password"] = "Contraseña de acceso a la base de datos";
-$a->strings["Database Name"] = "Nombre de la base de datos";
-$a->strings["Database Type"] = "Tipo de base de datos";
-$a->strings["Site administrator email address"] = "Dirección de correo electrónico del administrador del sitio";
-$a->strings["Your account email address must match this in order to use the web admin panel."] = "Su cuenta deberá usar la misma dirección de correo electrónico para poder utilizar el panel de administración web.";
-$a->strings["Website URL"] = "Dirección del sitio web";
-$a->strings["Please use SSL (https) URL if available."] = "Por favor, use SSL (https) si está disponible.";
-$a->strings["Please select a default timezone for your website"] = "Por favor, selecciones la zona horaria por defecto de su sitio web";
-$a->strings["Site settings"] = "Ajustes del sitio";
-$a->strings["Could not find a command line version of PHP in the web server PATH."] = "No se puede encontrar una versión en línea de comandos de PHP en la ruta del servidor web.";
-$a->strings["If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron."] = "Si no tiene instalada la versión de línea de comandos de PHP en su servidor, no podrá ejecutar votaciones en segundo plano vía cron.";
-$a->strings["PHP executable path"] = "ruta del ejecutable PHP";
-$a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Introducir la ruta completa del ejecutable PHP. Puede dejar la línea en blanco para continuar la instalación.";
-$a->strings["Command line PHP"] = "PHP en línea de comandos";
-$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "La línea de comandos PHP de su sistema no tiene activado \"register_argc_argv\".";
-$a->strings["This is required for message delivery to work."] = "Esto es necesario para que funcione la entrega de mensajes.";
-$a->strings["PHP register_argc_argv"] = "PHP register_argc_argv";
-$a->strings["Your max allowed total upload size is set to %s. Maximum size of one file to upload is set to %s. You are allowed to upload up to %d files at once."] = "La carga máxima que se le permite subir está establecida en %s. El tamaño máximo de un fichero está establecido en %s. Está permitido subir hasta un máximo de %d ficheros de una sola vez.";
-$a->strings["You can adjust these settings in the servers php.ini."] = "Puede ajustar estos valores en el fichero php.ini de su servidor.";
-$a->strings["PHP upload limits"] = "Límites PHP de subida";
-$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Error: La función \"openssl_pkey_new\" en este sistema no es capaz de general claves de cifrado.";
-$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "si está en un servidor Windows, por favor, lea \"http://www.php.net/manual/en/openssl.installation.php\".";
-$a->strings["Generate encryption keys"] = "Generar claves de cifrado";
-$a->strings["libCurl PHP module"] = "módulo libCurl PHP";
-$a->strings["GD graphics PHP module"] = "módulo PHP GD graphics";
-$a->strings["OpenSSL PHP module"] = "módulo PHP OpenSSL";
-$a->strings["mysqli or postgres PHP module"] = "módulo PHP mysqli o postgres";
-$a->strings["mb_string PHP module"] = "módulo PHP mb_string";
-$a->strings["mcrypt PHP module"] = "módulo PHP mcrypt ";
-$a->strings["xml PHP module"] = "módulo PHP xml";
-$a->strings["Apache mod_rewrite module"] = "módulo Apache mod_rewrite ";
-$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Error: se necesita el módulo del servidor web Apache mod-rewrite pero no está instalado.";
-$a->strings["proc_open"] = "proc_open";
-$a->strings["Error: proc_open is required but is either not installed or has been disabled in php.ini"] = "Error: se necesita proc_open pero o no está instalado o ha sido desactivado en el fichero php.ini";
-$a->strings["Error: libCURL PHP module required but not installed."] = "Error: se necesita el módulo PHP libCURL pero no está instalado.";
-$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Error: el módulo PHP GD graphics es necesario, pero no está instalado.";
-$a->strings["Error: openssl PHP module required but not installed."] = "Error: el módulo PHP openssl es necesario, pero no está instalado.";
-$a->strings["Error: mysqli or postgres PHP module required but neither are installed."] = "Error: el módulo PHP mysqli o postgres es necesario pero no ninguno de los dos está instalado.";
-$a->strings["Error: mb_string PHP module required but not installed."] = "Error: el módulo PHP mb_string es necesario, pero no está instalado.";
-$a->strings["Error: mcrypt PHP module required but not installed."] = "Error: el módulo PHP mcrypt es necesario, pero no está instalado.";
-$a->strings["Error: xml PHP module required for DAV but not installed."] = "Error: el módulo PHP xml es necesario para DAV, pero no está instalado.";
-$a->strings["The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so."] = "El instalador web no ha podido crear un fichero llamado “.htconfig.php” en la carpeta base de su servidor.";
-$a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "Esto está generalmente ligado a un problema de permisos, a causa del cual el servidor web tiene prohibido modificar ficheros en su carpeta - incluso si usted mismo tiene esos permisos.";
-$a->strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Red top folder."] = "Al término de este procedimiento, podemos crear un fichero de texto para guardar con el nombre .htconfig.php en el directorio raíz de su instalación de Red.";
-$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"install/INSTALL.txt\" for instructions."] = "Como alternativa, puede dejar este procedimiento e intentar realizar una instalación manual. Lea, por favor, el fichero\"install/INSTALL.txt\" para las instrucciones.";
-$a->strings[".htconfig.php is writable"] = ".htconfig.php tiene permisos de escritura";
-$a->strings["Red uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Red hace uso del motor de plantillas Smarty3 para diseñar sus plantillas gráficas. Smarty3 es más rápido porque compila las plantillas de páginas directamente en PHP.";
-$a->strings["In order to store these compiled templates, the web server needs to have write access to the directory %s under the Red top level folder."] = "Para poder guardar las plantillas compiladas, el servidor web necesita permisos para acceder al subdirectorio %s en el directorio de instalación de Red.";
-$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Por favor, asegúrese de que el servidor web está siendo ejecutado por un usuario que tenga permisos de escritura sobre esta carpeta (por ejemplo, www-data).";
-$a->strings["Note: as a security measure, you should give the web server write access to %s only--not the template files (.tpl) that it contains."] = "Nota: como medida de seguridad, debe dar al servidor web permisos de escritura solo sobre %s -no al fichero de plantilla (.tpl) que contiene.";
-$a->strings["%s is writable"] = "%s tiene permisos de escritura";
-$a->strings["Red uses the store directory to save uploaded files. The web server needs to have write access to the store directory under the Red top level folder"] = "Red guarda los ficheros descargados en la carpeta \"store\". El servidor web necesita tener permisos de escritura sobre esa carpeta, en el directorio de instalación.";
-$a->strings["store is writable"] = "\"store\" tiene permisos de escritura";
-$a->strings["SSL certificate cannot be validated. Fix certificate or disable https access to this site."] = "El certificado SSL no ha podido ser validado. Corrija este problema o desactive el acceso https a este sitio.";
-$a->strings["If you have https access to your website or allow connections to TCP port 443 (the https: port), you MUST use a browser-valid certificate. You MUST NOT use self-signed certificates!"] = "Si su servidor soporta conexiones cifradas SSL o si permite conexiones al puerto TCP 443 (el puerto usado por el protocolo https), debe utilizar un certificado válido. No debe usar un certificado firmado por usted mismo.";
-$a->strings["This restriction is incorporated because public posts from you may for example contain references to images on your own hub."] = "Se ha incorporado esta restricción para evitar que sus publicaciones públicas hagan referencia a imágenes en su propio servidor.";
-$a->strings["If your certificate is not recognized, members of other sites (who may themselves have valid certificates) will get a warning message on their own site complaining about security issues."] = "Si su certificado no ha sido reconocido, los miembros de otros sitios (con certificados válidos) recibirán mensajes de aviso en sus propios sitios web.";
-$a->strings["This can cause usability issues elsewhere (not just on your own site) so we must insist on this requirement."] = "Por razones de compatibilidad (sobre el conjunto de la red, no solo sobre su propio sitio), debemos insistir en estos requisitos.";
-$a->strings["Providers are available that issue free certificates which are browser-valid."] = "Existen varias Autoridades de Certificación que le pueden proporcionar certificados válidos.";
-$a->strings["SSL certificate validation"] = "validación del certificado SSL";
-$a->strings["Url rewrite in .htaccess is not working. Check your server configuration.Test: "] = "No se pueden reescribir las direcciones web en .htaccess. Compruebe la configuración de su servidor:";
-$a->strings["Url rewrite is working"] = "La reescritura de la direcciones funciona correctamente";
-$a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "El fichero de configuración de la base de datos .htconfig.php no se ha podido modificar. Por favor, copie el texto generado en un fichero con ese nombre en el directorio raíz de su servidor.";
-$a->strings["Errors encountered creating database tables."] = "Se han encontrado errores al crear las tablas de la base de datos.";
-$a->strings["<h1>What next</h1>"] = "<h1>Siguiente paso</h1>";
-$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANTE: Debe crear [manualmente] una tarea programada para las actualizaciones.";
-$a->strings["OpenID protocol error. No ID returned."] = "Error del protocolo OpenID. Ningún ID recibido como respuesta.";
-$a->strings["Welcome %s. Remote authentication successful."] = "Bienvenido %s. La identificación desde su servidor se ha llevado a cabo correctamente.";
-$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s ha etiquetado el %3\$s de %2\$s con %4\$s";
-$a->strings["Export Channel"] = "Exportar el canal";
-$a->strings["Export your basic channel information to a small file.  This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new hub, but\tdoes not contain your content."] = "Exportar la base de datos de su canal a un pequeño fichero. Este podrá servir como una copia de seguridad de sus conexiones, permisos, perfil y datos básicos, que podrá importar a un nuevo canal, pero sin sus contenidos.";
-$a->strings["Export Content"] = "Exportar contenidos";
-$a->strings["Export your channel information and all the content to a JSON backup. This backs up all of your connections, permissions, profile data and all of your content, but is generally not suitable for importing a channel to a new hub as this file may be VERY large.  Please be patient - it may take several minutes for this download to begin."] = "Exportar toda la información del canal y todo su contenido a un fichero JSON. Este contendrá todas sus conexiones, permisos, información del perfil y todo su contenido, Sin embargo, a menudo, no será una buena solución para importarlo en una nueva instancia, pues el fichero será MUY voluminoso. Por favor, tenga paciencia - pueden pasar muchos minutos antes de que comience la carga.";
-$a->strings["No connections."] = "Sin conexiones.";
-$a->strings["Visit %s's profile [%s]"] = "Visitar el perfil de %s [%s]";
-$a->strings["invalid target signature"] = "La firma recibida no es válida";
+$a->strings["No such group"] = "No se encuentra el grupo";
+$a->strings["No such channel"] = "No se encuentra el  canal";
+$a->strings["forum"] = "foro";
+$a->strings["Search Results For:"] = "Buscar resultados para:";
+$a->strings["Collection is empty"] = "La colección está vacía";
+$a->strings["Collection: "] = "Colección:";
+$a->strings["Invalid connection."] = "Conexión no válida.";
+$a->strings["You must be logged in to see this page."] = "Debe haber iniciado sesión para poder ver esta página.";
+$a->strings["Room not found"] = "Sala no encontrada";
+$a->strings["Leave Room"] = "Abandonar la sala";
+$a->strings["Delete This Room"] = "Eliminar esta sala";
+$a->strings["I am away right now"] = "Estoy ausente momentáneamente";
+$a->strings["I am online"] = "Estoy conectado/a";
+$a->strings["Bookmark this room"] = "Añadir esta sala a Marcadores";
+$a->strings["New Chatroom"] = "Nueva sala de chat";
+$a->strings["Chatroom Name"] = "Nombre de la sala de chat";
+$a->strings["Expiration of chats (minutes)"] = "Tiempo de expiración de los mensajes en los chats (en minutos)";
+$a->strings["%1\$s's Chatrooms"] = "Salas de chat de %1\$s";
+$a->strings["Items tagged with: %s"] = "elementos etiquetados con: %s";
+$a->strings["Search results for: %s"] = "Resultados de la búsqueda para: %s";
+$a->strings["Website:"] = "Sitio web:";
+$a->strings["Remote Channel [%s] (not yet known on this site)"] = "Canal remoto [%s] (aún no es conocido en este sitio)";
+$a->strings["Rating (this information is public)"] = "Valoración (esta información es pública)";
+$a->strings["Optionally explain your rating (this information is public)"] = "Opcionalmente puede explicar su valoración (esta información es pública)";
+$a->strings["Unable to lookup recipient."] = "Imposible asociar a un destinatario.";
+$a->strings["Unable to communicate with requested channel."] = "Imposible comunicar con el canal solicitado.";
+$a->strings["Cannot verify requested channel."] = "No se puede verificar el canal solicitado.";
+$a->strings["Selected channel has private message restrictions. Send failed."] = "El canal seleccionado tiene restricciones sobre los mensajes privados. El envío falló.";
+$a->strings["Messages"] = "Mensajes";
+$a->strings["Message recalled."] = "Mensaje revocado.";
+$a->strings["Conversation removed."] = "Conversación eliminada.";
+$a->strings["Requested channel is not in this network"] = "El canal solicitado no existe en esta red";
+$a->strings["Send Private Message"] = "Enviar un mensaje privado";
+$a->strings["To:"] = "Para:";
+$a->strings["Subject:"] = "Asunto:";
+$a->strings["Your message:"] = "Su mensaje:";
+$a->strings["Send"] = "Enviar";
+$a->strings["Delete message"] = "Borrar mensaje";
+$a->strings["Delivery report"] = "Informe de transmisión";
+$a->strings["Recall message"] = "Revocar el mensaje";
+$a->strings["Message has been recalled."] = "El mensaje ha sido revocado.";
+$a->strings["Delete Conversation"] = "Eliminar Conversación";
+$a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Comunicación segura no disponible. Pero <strong>puede</strong> responder desde la página del perfil del remitente.";
+$a->strings["Send Reply"] = "Responder";
+$a->strings["Your message for %s (%s):"] = "Su mensaje para %s (%s):";
+$a->strings["Invalid message"] = "Mensaje no válido";
+$a->strings["no results"] = "sin resultados";
+$a->strings["Delivery report for %1\$s"] = "Informe de entrega para %1\$s";
+$a->strings["channel sync processed"] = "se ha realizado la sincronización del canal";
+$a->strings["queued"] = "encolado";
+$a->strings["posted"] = "enviado";
+$a->strings["accepted for delivery"] = "aceptado para el envío";
+$a->strings["updated"] = "actualizado";
+$a->strings["update ignored"] = "actualización ignorada";
+$a->strings["permission denied"] = "permiso denegado";
+$a->strings["recipient not found"] = "destinatario no encontrado";
+$a->strings["mail recalled"] = "mensaje de correo revocado";
+$a->strings["duplicate mail received"] = "se ha recibido mensaje duplicado";
+$a->strings["mail delivered"] = "correo enviado";
+$a->strings["Item not found"] = "Elemento no encontrado";
+$a->strings["Delete block?"] = "¿Borrar bloque?";
+$a->strings["Insert YouTube video"] = "Insertar vídeo de YouTube";
+$a->strings["Insert Vorbis [.ogg] video"] = "Insertar vídeo Vorbis [.ogg]";
+$a->strings["Insert Vorbis [.ogg] audio"] = "Insertar audio Vorbis [.ogg]";
+$a->strings["Edit Block"] = "Modificar este bloque";
+$a->strings["This directory server requires an access token"] = "El servidor de este directorio necesita un \"token\" de acceso";
+$a->strings["Item is not editable"] = "El elemento no es editable";
+$a->strings["Delete item?"] = "¿Borrar elemento?";
+$a->strings["Edit post"] = "Editar la entrada";
+$a->strings["Unable to find your hub."] = "No se puede encontrar su servidor.";
+$a->strings["Post successful."] = "Enviado con éxito.";
 $a->strings["Theme settings updated."] = "Ajustes del tema actualizados.";
-$a->strings["Site"] = "Sitio";
-$a->strings["Accounts"] = "Cuentas";
-$a->strings["Channels"] = "Canales";
-$a->strings["Plugins"] = "Extensiones";
-$a->strings["Themes"] = "Temas";
-$a->strings["Inspect queue"] = "Examinar la cola";
-$a->strings["Profile Config"] = "Ajustes del perfil";
-$a->strings["DB updates"] = "Actualizaciones de la base de datos";
-$a->strings["Logs"] = "Informes";
-$a->strings["Plugin Features"] = "Ajustes de la extensión";
-$a->strings["User registrations waiting for confirmation"] = "Registros de usuarios pendientes de confirmación";
 $a->strings["# Accounts"] = "# Cuentas";
 $a->strings["# blocked accounts"] = "# cuentas bloqueadas";
 $a->strings["# expired accounts"] = "# cuentas caducadas";
@@ -1590,14 +1341,12 @@ $a->strings["Administrator Information"] = "Información del Administrador";
 $a->strings["Contact information for site administrators.  Displayed on siteinfo page.  BBCode can be used here"] = "Información de contacto de los administradores del sitio. Visible en la página \"siteinfo\". Se puede usar BBCode";
 $a->strings["System language"] = "Idioma del sistema";
 $a->strings["System theme"] = "Tema gráfico del sistema";
-$a->strings["Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"] = "Tema del sistema por defecto - se puede cambiar por cada perfil de usuario - <a href='#' id='cnftheme'>modificar ajustes del tema</a>";
+$a->strings["Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"] = "Tema del sistema por defecto - se puede cambiar por cada perfil de usuario - <a href='#' id='cnftheme'>modificar los ajustes del tema</a>";
 $a->strings["Mobile system theme"] = "Tema del sistema para móviles";
-$a->strings["Theme for mobile devices"] = "Tema para aparatos móviles";
-$a->strings["Enable Diaspora Protocol"] = "Activar el protocolo de la red social Diaspora";
-$a->strings["Communicate with Diaspora and Friendica - experimental"] = "Comunicar con Diaspora y Friendica - experimental";
+$a->strings["Theme for mobile devices"] = "Tema para dispositivos móviles";
 $a->strings["Allow Feeds as Connections"] = "Permitir flujos RSS como conexiones";
 $a->strings["(Heavy system resource usage)"] = "(Uso intenso de los recursos del sistema)";
-$a->strings["Maximum image size"] = "Tamaño máximo de imagen";
+$a->strings["Maximum image size"] = "Tamaño máximo de la imagen";
 $a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "Tamaño máximo en bytes de la imagen subida. Por defecto, es 0, lo que significa que no hay límites.";
 $a->strings["Does this site allow new member registration?"] = "¿Debe este sitio permitir el registro de nuevos miembros?";
 $a->strings["Which best describes the types of account offered by this hub?"] = "¿Cómo describiría el tipo de servicio ofrecido por este servidor?";
@@ -1607,7 +1356,7 @@ $a->strings["Site homepage to show visitors (default: login box)"] = "Página pe
 $a->strings["example: 'public' to show public stream, 'page/sys/home' to show a system webpage called 'home' or 'include:home.html' to include a file."] = "ejemplo: 'public' para mostrar contenido público de los usuarios, 'page/sys/home' para mostrar la página web definida como \"home\" o 'include:home.html' para mostrar el contenido de un fichero.";
 $a->strings["Preserve site homepage URL"] = "Preservar la dirección de la página personal";
 $a->strings["Present the site homepage in a frame at the original location instead of redirecting"] = "Presenta la página personal del sitio en un marco en la ubicación original, en vez de redirigirla.";
-$a->strings["Accounts abandoned after x days"] = "Cuentas abandonados después de x días";
+$a->strings["Accounts abandoned after x days"] = "Cuentas abandonadas después de x días";
 $a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Para evitar consumir recursos del sistema intentando poner al día las cuentas abandonadas. Introduzca 0 para no tener límite de tiempo.";
 $a->strings["Allowed friend domains"] = "Dominios amigos permitidos";
 $a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Lista separada por comas de dominios a los que está permitido establecer relaciones de amistad con este sitio. Se permiten comodines. Dejar en claro para aceptar cualquier dominio.";
@@ -1615,9 +1364,9 @@ $a->strings["Allowed email domains"] = "Se aceptan dominios de correo electróni
 $a->strings["Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains"] = "Lista separada por comas de los dominios de los que se acepta una dirección de correo electrónico para registros en este sitio. Se permiten comodines. Dejar en claro para aceptar cualquier dominio. ";
 $a->strings["Not allowed email domains"] = "No se permiten dominios de correo electrónico";
 $a->strings["Comma separated list of domains which are not allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains, unless allowed domains have been defined."] = "Lista separada por comas de los dominios de los que no se acepta una dirección de correo electrónico para registros en este sitio. Se permiten comodines. Dejar en claro para no aceptar cualquier dominio, excepto los que se hayan autorizado.";
-$a->strings["Block public"] = "Bloquear página pública";
-$a->strings["Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."] = "Activar para bloquear el acceso público a todas las páginas públicas personales en este sitio salvo que estén identificadas en el sistema.";
-$a->strings["Verify Email Addresses"] = "Verificar direcciones de correo electrónico";
+$a->strings["Block public"] = "Bloquear páginas públicas";
+$a->strings["Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."] = "Activar para bloquear el acceso a todas las páginas públicas personales en este sitio, salvo que estén identificadas en el sistema.";
+$a->strings["Verify Email Addresses"] = "Verificar las direcciones de correo electrónico";
 $a->strings["Check to verify email addresses used in account registration (recommended)."] = "Activar para la verificación de la dirección de correo electrónico en el registro de una cuenta (recomendado).";
 $a->strings["Force publish"] = "Forzar la publicación";
 $a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Intentar forzar todos los perfiles para que sean listados en el directorio de este sitio.";
@@ -1630,11 +1379,13 @@ $a->strings["Proxy URL"] = "Dirección del proxy";
 $a->strings["Network timeout"] = "Tiempo de espera de la red";
 $a->strings["Value is in seconds. Set to 0 for unlimited (not recommended)."] = "Valor en segundos. Poner a 0 para que no haya tiempo límite (no recomendado)";
 $a->strings["Delivery interval"] = "Intervalo de entrega";
-$a->strings["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."] = "Retrasar los procesos de entrega en segundo plano por esta cantidad de segundos para reducir la carga del sistema. Recomendado: 4-5 para hosts compartidos, 2-3 para servidores virtuales privados, 0-1 para grandes servidores dedicados.";
+$a->strings["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."] = "Retrasar los procesos de transmisión en segundo plano por esta cantidad de segundos para reducir la carga del sistema. Recomendado: 4-5 para sitios compartidos, 2-3 para servidores virtuales privados, 0-1 para grandes servidores dedicados.";
+$a->strings["Deliveries per process"] = "Intentos de envío por proceso";
+$a->strings["Number of deliveries to attempt in a single operating system process. Adjust if necessary to tune system performance. Recommend: 1-5."] = "Numero de envíos a intentar en un único proceso del sistema operativo. Ajustar si es necesario mejorar el rendimiento. Se recomienda: 1-5.";
 $a->strings["Poll interval"] = "Intervalo de sondeo";
-$a->strings["Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval."] = "Retrasar el sondeo en segundo plano en esta cantidad de segundo para reducir la carga del sistema. Si es 0, use el intervalo de entrega.";
+$a->strings["Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval."] = "Retrasar el sondeo en segundo plano, en esta cantidad de segundos, para reducir la carga del sistema. Si es 0, usar el intervalo de transmisión.";
 $a->strings["Maximum Load Average"] = "Carga media máxima";
-$a->strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Carga máxima del sistema antes de que los procesos de entrega y sondeo se hayan retardado - por defecto, 50.";
+$a->strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Carga máxima del sistema antes de que los procesos de transmisión y sondeo se hayan retardado - por defecto, 50.";
 $a->strings["Expiration period in days for imported (matrix/network) content"] = "Periodo de caducidad en días para el contenido importado (red)";
 $a->strings["0 for no expiration of imported content"] = "0 para que no caduque el contenido importado";
 $a->strings["No server found"] = "Servidor no encontrado";
@@ -1676,10 +1427,7 @@ $a->strings["select all"] = "seleccionar todo";
 $a->strings["User registrations waiting for confirm"] = "Registros de usuario en espera de aprobación";
 $a->strings["Request date"] = "Fecha de solicitud";
 $a->strings["No registrations."] = "Sin registros.";
-$a->strings["Approve"] = "Aprobar";
 $a->strings["Deny"] = "Rechazar";
-$a->strings["Block"] = "Bloquear";
-$a->strings["Unblock"] = "Desbloquear";
 $a->strings["Register date"] = "Fecha de registro";
 $a->strings["Last login"] = "Último acceso";
 $a->strings["Expires"] = "Caduca";
@@ -1709,6 +1457,7 @@ $a->strings["Uncensor"] = "No censurar";
 $a->strings["Allow Code"] = "Permitir código";
 $a->strings["Disallow Code"] = "No permitir código";
 $a->strings["UID"] = "UID";
+$a->strings["Address"] = "Dirección";
 $a->strings["Selected channels will be deleted!\\n\\nEverything that was posted in these channels on this site will be permanently deleted!\\n\\nAre you sure?"] = "Los canales seleccionados se eliminarán!\\n\\nTodo lo publicado por estos canales en este sitio se borrarán definitivamente!\\n\\n¿Está seguro de querer hacerlo?";
 $a->strings["The channel {0} will be deleted!\\n\\nEverything that was posted in this channel on this site will be permanently deleted!\\n\\nAre you sure?"] = "El canal {0} va a ser eliminado!\\n\\nTodo lo publicado por el canal en este sitio se borrará definitivamente!\\n\\n¿Está seguro de querer hacerlo?";
 $a->strings["Plugin %s disabled."] = "Extensión %s desactivada.";
@@ -1726,20 +1475,163 @@ $a->strings["Log settings updated."] = "Actualizado el informe de configuracione
 $a->strings["Clear"] = "Vaciar";
 $a->strings["Debugging"] = "Depuración";
 $a->strings["Log file"] = "Fichero de informe";
-$a->strings["Must be writable by web server. Relative to your Red top-level directory."] = "Debe tener permisos de escritura para el servidor web. Ruta relativa al directorio raíz de Red.";
+$a->strings["Must be writable by web server. Relative to your Red top-level directory."] = "Debe tener permisos de escritura por el servidor web. La ruta es relativa al directorio de instalación de Hubzilla.";
 $a->strings["Log level"] = "Nivel de depuración";
 $a->strings["New Profile Field"] = "Nuevo campo en el perfil";
 $a->strings["Field nickname"] = "Alias del campo";
 $a->strings["System name of field"] = "Nombre del campo en el sistema";
 $a->strings["Input type"] = "Tipo de entrada";
 $a->strings["Field Name"] = "Nombre del campo";
-$a->strings["Label on profile pages"] = "Etiqueta a mostrar en las páginas del perfil";
+$a->strings["Label on profile pages"] = "Etiqueta a mostrar en la página del perfil";
 $a->strings["Help text"] = "Texto de ayuda";
 $a->strings["Additional info (optional)"] = "Información adicional (opcional)";
 $a->strings["Field definition not found"] = "Definición del campo no encontrada";
 $a->strings["Edit Profile Field"] = "Modificar el campo del perfil";
-$a->strings["Unable to find your hub."] = "No se puede encontrar su servidor.";
-$a->strings["Post successful."] = "Enviado con éxito.";
+$a->strings["App installed."] = "Aplicación instalada.";
+$a->strings["Malformed app."] = "Aplicación con errores";
+$a->strings["Embed code"] = "Código incorporado";
+$a->strings["Edit App"] = "Modificar la aplicación";
+$a->strings["Create App"] = "Crear una aplicación";
+$a->strings["Name of app"] = "Nombre de la aplicación";
+$a->strings["Location (URL) of app"] = "Ubicación (URL) de la aplicación";
+$a->strings["Description"] = "Descripción";
+$a->strings["Photo icon URL"] = "Dirección del icono que se va a utilizar para esta foto";
+$a->strings["80 x 80 pixels - optional"] = "80 x 80 pixels - opcional";
+$a->strings["Version ID"] = "Versión";
+$a->strings["Price of app"] = "Precio de la aplicación";
+$a->strings["Location (URL) to purchase app"] = "Ubicación (URL) donde adquirir la aplicación";
+$a->strings["Unable to update menu."] = "No se puede actualizar el menú.";
+$a->strings["Unable to create menu."] = "No se puede crear el menú.";
+$a->strings["Menu Name"] = "Nombre del menú";
+$a->strings["Unique name (not visible on webpage) - required"] = "Nombre único (no será visible en la página web) - requerido";
+$a->strings["Menu Title"] = "Título del menú";
+$a->strings["Visible on webpage - leave empty for no title"] = "Visible en la página web - no ponga nada si no desea un título";
+$a->strings["Allow Bookmarks"] = "Permitir marcadores";
+$a->strings["Menu may be used to store saved bookmarks"] = "El menú se puede usar para guardar marcadores";
+$a->strings["Submit and proceed"] = "Enviar y proceder";
+$a->strings["Drop"] = "Eliminar";
+$a->strings["Bookmarks allowed"] = "Marcadores permitidos";
+$a->strings["Delete this menu"] = "Borrar este menú";
+$a->strings["Edit menu contents"] = "Editar los contenidos del menú";
+$a->strings["Edit this menu"] = "Modificar este menú";
+$a->strings["Menu could not be deleted."] = "El menú no puede ser eliminado.";
+$a->strings["Edit Menu"] = "Modificar el menú";
+$a->strings["Add or remove entries to this menu"] = "Añadir o quitar entradas en este menú";
+$a->strings["Menu name"] = "Nombre del menú";
+$a->strings["Must be unique, only seen by you"] = "Debe ser único, solo será visible para usted";
+$a->strings["Menu title"] = "Título del menú";
+$a->strings["Menu title as seen by others"] = "El título del menú tal como será visto por los demás";
+$a->strings["Allow bookmarks"] = "Permitir marcadores";
+$a->strings["No more system notifications."] = "No hay más notificaciones del sistema";
+$a->strings["System Notifications"] = "Notificaciones de sistema";
+$a->strings["Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."] = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.";
+$a->strings["Add a Channel"] = "Añadir un canal";
+$a->strings["A channel is your own collection of related web pages. A channel can be used to hold social network profiles, blogs, conversation groups and forums, celebrity pages, and much more. You may create as many channels as your service provider allows."] = "Un canal está formado por su propia colección de páginas web relacionadas. Se puede utilizar para almacenar los perfiles sociales de la red, blogs, grupos de conversación y foros, páginas de famosos y mucho más. Puede crear tantos canales como su proveedor de servicio permita.";
+$a->strings["Channel Name"] = "Nombre del canal";
+$a->strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "] = "Ejemplos: \"Juan García\", \"Isabel y sus caballos\", \"Fútbol\", \"Grupo de parapente\" ";
+$a->strings["Choose a short nickname"] = "Elija un alias corto";
+$a->strings["Your nickname will be used to create an easily remembered channel address (like an email address) which you can share with others."] = "Su alias podrá usarse para crear una dirección de canal fácilmente memorizable (como una dirección de correo electrónico) que puede ser compartido con otros.";
+$a->strings["Or <a href=\"import\">import an existing channel</a> from another location"] = "O <a href=\"import\">importar un canal existente</a> de otro lugar";
+$a->strings["Please choose a channel type (such as social networking or community forum) and privacy requirements so we can select the best permissions for you"] = "Elija el tipo de canal (como red social o foro de discusión) y la privacidad que requiera, así podremos seleccionar el mejor conjunto de permisos para usted";
+$a->strings["Channel Type"] = "Tipo de canal";
+$a->strings["Read more about roles"] = "Leer más sobre los roles";
+$a->strings["Invalid request identifier."] = "Petición inválida del identificador.";
+$a->strings["Discard"] = "Descartar";
+$a->strings["Layout updated."] = "Formato actualizado";
+$a->strings["Edit System Page Description"] = "Editor del Sistema de Descripción de Páginas";
+$a->strings["Layout not found."] = "Formato no encontrado";
+$a->strings["Module Name:"] = "Nombre del módulo:";
+$a->strings["Layout Help"] = "Ayuda para el diseño de la página";
+$a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s está siguiendo %2\$s de %3\$s";
+$a->strings["No valid account found."] = "No se ha encontrado una cuenta válida.";
+$a->strings["Password reset request issued. Check your email."] = "Se ha recibido una solicitud de restablecimiento de contraseña. Consulte su correo electrónico.";
+$a->strings["Site Member (%s)"] = "Usuario del sitio (%s)";
+$a->strings["Password reset requested at %s"] = "Se ha solicitado restablecer la contraseña en %s";
+$a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "La solicitud no ha podido ser verificada. (Puede que la haya enviado con anterioridad) El restablecimiento de la contraseña ha fallado.";
+$a->strings["Password Reset"] = "Restablecer la contraseña";
+$a->strings["Your password has been reset as requested."] = "Su contraseña ha sido restablecida según lo solicitó.";
+$a->strings["Your new password is"] = "Su nueva contraseña es";
+$a->strings["Save or copy your new password - and then"] = "Guarde o copie su nueva contraseña - y después";
+$a->strings["click here to login"] = "pulse aquí para conectarse";
+$a->strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "Puede cambiar la contraseña en la página <em>Ajustes</em> una vez iniciada la sesión.";
+$a->strings["Your password has changed at %s"] = "Su contraseña en %s ha sido cambiada";
+$a->strings["Forgot your Password?"] = "¿Ha olvidado su contraseña?";
+$a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Introduzca y envíe su dirección de correo electrónico para el restablecimiento de su contraseña. Luego revise su correo para obtener más instrucciones.";
+$a->strings["Email Address"] = "Dirección de correo electrónico";
+$a->strings["Reset"] = "Reiniciar";
+$a->strings["\$Projectname"] = "\$Projectname";
+$a->strings["Welcome to %s"] = "Bienvenido a %s";
+$a->strings["\$Projectname channel"] = "Canal \$Projectname";
+$a->strings["Calendar entries imported."] = "Entradas de calendario importadas.";
+$a->strings["No calendar entries found."] = "No se han encontrado entradas de calendario.";
+$a->strings["Event can not end before it has started."] = "Un evento no puede terminar antes de que haya comenzado.";
+$a->strings["Unable to generate preview."] = "No se puede crear la vista previa.";
+$a->strings["Event title and start time are required."] = "Se requieren el título del evento y su hora de inicio.";
+$a->strings["Event not found."] = "Evento no encontrado.";
+$a->strings["l, F j"] = "l j F";
+$a->strings["Edit event"] = "Editar evento";
+$a->strings["Delete event"] = "Borrar evento";
+$a->strings["calendar"] = "calendario";
+$a->strings["Create New Event"] = "Crear un nuevo evento";
+$a->strings["Export"] = "Exportar";
+$a->strings["Import"] = "Importar";
+$a->strings["Event removed"] = "Evento borrado";
+$a->strings["Failed to remove event"] = "Error al eliminar el evento";
+$a->strings["Event details"] = "Detalles del evento";
+$a->strings["Starting date and Title are required."] = "Se requieren fecha y título.";
+$a->strings["Categories (comma-separated list)"] = "Categorías (lista separada por comas)";
+$a->strings["Event Starts:"] = "Inicio del evento:";
+$a->strings["Finish date/time is not known or not relevant"] = "La fecha / hora de finalización no se conocen o no son relevantes";
+$a->strings["Event Finishes:"] = "Finalización del evento:";
+$a->strings["Adjust for viewer timezone"] = "Ajustar para obtener el visor de zona horaria";
+$a->strings["Important for events that happen in a particular place. Not practical for global holidays."] = "Importante para los eventos que suceden en un lugar determinado. No es práctico para los globales.";
+$a->strings["Title:"] = "Título:";
+$a->strings["Share this event"] = "Compartir este evento";
+$a->strings["%s element installed"] = "%s elemento instalado";
+$a->strings["%s element installation failed"] = "Elemento con instalación fallida: %s";
+$a->strings["Fetching URL returns error: %1\$s"] = "Al intentar obtener la dirección, retorna el error: %1\$s";
+$a->strings["Profile Match"] = "Perfil compatible";
+$a->strings["No keywords to match. Please add keywords to your default profile."] = "No hay palabras clave en el perfil principal para poder encontrar perfiles compatibles. Por favor, añada palabras clave a su perfil principal.";
+$a->strings["is interested in:"] = "está interesado en:";
+$a->strings["No matches"] = "No se han encontrado perfiles compatibles";
+$a->strings["Image uploaded but image cropping failed."] = "Imagen actualizada, pero el recorte de la imagen ha fallado. ";
+$a->strings["Image resize failed."] = "El ajuste del tamaño de la imagen ha fallado.";
+$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Recargue la página o limpie el caché del navegador si la nueva foto no se muestra inmediatamente.";
+$a->strings["Image upload failed."] = "Subida de imagen fallida.";
+$a->strings["Unable to process image."] = "No ha sido posible procesar la imagen.";
+$a->strings["female"] = "mujer";
+$a->strings["%1\$s updated her %2\$s"] = "%1\$s ha actualizado su %2\$s";
+$a->strings["male"] = "hombre";
+$a->strings["%1\$s updated his %2\$s"] = "%1\$s ha actualizado su %2\$s";
+$a->strings["%1\$s updated their %2\$s"] = "%1\$s ha actualizado sus %2\$s";
+$a->strings["profile photo"] = "foto del perfil";
+$a->strings["Photo not available."] = "Foto no disponible.";
+$a->strings["Upload File:"] = "Subir fichero:";
+$a->strings["Select a profile:"] = "Seleccionar un perfil:";
+$a->strings["Upload Profile Photo"] = "Subir foto del perfil";
+$a->strings["or"] = "o";
+$a->strings["skip this step"] = "Omitir este paso";
+$a->strings["select a photo from your photo albums"] = "Seleccione una foto de sus álbumes de fotos";
+$a->strings["Crop Image"] = "Recortar imagen";
+$a->strings["Please adjust the image cropping for optimum viewing."] = "Por favor ajuste el recorte de la imagen para una visión óptima.";
+$a->strings["Done Editing"] = "Edición completada";
+$a->strings["Channel added."] = "Canal añadido.";
+$a->strings["Tag removed"] = "Etiqueta eliminada.";
+$a->strings["Remove Item Tag"] = "Eliminar etiqueta del elemento.";
+$a->strings["Select a tag to remove: "] = "Seleccionar una etiqueta para eliminar:";
+$a->strings["No ratings"] = "Ninguna valoración";
+$a->strings["Ratings"] = "Valoraciones";
+$a->strings["Rating: "] = "Valoración:";
+$a->strings["Website: "] = "Sitio web:";
+$a->strings["Description: "] = "Descripción:";
+$a->strings["Unable to locate original post."] = "No ha sido posible encontrar la entrada original.";
+$a->strings["Empty post discarded."] = "La entrada vacía ha sido desechada.";
+$a->strings["Executable content type not permitted to this channel."] = "Contenido de tipo ejecutable no permitido en este canal.";
+$a->strings["System error. Post not saved."] = "Error del sistema. La entrada no se ha podido salvar.";
+$a->strings["Unable to obtain post information from database."] = "No ha sido posible obtener información de la entrada en la base de datos.";
+$a->strings["You have reached your limit of %1$.0f top level posts."] = "Ha alcanzado su límite de %1$.0f entradas en la página principal.";
+$a->strings["You have reached your limit of %1$.0f webpages."] = "Ha alcanzado su límite de %1$.0f páginas web.";
+$a->strings["Page Title"] = "Título de página";
 $a->strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = "Se ha superado el límite máximo de inscripciones diarias de este sitio. Por favor, pruebe de nuevo mañana.";
 $a->strings["Please indicate acceptance of the Terms of Service. Registration failed."] = "Por favor, confirme que acepta los Términos del servicio. El registro ha fallado.";
 $a->strings["Passwords do not match."] = "Las contraseñas no coinciden.";
@@ -1757,27 +1649,123 @@ $a->strings["Please enter your invitation code"] = "Por favor, introduzca el có
 $a->strings["Your email address"] = "Su dirección de correo electrónico";
 $a->strings["Choose a password"] = "Elija una contraseña";
 $a->strings["Please re-enter your password"] = "Por favor, vuelva a escribir su contraseña";
+$a->strings["Block Name"] = "Nombre del bloque";
+$a->strings["Block Title"] = "Título del bloque";
 $a->strings["Account removals are not allowed within 48 hours of changing the account password."] = "La eliminación de cuentas no está permitida hasta después de que hayan transcurrido 48 horas desde el último cambio de contraseña.";
 $a->strings["Remove This Account"] = "Eliminar esta cuenta";
-$a->strings["WARNING: "] = "ATENCIÓN:";
 $a->strings["This account and all its channels will be completely removed from the network. "] = "Esta cuenta y todos sus canales van a ser eliminados de la red.";
-$a->strings["This action is permanent and can not be undone!"] = "¡Esta acción tiene carácter definitivo y no se puede deshacer!";
-$a->strings["Please enter your password for verification:"] = "Por favor, introduzca su contraseña para su verificación:";
 $a->strings["Remove this account, all its channels and all its channel clones from the network"] = "Remover esta cuenta, todos sus canales y clones de la red";
 $a->strings["By default only the instances of the channels located on this hub will be removed from the network"] = "Por defecto, solo las instancias de los canales ubicados en este servidor serán eliminados de la red";
 $a->strings["Remove Account"] = "Eliminar cuenta";
-$a->strings["Help:"] = "Ayuda:";
-$a->strings["Not Found"] = "No encontrado";
-$a->strings["\$Projectname Documentation"] = "Documentación de \$Projectname";
-$a->strings["[Embedded content - reload page to view]"] = "[Contenido incorporado - recargue la página para poder verlo]";
+$a->strings["No service class restrictions found."] = "No se han encontrado restricciones sobre esta clase de servicio.";
+$a->strings["Item not available."] = "Elemento no disponible";
+$a->strings["Public Sites"] = "Sitios públicos";
+$a->strings["The listed sites allow public registration for the \$Projectname network. All sites in the network are interlinked so membership on any of them conveys membership in the network as a whole. Some sites may require subscription or provide tiered service plans. The provider links <strong>may</strong> provide additional details."] = "Los sitios listados permiten el registro público en la red \$Projectname. Todos los sitios de la red están vinculados entre sí, por lo que sus miembros, en ninguno de ellos, indican la pertenencia a la red en su conjunto. Algunos sitios pueden requerir suscripción o proporcionar planes de servicio por niveles. Los enlaces de los proveedores <strong> pueden </strong> proporcionar detalles adicionales.";
+$a->strings["Rate this hub"] = "Valorar este sitio";
+$a->strings["Site URL"] = "Dirección del sitio";
+$a->strings["Access Type"] = "Tipo de acceso";
+$a->strings["Registration Policy"] = "Normas de registro";
+$a->strings["Location"] = "Localización";
+$a->strings["Project"] = "Proyecto";
+$a->strings["View hub ratings"] = "Ver las valoraciones del sitio";
+$a->strings["Rate"] = "Valorar";
+$a->strings["View ratings"] = "Ver valoraciones";
+$a->strings["Failed to create source. No channel selected."] = "Imposible crear el origen de los contenidos. Ningún canal ha sido seleccionado.";
+$a->strings["Source created."] = "Fuente creada.";
+$a->strings["Source updated."] = "Fuente actualizada.";
+$a->strings["*"] = "*";
+$a->strings["Manage remote sources of content for your channel."] = "Gestionar contenido de origen remoto para su canal.";
+$a->strings["New Source"] = "Nueva fuente";
+$a->strings["Import all or selected content from the following channel into this channel and distribute it according to your channel settings."] = "Importar todo el contenido o una selección de los siguientes canales en este canal y distribuirlo de acuerdo con sus ajustes.";
+$a->strings["Only import content with these words (one per line)"] = "Importar solo contenido que contenga estas palabras (una por línea)";
+$a->strings["Leave blank to import all public content"] = "Dejar en blanco para importar todo el contenido público";
+$a->strings["Source not found."] = "Fuente no encontrada";
+$a->strings["Edit Source"] = "Editar fuente";
+$a->strings["Delete Source"] = "Eliminar fuente";
+$a->strings["Source removed"] = "Fuente eliminada";
+$a->strings["Unable to remove source."] = "Imposible eliminar la fuente.";
 $a->strings["Remote privacy information not available."] = "La información privada remota no está disponible.";
 $a->strings["Visible to:"] = "Visible para:";
+$a->strings["network"] = "red";
+$a->strings["RSS"] = "RSS";
+$a->strings["Please login."] = "Por favor, inicie sesión.";
+$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Encontramos un problema durante el inicio de sesión con la OpenID que proporcionó. Por favor, compruebe que la ID está correctamente escrita.";
+$a->strings["The error message was:"] = "El mensaje de error fue:";
+$a->strings["Authentication failed."] = "Falló la autenticación.";
+$a->strings["Remote Authentication"] = "Acceso desde su servidor";
+$a->strings["Enter your channel address (e.g. channel@example.com)"] = "Introduzca la dirección del canal (p.ej. canal@ejemplo.com)";
+$a->strings["Authenticate"] = "Acceder";
+$a->strings["Insufficient permissions.  Request redirected to profile page."] = "Permisos insuficientes. Petición redirigida a la página del perfil.";
+$a->strings["Version %s"] = "Versión %s";
+$a->strings["Installed plugins/addons/apps:"] = "Extensiones/Aplicaciones instaladas:";
+$a->strings["No installed plugins/addons/apps"] = "Extensiones/Aplicaciones no instaladas:";
+$a->strings["This is a hub of \$Projectname - a global cooperative network of decentralized privacy enhanced websites."] = "Este es un sitio integrado en \$Projectname - una red cooperativa mundial de sitios web descentralizados de privacidad mejorada.";
+$a->strings["Tag: "] = "Etiqueta:";
+$a->strings["Last background fetch: "] = "Última actualización en segundo plano:";
+$a->strings["Current load average: "] = "Carga media actual:";
+$a->strings["Running at web location"] = "Corriendo en el sitio web";
+$a->strings["Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more about \$Projectname."] = "Por favor, visite <a href=\"http://hubzilla.org\">hubzilla.org</a> para más información sobre \$Projectname.";
+$a->strings["Bug reports and issues: please visit"] = "Informes de errores e incidencias: por, favor visite";
+$a->strings["\$projectname issues"] = "Problemas en \$projectname";
+$a->strings["Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"] = "Sugerencias, elogios, etc - por favor, un correo electrónico a \"redmatrix\" en librelist - punto com";
+$a->strings["Site Administrators"] = "Administradores del sitio";
+$a->strings["Your service plan only allows %d channels."] = "Su paquete de servicios solo permite %d canales.";
+$a->strings["Nothing to import."] = "No hay nada para importar.";
+$a->strings["Unable to download data from old server"] = "No se han podido descargar datos de su antiguo servidor";
+$a->strings["Imported file is empty."] = "El fichero importado está vacío.";
+$a->strings["Warning: Database versions differ by %1\$d updates."] = "Atención: Las versiones de la base de datos difieren en %1\$d actualizaciones.";
+$a->strings["No channel. Import failed."] = "No hay canal. La importación ha fallado";
+$a->strings["You must be logged in to use this feature."] = "Debe estar registrado para poder usar esta funcionalidad.";
+$a->strings["Import Channel"] = "Importar canal";
+$a->strings["Use this form to import an existing channel from a different server/hub. You may retrieve the channel identity from the old server/hub via the network or provide an export file."] = "Emplee este formulario para importar un canal desde un servidor/hub diferente. Puede recuperar el canal desde el antiguo servidor/hub a través de la red o proporcionando un fichero de exportación.";
+$a->strings["File to Upload"] = "Fichero para subir";
+$a->strings["Or provide the old server/hub details"] = "O proporcione los detalles de su antiguo servidor/hub";
+$a->strings["Your old identity address (xyz@example.com)"] = "Su identidad en el antiguo servidor  (canal@ejemplo.com)";
+$a->strings["Your old login email address"] = "Su antigua dirección de correo electrónico";
+$a->strings["Your old login password"] = "Su antigua contraseña";
+$a->strings["For either option, please choose whether to make this hub your new primary address, or whether your old location should continue this role. You will be able to post from either location, but only one can be marked as the primary location for files, photos, and media."] = "Para cualquiera de las opciones, elija si hacer de este servidor su nueva dirección primaria, o si su antigua ubicación debe continuar con este papel. Usted podrá publicar desde cualquier ubicación, pero sólo una puede estar marcada como la ubicación principal para los ficheros, fotos y otras imágenes o vídeos.";
+$a->strings["Make this hub my primary location"] = "Convertir este servidor en mi ubicación primaria";
+$a->strings["Import existing posts if possible (experimental - limited by available memory"] = "Importar el contenido publicado si es posible (experimental - limitado por la memoria disponible";
+$a->strings["This process may take several minutes to complete. Please submit the form only once and leave this page open until finished."] = "Este proceso puede tardar varios minutos en completarse. Por favor envíe el formulario una sola vez y mantenga esta página abierta hasta que termine.";
+$a->strings["Thing updated"] = "Elemento actualizado.";
+$a->strings["Object store: failed"] = "Guardar objeto: ha fallado";
+$a->strings["Thing added"] = "Elemento añadido";
+$a->strings["OBJ: %1\$s %2\$s %3\$s"] = "OBJ: %1\$s %2\$s %3\$s";
+$a->strings["Show Thing"] = "Mostrar elemento";
+$a->strings["item not found."] = "elemento no encontrado.";
+$a->strings["Edit Thing"] = "Editar elemento";
+$a->strings["Select a profile"] = "Seleccionar un perfil";
+$a->strings["Post an activity"] = "Publicar una actividad";
+$a->strings["Only sends to viewers of the applicable profile"] = "Sólo enviar a espectadores del perfil pertinente.";
+$a->strings["Name of thing e.g. something"] = "Nombre del elemento, p. ej.:. \"algo\"";
+$a->strings["URL of thing (optional)"] = "Dirección del elemento (opcional)";
+$a->strings["URL for photo of thing (optional)"] = "Dirección para la foto o elemento (opcional)";
+$a->strings["Add Thing to your Profile"] = "Añadir alguna cosa a su perfil";
+$a->strings["Total invitation limit exceeded."] = "Se ha superado el límite máximo de invitaciones.";
+$a->strings["%s : Not a valid email address."] = "%s : No es una dirección de correo electrónico válida. ";
+$a->strings["Please join us on \$Projectname"] = "Únase a nosotros en \$Projectname";
+$a->strings["Invitation limit exceeded. Please contact your site administrator."] = "Excedido el límite de invitaciones. Por favor, contacte con el Administrador de su sitio.";
+$a->strings["%s : Message delivery failed."] = "%s : Falló el envío del mensaje.";
+$a->strings["%d message sent."] = array(
+	0 => "%d mensajes enviados.",
+	1 => "%d mensajes enviados.",
+);
+$a->strings["You have no more invitations available"] = "No tiene más invitaciones disponibles";
+$a->strings["Send invitations"] = "Enviar invitaciones";
+$a->strings["Enter email addresses, one per line:"] = "Introduzca las direcciones de correo electrónica, una por línea:";
+$a->strings["Please join my community on \$Projectname."] = "Por favor, únase a mi comunidad en \$Projectname.";
+$a->strings["You will need to supply this invitation code: "] = "Debe proporcionar este código de invitación:";
+$a->strings["1. Register at any \$Projectname location (they are all inter-connected)"] = "1. Regístrese en cualquier lugar de \$Projectname (están todos interconectados)";
+$a->strings["2. Enter my \$Projectname network address into the site searchbar."] = "2. Introduzca mi dirección \$Projectname en la caja de búsqueda del sitio.";
+$a->strings["or visit "] = "o visite";
+$a->strings["3. Click [Connect]"] = "3. Pulse [conectar]";
+$a->strings["[Embedded content - reload page to view]"] = "[Contenido incorporado - recargue la página para poder verlo]";
+$a->strings["Source of Item"] = "Origen del elemento";
 $a->strings["Name is required"] = "El nombre es obligatorio";
 $a->strings["Key and Secret are required"] = "Clave y Secreto son obligatorios";
-$a->strings["Diaspora Policy Settings updated."] = "Configuración de directivas de Diaspora actualizada.";
 $a->strings["Passwords do not match. Password unchanged."] = "Las contraseñas no coinciden. La contraseña no se ha cambiado.";
 $a->strings["Empty passwords are not allowed. Password unchanged."] = "No se permiten contraseñas vacías. La contraseña no se ha cambiado.";
-$a->strings["Password changed."] = "Constraseña cambiada.";
+$a->strings["Password changed."] = "Contraseña cambiada.";
 $a->strings["Password update failed. Please try again."] = "La actualización de la contraseña ha fallado. Por favor, inténtalo de nuevo.";
 $a->strings["Not valid email."] = "Correo electrónico no válido.";
 $a->strings["Protected email address. Cannot change to that email."] = "Dirección de correo electrónico protegida. No se puede cambiar a ella.";
@@ -1790,7 +1778,7 @@ $a->strings["Automatically generated - change if desired. Max length 20"] = "Gen
 $a->strings["Consumer Secret"] = "Clave secreta de consumidor";
 $a->strings["Redirect"] = "Redirigir";
 $a->strings["Redirect URI - leave blank unless your application specifically requires this"] = "URI de redirección - dejar en blanco a menos que su aplicación específicamente lo requiera";
-$a->strings["Icon url"] = "dirección del icono";
+$a->strings["Icon url"] = "Dirección del icono";
 $a->strings["Optional"] = "Opcional";
 $a->strings["You can't edit this application."] = "No puede modificar esta aplicación.";
 $a->strings["Connected Apps"] = "Aplicaciones conectadas";
@@ -1799,11 +1787,6 @@ $a->strings["No name"] = "Sin nombre";
 $a->strings["Remove authorization"] = "Eliminar autorización";
 $a->strings["No feature settings configured"] = "No se ha establecido la configuración de características";
 $a->strings["Feature/Addon Settings"] = "Ajustes de la característica o el complemento";
-$a->strings["Settings for the built-in Diaspora emulator"] = "Configuración para el emulador de Diaspora incorporado";
-$a->strings["Allow any Diaspora member to comment on your public posts"] = "Permitir a cualquier miembro de Diaspora comentar en sus publicaciones públicas";
-$a->strings["Enable the Diaspora protocol for this channel"] = "Activar el protocolo de Diaspora para este canal";
-$a->strings["Diaspora Policy Settings"] = "Configuración de directivas de Diaspora";
-$a->strings["Prevent your hashtags from being redirected to other sites"] = "Impedir que sus \"hashtags\" sean redirigidos a otros sitios ";
 $a->strings["Account Settings"] = "Configuración de la cuenta";
 $a->strings["Enter New Password:"] = "Introduzca la nueva contraseña:";
 $a->strings["Confirm New Password:"] = "Confirme la nueva contraseña:";
@@ -1834,9 +1817,9 @@ $a->strings["Use blog/list mode on channel page"] = "Usar modo blog/lista en la
 $a->strings["(comments displayed separately)"] = "(comentarios mostrados de forma separada)";
 $a->strings["Use blog/list mode on matrix page"] = "Mostrar la red en modo blog/lista";
 $a->strings["Channel page max height of content (in pixels)"] = "Altura máxima del contenido de la página del canal (en píxeles)";
-$a->strings["click to expand content exceeding this height"] = "Pulsa para expandir el contenido que excede esta altura";
-$a->strings["Matrix page max height of content (in pixels)"] = "Altura máxima del contenido de la página de la red (en píxeles)";
-$a->strings["Nobody except yourself"] = "Nadie excepto tú";
+$a->strings["click to expand content exceeding this height"] = "Pulsar para expandir el contenido que exceda de esta altura";
+$a->strings["Matrix page max height of content (in pixels)"] = "Altura máxima del contenido de la página de su red (en píxeles)";
+$a->strings["Nobody except yourself"] = "Nadie excepto usted";
 $a->strings["Only those you specifically allow"] = "Solo aquellos a los que usted permita explícitamente";
 $a->strings["Approved connections"] = "Conexiones aprobadas";
 $a->strings["Any connections"] = "Cualquier conexión";
@@ -1857,7 +1840,7 @@ $a->strings["Adult Content"] = "Contenido solo para adultos";
 $a->strings["This channel frequently or regularly publishes adult content. (Please tag any adult material and/or nudity with #NSFW)"] = "Este canal publica contenido solo para adultos con frecuencia o regularmente. (Por favor etiquete cualquier material para adultos con la etiqueta #NSFW)";
 $a->strings["Security and Privacy Settings"] = "Configuración de seguridad y privacidad";
 $a->strings["Your permissions are already configured. Click to view/adjust"] = "Sus permisos ya están configurados. Pulse para ver/ajustar";
-$a->strings["Hide my online presence"] = "Ocultra mi presencia en línea";
+$a->strings["Hide my online presence"] = "Ocultar mi presencia en línea";
 $a->strings["Prevents displaying in your profile that you are online"] = "Evitar mostrar en su perfil que está en línea";
 $a->strings["Simple Privacy Settings:"] = "Configuración de privacidad sencilla:";
 $a->strings["Very Public - <em>extremely permissive (should be used with caution)</em>"] = "Muy Público - <em>extremadamente permisivo (debería ser usado con precaución)</em>";
@@ -1871,7 +1854,7 @@ $a->strings["Expire other channel content after this many days"] = "Caducar cont
 $a->strings["0 or blank prevents expiration"] = "0 o en claro evitan la caducidad";
 $a->strings["Maximum Friend Requests/Day:"] = "Máximo de solicitudes de amistad por día:";
 $a->strings["May reduce spam activity"] = "Podría reducir la actividad de spam";
-$a->strings["Default Post Permissions"] = "Permidos de publicación predeterminados";
+$a->strings["Default Post Permissions"] = "Permisos de publicación predeterminados";
 $a->strings["Channel permissions category:"] = "Categoría de permisos del canal:";
 $a->strings["Maximum private messages per day from unknown people:"] = "Máximo de mensajes privados por día de gente desconocida:";
 $a->strings["Useful to reduce spamming"] = "Útil para reducir el envío de correo no deseado";
@@ -1888,7 +1871,7 @@ $a->strings["Someone writes a followup comment"] = "Alguien escriba un comentari
 $a->strings["You receive a private message"] = "Reciba un mensaje privado";
 $a->strings["You receive a friend suggestion"] = "Reciba una sugerencia de amistad";
 $a->strings["You are tagged in a post"] = "Usted sea etiquetado en una publicación";
-$a->strings["You are poked/prodded/etc. in a post"] = "Recibir un toque o incitación en una publicación";
+$a->strings["You are poked/prodded/etc. in a post"] = "Reciba un toque o incitación en una entrada";
 $a->strings["Show visual notifications including:"] = "Mostrar notificaciones visuales que incluyan:";
 $a->strings["Unseen matrix activity"] = "Actividad no vista en la red";
 $a->strings["Unseen channel activity"] = "Actividad no vista en el canal";
@@ -1910,201 +1893,245 @@ $a->strings["Advanced Account/Page Type Settings"] = "Ajustes avanzados de la cu
 $a->strings["Change the behaviour of this account for special situations"] = "Cambiar el comportamiento de esta cuenta en situaciones especiales";
 $a->strings["Please enable expert mode (in <a href=\"settings/features\">Settings > Additional features</a>) to adjust!"] = "Activar modo experto (en <a href=\"settings/features\">Ajustes > Características Adicionales</a>) para ajustar.";
 $a->strings["Miscellaneous Settings"] = "Ajustes diversos";
+$a->strings["Default photo upload folder"] = "Carpeta por defecto de las fotos subidas";
+$a->strings["Default file upload folder"] = "Carpeta por defecto de los archivos subidos";
 $a->strings["Personal menu to display in your channel pages"] = "Menú personal que debe mostrarse en las páginas de su canal";
-$a->strings["Remove Channel"] = "Eliminar canal";
 $a->strings["Remove this channel."] = "Eliminar este canal.";
-$a->strings["First Name"] = "Nombre";
-$a->strings["Last Name"] = "Apellido";
-$a->strings["Nickname"] = "Sobrenombre o Alias";
-$a->strings["Full Name"] = "Nombre completo";
-$a->strings["Profile Photo 16px"] = "Foto de perfil 16px";
-$a->strings["Profile Photo 32px"] = "Foto de perfil 32px";
-$a->strings["Profile Photo 48px"] = "Foto de perfil 48px";
-$a->strings["Profile Photo 64px"] = "Foto de perfil 64px";
-$a->strings["Profile Photo 80px"] = "Foto de perfil 80px";
-$a->strings["Profile Photo 128px"] = "Foto de perfil 128px";
-$a->strings["Timezone"] = "Zona horaria";
-$a->strings["Homepage URL"] = "Dirección de la página personal";
-$a->strings["Birth Year"] = "Año de nacimiento";
-$a->strings["Birth Month"] = "Mes de nacimiento";
-$a->strings["Birth Day"] = "Día de nacimiento";
-$a->strings["Birthdate"] = "Fecha de nacimiento";
-$a->strings["Conversation removed."] = "Conversación eliminada.";
-$a->strings["No messages."] = "Sin mensajes.";
-$a->strings["Delete conversation"] = "Eliminar conversación";
-$a->strings["D, d M Y - g:i A"] = "D d M Y - G:i";
-$a->strings["Set your current mood and tell your friends"] = "Describir su estado de ánimo para comunicárselo a sus amigos";
-$a->strings["Total votes"] = "Total de votos";
-$a->strings["Average Rating"] = "Valoración media";
-$a->strings["Channel removals are not allowed within 48 hours of changing the account password."] = "La eliminación de canales no está permitida hasta pasadas 48 horas desde el último cambio de contraseña.";
-$a->strings["Remove This Channel"] = "Eliminar este canal";
-$a->strings["This channel will be completely removed from the network. "] = "Este canal va a ser completamente eliminado de la red.";
-$a->strings["Remove this channel and all its clones from the network"] = "Eliminar este canal y todos sus clones de la red";
-$a->strings["By default only the instance of the channel located on this hub will be removed from the network"] = "Por defecto, solo la instancia del canal alojado en este servidor será eliminado de la red";
-$a->strings["Could not access contact record."] = "No se ha podido acceder al registro de contacto.";
-$a->strings["Could not locate selected profile."] = "No se ha podido localizar el perfil seleccionado.";
-$a->strings["Connection updated."] = "Conexión actualizada.";
-$a->strings["Failed to update connection record."] = "Error al actualizar el registro de la conexión.";
-$a->strings["is now connected to"] = "ahora está conectado a";
-$a->strings["Could not access address book record."] = "No se pudo acceder a la entrada en su libreta de direcciones.";
-$a->strings["Refresh failed - channel is currently unavailable."] = "Recarga fallida - no se puede encontrar actualmente el canal";
-$a->strings["Unable to set address book parameters."] = "No ha sido posible establecer los parámetros de la libreta de direcciones.";
-$a->strings["Connection has been removed."] = "La conexión ha sido eliminada.";
-$a->strings["View %s's profile"] = "Ver el perfil de %s";
-$a->strings["Refresh Permissions"] = "Recargar los permisos";
-$a->strings["Fetch updated permissions"] = "Obtener los permisos actualizados";
-$a->strings["Recent Activity"] = "Actividad reciente";
-$a->strings["View recent posts and comments"] = "Ver publicaciones y comentarios recientes";
-$a->strings["Block (or Unblock) all communications with this connection"] = "Bloquear (o desbloquear) todas las comunicaciones con esta conexión";
-$a->strings["This connection is blocked!"] = "¡Esta conexión está bloqueada!";
-$a->strings["Unignore"] = "Dejar de ignorar";
-$a->strings["Ignore"] = "Ignorar";
-$a->strings["Ignore (or Unignore) all inbound communications from this connection"] = "Ignorar (o dejar de ignorar) todas las comunicaciones entrantes de esta conexión";
-$a->strings["This connection is ignored!"] = "¡Esta conexión es ignorada!";
-$a->strings["Unarchive"] = "Desarchivar";
-$a->strings["Archive"] = "Archivar";
-$a->strings["Archive (or Unarchive) this connection - mark channel dead but keep content"] = "Archiva (o desarchiva) esta conexión - marca el canal como muerto aunque mantiene sus contenidos";
-$a->strings["This connection is archived!"] = "¡Esta conexión esta archivada!";
-$a->strings["Unhide"] = "Mostrar";
-$a->strings["Hide"] = "Ocultar";
-$a->strings["Hide or Unhide this connection from your other connections"] = "Ocultar o mostrar esta conexión a sus otras conexiones";
-$a->strings["This connection is hidden!"] = "¡Esta conexión está oculta!";
-$a->strings["Delete this connection"] = "Eliminar esta conexión";
-$a->strings["Approve this connection"] = "Aprobar esta conexión";
-$a->strings["Accept connection to allow communication"] = "Aceptar la conexión para permitir la comunicación";
-$a->strings["Set Affinity"] = "Ajustar Afinidad";
-$a->strings["Set Profile"] = "Ajustar Perfil";
-$a->strings["Set Affinity & Profile"] = "Ajustar Afinidad y Perfil";
-$a->strings["Apply these permissions automatically"] = "Aplicar estos permisos automaticamente";
-$a->strings["This connection's address is"] = "La dirección de esta conexión es";
-$a->strings["The permissions indicated on this page will be applied to all new connections."] = "Los permisos indicados en esta página serán aplicados en todas las nuevas conexiones.";
-$a->strings["Slide to adjust your degree of friendship"] = "Deslizar para ajustar el grado de amistad";
-$a->strings["Slide to adjust your rating"] = "Deslizar para ajustar su valoración";
-$a->strings["Optionally explain your rating"] = "Opcionalmente, puede explicar su valoración";
-$a->strings["Custom Filter"] = "Filtro Personalizado";
-$a->strings["Only import posts with this text"] = "Importar solo entradas que contengan este texto";
-$a->strings["words one per line or #tags or /patterns/, leave blank to import all posts"] = "Palabras, una por línea o #etiquetas o /patrones/, dejar en blanco para importar todas las entradas";
-$a->strings["Do not import posts with this text"] = "No importar entradas que contienen este texto";
-$a->strings["This information is public!"] = "¡Esta información es pública!";
-$a->strings["Connection Pending Approval"] = "Conexión pendiente de aprobación";
-$a->strings["Connection Request"] = "Solicitud de conexión";
-$a->strings["(%s) would like to connect with you. Please approve this connection to allow communication."] = "(%s) desearía conectar con usted. por favor, apruebe esta conexión para permitir la comunicación.";
-$a->strings["Approve Later"] = "Aprobar más tarde";
-$a->strings["inherited"] = "heredado";
-$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Por favor, escoja el perfil que quiere mostrar a %s cuando esté viendo su perfil de forma segura.";
-$a->strings["Their Settings"] = "Sus ajustes";
-$a->strings["My Settings"] = "Mis ajustes";
-$a->strings["Individual Permissions"] = "Permisos individuales";
-$a->strings["Some permissions may be inherited from your channel's <a href=\"settings\"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can <strong>not</strong> change those settings here."] = "Algunos permisos pueden ser heredados de los <a href=\"settings\"><strong>ajustes de privacidad</strong></a> de sus canales, los cuales tienen una prioridad más alta que los ajustes individuales. <strong>No</strong> puede cambiar estos ajustes aquí.";
-$a->strings["Some permissions may be inherited from your channel's <a href=\"settings\"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can change those settings here but they wont have any impact unless the inherited setting changes."] = "Algunos permisos pueden ser heredados de los <a href=\"settings\"><strong>ajustes de privacidad</strong></a> de sus canales, los cuales tienen una prioridad más alta que los ajustes individuales. Puede cambiar estos ajustes aquí, pero no tendrán ningún impacto hasta que cambie los ajustes heredados.";
-$a->strings["Last update:"] = "Última actualización:";
-$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Encontramos un problema durante el inicio de sesión con la OpenID que proporcionó. por favor, compruebe que la ID está correctamente escrita.";
-$a->strings["The error message was:"] = "El mensaje de error fue:";
-$a->strings["Authentication failed."] = "Falló la autenticación.";
-$a->strings["Remote Authentication"] = "Acceso desde su servidor";
-$a->strings["Enter your channel address (e.g. channel@example.com)"] = "Introduzca la dirección del canal (p.ej. canal@ejemplo.com)";
-$a->strings["Authenticate"] = "Acceder";
-$a->strings["Unable to lookup recipient."] = "Imposible asociar a un destinatario.";
-$a->strings["Unable to communicate with requested channel."] = "Imposible comunicar con el canal solicitado.";
-$a->strings["Cannot verify requested channel."] = "No se puede verificar el canal solicitado.";
-$a->strings["Selected channel has private message restrictions. Send failed."] = "El canal seleccionado tiene restricciones sobre los mensajes privados. El envío falló.";
-$a->strings["Message deleted."] = "Mensaje eliminado.";
-$a->strings["Message recalled."] = "Mensaje recuperado.";
-$a->strings["Send Private Message"] = "Enviar un mensaje privado";
-$a->strings["To:"] = "Para:";
-$a->strings["Subject:"] = "Asunto:";
-$a->strings["Send"] = "Enviar";
-$a->strings["Message not found."] = "No se encuentra el mensaje.";
-$a->strings["Delete message"] = "Mensaje eliminado";
-$a->strings["Recall message"] = "Recuperar el mensaje";
-$a->strings["Message has been recalled."] = "El mensaje ha sido recuperado.";
-$a->strings["Private Conversation"] = "Conversación privada";
-$a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Comunicación segura no disponible. Pero <strong>puede</strong> responder desde la página de perfil del remitente.";
-$a->strings["Send Reply"] = "Responder";
-$a->strings["Invalid request identifier."] = "Petición inválida del identificador.";
-$a->strings["Discard"] = "Descartar";
-$a->strings["Please login."] = "Por favor, inicie sesión.";
+$a->strings["Xchan Lookup"] = "Búsqueda de canales";
+$a->strings["Lookup xchan beginning with (or webbie): "] = "Buscar un canal (o un \"webbie\") que comience por:";
+$a->strings["You have created %1$.0f of %2$.0f allowed channels."] = "Ha creado %1$.0f de %2$.0f canales permitidos.";
+$a->strings["Create a new channel"] = "Crear un nuevo canal";
+$a->strings["Current Channel"] = "Canal actual";
+$a->strings["Switch to one of your channels by selecting it."] = "Cambiar a uno de sus canales seleccionándolo.";
+$a->strings["Default Channel"] = "Canal principal";
+$a->strings["Make Default"] = "Convertir en predeterminado";
+$a->strings["%d new messages"] = "%d mensajes nuevos";
+$a->strings["%d new introductions"] = "%d nuevas isolicitudes de conexión";
+$a->strings["Delegated Channels"] = "Canales delegados";
+$a->strings["Authorize application connection"] = "Autorizar una conexión de aplicación";
+$a->strings["Return to your app and insert this Securty Code:"] = "Volver a su aplicación e introducir este código de seguridad:";
+$a->strings["Please login to continue."] = "Por favor inicia sesión para continuar.";
+$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "¿Desea autorizar a esta aplicación a acceder a sus publicaciones y contactos, y/o crear nuevas publicaciones por usted?";
+$a->strings["Blocked"] = "Bloqueadas";
+$a->strings["Ignored"] = "Ignoradas";
+$a->strings["Hidden"] = "Ocultas";
+$a->strings["Archived"] = "Archivadas";
+$a->strings["Suggest new connections"] = "Sugerir nuevas conexiones";
+$a->strings["New Connections"] = "Nuevas conexiones";
+$a->strings["Show pending (new) connections"] = "Mostrar conexiones (nuevas) pendientes";
+$a->strings["All Connections"] = "Todas las conexiones";
+$a->strings["Show all connections"] = "Mostrar todas las conexiones";
+$a->strings["Unblocked"] = "Desbloqueadas";
+$a->strings["Only show unblocked connections"] = "Mostrar solo las conexiones desbloqueadas";
+$a->strings["Only show blocked connections"] = "Mostrar solo las conexiones bloqueadas";
+$a->strings["Only show ignored connections"] = "Mostrar solo conexiones ignoradas";
+$a->strings["Only show archived connections"] = "Mostrar solo las conexiones archivadas";
+$a->strings["Only show hidden connections"] = "Mostrar solo las conexiones ocultas";
+$a->strings["%1\$s [%2\$s]"] = "%1\$s [%2\$s]";
+$a->strings["Edit connection"] = "Editar conexión";
+$a->strings["Search your connections"] = "Buscar sus conexiones";
+$a->strings["Finding: "] = "Búsqueda:";
+$a->strings["Delete layout?"] = "¿Borrar el formato?";
+$a->strings["Edit Layout"] = "Modificar el formato";
+$a->strings["Delete webpage?"] = "¿Eliminar la página web?";
+$a->strings["Page link title"] = "Título del enlace de la página";
+$a->strings["Edit Webpage"] = "Editar la página web";
+$a->strings["Collection created."] = "La colección ha sido creada.";
+$a->strings["Could not create collection."] = "No se puede crear la colección.";
+$a->strings["Collection updated."] = "La colección ha sido actualizada.";
+$a->strings["Create a collection of channels."] = "Crear una colección de canales.";
+$a->strings["Collection Name: "] = "Nombre de la colección:";
+$a->strings["Members are visible to other channels"] = "Los miembros son visibles para otros canales";
+$a->strings["Collection removed."] = "La colección ha sido eliminada.";
+$a->strings["Unable to remove collection."] = "No ha sido posible de eliminar la colección.";
+$a->strings["Collection Editor"] = "Editor de colecciones";
+$a->strings["Members"] = "Miembros";
+$a->strings["All Connected Channels"] = "Todos los canales conectados";
+$a->strings["Click on a channel to add or remove."] = "Haga clic en un canal para agregarlo o quitarlo.";
+$a->strings["Continue"] = "Continuar";
+$a->strings["Premium Channel Setup"] = "Configuración del canal premium";
+$a->strings["Enable premium channel connection restrictions"] = "Habilitar restricciones de conexión del canal premium";
+$a->strings["Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc."] = "Por favor introduzca sus restricciones o condiciones, como recibo de paypal, normas de uso, etc.";
+$a->strings["This channel may require additional steps or acknowledgement of the following conditions prior to connecting:"] = "Este canal puede requerir antes de conectar unos pasos adicionales o el conocimiento de las siguientes condiciones:";
+$a->strings["Potential connections will then see the following text before proceeding:"] = "Las posibles conexiones verán, por tanto, el siguiente texto antes de proceder:";
+$a->strings["By continuing, I certify that I have complied with any instructions provided on this page."] = "Al continuar, certifico que he cumplido con todas las instrucciones proporcionadas en esta página.";
+$a->strings["(No specific instructions have been provided by the channel owner.)"] = "(No ha sido proporcionada ninguna instrucción específica por el propietario del canal.)";
+$a->strings["Restricted or Premium Channel"] = "Canal premium o restringido";
+$a->strings["No connections."] = "Sin conexiones.";
+$a->strings["Visit %s's profile [%s]"] = "Visitar el perfil de %s [%s]";
+$a->strings["Location not found."] = "Localización no encontrada.";
+$a->strings["Location lookup failed."] = "Ha fallado la búsqueda de la ubicación.";
+$a->strings["Please select another location to become primary before removing the primary location."] = "Por favor, seleccione otra ubicación para convertirla en primaria antes de retirar la ubicación principal.";
+$a->strings["No locations found."] = "Ninguna localización encontrada.";
+$a->strings["Manage Channel Locations"] = "Gestionar localizaciones del canal";
+$a->strings["Location (address)"] = "Localización (dirección)";
+$a->strings["Primary Location"] = "Localización primaria";
+$a->strings["Drop location"] = "Eliminar localización";
 $a->strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "La autenticación desde su servidor está bloqueada. Ha iniciado sesión localmente. Por favor, salga de la sesión y vuelva a intentarlo.";
-$a->strings["Add a Channel"] = "Añadir un canal";
-$a->strings["A channel is your own collection of related web pages. A channel can be used to hold social network profiles, blogs, conversation groups and forums, celebrity pages, and much more. You may create as many channels as your service provider allows."] = "Un canal está formado por su propia colección de páginas web relacionadas. Se puede utilizar para almacenar los perfiles sociales de la red, blogs, grupos de conversación y foros, páginas de famosos y mucho más. Puede crear tantos canales como su proveedor de servicio permita.";
-$a->strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "] = "Ejemplos: \"Juan García\", \"Isabel y sus caballos\", \"Fútbol\", \"Grupo de parapente\" ";
-$a->strings["Choose a short nickname"] = "Elija un alias corto";
-$a->strings["Your nickname will be used to create an easily remembered channel address (like an email address) which you can share with others."] = "Su alias podrá usarse para crear una dirección de canal fácilmente memorizable (como una dirección de correo electrónico) que puede ser compartido con otros.";
-$a->strings["Or <a href=\"import\">import an existing channel</a> from another location"] = "O <a href=\"import\">importar un canal existente</a> de otro lugar";
-$a->strings["Please choose a channel type (such as social networking or community forum) and privacy requirements so we can select the best permissions for you"] = "Elija el tipo de canal (como red social o foro de discusión) y la privacidad que requiera, así podremos seleccionar el mejor conjunto de permisos para usted";
-$a->strings["Channel Type"] = "Tipo de canal";
-$a->strings["Read more about roles"] = "Leer más sobre los roles";
-$a->strings["App installed."] = "Aplicación instalada.";
-$a->strings["Malformed app."] = "Aplicación con errores";
-$a->strings["Embed code"] = "código incorporado";
-$a->strings["Edit App"] = "Modificar la aplicación";
-$a->strings["Create App"] = "Crear una aplicación";
-$a->strings["Name of app"] = "Nombre de la aplicación";
-$a->strings["Location (URL) of app"] = "Ubicación (URL) de la aplicación";
-$a->strings["Photo icon URL"] = "Dirección del icono que se va a utilizar para esta foto";
-$a->strings["80 x 80 pixels - optional"] = "80 x 80 pixels - opcional";
-$a->strings["Version ID"] = "Versión";
-$a->strings["Price of app"] = "Precio de la aplicación";
-$a->strings["Location (URL) to purchase app"] = "Ubicación (URL) donde adquirir la aplicación";
-$a->strings["sent you a private message"] = "enviarle un mensaje privado";
-$a->strings["added your channel"] = "añadió este canal a sus conexiones";
-$a->strings["posted an event"] = "publicó un evento";
-$a->strings["Comanche page description language help"] = "Página de ayuda del lenguaje de descripción de páginas (PDL) Comanche";
-$a->strings["Layout Description"] = "Descripción del formato";
-$a->strings["Download PDL file"] = "Descargar el fichero PDL";
-$a->strings["Welcome to %s"] = "Bienvenido a %s";
-$a->strings["Lorem Ipsum"] = "Lorem Ipsum";
-$a->strings["Bookmark added"] = "Marcador añadido";
-$a->strings["My Bookmarks"] = "Mis Marcadores";
-$a->strings["My Connections Bookmarks"] = "Marcadores de mis conexiones";
-$a->strings["Insufficient permissions.  Request redirected to profile page."] = "Permisos insuficientes. Petición redirigida a la página del perfil.";
-$a->strings["This setting requires special processing and editing has been blocked."] = "Este ajuste necesita de un proceso especial y la edición ha sido bloqueada.";
-$a->strings["Configuration Editor"] = "Editor de configuración";
-$a->strings["Warning: Changing some settings could render your channel inoperable. Please leave this page unless you are comfortable with and knowledgeable about how to correctly use this feature."] = "Atención: El cambio de algunos ajustes puede volver inoperante su canal. Por favor, abandone la página excepto que esté seguro y sepa cómo usar correctamente esta característica.";
-$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "No hay sugerencias disponibles. Si es un sitio nuevo, espere 24 horas y pruebe de nuevo.";
-$a->strings["Poll"] = "Sondear";
-$a->strings["View Results"] = "Mostrar resultados";
-$a->strings["No service class restrictions found."] = "No se han encontrado restricciones sobre esta clase de servicio.";
+$a->strings["\$Projectname Server - Setup"] = "Servidor \$Projectname  - Instalación";
+$a->strings["Could not connect to database."] = "No se ha podido conectar a la base de datos.";
+$a->strings["Could not connect to specified site URL. Possible SSL certificate or DNS issue."] = "No se puede conectar con la dirección del sitio indicada. Podría tratarse de un problema de SSL o DNS.";
+$a->strings["Could not create table."] = "No se puede crear la tabla.";
+$a->strings["Your site database has been installed."] = "La base de datos del sitio ha sido instalada.";
+$a->strings["You may need to import the file \"install/schema_xxx.sql\" manually using a database client."] = "Podría tener que importar manualmente el fichero \"install/schema_xxx.sql\" usando un cliente de base de datos.";
+$a->strings["Please see the file \"install/INSTALL.txt\"."] = "Por favor, lea el fichero \"install/INSTALL.txt\".";
+$a->strings["System check"] = "Verificación del sistema";
+$a->strings["Check again"] = "Verificar de nuevo";
+$a->strings["Database connection"] = "Conexión a la base de datos";
+$a->strings["In order to install \$Projectname we need to know how to connect to your database."] = "Para instalar \$Projectname es necesario saber cómo conectar con su base de datos.";
+$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Por favor, contacte con el proveedor de servicios o el administrador del sitio si tiene dudas sobre estos ajustes.";
+$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "La base de datos que especifique a continuación debe existir ya. Si no es así, por favor, créela antes de seguir.";
+$a->strings["Database Server Name"] = "Nombre del servidor de base de datos";
+$a->strings["Default is 127.0.0.1"] = "De forma predeterminada es 127.0.0.1";
+$a->strings["Database Port"] = "Puerto de la base de datos";
+$a->strings["Communication port number - use 0 for default"] = "Número del puerto de comunicaciones - use 0 como valor por defecto";
+$a->strings["Database Login Name"] = "Usuario de la base de datos";
+$a->strings["Database Login Password"] = "Contraseña de acceso a la base de datos";
+$a->strings["Database Name"] = "Nombre de la base de datos";
+$a->strings["Database Type"] = "Tipo de base de datos";
+$a->strings["Site administrator email address"] = "Dirección de correo electrónico del administrador del sitio";
+$a->strings["Your account email address must match this in order to use the web admin panel."] = "Su cuenta deberá usar la misma dirección de correo electrónico para poder utilizar el panel de administración web.";
+$a->strings["Website URL"] = "Dirección del sitio web";
+$a->strings["Please use SSL (https) URL if available."] = "Por favor, use SSL (https) si está disponible.";
+$a->strings["Please select a default timezone for your website"] = "Por favor, selecciones la zona horaria por defecto de su sitio web";
+$a->strings["Site settings"] = "Ajustes del sitio";
+$a->strings["Could not find a command line version of PHP in the web server PATH."] = "No se puede encontrar una versión en línea de comandos de PHP en la ruta del servidor web.";
+$a->strings["If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron."] = "Si no tiene instalada la versión de línea de comandos de PHP en su servidor, no podrá ejecutar sondeos en segundo plano mediante cron.";
+$a->strings["PHP executable path"] = "Ruta del ejecutable PHP";
+$a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Introducir la ruta completa del ejecutable PHP. Puede dejar la línea en blanco para continuar la instalación.";
+$a->strings["Command line PHP"] = "PHP en línea de comandos";
+$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "La línea de comandos PHP de su sistema no tiene activado \"register_argc_argv\".";
+$a->strings["This is required for message delivery to work."] = "Esto es necesario para que funcione la transmisión de mensajes.";
+$a->strings["PHP register_argc_argv"] = "PHP register_argc_argv";
+$a->strings["Your max allowed total upload size is set to %s. Maximum size of one file to upload is set to %s. You are allowed to upload up to %d files at once."] = "La carga máxima que se le permite subir está establecida en %s. El tamaño máximo de un fichero está establecido en %s. Está permitido subir hasta un máximo de %d ficheros de una sola vez.";
+$a->strings["You can adjust these settings in the servers php.ini."] = "Puede ajustar estos valores en el fichero php.ini de su servidor.";
+$a->strings["PHP upload limits"] = "Límites PHP de subida";
+$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Error: La función \"openssl_pkey_new\" en este sistema no es capaz de general claves de cifrado.";
+$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Si está en un servidor Windows, por favor, lea \"http://www.php.net/manual/en/openssl.installation.php\".";
+$a->strings["Generate encryption keys"] = "Generar claves de cifrado";
+$a->strings["libCurl PHP module"] = "módulo libCurl PHP";
+$a->strings["GD graphics PHP module"] = "módulo PHP GD graphics";
+$a->strings["OpenSSL PHP module"] = "módulo PHP OpenSSL";
+$a->strings["mysqli or postgres PHP module"] = "módulo PHP mysqli o postgres";
+$a->strings["mb_string PHP module"] = "módulo PHP mb_string";
+$a->strings["mcrypt PHP module"] = "módulo PHP mcrypt ";
+$a->strings["xml PHP module"] = "módulo PHP xml";
+$a->strings["Apache mod_rewrite module"] = "módulo Apache mod_rewrite ";
+$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Error: se necesita el módulo del servidor web Apache mod-rewrite pero no está instalado.";
+$a->strings["proc_open"] = "proc_open";
+$a->strings["Error: proc_open is required but is either not installed or has been disabled in php.ini"] = "Error: se necesita proc_open pero o no está instalado o ha sido desactivado en el fichero php.ini";
+$a->strings["Error: libCURL PHP module required but not installed."] = "Error: se necesita el módulo PHP libCURL pero no está instalado.";
+$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Error: el módulo PHP GD graphics es necesario, pero no está instalado.";
+$a->strings["Error: openssl PHP module required but not installed."] = "Error: el módulo PHP openssl es necesario, pero no está instalado.";
+$a->strings["Error: mysqli or postgres PHP module required but neither are installed."] = "Error: el módulo PHP mysqli o postgres es necesario pero ninguno de los dos está instalado.";
+$a->strings["Error: mb_string PHP module required but not installed."] = "Error: el módulo PHP mb_string es necesario, pero no está instalado.";
+$a->strings["Error: mcrypt PHP module required but not installed."] = "Error: el módulo PHP mcrypt es necesario, pero no está instalado.";
+$a->strings["Error: xml PHP module required for DAV but not installed."] = "Error: el módulo PHP xml es necesario para DAV, pero no está instalado.";
+$a->strings["The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so."] = "El instalador web no ha podido crear un fichero llamado “.htconfig.php” en la carpeta base de su servidor.";
+$a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "Esto está generalmente ligado a un problema de permisos, a causa del cual el servidor web tiene prohibido modificar ficheros en su carpeta - incluso si usted mismo tiene esos permisos.";
+$a->strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Red top folder."] = "Al término de este procedimiento, podemos crear un fichero de texto para guardar con el nombre .htconfig.php en el directorio raíz de su instalación de Hubzilla.";
+$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"install/INSTALL.txt\" for instructions."] = "Como alternativa, puede dejar este procedimiento e intentar realizar una instalación manual. Lea, por favor, el fichero\"install/INSTALL.txt\" para las instrucciones.";
+$a->strings[".htconfig.php is writable"] = ".htconfig.php tiene permisos de escritura";
+$a->strings["Red uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Hubzilla hace uso del motor de plantillas Smarty3 para diseñar sus plantillas gráficas. Smarty3 es más rápido porque compila las plantillas de páginas directamente en PHP.";
+$a->strings["In order to store these compiled templates, the web server needs to have write access to the directory %s under the Red top level folder."] = "Para poder guardar las plantillas compiladas, el servidor web necesita permisos para acceder al subdirectorio %s en el directorio de instalación de Hubzilla.";
+$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Por favor, asegúrese de que el servidor web está siendo ejecutado por un usuario que tenga permisos de escritura sobre esta carpeta (por ejemplo, www-data).";
+$a->strings["Note: as a security measure, you should give the web server write access to %s only--not the template files (.tpl) that it contains."] = "Nota: como medida de seguridad, debe dar al servidor web permisos de escritura solo sobre %s - no sobre el fichero de plantilla (.tpl) que contiene.";
+$a->strings["%s is writable"] = "%s tiene permisos de escritura";
+$a->strings["Red uses the store directory to save uploaded files. The web server needs to have write access to the store directory under the Red top level folder"] = "Red guarda los ficheros descargados en la carpeta \"store\". El servidor web necesita tener permisos de escritura sobre esa carpeta, en el directorio de instalación.";
+$a->strings["store is writable"] = "\"store\" tiene permisos de escritura";
+$a->strings["SSL certificate cannot be validated. Fix certificate or disable https access to this site."] = "El certificado SSL no ha podido ser validado. Corrija este problema o desactive el acceso https a este sitio.";
+$a->strings["If you have https access to your website or allow connections to TCP port 443 (the https: port), you MUST use a browser-valid certificate. You MUST NOT use self-signed certificates!"] = "Si su servidor soporta conexiones cifradas SSL o si permite conexiones al puerto TCP 443 (el puerto usado por el protocolo https), debe utilizar un certificado válido. No debe usar un certificado firmado por usted mismo.";
+$a->strings["This restriction is incorporated because public posts from you may for example contain references to images on your own hub."] = "Se ha incorporado esta restricción para evitar que sus publicaciones públicas hagan referencia a imágenes en su propio servidor.";
+$a->strings["If your certificate is not recognized, members of other sites (who may themselves have valid certificates) will get a warning message on their own site complaining about security issues."] = "Si su certificado no ha sido reconocido, los miembros de otros sitios (con certificados válidos) recibirán mensajes de aviso en sus propios sitios web.";
+$a->strings["This can cause usability issues elsewhere (not just on your own site) so we must insist on this requirement."] = "Por razones de compatibilidad (sobre el conjunto de la red, no solo sobre su propio sitio), debemos insistir en estos requisitos.";
+$a->strings["Providers are available that issue free certificates which are browser-valid."] = "Existen varias Autoridades de Certificación que le pueden proporcionar certificados válidos.";
+$a->strings["SSL certificate validation"] = "validación del certificado SSL";
+$a->strings["Url rewrite in .htaccess is not working. Check your server configuration.Test: "] = "No se pueden reescribir las direcciones web en .htaccess. Compruebe la configuración de su servidor:";
+$a->strings["Url rewrite is working"] = "La reescritura de las direcciones funciona correctamente";
+$a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "El fichero de configuración de la base de datos .htconfig.php no se ha podido modificar. Por favor, copie el texto generado en un fichero con ese nombre en el directorio raíz de su servidor.";
+$a->strings["Errors encountered creating database tables."] = "Se han encontrado errores al crear las tablas de la base de datos.";
+$a->strings["<h1>What next</h1>"] = "<h1>Siguiente paso</h1>";
+$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANTE: Debe crear [manualmente] una tarea programada para el \"poller\".";
 $a->strings["Files: shared with me"] = "Ficheros: compartidos conmigo";
 $a->strings["NEW"] = "NUEVO";
-$a->strings["Remove all files"] = "Borrar todos los ficheros";
-$a->strings["Remove this file"] = "Borrar este fichero";
-$a->strings["Schema Default"] = "Esquema predeterminado";
-$a->strings["Sans-Serif"] = "Sans-Serif";
-$a->strings["Monospace"] = "Monospace";
+$a->strings["Remove all files"] = "Eliminar todos los ficheros";
+$a->strings["Remove this file"] = "Eliminar este fichero";
+$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "No hay sugerencias disponibles. Si es un sitio nuevo, espere 24 horas y pruebe de nuevo.";
+$a->strings["Profile not found."] = "Perfil no encontrado.";
+$a->strings["Profile deleted."] = "Perfil eliminado.";
+$a->strings["Profile-"] = "Perfil-";
+$a->strings["New profile created."] = "El nuevo perfil ha sido creado.";
+$a->strings["Profile unavailable to clone."] = "Perfil no disponible para clonar.";
+$a->strings["Profile unavailable to export."] = "Perfil no disponible para exportar.";
+$a->strings["Profile Name is required."] = "Se necesita el nombre del perfil.";
+$a->strings["Marital Status"] = "Estado civil";
+$a->strings["Romantic Partner"] = "Pareja sentimental";
+$a->strings["Likes"] = "Me gusta";
+$a->strings["Dislikes"] = "No me gusta";
+$a->strings["Work/Employment"] = "Trabajo:";
+$a->strings["Religion"] = "Religión";
+$a->strings["Political Views"] = "Ideas políticas";
+$a->strings["Sexual Preference"] = "Preferencia sexual";
+$a->strings["Homepage"] = "Página personal";
+$a->strings["Interests"] = "Intereses";
+$a->strings["Profile updated."] = "Perfil actualizado.";
+$a->strings["Hide your contact/friend list from viewers of this profile?"] = "¿Ocultar su lista de contactos a los visitantes de este perfil?";
+$a->strings["Edit Profile Details"] = "Modificar los detalles de este perfil";
+$a->strings["View this profile"] = "Ver este perfil";
+$a->strings["Change Profile Photo"] = "Cambiar la foto del perfil";
+$a->strings["Create a new profile using these settings"] = "Crear un nuevo perfil usando estos ajustes";
+$a->strings["Clone this profile"] = "Clonar este perfil";
+$a->strings["Delete this profile"] = "Eliminar este perfil";
+$a->strings["Import profile from file"] = "Importar perfil desde un fichero";
+$a->strings["Export profile to file"] = "Exportar perfil a un fichero";
+$a->strings["Profile Name:"] = "Nombre del perfil:";
+$a->strings["Your Full Name:"] = "Su nombre completo:";
+$a->strings["Title/Description:"] = "Título/Descripción:";
+$a->strings["Your Gender:"] = "Su género:";
+$a->strings["Birthday :"] = "Cumpleaños:";
+$a->strings["Street Address:"] = "Calle:";
+$a->strings["Locality/City:"] = "Ciudad:";
+$a->strings["Postal/Zip Code:"] = "Código postal:";
+$a->strings["Country:"] = "País:";
+$a->strings["Region/State:"] = "Región/Estado:";
+$a->strings["<span class=\"heart\">&hearts;</span> Marital Status:"] = "<span class=\"heart\">&hearts;</span> Estado sentimental:";
+$a->strings["Who: (if applicable)"] = "Quién: (si es aplicable)";
+$a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Por ejemplo: ana123, María González, sara@ejemplo.com";
+$a->strings["Since [date]:"] = "Desde [fecha]:";
+$a->strings["Homepage URL:"] = "Dirección de la página personal:";
+$a->strings["Religious Views:"] = "Creencias religiosas:";
+$a->strings["Keywords:"] = "Palabras clave:";
+$a->strings["Example: fishing photography software"] = "Por ejemplo: software de fotografía submarina";
+$a->strings["Used in directory listings"] = "Visible en el directorio público del canal";
+$a->strings["Tell us about yourself..."] = "Háblenos de usted...";
+$a->strings["Hobbies/Interests"] = "Aficiones/Intereses";
+$a->strings["Contact information and Social Networks"] = "Información de contacto y redes sociales";
+$a->strings["My other channels"] = "Mis otros canales";
+$a->strings["Musical interests"] = "Preferencias musicales";
+$a->strings["Books, literature"] = "Libros, literatura";
+$a->strings["Television"] = "Televisión";
+$a->strings["Film/dance/culture/entertainment"] = "Cine/danza/cultura/entretenimiento";
+$a->strings["Love/romance"] = "Vida sentimental/amorosa";
+$a->strings["Work/employment"] = "Trabajo";
+$a->strings["School/education"] = "Estudios";
+$a->strings["This is your default profile."] = "Este es su perfil principal.";
+$a->strings["Age: "] = "Edad:";
+$a->strings["Edit/Manage Profiles"] = "Modificar/gestionar perfiles";
+$a->strings["Add profile things"] = "Añadir cosas al perfil";
+$a->strings["Include desirable objects in your profile"] = "Añadir objetos interesantes en su perfil";
+$a->strings["Invalid profile identifier."] = "Identificador del perfil no válido";
+$a->strings["Profile Visibility Editor"] = "Editor de visibilidad del perfil";
+$a->strings["Click on a contact to add or remove."] = "Pulsar en un contacto para añadirlo o eliminarlo.";
+$a->strings["Visible To"] = "Visible para";
+$a->strings["Select a bookmark folder"] = "Seleccionar una carpeta de marcadores";
+$a->strings["Save Bookmark"] = "Guardar marcador";
+$a->strings["URL of bookmark"] = "Dirección del marcador";
+$a->strings["Or enter new bookmark folder name"] = "O introduzca un nuevo nombre para la carpeta de marcadores";
+$a->strings["Import completed"] = "Importación completada";
+$a->strings["Import Items"] = "Importar elementos";
+$a->strings["Use this form to import existing posts and content from an export file."] = "Utilice este formulario para importar entradas existentes y contenido desde un archivo de exportación.";
+$a->strings["Focus (Hubzilla default)"] = "Focus (predefinido)";
 $a->strings["Theme settings"] = "Ajustes del tema";
-$a->strings["Set scheme"] = "Ajustar esquema";
-$a->strings["Set font-size for posts and comments"] = "Ajustar el tamaño del tipo de letra para entradas y comentarios";
-$a->strings["Set font face"] = "Ajustar el tipo de letra";
-$a->strings["Set iconset"] = "Ajustar el conjunto de iconos";
-$a->strings["Set big shadow size, default 15px 15px 15px"] = "Ajustar el sombreado grande, por defecto 15px 15px 15px";
-$a->strings["Set small shadow size, default 5px 5px 5px"] = "Ajustar el sombreado pequeño, por defecto 5px 5px 5px";
-$a->strings["Set shadow color, default #000"] = "Ajustar el color del sombreado, predeterminado a #000";
-$a->strings["Set radius size, default 5px"] = "Ajusta el tamaño del radio, predeterminado a 5px";
-$a->strings["Set line-height for posts and comments"] = "Ajustar la altura de linea para entradas y comentarios";
-$a->strings["Set background image"] = "Ajustar la imagen de fondo";
-$a->strings["Set background attachment"] = "Ajustar el fondo adjuntado";
-$a->strings["Set background color"] = "Ajustar el color de fondo";
-$a->strings["Set section background image"] = "Ajustar la imagen de la sección del fondo";
-$a->strings["Set section background color"] = "Ajustar el color de la sección del fondo";
-$a->strings["Set color of items - use hex"] = "Ajustar el color de los elementos - utilizar código hexadecimal";
-$a->strings["Set color of links - use hex"] = "Ajusta el color de los enlaces - utilizar código hexadecimal";
-$a->strings["Set max-width for items.  Default 400px"] = "Ajustar la anchura máxima para los elementos. Predeterminado a 400px";
-$a->strings["Set min-width for items.  Default 240px"] = "Ajustar la anchura mínima para los elementos. Predeterminado a 240px";
-$a->strings["Set the generic content wrapper width.  Default 48%"] = "Ajustar el ancho de la envoltura del contenido genérico. Predeterminado 48%";
-$a->strings["Set color of fonts - use hex"] = "Ajustar el color del tipo de letra - utiliza código hexadecimal";
-$a->strings["Set background-size element"] = "Ajustar el tamaño de fondo del elemento";
-$a->strings["Item opacity"] = "Opacidad del elemento";
-$a->strings["Display post previews only"] = "Mostrar solo las previsualizaciones de las entradas";
-$a->strings["Display side bar on channel page"] = "Muestra la barra lateral en la página del canal";
-$a->strings["Colour of the navigation bar"] = "Color de la barra de navegación";
-$a->strings["Item float"] = "Elemento flotante";
-$a->strings["Left offset of the section element"] = "Desplazamiento izquierdo del elemento de la sección";
-$a->strings["Right offset of the section element"] = "Desplazamiento derecho del elemento de la sección";
-$a->strings["Section width"] = "Ancho de la sección";
-$a->strings["Left offset of the aside"] = "Desplazamiento izquierdo del lateral";
-$a->strings["Right offset of the aside element"] = "Desplazamiento derecho del elemento lateral";
-$a->strings["Light (Red Matrix default)"] = "Ligero (predeterminado de RedMatrix)";
 $a->strings["Select scheme"] = "Elegir un esquema";
 $a->strings["Narrow navbar"] = "Estrechar la barra de navegación";
 $a->strings["Navigation bar background color"] = "Color de fondo de la barra de navegación";
@@ -2127,23 +2154,24 @@ $a->strings["Set the basic color for item icons"] = "Ajustar el color básico pa
 $a->strings["Set the hover color for item icons"] = "Ajustar el color flotante para los iconos de los elementos";
 $a->strings["Set font-size for the entire application"] = "Ajustar el tamaño de letra para toda la aplicación";
 $a->strings["Example: 14px"] = "Ejemplo: 14px";
+$a->strings["Set font-size for posts and comments"] = "Ajustar el tamaño del tipo de letra para entradas y comentarios";
 $a->strings["Set font-color for posts and comments"] = "Establecer el color de la letra para publicaciones y comentarios";
 $a->strings["Set radius of corners"] = "Establecer el radio de curvatura de las esquinas";
 $a->strings["Set shadow depth of photos"] = "Ajustar la profundidad de sombras de las fotos";
 $a->strings["Set maximum width of content region in pixel"] = "Ajustar la anchura máxima de la región de contenido, en pixels";
 $a->strings["Leave empty for default width"] = "Dejar en blanco para la anchura predeterminada";
-$a->strings["Center page content"] = "Contenido del centro de la página";
+$a->strings["Left align page content"] = "Alinear a la izquierda el contenido de la página";
 $a->strings["Set minimum opacity of nav bar - to hide it"] = "Ajustar la opacidad mínima de la barra de navegación - para ocultarla";
 $a->strings["Set size of conversation author photo"] = "Ajustar el tamaño de la foto del autor de la conversación";
 $a->strings["Set size of followup author photos"] = "Ajustar el tamaño de foto de los seguidores del autor";
 $a->strings["Update %s failed. See error logs."] = "La actualización %s ha fallado. Mire el informe de errores.";
-$a->strings["Update Error at %s"] = "Error de Actualización en %s";
-$a->strings["Create an account to access services and applications within the Red Matrix"] = "Crear una cuenta para acceder a los servicios y aplicaciones dentro de la red";
+$a->strings["Update Error at %s"] = "Error de actualización en %s";
+$a->strings["Create an account to access services and applications within the Hubzilla"] = "Crear una cuenta para acceder a los servicios y aplicaciones dentro de Hubzilla";
 $a->strings["Password"] = "Contraseña";
 $a->strings["Remember me"] = "Recordarme";
 $a->strings["Forgot your password?"] = "¿Olvidó su contraseña?";
 $a->strings["toggle mobile"] = "cambiar a modo móvil";
-$a->strings["Website SSL certificate is not valid. Please correct."] = "El certificado SSL del sitio web no es válido. Por favor, corríjalo.";
-$a->strings["[red] Website SSL error for %s"] = "[red] Error SSL del sitio web en %s";
-$a->strings["Cron/Scheduled tasks not running."] = "Las tareas del Planificador/Cron no se están funcionando.";
-$a->strings["[red] Cron tasks not running on %s"] = "[red] Las tareas de Cron no están funcionando en %s";
+$a->strings["Website SSL certificate is not valid. Please correct."] = "El certificado SSL del sitio web no es válido. Por favor, solucione el problema.";
+$a->strings["[hubzilla] Website SSL error for %s"] = "[hubzilla] Error SSL del sitio web en %s";
+$a->strings["Cron/Scheduled tasks not running."] = "Las tareas del Planificador/Cron no están funcionando.";
+$a->strings["[hubzilla] Cron tasks not running on %s"] = "[hubzilla] Las tareas de Cron no están funcionando en %s";
diff --git a/view/es/messages.po b/view/es/messages.po
index cc6d56196..6c2093830 100644
--- a/view/es/messages.po
+++ b/view/es/messages.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Redmatrix\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-18 00:04-0700\n"
-"PO-Revision-Date: 2015-09-22 14:10+0000\n"
+"POT-Creation-Date: 2015-10-17 16:47-0700\n"
+"PO-Revision-Date: 2015-10-18 15:17+0000\n"
 "Last-Translator: Manuel Jiménez Friaza <mjfriaza@openmailbox.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/Friendica/red-matrix/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -422,7 +422,7 @@ msgstr "Creado"
 msgid "Edited"
 msgstr "Editado"
 
-#: ../../include/api.php:1234
+#: ../../include/api.php:1267
 msgid "Public Timeline"
 msgstr "Cronología pública"
 
@@ -660,7 +660,7 @@ msgstr "Guardar"
 
 #: ../../include/text.php:990
 msgid "poke"
-msgstr "dar un toque"
+msgstr "un toque"
 
 #: ../../include/text.php:990 ../../include/conversation.php:243
 msgid "poked"
@@ -668,7 +668,7 @@ msgstr "ha recibido un toque"
 
 #: ../../include/text.php:991
 msgid "ping"
-msgstr "avisar"
+msgstr "un \"ping\""
 
 #: ../../include/text.php:991
 msgid "pinged"
@@ -692,19 +692,19 @@ msgstr "abofeteado/a"
 
 #: ../../include/text.php:994
 msgid "finger"
-msgstr "señalar"
+msgstr "un \"finger\""
 
 #: ../../include/text.php:994
 msgid "fingered"
-msgstr "señalado/a"
+msgstr "ha recibido un \"finger\""
 
 #: ../../include/text.php:995
 msgid "rebuff"
-msgstr "desairar"
+msgstr "un rechazo"
 
 #: ../../include/text.php:995
 msgid "rebuffed"
-msgstr "desairado/a"
+msgstr "ha sido rechazado/a"
 
 #: ../../include/text.php:1005
 msgid "happy"
@@ -834,7 +834,8 @@ msgstr "marzo"
 msgid "April"
 msgstr "abril"
 
-#: ../../include/text.php:1201
+#: ../../include/text.php:1201 ../../mod/uexport.php:58
+#: ../../mod/uexport.php:59
 msgid "May"
 msgstr "mayo"
 
@@ -926,7 +927,7 @@ msgstr "evento"
 #: ../../include/conversation.php:148 ../../mod/like.php:349
 #: ../../mod/subthread.php:72 ../../mod/subthread.php:174
 msgid "status"
-msgstr "estado"
+msgstr "el mensaje de estado"
 
 #: ../../include/text.php:1892 ../../include/conversation.php:150
 #: ../../mod/tagger.php:53
@@ -1091,7 +1092,7 @@ msgstr "Gracias,"
 #: ../../include/network.php:1590 ../../include/enotify.php:63
 #, php-format
 msgid "%s Administrator"
-msgstr "%s Administrador"
+msgstr "Administrador de %s"
 
 #: ../../include/network.php:1646
 msgid "No Subject"
@@ -1380,7 +1381,7 @@ msgstr "Editar una aplicación personal"
 
 #: ../../include/widgets.php:136 ../../include/widgets.php:175
 #: ../../include/Contact.php:107 ../../include/conversation.php:956
-#: ../../include/identity.php:933 ../../mod/directory.php:316
+#: ../../include/identity.php:956 ../../mod/directory.php:316
 #: ../../mod/match.php:64 ../../mod/suggest.php:52
 msgid "Connect"
 msgstr "Conectar"
@@ -1557,7 +1558,7 @@ msgid "Finishes:"
 msgstr "Finaliza:"
 
 #: ../../include/event.php:50 ../../include/bb2diaspora.php:481
-#: ../../include/identity.php:984 ../../mod/directory.php:302
+#: ../../include/identity.php:1007 ../../mod/directory.php:302
 #: ../../mod/events.php:684
 msgid "Location:"
 msgstr "Ubicación:"
@@ -1603,12 +1604,12 @@ msgstr "%1$s, %2$s ha comentado sobre [zrl=%3$s]%4$s[/zrl]"
 #: ../../include/enotify.php:166
 #, php-format
 msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
-msgstr "%1$s, %2$s ha comentado sobre el [zrl=%3$s]%5$s de %4$s[/zrl]"
+msgstr "%1$s, %2$s ha comentado [zrl=%3$s]%5$s de %4$s[/zrl]"
 
 #: ../../include/enotify.php:175
 #, php-format
 msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
-msgstr "%1$s, %2$s ha comentado [zrl=%3$s]su %4$s[/zrl]"
+msgstr "%1$s, %2$s ha comentado [zrl=%3$s]%4$s creado por usted[/zrl]"
 
 #: ../../include/enotify.php:186
 #, php-format
@@ -1665,7 +1666,7 @@ msgstr "[Red:Aviso]  %1$s le ha dado un toque"
 #: ../../include/enotify.php:239
 #, php-format
 msgid "%1$s, %2$s poked you at %3$s"
-msgstr "%1$s, %2$s le dio un toque sobre %3$s"
+msgstr "%1$s, %2$s le dio un toque en %3$s"
 
 #: ../../include/enotify.php:240
 #, php-format
@@ -1680,7 +1681,7 @@ msgstr "[Red:Aviso]  %s etiquetó su entrada"
 #: ../../include/enotify.php:257
 #, php-format
 msgid "%1$s, %2$s tagged your post at %3$s"
-msgstr "%1$s, %2$s ha etiquetado su publicación sobre %3$s"
+msgstr "%1$s, %2$s ha etiquetado su publicación en %3$s"
 
 #: ../../include/enotify.php:258
 #, php-format
@@ -1862,7 +1863,7 @@ msgid "View all"
 msgstr "Ver todo"
 
 #: ../../include/ItemObject.php:179 ../../include/taxonomy.php:396
-#: ../../include/conversation.php:1712 ../../include/identity.php:1243
+#: ../../include/conversation.php:1712 ../../include/identity.php:1266
 #: ../../mod/photos.php:1019
 msgctxt "noun"
 msgid "Like"
@@ -2114,7 +2115,7 @@ msgstr "Editar perfiles"
 msgid "Manage/Edit profiles"
 msgstr "Administrar/editar perfiles"
 
-#: ../../include/nav.php:95 ../../include/identity.php:956
+#: ../../include/nav.php:95 ../../include/identity.php:979
 msgid "Edit Profile"
 msgstr "Editar perfil"
 
@@ -2416,7 +2417,7 @@ msgstr "Pueden verse mis conexiones"
 
 #: ../../include/permissions.php:30
 msgid "Can view my file storage"
-msgstr "Pueden verse mis ficheros compartidos"
+msgstr "Puede verse mi repositorio de ficheros"
 
 #: ../../include/permissions.php:31
 msgid "Can view my webpages"
@@ -2464,7 +2465,7 @@ msgstr "Se puede charlar conmigo (cuando esté disponible)"
 
 #: ../../include/permissions.php:43
 msgid "Can write to my file storage"
-msgstr "Puede escribirse en mi carpeta de ficheros"
+msgstr "Puede escribirse en mi repositorio de ficheros"
 
 #: ../../include/permissions.php:44
 msgid "Can edit my webpages"
@@ -2589,12 +2590,12 @@ msgstr "Abstención"
 #: ../../include/conversation.php:585 ../../mod/photos.php:998
 msgctxt "title"
 msgid "Attending"
-msgstr "Participar"
+msgstr "Participaré"
 
 #: ../../include/conversation.php:585 ../../mod/photos.php:998
 msgctxt "title"
 msgid "Not attending"
-msgstr "No participar"
+msgstr "No participaré"
 
 #: ../../include/conversation.php:585 ../../mod/photos.php:998
 msgctxt "title"
@@ -2636,7 +2637,7 @@ msgstr "Seguir el hilo"
 
 #: ../../include/conversation.php:952
 msgid "View Status"
-msgstr "Ver estado"
+msgstr "Estado actual"
 
 #: ../../include/conversation.php:954
 msgid "View Photos"
@@ -2656,7 +2657,7 @@ msgstr "Enviar Mensaje Privado"
 
 #: ../../include/conversation.php:959 ../../include/apps.php:145
 msgid "Poke"
-msgstr "Dar un toque"
+msgstr "Toques y otras cosas"
 
 #: ../../include/conversation.php:1073
 #, php-format
@@ -2946,7 +2947,7 @@ msgstr "Álbumes de fotos"
 
 #: ../../include/conversation.php:1623
 msgid "Files and Storage"
-msgstr "Ficheros y carpetas"
+msgstr "Repositorio de ficheros"
 
 #: ../../include/conversation.php:1633 ../../include/conversation.php:1636
 msgid "Chatrooms"
@@ -2965,14 +2966,14 @@ msgctxt "noun"
 msgid "Attending"
 msgid_plural "Attending"
 msgstr[0] "Asistir"
-msgstr[1] "Participar"
+msgstr[1] "Participaré"
 
 #: ../../include/conversation.php:1721
 msgctxt "noun"
 msgid "Not Attending"
 msgid_plural "Not Attending"
 msgstr[0] "No asistir"
-msgstr[1] "No participar"
+msgstr[1] "No participaré"
 
 #: ../../include/conversation.php:1724
 msgctxt "noun"
@@ -3008,51 +3009,51 @@ msgstr[1] "Se abstienen"
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
-#: ../../include/items.php:1038 ../../include/items.php:1084
+#: ../../include/items.php:1101 ../../include/items.php:1147
 msgid "(Unknown)"
 msgstr "(Desconocido)"
 
-#: ../../include/items.php:1310
+#: ../../include/items.php:1373
 msgid "Visible to anybody on the internet."
 msgstr "Visible para cualquiera en internet."
 
-#: ../../include/items.php:1312
+#: ../../include/items.php:1375
 msgid "Visible to you only."
 msgstr "Visible sólo para usted."
 
-#: ../../include/items.php:1314
+#: ../../include/items.php:1377
 msgid "Visible to anybody in this network."
 msgstr "Visible para cualquiera en esta red."
 
-#: ../../include/items.php:1316
+#: ../../include/items.php:1379
 msgid "Visible to anybody authenticated."
 msgstr "Visible para cualquiera que haya sido autenticado."
 
-#: ../../include/items.php:1318
+#: ../../include/items.php:1381
 #, php-format
 msgid "Visible to anybody on %s."
 msgstr "Visible para cualquiera en %s."
 
-#: ../../include/items.php:1320
+#: ../../include/items.php:1383
 msgid "Visible to all connections."
 msgstr "Visible para todas las conexiones."
 
-#: ../../include/items.php:1322
+#: ../../include/items.php:1385
 msgid "Visible to approved connections."
 msgstr "Visible para las conexiones permitidas."
 
-#: ../../include/items.php:1324
+#: ../../include/items.php:1387
 msgid "Visible to specific connections."
 msgstr "Visible para conexiones específicas."
 
-#: ../../include/items.php:4223 ../../mod/thing.php:74
+#: ../../include/items.php:4310 ../../mod/thing.php:74
 #: ../../mod/filestorage.php:27 ../../mod/viewsrc.php:20
 #: ../../mod/admin.php:167 ../../mod/admin.php:1025 ../../mod/admin.php:1225
 #: ../../mod/display.php:36
 msgid "Item not found."
 msgstr "Elemento no encontrado."
 
-#: ../../include/items.php:4296 ../../include/attach.php:137
+#: ../../include/items.php:4383 ../../include/attach.php:137
 #: ../../include/attach.php:184 ../../include/attach.php:247
 #: ../../include/attach.php:261 ../../include/attach.php:305
 #: ../../include/attach.php:319 ../../include/attach.php:350
@@ -3095,38 +3096,38 @@ msgstr "Elemento no encontrado."
 msgid "Permission denied."
 msgstr "Acceso denegado."
 
-#: ../../include/items.php:4700 ../../mod/group.php:38 ../../mod/group.php:140
+#: ../../include/items.php:4787 ../../mod/group.php:38 ../../mod/group.php:140
 #: ../../mod/bulksetclose.php:51
 msgid "Collection not found."
 msgstr "Colección no encontrada."
 
-#: ../../include/items.php:4716
+#: ../../include/items.php:4803
 msgid "Collection is empty."
 msgstr "La colección está vacía."
 
-#: ../../include/items.php:4723
+#: ../../include/items.php:4810
 #, php-format
 msgid "Collection: %s"
 msgstr "Colección: %s"
 
-#: ../../include/items.php:4733 ../../mod/connedit.php:674
+#: ../../include/items.php:4820 ../../mod/connedit.php:674
 #, php-format
 msgid "Connection: %s"
 msgstr "Conexión: %s"
 
-#: ../../include/items.php:4735
+#: ../../include/items.php:4822
 msgid "Connection not found."
 msgstr "Conexión no encontrada"
 
-#: ../../include/zot.php:677
+#: ../../include/zot.php:684
 msgid "Invalid data packet"
 msgstr "Paquete de datos no válido"
 
-#: ../../include/zot.php:693
+#: ../../include/zot.php:700
 msgid "Unable to verify channel signature"
 msgstr "No ha sido posible de verificar la signatura del canal"
 
-#: ../../include/zot.php:2161
+#: ../../include/zot.php:2208
 #, php-format
 msgid "Unable to verify site signature for %s"
 msgstr "No ha sido posible de verificar la signatura del sitio para %s"
@@ -3324,11 +3325,11 @@ msgstr "No ha sido posible recuperar la identidad creada"
 msgid "Default Profile"
 msgstr "Perfil principal"
 
-#: ../../include/identity.php:736
+#: ../../include/identity.php:759
 msgid "Requested channel is not available."
 msgstr "El canal solicitado no está disponible."
 
-#: ../../include/identity.php:783 ../../mod/profile.php:16
+#: ../../include/identity.php:806 ../../mod/profile.php:16
 #: ../../mod/achievements.php:11 ../../mod/webpages.php:29
 #: ../../mod/connect.php:13 ../../mod/hcard.php:8 ../../mod/blocks.php:29
 #: ../../mod/editlayout.php:27 ../../mod/editwebpage.php:28
@@ -3337,193 +3338,193 @@ msgstr "El canal solicitado no está disponible."
 msgid "Requested profile is not available."
 msgstr "El perfil solicitado no está disponible."
 
-#: ../../include/identity.php:946 ../../mod/profiles.php:774
+#: ../../include/identity.php:969 ../../mod/profiles.php:774
 msgid "Change profile photo"
 msgstr "Cambiar foto de perfil"
 
-#: ../../include/identity.php:952
+#: ../../include/identity.php:975
 msgid "Profiles"
 msgstr "Perfiles"
 
-#: ../../include/identity.php:952
+#: ../../include/identity.php:975
 msgid "Manage/edit profiles"
 msgstr "Administrar/editar perfiles"
 
-#: ../../include/identity.php:953 ../../mod/profiles.php:775
+#: ../../include/identity.php:976 ../../mod/profiles.php:775
 msgid "Create New Profile"
 msgstr "Crear nuevo perfil"
 
-#: ../../include/identity.php:968 ../../mod/profiles.php:786
+#: ../../include/identity.php:991 ../../mod/profiles.php:786
 msgid "Profile Image"
 msgstr "Imagen de perfil"
 
-#: ../../include/identity.php:971
+#: ../../include/identity.php:994
 msgid "visible to everybody"
 msgstr "visible para cualquiera"
 
-#: ../../include/identity.php:972 ../../mod/profiles.php:669
+#: ../../include/identity.php:995 ../../mod/profiles.php:669
 #: ../../mod/profiles.php:790
 msgid "Edit visibility"
 msgstr "Editar visibilidad"
 
-#: ../../include/identity.php:988 ../../include/identity.php:1227
+#: ../../include/identity.php:1011 ../../include/identity.php:1250
 msgid "Gender:"
 msgstr "Género:"
 
-#: ../../include/identity.php:989 ../../include/identity.php:1271
+#: ../../include/identity.php:1012 ../../include/identity.php:1294
 msgid "Status:"
 msgstr "Estado:"
 
-#: ../../include/identity.php:990 ../../include/identity.php:1282
+#: ../../include/identity.php:1013 ../../include/identity.php:1305
 msgid "Homepage:"
 msgstr "Página personal:"
 
-#: ../../include/identity.php:991
+#: ../../include/identity.php:1014
 msgid "Online Now"
 msgstr "Ahora en línea"
 
-#: ../../include/identity.php:1074 ../../include/identity.php:1152
+#: ../../include/identity.php:1097 ../../include/identity.php:1175
 #: ../../mod/ping.php:324
 msgid "g A l F d"
 msgstr "g A l d F"
 
-#: ../../include/identity.php:1075 ../../include/identity.php:1153
+#: ../../include/identity.php:1098 ../../include/identity.php:1176
 msgid "F d"
 msgstr "d F"
 
-#: ../../include/identity.php:1120 ../../include/identity.php:1192
+#: ../../include/identity.php:1143 ../../include/identity.php:1215
 #: ../../mod/ping.php:346
 msgid "[today]"
 msgstr "[hoy]"
 
-#: ../../include/identity.php:1131
+#: ../../include/identity.php:1154
 msgid "Birthday Reminders"
 msgstr "Recordatorios de cumpleaños"
 
-#: ../../include/identity.php:1132
+#: ../../include/identity.php:1155
 msgid "Birthdays this week:"
 msgstr "Cumpleaños esta semana:"
 
-#: ../../include/identity.php:1185
+#: ../../include/identity.php:1208
 msgid "[No description]"
 msgstr "[Sin descripción]"
 
-#: ../../include/identity.php:1203
+#: ../../include/identity.php:1226
 msgid "Event Reminders"
 msgstr "Recordatorios de eventos"
 
-#: ../../include/identity.php:1204
+#: ../../include/identity.php:1227
 msgid "Events this week:"
 msgstr "Eventos de esta semana:"
 
-#: ../../include/identity.php:1217 ../../include/identity.php:1334
+#: ../../include/identity.php:1240 ../../include/identity.php:1357
 #: ../../include/apps.php:138 ../../mod/profperm.php:112
 msgid "Profile"
 msgstr "Perfil"
 
-#: ../../include/identity.php:1225 ../../mod/settings.php:1056
+#: ../../include/identity.php:1248 ../../mod/settings.php:1056
 msgid "Full Name:"
 msgstr "Nombre completo:"
 
-#: ../../include/identity.php:1232
+#: ../../include/identity.php:1255
 msgid "Like this channel"
 msgstr "Me gusta este canal"
 
-#: ../../include/identity.php:1256
+#: ../../include/identity.php:1279
 msgid "j F, Y"
 msgstr "j F Y"
 
-#: ../../include/identity.php:1257
+#: ../../include/identity.php:1280
 msgid "j F"
 msgstr "j F"
 
-#: ../../include/identity.php:1264
+#: ../../include/identity.php:1287
 msgid "Birthday:"
 msgstr "Cumpleaños:"
 
-#: ../../include/identity.php:1268 ../../mod/directory.php:297
+#: ../../include/identity.php:1291 ../../mod/directory.php:297
 msgid "Age:"
 msgstr "Edad:"
 
-#: ../../include/identity.php:1277
+#: ../../include/identity.php:1300
 #, php-format
 msgid "for %1$d %2$s"
 msgstr "por %1$d %2$s"
 
-#: ../../include/identity.php:1280 ../../mod/profiles.php:691
+#: ../../include/identity.php:1303 ../../mod/profiles.php:691
 msgid "Sexual Preference:"
 msgstr "Orientación sexual:"
 
-#: ../../include/identity.php:1284 ../../mod/directory.php:313
+#: ../../include/identity.php:1307 ../../mod/directory.php:313
 #: ../../mod/profiles.php:693
 msgid "Hometown:"
 msgstr "Ciudad de origen:"
 
-#: ../../include/identity.php:1286
+#: ../../include/identity.php:1309
 msgid "Tags:"
 msgstr "Etiquetas:"
 
-#: ../../include/identity.php:1288 ../../mod/profiles.php:694
+#: ../../include/identity.php:1311 ../../mod/profiles.php:694
 msgid "Political Views:"
 msgstr "Posición política:"
 
-#: ../../include/identity.php:1290
+#: ../../include/identity.php:1313
 msgid "Religion:"
 msgstr "Religión:"
 
-#: ../../include/identity.php:1292 ../../mod/directory.php:315
+#: ../../include/identity.php:1315 ../../mod/directory.php:315
 msgid "About:"
 msgstr "Sobre mí:"
 
-#: ../../include/identity.php:1294
+#: ../../include/identity.php:1317
 msgid "Hobbies/Interests:"
 msgstr "Aficciones/Intereses:"
 
-#: ../../include/identity.php:1296 ../../mod/profiles.php:697
+#: ../../include/identity.php:1319 ../../mod/profiles.php:697
 msgid "Likes:"
 msgstr "Me gusta:"
 
-#: ../../include/identity.php:1298 ../../mod/profiles.php:698
+#: ../../include/identity.php:1321 ../../mod/profiles.php:698
 msgid "Dislikes:"
 msgstr "No me gusta:"
 
-#: ../../include/identity.php:1300
+#: ../../include/identity.php:1323
 msgid "Contact information and Social Networks:"
 msgstr "Información de contacto y redes sociales:"
 
-#: ../../include/identity.php:1302
+#: ../../include/identity.php:1325
 msgid "My other channels:"
 msgstr "Mis otros canales:"
 
-#: ../../include/identity.php:1304
+#: ../../include/identity.php:1327
 msgid "Musical interests:"
 msgstr "Intereses musicales:"
 
-#: ../../include/identity.php:1306
+#: ../../include/identity.php:1329
 msgid "Books, literature:"
 msgstr "Libros, literatura:"
 
-#: ../../include/identity.php:1308
+#: ../../include/identity.php:1331
 msgid "Television:"
 msgstr "Televisión:"
 
-#: ../../include/identity.php:1310
+#: ../../include/identity.php:1333
 msgid "Film/dance/culture/entertainment:"
 msgstr "Cine/danza/cultura/entretenimiento:"
 
-#: ../../include/identity.php:1312
+#: ../../include/identity.php:1335
 msgid "Love/Romance:"
 msgstr "Vida sentimental/amorosa:"
 
-#: ../../include/identity.php:1314
+#: ../../include/identity.php:1337
 msgid "Work/employment:"
 msgstr "Trabajo:"
 
-#: ../../include/identity.php:1316
+#: ../../include/identity.php:1339
 msgid "School/education:"
 msgstr "Estudios:"
 
-#: ../../include/identity.php:1336
+#: ../../include/identity.php:1359
 msgid "Like this thing"
 msgstr "Me gusta esto"
 
@@ -4273,7 +4274,7 @@ msgstr "Omitir este paso"
 
 #: ../../mod/profile_photo.php:366
 msgid "select a photo from your photo albums"
-msgstr "Seleccione una foto de sus álbumes de fotos"
+msgstr "Seleccione una foto de sus álbumes"
 
 #: ../../mod/profile_photo.php:382
 msgid "Crop Image"
@@ -4610,7 +4611,7 @@ msgstr "Extensiones/Aplicaciones instaladas:"
 msgid "No installed plugins/addons/apps"
 msgstr "Extensiones/Aplicaciones no instaladas:"
 
-#: ../../mod/siteinfo.php:155 ../../mod/home.php:58 ../../mod/home.php:64
+#: ../../mod/siteinfo.php:155 ../../mod/home.php:58 ../../mod/home.php:66
 msgid "$Projectname"
 msgstr "$Projectname"
 
@@ -4875,12 +4876,12 @@ msgstr "El acceso a este elemento está restringido."
 #: ../../mod/photos.php:535
 #, php-format
 msgid "%1$.2f MB of %2$.2f MB photo storage used."
-msgstr "%1$.2f MB de %2$.2f MB de almacenamiento de fotos utilizado."
+msgstr "%1$.2f MB de %2$.2f MB usados de la capacidad de almacenamiento de fotos."
 
 #: ../../mod/photos.php:538
 #, php-format
 msgid "%1$.2f MB photo storage used."
-msgstr "%1$.2f MB de almacenamiento de fotos utilizado."
+msgstr "%1$.2f MB utilizados de la capacidad de almacenamiento de fotos."
 
 #: ../../mod/photos.php:562
 msgid "Upload Photos"
@@ -5787,7 +5788,7 @@ msgstr "Servidor no encontrado"
 
 #: ../../mod/poke.php:159
 msgid "Poke/Prod"
-msgstr "Dar un toque/Incitar"
+msgstr "Toque/Incitación"
 
 #: ../../mod/poke.php:160
 msgid "poke, prod or do other things to somebody"
@@ -6524,7 +6525,7 @@ msgstr "IMPORTANTE: Debe crear [manualmente] una tarea programada para las actua
 msgid "OpenID protocol error. No ID returned."
 msgstr "Error del protocolo OpenID. Ningún ID recibido como respuesta."
 
-#: ../../mod/openid.php:72 ../../mod/openid.php:180 ../../mod/post.php:286
+#: ../../mod/openid.php:72 ../../mod/openid.php:180 ../../mod/post.php:287
 #, php-format
 msgid "Welcome %s. Remote authentication successful."
 msgstr "Bienvenido %s. La identificación desde su servidor se ha llevado a cabo correctamente."
@@ -6534,31 +6535,6 @@ msgstr "Bienvenido %s. La identificación desde su servidor se ha llevado a cabo
 msgid "%1$s tagged %2$s's %3$s with %4$s"
 msgstr "%1$s ha etiquetado la %3$s de %2$s con %4$s"
 
-#: ../../mod/uexport.php:45 ../../mod/uexport.php:46
-msgid "Export Channel"
-msgstr "Exportar el canal"
-
-#: ../../mod/uexport.php:47
-msgid ""
-"Export your basic channel information to a small file.  This acts as a "
-"backup of your connections, permissions, profile and basic data, which can "
-"be used to import your data to a new hub, but\tdoes not contain your "
-"content."
-msgstr "Exportar la base de datos de su canal a un pequeño fichero. Este podrá servir como una copia de seguridad de sus conexiones, permisos, perfil y datos básicos, que podrá importar a un nuevo canal, pero sin sus contenidos."
-
-#: ../../mod/uexport.php:48
-msgid "Export Content"
-msgstr "Exportar contenidos"
-
-#: ../../mod/uexport.php:49
-msgid ""
-"Export your channel information and all the content to a JSON backup. This "
-"backs up all of your connections, permissions, profile data and all of your "
-"content, but is generally not suitable for importing a channel to a new hub "
-"as this file may be VERY large.  Please be patient - it may take several "
-"minutes for this download to begin."
-msgstr "Exportar toda la información del canal y todo su contenido a un fichero JSON. Este contendrá todas sus conexiones, permisos, información del perfil y todo su contenido, Sin embargo, a menudo, no será una buena solución para importarlo en una nueva instancia, pues el fichero será MUY voluminoso. Por favor, tenga paciencia - pueden pasar muchos minutos antes de que comience la carga."
-
 #: ../../mod/viewconnections.php:62
 msgid "No connections."
 msgstr "Sin conexiones."
@@ -7989,7 +7965,7 @@ msgstr "Usted ha sido etiquetado en una publicación"
 
 #: ../../mod/settings.php:1109
 msgid "You are poked/prodded/etc. in a post"
-msgstr "Recibir un toque o incitación en una publicación"
+msgstr "Reciba un toque o incitación en una entrada"
 
 #: ../../mod/settings.php:1112
 msgid "Show visual notifications including:"
@@ -8171,6 +8147,114 @@ msgstr "Eliminar conversación"
 msgid "D, d M Y - g:i A"
 msgstr "D d M Y - G:i"
 
+#: ../../mod/uexport.php:50 ../../mod/uexport.php:51
+msgid "Export Channel"
+msgstr "Exportar el canal"
+
+#: ../../mod/uexport.php:52
+msgid ""
+"Export your basic channel information to a file.  This acts as a backup of "
+"your connections, permissions, profile and basic data, which can be used to "
+"import your data to a new server hub, but does not contain your content."
+msgstr "Exportar la información básica del canal a un fichero. Este equivale a una copia de seguridad de sus conexiones, el perfil y datos fundamentales, que puede usarse para importar sus datos a un nuevo servidor, pero no incluye su contenido."
+
+#: ../../mod/uexport.php:53
+msgid "Export Content"
+msgstr "Exportar contenidos"
+
+#: ../../mod/uexport.php:54
+msgid ""
+"Export your channel information and recent content to a JSON backup that can"
+" be restored or imported to another server hub. This backs up all of your "
+"connections, permissions, profile data and several months of posts. This "
+"file may be VERY large.  Please be patient - it may take several minutes for"
+" this download to begin."
+msgstr "Exportar la información sobre su canal y el contenido reciente a un fichero de respaldo JSON, que puede ser restaurado o importado a otro servidor. Este fichero incluye todas sus conexiones, permisos, datos del perfil y publicaciones de varios meses. Puede llegar a ser MUY grande. Por favor, sea paciente, la descarga puede tardar varios minutos en comenzar."
+
+#: ../../mod/uexport.php:55
+msgid "Export your posts from a given year or month:"
+msgstr "Exporta sus entradas de un año o mes determinados."
+
+#: ../../mod/uexport.php:57
+msgid ""
+"You may also export your posts and conversations for a particular year or "
+"month. Click on one of the recent years or months below."
+msgstr "También puede exportar sus entradas y conversaciones de un año o mes en particular. Hágalo en primer lugar con uno de los años o meses más recientes."
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Jan"
+msgstr "Ene"
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Feb"
+msgstr "Feb"
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Mar"
+msgstr "Mar"
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Apr"
+msgstr "Abr"
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Jun"
+msgstr "Jun"
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Jul"
+msgstr "Jul"
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Aug"
+msgstr "Ago"
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Sep"
+msgstr "Sep"
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Oct"
+msgstr "Oct"
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Nov"
+msgstr "Nov"
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Dec"
+msgstr "Dic"
+
+#: ../../mod/uexport.php:60
+msgid ""
+"If the export fails (possibly due to memory exhaustion on your server hub), "
+"please try again selecting a more limited date range."
+msgstr "Si la exportación falla (posiblemente debido al agotamiento de la memoria del servidor hub), por favor, inténtelo de nuevo seleccionando un rango de fechas más pequeño."
+
+#: ../../mod/uexport.php:61
+#, php-format
+msgid ""
+"Or adjust the date in your browser location bar to select other dates. For "
+"example the year 2013; <a href=\"%1$s/2013\">%1$s/2013</a> or the month "
+"September 2013; <a href=\"%1$s/2013/9\">%1$s/2013/9</a>"
+msgstr "Ajuste la fecha en la barra de direcciones del navegador para seleccionar otras fechas. Por ejemlo, el año 2013:  <a href=\"%1$s/2013\">%1$s/2013</a> o el mes de septiembre de 2013: <a href=\"%1$s/2013/9\">%1$s/2013/9</a>"
+
+#: ../../mod/uexport.php:62
+msgid "Please visit"
+msgstr "Por favor, visite"
+
+#: ../../mod/uexport.php:62
+msgid "on another hub to import the backup files(s)."
+msgstr "en otro servidor hub para importar el fichero (s) de copia de seguridad."
+
+#: ../../mod/uexport.php:63
+msgid ""
+"We advise you to clone the channel on the new hub first and than to import "
+"the backup file(s) (from the same channel) in chronological order. Importing"
+" the backup files into another channel will certainly give permission "
+"issues."
+msgstr "Aviso: al clonar el canal en un nuevo servidor hub, en primer lugar tiene que importar el fichero (s) con las copias de seguridad (desde el mismo canal) en orden cronológico.  Importar los ficheros de copia de seguridad en otro canal le dará, con toda seguridad, problemas de permisos."
+
 #: ../../mod/mood.php:131
 msgid "Set your current mood and tell your friends"
 msgstr "Describir su estado de ánimo para comunicárselo a sus amigos"
@@ -8504,7 +8588,7 @@ msgstr "Mensaje eliminado."
 
 #: ../../mod/mail.php:156
 msgid "Message recalled."
-msgstr "Mensaje recuperado."
+msgstr "Mensaje revocado."
 
 #: ../../mod/mail.php:225
 msgid "Send Private Message"
@@ -8532,11 +8616,11 @@ msgstr "Mensaje eliminado"
 
 #: ../../mod/mail.php:313
 msgid "Recall message"
-msgstr "Recuperar el mensaje"
+msgstr "Revocar el mensaje"
 
 #: ../../mod/mail.php:315
 msgid "Message has been recalled."
-msgstr "El mensaje ha sido recuperado."
+msgstr "El mensaje ha sido revocado."
 
 #: ../../mod/mail.php:332
 msgid "Private Conversation"
@@ -8564,7 +8648,7 @@ msgstr "Descartar"
 msgid "Please login."
 msgstr "Por favor, inicie sesión."
 
-#: ../../mod/post.php:235
+#: ../../mod/post.php:236
 msgid ""
 "Remote authentication blocked. You are logged into this site locally. Please"
 " logout and retry."
@@ -8686,7 +8770,7 @@ msgstr "Descripción del formato"
 msgid "Download PDL file"
 msgstr "Descargar el fichero PDL"
 
-#: ../../mod/home.php:73
+#: ../../mod/home.php:75
 #, php-format
 msgid "Welcome to %s"
 msgstr "Bienvenido a %s"
@@ -8897,11 +8981,11 @@ msgstr "Ancho de la sección"
 
 #: ../../view/theme/apw/php/config.php:289
 msgid "Left offset of the aside"
-msgstr "Desplazamiento izquierdo del lateral"
+msgstr "Desplazamiento izquierdo del panel lateral"
 
 #: ../../view/theme/apw/php/config.php:290
 msgid "Right offset of the aside element"
-msgstr "Desplazamiento derecho del elemento lateral"
+msgstr "Desplazamiento derecho del elemento del panel lateral"
 
 #: ../../view/theme/redbasic/php/config.php:82
 msgid "Light (Red Matrix default)"
@@ -9073,7 +9157,7 @@ msgstr "[red] Error SSL del sitio web en %s"
 
 #: ../../boot.php:2352
 msgid "Cron/Scheduled tasks not running."
-msgstr "Las tareas del Planificador/Cron no se están funcionando."
+msgstr "Las tareas del Planificador/Cron no están funcionando."
 
 #: ../../boot.php:2356
 #, php-format
diff --git a/view/es/register_open_eml.tpl b/view/es/register_open_eml.tpl
index 74e5ba466..f6d68677e 100644
--- a/view/es/register_open_eml.tpl
+++ b/view/es/register_open_eml.tpl
@@ -2,16 +2,16 @@
 Una cuenta ha sido creada en {{$sitename}} con esta dirección de correo electrónico. 
 Los detalles del inicio de sesión son los siguientes:
 
-Localización del Sitio:	{{$siteurl}}
-Nombre de usuario:	{{$email}}
+Localización del sitio:⇥{{$siteurl}}
+Nombre de usuario:⇥{{$email}}
 Contraseña: (la contraseña que proporcionó durante el proceso de registro)
 
-Si esta cuenta se creó sin su consentimiento y no es deseada, puedes 
+Si esta cuenta se creó sin su consentimiento, y no es deseada, puede 
 visitar el sitio y cambiar la contraseña. Esto le permitirá eliminar la 
-cuenta de los enlaces en la página de Ajustes, le 
-pedimos disculpas por cualquier inconveniente que hayamos podido causar. 
+cuenta en la página de Ajustes del perfil, le 
+pedimos disculpas por cualquier inconveniente que hayamos podido causarle. 
 
-gracias y bienvenido a {{$sitename}}.
+Gracias y bienvenido a {{$sitename}}.
 
 Atentamente,
 	Administrador de {{$sitename}}
diff --git a/view/es/register_verify_eml.tpl b/view/es/register_verify_eml.tpl
index 4eabaacc7..dc913be97 100644
--- a/view/es/register_verify_eml.tpl
+++ b/view/es/register_verify_eml.tpl
@@ -5,8 +5,8 @@ su aprobación.
 
 Los detalles del inicio de sesión son los siguientes:
 
-Localización del Sitio:	{{$siteurl}}
-Nombre de usuario:	{{$email}}
+Localización del sitio:⇥{{$siteurl}}
+Nombre de usuario:⇥{{$email}}
 Dirección IP:  {{$details}}
 
 Para aprobar la petición siga el enlace:
@@ -15,7 +15,7 @@ Para aprobar la petición siga el enlace:
 {{$siteurl}}/regmod/allow/{{$hash}} 
 
 
-Para denegar la petición y eliminar la cuenta , siga:
+Para rechazar la petición y eliminar la cuenta , siga:
 
 
 {{$siteurl}}/regmod/deny/{{$hash}}
diff --git a/view/es/register_verify_member.tpl b/view/es/register_verify_member.tpl
index 202c4111c..f78a0353a 100644
--- a/view/es/register_verify_member.tpl
+++ b/view/es/register_verify_member.tpl
@@ -3,10 +3,10 @@ Gracias por registrarse en {{$sitename}}.
 
 Los detalles del inicio de sesión son los siguientes:
 
-Localización del Sitio:	{{$siteurl}}
-Nombre de usuario:	{{$email}}
+Localización del sitio:⇥{{$siteurl}}
+Nombre de usuario:⇥{{$email}}
 
-inicie la sesión con la contraseña que elegió durante el registro.
+Inicie la sesión con la contraseña que eligió durante el registro.
 
 Necesitamos verificar su correo electrónico para poder darle pleno acceso.
 
@@ -15,7 +15,7 @@ Si registró esta cuenta, por favor, siga el enlace:
 {{$siteurl}}/regver/allow/{{$hash}} 
 
 
-Para denegar la petición y eliminar la cuenta , siga:
+Para rechazar la petición y eliminar la cuenta , siga:
 
 
 {{$siteurl}}/regver/deny/{{$hash}}
diff --git a/view/es/strings.php b/view/es/strings.php
index f1821ad49..8b0b1758a 100644
--- a/view/es/strings.php
+++ b/view/es/strings.php
@@ -145,18 +145,18 @@ $a->strings["%d Connection"] = array(
 $a->strings["View Connections"] = "Ver conexiones";
 $a->strings["Search"] = "Buscar";
 $a->strings["Save"] = "Guardar";
-$a->strings["poke"] = "dar un toque";
+$a->strings["poke"] = "un toque";
 $a->strings["poked"] = "ha recibido un toque";
-$a->strings["ping"] = "avisar";
+$a->strings["ping"] = "un \"ping\"";
 $a->strings["pinged"] = "avisado/a";
 $a->strings["prod"] = "incitar";
 $a->strings["prodded"] = "incitado/a";
 $a->strings["slap"] = "abofetear";
 $a->strings["slapped"] = "abofeteado/a";
-$a->strings["finger"] = "señalar";
-$a->strings["fingered"] = "señalado/a";
-$a->strings["rebuff"] = "desairar";
-$a->strings["rebuffed"] = "desairado/a";
+$a->strings["finger"] = "un \"finger\"";
+$a->strings["fingered"] = "ha recibido un \"finger\"";
+$a->strings["rebuff"] = "un rechazo";
+$a->strings["rebuffed"] = "ha sido rechazado/a";
 $a->strings["happy"] = "feliz";
 $a->strings["sad"] = "triste";
 $a->strings["mellow"] = "amable";
@@ -210,7 +210,7 @@ $a->strings["Page content type"] = "Tipo de contenido de página";
 $a->strings["Select an alternate language"] = "Selecciona un idioma alternativo";
 $a->strings["photo"] = "foto";
 $a->strings["event"] = "evento";
-$a->strings["status"] = "estado";
+$a->strings["status"] = "el mensaje de estado";
 $a->strings["comment"] = "comentario";
 $a->strings["activity"] = "actividad";
 $a->strings["Design Tools"] = "Herramientas de diseño";
@@ -245,7 +245,7 @@ $a->strings["view full size"] = "Ver en el tamaño original";
 $a->strings["\$Projectname Notification"] = "Notificación de \$Projectname";
 $a->strings["\$projectname"] = "\$projectname";
 $a->strings["Thank You,"] = "Gracias,";
-$a->strings["%s Administrator"] = "%s Administrador";
+$a->strings["%s Administrator"] = "Administrador de %s";
 $a->strings["No Subject"] = "Sin asunto";
 $a->strings["General Features"] = "Características generales";
 $a->strings["Content Expiration"] = "Caducidad del contenido";
@@ -365,8 +365,8 @@ $a->strings["%1\$s sent you %2\$s."] = "%1\$s le envió %2\$s.";
 $a->strings["a private message"] = "un mensaje privado";
 $a->strings["Please visit %s to view and/or reply to your private messages."] = "Por favor visite %s para ver y/o responder a su mensaje privado.";
 $a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s, %2\$s ha comentado sobre [zrl=%3\$s]%4\$s[/zrl]";
-$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s, %2\$s ha comentado sobre el [zrl=%3\$s]%5\$s de %4\$s[/zrl]";
-$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s ha comentado [zrl=%3\$s]su %4\$s[/zrl]";
+$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s, %2\$s ha comentado [zrl=%3\$s]%5\$s de %4\$s[/zrl]";
+$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s ha comentado [zrl=%3\$s]%4\$s creado por usted[/zrl]";
 $a->strings["[Red:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Red:Aviso] Nuevo comentario de %2\$s en la conversación #%1\$d";
 $a->strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = "%1\$s, %2\$s comentó un elemento/conversación que ha estado siguiendo.";
 $a->strings["Please visit %s to view and/or reply to the conversation."] = "Para ver o comentar la conversación, visite %s";
@@ -377,10 +377,10 @@ $a->strings["[Red:Notify] %s tagged you"] = "[Red:Aviso] %s le etiquetó";
 $a->strings["%1\$s, %2\$s tagged you at %3\$s"] = "%1\$s, %2\$s le etiquetó en %3\$s";
 $a->strings["%1\$s, %2\$s [zrl=%3\$s]tagged you[/zrl]."] = "%1\$s, %2\$s [zrl=%3\$s]le etiquetó[/zrl].";
 $a->strings["[Red:Notify] %1\$s poked you"] = "[Red:Aviso]  %1\$s le ha dado un toque";
-$a->strings["%1\$s, %2\$s poked you at %3\$s"] = "%1\$s, %2\$s le dio un toque sobre %3\$s";
+$a->strings["%1\$s, %2\$s poked you at %3\$s"] = "%1\$s, %2\$s le dio un toque en %3\$s";
 $a->strings["%1\$s, %2\$s [zrl=%2\$s]poked you[/zrl]."] = "%1\$s, %2\$s [zrl=%2\$s]le dio un toque[/zrl].";
 $a->strings["[Red:Notify] %s tagged your post"] = "[Red:Aviso]  %s etiquetó su entrada";
-$a->strings["%1\$s, %2\$s tagged your post at %3\$s"] = "%1\$s, %2\$s ha etiquetado su publicación sobre %3\$s";
+$a->strings["%1\$s, %2\$s tagged your post at %3\$s"] = "%1\$s, %2\$s ha etiquetado su publicación en %3\$s";
 $a->strings["%1\$s, %2\$s tagged [zrl=%3\$s]your post[/zrl]"] = "%1\$s, %2\$s ha etiquetado [zrl=%3\$s]su publicación[/zrl]";
 $a->strings["[Red:Notify] Introduction received"] = "[Red:Aviso] Solicitud de conexión recibida";
 $a->strings["%1\$s, you've received an new connection request from '%2\$s' at %3\$s"] = "%1\$s, ha recibido una nueva solicitud de conexión de '%2\$s' en  %3\$s";
@@ -557,7 +557,7 @@ $a->strings["Can view my normal stream and posts"] = "Pueden verse mi flujo de a
 $a->strings["Can view my default channel profile"] = "Puede verse mi perfil de canal predeterminado.";
 $a->strings["Can view my photo albums"] = "Pueden verse mis álbumes de fotos";
 $a->strings["Can view my connections"] = "Pueden verse mis conexiones";
-$a->strings["Can view my file storage"] = "Pueden verse mis ficheros compartidos";
+$a->strings["Can view my file storage"] = "Puede verse mi repositorio de ficheros";
 $a->strings["Can view my webpages"] = "Pueden verse mis páginas web";
 $a->strings["Can send me their channel stream and posts"] = "Me pueden enviar sus entradas y flujo de actividad su canal";
 $a->strings["Can post on my channel page (\"wall\")"] = "Pueden crear entradas en mi página de inicio del canal (“muro”)";
@@ -569,7 +569,7 @@ $a->strings["Profiles and things other than posts/comments"] = "Perfiles y otras
 $a->strings["Can forward to all my channel contacts via post @mentions"] = "Puede enviarse una entrada a todos mis contactos del canal mediante una @mención";
 $a->strings["Advanced - useful for creating group forum channels"] = "Avanzado - útil para crear canales de foro o grupos";
 $a->strings["Can chat with me (when available)"] = "Se puede charlar conmigo (cuando esté disponible)";
-$a->strings["Can write to my file storage"] = "Puede escribirse en mi carpeta de ficheros";
+$a->strings["Can write to my file storage"] = "Puede escribirse en mi repositorio de ficheros";
 $a->strings["Can edit my webpages"] = "Puede editar mis páginas web";
 $a->strings["Can source my public posts in derived channels"] = "Pueden utilizarse mis publicaciones públicas como origen de contenidos  en canales derivados";
 $a->strings["Somewhat advanced - very useful in open communities"] = "Algo avanzado - muy útil en comunidades abiertas";
@@ -596,8 +596,8 @@ $a->strings["__ctx:title__ Dislikes"] = "No me gusta";
 $a->strings["__ctx:title__ Agree"] = "De acuerdo";
 $a->strings["__ctx:title__ Disagree"] = "En desacuerdo";
 $a->strings["__ctx:title__ Abstain"] = "Abstención";
-$a->strings["__ctx:title__ Attending"] = "Participar";
-$a->strings["__ctx:title__ Not attending"] = "No participar";
+$a->strings["__ctx:title__ Attending"] = "Participaré";
+$a->strings["__ctx:title__ Not attending"] = "No participaré";
 $a->strings["__ctx:title__ Might attend"] = "Quizá participe";
 $a->strings["View %s's profile @ %s"] = "Ver el perfil @ %s de %s";
 $a->strings["Categories:"] = "Categorías:";
@@ -607,12 +607,12 @@ $a->strings["remove"] = "eliminar";
 $a->strings["Delete Selected Items"] = "Eliminar elementos seleccionados";
 $a->strings["View Source"] = "Ver la fuente original de la entrada";
 $a->strings["Follow Thread"] = "Seguir el hilo";
-$a->strings["View Status"] = "Ver estado";
+$a->strings["View Status"] = "Estado actual";
 $a->strings["View Photos"] = "Ver fotos";
 $a->strings["Matrix Activity"] = "Actividad en la red de esta conexión";
 $a->strings["Edit Contact"] = "Editar contacto";
 $a->strings["Send PM"] = "Enviar Mensaje Privado";
-$a->strings["Poke"] = "Dar un toque";
+$a->strings["Poke"] = "Toques y otras cosas";
 $a->strings["%s likes this."] = "a %s le gusta esto.";
 $a->strings["%s doesn't like this."] = "a %s no le gusta esto.";
 $a->strings["<span  %1\$s>%2\$d people</span> like this."] = array(
@@ -683,17 +683,17 @@ $a->strings["Status Messages and Posts"] = "Mensajes de estado y publicaciones";
 $a->strings["About"] = "Sobre mí";
 $a->strings["Profile Details"] = "Detalles del perfil";
 $a->strings["Photo Albums"] = "Álbumes de fotos";
-$a->strings["Files and Storage"] = "Ficheros y carpetas";
+$a->strings["Files and Storage"] = "Repositorio de ficheros";
 $a->strings["Chatrooms"] = "Salas de chat";
 $a->strings["Saved Bookmarks"] = "Marcadores guardados";
 $a->strings["Manage Webpages"] = "Administrar páginas web";
 $a->strings["__ctx:noun__ Attending"] = array(
 	0 => "Asistir",
-	1 => "Participar",
+	1 => "Participaré",
 );
 $a->strings["__ctx:noun__ Not Attending"] = array(
 	0 => "No asistir",
-	1 => "No participar",
+	1 => "No participaré",
 );
 $a->strings["__ctx:noun__ Undecided"] = array(
 	0 => "Indeciso/a",
@@ -1007,7 +1007,7 @@ $a->strings["Select a profile:"] = "Seleccionar un perfil:";
 $a->strings["Upload Profile Photo"] = "Subir foto de perfil";
 $a->strings["or"] = "o";
 $a->strings["skip this step"] = "Omitir este paso";
-$a->strings["select a photo from your photo albums"] = "Seleccione una foto de sus álbumes de fotos";
+$a->strings["select a photo from your photo albums"] = "Seleccione una foto de sus álbumes";
 $a->strings["Crop Image"] = "Recortar imagen";
 $a->strings["Please adjust the image cropping for optimum viewing."] = "Por favor ajuste el recorte de la imagen para una visión óptima.";
 $a->strings["Done Editing"] = "Edición completada";
@@ -1149,8 +1149,8 @@ $a->strings["Delete Album"] = "Borrar álbum";
 $a->strings["Delete Photo"] = "Borrar foto";
 $a->strings["No photos selected"] = "No hay fotos seleccionadas";
 $a->strings["Access to this item is restricted."] = "El acceso a este elemento está restringido.";
-$a->strings["%1$.2f MB of %2$.2f MB photo storage used."] = "%1$.2f MB de %2$.2f MB de almacenamiento de fotos utilizado.";
-$a->strings["%1$.2f MB photo storage used."] = "%1$.2f MB de almacenamiento de fotos utilizado.";
+$a->strings["%1$.2f MB of %2$.2f MB photo storage used."] = "%1$.2f MB de %2$.2f MB usados de la capacidad de almacenamiento de fotos.";
+$a->strings["%1$.2f MB photo storage used."] = "%1$.2f MB utilizados de la capacidad de almacenamiento de fotos.";
 $a->strings["Upload Photos"] = "Subir fotos";
 $a->strings["Enter a new album name"] = "Introducir un nuevo nombre de álbum";
 $a->strings["or select an existing one (doubleclick)"] = "o seleccionar uno (doble click) existente";
@@ -1370,7 +1370,7 @@ $a->strings["Friend suggestion sent."] = "Enviar sugerencia a un amigo.";
 $a->strings["Suggest Friends"] = "Sugerir amigos";
 $a->strings["Suggest a friend for %s"] = "Sugerir un amigo a %s";
 $a->strings["Hub not found."] = "Servidor no encontrado";
-$a->strings["Poke/Prod"] = "Dar un toque/Incitar";
+$a->strings["Poke/Prod"] = "Toque/Incitación";
 $a->strings["poke, prod or do other things to somebody"] = "dar un toque, incitar u otras cosas a alguien";
 $a->strings["Recipient"] = "Destinatario";
 $a->strings["Choose what you wish to do to recipient"] = "Elegir qué desea enviar al destinatario";
@@ -1538,10 +1538,6 @@ $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for t
 $a->strings["OpenID protocol error. No ID returned."] = "Error del protocolo OpenID. Ningún ID recibido como respuesta.";
 $a->strings["Welcome %s. Remote authentication successful."] = "Bienvenido %s. La identificación desde su servidor se ha llevado a cabo correctamente.";
 $a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s ha etiquetado la %3\$s de %2\$s con %4\$s";
-$a->strings["Export Channel"] = "Exportar el canal";
-$a->strings["Export your basic channel information to a small file.  This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new hub, but\tdoes not contain your content."] = "Exportar la base de datos de su canal a un pequeño fichero. Este podrá servir como una copia de seguridad de sus conexiones, permisos, perfil y datos básicos, que podrá importar a un nuevo canal, pero sin sus contenidos.";
-$a->strings["Export Content"] = "Exportar contenidos";
-$a->strings["Export your channel information and all the content to a JSON backup. This backs up all of your connections, permissions, profile data and all of your content, but is generally not suitable for importing a channel to a new hub as this file may be VERY large.  Please be patient - it may take several minutes for this download to begin."] = "Exportar toda la información del canal y todo su contenido a un fichero JSON. Este contendrá todas sus conexiones, permisos, información del perfil y todo su contenido, Sin embargo, a menudo, no será una buena solución para importarlo en una nueva instancia, pues el fichero será MUY voluminoso. Por favor, tenga paciencia - pueden pasar muchos minutos antes de que comience la carga.";
 $a->strings["No connections."] = "Sin conexiones.";
 $a->strings["Visit %s's profile [%s]"] = "Visitar el perfil de %s [%s]";
 $a->strings["invalid target signature"] = "La firma recibida no es válida";
@@ -1888,7 +1884,7 @@ $a->strings["Someone writes a followup comment"] = "Alguien escriba un comentari
 $a->strings["You receive a private message"] = "Reciba un mensaje privado";
 $a->strings["You receive a friend suggestion"] = "Reciba una sugerencia de amistad";
 $a->strings["You are tagged in a post"] = "Usted ha sido etiquetado en una publicación";
-$a->strings["You are poked/prodded/etc. in a post"] = "Recibir un toque o incitación en una publicación";
+$a->strings["You are poked/prodded/etc. in a post"] = "Reciba un toque o incitación en una entrada";
 $a->strings["Show visual notifications including:"] = "Mostrar notificaciones visuales que incluyan:";
 $a->strings["Unseen matrix activity"] = "Actividad no vista en la red";
 $a->strings["Unseen channel activity"] = "Actividad no vista en el canal";
@@ -1933,6 +1929,28 @@ $a->strings["Conversation removed."] = "Conversación eliminada.";
 $a->strings["No messages."] = "Sin mensajes.";
 $a->strings["Delete conversation"] = "Eliminar conversación";
 $a->strings["D, d M Y - g:i A"] = "D d M Y - G:i";
+$a->strings["Export Channel"] = "Exportar el canal";
+$a->strings["Export your basic channel information to a file.  This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new server hub, but does not contain your content."] = "Exportar la información básica del canal a un fichero. Este equivale a una copia de seguridad de sus conexiones, el perfil y datos fundamentales, que puede usarse para importar sus datos a un nuevo servidor, pero no incluye su contenido.";
+$a->strings["Export Content"] = "Exportar contenidos";
+$a->strings["Export your channel information and recent content to a JSON backup that can be restored or imported to another server hub. This backs up all of your connections, permissions, profile data and several months of posts. This file may be VERY large.  Please be patient - it may take several minutes for this download to begin."] = "Exportar la información sobre su canal y el contenido reciente a un fichero de respaldo JSON, que puede ser restaurado o importado a otro servidor. Este fichero incluye todas sus conexiones, permisos, datos del perfil y publicaciones de varios meses. Puede llegar a ser MUY grande. Por favor, sea paciente, la descarga puede tardar varios minutos en comenzar.";
+$a->strings["Export your posts from a given year or month:"] = "Exporta sus entradas de un año o mes determinados.";
+$a->strings["You may also export your posts and conversations for a particular year or month. Click on one of the recent years or months below."] = "También puede exportar sus entradas y conversaciones de un año o mes en particular. Hágalo en primer lugar con uno de los años o meses más recientes.";
+$a->strings["Jan"] = "Ene";
+$a->strings["Feb"] = "Feb";
+$a->strings["Mar"] = "Mar";
+$a->strings["Apr"] = "Abr";
+$a->strings["Jun"] = "Jun";
+$a->strings["Jul"] = "Jul";
+$a->strings["Aug"] = "Ago";
+$a->strings["Sep"] = "Sep";
+$a->strings["Oct"] = "Oct";
+$a->strings["Nov"] = "Nov";
+$a->strings["Dec"] = "Dic";
+$a->strings["If the export fails (possibly due to memory exhaustion on your server hub), please try again selecting a more limited date range."] = "Si la exportación falla (posiblemente debido al agotamiento de la memoria del servidor hub), por favor, inténtelo de nuevo seleccionando un rango de fechas más pequeño.";
+$a->strings["Or adjust the date in your browser location bar to select other dates. For example the year 2013; <a href=\"%1\$s/2013\">%1\$s/2013</a> or the month September 2013; <a href=\"%1\$s/2013/9\">%1\$s/2013/9</a>"] = "Ajuste la fecha en la barra de direcciones del navegador para seleccionar otras fechas. Por ejemlo, el año 2013:  <a href=\"%1\$s/2013\">%1\$s/2013</a> o el mes de septiembre de 2013: <a href=\"%1\$s/2013/9\">%1\$s/2013/9</a>";
+$a->strings["Please visit"] = "Por favor, visite";
+$a->strings["on another hub to import the backup files(s)."] = "en otro servidor hub para importar el fichero (s) de copia de seguridad.";
+$a->strings["We advise you to clone the channel on the new hub first and than to import the backup file(s) (from the same channel) in chronological order. Importing the backup files into another channel will certainly give permission issues."] = "Aviso: al clonar el canal en un nuevo servidor hub, en primer lugar tiene que importar el fichero (s) con las copias de seguridad (desde el mismo canal) en orden cronológico.  Importar los ficheros de copia de seguridad en otro canal le dará, con toda seguridad, problemas de permisos.";
 $a->strings["Set your current mood and tell your friends"] = "Describir su estado de ánimo para comunicárselo a sus amigos";
 $a->strings["Total votes"] = "Total de votos";
 $a->strings["Average Rating"] = "Valoración media";
@@ -2009,15 +2027,15 @@ $a->strings["Unable to communicate with requested channel."] = "Imposible comuni
 $a->strings["Cannot verify requested channel."] = "No se puede verificar el canal solicitado.";
 $a->strings["Selected channel has private message restrictions. Send failed."] = "El canal seleccionado tiene restricciones sobre los mensajes privados. El envío falló.";
 $a->strings["Message deleted."] = "Mensaje eliminado.";
-$a->strings["Message recalled."] = "Mensaje recuperado.";
+$a->strings["Message recalled."] = "Mensaje revocado.";
 $a->strings["Send Private Message"] = "Enviar un mensaje privado";
 $a->strings["To:"] = "Para:";
 $a->strings["Subject:"] = "Asunto:";
 $a->strings["Send"] = "Enviar";
 $a->strings["Message not found."] = "No se encuentra el mensaje.";
 $a->strings["Delete message"] = "Mensaje eliminado";
-$a->strings["Recall message"] = "Recuperar el mensaje";
-$a->strings["Message has been recalled."] = "El mensaje ha sido recuperado.";
+$a->strings["Recall message"] = "Revocar el mensaje";
+$a->strings["Message has been recalled."] = "El mensaje ha sido revocado.";
 $a->strings["Private Conversation"] = "Conversación privada";
 $a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Comunicación segura no disponible. Pero <strong>puede</strong> responder desde la página de perfil del remitente.";
 $a->strings["Send Reply"] = "Responder";
@@ -2102,8 +2120,8 @@ $a->strings["Item float"] = "Elemento flotante";
 $a->strings["Left offset of the section element"] = "Desplazamiento izquierdo del elemento de la sección";
 $a->strings["Right offset of the section element"] = "Desplazamiento derecho del elemento de la sección";
 $a->strings["Section width"] = "Ancho de la sección";
-$a->strings["Left offset of the aside"] = "Desplazamiento izquierdo del lateral";
-$a->strings["Right offset of the aside element"] = "Desplazamiento derecho del elemento lateral";
+$a->strings["Left offset of the aside"] = "Desplazamiento izquierdo del panel lateral";
+$a->strings["Right offset of the aside element"] = "Desplazamiento derecho del elemento del panel lateral";
 $a->strings["Light (Red Matrix default)"] = "Ligero (predeterminado de RedMatrix)";
 $a->strings["Select scheme"] = "Elegir un esquema";
 $a->strings["Narrow navbar"] = "Estrechar la barra de navegación";
@@ -2145,5 +2163,5 @@ $a->strings["Forgot your password?"] = "¿Olvidó su contraseña?";
 $a->strings["toggle mobile"] = "cambiar a modo móvil";
 $a->strings["Website SSL certificate is not valid. Please correct."] = "El certificado SSL del sitio web no es válido. Por favor, corríjalo.";
 $a->strings["[red] Website SSL error for %s"] = "[red] Error SSL del sitio web en %s";
-$a->strings["Cron/Scheduled tasks not running."] = "Las tareas del Planificador/Cron no se están funcionando.";
+$a->strings["Cron/Scheduled tasks not running."] = "Las tareas del Planificador/Cron no están funcionando.";
 $a->strings["[red] Cron tasks not running on %s"] = "[red] Las tareas de Cron no están funcionando en %s";
diff --git a/view/it/hmessages.po b/view/it/hmessages.po
index 6f37f3518..956477e67 100644
--- a/view/it/hmessages.po
+++ b/view/it/hmessages.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Redmatrix\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-26 22:48-0700\n"
-"PO-Revision-Date: 2015-10-01 15:20+0000\n"
+"POT-Creation-Date: 2015-10-23 00:03-0700\n"
+"PO-Revision-Date: 2015-10-24 09:56+0000\n"
 "Last-Translator: tuscanhobbit <pynolo@tarine.net>\n"
 "Language-Team: Italian (http://www.transifex.com/Friendica/red-matrix/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -19,6 +19,32 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ../../include/bb2diaspora.php:388
+msgid "Attachments:"
+msgstr "Allegati:"
+
+#: ../../include/bb2diaspora.php:474 ../../include/event.php:22
+msgid "l F d, Y \\@ g:i A"
+msgstr "l d F Y \\@ G:i"
+
+#: ../../include/bb2diaspora.php:476
+msgid "$Projectname event notification:"
+msgstr "Notifica evento $Projectname:"
+
+#: ../../include/bb2diaspora.php:480 ../../include/event.php:30
+msgid "Starts:"
+msgstr "Inizio:"
+
+#: ../../include/bb2diaspora.php:488 ../../include/event.php:40
+msgid "Finishes:"
+msgstr "Fine:"
+
+#: ../../include/bb2diaspora.php:496 ../../include/event.php:50
+#: ../../include/identity.php:1016 ../../mod/directory.php:302
+#: ../../mod/events.php:701
+msgid "Location:"
+msgstr "Luogo:"
+
 #: ../../include/Import/import_diaspora.php:17
 msgid "No username found in import file."
 msgstr "Impossibile trovare il nome utente nel file da importare."
@@ -27,16 +53,16 @@ msgstr "Impossibile trovare il nome utente nel file da importare."
 msgid "Unable to create a unique channel address. Import failed."
 msgstr "Impossibile creare un indirizzo univoco per il canale. L'import è fallito."
 
-#: ../../include/Import/import_diaspora.php:143 ../../mod/import.php:480
+#: ../../include/Import/import_diaspora.php:143 ../../mod/import.php:486
 msgid "Import completed."
 msgstr "L'importazione è terminata con successo."
 
 #: ../../include/RedDAV/RedBrowser.php:107
-#: ../../include/RedDAV/RedBrowser.php:265
+#: ../../include/RedDAV/RedBrowser.php:239
 msgid "parent"
 msgstr "cartella superiore"
 
-#: ../../include/RedDAV/RedBrowser.php:131 ../../include/text.php:2497
+#: ../../include/RedDAV/RedBrowser.php:131 ../../include/text.php:2509
 msgid "Collection"
 msgstr "Cartella"
 
@@ -60,72 +86,62 @@ msgstr "Appuntamenti ricevuti"
 msgid "Schedule Outbox"
 msgstr "Appuntamenti inviati"
 
-#: ../../include/RedDAV/RedBrowser.php:164 ../../include/conversation.php:1021
-#: ../../include/apps.php:355 ../../include/apps.php:410
-#: ../../mod/photos.php:720 ../../mod/photos.php:1159
+#: ../../include/RedDAV/RedBrowser.php:164 ../../include/apps.php:360
+#: ../../include/apps.php:415 ../../include/conversation.php:1023
+#: ../../mod/photos.php:756 ../../mod/photos.php:1195
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: ../../include/RedDAV/RedBrowser.php:227
-#, php-format
-msgid "%1$s used"
-msgstr "%1$s occupati"
-
-#: ../../include/RedDAV/RedBrowser.php:232
-#, php-format
-msgid "%1$s used of %2$s (%3$s&#37;)"
-msgstr "%1$s occupati di %2$s (%3$s&#37;)"
-
-#: ../../include/RedDAV/RedBrowser.php:251 ../../include/conversation.php:1611
-#: ../../include/apps.php:135 ../../include/nav.php:93
+#: ../../include/RedDAV/RedBrowser.php:226 ../../include/apps.php:135
+#: ../../include/conversation.php:1613 ../../include/nav.php:93
 #: ../../mod/fbrowser.php:114
 msgid "Files"
 msgstr "Archivio file"
 
-#: ../../include/RedDAV/RedBrowser.php:253
+#: ../../include/RedDAV/RedBrowser.php:227
 msgid "Total"
 msgstr "Totale"
 
-#: ../../include/RedDAV/RedBrowser.php:255
+#: ../../include/RedDAV/RedBrowser.php:229
 msgid "Shared"
 msgstr "Condiviso"
 
-#: ../../include/RedDAV/RedBrowser.php:256
+#: ../../include/RedDAV/RedBrowser.php:230
 #: ../../include/RedDAV/RedBrowser.php:303 ../../mod/layouts.php:175
 #: ../../mod/menu.php:114 ../../mod/new_channel.php:121
 #: ../../mod/webpages.php:180 ../../mod/blocks.php:152
 msgid "Create"
 msgstr "Crea"
 
-#: ../../include/RedDAV/RedBrowser.php:257
-#: ../../include/RedDAV/RedBrowser.php:305 ../../mod/photos.php:745
-#: ../../mod/photos.php:1278 ../../mod/profile_photo.php:450
+#: ../../include/RedDAV/RedBrowser.php:231
+#: ../../include/RedDAV/RedBrowser.php:305 ../../mod/photos.php:781
+#: ../../mod/photos.php:1314 ../../mod/profile_photo.php:450
 msgid "Upload"
 msgstr "Carica"
 
-#: ../../include/RedDAV/RedBrowser.php:261 ../../mod/admin.php:948
+#: ../../include/RedDAV/RedBrowser.php:235 ../../mod/admin.php:948
 #: ../../mod/settings.php:585 ../../mod/settings.php:611
 #: ../../mod/sharedwithme.php:95
 msgid "Name"
 msgstr "Nome"
 
-#: ../../include/RedDAV/RedBrowser.php:262
+#: ../../include/RedDAV/RedBrowser.php:236
 msgid "Type"
 msgstr "Tipo"
 
-#: ../../include/RedDAV/RedBrowser.php:263 ../../mod/sharedwithme.php:97
+#: ../../include/RedDAV/RedBrowser.php:237 ../../mod/sharedwithme.php:97
 msgid "Size"
 msgstr "Dimensione"
 
-#: ../../include/RedDAV/RedBrowser.php:264 ../../mod/sharedwithme.php:98
+#: ../../include/RedDAV/RedBrowser.php:238 ../../mod/sharedwithme.php:98
 msgid "Last Modified"
 msgstr "Ultima modifica"
 
-#: ../../include/RedDAV/RedBrowser.php:266 ../../include/menu.php:108
+#: ../../include/RedDAV/RedBrowser.php:240 ../../include/menu.php:108
 #: ../../include/page_widgets.php:8 ../../include/page_widgets.php:36
-#: ../../include/apps.php:254 ../../include/ItemObject.php:100
-#: ../../mod/layouts.php:183 ../../mod/editpost.php:113
-#: ../../mod/editblock.php:135 ../../mod/menu.php:108
+#: ../../include/apps.php:259 ../../include/ItemObject.php:100
+#: ../../mod/layouts.php:183 ../../mod/editblock.php:135
+#: ../../mod/editpost.php:113 ../../mod/menu.php:108
 #: ../../mod/webpages.php:181 ../../mod/blocks.php:153 ../../mod/thing.php:257
 #: ../../mod/settings.php:645 ../../mod/connections.php:235
 #: ../../mod/connections.php:248 ../../mod/connections.php:267
@@ -133,16 +149,30 @@ msgstr "Ultima modifica"
 msgid "Edit"
 msgstr "Modifica"
 
-#: ../../include/RedDAV/RedBrowser.php:267 ../../include/conversation.php:662
-#: ../../include/apps.php:255 ../../include/ItemObject.php:120
-#: ../../mod/connedit.php:547 ../../mod/editblock.php:181
-#: ../../mod/admin.php:783 ../../mod/admin.php:942 ../../mod/photos.php:1090
+#: ../../include/RedDAV/RedBrowser.php:241 ../../include/apps.php:260
+#: ../../include/ItemObject.php:120 ../../include/conversation.php:657
+#: ../../mod/connedit.php:546 ../../mod/photos.php:1126
+#: ../../mod/editblock.php:181 ../../mod/admin.php:783 ../../mod/admin.php:942
 #: ../../mod/webpages.php:183 ../../mod/blocks.php:155 ../../mod/thing.php:258
 #: ../../mod/settings.php:646 ../../mod/editlayout.php:179
 #: ../../mod/editwebpage.php:223 ../../mod/group.php:173
 msgid "Delete"
 msgstr "Elimina"
 
+#: ../../include/RedDAV/RedBrowser.php:282
+#, php-format
+msgid "You are using %1$s of your available file storage."
+msgstr "Stai usando %1$s dello spazio disponibile per i tuoi file."
+
+#: ../../include/RedDAV/RedBrowser.php:287
+#, php-format
+msgid "You are using %1$s of %2$s available file storage. (%3$s&#37;)"
+msgstr "Stai usando %1$s di %2$s che hai a disposizione per i file. (%3$s&#37;)"
+
+#: ../../include/RedDAV/RedBrowser.php:299
+msgid "WARNING:"
+msgstr "ATTENZIONE:"
+
 #: ../../include/RedDAV/RedBrowser.php:302
 msgid "Create new folder"
 msgstr "Nuova cartella"
@@ -297,39 +327,39 @@ msgstr "Il nome della chat non è valido."
 msgid "Room not found."
 msgstr "Chat non trovata."
 
-#: ../../include/chat.php:133 ../../include/photos.php:26
-#: ../../include/attach.php:137 ../../include/attach.php:185
-#: ../../include/attach.php:248 ../../include/attach.php:262
-#: ../../include/attach.php:269 ../../include/attach.php:334
-#: ../../include/attach.php:348 ../../include/attach.php:355
-#: ../../include/attach.php:433 ../../include/attach.php:840
-#: ../../include/attach.php:911 ../../include/attach.php:1064
-#: ../../include/items.php:4342 ../../mod/achievements.php:30
+#: ../../include/chat.php:133 ../../include/items.php:4376
+#: ../../include/photos.php:26 ../../include/attach.php:137
+#: ../../include/attach.php:185 ../../include/attach.php:248
+#: ../../include/attach.php:262 ../../include/attach.php:269
+#: ../../include/attach.php:334 ../../include/attach.php:348
+#: ../../include/attach.php:355 ../../include/attach.php:433
+#: ../../include/attach.php:875 ../../include/attach.php:946
+#: ../../include/attach.php:1098 ../../mod/achievements.php:30
 #: ../../mod/fsuggest.php:78 ../../mod/authtest.php:13
 #: ../../mod/bookmarks.php:48 ../../mod/block.php:22 ../../mod/block.php:72
 #: ../../mod/id.php:71 ../../mod/like.php:177 ../../mod/common.php:35
-#: ../../mod/mitem.php:111 ../../mod/connedit.php:348 ../../mod/mood.php:112
-#: ../../mod/filestorage.php:18 ../../mod/filestorage.php:73
-#: ../../mod/filestorage.php:88 ../../mod/filestorage.php:115
-#: ../../mod/layouts.php:69 ../../mod/layouts.php:76 ../../mod/layouts.php:87
-#: ../../mod/poke.php:133 ../../mod/network.php:12 ../../mod/chat.php:91
-#: ../../mod/chat.php:96 ../../mod/message.php:16 ../../mod/channel.php:100
-#: ../../mod/channel.php:215 ../../mod/channel.php:255
-#: ../../mod/editpost.php:13 ../../mod/editblock.php:65 ../../mod/item.php:206
-#: ../../mod/item.php:214 ../../mod/item.php:992 ../../mod/appman.php:66
-#: ../../mod/profile.php:64 ../../mod/profile.php:72 ../../mod/menu.php:74
-#: ../../mod/page.php:31 ../../mod/page.php:86 ../../mod/new_channel.php:68
+#: ../../mod/mitem.php:111 ../../mod/connedit.php:347 ../../mod/mood.php:112
+#: ../../mod/photos.php:70 ../../mod/filestorage.php:18
+#: ../../mod/filestorage.php:73 ../../mod/filestorage.php:88
+#: ../../mod/filestorage.php:115 ../../mod/layouts.php:69
+#: ../../mod/layouts.php:76 ../../mod/layouts.php:87 ../../mod/poke.php:133
+#: ../../mod/network.php:12 ../../mod/chat.php:94 ../../mod/chat.php:99
+#: ../../mod/rate.php:111 ../../mod/mail.php:118 ../../mod/editblock.php:65
+#: ../../mod/editpost.php:13 ../../mod/appman.php:66 ../../mod/profile.php:64
+#: ../../mod/profile.php:72 ../../mod/menu.php:74 ../../mod/page.php:31
+#: ../../mod/page.php:86 ../../mod/new_channel.php:68
 #: ../../mod/new_channel.php:99 ../../mod/notifications.php:66
-#: ../../mod/pdledit.php:21 ../../mod/photos.php:70 ../../mod/rate.php:110
-#: ../../mod/events.php:256 ../../mod/profile_photo.php:338
-#: ../../mod/profile_photo.php:351 ../../mod/mail.php:114
-#: ../../mod/webpages.php:69 ../../mod/register.php:72 ../../mod/blocks.php:69
-#: ../../mod/blocks.php:76 ../../mod/service_limits.php:7
-#: ../../mod/sources.php:66 ../../mod/regmod.php:17 ../../mod/thing.php:271
-#: ../../mod/thing.php:291 ../../mod/thing.php:328 ../../mod/invite.php:13
-#: ../../mod/invite.php:104 ../../mod/viewsrc.php:14
-#: ../../mod/settings.php:565 ../../mod/manage.php:6 ../../mod/api.php:26
-#: ../../mod/api.php:31 ../../mod/connections.php:29
+#: ../../mod/pdledit.php:21 ../../mod/events.php:256
+#: ../../mod/profile_photo.php:338 ../../mod/profile_photo.php:351
+#: ../../mod/item.php:205 ../../mod/item.php:213 ../../mod/item.php:1002
+#: ../../mod/message.php:16 ../../mod/webpages.php:69
+#: ../../mod/register.php:72 ../../mod/blocks.php:69 ../../mod/blocks.php:76
+#: ../../mod/service_limits.php:7 ../../mod/sources.php:66
+#: ../../mod/regmod.php:17 ../../mod/channel.php:100 ../../mod/channel.php:214
+#: ../../mod/channel.php:254 ../../mod/thing.php:271 ../../mod/thing.php:291
+#: ../../mod/thing.php:328 ../../mod/invite.php:13 ../../mod/invite.php:104
+#: ../../mod/viewsrc.php:14 ../../mod/settings.php:565 ../../mod/manage.php:6
+#: ../../mod/api.php:26 ../../mod/api.php:31 ../../mod/connections.php:29
 #: ../../mod/editlayout.php:63 ../../mod/editlayout.php:87
 #: ../../mod/editwebpage.php:64 ../../mod/editwebpage.php:86
 #: ../../mod/editwebpage.php:101 ../../mod/editwebpage.php:125
@@ -358,7 +388,7 @@ msgstr "AAAA-MM-GG oppure MM-GG"
 msgid "Required"
 msgstr "Obbligatorio"
 
-#: ../../include/datetime.php:262 ../../boot.php:2306
+#: ../../include/datetime.php:262 ../../boot.php:2312
 msgid "never"
 msgstr "mai"
 
@@ -542,9 +572,9 @@ msgstr "Foto grandi"
 
 #: ../../include/features.php:58
 msgid ""
-"Include large (640px) photo thumbnails in posts. If not enabled, use small "
-"(320px) photo thumbnails"
-msgstr "Includi anteprime grandi delle foto nei post (640px). Se disabilitato le anteprime saranno piccole (320px)"
+"Include large (1024px) photo thumbnails in posts. If not enabled, use small "
+"(640px) photo thumbnails"
+msgstr "Includi anteprime grandi per le foto dei tuoi post (1024px). Altrimenti saranno mostrate anteprime più piccole (640px)"
 
 #: ../../include/features.php:59 ../../include/widgets.php:545
 #: ../../mod/sources.php:88
@@ -701,12 +731,12 @@ msgstr "Predefinito"
 msgid "Delete this item?"
 msgstr "Eliminare questo elemento?"
 
-#: ../../include/js_strings.php:6 ../../include/ItemObject.php:673
-#: ../../mod/photos.php:1008 ../../mod/photos.php:1126
+#: ../../include/js_strings.php:6 ../../include/ItemObject.php:681
+#: ../../mod/photos.php:1044 ../../mod/photos.php:1162
 msgid "Comment"
 msgstr "Commento"
 
-#: ../../include/js_strings.php:7 ../../include/ItemObject.php:390
+#: ../../include/js_strings.php:7 ../../include/ItemObject.php:398
 msgid "[+] show all"
 msgstr "[+] mostra tutto"
 
@@ -758,8 +788,8 @@ msgstr "Niente di nuovo qui"
 msgid "Rate This Channel (this is public)"
 msgstr "Valuta questo canale (visibile a tutti)"
 
-#: ../../include/js_strings.php:20 ../../mod/connedit.php:667
-#: ../../mod/rate.php:156
+#: ../../include/js_strings.php:20 ../../mod/connedit.php:666
+#: ../../mod/rate.php:157
 msgid "Rating"
 msgstr "Valutazioni"
 
@@ -767,17 +797,18 @@ msgstr "Valutazioni"
 msgid "Describe (optional)"
 msgstr "Descrizione (facoltativa)"
 
-#: ../../include/js_strings.php:22 ../../include/ItemObject.php:674
+#: ../../include/js_strings.php:22 ../../include/ItemObject.php:682
 #: ../../mod/fsuggest.php:108 ../../mod/mitem.php:231
-#: ../../mod/connedit.php:688 ../../mod/mood.php:135 ../../mod/pconfig.php:108
-#: ../../mod/filestorage.php:156 ../../mod/poke.php:171 ../../mod/chat.php:181
-#: ../../mod/chat.php:209 ../../mod/admin.php:411 ../../mod/admin.php:776
-#: ../../mod/admin.php:940 ../../mod/admin.php:1072 ../../mod/admin.php:1266
-#: ../../mod/admin.php:1351 ../../mod/appman.php:99 ../../mod/pdledit.php:58
-#: ../../mod/photos.php:598 ../../mod/photos.php:969 ../../mod/photos.php:1009
-#: ../../mod/photos.php:1127 ../../mod/rate.php:167 ../../mod/events.php:534
-#: ../../mod/events.php:710 ../../mod/mail.php:364 ../../mod/sources.php:104
-#: ../../mod/sources.php:138 ../../mod/import.php:511 ../../mod/thing.php:313
+#: ../../mod/connedit.php:687 ../../mod/mood.php:135 ../../mod/pconfig.php:108
+#: ../../mod/photos.php:634 ../../mod/photos.php:1005
+#: ../../mod/photos.php:1045 ../../mod/photos.php:1163
+#: ../../mod/filestorage.php:156 ../../mod/poke.php:171 ../../mod/chat.php:184
+#: ../../mod/chat.php:213 ../../mod/rate.php:168 ../../mod/mail.php:371
+#: ../../mod/admin.php:411 ../../mod/admin.php:776 ../../mod/admin.php:940
+#: ../../mod/admin.php:1072 ../../mod/admin.php:1266 ../../mod/admin.php:1351
+#: ../../mod/appman.php:99 ../../mod/pdledit.php:58 ../../mod/events.php:534
+#: ../../mod/events.php:710 ../../mod/sources.php:104
+#: ../../mod/sources.php:138 ../../mod/import.php:517 ../../mod/thing.php:313
 #: ../../mod/thing.php:359 ../../mod/invite.php:142 ../../mod/settings.php:583
 #: ../../mod/settings.php:695 ../../mod/settings.php:723
 #: ../../mod/settings.php:746 ../../mod/settings.php:831
@@ -1086,7 +1117,7 @@ msgstr "RSS/Atom"
 
 #: ../../include/contact_selectors.php:79 ../../mod/id.php:15
 #: ../../mod/id.php:16 ../../mod/admin.php:779 ../../mod/admin.php:788
-#: ../../boot.php:1499
+#: ../../boot.php:1505
 msgid "Email"
 msgstr "Email"
 
@@ -1137,8 +1168,8 @@ msgstr "Guarda %2$s di %1$s "
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr "%1$s ha aggiornato %2$s cambiando %3$s."
 
-#: ../../include/Contact.php:101 ../../include/conversation.php:947
-#: ../../include/identity.php:941 ../../include/widgets.php:136
+#: ../../include/Contact.php:101 ../../include/identity.php:965
+#: ../../include/conversation.php:949 ../../include/widgets.php:136
 #: ../../include/widgets.php:174 ../../mod/directory.php:316
 #: ../../mod/match.php:64 ../../mod/suggest.php:52
 msgid "Connect"
@@ -1162,679 +1193,660 @@ msgstr "Utente '%s' eliminato"
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr "Non trovo le informazioni DNS per il database server '%s'"
 
-#: ../../include/conversation.php:120 ../../include/text.php:1832
-#: ../../mod/like.php:361 ../../mod/tagger.php:43 ../../mod/subthread.php:72
-#: ../../mod/subthread.php:172
-msgid "photo"
-msgstr "la foto"
+#: ../../include/items.php:423 ../../mod/like.php:280 ../../mod/dreport.php:6
+#: ../../mod/dreport.php:45 ../../mod/subthread.php:49 ../../mod/group.php:68
+#: ../../mod/profperm.php:23 ../../mod/import_items.php:114
+#: ../../index.php:360
+msgid "Permission denied"
+msgstr "Permesso negato"
 
-#: ../../include/conversation.php:123 ../../include/text.php:1835
-#: ../../include/event.php:896 ../../mod/like.php:363 ../../mod/tagger.php:47
-#: ../../mod/events.php:245
-msgid "event"
-msgstr "l'evento"
+#: ../../include/items.php:1128 ../../include/items.php:1174
+msgid "(Unknown)"
+msgstr "(Sconosciuto)"
 
-#: ../../include/conversation.php:126 ../../mod/like.php:113
-msgid "channel"
-msgstr "il canale"
+#: ../../include/items.php:1371
+msgid "Visible to anybody on the internet."
+msgstr "Visibile a chiunque su internet."
 
-#: ../../include/conversation.php:148 ../../include/text.php:1838
-#: ../../mod/like.php:361 ../../mod/subthread.php:72
-#: ../../mod/subthread.php:172
-msgid "status"
-msgstr "il messaggio di stato"
+#: ../../include/items.php:1373
+msgid "Visible to you only."
+msgstr "Visibile solo a te."
 
-#: ../../include/conversation.php:150 ../../include/text.php:1840
-#: ../../mod/tagger.php:53
-msgid "comment"
-msgstr "il commento"
+#: ../../include/items.php:1375
+msgid "Visible to anybody in this network."
+msgstr "Visibile a tutti su questa rete."
 
-#: ../../include/conversation.php:164 ../../mod/like.php:410
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
-msgstr "A %1$s piace %3$s di %2$s"
+#: ../../include/items.php:1377
+msgid "Visible to anybody authenticated."
+msgstr "Visibile a chiunque sia autenticato."
 
-#: ../../include/conversation.php:167 ../../mod/like.php:412
+#: ../../include/items.php:1379
 #, php-format
-msgid "%1$s doesn't like %2$s's %3$s"
-msgstr "A %1$s non piace %3$s di %2$s"
+msgid "Visible to anybody on %s."
+msgstr "Visibile a tutti su %s."
 
-#: ../../include/conversation.php:204
-#, php-format
-msgid "%1$s is now connected with %2$s"
-msgstr "%1$s adesso è connesso con %2$s"
+#: ../../include/items.php:1381
+msgid "Visible to all connections."
+msgstr "Visibile a tutti coloro che ti seguono."
 
-#: ../../include/conversation.php:239
-#, php-format
-msgid "%1$s poked %2$s"
-msgstr "%1$s ha mandato un poke a %2$s"
+#: ../../include/items.php:1383
+msgid "Visible to approved connections."
+msgstr "Visibile ai contatti approvati."
 
-#: ../../include/conversation.php:243 ../../include/text.php:933
-msgid "poked"
-msgstr "ha ricevuto un poke"
+#: ../../include/items.php:1385
+msgid "Visible to specific connections."
+msgstr "Visibile ad alcuni contatti scelti."
 
-#: ../../include/conversation.php:260 ../../mod/mood.php:63
-#, php-format
-msgctxt "mood"
-msgid "%1$s is %2$s"
-msgstr "%1$s è %2$s"
+#: ../../include/items.php:4297 ../../mod/display.php:36
+#: ../../mod/filestorage.php:27 ../../mod/admin.php:127
+#: ../../mod/admin.php:979 ../../mod/admin.php:1179 ../../mod/thing.php:86
+#: ../../mod/viewsrc.php:20
+msgid "Item not found."
+msgstr "Elemento non trovato."
 
-#: ../../include/conversation.php:574 ../../mod/photos.php:1024
-msgctxt "title"
-msgid "Likes"
-msgstr "Mi piace"
+#: ../../include/items.php:4806 ../../mod/group.php:38 ../../mod/group.php:137
+msgid "Collection not found."
+msgstr "Insieme di canali non trovato."
 
-#: ../../include/conversation.php:574 ../../mod/photos.php:1024
-msgctxt "title"
-msgid "Dislikes"
-msgstr "Non mi piace"
+#: ../../include/items.php:4822
+msgid "Collection is empty."
+msgstr "L'insieme di canali è vuoto."
 
-#: ../../include/conversation.php:575 ../../mod/photos.php:1025
-msgctxt "title"
-msgid "Agree"
-msgstr "D'accordo"
+#: ../../include/items.php:4829
+#, php-format
+msgid "Collection: %s"
+msgstr "Insieme: %s"
 
-#: ../../include/conversation.php:575 ../../mod/photos.php:1025
-msgctxt "title"
-msgid "Disagree"
-msgstr "Non d'accordo"
+#: ../../include/items.php:4839 ../../mod/connedit.php:657
+#, php-format
+msgid "Connection: %s"
+msgstr "Contatto: %s"
 
-#: ../../include/conversation.php:575 ../../mod/photos.php:1025
-msgctxt "title"
-msgid "Abstain"
-msgstr "Astenuti"
+#: ../../include/items.php:4841
+msgid "Connection not found."
+msgstr "Contatto non trovato."
 
-#: ../../include/conversation.php:576 ../../mod/photos.php:1026
-msgctxt "title"
-msgid "Attending"
-msgstr "Partecipano"
+#: ../../include/api.php:1321
+msgid "Public Timeline"
+msgstr "Diario pubblico"
 
-#: ../../include/conversation.php:576 ../../mod/photos.php:1026
-msgctxt "title"
-msgid "Not attending"
-msgstr "Non partecipano"
+#: ../../include/network.php:635
+msgid "view full size"
+msgstr "guarda nelle dimensioni reali"
 
-#: ../../include/conversation.php:576 ../../mod/photos.php:1026
-msgctxt "title"
-msgid "Might attend"
-msgstr "Forse partecipano"
+#: ../../include/network.php:1613 ../../include/enotify.php:57
+msgid "$Projectname Notification"
+msgstr "Notifica $Projectname"
 
-#: ../../include/conversation.php:661 ../../include/ItemObject.php:126
-msgid "Select"
-msgstr "Scegli"
+#: ../../include/network.php:1614 ../../include/enotify.php:58
+msgid "$projectname"
+msgstr "$projectname"
 
-#: ../../include/conversation.php:669 ../../include/ItemObject.php:89
-msgid "Private Message"
-msgstr "Messaggio privato"
+#: ../../include/network.php:1616 ../../include/enotify.php:60
+msgid "Thank You,"
+msgstr "Grazie,"
 
-#: ../../include/conversation.php:676 ../../include/ItemObject.php:227
-msgid "Message signature validated"
-msgstr "Messaggio con firma verificata"
+#: ../../include/network.php:1618 ../../include/enotify.php:62
+#, php-format
+msgid "%s Administrator"
+msgstr "L'amministratore di %s"
 
-#: ../../include/conversation.php:677 ../../include/ItemObject.php:228
-msgid "Message signature incorrect"
-msgstr "Massaggio con firma non corretta"
+#: ../../include/network.php:1660 ../../include/account.php:316
+#: ../../include/account.php:343 ../../include/account.php:403
+msgid "Administrator"
+msgstr "Amministratore"
 
-#: ../../include/conversation.php:694
+#: ../../include/network.php:1674
+msgid "No Subject"
+msgstr "Nessun titolo"
+
+#: ../../include/bookmarks.php:35
 #, php-format
-msgid "View %s's profile @ %s"
-msgstr "Vedi il profilo di %s @ %s"
+msgid "%1$s's bookmarks"
+msgstr "I segnalibri di %1$s"
 
-#: ../../include/conversation.php:709
-msgid "Categories:"
-msgstr "Categorie:"
+#: ../../include/acl_selectors.php:239
+msgid "Visible to your default audience"
+msgstr "Visibile secondo le impostazioni predefinite"
 
-#: ../../include/conversation.php:710
-msgid "Filed under:"
-msgstr "Classificato come:"
+#: ../../include/acl_selectors.php:240
+msgid "Show"
+msgstr "Mostra"
 
-#: ../../include/conversation.php:718 ../../include/ItemObject.php:314
-#, php-format
-msgid "from %s"
-msgstr "da %s"
+#: ../../include/acl_selectors.php:241
+msgid "Don't show"
+msgstr "Non mostrare"
 
-#: ../../include/conversation.php:721 ../../include/ItemObject.php:317
-#, php-format
-msgid "last edited: %s"
-msgstr "ultima modifica: %s"
+#: ../../include/acl_selectors.php:247 ../../mod/photos.php:628
+#: ../../mod/photos.php:998 ../../mod/filestorage.php:147
+#: ../../mod/chat.php:211 ../../mod/events.php:708 ../../mod/thing.php:310
+#: ../../mod/thing.php:356
+msgid "Permissions"
+msgstr "Permessi"
 
-#: ../../include/conversation.php:722 ../../include/ItemObject.php:318
-#, php-format
-msgid "Expires: %s"
-msgstr "Scadenza: %s"
+#: ../../include/acl_selectors.php:248 ../../include/ItemObject.php:369
+#: ../../mod/photos.php:1215
+msgid "Close"
+msgstr "Chiudi"
 
-#: ../../include/conversation.php:737
-msgid "View in context"
-msgstr "Vedi nel contesto"
+#: ../../include/import.php:23
+msgid ""
+"Cannot create a duplicate channel identifier on this system. Import failed."
+msgstr "Non posso creare un canale con un identificativo che già esiste su questo sistema. L'importazione è fallita."
 
-#: ../../include/conversation.php:739 ../../include/conversation.php:1212
-#: ../../include/ItemObject.php:366 ../../mod/editpost.php:130
-#: ../../mod/editblock.php:150 ../../mod/photos.php:990 ../../mod/mail.php:237
-#: ../../mod/mail.php:365 ../../mod/editlayout.php:148
-#: ../../mod/editwebpage.php:190
-msgid "Please wait"
-msgstr "Attendere"
+#: ../../include/import.php:70
+msgid "Channel clone failed. Import failed."
+msgstr "Impossibile clonare il canale. L'importazione è fallita."
 
-#: ../../include/conversation.php:848
-msgid "remove"
-msgstr "rimuovi"
+#: ../../include/import.php:80 ../../mod/import.php:138
+msgid "Cloned channel not found. Import failed."
+msgstr "Impossibile trovare il canale clonato. L'importazione è fallita."
 
-#: ../../include/conversation.php:852 ../../include/nav.php:241
-msgid "Loading..."
-msgstr "Caricamento in corso..."
+#: ../../include/photos.php:109
+#, php-format
+msgid "Image exceeds website size limit of %lu bytes"
+msgstr "L'immagine supera il limite massimo di %lu bytes"
 
-#: ../../include/conversation.php:853
-msgid "Delete Selected Items"
-msgstr "Elimina gli oggetti selezionati"
+#: ../../include/photos.php:116
+msgid "Image file is empty."
+msgstr "Il file dell'immagine è vuoto."
 
-#: ../../include/conversation.php:941
-msgid "View Source"
-msgstr "Vedi il sorgente"
+#: ../../include/photos.php:143 ../../mod/profile_photo.php:222
+msgid "Unable to process image"
+msgstr "Impossibile elaborare l'immagine"
 
-#: ../../include/conversation.php:942
-msgid "Follow Thread"
-msgstr "Segui la discussione"
+#: ../../include/photos.php:232
+msgid "Photo storage failed."
+msgstr "Impossibile salvare la foto."
 
-#: ../../include/conversation.php:943
-msgid "View Status"
-msgstr "Guarda il messaggio di stato"
+#: ../../include/photos.php:452 ../../include/conversation.php:1609
+msgid "Photo Albums"
+msgstr "Album foto"
 
-#: ../../include/conversation.php:944 ../../include/nav.php:86
-#: ../../mod/connedit.php:494
-msgid "View Profile"
-msgstr "Profilo"
+#: ../../include/photos.php:456
+msgid "Upload New Photos"
+msgstr "Carica nuove foto"
 
-#: ../../include/conversation.php:945
-msgid "View Photos"
-msgstr "Foto"
+#: ../../include/notify.php:20
+msgid "created a new post"
+msgstr "Ha creato un nuovo post"
 
-#: ../../include/conversation.php:946
-msgid "Activity/Posts"
-msgstr "Attività e Post"
+#: ../../include/notify.php:21
+#, php-format
+msgid "commented on %s's post"
+msgstr "ha commentato il post di %s"
 
-#: ../../include/conversation.php:948
-msgid "Edit Connection"
-msgstr "Modifica il contatto"
+#: ../../include/page_widgets.php:6
+msgid "New Page"
+msgstr "Nuova pagina web"
 
-#: ../../include/conversation.php:949
-msgid "Send PM"
-msgstr "Messaggio privato"
+#: ../../include/page_widgets.php:39 ../../mod/layouts.php:188
+#: ../../mod/webpages.php:187 ../../mod/blocks.php:159
+msgid "View"
+msgstr "Guarda"
 
-#: ../../include/conversation.php:950 ../../include/apps.php:145
-msgid "Poke"
-msgstr "Poke"
+#: ../../include/page_widgets.php:40 ../../include/ItemObject.php:691
+#: ../../include/conversation.php:1160 ../../mod/photos.php:1046
+#: ../../mod/editblock.php:171 ../../mod/editpost.php:150
+#: ../../mod/events.php:707 ../../mod/webpages.php:188
+#: ../../mod/editwebpage.php:212
+msgid "Preview"
+msgstr "Anteprima"
 
-#: ../../include/conversation.php:1064
-#, php-format
-msgid "%s likes this."
-msgstr "Piace a %s."
+#: ../../include/page_widgets.php:41 ../../mod/webpages.php:189
+msgid "Actions"
+msgstr "Azioni"
 
-#: ../../include/conversation.php:1064
-#, php-format
-msgid "%s doesn't like this."
-msgstr "Non piace a %s."
+#: ../../include/page_widgets.php:42 ../../mod/webpages.php:190
+msgid "Page Link"
+msgstr "Link alla pagina"
 
-#: ../../include/conversation.php:1068
-#, php-format
-msgid "<span  %1$s>%2$d people</span> like this."
-msgid_plural "<span  %1$s>%2$d people</span> like this."
-msgstr[0] ""
-msgstr[1] "Piace a <span %1$s>%2$d persone</span>."
+#: ../../include/page_widgets.php:43
+msgid "Title"
+msgstr "Titolo"
 
-#: ../../include/conversation.php:1070
-#, php-format
-msgid "<span  %1$s>%2$d people</span> don't like this."
-msgid_plural "<span  %1$s>%2$d people</span> don't like this."
-msgstr[0] ""
-msgstr[1] "Non piace a <span %1$s>%2$d persone</span>."
+#: ../../include/page_widgets.php:44 ../../mod/layouts.php:181
+#: ../../mod/menu.php:110 ../../mod/webpages.php:192 ../../mod/blocks.php:150
+msgid "Created"
+msgstr "Creato"
 
-#: ../../include/conversation.php:1076
-msgid "and"
-msgstr "e"
+#: ../../include/page_widgets.php:45 ../../mod/layouts.php:182
+#: ../../mod/menu.php:111 ../../mod/webpages.php:193 ../../mod/blocks.php:151
+msgid "Edited"
+msgstr "Modificato"
 
-#: ../../include/conversation.php:1079
-#, php-format
-msgid ", and %d other people"
-msgid_plural ", and %d other people"
-msgstr[0] ""
-msgstr[1] "e altre %d persone"
+#: ../../include/photo/photo_driver.php:705 ../../mod/photos.php:94
+#: ../../mod/photos.php:696 ../../mod/profile_photo.php:146
+#: ../../mod/profile_photo.php:236 ../../mod/profile_photo.php:376
+msgid "Profile Photos"
+msgstr "Foto del profilo"
 
-#: ../../include/conversation.php:1080
-#, php-format
-msgid "%s like this."
-msgstr "Piace a %s."
+#: ../../include/profile_selectors.php:6
+#: ../../include/profile_selectors.php:23 ../../mod/id.php:103
+msgid "Male"
+msgstr "Maschio"
 
-#: ../../include/conversation.php:1080
-#, php-format
-msgid "%s don't like this."
-msgstr "Non piace a %s."
+#: ../../include/profile_selectors.php:6
+#: ../../include/profile_selectors.php:23 ../../mod/id.php:105
+msgid "Female"
+msgstr "Femmina"
 
-#: ../../include/conversation.php:1143
-msgid "Visible to <strong>everybody</strong>"
-msgstr "Visibile a <strong>tutti</strong>"
+#: ../../include/profile_selectors.php:6
+msgid "Currently Male"
+msgstr "Al momento maschio"
 
-#: ../../include/conversation.php:1144 ../../mod/mail.php:170
-#: ../../mod/mail.php:299
-msgid "Please enter a link URL:"
-msgstr "Inserisci l'indirizzo del link:"
+#: ../../include/profile_selectors.php:6
+msgid "Currently Female"
+msgstr "Al momento femmina"
 
-#: ../../include/conversation.php:1145
-msgid "Please enter a video link/URL:"
-msgstr "Inserisci l'indirizzo del video:"
+#: ../../include/profile_selectors.php:6
+msgid "Mostly Male"
+msgstr "Prevalentemente maschio"
 
-#: ../../include/conversation.php:1146
-msgid "Please enter an audio link/URL:"
-msgstr "Inserisci l'indirizzo dell'audio:"
+#: ../../include/profile_selectors.php:6
+msgid "Mostly Female"
+msgstr "Prevalentemente femmina"
 
-#: ../../include/conversation.php:1147
-msgid "Tag term:"
-msgstr "Tag:"
+#: ../../include/profile_selectors.php:6
+msgid "Transgender"
+msgstr "Transgender"
 
-#: ../../include/conversation.php:1148 ../../mod/filer.php:48
-msgid "Save to Folder:"
-msgstr "Salva nella cartella:"
+#: ../../include/profile_selectors.php:6
+msgid "Intersex"
+msgstr "Intersex"
 
-#: ../../include/conversation.php:1149
-msgid "Where are you right now?"
-msgstr "Dove sei ora?"
+#: ../../include/profile_selectors.php:6
+msgid "Transsexual"
+msgstr "Transessuale"
 
-#: ../../include/conversation.php:1150 ../../mod/editpost.php:54
-#: ../../mod/mail.php:171 ../../mod/mail.php:300
-msgid "Expires YYYY-MM-DD HH:MM"
-msgstr "Scade il YYYY-MM-DD HH:MM"
+#: ../../include/profile_selectors.php:6
+msgid "Hermaphrodite"
+msgstr "Ermafrodito"
 
-#: ../../include/conversation.php:1158 ../../include/page_widgets.php:40
-#: ../../include/ItemObject.php:683 ../../mod/editpost.php:150
-#: ../../mod/editblock.php:171 ../../mod/photos.php:1010
-#: ../../mod/events.php:707 ../../mod/webpages.php:188
-#: ../../mod/editwebpage.php:212
-msgid "Preview"
-msgstr "Anteprima"
+#: ../../include/profile_selectors.php:6
+msgid "Neuter"
+msgstr "Neutro"
 
-#: ../../include/conversation.php:1177 ../../mod/layouts.php:184
-#: ../../mod/photos.php:989 ../../mod/webpages.php:182
-#: ../../mod/blocks.php:154
-msgid "Share"
-msgstr "Condividi"
+#: ../../include/profile_selectors.php:6
+msgid "Non-specific"
+msgstr "Non specificato"
 
-#: ../../include/conversation.php:1179
-msgid "Page link name"
-msgstr "Nome del link alla pagina"
+#: ../../include/profile_selectors.php:6
+msgid "Undecided"
+msgstr "Indeciso"
 
-#: ../../include/conversation.php:1182
-msgid "Post as"
-msgstr "Pubblica come "
+#: ../../include/profile_selectors.php:42
+#: ../../include/profile_selectors.php:61
+msgid "Males"
+msgstr "Maschi"
 
-#: ../../include/conversation.php:1184 ../../include/ItemObject.php:675
-#: ../../mod/editpost.php:114 ../../mod/editblock.php:136
-#: ../../mod/editlayout.php:135 ../../mod/editwebpage.php:177
-msgid "Bold"
-msgstr "Grassetto"
+#: ../../include/profile_selectors.php:42
+#: ../../include/profile_selectors.php:61
+msgid "Females"
+msgstr "Femmine"
 
-#: ../../include/conversation.php:1185 ../../include/ItemObject.php:676
-#: ../../mod/editpost.php:115 ../../mod/editblock.php:137
-#: ../../mod/editlayout.php:136 ../../mod/editwebpage.php:178
-msgid "Italic"
-msgstr "Corsivo"
+#: ../../include/profile_selectors.php:42
+msgid "Gay"
+msgstr "Gay"
 
-#: ../../include/conversation.php:1186 ../../include/ItemObject.php:677
-#: ../../mod/editpost.php:116 ../../mod/editblock.php:138
-#: ../../mod/editlayout.php:137 ../../mod/editwebpage.php:179
-msgid "Underline"
-msgstr "Sottolineato"
+#: ../../include/profile_selectors.php:42
+msgid "Lesbian"
+msgstr "Lesbica"
 
-#: ../../include/conversation.php:1187 ../../include/ItemObject.php:678
-#: ../../mod/editpost.php:117 ../../mod/editblock.php:139
-#: ../../mod/editlayout.php:138 ../../mod/editwebpage.php:180
-msgid "Quote"
-msgstr "Citazione"
+#: ../../include/profile_selectors.php:42
+msgid "No Preference"
+msgstr "Senza preferenza"
 
-#: ../../include/conversation.php:1188 ../../include/ItemObject.php:679
-#: ../../mod/editpost.php:118 ../../mod/editblock.php:140
-#: ../../mod/editlayout.php:139 ../../mod/editwebpage.php:181
-msgid "Code"
-msgstr "Codice"
+#: ../../include/profile_selectors.php:42
+msgid "Bisexual"
+msgstr "Bisessuale"
 
-#: ../../include/conversation.php:1189 ../../mod/editpost.php:119
-#: ../../mod/editblock.php:142 ../../mod/mail.php:234 ../../mod/mail.php:361
-#: ../../mod/editlayout.php:140 ../../mod/editwebpage.php:182
-msgid "Upload photo"
-msgstr "Carica foto"
+#: ../../include/profile_selectors.php:42
+msgid "Autosexual"
+msgstr "Autosessuale"
 
-#: ../../include/conversation.php:1190
-msgid "upload photo"
-msgstr "carica foto"
+#: ../../include/profile_selectors.php:42
+msgid "Abstinent"
+msgstr "Astinente"
 
-#: ../../include/conversation.php:1191 ../../mod/editpost.php:120
-#: ../../mod/editblock.php:143 ../../mod/mail.php:235 ../../mod/mail.php:362
-#: ../../mod/editlayout.php:141 ../../mod/editwebpage.php:183
-msgid "Attach file"
-msgstr "Allega file"
+#: ../../include/profile_selectors.php:42
+msgid "Virgin"
+msgstr "Vergine"
 
-#: ../../include/conversation.php:1192
-msgid "attach file"
-msgstr "allega file"
+#: ../../include/profile_selectors.php:42
+msgid "Deviant"
+msgstr "Deviato"
 
-#: ../../include/conversation.php:1193 ../../mod/editpost.php:121
-#: ../../mod/editblock.php:144 ../../mod/mail.php:236 ../../mod/mail.php:363
-#: ../../mod/editlayout.php:142 ../../mod/editwebpage.php:184
-msgid "Insert web link"
-msgstr "Inserisci un indirizzo web"
+#: ../../include/profile_selectors.php:42
+msgid "Fetish"
+msgstr "Feticista"
 
-#: ../../include/conversation.php:1194
-msgid "web link"
-msgstr "link web"
+#: ../../include/profile_selectors.php:42
+msgid "Oodles"
+msgstr "Un sacco"
 
-#: ../../include/conversation.php:1195
-msgid "Insert video link"
-msgstr "Inserisci l'indirizzo del video"
+#: ../../include/profile_selectors.php:42
+msgid "Nonsexual"
+msgstr "Asessuato"
 
-#: ../../include/conversation.php:1196
-msgid "video link"
-msgstr "link video"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Single"
+msgstr "Single"
 
-#: ../../include/conversation.php:1197
-msgid "Insert audio link"
-msgstr "Inserisci l'indirizzo dell'audio"
+#: ../../include/profile_selectors.php:80
+msgid "Lonely"
+msgstr "Da solo"
 
-#: ../../include/conversation.php:1198
-msgid "audio link"
-msgstr "link audio"
+#: ../../include/profile_selectors.php:80
+msgid "Available"
+msgstr "Disponibile"
 
-#: ../../include/conversation.php:1199 ../../mod/editpost.php:125
-#: ../../mod/editblock.php:148 ../../mod/editlayout.php:146
-#: ../../mod/editwebpage.php:188
-msgid "Set your location"
-msgstr "La tua località"
+#: ../../include/profile_selectors.php:80
+msgid "Unavailable"
+msgstr "Non disponibile"
 
-#: ../../include/conversation.php:1200
-msgid "set location"
-msgstr "la tua località"
+#: ../../include/profile_selectors.php:80
+msgid "Has crush"
+msgstr "Ha una cotta"
 
-#: ../../include/conversation.php:1201 ../../mod/editpost.php:127
-msgid "Toggle voting"
-msgstr "Abilita/disabilita il voto"
+#: ../../include/profile_selectors.php:80
+msgid "Infatuated"
+msgstr "Infatuato/a"
 
-#: ../../include/conversation.php:1204 ../../mod/editpost.php:126
-#: ../../mod/editblock.php:149 ../../mod/editlayout.php:147
-#: ../../mod/editwebpage.php:189
-msgid "Clear browser location"
-msgstr "Rimuovi la località data dal browser"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Dating"
+msgstr "Disponibile a un incontro"
 
-#: ../../include/conversation.php:1205
-msgid "clear location"
-msgstr "rimuovi la località"
+#: ../../include/profile_selectors.php:80
+msgid "Unfaithful"
+msgstr "Infedele"
 
-#: ../../include/conversation.php:1207 ../../mod/editpost.php:142
-#: ../../mod/editblock.php:162 ../../mod/editwebpage.php:205
-msgid "Title (optional)"
-msgstr "Titolo (opzionale)"
+#: ../../include/profile_selectors.php:80
+msgid "Sex Addict"
+msgstr "Sesso-dipendente"
 
-#: ../../include/conversation.php:1211 ../../mod/editpost.php:144
-#: ../../mod/editblock.php:165 ../../mod/editlayout.php:163
-#: ../../mod/editwebpage.php:207
-msgid "Categories (optional, comma-separated list)"
-msgstr "Categorie (lista separata da virgole)"
+#: ../../include/profile_selectors.php:80 ../../include/identity.php:390
+#: ../../include/identity.php:391 ../../include/identity.php:398
+#: ../../include/widgets.php:429 ../../mod/connedit.php:568
+#: ../../mod/settings.php:337 ../../mod/settings.php:341
+#: ../../mod/settings.php:342 ../../mod/settings.php:345
+#: ../../mod/settings.php:356
+msgid "Friends"
+msgstr "Amici"
 
-#: ../../include/conversation.php:1213 ../../mod/editpost.php:131
-#: ../../mod/editblock.php:151 ../../mod/editlayout.php:149
-#: ../../mod/editwebpage.php:191
-msgid "Permission settings"
-msgstr "Permessi dei tuoi contatti"
+#: ../../include/profile_selectors.php:80
+msgid "Friends/Benefits"
+msgstr "Amici con qualcosa in più"
 
-#: ../../include/conversation.php:1214
-msgid "permissions"
-msgstr "permessi"
+#: ../../include/profile_selectors.php:80
+msgid "Casual"
+msgstr "Casual"
 
-#: ../../include/conversation.php:1222 ../../mod/editpost.php:139
-#: ../../mod/editblock.php:159 ../../mod/editlayout.php:156
-#: ../../mod/editwebpage.php:200
-msgid "Public post"
-msgstr "Post pubblico"
+#: ../../include/profile_selectors.php:80
+msgid "Engaged"
+msgstr "Impegnato"
 
-#: ../../include/conversation.php:1224 ../../mod/editpost.php:145
-#: ../../mod/editblock.php:166 ../../mod/editlayout.php:164
-#: ../../mod/editwebpage.php:208
-msgid "Example: bob@example.com, mary@example.com"
-msgstr "Per esempio: mario@esempio.com, simona@esempio.com"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Married"
+msgstr "Sposato/a"
 
-#: ../../include/conversation.php:1237 ../../mod/editpost.php:156
-#: ../../mod/editblock.php:176 ../../mod/mail.php:241 ../../mod/mail.php:368
-#: ../../mod/editlayout.php:173 ../../mod/editwebpage.php:217
-msgid "Set expiration date"
-msgstr "Data di scadenza"
+#: ../../include/profile_selectors.php:80
+msgid "Imaginarily married"
+msgstr "Con matrimonio immaginario"
 
-#: ../../include/conversation.php:1239 ../../include/ItemObject.php:686
-#: ../../mod/editpost.php:158 ../../mod/mail.php:243 ../../mod/mail.php:370
-msgid "Encrypt text"
-msgstr "Cifratura del messaggio"
+#: ../../include/profile_selectors.php:80
+msgid "Partners"
+msgstr "Partner"
 
-#: ../../include/conversation.php:1241 ../../mod/editpost.php:160
-#: ../../mod/events.php:691
-msgid "OK"
-msgstr "OK"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Cohabiting"
+msgstr "Convivente"
 
-#: ../../include/conversation.php:1242 ../../mod/fbrowser.php:82
-#: ../../mod/fbrowser.php:117 ../../mod/editpost.php:161
-#: ../../mod/events.php:690 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134
-#: ../../mod/settings.php:584 ../../mod/settings.php:610
-msgid "Cancel"
-msgstr "Annulla"
+#: ../../include/profile_selectors.php:80
+msgid "Common law"
+msgstr "Matrimonio regolare"
 
-#: ../../include/conversation.php:1485
-msgid "Discover"
-msgstr "Scopri"
+#: ../../include/profile_selectors.php:80
+msgid "Happy"
+msgstr "Felice"
 
-#: ../../include/conversation.php:1488
-msgid "Imported public streams"
-msgstr "Contenuti pubblici importati"
+#: ../../include/profile_selectors.php:80
+msgid "Not looking"
+msgstr "Non in cerca"
 
-#: ../../include/conversation.php:1493
-msgid "Commented Order"
-msgstr "Ultimi commenti"
+#: ../../include/profile_selectors.php:80
+msgid "Swinger"
+msgstr "Scambista"
 
-#: ../../include/conversation.php:1496
-msgid "Sort by Comment Date"
-msgstr "Per data del commento"
+#: ../../include/profile_selectors.php:80
+msgid "Betrayed"
+msgstr "Tradito/a"
 
-#: ../../include/conversation.php:1500
-msgid "Posted Order"
-msgstr "Ultimi post"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Separated"
+msgstr "Separato/a"
 
-#: ../../include/conversation.php:1503
-msgid "Sort by Post Date"
-msgstr "Per data di creazione"
+#: ../../include/profile_selectors.php:80
+msgid "Unstable"
+msgstr "Instabile"
 
-#: ../../include/conversation.php:1508 ../../include/widgets.php:94
-msgid "Personal"
-msgstr "Personali"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Divorced"
+msgstr "Divorziato/a"
 
-#: ../../include/conversation.php:1511
-msgid "Posts that mention or involve you"
-msgstr "Post che ti riguardano"
+#: ../../include/profile_selectors.php:80
+msgid "Imaginarily divorced"
+msgstr "Sogna il divorzio"
 
-#: ../../include/conversation.php:1517 ../../mod/menu.php:112
-#: ../../mod/connections.php:72 ../../mod/connections.php:82
-msgid "New"
-msgstr "Novità"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Widowed"
+msgstr "Vedovo/a"
 
-#: ../../include/conversation.php:1520
-msgid "Activity Stream - by date"
-msgstr "Elenco attività - per data"
+#: ../../include/profile_selectors.php:80
+msgid "Uncertain"
+msgstr "Incerto/a"
 
-#: ../../include/conversation.php:1526
-msgid "Starred"
-msgstr "Preferiti"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "It's complicated"
+msgstr "Relazione complicata"
 
-#: ../../include/conversation.php:1529
-msgid "Favourite Posts"
-msgstr "Post preferiti"
+#: ../../include/profile_selectors.php:80
+msgid "Don't care"
+msgstr "Chi se ne frega"
 
-#: ../../include/conversation.php:1536
-msgid "Spam"
-msgstr "Spam"
+#: ../../include/profile_selectors.php:80
+msgid "Ask me"
+msgstr "Chiedimelo"
 
-#: ../../include/conversation.php:1539
-msgid "Posts flagged as SPAM"
-msgstr "Post marcati come spam"
+#: ../../include/oembed.php:213
+msgid "Embedded content"
+msgstr "Contenuti incorporati"
 
-#: ../../include/conversation.php:1583 ../../mod/admin.php:947
-msgid "Channel"
-msgstr "Canale"
+#: ../../include/oembed.php:222
+msgid "Embedding disabled"
+msgstr "Disabilita la creazione di contenuti incorporati"
 
-#: ../../include/conversation.php:1586
-msgid "Status Messages and Posts"
-msgstr "Post e messaggi di stato"
+#: ../../include/event.php:766
+msgid "This event has been added to your calendar."
+msgstr "Questo evento è stato aggiunto al tuo calendario"
 
-#: ../../include/conversation.php:1595
-msgid "About"
-msgstr "Informazioni"
+#: ../../include/event.php:896 ../../include/text.php:1846
+#: ../../include/conversation.php:123 ../../mod/like.php:363
+#: ../../mod/tagger.php:47 ../../mod/events.php:245
+msgid "event"
+msgstr "l'evento"
 
-#: ../../include/conversation.php:1598
-msgid "Profile Details"
-msgstr "Dettagli del profilo"
+#: ../../include/event.php:953
+msgid "Not specified"
+msgstr "Non specificato"
 
-#: ../../include/conversation.php:1604 ../../include/apps.php:139
-#: ../../include/nav.php:92 ../../mod/fbrowser.php:25
-msgid "Photos"
-msgstr "Foto"
+#: ../../include/event.php:954
+msgid "Needs Action"
+msgstr "Necessita di un intervento"
 
-#: ../../include/conversation.php:1607 ../../include/photos.php:422
-msgid "Photo Albums"
-msgstr "Album foto"
+#: ../../include/event.php:955
+msgid "Completed"
+msgstr "Completato"
 
-#: ../../include/conversation.php:1614
-msgid "Files and Storage"
-msgstr "Archivio file"
+#: ../../include/event.php:956
+msgid "In Process"
+msgstr "In corso"
 
-#: ../../include/conversation.php:1624 ../../include/conversation.php:1627
-msgid "Chatrooms"
-msgstr "Chat"
+#: ../../include/event.php:957
+msgid "Cancelled"
+msgstr "Annullato"
 
-#: ../../include/conversation.php:1637 ../../include/apps.php:129
+#: ../../include/apps.php:128
+msgid "Site Admin"
+msgstr "Amministrazione sito"
+
+#: ../../include/apps.php:129 ../../include/conversation.php:1639
 #: ../../include/nav.php:103
 msgid "Bookmarks"
 msgstr "Segnalibri"
 
-#: ../../include/conversation.php:1640
-msgid "Saved Bookmarks"
-msgstr "Segnalibri salvati"
+#: ../../include/apps.php:130
+msgid "Address Book"
+msgstr "Rubrica"
+
+#: ../../include/apps.php:131 ../../include/nav.php:111 ../../boot.php:1503
+msgid "Login"
+msgstr "Accedi"
+
+#: ../../include/apps.php:132 ../../include/nav.php:200
+#: ../../mod/manage.php:160
+msgid "Channel Manager"
+msgstr "Gestione canali"
 
-#: ../../include/conversation.php:1647 ../../include/apps.php:136
+#: ../../include/apps.php:133 ../../include/nav.php:174
+msgid "Grid"
+msgstr "Rete"
+
+#: ../../include/apps.php:134 ../../include/widgets.php:553
+#: ../../include/nav.php:202 ../../mod/admin.php:1033 ../../mod/admin.php:1233
+msgid "Settings"
+msgstr "Impostazioni"
+
+#: ../../include/apps.php:136 ../../include/conversation.php:1649
 #: ../../include/nav.php:107 ../../mod/webpages.php:178
 msgid "Webpages"
 msgstr "Pagine web"
 
-#: ../../include/conversation.php:1650
-msgid "Manage Webpages"
-msgstr "Gestisci le pagine web"
+#: ../../include/apps.php:137 ../../include/nav.php:177
+msgid "Channel Home"
+msgstr "Bacheca del canale"
 
-#: ../../include/conversation.php:1679 ../../include/ItemObject.php:175
-#: ../../include/ItemObject.php:187 ../../mod/photos.php:1043
-#: ../../mod/photos.php:1055
-msgid "View all"
-msgstr "Vedi tutto"
+#: ../../include/apps.php:138 ../../include/identity.php:1250
+#: ../../include/identity.php:1367 ../../mod/profperm.php:112
+msgid "Profile"
+msgstr "Profilo"
 
-#: ../../include/conversation.php:1703 ../../include/taxonomy.php:403
-#: ../../include/identity.php:1252 ../../include/ItemObject.php:179
-#: ../../mod/photos.php:1047
-msgctxt "noun"
-msgid "Like"
-msgid_plural "Likes"
-msgstr[0] "Mi piace"
-msgstr[1] "Mi piace"
+#: ../../include/apps.php:139 ../../include/conversation.php:1606
+#: ../../include/nav.php:92 ../../mod/fbrowser.php:25
+msgid "Photos"
+msgstr "Foto"
 
-#: ../../include/conversation.php:1706 ../../include/ItemObject.php:184
-#: ../../mod/photos.php:1052
-msgctxt "noun"
-msgid "Dislike"
-msgid_plural "Dislikes"
-msgstr[0] "Non mi piace"
-msgstr[1] "Non mi piace"
+#: ../../include/apps.php:140 ../../include/nav.php:196
+#: ../../mod/events.php:526
+msgid "Events"
+msgstr "Eventi"
 
-#: ../../include/conversation.php:1709
-msgctxt "noun"
-msgid "Attending"
-msgid_plural "Attending"
-msgstr[0] "Partecipa"
-msgstr[1] "Partecipano"
+#: ../../include/apps.php:141 ../../include/nav.php:162
+msgid "Directory"
+msgstr "Elenchi pubblici dei canali"
 
-#: ../../include/conversation.php:1712
-msgctxt "noun"
-msgid "Not Attending"
-msgid_plural "Not Attending"
-msgstr[0] "Non partecipa"
-msgstr[1] "Non partecipano"
+#: ../../include/apps.php:142 ../../include/nav.php:154 ../../mod/help.php:202
+#: ../../mod/help.php:207 ../../mod/layouts.php:176
+msgid "Help"
+msgstr "Guida"
 
-#: ../../include/conversation.php:1715
-msgctxt "noun"
-msgid "Undecided"
-msgid_plural "Undecided"
-msgstr[0] "Indeciso"
-msgstr[1] "Indecisi"
+#: ../../include/apps.php:143 ../../include/nav.php:188
+msgid "Mail"
+msgstr "Messaggi"
 
-#: ../../include/conversation.php:1718
-msgctxt "noun"
-msgid "Agree"
-msgid_plural "Agrees"
-msgstr[0] "D'accordo"
-msgstr[1] "D'accordo"
+#: ../../include/apps.php:144 ../../mod/mood.php:131
+msgid "Mood"
+msgstr "Umore"
 
-#: ../../include/conversation.php:1721
-msgctxt "noun"
-msgid "Disagree"
-msgid_plural "Disagrees"
-msgstr[0] "Non d'accordo"
-msgstr[1] "Non d'accordo"
+#: ../../include/apps.php:145 ../../include/conversation.php:952
+msgid "Poke"
+msgstr "Poke"
 
-#: ../../include/conversation.php:1724
-msgctxt "noun"
-msgid "Abstain"
-msgid_plural "Abstains"
-msgstr[0] "Astenuto"
-msgstr[1] "Astenuti"
+#: ../../include/apps.php:146 ../../include/nav.php:97
+msgid "Chat"
+msgstr "Chat"
 
-#: ../../include/api.php:1290
-msgid "Public Timeline"
-msgstr "Diario pubblico"
+#: ../../include/apps.php:147 ../../include/text.php:857
+#: ../../include/text.php:869 ../../include/nav.php:159
+#: ../../mod/search.php:38
+msgid "Search"
+msgstr "Cerca"
 
-#: ../../include/photos.php:109
-#, php-format
-msgid "Image exceeds website size limit of %lu bytes"
-msgstr "L'immagine supera il limite massimo di %lu bytes"
+#: ../../include/apps.php:148
+msgid "Probe"
+msgstr "Diagnostica"
 
-#: ../../include/photos.php:116
-msgid "Image file is empty."
-msgstr "Il file dell'immagine è vuoto."
+#: ../../include/apps.php:149
+msgid "Suggest"
+msgstr "Suggerisci"
 
-#: ../../include/photos.php:143 ../../mod/profile_photo.php:222
-msgid "Unable to process image"
-msgstr "Impossibile elaborare l'immagine"
+#: ../../include/apps.php:150
+msgid "Random Channel"
+msgstr "Canale casuale"
 
-#: ../../include/photos.php:219
-msgid "Photo storage failed."
-msgstr "Impossibile salvare la foto."
+#: ../../include/apps.php:151
+msgid "Invite"
+msgstr "Invita"
 
-#: ../../include/photos.php:426
-msgid "Upload New Photos"
-msgstr "Carica nuove foto"
+#: ../../include/apps.php:152
+msgid "Features"
+msgstr "Funzionalità"
 
-#: ../../include/enotify.php:57 ../../include/network.php:1613
-msgid "$Projectname Notification"
-msgstr "Notifica $Projectname"
+#: ../../include/apps.php:153 ../../mod/id.php:28
+msgid "Language"
+msgstr "Lingua"
 
-#: ../../include/enotify.php:58 ../../include/network.php:1614
-msgid "$projectname"
-msgstr "$projectname"
+#: ../../include/apps.php:154
+msgid "Post"
+msgstr "Post"
 
-#: ../../include/enotify.php:60 ../../include/network.php:1616
-msgid "Thank You,"
-msgstr "Grazie,"
+#: ../../include/apps.php:155 ../../mod/id.php:17 ../../mod/id.php:18
+#: ../../mod/id.php:19
+msgid "Profile Photo"
+msgstr "Foto del profilo"
 
-#: ../../include/enotify.php:62 ../../include/network.php:1618
-#, php-format
-msgid "%s Administrator"
-msgstr "L'amministratore di %s"
+#: ../../include/apps.php:252 ../../mod/settings.php:84
+#: ../../mod/settings.php:609
+msgid "Update"
+msgstr "Aggiorna"
+
+#: ../../include/apps.php:252
+msgid "Install"
+msgstr "Installa"
+
+#: ../../include/apps.php:257
+msgid "Purchase"
+msgstr "Acquista"
+
+#: ../../include/auth.php:131
+msgid "Logged out."
+msgstr "Uscita effettuata."
+
+#: ../../include/auth.php:272
+msgid "Failed authentication"
+msgstr "Autenticazione fallita"
+
+#: ../../include/auth.php:286 ../../mod/openid.php:189
+msgid "Login failed."
+msgstr "Accesso fallito."
 
 #: ../../include/enotify.php:96
 #, php-format
@@ -1843,7 +1855,7 @@ msgstr "%s <!item_type!>"
 
 #: ../../include/enotify.php:100
 #, php-format
-msgid "[Red:Notify] New mail received at %s"
+msgid "[Hubzilla:Notify] New mail received at %s"
 msgstr "[Hubzilla] Nuovo messaggio su %s"
 
 #: ../../include/enotify.php:102
@@ -1882,7 +1894,7 @@ msgstr "%1$s, %2$s ha commentato [zrl=%3$s]%4$s che hai creato[/zrl]"
 
 #: ../../include/enotify.php:186
 #, php-format
-msgid "[Red:Notify] Comment to conversation #%1$d by %2$s"
+msgid "[Hubzilla:Notify] Comment to conversation #%1$d by %2$s"
 msgstr "[Hubzilla] Nuovo commento di %2$s alla conversazione #%1$d"
 
 #: ../../include/enotify.php:187
@@ -1899,7 +1911,7 @@ msgstr "Visita %s per leggere o commentare la conversazione."
 
 #: ../../include/enotify.php:196
 #, php-format
-msgid "[Red:Notify] %s posted to your profile wall"
+msgid "[Hubzilla:Notify] %s posted to your profile wall"
 msgstr "[Hubzilla] %s ha scritto sulla tua bacheca"
 
 #: ../../include/enotify.php:198
@@ -1914,7 +1926,7 @@ msgstr "%1$s, %2$s ha scritto sulla [zrl=%3$s]tua bacheca[/zrl]"
 
 #: ../../include/enotify.php:224
 #, php-format
-msgid "[Red:Notify] %s tagged you"
+msgid "[Hubzilla:Notify] %s tagged you"
 msgstr "[Hubzilla] %s ti ha taggato"
 
 #: ../../include/enotify.php:225
@@ -1929,7 +1941,7 @@ msgstr "%1$s, %2$s [zrl=%3$s]ti ha taggato[/zrl]."
 
 #: ../../include/enotify.php:238
 #, php-format
-msgid "[Red:Notify] %1$s poked you"
+msgid "[Hubzilla:Notify] %1$s poked you"
 msgstr "[Hubzilla] %1$s ti ha mandato un poke"
 
 #: ../../include/enotify.php:239
@@ -1944,7 +1956,7 @@ msgstr "%1$s, %2$s [zrl=%2$s]ti ha mandato un poke[/zrl]."
 
 #: ../../include/enotify.php:256
 #, php-format
-msgid "[Red:Notify] %s tagged your post"
+msgid "[Hubzilla:Notify] %s tagged your post"
 msgstr "[Hubzilla] %s ha taggato il tuo post"
 
 #: ../../include/enotify.php:257
@@ -1958,7 +1970,7 @@ msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
 msgstr "%1$s, %2$s ha taggato [zrl=%3$s]il tuo post[/zrl]"
 
 #: ../../include/enotify.php:270
-msgid "[Red:Notify] Introduction received"
+msgid "[Hubzilla:Notify] Introduction received"
 msgstr "[Hubzilla] Hai una richiesta di amicizia"
 
 #: ../../include/enotify.php:271
@@ -1983,7 +1995,7 @@ msgid "Please visit %s to approve or reject the connection request."
 msgstr "Visita %s per approvare o rifiutare la richiesta di entrare in contatto."
 
 #: ../../include/enotify.php:285
-msgid "[Red:Notify] Friend suggestion received"
+msgid "[Hubzilla:Notify] Friend suggestion received"
 msgstr "[Hubzilla] Ti è stato suggerito un amico"
 
 #: ../../include/enotify.php:286
@@ -2011,27 +2023,248 @@ msgstr "Foto:"
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr "Visita %s per approvare o rifiutare il suggerimento."
 
-#: ../../include/enotify.php:508
-msgid "[Red:Notify]"
+#: ../../include/enotify.php:511
+msgid "[Hubzilla:Notify]"
 msgstr "[Hubzilla]"
 
-#: ../../include/network.php:635
-msgid "view full size"
-msgstr "guarda nelle dimensioni reali"
+#: ../../include/ItemObject.php:89 ../../include/conversation.php:664
+msgid "Private Message"
+msgstr "Messaggio privato"
 
-#: ../../include/network.php:1660 ../../include/account.php:314
-#: ../../include/account.php:341 ../../include/account.php:401
-msgid "Administrator"
-msgstr "Amministratore"
+#: ../../include/ItemObject.php:126 ../../include/conversation.php:656
+msgid "Select"
+msgstr "Scegli"
 
-#: ../../include/network.php:1674
-msgid "No Subject"
-msgstr "Nessun titolo"
+#: ../../include/ItemObject.php:130
+msgid "Save to Folder"
+msgstr "Salva nella cartella"
 
-#: ../../include/bookmarks.php:35
+#: ../../include/ItemObject.php:151
+msgid "I will attend"
+msgstr "Parteciperò"
+
+#: ../../include/ItemObject.php:151
+msgid "I will not attend"
+msgstr "Non parteciperò"
+
+#: ../../include/ItemObject.php:151
+msgid "I might attend"
+msgstr "Forse parteciperò"
+
+#: ../../include/ItemObject.php:161
+msgid "I agree"
+msgstr "Sono d'accordo"
+
+#: ../../include/ItemObject.php:161
+msgid "I disagree"
+msgstr "Non sono d'accordo"
+
+#: ../../include/ItemObject.php:161
+msgid "I abstain"
+msgstr "Mi astengo"
+
+#: ../../include/ItemObject.php:175 ../../include/ItemObject.php:187
+#: ../../include/conversation.php:1681 ../../mod/photos.php:1079
+#: ../../mod/photos.php:1091
+msgid "View all"
+msgstr "Vedi tutto"
+
+#: ../../include/ItemObject.php:179 ../../include/identity.php:1276
+#: ../../include/taxonomy.php:403 ../../include/conversation.php:1705
+#: ../../mod/photos.php:1083
+msgctxt "noun"
+msgid "Like"
+msgid_plural "Likes"
+msgstr[0] "Mi piace"
+msgstr[1] "Mi piace"
+
+#: ../../include/ItemObject.php:184 ../../include/conversation.php:1708
+#: ../../mod/photos.php:1088
+msgctxt "noun"
+msgid "Dislike"
+msgid_plural "Dislikes"
+msgstr[0] "Non mi piace"
+msgstr[1] "Non mi piace"
+
+#: ../../include/ItemObject.php:212
+msgid "Add Star"
+msgstr "Aggiungi ai preferiti"
+
+#: ../../include/ItemObject.php:213
+msgid "Remove Star"
+msgstr "Rimuovi dai preferiti"
+
+#: ../../include/ItemObject.php:214
+msgid "Toggle Star Status"
+msgstr "Attiva/disattiva preferito"
+
+#: ../../include/ItemObject.php:218
+msgid "starred"
+msgstr "preferito"
+
+#: ../../include/ItemObject.php:227 ../../include/conversation.php:671
+msgid "Message signature validated"
+msgstr "Messaggio con firma verificata"
+
+#: ../../include/ItemObject.php:228 ../../include/conversation.php:672
+msgid "Message signature incorrect"
+msgstr "Massaggio con firma non corretta"
+
+#: ../../include/ItemObject.php:236
+msgid "Add Tag"
+msgstr "Aggiungi un tag"
+
+#: ../../include/ItemObject.php:254 ../../mod/photos.php:1023
+msgid "I like this (toggle)"
+msgstr "Attiva/disattiva Mi piace"
+
+#: ../../include/ItemObject.php:254 ../../include/taxonomy.php:317
+msgid "like"
+msgstr "mi piace"
+
+#: ../../include/ItemObject.php:255 ../../mod/photos.php:1024
+msgid "I don't like this (toggle)"
+msgstr "Attiva/disattiva Non mi piace"
+
+#: ../../include/ItemObject.php:255 ../../include/taxonomy.php:318
+msgid "dislike"
+msgstr "non mi piace"
+
+#: ../../include/ItemObject.php:259
+msgid "Share This"
+msgstr "Condividi"
+
+#: ../../include/ItemObject.php:259
+msgid "share"
+msgstr "condividi"
+
+#: ../../include/ItemObject.php:276
 #, php-format
-msgid "%1$s's bookmarks"
-msgstr "I segnalibri di %1$s"
+msgid "%d comment"
+msgid_plural "%d comments"
+msgstr[0] "%d commento"
+msgstr[1] "%d commenti"
+
+#: ../../include/ItemObject.php:301 ../../include/ItemObject.php:302
+#, php-format
+msgid "View %s's profile - %s"
+msgstr "Guarda il profilo di %s - %s"
+
+#: ../../include/ItemObject.php:305
+msgid "to"
+msgstr "a"
+
+#: ../../include/ItemObject.php:306
+msgid "via"
+msgstr "via"
+
+#: ../../include/ItemObject.php:307
+msgid "Wall-to-Wall"
+msgstr "Da bacheca a bacheca"
+
+#: ../../include/ItemObject.php:308
+msgid "via Wall-To-Wall:"
+msgstr "da bacheca a bacheca:"
+
+#: ../../include/ItemObject.php:311
+msgid "Delivery Report"
+msgstr "Rapporto di trasmissione"
+
+#: ../../include/ItemObject.php:320 ../../include/conversation.php:718
+#, php-format
+msgid "from %s"
+msgstr "da %s"
+
+#: ../../include/ItemObject.php:323 ../../include/conversation.php:721
+#, php-format
+msgid "last edited: %s"
+msgstr "ultima modifica: %s"
+
+#: ../../include/ItemObject.php:324 ../../include/conversation.php:722
+#, php-format
+msgid "Expires: %s"
+msgstr "Scadenza: %s"
+
+#: ../../include/ItemObject.php:347
+msgid "Save Bookmarks"
+msgstr "Salva segnalibro"
+
+#: ../../include/ItemObject.php:348
+msgid "Add to Calendar"
+msgstr "Aggiungi al calendario"
+
+#: ../../include/ItemObject.php:357
+msgid "Mark all seen"
+msgstr "Marca tutto come letto"
+
+#: ../../include/ItemObject.php:363 ../../mod/photos.php:1209
+msgctxt "noun"
+msgid "Likes"
+msgstr "Mi piace"
+
+#: ../../include/ItemObject.php:364 ../../mod/photos.php:1210
+msgctxt "noun"
+msgid "Dislikes"
+msgstr "Non mi piace"
+
+#: ../../include/ItemObject.php:374 ../../include/conversation.php:739
+#: ../../include/conversation.php:1214 ../../mod/photos.php:1026
+#: ../../mod/editblock.php:150 ../../mod/editpost.php:130
+#: ../../mod/editlayout.php:148 ../../mod/editwebpage.php:190
+msgid "Please wait"
+msgstr "Attendere"
+
+#: ../../include/ItemObject.php:679 ../../mod/photos.php:1042
+#: ../../mod/photos.php:1160
+msgid "This is you"
+msgstr "Questo sei tu"
+
+#: ../../include/ItemObject.php:683 ../../include/conversation.php:1186
+#: ../../mod/editblock.php:136 ../../mod/editpost.php:114
+#: ../../mod/editlayout.php:135 ../../mod/editwebpage.php:177
+msgid "Bold"
+msgstr "Grassetto"
+
+#: ../../include/ItemObject.php:684 ../../include/conversation.php:1187
+#: ../../mod/editblock.php:137 ../../mod/editpost.php:115
+#: ../../mod/editlayout.php:136 ../../mod/editwebpage.php:178
+msgid "Italic"
+msgstr "Corsivo"
+
+#: ../../include/ItemObject.php:685 ../../include/conversation.php:1188
+#: ../../mod/editblock.php:138 ../../mod/editpost.php:116
+#: ../../mod/editlayout.php:137 ../../mod/editwebpage.php:179
+msgid "Underline"
+msgstr "Sottolineato"
+
+#: ../../include/ItemObject.php:686 ../../include/conversation.php:1189
+#: ../../mod/editblock.php:139 ../../mod/editpost.php:117
+#: ../../mod/editlayout.php:138 ../../mod/editwebpage.php:180
+msgid "Quote"
+msgstr "Citazione"
+
+#: ../../include/ItemObject.php:687 ../../include/conversation.php:1190
+#: ../../mod/editblock.php:140 ../../mod/editpost.php:118
+#: ../../mod/editlayout.php:139 ../../mod/editwebpage.php:181
+msgid "Code"
+msgstr "Codice"
+
+#: ../../include/ItemObject.php:688
+msgid "Image"
+msgstr "Immagine"
+
+#: ../../include/ItemObject.php:689
+msgid "Insert Link"
+msgstr "Collegamento"
+
+#: ../../include/ItemObject.php:690
+msgid "Video"
+msgstr "Video"
+
+#: ../../include/ItemObject.php:694 ../../include/conversation.php:1241
+#: ../../mod/mail.php:247 ../../mod/mail.php:376 ../../mod/editpost.php:158
+msgid "Encrypt text"
+msgstr "Cifratura del messaggio"
 
 #: ../../include/text.php:391
 msgid "prev"
@@ -2072,12 +2305,6 @@ msgstr[1] "%d contatti"
 msgid "View Connections"
 msgstr "Elenco contatti"
 
-#: ../../include/text.php:857 ../../include/text.php:869
-#: ../../include/apps.php:147 ../../include/nav.php:159
-#: ../../mod/search.php:38
-msgid "Search"
-msgstr "Cerca"
-
 #: ../../include/text.php:858 ../../include/text.php:870
 #: ../../include/widgets.php:191 ../../mod/filer.php:49
 #: ../../mod/admin.php:1411 ../../mod/admin.php:1431 ../../mod/rbmark.php:28
@@ -2089,6 +2316,10 @@ msgstr "Salva"
 msgid "poke"
 msgstr "poke"
 
+#: ../../include/text.php:933 ../../include/conversation.php:243
+msgid "poked"
+msgstr "ha ricevuto un poke"
+
 #: ../../include/text.php:934
 msgid "ping"
 msgstr "ping"
@@ -2217,640 +2448,95 @@ msgstr "sorpreso"
 msgid "May"
 msgstr "maggio"
 
-#: ../../include/text.php:1247
-msgid "unknown.???"
-msgstr "sconosciuto???"
+#: ../../include/text.php:1221 ../../include/text.php:1225
+msgid "Unknown Attachment"
+msgstr "Allegato non riconoscuto"
+
+#: ../../include/text.php:1227
+msgid "Attachment"
+msgstr "Allegato"
 
-#: ../../include/text.php:1248
-msgid "bytes"
-msgstr "byte"
+#: ../../include/text.php:1227
+msgid "Size Unknown"
+msgstr "Dimensioni non note"
 
-#: ../../include/text.php:1284
+#: ../../include/text.php:1263
 msgid "remove category"
 msgstr "rimuovi la categoria"
 
-#: ../../include/text.php:1359
+#: ../../include/text.php:1340
 msgid "remove from file"
 msgstr "rimuovi dal file"
 
-#: ../../include/text.php:1443 ../../include/text.php:1454
+#: ../../include/text.php:1441 ../../include/text.php:1452
 msgid "Click to open/close"
 msgstr "Clicca per aprire/chiudere"
 
-#: ../../include/text.php:1609 ../../mod/events.php:497
+#: ../../include/text.php:1620 ../../mod/events.php:497
 msgid "Link to Source"
 msgstr "Link al sito d'origine"
 
-#: ../../include/text.php:1630 ../../include/text.php:1701
+#: ../../include/text.php:1641 ../../include/text.php:1712
 msgid "default"
 msgstr "predefinito"
 
-#: ../../include/text.php:1638
+#: ../../include/text.php:1649
 msgid "Page layout"
 msgstr "Layout della pagina"
 
-#: ../../include/text.php:1638
+#: ../../include/text.php:1649
 msgid "You can create your own with the layouts tool"
 msgstr "Con la configurazione del layout puoi crearne uno tuo"
 
-#: ../../include/text.php:1679
+#: ../../include/text.php:1690
 msgid "Page content type"
 msgstr "Tipo di contenuto della pagina"
 
-#: ../../include/text.php:1713
+#: ../../include/text.php:1724
 msgid "Select an alternate language"
 msgstr "Seleziona una lingua diversa"
 
-#: ../../include/text.php:1845
+#: ../../include/text.php:1843 ../../include/conversation.php:120
+#: ../../mod/like.php:361 ../../mod/tagger.php:43 ../../mod/subthread.php:72
+#: ../../mod/subthread.php:172
+msgid "photo"
+msgstr "la foto"
+
+#: ../../include/text.php:1849 ../../include/conversation.php:148
+#: ../../mod/like.php:361 ../../mod/subthread.php:72
+#: ../../mod/subthread.php:172
+msgid "status"
+msgstr "il messaggio di stato"
+
+#: ../../include/text.php:1851 ../../include/conversation.php:150
+#: ../../mod/tagger.php:53
+msgid "comment"
+msgstr "il commento"
+
+#: ../../include/text.php:1856
 msgid "activity"
 msgstr "l'attività"
 
-#: ../../include/text.php:2140
+#: ../../include/text.php:2151
 msgid "Design Tools"
 msgstr "Strumenti di design"
 
-#: ../../include/text.php:2143 ../../mod/blocks.php:147
+#: ../../include/text.php:2154 ../../mod/blocks.php:147
 msgid "Blocks"
 msgstr "Riquadri"
 
-#: ../../include/text.php:2144 ../../mod/menu.php:103
+#: ../../include/text.php:2155 ../../mod/menu.php:103
 msgid "Menus"
 msgstr "Menù"
 
-#: ../../include/text.php:2145 ../../mod/layouts.php:174
+#: ../../include/text.php:2156 ../../mod/layouts.php:174
 msgid "Layouts"
 msgstr "Layout"
 
-#: ../../include/text.php:2146
+#: ../../include/text.php:2157
 msgid "Pages"
 msgstr "Pagine"
 
-#: ../../include/acl_selectors.php:239
-msgid "Visible to your default audience"
-msgstr "Visibile secondo le impostazioni predefinite"
-
-#: ../../include/acl_selectors.php:240
-msgid "Show"
-msgstr "Mostra"
-
-#: ../../include/acl_selectors.php:241
-msgid "Don't show"
-msgstr "Non mostrare"
-
-#: ../../include/acl_selectors.php:247 ../../mod/filestorage.php:147
-#: ../../mod/chat.php:207 ../../mod/photos.php:592 ../../mod/photos.php:962
-#: ../../mod/events.php:708 ../../mod/thing.php:310 ../../mod/thing.php:356
-msgid "Permissions"
-msgstr "Permessi"
-
-#: ../../include/acl_selectors.php:248 ../../include/ItemObject.php:361
-#: ../../mod/photos.php:1179
-msgid "Close"
-msgstr "Chiudi"
-
-#: ../../include/attach.php:243 ../../include/attach.php:329
-msgid "Item was not found."
-msgstr "Elemento non trovato."
-
-#: ../../include/attach.php:471
-msgid "No source file."
-msgstr "Nessun file di origine."
-
-#: ../../include/attach.php:489
-msgid "Cannot locate file to replace"
-msgstr "Il file da sostituire non è stato trovato"
-
-#: ../../include/attach.php:507
-msgid "Cannot locate file to revise/update"
-msgstr "Il file da aggiornare non è stato trovato"
-
-#: ../../include/attach.php:632
-#, php-format
-msgid "File exceeds size limit of %d"
-msgstr "Il file supera la dimensione massima di %d"
-
-#: ../../include/attach.php:645
-#, php-format
-msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
-msgstr "Hai raggiunto il limite complessivo di %1$.0f Mbytes per gli allegati."
-
-#: ../../include/attach.php:793
-msgid "File upload failed. Possible system limit or action terminated."
-msgstr "Caricamento file fallito, potrebbe essere stato interrotto o potrebbe aver superato lo spazio assegnato."
-
-#: ../../include/attach.php:806
-msgid "Stored file could not be verified. Upload failed."
-msgstr "Il file non può essere verificato. Caricamento fallito."
-
-#: ../../include/attach.php:854 ../../include/attach.php:870
-msgid "Path not available."
-msgstr "Percorso non disponibile."
-
-#: ../../include/attach.php:916 ../../include/attach.php:1069
-msgid "Empty pathname"
-msgstr "Il percorso del file è vuoto"
-
-#: ../../include/attach.php:942
-msgid "duplicate filename or path"
-msgstr "il file o il percorso del file è duplicato"
-
-#: ../../include/attach.php:965
-msgid "Path not found."
-msgstr "Percorso del file non trovato."
-
-#: ../../include/attach.php:1023
-msgid "mkdir failed."
-msgstr "mkdir fallito."
-
-#: ../../include/attach.php:1027
-msgid "database storage failed."
-msgstr "scrittura su database fallita."
-
-#: ../../include/attach.php:1075
-msgid "Empty path"
-msgstr "La posizione è vuota"
-
-#: ../../include/import.php:23
-msgid ""
-"Cannot create a duplicate channel identifier on this system. Import failed."
-msgstr "Non posso creare un canale con un identificativo che già esiste su questo sistema. L'importazione è fallita."
-
-#: ../../include/import.php:70
-msgid "Channel clone failed. Import failed."
-msgstr "Impossibile clonare il canale. L'importazione è fallita."
-
-#: ../../include/import.php:80 ../../mod/import.php:138
-msgid "Cloned channel not found. Import failed."
-msgstr "Impossibile trovare il canale clonato. L'importazione è fallita."
-
-#: ../../include/notify.php:20
-msgid "created a new post"
-msgstr "Ha creato un nuovo post"
-
-#: ../../include/notify.php:21
-#, php-format
-msgid "commented on %s's post"
-msgstr "ha commentato il post di %s"
-
-#: ../../include/page_widgets.php:6
-msgid "New Page"
-msgstr "Nuova pagina web"
-
-#: ../../include/page_widgets.php:39 ../../mod/layouts.php:188
-#: ../../mod/webpages.php:187 ../../mod/blocks.php:159
-msgid "View"
-msgstr "Guarda"
-
-#: ../../include/page_widgets.php:41 ../../mod/webpages.php:189
-msgid "Actions"
-msgstr "Azioni"
-
-#: ../../include/page_widgets.php:42 ../../mod/webpages.php:190
-msgid "Page Link"
-msgstr "Link alla pagina"
-
-#: ../../include/page_widgets.php:43
-msgid "Title"
-msgstr "Titolo"
-
-#: ../../include/page_widgets.php:44 ../../mod/layouts.php:181
-#: ../../mod/menu.php:110 ../../mod/webpages.php:192 ../../mod/blocks.php:150
-msgid "Created"
-msgstr "Creato"
-
-#: ../../include/page_widgets.php:45 ../../mod/layouts.php:182
-#: ../../mod/menu.php:111 ../../mod/webpages.php:193 ../../mod/blocks.php:151
-msgid "Edited"
-msgstr "Modificato"
-
-#: ../../include/photo/photo_driver.php:705 ../../mod/photos.php:94
-#: ../../mod/photos.php:660 ../../mod/profile_photo.php:146
-#: ../../mod/profile_photo.php:236 ../../mod/profile_photo.php:376
-msgid "Profile Photos"
-msgstr "Foto del profilo"
-
-#: ../../include/profile_selectors.php:6
-#: ../../include/profile_selectors.php:23 ../../mod/id.php:103
-msgid "Male"
-msgstr "Maschio"
-
-#: ../../include/profile_selectors.php:6
-#: ../../include/profile_selectors.php:23 ../../mod/id.php:105
-msgid "Female"
-msgstr "Femmina"
-
-#: ../../include/profile_selectors.php:6
-msgid "Currently Male"
-msgstr "Al momento maschio"
-
-#: ../../include/profile_selectors.php:6
-msgid "Currently Female"
-msgstr "Al momento femmina"
-
-#: ../../include/profile_selectors.php:6
-msgid "Mostly Male"
-msgstr "Prevalentemente maschio"
-
-#: ../../include/profile_selectors.php:6
-msgid "Mostly Female"
-msgstr "Prevalentemente femmina"
-
-#: ../../include/profile_selectors.php:6
-msgid "Transgender"
-msgstr "Transgender"
-
-#: ../../include/profile_selectors.php:6
-msgid "Intersex"
-msgstr "Intersex"
-
-#: ../../include/profile_selectors.php:6
-msgid "Transsexual"
-msgstr "Transessuale"
-
-#: ../../include/profile_selectors.php:6
-msgid "Hermaphrodite"
-msgstr "Ermafrodito"
-
-#: ../../include/profile_selectors.php:6
-msgid "Neuter"
-msgstr "Neutro"
-
-#: ../../include/profile_selectors.php:6
-msgid "Non-specific"
-msgstr "Non specificato"
-
-#: ../../include/profile_selectors.php:6
-msgid "Undecided"
-msgstr "Indeciso"
-
-#: ../../include/profile_selectors.php:42
-#: ../../include/profile_selectors.php:61
-msgid "Males"
-msgstr "Maschi"
-
-#: ../../include/profile_selectors.php:42
-#: ../../include/profile_selectors.php:61
-msgid "Females"
-msgstr "Femmine"
-
-#: ../../include/profile_selectors.php:42
-msgid "Gay"
-msgstr "Gay"
-
-#: ../../include/profile_selectors.php:42
-msgid "Lesbian"
-msgstr "Lesbica"
-
-#: ../../include/profile_selectors.php:42
-msgid "No Preference"
-msgstr "Senza preferenza"
-
-#: ../../include/profile_selectors.php:42
-msgid "Bisexual"
-msgstr "Bisessuale"
-
-#: ../../include/profile_selectors.php:42
-msgid "Autosexual"
-msgstr "Autosessuale"
-
-#: ../../include/profile_selectors.php:42
-msgid "Abstinent"
-msgstr "Astinente"
-
-#: ../../include/profile_selectors.php:42
-msgid "Virgin"
-msgstr "Vergine"
-
-#: ../../include/profile_selectors.php:42
-msgid "Deviant"
-msgstr "Deviato"
-
-#: ../../include/profile_selectors.php:42
-msgid "Fetish"
-msgstr "Feticista"
-
-#: ../../include/profile_selectors.php:42
-msgid "Oodles"
-msgstr "Un sacco"
-
-#: ../../include/profile_selectors.php:42
-msgid "Nonsexual"
-msgstr "Asessuato"
-
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Single"
-msgstr "Single"
-
-#: ../../include/profile_selectors.php:80
-msgid "Lonely"
-msgstr "Da solo"
-
-#: ../../include/profile_selectors.php:80
-msgid "Available"
-msgstr "Disponibile"
-
-#: ../../include/profile_selectors.php:80
-msgid "Unavailable"
-msgstr "Non disponibile"
-
-#: ../../include/profile_selectors.php:80
-msgid "Has crush"
-msgstr "Ha una cotta"
-
-#: ../../include/profile_selectors.php:80
-msgid "Infatuated"
-msgstr "Infatuato/a"
-
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Dating"
-msgstr "Disponibile a un incontro"
-
-#: ../../include/profile_selectors.php:80
-msgid "Unfaithful"
-msgstr "Infedele"
-
-#: ../../include/profile_selectors.php:80
-msgid "Sex Addict"
-msgstr "Sesso-dipendente"
-
-#: ../../include/profile_selectors.php:80 ../../include/identity.php:390
-#: ../../include/identity.php:391 ../../include/identity.php:398
-#: ../../include/widgets.php:429 ../../mod/connedit.php:569
-#: ../../mod/settings.php:337 ../../mod/settings.php:341
-#: ../../mod/settings.php:342 ../../mod/settings.php:345
-#: ../../mod/settings.php:356
-msgid "Friends"
-msgstr "Amici"
-
-#: ../../include/profile_selectors.php:80
-msgid "Friends/Benefits"
-msgstr "Amici con qualcosa in più"
-
-#: ../../include/profile_selectors.php:80
-msgid "Casual"
-msgstr "Casual"
-
-#: ../../include/profile_selectors.php:80
-msgid "Engaged"
-msgstr "Impegnato"
-
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Married"
-msgstr "Sposato/a"
-
-#: ../../include/profile_selectors.php:80
-msgid "Imaginarily married"
-msgstr "Con matrimonio immaginario"
-
-#: ../../include/profile_selectors.php:80
-msgid "Partners"
-msgstr "Partner"
-
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Cohabiting"
-msgstr "Convivente"
-
-#: ../../include/profile_selectors.php:80
-msgid "Common law"
-msgstr "Matrimonio regolare"
-
-#: ../../include/profile_selectors.php:80
-msgid "Happy"
-msgstr "Felice"
-
-#: ../../include/profile_selectors.php:80
-msgid "Not looking"
-msgstr "Non in cerca"
-
-#: ../../include/profile_selectors.php:80
-msgid "Swinger"
-msgstr "Scambista"
-
-#: ../../include/profile_selectors.php:80
-msgid "Betrayed"
-msgstr "Tradito/a"
-
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Separated"
-msgstr "Separato/a"
-
-#: ../../include/profile_selectors.php:80
-msgid "Unstable"
-msgstr "Instabile"
-
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Divorced"
-msgstr "Divorziato/a"
-
-#: ../../include/profile_selectors.php:80
-msgid "Imaginarily divorced"
-msgstr "Sogna il divorzio"
-
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Widowed"
-msgstr "Vedovo/a"
-
-#: ../../include/profile_selectors.php:80
-msgid "Uncertain"
-msgstr "Incerto/a"
-
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "It's complicated"
-msgstr "Relazione complicata"
-
-#: ../../include/profile_selectors.php:80
-msgid "Don't care"
-msgstr "Chi se ne frega"
-
-#: ../../include/profile_selectors.php:80
-msgid "Ask me"
-msgstr "Chiedimelo"
-
-#: ../../include/oembed.php:213
-msgid "Embedded content"
-msgstr "Contenuti incorporati"
-
-#: ../../include/oembed.php:222
-msgid "Embedding disabled"
-msgstr "Disabilita la creazione di contenuti incorporati"
-
-#: ../../include/event.php:22 ../../include/bb2diaspora.php:459
-msgid "l F d, Y \\@ g:i A"
-msgstr "l d F Y \\@ G:i"
-
-#: ../../include/event.php:30 ../../include/bb2diaspora.php:465
-msgid "Starts:"
-msgstr "Inizio:"
-
-#: ../../include/event.php:40 ../../include/bb2diaspora.php:473
-msgid "Finishes:"
-msgstr "Fine:"
-
-#: ../../include/event.php:50 ../../include/bb2diaspora.php:481
-#: ../../include/identity.php:992 ../../mod/directory.php:302
-#: ../../mod/events.php:701
-msgid "Location:"
-msgstr "Luogo:"
-
-#: ../../include/event.php:766
-msgid "This event has been added to your calendar."
-msgstr "Questo evento è stato aggiunto al tuo calendario"
-
-#: ../../include/event.php:953
-msgid "Not specified"
-msgstr "Non specificato"
-
-#: ../../include/event.php:954
-msgid "Needs Action"
-msgstr "Necessita di un intervento"
-
-#: ../../include/event.php:955
-msgid "Completed"
-msgstr "Completato"
-
-#: ../../include/event.php:956
-msgid "In Process"
-msgstr "In corso"
-
-#: ../../include/event.php:957
-msgid "Cancelled"
-msgstr "Annullato"
-
-#: ../../include/apps.php:128
-msgid "Site Admin"
-msgstr "Amministrazione sito"
-
-#: ../../include/apps.php:130
-msgid "Address Book"
-msgstr "Rubrica"
-
-#: ../../include/apps.php:131 ../../include/nav.php:111 ../../boot.php:1497
-msgid "Login"
-msgstr "Accedi"
-
-#: ../../include/apps.php:132 ../../include/nav.php:200
-#: ../../mod/manage.php:160
-msgid "Channel Manager"
-msgstr "Gestione canali"
-
-#: ../../include/apps.php:133
-msgid "Matrix"
-msgstr "Rete"
-
-#: ../../include/apps.php:134 ../../include/widgets.php:553
-#: ../../include/nav.php:202 ../../mod/admin.php:1033 ../../mod/admin.php:1233
-msgid "Settings"
-msgstr "Impostazioni"
-
-#: ../../include/apps.php:137 ../../include/nav.php:177
-msgid "Channel Home"
-msgstr "Bacheca del canale"
-
-#: ../../include/apps.php:138 ../../include/identity.php:1226
-#: ../../include/identity.php:1343 ../../mod/profperm.php:112
-msgid "Profile"
-msgstr "Profilo"
-
-#: ../../include/apps.php:140 ../../include/nav.php:196
-#: ../../mod/events.php:526
-msgid "Events"
-msgstr "Eventi"
-
-#: ../../include/apps.php:141 ../../include/nav.php:162
-msgid "Directory"
-msgstr "Elenco pubblico"
-
-#: ../../include/apps.php:142 ../../include/nav.php:154 ../../mod/help.php:202
-#: ../../mod/help.php:207 ../../mod/layouts.php:176
-msgid "Help"
-msgstr "Guida"
-
-#: ../../include/apps.php:143 ../../include/nav.php:188
-msgid "Mail"
-msgstr "Messaggi"
-
-#: ../../include/apps.php:144 ../../mod/mood.php:131
-msgid "Mood"
-msgstr "Umore"
-
-#: ../../include/apps.php:146 ../../include/nav.php:97
-msgid "Chat"
-msgstr "Chat"
-
-#: ../../include/apps.php:148
-msgid "Probe"
-msgstr "Diagnostica"
-
-#: ../../include/apps.php:149
-msgid "Suggest"
-msgstr "Suggerisci"
-
-#: ../../include/apps.php:150
-msgid "Random Channel"
-msgstr "Canale casuale"
-
-#: ../../include/apps.php:151
-msgid "Invite"
-msgstr "Invita"
-
-#: ../../include/apps.php:152
-msgid "Features"
-msgstr "Funzionalità"
-
-#: ../../include/apps.php:153 ../../mod/id.php:28
-msgid "Language"
-msgstr "Lingua"
-
-#: ../../include/apps.php:154
-msgid "Post"
-msgstr "Post"
-
-#: ../../include/apps.php:155 ../../mod/id.php:17 ../../mod/id.php:18
-#: ../../mod/id.php:19
-msgid "Profile Photo"
-msgstr "Foto del profilo"
-
-#: ../../include/apps.php:247 ../../mod/settings.php:84
-#: ../../mod/settings.php:609
-msgid "Update"
-msgstr "Aggiorna"
-
-#: ../../include/apps.php:247
-msgid "Install"
-msgstr "Installa"
-
-#: ../../include/apps.php:252
-msgid "Purchase"
-msgstr "Acquista"
-
-#: ../../include/auth.php:131
-msgid "Logged out."
-msgstr "Uscita effettuata."
-
-#: ../../include/auth.php:272
-msgid "Failed authentication"
-msgstr "Autenticazione fallita"
-
-#: ../../include/auth.php:286 ../../mod/openid.php:189
-msgid "Login failed."
-msgstr "Accesso fallito."
-
-#: ../../include/bb2diaspora.php:373
-msgid "Attachments:"
-msgstr "Allegati:"
-
-#: ../../include/bb2diaspora.php:461
-msgid "$Projectname event notification:"
-msgstr "Notifica evento $Projectname:"
-
 #: ../../include/bbcode.php:123 ../../include/bbcode.php:793
 #: ../../include/bbcode.php:796 ../../include/bbcode.php:801
 #: ../../include/bbcode.php:804 ../../include/bbcode.php:807
@@ -2942,47 +2628,47 @@ msgstr "Inserisci le informazioni richieste."
 msgid "Failed to store account information."
 msgstr "Non è stato possibile salvare le informazioni del tuo account."
 
-#: ../../include/account.php:246
+#: ../../include/account.php:248
 #, php-format
 msgid "Registration confirmation for %s"
 msgstr "Registrazione di %s confermata"
 
-#: ../../include/account.php:312
+#: ../../include/account.php:314
 #, php-format
 msgid "Registration request at %s"
 msgstr "Richiesta di registrazione su %s"
 
-#: ../../include/account.php:336
+#: ../../include/account.php:338
 msgid "your registration password"
 msgstr "la password di registrazione"
 
-#: ../../include/account.php:339 ../../include/account.php:399
+#: ../../include/account.php:341 ../../include/account.php:401
 #, php-format
 msgid "Registration details for %s"
 msgstr "Dettagli della registrazione di %s"
 
-#: ../../include/account.php:408
+#: ../../include/account.php:410
 msgid "Account approved."
 msgstr "Account approvato."
 
-#: ../../include/account.php:447
+#: ../../include/account.php:449
 #, php-format
 msgid "Registration revoked for %s"
 msgstr "Registrazione revocata per %s"
 
-#: ../../include/account.php:492
+#: ../../include/account.php:494
 msgid "Account verified. Please login."
 msgstr "Registrazione verificata. Adesso puoi effettuare login."
 
-#: ../../include/account.php:705 ../../include/account.php:707
+#: ../../include/account.php:707 ../../include/account.php:709
 msgid "Click here to upgrade."
 msgstr "Clicca qui per aggiornare."
 
-#: ../../include/account.php:713
+#: ../../include/account.php:715
 msgid "This action exceeds the limits set by your subscription plan."
 msgstr "Questa operazione supera i limiti del tuo abbonamento."
 
-#: ../../include/account.php:718
+#: ../../include/account.php:720
 msgid "This action is not available under your subscription plan."
 msgstr "Questa operazione non è prevista dal tuo abbonamento."
 
@@ -3002,7 +2688,7 @@ msgstr "La risposta dal canale non è completa."
 msgid "Channel was deleted and no longer exists."
 msgstr "Il canale è stato rimosso e non esiste più."
 
-#: ../../include/follow.php:154
+#: ../../include/follow.php:152 ../../include/follow.php:180
 msgid "Protocol disabled."
 msgstr "Protocollo disabilitato."
 
@@ -3010,15 +2696,15 @@ msgstr "Protocollo disabilitato."
 msgid "Channel discovery failed."
 msgstr "La ricerca del canale non ha avuto successo."
 
-#: ../../include/follow.php:186
+#: ../../include/follow.php:196
 msgid "local account not found."
 msgstr "l'account locale non è stato trovato."
 
-#: ../../include/follow.php:210
+#: ../../include/follow.php:220
 msgid "Cannot connect to yourself."
 msgstr "Non puoi connetterti a te stesso."
 
-#: ../../include/security.php:345
+#: ../../include/security.php:381
 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."
@@ -3133,84 +2819,38 @@ msgstr "Canali che non sono in un insieme"
 msgid "add"
 msgstr "aggiungi"
 
-#: ../../include/taxonomy.php:229 ../../include/taxonomy.php:250
-msgid "Tags"
-msgstr "Tag"
-
-#: ../../include/taxonomy.php:294
-msgid "Keywords"
-msgstr "Parole chiave"
-
-#: ../../include/taxonomy.php:315
-msgid "have"
-msgstr "ho"
-
-#: ../../include/taxonomy.php:315
-msgid "has"
-msgstr "ha"
-
-#: ../../include/taxonomy.php:316
-msgid "want"
-msgstr "voglio"
-
-#: ../../include/taxonomy.php:316
-msgid "wants"
-msgstr "vuole"
-
-#: ../../include/taxonomy.php:317 ../../include/ItemObject.php:254
-msgid "like"
-msgstr "mi piace"
-
-#: ../../include/taxonomy.php:317
-msgid "likes"
-msgstr "gli piace"
-
-#: ../../include/taxonomy.php:318 ../../include/ItemObject.php:255
-msgid "dislike"
-msgstr "non mi piace"
+#: ../../include/zot.php:683
+msgid "Invalid data packet"
+msgstr "Dati ricevuti non validi"
 
-#: ../../include/taxonomy.php:318
-msgid "dislikes"
-msgstr "non gli piace"
+#: ../../include/zot.php:699
+msgid "Unable to verify channel signature"
+msgstr "Impossibile verificare la firma elettronica del canale"
 
-#: ../../include/dir_fns.php:126
-msgid "Directory Options"
-msgstr "Opzioni elenco pubblico"
+#: ../../include/zot.php:2235
+#, php-format
+msgid "Unable to verify site signature for %s"
+msgstr "Impossibile verificare la firma elettronica del sito %s"
 
-#: ../../include/dir_fns.php:128
-msgid "Safe Mode"
-msgstr "Modalità SafeSearch"
+#: ../../include/zot.php:3555
+msgid "invalid target signature"
+msgstr "la firma ricevuta non è valida"
 
-#: ../../include/dir_fns.php:128 ../../include/dir_fns.php:129
-#: ../../include/dir_fns.php:130 ../../mod/removeme.php:60
-#: ../../mod/mitem.php:154 ../../mod/mitem.php:155 ../../mod/mitem.php:228
-#: ../../mod/mitem.php:229 ../../mod/connedit.php:631
-#: ../../mod/connedit.php:659 ../../mod/filestorage.php:151
-#: ../../mod/filestorage.php:159 ../../mod/admin.php:386 ../../mod/menu.php:96
-#: ../../mod/menu.php:153 ../../mod/photos.php:589 ../../mod/settings.php:574
-#: ../../mod/api.php:106 ../../view/theme/redbasic/php/config.php:104
-#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1501
-msgid "No"
-msgstr "No"
+#: ../../include/message.php:18
+msgid "No recipient provided."
+msgstr "Devi scegliere un destinatario."
 
-#: ../../include/dir_fns.php:128 ../../include/dir_fns.php:129
-#: ../../include/dir_fns.php:130 ../../mod/removeme.php:60
-#: ../../mod/mitem.php:154 ../../mod/mitem.php:155 ../../mod/mitem.php:228
-#: ../../mod/mitem.php:229 ../../mod/filestorage.php:151
-#: ../../mod/filestorage.php:159 ../../mod/admin.php:388 ../../mod/menu.php:96
-#: ../../mod/menu.php:153 ../../mod/photos.php:589 ../../mod/settings.php:574
-#: ../../mod/api.php:105 ../../view/theme/redbasic/php/config.php:104
-#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1501
-msgid "Yes"
-msgstr "Si"
+#: ../../include/message.php:23
+msgid "[no subject]"
+msgstr "[nessun titolo]"
 
-#: ../../include/dir_fns.php:129
-msgid "Public Forums Only"
-msgstr "Solo forum pubblici"
+#: ../../include/message.php:43
+msgid "Unable to determine sender."
+msgstr "Impossibile determinare il mittente."
 
-#: ../../include/dir_fns.php:130
-msgid "This Website Only"
-msgstr "Solo in questo sito"
+#: ../../include/message.php:218
+msgid "Stored post could not be verified."
+msgstr "Non è stato possibile verificare il post."
 
 #: ../../include/identity.php:32
 msgid "Unable to obtain identity information from database"
@@ -3249,11 +2889,11 @@ msgstr "Impossibile caricare l'identità creata"
 msgid "Default Profile"
 msgstr "Profilo predefinito"
 
-#: ../../include/identity.php:745
+#: ../../include/identity.php:769
 msgid "Requested channel is not available."
 msgstr "Il canale che cerchi non è disponibile."
 
-#: ../../include/identity.php:791 ../../mod/achievements.php:11
+#: ../../include/identity.php:815 ../../mod/achievements.php:11
 #: ../../mod/filestorage.php:54 ../../mod/hcard.php:8 ../../mod/layouts.php:29
 #: ../../mod/editblock.php:29 ../../mod/profile.php:16
 #: ../../mod/webpages.php:29 ../../mod/blocks.php:29
@@ -3262,417 +2902,768 @@ msgstr "Il canale che cerchi non è disponibile."
 msgid "Requested profile is not available."
 msgstr "Il profilo richiesto non è disponibile."
 
-#: ../../include/identity.php:954 ../../mod/profiles.php:774
+#: ../../include/identity.php:978 ../../mod/profiles.php:774
 msgid "Change profile photo"
 msgstr "Cambia la foto del profilo"
 
-#: ../../include/identity.php:960
+#: ../../include/identity.php:984
 msgid "Profiles"
 msgstr "Profili"
 
-#: ../../include/identity.php:960
+#: ../../include/identity.php:984
 msgid "Manage/edit profiles"
 msgstr "Gestisci/modifica i profili"
 
-#: ../../include/identity.php:961 ../../mod/profiles.php:775
+#: ../../include/identity.php:985 ../../mod/profiles.php:775
 msgid "Create New Profile"
 msgstr "Crea un nuovo profilo"
 
-#: ../../include/identity.php:964 ../../include/nav.php:90
+#: ../../include/identity.php:988 ../../include/nav.php:90
 msgid "Edit Profile"
 msgstr "Modifica il profilo"
 
-#: ../../include/identity.php:976 ../../mod/profiles.php:786
+#: ../../include/identity.php:1000 ../../mod/profiles.php:786
 msgid "Profile Image"
 msgstr "Immagine del profilo"
 
-#: ../../include/identity.php:979
+#: ../../include/identity.php:1003
 msgid "visible to everybody"
 msgstr "visibile a tutti"
 
-#: ../../include/identity.php:980 ../../mod/profiles.php:669
+#: ../../include/identity.php:1004 ../../mod/profiles.php:669
 #: ../../mod/profiles.php:790
 msgid "Edit visibility"
 msgstr "Cambia la visibilità"
 
-#: ../../include/identity.php:996 ../../include/identity.php:1236
+#: ../../include/identity.php:1020 ../../include/identity.php:1260
 msgid "Gender:"
 msgstr "Sesso:"
 
-#: ../../include/identity.php:997 ../../include/identity.php:1280
+#: ../../include/identity.php:1021 ../../include/identity.php:1304
 msgid "Status:"
 msgstr "Stato:"
 
-#: ../../include/identity.php:998 ../../include/identity.php:1291
+#: ../../include/identity.php:1022 ../../include/identity.php:1315
 msgid "Homepage:"
 msgstr "Home page:"
 
-#: ../../include/identity.php:999
+#: ../../include/identity.php:1023
 msgid "Online Now"
 msgstr "Online adesso"
 
-#: ../../include/identity.php:1083 ../../include/identity.php:1161
+#: ../../include/identity.php:1107 ../../include/identity.php:1185
 #: ../../mod/ping.php:318
 msgid "g A l F d"
 msgstr "g A l d F"
 
-#: ../../include/identity.php:1084 ../../include/identity.php:1162
+#: ../../include/identity.php:1108 ../../include/identity.php:1186
 msgid "F d"
 msgstr "d F"
 
-#: ../../include/identity.php:1129 ../../include/identity.php:1201
+#: ../../include/identity.php:1153 ../../include/identity.php:1225
 #: ../../mod/ping.php:341
 msgid "[today]"
 msgstr "[oggi]"
 
-#: ../../include/identity.php:1140
+#: ../../include/identity.php:1164
 msgid "Birthday Reminders"
 msgstr "Promemoria compleanni"
 
-#: ../../include/identity.php:1141
+#: ../../include/identity.php:1165
 msgid "Birthdays this week:"
 msgstr "Compleanni questa settimana:"
 
-#: ../../include/identity.php:1194
+#: ../../include/identity.php:1218
 msgid "[No description]"
 msgstr "[Nessuna descrizione]"
 
-#: ../../include/identity.php:1212
+#: ../../include/identity.php:1236
 msgid "Event Reminders"
 msgstr "Promemoria"
 
-#: ../../include/identity.php:1213
+#: ../../include/identity.php:1237
 msgid "Events this week:"
 msgstr "Eventi della settimana:"
 
-#: ../../include/identity.php:1234 ../../mod/settings.php:1026
+#: ../../include/identity.php:1258 ../../mod/settings.php:1026
 msgid "Full Name:"
 msgstr "Nome completo:"
 
-#: ../../include/identity.php:1241
+#: ../../include/identity.php:1265
 msgid "Like this channel"
 msgstr "Mi piace questo canale"
 
-#: ../../include/identity.php:1265
+#: ../../include/identity.php:1289
 msgid "j F, Y"
 msgstr "j F Y"
 
-#: ../../include/identity.php:1266
+#: ../../include/identity.php:1290
 msgid "j F"
 msgstr "j F"
 
-#: ../../include/identity.php:1273
+#: ../../include/identity.php:1297
 msgid "Birthday:"
 msgstr "Compleanno:"
 
-#: ../../include/identity.php:1277 ../../mod/directory.php:297
+#: ../../include/identity.php:1301 ../../mod/directory.php:297
 msgid "Age:"
 msgstr "Età:"
 
-#: ../../include/identity.php:1286
+#: ../../include/identity.php:1310
 #, php-format
 msgid "for %1$d %2$s"
 msgstr "per %1$d %2$s"
 
-#: ../../include/identity.php:1289 ../../mod/profiles.php:691
+#: ../../include/identity.php:1313 ../../mod/profiles.php:691
 msgid "Sexual Preference:"
 msgstr "Preferenze sessuali:"
 
-#: ../../include/identity.php:1293 ../../mod/directory.php:313
+#: ../../include/identity.php:1317 ../../mod/directory.php:313
 #: ../../mod/profiles.php:693
 msgid "Hometown:"
 msgstr "Città dove vivo:"
 
-#: ../../include/identity.php:1295
+#: ../../include/identity.php:1319
 msgid "Tags:"
 msgstr "Tag:"
 
-#: ../../include/identity.php:1297 ../../mod/profiles.php:694
+#: ../../include/identity.php:1321 ../../mod/profiles.php:694
 msgid "Political Views:"
 msgstr "Orientamento politico:"
 
-#: ../../include/identity.php:1299
+#: ../../include/identity.php:1323
 msgid "Religion:"
 msgstr "Religione:"
 
-#: ../../include/identity.php:1301 ../../mod/directory.php:315
+#: ../../include/identity.php:1325 ../../mod/directory.php:315
 msgid "About:"
 msgstr "Informazioni:"
 
-#: ../../include/identity.php:1303
+#: ../../include/identity.php:1327
 msgid "Hobbies/Interests:"
 msgstr "Interessi e hobby:"
 
-#: ../../include/identity.php:1305 ../../mod/profiles.php:697
+#: ../../include/identity.php:1329 ../../mod/profiles.php:697
 msgid "Likes:"
 msgstr "Mi piace:"
 
-#: ../../include/identity.php:1307 ../../mod/profiles.php:698
+#: ../../include/identity.php:1331 ../../mod/profiles.php:698
 msgid "Dislikes:"
 msgstr "Non mi piace:"
 
-#: ../../include/identity.php:1309
+#: ../../include/identity.php:1333
 msgid "Contact information and Social Networks:"
 msgstr "Contatti e social network:"
 
-#: ../../include/identity.php:1311
+#: ../../include/identity.php:1335
 msgid "My other channels:"
 msgstr "I miei altri canali:"
 
-#: ../../include/identity.php:1313
+#: ../../include/identity.php:1337
 msgid "Musical interests:"
 msgstr "Gusti musicali:"
 
-#: ../../include/identity.php:1315
+#: ../../include/identity.php:1339
 msgid "Books, literature:"
 msgstr "Libri, letteratura:"
 
-#: ../../include/identity.php:1317
+#: ../../include/identity.php:1341
 msgid "Television:"
 msgstr "Televisione:"
 
-#: ../../include/identity.php:1319
+#: ../../include/identity.php:1343
 msgid "Film/dance/culture/entertainment:"
 msgstr "Film, danza, cultura, intrattenimento:"
 
-#: ../../include/identity.php:1321
+#: ../../include/identity.php:1345
 msgid "Love/Romance:"
 msgstr "Amore:"
 
-#: ../../include/identity.php:1323
+#: ../../include/identity.php:1347
 msgid "Work/employment:"
 msgstr "Lavoro:"
 
-#: ../../include/identity.php:1325
+#: ../../include/identity.php:1349
 msgid "School/education:"
 msgstr "Scuola:"
 
-#: ../../include/identity.php:1345
+#: ../../include/identity.php:1369
 msgid "Like this thing"
 msgstr "Mi piace"
 
-#: ../../include/message.php:18
-msgid "No recipient provided."
-msgstr "Devi scegliere un destinatario."
-
-#: ../../include/message.php:23
-msgid "[no subject]"
-msgstr "[nessun titolo]"
+#: ../../include/taxonomy.php:229 ../../include/taxonomy.php:250
+msgid "Tags"
+msgstr "Tag"
 
-#: ../../include/message.php:45
-msgid "Unable to determine sender."
-msgstr "Impossibile determinare il mittente."
+#: ../../include/taxonomy.php:294
+msgid "Keywords"
+msgstr "Parole chiave"
 
-#: ../../include/message.php:203
-msgid "Stored post could not be verified."
-msgstr "Non è stato possibile verificare il post."
+#: ../../include/taxonomy.php:315
+msgid "have"
+msgstr "ho"
 
-#: ../../include/ItemObject.php:130
-msgid "Save to Folder"
-msgstr "Salva nella cartella"
+#: ../../include/taxonomy.php:315
+msgid "has"
+msgstr "ha"
 
-#: ../../include/ItemObject.php:151
-msgid "I will attend"
-msgstr "Parteciperò"
+#: ../../include/taxonomy.php:316
+msgid "want"
+msgstr "voglio"
 
-#: ../../include/ItemObject.php:151
-msgid "I will not attend"
-msgstr "Non parteciperò"
+#: ../../include/taxonomy.php:316
+msgid "wants"
+msgstr "vuole"
 
-#: ../../include/ItemObject.php:151
-msgid "I might attend"
-msgstr "Forse parteciperò"
+#: ../../include/taxonomy.php:317
+msgid "likes"
+msgstr "gli piace"
 
-#: ../../include/ItemObject.php:161
-msgid "I agree"
-msgstr "Sono d'accordo"
+#: ../../include/taxonomy.php:318
+msgid "dislikes"
+msgstr "non gli piace"
 
-#: ../../include/ItemObject.php:161
-msgid "I disagree"
-msgstr "Non sono d'accordo"
+#: ../../include/attach.php:243 ../../include/attach.php:329
+msgid "Item was not found."
+msgstr "Elemento non trovato."
 
-#: ../../include/ItemObject.php:161
-msgid "I abstain"
-msgstr "Mi astengo"
+#: ../../include/attach.php:493
+msgid "No source file."
+msgstr "Nessun file di origine."
 
-#: ../../include/ItemObject.php:212
-msgid "Add Star"
-msgstr "Aggiungi ai preferiti"
+#: ../../include/attach.php:511
+msgid "Cannot locate file to replace"
+msgstr "Il file da sostituire non è stato trovato"
 
-#: ../../include/ItemObject.php:213
-msgid "Remove Star"
-msgstr "Rimuovi dai preferiti"
+#: ../../include/attach.php:529
+msgid "Cannot locate file to revise/update"
+msgstr "Il file da aggiornare non è stato trovato"
 
-#: ../../include/ItemObject.php:214
-msgid "Toggle Star Status"
-msgstr "Attiva/disattiva preferito"
+#: ../../include/attach.php:664
+#, php-format
+msgid "File exceeds size limit of %d"
+msgstr "Il file supera la dimensione massima di %d"
 
-#: ../../include/ItemObject.php:218
-msgid "starred"
-msgstr "preferito"
+#: ../../include/attach.php:678
+#, php-format
+msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
+msgstr "Hai raggiunto il limite complessivo di %1$.0f Mbytes per gli allegati."
 
-#: ../../include/ItemObject.php:236
-msgid "Add Tag"
-msgstr "Aggiungi un tag"
+#: ../../include/attach.php:828
+msgid "File upload failed. Possible system limit or action terminated."
+msgstr "Caricamento file fallito, potrebbe essere stato interrotto o potrebbe aver superato lo spazio assegnato."
 
-#: ../../include/ItemObject.php:254 ../../mod/photos.php:987
-msgid "I like this (toggle)"
-msgstr "Attiva/disattiva Mi piace"
+#: ../../include/attach.php:841
+msgid "Stored file could not be verified. Upload failed."
+msgstr "Il file non può essere verificato. Caricamento fallito."
 
-#: ../../include/ItemObject.php:255 ../../mod/photos.php:988
-msgid "I don't like this (toggle)"
-msgstr "Attiva/disattiva Non mi piace"
+#: ../../include/attach.php:889 ../../include/attach.php:905
+msgid "Path not available."
+msgstr "Percorso non disponibile."
 
-#: ../../include/ItemObject.php:259
-msgid "Share This"
-msgstr "Condividi"
+#: ../../include/attach.php:951 ../../include/attach.php:1103
+msgid "Empty pathname"
+msgstr "Il percorso del file è vuoto"
 
-#: ../../include/ItemObject.php:259
-msgid "share"
-msgstr "condividi"
+#: ../../include/attach.php:977
+msgid "duplicate filename or path"
+msgstr "il file o il percorso del file è duplicato"
 
-#: ../../include/ItemObject.php:276
-#, php-format
-msgid "%d comment"
-msgid_plural "%d comments"
-msgstr[0] "%d commento"
-msgstr[1] "%d commenti"
+#: ../../include/attach.php:999
+msgid "Path not found."
+msgstr "Percorso del file non trovato."
 
-#: ../../include/ItemObject.php:295 ../../include/ItemObject.php:296
-#, php-format
-msgid "View %s's profile - %s"
-msgstr "Guarda il profilo di %s - %s"
+#: ../../include/attach.php:1057
+msgid "mkdir failed."
+msgstr "mkdir fallito."
 
-#: ../../include/ItemObject.php:299
-msgid "to"
-msgstr "a"
+#: ../../include/attach.php:1061
+msgid "database storage failed."
+msgstr "scrittura su database fallita."
 
-#: ../../include/ItemObject.php:300
-msgid "via"
-msgstr "via"
+#: ../../include/attach.php:1109
+msgid "Empty path"
+msgstr "La posizione è vuota"
 
-#: ../../include/ItemObject.php:301
-msgid "Wall-to-Wall"
-msgstr "Da bacheca a bacheca"
+#: ../../include/conversation.php:126 ../../mod/like.php:113
+msgid "channel"
+msgstr "il canale"
 
-#: ../../include/ItemObject.php:302
-msgid "via Wall-To-Wall:"
-msgstr "da bacheca a bacheca:"
+#: ../../include/conversation.php:164 ../../mod/like.php:410
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
+msgstr "A %1$s piace %3$s di %2$s"
 
-#: ../../include/ItemObject.php:305
-msgid "Delivery Report"
-msgstr "Rapporto di trasmissione"
+#: ../../include/conversation.php:167 ../../mod/like.php:412
+#, php-format
+msgid "%1$s doesn't like %2$s's %3$s"
+msgstr "A %1$s non piace %3$s di %2$s"
 
-#: ../../include/ItemObject.php:339
-msgid "Save Bookmarks"
-msgstr "Salva segnalibro"
+#: ../../include/conversation.php:204
+#, php-format
+msgid "%1$s is now connected with %2$s"
+msgstr "%1$s adesso è connesso con %2$s"
 
-#: ../../include/ItemObject.php:340
-msgid "Add to Calendar"
-msgstr "Aggiungi al calendario"
+#: ../../include/conversation.php:239
+#, php-format
+msgid "%1$s poked %2$s"
+msgstr "%1$s ha mandato un poke a %2$s"
 
-#: ../../include/ItemObject.php:349
-msgid "Mark all seen"
-msgstr "Marca tutto come letto"
+#: ../../include/conversation.php:260 ../../mod/mood.php:63
+#, php-format
+msgctxt "mood"
+msgid "%1$s is %2$s"
+msgstr "%1$s è %2$s"
 
-#: ../../include/ItemObject.php:355 ../../mod/photos.php:1173
-msgctxt "noun"
+#: ../../include/conversation.php:574 ../../mod/photos.php:1060
+msgctxt "title"
 msgid "Likes"
 msgstr "Mi piace"
 
-#: ../../include/ItemObject.php:356 ../../mod/photos.php:1174
-msgctxt "noun"
+#: ../../include/conversation.php:574 ../../mod/photos.php:1060
+msgctxt "title"
 msgid "Dislikes"
 msgstr "Non mi piace"
 
-#: ../../include/ItemObject.php:671 ../../mod/photos.php:1006
-#: ../../mod/photos.php:1124
-msgid "This is you"
-msgstr "Questo sei tu"
+#: ../../include/conversation.php:575 ../../mod/photos.php:1061
+msgctxt "title"
+msgid "Agree"
+msgstr "D'accordo"
 
-#: ../../include/ItemObject.php:680
-msgid "Image"
-msgstr "Immagine"
+#: ../../include/conversation.php:575 ../../mod/photos.php:1061
+msgctxt "title"
+msgid "Disagree"
+msgstr "Non d'accordo"
 
-#: ../../include/ItemObject.php:681
-msgid "Insert Link"
-msgstr "Collegamento"
+#: ../../include/conversation.php:575 ../../mod/photos.php:1061
+msgctxt "title"
+msgid "Abstain"
+msgstr "Astenuti"
 
-#: ../../include/ItemObject.php:682
-msgid "Video"
-msgstr "Video"
+#: ../../include/conversation.php:576 ../../mod/photos.php:1062
+msgctxt "title"
+msgid "Attending"
+msgstr "Partecipano"
 
-#: ../../include/items.php:423 ../../mod/like.php:280 ../../mod/dreport.php:6
-#: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/profperm.php:23
-#: ../../mod/import_items.php:114 ../../index.php:360
-msgid "Permission denied"
-msgstr "Permesso negato"
+#: ../../include/conversation.php:576 ../../mod/photos.php:1062
+msgctxt "title"
+msgid "Not attending"
+msgstr "Non partecipano"
 
-#: ../../include/items.php:1128 ../../include/items.php:1174
-msgid "(Unknown)"
-msgstr "(Sconosciuto)"
+#: ../../include/conversation.php:576 ../../mod/photos.php:1062
+msgctxt "title"
+msgid "Might attend"
+msgstr "Forse partecipano"
 
-#: ../../include/items.php:1371
-msgid "Visible to anybody on the internet."
-msgstr "Visibile a chiunque su internet."
+#: ../../include/conversation.php:692
+#, php-format
+msgid "View %s's profile @ %s"
+msgstr "Vedi il profilo di %s @ %s"
 
-#: ../../include/items.php:1373
-msgid "Visible to you only."
-msgstr "Visibile solo a te."
+#: ../../include/conversation.php:709
+msgid "Categories:"
+msgstr "Categorie:"
 
-#: ../../include/items.php:1375
-msgid "Visible to anybody in this network."
-msgstr "Visibile a tutti su questa rete."
+#: ../../include/conversation.php:710
+msgid "Filed under:"
+msgstr "Classificato come:"
 
-#: ../../include/items.php:1377
-msgid "Visible to anybody authenticated."
-msgstr "Visibile a chiunque sia autenticato."
+#: ../../include/conversation.php:737
+msgid "View in context"
+msgstr "Vedi nel contesto"
 
-#: ../../include/items.php:1379
-#, php-format
-msgid "Visible to anybody on %s."
-msgstr "Visibile a tutti su %s."
+#: ../../include/conversation.php:850
+msgid "remove"
+msgstr "rimuovi"
 
-#: ../../include/items.php:1381
-msgid "Visible to all connections."
-msgstr "Visibile a tutti coloro che ti seguono."
+#: ../../include/conversation.php:854 ../../include/nav.php:241
+msgid "Loading..."
+msgstr "Caricamento in corso..."
 
-#: ../../include/items.php:1383
-msgid "Visible to approved connections."
-msgstr "Visibile ai contatti approvati."
+#: ../../include/conversation.php:855
+msgid "Delete Selected Items"
+msgstr "Elimina gli oggetti selezionati"
 
-#: ../../include/items.php:1385
-msgid "Visible to specific connections."
-msgstr "Visibile ad alcuni contatti scelti."
+#: ../../include/conversation.php:943
+msgid "View Source"
+msgstr "Vedi il sorgente"
 
-#: ../../include/items.php:4263 ../../mod/display.php:36
-#: ../../mod/filestorage.php:27 ../../mod/admin.php:127
-#: ../../mod/admin.php:979 ../../mod/admin.php:1179 ../../mod/thing.php:86
-#: ../../mod/viewsrc.php:20
-msgid "Item not found."
-msgstr "Elemento non trovato."
+#: ../../include/conversation.php:944
+msgid "Follow Thread"
+msgstr "Segui la discussione"
 
-#: ../../include/items.php:4772 ../../mod/group.php:38 ../../mod/group.php:137
-msgid "Collection not found."
-msgstr "Insieme di canali non trovato."
+#: ../../include/conversation.php:945
+msgid "View Status"
+msgstr "Stato attuale"
 
-#: ../../include/items.php:4788
-msgid "Collection is empty."
-msgstr "L'insieme di canali è vuoto."
+#: ../../include/conversation.php:946 ../../include/nav.php:86
+#: ../../mod/connedit.php:493
+msgid "View Profile"
+msgstr "Profilo"
+
+#: ../../include/conversation.php:947
+msgid "View Photos"
+msgstr "Foto"
 
-#: ../../include/items.php:4795
+#: ../../include/conversation.php:948
+msgid "Activity/Posts"
+msgstr "Attività e Post"
+
+#: ../../include/conversation.php:950
+msgid "Edit Connection"
+msgstr "Modifica il contatto"
+
+#: ../../include/conversation.php:951
+msgid "Send PM"
+msgstr "Messaggio privato"
+
+#: ../../include/conversation.php:1066
 #, php-format
-msgid "Collection: %s"
-msgstr "Insieme: %s"
+msgid "%s likes this."
+msgstr "Piace a %s."
 
-#: ../../include/items.php:4805 ../../mod/connedit.php:658
+#: ../../include/conversation.php:1066
 #, php-format
-msgid "Connection: %s"
-msgstr "Contatto: %s"
+msgid "%s doesn't like this."
+msgstr "Non piace a %s."
 
-#: ../../include/items.php:4807
-msgid "Connection not found."
-msgstr "Contatto non trovato."
+#: ../../include/conversation.php:1070
+#, php-format
+msgid "<span  %1$s>%2$d people</span> like this."
+msgid_plural "<span  %1$s>%2$d people</span> like this."
+msgstr[0] ""
+msgstr[1] "Piace a <span %1$s>%2$d persone</span>."
+
+#: ../../include/conversation.php:1072
+#, php-format
+msgid "<span  %1$s>%2$d people</span> don't like this."
+msgid_plural "<span  %1$s>%2$d people</span> don't like this."
+msgstr[0] ""
+msgstr[1] "Non piace a <span %1$s>%2$d persone</span>."
+
+#: ../../include/conversation.php:1078
+msgid "and"
+msgstr "e"
+
+#: ../../include/conversation.php:1081
+#, php-format
+msgid ", and %d other people"
+msgid_plural ", and %d other people"
+msgstr[0] ""
+msgstr[1] "e altre %d persone"
+
+#: ../../include/conversation.php:1082
+#, php-format
+msgid "%s like this."
+msgstr "Piace a %s."
+
+#: ../../include/conversation.php:1082
+#, php-format
+msgid "%s don't like this."
+msgstr "Non piace a %s."
+
+#: ../../include/conversation.php:1145
+msgid "Visible to <strong>everybody</strong>"
+msgstr "Visibile a <strong>tutti</strong>"
+
+#: ../../include/conversation.php:1146 ../../mod/mail.php:194
+#: ../../mod/mail.php:308
+msgid "Please enter a link URL:"
+msgstr "Inserisci l'indirizzo del link:"
+
+#: ../../include/conversation.php:1147
+msgid "Please enter a video link/URL:"
+msgstr "Inserisci l'indirizzo del video:"
+
+#: ../../include/conversation.php:1148
+msgid "Please enter an audio link/URL:"
+msgstr "Inserisci l'indirizzo dell'audio:"
+
+#: ../../include/conversation.php:1149
+msgid "Tag term:"
+msgstr "Tag:"
+
+#: ../../include/conversation.php:1150 ../../mod/filer.php:48
+msgid "Save to Folder:"
+msgstr "Salva nella cartella:"
+
+#: ../../include/conversation.php:1151
+msgid "Where are you right now?"
+msgstr "Dove sei ora?"
+
+#: ../../include/conversation.php:1152 ../../mod/mail.php:195
+#: ../../mod/mail.php:309 ../../mod/editpost.php:54
+msgid "Expires YYYY-MM-DD HH:MM"
+msgstr "Scade il YYYY-MM-DD HH:MM"
+
+#: ../../include/conversation.php:1179 ../../mod/photos.php:1025
+#: ../../mod/layouts.php:184 ../../mod/webpages.php:182
+#: ../../mod/blocks.php:154
+msgid "Share"
+msgstr "Condividi"
+
+#: ../../include/conversation.php:1181
+msgid "Page link name"
+msgstr "Nome del link alla pagina"
+
+#: ../../include/conversation.php:1184
+msgid "Post as"
+msgstr "Pubblica come "
+
+#: ../../include/conversation.php:1191 ../../mod/editblock.php:142
+#: ../../mod/editpost.php:119 ../../mod/editlayout.php:140
+#: ../../mod/editwebpage.php:182
+msgid "Upload photo"
+msgstr "Carica foto"
+
+#: ../../include/conversation.php:1192
+msgid "upload photo"
+msgstr "carica foto"
+
+#: ../../include/conversation.php:1193 ../../mod/mail.php:240
+#: ../../mod/mail.php:369 ../../mod/editblock.php:143
+#: ../../mod/editpost.php:120 ../../mod/editlayout.php:141
+#: ../../mod/editwebpage.php:183
+msgid "Attach file"
+msgstr "Allega file"
+
+#: ../../include/conversation.php:1194
+msgid "attach file"
+msgstr "allega file"
+
+#: ../../include/conversation.php:1195 ../../mod/mail.php:241
+#: ../../mod/mail.php:370 ../../mod/editblock.php:144
+#: ../../mod/editpost.php:121 ../../mod/editlayout.php:142
+#: ../../mod/editwebpage.php:184
+msgid "Insert web link"
+msgstr "Inserisci un indirizzo web"
+
+#: ../../include/conversation.php:1196
+msgid "web link"
+msgstr "link web"
+
+#: ../../include/conversation.php:1197
+msgid "Insert video link"
+msgstr "Inserisci l'indirizzo del video"
+
+#: ../../include/conversation.php:1198
+msgid "video link"
+msgstr "link video"
+
+#: ../../include/conversation.php:1199
+msgid "Insert audio link"
+msgstr "Inserisci l'indirizzo dell'audio"
+
+#: ../../include/conversation.php:1200
+msgid "audio link"
+msgstr "link audio"
+
+#: ../../include/conversation.php:1201 ../../mod/editblock.php:148
+#: ../../mod/editpost.php:125 ../../mod/editlayout.php:146
+#: ../../mod/editwebpage.php:188
+msgid "Set your location"
+msgstr "La tua località"
+
+#: ../../include/conversation.php:1202
+msgid "set location"
+msgstr "la tua località"
+
+#: ../../include/conversation.php:1203 ../../mod/editpost.php:127
+msgid "Toggle voting"
+msgstr "Abilita/disabilita il voto"
+
+#: ../../include/conversation.php:1206 ../../mod/editblock.php:149
+#: ../../mod/editpost.php:126 ../../mod/editlayout.php:147
+#: ../../mod/editwebpage.php:189
+msgid "Clear browser location"
+msgstr "Rimuovi la località data dal browser"
+
+#: ../../include/conversation.php:1207
+msgid "clear location"
+msgstr "rimuovi la località"
+
+#: ../../include/conversation.php:1209 ../../mod/editblock.php:162
+#: ../../mod/editpost.php:142 ../../mod/editwebpage.php:205
+msgid "Title (optional)"
+msgstr "Titolo (opzionale)"
+
+#: ../../include/conversation.php:1213 ../../mod/editblock.php:165
+#: ../../mod/editpost.php:144 ../../mod/editlayout.php:163
+#: ../../mod/editwebpage.php:207
+msgid "Categories (optional, comma-separated list)"
+msgstr "Categorie (lista separata da virgole)"
+
+#: ../../include/conversation.php:1215 ../../mod/editblock.php:151
+#: ../../mod/editpost.php:131 ../../mod/editlayout.php:149
+#: ../../mod/editwebpage.php:191
+msgid "Permission settings"
+msgstr "Permessi dei tuoi contatti"
+
+#: ../../include/conversation.php:1216
+msgid "permissions"
+msgstr "permessi"
+
+#: ../../include/conversation.php:1224 ../../mod/editblock.php:159
+#: ../../mod/editpost.php:139 ../../mod/editlayout.php:156
+#: ../../mod/editwebpage.php:200
+msgid "Public post"
+msgstr "Post pubblico"
+
+#: ../../include/conversation.php:1226 ../../mod/editblock.php:166
+#: ../../mod/editpost.php:145 ../../mod/editlayout.php:164
+#: ../../mod/editwebpage.php:208
+msgid "Example: bob@example.com, mary@example.com"
+msgstr "Per esempio: mario@esempio.com, simona@esempio.com"
+
+#: ../../include/conversation.php:1239 ../../mod/mail.php:245
+#: ../../mod/mail.php:374 ../../mod/editblock.php:176
+#: ../../mod/editpost.php:156 ../../mod/editlayout.php:173
+#: ../../mod/editwebpage.php:217
+msgid "Set expiration date"
+msgstr "Data di scadenza"
+
+#: ../../include/conversation.php:1243 ../../mod/editpost.php:160
+#: ../../mod/events.php:691
+msgid "OK"
+msgstr "OK"
+
+#: ../../include/conversation.php:1244 ../../mod/fbrowser.php:82
+#: ../../mod/fbrowser.php:117 ../../mod/editpost.php:161
+#: ../../mod/events.php:690 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134
+#: ../../mod/settings.php:584 ../../mod/settings.php:610
+msgid "Cancel"
+msgstr "Annulla"
+
+#: ../../include/conversation.php:1487
+msgid "Discover"
+msgstr "Scopri"
+
+#: ../../include/conversation.php:1490
+msgid "Imported public streams"
+msgstr "Contenuti pubblici importati"
+
+#: ../../include/conversation.php:1495
+msgid "Commented Order"
+msgstr "Ultimi commenti"
+
+#: ../../include/conversation.php:1498
+msgid "Sort by Comment Date"
+msgstr "Per data del commento"
+
+#: ../../include/conversation.php:1502
+msgid "Posted Order"
+msgstr "Ultimi post"
+
+#: ../../include/conversation.php:1505
+msgid "Sort by Post Date"
+msgstr "Per data di creazione"
+
+#: ../../include/conversation.php:1510 ../../include/widgets.php:94
+msgid "Personal"
+msgstr "Personali"
+
+#: ../../include/conversation.php:1513
+msgid "Posts that mention or involve you"
+msgstr "Post che ti riguardano"
+
+#: ../../include/conversation.php:1519 ../../mod/menu.php:112
+#: ../../mod/connections.php:72 ../../mod/connections.php:82
+msgid "New"
+msgstr "Novità"
+
+#: ../../include/conversation.php:1522
+msgid "Activity Stream - by date"
+msgstr "Elenco attività - per data"
+
+#: ../../include/conversation.php:1528
+msgid "Starred"
+msgstr "Preferiti"
+
+#: ../../include/conversation.php:1531
+msgid "Favourite Posts"
+msgstr "Post preferiti"
+
+#: ../../include/conversation.php:1538
+msgid "Spam"
+msgstr "Spam"
+
+#: ../../include/conversation.php:1541
+msgid "Posts flagged as SPAM"
+msgstr "Post marcati come spam"
+
+#: ../../include/conversation.php:1585 ../../mod/admin.php:947
+msgid "Channel"
+msgstr "Canale"
+
+#: ../../include/conversation.php:1588
+msgid "Status Messages and Posts"
+msgstr "Post e messaggi di stato"
+
+#: ../../include/conversation.php:1597
+msgid "About"
+msgstr "Informazioni"
+
+#: ../../include/conversation.php:1600
+msgid "Profile Details"
+msgstr "Dettagli del profilo"
+
+#: ../../include/conversation.php:1616
+msgid "Files and Storage"
+msgstr "Archivio file"
+
+#: ../../include/conversation.php:1626 ../../include/conversation.php:1629
+msgid "Chatrooms"
+msgstr "Chat"
+
+#: ../../include/conversation.php:1642
+msgid "Saved Bookmarks"
+msgstr "Segnalibri salvati"
+
+#: ../../include/conversation.php:1652
+msgid "Manage Webpages"
+msgstr "Gestisci le pagine web"
+
+#: ../../include/conversation.php:1711
+msgctxt "noun"
+msgid "Attending"
+msgid_plural "Attending"
+msgstr[0] "Partecipa"
+msgstr[1] "Partecipano"
+
+#: ../../include/conversation.php:1714
+msgctxt "noun"
+msgid "Not Attending"
+msgid_plural "Not Attending"
+msgstr[0] "Non partecipa"
+msgstr[1] "Non partecipano"
+
+#: ../../include/conversation.php:1717
+msgctxt "noun"
+msgid "Undecided"
+msgid_plural "Undecided"
+msgstr[0] "Indeciso"
+msgstr[1] "Indecisi"
+
+#: ../../include/conversation.php:1720
+msgctxt "noun"
+msgid "Agree"
+msgid_plural "Agrees"
+msgstr[0] "D'accordo"
+msgstr[1] "D'accordo"
+
+#: ../../include/conversation.php:1723
+msgctxt "noun"
+msgid "Disagree"
+msgid_plural "Disagrees"
+msgstr[0] "Non d'accordo"
+msgstr[1] "Non d'accordo"
+
+#: ../../include/conversation.php:1726
+msgctxt "noun"
+msgid "Abstain"
+msgid_plural "Abstains"
+msgstr[0] "Astenuto"
+msgstr[1] "Astenuti"
 
 #: ../../include/widgets.php:91 ../../include/nav.php:157
 #: ../../mod/apps.php:36
@@ -3732,19 +3723,19 @@ msgstr "Rimuovi termine"
 msgid "Archives"
 msgstr "Archivi"
 
-#: ../../include/widgets.php:427 ../../mod/connedit.php:567
+#: ../../include/widgets.php:427 ../../mod/connedit.php:566
 msgid "Me"
 msgstr "Me"
 
-#: ../../include/widgets.php:428 ../../mod/connedit.php:568
+#: ../../include/widgets.php:428 ../../mod/connedit.php:567
 msgid "Family"
 msgstr "Famiglia"
 
-#: ../../include/widgets.php:430 ../../mod/connedit.php:570
+#: ../../include/widgets.php:430 ../../mod/connedit.php:569
 msgid "Acquaintances"
 msgstr "Conoscenti"
 
-#: ../../include/widgets.php:431 ../../mod/connedit.php:571
+#: ../../include/widgets.php:431 ../../mod/connedit.php:570
 #: ../../mod/connections.php:88 ../../mod/connections.php:103
 msgid "All"
 msgstr "Tutti"
@@ -3781,7 +3772,7 @@ msgstr "App connesse"
 msgid "Export channel"
 msgstr "Esporta il canale"
 
-#: ../../include/widgets.php:529 ../../mod/connedit.php:658
+#: ../../include/widgets.php:529 ../../mod/connedit.php:657
 msgid "Connection Default Permissions"
 msgstr "Permessi predefiniti dei nuovi contatti"
 
@@ -3794,174 +3785,153 @@ msgid "Private Mail Menu"
 msgstr "Menu messaggi privati"
 
 #: ../../include/widgets.php:569
-msgid "Check Mail"
-msgstr "Controlla i messaggi"
-
-#: ../../include/widgets.php:575
 msgid "Combined View"
 msgstr "Vista combinata"
 
-#: ../../include/widgets.php:580 ../../include/nav.php:191
+#: ../../include/widgets.php:574 ../../include/nav.php:191
 msgid "Inbox"
 msgstr "In arrivo"
 
-#: ../../include/widgets.php:585 ../../include/nav.php:192
+#: ../../include/widgets.php:579 ../../include/nav.php:192
 msgid "Outbox"
 msgstr "Inviati"
 
-#: ../../include/widgets.php:590 ../../include/nav.php:193
+#: ../../include/widgets.php:584 ../../include/nav.php:193
 msgid "New Message"
 msgstr "Nuovo messaggio"
 
-#: ../../include/widgets.php:609 ../../include/widgets.php:621
+#: ../../include/widgets.php:603 ../../include/widgets.php:615
 msgid "Conversations"
 msgstr "Conversazioni"
 
-#: ../../include/widgets.php:613
+#: ../../include/widgets.php:607
 msgid "Received Messages"
 msgstr "Ricevuti"
 
-#: ../../include/widgets.php:617
+#: ../../include/widgets.php:611
 msgid "Sent Messages"
 msgstr "Inviati"
 
-#: ../../include/widgets.php:631
+#: ../../include/widgets.php:625
 msgid "No messages."
 msgstr "Nessun messaggio."
 
-#: ../../include/widgets.php:648
+#: ../../include/widgets.php:643
 msgid "Delete conversation"
 msgstr "Elimina la conversazione"
 
-#: ../../include/widgets.php:650
+#: ../../include/widgets.php:645
 msgid "D, d M Y - g:i A"
 msgstr "D d M Y - G:i"
 
-#: ../../include/widgets.php:738
+#: ../../include/widgets.php:734
 msgid "Chat Rooms"
 msgstr "Chat"
 
-#: ../../include/widgets.php:758
+#: ../../include/widgets.php:754
 msgid "Bookmarked Chatrooms"
 msgstr "Chat nei segnalibri"
 
-#: ../../include/widgets.php:778
+#: ../../include/widgets.php:774
 msgid "Suggested Chatrooms"
 msgstr "Chat suggerite"
 
-#: ../../include/widgets.php:905 ../../include/widgets.php:963
+#: ../../include/widgets.php:901 ../../include/widgets.php:959
 msgid "photo/image"
 msgstr "foto/immagine"
 
-#: ../../include/widgets.php:1058 ../../include/widgets.php:1060
+#: ../../include/widgets.php:1054 ../../include/widgets.php:1056
 msgid "Rate Me"
 msgstr "Valutami"
 
-#: ../../include/widgets.php:1064
+#: ../../include/widgets.php:1060
 msgid "View Ratings"
 msgstr "Vedi le valutazioni ricevute"
 
-#: ../../include/widgets.php:1075
+#: ../../include/widgets.php:1071
 msgid "Public Hubs"
 msgstr "Hub pubblici"
 
-#: ../../include/widgets.php:1123
+#: ../../include/widgets.php:1119
 msgid "Forums"
 msgstr "Forum"
 
-#: ../../include/widgets.php:1150
+#: ../../include/widgets.php:1146
 msgid "Tasks"
 msgstr "Attività"
 
-#: ../../include/widgets.php:1159
+#: ../../include/widgets.php:1155
 msgid "Documentation"
 msgstr "Guida"
 
-#: ../../include/widgets.php:1161
+#: ../../include/widgets.php:1157
 msgid "Project/Site Information"
 msgstr "Informazioni sul sito/progetto"
 
-#: ../../include/widgets.php:1162
+#: ../../include/widgets.php:1158
 msgid "For Members"
 msgstr "Per gli utenti"
 
-#: ../../include/widgets.php:1163
+#: ../../include/widgets.php:1159
 msgid "For Administrators"
 msgstr "Per gli amministratori"
 
-#: ../../include/widgets.php:1164
+#: ../../include/widgets.php:1160
 msgid "For Developers"
 msgstr "Per sviluppatori"
 
-#: ../../include/widgets.php:1189 ../../mod/admin.php:410
+#: ../../include/widgets.php:1185 ../../mod/admin.php:410
 msgid "Site"
 msgstr "Sito"
 
-#: ../../include/widgets.php:1190
+#: ../../include/widgets.php:1186
 msgid "Accounts"
 msgstr "Account"
 
-#: ../../include/widgets.php:1191 ../../mod/admin.php:939
+#: ../../include/widgets.php:1187 ../../mod/admin.php:939
 msgid "Channels"
 msgstr "Canali"
 
-#: ../../include/widgets.php:1192 ../../mod/admin.php:1031
+#: ../../include/widgets.php:1188 ../../mod/admin.php:1031
 #: ../../mod/admin.php:1071
 msgid "Plugins"
 msgstr "Plugin"
 
-#: ../../include/widgets.php:1193 ../../mod/admin.php:1231
+#: ../../include/widgets.php:1189 ../../mod/admin.php:1231
 #: ../../mod/admin.php:1265
 msgid "Themes"
 msgstr "Temi"
 
-#: ../../include/widgets.php:1194
+#: ../../include/widgets.php:1190
 msgid "Inspect queue"
 msgstr "Coda di attesa"
 
-#: ../../include/widgets.php:1195
+#: ../../include/widgets.php:1191
 msgid "Profile Config"
 msgstr "Configurazione del profilo"
 
-#: ../../include/widgets.php:1196
+#: ../../include/widgets.php:1192
 msgid "DB updates"
 msgstr "Aggiornamenti al DB"
 
-#: ../../include/widgets.php:1214 ../../include/widgets.php:1220
+#: ../../include/widgets.php:1210 ../../include/widgets.php:1216
 #: ../../mod/admin.php:1350
 msgid "Logs"
 msgstr "Log"
 
-#: ../../include/widgets.php:1218 ../../include/nav.php:210
+#: ../../include/widgets.php:1214 ../../include/nav.php:210
 msgid "Admin"
 msgstr "Amministrazione"
 
-#: ../../include/widgets.php:1219
+#: ../../include/widgets.php:1215
 msgid "Plugin Features"
 msgstr "Plugin"
 
-#: ../../include/widgets.php:1221
+#: ../../include/widgets.php:1217
 msgid "User registrations waiting for confirmation"
 msgstr "Registrazioni in attesa"
 
-#: ../../include/zot.php:677
-msgid "Invalid data packet"
-msgstr "Dati ricevuti non validi"
-
-#: ../../include/zot.php:693
-msgid "Unable to verify channel signature"
-msgstr "Impossibile verificare la firma elettronica del canale"
-
-#: ../../include/zot.php:2213
-#, php-format
-msgid "Unable to verify site signature for %s"
-msgstr "Impossibile verificare la firma elettronica del sito %s"
-
-#: ../../include/zot.php:3511
-msgid "invalid target signature"
-msgstr "la firma ricevuta non è valida"
-
-#: ../../include/nav.php:82 ../../include/nav.php:114 ../../boot.php:1496
+#: ../../include/nav.php:82 ../../include/nav.php:114 ../../boot.php:1502
 msgid "Logout"
 msgstr "Esci"
 
@@ -4034,7 +4004,7 @@ msgstr "Clicca per farti riconoscere dal tuo hub principale"
 msgid "Home Page"
 msgstr "Bacheca"
 
-#: ../../include/nav.php:149 ../../mod/register.php:224 ../../boot.php:1473
+#: ../../include/nav.php:149 ../../mod/register.php:224 ../../boot.php:1479
 msgid "Register"
 msgstr "Registrati"
 
@@ -4056,11 +4026,7 @@ msgstr "Cerca nel sito per @nome, #tag, ?guida o per contenuto"
 
 #: ../../include/nav.php:162
 msgid "Channel Directory"
-msgstr "Elenco pubblico canali"
-
-#: ../../include/nav.php:174
-msgid "Grid"
-msgstr "Rete"
+msgstr "Elenchi pubblici dei canali"
 
 #: ../../include/nav.php:174
 msgid "Your grid"
@@ -4142,6 +4108,47 @@ msgstr "@nome, #tag, ?guida, contenuto"
 msgid "Please wait..."
 msgstr "Attendere..."
 
+#: ../../include/dir_fns.php:126
+msgid "Directory Options"
+msgstr "Opzioni per elenchi pubblici"
+
+#: ../../include/dir_fns.php:128
+msgid "Safe Mode"
+msgstr "Modalità SafeSearch"
+
+#: ../../include/dir_fns.php:128 ../../include/dir_fns.php:129
+#: ../../include/dir_fns.php:130 ../../mod/removeme.php:60
+#: ../../mod/mitem.php:154 ../../mod/mitem.php:155 ../../mod/mitem.php:228
+#: ../../mod/mitem.php:229 ../../mod/connedit.php:630
+#: ../../mod/connedit.php:658 ../../mod/photos.php:625
+#: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159
+#: ../../mod/admin.php:386 ../../mod/menu.php:96 ../../mod/menu.php:153
+#: ../../mod/settings.php:574 ../../mod/api.php:106
+#: ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1507
+msgid "No"
+msgstr "No"
+
+#: ../../include/dir_fns.php:128 ../../include/dir_fns.php:129
+#: ../../include/dir_fns.php:130 ../../mod/removeme.php:60
+#: ../../mod/mitem.php:154 ../../mod/mitem.php:155 ../../mod/mitem.php:228
+#: ../../mod/mitem.php:229 ../../mod/photos.php:625
+#: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159
+#: ../../mod/admin.php:388 ../../mod/menu.php:96 ../../mod/menu.php:153
+#: ../../mod/settings.php:574 ../../mod/api.php:105
+#: ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1507
+msgid "Yes"
+msgstr "Si"
+
+#: ../../include/dir_fns.php:129
+msgid "Public Forums Only"
+msgstr "Solo forum pubblici"
+
+#: ../../include/dir_fns.php:130
+msgid "This Website Only"
+msgstr "Solo in questo sito"
+
 #: ../../mod/achievements.php:34
 msgid "Some blurb about what to do when you're new here"
 msgstr "Qualche suggerimento per i nuovi utenti su cosa fare"
@@ -4163,8 +4170,8 @@ msgstr "Suggerisci amici"
 msgid "Suggest a friend for %s"
 msgstr "Suggerisci un amico a %s"
 
-#: ../../mod/directory.php:59 ../../mod/display.php:13 ../../mod/search.php:13
-#: ../../mod/photos.php:453 ../../mod/ratings.php:82
+#: ../../mod/directory.php:59 ../../mod/display.php:13
+#: ../../mod/photos.php:489 ../../mod/search.php:13 ../../mod/ratings.php:82
 #: ../../mod/viewconnections.php:17
 msgid "Public access denied."
 msgstr "Accesso pubblico negato."
@@ -4210,11 +4217,11 @@ msgstr "Contatti in comune:"
 
 #: ../../mod/directory.php:374
 msgid "Global Directory"
-msgstr "Elenco globale dei canali"
+msgstr "Elenchi pubblici globali"
 
 #: ../../mod/directory.php:374
 msgid "Local Directory"
-msgstr "Elenco canali su questo server"
+msgstr "Elenco canali su questo hub"
 
 #: ../../mod/directory.php:380
 msgid "Finding:"
@@ -4561,7 +4568,7 @@ msgstr "Inserisci la tua password per verifica:"
 
 #: ../../mod/removeme.php:60
 msgid "Remove this channel and all its clones from the network"
-msgstr "Rimuovi questo canale e tutti i suoi cloni dalla rete"
+msgstr "Elimina questo canale e tutti i suoi cloni dalla rete"
 
 #: ../../mod/removeme.php:60
 msgid ""
@@ -4709,240 +4716,240 @@ msgstr "Non è possibile accedere alle informazioni sul contatto."
 msgid "Could not locate selected profile."
 msgstr "Non riesco a trovare il profilo selezionato."
 
-#: ../../mod/connedit.php:219
+#: ../../mod/connedit.php:218
 msgid "Connection updated."
 msgstr "Contatto aggiornato."
 
-#: ../../mod/connedit.php:221
+#: ../../mod/connedit.php:220
 msgid "Failed to update connection record."
 msgstr "Impossibile aggiornare le informazioni del contatto."
 
-#: ../../mod/connedit.php:268
+#: ../../mod/connedit.php:267
 msgid "is now connected to"
 msgstr "ha come nuovo contatto"
 
-#: ../../mod/connedit.php:391
+#: ../../mod/connedit.php:390
 msgid "Could not access address book record."
 msgstr "Impossibile accedere alle informazioni della rubrica."
 
-#: ../../mod/connedit.php:405
+#: ../../mod/connedit.php:404
 msgid "Refresh failed - channel is currently unavailable."
 msgstr "Il canale non è disponibile - impossibile aggiornare."
 
-#: ../../mod/connedit.php:414 ../../mod/connedit.php:423
-#: ../../mod/connedit.php:432 ../../mod/connedit.php:441
-#: ../../mod/connedit.php:454
+#: ../../mod/connedit.php:413 ../../mod/connedit.php:422
+#: ../../mod/connedit.php:431 ../../mod/connedit.php:440
+#: ../../mod/connedit.php:453
 msgid "Unable to set address book parameters."
 msgstr "Impossibile impostare i parametri della rubrica."
 
-#: ../../mod/connedit.php:478
+#: ../../mod/connedit.php:477
 msgid "Connection has been removed."
 msgstr "Il contatto è stato rimosso."
 
-#: ../../mod/connedit.php:497
+#: ../../mod/connedit.php:496
 #, php-format
 msgid "View %s's profile"
 msgstr "Guarda il profilo di %s"
 
-#: ../../mod/connedit.php:501
+#: ../../mod/connedit.php:500
 msgid "Refresh Permissions"
 msgstr "Modifica i permessi"
 
-#: ../../mod/connedit.php:504
+#: ../../mod/connedit.php:503
 msgid "Fetch updated permissions"
 msgstr "Guarda e modifica i permessi assegnati"
 
-#: ../../mod/connedit.php:508
+#: ../../mod/connedit.php:507
 msgid "Recent Activity"
 msgstr "Attività recenti"
 
-#: ../../mod/connedit.php:511
+#: ../../mod/connedit.php:510
 msgid "View recent posts and comments"
 msgstr "Leggi i post recenti e i commenti"
 
-#: ../../mod/connedit.php:515 ../../mod/admin.php:785
+#: ../../mod/connedit.php:514 ../../mod/admin.php:785
 msgid "Unblock"
 msgstr "Sblocca"
 
-#: ../../mod/connedit.php:515 ../../mod/admin.php:784
+#: ../../mod/connedit.php:514 ../../mod/admin.php:784
 msgid "Block"
 msgstr "Blocca"
 
-#: ../../mod/connedit.php:518
+#: ../../mod/connedit.php:517
 msgid "Block (or Unblock) all communications with this connection"
 msgstr "Blocca ogni interazione con questo contatto (abilita/disabilita)"
 
-#: ../../mod/connedit.php:519
+#: ../../mod/connedit.php:518
 msgid "This connection is blocked!"
 msgstr "Questa connessione è tra quelle bloccate!"
 
-#: ../../mod/connedit.php:523
+#: ../../mod/connedit.php:522
 msgid "Unignore"
 msgstr "Non ignorare"
 
-#: ../../mod/connedit.php:523 ../../mod/notifications.php:51
+#: ../../mod/connedit.php:522 ../../mod/notifications.php:51
 msgid "Ignore"
 msgstr "Ignora"
 
-#: ../../mod/connedit.php:526
+#: ../../mod/connedit.php:525
 msgid "Ignore (or Unignore) all inbound communications from this connection"
 msgstr "Ignora tutte le comunicazioni in arrivo da questo contatto (abilita/disabilita)"
 
-#: ../../mod/connedit.php:527
+#: ../../mod/connedit.php:526
 msgid "This connection is ignored!"
 msgstr "Questa connessione è tra quelle ignorate!"
 
-#: ../../mod/connedit.php:531
+#: ../../mod/connedit.php:530
 msgid "Unarchive"
 msgstr "Non archiviare"
 
-#: ../../mod/connedit.php:531
+#: ../../mod/connedit.php:530
 msgid "Archive"
 msgstr "Archivia"
 
-#: ../../mod/connedit.php:534
+#: ../../mod/connedit.php:533
 msgid ""
 "Archive (or Unarchive) this connection - mark channel dead but keep content"
 msgstr "Archivia questo contatto (abilita/disabilita) - segna il canale come non più attivo ma ne conserva i contenuti"
 
-#: ../../mod/connedit.php:535
+#: ../../mod/connedit.php:534
 msgid "This connection is archived!"
 msgstr "Questa connessione è tra quelle archiviate!"
 
-#: ../../mod/connedit.php:539
+#: ../../mod/connedit.php:538
 msgid "Unhide"
 msgstr "Non nascondere"
 
-#: ../../mod/connedit.php:539
+#: ../../mod/connedit.php:538
 msgid "Hide"
 msgstr "Nascondi"
 
-#: ../../mod/connedit.php:542
+#: ../../mod/connedit.php:541
 msgid "Hide or Unhide this connection from your other connections"
 msgstr "Nascondi questo contatto a tutti gli altri (abilita/disabilita)"
 
-#: ../../mod/connedit.php:543
+#: ../../mod/connedit.php:542
 msgid "This connection is hidden!"
 msgstr "Questa connessione è tra quelle nascoste!"
 
-#: ../../mod/connedit.php:550
+#: ../../mod/connedit.php:549
 msgid "Delete this connection"
 msgstr "Elimina questo contatto"
 
-#: ../../mod/connedit.php:631
+#: ../../mod/connedit.php:630
 msgid "Approve this connection"
 msgstr "Approva questo contatto"
 
-#: ../../mod/connedit.php:631
+#: ../../mod/connedit.php:630
 msgid "Accept connection to allow communication"
 msgstr "Entra in contatto per poter comunicare"
 
-#: ../../mod/connedit.php:636
+#: ../../mod/connedit.php:635
 msgid "Set Affinity"
 msgstr "Scegli l'affinità"
 
-#: ../../mod/connedit.php:639
+#: ../../mod/connedit.php:638
 msgid "Set Profile"
 msgstr "Scegli il profilo da mostrare"
 
-#: ../../mod/connedit.php:642
+#: ../../mod/connedit.php:641
 msgid "Set Affinity & Profile"
 msgstr "Affinità e profilo"
 
-#: ../../mod/connedit.php:659
+#: ../../mod/connedit.php:658
 msgid "Apply these permissions automatically"
 msgstr "Applica automaticamente questi permessi"
 
-#: ../../mod/connedit.php:661
+#: ../../mod/connedit.php:660
 msgid "This connection's address is"
 msgstr "Indirizzo di questo contatto"
 
-#: ../../mod/connedit.php:664
+#: ../../mod/connedit.php:663
 msgid ""
 "The permissions indicated on this page will be applied to all new "
 "connections."
 msgstr "I permessi indicati su questa pagina saranno applicati a tutti i nuovi contatti da ora in poi."
 
-#: ../../mod/connedit.php:666
+#: ../../mod/connedit.php:665
 msgid "Slide to adjust your degree of friendship"
 msgstr "Trascina per restringere il grado di amicizia da mostrare"
 
-#: ../../mod/connedit.php:668
+#: ../../mod/connedit.php:667
 msgid "Slide to adjust your rating"
 msgstr "Trascina per cambiare la tua valutazione"
 
-#: ../../mod/connedit.php:669 ../../mod/connedit.php:674
+#: ../../mod/connedit.php:668 ../../mod/connedit.php:673
 msgid "Optionally explain your rating"
 msgstr "Commento opzionale"
 
-#: ../../mod/connedit.php:671
+#: ../../mod/connedit.php:670
 msgid "Custom Filter"
 msgstr "Filtro personalizzato"
 
-#: ../../mod/connedit.php:672
+#: ../../mod/connedit.php:671
 msgid "Only import posts with this text"
 msgstr "Importa solo i post che contengono queste parole chiave"
 
-#: ../../mod/connedit.php:672 ../../mod/connedit.php:673
+#: ../../mod/connedit.php:671 ../../mod/connedit.php:672
 msgid ""
 "words one per line or #tags or /patterns/, leave blank to import all posts"
 msgstr "una parola per riga, oppure #tag o /pattern/ oppure lascia vuoto per importare tutto"
 
-#: ../../mod/connedit.php:673
+#: ../../mod/connedit.php:672
 msgid "Do not import posts with this text"
 msgstr "Non importare i post con queste parole chiave"
 
-#: ../../mod/connedit.php:675
+#: ../../mod/connedit.php:674
 msgid "This information is public!"
 msgstr "Questa informazione è pubblica!"
 
-#: ../../mod/connedit.php:680
+#: ../../mod/connedit.php:679
 msgid "Connection Pending Approval"
 msgstr "Contatti in attesa di approvazione"
 
-#: ../../mod/connedit.php:681
+#: ../../mod/connedit.php:680
 msgid "Connection Request"
 msgstr "Richiesta di entrare in contatto"
 
-#: ../../mod/connedit.php:682
+#: ../../mod/connedit.php:681
 #, php-format
 msgid ""
 "(%s) would like to connect with you. Please approve this connection to allow"
 " communication."
 msgstr "(%s) vorrebbe entrare in contatto con te. Per permettere la comunicazione è necessario che tu approvi."
 
-#: ../../mod/connedit.php:683 ../../mod/admin.php:781
+#: ../../mod/connedit.php:682 ../../mod/admin.php:781
 msgid "Approve"
 msgstr "Approva"
 
-#: ../../mod/connedit.php:684
+#: ../../mod/connedit.php:683
 msgid "Approve Later"
 msgstr "Approva più tardi"
 
-#: ../../mod/connedit.php:687
+#: ../../mod/connedit.php:686
 msgid "inherited"
 msgstr "derivato"
 
-#: ../../mod/connedit.php:689
+#: ../../mod/connedit.php:688
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
-msgstr "Seleziona il profilo che vuoi mostrare a %s quando visita il tuo profilo dopo aver effettuato l'accesso."
+msgstr "Seleziona il profilo che vuoi mostrare a %s dopo che ha effettuato l'accesso."
 
-#: ../../mod/connedit.php:691
+#: ../../mod/connedit.php:690
 msgid "Their Settings"
 msgstr "Permessi concessi a te"
 
-#: ../../mod/connedit.php:692
+#: ../../mod/connedit.php:691
 msgid "My Settings"
 msgstr "Permessi che concedo"
 
-#: ../../mod/connedit.php:694
+#: ../../mod/connedit.php:693
 msgid "Individual Permissions"
 msgstr "Permessi individuali"
 
-#: ../../mod/connedit.php:695
+#: ../../mod/connedit.php:694
 msgid ""
 "Some permissions may be inherited from your channel's <a "
 "href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
@@ -4950,7 +4957,7 @@ msgid ""
 " settings here."
 msgstr "Alcuni permessi derivano dalle <a href=\"settings\"><strong>impostazioni di privacy</strong></a> del tuo canale, che hanno priorità assoluta su qualsiasi altra impostazione scelta per i singoli contatti. Da questa pagina <strong>non</strong> puoi cambiarle."
 
-#: ../../mod/connedit.php:696
+#: ../../mod/connedit.php:695
 msgid ""
 "Some permissions may be inherited from your channel's <a "
 "href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
@@ -4958,7 +4965,7 @@ msgid ""
 "they wont have any impact unless the inherited setting changes."
 msgstr "Alcuni permessi derivano dalle <a href=\"settings\"><strong>impostazioni di privacy</strong></a> del tuo canale, che hanno priorità assoluta su qualsiasi altra impostazione scelta per i singoli contatti. Le personalizzazioni che effettuerai qui potrebbero non essere effettive a meno che tu non cambi le impostazioni generali."
 
-#: ../../mod/connedit.php:697
+#: ../../mod/connedit.php:696
 msgid "Last update:"
 msgstr "Ultimo aggiornamento:"
 
@@ -4985,50 +4992,164 @@ msgid ""
 " to correctly use this feature."
 msgstr "Attenzione: alcune delle impostazioni, se cambiate, potrebbero rendere questo canale non funzionante. Lascia questa pagina a meno che tu non sappia con assoluta certezza quali modifiche effettuare."
 
-#: ../../mod/pubsites.php:16
-msgid "Public Sites"
-msgstr "Siti pubblici"
+#: ../../mod/photos.php:79
+msgid "Page owner information could not be retrieved."
+msgstr "Impossibile ottenere informazioni sul proprietario della pagina."
 
-#: ../../mod/pubsites.php:19
-msgid ""
-"The listed sites allow public registration for the $Projectname network. All"
-" sites in the network are interlinked so membership on any of them conveys "
-"membership in the network as a whole. Some sites may require subscription or"
-" provide tiered service plans. The provider links <strong>may</strong> "
-"provide additional details."
-msgstr "I siti elencati permettono la registrazione libera sulla rete $Projectname. Tutti questi hub sono interconnessi, quindi essere iscritti su uno equivale a una registrazione su tutta la rete. Alcuni siti potrebbero richiedere un abbonamento o dei servizi a pagamento. Per maggiori dettagli visita gli indirizzi nell'elenco."
+#: ../../mod/photos.php:100
+msgid "Album not found."
+msgstr "Album non trovato."
 
-#: ../../mod/pubsites.php:25
-msgid "Rate this hub"
-msgstr "Valuta questo hub"
+#: ../../mod/photos.php:127
+msgid "Delete Album"
+msgstr "Elimina album"
 
-#: ../../mod/pubsites.php:26
-msgid "Site URL"
-msgstr "URL del sito"
+#: ../../mod/photos.php:171 ../../mod/photos.php:1006
+msgid "Delete Photo"
+msgstr "Elimina foto"
 
-#: ../../mod/pubsites.php:26
-msgid "Access Type"
-msgstr "Tipo di accesso"
+#: ../../mod/photos.php:500
+msgid "No photos selected"
+msgstr "Nessuna foto selezionata"
 
-#: ../../mod/pubsites.php:26
-msgid "Registration Policy"
-msgstr "Politica di registrazione"
+#: ../../mod/photos.php:549
+msgid "Access to this item is restricted."
+msgstr "Questo elemento non è visibile a tutti."
 
-#: ../../mod/pubsites.php:26 ../../mod/profiles.php:454
-msgid "Location"
-msgstr "Posizione geografica"
+#: ../../mod/photos.php:588
+#, php-format
+msgid "%1$.2f MB of %2$.2f MB photo storage used."
+msgstr "Hai usato %1$.2f Mb dei %2$.2f Mb di spazio disponibile."
 
-#: ../../mod/pubsites.php:26
-msgid "View hub ratings"
-msgstr "Vedi le valutazioni del hub"
+#: ../../mod/photos.php:591
+#, php-format
+msgid "%1$.2f MB photo storage used."
+msgstr "Hai usato %1$.2f Mb del tuo spazio disponibile."
 
-#: ../../mod/pubsites.php:30
-msgid "Rate"
-msgstr "Valuta"
+#: ../../mod/photos.php:619
+msgid "Upload Photos"
+msgstr "Carica foto"
 
-#: ../../mod/pubsites.php:31
-msgid "View ratings"
-msgstr "Vedi le valutazioni"
+#: ../../mod/photos.php:623
+msgid "Enter an album name"
+msgstr "Scegli il nome dell'album"
+
+#: ../../mod/photos.php:624
+msgid "or select an existing album (doubleclick)"
+msgstr "o seleziona un album esistente (doppio click)"
+
+#: ../../mod/photos.php:625
+msgid "Create a status post for this upload"
+msgstr "Pubblica sulla bacheca"
+
+#: ../../mod/photos.php:652
+msgid "Album name could not be decoded"
+msgstr "Non è stato possibile leggere il nome dell'album"
+
+#: ../../mod/photos.php:696 ../../mod/photos.php:1233
+#: ../../mod/photos.php:1250
+msgid "Contact Photos"
+msgstr "Foto dei contatti"
+
+#: ../../mod/photos.php:724
+msgid "Show Newest First"
+msgstr "Prima i più recenti"
+
+#: ../../mod/photos.php:726
+msgid "Show Oldest First"
+msgstr "Prima i più vecchi"
+
+#: ../../mod/photos.php:750 ../../mod/photos.php:1283
+msgid "View Photo"
+msgstr "Guarda la foto"
+
+#: ../../mod/photos.php:779
+msgid "Edit Album"
+msgstr "Modifica album"
+
+#: ../../mod/photos.php:824
+msgid "Permission denied. Access to this item may be restricted."
+msgstr "Permesso negato. L'accesso a questo elemento può essere stato limitato."
+
+#: ../../mod/photos.php:826
+msgid "Photo not available"
+msgstr "Foto non disponibile"
+
+#: ../../mod/photos.php:884
+msgid "Use as profile photo"
+msgstr "Usa come foto del profilo"
+
+#: ../../mod/photos.php:891
+msgid "Private Photo"
+msgstr "Foto privata"
+
+#: ../../mod/photos.php:902 ../../mod/events.php:528
+msgid "Previous"
+msgstr "Precendente"
+
+#: ../../mod/photos.php:906
+msgid "View Full Size"
+msgstr "Vedi nelle dimensioni originali"
+
+#: ../../mod/photos.php:911 ../../mod/events.php:529 ../../mod/setup.php:285
+msgid "Next"
+msgstr "Successivo"
+
+#: ../../mod/photos.php:951 ../../mod/tagrm.php:133
+msgid "Remove"
+msgstr "Rimuovi"
+
+#: ../../mod/photos.php:985
+msgid "Edit photo"
+msgstr "Modifica la foto"
+
+#: ../../mod/photos.php:987
+msgid "Rotate CW (right)"
+msgstr "Ruota (senso orario)"
+
+#: ../../mod/photos.php:988
+msgid "Rotate CCW (left)"
+msgstr "Ruota (senso antiorario)"
+
+#: ../../mod/photos.php:991
+msgid "Enter a new album name"
+msgstr "Inserisci il nome del nuovo album"
+
+#: ../../mod/photos.php:992
+msgid "or select an existing one (doubleclick)"
+msgstr "o seleziona uno esistente (doppio click)"
+
+#: ../../mod/photos.php:995
+msgid "Caption"
+msgstr "Didascalia"
+
+#: ../../mod/photos.php:997
+msgid "Add a Tag"
+msgstr "Aggiungi tag"
+
+#: ../../mod/photos.php:1001
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
+msgstr "Esempio: @bob, @Barbara_Jensen, @jim@example.com"
+
+#: ../../mod/photos.php:1004
+msgid "Flag as adult in album view"
+msgstr "Marca come 'per adulti'"
+
+#: ../../mod/photos.php:1196
+msgid "In This Photo:"
+msgstr "In questa foto:"
+
+#: ../../mod/photos.php:1201
+msgid "Map"
+msgstr "Mappa"
+
+#: ../../mod/photos.php:1289
+msgid "View Album"
+msgstr "Guarda l'album"
+
+#: ../../mod/photos.php:1312
+msgid "Recent Photos"
+msgstr "Foto recenti"
 
 #: ../../mod/filestorage.php:82
 msgid "Permission Denied."
@@ -5074,6 +5195,10 @@ msgstr "Mostra l'URL del file"
 msgid "Notify your contacts about this file"
 msgstr "Notifica ai contatti che hai caricato questo file"
 
+#: ../../mod/regdir.php:45 ../../mod/dirsearch.php:21
+msgid "This site is not a directory server"
+msgstr "Questo non è un directory server"
+
 #: ../../mod/layouts.php:121 ../../mod/layouts.php:179
 #: ../../mod/editlayout.php:161
 msgid "Layout Name"
@@ -5147,39 +5272,43 @@ msgstr "Contatto non valido."
 msgid "You must be logged in to see this page."
 msgstr "Devi aver effettuato l'accesso per vedere questa pagina."
 
-#: ../../mod/chat.php:171
+#: ../../mod/chat.php:174
 msgid "Room not found"
 msgstr "Chat non trovata"
 
-#: ../../mod/chat.php:182
+#: ../../mod/chat.php:185
 msgid "Leave Room"
 msgstr "Lascia la chat"
 
-#: ../../mod/chat.php:183
+#: ../../mod/chat.php:186
 msgid "Delete This Room"
 msgstr "Elimina questa chat"
 
-#: ../../mod/chat.php:184
+#: ../../mod/chat.php:187
 msgid "I am away right now"
 msgstr "Non sono presente"
 
-#: ../../mod/chat.php:185
+#: ../../mod/chat.php:188
 msgid "I am online"
 msgstr "Sono online"
 
-#: ../../mod/chat.php:187
+#: ../../mod/chat.php:190
 msgid "Bookmark this room"
 msgstr "Aggiungi questa chat ai segnalibri"
 
-#: ../../mod/chat.php:205 ../../mod/chat.php:227
+#: ../../mod/chat.php:208 ../../mod/chat.php:231
 msgid "New Chatroom"
 msgstr "Nuova chat"
 
-#: ../../mod/chat.php:206
+#: ../../mod/chat.php:209
 msgid "Chatroom Name"
 msgstr "Nome della chat"
 
-#: ../../mod/chat.php:223
+#: ../../mod/chat.php:210
+msgid "Expiration of chats (minutes)"
+msgstr "Scadenza dei messaggi in chat (minuti)"
+
+#: ../../mod/chat.php:227
 #, php-format
 msgid "%1$s's Chatrooms"
 msgstr "Le chat di %1$s"
@@ -5194,134 +5323,211 @@ msgstr "Elementi taggati con: %s"
 msgid "Search results for: %s"
 msgstr "Risultati ricerca: %s"
 
-#: ../../mod/message.php:34
+#: ../../mod/rate.php:158
+msgid "Website:"
+msgstr "Sito web:"
+
+#: ../../mod/rate.php:161
+#, php-format
+msgid "Remote Channel [%s] (not yet known on this site)"
+msgstr "Canale remoto [%s] (non ancora conosciuto da questo sito)"
+
+#: ../../mod/rate.php:162
+msgid "Rating (this information is public)"
+msgstr "Valutazione (visibile a tutti)"
+
+#: ../../mod/rate.php:163
+msgid "Optionally explain your rating (this information is public)"
+msgstr "Commento alla valutazione (facoltativo, visibile a tutti)"
+
+#: ../../mod/mail.php:33
+msgid "Unable to lookup recipient."
+msgstr "Impossibile associare un destinatario."
+
+#: ../../mod/mail.php:41
+msgid "Unable to communicate with requested channel."
+msgstr "Impossibile comunicare con il canale richiesto."
+
+#: ../../mod/mail.php:48
+msgid "Cannot verify requested channel."
+msgstr "Impossibile verificare il canale richiesto."
+
+#: ../../mod/mail.php:74
+msgid "Selected channel has private message restrictions. Send failed."
+msgstr "Il canale ha delle regole restrittive per la ricezione dei messaggi privati. Invio fallito."
+
+#: ../../mod/mail.php:132
+msgid "Messages"
+msgstr "Messaggi"
+
+#: ../../mod/mail.php:167
+msgid "Message recalled."
+msgstr "Messaggio revocato."
+
+#: ../../mod/mail.php:180
 msgid "Conversation removed."
 msgstr "Conversazione rimossa."
 
-#: ../../mod/channel.php:97
-msgid "Insufficient permissions.  Request redirected to profile page."
-msgstr "Permessi insufficienti. Sarà visualizzata la pagina del profilo."
+#: ../../mod/mail.php:223
+msgid "Requested channel is not in this network"
+msgstr "Il canale cercato non è in questa rete"
 
-#: ../../mod/editpost.php:20 ../../mod/editblock.php:78
-#: ../../mod/editblock.php:94 ../../mod/editlayout.php:76
-#: ../../mod/editwebpage.php:77
-msgid "Item not found"
-msgstr "Elemento non trovato"
+#: ../../mod/mail.php:231
+msgid "Send Private Message"
+msgstr "Invia un messaggio privato"
 
-#: ../../mod/editpost.php:31
-msgid "Item is not editable"
-msgstr "L'elemento non è modificabile"
+#: ../../mod/mail.php:232 ../../mod/mail.php:361
+msgid "To:"
+msgstr "A:"
 
-#: ../../mod/editpost.php:55
-msgid "Delete item?"
-msgstr "Eliminare questo elemento?"
+#: ../../mod/mail.php:235 ../../mod/mail.php:363
+msgid "Subject:"
+msgstr "Oggetto:"
 
-#: ../../mod/editpost.php:122 ../../mod/editblock.php:145
-#: ../../mod/editlayout.php:143 ../../mod/editwebpage.php:185
-msgid "Insert YouTube video"
-msgstr "Inserisci video da YouTube"
+#: ../../mod/mail.php:238 ../../mod/invite.php:131
+msgid "Your message:"
+msgstr "Il tuo messaggio:"
 
-#: ../../mod/editpost.php:123 ../../mod/editblock.php:146
-#: ../../mod/editlayout.php:144 ../../mod/editwebpage.php:186
-msgid "Insert Vorbis [.ogg] video"
-msgstr "Inserisci video Vorbis [.ogg]"
+#: ../../mod/mail.php:242
+msgid "Send"
+msgstr "Invia"
 
-#: ../../mod/editpost.php:124 ../../mod/editblock.php:147
-#: ../../mod/editlayout.php:145 ../../mod/editwebpage.php:187
-msgid "Insert Vorbis [.ogg] audio"
-msgstr "Inserisci audio Vorbis [.ogg]"
+#: ../../mod/mail.php:333
+msgid "Delete message"
+msgstr "Elimina il messaggio"
 
-#: ../../mod/editpost.php:165 ../../mod/rpost.php:128
-msgid "Edit post"
-msgstr "Modifica post"
+#: ../../mod/mail.php:334
+msgid "Delivery report"
+msgstr "Rapporto di trasmissione"
+
+#: ../../mod/mail.php:335
+msgid "Recall message"
+msgstr "Revoca il messaggio"
+
+#: ../../mod/mail.php:337
+msgid "Message has been recalled."
+msgstr "Il messaggio è stato revocato."
+
+#: ../../mod/mail.php:354
+msgid "Delete Conversation"
+msgstr "Elimina la conversazione"
+
+#: ../../mod/mail.php:356
+msgid ""
+"No secure communications available. You <strong>may</strong> be able to "
+"respond from the sender's profile page."
+msgstr "Non è disponibile alcun modo sicuro di comunicare con questo canale. <strong>Se possibile</strong>, prova a rispondere direttamente dalla pagina del profilo del mittente."
+
+#: ../../mod/mail.php:360
+msgid "Send Reply"
+msgstr "Invia la risposta"
+
+#: ../../mod/mail.php:365
+#, php-format
+msgid "Your message for %s (%s):"
+msgstr "Il tuo messaggio per %s (%s):"
 
-#: ../../mod/dreport.php:15
+#: ../../mod/dreport.php:23
 msgid "Invalid message"
 msgstr "Messaggio non valido"
 
-#: ../../mod/dreport.php:25
+#: ../../mod/dreport.php:55
 msgid "no results"
 msgstr "nessun risultato"
 
-#: ../../mod/dreport.php:30
+#: ../../mod/dreport.php:60
 #, php-format
 msgid "Delivery report for %1$s"
 msgstr "Rapporto di consegna - %1$s"
 
-#: ../../mod/dreport.php:39
+#: ../../mod/dreport.php:74
 msgid "channel sync processed"
 msgstr "sincronizzazione del canale effettuata"
 
-#: ../../mod/dreport.php:43
+#: ../../mod/dreport.php:78
 msgid "queued"
 msgstr "in coda"
 
-#: ../../mod/dreport.php:47
+#: ../../mod/dreport.php:82
 msgid "posted"
 msgstr "inviato"
 
-#: ../../mod/dreport.php:51
+#: ../../mod/dreport.php:86
 msgid "accepted for delivery"
 msgstr "accettato per la spedizione"
 
-#: ../../mod/dreport.php:55
+#: ../../mod/dreport.php:90
 msgid "updated"
 msgstr "aggiornato"
 
-#: ../../mod/dreport.php:58
+#: ../../mod/dreport.php:93
 msgid "update ignored"
 msgstr "aggiornamento ignorato"
 
-#: ../../mod/dreport.php:61
+#: ../../mod/dreport.php:96
 msgid "permission denied"
 msgstr "permessi non sufficienti"
 
+#: ../../mod/dreport.php:100
+msgid "recipient not found"
+msgstr "Destinatario non trovato"
+
+#: ../../mod/dreport.php:103
+msgid "mail recalled"
+msgstr "messaggio richiamato dal mittente"
+
+#: ../../mod/dreport.php:106
+msgid "duplicate mail received"
+msgstr "ricevuto messaggio duplicato"
+
+#: ../../mod/dreport.php:109
+msgid "mail delivered"
+msgstr "messaggio recapitato"
+
+#: ../../mod/editblock.php:78 ../../mod/editblock.php:94
+#: ../../mod/editpost.php:20 ../../mod/editlayout.php:76
+#: ../../mod/editwebpage.php:77
+msgid "Item not found"
+msgstr "Elemento non trovato"
+
 #: ../../mod/editblock.php:118
 msgid "Delete block?"
 msgstr "Vuoi eliminare questo riquadro?"
 
-#: ../../mod/editblock.php:180
-msgid "Edit Block"
-msgstr "Modifica il riquadro"
-
-#: ../../mod/home.php:57 ../../mod/home.php:63 ../../mod/siteinfo.php:157
-msgid "$Projectname"
-msgstr "$Projectname"
-
-#: ../../mod/home.php:73
-#, php-format
-msgid "Welcome to %s"
-msgstr "%s ti dà il benvenuto"
+#: ../../mod/editblock.php:145 ../../mod/editpost.php:122
+#: ../../mod/editlayout.php:143 ../../mod/editwebpage.php:185
+msgid "Insert YouTube video"
+msgstr "Inserisci video da YouTube"
 
-#: ../../mod/item.php:174
-msgid "Unable to locate original post."
-msgstr "Impossibile trovare il messaggio originale."
+#: ../../mod/editblock.php:146 ../../mod/editpost.php:123
+#: ../../mod/editlayout.php:144 ../../mod/editwebpage.php:186
+msgid "Insert Vorbis [.ogg] video"
+msgstr "Inserisci video Vorbis [.ogg]"
 
-#: ../../mod/item.php:407
-msgid "Empty post discarded."
-msgstr "Il post vuoto è stato ignorato."
+#: ../../mod/editblock.php:147 ../../mod/editpost.php:124
+#: ../../mod/editlayout.php:145 ../../mod/editwebpage.php:187
+msgid "Insert Vorbis [.ogg] audio"
+msgstr "Inserisci audio Vorbis [.ogg]"
 
-#: ../../mod/item.php:447
-msgid "Executable content type not permitted to this channel."
-msgstr "I contenuti eseguibili non sono permessi su questo canale."
+#: ../../mod/editblock.php:180
+msgid "Edit Block"
+msgstr "Modifica il riquadro"
 
-#: ../../mod/item.php:896
-msgid "System error. Post not saved."
-msgstr "Errore di sistema. Post non salvato."
+#: ../../mod/dirsearch.php:29
+msgid "This directory server requires an access token"
+msgstr "Questo server di elenchi pubblici necessita di un token di autenticazione"
 
-#: ../../mod/item.php:1163
-msgid "Unable to obtain post information from database."
-msgstr "Impossibile caricare il post dal database."
+#: ../../mod/editpost.php:31
+msgid "Item is not editable"
+msgstr "L'elemento non è modificabile"
 
-#: ../../mod/item.php:1170
-#, php-format
-msgid "You have reached your limit of %1$.0f top level posts."
-msgstr "Hai raggiunto il limite massimo di %1$.0f post sulla pagina principale."
+#: ../../mod/editpost.php:55
+msgid "Delete item?"
+msgstr "Eliminare questo elemento?"
 
-#: ../../mod/item.php:1177
-#, php-format
-msgid "You have reached your limit of %1$.0f webpages."
-msgstr "Hai raggiunto il limite massimo di %1$.0f pagine web."
+#: ../../mod/editpost.php:165 ../../mod/rpost.php:128
+msgid "Edit post"
+msgstr "Modifica post"
 
 #: ../../mod/oexchange.php:23
 msgid "Unable to find your hub."
@@ -5608,7 +5814,7 @@ msgstr "Forza la publicazione del profilo"
 #: ../../mod/admin.php:439
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
-msgstr "Seleziona per mostrare nell'elenco pubblico <strong>tutti</strong> i profili registrati su questo sito."
+msgstr "Seleziona per mostrare negli elenchi pubblici <strong>tutti</strong> i profili registrati su questo sito."
 
 #: ../../mod/admin.php:440
 msgid "Disable discovery tab"
@@ -6333,7 +6539,7 @@ msgid ""
 "Password reset failed."
 msgstr "La richiesta non può essere verificata (potresti averla già usata precedentemente). La password non sarà reimpostata."
 
-#: ../../mod/lostpass.php:86 ../../boot.php:1505
+#: ../../mod/lostpass.php:86 ../../boot.php:1511
 msgid "Password Reset"
 msgstr "Reimposta la password"
 
@@ -6382,186 +6588,19 @@ msgstr "Indirizzo email"
 msgid "Reset"
 msgstr "Reimposta"
 
-#: ../../mod/photos.php:79
-msgid "Page owner information could not be retrieved."
-msgstr "Impossibile ottenere informazioni sul proprietario della pagina."
-
-#: ../../mod/photos.php:100
-msgid "Album not found."
-msgstr "Album non trovato."
-
-#: ../../mod/photos.php:127
-msgid "Delete Album"
-msgstr "Elimina album"
-
-#: ../../mod/photos.php:170 ../../mod/photos.php:970
-msgid "Delete Photo"
-msgstr "Elimina foto"
-
-#: ../../mod/photos.php:464
-msgid "No photos selected"
-msgstr "Nessuna foto selezionata"
-
-#: ../../mod/photos.php:513
-msgid "Access to this item is restricted."
-msgstr "Questo elemento non è visibile a tutti."
-
-#: ../../mod/photos.php:552
-#, php-format
-msgid "%1$.2f MB of %2$.2f MB photo storage used."
-msgstr "Hai usato %1$.2f Mb dei %2$.2f Mb di spazio disponibile."
+#: ../../mod/home.php:57 ../../mod/home.php:65 ../../mod/siteinfo.php:157
+msgid "$Projectname"
+msgstr "$Projectname"
 
-#: ../../mod/photos.php:555
+#: ../../mod/home.php:75
 #, php-format
-msgid "%1$.2f MB photo storage used."
-msgstr "Hai usato %1$.2f Mb del tuo spazio disponibile."
-
-#: ../../mod/photos.php:583
-msgid "Upload Photos"
-msgstr "Carica foto"
-
-#: ../../mod/photos.php:587
-msgid "Enter an album name"
-msgstr "Scegli il nome dell'album"
-
-#: ../../mod/photos.php:588
-msgid "or select an existing album (doubleclick)"
-msgstr "o seleziona un album esistente (doppio click)"
-
-#: ../../mod/photos.php:589
-msgid "Create a status post for this upload"
-msgstr "Pubblica sulla bacheca"
-
-#: ../../mod/photos.php:616
-msgid "Album name could not be decoded"
-msgstr "Non è stato possibile leggere il nome dell'album"
-
-#: ../../mod/photos.php:660 ../../mod/photos.php:1197
-#: ../../mod/photos.php:1214
-msgid "Contact Photos"
-msgstr "Foto dei contatti"
-
-#: ../../mod/photos.php:688
-msgid "Show Newest First"
-msgstr "Prima i più recenti"
-
-#: ../../mod/photos.php:690
-msgid "Show Oldest First"
-msgstr "Prima i più vecchi"
-
-#: ../../mod/photos.php:714 ../../mod/photos.php:1247
-msgid "View Photo"
-msgstr "Guarda la foto"
-
-#: ../../mod/photos.php:743
-msgid "Edit Album"
-msgstr "Modifica album"
-
-#: ../../mod/photos.php:788
-msgid "Permission denied. Access to this item may be restricted."
-msgstr "Permesso negato. L'accesso a questo elemento può essere stato limitato."
-
-#: ../../mod/photos.php:790
-msgid "Photo not available"
-msgstr "Foto non disponibile"
-
-#: ../../mod/photos.php:848
-msgid "Use as profile photo"
-msgstr "Usa come foto del profilo"
-
-#: ../../mod/photos.php:855
-msgid "Private Photo"
-msgstr "Foto privata"
-
-#: ../../mod/photos.php:866 ../../mod/events.php:528
-msgid "Previous"
-msgstr "Precendente"
-
-#: ../../mod/photos.php:870
-msgid "View Full Size"
-msgstr "Vedi nelle dimensioni originali"
-
-#: ../../mod/photos.php:875 ../../mod/events.php:529 ../../mod/setup.php:285
-msgid "Next"
-msgstr "Successivo"
-
-#: ../../mod/photos.php:915 ../../mod/tagrm.php:133
-msgid "Remove"
-msgstr "Rimuovi"
-
-#: ../../mod/photos.php:949
-msgid "Edit photo"
-msgstr "Modifica la foto"
-
-#: ../../mod/photos.php:951
-msgid "Rotate CW (right)"
-msgstr "Ruota (senso orario)"
-
-#: ../../mod/photos.php:952
-msgid "Rotate CCW (left)"
-msgstr "Ruota (senso antiorario)"
-
-#: ../../mod/photos.php:955
-msgid "Enter a new album name"
-msgstr "Inserisci il nome del nuovo album"
-
-#: ../../mod/photos.php:956
-msgid "or select an existing one (doubleclick)"
-msgstr "o seleziona uno esistente (doppio click)"
-
-#: ../../mod/photos.php:959
-msgid "Caption"
-msgstr "Didascalia"
-
-#: ../../mod/photos.php:961
-msgid "Add a Tag"
-msgstr "Aggiungi tag"
-
-#: ../../mod/photos.php:965
-msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
-msgstr "Esempio: @bob, @Barbara_Jensen, @jim@example.com"
-
-#: ../../mod/photos.php:968
-msgid "Flag as adult in album view"
-msgstr "Marca come 'per adulti'"
-
-#: ../../mod/photos.php:1160
-msgid "In This Photo:"
-msgstr "In questa foto:"
-
-#: ../../mod/photos.php:1165
-msgid "Map"
-msgstr "Mappa"
-
-#: ../../mod/photos.php:1253
-msgid "View Album"
-msgstr "Guarda l'album"
-
-#: ../../mod/photos.php:1276
-msgid "Recent Photos"
-msgstr "Foto recenti"
+msgid "Welcome to %s"
+msgstr "%s ti dà il benvenuto"
 
 #: ../../mod/dav.php:121
 msgid "$Projectname channel"
 msgstr "Canale $Projectname"
 
-#: ../../mod/rate.php:157
-msgid "Website:"
-msgstr "Sito web:"
-
-#: ../../mod/rate.php:160
-#, php-format
-msgid "Remote Channel [%s] (not yet known on this site)"
-msgstr "Canale remoto [%s] (non ancora conosciuto da questo sito)"
-
-#: ../../mod/rate.php:161
-msgid "Rating (this information is public)"
-msgstr "Valutazione (visibile a tutti)"
-
-#: ../../mod/rate.php:162
-msgid "Optionally explain your rating (this information is public)"
-msgstr "Commento alla valutazione (facoltativo, visibile a tutti)"
-
 #: ../../mod/events.php:21
 msgid "Calendar entries imported."
 msgstr "Le voci del calendario sono state importate."
@@ -6654,7 +6693,7 @@ msgstr "Adatta al fuso orario di chi legge"
 msgid ""
 "Important for events that happen in a particular place. Not practical for "
 "global holidays."
-msgstr "Importante per eventi che avvengono online ma con l'orario di un luogo particolare."
+msgstr "Importante per eventi che avvengono online ma con un certo fuso orario."
 
 #: ../../mod/events.php:703
 msgid "Title:"
@@ -6820,83 +6859,35 @@ msgstr "Sito web:"
 msgid "Description: "
 msgstr "Descrizione:"
 
-#: ../../mod/regdir.php:45 ../../mod/dirsearch.php:21
-msgid "This site is not a directory server"
-msgstr "Questo non è un server di elenchi di canali"
-
-#: ../../mod/mail.php:33
-msgid "Unable to lookup recipient."
-msgstr "Impossibile associare un destinatario."
-
-#: ../../mod/mail.php:41
-msgid "Unable to communicate with requested channel."
-msgstr "Impossibile comunicare con il canale richiesto."
-
-#: ../../mod/mail.php:48
-msgid "Cannot verify requested channel."
-msgstr "Impossibile verificare il canale richiesto."
-
-#: ../../mod/mail.php:74
-msgid "Selected channel has private message restrictions. Send failed."
-msgstr "Il canale ha delle regole restrittive per la ricezione dei messaggi privati. Invio fallito."
-
-#: ../../mod/mail.php:128
-msgid "Messages"
-msgstr "Messaggi"
-
-#: ../../mod/mail.php:138
-msgid "Message deleted."
-msgstr "Messaggio eliminato."
-
-#: ../../mod/mail.php:154
-msgid "Message recalled."
-msgstr "Messaggio revocato."
-
-#: ../../mod/mail.php:221
-msgid "Send Private Message"
-msgstr "Invia un messaggio privato"
-
-#: ../../mod/mail.php:222 ../../mod/mail.php:352
-msgid "To:"
-msgstr "A:"
-
-#: ../../mod/mail.php:227 ../../mod/mail.php:341 ../../mod/mail.php:354
-msgid "Subject:"
-msgstr "Oggetto:"
-
-#: ../../mod/mail.php:231 ../../mod/mail.php:357 ../../mod/invite.php:131
-msgid "Your message:"
-msgstr "Il tuo messaggio:"
-
-#: ../../mod/mail.php:238
-msgid "Send"
-msgstr "Invia"
+#: ../../mod/item.php:173
+msgid "Unable to locate original post."
+msgstr "Impossibile trovare il messaggio originale."
 
-#: ../../mod/mail.php:322
-msgid "Delete message"
-msgstr "Elimina il messaggio"
+#: ../../mod/item.php:417
+msgid "Empty post discarded."
+msgstr "Il post vuoto è stato ignorato."
 
-#: ../../mod/mail.php:323
-msgid "Recall message"
-msgstr "Revoca il messaggio"
+#: ../../mod/item.php:457
+msgid "Executable content type not permitted to this channel."
+msgstr "I contenuti eseguibili non sono permessi su questo canale."
 
-#: ../../mod/mail.php:325
-msgid "Message has been recalled."
-msgstr "Il messaggio è stato revocato."
+#: ../../mod/item.php:906
+msgid "System error. Post not saved."
+msgstr "Errore di sistema. Post non salvato."
 
-#: ../../mod/mail.php:345
-msgid "Delete Conversation"
-msgstr "Elimina la conversazione"
+#: ../../mod/item.php:1173
+msgid "Unable to obtain post information from database."
+msgstr "Impossibile caricare il post dal database."
 
-#: ../../mod/mail.php:347
-msgid ""
-"No secure communications available. You <strong>may</strong> be able to "
-"respond from the sender's profile page."
-msgstr "Non è disponibile alcun modo sicuro di comunicare con questo canale. <strong>Se possibile</strong>, prova a rispondere direttamente dalla pagina del profilo del mittente."
+#: ../../mod/item.php:1180
+#, php-format
+msgid "You have reached your limit of %1$.0f top level posts."
+msgstr "Hai raggiunto il limite massimo di %1$.0f post sulla pagina principale."
 
-#: ../../mod/mail.php:351
-msgid "Send Reply"
-msgstr "Invia la risposta"
+#: ../../mod/item.php:1187
+#, php-format
+msgid "You have reached your limit of %1$.0f webpages."
+msgstr "Hai raggiunto il limite massimo di %1$.0f pagine web."
 
 #: ../../mod/webpages.php:191
 msgid "Page Title"
@@ -7025,6 +7016,55 @@ msgstr "Non esistono restrizioni su questa classe di account."
 msgid "Item not available."
 msgstr "Elemento non disponibile."
 
+#: ../../mod/pubsites.php:16
+msgid "Public Sites"
+msgstr "Siti pubblici"
+
+#: ../../mod/pubsites.php:19
+msgid ""
+"The listed sites allow public registration for the $Projectname network. All"
+" sites in the network are interlinked so membership on any of them conveys "
+"membership in the network as a whole. Some sites may require subscription or"
+" provide tiered service plans. The provider links <strong>may</strong> "
+"provide additional details."
+msgstr "I siti elencati permettono la registrazione libera sulla rete $Projectname. Tutti questi hub sono interconnessi, quindi essere iscritti su uno equivale a una registrazione su tutta la rete. Alcuni siti potrebbero richiedere un abbonamento o dei servizi a pagamento. Per maggiori dettagli visita gli indirizzi nell'elenco."
+
+#: ../../mod/pubsites.php:25
+msgid "Rate this hub"
+msgstr "Valuta questo hub"
+
+#: ../../mod/pubsites.php:26
+msgid "Site URL"
+msgstr "URL del sito"
+
+#: ../../mod/pubsites.php:26
+msgid "Access Type"
+msgstr "Tipo di accesso"
+
+#: ../../mod/pubsites.php:26
+msgid "Registration Policy"
+msgstr "Politica di registrazione"
+
+#: ../../mod/pubsites.php:26 ../../mod/profiles.php:454
+msgid "Location"
+msgstr "Posizione geografica"
+
+#: ../../mod/pubsites.php:26
+msgid "Project"
+msgstr "Progetto"
+
+#: ../../mod/pubsites.php:26
+msgid "View hub ratings"
+msgstr "Vedi le valutazioni del hub"
+
+#: ../../mod/pubsites.php:30
+msgid "Rate"
+msgstr "Valuta"
+
+#: ../../mod/pubsites.php:31
+msgid "View ratings"
+msgstr "Vedi le valutazioni"
+
 #: ../../mod/sources.php:32
 msgid "Failed to create source. No channel selected."
 msgstr "Impossibile creare la sorgente. Nessun canale selezionato."
@@ -7129,9 +7169,9 @@ msgstr "Inserisci l'indirizzo del tuo canale (ad esempio lucia@esempio.com)"
 msgid "Authenticate"
 msgstr "Accedi"
 
-#: ../../mod/dirsearch.php:29
-msgid "This directory server requires an access token"
-msgstr "Questo server di elenchi pubblici necessita di un token di autenticazione"
+#: ../../mod/channel.php:97
+msgid "Insufficient permissions.  Request redirected to profile page."
+msgstr "Permessi insufficienti. Sarà visualizzata la pagina del profilo."
 
 #: ../../mod/siteinfo.php:111
 #, php-format
@@ -7170,9 +7210,9 @@ msgstr "In esecuzione sull'indirizzo web"
 
 #: ../../mod/siteinfo.php:168
 msgid ""
-"Please visit <a href=\"https://redmatrix.me\">redmatrix.me</a> to learn more"
-" about $Projectname."
-msgstr "Visita <a href=\"https://redmatrix.me\">RedMatrix.me</a> per scoprire di più su $Projectname."
+"Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more "
+"about $Projectname."
+msgstr "Visita <a href=\"http://hubzilla.org\">hubzilla.org</a> per maggiori informazioni su $Projectname."
 
 #: ../../mod/siteinfo.php:169
 msgid "Bug reports and issues: please visit"
@@ -7218,42 +7258,42 @@ msgstr "Attenzione: le versioni di database differiscono di %1$d aggiornamenti."
 msgid "No channel. Import failed."
 msgstr "Nessun canale. Import fallito."
 
-#: ../../mod/import.php:493
+#: ../../mod/import.php:499
 msgid "You must be logged in to use this feature."
 msgstr "Per questa funzionalità devi aver effettuato l'accesso."
 
-#: ../../mod/import.php:498
+#: ../../mod/import.php:504
 msgid "Import Channel"
 msgstr "Importa un canale"
 
-#: ../../mod/import.php:499
+#: ../../mod/import.php:505
 msgid ""
 "Use this form to import an existing channel from a different server/hub. You"
 " may retrieve the channel identity from the old server/hub via the network "
 "or provide an export file."
 msgstr "Usa questo modulo per importare un tuo canale da un altro hub. Puoi ottenere i dati identificativi del canale direttamente dall'altro hub oppure tramite un file esportato in precedenza."
 
-#: ../../mod/import.php:500 ../../mod/import_items.php:121
+#: ../../mod/import.php:506 ../../mod/import_items.php:121
 msgid "File to Upload"
 msgstr "File da caricare"
 
-#: ../../mod/import.php:501
+#: ../../mod/import.php:507
 msgid "Or provide the old server/hub details"
 msgstr "Oppure fornisci i dettagli del vecchio hub"
 
-#: ../../mod/import.php:502
+#: ../../mod/import.php:508
 msgid "Your old identity address (xyz@example.com)"
 msgstr "Il tuo vecchio identificativo (per esempio pippo@esempio.com)"
 
-#: ../../mod/import.php:503
+#: ../../mod/import.php:509
 msgid "Your old login email address"
 msgstr "L'email che usavi per accedere sul vecchio hub"
 
-#: ../../mod/import.php:504
+#: ../../mod/import.php:510
 msgid "Your old login password"
 msgstr "La password per il vecchio hub"
 
-#: ../../mod/import.php:505
+#: ../../mod/import.php:511
 msgid ""
 "For either option, please choose whether to make this hub your new primary "
 "address, or whether your old location should continue this role. You will be"
@@ -7261,17 +7301,17 @@ msgid ""
 "primary location for files, photos, and media."
 msgstr "Scegli se vuoi spostare il tuo indirizzo primario su questo hub, oppure se preferisci che quello vecchio resti tale. Potrai pubblicare da entrambi i hub, ma solamente uno sarà indicato come la posizione su cui risiedono i tuoi file, foto, ecc."
 
-#: ../../mod/import.php:506
+#: ../../mod/import.php:512
 msgid "Make this hub my primary location"
 msgstr "Rendi questo hub il mio indirizzo primario"
 
-#: ../../mod/import.php:507
+#: ../../mod/import.php:513
 msgid ""
 "Import existing posts if possible (experimental - limited by available "
 "memory"
 msgstr "Importa i contenuti pubblicati, se possibile (sperimentale)"
 
-#: ../../mod/import.php:508
+#: ../../mod/import.php:514
 msgid ""
 "This process may take several minutes to complete. Please submit the form "
 "only once and leave this page open until finished."
@@ -7316,7 +7356,7 @@ msgstr "Pubblica un'attività"
 
 #: ../../mod/thing.php:302 ../../mod/thing.php:351
 msgid "Only sends to viewers of the applicable profile"
-msgstr "Invia solo a chi può vedere il profilo"
+msgstr "Invia solo a chi può vedere il profilo scelto"
 
 #: ../../mod/thing.php:304 ../../mod/thing.php:353
 msgid "Name of thing e.g. something"
@@ -7680,7 +7720,7 @@ msgstr "Chiunque su internet"
 
 #: ../../mod/settings.php:963
 msgid "Publish your default profile in the network directory"
-msgstr "Mostra il mio profilo predefinito nell'elenco pubblico dei canali"
+msgstr "Mostra il mio profilo predefinito negli elenchi pubblici dei canali"
 
 #: ../../mod/settings.php:968
 msgid "Allow us to suggest you as a potential friend to new members?"
@@ -8337,8 +8377,8 @@ msgid "Database Server Name"
 msgstr "Server del database"
 
 #: ../../mod/setup.php:315
-msgid "Default is localhost"
-msgstr "'localhost' è il predefinito"
+msgid "Default is 127.0.0.1"
+msgstr "Il valore predefinito è 127.0.0.1"
 
 #: ../../mod/setup.php:316
 msgid "Database Port"
@@ -8883,7 +8923,7 @@ msgstr "Per esempio: pesca fotografia programmazione"
 
 #: ../../mod/profiles.php:700
 msgid "Used in directory listings"
-msgstr "Visibile nell'elenco pubblico di canali"
+msgstr "Visibile sugli elenchi pubblici di canali"
 
 #: ../../mod/profiles.php:701
 msgid "Tell us about yourself..."
@@ -9130,51 +9170,51 @@ msgstr "Dimensione foto dell'autore della conversazione"
 msgid "Set size of followup author photos"
 msgstr "Dimensione foto dei partecipanti alla conversazione"
 
-#: ../../boot.php:1302
+#: ../../boot.php:1308
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "%s: aggiornamento fallito. Controlla i log di errore."
 
-#: ../../boot.php:1305
+#: ../../boot.php:1311
 #, php-format
 msgid "Update Error at %s"
 msgstr "Errore di aggiornamento su %s"
 
-#: ../../boot.php:1472
+#: ../../boot.php:1478
 msgid ""
 "Create an account to access services and applications within the Hubzilla"
 msgstr "Registrati per accedere ai servizi e alle applicazioni di Hubzilla"
 
-#: ../../boot.php:1500
+#: ../../boot.php:1506
 msgid "Password"
 msgstr "Password"
 
-#: ../../boot.php:1501
+#: ../../boot.php:1507
 msgid "Remember me"
 msgstr "Resta connesso"
 
-#: ../../boot.php:1504
+#: ../../boot.php:1510
 msgid "Forgot your password?"
 msgstr "Hai dimenticato la password?"
 
-#: ../../boot.php:2130
+#: ../../boot.php:2136
 msgid "toggle mobile"
 msgstr "attiva/disattiva versione mobile"
 
-#: ../../boot.php:2265
+#: ../../boot.php:2271
 msgid "Website SSL certificate is not valid. Please correct."
 msgstr "Il certificato SSL del sito non è valido. Si prega di intervenire."
 
-#: ../../boot.php:2268
+#: ../../boot.php:2274
 #, php-format
 msgid "[hubzilla] Website SSL error for %s"
 msgstr "[hubzilla] Errore SSL su %s"
 
-#: ../../boot.php:2305
+#: ../../boot.php:2311
 msgid "Cron/Scheduled tasks not running."
 msgstr "Processi cron non avviati."
 
-#: ../../boot.php:2309
+#: ../../boot.php:2315
 #, php-format
 msgid "[hubzilla] Cron tasks not running on %s"
 msgstr "[hubzilla] Cron non è stato eseguito %s"
diff --git a/view/it/hstrings.php b/view/it/hstrings.php
index 72fc2fa60..4ecbab3f1 100644
--- a/view/it/hstrings.php
+++ b/view/it/hstrings.php
@@ -5,6 +5,12 @@ function string_plural_select_it($n){
 	return ($n != 1);;
 }}
 ;
+$a->strings["Attachments:"] = "Allegati:";
+$a->strings["l F d, Y \\@ g:i A"] = "l d F Y \\@ G:i";
+$a->strings["\$Projectname event notification:"] = "Notifica evento \$Projectname:";
+$a->strings["Starts:"] = "Inizio:";
+$a->strings["Finishes:"] = "Fine:";
+$a->strings["Location:"] = "Luogo:";
 $a->strings["No username found in import file."] = "Impossibile trovare il nome utente nel file da importare.";
 $a->strings["Unable to create a unique channel address. Import failed."] = "Impossibile creare un indirizzo univoco per il canale. L'import è fallito.";
 $a->strings["Import completed."] = "L'importazione è terminata con successo.";
@@ -16,8 +22,6 @@ $a->strings["Calendar"] = "Calendario";
 $a->strings["Schedule Inbox"] = "Appuntamenti ricevuti";
 $a->strings["Schedule Outbox"] = "Appuntamenti inviati";
 $a->strings["Unknown"] = "Sconosciuto";
-$a->strings["%1\$s used"] = "%1\$s occupati";
-$a->strings["%1\$s used of %2\$s (%3\$s&#37;)"] = "%1\$s occupati di %2\$s (%3\$s&#37;)";
 $a->strings["Files"] = "Archivio file";
 $a->strings["Total"] = "Totale";
 $a->strings["Shared"] = "Condiviso";
@@ -29,6 +33,9 @@ $a->strings["Size"] = "Dimensione";
 $a->strings["Last Modified"] = "Ultima modifica";
 $a->strings["Edit"] = "Modifica";
 $a->strings["Delete"] = "Elimina";
+$a->strings["You are using %1\$s of your available file storage."] = "Stai usando %1\$s dello spazio disponibile per i tuoi file.";
+$a->strings["You are using %1\$s of %2\$s available file storage. (%3\$s&#37;)"] = "Stai usando %1\$s di %2\$s che hai a disposizione per i file. (%3\$s&#37;)";
+$a->strings["WARNING:"] = "ATTENZIONE:";
 $a->strings["Create new folder"] = "Nuova cartella";
 $a->strings["Upload file"] = "Carica un file";
 $a->strings["Can view my normal stream and posts"] = "Può vedere i miei contenuti e i post normali";
@@ -115,7 +122,7 @@ $a->strings["Post Composition Features"] = "Modalità di scrittura post";
 $a->strings["Use Markdown"] = "Usa il markdown";
 $a->strings["Allow use of \"Markdown\" to format posts"] = "Consenti l'uso del markdown per formattare i post";
 $a->strings["Large Photos"] = "Foto grandi";
-$a->strings["Include large (640px) photo thumbnails in posts. If not enabled, use small (320px) photo thumbnails"] = "Includi anteprime grandi delle foto nei post (640px). Se disabilitato le anteprime saranno piccole (320px)";
+$a->strings["Include large (1024px) photo thumbnails in posts. If not enabled, use small (640px) photo thumbnails"] = "Includi anteprime grandi per le foto dei tuoi post (1024px). Altrimenti saranno mostrate anteprime più piccole (640px)";
 $a->strings["Channel Sources"] = "Sorgenti del canale";
 $a->strings["Automatically import channel content from other channels or feeds"] = "Importa automaticamente il contenuto del canale da altri canali o feed";
 $a->strings["Even More Encryption"] = "Cifratura addizionale";
@@ -259,308 +266,50 @@ $a->strings["New window"] = "Nuova finestra";
 $a->strings["Open the selected location in a different window or browser tab"] = "Apri l'indirizzo selezionato in una nuova scheda o finestra";
 $a->strings["User '%s' deleted"] = "Utente '%s' eliminato";
 $a->strings["Cannot locate DNS info for database server '%s'"] = "Non trovo le informazioni DNS per il database server '%s'";
-$a->strings["photo"] = "la foto";
-$a->strings["event"] = "l'evento";
-$a->strings["channel"] = "il canale";
-$a->strings["status"] = "il messaggio di stato";
-$a->strings["comment"] = "il commento";
-$a->strings["%1\$s likes %2\$s's %3\$s"] = "A %1\$s piace %3\$s di %2\$s";
-$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "A %1\$s non piace %3\$s di %2\$s";
-$a->strings["%1\$s is now connected with %2\$s"] = "%1\$s adesso è connesso con %2\$s";
-$a->strings["%1\$s poked %2\$s"] = "%1\$s ha mandato un poke a %2\$s";
-$a->strings["poked"] = "ha ricevuto un poke";
-$a->strings["__ctx:mood__ %1\$s is %2\$s"] = "%1\$s è %2\$s";
-$a->strings["__ctx:title__ Likes"] = "Mi piace";
-$a->strings["__ctx:title__ Dislikes"] = "Non mi piace";
-$a->strings["__ctx:title__ Agree"] = "D'accordo";
-$a->strings["__ctx:title__ Disagree"] = "Non d'accordo";
-$a->strings["__ctx:title__ Abstain"] = "Astenuti";
-$a->strings["__ctx:title__ Attending"] = "Partecipano";
-$a->strings["__ctx:title__ Not attending"] = "Non partecipano";
-$a->strings["__ctx:title__ Might attend"] = "Forse partecipano";
-$a->strings["Select"] = "Scegli";
-$a->strings["Private Message"] = "Messaggio privato";
-$a->strings["Message signature validated"] = "Messaggio con firma verificata";
-$a->strings["Message signature incorrect"] = "Massaggio con firma non corretta";
-$a->strings["View %s's profile @ %s"] = "Vedi il profilo di %s @ %s";
-$a->strings["Categories:"] = "Categorie:";
-$a->strings["Filed under:"] = "Classificato come:";
-$a->strings["from %s"] = "da %s";
-$a->strings["last edited: %s"] = "ultima modifica: %s";
-$a->strings["Expires: %s"] = "Scadenza: %s";
-$a->strings["View in context"] = "Vedi nel contesto";
-$a->strings["Please wait"] = "Attendere";
-$a->strings["remove"] = "rimuovi";
-$a->strings["Loading..."] = "Caricamento in corso...";
-$a->strings["Delete Selected Items"] = "Elimina gli oggetti selezionati";
-$a->strings["View Source"] = "Vedi il sorgente";
-$a->strings["Follow Thread"] = "Segui la discussione";
-$a->strings["View Status"] = "Guarda il messaggio di stato";
-$a->strings["View Profile"] = "Profilo";
-$a->strings["View Photos"] = "Foto";
-$a->strings["Activity/Posts"] = "Attività e Post";
-$a->strings["Edit Connection"] = "Modifica il contatto";
-$a->strings["Send PM"] = "Messaggio privato";
-$a->strings["Poke"] = "Poke";
-$a->strings["%s likes this."] = "Piace a %s.";
-$a->strings["%s doesn't like this."] = "Non piace a %s.";
-$a->strings["<span  %1\$s>%2\$d people</span> like this."] = array(
-	0 => "",
-	1 => "Piace a <span %1\$s>%2\$d persone</span>.",
-);
-$a->strings["<span  %1\$s>%2\$d people</span> don't like this."] = array(
-	0 => "",
-	1 => "Non piace a <span %1\$s>%2\$d persone</span>.",
-);
-$a->strings["and"] = "e";
-$a->strings[", and %d other people"] = array(
-	0 => "",
-	1 => "e altre %d persone",
-);
-$a->strings["%s like this."] = "Piace a %s.";
-$a->strings["%s don't like this."] = "Non piace a %s.";
-$a->strings["Visible to <strong>everybody</strong>"] = "Visibile a <strong>tutti</strong>";
-$a->strings["Please enter a link URL:"] = "Inserisci l'indirizzo del link:";
-$a->strings["Please enter a video link/URL:"] = "Inserisci l'indirizzo del video:";
-$a->strings["Please enter an audio link/URL:"] = "Inserisci l'indirizzo dell'audio:";
-$a->strings["Tag term:"] = "Tag:";
-$a->strings["Save to Folder:"] = "Salva nella cartella:";
-$a->strings["Where are you right now?"] = "Dove sei ora?";
-$a->strings["Expires YYYY-MM-DD HH:MM"] = "Scade il YYYY-MM-DD HH:MM";
-$a->strings["Preview"] = "Anteprima";
-$a->strings["Share"] = "Condividi";
-$a->strings["Page link name"] = "Nome del link alla pagina";
-$a->strings["Post as"] = "Pubblica come ";
-$a->strings["Bold"] = "Grassetto";
-$a->strings["Italic"] = "Corsivo";
-$a->strings["Underline"] = "Sottolineato";
-$a->strings["Quote"] = "Citazione";
-$a->strings["Code"] = "Codice";
-$a->strings["Upload photo"] = "Carica foto";
-$a->strings["upload photo"] = "carica foto";
-$a->strings["Attach file"] = "Allega file";
-$a->strings["attach file"] = "allega file";
-$a->strings["Insert web link"] = "Inserisci un indirizzo web";
-$a->strings["web link"] = "link web";
-$a->strings["Insert video link"] = "Inserisci l'indirizzo del video";
-$a->strings["video link"] = "link video";
-$a->strings["Insert audio link"] = "Inserisci l'indirizzo dell'audio";
-$a->strings["audio link"] = "link audio";
-$a->strings["Set your location"] = "La tua località";
-$a->strings["set location"] = "la tua località";
-$a->strings["Toggle voting"] = "Abilita/disabilita il voto";
-$a->strings["Clear browser location"] = "Rimuovi la località data dal browser";
-$a->strings["clear location"] = "rimuovi la località";
-$a->strings["Title (optional)"] = "Titolo (opzionale)";
-$a->strings["Categories (optional, comma-separated list)"] = "Categorie (lista separata da virgole)";
-$a->strings["Permission settings"] = "Permessi dei tuoi contatti";
-$a->strings["permissions"] = "permessi";
-$a->strings["Public post"] = "Post pubblico";
-$a->strings["Example: bob@example.com, mary@example.com"] = "Per esempio: mario@esempio.com, simona@esempio.com";
-$a->strings["Set expiration date"] = "Data di scadenza";
-$a->strings["Encrypt text"] = "Cifratura del messaggio";
-$a->strings["OK"] = "OK";
-$a->strings["Cancel"] = "Annulla";
-$a->strings["Discover"] = "Scopri";
-$a->strings["Imported public streams"] = "Contenuti pubblici importati";
-$a->strings["Commented Order"] = "Ultimi commenti";
-$a->strings["Sort by Comment Date"] = "Per data del commento";
-$a->strings["Posted Order"] = "Ultimi post";
-$a->strings["Sort by Post Date"] = "Per data di creazione";
-$a->strings["Personal"] = "Personali";
-$a->strings["Posts that mention or involve you"] = "Post che ti riguardano";
-$a->strings["New"] = "Novità";
-$a->strings["Activity Stream - by date"] = "Elenco attività - per data";
-$a->strings["Starred"] = "Preferiti";
-$a->strings["Favourite Posts"] = "Post preferiti";
-$a->strings["Spam"] = "Spam";
-$a->strings["Posts flagged as SPAM"] = "Post marcati come spam";
-$a->strings["Channel"] = "Canale";
-$a->strings["Status Messages and Posts"] = "Post e messaggi di stato";
-$a->strings["About"] = "Informazioni";
-$a->strings["Profile Details"] = "Dettagli del profilo";
-$a->strings["Photos"] = "Foto";
-$a->strings["Photo Albums"] = "Album foto";
-$a->strings["Files and Storage"] = "Archivio file";
-$a->strings["Chatrooms"] = "Chat";
-$a->strings["Bookmarks"] = "Segnalibri";
-$a->strings["Saved Bookmarks"] = "Segnalibri salvati";
-$a->strings["Webpages"] = "Pagine web";
-$a->strings["Manage Webpages"] = "Gestisci le pagine web";
-$a->strings["View all"] = "Vedi tutto";
-$a->strings["__ctx:noun__ Like"] = array(
-	0 => "Mi piace",
-	1 => "Mi piace",
-);
-$a->strings["__ctx:noun__ Dislike"] = array(
-	0 => "Non mi piace",
-	1 => "Non mi piace",
-);
-$a->strings["__ctx:noun__ Attending"] = array(
-	0 => "Partecipa",
-	1 => "Partecipano",
-);
-$a->strings["__ctx:noun__ Not Attending"] = array(
-	0 => "Non partecipa",
-	1 => "Non partecipano",
-);
-$a->strings["__ctx:noun__ Undecided"] = array(
-	0 => "Indeciso",
-	1 => "Indecisi",
-);
-$a->strings["__ctx:noun__ Agree"] = array(
-	0 => "D'accordo",
-	1 => "D'accordo",
-);
-$a->strings["__ctx:noun__ Disagree"] = array(
-	0 => "Non d'accordo",
-	1 => "Non d'accordo",
-);
-$a->strings["__ctx:noun__ Abstain"] = array(
-	0 => "Astenuto",
-	1 => "Astenuti",
-);
+$a->strings["Permission denied"] = "Permesso negato";
+$a->strings["(Unknown)"] = "(Sconosciuto)";
+$a->strings["Visible to anybody on the internet."] = "Visibile a chiunque su internet.";
+$a->strings["Visible to you only."] = "Visibile solo a te.";
+$a->strings["Visible to anybody in this network."] = "Visibile a tutti su questa rete.";
+$a->strings["Visible to anybody authenticated."] = "Visibile a chiunque sia autenticato.";
+$a->strings["Visible to anybody on %s."] = "Visibile a tutti su %s.";
+$a->strings["Visible to all connections."] = "Visibile a tutti coloro che ti seguono.";
+$a->strings["Visible to approved connections."] = "Visibile ai contatti approvati.";
+$a->strings["Visible to specific connections."] = "Visibile ad alcuni contatti scelti.";
+$a->strings["Item not found."] = "Elemento non trovato.";
+$a->strings["Collection not found."] = "Insieme di canali non trovato.";
+$a->strings["Collection is empty."] = "L'insieme di canali è vuoto.";
+$a->strings["Collection: %s"] = "Insieme: %s";
+$a->strings["Connection: %s"] = "Contatto: %s";
+$a->strings["Connection not found."] = "Contatto non trovato.";
 $a->strings["Public Timeline"] = "Diario pubblico";
-$a->strings["Image exceeds website size limit of %lu bytes"] = "L'immagine supera il limite massimo di %lu bytes";
-$a->strings["Image file is empty."] = "Il file dell'immagine è vuoto.";
-$a->strings["Unable to process image"] = "Impossibile elaborare l'immagine";
-$a->strings["Photo storage failed."] = "Impossibile salvare la foto.";
-$a->strings["Upload New Photos"] = "Carica nuove foto";
+$a->strings["view full size"] = "guarda nelle dimensioni reali";
 $a->strings["\$Projectname Notification"] = "Notifica \$Projectname";
 $a->strings["\$projectname"] = "\$projectname";
 $a->strings["Thank You,"] = "Grazie,";
 $a->strings["%s Administrator"] = "L'amministratore di %s";
-$a->strings["%s <!item_type!>"] = "%s <!item_type!>";
-$a->strings["[Red:Notify] New mail received at %s"] = "[Hubzilla] Nuovo messaggio su %s";
-$a->strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s  ti ha mandato un messaggio privato su %3\$s.";
-$a->strings["%1\$s sent you %2\$s."] = "%1\$s ti ha mandato %2\$s.";
-$a->strings["a private message"] = "un messaggio privato";
-$a->strings["Please visit %s to view and/or reply to your private messages."] = "Visita %s per leggere i tuoi messaggi privati e rispondere.";
-$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s, %2\$s ha commentato [zrl=%3\$s]%4\$s[/zrl]";
-$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s, %2\$s ha commentato [zrl=%3\$s]%5\$s di %4\$s[/zrl]";
-$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s ha commentato [zrl=%3\$s]%4\$s che hai creato[/zrl]";
-$a->strings["[Red:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Hubzilla] Nuovo commento di %2\$s alla conversazione #%1\$d";
-$a->strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = "%1\$s, %2\$s ha commentato un elemento che stavi seguendo.";
-$a->strings["Please visit %s to view and/or reply to the conversation."] = "Visita %s per leggere o commentare la conversazione.";
-$a->strings["[Red:Notify] %s posted to your profile wall"] = "[Hubzilla] %s ha scritto sulla tua bacheca";
-$a->strings["%1\$s, %2\$s posted to your profile wall at %3\$s"] = "%1\$s, %2\$s ha scritto sulla bacheca del tuo profilo su %3\$s";
-$a->strings["%1\$s, %2\$s posted to [zrl=%3\$s]your wall[/zrl]"] = "%1\$s, %2\$s ha scritto sulla [zrl=%3\$s]tua bacheca[/zrl]";
-$a->strings["[Red:Notify] %s tagged you"] = "[Hubzilla] %s ti ha taggato";
-$a->strings["%1\$s, %2\$s tagged you at %3\$s"] = "%1\$s, %2\$s ti ha taggato su %3\$s";
-$a->strings["%1\$s, %2\$s [zrl=%3\$s]tagged you[/zrl]."] = "%1\$s, %2\$s [zrl=%3\$s]ti ha taggato[/zrl].";
-$a->strings["[Red:Notify] %1\$s poked you"] = "[Hubzilla] %1\$s ti ha mandato un poke";
-$a->strings["%1\$s, %2\$s poked you at %3\$s"] = "%1\$s, %2\$s ti ha mandato un poke su %3\$s";
-$a->strings["%1\$s, %2\$s [zrl=%2\$s]poked you[/zrl]."] = "%1\$s, %2\$s [zrl=%2\$s]ti ha mandato un poke[/zrl].";
-$a->strings["[Red:Notify] %s tagged your post"] = "[Hubzilla] %s ha taggato il tuo post";
-$a->strings["%1\$s, %2\$s tagged your post at %3\$s"] = "%1\$s, %2\$s ha taggato il tuo post su %3\$s";
-$a->strings["%1\$s, %2\$s tagged [zrl=%3\$s]your post[/zrl]"] = "%1\$s, %2\$s ha taggato [zrl=%3\$s]il tuo post[/zrl]";
-$a->strings["[Red:Notify] Introduction received"] = "[Hubzilla] Hai una richiesta di amicizia";
-$a->strings["%1\$s, you've received an new connection request from '%2\$s' at %3\$s"] = "%1\$s, hai ricevuto una richiesta di entrare in contatto da '%2\$s' su %3\$s";
-$a->strings["%1\$s, you've received [zrl=%2\$s]a new connection request[/zrl] from %3\$s."] = "%1\$s, hai ricevuto una [zrl=%2\$s]richiesta di entrare in contatto[/zrl] da %3\$s.";
-$a->strings["You may visit their profile at %s"] = "Puoi visitare il suo profilo su %s";
-$a->strings["Please visit %s to approve or reject the connection request."] = "Visita %s per approvare o rifiutare la richiesta di entrare in contatto.";
-$a->strings["[Red:Notify] Friend suggestion received"] = "[Hubzilla] Ti è stato suggerito un amico";
-$a->strings["%1\$s, you've received a friend suggestion from '%2\$s' at %3\$s"] = "%1\$s, ti è stato suggerito un amico da '%2\$s' su %3\$s";
-$a->strings["%1\$s, you've received [zrl=%2\$s]a friend suggestion[/zrl] for %3\$s from %4\$s."] = "%1\$s, %4\$s ti [zrl=%2\$s]ha suggerito %3\$s[/zrl] come amico.";
-$a->strings["Name:"] = "Nome:";
-$a->strings["Photo:"] = "Foto:";
-$a->strings["Please visit %s to approve or reject the suggestion."] = "Visita %s per approvare o rifiutare il suggerimento.";
-$a->strings["[Red:Notify]"] = "[Hubzilla]";
-$a->strings["view full size"] = "guarda nelle dimensioni reali";
 $a->strings["Administrator"] = "Amministratore";
 $a->strings["No Subject"] = "Nessun titolo";
 $a->strings["%1\$s's bookmarks"] = "I segnalibri di %1\$s";
-$a->strings["prev"] = "prec";
-$a->strings["first"] = "inizio";
-$a->strings["last"] = "fine";
-$a->strings["next"] = "succ";
-$a->strings["older"] = "più recenti";
-$a->strings["newer"] = "più nuovi";
-$a->strings["No connections"] = "Nessun contatto";
-$a->strings["%d Connection"] = array(
-	0 => "%d contatto",
-	1 => "%d contatti",
-);
-$a->strings["View Connections"] = "Elenco contatti";
-$a->strings["Search"] = "Cerca";
-$a->strings["Save"] = "Salva";
-$a->strings["poke"] = "poke";
-$a->strings["ping"] = "ping";
-$a->strings["pinged"] = "ha ricevuto un ping";
-$a->strings["prod"] = "spintone";
-$a->strings["prodded"] = "ha ricevuto uno spintone";
-$a->strings["slap"] = "schiaffo";
-$a->strings["slapped"] = "ha ricevuto uno schiaffo";
-$a->strings["finger"] = "finger";
-$a->strings["fingered"] = "ha ricevuto un finger";
-$a->strings["rebuff"] = "rifiuto";
-$a->strings["rebuffed"] = "ha ricevuto un rifiuto";
-$a->strings["happy"] = "felice";
-$a->strings["sad"] = "triste";
-$a->strings["mellow"] = "calmo";
-$a->strings["tired"] = "stanco";
-$a->strings["perky"] = "vivace";
-$a->strings["angry"] = "arrabbiato";
-$a->strings["stupified"] = "stordito";
-$a->strings["puzzled"] = "confuso";
-$a->strings["interested"] = "attento";
-$a->strings["bitter"] = "amaro";
-$a->strings["cheerful"] = "allegro";
-$a->strings["alive"] = "vivace";
-$a->strings["annoyed"] = "seccato";
-$a->strings["anxious"] = "ansioso";
-$a->strings["cranky"] = "irritabile";
-$a->strings["disturbed"] = "turbato";
-$a->strings["frustrated"] = "frustrato";
-$a->strings["depressed"] = "in depressione";
-$a->strings["motivated"] = "motivato";
-$a->strings["relaxed"] = "rilassato";
-$a->strings["surprised"] = "sorpreso";
-$a->strings["May"] = "maggio";
-$a->strings["unknown.???"] = "sconosciuto???";
-$a->strings["bytes"] = "byte";
-$a->strings["remove category"] = "rimuovi la categoria";
-$a->strings["remove from file"] = "rimuovi dal file";
-$a->strings["Click to open/close"] = "Clicca per aprire/chiudere";
-$a->strings["Link to Source"] = "Link al sito d'origine";
-$a->strings["default"] = "predefinito";
-$a->strings["Page layout"] = "Layout della pagina";
-$a->strings["You can create your own with the layouts tool"] = "Con la configurazione del layout puoi crearne uno tuo";
-$a->strings["Page content type"] = "Tipo di contenuto della pagina";
-$a->strings["Select an alternate language"] = "Seleziona una lingua diversa";
-$a->strings["activity"] = "l'attività";
-$a->strings["Design Tools"] = "Strumenti di design";
-$a->strings["Blocks"] = "Riquadri";
-$a->strings["Menus"] = "Menù";
-$a->strings["Layouts"] = "Layout";
-$a->strings["Pages"] = "Pagine";
 $a->strings["Visible to your default audience"] = "Visibile secondo le impostazioni predefinite";
 $a->strings["Show"] = "Mostra";
 $a->strings["Don't show"] = "Non mostrare";
 $a->strings["Permissions"] = "Permessi";
 $a->strings["Close"] = "Chiudi";
-$a->strings["Item was not found."] = "Elemento non trovato.";
-$a->strings["No source file."] = "Nessun file di origine.";
-$a->strings["Cannot locate file to replace"] = "Il file da sostituire non è stato trovato";
-$a->strings["Cannot locate file to revise/update"] = "Il file da aggiornare non è stato trovato";
-$a->strings["File exceeds size limit of %d"] = "Il file supera la dimensione massima di %d";
-$a->strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Hai raggiunto il limite complessivo di %1$.0f Mbytes per gli allegati.";
-$a->strings["File upload failed. Possible system limit or action terminated."] = "Caricamento file fallito, potrebbe essere stato interrotto o potrebbe aver superato lo spazio assegnato.";
-$a->strings["Stored file could not be verified. Upload failed."] = "Il file non può essere verificato. Caricamento fallito.";
-$a->strings["Path not available."] = "Percorso non disponibile.";
-$a->strings["Empty pathname"] = "Il percorso del file è vuoto";
-$a->strings["duplicate filename or path"] = "il file o il percorso del file è duplicato";
-$a->strings["Path not found."] = "Percorso del file non trovato.";
-$a->strings["mkdir failed."] = "mkdir fallito.";
-$a->strings["database storage failed."] = "scrittura su database fallita.";
-$a->strings["Empty path"] = "La posizione è vuota";
 $a->strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "Non posso creare un canale con un identificativo che già esiste su questo sistema. L'importazione è fallita.";
 $a->strings["Channel clone failed. Import failed."] = "Impossibile clonare il canale. L'importazione è fallita.";
 $a->strings["Cloned channel not found. Import failed."] = "Impossibile trovare il canale clonato. L'importazione è fallita.";
+$a->strings["Image exceeds website size limit of %lu bytes"] = "L'immagine supera il limite massimo di %lu bytes";
+$a->strings["Image file is empty."] = "Il file dell'immagine è vuoto.";
+$a->strings["Unable to process image"] = "Impossibile elaborare l'immagine";
+$a->strings["Photo storage failed."] = "Impossibile salvare la foto.";
+$a->strings["Photo Albums"] = "Album foto";
+$a->strings["Upload New Photos"] = "Carica nuove foto";
 $a->strings["created a new post"] = "Ha creato un nuovo post";
 $a->strings["commented on %s's post"] = "ha commentato il post di %s";
 $a->strings["New Page"] = "Nuova pagina web";
 $a->strings["View"] = "Guarda";
+$a->strings["Preview"] = "Anteprima";
 $a->strings["Actions"] = "Azioni";
 $a->strings["Page Link"] = "Link alla pagina";
 $a->strings["Title"] = "Titolo";
@@ -626,30 +375,32 @@ $a->strings["Don't care"] = "Chi se ne frega";
 $a->strings["Ask me"] = "Chiedimelo";
 $a->strings["Embedded content"] = "Contenuti incorporati";
 $a->strings["Embedding disabled"] = "Disabilita la creazione di contenuti incorporati";
-$a->strings["l F d, Y \\@ g:i A"] = "l d F Y \\@ G:i";
-$a->strings["Starts:"] = "Inizio:";
-$a->strings["Finishes:"] = "Fine:";
-$a->strings["Location:"] = "Luogo:";
 $a->strings["This event has been added to your calendar."] = "Questo evento è stato aggiunto al tuo calendario";
+$a->strings["event"] = "l'evento";
 $a->strings["Not specified"] = "Non specificato";
 $a->strings["Needs Action"] = "Necessita di un intervento";
 $a->strings["Completed"] = "Completato";
 $a->strings["In Process"] = "In corso";
 $a->strings["Cancelled"] = "Annullato";
 $a->strings["Site Admin"] = "Amministrazione sito";
+$a->strings["Bookmarks"] = "Segnalibri";
 $a->strings["Address Book"] = "Rubrica";
 $a->strings["Login"] = "Accedi";
 $a->strings["Channel Manager"] = "Gestione canali";
-$a->strings["Matrix"] = "Rete";
+$a->strings["Grid"] = "Rete";
 $a->strings["Settings"] = "Impostazioni";
+$a->strings["Webpages"] = "Pagine web";
 $a->strings["Channel Home"] = "Bacheca del canale";
 $a->strings["Profile"] = "Profilo";
+$a->strings["Photos"] = "Foto";
 $a->strings["Events"] = "Eventi";
-$a->strings["Directory"] = "Elenco pubblico";
+$a->strings["Directory"] = "Elenchi pubblici dei canali";
 $a->strings["Help"] = "Guida";
 $a->strings["Mail"] = "Messaggi";
 $a->strings["Mood"] = "Umore";
+$a->strings["Poke"] = "Poke";
 $a->strings["Chat"] = "Chat";
+$a->strings["Search"] = "Cerca";
 $a->strings["Probe"] = "Diagnostica";
 $a->strings["Suggest"] = "Suggerisci";
 $a->strings["Random Channel"] = "Canale casuale";
@@ -664,8 +415,170 @@ $a->strings["Purchase"] = "Acquista";
 $a->strings["Logged out."] = "Uscita effettuata.";
 $a->strings["Failed authentication"] = "Autenticazione fallita";
 $a->strings["Login failed."] = "Accesso fallito.";
-$a->strings["Attachments:"] = "Allegati:";
-$a->strings["\$Projectname event notification:"] = "Notifica evento \$Projectname:";
+$a->strings["%s <!item_type!>"] = "%s <!item_type!>";
+$a->strings["[Hubzilla:Notify] New mail received at %s"] = "[Hubzilla] Nuovo messaggio su %s";
+$a->strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s  ti ha mandato un messaggio privato su %3\$s.";
+$a->strings["%1\$s sent you %2\$s."] = "%1\$s ti ha mandato %2\$s.";
+$a->strings["a private message"] = "un messaggio privato";
+$a->strings["Please visit %s to view and/or reply to your private messages."] = "Visita %s per leggere i tuoi messaggi privati e rispondere.";
+$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s, %2\$s ha commentato [zrl=%3\$s]%4\$s[/zrl]";
+$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s, %2\$s ha commentato [zrl=%3\$s]%5\$s di %4\$s[/zrl]";
+$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s ha commentato [zrl=%3\$s]%4\$s che hai creato[/zrl]";
+$a->strings["[Hubzilla:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Hubzilla] Nuovo commento di %2\$s alla conversazione #%1\$d";
+$a->strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = "%1\$s, %2\$s ha commentato un elemento che stavi seguendo.";
+$a->strings["Please visit %s to view and/or reply to the conversation."] = "Visita %s per leggere o commentare la conversazione.";
+$a->strings["[Hubzilla:Notify] %s posted to your profile wall"] = "[Hubzilla] %s ha scritto sulla tua bacheca";
+$a->strings["%1\$s, %2\$s posted to your profile wall at %3\$s"] = "%1\$s, %2\$s ha scritto sulla bacheca del tuo profilo su %3\$s";
+$a->strings["%1\$s, %2\$s posted to [zrl=%3\$s]your wall[/zrl]"] = "%1\$s, %2\$s ha scritto sulla [zrl=%3\$s]tua bacheca[/zrl]";
+$a->strings["[Hubzilla:Notify] %s tagged you"] = "[Hubzilla] %s ti ha taggato";
+$a->strings["%1\$s, %2\$s tagged you at %3\$s"] = "%1\$s, %2\$s ti ha taggato su %3\$s";
+$a->strings["%1\$s, %2\$s [zrl=%3\$s]tagged you[/zrl]."] = "%1\$s, %2\$s [zrl=%3\$s]ti ha taggato[/zrl].";
+$a->strings["[Hubzilla:Notify] %1\$s poked you"] = "[Hubzilla] %1\$s ti ha mandato un poke";
+$a->strings["%1\$s, %2\$s poked you at %3\$s"] = "%1\$s, %2\$s ti ha mandato un poke su %3\$s";
+$a->strings["%1\$s, %2\$s [zrl=%2\$s]poked you[/zrl]."] = "%1\$s, %2\$s [zrl=%2\$s]ti ha mandato un poke[/zrl].";
+$a->strings["[Hubzilla:Notify] %s tagged your post"] = "[Hubzilla] %s ha taggato il tuo post";
+$a->strings["%1\$s, %2\$s tagged your post at %3\$s"] = "%1\$s, %2\$s ha taggato il tuo post su %3\$s";
+$a->strings["%1\$s, %2\$s tagged [zrl=%3\$s]your post[/zrl]"] = "%1\$s, %2\$s ha taggato [zrl=%3\$s]il tuo post[/zrl]";
+$a->strings["[Hubzilla:Notify] Introduction received"] = "[Hubzilla] Hai una richiesta di amicizia";
+$a->strings["%1\$s, you've received an new connection request from '%2\$s' at %3\$s"] = "%1\$s, hai ricevuto una richiesta di entrare in contatto da '%2\$s' su %3\$s";
+$a->strings["%1\$s, you've received [zrl=%2\$s]a new connection request[/zrl] from %3\$s."] = "%1\$s, hai ricevuto una [zrl=%2\$s]richiesta di entrare in contatto[/zrl] da %3\$s.";
+$a->strings["You may visit their profile at %s"] = "Puoi visitare il suo profilo su %s";
+$a->strings["Please visit %s to approve or reject the connection request."] = "Visita %s per approvare o rifiutare la richiesta di entrare in contatto.";
+$a->strings["[Hubzilla:Notify] Friend suggestion received"] = "[Hubzilla] Ti è stato suggerito un amico";
+$a->strings["%1\$s, you've received a friend suggestion from '%2\$s' at %3\$s"] = "%1\$s, ti è stato suggerito un amico da '%2\$s' su %3\$s";
+$a->strings["%1\$s, you've received [zrl=%2\$s]a friend suggestion[/zrl] for %3\$s from %4\$s."] = "%1\$s, %4\$s ti [zrl=%2\$s]ha suggerito %3\$s[/zrl] come amico.";
+$a->strings["Name:"] = "Nome:";
+$a->strings["Photo:"] = "Foto:";
+$a->strings["Please visit %s to approve or reject the suggestion."] = "Visita %s per approvare o rifiutare il suggerimento.";
+$a->strings["[Hubzilla:Notify]"] = "[Hubzilla]";
+$a->strings["Private Message"] = "Messaggio privato";
+$a->strings["Select"] = "Scegli";
+$a->strings["Save to Folder"] = "Salva nella cartella";
+$a->strings["I will attend"] = "Parteciperò";
+$a->strings["I will not attend"] = "Non parteciperò";
+$a->strings["I might attend"] = "Forse parteciperò";
+$a->strings["I agree"] = "Sono d'accordo";
+$a->strings["I disagree"] = "Non sono d'accordo";
+$a->strings["I abstain"] = "Mi astengo";
+$a->strings["View all"] = "Vedi tutto";
+$a->strings["__ctx:noun__ Like"] = array(
+	0 => "Mi piace",
+	1 => "Mi piace",
+);
+$a->strings["__ctx:noun__ Dislike"] = array(
+	0 => "Non mi piace",
+	1 => "Non mi piace",
+);
+$a->strings["Add Star"] = "Aggiungi ai preferiti";
+$a->strings["Remove Star"] = "Rimuovi dai preferiti";
+$a->strings["Toggle Star Status"] = "Attiva/disattiva preferito";
+$a->strings["starred"] = "preferito";
+$a->strings["Message signature validated"] = "Messaggio con firma verificata";
+$a->strings["Message signature incorrect"] = "Massaggio con firma non corretta";
+$a->strings["Add Tag"] = "Aggiungi un tag";
+$a->strings["I like this (toggle)"] = "Attiva/disattiva Mi piace";
+$a->strings["like"] = "mi piace";
+$a->strings["I don't like this (toggle)"] = "Attiva/disattiva Non mi piace";
+$a->strings["dislike"] = "non mi piace";
+$a->strings["Share This"] = "Condividi";
+$a->strings["share"] = "condividi";
+$a->strings["%d comment"] = array(
+	0 => "%d commento",
+	1 => "%d commenti",
+);
+$a->strings["View %s's profile - %s"] = "Guarda il profilo di %s - %s";
+$a->strings["to"] = "a";
+$a->strings["via"] = "via";
+$a->strings["Wall-to-Wall"] = "Da bacheca a bacheca";
+$a->strings["via Wall-To-Wall:"] = "da bacheca a bacheca:";
+$a->strings["Delivery Report"] = "Rapporto di trasmissione";
+$a->strings["from %s"] = "da %s";
+$a->strings["last edited: %s"] = "ultima modifica: %s";
+$a->strings["Expires: %s"] = "Scadenza: %s";
+$a->strings["Save Bookmarks"] = "Salva segnalibro";
+$a->strings["Add to Calendar"] = "Aggiungi al calendario";
+$a->strings["Mark all seen"] = "Marca tutto come letto";
+$a->strings["__ctx:noun__ Likes"] = "Mi piace";
+$a->strings["__ctx:noun__ Dislikes"] = "Non mi piace";
+$a->strings["Please wait"] = "Attendere";
+$a->strings["This is you"] = "Questo sei tu";
+$a->strings["Bold"] = "Grassetto";
+$a->strings["Italic"] = "Corsivo";
+$a->strings["Underline"] = "Sottolineato";
+$a->strings["Quote"] = "Citazione";
+$a->strings["Code"] = "Codice";
+$a->strings["Image"] = "Immagine";
+$a->strings["Insert Link"] = "Collegamento";
+$a->strings["Video"] = "Video";
+$a->strings["Encrypt text"] = "Cifratura del messaggio";
+$a->strings["prev"] = "prec";
+$a->strings["first"] = "inizio";
+$a->strings["last"] = "fine";
+$a->strings["next"] = "succ";
+$a->strings["older"] = "più recenti";
+$a->strings["newer"] = "più nuovi";
+$a->strings["No connections"] = "Nessun contatto";
+$a->strings["%d Connection"] = array(
+	0 => "%d contatto",
+	1 => "%d contatti",
+);
+$a->strings["View Connections"] = "Elenco contatti";
+$a->strings["Save"] = "Salva";
+$a->strings["poke"] = "poke";
+$a->strings["poked"] = "ha ricevuto un poke";
+$a->strings["ping"] = "ping";
+$a->strings["pinged"] = "ha ricevuto un ping";
+$a->strings["prod"] = "spintone";
+$a->strings["prodded"] = "ha ricevuto uno spintone";
+$a->strings["slap"] = "schiaffo";
+$a->strings["slapped"] = "ha ricevuto uno schiaffo";
+$a->strings["finger"] = "finger";
+$a->strings["fingered"] = "ha ricevuto un finger";
+$a->strings["rebuff"] = "rifiuto";
+$a->strings["rebuffed"] = "ha ricevuto un rifiuto";
+$a->strings["happy"] = "felice";
+$a->strings["sad"] = "triste";
+$a->strings["mellow"] = "calmo";
+$a->strings["tired"] = "stanco";
+$a->strings["perky"] = "vivace";
+$a->strings["angry"] = "arrabbiato";
+$a->strings["stupified"] = "stordito";
+$a->strings["puzzled"] = "confuso";
+$a->strings["interested"] = "attento";
+$a->strings["bitter"] = "amaro";
+$a->strings["cheerful"] = "allegro";
+$a->strings["alive"] = "vivace";
+$a->strings["annoyed"] = "seccato";
+$a->strings["anxious"] = "ansioso";
+$a->strings["cranky"] = "irritabile";
+$a->strings["disturbed"] = "turbato";
+$a->strings["frustrated"] = "frustrato";
+$a->strings["depressed"] = "in depressione";
+$a->strings["motivated"] = "motivato";
+$a->strings["relaxed"] = "rilassato";
+$a->strings["surprised"] = "sorpreso";
+$a->strings["May"] = "maggio";
+$a->strings["Unknown Attachment"] = "Allegato non riconoscuto";
+$a->strings["Attachment"] = "Allegato";
+$a->strings["Size Unknown"] = "Dimensioni non note";
+$a->strings["remove category"] = "rimuovi la categoria";
+$a->strings["remove from file"] = "rimuovi dal file";
+$a->strings["Click to open/close"] = "Clicca per aprire/chiudere";
+$a->strings["Link to Source"] = "Link al sito d'origine";
+$a->strings["default"] = "predefinito";
+$a->strings["Page layout"] = "Layout della pagina";
+$a->strings["You can create your own with the layouts tool"] = "Con la configurazione del layout puoi crearne uno tuo";
+$a->strings["Page content type"] = "Tipo di contenuto della pagina";
+$a->strings["Select an alternate language"] = "Seleziona una lingua diversa";
+$a->strings["photo"] = "la foto";
+$a->strings["status"] = "il messaggio di stato";
+$a->strings["comment"] = "il commento";
+$a->strings["activity"] = "l'attività";
+$a->strings["Design Tools"] = "Strumenti di design";
+$a->strings["Blocks"] = "Riquadri";
+$a->strings["Menus"] = "Menù";
+$a->strings["Layouts"] = "Layout";
+$a->strings["Pages"] = "Pagine";
 $a->strings["Image/photo"] = "Immagine";
 $a->strings["Encrypted content"] = "Contenuto cifrato";
 $a->strings["Install %s element: "] = "Installa l'elemento %s:";
@@ -735,22 +648,14 @@ $a->strings["Edit collection"] = "Modifica l'insieme di canali";
 $a->strings["Add new collection"] = "Nuovo insieme";
 $a->strings["Channels not in any collection"] = "Canali che non sono in un insieme";
 $a->strings["add"] = "aggiungi";
-$a->strings["Tags"] = "Tag";
-$a->strings["Keywords"] = "Parole chiave";
-$a->strings["have"] = "ho";
-$a->strings["has"] = "ha";
-$a->strings["want"] = "voglio";
-$a->strings["wants"] = "vuole";
-$a->strings["like"] = "mi piace";
-$a->strings["likes"] = "gli piace";
-$a->strings["dislike"] = "non mi piace";
-$a->strings["dislikes"] = "non gli piace";
-$a->strings["Directory Options"] = "Opzioni elenco pubblico";
-$a->strings["Safe Mode"] = "Modalità SafeSearch";
-$a->strings["No"] = "No";
-$a->strings["Yes"] = "Si";
-$a->strings["Public Forums Only"] = "Solo forum pubblici";
-$a->strings["This Website Only"] = "Solo in questo sito";
+$a->strings["Invalid data packet"] = "Dati ricevuti non validi";
+$a->strings["Unable to verify channel signature"] = "Impossibile verificare la firma elettronica del canale";
+$a->strings["Unable to verify site signature for %s"] = "Impossibile verificare la firma elettronica del sito %s";
+$a->strings["invalid target signature"] = "la firma ricevuta non è valida";
+$a->strings["No recipient provided."] = "Devi scegliere un destinatario.";
+$a->strings["[no subject]"] = "[nessun titolo]";
+$a->strings["Unable to determine sender."] = "Impossibile determinare il mittente.";
+$a->strings["Stored post could not be verified."] = "Non è stato possibile verificare il post.";
 $a->strings["Unable to obtain identity information from database"] = "Impossibile ottenere le informazioni di identificazione dal database";
 $a->strings["Empty name"] = "Nome vuoto";
 $a->strings["Name too long"] = "Nome troppo lungo";
@@ -808,61 +713,156 @@ $a->strings["Love/Romance:"] = "Amore:";
 $a->strings["Work/employment:"] = "Lavoro:";
 $a->strings["School/education:"] = "Scuola:";
 $a->strings["Like this thing"] = "Mi piace";
-$a->strings["No recipient provided."] = "Devi scegliere un destinatario.";
-$a->strings["[no subject]"] = "[nessun titolo]";
-$a->strings["Unable to determine sender."] = "Impossibile determinare il mittente.";
-$a->strings["Stored post could not be verified."] = "Non è stato possibile verificare il post.";
-$a->strings["Save to Folder"] = "Salva nella cartella";
-$a->strings["I will attend"] = "Parteciperò";
-$a->strings["I will not attend"] = "Non parteciperò";
-$a->strings["I might attend"] = "Forse parteciperò";
-$a->strings["I agree"] = "Sono d'accordo";
-$a->strings["I disagree"] = "Non sono d'accordo";
-$a->strings["I abstain"] = "Mi astengo";
-$a->strings["Add Star"] = "Aggiungi ai preferiti";
-$a->strings["Remove Star"] = "Rimuovi dai preferiti";
-$a->strings["Toggle Star Status"] = "Attiva/disattiva preferito";
-$a->strings["starred"] = "preferito";
-$a->strings["Add Tag"] = "Aggiungi un tag";
-$a->strings["I like this (toggle)"] = "Attiva/disattiva Mi piace";
-$a->strings["I don't like this (toggle)"] = "Attiva/disattiva Non mi piace";
-$a->strings["Share This"] = "Condividi";
-$a->strings["share"] = "condividi";
-$a->strings["%d comment"] = array(
-	0 => "%d commento",
-	1 => "%d commenti",
+$a->strings["Tags"] = "Tag";
+$a->strings["Keywords"] = "Parole chiave";
+$a->strings["have"] = "ho";
+$a->strings["has"] = "ha";
+$a->strings["want"] = "voglio";
+$a->strings["wants"] = "vuole";
+$a->strings["likes"] = "gli piace";
+$a->strings["dislikes"] = "non gli piace";
+$a->strings["Item was not found."] = "Elemento non trovato.";
+$a->strings["No source file."] = "Nessun file di origine.";
+$a->strings["Cannot locate file to replace"] = "Il file da sostituire non è stato trovato";
+$a->strings["Cannot locate file to revise/update"] = "Il file da aggiornare non è stato trovato";
+$a->strings["File exceeds size limit of %d"] = "Il file supera la dimensione massima di %d";
+$a->strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Hai raggiunto il limite complessivo di %1$.0f Mbytes per gli allegati.";
+$a->strings["File upload failed. Possible system limit or action terminated."] = "Caricamento file fallito, potrebbe essere stato interrotto o potrebbe aver superato lo spazio assegnato.";
+$a->strings["Stored file could not be verified. Upload failed."] = "Il file non può essere verificato. Caricamento fallito.";
+$a->strings["Path not available."] = "Percorso non disponibile.";
+$a->strings["Empty pathname"] = "Il percorso del file è vuoto";
+$a->strings["duplicate filename or path"] = "il file o il percorso del file è duplicato";
+$a->strings["Path not found."] = "Percorso del file non trovato.";
+$a->strings["mkdir failed."] = "mkdir fallito.";
+$a->strings["database storage failed."] = "scrittura su database fallita.";
+$a->strings["Empty path"] = "La posizione è vuota";
+$a->strings["channel"] = "il canale";
+$a->strings["%1\$s likes %2\$s's %3\$s"] = "A %1\$s piace %3\$s di %2\$s";
+$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "A %1\$s non piace %3\$s di %2\$s";
+$a->strings["%1\$s is now connected with %2\$s"] = "%1\$s adesso è connesso con %2\$s";
+$a->strings["%1\$s poked %2\$s"] = "%1\$s ha mandato un poke a %2\$s";
+$a->strings["__ctx:mood__ %1\$s is %2\$s"] = "%1\$s è %2\$s";
+$a->strings["__ctx:title__ Likes"] = "Mi piace";
+$a->strings["__ctx:title__ Dislikes"] = "Non mi piace";
+$a->strings["__ctx:title__ Agree"] = "D'accordo";
+$a->strings["__ctx:title__ Disagree"] = "Non d'accordo";
+$a->strings["__ctx:title__ Abstain"] = "Astenuti";
+$a->strings["__ctx:title__ Attending"] = "Partecipano";
+$a->strings["__ctx:title__ Not attending"] = "Non partecipano";
+$a->strings["__ctx:title__ Might attend"] = "Forse partecipano";
+$a->strings["View %s's profile @ %s"] = "Vedi il profilo di %s @ %s";
+$a->strings["Categories:"] = "Categorie:";
+$a->strings["Filed under:"] = "Classificato come:";
+$a->strings["View in context"] = "Vedi nel contesto";
+$a->strings["remove"] = "rimuovi";
+$a->strings["Loading..."] = "Caricamento in corso...";
+$a->strings["Delete Selected Items"] = "Elimina gli oggetti selezionati";
+$a->strings["View Source"] = "Vedi il sorgente";
+$a->strings["Follow Thread"] = "Segui la discussione";
+$a->strings["View Status"] = "Stato attuale";
+$a->strings["View Profile"] = "Profilo";
+$a->strings["View Photos"] = "Foto";
+$a->strings["Activity/Posts"] = "Attività e Post";
+$a->strings["Edit Connection"] = "Modifica il contatto";
+$a->strings["Send PM"] = "Messaggio privato";
+$a->strings["%s likes this."] = "Piace a %s.";
+$a->strings["%s doesn't like this."] = "Non piace a %s.";
+$a->strings["<span  %1\$s>%2\$d people</span> like this."] = array(
+	0 => "",
+	1 => "Piace a <span %1\$s>%2\$d persone</span>.",
+);
+$a->strings["<span  %1\$s>%2\$d people</span> don't like this."] = array(
+	0 => "",
+	1 => "Non piace a <span %1\$s>%2\$d persone</span>.",
+);
+$a->strings["and"] = "e";
+$a->strings[", and %d other people"] = array(
+	0 => "",
+	1 => "e altre %d persone",
+);
+$a->strings["%s like this."] = "Piace a %s.";
+$a->strings["%s don't like this."] = "Non piace a %s.";
+$a->strings["Visible to <strong>everybody</strong>"] = "Visibile a <strong>tutti</strong>";
+$a->strings["Please enter a link URL:"] = "Inserisci l'indirizzo del link:";
+$a->strings["Please enter a video link/URL:"] = "Inserisci l'indirizzo del video:";
+$a->strings["Please enter an audio link/URL:"] = "Inserisci l'indirizzo dell'audio:";
+$a->strings["Tag term:"] = "Tag:";
+$a->strings["Save to Folder:"] = "Salva nella cartella:";
+$a->strings["Where are you right now?"] = "Dove sei ora?";
+$a->strings["Expires YYYY-MM-DD HH:MM"] = "Scade il YYYY-MM-DD HH:MM";
+$a->strings["Share"] = "Condividi";
+$a->strings["Page link name"] = "Nome del link alla pagina";
+$a->strings["Post as"] = "Pubblica come ";
+$a->strings["Upload photo"] = "Carica foto";
+$a->strings["upload photo"] = "carica foto";
+$a->strings["Attach file"] = "Allega file";
+$a->strings["attach file"] = "allega file";
+$a->strings["Insert web link"] = "Inserisci un indirizzo web";
+$a->strings["web link"] = "link web";
+$a->strings["Insert video link"] = "Inserisci l'indirizzo del video";
+$a->strings["video link"] = "link video";
+$a->strings["Insert audio link"] = "Inserisci l'indirizzo dell'audio";
+$a->strings["audio link"] = "link audio";
+$a->strings["Set your location"] = "La tua località";
+$a->strings["set location"] = "la tua località";
+$a->strings["Toggle voting"] = "Abilita/disabilita il voto";
+$a->strings["Clear browser location"] = "Rimuovi la località data dal browser";
+$a->strings["clear location"] = "rimuovi la località";
+$a->strings["Title (optional)"] = "Titolo (opzionale)";
+$a->strings["Categories (optional, comma-separated list)"] = "Categorie (lista separata da virgole)";
+$a->strings["Permission settings"] = "Permessi dei tuoi contatti";
+$a->strings["permissions"] = "permessi";
+$a->strings["Public post"] = "Post pubblico";
+$a->strings["Example: bob@example.com, mary@example.com"] = "Per esempio: mario@esempio.com, simona@esempio.com";
+$a->strings["Set expiration date"] = "Data di scadenza";
+$a->strings["OK"] = "OK";
+$a->strings["Cancel"] = "Annulla";
+$a->strings["Discover"] = "Scopri";
+$a->strings["Imported public streams"] = "Contenuti pubblici importati";
+$a->strings["Commented Order"] = "Ultimi commenti";
+$a->strings["Sort by Comment Date"] = "Per data del commento";
+$a->strings["Posted Order"] = "Ultimi post";
+$a->strings["Sort by Post Date"] = "Per data di creazione";
+$a->strings["Personal"] = "Personali";
+$a->strings["Posts that mention or involve you"] = "Post che ti riguardano";
+$a->strings["New"] = "Novità";
+$a->strings["Activity Stream - by date"] = "Elenco attività - per data";
+$a->strings["Starred"] = "Preferiti";
+$a->strings["Favourite Posts"] = "Post preferiti";
+$a->strings["Spam"] = "Spam";
+$a->strings["Posts flagged as SPAM"] = "Post marcati come spam";
+$a->strings["Channel"] = "Canale";
+$a->strings["Status Messages and Posts"] = "Post e messaggi di stato";
+$a->strings["About"] = "Informazioni";
+$a->strings["Profile Details"] = "Dettagli del profilo";
+$a->strings["Files and Storage"] = "Archivio file";
+$a->strings["Chatrooms"] = "Chat";
+$a->strings["Saved Bookmarks"] = "Segnalibri salvati";
+$a->strings["Manage Webpages"] = "Gestisci le pagine web";
+$a->strings["__ctx:noun__ Attending"] = array(
+	0 => "Partecipa",
+	1 => "Partecipano",
+);
+$a->strings["__ctx:noun__ Not Attending"] = array(
+	0 => "Non partecipa",
+	1 => "Non partecipano",
+);
+$a->strings["__ctx:noun__ Undecided"] = array(
+	0 => "Indeciso",
+	1 => "Indecisi",
+);
+$a->strings["__ctx:noun__ Agree"] = array(
+	0 => "D'accordo",
+	1 => "D'accordo",
+);
+$a->strings["__ctx:noun__ Disagree"] = array(
+	0 => "Non d'accordo",
+	1 => "Non d'accordo",
+);
+$a->strings["__ctx:noun__ Abstain"] = array(
+	0 => "Astenuto",
+	1 => "Astenuti",
 );
-$a->strings["View %s's profile - %s"] = "Guarda il profilo di %s - %s";
-$a->strings["to"] = "a";
-$a->strings["via"] = "via";
-$a->strings["Wall-to-Wall"] = "Da bacheca a bacheca";
-$a->strings["via Wall-To-Wall:"] = "da bacheca a bacheca:";
-$a->strings["Delivery Report"] = "Rapporto di trasmissione";
-$a->strings["Save Bookmarks"] = "Salva segnalibro";
-$a->strings["Add to Calendar"] = "Aggiungi al calendario";
-$a->strings["Mark all seen"] = "Marca tutto come letto";
-$a->strings["__ctx:noun__ Likes"] = "Mi piace";
-$a->strings["__ctx:noun__ Dislikes"] = "Non mi piace";
-$a->strings["This is you"] = "Questo sei tu";
-$a->strings["Image"] = "Immagine";
-$a->strings["Insert Link"] = "Collegamento";
-$a->strings["Video"] = "Video";
-$a->strings["Permission denied"] = "Permesso negato";
-$a->strings["(Unknown)"] = "(Sconosciuto)";
-$a->strings["Visible to anybody on the internet."] = "Visibile a chiunque su internet.";
-$a->strings["Visible to you only."] = "Visibile solo a te.";
-$a->strings["Visible to anybody in this network."] = "Visibile a tutti su questa rete.";
-$a->strings["Visible to anybody authenticated."] = "Visibile a chiunque sia autenticato.";
-$a->strings["Visible to anybody on %s."] = "Visibile a tutti su %s.";
-$a->strings["Visible to all connections."] = "Visibile a tutti coloro che ti seguono.";
-$a->strings["Visible to approved connections."] = "Visibile ai contatti approvati.";
-$a->strings["Visible to specific connections."] = "Visibile ad alcuni contatti scelti.";
-$a->strings["Item not found."] = "Elemento non trovato.";
-$a->strings["Collection not found."] = "Insieme di canali non trovato.";
-$a->strings["Collection is empty."] = "L'insieme di canali è vuoto.";
-$a->strings["Collection: %s"] = "Insieme: %s";
-$a->strings["Connection: %s"] = "Contatto: %s";
-$a->strings["Connection not found."] = "Contatto non trovato.";
 $a->strings["Apps"] = "App";
 $a->strings["System"] = "Sistema";
 $a->strings["Create Personal App"] = "Crea app personale";
@@ -892,7 +892,6 @@ $a->strings["Export channel"] = "Esporta il canale";
 $a->strings["Connection Default Permissions"] = "Permessi predefiniti dei nuovi contatti";
 $a->strings["Premium Channel Settings"] = "Canale premium - impostazioni";
 $a->strings["Private Mail Menu"] = "Menu messaggi privati";
-$a->strings["Check Mail"] = "Controlla i messaggi";
 $a->strings["Combined View"] = "Vista combinata";
 $a->strings["Inbox"] = "In arrivo";
 $a->strings["Outbox"] = "Inviati";
@@ -929,10 +928,6 @@ $a->strings["Logs"] = "Log";
 $a->strings["Admin"] = "Amministrazione";
 $a->strings["Plugin Features"] = "Plugin";
 $a->strings["User registrations waiting for confirmation"] = "Registrazioni in attesa";
-$a->strings["Invalid data packet"] = "Dati ricevuti non validi";
-$a->strings["Unable to verify channel signature"] = "Impossibile verificare la firma elettronica del canale";
-$a->strings["Unable to verify site signature for %s"] = "Impossibile verificare la firma elettronica del sito %s";
-$a->strings["invalid target signature"] = "la firma ricevuta non è valida";
 $a->strings["Logout"] = "Esci";
 $a->strings["End this session"] = "Chiudi questa sessione";
 $a->strings["Home"] = "Bacheca";
@@ -956,8 +951,7 @@ $a->strings["Create an account"] = "Crea un account";
 $a->strings["Help and documentation"] = "Guida e documentazione";
 $a->strings["Applications, utilities, links, games"] = "Applicazioni, utilità, link, giochi";
 $a->strings["Search site @name, #tag, ?docs, content"] = "Cerca nel sito per @nome, #tag, ?guida o per contenuto";
-$a->strings["Channel Directory"] = "Elenco pubblico canali";
-$a->strings["Grid"] = "Rete";
+$a->strings["Channel Directory"] = "Elenchi pubblici dei canali";
 $a->strings["Your grid"] = "La tua rete";
 $a->strings["Mark all grid notifications seen"] = "Segna come lette le notifiche della tua rete";
 $a->strings["Channel home"] = "Bacheca del canale";
@@ -978,6 +972,12 @@ $a->strings["Account/Channel Settings"] = "Impostazioni dell'account e del canal
 $a->strings["Site Setup and Configuration"] = "Installazione e configurazione del sito";
 $a->strings["@name, #tag, ?doc, content"] = "@nome, #tag, ?guida, contenuto";
 $a->strings["Please wait..."] = "Attendere...";
+$a->strings["Directory Options"] = "Opzioni per elenchi pubblici";
+$a->strings["Safe Mode"] = "Modalità SafeSearch";
+$a->strings["No"] = "No";
+$a->strings["Yes"] = "Si";
+$a->strings["Public Forums Only"] = "Solo forum pubblici";
+$a->strings["This Website Only"] = "Solo in questo sito";
 $a->strings["Some blurb about what to do when you're new here"] = "Qualche suggerimento per i nuovi utenti su cosa fare";
 $a->strings["Contact not found."] = "Contatto non trovato.";
 $a->strings["Friend suggestion sent."] = "Suggerimento di amicizia inviato.";
@@ -996,8 +996,8 @@ $a->strings["Public Forum:"] = "Forum pubblico:";
 $a->strings["Keywords: "] = "Parole chiave:";
 $a->strings["Don't suggest"] = "Non fornire suggerimenti";
 $a->strings["Common connections:"] = "Contatti in comune:";
-$a->strings["Global Directory"] = "Elenco globale dei canali";
-$a->strings["Local Directory"] = "Elenco canali su questo server";
+$a->strings["Global Directory"] = "Elenchi pubblici globali";
+$a->strings["Local Directory"] = "Elenco canali su questo hub";
 $a->strings["Finding:"] = "Ricerca:";
 $a->strings["next page"] = "pagina successiva";
 $a->strings["previous page"] = "pagina precedente";
@@ -1075,7 +1075,7 @@ $a->strings["WARNING: "] = "ATTENZIONE:";
 $a->strings["This channel will be completely removed from the network. "] = "Questo canale sarà completamente eliminato dalla rete.";
 $a->strings["This action is permanent and can not be undone!"] = "Questo comando è definitivo e non può essere annullato!";
 $a->strings["Please enter your password for verification:"] = "Inserisci la tua password per verifica:";
-$a->strings["Remove this channel and all its clones from the network"] = "Rimuovi questo canale e tutti i suoi cloni dalla rete";
+$a->strings["Remove this channel and all its clones from the network"] = "Elimina questo canale e tutti i suoi cloni dalla rete";
 $a->strings["By default only the instance of the channel located on this hub will be removed from the network"] = "L'impostazione predefinita è che sia eliminata solo l'istanza del canale presente su questo hub, non gli eventuali cloni";
 $a->strings["Remove Channel"] = "Elimina questo canale";
 $a->strings["- select -"] = "- scegli -";
@@ -1163,7 +1163,7 @@ $a->strings["(%s) would like to connect with you. Please approve this connection
 $a->strings["Approve"] = "Approva";
 $a->strings["Approve Later"] = "Approva più tardi";
 $a->strings["inherited"] = "derivato";
-$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Seleziona il profilo che vuoi mostrare a %s quando visita il tuo profilo dopo aver effettuato l'accesso.";
+$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Seleziona il profilo che vuoi mostrare a %s dopo che ha effettuato l'accesso.";
 $a->strings["Their Settings"] = "Permessi concessi a te";
 $a->strings["My Settings"] = "Permessi che concedo";
 $a->strings["Individual Permissions"] = "Permessi individuali";
@@ -1175,16 +1175,45 @@ $a->strings["Hub not found."] = "Hub non trovato.";
 $a->strings["This setting requires special processing and editing has been blocked."] = "Questa impostazione è bloccata, richiede criteri di modifica speciali";
 $a->strings["Configuration Editor"] = "Editor di configurazione";
 $a->strings["Warning: Changing some settings could render your channel inoperable. Please leave this page unless you are comfortable with and knowledgeable about how to correctly use this feature."] = "Attenzione: alcune delle impostazioni, se cambiate, potrebbero rendere questo canale non funzionante. Lascia questa pagina a meno che tu non sappia con assoluta certezza quali modifiche effettuare.";
-$a->strings["Public Sites"] = "Siti pubblici";
-$a->strings["The listed sites allow public registration for the \$Projectname network. All sites in the network are interlinked so membership on any of them conveys membership in the network as a whole. Some sites may require subscription or provide tiered service plans. The provider links <strong>may</strong> provide additional details."] = "I siti elencati permettono la registrazione libera sulla rete \$Projectname. Tutti questi hub sono interconnessi, quindi essere iscritti su uno equivale a una registrazione su tutta la rete. Alcuni siti potrebbero richiedere un abbonamento o dei servizi a pagamento. Per maggiori dettagli visita gli indirizzi nell'elenco.";
-$a->strings["Rate this hub"] = "Valuta questo hub";
-$a->strings["Site URL"] = "URL del sito";
-$a->strings["Access Type"] = "Tipo di accesso";
-$a->strings["Registration Policy"] = "Politica di registrazione";
-$a->strings["Location"] = "Posizione geografica";
-$a->strings["View hub ratings"] = "Vedi le valutazioni del hub";
-$a->strings["Rate"] = "Valuta";
-$a->strings["View ratings"] = "Vedi le valutazioni";
+$a->strings["Page owner information could not be retrieved."] = "Impossibile ottenere informazioni sul proprietario della pagina.";
+$a->strings["Album not found."] = "Album non trovato.";
+$a->strings["Delete Album"] = "Elimina album";
+$a->strings["Delete Photo"] = "Elimina foto";
+$a->strings["No photos selected"] = "Nessuna foto selezionata";
+$a->strings["Access to this item is restricted."] = "Questo elemento non è visibile a tutti.";
+$a->strings["%1$.2f MB of %2$.2f MB photo storage used."] = "Hai usato %1$.2f Mb dei %2$.2f Mb di spazio disponibile.";
+$a->strings["%1$.2f MB photo storage used."] = "Hai usato %1$.2f Mb del tuo spazio disponibile.";
+$a->strings["Upload Photos"] = "Carica foto";
+$a->strings["Enter an album name"] = "Scegli il nome dell'album";
+$a->strings["or select an existing album (doubleclick)"] = "o seleziona un album esistente (doppio click)";
+$a->strings["Create a status post for this upload"] = "Pubblica sulla bacheca";
+$a->strings["Album name could not be decoded"] = "Non è stato possibile leggere il nome dell'album";
+$a->strings["Contact Photos"] = "Foto dei contatti";
+$a->strings["Show Newest First"] = "Prima i più recenti";
+$a->strings["Show Oldest First"] = "Prima i più vecchi";
+$a->strings["View Photo"] = "Guarda la foto";
+$a->strings["Edit Album"] = "Modifica album";
+$a->strings["Permission denied. Access to this item may be restricted."] = "Permesso negato. L'accesso a questo elemento può essere stato limitato.";
+$a->strings["Photo not available"] = "Foto non disponibile";
+$a->strings["Use as profile photo"] = "Usa come foto del profilo";
+$a->strings["Private Photo"] = "Foto privata";
+$a->strings["Previous"] = "Precendente";
+$a->strings["View Full Size"] = "Vedi nelle dimensioni originali";
+$a->strings["Next"] = "Successivo";
+$a->strings["Remove"] = "Rimuovi";
+$a->strings["Edit photo"] = "Modifica la foto";
+$a->strings["Rotate CW (right)"] = "Ruota (senso orario)";
+$a->strings["Rotate CCW (left)"] = "Ruota (senso antiorario)";
+$a->strings["Enter a new album name"] = "Inserisci il nome del nuovo album";
+$a->strings["or select an existing one (doubleclick)"] = "o seleziona uno esistente (doppio click)";
+$a->strings["Caption"] = "Didascalia";
+$a->strings["Add a Tag"] = "Aggiungi tag";
+$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com"] = "Esempio: @bob, @Barbara_Jensen, @jim@example.com";
+$a->strings["Flag as adult in album view"] = "Marca come 'per adulti'";
+$a->strings["In This Photo:"] = "In questa foto:";
+$a->strings["Map"] = "Mappa";
+$a->strings["View Album"] = "Guarda l'album";
+$a->strings["Recent Photos"] = "Foto recenti";
 $a->strings["Permission Denied."] = "Permesso negato.";
 $a->strings["File not found."] = "File non trovato.";
 $a->strings["Edit file permissions"] = "Modifica i permessi del file";
@@ -1196,6 +1225,7 @@ $a->strings["Copy/paste this URL to link file from a web page"] = "Copia/incolla
 $a->strings["Share this file"] = "Condividi questo file";
 $a->strings["Show URL to this file"] = "Mostra l'URL del file";
 $a->strings["Notify your contacts about this file"] = "Notifica ai contatti che hai caricato questo file";
+$a->strings["This site is not a directory server"] = "Questo non è un directory server";
 $a->strings["Layout Name"] = "Nome layout";
 $a->strings["Layout Description (Optional)"] = "Descrizione del layout (facoltativa)";
 $a->strings["Comanche page description language help"] = "Guida di Comanche Page Description Language";
@@ -1222,18 +1252,35 @@ $a->strings["I am online"] = "Sono online";
 $a->strings["Bookmark this room"] = "Aggiungi questa chat ai segnalibri";
 $a->strings["New Chatroom"] = "Nuova chat";
 $a->strings["Chatroom Name"] = "Nome della chat";
+$a->strings["Expiration of chats (minutes)"] = "Scadenza dei messaggi in chat (minuti)";
 $a->strings["%1\$s's Chatrooms"] = "Le chat di %1\$s";
 $a->strings["Items tagged with: %s"] = "Elementi taggati con: %s";
 $a->strings["Search results for: %s"] = "Risultati ricerca: %s";
+$a->strings["Website:"] = "Sito web:";
+$a->strings["Remote Channel [%s] (not yet known on this site)"] = "Canale remoto [%s] (non ancora conosciuto da questo sito)";
+$a->strings["Rating (this information is public)"] = "Valutazione (visibile a tutti)";
+$a->strings["Optionally explain your rating (this information is public)"] = "Commento alla valutazione (facoltativo, visibile a tutti)";
+$a->strings["Unable to lookup recipient."] = "Impossibile associare un destinatario.";
+$a->strings["Unable to communicate with requested channel."] = "Impossibile comunicare con il canale richiesto.";
+$a->strings["Cannot verify requested channel."] = "Impossibile verificare il canale richiesto.";
+$a->strings["Selected channel has private message restrictions. Send failed."] = "Il canale ha delle regole restrittive per la ricezione dei messaggi privati. Invio fallito.";
+$a->strings["Messages"] = "Messaggi";
+$a->strings["Message recalled."] = "Messaggio revocato.";
 $a->strings["Conversation removed."] = "Conversazione rimossa.";
-$a->strings["Insufficient permissions.  Request redirected to profile page."] = "Permessi insufficienti. Sarà visualizzata la pagina del profilo.";
-$a->strings["Item not found"] = "Elemento non trovato";
-$a->strings["Item is not editable"] = "L'elemento non è modificabile";
-$a->strings["Delete item?"] = "Eliminare questo elemento?";
-$a->strings["Insert YouTube video"] = "Inserisci video da YouTube";
-$a->strings["Insert Vorbis [.ogg] video"] = "Inserisci video Vorbis [.ogg]";
-$a->strings["Insert Vorbis [.ogg] audio"] = "Inserisci audio Vorbis [.ogg]";
-$a->strings["Edit post"] = "Modifica post";
+$a->strings["Requested channel is not in this network"] = "Il canale cercato non è in questa rete";
+$a->strings["Send Private Message"] = "Invia un messaggio privato";
+$a->strings["To:"] = "A:";
+$a->strings["Subject:"] = "Oggetto:";
+$a->strings["Your message:"] = "Il tuo messaggio:";
+$a->strings["Send"] = "Invia";
+$a->strings["Delete message"] = "Elimina il messaggio";
+$a->strings["Delivery report"] = "Rapporto di trasmissione";
+$a->strings["Recall message"] = "Revoca il messaggio";
+$a->strings["Message has been recalled."] = "Il messaggio è stato revocato.";
+$a->strings["Delete Conversation"] = "Elimina la conversazione";
+$a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Non è disponibile alcun modo sicuro di comunicare con questo canale. <strong>Se possibile</strong>, prova a rispondere direttamente dalla pagina del profilo del mittente.";
+$a->strings["Send Reply"] = "Invia la risposta";
+$a->strings["Your message for %s (%s):"] = "Il tuo messaggio per %s (%s):";
 $a->strings["Invalid message"] = "Messaggio non valido";
 $a->strings["no results"] = "nessun risultato";
 $a->strings["Delivery report for %1\$s"] = "Rapporto di consegna - %1\$s";
@@ -1244,17 +1291,20 @@ $a->strings["accepted for delivery"] = "accettato per la spedizione";
 $a->strings["updated"] = "aggiornato";
 $a->strings["update ignored"] = "aggiornamento ignorato";
 $a->strings["permission denied"] = "permessi non sufficienti";
+$a->strings["recipient not found"] = "Destinatario non trovato";
+$a->strings["mail recalled"] = "messaggio richiamato dal mittente";
+$a->strings["duplicate mail received"] = "ricevuto messaggio duplicato";
+$a->strings["mail delivered"] = "messaggio recapitato";
+$a->strings["Item not found"] = "Elemento non trovato";
 $a->strings["Delete block?"] = "Vuoi eliminare questo riquadro?";
+$a->strings["Insert YouTube video"] = "Inserisci video da YouTube";
+$a->strings["Insert Vorbis [.ogg] video"] = "Inserisci video Vorbis [.ogg]";
+$a->strings["Insert Vorbis [.ogg] audio"] = "Inserisci audio Vorbis [.ogg]";
 $a->strings["Edit Block"] = "Modifica il riquadro";
-$a->strings["\$Projectname"] = "\$Projectname";
-$a->strings["Welcome to %s"] = "%s ti dà il benvenuto";
-$a->strings["Unable to locate original post."] = "Impossibile trovare il messaggio originale.";
-$a->strings["Empty post discarded."] = "Il post vuoto è stato ignorato.";
-$a->strings["Executable content type not permitted to this channel."] = "I contenuti eseguibili non sono permessi su questo canale.";
-$a->strings["System error. Post not saved."] = "Errore di sistema. Post non salvato.";
-$a->strings["Unable to obtain post information from database."] = "Impossibile caricare il post dal database.";
-$a->strings["You have reached your limit of %1$.0f top level posts."] = "Hai raggiunto il limite massimo di %1$.0f post sulla pagina principale.";
-$a->strings["You have reached your limit of %1$.0f webpages."] = "Hai raggiunto il limite massimo di %1$.0f pagine web.";
+$a->strings["This directory server requires an access token"] = "Questo server di elenchi pubblici necessita di un token di autenticazione";
+$a->strings["Item is not editable"] = "L'elemento non è modificabile";
+$a->strings["Delete item?"] = "Eliminare questo elemento?";
+$a->strings["Edit post"] = "Modifica post";
 $a->strings["Unable to find your hub."] = "Impossibile raggiungere il tuo hub.";
 $a->strings["Post successful."] = "Inviato!";
 $a->strings["Theme settings updated."] = "Le impostazioni del tema sono state aggiornate.";
@@ -1319,7 +1369,7 @@ $a->strings["Check to block public access to all otherwise public personal pages
 $a->strings["Verify Email Addresses"] = "Verifica l'indirizzo email";
 $a->strings["Check to verify email addresses used in account registration (recommended)."] = "Attiva per richiedere la verifica degli indirizzi email dei nuovi utenti (consigliato).";
 $a->strings["Force publish"] = "Forza la publicazione del profilo";
-$a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Seleziona per mostrare nell'elenco pubblico <strong>tutti</strong> i profili registrati su questo sito.";
+$a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Seleziona per mostrare negli elenchi pubblici <strong>tutti</strong> i profili registrati su questo sito.";
 $a->strings["Disable discovery tab"] = "Disabilita la funzione 'scopri'";
 $a->strings["Remove the tab in the network view with public content pulled from sources chosen for this site."] = "Nell'area della rete personale non comparirà più la scheda con i contenuti acquisiti da altri siti.";
 $a->strings["login on Homepage"] = "Mostra il login sulla homepage";
@@ -1509,50 +1559,9 @@ $a->strings["Forgot your Password?"] = "Hai dimenticato la password?";
 $a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Inserisci il tuo indirizzo email per reimpostare la password. Dopo aver inviato la richiesta, controlla l'email e troverai le istruzioni per continuare.";
 $a->strings["Email Address"] = "Indirizzo email";
 $a->strings["Reset"] = "Reimposta";
-$a->strings["Page owner information could not be retrieved."] = "Impossibile ottenere informazioni sul proprietario della pagina.";
-$a->strings["Album not found."] = "Album non trovato.";
-$a->strings["Delete Album"] = "Elimina album";
-$a->strings["Delete Photo"] = "Elimina foto";
-$a->strings["No photos selected"] = "Nessuna foto selezionata";
-$a->strings["Access to this item is restricted."] = "Questo elemento non è visibile a tutti.";
-$a->strings["%1$.2f MB of %2$.2f MB photo storage used."] = "Hai usato %1$.2f Mb dei %2$.2f Mb di spazio disponibile.";
-$a->strings["%1$.2f MB photo storage used."] = "Hai usato %1$.2f Mb del tuo spazio disponibile.";
-$a->strings["Upload Photos"] = "Carica foto";
-$a->strings["Enter an album name"] = "Scegli il nome dell'album";
-$a->strings["or select an existing album (doubleclick)"] = "o seleziona un album esistente (doppio click)";
-$a->strings["Create a status post for this upload"] = "Pubblica sulla bacheca";
-$a->strings["Album name could not be decoded"] = "Non è stato possibile leggere il nome dell'album";
-$a->strings["Contact Photos"] = "Foto dei contatti";
-$a->strings["Show Newest First"] = "Prima i più recenti";
-$a->strings["Show Oldest First"] = "Prima i più vecchi";
-$a->strings["View Photo"] = "Guarda la foto";
-$a->strings["Edit Album"] = "Modifica album";
-$a->strings["Permission denied. Access to this item may be restricted."] = "Permesso negato. L'accesso a questo elemento può essere stato limitato.";
-$a->strings["Photo not available"] = "Foto non disponibile";
-$a->strings["Use as profile photo"] = "Usa come foto del profilo";
-$a->strings["Private Photo"] = "Foto privata";
-$a->strings["Previous"] = "Precendente";
-$a->strings["View Full Size"] = "Vedi nelle dimensioni originali";
-$a->strings["Next"] = "Successivo";
-$a->strings["Remove"] = "Rimuovi";
-$a->strings["Edit photo"] = "Modifica la foto";
-$a->strings["Rotate CW (right)"] = "Ruota (senso orario)";
-$a->strings["Rotate CCW (left)"] = "Ruota (senso antiorario)";
-$a->strings["Enter a new album name"] = "Inserisci il nome del nuovo album";
-$a->strings["or select an existing one (doubleclick)"] = "o seleziona uno esistente (doppio click)";
-$a->strings["Caption"] = "Didascalia";
-$a->strings["Add a Tag"] = "Aggiungi tag";
-$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com"] = "Esempio: @bob, @Barbara_Jensen, @jim@example.com";
-$a->strings["Flag as adult in album view"] = "Marca come 'per adulti'";
-$a->strings["In This Photo:"] = "In questa foto:";
-$a->strings["Map"] = "Mappa";
-$a->strings["View Album"] = "Guarda l'album";
-$a->strings["Recent Photos"] = "Foto recenti";
+$a->strings["\$Projectname"] = "\$Projectname";
+$a->strings["Welcome to %s"] = "%s ti dà il benvenuto";
 $a->strings["\$Projectname channel"] = "Canale \$Projectname";
-$a->strings["Website:"] = "Sito web:";
-$a->strings["Remote Channel [%s] (not yet known on this site)"] = "Canale remoto [%s] (non ancora conosciuto da questo sito)";
-$a->strings["Rating (this information is public)"] = "Valutazione (visibile a tutti)";
-$a->strings["Optionally explain your rating (this information is public)"] = "Commento alla valutazione (facoltativo, visibile a tutti)";
 $a->strings["Calendar entries imported."] = "Le voci del calendario sono state importate.";
 $a->strings["No calendar entries found."] = "Non sono state trovate voci del calendario.";
 $a->strings["Event can not end before it has started."] = "Un evento non può terminare prima del suo inizio.";
@@ -1575,7 +1584,7 @@ $a->strings["Event Starts:"] = "Inizio:";
 $a->strings["Finish date/time is not known or not relevant"] = "La data/ora di fine non è rilevante";
 $a->strings["Event Finishes:"] = "Fine:";
 $a->strings["Adjust for viewer timezone"] = "Adatta al fuso orario di chi legge";
-$a->strings["Important for events that happen in a particular place. Not practical for global holidays."] = "Importante per eventi che avvengono online ma con l'orario di un luogo particolare.";
+$a->strings["Important for events that happen in a particular place. Not practical for global holidays."] = "Importante per eventi che avvengono online ma con un certo fuso orario.";
 $a->strings["Title:"] = "Titolo:";
 $a->strings["Share this event"] = "Condividi questo evento";
 $a->strings["%s element installed"] = "%s elemento installato";
@@ -1615,25 +1624,13 @@ $a->strings["Ratings"] = "Valutazioni";
 $a->strings["Rating: "] = "Valutazione:";
 $a->strings["Website: "] = "Sito web:";
 $a->strings["Description: "] = "Descrizione:";
-$a->strings["This site is not a directory server"] = "Questo non è un server di elenchi di canali";
-$a->strings["Unable to lookup recipient."] = "Impossibile associare un destinatario.";
-$a->strings["Unable to communicate with requested channel."] = "Impossibile comunicare con il canale richiesto.";
-$a->strings["Cannot verify requested channel."] = "Impossibile verificare il canale richiesto.";
-$a->strings["Selected channel has private message restrictions. Send failed."] = "Il canale ha delle regole restrittive per la ricezione dei messaggi privati. Invio fallito.";
-$a->strings["Messages"] = "Messaggi";
-$a->strings["Message deleted."] = "Messaggio eliminato.";
-$a->strings["Message recalled."] = "Messaggio revocato.";
-$a->strings["Send Private Message"] = "Invia un messaggio privato";
-$a->strings["To:"] = "A:";
-$a->strings["Subject:"] = "Oggetto:";
-$a->strings["Your message:"] = "Il tuo messaggio:";
-$a->strings["Send"] = "Invia";
-$a->strings["Delete message"] = "Elimina il messaggio";
-$a->strings["Recall message"] = "Revoca il messaggio";
-$a->strings["Message has been recalled."] = "Il messaggio è stato revocato.";
-$a->strings["Delete Conversation"] = "Elimina la conversazione";
-$a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Non è disponibile alcun modo sicuro di comunicare con questo canale. <strong>Se possibile</strong>, prova a rispondere direttamente dalla pagina del profilo del mittente.";
-$a->strings["Send Reply"] = "Invia la risposta";
+$a->strings["Unable to locate original post."] = "Impossibile trovare il messaggio originale.";
+$a->strings["Empty post discarded."] = "Il post vuoto è stato ignorato.";
+$a->strings["Executable content type not permitted to this channel."] = "I contenuti eseguibili non sono permessi su questo canale.";
+$a->strings["System error. Post not saved."] = "Errore di sistema. Post non salvato.";
+$a->strings["Unable to obtain post information from database."] = "Impossibile caricare il post dal database.";
+$a->strings["You have reached your limit of %1$.0f top level posts."] = "Hai raggiunto il limite massimo di %1$.0f post sulla pagina principale.";
+$a->strings["You have reached your limit of %1$.0f webpages."] = "Hai raggiunto il limite massimo di %1$.0f pagine web.";
 $a->strings["Page Title"] = "Titolo della pagina";
 $a->strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = "È stato superato il numero massimo giornaliero di registrazioni a questo sito. Riprova domani!";
 $a->strings["Please indicate acceptance of the Terms of Service. Registration failed."] = "Impossibile proseguire. Devi prima accettare le Condizioni d'Uso del servizio.";
@@ -1662,6 +1659,17 @@ $a->strings["By default only the instances of the channels located on this hub w
 $a->strings["Remove Account"] = "Elimina l'account";
 $a->strings["No service class restrictions found."] = "Non esistono restrizioni su questa classe di account.";
 $a->strings["Item not available."] = "Elemento non disponibile.";
+$a->strings["Public Sites"] = "Siti pubblici";
+$a->strings["The listed sites allow public registration for the \$Projectname network. All sites in the network are interlinked so membership on any of them conveys membership in the network as a whole. Some sites may require subscription or provide tiered service plans. The provider links <strong>may</strong> provide additional details."] = "I siti elencati permettono la registrazione libera sulla rete \$Projectname. Tutti questi hub sono interconnessi, quindi essere iscritti su uno equivale a una registrazione su tutta la rete. Alcuni siti potrebbero richiedere un abbonamento o dei servizi a pagamento. Per maggiori dettagli visita gli indirizzi nell'elenco.";
+$a->strings["Rate this hub"] = "Valuta questo hub";
+$a->strings["Site URL"] = "URL del sito";
+$a->strings["Access Type"] = "Tipo di accesso";
+$a->strings["Registration Policy"] = "Politica di registrazione";
+$a->strings["Location"] = "Posizione geografica";
+$a->strings["Project"] = "Progetto";
+$a->strings["View hub ratings"] = "Vedi le valutazioni del hub";
+$a->strings["Rate"] = "Valuta";
+$a->strings["View ratings"] = "Vedi le valutazioni";
 $a->strings["Failed to create source. No channel selected."] = "Impossibile creare la sorgente. Nessun canale selezionato.";
 $a->strings["Source created."] = "Sorgente creata.";
 $a->strings["Source updated."] = "Sorgente aggiornata.";
@@ -1687,7 +1695,7 @@ $a->strings["Authentication failed."] = "Autenticazione fallita.";
 $a->strings["Remote Authentication"] = "Accedi tramite il tuo hub";
 $a->strings["Enter your channel address (e.g. channel@example.com)"] = "Inserisci l'indirizzo del tuo canale (ad esempio lucia@esempio.com)";
 $a->strings["Authenticate"] = "Accedi";
-$a->strings["This directory server requires an access token"] = "Questo server di elenchi pubblici necessita di un token di autenticazione";
+$a->strings["Insufficient permissions.  Request redirected to profile page."] = "Permessi insufficienti. Sarà visualizzata la pagina del profilo.";
 $a->strings["Version %s"] = "Versione %s";
 $a->strings["Installed plugins/addons/apps:"] = "App e componenti installati:";
 $a->strings["No installed plugins/addons/apps"] = "Nessuna app o componente installato";
@@ -1696,7 +1704,7 @@ $a->strings["Tag: "] = "Tag: ";
 $a->strings["Last background fetch: "] = "Ultima acquisizione:";
 $a->strings["Current load average: "] = "Carico medio attuale:";
 $a->strings["Running at web location"] = "In esecuzione sull'indirizzo web";
-$a->strings["Please visit <a href=\"https://redmatrix.me\">redmatrix.me</a> to learn more about \$Projectname."] = "Visita <a href=\"https://redmatrix.me\">RedMatrix.me</a> per scoprire di più su \$Projectname.";
+$a->strings["Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more about \$Projectname."] = "Visita <a href=\"http://hubzilla.org\">hubzilla.org</a> per maggiori informazioni su \$Projectname.";
 $a->strings["Bug reports and issues: please visit"] = "Per segnalare bug e problemi: visita";
 $a->strings["\$projectname issues"] = "Problematiche note su \$projectname";
 $a->strings["Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"] = "Per consigli, ringraziamenti, ecc. - scrivi a \"redmatrix\" at librelist - dot com";
@@ -1728,7 +1736,7 @@ $a->strings["item not found."] = "non trovato.";
 $a->strings["Edit Thing"] = "Modifica l'oggetto";
 $a->strings["Select a profile"] = "Scegli un profilo";
 $a->strings["Post an activity"] = "Pubblica un'attività";
-$a->strings["Only sends to viewers of the applicable profile"] = "Invia solo a chi può vedere il profilo";
+$a->strings["Only sends to viewers of the applicable profile"] = "Invia solo a chi può vedere il profilo scelto";
 $a->strings["Name of thing e.g. something"] = "Nome dell'oggetto";
 $a->strings["URL of thing (optional)"] = "Indirizzo web dell'oggetto (opzionale)";
 $a->strings["URL for photo of thing (optional)"] = "Indirizzo di un'immagine dell'oggetto (facoltativo)";
@@ -1819,7 +1827,7 @@ $a->strings["Anybody on this website"] = "Chiunque su questo hub";
 $a->strings["Anybody in this network"] = "Chiunque su questa rete";
 $a->strings["Anybody authenticated"] = "Chiunque abbia effettuato l'accesso";
 $a->strings["Anybody on the internet"] = "Chiunque su internet";
-$a->strings["Publish your default profile in the network directory"] = "Mostra il mio profilo predefinito nell'elenco pubblico dei canali";
+$a->strings["Publish your default profile in the network directory"] = "Mostra il mio profilo predefinito negli elenchi pubblici dei canali";
 $a->strings["Allow us to suggest you as a potential friend to new members?"] = "Vuoi essere suggerito come amico ai nuovi membri?";
 $a->strings["Your channel address is"] = "L'indirizzo del tuo canale è";
 $a->strings["Channel Settings"] = "Impostazioni del canale";
@@ -1974,7 +1982,7 @@ $a->strings["In order to install \$Projectname we need to know how to connect to
 $a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Contatta il tuo fornitore di hosting o l'amministratore del sito se hai domande su queste impostazioni.";
 $a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "Il database deve già esistere. Se non esiste, crealo prima di continuare.";
 $a->strings["Database Server Name"] = "Server del database";
-$a->strings["Default is localhost"] = "'localhost' è il predefinito";
+$a->strings["Default is 127.0.0.1"] = "Il valore predefinito è 127.0.0.1";
 $a->strings["Database Port"] = "Port del database";
 $a->strings["Communication port number - use 0 for default"] = "Scrivi 0 per usare il valore standard";
 $a->strings["Database Login Name"] = "Utente database";
@@ -2094,7 +2102,7 @@ $a->strings["Homepage URL:"] = "Indirizzo home page:";
 $a->strings["Religious Views:"] = "Orientamento religioso:";
 $a->strings["Keywords:"] = "Parole chiave, tag:";
 $a->strings["Example: fishing photography software"] = "Per esempio: pesca fotografia programmazione";
-$a->strings["Used in directory listings"] = "Visibile nell'elenco pubblico di canali";
+$a->strings["Used in directory listings"] = "Visibile sugli elenchi pubblici di canali";
 $a->strings["Tell us about yourself..."] = "Raccontaci di te...";
 $a->strings["Hobbies/Interests"] = "Hobby/interessi";
 $a->strings["Contact information and Social Networks"] = "Contatti personali e i tuoi social network";
diff --git a/view/it/messages.po b/view/it/messages.po
index b3f40c0ab..5efed0fd8 100644
--- a/view/it/messages.po
+++ b/view/it/messages.po
@@ -1,5 +1,5 @@
-# Hubzilla Project
-# Copyright (C) 2012-2014 the Hubzilla Project
+# Red Matrix Project
+# Copyright (C) 2012-2014 the Red Matrix Project
 # This file is distributed under the same license as the Red package.
 # 
 # Translators:
@@ -11,12 +11,12 @@
 # tuscanhobbit <pynolo@tarine.net>, 2013-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: Hubzilla\n"
+"Project-Id-Version: Redmatrix\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-24 00:03-0700\n"
-"PO-Revision-Date: 2015-05-04 14:29+0000\n"
+"POT-Creation-Date: 2015-10-17 16:47-0700\n"
+"PO-Revision-Date: 2015-10-24 10:03+0000\n"
 "Last-Translator: tuscanhobbit <pynolo@tarine.net>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/red-matrix/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/red-matrix/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,24 +30,108 @@ msgstr "Non trovo le informazioni DNS per il database server '%s'"
 
 #: ../../include/photo/photo_driver.php:687 ../../mod/profile_photo.php:143
 #: ../../mod/profile_photo.php:302 ../../mod/profile_photo.php:424
-#: ../../mod/photos.php:91 ../../mod/photos.php:625
+#: ../../mod/photos.php:92 ../../mod/photos.php:637
 msgid "Profile Photos"
 msgstr "Foto del profilo"
 
-#: ../../include/security.php:349
-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 "I controlli di sicurezza sono falliti. Probabilmente è accaduto perché la pagina è stata tenuta aperta troppo a lungo (ore?) prima di inviare il contenuto."
+#: ../../include/menu.php:107 ../../include/page_widgets.php:8
+#: ../../include/page_widgets.php:36 ../../include/RedDAV/RedBrowser.php:266
+#: ../../include/ItemObject.php:100 ../../include/apps.php:254
+#: ../../mod/webpages.php:181 ../../mod/thing.php:255
+#: ../../mod/connections.php:242 ../../mod/connections.php:255
+#: ../../mod/connections.php:274 ../../mod/blocks.php:153
+#: ../../mod/editpost.php:106 ../../mod/editlayout.php:133
+#: ../../mod/editwebpage.php:178 ../../mod/editblock.php:134
+#: ../../mod/menu.php:106 ../../mod/settings.php:650 ../../mod/layouts.php:183
+msgid "Edit"
+msgstr "Modifica"
+
+#: ../../include/contact_selectors.php:56
+msgid "Frequently"
+msgstr "Frequentemente"
+
+#: ../../include/contact_selectors.php:57
+msgid "Hourly"
+msgstr "Ogni ora"
+
+#: ../../include/contact_selectors.php:58
+msgid "Twice daily"
+msgstr "Due volte al giorno"
+
+#: ../../include/contact_selectors.php:59
+msgid "Daily"
+msgstr "Ogni giorno"
+
+#: ../../include/contact_selectors.php:60
+msgid "Weekly"
+msgstr "Ogni settimana"
+
+#: ../../include/contact_selectors.php:61
+msgid "Monthly"
+msgstr "Ogni mese"
+
+#: ../../include/contact_selectors.php:76
+msgid "Friendica"
+msgstr "Friendica"
+
+#: ../../include/contact_selectors.php:77
+msgid "OStatus"
+msgstr "OStatus"
+
+#: ../../include/contact_selectors.php:78
+msgid "RSS/Atom"
+msgstr "RSS/Atom"
+
+#: ../../include/contact_selectors.php:79 ../../mod/admin.php:822
+#: ../../mod/admin.php:831 ../../mod/id.php:15 ../../mod/id.php:16
+#: ../../boot.php:1552
+msgid "Email"
+msgstr "Email"
+
+#: ../../include/contact_selectors.php:80
+msgid "Diaspora"
+msgstr "Diaspora"
+
+#: ../../include/contact_selectors.php:81
+msgid "Facebook"
+msgstr "Facebook"
+
+#: ../../include/contact_selectors.php:82
+msgid "Zot!"
+msgstr "Zot!"
+
+#: ../../include/contact_selectors.php:83
+msgid "LinkedIn"
+msgstr "LinkedIn"
+
+#: ../../include/contact_selectors.php:84
+msgid "XMPP/IM"
+msgstr "XMPP/IM"
+
+#: ../../include/contact_selectors.php:85
+msgid "MySpace"
+msgstr "MySpace"
 
 #: ../../include/notify.php:23
 msgid "created a new post"
-msgstr "Ha creato un nuovo articolo"
+msgstr "Ha creato un nuovo post"
 
 #: ../../include/notify.php:24
 #, php-format
 msgid "commented on %s's post"
-msgstr "ha commentato l'articolo di %s"
+msgstr "ha commentato il post di %s"
+
+#: ../../include/Import/import_diaspora.php:17
+msgid "No username found in import file."
+msgstr "Impossibile trovare il nome utente nel file da importare."
+
+#: ../../include/Import/import_diaspora.php:42 ../../mod/import.php:156
+msgid "Unable to create a unique channel address. Import failed."
+msgstr "Impossibile creare un indirizzo univoco per il canale. L'import è fallito."
+
+#: ../../include/Import/import_diaspora.php:140 ../../mod/import.php:562
+msgid "Import completed."
+msgstr "L'importazione è terminata con successo!"
 
 #: ../../include/group.php:26
 msgid ""
@@ -60,7 +144,7 @@ msgstr "È stato ripristinato un insieme con lo stesso nome che era stato elimin
 msgid "Default privacy group for new contacts"
 msgstr "Insieme predefinito per i canali che inizi a seguire"
 
-#: ../../include/group.php:254 ../../mod/admin.php:822
+#: ../../include/group.php:254 ../../mod/admin.php:831
 msgid "All Channels"
 msgstr "Tutti i canali"
 
@@ -127,7 +211,7 @@ msgid "Registration request at %s"
 msgstr "Richiesta di registrazione su %s"
 
 #: ../../include/account.php:314 ../../include/account.php:341
-#: ../../include/account.php:401
+#: ../../include/account.php:401 ../../include/network.php:1632
 msgid "Administrator"
 msgstr "Amministratore"
 
@@ -173,12 +257,12 @@ msgstr "Altro"
 msgid "YYYY-MM-DD or MM-DD"
 msgstr "AAAA-MM-GG oppure MM-GG"
 
-#: ../../include/datetime.php:235 ../../mod/events.php:635
+#: ../../include/datetime.php:235 ../../mod/events.php:672
 #: ../../mod/appman.php:91 ../../mod/appman.php:92
 msgid "Required"
 msgstr "Obbligatorio"
 
-#: ../../include/datetime.php:262 ../../boot.php:2342
+#: ../../include/datetime.php:262 ../../boot.php:2353
 msgid "never"
 msgstr "mai"
 
@@ -258,41 +342,69 @@ msgstr "Compleanno di %1$s"
 msgid "Happy Birthday %1$s"
 msgstr "Buon compleanno %1$s"
 
+#: ../../include/dir_fns.php:126
+msgid "Directory Options"
+msgstr "Opzioni elenco pubblico"
+
+#: ../../include/dir_fns.php:128
+msgid "Safe Mode"
+msgstr "Modalità SafeSearch"
+
+#: ../../include/dir_fns.php:128 ../../include/dir_fns.php:129
+#: ../../include/dir_fns.php:130 ../../mod/api.php:106
+#: ../../mod/photos.php:568 ../../mod/mitem.php:159 ../../mod/mitem.php:160
+#: ../../mod/mitem.php:232 ../../mod/mitem.php:233 ../../mod/menu.php:94
+#: ../../mod/menu.php:151 ../../mod/filestorage.php:151
+#: ../../mod/filestorage.php:159 ../../mod/admin.php:428
+#: ../../mod/settings.php:579 ../../mod/removeme.php:60
+#: ../../mod/connedit.php:647 ../../mod/connedit.php:675
+#: ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1554
+msgid "No"
+msgstr "No"
+
+#: ../../include/dir_fns.php:128 ../../include/dir_fns.php:129
+#: ../../include/dir_fns.php:130 ../../mod/api.php:105
+#: ../../mod/photos.php:568 ../../mod/mitem.php:159 ../../mod/mitem.php:160
+#: ../../mod/mitem.php:232 ../../mod/mitem.php:233 ../../mod/menu.php:94
+#: ../../mod/menu.php:151 ../../mod/filestorage.php:151
+#: ../../mod/filestorage.php:159 ../../mod/admin.php:430
+#: ../../mod/settings.php:579 ../../mod/removeme.php:60
+#: ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1554
+msgid "Yes"
+msgstr "Si"
+
+#: ../../include/dir_fns.php:129
+msgid "Public Forums Only"
+msgstr "Solo forum pubblici"
+
+#: ../../include/dir_fns.php:130
+msgid "This Website Only"
+msgstr "Solo in questo sito"
+
 #: ../../include/page_widgets.php:6
 msgid "New Page"
 msgstr "Nuova pagina web"
 
-#: ../../include/page_widgets.php:8 ../../include/page_widgets.php:36
-#: ../../include/RedDAV/RedBrowser.php:269 ../../include/ItemObject.php:100
-#: ../../include/apps.php:254 ../../include/menu.php:43
-#: ../../mod/settings.php:644 ../../mod/thing.php:227
-#: ../../mod/connections.php:382 ../../mod/connections.php:395
-#: ../../mod/connections.php:414 ../../mod/editlayout.php:139
-#: ../../mod/editwebpage.php:178 ../../mod/editpost.php:113
-#: ../../mod/menu.php:100 ../../mod/webpages.php:179
-#: ../../mod/editblock.php:140 ../../mod/blocks.php:148
-#: ../../mod/layouts.php:174
-msgid "Edit"
-msgstr "Modifica"
-
-#: ../../include/page_widgets.php:39 ../../mod/webpages.php:185
-#: ../../mod/blocks.php:154 ../../mod/layouts.php:178
+#: ../../include/page_widgets.php:39 ../../mod/webpages.php:187
+#: ../../mod/blocks.php:159 ../../mod/layouts.php:188
 msgid "View"
 msgstr "Guarda"
 
 #: ../../include/page_widgets.php:40 ../../include/ItemObject.php:677
-#: ../../include/conversation.php:1153 ../../mod/events.php:653
-#: ../../mod/photos.php:970 ../../mod/editwebpage.php:214
-#: ../../mod/editpost.php:149 ../../mod/webpages.php:186
-#: ../../mod/editblock.php:176
+#: ../../include/conversation.php:1166 ../../mod/webpages.php:188
+#: ../../mod/events.php:690 ../../mod/editpost.php:143
+#: ../../mod/photos.php:982 ../../mod/editwebpage.php:214
+#: ../../mod/editblock.php:170
 msgid "Preview"
 msgstr "Anteprima"
 
-#: ../../include/page_widgets.php:41 ../../mod/webpages.php:187
+#: ../../include/page_widgets.php:41 ../../mod/webpages.php:189
 msgid "Actions"
 msgstr "Azioni"
 
-#: ../../include/page_widgets.php:42 ../../mod/webpages.php:188
+#: ../../include/page_widgets.php:42 ../../mod/webpages.php:190
 msgid "Page Link"
 msgstr "Link alla pagina"
 
@@ -300,89 +412,31 @@ msgstr "Link alla pagina"
 msgid "Title"
 msgstr "Titolo"
 
-#: ../../include/page_widgets.php:44 ../../mod/webpages.php:190
-#: ../../mod/blocks.php:145
+#: ../../include/page_widgets.php:44 ../../mod/webpages.php:192
+#: ../../mod/blocks.php:150 ../../mod/menu.php:108 ../../mod/layouts.php:181
 msgid "Created"
 msgstr "Creato"
 
-#: ../../include/page_widgets.php:45 ../../mod/webpages.php:191
-#: ../../mod/blocks.php:146
+#: ../../include/page_widgets.php:45 ../../mod/webpages.php:193
+#: ../../mod/blocks.php:151 ../../mod/menu.php:109 ../../mod/layouts.php:182
 msgid "Edited"
 msgstr "Modificato"
 
-#: ../../include/api.php:1158
+#: ../../include/api.php:1267
 msgid "Public Timeline"
 msgstr "Diario pubblico"
 
-#: ../../include/comanche.php:34 ../../mod/admin.php:386
+#: ../../include/comanche.php:34 ../../mod/admin.php:390
 #: ../../view/theme/apw/php/config.php:185
 msgid "Default"
 msgstr "Predefinito"
 
-#: ../../include/dir_fns.php:143
-msgid "Directory Options"
-msgstr "Opzioni elenco pubblico"
-
-#: ../../include/dir_fns.php:144
-msgid "Alphabetic"
-msgstr "Alfabetico"
-
-#: ../../include/dir_fns.php:145
-msgid "Reverse Alphabetic"
-msgstr "Alfabetico inverso"
-
-#: ../../include/dir_fns.php:146
-msgid "Newest to Oldest"
-msgstr "Prima i più recenti"
-
-#: ../../include/dir_fns.php:147
-msgid "Oldest to Newest"
-msgstr "Prima i più vecchi"
-
-#: ../../include/dir_fns.php:148
-msgid "Sort"
-msgstr "Ordinamento"
-
-#: ../../include/dir_fns.php:152
-msgid "Safe Mode"
-msgstr "Modalità SafeSearch"
-
-#: ../../include/dir_fns.php:154
-msgid "Public Forums Only"
-msgstr "Solo forum pubblici"
-
-#: ../../include/dir_fns.php:155
-msgid "This Website Only"
-msgstr "Solo in questo sito"
-
-#: ../../include/event.php:19 ../../include/bb2diaspora.php:451
-msgid "l F d, Y \\@ g:i A"
-msgstr "l d F Y \\@ G:i"
-
-#: ../../include/event.php:27 ../../include/bb2diaspora.php:457
-msgid "Starts:"
-msgstr "Inizio:"
-
-#: ../../include/event.php:37 ../../include/bb2diaspora.php:465
-msgid "Finishes:"
-msgstr "Fine:"
-
-#: ../../include/event.php:47 ../../include/bb2diaspora.php:473
-#: ../../include/identity.php:874 ../../mod/events.php:647
-#: ../../mod/directory.php:234
-msgid "Location:"
-msgstr "Luogo:"
-
-#: ../../include/event.php:391
-msgid "This event has been added to your calendar."
-msgstr "Questo evento è stato aggiunto al tuo calendario"
-
 #: ../../include/js_strings.php:5
 msgid "Delete this item?"
 msgstr "Eliminare questo elemento?"
 
 #: ../../include/js_strings.php:6 ../../include/ItemObject.php:667
-#: ../../mod/photos.php:968 ../../mod/photos.php:1086
+#: ../../mod/photos.php:980 ../../mod/photos.php:1098
 msgid "Comment"
 msgstr "Commento"
 
@@ -410,7 +464,7 @@ msgstr "Password troppo corta"
 msgid "Passwords do not match"
 msgstr "Le password non corrispondono"
 
-#: ../../include/js_strings.php:13 ../../mod/photos.php:39
+#: ../../include/js_strings.php:13 ../../mod/photos.php:40
 msgid "everybody"
 msgstr "tutti"
 
@@ -439,6 +493,7 @@ msgid "Rate This Channel (this is public)"
 msgstr "Valuta questo canale (visibile a tutti)"
 
 #: ../../include/js_strings.php:20 ../../mod/rate.php:156
+#: ../../mod/connedit.php:683
 msgid "Rating"
 msgstr "Valutazioni"
 
@@ -447,25 +502,26 @@ msgid "Describe (optional)"
 msgstr "Descrizione (facoltativa)"
 
 #: ../../include/js_strings.php:22 ../../include/ItemObject.php:668
-#: ../../mod/settings.php:582 ../../mod/settings.php:684
-#: ../../mod/settings.php:710 ../../mod/settings.php:738
-#: ../../mod/settings.php:761 ../../mod/settings.php:843
-#: ../../mod/settings.php:1039 ../../mod/xchan.php:11 ../../mod/connect.php:93
-#: ../../mod/thing.php:275 ../../mod/thing.php:318 ../../mod/events.php:656
-#: ../../mod/group.php:81 ../../mod/setup.php:313 ../../mod/setup.php:358
-#: ../../mod/photos.php:565 ../../mod/photos.php:642 ../../mod/photos.php:929
-#: ../../mod/photos.php:969 ../../mod/photos.php:1087 ../../mod/pdledit.php:58
-#: ../../mod/import.php:504 ../../mod/chat.php:177 ../../mod/chat.php:211
-#: ../../mod/rate.php:167 ../../mod/invite.php:142 ../../mod/locs.php:105
-#: ../../mod/sources.php:104 ../../mod/sources.php:138
-#: ../../mod/filestorage.php:156 ../../mod/fsuggest.php:108
-#: ../../mod/poke.php:166 ../../mod/profiles.php:667 ../../mod/mitem.php:229
-#: ../../mod/admin.php:446 ../../mod/admin.php:810 ../../mod/admin.php:946
-#: ../../mod/admin.php:1077 ../../mod/admin.php:1271 ../../mod/admin.php:1356
-#: ../../mod/mood.php:134 ../../mod/connedit.php:679 ../../mod/mail.php:355
-#: ../../mod/appman.php:99 ../../mod/poll.php:68 ../../mod/bulksetclose.php:24
-#: ../../view/theme/apw/php/config.php:256
-#: ../../view/theme/redbasic/php/config.php:97
+#: ../../mod/xchan.php:11 ../../mod/connect.php:93 ../../mod/thing.php:303
+#: ../../mod/thing.php:346 ../../mod/events.php:511 ../../mod/events.php:693
+#: ../../mod/group.php:81 ../../mod/photos.php:577 ../../mod/photos.php:654
+#: ../../mod/photos.php:941 ../../mod/photos.php:981 ../../mod/photos.php:1099
+#: ../../mod/pdledit.php:58 ../../mod/import.php:592 ../../mod/chat.php:177
+#: ../../mod/chat.php:211 ../../mod/mitem.php:235 ../../mod/rate.php:167
+#: ../../mod/invite.php:142 ../../mod/locs.php:105 ../../mod/sources.php:104
+#: ../../mod/sources.php:138 ../../mod/filestorage.php:156
+#: ../../mod/fsuggest.php:108 ../../mod/poke.php:166
+#: ../../mod/profiles.php:667 ../../mod/setup.php:327 ../../mod/setup.php:367
+#: ../../mod/admin.php:453 ../../mod/admin.php:819 ../../mod/admin.php:986
+#: ../../mod/admin.php:1118 ../../mod/admin.php:1312 ../../mod/admin.php:1397
+#: ../../mod/settings.php:588 ../../mod/settings.php:692
+#: ../../mod/settings.php:718 ../../mod/settings.php:746
+#: ../../mod/settings.php:769 ../../mod/settings.php:854
+#: ../../mod/settings.php:1050 ../../mod/mood.php:134
+#: ../../mod/connedit.php:704 ../../mod/mail.php:355 ../../mod/appman.php:99
+#: ../../mod/pconfig.php:108 ../../mod/poll.php:68
+#: ../../mod/bulksetclose.php:24 ../../view/theme/apw/php/config.php:256
+#: ../../view/theme/redbasic/php/config.php:99
 msgid "Submit"
 msgstr "Salva"
 
@@ -550,15 +606,367 @@ msgstr " "
 msgid "timeago.numbers"
 msgstr "timeago.numbers"
 
-#: ../../include/RedDAV/RedBrowser.php:107
-#: ../../include/RedDAV/RedBrowser.php:268
-msgid "parent"
-msgstr "cartella superiore"
+#: ../../include/text.php:391
+msgid "prev"
+msgstr "prec"
+
+#: ../../include/text.php:393
+msgid "first"
+msgstr "inizio"
+
+#: ../../include/text.php:422
+msgid "last"
+msgstr "fine"
+
+#: ../../include/text.php:425
+msgid "next"
+msgstr "succ"
+
+#: ../../include/text.php:435
+msgid "older"
+msgstr "più recenti"
+
+#: ../../include/text.php:437
+msgid "newer"
+msgstr "più nuovi"
+
+#: ../../include/text.php:830
+msgid "No connections"
+msgstr "Nessun contatto"
+
+#: ../../include/text.php:844
+#, php-format
+msgid "%d Connection"
+msgid_plural "%d Connections"
+msgstr[0] "%d contatto"
+msgstr[1] "%d contatti"
+
+#: ../../include/text.php:857 ../../mod/viewconnections.php:104
+msgid "View Connections"
+msgstr "Elenco contatti"
+
+#: ../../include/text.php:914 ../../include/text.php:926
+#: ../../include/nav.php:165 ../../include/apps.php:147
+#: ../../mod/search.php:38
+msgid "Search"
+msgstr "Cerca"
+
+#: ../../include/text.php:915 ../../include/text.php:927
+#: ../../include/widgets.php:192 ../../mod/rbmark.php:28
+#: ../../mod/rbmark.php:98 ../../mod/filer.php:50 ../../mod/admin.php:1457
+#: ../../mod/admin.php:1477
+msgid "Save"
+msgstr "Salva"
+
+#: ../../include/text.php:990
+msgid "poke"
+msgstr "poke"
+
+#: ../../include/text.php:990 ../../include/conversation.php:243
+msgid "poked"
+msgstr "ha ricevuto un poke"
+
+#: ../../include/text.php:991
+msgid "ping"
+msgstr "ping"
+
+#: ../../include/text.php:991
+msgid "pinged"
+msgstr "ha ricevuto un ping"
+
+#: ../../include/text.php:992
+msgid "prod"
+msgstr "spintone"
+
+#: ../../include/text.php:992
+msgid "prodded"
+msgstr "ha ricevuto uno spintone"
+
+#: ../../include/text.php:993
+msgid "slap"
+msgstr "schiaffo"
+
+#: ../../include/text.php:993
+msgid "slapped"
+msgstr "ha ricevuto uno schiaffo"
 
-#: ../../include/RedDAV/RedBrowser.php:131 ../../include/text.php:2479
+#: ../../include/text.php:994
+msgid "finger"
+msgstr "finger"
+
+#: ../../include/text.php:994
+msgid "fingered"
+msgstr "ha ricevuto un finger"
+
+#: ../../include/text.php:995
+msgid "rebuff"
+msgstr "rifiuto"
+
+#: ../../include/text.php:995
+msgid "rebuffed"
+msgstr "ha ricevuto un rifiuto"
+
+#: ../../include/text.php:1005
+msgid "happy"
+msgstr "felice"
+
+#: ../../include/text.php:1006
+msgid "sad"
+msgstr "triste"
+
+#: ../../include/text.php:1007
+msgid "mellow"
+msgstr "calmo"
+
+#: ../../include/text.php:1008
+msgid "tired"
+msgstr "stanco"
+
+#: ../../include/text.php:1009
+msgid "perky"
+msgstr "vivace"
+
+#: ../../include/text.php:1010
+msgid "angry"
+msgstr "arrabbiato"
+
+#: ../../include/text.php:1011
+msgid "stupified"
+msgstr "stordito"
+
+#: ../../include/text.php:1012
+msgid "puzzled"
+msgstr "confuso"
+
+#: ../../include/text.php:1013
+msgid "interested"
+msgstr "attento"
+
+#: ../../include/text.php:1014
+msgid "bitter"
+msgstr "amaro"
+
+#: ../../include/text.php:1015
+msgid "cheerful"
+msgstr "allegro"
+
+#: ../../include/text.php:1016
+msgid "alive"
+msgstr "vivace"
+
+#: ../../include/text.php:1017
+msgid "annoyed"
+msgstr "seccato"
+
+#: ../../include/text.php:1018
+msgid "anxious"
+msgstr "ansioso"
+
+#: ../../include/text.php:1019
+msgid "cranky"
+msgstr "irritabile"
+
+#: ../../include/text.php:1020
+msgid "disturbed"
+msgstr "turbato"
+
+#: ../../include/text.php:1021
+msgid "frustrated"
+msgstr "frustrato"
+
+#: ../../include/text.php:1022
+msgid "depressed"
+msgstr "in depressione"
+
+#: ../../include/text.php:1023
+msgid "motivated"
+msgstr "motivato"
+
+#: ../../include/text.php:1024
+msgid "relaxed"
+msgstr "rilassato"
+
+#: ../../include/text.php:1025
+msgid "surprised"
+msgstr "sorpreso"
+
+#: ../../include/text.php:1197
+msgid "Monday"
+msgstr "lunedì"
+
+#: ../../include/text.php:1197
+msgid "Tuesday"
+msgstr "martedì"
+
+#: ../../include/text.php:1197
+msgid "Wednesday"
+msgstr "mercoledì"
+
+#: ../../include/text.php:1197
+msgid "Thursday"
+msgstr "giovedì"
+
+#: ../../include/text.php:1197
+msgid "Friday"
+msgstr "venerdì"
+
+#: ../../include/text.php:1197
+msgid "Saturday"
+msgstr "sabato"
+
+#: ../../include/text.php:1197
+msgid "Sunday"
+msgstr "domenica"
+
+#: ../../include/text.php:1201
+msgid "January"
+msgstr "gennaio"
+
+#: ../../include/text.php:1201
+msgid "February"
+msgstr "febbraio"
+
+#: ../../include/text.php:1201
+msgid "March"
+msgstr "marzo"
+
+#: ../../include/text.php:1201
+msgid "April"
+msgstr "aprile"
+
+#: ../../include/text.php:1201 ../../mod/uexport.php:58
+#: ../../mod/uexport.php:59
+msgid "May"
+msgstr "maggio"
+
+#: ../../include/text.php:1201
+msgid "June"
+msgstr "giugno"
+
+#: ../../include/text.php:1201
+msgid "July"
+msgstr "luglio"
+
+#: ../../include/text.php:1201
+msgid "August"
+msgstr "agosto"
+
+#: ../../include/text.php:1201
+msgid "September"
+msgstr "settembre"
+
+#: ../../include/text.php:1201
+msgid "October"
+msgstr "ottobre"
+
+#: ../../include/text.php:1201
+msgid "November"
+msgstr "novembre"
+
+#: ../../include/text.php:1201
+msgid "December"
+msgstr "dicembre"
+
+#: ../../include/text.php:1306
+msgid "unknown.???"
+msgstr "sconosciuto???"
+
+#: ../../include/text.php:1307
+msgid "bytes"
+msgstr "byte"
+
+#: ../../include/text.php:1343
+msgid "remove category"
+msgstr "rimuovi la categoria"
+
+#: ../../include/text.php:1418
+msgid "remove from file"
+msgstr "rimuovi dal file"
+
+#: ../../include/text.php:1494 ../../include/text.php:1505
+msgid "Click to open/close"
+msgstr "Clicca per aprire/chiudere"
+
+#: ../../include/text.php:1661 ../../mod/events.php:474
+msgid "Link to Source"
+msgstr "Link al sito d'origine"
+
+#: ../../include/text.php:1682 ../../include/text.php:1753
+msgid "default"
+msgstr "predefinito"
+
+#: ../../include/text.php:1690
+msgid "Page layout"
+msgstr "Layout della pagina"
+
+#: ../../include/text.php:1690
+msgid "You can create your own with the layouts tool"
+msgstr "Con la configurazione del layout puoi crearne uno tuo"
+
+#: ../../include/text.php:1731
+msgid "Page content type"
+msgstr "Tipo di contenuto della pagina"
+
+#: ../../include/text.php:1765
+msgid "Select an alternate language"
+msgstr "Seleziona una lingua diversa"
+
+#: ../../include/text.php:1884 ../../include/diaspora.php:2119
+#: ../../include/conversation.php:120 ../../mod/like.php:349
+#: ../../mod/subthread.php:72 ../../mod/subthread.php:174
+#: ../../mod/tagger.php:43
+msgid "photo"
+msgstr "la foto"
+
+#: ../../include/text.php:1887 ../../include/conversation.php:123
+#: ../../mod/like.php:351 ../../mod/tagger.php:47
+msgid "event"
+msgstr "l'evento"
+
+#: ../../include/text.php:1890 ../../include/diaspora.php:2119
+#: ../../include/conversation.php:148 ../../mod/like.php:349
+#: ../../mod/subthread.php:72 ../../mod/subthread.php:174
+msgid "status"
+msgstr "il messaggio di stato"
+
+#: ../../include/text.php:1892 ../../include/conversation.php:150
+#: ../../mod/tagger.php:53
+msgid "comment"
+msgstr "il commento"
+
+#: ../../include/text.php:1897
+msgid "activity"
+msgstr "l'attività"
+
+#: ../../include/text.php:2192
+msgid "Design Tools"
+msgstr "Strumenti di design"
+
+#: ../../include/text.php:2195 ../../mod/blocks.php:147
+msgid "Blocks"
+msgstr "Riquadri"
+
+#: ../../include/text.php:2196 ../../mod/menu.php:101
+msgid "Menus"
+msgstr "Menù"
+
+#: ../../include/text.php:2197 ../../mod/layouts.php:174
+msgid "Layouts"
+msgstr "Layout"
+
+#: ../../include/text.php:2198
+msgid "Pages"
+msgstr "Pagine"
+
+#: ../../include/text.php:2549 ../../include/RedDAV/RedBrowser.php:131
 msgid "Collection"
 msgstr "Cartella"
 
+#: ../../include/RedDAV/RedBrowser.php:107
+#: ../../include/RedDAV/RedBrowser.php:265
+msgid "parent"
+msgstr "cartella superiore"
+
 #: ../../include/RedDAV/RedBrowser.php:134
 msgid "Principal"
 msgstr "Principale"
@@ -579,9 +987,9 @@ msgstr "Appuntamenti ricevuti"
 msgid "Schedule Outbox"
 msgstr "Appuntamenti inviati"
 
-#: ../../include/RedDAV/RedBrowser.php:164 ../../include/conversation.php:1019
+#: ../../include/RedDAV/RedBrowser.php:164 ../../include/conversation.php:1030
 #: ../../include/apps.php:336 ../../include/apps.php:387
-#: ../../mod/photos.php:681 ../../mod/photos.php:1119
+#: ../../mod/photos.php:693 ../../mod/photos.php:1131
 msgid "Unknown"
 msgstr "Sconosciuto"
 
@@ -596,7 +1004,7 @@ msgid "%1$s used of %2$s (%3$s&#37;)"
 msgstr "%1$s occupati di %2$s (%3$s&#37;)"
 
 #: ../../include/RedDAV/RedBrowser.php:251 ../../include/nav.php:98
-#: ../../include/conversation.php:1606 ../../include/apps.php:135
+#: ../../include/conversation.php:1620 ../../include/apps.php:135
 #: ../../mod/fbrowser.php:114
 msgid "Files"
 msgstr "Archivio file"
@@ -610,51 +1018,51 @@ msgid "Shared"
 msgstr "Condiviso"
 
 #: ../../include/RedDAV/RedBrowser.php:256
-#: ../../include/RedDAV/RedBrowser.php:306 ../../mod/menu.php:104
-#: ../../mod/webpages.php:178 ../../mod/blocks.php:147
-#: ../../mod/layouts.php:170 ../../mod/new_channel.php:121
+#: ../../include/RedDAV/RedBrowser.php:303 ../../mod/webpages.php:180
+#: ../../mod/blocks.php:152 ../../mod/menu.php:112
+#: ../../mod/new_channel.php:121 ../../mod/layouts.php:175
 msgid "Create"
 msgstr "Crea"
 
 #: ../../include/RedDAV/RedBrowser.php:257
-#: ../../include/RedDAV/RedBrowser.php:308 ../../mod/profile_photo.php:362
-#: ../../mod/photos.php:706 ../../mod/photos.php:1236
+#: ../../include/RedDAV/RedBrowser.php:305 ../../mod/profile_photo.php:362
+#: ../../mod/photos.php:718 ../../mod/photos.php:1248
 msgid "Upload"
 msgstr "Carica"
 
-#: ../../include/RedDAV/RedBrowser.php:264 ../../mod/settings.php:584
-#: ../../mod/settings.php:610 ../../mod/admin.php:953
+#: ../../include/RedDAV/RedBrowser.php:261 ../../mod/admin.php:994
+#: ../../mod/settings.php:590 ../../mod/settings.php:616
 #: ../../mod/sharedwithme.php:95
 msgid "Name"
 msgstr "Nome"
 
-#: ../../include/RedDAV/RedBrowser.php:265
+#: ../../include/RedDAV/RedBrowser.php:262
 msgid "Type"
 msgstr "Tipo"
 
-#: ../../include/RedDAV/RedBrowser.php:266 ../../mod/sharedwithme.php:97
+#: ../../include/RedDAV/RedBrowser.php:263 ../../mod/sharedwithme.php:97
 msgid "Size"
 msgstr "Dimensione"
 
-#: ../../include/RedDAV/RedBrowser.php:267 ../../mod/sharedwithme.php:98
+#: ../../include/RedDAV/RedBrowser.php:264 ../../mod/sharedwithme.php:98
 msgid "Last Modified"
 msgstr "Ultima modifica"
 
-#: ../../include/RedDAV/RedBrowser.php:270 ../../include/ItemObject.php:120
-#: ../../include/conversation.php:660 ../../include/apps.php:255
-#: ../../mod/settings.php:645 ../../mod/thing.php:228 ../../mod/group.php:176
-#: ../../mod/photos.php:1050 ../../mod/editwebpage.php:225
-#: ../../mod/webpages.php:181 ../../mod/admin.php:817 ../../mod/admin.php:948
-#: ../../mod/editblock.php:113 ../../mod/blocks.php:150
-#: ../../mod/connedit.php:543
+#: ../../include/RedDAV/RedBrowser.php:267 ../../include/ItemObject.php:120
+#: ../../include/conversation.php:671 ../../include/apps.php:255
+#: ../../mod/webpages.php:183 ../../mod/thing.php:256 ../../mod/group.php:176
+#: ../../mod/blocks.php:155 ../../mod/photos.php:1062
+#: ../../mod/editlayout.php:178 ../../mod/editwebpage.php:225
+#: ../../mod/editblock.php:180 ../../mod/admin.php:826 ../../mod/admin.php:988
+#: ../../mod/settings.php:651 ../../mod/connedit.php:563
 msgid "Delete"
 msgstr "Elimina"
 
-#: ../../include/RedDAV/RedBrowser.php:305
+#: ../../include/RedDAV/RedBrowser.php:302
 msgid "Create new folder"
 msgstr "Crea una nuova cartella"
 
-#: ../../include/RedDAV/RedBrowser.php:307
+#: ../../include/RedDAV/RedBrowser.php:304
 msgid "Upload file"
 msgstr "Carica un file"
 
@@ -663,10 +1071,33 @@ msgstr "Carica un file"
 msgid "%1$s's bookmarks"
 msgstr "I segnalibri di %1$s"
 
-#: ../../include/network.php:632
+#: ../../include/network.php:635
 msgid "view full size"
 msgstr "guarda nelle dimensioni reali"
 
+#: ../../include/network.php:1585 ../../include/enotify.php:58
+msgid "$Projectname Notification"
+msgstr "Notifica $Projectname"
+
+#: ../../include/network.php:1586 ../../include/enotify.php:59
+#: ../../include/diaspora.php:2522 ../../include/diaspora.php:2533
+#: ../../mod/p.php:46
+msgid "$projectname"
+msgstr "$projectname"
+
+#: ../../include/network.php:1588 ../../include/enotify.php:61
+msgid "Thank You,"
+msgstr "Grazie,"
+
+#: ../../include/network.php:1590 ../../include/enotify.php:63
+#, php-format
+msgid "%s Administrator"
+msgstr "L'amministratore di %s"
+
+#: ../../include/network.php:1646
+msgid "No Subject"
+msgstr "Nessun titolo"
+
 #: ../../include/features.php:38
 msgid "General Features"
 msgstr "Funzionalità di base"
@@ -677,7 +1108,7 @@ msgstr "Scadenza"
 
 #: ../../include/features.php:40
 msgid "Remove posts/comments and/or private messages at a future time"
-msgstr "Elimina gli articoli, i commenti o i messaggi privati dopo un lasso di tempo"
+msgstr "Elimina i post, i commenti o i messaggi privati dopo un lasso di tempo"
 
 #: ../../include/features.php:41
 msgid "Multiple Profiles"
@@ -755,7 +1186,7 @@ msgstr "Ti permette di impostare delle restrizioni e dei termini d'uso a chi seg
 
 #: ../../include/features.php:55
 msgid "Post Composition Features"
-msgstr "Modalità di scrittura articoli"
+msgstr "Modalità di scrittura post"
 
 #: ../../include/features.php:57
 msgid "Use Markdown"
@@ -763,7 +1194,7 @@ msgstr "Usa il markdown"
 
 #: ../../include/features.php:57
 msgid "Allow use of \"Markdown\" to format posts"
-msgstr "Consenti l'uso del markdown per formattare gli articoli"
+msgstr "Consenti l'uso del markdown per formattare i post"
 
 #: ../../include/features.php:58
 msgid "Large Photos"
@@ -775,7 +1206,7 @@ msgid ""
 "(320px) photo thumbnails"
 msgstr "Includi anteprime grandi delle foto nei post (640px). Se disabilitato le anteprime saranno piccole (320px)"
 
-#: ../../include/features.php:59 ../../include/widgets.php:546
+#: ../../include/features.php:59 ../../include/widgets.php:548
 #: ../../mod/sources.php:88
 msgid "Channel Sources"
 msgstr "Sorgenti del canale"
@@ -799,7 +1230,7 @@ msgstr "Permetti i post con votazione"
 
 #: ../../include/features.php:61
 msgid "Provide a class of post which others can vote on"
-msgstr "Rende possibile la creazione di articoli in cui sarà possibile votare"
+msgstr "Rende possibile la creazione di post in cui sarà possibile votare"
 
 #: ../../include/features.php:67
 msgid "Network and Stream Filtering"
@@ -811,7 +1242,7 @@ msgstr "Ricerca per data"
 
 #: ../../include/features.php:68
 msgid "Ability to select posts by date ranges"
-msgstr "Per selezionare gli articoli in un intervallo tra date"
+msgstr "Per selezionare i post in un intervallo tra date"
 
 #: ../../include/features.php:69
 msgid "Collections Filter"
@@ -819,7 +1250,7 @@ msgstr "Filtra per insiemi di canali"
 
 #: ../../include/features.php:69
 msgid "Enable widget to display Network posts only from selected collections"
-msgstr "Mostra il riquadro per filtrare gli articoli di certi insiemi di canali"
+msgstr "Mostra il riquadro per filtrare i post di certi insiemi di canali"
 
 #: ../../include/features.php:70 ../../include/widgets.php:274
 msgid "Saved Searches"
@@ -854,63 +1285,71 @@ msgid "Filter stream activity by depth of relationships"
 msgstr "Permette di selezionare i contenuti in base al livello di amicizia"
 
 #: ../../include/features.php:74
+msgid "Connection Filtering"
+msgstr "Filtro sui contatti"
+
+#: ../../include/features.php:74
+msgid "Filter incoming posts from connections based on keywords/content"
+msgstr "Filtra con delle parole chiave i post che ricevi"
+
+#: ../../include/features.php:75
 msgid "Suggest Channels"
 msgstr "Suggerisci canali"
 
-#: ../../include/features.php:74
+#: ../../include/features.php:75
 msgid "Show channel suggestions"
 msgstr "Mostra alcuni canali che potrebbero interessarti"
 
-#: ../../include/features.php:79
+#: ../../include/features.php:80
 msgid "Post/Comment Tools"
-msgstr "Gestione articoli e commenti"
+msgstr "Gestione post e commenti"
 
-#: ../../include/features.php:80
+#: ../../include/features.php:81
 msgid "Tagging"
 msgstr "Tag"
 
-#: ../../include/features.php:80
+#: ../../include/features.php:81
 msgid "Ability to tag existing posts"
-msgstr "Permetti l'aggiunta di tag su articoli già esistenti"
+msgstr "Permetti l'aggiunta di tag su post già esistenti"
 
-#: ../../include/features.php:81
+#: ../../include/features.php:82
 msgid "Post Categories"
-msgstr "Categorie degli articoli"
+msgstr "Categorie dei post"
 
-#: ../../include/features.php:81
+#: ../../include/features.php:82
 msgid "Add categories to your posts"
-msgstr "Abilita le categorie per i tuoi articoli"
+msgstr "Abilita le categorie per i tuoi post"
 
-#: ../../include/features.php:82 ../../include/widgets.php:304
+#: ../../include/features.php:83 ../../include/widgets.php:304
 #: ../../include/contact_widgets.php:57
 msgid "Saved Folders"
 msgstr "Cartelle salvate"
 
-#: ../../include/features.php:82
+#: ../../include/features.php:83
 msgid "Ability to file posts under folders"
-msgstr "Abilita la raccolta dei tuoi articoli in cartelle"
+msgstr "Abilita la raccolta dei tuoi articoli in post"
 
-#: ../../include/features.php:83
+#: ../../include/features.php:84
 msgid "Dislike Posts"
 msgstr "Non mi piace"
 
-#: ../../include/features.php:83
+#: ../../include/features.php:84
 msgid "Ability to dislike posts/comments"
-msgstr "Abilità la funzionalità \"non mi piace\" per i tuoi articoli"
+msgstr "Abilità la funzionalità \"non mi piace\" per i tuoi post"
 
-#: ../../include/features.php:84
+#: ../../include/features.php:85
 msgid "Star Posts"
-msgstr "Articoli stella (preferiti)"
+msgstr "Post con stella"
 
-#: ../../include/features.php:84
+#: ../../include/features.php:85
 msgid "Ability to mark special posts with a star indicator"
-msgstr "Mostra la stella per scegliere gli articoli preferiti"
+msgstr "Mostra la stella per segnare i post preferiti"
 
-#: ../../include/features.php:85
+#: ../../include/features.php:86
 msgid "Tag Cloud"
 msgstr "Nuvola di tag"
 
-#: ../../include/features.php:85
+#: ../../include/features.php:86
 msgid "Provide a personal tag cloud on your channel page"
 msgstr "Mostra la nuvola dei tag che usi di più sulla pagina del tuo canale"
 
@@ -920,7 +1359,7 @@ msgid "Categories"
 msgstr "Categorie"
 
 #: ../../include/widgets.php:91 ../../include/nav.php:163
-#: ../../mod/apps.php:34
+#: ../../mod/apps.php:36
 msgid "Apps"
 msgstr "Apps"
 
@@ -928,7 +1367,7 @@ msgstr "Apps"
 msgid "System"
 msgstr "Sistema"
 
-#: ../../include/widgets.php:94 ../../include/conversation.php:1501
+#: ../../include/widgets.php:94 ../../include/conversation.php:1515
 msgid "Personal"
 msgstr "Personali"
 
@@ -941,9 +1380,9 @@ msgid "Edit Personal App"
 msgstr "Modifica una app personale"
 
 #: ../../include/widgets.php:136 ../../include/widgets.php:175
-#: ../../include/Contact.php:107 ../../include/conversation.php:945
-#: ../../include/identity.php:823 ../../mod/match.php:64
-#: ../../mod/directory.php:302 ../../mod/suggest.php:52
+#: ../../include/Contact.php:107 ../../include/conversation.php:956
+#: ../../include/identity.php:956 ../../mod/directory.php:316
+#: ../../mod/match.php:64 ../../mod/suggest.php:52
 msgid "Connect"
 msgstr "Aggiungi"
 
@@ -951,7 +1390,7 @@ msgstr "Aggiungi"
 msgid "Ignore/Hide"
 msgstr "Ignora/nascondi"
 
-#: ../../include/widgets.php:143 ../../mod/connections.php:268
+#: ../../include/widgets.php:143 ../../mod/connections.php:128
 msgid "Suggestions"
 msgstr "Suggerimenti"
 
@@ -980,12 +1419,6 @@ msgstr "Per esempio: mario@pippo.it oppure http://pluto.com/barbara"
 msgid "Notes"
 msgstr "Note"
 
-#: ../../include/widgets.php:192 ../../include/text.php:853
-#: ../../include/text.php:865 ../../mod/rbmark.php:28 ../../mod/rbmark.php:98
-#: ../../mod/filer.php:50 ../../mod/admin.php:1416 ../../mod/admin.php:1436
-msgid "Save"
-msgstr "Salva"
-
 #: ../../include/widgets.php:266
 msgid "Remove term"
 msgstr "Rimuovi termine"
@@ -999,135 +1432,140 @@ msgstr "Tutto"
 msgid "Archives"
 msgstr "Archivi"
 
-#: ../../include/widgets.php:427 ../../mod/connedit.php:572
+#: ../../include/widgets.php:429 ../../mod/connedit.php:583
 msgid "Me"
 msgstr "Io"
 
-#: ../../include/widgets.php:428 ../../mod/connedit.php:573
+#: ../../include/widgets.php:430 ../../mod/connedit.php:584
 msgid "Family"
 msgstr "Famiglia"
 
-#: ../../include/widgets.php:429 ../../include/identity.php:394
+#: ../../include/widgets.php:431 ../../include/identity.php:394
 #: ../../include/identity.php:395 ../../include/identity.php:402
-#: ../../include/profile_selectors.php:80 ../../mod/settings.php:339
-#: ../../mod/settings.php:343 ../../mod/settings.php:344
-#: ../../mod/settings.php:347 ../../mod/settings.php:358
-#: ../../mod/connedit.php:574
+#: ../../include/profile_selectors.php:80 ../../mod/settings.php:345
+#: ../../mod/settings.php:349 ../../mod/settings.php:350
+#: ../../mod/settings.php:353 ../../mod/settings.php:364
+#: ../../mod/connedit.php:585
 msgid "Friends"
 msgstr "Amici"
 
-#: ../../include/widgets.php:430 ../../mod/connedit.php:575
+#: ../../include/widgets.php:432 ../../mod/connedit.php:586
 msgid "Acquaintances"
 msgstr "Conoscenti"
 
-#: ../../include/widgets.php:431 ../../mod/connections.php:231
-#: ../../mod/connections.php:246 ../../mod/connedit.php:576
+#: ../../include/widgets.php:433 ../../mod/connections.php:91
+#: ../../mod/connections.php:106 ../../mod/connedit.php:587
 msgid "All"
 msgstr "Tutti"
 
-#: ../../include/widgets.php:450
+#: ../../include/widgets.php:452
 msgid "Refresh"
 msgstr "Aggiorna"
 
-#: ../../include/widgets.php:485
+#: ../../include/widgets.php:487
 msgid "Account settings"
 msgstr "Il tuo account"
 
-#: ../../include/widgets.php:491
+#: ../../include/widgets.php:493
 msgid "Channel settings"
 msgstr "Impostazioni del canale"
 
-#: ../../include/widgets.php:497
+#: ../../include/widgets.php:499
 msgid "Additional features"
 msgstr "Funzionalità opzionali"
 
-#: ../../include/widgets.php:503
+#: ../../include/widgets.php:505
 msgid "Feature/Addon settings"
 msgstr "Impostazioni dei componenti aggiuntivi"
 
-#: ../../include/widgets.php:509
+#: ../../include/widgets.php:511
 msgid "Display settings"
 msgstr "Aspetto"
 
-#: ../../include/widgets.php:515
+#: ../../include/widgets.php:517
 msgid "Connected apps"
 msgstr "App connesse"
 
-#: ../../include/widgets.php:521
+#: ../../include/widgets.php:523
 msgid "Export channel"
 msgstr "Esporta il canale"
 
-#: ../../include/widgets.php:530 ../../mod/connedit.php:653
+#: ../../include/widgets.php:532 ../../mod/connedit.php:674
 msgid "Connection Default Permissions"
 msgstr "Permessi predefiniti dei nuovi contatti"
 
-#: ../../include/widgets.php:538
+#: ../../include/widgets.php:540
 msgid "Premium Channel Settings"
 msgstr "Canale premium - impostazioni"
 
-#: ../../include/widgets.php:554 ../../include/nav.php:208
-#: ../../include/apps.php:134 ../../mod/admin.php:1038
-#: ../../mod/admin.php:1238
+#: ../../include/widgets.php:556 ../../include/nav.php:208
+#: ../../include/apps.php:134 ../../mod/admin.php:1079
+#: ../../mod/admin.php:1279
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: ../../include/widgets.php:567 ../../mod/message.php:31
+#: ../../include/widgets.php:569 ../../mod/message.php:31
 #: ../../mod/mail.php:128
 msgid "Messages"
 msgstr "Messaggi"
 
-#: ../../include/widgets.php:570
+#: ../../include/widgets.php:572
 msgid "Check Mail"
 msgstr "Controlla i messaggi"
 
-#: ../../include/widgets.php:575 ../../include/nav.php:199
+#: ../../include/widgets.php:577 ../../include/nav.php:199
 msgid "New Message"
 msgstr "Nuovo messaggio"
 
-#: ../../include/widgets.php:650
+#: ../../include/widgets.php:652
 msgid "Chat Rooms"
 msgstr "Aree chat attive"
 
-#: ../../include/widgets.php:670
+#: ../../include/widgets.php:672
 msgid "Bookmarked Chatrooms"
 msgstr "Aree chat nei segnalibri"
 
-#: ../../include/widgets.php:690
+#: ../../include/widgets.php:692
 msgid "Suggested Chatrooms"
 msgstr "Aree chat suggerite"
 
-#: ../../include/widgets.php:817 ../../include/widgets.php:875
+#: ../../include/widgets.php:819 ../../include/widgets.php:877
 msgid "photo/image"
 msgstr "foto/immagine"
 
-#: ../../include/widgets.php:970 ../../include/widgets.php:972
+#: ../../include/widgets.php:972 ../../include/widgets.php:974
 msgid "Rate Me"
 msgstr "Valutami"
 
-#: ../../include/widgets.php:976
+#: ../../include/widgets.php:978
 msgid "View Ratings"
 msgstr "Vedi le valutazioni ricevute"
 
-#: ../../include/widgets.php:987
+#: ../../include/widgets.php:989
 msgid "Public Hubs"
 msgstr "Hub pubblici"
 
-#: ../../include/enotify.php:58
-msgid "Hubzilla Notification"
-msgstr "Notifica di Hubzilla"
+#: ../../include/event.php:22 ../../include/bb2diaspora.php:459
+msgid "l F d, Y \\@ g:i A"
+msgstr "l d F Y \\@ G:i"
+
+#: ../../include/event.php:30 ../../include/bb2diaspora.php:465
+msgid "Starts:"
+msgstr "Inizio:"
 
-#: ../../include/enotify.php:59
-msgid "hubzilla"
-msgstr "Hubzilla"
+#: ../../include/event.php:40 ../../include/bb2diaspora.php:473
+msgid "Finishes:"
+msgstr "Fine:"
 
-#: ../../include/enotify.php:61
-msgid "Thank You,"
-msgstr "Grazie,"
+#: ../../include/event.php:50 ../../include/bb2diaspora.php:481
+#: ../../include/identity.php:1007 ../../mod/directory.php:302
+#: ../../mod/events.php:684
+msgid "Location:"
+msgstr "Luogo:"
 
-#: ../../include/enotify.php:63
-#, php-format
-msgid "%s Administrator"
-msgstr "L'amministratore di %s"
+#: ../../include/event.php:549
+msgid "This event has been added to your calendar."
+msgstr "Questo evento è stato aggiunto al tuo calendario"
 
 #: ../../include/enotify.php:96
 #, php-format
@@ -1137,7 +1575,7 @@ msgstr "%s <!item_type!>"
 #: ../../include/enotify.php:100
 #, php-format
 msgid "[Red:Notify] New mail received at %s"
-msgstr "[Hubzilla] Nuovo messaggio su %s"
+msgstr "[RedMatrix] Nuovo messaggio su %s"
 
 #: ../../include/enotify.php:102
 #, php-format
@@ -1176,7 +1614,7 @@ msgstr "%1$s, %2$s ha commentato [zrl=%3$s]%4$s che hai creato[/zrl]"
 #: ../../include/enotify.php:186
 #, php-format
 msgid "[Red:Notify] Comment to conversation #%1$d by %2$s"
-msgstr "[Hubzilla] Nuovo commento di %2$s alla conversazione #%1$d"
+msgstr "[RedMatrix] Nuovo commento di %2$s alla conversazione #%1$d"
 
 #: ../../include/enotify.php:187
 #, php-format
@@ -1193,7 +1631,7 @@ msgstr "Visita %s per leggere o commentare la conversazione."
 #: ../../include/enotify.php:196
 #, php-format
 msgid "[Red:Notify] %s posted to your profile wall"
-msgstr "[Hubzilla] %s ha scritto sulla tua bacheca"
+msgstr "[RedMatrix] %s ha scritto sulla tua bacheca"
 
 #: ../../include/enotify.php:198
 #, php-format
@@ -1208,7 +1646,7 @@ msgstr "%1$s, %2$s ha scritto sulla [zrl=%3$s]tua bacheca[/zrl]"
 #: ../../include/enotify.php:224
 #, php-format
 msgid "[Red:Notify] %s tagged you"
-msgstr "[Hubzilla] %s ti ha taggato"
+msgstr "[RedMatrix] %s ti ha taggato"
 
 #: ../../include/enotify.php:225
 #, php-format
@@ -1223,7 +1661,7 @@ msgstr "%1$s, %2$s [zrl=%3$s]ti ha taggato[/zrl]."
 #: ../../include/enotify.php:238
 #, php-format
 msgid "[Red:Notify] %1$s poked you"
-msgstr "[Hubzilla] %1$s ti ha mandato un poke"
+msgstr "[RedMatrix] %1$s ti ha mandato un poke"
 
 #: ../../include/enotify.php:239
 #, php-format
@@ -1238,21 +1676,21 @@ msgstr "%1$s, %2$s [zrl=%2$s]ti ha mandato un poke[/zrl]."
 #: ../../include/enotify.php:256
 #, php-format
 msgid "[Red:Notify] %s tagged your post"
-msgstr "[Hubzilla] %s ha taggato il tuo articolo"
+msgstr "[RedMatrix] %s ha taggato il tuo post"
 
 #: ../../include/enotify.php:257
 #, php-format
 msgid "%1$s, %2$s tagged your post at %3$s"
-msgstr "%1$s, %2$s ha taggato il tuo articolo su %3$s"
+msgstr "%1$s, %2$s ha taggato il tuo post su %3$s"
 
 #: ../../include/enotify.php:258
 #, php-format
 msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
-msgstr "%1$s, %2$s ha taggato [zrl=%3$s]il tuo articolo[/zrl]"
+msgstr "%1$s, %2$s ha taggato [zrl=%3$s]il tuo post[/zrl]"
 
 #: ../../include/enotify.php:270
 msgid "[Red:Notify] Introduction received"
-msgstr "[Hubzilla] Hai una richiesta di amicizia"
+msgstr "[RedMatrix] Hai una richiesta di amicizia"
 
 #: ../../include/enotify.php:271
 #, php-format
@@ -1277,7 +1715,7 @@ msgstr "Visita %s per approvare o rifiutare la richiesta di entrare in contatto.
 
 #: ../../include/enotify.php:285
 msgid "[Red:Notify] Friend suggestion received"
-msgstr "[Hubzilla] Ti è stato suggerito un amico"
+msgstr "[RedMatrix] Ti è stato suggerito un amico"
 
 #: ../../include/enotify.php:286
 #, php-format
@@ -1306,73 +1744,7 @@ msgstr "Visita %s per approvare o rifiutare il suggerimento."
 
 #: ../../include/enotify.php:508
 msgid "[Red:Notify]"
-msgstr "[Hubzilla]"
-
-#: ../../include/contact_selectors.php:56
-msgid "Frequently"
-msgstr "Frequentemente"
-
-#: ../../include/contact_selectors.php:57
-msgid "Hourly"
-msgstr "Ogni ora"
-
-#: ../../include/contact_selectors.php:58
-msgid "Twice daily"
-msgstr "Due volte al giorno"
-
-#: ../../include/contact_selectors.php:59
-msgid "Daily"
-msgstr "Ogni giorno"
-
-#: ../../include/contact_selectors.php:60
-msgid "Weekly"
-msgstr "Ogni settimana"
-
-#: ../../include/contact_selectors.php:61
-msgid "Monthly"
-msgstr "Ogni mese"
-
-#: ../../include/contact_selectors.php:76
-msgid "Friendica"
-msgstr "Friendica"
-
-#: ../../include/contact_selectors.php:77
-msgid "OStatus"
-msgstr "OStatus"
-
-#: ../../include/contact_selectors.php:78
-msgid "RSS/Atom"
-msgstr "RSS/Atom"
-
-#: ../../include/contact_selectors.php:79 ../../mod/admin.php:813
-#: ../../mod/admin.php:822 ../../mod/id.php:15 ../../mod/id.php:16
-#: ../../boot.php:1542
-msgid "Email"
-msgstr "Email"
-
-#: ../../include/contact_selectors.php:80
-msgid "Diaspora"
-msgstr "Diaspora"
-
-#: ../../include/contact_selectors.php:81
-msgid "Facebook"
-msgstr "Facebook"
-
-#: ../../include/contact_selectors.php:82
-msgid "Zot!"
-msgstr "Zot!"
-
-#: ../../include/contact_selectors.php:83
-msgid "LinkedIn"
-msgstr "LinkedIn"
-
-#: ../../include/contact_selectors.php:84
-msgid "XMPP/IM"
-msgstr "XMPP/IM"
-
-#: ../../include/contact_selectors.php:85
-msgid "MySpace"
-msgstr "MySpace"
+msgstr "[RedMatrix]"
 
 #: ../../include/message.php:18
 msgid "No recipient provided."
@@ -1388,7 +1760,29 @@ msgstr "Impossibile determinare il mittente."
 
 #: ../../include/message.php:200
 msgid "Stored post could not be verified."
-msgstr "Non è stato possibile verificare l'articolo inserito."
+msgstr "Non è stato possibile verificare il post."
+
+#: ../../include/diaspora.php:2148 ../../include/conversation.php:164
+#: ../../mod/like.php:397
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
+msgstr "A %1$s piace %3$s di %2$s"
+
+#: ../../include/diaspora.php:2494
+msgid "Please choose"
+msgstr "La tua scelta"
+
+#: ../../include/diaspora.php:2496
+msgid "Agree"
+msgstr "Sono d'accordo"
+
+#: ../../include/diaspora.php:2498
+msgid "Disagree"
+msgstr "Non sono d'accordo"
+
+#: ../../include/diaspora.php:2500
+msgid "Abstain"
+msgstr "Mi astengo"
 
 #: ../../include/follow.php:28
 msgid "Channel is blocked on this site."
@@ -1406,27 +1800,31 @@ msgstr "La risposta dal canale non è completa."
 msgid "Channel was deleted and no longer exists."
 msgstr "Il canale è stato rimosso e non esiste più."
 
-#: ../../include/follow.php:135 ../../include/follow.php:197
+#: ../../include/follow.php:135 ../../include/follow.php:206
 msgid "Protocol disabled."
 msgstr "Protocollo disabilitato."
 
-#: ../../include/follow.php:170
+#: ../../include/follow.php:144
+msgid "Protocol blocked for this channel."
+msgstr "Protocollo bloccato per questo canale."
+
+#: ../../include/follow.php:179
 msgid "Channel discovery failed."
 msgstr "La ricerca del canale non ha avuto successo."
 
-#: ../../include/follow.php:186
+#: ../../include/follow.php:195
 msgid "local account not found."
 msgstr "l'account locale non è stato trovato."
 
-#: ../../include/follow.php:215
+#: ../../include/follow.php:224
 msgid "Cannot connect to yourself."
 msgstr "Non puoi connetterti a te stesso."
 
-#: ../../include/ItemObject.php:89 ../../include/conversation.php:667
+#: ../../include/ItemObject.php:89 ../../include/conversation.php:678
 msgid "Private Message"
 msgstr "Messaggio privato"
 
-#: ../../include/ItemObject.php:126 ../../include/conversation.php:659
+#: ../../include/ItemObject.php:126 ../../include/conversation.php:670
 msgid "Select"
 msgstr "Seleziona"
 
@@ -1459,22 +1857,22 @@ msgid "I abstain"
 msgstr "Mi astengo"
 
 #: ../../include/ItemObject.php:175 ../../include/ItemObject.php:187
-#: ../../include/conversation.php:1674 ../../mod/photos.php:1003
-#: ../../mod/photos.php:1015
+#: ../../include/conversation.php:1688 ../../mod/photos.php:1015
+#: ../../mod/photos.php:1027
 msgid "View all"
 msgstr "Vedi tutto"
 
 #: ../../include/ItemObject.php:179 ../../include/taxonomy.php:396
-#: ../../include/conversation.php:1698 ../../include/identity.php:1133
-#: ../../mod/photos.php:1007
+#: ../../include/conversation.php:1712 ../../include/identity.php:1266
+#: ../../mod/photos.php:1019
 msgctxt "noun"
 msgid "Like"
 msgid_plural "Likes"
 msgstr[0] "Mi piace"
 msgstr[1] "Mi piace"
 
-#: ../../include/ItemObject.php:184 ../../include/conversation.php:1701
-#: ../../mod/photos.php:1012
+#: ../../include/ItemObject.php:184 ../../include/conversation.php:1715
+#: ../../mod/photos.php:1024
 msgctxt "noun"
 msgid "Dislike"
 msgid_plural "Dislikes"
@@ -1497,11 +1895,11 @@ msgstr "Attiva/disattiva preferito"
 msgid "starred"
 msgstr "preferito"
 
-#: ../../include/ItemObject.php:227 ../../include/conversation.php:674
+#: ../../include/ItemObject.php:227 ../../include/conversation.php:685
 msgid "Message signature validated"
 msgstr "Messaggio con firma verificata"
 
-#: ../../include/ItemObject.php:228 ../../include/conversation.php:675
+#: ../../include/ItemObject.php:228 ../../include/conversation.php:686
 msgid "Message signature incorrect"
 msgstr "Massaggio con firma non corretta"
 
@@ -1509,7 +1907,7 @@ msgstr "Massaggio con firma non corretta"
 msgid "Add Tag"
 msgstr "Aggiungi un tag"
 
-#: ../../include/ItemObject.php:254 ../../mod/photos.php:947
+#: ../../include/ItemObject.php:254 ../../mod/photos.php:959
 msgid "I like this (toggle)"
 msgstr "Attiva/disattiva Mi piace"
 
@@ -1517,7 +1915,7 @@ msgstr "Attiva/disattiva Mi piace"
 msgid "like"
 msgstr "mi piace"
 
-#: ../../include/ItemObject.php:255 ../../mod/photos.php:948
+#: ../../include/ItemObject.php:255 ../../mod/photos.php:960
 msgid "I don't like this (toggle)"
 msgstr "Attiva/disattiva Non mi piace"
 
@@ -1561,17 +1959,17 @@ msgstr "Da bacheca a bacheca"
 msgid "via Wall-To-Wall:"
 msgstr "da bacheca a bacheca:"
 
-#: ../../include/ItemObject.php:312 ../../include/conversation.php:716
+#: ../../include/ItemObject.php:312 ../../include/conversation.php:727
 #, php-format
 msgid "from %s"
 msgstr "da %s"
 
-#: ../../include/ItemObject.php:315 ../../include/conversation.php:719
+#: ../../include/ItemObject.php:315 ../../include/conversation.php:730
 #, php-format
 msgid "last edited: %s"
 msgstr "ultima modifica: %s"
 
-#: ../../include/ItemObject.php:316 ../../include/conversation.php:720
+#: ../../include/ItemObject.php:316 ../../include/conversation.php:731
 #, php-format
 msgid "Expires: %s"
 msgstr "Scadenza: %s"
@@ -1588,61 +1986,61 @@ msgstr "Aggiungi al calendario"
 msgid "Mark all seen"
 msgstr "Marca tutto come letto"
 
-#: ../../include/ItemObject.php:353 ../../mod/photos.php:1133
+#: ../../include/ItemObject.php:353 ../../mod/photos.php:1145
 msgctxt "noun"
 msgid "Likes"
 msgstr "Mi piace"
 
-#: ../../include/ItemObject.php:354 ../../mod/photos.php:1134
+#: ../../include/ItemObject.php:354 ../../mod/photos.php:1146
 msgctxt "noun"
 msgid "Dislikes"
 msgstr "Non mi piace"
 
 #: ../../include/ItemObject.php:359 ../../include/acl_selectors.php:249
-#: ../../mod/photos.php:1139
+#: ../../mod/photos.php:1151
 msgid "Close"
 msgstr "Chiudi"
 
-#: ../../include/ItemObject.php:364 ../../include/conversation.php:737
-#: ../../include/conversation.php:1206 ../../mod/photos.php:950
-#: ../../mod/editlayout.php:153 ../../mod/editwebpage.php:192
-#: ../../mod/editpost.php:130 ../../mod/editblock.php:155
+#: ../../include/ItemObject.php:364 ../../include/conversation.php:748
+#: ../../include/conversation.php:1220 ../../mod/editpost.php:123
+#: ../../mod/photos.php:962 ../../mod/editlayout.php:147
+#: ../../mod/editwebpage.php:192 ../../mod/editblock.php:149
 #: ../../mod/mail.php:241 ../../mod/mail.php:356
 msgid "Please wait"
 msgstr "Attendere"
 
-#: ../../include/ItemObject.php:665 ../../mod/photos.php:966
-#: ../../mod/photos.php:1084
+#: ../../include/ItemObject.php:665 ../../mod/photos.php:978
+#: ../../mod/photos.php:1096
 msgid "This is you"
 msgstr "Questo sei tu"
 
-#: ../../include/ItemObject.php:669 ../../include/conversation.php:1179
-#: ../../mod/editlayout.php:140 ../../mod/editwebpage.php:179
-#: ../../mod/editpost.php:114 ../../mod/editblock.php:141
+#: ../../include/ItemObject.php:669 ../../include/conversation.php:1192
+#: ../../mod/editpost.php:107 ../../mod/editlayout.php:134
+#: ../../mod/editwebpage.php:179 ../../mod/editblock.php:135
 msgid "Bold"
 msgstr "Grassetto"
 
-#: ../../include/ItemObject.php:670 ../../include/conversation.php:1180
-#: ../../mod/editlayout.php:141 ../../mod/editwebpage.php:180
-#: ../../mod/editpost.php:115 ../../mod/editblock.php:142
+#: ../../include/ItemObject.php:670 ../../include/conversation.php:1193
+#: ../../mod/editpost.php:108 ../../mod/editlayout.php:135
+#: ../../mod/editwebpage.php:180 ../../mod/editblock.php:136
 msgid "Italic"
 msgstr "Corsivo"
 
-#: ../../include/ItemObject.php:671 ../../include/conversation.php:1181
-#: ../../mod/editlayout.php:142 ../../mod/editwebpage.php:181
-#: ../../mod/editpost.php:116 ../../mod/editblock.php:143
+#: ../../include/ItemObject.php:671 ../../include/conversation.php:1194
+#: ../../mod/editpost.php:109 ../../mod/editlayout.php:136
+#: ../../mod/editwebpage.php:181 ../../mod/editblock.php:137
 msgid "Underline"
 msgstr "Sottolineato"
 
-#: ../../include/ItemObject.php:672 ../../include/conversation.php:1182
-#: ../../mod/editlayout.php:143 ../../mod/editwebpage.php:182
-#: ../../mod/editpost.php:117 ../../mod/editblock.php:144
+#: ../../include/ItemObject.php:672 ../../include/conversation.php:1195
+#: ../../mod/editpost.php:110 ../../mod/editlayout.php:137
+#: ../../mod/editwebpage.php:182 ../../mod/editblock.php:138
 msgid "Quote"
 msgstr "Citazione"
 
-#: ../../include/ItemObject.php:673 ../../include/conversation.php:1183
-#: ../../mod/editlayout.php:144 ../../mod/editwebpage.php:183
-#: ../../mod/editpost.php:118 ../../mod/editblock.php:145
+#: ../../include/ItemObject.php:673 ../../include/conversation.php:1196
+#: ../../mod/editpost.php:111 ../../mod/editlayout.php:138
+#: ../../mod/editwebpage.php:183 ../../mod/editblock.php:139
 msgid "Code"
 msgstr "Codice"
 
@@ -1658,8 +2056,8 @@ msgstr "Collegamento"
 msgid "Video"
 msgstr "Video"
 
-#: ../../include/ItemObject.php:680 ../../include/conversation.php:1233
-#: ../../mod/editpost.php:157 ../../mod/mail.php:247 ../../mod/mail.php:361
+#: ../../include/ItemObject.php:680 ../../include/conversation.php:1247
+#: ../../mod/editpost.php:151 ../../mod/mail.php:247 ../../mod/mail.php:361
 msgid "Encrypt text"
 msgstr "Crittografia del testo"
 
@@ -1671,7 +2069,7 @@ msgstr "Nuova finestra"
 msgid "Open the selected location in a different window or browser tab"
 msgstr "Apri l'indirizzo selezionato in una nuova scheda o finestra"
 
-#: ../../include/Contact.php:215 ../../mod/admin.php:730
+#: ../../include/Contact.php:212
 #, php-format
 msgid "User '%s' deleted"
 msgstr "Utente '%s' eliminato"
@@ -1680,357 +2078,11 @@ msgstr "Utente '%s' eliminato"
 msgid "Attachments:"
 msgstr "Allegati:"
 
-#: ../../include/bb2diaspora.php:453
-msgid "Hubzilla event notification:"
-msgstr "Notifica eventi Hubzilla:"
-
-#: ../../include/text.php:329
-msgid "prev"
-msgstr "prec"
-
-#: ../../include/text.php:331
-msgid "first"
-msgstr "inizio"
-
-#: ../../include/text.php:360
-msgid "last"
-msgstr "fine"
-
-#: ../../include/text.php:363
-msgid "next"
-msgstr "succ"
-
-#: ../../include/text.php:373
-msgid "older"
-msgstr "più recenti"
-
-#: ../../include/text.php:375
-msgid "newer"
-msgstr "più nuovi"
-
-#: ../../include/text.php:768
-msgid "No connections"
-msgstr "Nessun contatto"
-
-#: ../../include/text.php:782
-#, php-format
-msgid "%d Connection"
-msgid_plural "%d Connections"
-msgstr[0] "%d contatto"
-msgstr[1] "%d contatti"
-
-#: ../../include/text.php:795 ../../mod/viewconnections.php:104
-msgid "View Connections"
-msgstr "Elenco contatti"
-
-#: ../../include/text.php:852 ../../include/text.php:864
-#: ../../include/nav.php:165 ../../include/apps.php:147
-#: ../../mod/search.php:38
-msgid "Search"
-msgstr "Cerca"
-
-#: ../../include/text.php:928
-msgid "poke"
-msgstr "poke"
-
-#: ../../include/text.php:928 ../../include/conversation.php:243
-msgid "poked"
-msgstr "ha ricevuto un poke"
-
-#: ../../include/text.php:929
-msgid "ping"
-msgstr "ping"
-
-#: ../../include/text.php:929
-msgid "pinged"
-msgstr "ha ricevuto un ping"
-
-#: ../../include/text.php:930
-msgid "prod"
-msgstr "spintone"
-
-#: ../../include/text.php:930
-msgid "prodded"
-msgstr "ha ricevuto uno spintone"
-
-#: ../../include/text.php:931
-msgid "slap"
-msgstr "schiaffo"
-
-#: ../../include/text.php:931
-msgid "slapped"
-msgstr "ha ricevuto uno schiaffo"
-
-#: ../../include/text.php:932
-msgid "finger"
-msgstr "finger"
-
-#: ../../include/text.php:932
-msgid "fingered"
-msgstr "ha ricevuto un finger"
-
-#: ../../include/text.php:933
-msgid "rebuff"
-msgstr "rifiuto"
-
-#: ../../include/text.php:933
-msgid "rebuffed"
-msgstr "ha ricevuto un rifiuto"
-
-#: ../../include/text.php:943
-msgid "happy"
-msgstr "felice"
-
-#: ../../include/text.php:944
-msgid "sad"
-msgstr "triste"
-
-#: ../../include/text.php:945
-msgid "mellow"
-msgstr "calmo"
-
-#: ../../include/text.php:946
-msgid "tired"
-msgstr "stanco"
-
-#: ../../include/text.php:947
-msgid "perky"
-msgstr "vivace"
-
-#: ../../include/text.php:948
-msgid "angry"
-msgstr "arrabbiato"
-
-#: ../../include/text.php:949
-msgid "stupified"
-msgstr "stordito"
-
-#: ../../include/text.php:950
-msgid "puzzled"
-msgstr "confuso"
-
-#: ../../include/text.php:951
-msgid "interested"
-msgstr "attento"
-
-#: ../../include/text.php:952
-msgid "bitter"
-msgstr "amaro"
-
-#: ../../include/text.php:953
-msgid "cheerful"
-msgstr "allegro"
-
-#: ../../include/text.php:954
-msgid "alive"
-msgstr "vivace"
-
-#: ../../include/text.php:955
-msgid "annoyed"
-msgstr "seccato"
-
-#: ../../include/text.php:956
-msgid "anxious"
-msgstr "ansioso"
-
-#: ../../include/text.php:957
-msgid "cranky"
-msgstr "irritabile"
-
-#: ../../include/text.php:958
-msgid "disturbed"
-msgstr "turbato"
-
-#: ../../include/text.php:959
-msgid "frustrated"
-msgstr "frustrato"
-
-#: ../../include/text.php:960
-msgid "depressed"
-msgstr "in depressione"
-
-#: ../../include/text.php:961
-msgid "motivated"
-msgstr "motivato"
-
-#: ../../include/text.php:962
-msgid "relaxed"
-msgstr "rilassato"
-
-#: ../../include/text.php:963
-msgid "surprised"
-msgstr "sorpreso"
-
-#: ../../include/text.php:1135
-msgid "Monday"
-msgstr "lunedì"
-
-#: ../../include/text.php:1135
-msgid "Tuesday"
-msgstr "martedì"
-
-#: ../../include/text.php:1135
-msgid "Wednesday"
-msgstr "mercoledì"
-
-#: ../../include/text.php:1135
-msgid "Thursday"
-msgstr "giovedì"
-
-#: ../../include/text.php:1135
-msgid "Friday"
-msgstr "venerdì"
-
-#: ../../include/text.php:1135
-msgid "Saturday"
-msgstr "sabato"
-
-#: ../../include/text.php:1135
-msgid "Sunday"
-msgstr "domenica"
+#: ../../include/bb2diaspora.php:461
+msgid "$Projectname event notification:"
+msgstr "Notifica evento $Projectname:"
 
-#: ../../include/text.php:1139
-msgid "January"
-msgstr "gennaio"
-
-#: ../../include/text.php:1139
-msgid "February"
-msgstr "febbraio"
-
-#: ../../include/text.php:1139
-msgid "March"
-msgstr "marzo"
-
-#: ../../include/text.php:1139
-msgid "April"
-msgstr "aprile"
-
-#: ../../include/text.php:1139
-msgid "May"
-msgstr "maggio"
-
-#: ../../include/text.php:1139
-msgid "June"
-msgstr "giugno"
-
-#: ../../include/text.php:1139
-msgid "July"
-msgstr "luglio"
-
-#: ../../include/text.php:1139
-msgid "August"
-msgstr "agosto"
-
-#: ../../include/text.php:1139
-msgid "September"
-msgstr "settembre"
-
-#: ../../include/text.php:1139
-msgid "October"
-msgstr "ottobre"
-
-#: ../../include/text.php:1139
-msgid "November"
-msgstr "novembre"
-
-#: ../../include/text.php:1139
-msgid "December"
-msgstr "dicembre"
-
-#: ../../include/text.php:1236
-msgid "unknown.???"
-msgstr "sconosciuto???"
-
-#: ../../include/text.php:1237
-msgid "bytes"
-msgstr "byte"
-
-#: ../../include/text.php:1273
-msgid "remove category"
-msgstr "rimuovi la categoria"
-
-#: ../../include/text.php:1348
-msgid "remove from file"
-msgstr "rimuovi dal file"
-
-#: ../../include/text.php:1424 ../../include/text.php:1435
-#: ../../mod/connedit.php:661
-msgid "Click to open/close"
-msgstr "Clicca per aprire/chiudere"
-
-#: ../../include/text.php:1591 ../../mod/events.php:444
-msgid "Link to Source"
-msgstr "Link al sito d'origine"
-
-#: ../../include/text.php:1612 ../../include/text.php:1683
-msgid "default"
-msgstr "predefinito"
-
-#: ../../include/text.php:1620
-msgid "Page layout"
-msgstr "Layout della pagina"
-
-#: ../../include/text.php:1620
-msgid "You can create your own with the layouts tool"
-msgstr "Con gli strumenti di design puoi creare il tuo"
-
-#: ../../include/text.php:1661
-msgid "Page content type"
-msgstr "Tipo di contenuto della pagina"
-
-#: ../../include/text.php:1695
-msgid "Select an alternate language"
-msgstr "Seleziona una lingua diversa"
-
-#: ../../include/text.php:1814 ../../include/conversation.php:120
-#: ../../include/diaspora.php:2081 ../../mod/like.php:346
-#: ../../mod/subthread.php:72 ../../mod/subthread.php:174
-#: ../../mod/tagger.php:43
-msgid "photo"
-msgstr "la foto"
-
-#: ../../include/text.php:1817 ../../include/conversation.php:123
-#: ../../mod/like.php:348 ../../mod/tagger.php:47
-msgid "event"
-msgstr "l'evento"
-
-#: ../../include/text.php:1820 ../../include/conversation.php:148
-#: ../../include/diaspora.php:2081 ../../mod/like.php:346
-#: ../../mod/subthread.php:72 ../../mod/subthread.php:174
-#: ../../mod/tagger.php:51
-msgid "status"
-msgstr "il messaggio di stato"
-
-#: ../../include/text.php:1822 ../../include/conversation.php:150
-#: ../../mod/tagger.php:53
-msgid "comment"
-msgstr "il commento"
-
-#: ../../include/text.php:1827
-msgid "activity"
-msgstr "l'attività"
-
-#: ../../include/text.php:2122
-msgid "Design Tools"
-msgstr "Strumenti di design"
-
-#: ../../include/text.php:2125 ../../mod/blocks.php:143
-msgid "Blocks"
-msgstr "Riquadri"
-
-#: ../../include/text.php:2126 ../../mod/menu.php:95
-msgid "Menus"
-msgstr "Menù"
-
-#: ../../include/text.php:2127 ../../mod/layouts.php:169
-msgid "Layouts"
-msgstr "Layout"
-
-#: ../../include/text.php:2128
-msgid "Pages"
-msgstr "Pagine"
-
-#: ../../include/nav.php:87 ../../include/nav.php:120 ../../boot.php:1539
+#: ../../include/nav.php:87 ../../include/nav.php:120 ../../boot.php:1549
 msgid "Logout"
 msgstr "Esci"
 
@@ -2044,10 +2096,10 @@ msgstr "Bacheca"
 
 #: ../../include/nav.php:90
 msgid "Your posts and conversations"
-msgstr "I tuoi articoli e conversazioni"
+msgstr "I tuoi post e conversazioni"
 
-#: ../../include/nav.php:91 ../../include/conversation.php:942
-#: ../../mod/connedit.php:494 ../../mod/connedit.php:660
+#: ../../include/nav.php:91 ../../include/conversation.php:953
+#: ../../mod/connedit.php:510
 msgid "View Profile"
 msgstr "Profilo"
 
@@ -2063,7 +2115,7 @@ msgstr "Modifica i profili"
 msgid "Manage/Edit profiles"
 msgstr "Gestisci/modifica i profili"
 
-#: ../../include/nav.php:95 ../../include/identity.php:846
+#: ../../include/nav.php:95 ../../include/identity.php:979
 msgid "Edit Profile"
 msgstr "Modifica il profilo"
 
@@ -2071,7 +2123,7 @@ msgstr "Modifica il profilo"
 msgid "Edit your profile"
 msgstr "Modifica il profilo"
 
-#: ../../include/nav.php:97 ../../include/conversation.php:1597
+#: ../../include/nav.php:97 ../../include/conversation.php:1611
 #: ../../include/apps.php:139 ../../mod/fbrowser.php:25
 msgid "Photos"
 msgstr "Foto"
@@ -2092,7 +2144,7 @@ msgstr "Area chat"
 msgid "Your chatrooms"
 msgstr "Le tue aree chat"
 
-#: ../../include/nav.php:109 ../../include/conversation.php:1632
+#: ../../include/nav.php:109 ../../include/conversation.php:1646
 #: ../../include/apps.php:129
 msgid "Bookmarks"
 msgstr "Segnalibri"
@@ -2101,8 +2153,8 @@ msgstr "Segnalibri"
 msgid "Your bookmarks"
 msgstr "I tuoi segnalibri"
 
-#: ../../include/nav.php:113 ../../include/conversation.php:1642
-#: ../../include/apps.php:136 ../../mod/webpages.php:176
+#: ../../include/nav.php:113 ../../include/conversation.php:1656
+#: ../../include/apps.php:136 ../../mod/webpages.php:178
 msgid "Webpages"
 msgstr "Pagine web"
 
@@ -2110,7 +2162,7 @@ msgstr "Pagine web"
 msgid "Your webpages"
 msgstr "Le tue pagine web"
 
-#: ../../include/nav.php:117 ../../include/apps.php:131 ../../boot.php:1540
+#: ../../include/nav.php:117 ../../include/apps.php:131 ../../boot.php:1550
 msgid "Login"
 msgstr "Accedi"
 
@@ -2125,17 +2177,17 @@ msgstr "%s - clicca per uscire"
 
 #: ../../include/nav.php:137
 msgid "Remote authentication"
-msgstr "Autenticazione magica dal tuo server"
+msgstr "Accedi dal tuo hub"
 
 #: ../../include/nav.php:137
 msgid "Click to authenticate to your home hub"
-msgstr "Clicca per autenticarti sul tuo server principale"
+msgstr "Accedi tramite il tuo hub principale"
 
 #: ../../include/nav.php:151
 msgid "Home Page"
 msgstr "Bacheca"
 
-#: ../../include/nav.php:155 ../../mod/register.php:224 ../../boot.php:1516
+#: ../../include/nav.php:155 ../../mod/register.php:224 ../../boot.php:1526
 msgid "Register"
 msgstr "Iscriviti"
 
@@ -2144,7 +2196,7 @@ msgid "Create an account"
 msgstr "Crea un account"
 
 #: ../../include/nav.php:160 ../../include/apps.php:142 ../../mod/help.php:67
-#: ../../mod/help.php:72 ../../mod/layouts.php:171
+#: ../../mod/help.php:72 ../../mod/layouts.php:176
 msgid "Help"
 msgstr "Guida"
 
@@ -2161,7 +2213,6 @@ msgid "Search site content"
 msgstr "Cerca nel sito"
 
 #: ../../include/nav.php:168 ../../include/apps.php:141
-#: ../../mod/directory.php:366
 msgid "Directory"
 msgstr "Elenco pubblico"
 
@@ -2171,7 +2222,7 @@ msgstr "Elenco pubblico canali"
 
 #: ../../include/nav.php:180 ../../include/apps.php:133
 msgid "Matrix"
-msgstr "Hubzilla"
+msgstr "RedMatrix"
 
 #: ../../include/nav.php:180
 msgid "Your matrix"
@@ -2193,7 +2244,7 @@ msgstr "Bacheca del canale"
 msgid "Mark all channel notifications seen"
 msgstr "Segna come lette le notifiche del canale"
 
-#: ../../include/nav.php:187 ../../mod/connections.php:407
+#: ../../include/nav.php:187 ../../mod/connections.php:267
 msgid "Connections"
 msgstr "Contatti"
 
@@ -2238,7 +2289,7 @@ msgid "Outbox"
 msgstr "Inviati"
 
 #: ../../include/nav.php:202 ../../include/apps.php:140
-#: ../../mod/events.php:472
+#: ../../mod/events.php:503
 msgid "Events"
 msgstr "Eventi"
 
@@ -2275,7 +2326,7 @@ msgstr "Amministrazione"
 msgid "Site Setup and Configuration"
 msgstr "Installazione e configurazione del sito"
 
-#: ../../include/nav.php:247 ../../include/conversation.php:850
+#: ../../include/nav.php:247 ../../include/conversation.php:861
 msgid "Loading..."
 msgstr "Caricamento in corso..."
 
@@ -2342,167 +2393,15 @@ msgstr "Guarda %2$s di %1$s "
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr "%1$s ha aggiornato %2$s cambiando %3$s."
 
-#: ../../include/bbcode.php:122 ../../include/bbcode.php:735
-#: ../../include/bbcode.php:738 ../../include/bbcode.php:743
-#: ../../include/bbcode.php:746 ../../include/bbcode.php:749
-#: ../../include/bbcode.php:752 ../../include/bbcode.php:757
-#: ../../include/bbcode.php:760 ../../include/bbcode.php:765
-#: ../../include/bbcode.php:768 ../../include/bbcode.php:771
-#: ../../include/bbcode.php:774
-msgid "Image/photo"
-msgstr "Immagine"
-
-#: ../../include/bbcode.php:161 ../../include/bbcode.php:785
-msgid "Encrypted content"
-msgstr "Contenuto crittografato"
-
-#: ../../include/bbcode.php:177
-msgid "Install design element: "
-msgstr "Installa il componente di design:"
-
-#: ../../include/bbcode.php:190
-msgid "QR code"
-msgstr "QR code"
-
-#: ../../include/bbcode.php:241
-#, php-format
-msgid "%1$s wrote the following %2$s %3$s"
-msgstr "%1$s ha scritto %2$s %3$s"
-
-#: ../../include/bbcode.php:243
-msgid "post"
-msgstr "l'articolo"
-
-#: ../../include/bbcode.php:485
-msgid "Different viewers will see this text differently"
-msgstr "Ad altri questo testo potrebbe apparire in modo differente"
-
-#: ../../include/bbcode.php:696
-msgid "$1 spoiler"
-msgstr "$1 spoiler"
-
-#: ../../include/bbcode.php:723
-msgid "$1 wrote:"
-msgstr "$1 ha scritto:"
-
-#: ../../include/items.php:399 ../../mod/like.php:270
-#: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/profperm.php:23
-#: ../../mod/bulksetclose.php:11 ../../index.php:392
-msgid "Permission denied"
-msgstr "Permesso negato"
-
-#: ../../include/items.php:1012 ../../include/items.php:1058
-msgid "(Unknown)"
-msgstr "(Sconosciuto)"
-
-#: ../../include/items.php:1226
-msgid "Visible to anybody on the internet."
-msgstr "Visibile a chiunque su internet."
-
-#: ../../include/items.php:1228
-msgid "Visible to you only."
-msgstr "Visibile solo a te."
-
-#: ../../include/items.php:1230
-msgid "Visible to anybody in this network."
-msgstr "Visibile a tutti su questa rete."
-
-#: ../../include/items.php:1232
-msgid "Visible to anybody authenticated."
-msgstr "Visibile a chiunque sia autenticato."
-
-#: ../../include/items.php:1234
-#, php-format
-msgid "Visible to anybody on %s."
-msgstr "Visibile a tutti in %s."
-
-#: ../../include/items.php:1236
-msgid "Visible to all connections."
-msgstr "Visibile a tutti coloro che ti seguono."
-
-#: ../../include/items.php:1238
-msgid "Visible to approved connections."
-msgstr "Visibile ai contatti approvati."
-
-#: ../../include/items.php:1240
-msgid "Visible to specific connections."
-msgstr "Visibile ad alcuni contatti scelti."
-
-#: ../../include/items.php:4051 ../../mod/thing.php:74
-#: ../../mod/display.php:36 ../../mod/filestorage.php:27
-#: ../../mod/viewsrc.php:20 ../../mod/admin.php:167 ../../mod/admin.php:984
-#: ../../mod/admin.php:1184
-msgid "Item not found."
-msgstr "Elemento non trovato."
-
-#: ../../include/items.php:4124 ../../include/photos.php:26
-#: ../../include/attach.php:136 ../../include/attach.php:183
-#: ../../include/attach.php:246 ../../include/attach.php:260
-#: ../../include/attach.php:304 ../../include/attach.php:318
-#: ../../include/attach.php:343 ../../include/attach.php:539
-#: ../../include/attach.php:611 ../../include/chat.php:131
-#: ../../mod/profile.php:64 ../../mod/profile.php:72
-#: ../../mod/achievements.php:30 ../../mod/manage.php:6
-#: ../../mod/settings.php:564 ../../mod/api.php:26 ../../mod/api.php:31
-#: ../../mod/thing.php:241 ../../mod/thing.php:256 ../../mod/thing.php:290
-#: ../../mod/profile_photo.php:264 ../../mod/profile_photo.php:277
-#: ../../mod/block.php:22 ../../mod/block.php:72 ../../mod/like.php:178
-#: ../../mod/events.php:219 ../../mod/group.php:9 ../../mod/setup.php:207
-#: ../../mod/common.php:35 ../../mod/connections.php:169
-#: ../../mod/photos.php:68 ../../mod/pdledit.php:21 ../../mod/authtest.php:13
-#: ../../mod/editlayout.php:64 ../../mod/editlayout.php:89
-#: ../../mod/chat.php:90 ../../mod/chat.php:95 ../../mod/editwebpage.php:64
-#: ../../mod/editwebpage.php:86 ../../mod/editwebpage.php:101
-#: ../../mod/editwebpage.php:125 ../../mod/rate.php:110
-#: ../../mod/editpost.php:13 ../../mod/invite.php:13 ../../mod/invite.php:104
-#: ../../mod/locs.php:77 ../../mod/sources.php:66 ../../mod/menu.php:69
-#: ../../mod/filestorage.php:18 ../../mod/filestorage.php:73
-#: ../../mod/filestorage.php:88 ../../mod/filestorage.php:115
-#: ../../mod/fsuggest.php:78 ../../mod/poke.php:128 ../../mod/webpages.php:69
-#: ../../mod/profiles.php:188 ../../mod/profiles.php:576
-#: ../../mod/viewsrc.php:14 ../../mod/mitem.php:115
-#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27
-#: ../../mod/editblock.php:65 ../../mod/register.php:72 ../../mod/item.php:206
-#: ../../mod/item.php:214 ../../mod/item.php:962 ../../mod/blocks.php:69
-#: ../../mod/blocks.php:76 ../../mod/id.php:71 ../../mod/message.php:16
-#: ../../mod/layouts.php:69 ../../mod/layouts.php:76 ../../mod/layouts.php:87
-#: ../../mod/mood.php:111 ../../mod/connedit.php:331 ../../mod/mail.php:114
-#: ../../mod/notifications.php:66 ../../mod/regmod.php:17
-#: ../../mod/new_channel.php:68 ../../mod/new_channel.php:99
-#: ../../mod/appman.php:66 ../../mod/network.php:12 ../../mod/page.php:28
-#: ../../mod/page.php:79 ../../mod/bookmarks.php:46 ../../mod/channel.php:100
-#: ../../mod/channel.php:219 ../../mod/channel.php:262
-#: ../../mod/suggest.php:26 ../../mod/service_limits.php:7
-#: ../../mod/sharedwithme.php:7 ../../index.php:190 ../../index.php:393
-msgid "Permission denied."
-msgstr "Permesso negato."
-
-#: ../../include/items.php:4524 ../../mod/group.php:38 ../../mod/group.php:140
-#: ../../mod/bulksetclose.php:51
-msgid "Collection not found."
-msgstr "Insieme di canali non trovato."
-
-#: ../../include/items.php:4540
-msgid "Collection is empty."
-msgstr "L'insieme di canali è vuoto."
-
-#: ../../include/items.php:4547
-#, php-format
-msgid "Collection: %s"
-msgstr "Insieme: %s"
-
-#: ../../include/items.php:4557
-#, php-format
-msgid "Connection: %s"
-msgstr "Contatto: %s"
-
-#: ../../include/items.php:4559
-msgid "Connection not found."
-msgstr "Contatto non trovato."
+#: ../../include/security.php:349
+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 "I controlli di sicurezza sono falliti. Probabilmente è accaduto perché la pagina è stata tenuta aperta troppo a lungo (ore?) prima di inviare il contenuto."
 
 #: ../../include/permissions.php:26
 msgid "Can view my normal stream and posts"
-msgstr "Può vedere i miei contenuti e articoli normali"
+msgstr "Può vedere i miei contenuti e i post normali"
 
 #: ../../include/permissions.php:27
 msgid "Can view my default channel profile"
@@ -2534,7 +2433,7 @@ msgstr "Può scrivere sulla bacheca del mio canale"
 
 #: ../../include/permissions.php:36
 msgid "Can comment on or like my posts"
-msgstr "Può commentare o aggiungere \"mi piace\" ai miei articoli"
+msgstr "Può commentare o aggiungere \"mi piace\" ai miei post"
 
 #: ../../include/permissions.php:37
 msgid "Can send me private mail messages"
@@ -2550,11 +2449,11 @@ msgstr "Può aggiungere \"mi piace\""
 
 #: ../../include/permissions.php:39
 msgid "Profiles and things other than posts/comments"
-msgstr "Profili e tutto ciò che non è articoli e commenti"
+msgstr "Profili e tutto ciò che non è post o commenti"
 
 #: ../../include/permissions.php:41
 msgid "Can forward to all my channel contacts via post @mentions"
-msgstr "Può inoltrare articoli a tutti i contatti del canale tramite una @menzione"
+msgstr "Può inoltrare post a tutti i contatti del canale tramite una @menzione"
 
 #: ../../include/permissions.php:41
 msgid "Advanced - useful for creating group forum channels"
@@ -2574,7 +2473,7 @@ msgstr "Può modificare le mie pagine web"
 
 #: ../../include/permissions.php:46
 msgid "Can source my public posts in derived channels"
-msgstr "Può usare i miei articoli pubblici per creare canali derivati"
+msgstr "Può usare i miei post pubblici per creare canali derivati"
 
 #: ../../include/permissions.php:46
 msgid "Somewhat advanced - very useful in open communities"
@@ -2589,52 +2488,52 @@ msgid ""
 "Extremely advanced. Leave this alone unless you know what you are doing"
 msgstr "Impostazione pericolosa - lasciare il valore predefinito se non si è assolutamente sicuri"
 
-#: ../../include/permissions.php:809
+#: ../../include/permissions.php:893
 msgid "Social Networking"
 msgstr "Social network"
 
-#: ../../include/permissions.php:809 ../../include/permissions.php:810
-#: ../../include/permissions.php:811
+#: ../../include/permissions.php:893 ../../include/permissions.php:894
+#: ../../include/permissions.php:895
 msgid "Mostly Public"
 msgstr "Prevalentemente pubblico"
 
-#: ../../include/permissions.php:809 ../../include/permissions.php:810
-#: ../../include/permissions.php:811
+#: ../../include/permissions.php:893 ../../include/permissions.php:894
+#: ../../include/permissions.php:895
 msgid "Restricted"
 msgstr "Con restrizioni"
 
-#: ../../include/permissions.php:809 ../../include/permissions.php:810
+#: ../../include/permissions.php:893 ../../include/permissions.php:894
 msgid "Private"
 msgstr "Privato"
 
-#: ../../include/permissions.php:810
+#: ../../include/permissions.php:894
 msgid "Community Forum"
 msgstr "Forum di discussione"
 
-#: ../../include/permissions.php:811
+#: ../../include/permissions.php:895
 msgid "Feed Republish"
 msgstr "Aggregatore di feed esterni"
 
-#: ../../include/permissions.php:812
+#: ../../include/permissions.php:896
 msgid "Special Purpose"
 msgstr "Per finalità speciali"
 
-#: ../../include/permissions.php:812
+#: ../../include/permissions.php:896
 msgid "Celebrity/Soapbox"
 msgstr "Pagina per fan"
 
-#: ../../include/permissions.php:812
+#: ../../include/permissions.php:896
 msgid "Group Repository"
 msgstr "Repository di gruppo"
 
-#: ../../include/permissions.php:813 ../../include/profile_selectors.php:6
+#: ../../include/permissions.php:897 ../../include/profile_selectors.php:6
 #: ../../include/profile_selectors.php:23
 #: ../../include/profile_selectors.php:61
 #: ../../include/profile_selectors.php:97
 msgid "Other"
 msgstr "Altro"
 
-#: ../../include/permissions.php:813
+#: ../../include/permissions.php:897
 msgid "Custom/Expert Mode"
 msgstr "Personalizzazione per esperti"
 
@@ -2642,13 +2541,7 @@ msgstr "Personalizzazione per esperti"
 msgid "channel"
 msgstr "canale"
 
-#: ../../include/conversation.php:164 ../../include/diaspora.php:2110
-#: ../../mod/like.php:394
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
-msgstr "A %1$s piace %3$s di %2$s"
-
-#: ../../include/conversation.php:167 ../../mod/like.php:396
+#: ../../include/conversation.php:167 ../../mod/like.php:399
 #, php-format
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr "A %1$s non piace %3$s di %2$s"
@@ -2669,479 +2562,572 @@ msgctxt "mood"
 msgid "%1$s is %2$s"
 msgstr "%1$s è %2$s"
 
-#: ../../include/conversation.php:572 ../../mod/photos.php:984
+#: ../../include/conversation.php:583 ../../mod/photos.php:996
 msgctxt "title"
 msgid "Likes"
 msgstr "Mi piace"
 
-#: ../../include/conversation.php:572 ../../mod/photos.php:984
+#: ../../include/conversation.php:583 ../../mod/photos.php:996
 msgctxt "title"
 msgid "Dislikes"
 msgstr "Non mi piace"
 
-#: ../../include/conversation.php:573 ../../mod/photos.php:985
+#: ../../include/conversation.php:584 ../../mod/photos.php:997
 msgctxt "title"
 msgid "Agree"
 msgstr "D'accordo"
 
-#: ../../include/conversation.php:573 ../../mod/photos.php:985
+#: ../../include/conversation.php:584 ../../mod/photos.php:997
 msgctxt "title"
 msgid "Disagree"
 msgstr "Non d'accordo"
 
-#: ../../include/conversation.php:573 ../../mod/photos.php:985
+#: ../../include/conversation.php:584 ../../mod/photos.php:997
 msgctxt "title"
 msgid "Abstain"
 msgstr "Astenuti"
 
-#: ../../include/conversation.php:574 ../../mod/photos.php:986
+#: ../../include/conversation.php:585 ../../mod/photos.php:998
 msgctxt "title"
 msgid "Attending"
 msgstr "Partecipano"
 
-#: ../../include/conversation.php:574 ../../mod/photos.php:986
+#: ../../include/conversation.php:585 ../../mod/photos.php:998
 msgctxt "title"
 msgid "Not attending"
 msgstr "Non partecipano"
 
-#: ../../include/conversation.php:574 ../../mod/photos.php:986
+#: ../../include/conversation.php:585 ../../mod/photos.php:998
 msgctxt "title"
 msgid "Might attend"
 msgstr "Forse partecipano"
 
-#: ../../include/conversation.php:692
+#: ../../include/conversation.php:703
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr "Vedi il profilo di %s @ %s"
 
-#: ../../include/conversation.php:707
+#: ../../include/conversation.php:718
 msgid "Categories:"
 msgstr "Categorie:"
 
-#: ../../include/conversation.php:708
+#: ../../include/conversation.php:719
 msgid "Filed under:"
 msgstr "Classificato come:"
 
-#: ../../include/conversation.php:735
+#: ../../include/conversation.php:746
 msgid "View in context"
 msgstr "Vedi nel contesto"
 
-#: ../../include/conversation.php:846
+#: ../../include/conversation.php:857
 msgid "remove"
 msgstr "rimuovi"
 
-#: ../../include/conversation.php:851
+#: ../../include/conversation.php:862
 msgid "Delete Selected Items"
 msgstr "Elimina gli oggetti selezionati"
 
-#: ../../include/conversation.php:939
+#: ../../include/conversation.php:950
 msgid "View Source"
 msgstr "Vedi il sorgente"
 
-#: ../../include/conversation.php:940
+#: ../../include/conversation.php:951
 msgid "Follow Thread"
 msgstr "Segui la discussione"
 
-#: ../../include/conversation.php:941
+#: ../../include/conversation.php:952
 msgid "View Status"
 msgstr "Guarda il messaggio di stato"
 
-#: ../../include/conversation.php:943
+#: ../../include/conversation.php:954
 msgid "View Photos"
 msgstr "Guarda le foto"
 
-#: ../../include/conversation.php:944
+#: ../../include/conversation.php:955
 msgid "Matrix Activity"
 msgstr "Attività nella tua rete"
 
-#: ../../include/conversation.php:946
+#: ../../include/conversation.php:957
 msgid "Edit Contact"
 msgstr "Modifica il contatto"
 
-#: ../../include/conversation.php:947
+#: ../../include/conversation.php:958
 msgid "Send PM"
 msgstr "Invia messaggio privato"
 
-#: ../../include/conversation.php:948 ../../include/apps.php:145
+#: ../../include/conversation.php:959 ../../include/apps.php:145
 msgid "Poke"
 msgstr "Poke"
 
-#: ../../include/conversation.php:1062
+#: ../../include/conversation.php:1073
 #, php-format
 msgid "%s likes this."
 msgstr "Piace a %s."
 
-#: ../../include/conversation.php:1062
+#: ../../include/conversation.php:1073
 #, php-format
 msgid "%s doesn't like this."
 msgstr "Non piace a %s."
 
-#: ../../include/conversation.php:1066
+#: ../../include/conversation.php:1077
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgid_plural "<span  %1$s>%2$d people</span> like this."
 msgstr[0] ""
 msgstr[1] "Piace a <span %1$s>%2$d persone</span>."
 
-#: ../../include/conversation.php:1068
+#: ../../include/conversation.php:1079
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this."
 msgid_plural "<span  %1$s>%2$d people</span> don't like this."
 msgstr[0] ""
 msgstr[1] "Non piace a <span %1$s>%2$d persone</span>."
 
-#: ../../include/conversation.php:1074
+#: ../../include/conversation.php:1085
 msgid "and"
 msgstr "e"
 
-#: ../../include/conversation.php:1077
+#: ../../include/conversation.php:1088
 #, php-format
 msgid ", and %d other people"
 msgid_plural ", and %d other people"
 msgstr[0] ""
 msgstr[1] "e altre %d persone"
 
-#: ../../include/conversation.php:1078
+#: ../../include/conversation.php:1089
 #, php-format
 msgid "%s like this."
 msgstr "Piace a %s."
 
-#: ../../include/conversation.php:1078
+#: ../../include/conversation.php:1089
 #, php-format
 msgid "%s don't like this."
 msgstr "Non piace a %s."
 
-#: ../../include/conversation.php:1138
+#: ../../include/conversation.php:1151
 msgid "Visible to <strong>everybody</strong>"
 msgstr "Visibile a <strong>tutti</strong>"
 
-#: ../../include/conversation.php:1139 ../../mod/mail.php:174
+#: ../../include/conversation.php:1152 ../../mod/mail.php:174
 #: ../../mod/mail.php:289
 msgid "Please enter a link URL:"
 msgstr "Inserisci l'indirizzo del link:"
 
-#: ../../include/conversation.php:1140
+#: ../../include/conversation.php:1153
 msgid "Please enter a video link/URL:"
 msgstr "Inserisci l'indirizzo del video:"
 
-#: ../../include/conversation.php:1141
+#: ../../include/conversation.php:1154
 msgid "Please enter an audio link/URL:"
 msgstr "Inserisci l'indirizzo dell'audio:"
 
-#: ../../include/conversation.php:1142
+#: ../../include/conversation.php:1155
 msgid "Tag term:"
 msgstr "Tag:"
 
-#: ../../include/conversation.php:1143 ../../mod/filer.php:49
+#: ../../include/conversation.php:1156 ../../mod/filer.php:49
 msgid "Save to Folder:"
 msgstr "Salva nella cartella:"
 
-#: ../../include/conversation.php:1144
+#: ../../include/conversation.php:1157
 msgid "Where are you right now?"
 msgstr "Dove sei ora?"
 
-#: ../../include/conversation.php:1145 ../../mod/editpost.php:52
+#: ../../include/conversation.php:1158 ../../mod/editpost.php:47
 #: ../../mod/mail.php:175 ../../mod/mail.php:290
 msgid "Expires YYYY-MM-DD HH:MM"
 msgstr "Scade il YYYY-MM-DD HH:MM"
 
-#: ../../include/conversation.php:1172 ../../mod/photos.php:949
-#: ../../mod/editlayout.php:197 ../../mod/webpages.php:180
-#: ../../mod/blocks.php:149 ../../mod/layouts.php:175
+#: ../../include/conversation.php:1185 ../../mod/webpages.php:182
+#: ../../mod/blocks.php:154 ../../mod/photos.php:961 ../../mod/layouts.php:184
 msgid "Share"
 msgstr "Condividi"
 
-#: ../../include/conversation.php:1174
+#: ../../include/conversation.php:1187
 msgid "Page link name"
 msgstr "Nome del link alla pagina"
 
-#: ../../include/conversation.php:1177
+#: ../../include/conversation.php:1190
 msgid "Post as"
 msgstr "Pubblica come "
 
-#: ../../include/conversation.php:1184 ../../mod/editlayout.php:145
-#: ../../mod/editwebpage.php:184 ../../mod/editpost.php:119
-#: ../../mod/editblock.php:147 ../../mod/mail.php:238 ../../mod/mail.php:352
+#: ../../include/conversation.php:1197 ../../mod/editpost.php:112
+#: ../../mod/editlayout.php:139 ../../mod/editwebpage.php:184
+#: ../../mod/editblock.php:141 ../../mod/mail.php:238 ../../mod/mail.php:352
 msgid "Upload photo"
 msgstr "Carica foto"
 
-#: ../../include/conversation.php:1185
+#: ../../include/conversation.php:1198
 msgid "upload photo"
 msgstr "carica foto"
 
-#: ../../include/conversation.php:1186 ../../mod/editlayout.php:146
-#: ../../mod/editwebpage.php:185 ../../mod/editpost.php:120
-#: ../../mod/editblock.php:148 ../../mod/mail.php:239 ../../mod/mail.php:353
+#: ../../include/conversation.php:1199 ../../mod/editpost.php:113
+#: ../../mod/editlayout.php:140 ../../mod/editwebpage.php:185
+#: ../../mod/editblock.php:142 ../../mod/mail.php:239 ../../mod/mail.php:353
 msgid "Attach file"
 msgstr "Allega file"
 
-#: ../../include/conversation.php:1187
+#: ../../include/conversation.php:1200
 msgid "attach file"
 msgstr "allega file"
 
-#: ../../include/conversation.php:1188 ../../mod/editlayout.php:147
-#: ../../mod/editwebpage.php:186 ../../mod/editpost.php:121
-#: ../../mod/editblock.php:149 ../../mod/mail.php:240 ../../mod/mail.php:354
+#: ../../include/conversation.php:1201 ../../mod/editpost.php:114
+#: ../../mod/editlayout.php:141 ../../mod/editwebpage.php:186
+#: ../../mod/editblock.php:143 ../../mod/mail.php:240 ../../mod/mail.php:354
 msgid "Insert web link"
 msgstr "Inserisci un indirizzo web"
 
-#: ../../include/conversation.php:1189
+#: ../../include/conversation.php:1202
 msgid "web link"
 msgstr "link web"
 
-#: ../../include/conversation.php:1190
+#: ../../include/conversation.php:1203
 msgid "Insert video link"
 msgstr "Inserisci l'indirizzo di un video"
 
-#: ../../include/conversation.php:1191
+#: ../../include/conversation.php:1204
 msgid "video link"
 msgstr "link video"
 
-#: ../../include/conversation.php:1192
+#: ../../include/conversation.php:1205
 msgid "Insert audio link"
 msgstr "Inserisci l'indirizzo di un audio"
 
-#: ../../include/conversation.php:1193
+#: ../../include/conversation.php:1206
 msgid "audio link"
 msgstr "link audio"
 
-#: ../../include/conversation.php:1194 ../../mod/editlayout.php:151
-#: ../../mod/editwebpage.php:190 ../../mod/editpost.php:125
-#: ../../mod/editblock.php:153
+#: ../../include/conversation.php:1207 ../../mod/editpost.php:118
+#: ../../mod/editlayout.php:145 ../../mod/editwebpage.php:190
+#: ../../mod/editblock.php:147
 msgid "Set your location"
 msgstr "La tua località"
 
-#: ../../include/conversation.php:1195
+#: ../../include/conversation.php:1208
 msgid "set location"
 msgstr "la tua località"
 
-#: ../../include/conversation.php:1196 ../../mod/editpost.php:127
+#: ../../include/conversation.php:1209 ../../mod/editpost.php:120
 msgid "Toggle voting"
 msgstr "Abilita/disabilita il voto"
 
-#: ../../include/conversation.php:1199 ../../mod/editlayout.php:152
-#: ../../mod/editwebpage.php:191 ../../mod/editpost.php:126
-#: ../../mod/editblock.php:154
+#: ../../include/conversation.php:1212 ../../mod/editpost.php:119
+#: ../../mod/editlayout.php:146 ../../mod/editwebpage.php:191
+#: ../../mod/editblock.php:148
 msgid "Clear browser location"
 msgstr "Rimuovi la località data dal browser"
 
-#: ../../include/conversation.php:1200
+#: ../../include/conversation.php:1213
 msgid "clear location"
 msgstr "rimuovi la località"
 
-#: ../../include/conversation.php:1202 ../../mod/editlayout.php:164
-#: ../../mod/editwebpage.php:207 ../../mod/editpost.php:141
-#: ../../mod/editblock.php:167
+#: ../../include/conversation.php:1215 ../../mod/editpost.php:135
+#: ../../mod/editwebpage.php:207 ../../mod/editblock.php:161
 msgid "Title (optional)"
 msgstr "Titolo (opzionale)"
 
-#: ../../include/conversation.php:1205 ../../mod/editlayout.php:167
-#: ../../mod/editwebpage.php:209 ../../mod/editpost.php:143
-#: ../../mod/editblock.php:170
+#: ../../include/conversation.php:1219 ../../mod/editpost.php:137
+#: ../../mod/editlayout.php:162 ../../mod/editwebpage.php:209
+#: ../../mod/editblock.php:164
 msgid "Categories (optional, comma-separated list)"
 msgstr "Categorie (lista separata da virgole)"
 
-#: ../../include/conversation.php:1207 ../../mod/editlayout.php:154
-#: ../../mod/editwebpage.php:193 ../../mod/editpost.php:131
-#: ../../mod/editblock.php:156
+#: ../../include/conversation.php:1221 ../../mod/editpost.php:124
+#: ../../mod/editlayout.php:148 ../../mod/editwebpage.php:193
+#: ../../mod/editblock.php:150
 msgid "Permission settings"
 msgstr "Impostazioni permessi"
 
-#: ../../include/conversation.php:1208
+#: ../../include/conversation.php:1222
 msgid "permissions"
 msgstr "permessi"
 
-#: ../../include/conversation.php:1216 ../../mod/editlayout.php:161
-#: ../../mod/editwebpage.php:202 ../../mod/editpost.php:138
-#: ../../mod/editblock.php:164
+#: ../../include/conversation.php:1230 ../../mod/editpost.php:132
+#: ../../mod/editlayout.php:155 ../../mod/editwebpage.php:202
+#: ../../mod/editblock.php:158
 msgid "Public post"
-msgstr "Articolo pubblico"
+msgstr "Post pubblico"
 
-#: ../../include/conversation.php:1218 ../../mod/editlayout.php:168
-#: ../../mod/editwebpage.php:210 ../../mod/editpost.php:144
-#: ../../mod/editblock.php:171
+#: ../../include/conversation.php:1232 ../../mod/editpost.php:138
+#: ../../mod/editlayout.php:163 ../../mod/editwebpage.php:210
+#: ../../mod/editblock.php:165
 msgid "Example: bob@example.com, mary@example.com"
 msgstr "Per esempio: mario@esempio.com, simona@esempio.com"
 
-#: ../../include/conversation.php:1231 ../../mod/editlayout.php:177
-#: ../../mod/editwebpage.php:219 ../../mod/editpost.php:155
-#: ../../mod/editblock.php:181 ../../mod/mail.php:245 ../../mod/mail.php:359
+#: ../../include/conversation.php:1245 ../../mod/editpost.php:149
+#: ../../mod/editlayout.php:172 ../../mod/editwebpage.php:219
+#: ../../mod/editblock.php:175 ../../mod/mail.php:245 ../../mod/mail.php:359
 msgid "Set expiration date"
 msgstr "Data di scadenza"
 
-#: ../../include/conversation.php:1235 ../../mod/events.php:637
-#: ../../mod/editpost.php:159
+#: ../../include/conversation.php:1249 ../../mod/events.php:674
+#: ../../mod/editpost.php:153
 msgid "OK"
 msgstr "OK"
 
-#: ../../include/conversation.php:1236 ../../mod/settings.php:583
-#: ../../mod/settings.php:609 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134
-#: ../../mod/events.php:636 ../../mod/fbrowser.php:82
-#: ../../mod/fbrowser.php:117 ../../mod/editpost.php:160
+#: ../../include/conversation.php:1250 ../../mod/tagrm.php:11
+#: ../../mod/tagrm.php:134 ../../mod/events.php:673 ../../mod/fbrowser.php:82
+#: ../../mod/fbrowser.php:117 ../../mod/editpost.php:154
+#: ../../mod/settings.php:589 ../../mod/settings.php:615
 msgid "Cancel"
 msgstr "Annulla"
 
-#: ../../include/conversation.php:1478
+#: ../../include/conversation.php:1492
 msgid "Discover"
 msgstr "Scopri"
 
-#: ../../include/conversation.php:1481
+#: ../../include/conversation.php:1495
 msgid "Imported public streams"
 msgstr "Contenuti pubblici importati"
 
-#: ../../include/conversation.php:1486
+#: ../../include/conversation.php:1500
 msgid "Commented Order"
 msgstr "Ultimi commenti"
 
-#: ../../include/conversation.php:1489
+#: ../../include/conversation.php:1503
 msgid "Sort by Comment Date"
 msgstr "Per data del commento"
 
-#: ../../include/conversation.php:1493
+#: ../../include/conversation.php:1507
 msgid "Posted Order"
-msgstr "Ultimi articoli"
+msgstr "Ultimi post"
 
-#: ../../include/conversation.php:1496
+#: ../../include/conversation.php:1510
 msgid "Sort by Post Date"
 msgstr "Per data di creazione"
 
-#: ../../include/conversation.php:1504
+#: ../../include/conversation.php:1518
 msgid "Posts that mention or involve you"
-msgstr "Articoli che ti riguardano o ti menzionano"
+msgstr "Post che ti riguardano o ti menzionano"
 
-#: ../../include/conversation.php:1510 ../../mod/connections.php:212
-#: ../../mod/connections.php:225 ../../mod/menu.php:102
+#: ../../include/conversation.php:1524 ../../mod/connections.php:72
+#: ../../mod/connections.php:85 ../../mod/menu.php:110
 msgid "New"
 msgstr "Novità"
 
-#: ../../include/conversation.php:1513
+#: ../../include/conversation.php:1527
 msgid "Activity Stream - by date"
 msgstr "Elenco attività - per data"
 
-#: ../../include/conversation.php:1519
+#: ../../include/conversation.php:1533
 msgid "Starred"
 msgstr "Preferiti"
 
-#: ../../include/conversation.php:1522
+#: ../../include/conversation.php:1536
 msgid "Favourite Posts"
-msgstr "Articoli preferiti"
+msgstr "Post preferiti"
 
-#: ../../include/conversation.php:1529
+#: ../../include/conversation.php:1543
 msgid "Spam"
 msgstr "Spam"
 
-#: ../../include/conversation.php:1532
+#: ../../include/conversation.php:1546
 msgid "Posts flagged as SPAM"
-msgstr "Articoli marcati come spam"
+msgstr "Post marcati come spam"
 
-#: ../../include/conversation.php:1576 ../../mod/admin.php:952
+#: ../../include/conversation.php:1590 ../../mod/admin.php:993
 msgid "Channel"
 msgstr "Canale"
 
-#: ../../include/conversation.php:1579
+#: ../../include/conversation.php:1593
 msgid "Status Messages and Posts"
-msgstr "Articoli e messaggi di stato"
+msgstr "Post e messaggi di stato"
 
-#: ../../include/conversation.php:1588
+#: ../../include/conversation.php:1602
 msgid "About"
 msgstr "Informazioni"
 
-#: ../../include/conversation.php:1591
+#: ../../include/conversation.php:1605
 msgid "Profile Details"
 msgstr "Dettagli del profilo"
 
-#: ../../include/conversation.php:1600 ../../include/photos.php:359
+#: ../../include/conversation.php:1614 ../../include/photos.php:359
 msgid "Photo Albums"
 msgstr "Album foto"
 
-#: ../../include/conversation.php:1609
+#: ../../include/conversation.php:1623
 msgid "Files and Storage"
 msgstr "Archivio file"
 
-#: ../../include/conversation.php:1619 ../../include/conversation.php:1622
+#: ../../include/conversation.php:1633 ../../include/conversation.php:1636
 msgid "Chatrooms"
 msgstr "Area chat"
 
-#: ../../include/conversation.php:1635
+#: ../../include/conversation.php:1649
 msgid "Saved Bookmarks"
 msgstr "Segnalibri salvati"
 
-#: ../../include/conversation.php:1645
+#: ../../include/conversation.php:1659
 msgid "Manage Webpages"
 msgstr "Gestisci le pagine web"
 
-#: ../../include/conversation.php:1704
+#: ../../include/conversation.php:1718
 msgctxt "noun"
 msgid "Attending"
 msgid_plural "Attending"
 msgstr[0] "Partecipa"
 msgstr[1] "Partecipano"
 
-#: ../../include/conversation.php:1707
+#: ../../include/conversation.php:1721
 msgctxt "noun"
 msgid "Not Attending"
 msgid_plural "Not Attending"
 msgstr[0] "Non partecipa"
 msgstr[1] "Non partecipano"
 
-#: ../../include/conversation.php:1710
+#: ../../include/conversation.php:1724
 msgctxt "noun"
 msgid "Undecided"
 msgid_plural "Undecided"
 msgstr[0] "Indeciso"
 msgstr[1] "Indecisi"
 
-#: ../../include/conversation.php:1713
+#: ../../include/conversation.php:1727
 msgctxt "noun"
 msgid "Agree"
 msgid_plural "Agrees"
 msgstr[0] "D'accordo"
 msgstr[1] "D'accordo"
 
-#: ../../include/conversation.php:1716
+#: ../../include/conversation.php:1730
 msgctxt "noun"
 msgid "Disagree"
 msgid_plural "Disagrees"
 msgstr[0] "Non d'accordo"
 msgstr[1] "Non d'accordo"
 
-#: ../../include/conversation.php:1719
+#: ../../include/conversation.php:1733
 msgctxt "noun"
 msgid "Abstain"
 msgid_plural "Abstains"
 msgstr[0] "Astenuto"
 msgstr[1] "Astenuti"
 
-#: ../../include/photos.php:94
+#: ../../include/items.php:413 ../../mod/like.php:273
+#: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/profperm.php:23
+#: ../../mod/bulksetclose.php:11 ../../index.php:392
+msgid "Permission denied"
+msgstr "Permesso negato"
+
+#: ../../include/items.php:1101 ../../include/items.php:1147
+msgid "(Unknown)"
+msgstr "(Sconosciuto)"
+
+#: ../../include/items.php:1373
+msgid "Visible to anybody on the internet."
+msgstr "Visibile a chiunque su internet."
+
+#: ../../include/items.php:1375
+msgid "Visible to you only."
+msgstr "Visibile solo a te."
+
+#: ../../include/items.php:1377
+msgid "Visible to anybody in this network."
+msgstr "Visibile a tutti su questa rete."
+
+#: ../../include/items.php:1379
+msgid "Visible to anybody authenticated."
+msgstr "Visibile a chiunque sia autenticato."
+
+#: ../../include/items.php:1381
 #, php-format
-msgid "Image exceeds website size limit of %lu bytes"
-msgstr "L'immagine supera il limite massimo di %lu bytes"
+msgid "Visible to anybody on %s."
+msgstr "Visibile a tutti in %s."
 
-#: ../../include/photos.php:101
-msgid "Image file is empty."
-msgstr "Il file dell'immagine è vuoto."
+#: ../../include/items.php:1383
+msgid "Visible to all connections."
+msgstr "Visibile a tutti coloro che ti seguono."
 
-#: ../../include/photos.php:128 ../../mod/profile_photo.php:217
-msgid "Unable to process image"
-msgstr "Impossibile elaborare l'immagine"
+#: ../../include/items.php:1385
+msgid "Visible to approved connections."
+msgstr "Visibile ai contatti approvati."
 
-#: ../../include/photos.php:199
-msgid "Photo storage failed."
-msgstr "Impossibile caricare la foto."
+#: ../../include/items.php:1387
+msgid "Visible to specific connections."
+msgstr "Visibile ad alcuni contatti scelti."
 
-#: ../../include/photos.php:363
-msgid "Upload New Photos"
-msgstr "Carica nuove foto"
+#: ../../include/items.php:4310 ../../mod/thing.php:74
+#: ../../mod/filestorage.php:27 ../../mod/viewsrc.php:20
+#: ../../mod/admin.php:167 ../../mod/admin.php:1025 ../../mod/admin.php:1225
+#: ../../mod/display.php:36
+msgid "Item not found."
+msgstr "Elemento non trovato."
+
+#: ../../include/items.php:4383 ../../include/attach.php:137
+#: ../../include/attach.php:184 ../../include/attach.php:247
+#: ../../include/attach.php:261 ../../include/attach.php:305
+#: ../../include/attach.php:319 ../../include/attach.php:350
+#: ../../include/attach.php:546 ../../include/attach.php:618
+#: ../../include/chat.php:131 ../../include/photos.php:26
+#: ../../mod/profile.php:64 ../../mod/profile.php:72
+#: ../../mod/achievements.php:30 ../../mod/manage.php:6 ../../mod/api.php:26
+#: ../../mod/api.php:31 ../../mod/webpages.php:69 ../../mod/thing.php:269
+#: ../../mod/thing.php:284 ../../mod/thing.php:318
+#: ../../mod/profile_photo.php:264 ../../mod/profile_photo.php:277
+#: ../../mod/block.php:22 ../../mod/block.php:72 ../../mod/like.php:178
+#: ../../mod/events.php:249 ../../mod/group.php:9 ../../mod/item.php:206
+#: ../../mod/item.php:214 ../../mod/item.php:1005 ../../mod/network.php:12
+#: ../../mod/common.php:35 ../../mod/connections.php:29
+#: ../../mod/blocks.php:69 ../../mod/blocks.php:76 ../../mod/editpost.php:13
+#: ../../mod/photos.php:69 ../../mod/pdledit.php:21 ../../mod/authtest.php:13
+#: ../../mod/editlayout.php:63 ../../mod/editlayout.php:87
+#: ../../mod/chat.php:90 ../../mod/chat.php:95 ../../mod/mitem.php:111
+#: ../../mod/editwebpage.php:64 ../../mod/editwebpage.php:86
+#: ../../mod/editwebpage.php:101 ../../mod/editwebpage.php:125
+#: ../../mod/rate.php:110 ../../mod/editblock.php:65 ../../mod/invite.php:13
+#: ../../mod/invite.php:104 ../../mod/locs.php:77 ../../mod/sources.php:66
+#: ../../mod/menu.php:72 ../../mod/filestorage.php:18
+#: ../../mod/filestorage.php:73 ../../mod/filestorage.php:88
+#: ../../mod/filestorage.php:115 ../../mod/fsuggest.php:78
+#: ../../mod/poke.php:128 ../../mod/profiles.php:188
+#: ../../mod/profiles.php:576 ../../mod/viewsrc.php:14 ../../mod/setup.php:223
+#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27
+#: ../../mod/register.php:72 ../../mod/settings.php:570 ../../mod/id.php:71
+#: ../../mod/message.php:16 ../../mod/mood.php:111 ../../mod/connedit.php:348
+#: ../../mod/mail.php:114 ../../mod/notifications.php:66
+#: ../../mod/regmod.php:17 ../../mod/new_channel.php:68
+#: ../../mod/new_channel.php:99 ../../mod/appman.php:66
+#: ../../mod/layouts.php:69 ../../mod/layouts.php:76 ../../mod/layouts.php:87
+#: ../../mod/page.php:31 ../../mod/page.php:86 ../../mod/bookmarks.php:46
+#: ../../mod/channel.php:100 ../../mod/channel.php:219
+#: ../../mod/channel.php:262 ../../mod/suggest.php:26
+#: ../../mod/service_limits.php:7 ../../mod/sharedwithme.php:7
+#: ../../index.php:182 ../../index.php:393
+msgid "Permission denied."
+msgstr "Permesso negato."
+
+#: ../../include/items.php:4787 ../../mod/group.php:38 ../../mod/group.php:140
+#: ../../mod/bulksetclose.php:51
+msgid "Collection not found."
+msgstr "Insieme di canali non trovato."
+
+#: ../../include/items.php:4803
+msgid "Collection is empty."
+msgstr "L'insieme di canali è vuoto."
+
+#: ../../include/items.php:4810
+#, php-format
+msgid "Collection: %s"
+msgstr "Insieme: %s"
 
-#: ../../include/zot.php:666
+#: ../../include/items.php:4820 ../../mod/connedit.php:674
+#, php-format
+msgid "Connection: %s"
+msgstr "Contatto: %s"
+
+#: ../../include/items.php:4822
+msgid "Connection not found."
+msgstr "Contatto non trovato."
+
+#: ../../include/zot.php:684
 msgid "Invalid data packet"
 msgstr "Dati non validi"
 
-#: ../../include/zot.php:682
+#: ../../include/zot.php:700
 msgid "Unable to verify channel signature"
 msgstr "Impossibile verificare la firma elettronica del canale"
 
-#: ../../include/zot.php:2108
+#: ../../include/zot.php:2208
 #, php-format
 msgid "Unable to verify site signature for %s"
 msgstr "Impossibile verificare la firma elettronica del sito %s"
@@ -3173,7 +3159,7 @@ msgid_plural "%d invitations available"
 msgstr[0] "%d invito disponibile"
 msgstr[1] "%d inviti disponibili"
 
-#: ../../include/contact_widgets.php:19 ../../mod/admin.php:450
+#: ../../include/contact_widgets.php:19 ../../mod/admin.php:457
 msgid "Advanced"
 msgstr "Avanzate"
 
@@ -3193,12 +3179,12 @@ msgstr "Aggiungi"
 msgid "Examples: Robert Morgenstein, Fishing"
 msgstr "Per esempio: Mario Rossi, Pesca"
 
-#: ../../include/contact_widgets.php:26 ../../mod/connections.php:413
-#: ../../mod/directory.php:362 ../../mod/directory.php:367
+#: ../../include/contact_widgets.php:26 ../../mod/directory.php:379
+#: ../../mod/directory.php:384 ../../mod/connections.php:273
 msgid "Find"
 msgstr "Cerca"
 
-#: ../../include/contact_widgets.php:27 ../../mod/directory.php:366
+#: ../../include/contact_widgets.php:27 ../../mod/directory.php:383
 #: ../../mod/suggest.php:60
 msgid "Channel Suggestions"
 msgstr "Canali suggeriti"
@@ -3238,67 +3224,67 @@ msgstr "Mostra"
 msgid "Don't show"
 msgstr "Non mostrare"
 
-#: ../../include/acl_selectors.php:248 ../../mod/events.php:654
-#: ../../mod/photos.php:559 ../../mod/photos.php:922 ../../mod/chat.php:209
+#: ../../include/acl_selectors.php:248 ../../mod/events.php:691
+#: ../../mod/photos.php:571 ../../mod/photos.php:934 ../../mod/chat.php:209
 #: ../../mod/filestorage.php:147
 msgid "Permissions"
 msgstr "Permessi"
 
-#: ../../include/attach.php:241 ../../include/attach.php:299
+#: ../../include/attach.php:242 ../../include/attach.php:300
 msgid "Item was not found."
 msgstr "Elemento non trovato."
 
-#: ../../include/attach.php:356
+#: ../../include/attach.php:363
 msgid "No source file."
 msgstr "Nessun file di origine."
 
-#: ../../include/attach.php:374
+#: ../../include/attach.php:381
 msgid "Cannot locate file to replace"
 msgstr "Il file da sostituire non è stato trovato"
 
-#: ../../include/attach.php:392
+#: ../../include/attach.php:399
 msgid "Cannot locate file to revise/update"
 msgstr "Il file da aggiornare non è stato trovato"
 
-#: ../../include/attach.php:403
+#: ../../include/attach.php:410
 #, php-format
 msgid "File exceeds size limit of %d"
 msgstr "Il file supera la dimensione massima di %d"
 
-#: ../../include/attach.php:415
+#: ../../include/attach.php:422
 #, php-format
 msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
 msgstr "Hai raggiunto il limite complessivo di %1$.0f Mbytes per gli allegati."
 
-#: ../../include/attach.php:498
+#: ../../include/attach.php:505
 msgid "File upload failed. Possible system limit or action terminated."
 msgstr "Caricamento file fallito, potrebbe essere stato interrotto o potrebbe aver superato lo spazio assegnato."
 
-#: ../../include/attach.php:510
+#: ../../include/attach.php:517
 msgid "Stored file could not be verified. Upload failed."
 msgstr "Il file non può essere verificato. Caricamento fallito."
 
-#: ../../include/attach.php:554 ../../include/attach.php:571
+#: ../../include/attach.php:561 ../../include/attach.php:578
 msgid "Path not available."
 msgstr "Percorso non disponibile."
 
-#: ../../include/attach.php:616
+#: ../../include/attach.php:623
 msgid "Empty pathname"
 msgstr "Il percorso del file è vuoto"
 
-#: ../../include/attach.php:632
+#: ../../include/attach.php:639
 msgid "duplicate filename or path"
 msgstr "il file o il percorso del file è duplicato"
 
-#: ../../include/attach.php:656
+#: ../../include/attach.php:663
 msgid "Path not found."
 msgstr "Percorso del file non trovato."
 
-#: ../../include/attach.php:707
+#: ../../include/attach.php:714
 msgid "mkdir failed."
 msgstr "mkdir fallito."
 
-#: ../../include/attach.php:711
+#: ../../include/attach.php:718
 msgid "database storage failed."
 msgstr "scrittura su database fallita."
 
@@ -3339,205 +3325,206 @@ msgstr "Impossibile caricare l'identità creata"
 msgid "Default Profile"
 msgstr "Profilo predefinito"
 
-#: ../../include/identity.php:630
+#: ../../include/identity.php:759
 msgid "Requested channel is not available."
 msgstr "Il canale che cerchi non è disponibile."
 
-#: ../../include/identity.php:677 ../../mod/profile.php:16
-#: ../../mod/achievements.php:11 ../../mod/connect.php:13
-#: ../../mod/hcard.php:8 ../../mod/editlayout.php:28
-#: ../../mod/editwebpage.php:28 ../../mod/filestorage.php:54
-#: ../../mod/webpages.php:29 ../../mod/editblock.php:29
-#: ../../mod/blocks.php:29 ../../mod/layouts.php:29
+#: ../../include/identity.php:806 ../../mod/profile.php:16
+#: ../../mod/achievements.php:11 ../../mod/webpages.php:29
+#: ../../mod/connect.php:13 ../../mod/hcard.php:8 ../../mod/blocks.php:29
+#: ../../mod/editlayout.php:27 ../../mod/editwebpage.php:28
+#: ../../mod/editblock.php:29 ../../mod/filestorage.php:54
+#: ../../mod/layouts.php:29
 msgid "Requested profile is not available."
 msgstr "Il profilo richiesto non è disponibile."
 
-#: ../../include/identity.php:836 ../../mod/profiles.php:774
+#: ../../include/identity.php:969 ../../mod/profiles.php:774
 msgid "Change profile photo"
 msgstr "Cambia la foto del profilo"
 
-#: ../../include/identity.php:842
+#: ../../include/identity.php:975
 msgid "Profiles"
 msgstr "Profili"
 
-#: ../../include/identity.php:842
+#: ../../include/identity.php:975
 msgid "Manage/edit profiles"
 msgstr "Gestisci/modifica i profili"
 
-#: ../../include/identity.php:843 ../../mod/profiles.php:775
+#: ../../include/identity.php:976 ../../mod/profiles.php:775
 msgid "Create New Profile"
 msgstr "Crea un nuovo profilo"
 
-#: ../../include/identity.php:858 ../../mod/profiles.php:786
+#: ../../include/identity.php:991 ../../mod/profiles.php:786
 msgid "Profile Image"
 msgstr "Immagine del profilo"
 
-#: ../../include/identity.php:861
+#: ../../include/identity.php:994
 msgid "visible to everybody"
 msgstr "visibile a tutti"
 
-#: ../../include/identity.php:862 ../../mod/profiles.php:669
+#: ../../include/identity.php:995 ../../mod/profiles.php:669
 #: ../../mod/profiles.php:790
 msgid "Edit visibility"
 msgstr "Cambia la visibilità"
 
-#: ../../include/identity.php:878 ../../include/identity.php:1117
+#: ../../include/identity.php:1011 ../../include/identity.php:1250
 msgid "Gender:"
 msgstr "Sesso:"
 
-#: ../../include/identity.php:879 ../../include/identity.php:1161
+#: ../../include/identity.php:1012 ../../include/identity.php:1294
 msgid "Status:"
 msgstr "Stato:"
 
-#: ../../include/identity.php:880 ../../include/identity.php:1172
+#: ../../include/identity.php:1013 ../../include/identity.php:1305
 msgid "Homepage:"
 msgstr "Home page:"
 
-#: ../../include/identity.php:881
+#: ../../include/identity.php:1014
 msgid "Online Now"
 msgstr "Online adesso"
 
-#: ../../include/identity.php:964 ../../include/identity.php:1042
+#: ../../include/identity.php:1097 ../../include/identity.php:1175
 #: ../../mod/ping.php:324
 msgid "g A l F d"
 msgstr "g A l d F"
 
-#: ../../include/identity.php:965 ../../include/identity.php:1043
+#: ../../include/identity.php:1098 ../../include/identity.php:1176
 msgid "F d"
 msgstr "d F"
 
-#: ../../include/identity.php:1010 ../../include/identity.php:1082
+#: ../../include/identity.php:1143 ../../include/identity.php:1215
 #: ../../mod/ping.php:346
 msgid "[today]"
 msgstr "[oggi]"
 
-#: ../../include/identity.php:1021
+#: ../../include/identity.php:1154
 msgid "Birthday Reminders"
 msgstr "Promemoria compleanni"
 
-#: ../../include/identity.php:1022
+#: ../../include/identity.php:1155
 msgid "Birthdays this week:"
 msgstr "Compleanni questa settimana:"
 
-#: ../../include/identity.php:1075
+#: ../../include/identity.php:1208
 msgid "[No description]"
 msgstr "[Nessuna descrizione]"
 
-#: ../../include/identity.php:1093
+#: ../../include/identity.php:1226
 msgid "Event Reminders"
 msgstr "Promemoria"
 
-#: ../../include/identity.php:1094
+#: ../../include/identity.php:1227
 msgid "Events this week:"
 msgstr "Eventi di questa settimana:"
 
-#: ../../include/identity.php:1107 ../../include/identity.php:1224
+#: ../../include/identity.php:1240 ../../include/identity.php:1357
 #: ../../include/apps.php:138 ../../mod/profperm.php:112
 msgid "Profile"
 msgstr "Profilo"
 
-#: ../../include/identity.php:1115 ../../mod/settings.php:1045
+#: ../../include/identity.php:1248 ../../mod/settings.php:1056
 msgid "Full Name:"
 msgstr "Nome completo:"
 
-#: ../../include/identity.php:1122
+#: ../../include/identity.php:1255
 msgid "Like this channel"
 msgstr "Mi piace questo canale"
 
-#: ../../include/identity.php:1146
+#: ../../include/identity.php:1279
 msgid "j F, Y"
 msgstr "j F Y"
 
-#: ../../include/identity.php:1147
+#: ../../include/identity.php:1280
 msgid "j F"
 msgstr "j F"
 
-#: ../../include/identity.php:1154
+#: ../../include/identity.php:1287
 msgid "Birthday:"
 msgstr "Compleanno:"
 
-#: ../../include/identity.php:1158
+#: ../../include/identity.php:1291 ../../mod/directory.php:297
 msgid "Age:"
 msgstr "Età:"
 
-#: ../../include/identity.php:1167
+#: ../../include/identity.php:1300
 #, php-format
 msgid "for %1$d %2$s"
 msgstr "per %1$d %2$s"
 
-#: ../../include/identity.php:1170 ../../mod/profiles.php:691
+#: ../../include/identity.php:1303 ../../mod/profiles.php:691
 msgid "Sexual Preference:"
 msgstr "Preferenze sessuali:"
 
-#: ../../include/identity.php:1174 ../../mod/profiles.php:693
+#: ../../include/identity.php:1307 ../../mod/directory.php:313
+#: ../../mod/profiles.php:693
 msgid "Hometown:"
 msgstr "Città dove vivo:"
 
-#: ../../include/identity.php:1176
+#: ../../include/identity.php:1309
 msgid "Tags:"
 msgstr "Tag:"
 
-#: ../../include/identity.php:1178 ../../mod/profiles.php:694
+#: ../../include/identity.php:1311 ../../mod/profiles.php:694
 msgid "Political Views:"
 msgstr "Orientamento politico:"
 
-#: ../../include/identity.php:1180
+#: ../../include/identity.php:1313
 msgid "Religion:"
 msgstr "Religione:"
 
-#: ../../include/identity.php:1182
+#: ../../include/identity.php:1315 ../../mod/directory.php:315
 msgid "About:"
 msgstr "Informazioni:"
 
-#: ../../include/identity.php:1184
+#: ../../include/identity.php:1317
 msgid "Hobbies/Interests:"
 msgstr "Interessi e hobby:"
 
-#: ../../include/identity.php:1186 ../../mod/profiles.php:697
+#: ../../include/identity.php:1319 ../../mod/profiles.php:697
 msgid "Likes:"
 msgstr "Mi piace:"
 
-#: ../../include/identity.php:1188 ../../mod/profiles.php:698
+#: ../../include/identity.php:1321 ../../mod/profiles.php:698
 msgid "Dislikes:"
 msgstr "Non mi piace:"
 
-#: ../../include/identity.php:1190
+#: ../../include/identity.php:1323
 msgid "Contact information and Social Networks:"
 msgstr "Contatti e social network:"
 
-#: ../../include/identity.php:1192
+#: ../../include/identity.php:1325
 msgid "My other channels:"
 msgstr "I miei altri canali:"
 
-#: ../../include/identity.php:1194
+#: ../../include/identity.php:1327
 msgid "Musical interests:"
 msgstr "Gusti musicali:"
 
-#: ../../include/identity.php:1196
+#: ../../include/identity.php:1329
 msgid "Books, literature:"
 msgstr "Libri, letteratura:"
 
-#: ../../include/identity.php:1198
+#: ../../include/identity.php:1331
 msgid "Television:"
 msgstr "Televisione:"
 
-#: ../../include/identity.php:1200
+#: ../../include/identity.php:1333
 msgid "Film/dance/culture/entertainment:"
 msgstr "Film, danza, cultura, intrattenimento:"
 
-#: ../../include/identity.php:1202
+#: ../../include/identity.php:1335
 msgid "Love/Romance:"
 msgstr "Amore:"
 
-#: ../../include/identity.php:1204
+#: ../../include/identity.php:1337
 msgid "Work/employment:"
 msgstr "Lavoro:"
 
-#: ../../include/identity.php:1206
+#: ../../include/identity.php:1339
 msgid "School/education:"
 msgstr "Scuola:"
 
-#: ../../include/identity.php:1226
+#: ../../include/identity.php:1359
 msgid "Like this thing"
 msgstr "Mi piace questo Oggetto"
 
@@ -3815,7 +3802,7 @@ msgstr "Lingua"
 
 #: ../../include/apps.php:154
 msgid "Post"
-msgstr "Articolo"
+msgstr "Post"
 
 #: ../../include/apps.php:155 ../../mod/id.php:17 ../../mod/id.php:18
 #: ../../mod/id.php:19
@@ -3823,7 +3810,7 @@ msgid "Profile Photo"
 msgstr "Foto del profilo"
 
 #: ../../include/apps.php:247 ../../mod/settings.php:84
-#: ../../mod/settings.php:608
+#: ../../mod/settings.php:614
 msgid "Update"
 msgstr "Aggiorna"
 
@@ -3835,6 +3822,73 @@ msgstr "Installa"
 msgid "Purchase"
 msgstr "Acquista"
 
+#: ../../include/bbcode.php:122 ../../include/bbcode.php:768
+#: ../../include/bbcode.php:771 ../../include/bbcode.php:776
+#: ../../include/bbcode.php:779 ../../include/bbcode.php:782
+#: ../../include/bbcode.php:785 ../../include/bbcode.php:790
+#: ../../include/bbcode.php:793 ../../include/bbcode.php:798
+#: ../../include/bbcode.php:801 ../../include/bbcode.php:804
+#: ../../include/bbcode.php:807
+msgid "Image/photo"
+msgstr "Immagine"
+
+#: ../../include/bbcode.php:161 ../../include/bbcode.php:818
+msgid "Encrypted content"
+msgstr "Contenuto crittografato"
+
+#: ../../include/bbcode.php:178
+#, php-format
+msgid "Install %s element: "
+msgstr "Installa l'elemento %s:"
+
+#: ../../include/bbcode.php:182
+#, php-format
+msgid ""
+"This post contains an installable %s element, however you lack permissions "
+"to install it on this site."
+msgstr "Questo post contiene un elemento %s installabile, tuttavia non hai i permessi necessari per l'installazione."
+
+#: ../../include/bbcode.php:192 ../../mod/impel.php:37
+msgid "webpage"
+msgstr "pagina web"
+
+#: ../../include/bbcode.php:195 ../../mod/impel.php:47
+msgid "layout"
+msgstr "layout"
+
+#: ../../include/bbcode.php:198 ../../mod/impel.php:42
+msgid "block"
+msgstr "riquadro"
+
+#: ../../include/bbcode.php:201 ../../mod/impel.php:54
+msgid "menu"
+msgstr "menu"
+
+#: ../../include/bbcode.php:215
+msgid "QR code"
+msgstr "QR code"
+
+#: ../../include/bbcode.php:266
+#, php-format
+msgid "%1$s wrote the following %2$s %3$s"
+msgstr "%1$s ha scritto %2$s %3$s"
+
+#: ../../include/bbcode.php:268 ../../mod/tagger.php:51
+msgid "post"
+msgstr "il post"
+
+#: ../../include/bbcode.php:518
+msgid "Different viewers will see this text differently"
+msgstr "Ad altri questo testo potrebbe apparire in modo differente"
+
+#: ../../include/bbcode.php:729
+msgid "$1 spoiler"
+msgstr "$1 spoiler"
+
+#: ../../include/bbcode.php:756
+msgid "$1 wrote:"
+msgstr "$1 ha scritto:"
+
 #: ../../include/chat.php:23
 msgid "Missing room name"
 msgstr "Area chat senza nome"
@@ -3855,6 +3909,27 @@ msgstr "Area chat non trovata."
 msgid "Room is full"
 msgstr "L'area chat è al completo"
 
+#: ../../include/photos.php:94
+#, php-format
+msgid "Image exceeds website size limit of %lu bytes"
+msgstr "L'immagine supera il limite massimo di %lu bytes"
+
+#: ../../include/photos.php:101
+msgid "Image file is empty."
+msgstr "Il file dell'immagine è vuoto."
+
+#: ../../include/photos.php:128 ../../mod/profile_photo.php:217
+msgid "Unable to process image"
+msgstr "Impossibile elaborare l'immagine"
+
+#: ../../include/photos.php:199
+msgid "Photo storage failed."
+msgstr "Impossibile caricare la foto."
+
+#: ../../include/photos.php:363
+msgid "Upload New Photos"
+msgstr "Carica nuove foto"
+
 #: ../../mod/achievements.php:34
 msgid "Some blurb about what to do when you're new here"
 msgstr "Qualche suggerimento per i nuovi utenti su cosa fare"
@@ -3898,599 +3973,94 @@ msgstr "%d nuove richieste di entrare in contatto"
 msgid "Delegated Channels"
 msgstr "Canali delegati"
 
-#: ../../mod/settings.php:76
-msgid "Name is required"
-msgstr "Il nome è obbligatorio"
-
-#: ../../mod/settings.php:80
-msgid "Key and Secret are required"
-msgstr "Key e Secret sono richiesti"
-
-#: ../../mod/settings.php:124
-msgid "Diaspora Policy Settings updated."
-msgstr "Le regole per Diaspora sono state aggiornate."
-
-#: ../../mod/settings.php:232
-msgid "Passwords do not match. Password unchanged."
-msgstr "Le password non corrispondono. Password non cambiata."
-
-#: ../../mod/settings.php:236
-msgid "Empty passwords are not allowed. Password unchanged."
-msgstr "Le password non possono essere vuote. Password non cambiata."
-
-#: ../../mod/settings.php:250
-msgid "Password changed."
-msgstr "Password cambiata."
-
-#: ../../mod/settings.php:252
-msgid "Password update failed. Please try again."
-msgstr "Modifica password fallita. Prova ancora."
-
-#: ../../mod/settings.php:266
-msgid "Not valid email."
-msgstr "Email non valida."
-
-#: ../../mod/settings.php:269
-msgid "Protected email address. Cannot change to that email."
-msgstr "È un indirizzo email riservato. Non puoi sceglierlo."
-
-#: ../../mod/settings.php:278
-msgid "System failure storing new email. Please try again."
-msgstr "Errore di sistema. Non è stato possibile memorizzare il tuo messaggio, riprova per favore."
-
-#: ../../mod/settings.php:517
-msgid "Settings updated."
-msgstr "Impostazioni aggiornate."
-
-#: ../../mod/settings.php:573 ../../mod/api.php:106 ../../mod/photos.php:556
-#: ../../mod/menu.php:88 ../../mod/filestorage.php:151
-#: ../../mod/filestorage.php:159 ../../mod/admin.php:424
-#: ../../mod/removeme.php:60 ../../view/theme/redbasic/php/config.php:102
-#: ../../view/theme/redbasic/php/config.php:127 ../../boot.php:1544
-msgid "No"
-msgstr "No"
-
-#: ../../mod/settings.php:573 ../../mod/api.php:105 ../../mod/photos.php:556
-#: ../../mod/menu.php:88 ../../mod/filestorage.php:151
-#: ../../mod/filestorage.php:159 ../../mod/admin.php:426
-#: ../../mod/removeme.php:60 ../../view/theme/redbasic/php/config.php:102
-#: ../../view/theme/redbasic/php/config.php:127 ../../boot.php:1544
-msgid "Yes"
-msgstr "Si"
-
-#: ../../mod/settings.php:581 ../../mod/settings.php:607
-#: ../../mod/settings.php:643
-msgid "Add application"
-msgstr "Aggiungi una app"
-
-#: ../../mod/settings.php:584
-msgid "Name of application"
-msgstr "Nome dell'applicazione"
-
-#: ../../mod/settings.php:585 ../../mod/settings.php:611
-msgid "Consumer Key"
-msgstr "Consumer Key"
-
-#: ../../mod/settings.php:585 ../../mod/settings.php:586
-msgid "Automatically generated - change if desired. Max length 20"
-msgstr "Generato automaticamente - è possibile cambiarlo. Lunghezza massima 20"
-
-#: ../../mod/settings.php:586 ../../mod/settings.php:612
-msgid "Consumer Secret"
-msgstr "Consumer Secret"
-
-#: ../../mod/settings.php:587 ../../mod/settings.php:613
-msgid "Redirect"
-msgstr "Redirect"
-
-#: ../../mod/settings.php:587
-msgid ""
-"Redirect URI - leave blank unless your application specifically requires "
-"this"
-msgstr "URI ridirezionato - lasciare bianco se non richiesto specificamente dall'applicazione."
-
-#: ../../mod/settings.php:588 ../../mod/settings.php:614
-msgid "Icon url"
-msgstr "Url icona"
-
-#: ../../mod/settings.php:588
-msgid "Optional"
-msgstr "Opzionale"
-
-#: ../../mod/settings.php:599
-msgid "You can't edit this application."
-msgstr "Non puoi modificare questa applicazione."
-
-#: ../../mod/settings.php:642
-msgid "Connected Apps"
-msgstr "App connesse"
-
-#: ../../mod/settings.php:646
-msgid "Client key starts with"
-msgstr "La client key inizia con"
-
-#: ../../mod/settings.php:647
-msgid "No name"
-msgstr "Nessun nome"
-
-#: ../../mod/settings.php:648
-msgid "Remove authorization"
-msgstr "Revoca l'autorizzazione"
-
-#: ../../mod/settings.php:662
-msgid "No feature settings configured"
-msgstr "Non hai componenti aggiuntivi da personalizzare"
-
-#: ../../mod/settings.php:678
-msgid "Feature/Addon Settings"
-msgstr "Impostazioni dei componenti aggiuntivi"
-
-#: ../../mod/settings.php:680
-msgid "Settings for the built-in Diaspora emulator"
-msgstr "Interconnessione con Diaspora"
-
-#: ../../mod/settings.php:681
-msgid "Allow any Diaspora member to comment on your public posts"
-msgstr "Permetti a tutti gli utenti di Diaspora di commentare i tuoi post pubblici"
-
-#: ../../mod/settings.php:682
-msgid "Diaspora Policy Settings"
-msgstr "Regole per Diaspora"
-
-#: ../../mod/settings.php:683
-msgid "Prevent your hashtags from being redirected to other sites"
-msgstr "Impedisci che i tuoi #tag puntino su altri siti"
-
-#: ../../mod/settings.php:707
-msgid "Account Settings"
-msgstr "Il tuo account"
-
-#: ../../mod/settings.php:708
-msgid "Enter New Password:"
-msgstr "Inserisci la nuova password:"
-
-#: ../../mod/settings.php:709
-msgid "Confirm New Password:"
-msgstr "Conferma la nuova password:"
-
-#: ../../mod/settings.php:709
-msgid "Leave password fields blank unless changing"
-msgstr "Lascia questi campi in bianco per non cambiare la password"
-
-#: ../../mod/settings.php:711 ../../mod/settings.php:1046
-msgid "Email Address:"
-msgstr "Indirizzo email:"
-
-#: ../../mod/settings.php:712 ../../mod/removeaccount.php:61
-msgid "Remove Account"
-msgstr "Elimina l'account"
-
-#: ../../mod/settings.php:713
-msgid "Remove this account including all its channels"
-msgstr "Elimina questo account e tutti i suoi canali"
-
-#: ../../mod/settings.php:729
-msgid "Off"
-msgstr "Off"
-
-#: ../../mod/settings.php:729
-msgid "On"
-msgstr "On"
-
-#: ../../mod/settings.php:736
-msgid "Additional Features"
-msgstr "Funzionalità opzionali"
-
-#: ../../mod/settings.php:760
-msgid "Connector Settings"
-msgstr "Impostazioni del connettore"
-
-#: ../../mod/settings.php:799
-msgid "No special theme for mobile devices"
-msgstr "Nessun tema per dispositivi mobili"
+#: ../../mod/directory.php:59 ../../mod/photos.php:441 ../../mod/search.php:13
+#: ../../mod/ratings.php:82 ../../mod/viewconnections.php:17
+#: ../../mod/display.php:13
+msgid "Public access denied."
+msgstr "Accesso pubblico negato."
 
-#: ../../mod/settings.php:802
+#: ../../mod/directory.php:234
 #, php-format
-msgid "%s - (Experimental)"
-msgstr "%s - (Sperimentale)"
-
-#: ../../mod/settings.php:805 ../../mod/admin.php:396
-msgid "mobile"
-msgstr "mobile"
-
-#: ../../mod/settings.php:841
-msgid "Display Settings"
-msgstr "Aspetto"
-
-#: ../../mod/settings.php:847
-msgid "Display Theme:"
-msgstr "Tema per schermi medio grandi:"
-
-#: ../../mod/settings.php:848
-msgid "Mobile Theme:"
-msgstr "Tema per dispositivi mobili:"
-
-#: ../../mod/settings.php:849
-msgid "Enable user zoom on mobile devices"
-msgstr "Attiva la possibilità di fare zoom sui dispositivi mobili"
-
-#: ../../mod/settings.php:850
-msgid "Update browser every xx seconds"
-msgstr "Aggiorna il browser ogni x secondi"
-
-#: ../../mod/settings.php:850
-msgid "Minimum of 10 seconds, no maximum"
-msgstr "Minimo 10 secondi, nessun limite massimo"
-
-#: ../../mod/settings.php:851
-msgid "Maximum number of conversations to load at any time:"
-msgstr "Massimo numero di conversazioni da mostrare ogni volta:"
-
-#: ../../mod/settings.php:851
-msgid "Maximum of 100 items"
-msgstr "Massimo 100"
-
-#: ../../mod/settings.php:852
-msgid "Show emoticons (smilies) as images"
-msgstr "Mostra le faccine (smilies) come immagini"
-
-#: ../../mod/settings.php:853
-msgid "Link post titles to source"
-msgstr "Il link del titolo di un articolo porta al sito originale"
-
-#: ../../mod/settings.php:854
-msgid "System Page Layout Editor - (advanced)"
-msgstr "Modifica i layout di sistema (avanzato)"
-
-#: ../../mod/settings.php:857
-msgid "Use blog/list mode on channel page"
-msgstr "Mostra il canale nella modalità blog"
-
-#: ../../mod/settings.php:857 ../../mod/settings.php:858
-msgid "(comments displayed separately)"
-msgstr "(i commenti sono mostrati separatamente)"
-
-#: ../../mod/settings.php:858
-msgid "Use blog/list mode on matrix page"
-msgstr "Mostra la tua rete in modalità blog"
-
-#: ../../mod/settings.php:859
-msgid "Channel page max height of content (in pixels)"
-msgstr "Altezza massima dei contenuti del canale (in pixel)"
-
-#: ../../mod/settings.php:859 ../../mod/settings.php:860
-msgid "click to expand content exceeding this height"
-msgstr "dovrai cliccare per mostrare i contenuti di dimensioni maggiori"
-
-#: ../../mod/settings.php:860
-msgid "Matrix page max height of content (in pixels)"
-msgstr "Altezza massima dei contenuti della tua rete (in pixel)"
-
-#: ../../mod/settings.php:894
-msgid "Nobody except yourself"
-msgstr "Nessuno tranne te"
-
-#: ../../mod/settings.php:895
-msgid "Only those you specifically allow"
-msgstr "Solo chi riceve il mio permesso"
-
-#: ../../mod/settings.php:896
-msgid "Approved connections"
-msgstr "Contatti approvati"
-
-#: ../../mod/settings.php:897
-msgid "Any connections"
-msgstr "Tutti i contatti"
-
-#: ../../mod/settings.php:898
-msgid "Anybody on this website"
-msgstr "Chiunque su questo sito"
-
-#: ../../mod/settings.php:899
-msgid "Anybody in this network"
-msgstr "Chiunque su Red"
-
-#: ../../mod/settings.php:900
-msgid "Anybody authenticated"
-msgstr "Chiunque sia autenticato"
-
-#: ../../mod/settings.php:901
-msgid "Anybody on the internet"
-msgstr "Chiunque su internet"
-
-#: ../../mod/settings.php:975
-msgid "Publish your default profile in the network directory"
-msgstr "Mostra il mio profilo predefinito nell'elenco pubblico dei canali"
-
-#: ../../mod/settings.php:980
-msgid "Allow us to suggest you as a potential friend to new members?"
-msgstr "Vuoi essere suggerito come amico ai nuovi membri?"
-
-#: ../../mod/settings.php:984 ../../mod/profile_photo.php:366
-msgid "or"
-msgstr "o"
-
-#: ../../mod/settings.php:989
-msgid "Your channel address is"
-msgstr "L'indirizzo del tuo canale è"
-
-#: ../../mod/settings.php:1037
-msgid "Channel Settings"
-msgstr "Impostazioni del canale"
-
-#: ../../mod/settings.php:1044
-msgid "Basic Settings"
-msgstr "Impostazioni di base"
-
-#: ../../mod/settings.php:1047
-msgid "Your Timezone:"
-msgstr "Il tuo fuso orario:"
-
-#: ../../mod/settings.php:1048
-msgid "Default Post Location:"
-msgstr "Località predefinita:"
-
-#: ../../mod/settings.php:1048
-msgid "Geographical location to display on your posts"
-msgstr "Posizione geografica da mostrare sui tuoi post"
-
-#: ../../mod/settings.php:1049
-msgid "Use Browser Location:"
-msgstr "Usa la località rilevata dal browser:"
-
-#: ../../mod/settings.php:1051
-msgid "Adult Content"
-msgstr "Contenuto per adulti"
-
-#: ../../mod/settings.php:1051
-msgid ""
-"This channel frequently or regularly publishes adult content. (Please tag "
-"any adult material and/or nudity with #NSFW)"
-msgstr "Questo canale pubblica frequentemente contenuto per adulti. (I contenuti per adulti vanno taggati #NSFW - Not Safe For Work)"
-
-#: ../../mod/settings.php:1053
-msgid "Security and Privacy Settings"
-msgstr "Impostazioni di sicurezza e privacy"
-
-#: ../../mod/settings.php:1055
-msgid "Your permissions are already configured. Click to view/adjust"
-msgstr "I tuoi permessi sono già stati configurati. Clicca per vederli o modificarli"
-
-#: ../../mod/settings.php:1057
-msgid "Hide my online presence"
-msgstr "Nascondi la mia presenza online"
-
-#: ../../mod/settings.php:1057
-msgid "Prevents displaying in your profile that you are online"
-msgstr "Evita che sul tuo profilo compaia la tua presenza online"
-
-#: ../../mod/settings.php:1059
-msgid "Simple Privacy Settings:"
-msgstr "Impostazioni di privacy semplificate"
-
-#: ../../mod/settings.php:1060
-msgid ""
-"Very Public - <em>extremely permissive (should be used with caution)</em>"
-msgstr "Tutto pubblico - <em>estremamente permissivo (da usare con cautela)</em>"
-
-#: ../../mod/settings.php:1061
-msgid ""
-"Typical - <em>default public, privacy when desired (similar to social "
-"network permissions but with improved privacy)</em>"
-msgstr "Standard - <em>contenuti normalmente pubblici, ma anche privati se necessario (simile ai social network ma con privacy migliorata)</em>"
-
-#: ../../mod/settings.php:1062
-msgid "Private - <em>default private, never open or public</em>"
-msgstr "Privato - <em>contenuti normalmente privati, nulla è aperto o pubblico</em>"
-
-#: ../../mod/settings.php:1063
-msgid "Blocked - <em>default blocked to/from everybody</em>"
-msgstr "Bloccato - <em>bloccato in invio e ricezione dei contenuti</em>"
-
-#: ../../mod/settings.php:1065
-msgid "Allow others to tag your posts"
-msgstr "Permetti ad altri di taggare i tuoi articoli"
-
-#: ../../mod/settings.php:1065
-msgid ""
-"Often used by the community to retro-actively flag inappropriate content"
-msgstr "Usato spesso dalla comunità per marcare contenuti inappropriati già esistenti"
-
-#: ../../mod/settings.php:1067
-msgid "Advanced Privacy Settings"
-msgstr "Impostazioni di privacy avanzate"
-
-#: ../../mod/settings.php:1069
-msgid "Expire other channel content after this many days"
-msgstr "Giorni dopo cui mettere in scadenza gli altri contenuti del canale"
-
-#: ../../mod/settings.php:1069
-msgid "0 or blank prevents expiration"
-msgstr "Lascia vuoto oppure 0 per non impostare scadenze"
-
-#: ../../mod/settings.php:1070
-msgid "Maximum Friend Requests/Day:"
-msgstr "Numero massimo giornaliero di richieste di amicizia:"
-
-#: ../../mod/settings.php:1070
-msgid "May reduce spam activity"
-msgstr "Serve e ridurre lo spam"
-
-#: ../../mod/settings.php:1071
-msgid "Default Post Permissions"
-msgstr "Permessi predefiniti per gli articoli"
-
-#: ../../mod/settings.php:1072 ../../mod/mitem.php:152 ../../mod/mitem.php:221
-msgid "(click to open/close)"
-msgstr "(clicca per aprire/chiudere)"
-
-#: ../../mod/settings.php:1076
-msgid "Channel permissions category:"
-msgstr "Categorie di permessi dei canali:"
-
-#: ../../mod/settings.php:1082
-msgid "Maximum private messages per day from unknown people:"
-msgstr "Numero massimo giornaliero di messaggi privati da utenti sconosciuti:"
-
-#: ../../mod/settings.php:1082
-msgid "Useful to reduce spamming"
-msgstr "Serve e ridurre lo spam"
-
-#: ../../mod/settings.php:1085
-msgid "Notification Settings"
-msgstr "Impostazioni di notifica"
-
-#: ../../mod/settings.php:1086
-msgid "By default post a status message when:"
-msgstr "Pubblica un messaggio di stato quando:"
-
-#: ../../mod/settings.php:1087
-msgid "accepting a friend request"
-msgstr "accetto una nuova amicizia"
-
-#: ../../mod/settings.php:1088
-msgid "joining a forum/community"
-msgstr "entro a far parte di un forum"
-
-#: ../../mod/settings.php:1089
-msgid "making an <em>interesting</em> profile change"
-msgstr "faccio un cambiamento <em>interessante</em> al mio profilo"
-
-#: ../../mod/settings.php:1090
-msgid "Send a notification email when:"
-msgstr "Invia una email di notifica quando:"
-
-#: ../../mod/settings.php:1091
-msgid "You receive a connection request"
-msgstr "Ricevi una richiesta di entrare in contatto"
-
-#: ../../mod/settings.php:1092
-msgid "Your connections are confirmed"
-msgstr "I tuoi contatti sono confermati"
-
-#: ../../mod/settings.php:1093
-msgid "Someone writes on your profile wall"
-msgstr "Qualcuno scrive sulla tua bacheca"
-
-#: ../../mod/settings.php:1094
-msgid "Someone writes a followup comment"
-msgstr "Qualcuno scrive un commento a un tuo articolo"
-
-#: ../../mod/settings.php:1095
-msgid "You receive a private message"
-msgstr "Ricevi un messaggio privato"
-
-#: ../../mod/settings.php:1096
-msgid "You receive a friend suggestion"
-msgstr "Ti viene suggerito un amico"
-
-#: ../../mod/settings.php:1097
-msgid "You are tagged in a post"
-msgstr "Sei taggato in un articolo"
-
-#: ../../mod/settings.php:1098
-msgid "You are poked/prodded/etc. in a post"
-msgstr "Ricevi un poke in un articolo"
-
-#: ../../mod/settings.php:1101
-msgid "Show visual notifications including:"
-msgstr "Mostra queste notifiche a schermo:"
-
-#: ../../mod/settings.php:1103
-msgid "Unseen matrix activity"
-msgstr "Nuove attività nella rete"
-
-#: ../../mod/settings.php:1104
-msgid "Unseen channel activity"
-msgstr "Novità nei canali"
-
-#: ../../mod/settings.php:1105
-msgid "Unseen private messages"
-msgstr "Nuovi messaggi privati"
-
-#: ../../mod/settings.php:1105 ../../mod/settings.php:1110
-#: ../../mod/settings.php:1111 ../../mod/settings.php:1112
-msgid "Recommended"
-msgstr "Consigliato"
+msgid "%d rating"
+msgid_plural "%d ratings"
+msgstr[0] "%d valutazione"
+msgstr[1] "%d valutazioni"
 
-#: ../../mod/settings.php:1106
-msgid "Upcoming events"
-msgstr "Prossimi eventi"
+#: ../../mod/directory.php:245
+msgid "Gender: "
+msgstr "Sesso:"
 
-#: ../../mod/settings.php:1107
-msgid "Events today"
-msgstr "Eventi di oggi"
+#: ../../mod/directory.php:247
+msgid "Status: "
+msgstr "Stato:"
 
-#: ../../mod/settings.php:1108
-msgid "Upcoming birthdays"
-msgstr "Prossimi compleanni"
+#: ../../mod/directory.php:249
+msgid "Homepage: "
+msgstr "Homepage:"
 
-#: ../../mod/settings.php:1108
-msgid "Not available in all themes"
-msgstr "Non disponibile in tutti i temi"
+#: ../../mod/directory.php:308 ../../mod/events.php:682
+msgid "Description:"
+msgstr "Descrizione:"
 
-#: ../../mod/settings.php:1109
-msgid "System (personal) notifications"
-msgstr "Notifiche personali dal sistema"
+#: ../../mod/directory.php:317
+msgid "Public Forum:"
+msgstr "Forum pubblico:"
 
-#: ../../mod/settings.php:1110
-msgid "System info messages"
-msgstr "Notifiche di sistema"
+#: ../../mod/directory.php:320
+msgid "Keywords: "
+msgstr "Parole chiave:"
 
-#: ../../mod/settings.php:1111
-msgid "System critical alerts"
-msgstr "Avvisi critici di sistema"
+#: ../../mod/directory.php:323
+msgid "Don't suggest"
+msgstr "Non fornire suggerimenti"
 
-#: ../../mod/settings.php:1112
-msgid "New connections"
-msgstr "Nuovi contatti"
+#: ../../mod/directory.php:325
+msgid "Common connections:"
+msgstr "Contatti in comune:"
 
-#: ../../mod/settings.php:1113
-msgid "System Registrations"
-msgstr "Registrazioni"
+#: ../../mod/directory.php:374
+msgid "Global Directory"
+msgstr "Elenco globale dei canali"
 
-#: ../../mod/settings.php:1114
-msgid ""
-"Also show new wall posts, private messages and connections under Notices"
-msgstr "Mostra negli avvisi anche i nuovi articoli, i messaggi privati e i nuovi contatti"
+#: ../../mod/directory.php:374
+msgid "Local Directory"
+msgstr "Elenco canali su questo server"
 
-#: ../../mod/settings.php:1116
-msgid "Notify me of events this many days in advance"
-msgstr "Giorni di anticipo per notificare gli eventi"
+#: ../../mod/directory.php:380
+msgid "Finding:"
+msgstr "Ricerca:"
 
-#: ../../mod/settings.php:1116
-msgid "Must be greater than 0"
-msgstr "Maggiore di 0"
+#: ../../mod/directory.php:385
+msgid "next page"
+msgstr "pagina successiva"
 
-#: ../../mod/settings.php:1118
-msgid "Advanced Account/Page Type Settings"
-msgstr "Impostazioni avanzate"
+#: ../../mod/directory.php:385
+msgid "previous page"
+msgstr "pagina precedente"
 
-#: ../../mod/settings.php:1119
-msgid "Change the behaviour of this account for special situations"
-msgstr "Cambia il funzionamento di questo account per necessità particolari"
+#: ../../mod/directory.php:386
+msgid "Sort options"
+msgstr "Opzioni di ordinamento"
 
-#: ../../mod/settings.php:1122
-msgid ""
-"Please enable expert mode (in <a href=\"settings/features\">Settings > "
-"Additional features</a>) to adjust!"
-msgstr "Abilita la modalità esperto per fare cambiamenti! (in <a href=\"settings/features\">Impostazioni > Funzionalità opzionali</a>)"
+#: ../../mod/directory.php:387
+msgid "Alphabetic"
+msgstr "Alfabetico"
 
-#: ../../mod/settings.php:1123
-msgid "Miscellaneous Settings"
-msgstr "Impostazioni varie"
+#: ../../mod/directory.php:388
+msgid "Reverse Alphabetic"
+msgstr "Alfabetico inverso"
 
-#: ../../mod/settings.php:1125
-msgid "Personal menu to display in your channel pages"
-msgstr "Menu personale da mostrare sulle pagine del tuo canale"
+#: ../../mod/directory.php:389
+msgid "Newest to Oldest"
+msgstr "Prima i più recenti"
 
-#: ../../mod/settings.php:1126 ../../mod/removeme.php:61
-msgid "Remove Channel"
-msgstr "Elimina questo canale"
+#: ../../mod/directory.php:390
+msgid "Oldest to Newest"
+msgstr "Prima i più vecchi"
 
-#: ../../mod/settings.php:1127
-msgid "Remove this channel."
-msgstr "Elimina questo canale."
+#: ../../mod/directory.php:407
+msgid "No entries (some entries may be hidden)."
+msgstr "Nessun risultato (qualche elemento potrebbe essere nascosto)."
 
 #: ../../mod/xchan.php:6
 msgid "Xchan Lookup"
@@ -4500,7 +4070,7 @@ msgstr "Ricerca canale"
 msgid "Lookup xchan beginning with (or webbie): "
 msgstr "Cerca un canale (o un webbie) che inizia per:"
 
-#: ../../mod/xchan.php:37 ../../mod/menu.php:149 ../../mod/mitem.php:120
+#: ../../mod/xchan.php:37 ../../mod/mitem.php:116 ../../mod/menu.php:160
 msgid "Not found."
 msgstr "Non trovato."
 
@@ -4522,6 +4092,10 @@ msgid ""
 " and/or create new posts for you?"
 msgstr "Vuoi autorizzare questa app ad accedere ai messaggi e ai contatti o creare nuovi messaggi per te?"
 
+#: ../../mod/webpages.php:191
+msgid "Page Title"
+msgstr "Titolo della pagina"
+
 #: ../../mod/follow.php:25
 msgid "Channel added."
 msgstr "Canale aggiunto."
@@ -4538,7 +4112,7 @@ msgstr "Rimuovi il tag"
 msgid "Select a tag to remove: "
 msgstr "Seleziona un tag da rimuovere: "
 
-#: ../../mod/tagrm.php:133 ../../mod/photos.php:875
+#: ../../mod/tagrm.php:133 ../../mod/photos.php:887
 msgid "Remove"
 msgstr "Rimuovi"
 
@@ -4589,56 +4163,56 @@ msgstr "Canale premium - con restrizioni"
 msgid "Thing updated"
 msgstr "L'Oggetto è stato aggiornato"
 
-#: ../../mod/thing.php:153
+#: ../../mod/thing.php:167
 msgid "Object store: failed"
 msgstr "Impossibile memorizzare l'oggetto."
 
-#: ../../mod/thing.php:157
+#: ../../mod/thing.php:171
 msgid "Thing added"
 msgstr "L'Oggetto è stato aggiunto"
 
-#: ../../mod/thing.php:175
+#: ../../mod/thing.php:203
 #, php-format
 msgid "OBJ: %1$s %2$s %3$s"
 msgstr "OBJ: %1$s %2$s %3$s"
 
-#: ../../mod/thing.php:226
+#: ../../mod/thing.php:254
 msgid "Show Thing"
 msgstr "Mostra l'Oggetto"
 
-#: ../../mod/thing.php:233
+#: ../../mod/thing.php:261
 msgid "item not found."
 msgstr "non trovato."
 
-#: ../../mod/thing.php:261
+#: ../../mod/thing.php:289
 msgid "Edit Thing"
 msgstr "Modifica l'Oggetto"
 
-#: ../../mod/thing.php:263 ../../mod/thing.php:310
+#: ../../mod/thing.php:291 ../../mod/thing.php:338
 msgid "Select a profile"
 msgstr "Scegli un profilo"
 
-#: ../../mod/thing.php:267 ../../mod/thing.php:313
+#: ../../mod/thing.php:295 ../../mod/thing.php:341
 msgid "Post an activity"
 msgstr "Pubblica un'attività"
 
-#: ../../mod/thing.php:267 ../../mod/thing.php:313
+#: ../../mod/thing.php:295 ../../mod/thing.php:341
 msgid "Only sends to viewers of the applicable profile"
 msgstr "Invia solo a chi segue il relativo canale"
 
-#: ../../mod/thing.php:269 ../../mod/thing.php:315
+#: ../../mod/thing.php:297 ../../mod/thing.php:343
 msgid "Name of thing e.g. something"
 msgstr "Nome dell'Oggetto"
 
-#: ../../mod/thing.php:271 ../../mod/thing.php:316
+#: ../../mod/thing.php:299 ../../mod/thing.php:344
 msgid "URL of thing (optional)"
 msgstr "Indirizzo web dell'Oggetto (opzionale)"
 
-#: ../../mod/thing.php:273 ../../mod/thing.php:317
+#: ../../mod/thing.php:301 ../../mod/thing.php:345
 msgid "URL for photo of thing (optional)"
 msgstr "Indirizzo di un'immagine dell'Oggetto (facoltativo)"
 
-#: ../../mod/thing.php:308
+#: ../../mod/thing.php:336
 msgid "Add Thing to your Profile"
 msgstr "Aggiungi l'Oggetto al tuo profilo"
 
@@ -4646,20 +4220,11 @@ msgstr "Aggiungi l'Oggetto al tuo profilo"
 msgid "Item not available."
 msgstr "Elemento non disponibile."
 
-#: ../../mod/probe.php:23 ../../mod/probe.php:29
+#: ../../mod/probe.php:24 ../../mod/probe.php:30
 #, php-format
 msgid "Fetching URL returns error: %1$s"
 msgstr "La chiamata all'URL restituisce questo errore: %1$s"
 
-#: ../../mod/home.php:53
-msgid "Hubzilla - &quot;The Network&quot;"
-msgstr "Hubzilla - &quot;La tua rete&quot;"
-
-#: ../../mod/home.php:124
-#, php-format
-msgid "Welcome to %s"
-msgstr "%s ti dà il benvenuto"
-
 #: ../../mod/profile_photo.php:108
 msgid "Image uploaded but image cropping failed."
 msgstr "L'immagine è stata caricata, ma il non è stato possibile ritagliarla."
@@ -4672,7 +4237,7 @@ msgstr "Il ridimensionamento dell'immagine è fallito."
 msgid ""
 "Shift-reload the page or clear browser cache if the new photo does not "
 "display immediately."
-msgstr "Ricarica la pagina con shift+control+r o cancella la cache del browser se la nuova foto non viene mostrata immediatamente."
+msgstr "Ricarica la pagina con shift+F5 o cancella la cache del browser se la nuova foto non viene mostrata immediatamente."
 
 #: ../../mod/profile_photo.php:233
 #, php-format
@@ -4699,6 +4264,10 @@ msgstr "Seleziona un profilo:"
 msgid "Upload Profile Photo"
 msgstr "Carica la foto del profilo"
 
+#: ../../mod/profile_photo.php:366 ../../mod/settings.php:995
+msgid "or"
+msgstr "o"
+
 #: ../../mod/profile_photo.php:366
 msgid "skip this step"
 msgstr "salta questo passaggio"
@@ -4732,16 +4301,16 @@ msgstr "Il caricamento dell'immagine è fallito."
 msgid "Image size reduction [%s] failed."
 msgstr "Il ridimensionamento del'immagine [%s] è fallito."
 
-#: ../../mod/block.php:27 ../../mod/page.php:33
+#: ../../mod/block.php:27 ../../mod/page.php:36
 msgid "Invalid item."
 msgstr "Elemento non valido."
 
-#: ../../mod/block.php:39 ../../mod/wall_upload.php:29 ../../mod/page.php:45
+#: ../../mod/block.php:39 ../../mod/wall_upload.php:29 ../../mod/page.php:52
 msgid "Channel not found."
 msgstr "Canale non trovato."
 
-#: ../../mod/block.php:75 ../../mod/help.php:79 ../../mod/display.php:106
-#: ../../mod/page.php:82 ../../index.php:241
+#: ../../mod/block.php:75 ../../mod/display.php:110 ../../mod/help.php:79
+#: ../../mod/page.php:89 ../../index.php:241
 msgid "Page not found."
 msgstr "Pagina non trovata."
 
@@ -4755,9 +4324,9 @@ msgstr "Questa funzionalità è riservata agli iscritti."
 
 #: ../../mod/like.php:21
 msgid ""
-"Please <a href=\"rmagic\">login with your Hubzilla ID</a> or <a "
-"href=\"register\">register as a new Redmatrix.member</a> to continue."
-msgstr "Per favore <a href=\"rmagic\">accedi con il tuo identificativo Hubzilla</a> o <a href=\"register\">registrati su Hubzilla</a> per continuare."
+"Please <a href=\"rmagic\">login with your $Projectname ID</a> or <a "
+"href=\"register\">register as a new $Projectname member</a> to continue."
+msgstr "Per continuare devi <a href=\"rmagic\">accedere con il tuo identificativo $Projectname</a> o <a href=\"register\">registrarti come nuovo utente $Projectname</a>."
 
 #: ../../mod/like.php:101 ../../mod/like.php:128 ../../mod/like.php:166
 msgid "Invalid request."
@@ -4771,143 +4340,155 @@ msgstr "Oggetto"
 msgid "Channel unavailable."
 msgstr "Canale non trovato."
 
-#: ../../mod/like.php:228
+#: ../../mod/like.php:231
 msgid "Previous action reversed."
 msgstr "Il comando precedente è stato annullato."
 
-#: ../../mod/like.php:398
+#: ../../mod/like.php:401
 #, php-format
 msgid "%1$s agrees with %2$s's %3$s"
 msgstr "%3$s di %2$s: %1$s è d'accordo"
 
-#: ../../mod/like.php:400
+#: ../../mod/like.php:403
 #, php-format
 msgid "%1$s doesn't agree with %2$s's %3$s"
 msgstr "%3$s di %2$s: %1$s non è d'accordo"
 
-#: ../../mod/like.php:402
+#: ../../mod/like.php:405
 #, php-format
 msgid "%1$s abstains from a decision on %2$s's %3$s"
 msgstr "%3$s di %2$s: %1$s non ha preso una decisione"
 
-#: ../../mod/like.php:404
+#: ../../mod/like.php:407
 #, php-format
 msgid "%1$s is attending %2$s's %3$s"
 msgstr "%3$s di %2$s: %1$s partecipa"
 
-#: ../../mod/like.php:406
+#: ../../mod/like.php:409
 #, php-format
 msgid "%1$s is not attending %2$s's %3$s"
 msgstr "%3$s di %2$s: %1$s non partecipa"
 
-#: ../../mod/like.php:408
+#: ../../mod/like.php:411
 #, php-format
 msgid "%1$s may attend %2$s's %3$s"
 msgstr "%3$s di %2$s: %1$s forse partecipa"
 
-#: ../../mod/like.php:492
+#: ../../mod/like.php:507
 msgid "Action completed."
 msgstr "Comando completato."
 
-#: ../../mod/like.php:493
+#: ../../mod/like.php:508
 msgid "Thank you."
 msgstr "Grazie."
 
-#: ../../mod/events.php:87
+#: ../../mod/events.php:21
+msgid "Calendar entries imported."
+msgstr "Le voci del calendario sono state importate."
+
+#: ../../mod/events.php:23
+msgid "No calendar entries found."
+msgstr "Non sono state trovate voci del calendario."
+
+#: ../../mod/events.php:101
 msgid "Event can not end before it has started."
 msgstr "Un evento non può terminare prima del suo inizio."
 
-#: ../../mod/events.php:89 ../../mod/events.php:98 ../../mod/events.php:116
+#: ../../mod/events.php:103 ../../mod/events.php:112 ../../mod/events.php:130
 msgid "Unable to generate preview."
 msgstr "Impossibile creare un'anteprima."
 
-#: ../../mod/events.php:96
+#: ../../mod/events.php:110
 msgid "Event title and start time are required."
 msgstr "Sono necessari il titolo e l'ora d'inizio dell'evento."
 
-#: ../../mod/events.php:114
+#: ../../mod/events.php:128
 msgid "Event not found."
 msgstr "Evento non trovato."
 
-#: ../../mod/events.php:396
+#: ../../mod/events.php:426
 msgid "l, F j"
 msgstr "l j F"
 
-#: ../../mod/events.php:418
+#: ../../mod/events.php:448
 msgid "Edit event"
 msgstr "Modifica l'evento"
 
-#: ../../mod/events.php:419
+#: ../../mod/events.php:449
 msgid "Delete event"
 msgstr "Elimina l'evento"
 
-#: ../../mod/events.php:473
+#: ../../mod/events.php:483
+msgid "calendar"
+msgstr "calendario"
+
+#: ../../mod/events.php:504
 msgid "Create New Event"
 msgstr "Crea un nuovo evento"
 
-#: ../../mod/events.php:474 ../../mod/photos.php:827
+#: ../../mod/events.php:505 ../../mod/photos.php:839
 msgid "Previous"
 msgstr "Precendente"
 
-#: ../../mod/events.php:475 ../../mod/setup.php:265 ../../mod/photos.php:836
+#: ../../mod/events.php:506 ../../mod/photos.php:848 ../../mod/setup.php:281
 msgid "Next"
 msgstr "Successivo"
 
-#: ../../mod/events.php:476
+#: ../../mod/events.php:507
 msgid "Export"
 msgstr "Esporta"
 
-#: ../../mod/events.php:504
+#: ../../mod/events.php:510
+msgid "Import"
+msgstr "Importa"
+
+#: ../../mod/events.php:541
 msgid "Event removed"
 msgstr "Evento eliminato"
 
-#: ../../mod/events.php:507
+#: ../../mod/events.php:544
 msgid "Failed to remove event"
 msgstr "Impossibile eliminare l'evento"
 
-#: ../../mod/events.php:627
+#: ../../mod/events.php:664
 msgid "Event details"
 msgstr "Dettagli evento"
 
-#: ../../mod/events.php:628
+#: ../../mod/events.php:665
 msgid "Starting date and Title are required."
 msgstr "Titolo e data d'inizio sono obbligatori."
 
-#: ../../mod/events.php:630
+#: ../../mod/events.php:667
 msgid "Categories (comma-separated list)"
 msgstr "Categorie (separate da virgola)"
 
-#: ../../mod/events.php:632
+#: ../../mod/events.php:669
 msgid "Event Starts:"
 msgstr "Inizio:"
 
-#: ../../mod/events.php:639
+#: ../../mod/events.php:676
 msgid "Finish date/time is not known or not relevant"
 msgstr "La data/ora di fine non è rilevante"
 
-#: ../../mod/events.php:641
+#: ../../mod/events.php:678
 msgid "Event Finishes:"
 msgstr "Fine:"
 
-#: ../../mod/events.php:643 ../../mod/events.php:644
+#: ../../mod/events.php:680 ../../mod/events.php:681
 msgid "Adjust for viewer timezone"
 msgstr "Adatta al fuso orario di chi legge"
 
-#: ../../mod/events.php:643
+#: ../../mod/events.php:680
 msgid ""
 "Important for events that happen in a particular place. Not practical for "
 "global holidays."
 msgstr "Importante per eventi che avvengono in base all'orario di un luogo particolare."
 
-#: ../../mod/events.php:645
-msgid "Description:"
-msgstr "Descrizione:"
-
-#: ../../mod/events.php:649
+#: ../../mod/events.php:686
 msgid "Title:"
 msgstr "Titolo:"
 
-#: ../../mod/events.php:651
+#: ../../mod/events.php:688
 msgid "Share this event"
 msgstr "Condividi questo evento"
 
@@ -4922,12 +4503,12 @@ msgstr "Siti pubblici"
 
 #: ../../mod/pubsites.php:19
 msgid ""
-"The listed sites allow public registration into the Hubzilla. All sites in"
-" the matrix are interlinked so membership on any of them conveys membership "
-"in the matrix as a whole. Some sites may require subscription or provide "
-"tiered service plans. The provider links <strong>may</strong> provide "
-"additional details."
-msgstr "Gli indirizzi elencati permettono la registrazione su Hubzilla. Tutti i siti di questa rete sono interconnessi, quindi essere registrati su uno è come essere registrati ovunque. Alcuni potrebbero richiedere un'iscrizione a pagamento o prevedere diverse tipologie di abbonamento. Eventualmente potrai trovare maggiori informazioni visitando ciascun sito."
+"The listed sites allow public registration for the $Projectname network. All"
+" sites in the network are interlinked so membership on any of them conveys "
+"membership in the network as a whole. Some sites may require subscription or"
+" provide tiered service plans. The provider links <strong>may</strong> "
+"provide additional details."
+msgstr "I siti elencati permettono la registrazione libera sulla rete $Projectname. Tutti questi hub sono interconnessi, quindi essere iscritti su uno equivale a una registrazione su tutta la rete. Alcuni siti potrebbero richiedere un abbonamento o dei servizi a pagamento. Per maggiori dettagli visita gli indirizzi nell'elenco."
 
 #: ../../mod/pubsites.php:25
 msgid "Rate this hub"
@@ -4961,13 +4542,13 @@ msgstr "Valuta"
 msgid "View ratings"
 msgstr "Vedi le valutazioni"
 
-#: ../../mod/rpost.php:131 ../../mod/editpost.php:42
+#: ../../mod/rpost.php:131 ../../mod/editpost.php:158
 msgid "Edit post"
-msgstr "Modifica articolo"
+msgstr "Modifica post"
 
 #: ../../mod/dav.php:121
-msgid "Hubzilla channel"
-msgstr "Canale Hubzilla"
+msgid "$Projectname channel"
+msgstr "Canale $Projectname"
 
 #: ../../mod/group.php:20
 msgid "Collection created."
@@ -5030,15 +4611,15 @@ msgstr "App e componenti installati:"
 msgid "No installed plugins/addons/apps"
 msgstr "Nessuna app o componente installato"
 
-#: ../../mod/siteinfo.php:155
-msgid "Red"
-msgstr "Hubzilla"
+#: ../../mod/siteinfo.php:155 ../../mod/home.php:58 ../../mod/home.php:66
+msgid "$Projectname"
+msgstr "$Projectname"
 
 #: ../../mod/siteinfo.php:156
 msgid ""
-"This is a hub of hubzilla - a global cooperative network of decentralized "
-"privacy enhanced websites."
-msgstr "Questo è un hub di Hubzilla - una rete cooperativa e decentralizzata di siti ad elevata privacy. "
+"This is a hub of $Projectname - a global cooperative network of "
+"decentralized privacy enhanced websites."
+msgstr "Questo è un hub di $Projectname - una rete cooperativa e decentralizzata di siti ad elevata privacy. "
 
 #: ../../mod/siteinfo.php:158
 msgid "Tag: "
@@ -5055,415 +4636,84 @@ msgstr "In esecuzione sull'indirizzo web"
 #: ../../mod/siteinfo.php:164
 msgid ""
 "Please visit <a href=\"https://redmatrix.me\">redmatrix.me</a> to learn more"
-" about the Hubzilla."
-msgstr "Visita <a href=\"https://redmatrix.me\">Redmatrix.me</a> per scoprire cosa è Hubzilla."
+" about $Projectname."
+msgstr "Visita <a href=\"https://redmatrix.me\">RedMatrix.me</a> per scoprire di più su $Projectname."
 
 #: ../../mod/siteinfo.php:165
 msgid "Bug reports and issues: please visit"
 msgstr "Per segnalare bug e problemi: visita"
 
+#: ../../mod/siteinfo.php:167
+msgid "$projectname issues"
+msgstr "Problematiche note su $projectname"
+
 #: ../../mod/siteinfo.php:168
 msgid ""
-"Suggestions, praise, etc. - please email \"hubzilla\" at librelist - dot "
+"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot "
 "com"
-msgstr "Per consigli, ringraziamenti, ecc. - scrivi a \"hubzilla\" at librelist - dot com"
+msgstr "Per consigli, ringraziamenti, ecc. - scrivi a \"redmatrix\" at librelist - dot com"
 
 #: ../../mod/siteinfo.php:170
 msgid "Site Administrators"
 msgstr "Amministratori del sito"
 
-#: ../../mod/help.php:49 ../../mod/help.php:55 ../../mod/help.php:61
-msgid "Help:"
-msgstr "Guida:"
-
-#: ../../mod/help.php:76 ../../index.php:238
-msgid "Not Found"
-msgstr "Non disponibile"
-
-#: ../../mod/setup.php:166
-msgid "Hubzilla Server - Setup"
-msgstr "Hubzilla Server - Installazione"
-
-#: ../../mod/setup.php:172
-msgid "Could not connect to database."
-msgstr " Impossibile connettersi al database."
-
-#: ../../mod/setup.php:176
-msgid ""
-"Could not connect to specified site URL. Possible SSL certificate or DNS "
-"issue."
-msgstr "Non è possibile raggiungere l'indirizzo del sito specificato. Potrebbe essere un problema di SSL o DNS."
-
-#: ../../mod/setup.php:183
-msgid "Could not create table."
-msgstr "Impossibile creare le tabelle."
-
-#: ../../mod/setup.php:189
-msgid "Your site database has been installed."
-msgstr "Il database del sito è stato installato."
-
-#: ../../mod/setup.php:194
-msgid ""
-"You may need to import the file \"install/schema_xxx.sql\" manually using a "
-"database client."
-msgstr "Potresti dover importare il file 'install/schema_xxx.sql' manualmente usando un client per collegarti al db."
-
-#: ../../mod/setup.php:195 ../../mod/setup.php:264 ../../mod/setup.php:662
-msgid "Please see the file \"install/INSTALL.txt\"."
-msgstr "Leggi il file 'install/INSTALL.txt'."
-
-#: ../../mod/setup.php:261
-msgid "System check"
-msgstr "Verifica del sistema"
-
-#: ../../mod/setup.php:266
-msgid "Check again"
-msgstr "Verifica di nuovo"
-
-#: ../../mod/setup.php:289
-msgid "Database connection"
-msgstr "Connessione al database"
-
-#: ../../mod/setup.php:290
-msgid ""
-"In order to install Hubzilla we need to know how to connect to your "
-"database."
-msgstr "Per installare Hubzilla è necessario conoscere i parametri di connessione al database."
-
-#: ../../mod/setup.php:291
-msgid ""
-"Please contact your hosting provider or site administrator if you have "
-"questions about these settings."
-msgstr "Contatta il tuo fornitore di hosting o l'amministratore del sito se hai domande su queste impostazioni."
-
-#: ../../mod/setup.php:292
-msgid ""
-"The database you specify below should already exist. If it does not, please "
-"create it before continuing."
-msgstr "Il database deve già esistere. Se non esiste, crealo prima di continuare."
-
-#: ../../mod/setup.php:296
-msgid "Database Server Name"
-msgstr "Server del database"
-
-#: ../../mod/setup.php:296
-msgid "Default is localhost"
-msgstr "'localhost' è il predefinito"
-
-#: ../../mod/setup.php:297
-msgid "Database Port"
-msgstr "Port del database"
-
-#: ../../mod/setup.php:297
-msgid "Communication port number - use 0 for default"
-msgstr "Scrivi 0 per usare il valore standard"
-
-#: ../../mod/setup.php:298
-msgid "Database Login Name"
-msgstr "Utente database"
-
-#: ../../mod/setup.php:299
-msgid "Database Login Password"
-msgstr "Password utente database"
-
-#: ../../mod/setup.php:300
-msgid "Database Name"
-msgstr "Nome database"
-
-#: ../../mod/setup.php:301
-msgid "Database Type"
-msgstr "Tipo database"
-
-#: ../../mod/setup.php:303 ../../mod/setup.php:347
-msgid "Site administrator email address"
-msgstr "Indirizzo email dell'amministratore del sito"
-
-#: ../../mod/setup.php:303 ../../mod/setup.php:347
-msgid ""
-"Your account email address must match this in order to use the web admin "
-"panel."
-msgstr "Il tuo indirizzo email deve corrispondere a questo per poter usare il pannello di amministrazione web."
-
-#: ../../mod/setup.php:304 ../../mod/setup.php:349
-msgid "Website URL"
-msgstr "URL completo del sito"
-
-#: ../../mod/setup.php:304 ../../mod/setup.php:349
-msgid "Please use SSL (https) URL if available."
-msgstr "Se disponibile, usa l'indirizzo SSL (https)."
-
-#: ../../mod/setup.php:307 ../../mod/setup.php:352
-msgid "Please select a default timezone for your website"
-msgstr "Seleziona il fuso orario predefinito per il tuo sito web"
-
-#: ../../mod/setup.php:335
-msgid "Site settings"
-msgstr "Impostazioni del sito"
-
-#: ../../mod/setup.php:395
-msgid "Could not find a command line version of PHP in the web server PATH."
-msgstr "Non è possibile trovare la versione di PHP da riga di comando nel PATH del server web"
-
-#: ../../mod/setup.php:396
-msgid ""
-"If you don't have a command line version of PHP installed on server, you "
-"will not be able to run background polling via cron."
-msgstr "Se non hai installata la versione di PHP da riga di comando non potrai attivare il polling in background tramite cron."
-
-#: ../../mod/setup.php:400
-msgid "PHP executable path"
-msgstr "Path del comando PHP"
-
-#: ../../mod/setup.php:400
-msgid ""
-"Enter full path to php executable. You can leave this blank to continue the "
-"installation."
-msgstr "Inserisci il percorso dell'eseguibile PHP. Puoi lasciarlo vuoto per continuare l'installazione."
-
-#: ../../mod/setup.php:405
-msgid "Command line PHP"
-msgstr "PHP da riga di comando"
-
-#: ../../mod/setup.php:414
-msgid ""
-"The command line version of PHP on your system does not have "
-"\"register_argc_argv\" enabled."
-msgstr "La versione da riga di comando di PHP nel sistema non ha abilitato \"register_argc_argv\"."
-
-#: ../../mod/setup.php:415
-msgid "This is required for message delivery to work."
-msgstr "E' necessario perché funzioni la consegna dei messaggi."
-
-#: ../../mod/setup.php:417
-msgid "PHP register_argc_argv"
-msgstr "PHP register_argc_argv"
-
-#: ../../mod/setup.php:438
-msgid ""
-"Error: the \"openssl_pkey_new\" function on this system is not able to "
-"generate encryption keys"
-msgstr "Errore: la funzione \"openssl_pkey_new\" su questo sistema non è in grado di generare le chiavi di criptazione"
-
-#: ../../mod/setup.php:439
-msgid ""
-"If running under Windows, please see "
-"\"http://www.php.net/manual/en/openssl.installation.php\"."
-msgstr "Se stai usando un server windows, guarda \"http://www.php.net/manual/en/openssl.installation.php\"."
-
-#: ../../mod/setup.php:441
-msgid "Generate encryption keys"
-msgstr "Genera chiavi di criptazione"
-
-#: ../../mod/setup.php:448
-msgid "libCurl PHP module"
-msgstr "modulo PHP libCurl"
-
-#: ../../mod/setup.php:449
-msgid "GD graphics PHP module"
-msgstr "modulo PHP GD graphics"
-
-#: ../../mod/setup.php:450
-msgid "OpenSSL PHP module"
-msgstr "modulo PHP OpenSSL"
-
-#: ../../mod/setup.php:451
-msgid "mysqli or postgres PHP module"
-msgstr "modulo PHP per mysqli oppure prostgres"
-
-#: ../../mod/setup.php:452
-msgid "mb_string PHP module"
-msgstr "modulo PHP mb_string"
-
-#: ../../mod/setup.php:453
-msgid "mcrypt PHP module"
-msgstr "modulo PHP mcrypt"
-
-#: ../../mod/setup.php:458 ../../mod/setup.php:460
-msgid "Apache mod_rewrite module"
-msgstr "modulo Apache mod_rewrite"
-
-#: ../../mod/setup.php:458
-msgid ""
-"Error: Apache webserver mod-rewrite module is required but not installed."
-msgstr "Errore: il modulo mod-rewrite di Apache è richiesto ma non installato"
-
-#: ../../mod/setup.php:464 ../../mod/setup.php:467
-msgid "proc_open"
-msgstr "proc_open"
-
-#: ../../mod/setup.php:464
-msgid ""
-"Error: proc_open is required but is either not installed or has been "
-"disabled in php.ini"
-msgstr "Errore: proc_open è richiesto ma non è installato o è disabilitato in php.ini"
-
-#: ../../mod/setup.php:472
-msgid "Error: libCURL PHP module required but not installed."
-msgstr "Errore: il modulo libCURL di PHP è richiesto ma non installato."
-
-#: ../../mod/setup.php:476
-msgid ""
-"Error: GD graphics PHP module with JPEG support required but not installed."
-msgstr "Errore: Il modulo GD graphics di PHP con supporto a JPEG è richiesto ma non installato."
-
-#: ../../mod/setup.php:480
-msgid "Error: openssl PHP module required but not installed."
-msgstr "Errore: il modulo openssl di PHP è richiesto ma non installato."
-
-#: ../../mod/setup.php:484
-msgid ""
-"Error: mysqli or postgres PHP module required but neither are installed."
-msgstr "Errore: il modulo PHP per mysqli o postgres è richiesto ma non installato"
-
-#: ../../mod/setup.php:488
-msgid "Error: mb_string PHP module required but not installed."
-msgstr "Errore: il modulo PHP mb_string è richiesto ma non installato."
-
-#: ../../mod/setup.php:492
-msgid "Error: mcrypt PHP module required but not installed."
-msgstr "Errore: il modulo PHP mcrypt è richiesto ma non installato."
-
-#: ../../mod/setup.php:508
-msgid ""
-"The web installer needs to be able to create a file called \".htconfig.php\""
-" in the top folder of your web server and it is unable to do so."
-msgstr "L'installazione web deve poter creare un file chiamato \".htconfig.php\" nella cartella di Hubzilla ma non è in grado di farlo."
-
-#: ../../mod/setup.php:509
-msgid ""
-"This is most often a permission setting, as the web server may not be able "
-"to write files in your folder - even if you can."
-msgstr "Spesso ciò è dovuto ai permessi di accesso al disco: il web server potrebbe non aver diritto di scrivere il file nella cartella, anche se tu puoi."
-
-#: ../../mod/setup.php:510
-msgid ""
-"At the end of this procedure, we will give you a text to save in a file "
-"named .htconfig.php in your Red top folder."
-msgstr "Alla fine di questa procedura ti sarà dato il testo da salvare in un file di nome .htconfig.php dentro la cartella principale di Hubzilla."
-
-#: ../../mod/setup.php:511
-msgid ""
-"You can alternatively skip this procedure and perform a manual installation."
-" Please see the file \"install/INSTALL.txt\" for instructions."
-msgstr "Puoi anche saltare questa procedura ed effettuare un'installazione manuale. Guarda il file 'install/INSTALL.txt' per le istruzioni."
+#: ../../mod/item.php:174
+msgid "Unable to locate original post."
+msgstr "Impossibile trovare il messaggio originale."
 
-#: ../../mod/setup.php:514
-msgid ".htconfig.php is writable"
-msgstr ".htconfig.php è scrivibile"
+#: ../../mod/item.php:440
+msgid "Empty post discarded."
+msgstr "Il post vuoto è stato ignorato."
 
-#: ../../mod/setup.php:524
-msgid ""
-"Red uses the Smarty3 template engine to render its web views. Smarty3 "
-"compiles templates to PHP to speed up rendering."
-msgstr "Red usa il sistema Smarty3 per costruire i suoi template grafici. Smarty3 è molto veloce perché compila i template delle pagine direttamente in PHP."
+#: ../../mod/item.php:480
+msgid "Executable content type not permitted to this channel."
+msgstr "I contenuti eseguibili non sono permessi su questo canale."
 
-#: ../../mod/setup.php:525
-#, php-format
-msgid ""
-"In order to store these compiled templates, the web server needs to have "
-"write access to the directory %s under the Red top level folder."
-msgstr "Per poter memorizzare i template compilati, il web server deve avere accesso in scrittura a %s sotto la cartella di installazione di Hubzilla."
+#: ../../mod/item.php:914
+msgid "System error. Post not saved."
+msgstr "Errore di sistema. Post non salvato."
 
-#: ../../mod/setup.php:526 ../../mod/setup.php:544
-msgid ""
-"Please ensure that the user that your web server runs as (e.g. www-data) has"
-" write access to this folder."
-msgstr "Assicurati che il tuo web server sia in esecuzione da parte di un utente che ha diritto di scrittura su quella cartella  (ad esempio www-data)."
+#: ../../mod/item.php:1146
+msgid "Unable to obtain post information from database."
+msgstr "Impossibile caricare il post dal database."
 
-#: ../../mod/setup.php:527
+#: ../../mod/item.php:1153
 #, php-format
-msgid ""
-"Note: as a security measure, you should give the web server write access to "
-"%s only--not the template files (.tpl) that it contains."
-msgstr "Nota bene: come precauzione, dovresti dare i diritti di scrittura solamente su %s e non sui file template (.tpl) che contiene."
+msgid "You have reached your limit of %1$.0f top level posts."
+msgstr "Hai raggiunto il limite massimo di %1$.0f post sulla pagina principale."
 
-#: ../../mod/setup.php:530
+#: ../../mod/item.php:1160
 #, php-format
-msgid "%s is writable"
-msgstr "%s è scrivibile"
-
-#: ../../mod/setup.php:543
-msgid ""
-"Red uses the store directory to save uploaded files. The web server needs to"
-" have write access to the store directory under the Red top level folder"
-msgstr "Hubzilla salva i file caricati nella cartella \"store\" sul server. Il server deve avere i diritti di scrittura su quella cartella che si trova dentro l'installazione di Hubzilla"
-
-#: ../../mod/setup.php:547
-msgid "store is writable"
-msgstr "l'archivio è scrivibile"
-
-#: ../../mod/setup.php:577
-msgid ""
-"SSL certificate cannot be validated. Fix certificate or disable https access"
-" to this site."
-msgstr "Il certificato SSL non può essere validato. Correggi l'errore o disabilita l'accesso https al sito."
-
-#: ../../mod/setup.php:578
-msgid ""
-"If you have https access to your website or allow connections to TCP port "
-"443 (the https: port), you MUST use a browser-valid certificate. You MUST "
-"NOT use self-signed certificates!"
-msgstr "Se abiliti https per il tuo sito o permetti connessioni TCP su port 443 (quella di https), DEVI usare un certificato riconosciuto dai browser internet. NON DEVI usare certificati generati da te!"
-
-#: ../../mod/setup.php:579
-msgid ""
-"This restriction is incorporated because public posts from you may for "
-"example contain references to images on your own hub."
-msgstr "Questa restrizione è necessaria perché i tuoi post pubblici potrebbero contenere riferimenti a immagini sul tuo server."
-
-#: ../../mod/setup.php:580
-msgid ""
-"If your certificate is not recognized, members of other sites (who may "
-"themselves have valid certificates) will get a warning message on their own "
-"site complaining about security issues."
-msgstr "Se il tuo certificato non è riconosciuto, gli utenti che ti seguono da altri siti (che avranno certificati validi) riceveranno gravi avvisi di sicurezza dal browser."
-
-#: ../../mod/setup.php:581
-msgid ""
-"This can cause usability issues elsewhere (not just on your own site) so we "
-"must insist on this requirement."
-msgstr "Ciò può creare seri problemi di usabilità (non solo sul tuo sito), quindi dobbiamo insistere su questo punto."
-
-#: ../../mod/setup.php:582
-msgid ""
-"Providers are available that issue free certificates which are browser-"
-"valid."
-msgstr "Eventualmente, considera che esistono provider che rilasciano certificati gratuiti riconosciuti dai browser."
+msgid "You have reached your limit of %1$.0f webpages."
+msgstr "Hai raggiunto il limite massimo di %1$.0f pagine web."
 
-#: ../../mod/setup.php:584
-msgid "SSL certificate validation"
-msgstr "Validazione del certificato SSL"
+#: ../../mod/network.php:91
+msgid "No such group"
+msgstr "Impossibile trovare l'insieme"
 
-#: ../../mod/setup.php:590
-msgid ""
-"Url rewrite in .htaccess is not working. Check your server "
-"configuration.Test: "
-msgstr "In .htaccess la funzionalità url rewrite non funziona. Controlla la configurazione del server. Test:"
+#: ../../mod/network.php:129
+msgid "No such channel"
+msgstr "Canale sconosciuto"
 
-#: ../../mod/setup.php:592
-msgid "Url rewrite is working"
-msgstr "Url rewrite funziona correttamente"
+#: ../../mod/network.php:143
+msgid "Search Results For:"
+msgstr "Cerca risultati con:"
 
-#: ../../mod/setup.php:602
-msgid ""
-"The database configuration file \".htconfig.php\" could not be written. "
-"Please use the enclosed text to create a configuration file in your web "
-"server root."
-msgstr "Il file di configurazione del database \".htconfig.php\" non puo' essere scritto. Usa il testo qui di seguito per creare questo file di configurazione nella cartella principale del tuo sito."
+#: ../../mod/network.php:198
+msgid "Collection is empty"
+msgstr "L'insieme di canali è vuoto"
 
-#: ../../mod/setup.php:625
-msgid "Errors encountered creating database tables."
-msgstr "La creazione delle tabelle del database ha generato errori."
+#: ../../mod/network.php:207
+msgid "Collection: "
+msgstr "Insieme:"
 
-#: ../../mod/setup.php:660
-msgid "<h1>What next</h1>"
-msgstr "<h1>I prossimi passi</h1>"
+#: ../../mod/network.php:226
+msgid "Connection: "
+msgstr "Contatto:"
 
-#: ../../mod/setup.php:661
-msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the "
-"poller."
-msgstr "IMPORTANTE: Devi creare [manualmente] la pianificazione del polling."
+#: ../../mod/network.php:233
+msgid "Invalid connection."
+msgstr "Contatto non valido."
 
 #: ../../mod/common.php:10
 msgid "No channel."
@@ -5481,270 +4731,273 @@ msgstr "Nessun contatto in comune."
 msgid "This site is not a directory server"
 msgstr "Questo sito non è un server di elenchi pubblici"
 
-#: ../../mod/connections.php:37 ../../mod/connedit.php:75
-msgid "Could not access contact record."
-msgstr "Non è possibile accedere alle informazioni sul contatto."
-
-#: ../../mod/connections.php:51 ../../mod/connedit.php:99
-msgid "Could not locate selected profile."
-msgstr "Non riesco a trovare il profilo selezionato."
-
-#: ../../mod/connections.php:94 ../../mod/connedit.php:214
-msgid "Connection updated."
-msgstr "Contatto aggiornato."
-
-#: ../../mod/connections.php:96 ../../mod/connedit.php:216
-msgid "Failed to update connection record."
-msgstr "Impossibile aggiornare le informazioni del contatto."
-
-#: ../../mod/connections.php:192 ../../mod/connections.php:293
+#: ../../mod/connections.php:52 ../../mod/connections.php:153
 msgid "Blocked"
 msgstr "Bloccati"
 
-#: ../../mod/connections.php:197 ../../mod/connections.php:300
+#: ../../mod/connections.php:57 ../../mod/connections.php:160
 msgid "Ignored"
 msgstr "Ignorati"
 
-#: ../../mod/connections.php:202 ../../mod/connections.php:314
+#: ../../mod/connections.php:62 ../../mod/connections.php:174
 msgid "Hidden"
 msgstr "Nascosti"
 
-#: ../../mod/connections.php:207 ../../mod/connections.php:307
+#: ../../mod/connections.php:67 ../../mod/connections.php:167
 msgid "Archived"
 msgstr "Archiviati"
 
-#: ../../mod/connections.php:271
+#: ../../mod/connections.php:131
 msgid "Suggest new connections"
 msgstr "Suggerisci nuovi contatti"
 
-#: ../../mod/connections.php:274
+#: ../../mod/connections.php:134
 msgid "New Connections"
 msgstr "Nuovi contatti"
 
-#: ../../mod/connections.php:277
+#: ../../mod/connections.php:137
 msgid "Show pending (new) connections"
 msgstr "Richieste di contatto in attesa"
 
-#: ../../mod/connections.php:280 ../../mod/profperm.php:139
+#: ../../mod/connections.php:140 ../../mod/profperm.php:139
 msgid "All Connections"
 msgstr "Tutti i contatti"
 
-#: ../../mod/connections.php:283
+#: ../../mod/connections.php:143
 msgid "Show all connections"
 msgstr "Mostra tutti i contatti"
 
-#: ../../mod/connections.php:286
+#: ../../mod/connections.php:146
 msgid "Unblocked"
 msgstr "Non bloccati"
 
-#: ../../mod/connections.php:289
+#: ../../mod/connections.php:149
 msgid "Only show unblocked connections"
 msgstr "Mostra solo i contatti non bloccati"
 
-#: ../../mod/connections.php:296
+#: ../../mod/connections.php:156
 msgid "Only show blocked connections"
 msgstr "Mostra solo i contatti bloccati"
 
-#: ../../mod/connections.php:303
+#: ../../mod/connections.php:163
 msgid "Only show ignored connections"
 msgstr "Mostra solo i contatti ignorati"
 
-#: ../../mod/connections.php:310
+#: ../../mod/connections.php:170
 msgid "Only show archived connections"
 msgstr "Mostra solo i contatti archiviati"
 
-#: ../../mod/connections.php:317
+#: ../../mod/connections.php:177
 msgid "Only show hidden connections"
 msgstr "Mostra solo i contatti nascosti"
 
-#: ../../mod/connections.php:372
+#: ../../mod/connections.php:232
 #, php-format
 msgid "%1$s [%2$s]"
 msgstr "%1$s [%2$s]"
 
-#: ../../mod/connections.php:373
+#: ../../mod/connections.php:233
 msgid "Edit connection"
 msgstr "Modifica il contatto"
 
-#: ../../mod/connections.php:411
+#: ../../mod/connections.php:271
 msgid "Search your connections"
 msgstr "Cerca tra i contatti"
 
-#: ../../mod/connections.php:412
+#: ../../mod/connections.php:272
 msgid "Finding: "
 msgstr "Ricerca: "
 
-#: ../../mod/impel.php:33
-msgid "webpage"
-msgstr "pagina web"
+#: ../../mod/blocks.php:95 ../../mod/blocks.php:148
+msgid "Block Name"
+msgstr "Nome del riquadro"
 
-#: ../../mod/impel.php:38
-msgid "block"
-msgstr "riquadro"
+#: ../../mod/blocks.php:149
+msgid "Block Title"
+msgstr "Nome del riquadro"
 
-#: ../../mod/impel.php:43
-msgid "layout"
-msgstr "layout"
+#: ../../mod/editpost.php:20 ../../mod/editlayout.php:76
+#: ../../mod/editwebpage.php:77 ../../mod/editblock.php:78
+#: ../../mod/editblock.php:94
+msgid "Item not found"
+msgstr "Elemento non trovato"
 
-#: ../../mod/impel.php:117
-#, php-format
-msgid "%s element installed"
-msgstr "%s elemento installato"
+#: ../../mod/editpost.php:31
+msgid "Item is not editable"
+msgstr "L'elemento non è modificabile"
 
-#: ../../mod/tagger.php:96
-#, php-format
-msgid "%1$s tagged %2$s's %3$s with %4$s"
-msgstr "%1$s ha taggato %3$s di %2$s con %4$s"
+#: ../../mod/editpost.php:48
+msgid "Delete item?"
+msgstr "Eliminare questo elemento?"
+
+#: ../../mod/editpost.php:115 ../../mod/editlayout.php:142
+#: ../../mod/editwebpage.php:187 ../../mod/editblock.php:144
+msgid "Insert YouTube video"
+msgstr "Inserisci video da YouTube"
+
+#: ../../mod/editpost.php:116 ../../mod/editlayout.php:143
+#: ../../mod/editwebpage.php:188 ../../mod/editblock.php:145
+msgid "Insert Vorbis [.ogg] video"
+msgstr "Inserisci video Vorbis [.ogg]"
+
+#: ../../mod/editpost.php:117 ../../mod/editlayout.php:144
+#: ../../mod/editwebpage.php:189 ../../mod/editblock.php:146
+msgid "Insert Vorbis [.ogg] audio"
+msgstr "Inserisci audio Vorbis [.ogg]"
 
 #: ../../mod/cloud.php:120
-msgid "Hubzilla - Guests: Username: {your email address}, Password: +++"
-msgstr "Accesso a Hubzilla. {Inserisci l'email con cui sei registrato e la password.}"
+msgid "$Projectname - Guests: Username: {your email address}, Password: +++"
+msgstr "Login su $Projectname. Username: {la tua email}, Password: {la tua password} "
 
-#: ../../mod/photos.php:77
+#: ../../mod/photos.php:78
 msgid "Page owner information could not be retrieved."
 msgstr "Impossibile ottenere informazioni sul proprietario della pagina."
 
-#: ../../mod/photos.php:97
+#: ../../mod/photos.php:98
 msgid "Album not found."
 msgstr "Album non trovato."
 
-#: ../../mod/photos.php:119 ../../mod/photos.php:643
+#: ../../mod/photos.php:120 ../../mod/photos.php:655
 msgid "Delete Album"
 msgstr "Elimina album"
 
-#: ../../mod/photos.php:159 ../../mod/photos.php:930
+#: ../../mod/photos.php:160 ../../mod/photos.php:942
 msgid "Delete Photo"
 msgstr "Elimina foto"
 
-#: ../../mod/photos.php:429 ../../mod/search.php:13 ../../mod/display.php:13
-#: ../../mod/ratings.php:82 ../../mod/directory.php:47
-#: ../../mod/viewconnections.php:17
-msgid "Public access denied."
-msgstr "Accesso pubblico negato."
-
-#: ../../mod/photos.php:440
+#: ../../mod/photos.php:452
 msgid "No photos selected"
 msgstr "Nessuna foto selezionata"
 
-#: ../../mod/photos.php:484
+#: ../../mod/photos.php:496
 msgid "Access to this item is restricted."
 msgstr "Questo elemento non è visibile a tutti."
 
-#: ../../mod/photos.php:523
+#: ../../mod/photos.php:535
 #, php-format
 msgid "%1$.2f MB of %2$.2f MB photo storage used."
 msgstr "Hai usato %1$.2f Mb dei %2$.2f Mb di spazio disponibile."
 
-#: ../../mod/photos.php:526
+#: ../../mod/photos.php:538
 #, php-format
 msgid "%1$.2f MB photo storage used."
 msgstr "Hai usato %1$.2f Mb del tuo spazio disponibile."
 
-#: ../../mod/photos.php:550
+#: ../../mod/photos.php:562
 msgid "Upload Photos"
 msgstr "Carica foto"
 
-#: ../../mod/photos.php:554 ../../mod/photos.php:636 ../../mod/photos.php:915
+#: ../../mod/photos.php:566 ../../mod/photos.php:648 ../../mod/photos.php:927
 msgid "Enter a new album name"
 msgstr "Inserisci il nome di un nuovo album"
 
-#: ../../mod/photos.php:555 ../../mod/photos.php:637 ../../mod/photos.php:916
+#: ../../mod/photos.php:567 ../../mod/photos.php:649 ../../mod/photos.php:928
 msgid "or select an existing one (doubleclick)"
 msgstr "o seleziona uno esistente (doppio click)"
 
-#: ../../mod/photos.php:556
+#: ../../mod/photos.php:568
 msgid "Create a status post for this upload"
 msgstr "Pubblica l'oggetto caricato sulla bacheca"
 
-#: ../../mod/photos.php:584
+#: ../../mod/photos.php:596
 msgid "Album name could not be decoded"
 msgstr "Non è stato possibile leggere il nome dell'album"
 
-#: ../../mod/photos.php:625 ../../mod/photos.php:1157
-#: ../../mod/photos.php:1173
+#: ../../mod/photos.php:637 ../../mod/photos.php:1169
+#: ../../mod/photos.php:1185
 msgid "Contact Photos"
 msgstr "Foto dei contatti"
 
-#: ../../mod/photos.php:649
+#: ../../mod/photos.php:661
 msgid "Show Newest First"
 msgstr "Prima i più recenti"
 
-#: ../../mod/photos.php:651
+#: ../../mod/photos.php:663
 msgid "Show Oldest First"
 msgstr "Prima i più vecchi"
 
-#: ../../mod/photos.php:675 ../../mod/photos.php:1205
+#: ../../mod/photos.php:687 ../../mod/photos.php:1217
 msgid "View Photo"
 msgstr "Guarda la foto"
 
-#: ../../mod/photos.php:704
+#: ../../mod/photos.php:716
 msgid "Edit Album"
 msgstr "Modifica album"
 
-#: ../../mod/photos.php:749
+#: ../../mod/photos.php:761
 msgid "Permission denied. Access to this item may be restricted."
 msgstr "Permesso negato. L'accesso a questo elemento può essere stato limitato."
 
-#: ../../mod/photos.php:751
+#: ../../mod/photos.php:763
 msgid "Photo not available"
 msgstr "Foto non disponibile"
 
-#: ../../mod/photos.php:809
+#: ../../mod/photos.php:821
 msgid "Use as profile photo"
 msgstr "Usa come foto del profilo"
 
-#: ../../mod/photos.php:816
+#: ../../mod/photos.php:828
 msgid "Private Photo"
 msgstr "Foto privata"
 
-#: ../../mod/photos.php:831
+#: ../../mod/photos.php:843
 msgid "View Full Size"
 msgstr "Vedi nelle dimensioni originali"
 
-#: ../../mod/photos.php:909
+#: ../../mod/photos.php:921
 msgid "Edit photo"
 msgstr "Modifica la foto"
 
-#: ../../mod/photos.php:911
+#: ../../mod/photos.php:923
 msgid "Rotate CW (right)"
 msgstr "Ruota (senso orario)"
 
-#: ../../mod/photos.php:912
+#: ../../mod/photos.php:924
 msgid "Rotate CCW (left)"
 msgstr "Ruota (senso antiorario)"
 
-#: ../../mod/photos.php:919
+#: ../../mod/photos.php:931
 msgid "Caption"
 msgstr "Titolo"
 
-#: ../../mod/photos.php:921
+#: ../../mod/photos.php:933
 msgid "Add a Tag"
 msgstr "Aggiungi tag"
 
-#: ../../mod/photos.php:925
+#: ../../mod/photos.php:937
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
 msgstr "Esempio: @bob, @Barbara_Jensen, @jim@example.com"
 
-#: ../../mod/photos.php:928
+#: ../../mod/photos.php:940
 msgid "Flag as adult in album view"
 msgstr "Marca come 'per adulti'"
 
-#: ../../mod/photos.php:1120
+#: ../../mod/photos.php:1132
 msgid "In This Photo:"
 msgstr "In questa foto:"
 
-#: ../../mod/photos.php:1125
+#: ../../mod/photos.php:1137
 msgid "Map"
 msgstr "Mappa"
 
-#: ../../mod/photos.php:1211
+#: ../../mod/photos.php:1223
 msgid "View Album"
 msgstr "Guarda l'album"
 
-#: ../../mod/photos.php:1234
+#: ../../mod/photos.php:1246
 msgid "Recent Photos"
 msgstr "Foto recenti"
 
+#: ../../mod/search.php:206
+#, php-format
+msgid "Items tagged with: %s"
+msgstr "Elementi taggati con: %s"
+
+#: ../../mod/search.php:208
+#, php-format
+msgid "Search results for: %s"
+msgstr "Risultati ricerca: %s"
+
 #: ../../mod/match.php:22
 msgid "Profile Match"
 msgstr "Profili corrispondenti"
@@ -5821,7 +5074,7 @@ msgstr "Layout non trovato."
 msgid "Module Name:"
 msgstr "Nome del modulo:"
 
-#: ../../mod/pdledit.php:55 ../../mod/layouts.php:108
+#: ../../mod/pdledit.php:55
 msgid "Layout Help"
 msgstr "Guida al layout"
 
@@ -5834,76 +5087,76 @@ msgstr "- scegli -"
 msgid "Your service plan only allows %d channels."
 msgstr "Il tuo account permette di creare al massimo %d canali."
 
-#: ../../mod/import.php:51
+#: ../../mod/import.php:60
 msgid "Nothing to import."
 msgstr "Non c'è niente da importare."
 
-#: ../../mod/import.php:75
+#: ../../mod/import.php:84
 msgid "Unable to download data from old server"
 msgstr "Impossibile importare i dati dal vecchio server"
 
-#: ../../mod/import.php:81
+#: ../../mod/import.php:90
 msgid "Imported file is empty."
 msgstr "Il file da importare è vuoto."
 
-#: ../../mod/import.php:106
+#: ../../mod/import.php:110
+msgid "The data provided is not compatible with this project."
+msgstr "I dati forniti non sono compatibili con questo hub."
+
+#: ../../mod/import.php:115
+#, php-format
+msgid "Warning: Database versions differ by %1$d updates."
+msgstr "Attenzione: le versioni di database differiscono di %1$d aggiornamenti."
+
+#: ../../mod/import.php:135
 msgid ""
 "Cannot create a duplicate channel identifier on this system. Import failed."
 msgstr "Non posso creare un canale con un identificativo che già esiste su questo sistema. L'importazione è fallita."
 
-#: ../../mod/import.php:127
-msgid "Unable to create a unique channel address. Import failed."
-msgstr "Impossibile creare un indirizzo univoco per il canale. L'import è fallito."
-
-#: ../../mod/import.php:147
+#: ../../mod/import.php:176
 msgid "Channel clone failed. Import failed."
 msgstr "Impossibile clonare il canale. L'importazione è fallita."
 
-#: ../../mod/import.php:157
+#: ../../mod/import.php:186
 msgid "Cloned channel not found. Import failed."
 msgstr "Impossibile trovare il canale clonato. L'importazione è fallita."
 
-#: ../../mod/import.php:475
-msgid "Import completed."
-msgstr "L'importazione è terminata con successo!"
-
-#: ../../mod/import.php:487
+#: ../../mod/import.php:574
 msgid "You must be logged in to use this feature."
 msgstr "Per questa funzionalità devi aver effettuato l'accesso."
 
-#: ../../mod/import.php:492
+#: ../../mod/import.php:579
 msgid "Import Channel"
 msgstr "Importa un canale"
 
-#: ../../mod/import.php:493
+#: ../../mod/import.php:580
 msgid ""
 "Use this form to import an existing channel from a different server/hub. You"
 " may retrieve the channel identity from the old server/hub via the network "
-"or provide an export file. Only identity and connections/relationships will "
-"be imported. Importation of content is not yet available."
-msgstr "Usa questo modulo per importare un tuo canale da un altro server/hub. Puoi scaricare i dati identificativi del canale direttamente dall'altro server/hub oppure tramite un file che hai esportato. Saranno importati solamente l'identità e i contatti. L'importazione dei contenuti non è ancora disponibile."
+"or provide an export file."
+msgstr "Usa questo modulo per importare un tuo canale da un altro server/hub. Puoi ottenere i dati identificativi del canale direttamente dall'altro server/hub oppure tramite un file esportato in precedenza."
 
-#: ../../mod/import.php:494
+#: ../../mod/import.php:581
 msgid "File to Upload"
 msgstr "File da caricare"
 
-#: ../../mod/import.php:495
+#: ../../mod/import.php:582
 msgid "Or provide the old server/hub details"
 msgstr "Oppure fornisci i dettagli del vecchio server/hub"
 
-#: ../../mod/import.php:496
+#: ../../mod/import.php:583
 msgid "Your old identity address (xyz@example.com)"
 msgstr "Il tuo vecchio identificativo (per esempio pippo@esempio.com)"
 
-#: ../../mod/import.php:497
+#: ../../mod/import.php:584
 msgid "Your old login email address"
 msgstr "L'email che usavi per accedere sul vecchio server"
 
-#: ../../mod/import.php:498
+#: ../../mod/import.php:585
 msgid "Your old login password"
 msgstr "La password per il vecchio server"
 
-#: ../../mod/import.php:499
+#: ../../mod/import.php:586
 msgid ""
 "For either option, please choose whether to make this hub your new primary "
 "address, or whether your old location should continue this role. You will be"
@@ -5911,46 +5164,38 @@ msgid ""
 "primary location for files, photos, and media."
 msgstr "Scegli se vuoi spostare il tuo indirizzo primario su questo server, oppure se preferisci che quello vecchio resti tale. Potrai pubblicare da entrambi i server, ma solamente uno sarà indicato come posizione in cui risiedono i tuoi file, foto, ecc."
 
-#: ../../mod/import.php:500
+#: ../../mod/import.php:587
 msgid "Make this hub my primary location"
 msgstr "Rendi questo server il mio indirizzo primario"
 
-#: ../../mod/import.php:501
-msgid "Import existing posts if possible"
-msgstr "Importazione dei post esistenti, se possibile"
-
-#: ../../mod/editlayout.php:78 ../../mod/editwebpage.php:77
-#: ../../mod/editpost.php:20 ../../mod/editblock.php:78
-#: ../../mod/editblock.php:94
-msgid "Item not found"
-msgstr "Elemento non trovato"
+#: ../../mod/import.php:588
+msgid ""
+"Import existing posts if possible (experimental - limited by available "
+"memory"
+msgstr "Importa i contenuti pubblicati, se possibile (sperimentale)"
 
-#: ../../mod/editlayout.php:108
-msgid "Edit Layout"
-msgstr "Modifica il layout"
+#: ../../mod/import.php:589
+msgid ""
+"This process may take several minutes to complete. Please submit the form "
+"only once and leave this page open until finished."
+msgstr "Questa funzione potrebbe impiegare molto tempo a terminare. Per favore lanciala *una volta sola* e resta su questa pagina finché non avrà finito."
 
-#: ../../mod/editlayout.php:117
+#: ../../mod/editlayout.php:111
 msgid "Delete layout?"
 msgstr "Vuoi eliminare questo layout?"
 
-#: ../../mod/editlayout.php:148 ../../mod/editwebpage.php:187
-#: ../../mod/editpost.php:122 ../../mod/editblock.php:150
-msgid "Insert YouTube video"
-msgstr "Inserisci video da YouTube"
+#: ../../mod/editlayout.php:158 ../../mod/layouts.php:124
+msgid "Layout Description (Optional)"
+msgstr "Descrizione del layout (facoltativa)"
 
-#: ../../mod/editlayout.php:149 ../../mod/editwebpage.php:188
-#: ../../mod/editpost.php:123 ../../mod/editblock.php:151
-msgid "Insert Vorbis [.ogg] video"
-msgstr "Inserisci video Vorbis [.ogg]"
-
-#: ../../mod/editlayout.php:150 ../../mod/editwebpage.php:189
-#: ../../mod/editpost.php:124 ../../mod/editblock.php:152
-msgid "Insert Vorbis [.ogg] audio"
-msgstr "Inserisci audio Vorbis [.ogg]"
+#: ../../mod/editlayout.php:160 ../../mod/layouts.php:121
+#: ../../mod/layouts.php:179
+msgid "Layout Name"
+msgstr "Nome layout"
 
-#: ../../mod/editlayout.php:182
-msgid "Delete Layout"
-msgstr "Elimina il layout"
+#: ../../mod/editlayout.php:177
+msgid "Edit Layout"
+msgstr "Modifica il layout"
 
 #: ../../mod/chat.php:19 ../../mod/channel.php:25
 msgid "You must be logged in to see this page."
@@ -5966,7 +5211,7 @@ msgstr "Lascia l'area chat"
 
 #: ../../mod/chat.php:179
 msgid "Delete This Room"
-msgstr "Elimina questa area chat"
+msgstr "Elimina questa chat"
 
 #: ../../mod/chat.php:180
 msgid "I am away right now"
@@ -5993,6 +5238,126 @@ msgstr "Nome dell'area chat"
 msgid "%1$s's Chatrooms"
 msgstr "Le aree chat di %1$s"
 
+#: ../../mod/mitem.php:24 ../../mod/menu.php:138
+msgid "Menu not found."
+msgstr "Menù non trovato."
+
+#: ../../mod/mitem.php:48
+msgid "Unable to create element."
+msgstr "Impossibile creare l'elemento."
+
+#: ../../mod/mitem.php:72
+msgid "Unable to update menu element."
+msgstr "Non è possibile aggiornare l'elemento del menù."
+
+#: ../../mod/mitem.php:88
+msgid "Unable to add menu element."
+msgstr "Impossibile aggiungere l'elemento al menù."
+
+#: ../../mod/mitem.php:154 ../../mod/mitem.php:226
+msgid "Menu Item Permissions"
+msgstr "Permessi del menu"
+
+#: ../../mod/mitem.php:155 ../../mod/mitem.php:227 ../../mod/settings.php:1083
+msgid "(click to open/close)"
+msgstr "(clicca per aprire/chiudere)"
+
+#: ../../mod/mitem.php:157 ../../mod/mitem.php:173
+msgid "Link Name"
+msgstr "Nome link"
+
+#: ../../mod/mitem.php:158 ../../mod/mitem.php:231
+msgid "Link or Submenu Target"
+msgstr "Destinazione del link o del sottomenu"
+
+#: ../../mod/mitem.php:158
+msgid "Enter URL of the link or select a menu name to create a submenu"
+msgstr "Inserisci l'indirizzo del link o scegli il nome di un sottomenu"
+
+#: ../../mod/mitem.php:159 ../../mod/mitem.php:232
+msgid "Use magic-auth if available"
+msgstr "Usa l'autenticazione magica se disponibile"
+
+#: ../../mod/mitem.php:160 ../../mod/mitem.php:233
+msgid "Open link in new window"
+msgstr "Apri il link in una nuova finestra"
+
+#: ../../mod/mitem.php:161 ../../mod/mitem.php:234
+msgid "Order in list"
+msgstr "Ordine dell'elenco"
+
+#: ../../mod/mitem.php:161 ../../mod/mitem.php:234
+msgid "Higher numbers will sink to bottom of listing"
+msgstr "I numeri più alti andranno in fondo all'elenco"
+
+#: ../../mod/mitem.php:162
+msgid "Submit and finish"
+msgstr "Salva e termina"
+
+#: ../../mod/mitem.php:163
+msgid "Submit and continue"
+msgstr "Salva e continua"
+
+#: ../../mod/mitem.php:171
+msgid "Menu:"
+msgstr "Menu:"
+
+#: ../../mod/mitem.php:174
+msgid "Link Target"
+msgstr "Destinazione link"
+
+#: ../../mod/mitem.php:177
+msgid "Edit menu"
+msgstr "Modifica il menù"
+
+#: ../../mod/mitem.php:180
+msgid "Edit element"
+msgstr "Modifica l'elemento"
+
+#: ../../mod/mitem.php:181
+msgid "Drop element"
+msgstr "Elimina l'elemento"
+
+#: ../../mod/mitem.php:182
+msgid "New element"
+msgstr "Nuovo elemento"
+
+#: ../../mod/mitem.php:183
+msgid "Edit this menu container"
+msgstr "Modifica il contenitore del menù"
+
+#: ../../mod/mitem.php:184
+msgid "Add menu element"
+msgstr "Aggiungi un elemento al menù"
+
+#: ../../mod/mitem.php:185
+msgid "Delete this menu item"
+msgstr "Elimina questo elemento del menù"
+
+#: ../../mod/mitem.php:186
+msgid "Edit this menu item"
+msgstr "Modifica questo elemento del menù"
+
+#: ../../mod/mitem.php:203
+msgid "Menu item not found."
+msgstr "L'elemento del menù non è stato trovato."
+
+#: ../../mod/mitem.php:215
+msgid "Menu item deleted."
+msgstr "L'elemento del menù è stato eliminato."
+
+#: ../../mod/mitem.php:217
+msgid "Menu item could not be deleted."
+msgstr "L'elemento del menù non può essere eliminato."
+
+#: ../../mod/mitem.php:224
+msgid "Edit Menu Element"
+msgstr "Modifica l'elemento del menù"
+
+#: ../../mod/mitem.php:230
+msgid "Link text"
+msgstr "Testo del link"
+
 #: ../../mod/editwebpage.php:152
 msgid "Delete webpage?"
 msgstr "Vuoi eliminare questa pagina web?"
@@ -6017,7 +5382,7 @@ msgstr "Nessun account valido trovato."
 msgid "Password reset request issued. Check your email."
 msgstr "La richiesta per reimpostare la password è stata inviata. Controlla la tua email."
 
-#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:102
+#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:103
 #, php-format
 msgid "Site Member (%s)"
 msgstr "Utente del sito (%s)"
@@ -6033,52 +5398,52 @@ msgid ""
 "Password reset failed."
 msgstr "La richiesta non può essere verificata (potresti averla già usata precedentemente). La password non sarà reimpostata."
 
-#: ../../mod/lostpass.php:85 ../../boot.php:1548
+#: ../../mod/lostpass.php:86 ../../boot.php:1558
 msgid "Password Reset"
 msgstr "Reimposta la password"
 
-#: ../../mod/lostpass.php:86
+#: ../../mod/lostpass.php:87
 msgid "Your password has been reset as requested."
 msgstr "La password è stata reimpostata come richiesto."
 
-#: ../../mod/lostpass.php:87
+#: ../../mod/lostpass.php:88
 msgid "Your new password is"
 msgstr "La tua nuova password è"
 
-#: ../../mod/lostpass.php:88
+#: ../../mod/lostpass.php:89
 msgid "Save or copy your new password - and then"
 msgstr "Salva o copia la tua nuova password, quindi"
 
-#: ../../mod/lostpass.php:89
+#: ../../mod/lostpass.php:90
 msgid "click here to login"
 msgstr "clicca qui per accedere"
 
-#: ../../mod/lostpass.php:90
+#: ../../mod/lostpass.php:91
 msgid ""
 "Your password may be changed from the <em>Settings</em> page after "
 "successful login."
 msgstr "Puoi cambiare la tua password dalla pagina delle <em>Impostazioni</em> dopo aver effettuato l'accesso."
 
-#: ../../mod/lostpass.php:107
+#: ../../mod/lostpass.php:108
 #, php-format
 msgid "Your password has changed at %s"
 msgstr "La tua password su %s è cambiata"
 
-#: ../../mod/lostpass.php:122
+#: ../../mod/lostpass.php:123
 msgid "Forgot your Password?"
 msgstr "Hai dimenticato la password?"
 
-#: ../../mod/lostpass.php:123
+#: ../../mod/lostpass.php:124
 msgid ""
 "Enter your email address and submit to have your password reset. Then check "
 "your email for further instructions."
 msgstr "Inserisci il tuo indirizzo email per reimpostare la password. Dopo aver inviato la richiesta, controlla l'email e troverai le istruzioni per continuare."
 
-#: ../../mod/lostpass.php:124
+#: ../../mod/lostpass.php:125
 msgid "Email Address"
 msgstr "Indirizzo email"
 
-#: ../../mod/lostpass.php:125
+#: ../../mod/lostpass.php:126
 msgid "Reset"
 msgstr "Reimposta"
 
@@ -6091,21 +5456,21 @@ msgstr "Sito web:"
 msgid "Remote Channel [%s] (not yet known on this site)"
 msgstr "Canale remoto [%s] (non ancora conosciuto da questo sito)"
 
-#: ../../mod/rate.php:161 ../../mod/connedit.php:663
+#: ../../mod/rate.php:161
 msgid "Rating (this information is public)"
 msgstr "Valutazione (visibile a tutti)"
 
-#: ../../mod/rate.php:162 ../../mod/connedit.php:664
+#: ../../mod/rate.php:162
 msgid "Optionally explain your rating (this information is public)"
 msgstr "Commento alla valutazione (facoltativo, visibile a tutti)"
 
-#: ../../mod/editpost.php:31
-msgid "Item is not editable"
-msgstr "L'elemento non è modificabile"
+#: ../../mod/editblock.php:117
+msgid "Delete block?"
+msgstr "Vuoi eliminare questo riquadro?"
 
-#: ../../mod/editpost.php:53
-msgid "Delete item?"
-msgstr "Eliminare questo elemento?"
+#: ../../mod/editblock.php:179
+msgid "Edit Block"
+msgstr "Modifica il riquadro"
 
 #: ../../mod/invite.php:25
 msgid "Total invitation limit exceeded."
@@ -6118,7 +5483,7 @@ msgstr "%s: non è un indirizzo email valido."
 
 #: ../../mod/invite.php:76
 msgid "Please join us on Red"
-msgstr "Vieni con noi su Hubzilla"
+msgstr "Vieni con noi su RedMatrix"
 
 #: ../../mod/invite.php:87
 msgid "Invitation limit exceeded. Please contact your site administrator."
@@ -6153,20 +5518,21 @@ msgid "Your message:"
 msgstr "Il tuo messaggio:"
 
 #: ../../mod/invite.php:132
-msgid "Please join my community on Hubzilla."
-msgstr "Entra a far parte della mia comunità su Hubzilla."
+msgid "Please join my community on $Projectname."
+msgstr "Entra nella mia comunità su $Projectname."
 
 #: ../../mod/invite.php:134
 msgid "You will need to supply this invitation code: "
 msgstr "Dovrai fornire questo codice di invito:"
 
 #: ../../mod/invite.php:135
-msgid "1. Register at any Hubzilla location (they are all inter-connected)"
-msgstr "1. Registrati su un qualsiasi sito Hubzilla (sono tutti interconnessi)"
+msgid ""
+"1. Register at any $Projectname location (they are all inter-connected)"
+msgstr "1. Registrati su qualsiasi server $Projectname (sono tutti interconnessi)"
 
 #: ../../mod/invite.php:137
-msgid "2. Enter my Hubzilla network address into the site searchbar."
-msgstr "2. Inserisci il mio indirizzo Hubzilla nella barra di ricerca che compare nella pagina."
+msgid "2. Enter my $Projectname network address into the site searchbar."
+msgstr "2. Inserisci il mio indirizzo $Projectname nel riquadro di ricerca del sito."
 
 #: ../../mod/invite.php:138
 msgid "or visit "
@@ -6267,102 +5633,94 @@ msgstr "Sorgente eliminata"
 msgid "Unable to remove source."
 msgstr "Impossibile rimuovere la sorgente."
 
-#: ../../mod/menu.php:44
+#: ../../mod/menu.php:45
 msgid "Unable to update menu."
 msgstr "Impossibile aggiornare il menù."
 
-#: ../../mod/menu.php:53
+#: ../../mod/menu.php:56
 msgid "Unable to create menu."
 msgstr "Impossibile creare il menù."
 
-#: ../../mod/menu.php:86 ../../mod/menu.php:98
+#: ../../mod/menu.php:92 ../../mod/menu.php:104
 msgid "Menu Name"
 msgstr "Nome del menu"
 
-#: ../../mod/menu.php:86
+#: ../../mod/menu.php:92
 msgid "Unique name (not visible on webpage) - required"
-msgstr "Identificativo unico (non visibile sulla pagina) - obbligatorio"
+msgstr "Nome unico (non visibile sulla pagina) - obbligatorio"
 
-#: ../../mod/menu.php:87 ../../mod/menu.php:99
+#: ../../mod/menu.php:93 ../../mod/menu.php:105
 msgid "Menu Title"
 msgstr "Titolo del menu"
 
-#: ../../mod/menu.php:87
+#: ../../mod/menu.php:93
 msgid "Visible on webpage - leave empty for no title"
 msgstr "Visibile sulla pagina - lascia vuoto per non avere un titolo"
 
-#: ../../mod/menu.php:88
+#: ../../mod/menu.php:94
 msgid "Allow Bookmarks"
-msgstr "Permetti l'aggiunta ai segnalibri"
+msgstr "Permetti i segnalibri"
 
-#: ../../mod/menu.php:88 ../../mod/menu.php:140
+#: ../../mod/menu.php:94 ../../mod/menu.php:151
 msgid "Menu may be used to store saved bookmarks"
 msgstr "Puoi salvare i segnalibri nei menù"
 
-#: ../../mod/menu.php:89
+#: ../../mod/menu.php:95 ../../mod/menu.php:153
 msgid "Submit and proceed"
 msgstr "Salva e procedi"
 
-#: ../../mod/menu.php:101
+#: ../../mod/menu.php:107
 msgid "Drop"
 msgstr "Elimina"
 
-#: ../../mod/menu.php:103
+#: ../../mod/menu.php:111
 msgid "Bookmarks allowed"
 msgstr "Permetti segnalibri"
 
-#: ../../mod/menu.php:105
+#: ../../mod/menu.php:113
 msgid "Delete this menu"
 msgstr "Elimina questo menù"
 
-#: ../../mod/menu.php:106 ../../mod/menu.php:137
+#: ../../mod/menu.php:114 ../../mod/menu.php:148
 msgid "Edit menu contents"
 msgstr "Modifica i contenuti del menù"
 
-#: ../../mod/menu.php:107
+#: ../../mod/menu.php:115
 msgid "Edit this menu"
 msgstr "Modifica questo menù"
 
-#: ../../mod/menu.php:121
+#: ../../mod/menu.php:130
 msgid "Menu could not be deleted."
 msgstr "Il menù non può essere eliminato."
 
-#: ../../mod/menu.php:129 ../../mod/mitem.php:24
-msgid "Menu not found."
-msgstr "Menù non trovato."
-
-#: ../../mod/menu.php:134
+#: ../../mod/menu.php:143
 msgid "Edit Menu"
 msgstr "Modifica menù"
 
-#: ../../mod/menu.php:136
+#: ../../mod/menu.php:147
 msgid "Add or remove entries to this menu"
 msgstr "Aggiungi o rimuovi elementi di questo menù"
 
-#: ../../mod/menu.php:138
+#: ../../mod/menu.php:149
 msgid "Menu name"
 msgstr "Nome del menù"
 
-#: ../../mod/menu.php:138
+#: ../../mod/menu.php:149
 msgid "Must be unique, only seen by you"
 msgstr "Deve essere unico, lo vedrai solo tu"
 
-#: ../../mod/menu.php:139
+#: ../../mod/menu.php:150
 msgid "Menu title"
 msgstr "Titolo del menù"
 
-#: ../../mod/menu.php:139
+#: ../../mod/menu.php:150
 msgid "Menu title as seen by others"
 msgstr "Titolo del menù come comparirà a tutti"
 
-#: ../../mod/menu.php:140
+#: ../../mod/menu.php:151
 msgid "Allow bookmarks"
 msgstr "Permetti l'invio di segnalibri"
 
-#: ../../mod/menu.php:142
-msgid "Modify"
-msgstr "Modifica"
-
 #: ../../mod/filestorage.php:82
 msgid "Permission Denied."
 msgstr "Permesso negato."
@@ -6389,7 +5747,7 @@ msgstr "Torna all'elenco dei file"
 
 #: ../../mod/filestorage.php:154
 msgid "Copy/paste this code to attach file to a post"
-msgstr "Copia/incolla questo codice per far comparire il file in un articolo"
+msgstr "Copia/incolla questo codice per far comparire il file in un post"
 
 #: ../../mod/filestorage.php:155
 msgid "Copy/paste this URL to link file from a web page"
@@ -6405,7 +5763,7 @@ msgstr "Mostra l'URL del file"
 
 #: ../../mod/filestorage.php:159
 msgid "Notify your contacts about this file"
-msgstr "Notifica ai tuoi contatti che hai caricato il file"
+msgstr "Notifica ai contatti che hai caricato questo file"
 
 #: ../../mod/fsuggest.php:20 ../../mod/fsuggest.php:92
 msgid "Contact not found."
@@ -6446,7 +5804,7 @@ msgstr "Scegli cosa vuoi inviare al destinatario"
 
 #: ../../mod/poke.php:165
 msgid "Make this post private"
-msgstr "Rendi privato questo articolo"
+msgstr "Rendi privato questo post"
 
 #: ../../mod/profperm.php:29 ../../mod/profperm.php:58
 msgid "Invalid profile identifier."
@@ -6464,9 +5822,15 @@ msgstr "Clicca su un contatto per aggiungerlo o rimuoverlo."
 msgid "Visible To"
 msgstr "Visibile a"
 
-#: ../../mod/webpages.php:189
-msgid "Page Title"
-msgstr "Titolo della pagina"
+#: ../../mod/impel.php:191
+#, php-format
+msgid "%s element installed"
+msgstr "%s elemento installato"
+
+#: ../../mod/impel.php:194
+#, php-format
+msgid "%s element installation failed"
+msgstr "Elementi con installazione fallita: %s"
 
 #: ../../mod/profiles.php:18 ../../mod/profiles.php:174
 #: ../../mod/profiles.php:231 ../../mod/profiles.php:600
@@ -6541,7 +5905,7 @@ msgstr "Home page"
 msgid "Interests"
 msgstr "Interessi"
 
-#: ../../mod/profiles.php:447 ../../mod/admin.php:953
+#: ../../mod/profiles.php:447 ../../mod/admin.php:994
 msgid "Address"
 msgstr "Indirizzo"
 
@@ -6709,7 +6073,7 @@ msgstr "Scuola/educazione"
 msgid "This is your default profile."
 msgstr "Questo è il tuo profilo predefinito."
 
-#: ../../mod/profiles.php:728 ../../mod/directory.php:218
+#: ../../mod/profiles.php:728
 msgid "Age: "
 msgstr "Età:"
 
@@ -6749,203 +6113,427 @@ msgstr "Descrizione:"
 msgid "Source of Item"
 msgstr "Sorgente"
 
-#: ../../mod/mitem.php:51
-msgid "Unable to create element."
-msgstr "Impossibile creare l'elemento."
+#: ../../mod/setup.php:187
+msgid "$Projectname Server - Setup"
+msgstr "Server $Projectname - Installazione"
 
-#: ../../mod/mitem.php:74
-msgid "Unable to update menu element."
-msgstr "Non è possibile aggiornare l'elemento del menù."
+#: ../../mod/setup.php:191
+msgid "Could not connect to database."
+msgstr " Impossibile connettersi al database."
 
-#: ../../mod/mitem.php:89
-msgid "Unable to add menu element."
-msgstr "Impossibile aggiungere l'elemento al menù."
+#: ../../mod/setup.php:195
+msgid ""
+"Could not connect to specified site URL. Possible SSL certificate or DNS "
+"issue."
+msgstr "Non è possibile raggiungere l'indirizzo del sito specificato. Potrebbe essere un problema di SSL o DNS."
 
-#: ../../mod/mitem.php:151 ../../mod/mitem.php:220
-msgid "Menu Item Permissions"
-msgstr "Permessi del menu"
+#: ../../mod/setup.php:202
+msgid "Could not create table."
+msgstr "Impossibile creare le tabelle."
 
-#: ../../mod/mitem.php:154 ../../mod/mitem.php:168
-msgid "Link Name"
-msgstr "Nome link"
+#: ../../mod/setup.php:207
+msgid "Your site database has been installed."
+msgstr "Il database del sito è stato installato."
 
-#: ../../mod/mitem.php:155 ../../mod/mitem.php:169
-msgid "Link Target"
-msgstr "Destinazione link"
+#: ../../mod/setup.php:211
+msgid ""
+"You may need to import the file \"install/schema_xxx.sql\" manually using a "
+"database client."
+msgstr "Potresti dover importare il file 'install/schema_xxx.sql' manualmente usando un client per collegarti al db."
 
-#: ../../mod/mitem.php:156 ../../mod/mitem.php:226
-msgid "Use Hubzilla magic-auth if available"
-msgstr "Usa l'autenticazione magica di Hubzilla, se disponibile"
+#: ../../mod/setup.php:212 ../../mod/setup.php:280 ../../mod/setup.php:730
+msgid "Please see the file \"install/INSTALL.txt\"."
+msgstr "Leggi il file 'install/INSTALL.txt'."
 
-#: ../../mod/mitem.php:157 ../../mod/mitem.php:227
-msgid "Open link in new window"
-msgstr "Apri il link in una nuova finestra"
+#: ../../mod/setup.php:277
+msgid "System check"
+msgstr "Verifica del sistema"
 
-#: ../../mod/mitem.php:158 ../../mod/mitem.php:228
-msgid "Order in list"
-msgstr "Ordine dell'elenco"
+#: ../../mod/setup.php:282
+msgid "Check again"
+msgstr "Verifica di nuovo"
 
-#: ../../mod/mitem.php:158 ../../mod/mitem.php:228
-msgid "Higher numbers will sink to bottom of listing"
-msgstr "I numeri più alti andranno in fondo all'elenco"
+#: ../../mod/setup.php:304
+msgid "Database connection"
+msgstr "Connessione al database"
 
-#: ../../mod/mitem.php:159
-msgid "Submit and finish"
-msgstr "Salva e termina"
+#: ../../mod/setup.php:305
+msgid ""
+"In order to install $Projectname we need to know how to connect to your "
+"database."
+msgstr "Per poter installare $Projectname è necessario fornire i parametri di connessione al tuo database."
 
-#: ../../mod/mitem.php:160
-msgid "Submit and continue"
-msgstr "Salva e continua"
+#: ../../mod/setup.php:306
+msgid ""
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
+msgstr "Contatta il tuo fornitore di hosting o l'amministratore del sito se hai domande su queste impostazioni."
 
-#: ../../mod/mitem.php:166
-msgid "Menu:"
-msgstr "Menu:"
+#: ../../mod/setup.php:307
+msgid ""
+"The database you specify below should already exist. If it does not, please "
+"create it before continuing."
+msgstr "Il database deve già esistere. Se non esiste, crealo prima di continuare."
 
-#: ../../mod/mitem.php:172
-msgid "Edit menu"
-msgstr "Modifica il menù"
+#: ../../mod/setup.php:311
+msgid "Database Server Name"
+msgstr "Server del database"
 
-#: ../../mod/mitem.php:175
-msgid "Edit element"
-msgstr "Modifica l'elemento"
+#: ../../mod/setup.php:311
+msgid "Default is localhost"
+msgstr "'localhost' è il predefinito"
 
-#: ../../mod/mitem.php:176
-msgid "Drop element"
-msgstr "Elimina l'elemento"
+#: ../../mod/setup.php:312
+msgid "Database Port"
+msgstr "Port del database"
 
-#: ../../mod/mitem.php:177
-msgid "New element"
-msgstr "Nuovo elemento"
+#: ../../mod/setup.php:312
+msgid "Communication port number - use 0 for default"
+msgstr "Scrivi 0 per usare il valore standard"
 
-#: ../../mod/mitem.php:178
-msgid "Edit this menu container"
-msgstr "Modifica il contenitore del menù"
+#: ../../mod/setup.php:313
+msgid "Database Login Name"
+msgstr "Utente database"
 
-#: ../../mod/mitem.php:179
-msgid "Add menu element"
-msgstr "Aggiungi un elemento al menù"
+#: ../../mod/setup.php:314
+msgid "Database Login Password"
+msgstr "Password utente database"
 
-#: ../../mod/mitem.php:180
-msgid "Delete this menu item"
-msgstr "Elimina questo elemento del menù"
+#: ../../mod/setup.php:315
+msgid "Database Name"
+msgstr "Nome database"
 
-#: ../../mod/mitem.php:181
-msgid "Edit this menu item"
-msgstr "Modifica questo elemento del menù"
+#: ../../mod/setup.php:316
+msgid "Database Type"
+msgstr "Tipo database"
 
-#: ../../mod/mitem.php:198
-msgid "Menu item not found."
-msgstr "L'elemento del menù non è stato trovato."
+#: ../../mod/setup.php:318 ../../mod/setup.php:359
+msgid "Site administrator email address"
+msgstr "Indirizzo email dell'amministratore del sito"
 
-#: ../../mod/mitem.php:209
-msgid "Menu item deleted."
-msgstr "L'elemento del menù è stato eliminato."
+#: ../../mod/setup.php:318 ../../mod/setup.php:359
+msgid ""
+"Your account email address must match this in order to use the web admin "
+"panel."
+msgstr "Il tuo indirizzo email deve corrispondere a questo per poter usare il pannello di amministrazione web."
 
-#: ../../mod/mitem.php:211
-msgid "Menu item could not be deleted."
-msgstr "L'elemento del menù non può essere eliminato."
+#: ../../mod/setup.php:319 ../../mod/setup.php:361
+msgid "Website URL"
+msgstr "URL completo del sito"
 
-#: ../../mod/mitem.php:218
-msgid "Edit Menu Element"
-msgstr "Modifica l'elemento del menù"
+#: ../../mod/setup.php:319 ../../mod/setup.php:361
+msgid "Please use SSL (https) URL if available."
+msgstr "Se disponibile, usa l'indirizzo SSL (https)."
 
-#: ../../mod/mitem.php:224
-msgid "Link text"
-msgstr "Testo del link"
+#: ../../mod/setup.php:321 ../../mod/setup.php:363
+msgid "Please select a default timezone for your website"
+msgstr "Seleziona il fuso orario predefinito per il tuo sito web"
 
-#: ../../mod/mitem.php:225
-msgid "URL of link"
-msgstr "Indirizzo del link"
+#: ../../mod/setup.php:348
+msgid "Site settings"
+msgstr "Impostazioni del sito"
 
-#: ../../mod/openid.php:26
-msgid "OpenID protocol error. No ID returned."
-msgstr "Errore del protocollo OpenID. Nessun ID ricevuto in risposta."
+#: ../../mod/setup.php:413
+msgid "Could not find a command line version of PHP in the web server PATH."
+msgstr "Non è possibile trovare la versione di PHP da riga di comando nel PATH del server web"
 
-#: ../../mod/openid.php:72 ../../mod/openid.php:180 ../../mod/post.php:286
-#, php-format
-msgid "Welcome %s. Remote authentication successful."
-msgstr "Ciao %s. L'autenticazione magica è avvenuta con successo."
+#: ../../mod/setup.php:414
+msgid ""
+"If you don't have a command line version of PHP installed on server, you "
+"will not be able to run background polling via cron."
+msgstr "Se non hai installata la versione di PHP da riga di comando non potrai attivare il polling in background tramite cron."
+
+#: ../../mod/setup.php:418
+msgid "PHP executable path"
+msgstr "Path del comando PHP"
+
+#: ../../mod/setup.php:418
+msgid ""
+"Enter full path to php executable. You can leave this blank to continue the "
+"installation."
+msgstr "Inserisci il percorso dell'eseguibile PHP. Puoi lasciarlo vuoto per continuare l'installazione."
+
+#: ../../mod/setup.php:423
+msgid "Command line PHP"
+msgstr "PHP da riga di comando"
 
-#: ../../mod/directory.php:224
+#: ../../mod/setup.php:432
+msgid ""
+"The command line version of PHP on your system does not have "
+"\"register_argc_argv\" enabled."
+msgstr "La versione da riga di comando di PHP nel sistema non ha abilitato \"register_argc_argv\"."
+
+#: ../../mod/setup.php:433
+msgid "This is required for message delivery to work."
+msgstr "E' necessario perché funzioni la consegna dei messaggi."
+
+#: ../../mod/setup.php:436
+msgid "PHP register_argc_argv"
+msgstr "PHP register_argc_argv"
+
+#: ../../mod/setup.php:454
 #, php-format
-msgid "%d rating"
-msgid_plural "%d ratings"
-msgstr[0] "%d valutazione"
-msgstr[1] "%d valutazioni"
+msgid ""
+"Your max allowed total upload size is set to %s. Maximum size of one file to"
+" upload is set to %s. You are allowed to upload up to %d files at once."
+msgstr "La dimensione massima di un caricamento è impostata a %s. Il singolo file non può superare %s. Ti è permesso caricare max %d file per volta."
 
-#: ../../mod/directory.php:236
-msgid "Gender: "
-msgstr "Sesso:"
+#: ../../mod/setup.php:459
+msgid "You can adjust these settings in the servers php.ini."
+msgstr "Puoi regolare queste impostazioni sul server in php.ini"
 
-#: ../../mod/directory.php:238
-msgid "Status: "
-msgstr "Stato:"
+#: ../../mod/setup.php:461
+msgid "PHP upload limits"
+msgstr "Limiti PHP in upload"
 
-#: ../../mod/directory.php:240
-msgid "Homepage: "
-msgstr "Homepage:"
+#: ../../mod/setup.php:484
+msgid ""
+"Error: the \"openssl_pkey_new\" function on this system is not able to "
+"generate encryption keys"
+msgstr "Errore: la funzione \"openssl_pkey_new\" su questo sistema non è in grado di generare le chiavi di criptazione"
 
-#: ../../mod/directory.php:243
-msgid "Hometown: "
-msgstr "Città dove vivo:"
+#: ../../mod/setup.php:485
+msgid ""
+"If running under Windows, please see "
+"\"http://www.php.net/manual/en/openssl.installation.php\"."
+msgstr "Se stai usando un server windows, guarda \"http://www.php.net/manual/en/openssl.installation.php\"."
 
-#: ../../mod/directory.php:245
-msgid "About: "
-msgstr "Informazioni:"
+#: ../../mod/setup.php:488
+msgid "Generate encryption keys"
+msgstr "Genera chiavi di criptazione"
 
-#: ../../mod/directory.php:303
-msgid "Public Forum:"
-msgstr "Forum pubblico:"
+#: ../../mod/setup.php:500
+msgid "libCurl PHP module"
+msgstr "modulo PHP libCurl"
 
-#: ../../mod/directory.php:306
-msgid "Keywords: "
-msgstr "Parole chiave:"
+#: ../../mod/setup.php:501
+msgid "GD graphics PHP module"
+msgstr "modulo PHP GD graphics"
+
+#: ../../mod/setup.php:502
+msgid "OpenSSL PHP module"
+msgstr "modulo PHP OpenSSL"
+
+#: ../../mod/setup.php:503
+msgid "mysqli or postgres PHP module"
+msgstr "modulo PHP per mysqli oppure prostgres"
+
+#: ../../mod/setup.php:504
+msgid "mb_string PHP module"
+msgstr "modulo PHP mb_string"
+
+#: ../../mod/setup.php:505
+msgid "mcrypt PHP module"
+msgstr "modulo PHP mcrypt"
+
+#: ../../mod/setup.php:506
+msgid "xml PHP module"
+msgstr "modulo xml PHP"
+
+#: ../../mod/setup.php:510 ../../mod/setup.php:512
+msgid "Apache mod_rewrite module"
+msgstr "modulo Apache mod_rewrite"
+
+#: ../../mod/setup.php:510
+msgid ""
+"Error: Apache webserver mod-rewrite module is required but not installed."
+msgstr "Errore: il modulo mod-rewrite di Apache è richiesto ma non installato"
+
+#: ../../mod/setup.php:516 ../../mod/setup.php:519
+msgid "proc_open"
+msgstr "proc_open"
+
+#: ../../mod/setup.php:516
+msgid ""
+"Error: proc_open is required but is either not installed or has been "
+"disabled in php.ini"
+msgstr "Errore: proc_open è richiesto ma non è installato o è disabilitato in php.ini"
+
+#: ../../mod/setup.php:524
+msgid "Error: libCURL PHP module required but not installed."
+msgstr "Errore: il modulo libCURL di PHP è richiesto ma non installato."
+
+#: ../../mod/setup.php:528
+msgid ""
+"Error: GD graphics PHP module with JPEG support required but not installed."
+msgstr "Errore: Il modulo GD graphics di PHP con supporto a JPEG è richiesto ma non installato."
+
+#: ../../mod/setup.php:532
+msgid "Error: openssl PHP module required but not installed."
+msgstr "Errore: il modulo openssl di PHP è richiesto ma non installato."
+
+#: ../../mod/setup.php:536
+msgid ""
+"Error: mysqli or postgres PHP module required but neither are installed."
+msgstr "Errore: il modulo PHP per mysqli o postgres è richiesto ma non installato"
+
+#: ../../mod/setup.php:540
+msgid "Error: mb_string PHP module required but not installed."
+msgstr "Errore: il modulo PHP mb_string è richiesto ma non installato."
+
+#: ../../mod/setup.php:544
+msgid "Error: mcrypt PHP module required but not installed."
+msgstr "Errore: il modulo PHP mcrypt è richiesto ma non installato."
+
+#: ../../mod/setup.php:548
+msgid "Error: xml PHP module required for DAV but not installed."
+msgstr "Errore: il modulo xml PHP è richiesto per DAV ma non è installato."
+
+#: ../../mod/setup.php:566
+msgid ""
+"The web installer needs to be able to create a file called \".htconfig.php\""
+" in the top folder of your web server and it is unable to do so."
+msgstr "L'installazione web deve poter creare un file chiamato \".htconfig.php\" nella cartella di RedMatrix ma non è in grado di farlo."
+
+#: ../../mod/setup.php:567
+msgid ""
+"This is most often a permission setting, as the web server may not be able "
+"to write files in your folder - even if you can."
+msgstr "Spesso ciò è dovuto ai permessi di accesso al disco: il web server potrebbe non aver diritto di scrivere il file nella cartella, anche se tu puoi."
+
+#: ../../mod/setup.php:568
+msgid ""
+"At the end of this procedure, we will give you a text to save in a file "
+"named .htconfig.php in your Red top folder."
+msgstr "Alla fine di questa procedura ti sarà dato il testo da salvare in un file di nome .htconfig.php dentro la cartella principale di RedMatrix."
 
-#: ../../mod/directory.php:311
+#: ../../mod/setup.php:569
+msgid ""
+"You can alternatively skip this procedure and perform a manual installation."
+" Please see the file \"install/INSTALL.txt\" for instructions."
+msgstr "Puoi anche saltare questa procedura ed effettuare un'installazione manuale. Guarda il file 'install/INSTALL.txt' per le istruzioni."
+
+#: ../../mod/setup.php:572
+msgid ".htconfig.php is writable"
+msgstr ".htconfig.php è scrivibile"
+
+#: ../../mod/setup.php:586
+msgid ""
+"Red uses the Smarty3 template engine to render its web views. Smarty3 "
+"compiles templates to PHP to speed up rendering."
+msgstr "Red usa il sistema Smarty3 per costruire i suoi template grafici. Smarty3 è molto veloce perché compila i template delle pagine direttamente in PHP."
+
+#: ../../mod/setup.php:587
 #, php-format
-msgid "Common connections: %s"
-msgstr "Contatti in comune: %s"
+msgid ""
+"In order to store these compiled templates, the web server needs to have "
+"write access to the directory %s under the Red top level folder."
+msgstr "Per poter memorizzare i template compilati, il web server deve avere accesso in scrittura a %s sotto la cartella di installazione di RedMatrix."
 
-#: ../../mod/directory.php:363
-msgid "Finding:"
-msgstr "Ricerca:"
+#: ../../mod/setup.php:588 ../../mod/setup.php:609
+msgid ""
+"Please ensure that the user that your web server runs as (e.g. www-data) has"
+" write access to this folder."
+msgstr "Assicurati che il tuo web server sia in esecuzione da parte di un utente che ha diritto di scrittura su quella cartella  (ad esempio www-data)."
 
-#: ../../mod/directory.php:368
-msgid "next page"
-msgstr "pagina successiva"
+#: ../../mod/setup.php:589
+#, php-format
+msgid ""
+"Note: as a security measure, you should give the web server write access to "
+"%s only--not the template files (.tpl) that it contains."
+msgstr "Nota bene: come precauzione, dovresti dare i diritti di scrittura solamente su %s e non sui file template (.tpl) che contiene."
 
-#: ../../mod/directory.php:368
-msgid "previous page"
-msgstr "pagina precedente"
+#: ../../mod/setup.php:592
+#, php-format
+msgid "%s is writable"
+msgstr "%s è scrivibile"
 
-#: ../../mod/directory.php:385
-msgid "No entries (some entries may be hidden)."
-msgstr "Nessun risultato (qualche elemento potrebbe essere nascosto)."
+#: ../../mod/setup.php:608
+msgid ""
+"Red uses the store directory to save uploaded files. The web server needs to"
+" have write access to the store directory under the Red top level folder"
+msgstr "RedMatrix salva i file caricati nella cartella \"store\" sul server. Il server deve avere i diritti di scrittura su quella cartella che si trova dentro l'installazione di RedMatrix"
 
-#: ../../mod/uexport.php:33 ../../mod/uexport.php:34
-msgid "Export Channel"
-msgstr "Esporta il canale"
+#: ../../mod/setup.php:612
+msgid "store is writable"
+msgstr "l'archivio è scrivibile"
 
-#: ../../mod/uexport.php:35
+#: ../../mod/setup.php:645
 msgid ""
-"Export your basic channel information to a small file.  This acts as a "
-"backup of your connections, permissions, profile and basic data, which can "
-"be used to import your data to a new hub, but\tdoes not contain your "
-"content."
-msgstr "Esporta le informazioni di base del tuo canale in un piccolo file. E' utile per avere un salvataggio di sicurezza dei tuoi contatti, del tuo profilo ed altre informazioni fondamentali. Può essere usato per importare il tuo canale su un nuovo server, ma\tnon include i contenuti, per esempio articoli e foto."
+"SSL certificate cannot be validated. Fix certificate or disable https access"
+" to this site."
+msgstr "Il certificato SSL non può essere validato. Correggi l'errore o disabilita l'accesso https al sito."
 
-#: ../../mod/uexport.php:36
-msgid "Export Content"
-msgstr "Esporta i contenuti"
+#: ../../mod/setup.php:646
+msgid ""
+"If you have https access to your website or allow connections to TCP port "
+"443 (the https: port), you MUST use a browser-valid certificate. You MUST "
+"NOT use self-signed certificates!"
+msgstr "Se abiliti https per il tuo sito o permetti connessioni TCP su port 443 (quella di https), DEVI usare un certificato riconosciuto dai browser internet. NON DEVI usare certificati generati da te!"
+
+#: ../../mod/setup.php:647
+msgid ""
+"This restriction is incorporated because public posts from you may for "
+"example contain references to images on your own hub."
+msgstr "Questa restrizione è necessaria perché i tuoi post pubblici potrebbero contenere riferimenti a immagini sul tuo server."
+
+#: ../../mod/setup.php:648
+msgid ""
+"If your certificate is not recognized, members of other sites (who may "
+"themselves have valid certificates) will get a warning message on their own "
+"site complaining about security issues."
+msgstr "Se il tuo certificato non è riconosciuto, gli utenti che ti seguono da altri siti (che avranno certificati validi) riceveranno gravi avvisi di sicurezza dal browser."
 
-#: ../../mod/uexport.php:37
+#: ../../mod/setup.php:649
 msgid ""
-"Export your channel information and all the content to a JSON backup. This "
-"backs up all of your connections, permissions, profile data and all of your "
-"content, but is generally not suitable for importing a channel to a new hub "
-"as this file may be VERY large.  Please be patient - it may take several "
-"minutes for this download to begin."
-msgstr "Esporta i dati del canale e i contenuti in un file in formato JSON. E' un salvataggio dei tuoi contatti, dei dati del profilo e anche di tutti i contenuti. Questa non è la soluzione opportuna per importare il tuo canale su un nuovo server, visto che il file potrebbe avere dimensioni NOTEVOLI. Devi pazientare - ci vorranno alcuni minuti per raccogliere i dati prima che inizi lo scaricamento."
+"This can cause usability issues elsewhere (not just on your own site) so we "
+"must insist on this requirement."
+msgstr "Ciò può creare seri problemi di usabilità (non solo sul tuo sito), quindi dobbiamo insistere su questo punto."
+
+#: ../../mod/setup.php:650
+msgid ""
+"Providers are available that issue free certificates which are browser-"
+"valid."
+msgstr "Eventualmente, considera che esistono provider che rilasciano certificati gratuiti riconosciuti dai browser."
+
+#: ../../mod/setup.php:652
+msgid "SSL certificate validation"
+msgstr "Validazione del certificato SSL"
+
+#: ../../mod/setup.php:658
+msgid ""
+"Url rewrite in .htaccess is not working. Check your server "
+"configuration.Test: "
+msgstr "In .htaccess la funzionalità url rewrite non funziona. Controlla la configurazione del server. Test:"
+
+#: ../../mod/setup.php:661
+msgid "Url rewrite is working"
+msgstr "Url rewrite funziona correttamente"
+
+#: ../../mod/setup.php:670
+msgid ""
+"The database configuration file \".htconfig.php\" could not be written. "
+"Please use the enclosed text to create a configuration file in your web "
+"server root."
+msgstr "Il file di configurazione del database \".htconfig.php\" non puo' essere scritto. Usa il testo qui di seguito per creare questo file di configurazione nella cartella principale del tuo sito."
+
+#: ../../mod/setup.php:694
+msgid "Errors encountered creating database tables."
+msgstr "La creazione delle tabelle del database ha generato errori."
+
+#: ../../mod/setup.php:728
+msgid "<h1>What next</h1>"
+msgstr "<h1>I prossimi passi</h1>"
+
+#: ../../mod/setup.php:729
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the "
+"poller."
+msgstr "IMPORTANTE: Devi creare [manualmente] la pianificazione del polling."
+
+#: ../../mod/openid.php:26
+msgid "OpenID protocol error. No ID returned."
+msgstr "Errore del protocollo OpenID. Nessun ID ricevuto in risposta."
+
+#: ../../mod/openid.php:72 ../../mod/openid.php:180 ../../mod/post.php:287
+#, php-format
+msgid "Welcome %s. Remote authentication successful."
+msgstr "Ciao %s. L'accesso tramite il tuo hub è avvenuto con successo."
+
+#: ../../mod/tagger.php:96
+#, php-format
+msgid "%1$s tagged %2$s's %3$s with %4$s"
+msgstr "%1$s ha taggato %3$s di %2$s con %4$s"
 
 #: ../../mod/viewconnections.php:62
 msgid "No connections."
@@ -6964,7 +6552,7 @@ msgstr "la firma ricevuta non è valida"
 msgid "Theme settings updated."
 msgstr "Le impostazioni del tema sono state aggiornate."
 
-#: ../../mod/admin.php:93 ../../mod/admin.php:445
+#: ../../mod/admin.php:93 ../../mod/admin.php:452
 msgid "Site"
 msgstr "Sito"
 
@@ -6972,15 +6560,15 @@ msgstr "Sito"
 msgid "Accounts"
 msgstr "Account"
 
-#: ../../mod/admin.php:95 ../../mod/admin.php:945
+#: ../../mod/admin.php:95 ../../mod/admin.php:985
 msgid "Channels"
 msgstr "Canali"
 
-#: ../../mod/admin.php:96 ../../mod/admin.php:1036 ../../mod/admin.php:1076
+#: ../../mod/admin.php:96 ../../mod/admin.php:1077 ../../mod/admin.php:1117
 msgid "Plugins"
 msgstr "Plugin"
 
-#: ../../mod/admin.php:97 ../../mod/admin.php:1236 ../../mod/admin.php:1270
+#: ../../mod/admin.php:97 ../../mod/admin.php:1277 ../../mod/admin.php:1311
 msgid "Themes"
 msgstr "Temi"
 
@@ -6996,7 +6584,7 @@ msgstr "Configurazione del profilo"
 msgid "DB updates"
 msgstr "Aggiornamenti al DB"
 
-#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1355
+#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1396
 msgid "Logs"
 msgstr "Log"
 
@@ -7040,10 +6628,10 @@ msgstr "# cloni"
 msgid "Message queues"
 msgstr "Coda messaggi in uscita"
 
-#: ../../mod/admin.php:240 ../../mod/admin.php:444 ../../mod/admin.php:539
-#: ../../mod/admin.php:808 ../../mod/admin.php:944 ../../mod/admin.php:1035
-#: ../../mod/admin.php:1075 ../../mod/admin.php:1235 ../../mod/admin.php:1269
-#: ../../mod/admin.php:1354
+#: ../../mod/admin.php:240 ../../mod/admin.php:451 ../../mod/admin.php:548
+#: ../../mod/admin.php:817 ../../mod/admin.php:984 ../../mod/admin.php:1076
+#: ../../mod/admin.php:1116 ../../mod/admin.php:1276 ../../mod/admin.php:1310
+#: ../../mod/admin.php:1395
 msgid "Administration"
 msgstr "Amministrazione"
 
@@ -7055,7 +6643,7 @@ msgstr "Riepilogo"
 msgid "Registered accounts"
 msgstr "Account creati"
 
-#: ../../mod/admin.php:245 ../../mod/admin.php:543
+#: ../../mod/admin.php:245 ../../mod/admin.php:552
 msgid "Pending registrations"
 msgstr "Registrazioni da approvare"
 
@@ -7063,7 +6651,7 @@ msgstr "Registrazioni da approvare"
 msgid "Registered channels"
 msgstr "Canali creati"
 
-#: ../../mod/admin.php:247 ../../mod/admin.php:544
+#: ../../mod/admin.php:247 ../../mod/admin.php:553
 msgid "Active plugins"
 msgstr "Plugin attivi"
 
@@ -7071,629 +6659,680 @@ msgstr "Plugin attivi"
 msgid "Version"
 msgstr "Versione"
 
-#: ../../mod/admin.php:359
+#: ../../mod/admin.php:363
 msgid "Site settings updated."
 msgstr "Impostazioni del sito salvate correttamente."
 
-#: ../../mod/admin.php:398
+#: ../../mod/admin.php:400 ../../mod/settings.php:813
+msgid "mobile"
+msgstr "mobile"
+
+#: ../../mod/admin.php:402
 msgid "experimental"
 msgstr "sperimentale"
 
-#: ../../mod/admin.php:400
+#: ../../mod/admin.php:404
 msgid "unsupported"
 msgstr "non supportato"
 
-#: ../../mod/admin.php:425
+#: ../../mod/admin.php:429
 msgid "Yes - with approval"
 msgstr "Sì - con approvazione"
 
-#: ../../mod/admin.php:431
+#: ../../mod/admin.php:435
 msgid "My site is not a public server"
 msgstr "Non è un server pubblico"
 
-#: ../../mod/admin.php:432
+#: ../../mod/admin.php:436
 msgid "My site has paid access only"
 msgstr "È un servizio a pagamento"
 
-#: ../../mod/admin.php:433
+#: ../../mod/admin.php:437
 msgid "My site has free access only"
 msgstr "È un servizio gratuito"
 
-#: ../../mod/admin.php:434
+#: ../../mod/admin.php:438
 msgid "My site offers free accounts with optional paid upgrades"
 msgstr "È un servizio gratuito con opzioni aggiuntive a pagamento"
 
-#: ../../mod/admin.php:447 ../../mod/register.php:207
+#: ../../mod/admin.php:454 ../../mod/register.php:207
 msgid "Registration"
 msgstr "Registrazione"
 
-#: ../../mod/admin.php:448
+#: ../../mod/admin.php:455
 msgid "File upload"
 msgstr "Caricamento file"
 
-#: ../../mod/admin.php:449
+#: ../../mod/admin.php:456
 msgid "Policies"
 msgstr "Politiche"
 
-#: ../../mod/admin.php:454
+#: ../../mod/admin.php:461
 msgid "Site name"
 msgstr "Nome del sito"
 
-#: ../../mod/admin.php:455
+#: ../../mod/admin.php:462
 msgid "Banner/Logo"
 msgstr "Banner o logo"
 
-#: ../../mod/admin.php:456
+#: ../../mod/admin.php:463
 msgid "Administrator Information"
 msgstr "Informazioni sull'amministratore"
 
-#: ../../mod/admin.php:456
+#: ../../mod/admin.php:463
 msgid ""
 "Contact information for site administrators.  Displayed on siteinfo page.  "
 "BBCode can be used here"
 msgstr "Informazioni per contattare gli amministratori del sito. Saranno mostrate sulla pagina di informazioni. È consentito il BBcode"
 
-#: ../../mod/admin.php:457
+#: ../../mod/admin.php:464
 msgid "System language"
 msgstr "Lingua di sistema"
 
-#: ../../mod/admin.php:458
+#: ../../mod/admin.php:465
 msgid "System theme"
 msgstr "Tema di sistema"
 
-#: ../../mod/admin.php:458
+#: ../../mod/admin.php:465
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
 msgstr "Il tema di sistema può essere cambiato dai profili dei singoli utenti - <a href='#' id='cnftheme'>Cambia le impostazioni del tema</a>"
 
-#: ../../mod/admin.php:459
+#: ../../mod/admin.php:466
 msgid "Mobile system theme"
 msgstr "Tema di sistema per dispositivi mobili"
 
-#: ../../mod/admin.php:459
+#: ../../mod/admin.php:466
 msgid "Theme for mobile devices"
 msgstr "Tema per i dispositivi mobili"
 
-#: ../../mod/admin.php:461
+#: ../../mod/admin.php:468
 msgid "Enable Diaspora Protocol"
 msgstr "Abilita la comunicazione con Diaspora"
 
-#: ../../mod/admin.php:461
+#: ../../mod/admin.php:468
 msgid "Communicate with Diaspora and Friendica - experimental"
 msgstr "Sperimentale - per comunicare con Diaspora e Friendica"
 
-#: ../../mod/admin.php:462
+#: ../../mod/admin.php:469
 msgid "Allow Feeds as Connections"
 msgstr "Permetti di aggiungere i feed come contatti"
 
-#: ../../mod/admin.php:462
+#: ../../mod/admin.php:469
 msgid "(Heavy system resource usage)"
 msgstr "(Uso intenso delle risorse di sistema!)"
 
-#: ../../mod/admin.php:463
+#: ../../mod/admin.php:470
 msgid "Maximum image size"
 msgstr "Dimensione massima immagini"
 
-#: ../../mod/admin.php:463
+#: ../../mod/admin.php:470
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr "Massima dimensione in byte delle immagini caricate. Il default è 0, cioè nessun limite."
 
-#: ../../mod/admin.php:464
+#: ../../mod/admin.php:471
 msgid "Does this site allow new member registration?"
 msgstr "Questo sito permette a nuovi utenti di registrarsi?"
 
-#: ../../mod/admin.php:465
+#: ../../mod/admin.php:472
 msgid "Which best describes the types of account offered by this hub?"
 msgstr "Come descriveresti il tipo di servizio proposto da questo server?"
 
-#: ../../mod/admin.php:466
+#: ../../mod/admin.php:473
 msgid "Register text"
 msgstr "Testo di registrazione"
 
-#: ../../mod/admin.php:466
+#: ../../mod/admin.php:473
 msgid "Will be displayed prominently on the registration page."
 msgstr "Sarà mostrato ben visibile nella pagina di registrazione."
 
-#: ../../mod/admin.php:467
+#: ../../mod/admin.php:474
+msgid "Site homepage to show visitors (default: login box)"
+msgstr "Homepage del sito da mostrare ai navigatori (predefinito: modulo di login)"
+
+#: ../../mod/admin.php:474
+msgid ""
+"example: 'public' to show public stream, 'page/sys/home' to show a system "
+"webpage called 'home' or 'include:home.html' to include a file."
+msgstr "esempio: 'public' per mostrare i contenuti pubblici degli utenti, 'page/sys/home' per mostrare la pagina web definita come 'home' oppure 'include:home.html' per mostrare il contenuto di un file."
+
+#: ../../mod/admin.php:475
+msgid "Preserve site homepage URL"
+msgstr "Conserva l'URL della homepage"
+
+#: ../../mod/admin.php:475
+msgid ""
+"Present the site homepage in a frame at the original location instead of "
+"redirecting"
+msgstr "Presenta la homepage del sito in un frame all'indirizzo attuale invece di un redirect."
+
+#: ../../mod/admin.php:476
 msgid "Accounts abandoned after x days"
 msgstr "Account abbandonati dopo X giorni"
 
-#: ../../mod/admin.php:467
+#: ../../mod/admin.php:476
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr "Eviterà di sprecare risorse di sistema controllando se i siti esterni hanno account abbandonati. Immettere 0 per non imporre nessun limite di tempo."
 
-#: ../../mod/admin.php:468
+#: ../../mod/admin.php:477
 msgid "Allowed friend domains"
 msgstr "Domini fidati e consentiti"
 
-#: ../../mod/admin.php:468
+#: ../../mod/admin.php:477
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr "Elenco separato da virglola dei domini che possono stabilire amicizie con questo sito. Sono accettati caratteri jolly. Lascia vuoto per accettare connessioni da qualsiasi dominio."
 
-#: ../../mod/admin.php:469
+#: ../../mod/admin.php:478
 msgid "Allowed email domains"
 msgstr "Domini email consentiti"
 
-#: ../../mod/admin.php:469
+#: ../../mod/admin.php:478
 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 "Elenco separato da virgola dei domini permessi come indirizzi email in fase di registrazione. Sono accettati caratteri jolly. Lascia vuoto per accettare qualsiasi dominio email"
 
-#: ../../mod/admin.php:470
+#: ../../mod/admin.php:479
 msgid "Not allowed email domains"
 msgstr "Domini email non consentiti"
 
-#: ../../mod/admin.php:470
+#: ../../mod/admin.php:479
 msgid ""
 "Comma separated list of domains which are not allowed in email addresses for"
 " registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains, unless allowed domains have been defined."
 msgstr "Elenco separato da virgola dei domini permessi come indirizzi email in fase di registrazione a questo sito. Sono accettati caratteri jolly. Lascalo vuoto per accettare qualsiasi dominio."
 
-#: ../../mod/admin.php:471
+#: ../../mod/admin.php:480
 msgid "Block public"
 msgstr "Blocca pagine pubbliche"
 
-#: ../../mod/admin.php:471
+#: ../../mod/admin.php:480
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently logged in."
 msgstr "Seleziona per impedire di vedere le pagine personali di questo sito a chi non ha effettuato l'accesso."
 
-#: ../../mod/admin.php:472
+#: ../../mod/admin.php:481
 msgid "Verify Email Addresses"
 msgstr "Verifica l'indirizzo email"
 
-#: ../../mod/admin.php:472
+#: ../../mod/admin.php:481
 msgid ""
 "Check to verify email addresses used in account registration (recommended)."
 msgstr "Attiva per richiedere la verifica degli indirizzi email dei nuovi utenti (consigliato)."
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:482
 msgid "Force publish"
 msgstr "Forza la publicazione del profilo"
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:482
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr "Seleziona per mostrare nell'elenco pubblico <strong>tutti</strong> i profili registrati su questo sito."
 
-#: ../../mod/admin.php:474
+#: ../../mod/admin.php:483
 msgid "Disable discovery tab"
 msgstr "Disabilita la funzione 'scopri'"
 
-#: ../../mod/admin.php:474
+#: ../../mod/admin.php:483
 msgid ""
 "Remove the tab in the network view with public content pulled from sources "
 "chosen for this site."
 msgstr "Nell'area della rete personale non comparirà più la scheda con i contenuti acquisiti da altri siti."
 
-#: ../../mod/admin.php:475
-msgid "No login on Homepage"
-msgstr "Non mostrare il login sulla homepage"
+#: ../../mod/admin.php:484
+msgid "login on Homepage"
+msgstr "Mostra il login sulla homepage"
 
-#: ../../mod/admin.php:475
+#: ../../mod/admin.php:484
 msgid ""
-"Check to hide the login form from your sites homepage when visitors arrive "
-"who are not logged in (e.g. when you put the content of the homepage in via "
-"the site channel)."
-msgstr "Per nascondere la possibilità di fare login ai visitatori (per esempio, quando il contenuto della homepage del sito è alimentato da un canale)."
+"Present a login box to visitors on the home page if no other content has "
+"been configured."
+msgstr "Presenta il modulo di login ai visitatori sulla homepage in mancanza di altri contenuti."
 
-#: ../../mod/admin.php:477
+#: ../../mod/admin.php:486
 msgid "Proxy user"
 msgstr "Utente proxy"
 
-#: ../../mod/admin.php:478
+#: ../../mod/admin.php:487
 msgid "Proxy URL"
 msgstr "URL proxy"
 
-#: ../../mod/admin.php:479
+#: ../../mod/admin.php:488
 msgid "Network timeout"
 msgstr "Timeout rete"
 
-#: ../../mod/admin.php:479
+#: ../../mod/admin.php:488
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr "Valore in secondi. Imposta a 0 per illimitato (sconsigliato)."
 
-#: ../../mod/admin.php:480
+#: ../../mod/admin.php:489
 msgid "Delivery interval"
 msgstr "Recapito ritardato"
 
-#: ../../mod/admin.php:480
+#: ../../mod/admin.php:489
 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 "Numero di secondi di cui può essere ritardato il recapito, per ridurre il carico di sistema. Consigliati: 4-5 secondi per hosting condiviso, 2-3 per i VPS, 0-1 per grandi server dedicati."
 
-#: ../../mod/admin.php:481
+#: ../../mod/admin.php:490
 msgid "Poll interval"
 msgstr "Intervallo di polling"
 
-#: ../../mod/admin.php:481
+#: ../../mod/admin.php:490
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
 msgstr "Numero di secondi di cui può essere ritardato il polling in background, per ridurre il carico del sistema. Se 0, verrà usato lo stesso valore del 'Recapito ritardato'."
 
-#: ../../mod/admin.php:482
+#: ../../mod/admin.php:491
 msgid "Maximum Load Average"
 msgstr "Carico massimo medio"
 
-#: ../../mod/admin.php:482
+#: ../../mod/admin.php:491
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr "Carico di sistema massimo perché i processi di recapito e polling siano ritardati - il valore predefinito è 50."
 
-#: ../../mod/admin.php:483
+#: ../../mod/admin.php:492
 msgid "Expiration period in days for imported (matrix/network) content"
 msgstr "Scadenza dei contenuti importati da altri siti (in giorni)"
 
-#: ../../mod/admin.php:483
+#: ../../mod/admin.php:492
 msgid "0 for no expiration of imported content"
 msgstr "0 per non avere scadenza"
 
-#: ../../mod/admin.php:531
+#: ../../mod/admin.php:540
 msgid "No server found"
 msgstr "Server non trovato"
 
-#: ../../mod/admin.php:538 ../../mod/admin.php:822
+#: ../../mod/admin.php:547 ../../mod/admin.php:831
 msgid "ID"
 msgstr "ID"
 
-#: ../../mod/admin.php:538
+#: ../../mod/admin.php:547
 msgid "for channel"
 msgstr "per canale"
 
-#: ../../mod/admin.php:538
+#: ../../mod/admin.php:547
 msgid "on server"
 msgstr "sul server"
 
-#: ../../mod/admin.php:538
+#: ../../mod/admin.php:547
 msgid "Status"
 msgstr "Stato"
 
-#: ../../mod/admin.php:540
+#: ../../mod/admin.php:549
 msgid "Server"
 msgstr "Server"
 
-#: ../../mod/admin.php:557
+#: ../../mod/admin.php:566
 msgid "Update has been marked successful"
 msgstr "L'aggiornamento è stato marcato come eseguito."
 
-#: ../../mod/admin.php:567
+#: ../../mod/admin.php:576
 #, php-format
 msgid "Executing %s failed. Check system logs."
 msgstr "Fallita l'esecuzione di %s. Maggiori informazioni sui log di sistema."
 
-#: ../../mod/admin.php:570
+#: ../../mod/admin.php:579
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr "L'aggiornamento %s è terminato correttamente."
 
-#: ../../mod/admin.php:574
+#: ../../mod/admin.php:583
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr "L'aggiornamento %s non ha dato risposta. Impossibile determinare se è terminato correttamente."
 
-#: ../../mod/admin.php:577
+#: ../../mod/admin.php:586
 #, php-format
 msgid "Update function %s could not be found."
 msgstr "Impossibile trovare la funzione di aggiornamento %s"
 
-#: ../../mod/admin.php:593
+#: ../../mod/admin.php:602
 msgid "No failed updates."
 msgstr "Nessun aggiornamento fallito."
 
-#: ../../mod/admin.php:597
+#: ../../mod/admin.php:606
 msgid "Failed Updates"
 msgstr "Aggiornamenti falliti."
 
-#: ../../mod/admin.php:599
+#: ../../mod/admin.php:608
 msgid "Mark success (if update was manually applied)"
 msgstr "Marca come eseguito (se applicato manualmente)."
 
-#: ../../mod/admin.php:600
+#: ../../mod/admin.php:609
 msgid "Attempt to execute this update step automatically"
 msgstr "Tenta di eseguire in automatico questo passaggio dell'aggiornamento."
 
-#: ../../mod/admin.php:632
+#: ../../mod/admin.php:641
 msgid "Queue Statistics"
 msgstr "Statistiche della coda"
 
-#: ../../mod/admin.php:633
+#: ../../mod/admin.php:642
 msgid "Total Entries"
 msgstr "Totale"
 
-#: ../../mod/admin.php:634
+#: ../../mod/admin.php:643
 msgid "Priority"
 msgstr "Priorità"
 
-#: ../../mod/admin.php:635
+#: ../../mod/admin.php:644
 msgid "Destination URL"
 msgstr "URL di destinazione"
 
-#: ../../mod/admin.php:636
+#: ../../mod/admin.php:645
 msgid "Mark hub permanently offline"
 msgstr "Questo hub è definitivamente offline"
 
-#: ../../mod/admin.php:637
+#: ../../mod/admin.php:646
 msgid "Empty queue for this hub"
 msgstr "Svuota la coda per questo hub"
 
-#: ../../mod/admin.php:638
+#: ../../mod/admin.php:647
 msgid "Last known contact"
 msgstr "Ultimo scambio dati"
 
-#: ../../mod/admin.php:674
+#: ../../mod/admin.php:683
 #, php-format
-msgid "%s user blocked/unblocked"
-msgid_plural "%s users blocked/unblocked"
-msgstr[0] "%s utente bloccato/sbloccato"
-msgstr[1] "%s utenti bloccati/sbloccati"
+msgid "%s account blocked/unblocked"
+msgid_plural "%s account blocked/unblocked"
+msgstr[0] "Modificato il blocco su %s account"
+msgstr[1] "Modificato il blocco verso %s"
 
-#: ../../mod/admin.php:682
+#: ../../mod/admin.php:691
 #, php-format
-msgid "%s user deleted"
-msgid_plural "%s users deleted"
-msgstr[0] "%s utente cancellato"
-msgstr[1] "%s utenti cancellati"
+msgid "%s account deleted"
+msgid_plural "%s accounts deleted"
+msgstr[0] "%s account eliminato"
+msgstr[1] "%s account eliminati"
 
-#: ../../mod/admin.php:718
+#: ../../mod/admin.php:727
 msgid "Account not found"
 msgstr "Account non trovato"
 
-#: ../../mod/admin.php:738
+#: ../../mod/admin.php:739
+#, php-format
+msgid "Account '%s' deleted"
+msgstr "Account '%s' eliminato"
+
+#: ../../mod/admin.php:747
 #, php-format
-msgid "User '%s' blocked"
-msgstr "Utente '%s' bloccato"
+msgid "Account '%s' blocked"
+msgstr "Aggiunto un blocco verso '%s'"
 
-#: ../../mod/admin.php:746
+#: ../../mod/admin.php:755
 #, php-format
-msgid "User '%s' unblocked"
-msgstr "Utente '%s' sbloccato"
+msgid "Account '%s' unblocked"
+msgstr "Rimosso il blocco verso '%s'"
 
-#: ../../mod/admin.php:809 ../../mod/admin.php:821
+#: ../../mod/admin.php:818 ../../mod/admin.php:830
 msgid "Users"
 msgstr "Utenti"
 
-#: ../../mod/admin.php:811 ../../mod/admin.php:947
+#: ../../mod/admin.php:820 ../../mod/admin.php:987
 msgid "select all"
 msgstr "seleziona tutti"
 
-#: ../../mod/admin.php:812
+#: ../../mod/admin.php:821
 msgid "User registrations waiting for confirm"
 msgstr "Richieste di registrazione in attesa di conferma"
 
-#: ../../mod/admin.php:813
+#: ../../mod/admin.php:822
 msgid "Request date"
 msgstr "Data richiesta"
 
-#: ../../mod/admin.php:814
+#: ../../mod/admin.php:823
 msgid "No registrations."
 msgstr "Nessuna registrazione."
 
-#: ../../mod/admin.php:815
+#: ../../mod/admin.php:824 ../../mod/connedit.php:699
 msgid "Approve"
 msgstr "Approva"
 
-#: ../../mod/admin.php:816
+#: ../../mod/admin.php:825
 msgid "Deny"
 msgstr "Nega"
 
-#: ../../mod/admin.php:818 ../../mod/connedit.php:517
-#: ../../mod/connedit.php:720
+#: ../../mod/admin.php:827 ../../mod/connedit.php:531
 msgid "Block"
 msgstr "Blocca"
 
-#: ../../mod/admin.php:819 ../../mod/connedit.php:517
-#: ../../mod/connedit.php:720
+#: ../../mod/admin.php:828 ../../mod/connedit.php:531
 msgid "Unblock"
 msgstr "Sblocca"
 
-#: ../../mod/admin.php:822
+#: ../../mod/admin.php:831
 msgid "Register date"
 msgstr "Data registrazione"
 
-#: ../../mod/admin.php:822
+#: ../../mod/admin.php:831
 msgid "Last login"
 msgstr "Ultimo accesso"
 
-#: ../../mod/admin.php:822
+#: ../../mod/admin.php:831
 msgid "Expires"
 msgstr "Con scadenza"
 
-#: ../../mod/admin.php:822
+#: ../../mod/admin.php:831
 msgid "Service Class"
 msgstr "Classe dell'account"
 
-#: ../../mod/admin.php:824
+#: ../../mod/admin.php:833
 msgid ""
-"Selected users will be deleted!\\n\\nEverything these users had posted on "
-"this site will be permanently deleted!\\n\\nAre you sure?"
-msgstr "Gli utenti selezionati saranno eliminati!\\n\\nTutto quello che gli utenti hanno pubblicato su questo sito sarà permanentemente eliminato!\\n\\nConfermi?"
+"Selected accounts will be deleted!\\n\\nEverything these accounts had posted"
+" on this site will be permanently deleted!\\n\\nAre you sure?"
+msgstr "Gli account selezionati saranno eliminati!\\n\\nTutto ciò che hanno caricato o pubblicato su questo sito sarà eliminato definitivamente!\\n\\nVuoi confermare?"
 
-#: ../../mod/admin.php:825
+#: ../../mod/admin.php:834
 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 "L'utente {0} sarà eliminato!\\n\\nTutto quello che ha pubblicato su questo sito sarà permanentemente eliminato!\\n\\nConfermi?"
+"The account {0} will be deleted!\\n\\nEverything this account has posted on "
+"this site will be permanently deleted!\\n\\nAre you sure?"
+msgstr "L'account {0} sarà eliminato!\\n\\nTutto ciò che ha caricato o pubblicato su questo sito sarà eliminato definitivamente!\\n\\nVuoi confermare?"
 
-#: ../../mod/admin.php:859
+#: ../../mod/admin.php:870
 #, php-format
 msgid "%s channel censored/uncensored"
 msgid_plural "%s channels censored/uncensored"
 msgstr[0] "Censura modificata per %s canale"
 msgstr[1] "Censura modificata per %s canali"
 
-#: ../../mod/admin.php:866
+#: ../../mod/admin.php:879
+#, php-format
+msgid "%s channel code allowed/disallowed"
+msgid_plural "%s channels code allowed/disallowed"
+msgstr[0] "%s canale permette/non permette codice nei contenuti"
+msgstr[1] "%s canali permettono/non permettono codice nei contenuti"
+
+#: ../../mod/admin.php:886
 #, php-format
 msgid "%s channel deleted"
 msgid_plural "%s channels deleted"
 msgstr[0] "%s canale è stato rimosso"
 msgstr[1] "%s canali sono stati rimossi"
 
-#: ../../mod/admin.php:886
+#: ../../mod/admin.php:906
 msgid "Channel not found"
 msgstr "Canale non trovato"
 
-#: ../../mod/admin.php:897
+#: ../../mod/admin.php:917
 #, php-format
 msgid "Channel '%s' deleted"
 msgstr "Il canale '%s' è stato rimosso"
 
-#: ../../mod/admin.php:908
+#: ../../mod/admin.php:929
+#, php-format
+msgid "Channel '%s' censored"
+msgstr "Applicata una censura al canale '%s'"
+
+#: ../../mod/admin.php:929
 #, php-format
 msgid "Channel '%s' uncensored"
 msgstr "Rimossa la censura dal canale '%s'"
 
-#: ../../mod/admin.php:908
+#: ../../mod/admin.php:940
 #, php-format
-msgid "Channel '%s' censored"
-msgstr "Applicata una censura al canale '%s'"
+msgid "Channel '%s' code allowed"
+msgstr "Il canale '%s' permette codice nei contenuti"
 
-#: ../../mod/admin.php:949
+#: ../../mod/admin.php:940
+#, php-format
+msgid "Channel '%s' code disallowed"
+msgstr "Il canale '%s' non permette codice nei contenuti"
+
+#: ../../mod/admin.php:989
 msgid "Censor"
 msgstr "Applica una censura"
 
-#: ../../mod/admin.php:950
+#: ../../mod/admin.php:990
 msgid "Uncensor"
 msgstr "Rimuovi la censura"
 
-#: ../../mod/admin.php:953
+#: ../../mod/admin.php:991
+msgid "Allow Code"
+msgstr "Permetti codice nei contenuti"
+
+#: ../../mod/admin.php:992
+msgid "Disallow Code"
+msgstr "Non permettere codice nei contenuti"
+
+#: ../../mod/admin.php:994
 msgid "UID"
 msgstr "UID"
 
-#: ../../mod/admin.php:955
+#: ../../mod/admin.php:996
 msgid ""
 "Selected channels will be deleted!\\n\\nEverything that was posted in these "
 "channels on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "I canali selezionati saranno rimossi!\\n\\nTutto ciò che è stato pubblicato su questo server tramite questi canali sarà irreversibilmente eliminato!\\n\\nVuoi confermare?"
 
-#: ../../mod/admin.php:956
+#: ../../mod/admin.php:997
 msgid ""
 "The channel {0} will be deleted!\\n\\nEverything that was posted in this "
 "channel on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Il canale {0} sarà rimosso!\\n\\nTutto ciò che è stato pubblicato su questo server tramite questo canale sarà irreversibilmente eliminato!\\n\\nVuoi confermare?"
 
-#: ../../mod/admin.php:996
+#: ../../mod/admin.php:1037
 #, php-format
 msgid "Plugin %s disabled."
 msgstr "Plugin %s non attivo."
 
-#: ../../mod/admin.php:1000
+#: ../../mod/admin.php:1041
 #, php-format
 msgid "Plugin %s enabled."
 msgstr "Plugin %s attivo."
 
-#: ../../mod/admin.php:1010 ../../mod/admin.php:1208
+#: ../../mod/admin.php:1051 ../../mod/admin.php:1249
 msgid "Disable"
 msgstr "Disattiva"
 
-#: ../../mod/admin.php:1013 ../../mod/admin.php:1210
+#: ../../mod/admin.php:1054 ../../mod/admin.php:1251
 msgid "Enable"
 msgstr "Attiva"
 
-#: ../../mod/admin.php:1037 ../../mod/admin.php:1237
+#: ../../mod/admin.php:1078 ../../mod/admin.php:1278
 msgid "Toggle"
 msgstr "Attiva/disattiva"
 
-#: ../../mod/admin.php:1045 ../../mod/admin.php:1247
+#: ../../mod/admin.php:1086 ../../mod/admin.php:1288
 msgid "Author: "
 msgstr "Autore:"
 
-#: ../../mod/admin.php:1046 ../../mod/admin.php:1248
+#: ../../mod/admin.php:1087 ../../mod/admin.php:1289
 msgid "Maintainer: "
 msgstr "Gestore:"
 
-#: ../../mod/admin.php:1173
+#: ../../mod/admin.php:1214
 msgid "No themes found."
 msgstr "Nessun tema trovato."
 
-#: ../../mod/admin.php:1229
+#: ../../mod/admin.php:1270
 msgid "Screenshot"
 msgstr "Istantanea dello schermo"
 
-#: ../../mod/admin.php:1275
+#: ../../mod/admin.php:1316
 msgid "[Experimental]"
 msgstr "[Sperimentale]"
 
-#: ../../mod/admin.php:1276
+#: ../../mod/admin.php:1317
 msgid "[Unsupported]"
 msgstr "[Non supportato]"
 
-#: ../../mod/admin.php:1300
+#: ../../mod/admin.php:1341
 msgid "Log settings updated."
 msgstr "Impostazioni di log aggiornate."
 
-#: ../../mod/admin.php:1357
+#: ../../mod/admin.php:1398
 msgid "Clear"
 msgstr "Pulisci"
 
-#: ../../mod/admin.php:1363
+#: ../../mod/admin.php:1404
 msgid "Debugging"
 msgstr "Debugging"
 
-#: ../../mod/admin.php:1364
+#: ../../mod/admin.php:1405
 msgid "Log file"
 msgstr "File di log"
 
-#: ../../mod/admin.php:1364
+#: ../../mod/admin.php:1405
 msgid ""
 "Must be writable by web server. Relative to your Red top-level directory."
-msgstr "Deve essere scrivibile dal web server. La posizione è relativa alla cartella dove è installato Hubzilla."
+msgstr "Deve essere scrivibile dal web server. La posizione è relativa alla cartella dove è installato RedMatrix."
 
-#: ../../mod/admin.php:1365
+#: ../../mod/admin.php:1406
 msgid "Log level"
 msgstr "Livello di log"
 
-#: ../../mod/admin.php:1411
+#: ../../mod/admin.php:1452
 msgid "New Profile Field"
 msgstr "Nuovo campo del profilo"
 
-#: ../../mod/admin.php:1412 ../../mod/admin.php:1432
+#: ../../mod/admin.php:1453 ../../mod/admin.php:1473
 msgid "Field nickname"
 msgstr "Nome breve del campo"
 
-#: ../../mod/admin.php:1412 ../../mod/admin.php:1432
+#: ../../mod/admin.php:1453 ../../mod/admin.php:1473
 msgid "System name of field"
 msgstr "Nome di sistema del campo"
 
-#: ../../mod/admin.php:1413 ../../mod/admin.php:1433
+#: ../../mod/admin.php:1454 ../../mod/admin.php:1474
 msgid "Input type"
 msgstr "Tipo di dati"
 
-#: ../../mod/admin.php:1414 ../../mod/admin.php:1434
+#: ../../mod/admin.php:1455 ../../mod/admin.php:1475
 msgid "Field Name"
 msgstr "Nome del campo"
 
-#: ../../mod/admin.php:1414 ../../mod/admin.php:1434
+#: ../../mod/admin.php:1455 ../../mod/admin.php:1475
 msgid "Label on profile pages"
 msgstr "Etichetta da mostrare sulla pagina del profilo"
 
-#: ../../mod/admin.php:1415 ../../mod/admin.php:1435
+#: ../../mod/admin.php:1456 ../../mod/admin.php:1476
 msgid "Help text"
 msgstr "Testo di aiuto"
 
-#: ../../mod/admin.php:1415 ../../mod/admin.php:1435
+#: ../../mod/admin.php:1456 ../../mod/admin.php:1476
 msgid "Additional info (optional)"
 msgstr "Informazioni aggiuntive (opzionali)"
 
-#: ../../mod/admin.php:1425
+#: ../../mod/admin.php:1466
 msgid "Field definition not found"
 msgstr "Impossibile trovare la definizione del campo"
 
-#: ../../mod/admin.php:1431
+#: ../../mod/admin.php:1472
 msgid "Edit Profile Field"
 msgstr "Modifica campo del profilo"
 
@@ -7705,14 +7344,6 @@ msgstr "Impossibile raggiungere il tuo hub."
 msgid "Post successful."
 msgstr "Inviato!"
 
-#: ../../mod/editblock.php:112
-msgid "Edit Block"
-msgstr "Modifica il riquadro"
-
-#: ../../mod/editblock.php:123
-msgid "Delete block?"
-msgstr "Vuoi eliminare questo riquadro?"
-
 #: ../../mod/register.php:44
 msgid "Maximum daily site registrations exceeded. Please try again tomorrow."
 msgstr "È stato superato il numero massimo giornaliero di registrazioni a questo sito. Riprova domani!"
@@ -7828,39 +7459,25 @@ msgid ""
 "removed from the network"
 msgstr "A meno che tu non lo richieda espressamente, solo i canali presenti su questo server saranno rimossi dalla rete."
 
-#: ../../mod/item.php:174
-msgid "Unable to locate original post."
-msgstr "Impossibile trovare il messaggio originale."
-
-#: ../../mod/item.php:437
-msgid "Empty post discarded."
-msgstr "L'articolo vuoto è stato ignorato."
-
-#: ../../mod/item.php:479
-msgid "Executable content type not permitted to this channel."
-msgstr "I contenuti eseguibili non sono permessi su questo canale."
-
-#: ../../mod/item.php:885
-msgid "System error. Post not saved."
-msgstr "Errore di sistema. Articolo non salvato."
+#: ../../mod/removeaccount.php:61 ../../mod/settings.php:720
+msgid "Remove Account"
+msgstr "Elimina l'account"
 
-#: ../../mod/item.php:1103
-msgid "Unable to obtain post information from database."
-msgstr "Impossibile caricare l'articolo dal database."
+#: ../../mod/help.php:49 ../../mod/help.php:55 ../../mod/help.php:61
+msgid "Help:"
+msgstr "Guida:"
 
-#: ../../mod/item.php:1110
-#, php-format
-msgid "You have reached your limit of %1$.0f top level posts."
-msgstr "Hai raggiunto il limite massimo di %1$.0f articoli sulla pagina principale."
+#: ../../mod/help.php:76 ../../index.php:238
+msgid "Not Found"
+msgstr "Non disponibile"
 
-#: ../../mod/item.php:1117
-#, php-format
-msgid "You have reached your limit of %1$.0f webpages."
-msgstr "Hai raggiunto il limite massimo di %1$.0f pagine web."
+#: ../../mod/help.php:100
+msgid "$Projectname Documentation"
+msgstr "Documentazione $Projectname"
 
 #: ../../mod/update_channel.php:43 ../../mod/update_display.php:25
 #: ../../mod/update_network.php:23 ../../mod/update_search.php:46
-#: ../../mod/update_home.php:21
+#: ../../mod/update_home.php:21 ../../mod/update_public.php:21
 msgid "[Embedded content - reload page to view]"
 msgstr "[Contenuto incorporato - ricarica la pagina per visualizzarlo correttamente]"
 
@@ -7872,9 +7489,583 @@ msgstr "Le informazioni remote sulla privacy non sono disponibili."
 msgid "Visible to:"
 msgstr "Visibile a:"
 
-#: ../../mod/blocks.php:95 ../../mod/blocks.php:144
-msgid "Block Name"
-msgstr "Nome del riquadro"
+#: ../../mod/settings.php:76
+msgid "Name is required"
+msgstr "Il nome è obbligatorio"
+
+#: ../../mod/settings.php:80
+msgid "Key and Secret are required"
+msgstr "Key e Secret sono richiesti"
+
+#: ../../mod/settings.php:130
+msgid "Diaspora Policy Settings updated."
+msgstr "Le regole per Diaspora sono state aggiornate."
+
+#: ../../mod/settings.php:238
+msgid "Passwords do not match. Password unchanged."
+msgstr "Le password non corrispondono. Password non cambiata."
+
+#: ../../mod/settings.php:242
+msgid "Empty passwords are not allowed. Password unchanged."
+msgstr "Le password non possono essere vuote. Password non cambiata."
+
+#: ../../mod/settings.php:256
+msgid "Password changed."
+msgstr "Password cambiata."
+
+#: ../../mod/settings.php:258
+msgid "Password update failed. Please try again."
+msgstr "Modifica password fallita. Prova ancora."
+
+#: ../../mod/settings.php:272
+msgid "Not valid email."
+msgstr "Email non valida."
+
+#: ../../mod/settings.php:275
+msgid "Protected email address. Cannot change to that email."
+msgstr "È un indirizzo email riservato. Non puoi sceglierlo."
+
+#: ../../mod/settings.php:284
+msgid "System failure storing new email. Please try again."
+msgstr "Errore di sistema. Non è stato possibile memorizzare il tuo messaggio, riprova per favore."
+
+#: ../../mod/settings.php:523
+msgid "Settings updated."
+msgstr "Impostazioni aggiornate."
+
+#: ../../mod/settings.php:587 ../../mod/settings.php:613
+#: ../../mod/settings.php:649
+msgid "Add application"
+msgstr "Aggiungi una app"
+
+#: ../../mod/settings.php:590
+msgid "Name of application"
+msgstr "Nome dell'applicazione"
+
+#: ../../mod/settings.php:591 ../../mod/settings.php:617
+msgid "Consumer Key"
+msgstr "Consumer Key"
+
+#: ../../mod/settings.php:591 ../../mod/settings.php:592
+msgid "Automatically generated - change if desired. Max length 20"
+msgstr "Generato automaticamente - è possibile cambiarlo. Lunghezza massima 20"
+
+#: ../../mod/settings.php:592 ../../mod/settings.php:618
+msgid "Consumer Secret"
+msgstr "Consumer Secret"
+
+#: ../../mod/settings.php:593 ../../mod/settings.php:619
+msgid "Redirect"
+msgstr "Redirect"
+
+#: ../../mod/settings.php:593
+msgid ""
+"Redirect URI - leave blank unless your application specifically requires "
+"this"
+msgstr "URI ridirezionato - lasciare bianco se non richiesto specificamente dall'applicazione."
+
+#: ../../mod/settings.php:594 ../../mod/settings.php:620
+msgid "Icon url"
+msgstr "Url icona"
+
+#: ../../mod/settings.php:594
+msgid "Optional"
+msgstr "Opzionale"
+
+#: ../../mod/settings.php:605
+msgid "You can't edit this application."
+msgstr "Non puoi modificare questa applicazione."
+
+#: ../../mod/settings.php:648
+msgid "Connected Apps"
+msgstr "App connesse"
+
+#: ../../mod/settings.php:652
+msgid "Client key starts with"
+msgstr "La client key inizia con"
+
+#: ../../mod/settings.php:653
+msgid "No name"
+msgstr "Nessun nome"
+
+#: ../../mod/settings.php:654
+msgid "Remove authorization"
+msgstr "Revoca l'autorizzazione"
+
+#: ../../mod/settings.php:668
+msgid "No feature settings configured"
+msgstr "Non hai componenti aggiuntivi da personalizzare"
+
+#: ../../mod/settings.php:685
+msgid "Feature/Addon Settings"
+msgstr "Impostazioni dei componenti aggiuntivi"
+
+#: ../../mod/settings.php:687
+msgid "Settings for the built-in Diaspora emulator"
+msgstr "Interconnessione con Diaspora"
+
+#: ../../mod/settings.php:688
+msgid "Allow any Diaspora member to comment on your public posts"
+msgstr "Permetti a tutti gli utenti di Diaspora di commentare i tuoi post pubblici"
+
+#: ../../mod/settings.php:689
+msgid "Enable the Diaspora protocol for this channel"
+msgstr "Abilita il protocollo Diaspora per questo canale"
+
+#: ../../mod/settings.php:690
+msgid "Diaspora Policy Settings"
+msgstr "Regole per Diaspora"
+
+#: ../../mod/settings.php:691
+msgid "Prevent your hashtags from being redirected to other sites"
+msgstr "Impedisci che i tuoi #tag puntino su altri siti"
+
+#: ../../mod/settings.php:715
+msgid "Account Settings"
+msgstr "Il tuo account"
+
+#: ../../mod/settings.php:716
+msgid "Enter New Password:"
+msgstr "Inserisci la nuova password:"
+
+#: ../../mod/settings.php:717
+msgid "Confirm New Password:"
+msgstr "Conferma la nuova password:"
+
+#: ../../mod/settings.php:717
+msgid "Leave password fields blank unless changing"
+msgstr "Lascia questi campi in bianco per non cambiare la password"
+
+#: ../../mod/settings.php:719 ../../mod/settings.php:1057
+msgid "Email Address:"
+msgstr "Indirizzo email:"
+
+#: ../../mod/settings.php:721
+msgid "Remove this account including all its channels"
+msgstr "Elimina questo account e tutti i suoi canali"
+
+#: ../../mod/settings.php:737
+msgid "Off"
+msgstr "Off"
+
+#: ../../mod/settings.php:737
+msgid "On"
+msgstr "On"
+
+#: ../../mod/settings.php:744
+msgid "Additional Features"
+msgstr "Funzionalità opzionali"
+
+#: ../../mod/settings.php:768
+msgid "Connector Settings"
+msgstr "Impostazioni del connettore"
+
+#: ../../mod/settings.php:807
+msgid "No special theme for mobile devices"
+msgstr "Nessun tema per dispositivi mobili"
+
+#: ../../mod/settings.php:810
+#, php-format
+msgid "%s - (Experimental)"
+msgstr "%s - (Sperimentale)"
+
+#: ../../mod/settings.php:849
+msgid "Display Settings"
+msgstr "Aspetto"
+
+#: ../../mod/settings.php:850
+msgid "Theme Settings"
+msgstr "Impostazioni del tema"
+
+#: ../../mod/settings.php:851
+msgid "Custom Theme Settings"
+msgstr "Personalizzazione del tema"
+
+#: ../../mod/settings.php:852
+msgid "Content Settings"
+msgstr "Impostazioni dei contenuti"
+
+#: ../../mod/settings.php:858
+msgid "Display Theme:"
+msgstr "Tema per schermi medio grandi:"
+
+#: ../../mod/settings.php:859
+msgid "Mobile Theme:"
+msgstr "Tema per dispositivi mobili:"
+
+#: ../../mod/settings.php:860
+msgid "Enable user zoom on mobile devices"
+msgstr "Attiva la possibilità di fare zoom sui dispositivi mobili"
+
+#: ../../mod/settings.php:861
+msgid "Update browser every xx seconds"
+msgstr "Aggiorna il browser ogni x secondi"
+
+#: ../../mod/settings.php:861
+msgid "Minimum of 10 seconds, no maximum"
+msgstr "Minimo 10 secondi, nessun limite massimo"
+
+#: ../../mod/settings.php:862
+msgid "Maximum number of conversations to load at any time:"
+msgstr "Massimo numero di conversazioni da mostrare ogni volta:"
+
+#: ../../mod/settings.php:862
+msgid "Maximum of 100 items"
+msgstr "Massimo 100"
+
+#: ../../mod/settings.php:863
+msgid "Show emoticons (smilies) as images"
+msgstr "Mostra le faccine (smilies) come immagini"
+
+#: ../../mod/settings.php:864
+msgid "Link post titles to source"
+msgstr "Il link del titolo di un post porta al sito originale"
+
+#: ../../mod/settings.php:865
+msgid "System Page Layout Editor - (advanced)"
+msgstr "Modifica i layout di sistema (avanzato)"
+
+#: ../../mod/settings.php:868
+msgid "Use blog/list mode on channel page"
+msgstr "Mostra il canale nella modalità blog"
+
+#: ../../mod/settings.php:868 ../../mod/settings.php:869
+msgid "(comments displayed separately)"
+msgstr "(i commenti sono mostrati separatamente)"
+
+#: ../../mod/settings.php:869
+msgid "Use blog/list mode on matrix page"
+msgstr "Mostra la tua rete in modalità blog"
+
+#: ../../mod/settings.php:870
+msgid "Channel page max height of content (in pixels)"
+msgstr "Altezza massima dei contenuti del canale (in pixel)"
+
+#: ../../mod/settings.php:870 ../../mod/settings.php:871
+msgid "click to expand content exceeding this height"
+msgstr "dovrai cliccare per mostrare i contenuti di dimensioni maggiori"
+
+#: ../../mod/settings.php:871
+msgid "Matrix page max height of content (in pixels)"
+msgstr "Altezza massima dei contenuti della tua rete (in pixel)"
+
+#: ../../mod/settings.php:905
+msgid "Nobody except yourself"
+msgstr "Nessuno tranne te"
+
+#: ../../mod/settings.php:906
+msgid "Only those you specifically allow"
+msgstr "Solo chi riceve il mio permesso"
+
+#: ../../mod/settings.php:907
+msgid "Approved connections"
+msgstr "Contatti approvati"
+
+#: ../../mod/settings.php:908
+msgid "Any connections"
+msgstr "Tutti i contatti"
+
+#: ../../mod/settings.php:909
+msgid "Anybody on this website"
+msgstr "Chiunque su questo sito"
+
+#: ../../mod/settings.php:910
+msgid "Anybody in this network"
+msgstr "Chiunque su Red"
+
+#: ../../mod/settings.php:911
+msgid "Anybody authenticated"
+msgstr "Chiunque abbia effettuato l'accesso"
+
+#: ../../mod/settings.php:912
+msgid "Anybody on the internet"
+msgstr "Chiunque su internet"
+
+#: ../../mod/settings.php:986
+msgid "Publish your default profile in the network directory"
+msgstr "Mostra il mio profilo predefinito nell'elenco pubblico dei canali"
+
+#: ../../mod/settings.php:991
+msgid "Allow us to suggest you as a potential friend to new members?"
+msgstr "Vuoi essere suggerito come amico ai nuovi membri?"
+
+#: ../../mod/settings.php:1000
+msgid "Your channel address is"
+msgstr "L'indirizzo del tuo canale è"
+
+#: ../../mod/settings.php:1048
+msgid "Channel Settings"
+msgstr "Impostazioni del canale"
+
+#: ../../mod/settings.php:1055
+msgid "Basic Settings"
+msgstr "Impostazioni di base"
+
+#: ../../mod/settings.php:1058
+msgid "Your Timezone:"
+msgstr "Il tuo fuso orario:"
+
+#: ../../mod/settings.php:1059
+msgid "Default Post Location:"
+msgstr "Località predefinita:"
+
+#: ../../mod/settings.php:1059
+msgid "Geographical location to display on your posts"
+msgstr "Posizione geografica da mostrare sui tuoi post"
+
+#: ../../mod/settings.php:1060
+msgid "Use Browser Location:"
+msgstr "Usa la località rilevata dal browser:"
+
+#: ../../mod/settings.php:1062
+msgid "Adult Content"
+msgstr "Contenuto per adulti"
+
+#: ../../mod/settings.php:1062
+msgid ""
+"This channel frequently or regularly publishes adult content. (Please tag "
+"any adult material and/or nudity with #NSFW)"
+msgstr "Questo canale pubblica frequentemente contenuto per adulti. (I contenuti per adulti vanno taggati #NSFW - Not Safe For Work)"
+
+#: ../../mod/settings.php:1064
+msgid "Security and Privacy Settings"
+msgstr "Impostazioni di sicurezza e privacy"
+
+#: ../../mod/settings.php:1066
+msgid "Your permissions are already configured. Click to view/adjust"
+msgstr "I tuoi permessi sono già stati configurati. Clicca per vederli o modificarli"
+
+#: ../../mod/settings.php:1068
+msgid "Hide my online presence"
+msgstr "Nascondi la mia presenza online"
+
+#: ../../mod/settings.php:1068
+msgid "Prevents displaying in your profile that you are online"
+msgstr "Evita che sul tuo profilo compaia la tua presenza online"
+
+#: ../../mod/settings.php:1070
+msgid "Simple Privacy Settings:"
+msgstr "Impostazioni di privacy semplificate"
+
+#: ../../mod/settings.php:1071
+msgid ""
+"Very Public - <em>extremely permissive (should be used with caution)</em>"
+msgstr "Tutto pubblico - <em>estremamente permissivo (da usare con cautela)</em>"
+
+#: ../../mod/settings.php:1072
+msgid ""
+"Typical - <em>default public, privacy when desired (similar to social "
+"network permissions but with improved privacy)</em>"
+msgstr "Standard - <em>contenuti normalmente pubblici, ma anche privati se necessario (simile ai social network ma con privacy migliorata)</em>"
+
+#: ../../mod/settings.php:1073
+msgid "Private - <em>default private, never open or public</em>"
+msgstr "Privato - <em>contenuti normalmente privati, nulla è aperto o pubblico</em>"
+
+#: ../../mod/settings.php:1074
+msgid "Blocked - <em>default blocked to/from everybody</em>"
+msgstr "Bloccato - <em>bloccato in invio e ricezione dei contenuti</em>"
+
+#: ../../mod/settings.php:1076
+msgid "Allow others to tag your posts"
+msgstr "Permetti ad altri di taggare i tuoi post"
+
+#: ../../mod/settings.php:1076
+msgid ""
+"Often used by the community to retro-actively flag inappropriate content"
+msgstr "Usato spesso dalla comunità per marcare contenuti inappropriati già esistenti"
+
+#: ../../mod/settings.php:1078
+msgid "Advanced Privacy Settings"
+msgstr "Impostazioni di privacy avanzate"
+
+#: ../../mod/settings.php:1080
+msgid "Expire other channel content after this many days"
+msgstr "Giorni dopo cui mettere in scadenza gli altri contenuti del canale"
+
+#: ../../mod/settings.php:1080
+msgid "0 or blank prevents expiration"
+msgstr "Lascia vuoto oppure 0 per non impostare scadenze"
+
+#: ../../mod/settings.php:1081
+msgid "Maximum Friend Requests/Day:"
+msgstr "Numero massimo giornaliero di richieste di amicizia:"
+
+#: ../../mod/settings.php:1081
+msgid "May reduce spam activity"
+msgstr "Serve e ridurre lo spam"
+
+#: ../../mod/settings.php:1082
+msgid "Default Post Permissions"
+msgstr "Permessi predefiniti per i post"
+
+#: ../../mod/settings.php:1087
+msgid "Channel permissions category:"
+msgstr "Categorie di permessi dei canali:"
+
+#: ../../mod/settings.php:1093
+msgid "Maximum private messages per day from unknown people:"
+msgstr "Numero massimo giornaliero di messaggi privati da utenti sconosciuti:"
+
+#: ../../mod/settings.php:1093
+msgid "Useful to reduce spamming"
+msgstr "Serve e ridurre lo spam"
+
+#: ../../mod/settings.php:1096
+msgid "Notification Settings"
+msgstr "Impostazioni di notifica"
+
+#: ../../mod/settings.php:1097
+msgid "By default post a status message when:"
+msgstr "Pubblica un messaggio di stato quando:"
+
+#: ../../mod/settings.php:1098
+msgid "accepting a friend request"
+msgstr "accetto una nuova amicizia"
+
+#: ../../mod/settings.php:1099
+msgid "joining a forum/community"
+msgstr "entro a far parte di un forum"
+
+#: ../../mod/settings.php:1100
+msgid "making an <em>interesting</em> profile change"
+msgstr "faccio un cambiamento <em>interessante</em> al mio profilo"
+
+#: ../../mod/settings.php:1101
+msgid "Send a notification email when:"
+msgstr "Invia una email di notifica quando:"
+
+#: ../../mod/settings.php:1102
+msgid "You receive a connection request"
+msgstr "Ricevi una richiesta di entrare in contatto"
+
+#: ../../mod/settings.php:1103
+msgid "Your connections are confirmed"
+msgstr "I tuoi contatti sono confermati"
+
+#: ../../mod/settings.php:1104
+msgid "Someone writes on your profile wall"
+msgstr "Qualcuno scrive sulla tua bacheca"
+
+#: ../../mod/settings.php:1105
+msgid "Someone writes a followup comment"
+msgstr "Qualcuno scrive un commento dopo di te"
+
+#: ../../mod/settings.php:1106
+msgid "You receive a private message"
+msgstr "Ricevi un messaggio privato"
+
+#: ../../mod/settings.php:1107
+msgid "You receive a friend suggestion"
+msgstr "Ti viene suggerito un amico"
+
+#: ../../mod/settings.php:1108
+msgid "You are tagged in a post"
+msgstr "Sei taggato in un post"
+
+#: ../../mod/settings.php:1109
+msgid "You are poked/prodded/etc. in a post"
+msgstr "Ricevi un poke in un post"
+
+#: ../../mod/settings.php:1112
+msgid "Show visual notifications including:"
+msgstr "Mostra queste notifiche a schermo:"
+
+#: ../../mod/settings.php:1114
+msgid "Unseen matrix activity"
+msgstr "Nuove attività nella rete"
+
+#: ../../mod/settings.php:1115
+msgid "Unseen channel activity"
+msgstr "Novità nei canali"
+
+#: ../../mod/settings.php:1116
+msgid "Unseen private messages"
+msgstr "Nuovi messaggi privati"
+
+#: ../../mod/settings.php:1116 ../../mod/settings.php:1121
+#: ../../mod/settings.php:1122 ../../mod/settings.php:1123
+msgid "Recommended"
+msgstr "Consigliato"
+
+#: ../../mod/settings.php:1117
+msgid "Upcoming events"
+msgstr "Prossimi eventi"
+
+#: ../../mod/settings.php:1118
+msgid "Events today"
+msgstr "Eventi di oggi"
+
+#: ../../mod/settings.php:1119
+msgid "Upcoming birthdays"
+msgstr "Prossimi compleanni"
+
+#: ../../mod/settings.php:1119
+msgid "Not available in all themes"
+msgstr "Non disponibile in tutti i temi"
+
+#: ../../mod/settings.php:1120
+msgid "System (personal) notifications"
+msgstr "Notifiche personali dal sistema"
+
+#: ../../mod/settings.php:1121
+msgid "System info messages"
+msgstr "Notifiche di sistema"
+
+#: ../../mod/settings.php:1122
+msgid "System critical alerts"
+msgstr "Avvisi critici di sistema"
+
+#: ../../mod/settings.php:1123
+msgid "New connections"
+msgstr "Nuovi contatti"
+
+#: ../../mod/settings.php:1124
+msgid "System Registrations"
+msgstr "Registrazioni"
+
+#: ../../mod/settings.php:1125
+msgid ""
+"Also show new wall posts, private messages and connections under Notices"
+msgstr "Mostra negli avvisi anche i nuovi post, i messaggi privati e i nuovi contatti"
+
+#: ../../mod/settings.php:1127
+msgid "Notify me of events this many days in advance"
+msgstr "Giorni di anticipo per notificare gli eventi"
+
+#: ../../mod/settings.php:1127
+msgid "Must be greater than 0"
+msgstr "Maggiore di 0"
+
+#: ../../mod/settings.php:1129
+msgid "Advanced Account/Page Type Settings"
+msgstr "Impostazioni avanzate"
+
+#: ../../mod/settings.php:1130
+msgid "Change the behaviour of this account for special situations"
+msgstr "Cambia il funzionamento di questo account per necessità particolari"
+
+#: ../../mod/settings.php:1133
+msgid ""
+"Please enable expert mode (in <a href=\"settings/features\">Settings > "
+"Additional features</a>) to adjust!"
+msgstr "Abilita la modalità esperto per fare cambiamenti! (in <a href=\"settings/features\">Impostazioni > Funzionalità opzionali</a>)"
+
+#: ../../mod/settings.php:1134
+msgid "Miscellaneous Settings"
+msgstr "Impostazioni varie"
+
+#: ../../mod/settings.php:1136
+msgid "Personal menu to display in your channel pages"
+msgstr "Menu personale da mostrare sulle pagine del tuo canale"
+
+#: ../../mod/settings.php:1137 ../../mod/removeme.php:61
+msgid "Remove Channel"
+msgstr "Elimina questo canale"
+
+#: ../../mod/settings.php:1138
+msgid "Remove this channel."
+msgstr "Elimina questo canale."
 
 #: ../../mod/id.php:11
 msgid "First Name"
@@ -7956,17 +8147,113 @@ msgstr "Elimina la conversazione"
 msgid "D, d M Y - g:i A"
 msgstr "D d M Y - G:i"
 
-#: ../../mod/layouts.php:111
-msgid "Help with this feature"
-msgstr "La guida per questa funzionalità"
+#: ../../mod/uexport.php:50 ../../mod/uexport.php:51
+msgid "Export Channel"
+msgstr "Esporta il canale"
 
-#: ../../mod/layouts.php:132
-msgid "Layout Name"
-msgstr "Nome layout"
+#: ../../mod/uexport.php:52
+msgid ""
+"Export your basic channel information to a file.  This acts as a backup of "
+"your connections, permissions, profile and basic data, which can be used to "
+"import your data to a new server hub, but does not contain your content."
+msgstr "Esporta le informazioni di base del canale in un file. In pratica è un salvataggio delle tue connessioni, dei permessi che hai assegnato e del tuo profilo che così potrà essere importato su un altro server/hub. Il file non includerà i tuoi post e altri contenuti che hai creato o caricato."
 
-#: ../../mod/layouts.php:171
-msgid "Comanche page description language help"
-msgstr "Guida di Comanche Page Description Language"
+#: ../../mod/uexport.php:53
+msgid "Export Content"
+msgstr "Esporta i contenuti"
+
+#: ../../mod/uexport.php:54
+msgid ""
+"Export your channel information and recent content to a JSON backup that can"
+" be restored or imported to another server hub. This backs up all of your "
+"connections, permissions, profile data and several months of posts. This "
+"file may be VERY large.  Please be patient - it may take several minutes for"
+" this download to begin."
+msgstr "Esporta il tuo canale e i contenuti recenti in un file di salvataggio che potrà essere importato su un altro server/hub. Sarà un backup dei tuoi contatti, dei permessi che hai assegnato, dei dati del profilo e dei post degli ultimi mesi. Il file potrebbe essere MOLTO grande. Sarà necessario attendere con pazienza - saranno necessari molti minuti prima che inizi lo scaricamento."
+
+#: ../../mod/uexport.php:55
+msgid "Export your posts from a given year or month:"
+msgstr "Puoi anche esportare i post relativi a un certo mese o anno"
+
+#: ../../mod/uexport.php:57
+msgid ""
+"You may also export your posts and conversations for a particular year or "
+"month. Click on one of the recent years or months below."
+msgstr "Puoi anche esportare i tuoi post e le conversazioni di un certo mese o anno. Clicca qua sotto su un mese o su un anno recente."
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Jan"
+msgstr "Gen"
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Feb"
+msgstr "Feb"
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Mar"
+msgstr "Mar"
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Apr"
+msgstr "Apr"
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Jun"
+msgstr "Giu"
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Jul"
+msgstr "Lug"
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Aug"
+msgstr "Ago"
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Sep"
+msgstr "Set"
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Oct"
+msgstr "Ott"
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Nov"
+msgstr "Nov"
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Dec"
+msgstr "Dic"
+
+#: ../../mod/uexport.php:60
+msgid ""
+"If the export fails (possibly due to memory exhaustion on your server hub), "
+"please try again selecting a more limited date range."
+msgstr "Se l'esportazione fallisce (di solito è per mancanza di memoria sullo hub), puoi provare nuovamente, ma scegliendo un intervallo di date più stretto."
+
+#: ../../mod/uexport.php:61
+#, php-format
+msgid ""
+"Or adjust the date in your browser location bar to select other dates. For "
+"example the year 2013; <a href=\"%1$s/2013\">%1$s/2013</a> or the month "
+"September 2013; <a href=\"%1$s/2013/9\">%1$s/2013/9</a>"
+msgstr "Oppure cambia le date nella barra degli indirizzi del tuo browser per selezionare altre date. Per esempio, l'anno 2013; <a href=\"%1$s/2013\">%1$s/2013</a> o il mese di settembre 2013; <a href=\"%1$s/2013/9\">%1$s/2013/9</a>"
+
+#: ../../mod/uexport.php:62
+msgid "Please visit"
+msgstr "Visita"
+
+#: ../../mod/uexport.php:62
+msgid "on another hub to import the backup files(s)."
+msgstr "su un altro hub per importare il backup."
+
+#: ../../mod/uexport.php:63
+msgid ""
+"We advise you to clone the channel on the new hub first and than to import "
+"the backup file(s) (from the same channel) in chronological order. Importing"
+" the backup files into another channel will certainly give permission "
+"issues."
+msgstr "Il consiglio è di clonare per prima cosa il canale sul nuovo hub e poi importare i file di backup creati dal canale originale in ordine cronologico. Importare contenuti di canali differenti darà sicuramente problemi sui diritti."
 
 #: ../../mod/mood.php:131
 msgid "Set your current mood and tell your friends"
@@ -7974,7 +8261,7 @@ msgstr "Scegli il tuo umore attuale per mostrarlo agli amici"
 
 #: ../../mod/vote.php:97
 msgid "Total votes"
-msgstr "Voti totali"
+msgstr "Totale voti"
 
 #: ../../mod/vote.php:98
 msgid "Average Rating"
@@ -8004,314 +8291,254 @@ msgid ""
 "removed from the network"
 msgstr "L'impostazione predefinita è che sia eliminata solo l'istanza del canale presente su questo hub, non gli eventuali cloni"
 
-#: ../../mod/connedit.php:262
+#: ../../mod/connedit.php:75
+msgid "Could not access contact record."
+msgstr "Non è possibile accedere alle informazioni sul contatto."
+
+#: ../../mod/connedit.php:99
+msgid "Could not locate selected profile."
+msgstr "Non riesco a trovare il profilo selezionato."
+
+#: ../../mod/connedit.php:219
+msgid "Connection updated."
+msgstr "Contatto aggiornato."
+
+#: ../../mod/connedit.php:221
+msgid "Failed to update connection record."
+msgstr "Impossibile aggiornare le informazioni del contatto."
+
+#: ../../mod/connedit.php:267
 msgid "is now connected to"
 msgstr "ha come nuovo contatto"
 
-#: ../../mod/connedit.php:375
+#: ../../mod/connedit.php:392
 msgid "Could not access address book record."
 msgstr "Impossibile accedere alle informazioni della rubrica."
 
-#: ../../mod/connedit.php:389
+#: ../../mod/connedit.php:406
 msgid "Refresh failed - channel is currently unavailable."
 msgstr "Il canale non è disponibile - impossibile aggiornare."
 
-#: ../../mod/connedit.php:396
-msgid "Channel has been unblocked"
-msgstr "Il canale è stato sbloccato"
-
-#: ../../mod/connedit.php:397
-msgid "Channel has been blocked"
-msgstr "Il canale è stato bloccato"
-
-#: ../../mod/connedit.php:401 ../../mod/connedit.php:413
-#: ../../mod/connedit.php:425 ../../mod/connedit.php:437
-#: ../../mod/connedit.php:453
+#: ../../mod/connedit.php:418 ../../mod/connedit.php:430
+#: ../../mod/connedit.php:442 ../../mod/connedit.php:454
+#: ../../mod/connedit.php:470
 msgid "Unable to set address book parameters."
 msgstr "Impossibile impostare i parametri della rubrica."
 
-#: ../../mod/connedit.php:408
-msgid "Channel has been unignored"
-msgstr "Il canale non sarà più ignorato"
-
-#: ../../mod/connedit.php:409
-msgid "Channel has been ignored"
-msgstr "Il canale sarà ignorato"
-
-#: ../../mod/connedit.php:420
-msgid "Channel has been unarchived"
-msgstr "Il canale non è più archiviato"
-
-#: ../../mod/connedit.php:421
-msgid "Channel has been archived"
-msgstr "Il canale è stato archiviato"
-
-#: ../../mod/connedit.php:432
-msgid "Channel has been unhidden"
-msgstr "Il canale non è più nascosto"
-
-#: ../../mod/connedit.php:433
-msgid "Channel has been hidden"
-msgstr "Il canale è stato nascosto"
-
-#: ../../mod/connedit.php:448
-msgid "Channel has been approved"
-msgstr "Il canale è stato approvato"
-
-#: ../../mod/connedit.php:449
-msgid "Channel has been unapproved"
-msgstr "Il canale non è più approvato"
-
-#: ../../mod/connedit.php:477
+#: ../../mod/connedit.php:494
 msgid "Connection has been removed."
 msgstr "Il contatto è stato rimosso."
 
-#: ../../mod/connedit.php:497
+#: ../../mod/connedit.php:513
 #, php-format
 msgid "View %s's profile"
 msgstr "Guarda il profilo di %s"
 
-#: ../../mod/connedit.php:501
+#: ../../mod/connedit.php:517
 msgid "Refresh Permissions"
 msgstr "Modifica i permessi"
 
-#: ../../mod/connedit.php:504
+#: ../../mod/connedit.php:520
 msgid "Fetch updated permissions"
 msgstr "Guarda e modifica i permessi assegnati"
 
-#: ../../mod/connedit.php:508
+#: ../../mod/connedit.php:524
 msgid "Recent Activity"
 msgstr "Attività recenti"
 
-#: ../../mod/connedit.php:511
+#: ../../mod/connedit.php:527
 msgid "View recent posts and comments"
 msgstr "Leggi i post recenti e i commenti"
 
-#: ../../mod/connedit.php:520
+#: ../../mod/connedit.php:534
 msgid "Block (or Unblock) all communications with this connection"
 msgstr "Blocca ogni interazione con questo contatto (abilita/disabilita)"
 
-#: ../../mod/connedit.php:524 ../../mod/connedit.php:721
+#: ../../mod/connedit.php:535
+msgid "This connection is blocked!"
+msgstr "Questa connessione è tra quelle bloccate!"
+
+#: ../../mod/connedit.php:539
 msgid "Unignore"
 msgstr "Non ignorare"
 
-#: ../../mod/connedit.php:524 ../../mod/connedit.php:721
-#: ../../mod/notifications.php:51
+#: ../../mod/connedit.php:539 ../../mod/notifications.php:51
 msgid "Ignore"
 msgstr "Ignora"
 
-#: ../../mod/connedit.php:527
+#: ../../mod/connedit.php:542
 msgid "Ignore (or Unignore) all inbound communications from this connection"
 msgstr "Ignora tutte le comunicazioni in arrivo da questo contatto (abilita/disabilita)"
 
-#: ../../mod/connedit.php:530
+#: ../../mod/connedit.php:543
+msgid "This connection is ignored!"
+msgstr "Questa connessione è tra quelle ignorate!"
+
+#: ../../mod/connedit.php:547
 msgid "Unarchive"
 msgstr "Non archiviare"
 
-#: ../../mod/connedit.php:530
+#: ../../mod/connedit.php:547
 msgid "Archive"
 msgstr "Archivia"
 
-#: ../../mod/connedit.php:533
+#: ../../mod/connedit.php:550
 msgid ""
 "Archive (or Unarchive) this connection - mark channel dead but keep content"
 msgstr "Archivia questo contatto (abilita/disabilita) - segna il canale come non più attivo ma ne conserva i contenuti"
 
-#: ../../mod/connedit.php:536
+#: ../../mod/connedit.php:551
+msgid "This connection is archived!"
+msgstr "Questa connessione è tra quelle archiviate!"
+
+#: ../../mod/connedit.php:555
 msgid "Unhide"
 msgstr "Non nascondere"
 
-#: ../../mod/connedit.php:536
+#: ../../mod/connedit.php:555
 msgid "Hide"
 msgstr "Nascondi"
 
-#: ../../mod/connedit.php:539
+#: ../../mod/connedit.php:558
 msgid "Hide or Unhide this connection from your other connections"
 msgstr "Nascondi questo contatto a tutti gli altri (abilita/disabilita)"
 
-#: ../../mod/connedit.php:546
+#: ../../mod/connedit.php:559
+msgid "This connection is hidden!"
+msgstr "Questa connessione è tra quelle nascoste!"
+
+#: ../../mod/connedit.php:566
 msgid "Delete this connection"
 msgstr "Elimina questo contatto"
 
-#: ../../mod/connedit.php:637 ../../mod/connedit.php:675
+#: ../../mod/connedit.php:647
 msgid "Approve this connection"
 msgstr "Approva questo contatto"
 
-#: ../../mod/connedit.php:637
+#: ../../mod/connedit.php:647
 msgid "Accept connection to allow communication"
 msgstr "Entra in contatto per poter comunicare"
 
-#: ../../mod/connedit.php:653
-#, php-format
-msgid "Connections: settings for %s"
-msgstr "Contatti: impostazioni per %s"
+#: ../../mod/connedit.php:652
+msgid "Set Affinity"
+msgstr "Scegli l'affinità"
 
-#: ../../mod/connedit.php:654
-msgid "Apply these permissions automatically"
-msgstr "Applica automaticamente questi permessi"
+#: ../../mod/connedit.php:655
+msgid "Set Profile"
+msgstr "Scegli il profilo da mostrare"
 
 #: ../../mod/connedit.php:658
-msgid "Apply the permissions indicated on this page to all new connections."
-msgstr "Applica i permessi indicati su questa pagina a tutti i nuovi contatti."
+msgid "Set Affinity & Profile"
+msgstr "Affinità e profilo"
 
-#: ../../mod/connedit.php:662
-msgid "Slide to adjust your degree of friendship"
-msgstr "Trascina per restringere il grado di amicizia da mostrare"
-
-#: ../../mod/connedit.php:671
-msgid ""
-"Default permissions for your channel type have (just) been applied. They "
-"have not yet been submitted. Please review the permissions on this page and "
-"make any desired changes at this time. This new connection may <em>not</em> "
-"be able to communicate with you until you submit this page, which will "
-"install and apply the selected permissions."
-msgstr "I tuoi nuovi contatti potrebbero <em>non</em> essere abilitati a comunicare con te finché non salverai questa pagina (perché non hai permessi impostati). Sono stati selezionati i permessi standard per il tipo di canale che hai scelto. Non sono stati ancora salvati però. Puoi verificare le impostazioni e fare i cambiamenti che preferisci prima di salvare. "
-
-#: ../../mod/connedit.php:674
-msgid "inherited"
-msgstr "derivato"
+#: ../../mod/connedit.php:675
+msgid "Apply these permissions automatically"
+msgstr "Applica automaticamente questi permessi"
 
 #: ../../mod/connedit.php:677
-msgid "Connection has no individual permissions!"
-msgstr "Non hai assegnato permessi individuali a questo contatto!"
-
-#: ../../mod/connedit.php:678
-msgid ""
-"This may be appropriate based on your <a href=\"settings\">privacy "
-"settings</a>, though you may wish to review the \"Advanced Permissions\"."
-msgstr "Questo corrisponde alle tue <a href='settings'>impostazioni di privacy</a>, ma puoi anche dare un'occhiata ai 'Permessi avanzati' per opzioni più dettagliate."
+msgid "This connection's address is"
+msgstr "Indirizzo di questo contatto"
 
 #: ../../mod/connedit.php:680
-msgid "Profile Visibility"
-msgstr "Visibilità del profilo"
-
-#: ../../mod/connedit.php:681
-#, php-format
 msgid ""
-"Please choose the profile you would like to display to %s when viewing your "
-"profile securely."
-msgstr "Seleziona il profilo che vuoi mostrare a %s quando visita il tuo profilo in modo sicuro."
+"The permissions indicated on this page will be applied to all new "
+"connections."
+msgstr "I permessi indicati su questa pagina saranno applicati a tutti i nuovi contatti da ora in poi."
 
 #: ../../mod/connedit.php:682
-msgid "Contact Information / Notes"
-msgstr "Informazioni e annotazioni sul contatto"
+msgid "Slide to adjust your degree of friendship"
+msgstr "Trascina per restringere il grado di amicizia da mostrare"
 
-#: ../../mod/connedit.php:683
-msgid "Edit contact notes"
-msgstr "Modifica le informazioni sul contatto"
+#: ../../mod/connedit.php:684
+msgid "Slide to adjust your rating"
+msgstr "Trascina per cambiare la tua valutazione"
 
-#: ../../mod/connedit.php:685
-msgid "Their Settings"
-msgstr "Permessi concessi a te"
+#: ../../mod/connedit.php:685 ../../mod/connedit.php:690
+msgid "Optionally explain your rating"
+msgstr "Commento opzionale"
 
-#: ../../mod/connedit.php:686
-msgid "My Settings"
-msgstr "I permessi che concedo"
+#: ../../mod/connedit.php:687
+msgid "Custom Filter"
+msgstr "Filtro personalizzato"
 
 #: ../../mod/connedit.php:688
+msgid "Only import posts with this text"
+msgstr "Importa solo i post che contengono questo testo"
+
+#: ../../mod/connedit.php:688 ../../mod/connedit.php:689
 msgid ""
-"Default permissions for this channel type have (just) been applied. They "
-"have <em>not</em> been saved and there are currently no stored default "
-"permissions. Please review/edit the applied settings and click [Submit] to "
-"finalize."
-msgstr "A questo canale sono stati applicati i permessi predefiniti ma <em>non</em> sono stati salvati. In realtà non esistono ancora dei permessi predefiniti da usare su questo sito. Controlla e verifica le impostazioni, [Salva] per confermare."
+"words one per line or #tags or /patterns/, leave blank to import all posts"
+msgstr "una parola per riga, oppure #tag o /pattern/ oppure lascia vuoto per importare tutto"
 
 #: ../../mod/connedit.php:689
-msgid "Clear/Disable Automatic Permissions"
-msgstr "Rimuovi/disabilita i permessi automatici"
-
-#: ../../mod/connedit.php:690
-msgid "Forum Members"
-msgstr "Membro di un forum"
+msgid "Do not import posts with this text"
+msgstr "Non importare i post con questo testo"
 
 #: ../../mod/connedit.php:691
-msgid "Soapbox"
-msgstr "Comunicati e annunci"
-
-#: ../../mod/connedit.php:692
-msgid "Full Sharing (typical social network permissions)"
-msgstr "Condivisione completa (permessi tipici dei social network)"
-
-#: ../../mod/connedit.php:693
-msgid "Cautious Sharing "
-msgstr "Condivisione prudente"
-
-#: ../../mod/connedit.php:694
-msgid "Follow Only"
-msgstr "Follower"
-
-#: ../../mod/connedit.php:695
-msgid "Individual Permissions"
-msgstr "Permessi individuali"
+msgid "This information is public!"
+msgstr "Questa informazione è pubblica!"
 
 #: ../../mod/connedit.php:696
-msgid ""
-"Some permissions may be inherited from your channel <a "
-"href=\"settings\">privacy settings</a>, which have higher priority than "
-"individual settings. Changing those inherited settings on this page will "
-"have no effect."
-msgstr "I permessi nelle <a href=\"settings\">impostazioni di privacy</a> hanno priorità su quelli mostrati in questa pagina. Non avrà alcun effetto cambiarli qui, se sono indicati come derivati."
+msgid "Connection Pending Approval"
+msgstr "Contatti in attesa di approvazione"
 
 #: ../../mod/connedit.php:697
-msgid "Advanced Permissions"
-msgstr "Permessi avanzati"
+msgid "Connection Request"
+msgstr "Richiesta di entrare in contatto"
 
 #: ../../mod/connedit.php:698
-msgid "Simple Permissions (select one and submit)"
-msgstr "Permessi semplificati (seleziona e salva)"
-
-#: ../../mod/connedit.php:702
 #, php-format
-msgid "Visit %s's profile - %s"
-msgstr "Guarda il profilo di %s - %s"
+msgid ""
+"(%s) would like to connect with you. Please approve this connection to allow"
+" communication."
+msgstr "(%s) vorrebbe entrare in contatto con te. Per permettere la comunicazione è necessario che tu approvi."
 
-#: ../../mod/connedit.php:703
-msgid "Block/Unblock contact"
-msgstr "Blocca/sblocca contatto"
+#: ../../mod/connedit.php:700
+msgid "Approve Later"
+msgstr "Approva più tardi"
 
-#: ../../mod/connedit.php:704
-msgid "Ignore contact"
-msgstr "Ignora il contatto"
+#: ../../mod/connedit.php:703
+msgid "inherited"
+msgstr "derivato"
 
 #: ../../mod/connedit.php:705
-msgid "Repair URL settings"
-msgstr "Ripara le impostazioni URL"
+#, php-format
+msgid ""
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
+msgstr "Seleziona il profilo che vuoi mostrare a %s quando visita il tuo profilo in modo sicuro."
 
-#: ../../mod/connedit.php:706
-msgid "View conversations"
-msgstr "Leggi le conversazioni"
+#: ../../mod/connedit.php:707
+msgid "Their Settings"
+msgstr "Permessi concessi a te"
 
 #: ../../mod/connedit.php:708
-msgid "Delete contact"
-msgstr "Elimina contatto"
-
-#: ../../mod/connedit.php:712
-msgid "Last update:"
-msgstr "Ultimo aggiornamento:"
-
-#: ../../mod/connedit.php:714
-msgid "Update public posts"
-msgstr "Aggiorna gli articoli pubblici"
-
-#: ../../mod/connedit.php:716
-msgid "Update now"
-msgstr "Aggiorna adesso"
+msgid "My Settings"
+msgstr "I permessi che concedo"
 
-#: ../../mod/connedit.php:722
-msgid "Currently blocked"
-msgstr "Attualmente bloccato"
+#: ../../mod/connedit.php:710
+msgid "Individual Permissions"
+msgstr "Permessi individuali"
 
-#: ../../mod/connedit.php:723
-msgid "Currently ignored"
-msgstr "Attualmente ignorato"
+#: ../../mod/connedit.php:711
+msgid ""
+"Some permissions may be inherited from your channel's <a "
+"href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
+"priority than individual settings. You can <strong>not</strong> change those"
+" settings here."
+msgstr "Alcuni permessi derivano dalle <a href=\"settings\"><strong>impostazioni di privacy</strong></a> del tuo canale, che hanno priorità assoluta su qualsiasi altra impostazione scelta per i singoli contatti. Da questa pagina <strong>non</strong> puoi cambiarle."
 
-#: ../../mod/connedit.php:724
-msgid "Currently archived"
-msgstr "Attualmente archiviato"
+#: ../../mod/connedit.php:712
+msgid ""
+"Some permissions may be inherited from your channel's <a "
+"href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
+"priority than individual settings. You can change those settings here but "
+"they wont have any impact unless the inherited setting changes."
+msgstr "Alcuni permessi derivano dalle <a href=\"settings\"><strong>impostazioni di privacy</strong></a> del tuo canale, che hanno priorità assoluta su qualsiasi altra impostazione scelta per i singoli contatti. Le personalizzazioni che effettuerai qui potrebbero non essere effettive a meno che tu non cambi proprio le impostazioni generali."
 
-#: ../../mod/connedit.php:725
-msgid "Currently pending"
-msgstr "Attualmente da approvare"
+#: ../../mod/connedit.php:713
+msgid "Last update:"
+msgstr "Ultimo aggiornamento:"
 
 #: ../../mod/rmagic.php:40
 msgid ""
@@ -8329,7 +8556,7 @@ msgstr "Autenticazione fallita."
 
 #: ../../mod/rmagic.php:84
 msgid "Remote Authentication"
-msgstr "Autenticazione a distanza"
+msgstr "Accedi dal tuo hub"
 
 #: ../../mod/rmagic.php:85
 msgid "Enter your channel address (e.g. channel@example.com)"
@@ -8337,7 +8564,7 @@ msgstr "Inserisci l'indirizzo del tuo canale (ad esempio lucia@esempio.com)"
 
 #: ../../mod/rmagic.php:86
 msgid "Authenticate"
-msgstr "Autenticazione"
+msgstr "Accedi"
 
 #: ../../mod/mail.php:33
 msgid "Unable to lookup recipient."
@@ -8421,11 +8648,11 @@ msgstr "Rifiuta"
 msgid "Please login."
 msgstr "Effettua l'accesso."
 
-#: ../../mod/post.php:235
+#: ../../mod/post.php:236
 msgid ""
 "Remote authentication blocked. You are logged into this site locally. Please"
 " logout and retry."
-msgstr "L'autenticazione magica dal tuo sito non è disponibile. Hai accesso solamente a questo sito. Puoi provare a disconnetterti per tentare di nuovo."
+msgstr "L'autenticazione magica dal tuo hub non è disponibile. Puoi provare a disconnetterti per tentare di nuovo."
 
 #: ../../mod/new_channel.php:109
 msgid "Add a Channel"
@@ -8461,7 +8688,7 @@ msgstr "Oppure <a href=\"import\">importa un tuo canale esistente</a> da un altr
 msgid ""
 "Please choose a channel type (such as social networking or community forum) "
 "and privacy requirements so we can select the best permissions for you"
-msgstr "Descrivi il tipo di canale che vorresti creare (per esempio se ti interessa più usarlo come social network, come un forum di discussione...) e il tipo di privacy che preferisci. Hubzilla sceglierà per te i permessi più adatti."
+msgstr "Descrivi il tipo di canale che vorresti creare (per esempio se ti interessa più usarlo come social network, come un forum di discussione...) e il tipo di privacy che preferisci. RedMatrix sceglierà per te i permessi più adatti."
 
 #: ../../mod/new_channel.php:119
 msgid "Channel Type"
@@ -8531,37 +8758,26 @@ msgstr "ha aggiunto il tuo canale"
 msgid "posted an event"
 msgstr "ha creato un evento"
 
-#: ../../mod/network.php:91
-msgid "No such group"
-msgstr "Impossibile trovare l'insieme"
-
-#: ../../mod/network.php:129
-msgid "No such channel"
-msgstr "Canale sconosciuto"
-
-#: ../../mod/network.php:143
-msgid "Search Results For:"
-msgstr "Cerca risultati con:"
-
-#: ../../mod/network.php:198
-msgid "Collection is empty"
-msgstr "L'insieme di canali è vuoto"
+#: ../../mod/layouts.php:176
+msgid "Comanche page description language help"
+msgstr "Guida di Comanche Page Description Language"
 
-#: ../../mod/network.php:207
-msgid "Collection: "
-msgstr "Insieme:"
+#: ../../mod/layouts.php:180
+msgid "Layout Description"
+msgstr "Descrizione del layout"
 
-#: ../../mod/network.php:226
-msgid "Connection: "
-msgstr "Contatto:"
+#: ../../mod/layouts.php:185
+msgid "Download PDL file"
+msgstr "Scarica il file PDL"
 
-#: ../../mod/network.php:233
-msgid "Invalid connection."
-msgstr "Contatto non valido."
+#: ../../mod/home.php:75
+#, php-format
+msgid "Welcome to %s"
+msgstr "%s ti dà il benvenuto"
 
-#: ../../mod/page.php:119
-msgid "Ipsum Lorem"
-msgstr "Ipsum Lorem"
+#: ../../mod/page.php:126
+msgid "Lorem Ipsum"
+msgstr "Lorem Ipsum"
 
 #: ../../mod/bookmarks.php:38
 msgid "Bookmark added"
@@ -8579,6 +8795,21 @@ msgstr "I segnalibri dei miei contatti"
 msgid "Insufficient permissions.  Request redirected to profile page."
 msgstr "Permessi insufficienti. Sarà visualizzata la pagina del profilo."
 
+#: ../../mod/pconfig.php:27 ../../mod/pconfig.php:60
+msgid "This setting requires special processing and editing has been blocked."
+msgstr "Questa impostazione è bloccata, richiede criteri di modifica speciali"
+
+#: ../../mod/pconfig.php:49
+msgid "Configuration Editor"
+msgstr "Editor di configurazione"
+
+#: ../../mod/pconfig.php:50
+msgid ""
+"Warning: Changing some settings could render your channel inoperable. Please"
+" leave this page unless you are comfortable with and knowledgeable about how"
+" to correctly use this feature."
+msgstr "Attenzione: alcune delle impostazioni, se cambiate, potrebbero rendere questo canale non funzionante. Lascia questa pagina a meno che tu non sappia con assoluta certezza quali modifiche effettuare."
+
 #: ../../mod/suggest.php:35
 msgid ""
 "No suggestions available. If this is a new site, please try again in 24 "
@@ -8620,14 +8851,14 @@ msgstr "Schema predefinito"
 
 #: ../../view/theme/apw/php/config.php:203
 msgid "Sans-Serif"
-msgstr "Sans-serif"
+msgstr "Sans-Serif"
 
 #: ../../view/theme/apw/php/config.php:204
 msgid "Monospace"
 msgstr "Monospace"
 
 #: ../../view/theme/apw/php/config.php:259
-#: ../../view/theme/redbasic/php/config.php:100
+#: ../../view/theme/redbasic/php/config.php:102
 msgid "Theme settings"
 msgstr "Impostazioni del tema"
 
@@ -8636,9 +8867,9 @@ msgid "Set scheme"
 msgstr "Schema"
 
 #: ../../view/theme/apw/php/config.php:261
-#: ../../view/theme/redbasic/php/config.php:122
+#: ../../view/theme/redbasic/php/config.php:124
 msgid "Set font-size for posts and comments"
-msgstr "Dimensioni del carattere per articoli e commenti"
+msgstr "Dimensioni del carattere per post e commenti"
 
 #: ../../view/theme/apw/php/config.php:262
 msgid "Set font face"
@@ -8646,7 +8877,7 @@ msgstr "Tipo di carattere"
 
 #: ../../view/theme/apw/php/config.php:263
 msgid "Set iconset"
-msgstr "Icone"
+msgstr "Set di icone"
 
 #: ../../view/theme/apw/php/config.php:264
 msgid "Set big shadow size, default 15px 15px 15px"
@@ -8666,7 +8897,7 @@ msgstr "Raggio degli angoli, predefinito 5px"
 
 #: ../../view/theme/apw/php/config.php:268
 msgid "Set line-height for posts and comments"
-msgstr "Altezza della riga per articoli e commenti"
+msgstr "Altezza della riga per post e commenti"
 
 #: ../../view/theme/apw/php/config.php:269
 msgid "Set background image"
@@ -8674,7 +8905,7 @@ msgstr "Immagine di sfondo"
 
 #: ../../view/theme/apw/php/config.php:270
 msgid "Set background attachment"
-msgstr "Allega uno sfondo"
+msgstr "Imposta un allegato di sfondo"
 
 #: ../../view/theme/apw/php/config.php:271
 msgid "Set background color"
@@ -8682,11 +8913,11 @@ msgstr "Colore di sfondo"
 
 #: ../../view/theme/apw/php/config.php:272
 msgid "Set section background image"
-msgstr "Immagine di sfondo della sezione"
+msgstr "Immagine di sfondo dei contenuti"
 
 #: ../../view/theme/apw/php/config.php:273
 msgid "Set section background color"
-msgstr "Colore di sfondo dell'area principale"
+msgstr "Colore di sfondo dei contenuti"
 
 #: ../../view/theme/apw/php/config.php:274
 msgid "Set color of items - use hex"
@@ -8698,15 +8929,15 @@ msgstr "Colore dei link - esadecimale"
 
 #: ../../view/theme/apw/php/config.php:276
 msgid "Set max-width for items.  Default 400px"
-msgstr "Larghezza massima degli elementi della pagina. Predefinita: 400px"
+msgstr "Larghezza massima degli elementi della pagina. Predefinita 400px"
 
 #: ../../view/theme/apw/php/config.php:277
 msgid "Set min-width for items.  Default 240px"
-msgstr "Larghezza minima degli elementi della pagina. Predefinita: 240px"
+msgstr "Larghezza minima degli elementi della pagina. Predefinita 240px"
 
 #: ../../view/theme/apw/php/config.php:278
 msgid "Set the generic content wrapper width.  Default 48%"
-msgstr "Larghezza di tutta l'area dei contenuti. Predefinita: 48%"
+msgstr "Larghezza dell'area dei contenuti. Predefinita: 48%"
 
 #: ../../view/theme/apw/php/config.php:279
 msgid "Set color of fonts - use hex"
@@ -8714,7 +8945,7 @@ msgstr "Colore dei caratteri - esadecimale"
 
 #: ../../view/theme/apw/php/config.php:280
 msgid "Set background-size element"
-msgstr "Background-size element"
+msgstr "Background-size"
 
 #: ../../view/theme/apw/php/config.php:281
 msgid "Item opacity"
@@ -8722,7 +8953,7 @@ msgstr "Opacità degli elementi della pagina"
 
 #: ../../view/theme/apw/php/config.php:282
 msgid "Display post previews only"
-msgstr "Mostra le anteprime solo degli articoli"
+msgstr "Mostra l'anteprima solo dei post"
 
 #: ../../view/theme/apw/php/config.php:283
 msgid "Display side bar on channel page"
@@ -8738,197 +8969,197 @@ msgstr "Float degli oggetti della pagina"
 
 #: ../../view/theme/apw/php/config.php:286
 msgid "Left offset of the section element"
-msgstr "Margine sinistro dell'area principale"
+msgstr "Margine sinistro dei contenuti"
 
 #: ../../view/theme/apw/php/config.php:287
 msgid "Right offset of the section element"
-msgstr "Margine destro dell'area principale"
+msgstr "Margine destro dei contenuti"
 
 #: ../../view/theme/apw/php/config.php:288
 msgid "Section width"
-msgstr "Larghezza dell'area principale"
+msgstr "Larghezza dei contenuti"
 
 #: ../../view/theme/apw/php/config.php:289
 msgid "Left offset of the aside"
-msgstr "Margine sinistro della colonna laterale"
+msgstr "Margine sinistro nella colonna laterale"
 
 #: ../../view/theme/apw/php/config.php:290
 msgid "Right offset of the aside element"
-msgstr "Margine destro della colonna laterale"
+msgstr "Margine destro nella colonna laterale"
 
 #: ../../view/theme/redbasic/php/config.php:82
-msgid "Light (Hubzilla default)"
+msgid "Light (Red Matrix default)"
 msgstr "Light (predefinito)"
 
-#: ../../view/theme/redbasic/php/config.php:101
+#: ../../view/theme/redbasic/php/config.php:103
 msgid "Select scheme"
 msgstr "Scegli uno schema"
 
-#: ../../view/theme/redbasic/php/config.php:102
+#: ../../view/theme/redbasic/php/config.php:104
 msgid "Narrow navbar"
 msgstr "Barra di navigazione ristretta"
 
-#: ../../view/theme/redbasic/php/config.php:103
+#: ../../view/theme/redbasic/php/config.php:105
 msgid "Navigation bar background color"
 msgstr "Barra di navigazione: Colore di sfondo"
 
-#: ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:106
 msgid "Navigation bar gradient top color"
 msgstr "Barra di navigazione: Gradiente superiore"
 
-#: ../../view/theme/redbasic/php/config.php:105
+#: ../../view/theme/redbasic/php/config.php:107
 msgid "Navigation bar gradient bottom color"
 msgstr "Barra di navigazione: Gradiente inferiore"
 
-#: ../../view/theme/redbasic/php/config.php:106
+#: ../../view/theme/redbasic/php/config.php:108
 msgid "Navigation active button gradient top color"
 msgstr "Bottone di navigazione attivo: Gradiente superiore"
 
-#: ../../view/theme/redbasic/php/config.php:107
+#: ../../view/theme/redbasic/php/config.php:109
 msgid "Navigation active button gradient bottom color"
 msgstr "Bottone di navigazione attivo: Gradiente inferiore"
 
-#: ../../view/theme/redbasic/php/config.php:108
+#: ../../view/theme/redbasic/php/config.php:110
 msgid "Navigation bar border color "
 msgstr "Barra di navigazione: Colore del bordo"
 
-#: ../../view/theme/redbasic/php/config.php:109
+#: ../../view/theme/redbasic/php/config.php:111
 msgid "Navigation bar icon color "
 msgstr "Barra di navigazione: Colore delle icone"
 
-#: ../../view/theme/redbasic/php/config.php:110
+#: ../../view/theme/redbasic/php/config.php:112
 msgid "Navigation bar active icon color "
 msgstr "Barra di navigazione: Colore dell'icona attiva"
 
-#: ../../view/theme/redbasic/php/config.php:111
+#: ../../view/theme/redbasic/php/config.php:113
 msgid "link color"
 msgstr "colore del link"
 
-#: ../../view/theme/redbasic/php/config.php:112
+#: ../../view/theme/redbasic/php/config.php:114
 msgid "Set font-color for banner"
 msgstr "Colore del font del banner"
 
-#: ../../view/theme/redbasic/php/config.php:113
+#: ../../view/theme/redbasic/php/config.php:115
 msgid "Set the background color"
 msgstr "Imposta il colore di sfondo"
 
-#: ../../view/theme/redbasic/php/config.php:114
+#: ../../view/theme/redbasic/php/config.php:116
 msgid "Set the background image"
 msgstr "Immagine di sfondo"
 
-#: ../../view/theme/redbasic/php/config.php:115
+#: ../../view/theme/redbasic/php/config.php:117
 msgid "Set the background color of items"
 msgstr "Imposta il colore di sfondo degli oggetti"
 
-#: ../../view/theme/redbasic/php/config.php:116
+#: ../../view/theme/redbasic/php/config.php:118
 msgid "Set the background color of comments"
 msgstr "Imposta il colore di sfondo dei commenti"
 
-#: ../../view/theme/redbasic/php/config.php:117
+#: ../../view/theme/redbasic/php/config.php:119
 msgid "Set the border color of comments"
 msgstr "Imposta il colore del bordo dei commenti"
 
-#: ../../view/theme/redbasic/php/config.php:118
+#: ../../view/theme/redbasic/php/config.php:120
 msgid "Set the indent for comments"
 msgstr "Imposta il lo spostamento a destra dei commenti"
 
-#: ../../view/theme/redbasic/php/config.php:119
+#: ../../view/theme/redbasic/php/config.php:121
 msgid "Set the basic color for item icons"
 msgstr "Colore di base per le icone"
 
-#: ../../view/theme/redbasic/php/config.php:120
+#: ../../view/theme/redbasic/php/config.php:122
 msgid "Set the hover color for item icons"
 msgstr "Colore per le icone in mouse-over"
 
-#: ../../view/theme/redbasic/php/config.php:121
+#: ../../view/theme/redbasic/php/config.php:123
 msgid "Set font-size for the entire application"
 msgstr "Dimensione font per tutto il sito"
 
-#: ../../view/theme/redbasic/php/config.php:121
+#: ../../view/theme/redbasic/php/config.php:123
 msgid "Example: 14px"
 msgstr "Esempio: 14px"
 
-#: ../../view/theme/redbasic/php/config.php:123
+#: ../../view/theme/redbasic/php/config.php:125
 msgid "Set font-color for posts and comments"
-msgstr "Imposta il colore del carattere per articoli e commenti"
+msgstr "Imposta il colore del carattere per post e commenti"
 
-#: ../../view/theme/redbasic/php/config.php:124
+#: ../../view/theme/redbasic/php/config.php:126
 msgid "Set radius of corners"
 msgstr "Raggio degli angoli stondati"
 
-#: ../../view/theme/redbasic/php/config.php:125
+#: ../../view/theme/redbasic/php/config.php:127
 msgid "Set shadow depth of photos"
 msgstr "Profondità dell'ombra delle foto"
 
-#: ../../view/theme/redbasic/php/config.php:126
+#: ../../view/theme/redbasic/php/config.php:128
 msgid "Set maximum width of content region in pixel"
 msgstr "Larghezza massima dell'area dei contenuti in pixel"
 
-#: ../../view/theme/redbasic/php/config.php:126
+#: ../../view/theme/redbasic/php/config.php:128
 msgid "Leave empty for default width"
 msgstr "Lascia vuoto per usare il valore predefinito"
 
-#: ../../view/theme/redbasic/php/config.php:127
+#: ../../view/theme/redbasic/php/config.php:129
 msgid "Center page content"
 msgstr "Centra il contenuto della pagina"
 
-#: ../../view/theme/redbasic/php/config.php:128
+#: ../../view/theme/redbasic/php/config.php:130
 msgid "Set minimum opacity of nav bar - to hide it"
 msgstr "Imposta l'opacità minima della barra di navigazione per nasconderla"
 
-#: ../../view/theme/redbasic/php/config.php:129
+#: ../../view/theme/redbasic/php/config.php:131
 msgid "Set size of conversation author photo"
 msgstr "Dimensione foto dell'autore della conversazione"
 
-#: ../../view/theme/redbasic/php/config.php:130
+#: ../../view/theme/redbasic/php/config.php:132
 msgid "Set size of followup author photos"
 msgstr "Dimensione foto dei partecipanti alla conversazione"
 
-#: ../../boot.php:1345
+#: ../../boot.php:1355
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "%s: aggiornamento fallito. Controlla i log di errore."
 
-#: ../../boot.php:1348
+#: ../../boot.php:1358
 #, php-format
 msgid "Update Error at %s"
 msgstr "Errore di aggiornamento su %s"
 
-#: ../../boot.php:1515
+#: ../../boot.php:1525
 msgid ""
-"Create an account to access services and applications within the Hubzilla"
-msgstr "Registrati per accedere ai servizi e alle applicazioni di Hubzilla"
+"Create an account to access services and applications within the Red Matrix"
+msgstr "Registrati per accedere ai servizi e alle applicazioni di RedMatrix"
 
-#: ../../boot.php:1543
+#: ../../boot.php:1553
 msgid "Password"
 msgstr "Password"
 
-#: ../../boot.php:1544
+#: ../../boot.php:1554
 msgid "Remember me"
 msgstr "Resta connesso"
 
-#: ../../boot.php:1547
+#: ../../boot.php:1557
 msgid "Forgot your password?"
 msgstr "Hai dimenticato la password?"
 
-#: ../../boot.php:2166
+#: ../../boot.php:2177
 msgid "toggle mobile"
 msgstr "attiva/disattiva versione mobile"
 
-#: ../../boot.php:2301
+#: ../../boot.php:2312
 msgid "Website SSL certificate is not valid. Please correct."
 msgstr "Il certificato SSL del sito non è valido. Si prega di intervenire."
 
-#: ../../boot.php:2304
+#: ../../boot.php:2315
 #, php-format
 msgid "[red] Website SSL error for %s"
 msgstr "[red] Errore SSL %s "
 
-#: ../../boot.php:2341
+#: ../../boot.php:2352
 msgid "Cron/Scheduled tasks not running."
 msgstr "Processi/cron non avviati."
 
-#: ../../boot.php:2345
+#: ../../boot.php:2356
 #, php-format
 msgid "[red] Cron tasks not running on %s"
-msgstr "[red] Processi non avviati su %s"
+msgstr "[red] Processi cron non avviati su %s"
diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js
index e077dc88d..0af27c61b 100644
--- a/view/js/autocomplete.js
+++ b/view/js/autocomplete.js
@@ -88,6 +88,14 @@ function basic_replace(item) {
 	return '$1'+item.name+' ';
 }
 
+function trim_replace(item) {
+	if(typeof item.replace !== 'undefined')
+		return '$1'+item.replace;
+
+	return '$1'+item.name;
+}
+
+
 function submit_form(e) {
 	$(e).parents('form').submit();
 }
@@ -162,4 +170,30 @@ function submit_form(e) {
 		if(typeof onselect !== 'undefined')
 			a.on('textComplete:select', function(e, value, strategy) { onselect(value); });
 	};
+})( jQuery );
+
+
+(function( $ ) {
+	$.fn.name_autocomplete = function(backend_url, typ, autosubmit, onselect) {
+		if(typeof typ === 'undefined') typ = '';
+		if(typeof autosubmit === 'undefined') autosubmit = false;
+
+		// Autocomplete contacts
+		names = {
+			match: /(^)([^\n]+)$/,
+			index: 2,
+			search: function(term, callback) { contact_search(term, callback, backend_url, typ,[], spinelement=false); },
+			replace: trim_replace,
+			template: contact_format,
+		};
+
+		this.attr('autocomplete','off');
+		var a = this.textcomplete([names], {className:'acpopup', zIndex:1020});
+
+		if(autosubmit)
+			a.on('textComplete:select', function(e,value,strategy) { submit_form(this); });
+
+		if(typeof onselect !== 'undefined')
+			a.on('textComplete:select', function(e, value, strategy) { onselect(value); });
+	};
 })( jQuery );
\ No newline at end of file
diff --git a/view/js/main.js b/view/js/main.js
index d3c7175d0..acdc2e5f5 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -112,12 +112,12 @@ function insertbbcomment(comment, BBcode, id) {
 	return true;
 }
 
-function inserteditortag(BBcode) {
+function inserteditortag(BBcode, id) {
 	// allow themes to override this
 	if(typeof(insertEditorFormatting) != 'undefined')
 		return(insertEditorFormatting(BBcode));
 
-	textarea = document.getElementById('profile-jot-text');
+	textarea = document.getElementById(id);
 	if (document.selection) {
 		textarea.focus();
 		selected = document.selection.createRange();
@@ -616,11 +616,12 @@ function updateConvItems(mode,data) {
 
 function collapseHeight() {
 	$(".wall-item-content, .directory-collapse").each(function() {
-		var orgHeight = $(this).height();
+		var orgHeight = $(this).outerHeight(true);
 		if(orgHeight > divmore_height + 10) {
 			if(! $(this).hasClass('divmore')) {
 				$(this).readmore({
 					speed: 0,
+					heightMargin: 50,
 					collapsedHeight: divmore_height, 
 					moreLink: '<a href="#" class="divgrow-showmore">' + aStr.divgrowmore + '</a>',
 					lessLink: '<a href="#" class="divgrow-showmore">' + aStr.divgrowless + '</a>',
@@ -745,12 +746,12 @@ function justifyPhotos() {
 		margins: 3,
 		border: 0,
 		sizeRangeSuffixes: {
-			'lt100': '-2',
-			'lt240': '-2',
-			'lt320': '-2',
-			'lt500': '',
-			'lt640': '-1',
-			'lt1024': '-0'
+			'lt100': '-3',
+			'lt240': '-3',
+			'lt320': '-3',
+			'lt500': '-2',
+			'lt640': '-2',
+			'lt1024': '-1'
 		}
 	}).on('jg.complete', function(e){ justifiedGalleryActive = false; });
 }
diff --git a/view/js/mod_mail.js b/view/js/mod_mail.js
index 704d0a460..36b22138f 100644
--- a/view/js/mod_mail.js
+++ b/view/js/mod_mail.js
@@ -1,5 +1,5 @@
 $(document).ready(function() { 
-	$("#recip").contact_autocomplete(baseurl + '/acl', '', false, function(data) {
+	$("#recip").name_autocomplete(baseurl + '/acl', '', false, function(data) {
 		$("#recip-complete").val(data.xid);
 	});
 }); 
diff --git a/view/js/mod_photos.js b/view/js/mod_photos.js
index b254370c1..d371c3f2f 100644
--- a/view/js/mod_photos.js
+++ b/view/js/mod_photos.js
@@ -6,10 +6,9 @@
 var ispublic = aStr.everybody;
 
 $(document).ready(function() {
-	$(document).ready(function() {
-		$("#photo-edit-newtag").contact_autocomplete(baseurl + '/acl', 'p', false, function(data) {
-			$("#photo-edit-newtag").val('@' + data.name);
-		});
+
+	$("#photo-edit-newtag").contact_autocomplete(baseurl + '/acl', 'p', false, function(data) {
+		$("#photo-edit-newtag").val('@' + data.name);
 	});
 
 	$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
@@ -24,4 +23,14 @@ $(document).ready(function() {
 			$('#jot-public').show();
 		}
 	}).trigger('change');
-});
\ No newline at end of file
+
+	showHideBodyTextarea();
+
+});
+
+function showHideBodyTextarea() {
+	if( $('#id_visible').is(':checked'))
+		$('#body-textarea').slideDown();
+	else
+		$('#body-textarea').slideUp();
+}
diff --git a/view/js/mod_poke.js b/view/js/mod_poke.js
index 58e50588f..221cbbb31 100644
--- a/view/js/mod_poke.js
+++ b/view/js/mod_poke.js
@@ -1,5 +1,5 @@
 $(document).ready(function() { 
-	$("#poke-recip").contact_autocomplete(baseurl + '/acl', 'a', false, function(data) {
+	$("#poke-recip").name_autocomplete(baseurl + '/acl', 'a', false, function(data) {
 		$("#poke-recip-complete").val(data.id);
 	});
 }); 
diff --git a/view/nl/hmessages.po b/view/nl/hmessages.po
index 242954b27..be8c3c262 100644
--- a/view/nl/hmessages.po
+++ b/view/nl/hmessages.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Redmatrix\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-26 22:48-0700\n"
-"PO-Revision-Date: 2015-09-29 20:19+0000\n"
+"POT-Creation-Date: 2015-10-23 00:03-0700\n"
+"PO-Revision-Date: 2015-10-26 15:20+0000\n"
 "Last-Translator: jeroenpraat <jeroenpraat@xs4all.nl>\n"
 "Language-Team: Dutch (http://www.transifex.com/Friendica/red-matrix/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,32 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ../../include/bb2diaspora.php:388
+msgid "Attachments:"
+msgstr "Bijlagen:"
+
+#: ../../include/bb2diaspora.php:474 ../../include/event.php:22
+msgid "l F d, Y \\@ g:i A"
+msgstr "l d F Y \\@ G:i"
+
+#: ../../include/bb2diaspora.php:476
+msgid "$Projectname event notification:"
+msgstr "Notificatie $Projectname-gebeurtenis:"
+
+#: ../../include/bb2diaspora.php:480 ../../include/event.php:30
+msgid "Starts:"
+msgstr "Start:"
+
+#: ../../include/bb2diaspora.php:488 ../../include/event.php:40
+msgid "Finishes:"
+msgstr "Einde:"
+
+#: ../../include/bb2diaspora.php:496 ../../include/event.php:50
+#: ../../include/identity.php:1016 ../../mod/directory.php:302
+#: ../../mod/events.php:701
+msgid "Location:"
+msgstr "Plaats:"
+
 #: ../../include/Import/import_diaspora.php:17
 msgid "No username found in import file."
 msgstr "Geen gebruikersnaam in het importbestand gevonden."
@@ -26,16 +52,16 @@ msgstr "Geen gebruikersnaam in het importbestand gevonden."
 msgid "Unable to create a unique channel address. Import failed."
 msgstr "Niet in staat om een uniek kanaaladres aan te maken. Importeren is mislukt."
 
-#: ../../include/Import/import_diaspora.php:143 ../../mod/import.php:480
+#: ../../include/Import/import_diaspora.php:143 ../../mod/import.php:486
 msgid "Import completed."
 msgstr "Import voltooid."
 
 #: ../../include/RedDAV/RedBrowser.php:107
-#: ../../include/RedDAV/RedBrowser.php:265
+#: ../../include/RedDAV/RedBrowser.php:239
 msgid "parent"
 msgstr "omhoog"
 
-#: ../../include/RedDAV/RedBrowser.php:131 ../../include/text.php:2497
+#: ../../include/RedDAV/RedBrowser.php:131 ../../include/text.php:2509
 msgid "Collection"
 msgstr "map"
 
@@ -59,72 +85,62 @@ msgstr "Planning-postvak IN"
 msgid "Schedule Outbox"
 msgstr "Planning-postvak UIT"
 
-#: ../../include/RedDAV/RedBrowser.php:164 ../../include/conversation.php:1021
-#: ../../include/apps.php:355 ../../include/apps.php:410
-#: ../../mod/photos.php:720 ../../mod/photos.php:1159
+#: ../../include/RedDAV/RedBrowser.php:164 ../../include/apps.php:360
+#: ../../include/apps.php:415 ../../include/conversation.php:1023
+#: ../../mod/photos.php:756 ../../mod/photos.php:1195
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: ../../include/RedDAV/RedBrowser.php:227
-#, php-format
-msgid "%1$s used"
-msgstr "%1$s gebruikt"
-
-#: ../../include/RedDAV/RedBrowser.php:232
-#, php-format
-msgid "%1$s used of %2$s (%3$s&#37;)"
-msgstr "%1$s van %2$s gebruikt (%3$s&#37;)"
-
-#: ../../include/RedDAV/RedBrowser.php:251 ../../include/conversation.php:1611
-#: ../../include/apps.php:135 ../../include/nav.php:93
+#: ../../include/RedDAV/RedBrowser.php:226 ../../include/apps.php:135
+#: ../../include/conversation.php:1613 ../../include/nav.php:93
 #: ../../mod/fbrowser.php:114
 msgid "Files"
 msgstr "Bestanden"
 
-#: ../../include/RedDAV/RedBrowser.php:253
+#: ../../include/RedDAV/RedBrowser.php:227
 msgid "Total"
 msgstr "Totaal"
 
-#: ../../include/RedDAV/RedBrowser.php:255
+#: ../../include/RedDAV/RedBrowser.php:229
 msgid "Shared"
 msgstr "Gedeeld"
 
-#: ../../include/RedDAV/RedBrowser.php:256
+#: ../../include/RedDAV/RedBrowser.php:230
 #: ../../include/RedDAV/RedBrowser.php:303 ../../mod/layouts.php:175
 #: ../../mod/menu.php:114 ../../mod/new_channel.php:121
 #: ../../mod/webpages.php:180 ../../mod/blocks.php:152
 msgid "Create"
 msgstr "Aanmaken"
 
-#: ../../include/RedDAV/RedBrowser.php:257
-#: ../../include/RedDAV/RedBrowser.php:305 ../../mod/photos.php:745
-#: ../../mod/photos.php:1278 ../../mod/profile_photo.php:450
+#: ../../include/RedDAV/RedBrowser.php:231
+#: ../../include/RedDAV/RedBrowser.php:305 ../../mod/photos.php:781
+#: ../../mod/photos.php:1314 ../../mod/profile_photo.php:450
 msgid "Upload"
 msgstr "Uploaden"
 
-#: ../../include/RedDAV/RedBrowser.php:261 ../../mod/admin.php:948
+#: ../../include/RedDAV/RedBrowser.php:235 ../../mod/admin.php:948
 #: ../../mod/settings.php:585 ../../mod/settings.php:611
 #: ../../mod/sharedwithme.php:95
 msgid "Name"
 msgstr "Naam"
 
-#: ../../include/RedDAV/RedBrowser.php:262
+#: ../../include/RedDAV/RedBrowser.php:236
 msgid "Type"
 msgstr "Type"
 
-#: ../../include/RedDAV/RedBrowser.php:263 ../../mod/sharedwithme.php:97
+#: ../../include/RedDAV/RedBrowser.php:237 ../../mod/sharedwithme.php:97
 msgid "Size"
 msgstr "Grootte"
 
-#: ../../include/RedDAV/RedBrowser.php:264 ../../mod/sharedwithme.php:98
+#: ../../include/RedDAV/RedBrowser.php:238 ../../mod/sharedwithme.php:98
 msgid "Last Modified"
 msgstr "Laatst gewijzigd"
 
-#: ../../include/RedDAV/RedBrowser.php:266 ../../include/menu.php:108
+#: ../../include/RedDAV/RedBrowser.php:240 ../../include/menu.php:108
 #: ../../include/page_widgets.php:8 ../../include/page_widgets.php:36
-#: ../../include/apps.php:254 ../../include/ItemObject.php:100
-#: ../../mod/layouts.php:183 ../../mod/editpost.php:113
-#: ../../mod/editblock.php:135 ../../mod/menu.php:108
+#: ../../include/apps.php:259 ../../include/ItemObject.php:100
+#: ../../mod/layouts.php:183 ../../mod/editblock.php:135
+#: ../../mod/editpost.php:113 ../../mod/menu.php:108
 #: ../../mod/webpages.php:181 ../../mod/blocks.php:153 ../../mod/thing.php:257
 #: ../../mod/settings.php:645 ../../mod/connections.php:235
 #: ../../mod/connections.php:248 ../../mod/connections.php:267
@@ -132,16 +148,30 @@ msgstr "Laatst gewijzigd"
 msgid "Edit"
 msgstr "Bewerken"
 
-#: ../../include/RedDAV/RedBrowser.php:267 ../../include/conversation.php:662
-#: ../../include/apps.php:255 ../../include/ItemObject.php:120
-#: ../../mod/connedit.php:547 ../../mod/editblock.php:181
-#: ../../mod/admin.php:783 ../../mod/admin.php:942 ../../mod/photos.php:1090
+#: ../../include/RedDAV/RedBrowser.php:241 ../../include/apps.php:260
+#: ../../include/ItemObject.php:120 ../../include/conversation.php:657
+#: ../../mod/connedit.php:546 ../../mod/photos.php:1126
+#: ../../mod/editblock.php:181 ../../mod/admin.php:783 ../../mod/admin.php:942
 #: ../../mod/webpages.php:183 ../../mod/blocks.php:155 ../../mod/thing.php:258
 #: ../../mod/settings.php:646 ../../mod/editlayout.php:179
 #: ../../mod/editwebpage.php:223 ../../mod/group.php:173
 msgid "Delete"
 msgstr "Verwijderen"
 
+#: ../../include/RedDAV/RedBrowser.php:282
+#, php-format
+msgid "You are using %1$s of your available file storage."
+msgstr "Je gebruikt %1$s van de beschikbare bestandsopslag."
+
+#: ../../include/RedDAV/RedBrowser.php:287
+#, php-format
+msgid "You are using %1$s of %2$s available file storage. (%3$s&#37;)"
+msgstr "Je gebruikt %1$s van totaal %2$s beschikbare bestandsopslag. (%3$s&#37;)"
+
+#: ../../include/RedDAV/RedBrowser.php:299
+msgid "WARNING:"
+msgstr "WAARSCHUWING:"
+
 #: ../../include/RedDAV/RedBrowser.php:302
 msgid "Create new folder"
 msgstr "Nieuwe map aanmaken"
@@ -296,39 +326,39 @@ msgstr "Ongeldige omschrijving chatkanaal"
 msgid "Room not found."
 msgstr "Chatkanaal niet gevonden"
 
-#: ../../include/chat.php:133 ../../include/photos.php:26
-#: ../../include/attach.php:137 ../../include/attach.php:185
-#: ../../include/attach.php:248 ../../include/attach.php:262
-#: ../../include/attach.php:269 ../../include/attach.php:334
-#: ../../include/attach.php:348 ../../include/attach.php:355
-#: ../../include/attach.php:433 ../../include/attach.php:840
-#: ../../include/attach.php:911 ../../include/attach.php:1064
-#: ../../include/items.php:4342 ../../mod/achievements.php:30
+#: ../../include/chat.php:133 ../../include/items.php:4376
+#: ../../include/photos.php:26 ../../include/attach.php:137
+#: ../../include/attach.php:185 ../../include/attach.php:248
+#: ../../include/attach.php:262 ../../include/attach.php:269
+#: ../../include/attach.php:334 ../../include/attach.php:348
+#: ../../include/attach.php:355 ../../include/attach.php:433
+#: ../../include/attach.php:875 ../../include/attach.php:946
+#: ../../include/attach.php:1098 ../../mod/achievements.php:30
 #: ../../mod/fsuggest.php:78 ../../mod/authtest.php:13
 #: ../../mod/bookmarks.php:48 ../../mod/block.php:22 ../../mod/block.php:72
 #: ../../mod/id.php:71 ../../mod/like.php:177 ../../mod/common.php:35
-#: ../../mod/mitem.php:111 ../../mod/connedit.php:348 ../../mod/mood.php:112
-#: ../../mod/filestorage.php:18 ../../mod/filestorage.php:73
-#: ../../mod/filestorage.php:88 ../../mod/filestorage.php:115
-#: ../../mod/layouts.php:69 ../../mod/layouts.php:76 ../../mod/layouts.php:87
-#: ../../mod/poke.php:133 ../../mod/network.php:12 ../../mod/chat.php:91
-#: ../../mod/chat.php:96 ../../mod/message.php:16 ../../mod/channel.php:100
-#: ../../mod/channel.php:215 ../../mod/channel.php:255
-#: ../../mod/editpost.php:13 ../../mod/editblock.php:65 ../../mod/item.php:206
-#: ../../mod/item.php:214 ../../mod/item.php:992 ../../mod/appman.php:66
-#: ../../mod/profile.php:64 ../../mod/profile.php:72 ../../mod/menu.php:74
-#: ../../mod/page.php:31 ../../mod/page.php:86 ../../mod/new_channel.php:68
+#: ../../mod/mitem.php:111 ../../mod/connedit.php:347 ../../mod/mood.php:112
+#: ../../mod/photos.php:70 ../../mod/filestorage.php:18
+#: ../../mod/filestorage.php:73 ../../mod/filestorage.php:88
+#: ../../mod/filestorage.php:115 ../../mod/layouts.php:69
+#: ../../mod/layouts.php:76 ../../mod/layouts.php:87 ../../mod/poke.php:133
+#: ../../mod/network.php:12 ../../mod/chat.php:94 ../../mod/chat.php:99
+#: ../../mod/rate.php:111 ../../mod/mail.php:118 ../../mod/editblock.php:65
+#: ../../mod/editpost.php:13 ../../mod/appman.php:66 ../../mod/profile.php:64
+#: ../../mod/profile.php:72 ../../mod/menu.php:74 ../../mod/page.php:31
+#: ../../mod/page.php:86 ../../mod/new_channel.php:68
 #: ../../mod/new_channel.php:99 ../../mod/notifications.php:66
-#: ../../mod/pdledit.php:21 ../../mod/photos.php:70 ../../mod/rate.php:110
-#: ../../mod/events.php:256 ../../mod/profile_photo.php:338
-#: ../../mod/profile_photo.php:351 ../../mod/mail.php:114
-#: ../../mod/webpages.php:69 ../../mod/register.php:72 ../../mod/blocks.php:69
-#: ../../mod/blocks.php:76 ../../mod/service_limits.php:7
-#: ../../mod/sources.php:66 ../../mod/regmod.php:17 ../../mod/thing.php:271
-#: ../../mod/thing.php:291 ../../mod/thing.php:328 ../../mod/invite.php:13
-#: ../../mod/invite.php:104 ../../mod/viewsrc.php:14
-#: ../../mod/settings.php:565 ../../mod/manage.php:6 ../../mod/api.php:26
-#: ../../mod/api.php:31 ../../mod/connections.php:29
+#: ../../mod/pdledit.php:21 ../../mod/events.php:256
+#: ../../mod/profile_photo.php:338 ../../mod/profile_photo.php:351
+#: ../../mod/item.php:205 ../../mod/item.php:213 ../../mod/item.php:1002
+#: ../../mod/message.php:16 ../../mod/webpages.php:69
+#: ../../mod/register.php:72 ../../mod/blocks.php:69 ../../mod/blocks.php:76
+#: ../../mod/service_limits.php:7 ../../mod/sources.php:66
+#: ../../mod/regmod.php:17 ../../mod/channel.php:100 ../../mod/channel.php:214
+#: ../../mod/channel.php:254 ../../mod/thing.php:271 ../../mod/thing.php:291
+#: ../../mod/thing.php:328 ../../mod/invite.php:13 ../../mod/invite.php:104
+#: ../../mod/viewsrc.php:14 ../../mod/settings.php:565 ../../mod/manage.php:6
+#: ../../mod/api.php:26 ../../mod/api.php:31 ../../mod/connections.php:29
 #: ../../mod/editlayout.php:63 ../../mod/editlayout.php:87
 #: ../../mod/editwebpage.php:64 ../../mod/editwebpage.php:86
 #: ../../mod/editwebpage.php:101 ../../mod/editwebpage.php:125
@@ -357,7 +387,7 @@ msgstr "JJJJ-MM-DD of MM-DD"
 msgid "Required"
 msgstr "Vereist"
 
-#: ../../include/datetime.php:262 ../../boot.php:2306
+#: ../../include/datetime.php:262 ../../boot.php:2312
 msgid "never"
 msgstr "nooit"
 
@@ -541,9 +571,9 @@ msgstr "Grote foto's"
 
 #: ../../include/features.php:58
 msgid ""
-"Include large (640px) photo thumbnails in posts. If not enabled, use small "
-"(320px) photo thumbnails"
-msgstr "Toon grote (640px) voorbeeldfoto's in berichten. Standaard worden kleine voorbeeldfoto's (320px) getoond. "
+"Include large (1024px) photo thumbnails in posts. If not enabled, use small "
+"(640px) photo thumbnails"
+msgstr "Gebruik grotere foto's (1024px) in berichten. Wanneer dit is uitgeschakeld worden er kleinere foto's (640px) gebruikt."
 
 #: ../../include/features.php:59 ../../include/widgets.php:545
 #: ../../mod/sources.php:88
@@ -700,12 +730,12 @@ msgstr "Standaard"
 msgid "Delete this item?"
 msgstr "Dit item verwijderen?"
 
-#: ../../include/js_strings.php:6 ../../include/ItemObject.php:673
-#: ../../mod/photos.php:1008 ../../mod/photos.php:1126
+#: ../../include/js_strings.php:6 ../../include/ItemObject.php:681
+#: ../../mod/photos.php:1044 ../../mod/photos.php:1162
 msgid "Comment"
 msgstr "Reactie"
 
-#: ../../include/js_strings.php:7 ../../include/ItemObject.php:390
+#: ../../include/js_strings.php:7 ../../include/ItemObject.php:398
 msgid "[+] show all"
 msgstr "[+] alle"
 
@@ -757,8 +787,8 @@ msgstr "Niets nieuw hier"
 msgid "Rate This Channel (this is public)"
 msgstr "Beoordeel dit kanaal (dit is openbaar)"
 
-#: ../../include/js_strings.php:20 ../../mod/connedit.php:667
-#: ../../mod/rate.php:156
+#: ../../include/js_strings.php:20 ../../mod/connedit.php:666
+#: ../../mod/rate.php:157
 msgid "Rating"
 msgstr "Beoordeling"
 
@@ -766,17 +796,18 @@ msgstr "Beoordeling"
 msgid "Describe (optional)"
 msgstr "Omschrijving (optioneel)"
 
-#: ../../include/js_strings.php:22 ../../include/ItemObject.php:674
+#: ../../include/js_strings.php:22 ../../include/ItemObject.php:682
 #: ../../mod/fsuggest.php:108 ../../mod/mitem.php:231
-#: ../../mod/connedit.php:688 ../../mod/mood.php:135 ../../mod/pconfig.php:108
-#: ../../mod/filestorage.php:156 ../../mod/poke.php:171 ../../mod/chat.php:181
-#: ../../mod/chat.php:209 ../../mod/admin.php:411 ../../mod/admin.php:776
-#: ../../mod/admin.php:940 ../../mod/admin.php:1072 ../../mod/admin.php:1266
-#: ../../mod/admin.php:1351 ../../mod/appman.php:99 ../../mod/pdledit.php:58
-#: ../../mod/photos.php:598 ../../mod/photos.php:969 ../../mod/photos.php:1009
-#: ../../mod/photos.php:1127 ../../mod/rate.php:167 ../../mod/events.php:534
-#: ../../mod/events.php:710 ../../mod/mail.php:364 ../../mod/sources.php:104
-#: ../../mod/sources.php:138 ../../mod/import.php:511 ../../mod/thing.php:313
+#: ../../mod/connedit.php:687 ../../mod/mood.php:135 ../../mod/pconfig.php:108
+#: ../../mod/photos.php:634 ../../mod/photos.php:1005
+#: ../../mod/photos.php:1045 ../../mod/photos.php:1163
+#: ../../mod/filestorage.php:156 ../../mod/poke.php:171 ../../mod/chat.php:184
+#: ../../mod/chat.php:213 ../../mod/rate.php:168 ../../mod/mail.php:371
+#: ../../mod/admin.php:411 ../../mod/admin.php:776 ../../mod/admin.php:940
+#: ../../mod/admin.php:1072 ../../mod/admin.php:1266 ../../mod/admin.php:1351
+#: ../../mod/appman.php:99 ../../mod/pdledit.php:58 ../../mod/events.php:534
+#: ../../mod/events.php:710 ../../mod/sources.php:104
+#: ../../mod/sources.php:138 ../../mod/import.php:517 ../../mod/thing.php:313
 #: ../../mod/thing.php:359 ../../mod/invite.php:142 ../../mod/settings.php:583
 #: ../../mod/settings.php:695 ../../mod/settings.php:723
 #: ../../mod/settings.php:746 ../../mod/settings.php:831
@@ -1085,7 +1116,7 @@ msgstr "RSS/Atom"
 
 #: ../../include/contact_selectors.php:79 ../../mod/id.php:15
 #: ../../mod/id.php:16 ../../mod/admin.php:779 ../../mod/admin.php:788
-#: ../../boot.php:1499
+#: ../../boot.php:1505
 msgid "Email"
 msgstr "E-mail"
 
@@ -1136,8 +1167,8 @@ msgstr "Bezoek het %2$s van %1$s"
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr "%1$s heeft een aangepaste %2$s, %3$s veranderd."
 
-#: ../../include/Contact.php:101 ../../include/conversation.php:947
-#: ../../include/identity.php:941 ../../include/widgets.php:136
+#: ../../include/Contact.php:101 ../../include/identity.php:965
+#: ../../include/conversation.php:949 ../../include/widgets.php:136
 #: ../../include/widgets.php:174 ../../mod/directory.php:316
 #: ../../mod/match.php:64 ../../mod/suggest.php:52
 msgid "Connect"
@@ -1161,679 +1192,660 @@ msgstr "Account '%s' verwijderd"
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr "Kan DNS-informatie voor databaseserver '%s' niet vinden"
 
-#: ../../include/conversation.php:120 ../../include/text.php:1832
-#: ../../mod/like.php:361 ../../mod/tagger.php:43 ../../mod/subthread.php:72
-#: ../../mod/subthread.php:172
-msgid "photo"
-msgstr "foto"
+#: ../../include/items.php:423 ../../mod/like.php:280 ../../mod/dreport.php:6
+#: ../../mod/dreport.php:45 ../../mod/subthread.php:49 ../../mod/group.php:68
+#: ../../mod/profperm.php:23 ../../mod/import_items.php:114
+#: ../../index.php:360
+msgid "Permission denied"
+msgstr "Toegang geweigerd"
 
-#: ../../include/conversation.php:123 ../../include/text.php:1835
-#: ../../include/event.php:896 ../../mod/like.php:363 ../../mod/tagger.php:47
-#: ../../mod/events.php:245
-msgid "event"
-msgstr "gebeurtenis"
+#: ../../include/items.php:1128 ../../include/items.php:1174
+msgid "(Unknown)"
+msgstr "(Onbekend)"
 
-#: ../../include/conversation.php:126 ../../mod/like.php:113
-msgid "channel"
-msgstr "kanaal"
+#: ../../include/items.php:1371
+msgid "Visible to anybody on the internet."
+msgstr "Voor iedereen op het internet zichtbaar."
 
-#: ../../include/conversation.php:148 ../../include/text.php:1838
-#: ../../mod/like.php:361 ../../mod/subthread.php:72
-#: ../../mod/subthread.php:172
-msgid "status"
-msgstr "bericht"
+#: ../../include/items.php:1373
+msgid "Visible to you only."
+msgstr "Alleen voor jou zichtbaar."
 
-#: ../../include/conversation.php:150 ../../include/text.php:1840
-#: ../../mod/tagger.php:53
-msgid "comment"
-msgstr "reactie"
+#: ../../include/items.php:1375
+msgid "Visible to anybody in this network."
+msgstr "Voor iedereen in dit netwerk zichtbaar."
 
-#: ../../include/conversation.php:164 ../../mod/like.php:410
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
-msgstr "%1$s vindt %3$s van %2$s leuk"
+#: ../../include/items.php:1377
+msgid "Visible to anybody authenticated."
+msgstr "Voor iedereen die geauthenticeerd is zichtbaar."
 
-#: ../../include/conversation.php:167 ../../mod/like.php:412
+#: ../../include/items.php:1379
 #, php-format
-msgid "%1$s doesn't like %2$s's %3$s"
-msgstr "%1$s vindt %3$s van %2$s niet leuk"
+msgid "Visible to anybody on %s."
+msgstr "Voor iedereen op %s zichtbaar."
 
-#: ../../include/conversation.php:204
-#, php-format
-msgid "%1$s is now connected with %2$s"
-msgstr "%1$s is nu met %2$s verbonden"
+#: ../../include/items.php:1381
+msgid "Visible to all connections."
+msgstr "Voor alle connecties zichtbaar."
 
-#: ../../include/conversation.php:239
-#, php-format
-msgid "%1$s poked %2$s"
-msgstr "%1$s heeft %2$s aangestoten"
+#: ../../include/items.php:1383
+msgid "Visible to approved connections."
+msgstr "Voor alle goedgekeurde connecties zichtbaar."
 
-#: ../../include/conversation.php:243 ../../include/text.php:933
-msgid "poked"
-msgstr "aangestoten"
+#: ../../include/items.php:1385
+msgid "Visible to specific connections."
+msgstr "Voor specifieke connecties zichtbaar."
 
-#: ../../include/conversation.php:260 ../../mod/mood.php:63
-#, php-format
-msgctxt "mood"
-msgid "%1$s is %2$s"
-msgstr "%1$s is %2$s"
+#: ../../include/items.php:4297 ../../mod/display.php:36
+#: ../../mod/filestorage.php:27 ../../mod/admin.php:127
+#: ../../mod/admin.php:979 ../../mod/admin.php:1179 ../../mod/thing.php:86
+#: ../../mod/viewsrc.php:20
+msgid "Item not found."
+msgstr "Item niet gevonden."
 
-#: ../../include/conversation.php:574 ../../mod/photos.php:1024
-msgctxt "title"
-msgid "Likes"
-msgstr "vinden dit leuk"
+#: ../../include/items.php:4806 ../../mod/group.php:38 ../../mod/group.php:137
+msgid "Collection not found."
+msgstr "Collectie niet gevonden."
 
-#: ../../include/conversation.php:574 ../../mod/photos.php:1024
-msgctxt "title"
-msgid "Dislikes"
-msgstr "vinden dit niet leuk"
+#: ../../include/items.php:4822
+msgid "Collection is empty."
+msgstr "Collectie is leeg"
 
-#: ../../include/conversation.php:575 ../../mod/photos.php:1025
-msgctxt "title"
-msgid "Agree"
-msgstr "eens"
+#: ../../include/items.php:4829
+#, php-format
+msgid "Collection: %s"
+msgstr "Collectie: %s"
 
-#: ../../include/conversation.php:575 ../../mod/photos.php:1025
-msgctxt "title"
-msgid "Disagree"
-msgstr "oneens"
+#: ../../include/items.php:4839 ../../mod/connedit.php:657
+#, php-format
+msgid "Connection: %s"
+msgstr "Connectie: %s"
 
-#: ../../include/conversation.php:575 ../../mod/photos.php:1025
-msgctxt "title"
-msgid "Abstain"
-msgstr "onthoudingen"
+#: ../../include/items.php:4841
+msgid "Connection not found."
+msgstr "Connectie niet gevonden."
 
-#: ../../include/conversation.php:576 ../../mod/photos.php:1026
-msgctxt "title"
-msgid "Attending"
-msgstr "aanwezig"
+#: ../../include/api.php:1321
+msgid "Public Timeline"
+msgstr "Openbare tijdlijn"
 
-#: ../../include/conversation.php:576 ../../mod/photos.php:1026
-msgctxt "title"
-msgid "Not attending"
-msgstr "niet aanwezig"
+#: ../../include/network.php:635
+msgid "view full size"
+msgstr "volledige grootte tonen"
 
-#: ../../include/conversation.php:576 ../../mod/photos.php:1026
-msgctxt "title"
-msgid "Might attend"
-msgstr "mogelijk aanwezig"
+#: ../../include/network.php:1613 ../../include/enotify.php:57
+msgid "$Projectname Notification"
+msgstr "$Projectname-notificatie"
 
-#: ../../include/conversation.php:661 ../../include/ItemObject.php:126
-msgid "Select"
-msgstr "Kies"
+#: ../../include/network.php:1614 ../../include/enotify.php:58
+msgid "$projectname"
+msgstr "$projectname"
 
-#: ../../include/conversation.php:669 ../../include/ItemObject.php:89
-msgid "Private Message"
-msgstr "Privébericht"
+#: ../../include/network.php:1616 ../../include/enotify.php:60
+msgid "Thank You,"
+msgstr "Bedankt,"
 
-#: ../../include/conversation.php:676 ../../include/ItemObject.php:227
-msgid "Message signature validated"
-msgstr "Berichtkenmerk gevalideerd"
+#: ../../include/network.php:1618 ../../include/enotify.php:62
+#, php-format
+msgid "%s Administrator"
+msgstr "Beheerder %s"
 
-#: ../../include/conversation.php:677 ../../include/ItemObject.php:228
-msgid "Message signature incorrect"
-msgstr "Berichtkenmerk onjuist"
+#: ../../include/network.php:1660 ../../include/account.php:316
+#: ../../include/account.php:343 ../../include/account.php:403
+msgid "Administrator"
+msgstr "Beheerder"
 
-#: ../../include/conversation.php:694
+#: ../../include/network.php:1674
+msgid "No Subject"
+msgstr "Geen onderwerp"
+
+#: ../../include/bookmarks.php:35
 #, php-format
-msgid "View %s's profile @ %s"
-msgstr "Bekijk het profiel van %s @ %s"
+msgid "%1$s's bookmarks"
+msgstr "Bladwijzers van %1$s"
 
-#: ../../include/conversation.php:709
-msgid "Categories:"
-msgstr "Categorieën:"
+#: ../../include/acl_selectors.php:239
+msgid "Visible to your default audience"
+msgstr "Voor iedereen zichtbaar, mits niet anders ingesteld"
 
-#: ../../include/conversation.php:710
-msgid "Filed under:"
-msgstr "Bewaard onder:"
+#: ../../include/acl_selectors.php:240
+msgid "Show"
+msgstr "Tonen"
 
-#: ../../include/conversation.php:718 ../../include/ItemObject.php:314
-#, php-format
-msgid "from %s"
-msgstr "van %s"
+#: ../../include/acl_selectors.php:241
+msgid "Don't show"
+msgstr "Niet tonen"
 
-#: ../../include/conversation.php:721 ../../include/ItemObject.php:317
-#, php-format
-msgid "last edited: %s"
-msgstr "laatst bewerkt: %s"
+#: ../../include/acl_selectors.php:247 ../../mod/photos.php:628
+#: ../../mod/photos.php:998 ../../mod/filestorage.php:147
+#: ../../mod/chat.php:211 ../../mod/events.php:708 ../../mod/thing.php:310
+#: ../../mod/thing.php:356
+msgid "Permissions"
+msgstr "Permissies"
 
-#: ../../include/conversation.php:722 ../../include/ItemObject.php:318
-#, php-format
-msgid "Expires: %s"
-msgstr "Verloopt: %s"
+#: ../../include/acl_selectors.php:248 ../../include/ItemObject.php:369
+#: ../../mod/photos.php:1215
+msgid "Close"
+msgstr "Sluiten"
 
-#: ../../include/conversation.php:737
-msgid "View in context"
-msgstr "In context bekijken"
+#: ../../include/import.php:23
+msgid ""
+"Cannot create a duplicate channel identifier on this system. Import failed."
+msgstr "Kan geen dubbele kanaal-identificator op deze hub aanmaken. Importeren mislukt."
 
-#: ../../include/conversation.php:739 ../../include/conversation.php:1212
-#: ../../include/ItemObject.php:366 ../../mod/editpost.php:130
-#: ../../mod/editblock.php:150 ../../mod/photos.php:990 ../../mod/mail.php:237
-#: ../../mod/mail.php:365 ../../mod/editlayout.php:148
-#: ../../mod/editwebpage.php:190
-msgid "Please wait"
-msgstr "Even wachten"
+#: ../../include/import.php:70
+msgid "Channel clone failed. Import failed."
+msgstr "Het klonen van het kanaal is mislukt. Importeren mislukt."
 
-#: ../../include/conversation.php:848
-msgid "remove"
-msgstr "verwijderen"
+#: ../../include/import.php:80 ../../mod/import.php:138
+msgid "Cloned channel not found. Import failed."
+msgstr "Gekloond kanaal niet gevonden. Importeren mislukt."
 
-#: ../../include/conversation.php:852 ../../include/nav.php:241
-msgid "Loading..."
-msgstr "Aan het laden..."
+#: ../../include/photos.php:109
+#, php-format
+msgid "Image exceeds website size limit of %lu bytes"
+msgstr "Afbeelding is groter dan op deze hub toegestane limiet van %lu bytes"
 
-#: ../../include/conversation.php:853
-msgid "Delete Selected Items"
-msgstr "Verwijder de geselecteerde items"
+#: ../../include/photos.php:116
+msgid "Image file is empty."
+msgstr "Afbeeldingsbestand is leeg"
 
-#: ../../include/conversation.php:941
-msgid "View Source"
-msgstr "Bron weergeven"
+#: ../../include/photos.php:143 ../../mod/profile_photo.php:222
+msgid "Unable to process image"
+msgstr "Afbeelding kan niet verwerkt worden"
 
-#: ../../include/conversation.php:942
-msgid "Follow Thread"
-msgstr "Conversatie volgen"
+#: ../../include/photos.php:232
+msgid "Photo storage failed."
+msgstr "Foto kan niet worden opgeslagen"
 
-#: ../../include/conversation.php:943
-msgid "View Status"
-msgstr "Status weergeven"
+#: ../../include/photos.php:452 ../../include/conversation.php:1609
+msgid "Photo Albums"
+msgstr "Fotoalbums"
 
-#: ../../include/conversation.php:944 ../../include/nav.php:86
-#: ../../mod/connedit.php:494
-msgid "View Profile"
-msgstr "Profiel weergeven"
+#: ../../include/photos.php:456
+msgid "Upload New Photos"
+msgstr "Nieuwe foto's uploaden"
 
-#: ../../include/conversation.php:945
-msgid "View Photos"
-msgstr "Foto's weergeven"
+#: ../../include/notify.php:20
+msgid "created a new post"
+msgstr "maakte een nieuw bericht aan"
 
-#: ../../include/conversation.php:946
-msgid "Activity/Posts"
-msgstr "Kanaal-activiteit"
+#: ../../include/notify.php:21
+#, php-format
+msgid "commented on %s's post"
+msgstr "gaf een reactie op een bericht van %s"
 
-#: ../../include/conversation.php:948
-msgid "Edit Connection"
-msgstr "Connectie bewerken"
+#: ../../include/page_widgets.php:6
+msgid "New Page"
+msgstr "Nieuwe pagina"
 
-#: ../../include/conversation.php:949
-msgid "Send PM"
-msgstr "Privébericht verzenden"
+#: ../../include/page_widgets.php:39 ../../mod/layouts.php:188
+#: ../../mod/webpages.php:187 ../../mod/blocks.php:159
+msgid "View"
+msgstr "Weergeven"
 
-#: ../../include/conversation.php:950 ../../include/apps.php:145
-msgid "Poke"
-msgstr "Aanstoten"
+#: ../../include/page_widgets.php:40 ../../include/ItemObject.php:691
+#: ../../include/conversation.php:1160 ../../mod/photos.php:1046
+#: ../../mod/editblock.php:171 ../../mod/editpost.php:150
+#: ../../mod/events.php:707 ../../mod/webpages.php:188
+#: ../../mod/editwebpage.php:212
+msgid "Preview"
+msgstr "Voorvertoning"
 
-#: ../../include/conversation.php:1064
-#, php-format
-msgid "%s likes this."
-msgstr "%s vindt dit leuk."
+#: ../../include/page_widgets.php:41 ../../mod/webpages.php:189
+msgid "Actions"
+msgstr "Acties"
 
-#: ../../include/conversation.php:1064
-#, php-format
-msgid "%s doesn't like this."
-msgstr "%s vindt dit niet leuk."
+#: ../../include/page_widgets.php:42 ../../mod/webpages.php:190
+msgid "Page Link"
+msgstr "Paginalink"
 
-#: ../../include/conversation.php:1068
-#, php-format
-msgid "<span  %1$s>%2$d people</span> like this."
-msgid_plural "<span  %1$s>%2$d people</span> like this."
-msgstr[0] "<span  %1$s>%2$d persoon</span> vindt dit leuk."
-msgstr[1] "<span  %1$s>%2$d personen</span> vinden dit leuk."
+#: ../../include/page_widgets.php:43
+msgid "Title"
+msgstr "Titel"
 
-#: ../../include/conversation.php:1070
-#, php-format
-msgid "<span  %1$s>%2$d people</span> don't like this."
-msgid_plural "<span  %1$s>%2$d people</span> don't like this."
-msgstr[0] "<span  %1$s>%2$d persoon</span> vindt dit niet leuk."
-msgstr[1] "<span  %1$s>%2$d personen</span> vinden dit niet leuk."
+#: ../../include/page_widgets.php:44 ../../mod/layouts.php:181
+#: ../../mod/menu.php:110 ../../mod/webpages.php:192 ../../mod/blocks.php:150
+msgid "Created"
+msgstr "Aangemaakt"
 
-#: ../../include/conversation.php:1076
-msgid "and"
-msgstr "en"
+#: ../../include/page_widgets.php:45 ../../mod/layouts.php:182
+#: ../../mod/menu.php:111 ../../mod/webpages.php:193 ../../mod/blocks.php:151
+msgid "Edited"
+msgstr "Bewerkt"
 
-#: ../../include/conversation.php:1079
-#, php-format
-msgid ", and %d other people"
-msgid_plural ", and %d other people"
-msgstr[0] ", en %d ander persoon"
-msgstr[1] ", en %d andere personen"
+#: ../../include/photo/photo_driver.php:705 ../../mod/photos.php:94
+#: ../../mod/photos.php:696 ../../mod/profile_photo.php:146
+#: ../../mod/profile_photo.php:236 ../../mod/profile_photo.php:376
+msgid "Profile Photos"
+msgstr "Profielfoto's"
 
-#: ../../include/conversation.php:1080
-#, php-format
-msgid "%s like this."
-msgstr "%s vinden dit leuk."
+#: ../../include/profile_selectors.php:6
+#: ../../include/profile_selectors.php:23 ../../mod/id.php:103
+msgid "Male"
+msgstr "Man"
 
-#: ../../include/conversation.php:1080
-#, php-format
-msgid "%s don't like this."
-msgstr "%s vinden dit niet leuk."
+#: ../../include/profile_selectors.php:6
+#: ../../include/profile_selectors.php:23 ../../mod/id.php:105
+msgid "Female"
+msgstr "Vrouw"
 
-#: ../../include/conversation.php:1143
-msgid "Visible to <strong>everybody</strong>"
-msgstr "Voor <strong>iedereen</strong> zichtbaar"
+#: ../../include/profile_selectors.php:6
+msgid "Currently Male"
+msgstr "Momenteel man"
 
-#: ../../include/conversation.php:1144 ../../mod/mail.php:170
-#: ../../mod/mail.php:299
-msgid "Please enter a link URL:"
-msgstr "Vul een internetadres/URL in:"
+#: ../../include/profile_selectors.php:6
+msgid "Currently Female"
+msgstr "Momenteel vrouw"
 
-#: ../../include/conversation.php:1145
-msgid "Please enter a video link/URL:"
-msgstr "Vul een videolink/URL in:"
+#: ../../include/profile_selectors.php:6
+msgid "Mostly Male"
+msgstr "Voornamelijk man"
 
-#: ../../include/conversation.php:1146
-msgid "Please enter an audio link/URL:"
-msgstr "Vul een audiolink/URL in:"
+#: ../../include/profile_selectors.php:6
+msgid "Mostly Female"
+msgstr "Voornamelijk vrouw"
 
-#: ../../include/conversation.php:1147
-msgid "Tag term:"
-msgstr "Tag:"
+#: ../../include/profile_selectors.php:6
+msgid "Transgender"
+msgstr "Transgender"
 
-#: ../../include/conversation.php:1148 ../../mod/filer.php:48
-msgid "Save to Folder:"
-msgstr "Bewaar in map: "
+#: ../../include/profile_selectors.php:6
+msgid "Intersex"
+msgstr "Interseksueel"
 
-#: ../../include/conversation.php:1149
-msgid "Where are you right now?"
-msgstr "Waar bevind je je op dit moment?"
+#: ../../include/profile_selectors.php:6
+msgid "Transsexual"
+msgstr "Transseksueel"
 
-#: ../../include/conversation.php:1150 ../../mod/editpost.php:54
-#: ../../mod/mail.php:171 ../../mod/mail.php:300
-msgid "Expires YYYY-MM-DD HH:MM"
-msgstr "Verloopt op DD-MM-YYYY om HH:MM"
+#: ../../include/profile_selectors.php:6
+msgid "Hermaphrodite"
+msgstr "Hermafrodiet"
 
-#: ../../include/conversation.php:1158 ../../include/page_widgets.php:40
-#: ../../include/ItemObject.php:683 ../../mod/editpost.php:150
-#: ../../mod/editblock.php:171 ../../mod/photos.php:1010
-#: ../../mod/events.php:707 ../../mod/webpages.php:188
-#: ../../mod/editwebpage.php:212
-msgid "Preview"
-msgstr "Voorvertoning"
+#: ../../include/profile_selectors.php:6
+msgid "Neuter"
+msgstr "Genderneutraal"
 
-#: ../../include/conversation.php:1177 ../../mod/layouts.php:184
-#: ../../mod/photos.php:989 ../../mod/webpages.php:182
-#: ../../mod/blocks.php:154
-msgid "Share"
-msgstr "Delen"
+#: ../../include/profile_selectors.php:6
+msgid "Non-specific"
+msgstr "Niet gespecificeerd"
 
-#: ../../include/conversation.php:1179
-msgid "Page link name"
-msgstr "Linknaam pagina"
+#: ../../include/profile_selectors.php:6
+msgid "Undecided"
+msgstr "Nog niet beslist"
 
-#: ../../include/conversation.php:1182
-msgid "Post as"
-msgstr "Bericht plaatsen als"
+#: ../../include/profile_selectors.php:42
+#: ../../include/profile_selectors.php:61
+msgid "Males"
+msgstr "Mannen"
 
-#: ../../include/conversation.php:1184 ../../include/ItemObject.php:675
-#: ../../mod/editpost.php:114 ../../mod/editblock.php:136
-#: ../../mod/editlayout.php:135 ../../mod/editwebpage.php:177
-msgid "Bold"
-msgstr "Vet"
+#: ../../include/profile_selectors.php:42
+#: ../../include/profile_selectors.php:61
+msgid "Females"
+msgstr "Vrouwen"
 
-#: ../../include/conversation.php:1185 ../../include/ItemObject.php:676
-#: ../../mod/editpost.php:115 ../../mod/editblock.php:137
-#: ../../mod/editlayout.php:136 ../../mod/editwebpage.php:178
-msgid "Italic"
-msgstr "Cursief"
+#: ../../include/profile_selectors.php:42
+msgid "Gay"
+msgstr "Homoseksueel"
 
-#: ../../include/conversation.php:1186 ../../include/ItemObject.php:677
-#: ../../mod/editpost.php:116 ../../mod/editblock.php:138
-#: ../../mod/editlayout.php:137 ../../mod/editwebpage.php:179
-msgid "Underline"
-msgstr "Onderstrepen"
+#: ../../include/profile_selectors.php:42
+msgid "Lesbian"
+msgstr "Lesbisch"
 
-#: ../../include/conversation.php:1187 ../../include/ItemObject.php:678
-#: ../../mod/editpost.php:117 ../../mod/editblock.php:139
-#: ../../mod/editlayout.php:138 ../../mod/editwebpage.php:180
-msgid "Quote"
-msgstr "Citeren"
+#: ../../include/profile_selectors.php:42
+msgid "No Preference"
+msgstr "Geen voorkeur"
 
-#: ../../include/conversation.php:1188 ../../include/ItemObject.php:679
-#: ../../mod/editpost.php:118 ../../mod/editblock.php:140
-#: ../../mod/editlayout.php:139 ../../mod/editwebpage.php:181
-msgid "Code"
-msgstr "Broncode"
+#: ../../include/profile_selectors.php:42
+msgid "Bisexual"
+msgstr "Biseksueel"
 
-#: ../../include/conversation.php:1189 ../../mod/editpost.php:119
-#: ../../mod/editblock.php:142 ../../mod/mail.php:234 ../../mod/mail.php:361
-#: ../../mod/editlayout.php:140 ../../mod/editwebpage.php:182
-msgid "Upload photo"
-msgstr "Foto uploaden"
+#: ../../include/profile_selectors.php:42
+msgid "Autosexual"
+msgstr "Autoseksueel"
 
-#: ../../include/conversation.php:1190
-msgid "upload photo"
-msgstr "foto uploaden"
+#: ../../include/profile_selectors.php:42
+msgid "Abstinent"
+msgstr "Seksuele onthouding"
 
-#: ../../include/conversation.php:1191 ../../mod/editpost.php:120
-#: ../../mod/editblock.php:143 ../../mod/mail.php:235 ../../mod/mail.php:362
-#: ../../mod/editlayout.php:141 ../../mod/editwebpage.php:183
-msgid "Attach file"
-msgstr "Bestand toevoegen"
+#: ../../include/profile_selectors.php:42
+msgid "Virgin"
+msgstr "Maagd"
 
-#: ../../include/conversation.php:1192
-msgid "attach file"
-msgstr "bestand toevoegen"
+#: ../../include/profile_selectors.php:42
+msgid "Deviant"
+msgstr "Afwijkend"
 
-#: ../../include/conversation.php:1193 ../../mod/editpost.php:121
-#: ../../mod/editblock.php:144 ../../mod/mail.php:236 ../../mod/mail.php:363
-#: ../../mod/editlayout.php:142 ../../mod/editwebpage.php:184
-msgid "Insert web link"
-msgstr "Weblink invoegen"
+#: ../../include/profile_selectors.php:42
+msgid "Fetish"
+msgstr "Fetisj"
 
-#: ../../include/conversation.php:1194
-msgid "web link"
-msgstr "Weblink"
+#: ../../include/profile_selectors.php:42
+msgid "Oodles"
+msgstr "Veel"
 
-#: ../../include/conversation.php:1195
-msgid "Insert video link"
-msgstr "Videolink invoegen"
+#: ../../include/profile_selectors.php:42
+msgid "Nonsexual"
+msgstr "Aseksueel"
 
-#: ../../include/conversation.php:1196
-msgid "video link"
-msgstr "videolink"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Single"
+msgstr "Alleen"
 
-#: ../../include/conversation.php:1197
-msgid "Insert audio link"
-msgstr "Audiolink invoegen"
+#: ../../include/profile_selectors.php:80
+msgid "Lonely"
+msgstr "Eenzaam"
 
-#: ../../include/conversation.php:1198
-msgid "audio link"
-msgstr "audiolink"
+#: ../../include/profile_selectors.php:80
+msgid "Available"
+msgstr "Beschikbaar"
 
-#: ../../include/conversation.php:1199 ../../mod/editpost.php:125
-#: ../../mod/editblock.php:148 ../../mod/editlayout.php:146
-#: ../../mod/editwebpage.php:188
-msgid "Set your location"
-msgstr "Locatie instellen"
+#: ../../include/profile_selectors.php:80
+msgid "Unavailable"
+msgstr "Niet beschikbaar"
 
-#: ../../include/conversation.php:1200
-msgid "set location"
-msgstr "locatie instellen"
+#: ../../include/profile_selectors.php:80
+msgid "Has crush"
+msgstr "Heeft een oogje op iemand"
 
-#: ../../include/conversation.php:1201 ../../mod/editpost.php:127
-msgid "Toggle voting"
-msgstr "Stemmen in- of uitschakelen"
+#: ../../include/profile_selectors.php:80
+msgid "Infatuated"
+msgstr "Smoorverliefd"
 
-#: ../../include/conversation.php:1204 ../../mod/editpost.php:126
-#: ../../mod/editblock.php:149 ../../mod/editlayout.php:147
-#: ../../mod/editwebpage.php:189
-msgid "Clear browser location"
-msgstr "Locatie van webbrowser wissen"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Dating"
+msgstr "Aan het daten"
 
-#: ../../include/conversation.php:1205
-msgid "clear location"
-msgstr "locatie wissen"
+#: ../../include/profile_selectors.php:80
+msgid "Unfaithful"
+msgstr "Ontrouw"
 
-#: ../../include/conversation.php:1207 ../../mod/editpost.php:142
-#: ../../mod/editblock.php:162 ../../mod/editwebpage.php:205
-msgid "Title (optional)"
-msgstr "Titel (optioneel)"
+#: ../../include/profile_selectors.php:80
+msgid "Sex Addict"
+msgstr "Seksverslaafd"
 
-#: ../../include/conversation.php:1211 ../../mod/editpost.php:144
-#: ../../mod/editblock.php:165 ../../mod/editlayout.php:163
-#: ../../mod/editwebpage.php:207
-msgid "Categories (optional, comma-separated list)"
-msgstr "Categorieën (optioneel, door komma's gescheiden lijst)"
+#: ../../include/profile_selectors.php:80 ../../include/identity.php:390
+#: ../../include/identity.php:391 ../../include/identity.php:398
+#: ../../include/widgets.php:429 ../../mod/connedit.php:568
+#: ../../mod/settings.php:337 ../../mod/settings.php:341
+#: ../../mod/settings.php:342 ../../mod/settings.php:345
+#: ../../mod/settings.php:356
+msgid "Friends"
+msgstr "Vrienden"
 
-#: ../../include/conversation.php:1213 ../../mod/editpost.php:131
-#: ../../mod/editblock.php:151 ../../mod/editlayout.php:149
-#: ../../mod/editwebpage.php:191
-msgid "Permission settings"
-msgstr "Permissies"
+#: ../../include/profile_selectors.php:80
+msgid "Friends/Benefits"
+msgstr "Vriendschap plus"
 
-#: ../../include/conversation.php:1214
-msgid "permissions"
-msgstr "permissies"
+#: ../../include/profile_selectors.php:80
+msgid "Casual"
+msgstr "Ongebonden/vluchtig"
 
-#: ../../include/conversation.php:1222 ../../mod/editpost.php:139
-#: ../../mod/editblock.php:159 ../../mod/editlayout.php:156
-#: ../../mod/editwebpage.php:200
-msgid "Public post"
-msgstr "Openbaar bericht"
+#: ../../include/profile_selectors.php:80
+msgid "Engaged"
+msgstr "Verloofd"
 
-#: ../../include/conversation.php:1224 ../../mod/editpost.php:145
-#: ../../mod/editblock.php:166 ../../mod/editlayout.php:164
-#: ../../mod/editwebpage.php:208
-msgid "Example: bob@example.com, mary@example.com"
-msgstr "Voorbeeld: bob@voorbeeld.nl, mary@voorbeeld.be"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Married"
+msgstr "Getrouwd"
 
-#: ../../include/conversation.php:1237 ../../mod/editpost.php:156
-#: ../../mod/editblock.php:176 ../../mod/mail.php:241 ../../mod/mail.php:368
-#: ../../mod/editlayout.php:173 ../../mod/editwebpage.php:217
-msgid "Set expiration date"
-msgstr "Verloopdatum instellen"
+#: ../../include/profile_selectors.php:80
+msgid "Imaginarily married"
+msgstr "Denkbeeldig getrouwd"
 
-#: ../../include/conversation.php:1239 ../../include/ItemObject.php:686
-#: ../../mod/editpost.php:158 ../../mod/mail.php:243 ../../mod/mail.php:370
-msgid "Encrypt text"
-msgstr "Tekst versleutelen"
+#: ../../include/profile_selectors.php:80
+msgid "Partners"
+msgstr "Partners"
 
-#: ../../include/conversation.php:1241 ../../mod/editpost.php:160
-#: ../../mod/events.php:691
-msgid "OK"
-msgstr "OK"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Cohabiting"
+msgstr "Samenwonend"
 
-#: ../../include/conversation.php:1242 ../../mod/fbrowser.php:82
-#: ../../mod/fbrowser.php:117 ../../mod/editpost.php:161
-#: ../../mod/events.php:690 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134
-#: ../../mod/settings.php:584 ../../mod/settings.php:610
-msgid "Cancel"
-msgstr "Annuleren"
+#: ../../include/profile_selectors.php:80
+msgid "Common law"
+msgstr "Common-law-huwelijk"
 
-#: ../../include/conversation.php:1485
-msgid "Discover"
-msgstr "Ontdekken"
+#: ../../include/profile_selectors.php:80
+msgid "Happy"
+msgstr "Gelukkig"
 
-#: ../../include/conversation.php:1488
-msgid "Imported public streams"
-msgstr "Openbare streams importeren"
+#: ../../include/profile_selectors.php:80
+msgid "Not looking"
+msgstr "Niet op zoek"
 
-#: ../../include/conversation.php:1493
-msgid "Commented Order"
-msgstr "Nieuwe reacties bovenaan"
+#: ../../include/profile_selectors.php:80
+msgid "Swinger"
+msgstr "Swinger"
 
-#: ../../include/conversation.php:1496
-msgid "Sort by Comment Date"
-msgstr "Berichten met nieuwe reacties bovenaan"
+#: ../../include/profile_selectors.php:80
+msgid "Betrayed"
+msgstr "Verraden"
 
-#: ../../include/conversation.php:1500
-msgid "Posted Order"
-msgstr "Nieuwe berichten bovenaan"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Separated"
+msgstr "Uit elkaar"
 
-#: ../../include/conversation.php:1503
-msgid "Sort by Post Date"
-msgstr "Nieuwe berichten bovenaan"
+#: ../../include/profile_selectors.php:80
+msgid "Unstable"
+msgstr "Onstabiel"
 
-#: ../../include/conversation.php:1508 ../../include/widgets.php:94
-msgid "Personal"
-msgstr "Persoonlijk"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Divorced"
+msgstr "Gescheiden"
 
-#: ../../include/conversation.php:1511
-msgid "Posts that mention or involve you"
-msgstr "Alleen berichten die jou vermelden of waar je op een andere manier bij betrokken bent"
+#: ../../include/profile_selectors.php:80
+msgid "Imaginarily divorced"
+msgstr "Denkbeeldig gescheiden"
 
-#: ../../include/conversation.php:1517 ../../mod/menu.php:112
-#: ../../mod/connections.php:72 ../../mod/connections.php:82
-msgid "New"
-msgstr "Nieuw"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Widowed"
+msgstr "Weduwnaar/weduwe"
 
-#: ../../include/conversation.php:1520
-msgid "Activity Stream - by date"
-msgstr "Activiteitenstroom - volgens datum"
+#: ../../include/profile_selectors.php:80
+msgid "Uncertain"
+msgstr "Onzeker"
 
-#: ../../include/conversation.php:1526
-msgid "Starred"
-msgstr "Met ster"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "It's complicated"
+msgstr "Het is ingewikkeld"
 
-#: ../../include/conversation.php:1529
-msgid "Favourite Posts"
-msgstr "Favoriete berichten"
+#: ../../include/profile_selectors.php:80
+msgid "Don't care"
+msgstr "Maakt mij niks uit"
 
-#: ../../include/conversation.php:1536
-msgid "Spam"
-msgstr "Spam"
+#: ../../include/profile_selectors.php:80
+msgid "Ask me"
+msgstr "Vraag het me"
 
-#: ../../include/conversation.php:1539
-msgid "Posts flagged as SPAM"
-msgstr "Berichten gemarkeerd als SPAM"
+#: ../../include/oembed.php:213
+msgid "Embedded content"
+msgstr "Ingesloten inhoud"
 
-#: ../../include/conversation.php:1583 ../../mod/admin.php:947
-msgid "Channel"
-msgstr "Kanaal"
+#: ../../include/oembed.php:222
+msgid "Embedding disabled"
+msgstr "Insluiten uitgeschakeld"
 
-#: ../../include/conversation.php:1586
-msgid "Status Messages and Posts"
-msgstr "Berichten in dit kanaal"
+#: ../../include/event.php:766
+msgid "This event has been added to your calendar."
+msgstr "Dit evenement is aan jouw agenda toegevoegd."
 
-#: ../../include/conversation.php:1595
-msgid "About"
-msgstr "Over"
+#: ../../include/event.php:896 ../../include/text.php:1846
+#: ../../include/conversation.php:123 ../../mod/like.php:363
+#: ../../mod/tagger.php:47 ../../mod/events.php:245
+msgid "event"
+msgstr "gebeurtenis"
 
-#: ../../include/conversation.php:1598
-msgid "Profile Details"
-msgstr "Profiel"
+#: ../../include/event.php:953
+msgid "Not specified"
+msgstr "Niet aangegeven"
 
-#: ../../include/conversation.php:1604 ../../include/apps.php:139
-#: ../../include/nav.php:92 ../../mod/fbrowser.php:25
-msgid "Photos"
-msgstr "Foto's"
+#: ../../include/event.php:954
+msgid "Needs Action"
+msgstr "Actie vereist"
 
-#: ../../include/conversation.php:1607 ../../include/photos.php:422
-msgid "Photo Albums"
-msgstr "Fotoalbums"
+#: ../../include/event.php:955
+msgid "Completed"
+msgstr "Voltooid"
 
-#: ../../include/conversation.php:1614
-msgid "Files and Storage"
-msgstr "Bestanden en opslagruimte"
+#: ../../include/event.php:956
+msgid "In Process"
+msgstr "In behandeling"
 
-#: ../../include/conversation.php:1624 ../../include/conversation.php:1627
-msgid "Chatrooms"
-msgstr "Chatkanalen"
+#: ../../include/event.php:957
+msgid "Cancelled"
+msgstr "Geannuleerd"
 
-#: ../../include/conversation.php:1637 ../../include/apps.php:129
+#: ../../include/apps.php:128
+msgid "Site Admin"
+msgstr "Hubbeheerder"
+
+#: ../../include/apps.php:129 ../../include/conversation.php:1639
 #: ../../include/nav.php:103
 msgid "Bookmarks"
 msgstr "Bladwijzers"
 
-#: ../../include/conversation.php:1640
-msgid "Saved Bookmarks"
-msgstr "Opgeslagen bladwijzers"
+#: ../../include/apps.php:130
+msgid "Address Book"
+msgstr "Connecties"
+
+#: ../../include/apps.php:131 ../../include/nav.php:111 ../../boot.php:1503
+msgid "Login"
+msgstr "Inloggen"
+
+#: ../../include/apps.php:132 ../../include/nav.php:200
+#: ../../mod/manage.php:160
+msgid "Channel Manager"
+msgstr "Kanaalbeheer"
+
+#: ../../include/apps.php:133 ../../include/nav.php:174
+msgid "Grid"
+msgstr "Grid"
+
+#: ../../include/apps.php:134 ../../include/widgets.php:553
+#: ../../include/nav.php:202 ../../mod/admin.php:1033 ../../mod/admin.php:1233
+msgid "Settings"
+msgstr "Instellingen"
 
-#: ../../include/conversation.php:1647 ../../include/apps.php:136
+#: ../../include/apps.php:136 ../../include/conversation.php:1649
 #: ../../include/nav.php:107 ../../mod/webpages.php:178
 msgid "Webpages"
 msgstr "Webpagina's"
 
-#: ../../include/conversation.php:1650
-msgid "Manage Webpages"
-msgstr "Webpagina's beheren"
+#: ../../include/apps.php:137 ../../include/nav.php:177
+msgid "Channel Home"
+msgstr "Tijdlijn kanaal"
 
-#: ../../include/conversation.php:1679 ../../include/ItemObject.php:175
-#: ../../include/ItemObject.php:187 ../../mod/photos.php:1043
-#: ../../mod/photos.php:1055
-msgid "View all"
-msgstr "Toon alles"
+#: ../../include/apps.php:138 ../../include/identity.php:1250
+#: ../../include/identity.php:1367 ../../mod/profperm.php:112
+msgid "Profile"
+msgstr "Profiel"
 
-#: ../../include/conversation.php:1703 ../../include/taxonomy.php:403
-#: ../../include/identity.php:1252 ../../include/ItemObject.php:179
-#: ../../mod/photos.php:1047
-msgctxt "noun"
-msgid "Like"
-msgid_plural "Likes"
-msgstr[0] "vindt dit leuk"
-msgstr[1] "vinden dit leuk"
+#: ../../include/apps.php:139 ../../include/conversation.php:1606
+#: ../../include/nav.php:92 ../../mod/fbrowser.php:25
+msgid "Photos"
+msgstr "Foto's"
 
-#: ../../include/conversation.php:1706 ../../include/ItemObject.php:184
-#: ../../mod/photos.php:1052
-msgctxt "noun"
-msgid "Dislike"
-msgid_plural "Dislikes"
-msgstr[0] "vindt dit niet leuk"
-msgstr[1] "vinden dit niet leuk"
+#: ../../include/apps.php:140 ../../include/nav.php:196
+#: ../../mod/events.php:526
+msgid "Events"
+msgstr "Agenda"
 
-#: ../../include/conversation.php:1709
-msgctxt "noun"
-msgid "Attending"
-msgid_plural "Attending"
-msgstr[0] "aanwezig"
-msgstr[1] "aanwezig"
+#: ../../include/apps.php:141 ../../include/nav.php:162
+msgid "Directory"
+msgstr "Kanalengids"
 
-#: ../../include/conversation.php:1712
-msgctxt "noun"
-msgid "Not Attending"
-msgid_plural "Not Attending"
-msgstr[0] "niet aanwezig"
-msgstr[1] "niet aanwezig"
+#: ../../include/apps.php:142 ../../include/nav.php:154 ../../mod/help.php:202
+#: ../../mod/help.php:207 ../../mod/layouts.php:176
+msgid "Help"
+msgstr "Hulp"
 
-#: ../../include/conversation.php:1715
-msgctxt "noun"
-msgid "Undecided"
-msgid_plural "Undecided"
-msgstr[0] "nog niet beslist"
-msgstr[1] "nog niet beslist"
+#: ../../include/apps.php:143 ../../include/nav.php:188
+msgid "Mail"
+msgstr "Privéberichten"
 
-#: ../../include/conversation.php:1718
-msgctxt "noun"
-msgid "Agree"
-msgid_plural "Agrees"
-msgstr[0] "eens"
-msgstr[1] "eens"
+#: ../../include/apps.php:144 ../../mod/mood.php:131
+msgid "Mood"
+msgstr "Stemming"
 
-#: ../../include/conversation.php:1721
-msgctxt "noun"
-msgid "Disagree"
-msgid_plural "Disagrees"
-msgstr[0] "oneens"
-msgstr[1] "oneens"
+#: ../../include/apps.php:145 ../../include/conversation.php:952
+msgid "Poke"
+msgstr "Aanstoten"
 
-#: ../../include/conversation.php:1724
-msgctxt "noun"
-msgid "Abstain"
-msgid_plural "Abstains"
-msgstr[0] "onthouding"
-msgstr[1] "onthoudingen"
+#: ../../include/apps.php:146 ../../include/nav.php:97
+msgid "Chat"
+msgstr "Chatten"
 
-#: ../../include/api.php:1290
-msgid "Public Timeline"
-msgstr "Openbare tijdlijn"
+#: ../../include/apps.php:147 ../../include/text.php:857
+#: ../../include/text.php:869 ../../include/nav.php:159
+#: ../../mod/search.php:38
+msgid "Search"
+msgstr "Zoeken"
 
-#: ../../include/photos.php:109
-#, php-format
-msgid "Image exceeds website size limit of %lu bytes"
-msgstr "Afbeelding is groter dan op deze hub toegestane limiet van %lu bytes"
+#: ../../include/apps.php:148
+msgid "Probe"
+msgstr "Onderzoeken"
 
-#: ../../include/photos.php:116
-msgid "Image file is empty."
-msgstr "Afbeeldingsbestand is leeg"
+#: ../../include/apps.php:149
+msgid "Suggest"
+msgstr "Voorstellen"
 
-#: ../../include/photos.php:143 ../../mod/profile_photo.php:222
-msgid "Unable to process image"
-msgstr "Afbeelding kan niet verwerkt worden"
+#: ../../include/apps.php:150
+msgid "Random Channel"
+msgstr "Willekeurig kanaal"
 
-#: ../../include/photos.php:219
-msgid "Photo storage failed."
-msgstr "Foto kan niet worden opgeslagen"
+#: ../../include/apps.php:151
+msgid "Invite"
+msgstr "Uitnodigen "
 
-#: ../../include/photos.php:426
-msgid "Upload New Photos"
-msgstr "Nieuwe foto's uploaden"
+#: ../../include/apps.php:152
+msgid "Features"
+msgstr "Extra functies"
 
-#: ../../include/enotify.php:57 ../../include/network.php:1613
-msgid "$Projectname Notification"
-msgstr "$Projectname-notificatie"
+#: ../../include/apps.php:153 ../../mod/id.php:28
+msgid "Language"
+msgstr "Taal"
 
-#: ../../include/enotify.php:58 ../../include/network.php:1614
-msgid "$projectname"
-msgstr "$projectname"
+#: ../../include/apps.php:154
+msgid "Post"
+msgstr "Bericht"
 
-#: ../../include/enotify.php:60 ../../include/network.php:1616
-msgid "Thank You,"
-msgstr "Bedankt,"
+#: ../../include/apps.php:155 ../../mod/id.php:17 ../../mod/id.php:18
+#: ../../mod/id.php:19
+msgid "Profile Photo"
+msgstr "Profielfoto"
 
-#: ../../include/enotify.php:62 ../../include/network.php:1618
-#, php-format
-msgid "%s Administrator"
-msgstr "Beheerder %s"
+#: ../../include/apps.php:252 ../../mod/settings.php:84
+#: ../../mod/settings.php:609
+msgid "Update"
+msgstr "Bijwerken"
+
+#: ../../include/apps.php:252
+msgid "Install"
+msgstr "Installeren"
+
+#: ../../include/apps.php:257
+msgid "Purchase"
+msgstr "Aanschaffen"
+
+#: ../../include/auth.php:131
+msgid "Logged out."
+msgstr "Uitgelogd."
+
+#: ../../include/auth.php:272
+msgid "Failed authentication"
+msgstr "Mislukte authenticatie"
+
+#: ../../include/auth.php:286 ../../mod/openid.php:189
+msgid "Login failed."
+msgstr "Inloggen mislukt."
 
 #: ../../include/enotify.php:96
 #, php-format
@@ -1842,8 +1854,8 @@ msgstr "%s <!item_type!>"
 
 #: ../../include/enotify.php:100
 #, php-format
-msgid "[Red:Notify] New mail received at %s"
-msgstr "[Red:Notificatie] Nieuw privébericht ontvangen op %s"
+msgid "[Hubzilla:Notify] New mail received at %s"
+msgstr "[Hubzilla:Notificatie] Nieuw privébericht ontvangen op %s"
 
 #: ../../include/enotify.php:102
 #, php-format
@@ -1881,8 +1893,8 @@ msgstr "%1$s, %2$s gaf een reactie op [zrl=%3$s]jouw %4$s[/zrl]"
 
 #: ../../include/enotify.php:186
 #, php-format
-msgid "[Red:Notify] Comment to conversation #%1$d by %2$s"
-msgstr "[Red:Notificatie] Reactie op conversatie #%1$d door %2$s"
+msgid "[Hubzilla:Notify] Comment to conversation #%1$d by %2$s"
+msgstr "[Hubzilla:Notificatie] Reactie op conversatie #%1$d door %2$s"
 
 #: ../../include/enotify.php:187
 #, php-format
@@ -1898,8 +1910,8 @@ msgstr "Bezoek %s om de conversatie te bekijken en/of er op te reageren."
 
 #: ../../include/enotify.php:196
 #, php-format
-msgid "[Red:Notify] %s posted to your profile wall"
-msgstr "[Red:Notificatie] %s heeft een bericht op jouw kanaal geplaatst"
+msgid "[Hubzilla:Notify] %s posted to your profile wall"
+msgstr "[Hubzilla:Notificatie] %s heeft een bericht op jouw kanaal geplaatst"
 
 #: ../../include/enotify.php:198
 #, php-format
@@ -1913,8 +1925,8 @@ msgstr "%1$s, %2$s heeft een bericht op [zrl=%3$s]jouw kanaal[/zrl] geplaatst"
 
 #: ../../include/enotify.php:224
 #, php-format
-msgid "[Red:Notify] %s tagged you"
-msgstr "[Red:Notificatie] %s heeft je genoemd"
+msgid "[Hubzilla:Notify] %s tagged you"
+msgstr "[Hubzilla:Notificatie] %s heeft je genoemd"
 
 #: ../../include/enotify.php:225
 #, php-format
@@ -1928,8 +1940,8 @@ msgstr "%1$s, %2$s [zrl=%3$s]noemde jou[/zrl]."
 
 #: ../../include/enotify.php:238
 #, php-format
-msgid "[Red:Notify] %1$s poked you"
-msgstr "[Red:Notificatie] %1$s heeft je aangestoten"
+msgid "[Hubzilla:Notify] %1$s poked you"
+msgstr "[Hubzilla:Notificatie] %1$s heeft je aangestoten"
 
 #: ../../include/enotify.php:239
 #, php-format
@@ -1943,8 +1955,8 @@ msgstr "%1$s, %2$s [zrl=%2$s]heeft je aangestoten[/zrl]."
 
 #: ../../include/enotify.php:256
 #, php-format
-msgid "[Red:Notify] %s tagged your post"
-msgstr "[Red:Notificatie] %s heeft jouw bericht getagd"
+msgid "[Hubzilla:Notify] %s tagged your post"
+msgstr "[Hubzilla:Notificatie] %s heeft jouw bericht getagd"
 
 #: ../../include/enotify.php:257
 #, php-format
@@ -1957,8 +1969,8 @@ msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
 msgstr "%1$s, %2$s heeft [zrl=%3$s]jouw bericht[/zrl] getagd"
 
 #: ../../include/enotify.php:270
-msgid "[Red:Notify] Introduction received"
-msgstr "[Red:Notificatie] Connectieverzoek ontvangen"
+msgid "[Hubzilla:Notify] Introduction received"
+msgstr "[Hubzilla:Notificatie] Connectieverzoek ontvangen"
 
 #: ../../include/enotify.php:271
 #, php-format
@@ -1982,8 +1994,8 @@ msgid "Please visit %s to approve or reject the connection request."
 msgstr "Bezoek %s om het connectieverzoek te accepteren of af te wijzen."
 
 #: ../../include/enotify.php:285
-msgid "[Red:Notify] Friend suggestion received"
-msgstr "[Red:Notificatie] Kanaalvoorstel ontvangen"
+msgid "[Hubzilla:Notify] Friend suggestion received"
+msgstr "[Hubzilla:Notificatie] Kanaalvoorstel ontvangen"
 
 #: ../../include/enotify.php:286
 #, php-format
@@ -2010,27 +2022,248 @@ msgstr "Foto:"
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr "Bezoek %s om het voorstel te accepteren of af te wijzen."
 
-#: ../../include/enotify.php:508
-msgid "[Red:Notify]"
-msgstr "[Red:Notificatie]"
+#: ../../include/enotify.php:511
+msgid "[Hubzilla:Notify]"
+msgstr "[Hubzilla:Notificatie]"
 
-#: ../../include/network.php:635
-msgid "view full size"
-msgstr "volledige grootte tonen"
+#: ../../include/ItemObject.php:89 ../../include/conversation.php:664
+msgid "Private Message"
+msgstr "Privébericht"
 
-#: ../../include/network.php:1660 ../../include/account.php:314
-#: ../../include/account.php:341 ../../include/account.php:401
-msgid "Administrator"
-msgstr "Beheerder"
+#: ../../include/ItemObject.php:126 ../../include/conversation.php:656
+msgid "Select"
+msgstr "Kies"
 
-#: ../../include/network.php:1674
-msgid "No Subject"
-msgstr "Geen onderwerp"
+#: ../../include/ItemObject.php:130
+msgid "Save to Folder"
+msgstr "In map opslaan"
 
-#: ../../include/bookmarks.php:35
+#: ../../include/ItemObject.php:151
+msgid "I will attend"
+msgstr "Aanwezig"
+
+#: ../../include/ItemObject.php:151
+msgid "I will not attend"
+msgstr "Niet aanwezig"
+
+#: ../../include/ItemObject.php:151
+msgid "I might attend"
+msgstr "Mogelijk aanwezig"
+
+#: ../../include/ItemObject.php:161
+msgid "I agree"
+msgstr "Eens"
+
+#: ../../include/ItemObject.php:161
+msgid "I disagree"
+msgstr "Oneens"
+
+#: ../../include/ItemObject.php:161
+msgid "I abstain"
+msgstr "Onthouding"
+
+#: ../../include/ItemObject.php:175 ../../include/ItemObject.php:187
+#: ../../include/conversation.php:1681 ../../mod/photos.php:1079
+#: ../../mod/photos.php:1091
+msgid "View all"
+msgstr "Toon alles"
+
+#: ../../include/ItemObject.php:179 ../../include/identity.php:1276
+#: ../../include/taxonomy.php:403 ../../include/conversation.php:1705
+#: ../../mod/photos.php:1083
+msgctxt "noun"
+msgid "Like"
+msgid_plural "Likes"
+msgstr[0] "vindt dit leuk"
+msgstr[1] "vinden dit leuk"
+
+#: ../../include/ItemObject.php:184 ../../include/conversation.php:1708
+#: ../../mod/photos.php:1088
+msgctxt "noun"
+msgid "Dislike"
+msgid_plural "Dislikes"
+msgstr[0] "vindt dit niet leuk"
+msgstr[1] "vinden dit niet leuk"
+
+#: ../../include/ItemObject.php:212
+msgid "Add Star"
+msgstr "Ster toevoegen"
+
+#: ../../include/ItemObject.php:213
+msgid "Remove Star"
+msgstr "Ster verwijderen"
+
+#: ../../include/ItemObject.php:214
+msgid "Toggle Star Status"
+msgstr "Ster toevoegen of verwijderen"
+
+#: ../../include/ItemObject.php:218
+msgid "starred"
+msgstr "met ster"
+
+#: ../../include/ItemObject.php:227 ../../include/conversation.php:671
+msgid "Message signature validated"
+msgstr "Berichtkenmerk gevalideerd"
+
+#: ../../include/ItemObject.php:228 ../../include/conversation.php:672
+msgid "Message signature incorrect"
+msgstr "Berichtkenmerk onjuist"
+
+#: ../../include/ItemObject.php:236
+msgid "Add Tag"
+msgstr "Tag toevoegen"
+
+#: ../../include/ItemObject.php:254 ../../mod/photos.php:1023
+msgid "I like this (toggle)"
+msgstr "Vind ik leuk"
+
+#: ../../include/ItemObject.php:254 ../../include/taxonomy.php:317
+msgid "like"
+msgstr "vind dit leuk"
+
+#: ../../include/ItemObject.php:255 ../../mod/photos.php:1024
+msgid "I don't like this (toggle)"
+msgstr "Vind ik niet leuk"
+
+#: ../../include/ItemObject.php:255 ../../include/taxonomy.php:318
+msgid "dislike"
+msgstr "vind dit niet leuk"
+
+#: ../../include/ItemObject.php:259
+msgid "Share This"
+msgstr "Delen"
+
+#: ../../include/ItemObject.php:259
+msgid "share"
+msgstr "delen"
+
+#: ../../include/ItemObject.php:276
 #, php-format
-msgid "%1$s's bookmarks"
-msgstr "Bladwijzers van %1$s"
+msgid "%d comment"
+msgid_plural "%d comments"
+msgstr[0] "%d reactie"
+msgstr[1] "%d reacties weergeven"
+
+#: ../../include/ItemObject.php:301 ../../include/ItemObject.php:302
+#, php-format
+msgid "View %s's profile - %s"
+msgstr "Profiel van %s bekijken - %s"
+
+#: ../../include/ItemObject.php:305
+msgid "to"
+msgstr "aan"
+
+#: ../../include/ItemObject.php:306
+msgid "via"
+msgstr "via"
+
+#: ../../include/ItemObject.php:307
+msgid "Wall-to-Wall"
+msgstr "Kanaal-naar-kanaal"
+
+#: ../../include/ItemObject.php:308
+msgid "via Wall-To-Wall:"
+msgstr "via kanaal-naar-kanaal"
+
+#: ../../include/ItemObject.php:311
+msgid "Delivery Report"
+msgstr "Afleveringsrapport"
+
+#: ../../include/ItemObject.php:320 ../../include/conversation.php:718
+#, php-format
+msgid "from %s"
+msgstr "van %s"
+
+#: ../../include/ItemObject.php:323 ../../include/conversation.php:721
+#, php-format
+msgid "last edited: %s"
+msgstr "laatst bewerkt: %s"
+
+#: ../../include/ItemObject.php:324 ../../include/conversation.php:722
+#, php-format
+msgid "Expires: %s"
+msgstr "Verloopt: %s"
+
+#: ../../include/ItemObject.php:347
+msgid "Save Bookmarks"
+msgstr "Bladwijzers opslaan"
+
+#: ../../include/ItemObject.php:348
+msgid "Add to Calendar"
+msgstr "Aan agenda toevoegen"
+
+#: ../../include/ItemObject.php:357
+msgid "Mark all seen"
+msgstr "Markeer alles als bekeken"
+
+#: ../../include/ItemObject.php:363 ../../mod/photos.php:1209
+msgctxt "noun"
+msgid "Likes"
+msgstr "vinden dit leuk"
+
+#: ../../include/ItemObject.php:364 ../../mod/photos.php:1210
+msgctxt "noun"
+msgid "Dislikes"
+msgstr "vinden dit niet leuk"
+
+#: ../../include/ItemObject.php:374 ../../include/conversation.php:739
+#: ../../include/conversation.php:1214 ../../mod/photos.php:1026
+#: ../../mod/editblock.php:150 ../../mod/editpost.php:130
+#: ../../mod/editlayout.php:148 ../../mod/editwebpage.php:190
+msgid "Please wait"
+msgstr "Even wachten"
+
+#: ../../include/ItemObject.php:679 ../../mod/photos.php:1042
+#: ../../mod/photos.php:1160
+msgid "This is you"
+msgstr "Dit ben jij"
+
+#: ../../include/ItemObject.php:683 ../../include/conversation.php:1186
+#: ../../mod/editblock.php:136 ../../mod/editpost.php:114
+#: ../../mod/editlayout.php:135 ../../mod/editwebpage.php:177
+msgid "Bold"
+msgstr "Vet"
+
+#: ../../include/ItemObject.php:684 ../../include/conversation.php:1187
+#: ../../mod/editblock.php:137 ../../mod/editpost.php:115
+#: ../../mod/editlayout.php:136 ../../mod/editwebpage.php:178
+msgid "Italic"
+msgstr "Cursief"
+
+#: ../../include/ItemObject.php:685 ../../include/conversation.php:1188
+#: ../../mod/editblock.php:138 ../../mod/editpost.php:116
+#: ../../mod/editlayout.php:137 ../../mod/editwebpage.php:179
+msgid "Underline"
+msgstr "Onderstrepen"
+
+#: ../../include/ItemObject.php:686 ../../include/conversation.php:1189
+#: ../../mod/editblock.php:139 ../../mod/editpost.php:117
+#: ../../mod/editlayout.php:138 ../../mod/editwebpage.php:180
+msgid "Quote"
+msgstr "Citeren"
+
+#: ../../include/ItemObject.php:687 ../../include/conversation.php:1190
+#: ../../mod/editblock.php:140 ../../mod/editpost.php:118
+#: ../../mod/editlayout.php:139 ../../mod/editwebpage.php:181
+msgid "Code"
+msgstr "Broncode"
+
+#: ../../include/ItemObject.php:688
+msgid "Image"
+msgstr "Afbeelding"
+
+#: ../../include/ItemObject.php:689
+msgid "Insert Link"
+msgstr "Link invoegen"
+
+#: ../../include/ItemObject.php:690
+msgid "Video"
+msgstr "Video"
+
+#: ../../include/ItemObject.php:694 ../../include/conversation.php:1241
+#: ../../mod/mail.php:247 ../../mod/mail.php:376 ../../mod/editpost.php:158
+msgid "Encrypt text"
+msgstr "Tekst versleutelen"
 
 #: ../../include/text.php:391
 msgid "prev"
@@ -2071,12 +2304,6 @@ msgstr[1] "%d connecties"
 msgid "View Connections"
 msgstr "Connecties weergeven"
 
-#: ../../include/text.php:857 ../../include/text.php:869
-#: ../../include/apps.php:147 ../../include/nav.php:159
-#: ../../mod/search.php:38
-msgid "Search"
-msgstr "Zoeken"
-
 #: ../../include/text.php:858 ../../include/text.php:870
 #: ../../include/widgets.php:191 ../../mod/filer.php:49
 #: ../../mod/admin.php:1411 ../../mod/admin.php:1431 ../../mod/rbmark.php:28
@@ -2088,6 +2315,10 @@ msgstr "Opslaan"
 msgid "poke"
 msgstr "aanstoten"
 
+#: ../../include/text.php:933 ../../include/conversation.php:243
+msgid "poked"
+msgstr "aangestoten"
+
 #: ../../include/text.php:934
 msgid "ping"
 msgstr "ping"
@@ -2216,640 +2447,95 @@ msgstr "verrast"
 msgid "May"
 msgstr "mei"
 
-#: ../../include/text.php:1247
-msgid "unknown.???"
-msgstr "onbekend.???"
+#: ../../include/text.php:1221 ../../include/text.php:1225
+msgid "Unknown Attachment"
+msgstr "Onbekende bijlage"
 
-#: ../../include/text.php:1248
-msgid "bytes"
-msgstr "bytes"
+#: ../../include/text.php:1227
+msgid "Attachment"
+msgstr "Bijlage"
 
-#: ../../include/text.php:1284
+#: ../../include/text.php:1227
+msgid "Size Unknown"
+msgstr "Onbekende grootte"
+
+#: ../../include/text.php:1263
 msgid "remove category"
 msgstr "categorie verwijderen"
 
-#: ../../include/text.php:1359
+#: ../../include/text.php:1340
 msgid "remove from file"
 msgstr "uit map verwijderen"
 
-#: ../../include/text.php:1443 ../../include/text.php:1454
+#: ../../include/text.php:1441 ../../include/text.php:1452
 msgid "Click to open/close"
 msgstr "Klik om te openen of te sluiten"
 
-#: ../../include/text.php:1609 ../../mod/events.php:497
+#: ../../include/text.php:1620 ../../mod/events.php:497
 msgid "Link to Source"
 msgstr "Originele locatie"
 
-#: ../../include/text.php:1630 ../../include/text.php:1701
+#: ../../include/text.php:1641 ../../include/text.php:1712
 msgid "default"
 msgstr "standaard"
 
-#: ../../include/text.php:1638
+#: ../../include/text.php:1649
 msgid "Page layout"
 msgstr "Pagina-lay-out"
 
-#: ../../include/text.php:1638
+#: ../../include/text.php:1649
 msgid "You can create your own with the layouts tool"
 msgstr "Je kan jouw eigen lay-out ontwerpen onder lay-outs"
 
-#: ../../include/text.php:1679
+#: ../../include/text.php:1690
 msgid "Page content type"
 msgstr "Opmaaktype pagina"
 
-#: ../../include/text.php:1713
+#: ../../include/text.php:1724
 msgid "Select an alternate language"
 msgstr "Kies een andere taal"
 
-#: ../../include/text.php:1845
+#: ../../include/text.php:1843 ../../include/conversation.php:120
+#: ../../mod/like.php:361 ../../mod/tagger.php:43 ../../mod/subthread.php:72
+#: ../../mod/subthread.php:172
+msgid "photo"
+msgstr "foto"
+
+#: ../../include/text.php:1849 ../../include/conversation.php:148
+#: ../../mod/like.php:361 ../../mod/subthread.php:72
+#: ../../mod/subthread.php:172
+msgid "status"
+msgstr "bericht"
+
+#: ../../include/text.php:1851 ../../include/conversation.php:150
+#: ../../mod/tagger.php:53
+msgid "comment"
+msgstr "reactie"
+
+#: ../../include/text.php:1856
 msgid "activity"
 msgstr "activiteit"
 
-#: ../../include/text.php:2140
+#: ../../include/text.php:2151
 msgid "Design Tools"
 msgstr "Ontwerp-hulpmiddelen"
 
-#: ../../include/text.php:2143 ../../mod/blocks.php:147
+#: ../../include/text.php:2154 ../../mod/blocks.php:147
 msgid "Blocks"
 msgstr "Blokken"
 
-#: ../../include/text.php:2144 ../../mod/menu.php:103
+#: ../../include/text.php:2155 ../../mod/menu.php:103
 msgid "Menus"
 msgstr "Menu's"
 
-#: ../../include/text.php:2145 ../../mod/layouts.php:174
+#: ../../include/text.php:2156 ../../mod/layouts.php:174
 msgid "Layouts"
 msgstr "Lay-outs"
 
-#: ../../include/text.php:2146
+#: ../../include/text.php:2157
 msgid "Pages"
 msgstr "Pagina's"
 
-#: ../../include/acl_selectors.php:239
-msgid "Visible to your default audience"
-msgstr "Voor iedereen zichtbaar, mits niet anders ingesteld"
-
-#: ../../include/acl_selectors.php:240
-msgid "Show"
-msgstr "Tonen"
-
-#: ../../include/acl_selectors.php:241
-msgid "Don't show"
-msgstr "Niet tonen"
-
-#: ../../include/acl_selectors.php:247 ../../mod/filestorage.php:147
-#: ../../mod/chat.php:207 ../../mod/photos.php:592 ../../mod/photos.php:962
-#: ../../mod/events.php:708 ../../mod/thing.php:310 ../../mod/thing.php:356
-msgid "Permissions"
-msgstr "Permissies"
-
-#: ../../include/acl_selectors.php:248 ../../include/ItemObject.php:361
-#: ../../mod/photos.php:1179
-msgid "Close"
-msgstr "Sluiten"
-
-#: ../../include/attach.php:243 ../../include/attach.php:329
-msgid "Item was not found."
-msgstr "Item niet gevonden"
-
-#: ../../include/attach.php:471
-msgid "No source file."
-msgstr "Geen bronbestand."
-
-#: ../../include/attach.php:489
-msgid "Cannot locate file to replace"
-msgstr "Kan het te vervangen bestand niet vinden"
-
-#: ../../include/attach.php:507
-msgid "Cannot locate file to revise/update"
-msgstr "Kan het bestand wat aangepast moet worden niet vinden"
-
-#: ../../include/attach.php:632
-#, php-format
-msgid "File exceeds size limit of %d"
-msgstr "Bestand is groter dan de toegelaten %d"
-
-#: ../../include/attach.php:645
-#, php-format
-msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
-msgstr "Je hebt jouw limiet van %1$.0f MB opslagruimte voor bijlagen bereikt."
-
-#: ../../include/attach.php:793
-msgid "File upload failed. Possible system limit or action terminated."
-msgstr "Uploaden van bestand mislukt. Mogelijk systeemlimiet bereikt of actie afgebroken."
-
-#: ../../include/attach.php:806
-msgid "Stored file could not be verified. Upload failed."
-msgstr "Opgeslagen bestand kon niet worden geverifieerd. Uploaden mislukt."
-
-#: ../../include/attach.php:854 ../../include/attach.php:870
-msgid "Path not available."
-msgstr "Pad niet beschikbaar."
-
-#: ../../include/attach.php:916 ../../include/attach.php:1069
-msgid "Empty pathname"
-msgstr "Padnaam leeg"
-
-#: ../../include/attach.php:942
-msgid "duplicate filename or path"
-msgstr "dubbele bestandsnaam of pad"
-
-#: ../../include/attach.php:965
-msgid "Path not found."
-msgstr "Pad niet gevonden"
-
-#: ../../include/attach.php:1023
-msgid "mkdir failed."
-msgstr "directory aanmaken (mkdir) mislukt."
-
-#: ../../include/attach.php:1027
-msgid "database storage failed."
-msgstr "opslag in database mislukt."
-
-#: ../../include/attach.php:1075
-msgid "Empty path"
-msgstr "Ontbrekend bestandspad"
-
-#: ../../include/import.php:23
-msgid ""
-"Cannot create a duplicate channel identifier on this system. Import failed."
-msgstr "Kan geen dubbele kanaal-identificator op deze hub aanmaken. Importeren mislukt."
-
-#: ../../include/import.php:70
-msgid "Channel clone failed. Import failed."
-msgstr "Het klonen van het kanaal is mislukt. Importeren mislukt."
-
-#: ../../include/import.php:80 ../../mod/import.php:138
-msgid "Cloned channel not found. Import failed."
-msgstr "Gekloond kanaal niet gevonden. Importeren mislukt."
-
-#: ../../include/notify.php:20
-msgid "created a new post"
-msgstr "maakte een nieuw bericht aan"
-
-#: ../../include/notify.php:21
-#, php-format
-msgid "commented on %s's post"
-msgstr "gaf een reactie op een bericht van %s"
-
-#: ../../include/page_widgets.php:6
-msgid "New Page"
-msgstr "Nieuwe pagina"
-
-#: ../../include/page_widgets.php:39 ../../mod/layouts.php:188
-#: ../../mod/webpages.php:187 ../../mod/blocks.php:159
-msgid "View"
-msgstr "Weergeven"
-
-#: ../../include/page_widgets.php:41 ../../mod/webpages.php:189
-msgid "Actions"
-msgstr "Acties"
-
-#: ../../include/page_widgets.php:42 ../../mod/webpages.php:190
-msgid "Page Link"
-msgstr "Paginalink"
-
-#: ../../include/page_widgets.php:43
-msgid "Title"
-msgstr "Titel"
-
-#: ../../include/page_widgets.php:44 ../../mod/layouts.php:181
-#: ../../mod/menu.php:110 ../../mod/webpages.php:192 ../../mod/blocks.php:150
-msgid "Created"
-msgstr "Aangemaakt"
-
-#: ../../include/page_widgets.php:45 ../../mod/layouts.php:182
-#: ../../mod/menu.php:111 ../../mod/webpages.php:193 ../../mod/blocks.php:151
-msgid "Edited"
-msgstr "Bewerkt"
-
-#: ../../include/photo/photo_driver.php:705 ../../mod/photos.php:94
-#: ../../mod/photos.php:660 ../../mod/profile_photo.php:146
-#: ../../mod/profile_photo.php:236 ../../mod/profile_photo.php:376
-msgid "Profile Photos"
-msgstr "Profielfoto's"
-
-#: ../../include/profile_selectors.php:6
-#: ../../include/profile_selectors.php:23 ../../mod/id.php:103
-msgid "Male"
-msgstr "Man"
-
-#: ../../include/profile_selectors.php:6
-#: ../../include/profile_selectors.php:23 ../../mod/id.php:105
-msgid "Female"
-msgstr "Vrouw"
-
-#: ../../include/profile_selectors.php:6
-msgid "Currently Male"
-msgstr "Momenteel man"
-
-#: ../../include/profile_selectors.php:6
-msgid "Currently Female"
-msgstr "Momenteel vrouw"
-
-#: ../../include/profile_selectors.php:6
-msgid "Mostly Male"
-msgstr "Voornamelijk man"
-
-#: ../../include/profile_selectors.php:6
-msgid "Mostly Female"
-msgstr "Voornamelijk vrouw"
-
-#: ../../include/profile_selectors.php:6
-msgid "Transgender"
-msgstr "Transgender"
-
-#: ../../include/profile_selectors.php:6
-msgid "Intersex"
-msgstr "Interseksueel"
-
-#: ../../include/profile_selectors.php:6
-msgid "Transsexual"
-msgstr "Transseksueel"
-
-#: ../../include/profile_selectors.php:6
-msgid "Hermaphrodite"
-msgstr "Hermafrodiet"
-
-#: ../../include/profile_selectors.php:6
-msgid "Neuter"
-msgstr "Genderneutraal"
-
-#: ../../include/profile_selectors.php:6
-msgid "Non-specific"
-msgstr "Niet gespecificeerd"
-
-#: ../../include/profile_selectors.php:6
-msgid "Undecided"
-msgstr "Nog niet beslist"
-
-#: ../../include/profile_selectors.php:42
-#: ../../include/profile_selectors.php:61
-msgid "Males"
-msgstr "Mannen"
-
-#: ../../include/profile_selectors.php:42
-#: ../../include/profile_selectors.php:61
-msgid "Females"
-msgstr "Vrouwen"
-
-#: ../../include/profile_selectors.php:42
-msgid "Gay"
-msgstr "Homoseksueel"
-
-#: ../../include/profile_selectors.php:42
-msgid "Lesbian"
-msgstr "Lesbisch"
-
-#: ../../include/profile_selectors.php:42
-msgid "No Preference"
-msgstr "Geen voorkeur"
-
-#: ../../include/profile_selectors.php:42
-msgid "Bisexual"
-msgstr "Biseksueel"
-
-#: ../../include/profile_selectors.php:42
-msgid "Autosexual"
-msgstr "Autoseksueel"
-
-#: ../../include/profile_selectors.php:42
-msgid "Abstinent"
-msgstr "Seksuele onthouding"
-
-#: ../../include/profile_selectors.php:42
-msgid "Virgin"
-msgstr "Maagd"
-
-#: ../../include/profile_selectors.php:42
-msgid "Deviant"
-msgstr "Afwijkend"
-
-#: ../../include/profile_selectors.php:42
-msgid "Fetish"
-msgstr "Fetisj"
-
-#: ../../include/profile_selectors.php:42
-msgid "Oodles"
-msgstr "Veel"
-
-#: ../../include/profile_selectors.php:42
-msgid "Nonsexual"
-msgstr "Aseksueel"
-
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Single"
-msgstr "Alleen"
-
-#: ../../include/profile_selectors.php:80
-msgid "Lonely"
-msgstr "Eenzaam"
-
-#: ../../include/profile_selectors.php:80
-msgid "Available"
-msgstr "Beschikbaar"
-
-#: ../../include/profile_selectors.php:80
-msgid "Unavailable"
-msgstr "Niet beschikbaar"
-
-#: ../../include/profile_selectors.php:80
-msgid "Has crush"
-msgstr "Heeft een oogje op iemand"
-
-#: ../../include/profile_selectors.php:80
-msgid "Infatuated"
-msgstr "Smoorverliefd"
-
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Dating"
-msgstr "Aan het daten"
-
-#: ../../include/profile_selectors.php:80
-msgid "Unfaithful"
-msgstr "Ontrouw"
-
-#: ../../include/profile_selectors.php:80
-msgid "Sex Addict"
-msgstr "Seksverslaafd"
-
-#: ../../include/profile_selectors.php:80 ../../include/identity.php:390
-#: ../../include/identity.php:391 ../../include/identity.php:398
-#: ../../include/widgets.php:429 ../../mod/connedit.php:569
-#: ../../mod/settings.php:337 ../../mod/settings.php:341
-#: ../../mod/settings.php:342 ../../mod/settings.php:345
-#: ../../mod/settings.php:356
-msgid "Friends"
-msgstr "Vrienden"
-
-#: ../../include/profile_selectors.php:80
-msgid "Friends/Benefits"
-msgstr "Vriendschap plus"
-
-#: ../../include/profile_selectors.php:80
-msgid "Casual"
-msgstr "Ongebonden/vluchtig"
-
-#: ../../include/profile_selectors.php:80
-msgid "Engaged"
-msgstr "Verloofd"
-
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Married"
-msgstr "Getrouwd"
-
-#: ../../include/profile_selectors.php:80
-msgid "Imaginarily married"
-msgstr "Denkbeeldig getrouwd"
-
-#: ../../include/profile_selectors.php:80
-msgid "Partners"
-msgstr "Partners"
-
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Cohabiting"
-msgstr "Samenwonend"
-
-#: ../../include/profile_selectors.php:80
-msgid "Common law"
-msgstr "Common-law-huwelijk"
-
-#: ../../include/profile_selectors.php:80
-msgid "Happy"
-msgstr "Gelukkig"
-
-#: ../../include/profile_selectors.php:80
-msgid "Not looking"
-msgstr "Niet op zoek"
-
-#: ../../include/profile_selectors.php:80
-msgid "Swinger"
-msgstr "Swinger"
-
-#: ../../include/profile_selectors.php:80
-msgid "Betrayed"
-msgstr "Verraden"
-
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Separated"
-msgstr "Uit elkaar"
-
-#: ../../include/profile_selectors.php:80
-msgid "Unstable"
-msgstr "Onstabiel"
-
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Divorced"
-msgstr "Gescheiden"
-
-#: ../../include/profile_selectors.php:80
-msgid "Imaginarily divorced"
-msgstr "Denkbeeldig gescheiden"
-
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Widowed"
-msgstr "Weduwnaar/weduwe"
-
-#: ../../include/profile_selectors.php:80
-msgid "Uncertain"
-msgstr "Onzeker"
-
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "It's complicated"
-msgstr "Het is ingewikkeld"
-
-#: ../../include/profile_selectors.php:80
-msgid "Don't care"
-msgstr "Maakt mij niks uit"
-
-#: ../../include/profile_selectors.php:80
-msgid "Ask me"
-msgstr "Vraag het me"
-
-#: ../../include/oembed.php:213
-msgid "Embedded content"
-msgstr "Ingesloten inhoud"
-
-#: ../../include/oembed.php:222
-msgid "Embedding disabled"
-msgstr "Insluiten uitgeschakeld"
-
-#: ../../include/event.php:22 ../../include/bb2diaspora.php:459
-msgid "l F d, Y \\@ g:i A"
-msgstr "l d F Y \\@ G:i"
-
-#: ../../include/event.php:30 ../../include/bb2diaspora.php:465
-msgid "Starts:"
-msgstr "Start:"
-
-#: ../../include/event.php:40 ../../include/bb2diaspora.php:473
-msgid "Finishes:"
-msgstr "Einde:"
-
-#: ../../include/event.php:50 ../../include/bb2diaspora.php:481
-#: ../../include/identity.php:992 ../../mod/directory.php:302
-#: ../../mod/events.php:701
-msgid "Location:"
-msgstr "Plaats:"
-
-#: ../../include/event.php:766
-msgid "This event has been added to your calendar."
-msgstr "Dit evenement is aan jouw agenda toegevoegd."
-
-#: ../../include/event.php:953
-msgid "Not specified"
-msgstr "Niet aangegeven"
-
-#: ../../include/event.php:954
-msgid "Needs Action"
-msgstr "Actie vereist"
-
-#: ../../include/event.php:955
-msgid "Completed"
-msgstr "Voltooid"
-
-#: ../../include/event.php:956
-msgid "In Process"
-msgstr "In behandeling"
-
-#: ../../include/event.php:957
-msgid "Cancelled"
-msgstr "Geannuleerd"
-
-#: ../../include/apps.php:128
-msgid "Site Admin"
-msgstr "Hubbeheerder"
-
-#: ../../include/apps.php:130
-msgid "Address Book"
-msgstr "Connecties"
-
-#: ../../include/apps.php:131 ../../include/nav.php:111 ../../boot.php:1497
-msgid "Login"
-msgstr "Inloggen"
-
-#: ../../include/apps.php:132 ../../include/nav.php:200
-#: ../../mod/manage.php:160
-msgid "Channel Manager"
-msgstr "Kanaalbeheer"
-
-#: ../../include/apps.php:133
-msgid "Matrix"
-msgstr "Matrix"
-
-#: ../../include/apps.php:134 ../../include/widgets.php:553
-#: ../../include/nav.php:202 ../../mod/admin.php:1033 ../../mod/admin.php:1233
-msgid "Settings"
-msgstr "Instellingen"
-
-#: ../../include/apps.php:137 ../../include/nav.php:177
-msgid "Channel Home"
-msgstr "Tijdlijn kanaal"
-
-#: ../../include/apps.php:138 ../../include/identity.php:1226
-#: ../../include/identity.php:1343 ../../mod/profperm.php:112
-msgid "Profile"
-msgstr "Profiel"
-
-#: ../../include/apps.php:140 ../../include/nav.php:196
-#: ../../mod/events.php:526
-msgid "Events"
-msgstr "Agenda"
-
-#: ../../include/apps.php:141 ../../include/nav.php:162
-msgid "Directory"
-msgstr "Kanalengids"
-
-#: ../../include/apps.php:142 ../../include/nav.php:154 ../../mod/help.php:202
-#: ../../mod/help.php:207 ../../mod/layouts.php:176
-msgid "Help"
-msgstr "Hulp"
-
-#: ../../include/apps.php:143 ../../include/nav.php:188
-msgid "Mail"
-msgstr "Privéberichten"
-
-#: ../../include/apps.php:144 ../../mod/mood.php:131
-msgid "Mood"
-msgstr "Stemming"
-
-#: ../../include/apps.php:146 ../../include/nav.php:97
-msgid "Chat"
-msgstr "Chatten"
-
-#: ../../include/apps.php:148
-msgid "Probe"
-msgstr "Onderzoeken"
-
-#: ../../include/apps.php:149
-msgid "Suggest"
-msgstr "Voorstellen"
-
-#: ../../include/apps.php:150
-msgid "Random Channel"
-msgstr "Willekeurig kanaal"
-
-#: ../../include/apps.php:151
-msgid "Invite"
-msgstr "Uitnodigen "
-
-#: ../../include/apps.php:152
-msgid "Features"
-msgstr "Extra functies"
-
-#: ../../include/apps.php:153 ../../mod/id.php:28
-msgid "Language"
-msgstr "Taal"
-
-#: ../../include/apps.php:154
-msgid "Post"
-msgstr "Bericht"
-
-#: ../../include/apps.php:155 ../../mod/id.php:17 ../../mod/id.php:18
-#: ../../mod/id.php:19
-msgid "Profile Photo"
-msgstr "Profielfoto"
-
-#: ../../include/apps.php:247 ../../mod/settings.php:84
-#: ../../mod/settings.php:609
-msgid "Update"
-msgstr "Bijwerken"
-
-#: ../../include/apps.php:247
-msgid "Install"
-msgstr "Installeren"
-
-#: ../../include/apps.php:252
-msgid "Purchase"
-msgstr "Aanschaffen"
-
-#: ../../include/auth.php:131
-msgid "Logged out."
-msgstr "Uitgelogd."
-
-#: ../../include/auth.php:272
-msgid "Failed authentication"
-msgstr "Mislukte authenticatie"
-
-#: ../../include/auth.php:286 ../../mod/openid.php:189
-msgid "Login failed."
-msgstr "Inloggen mislukt."
-
-#: ../../include/bb2diaspora.php:373
-msgid "Attachments:"
-msgstr "Bijlagen:"
-
-#: ../../include/bb2diaspora.php:461
-msgid "$Projectname event notification:"
-msgstr "Notificatie $Projectname-gebeurtenis:"
-
 #: ../../include/bbcode.php:123 ../../include/bbcode.php:793
 #: ../../include/bbcode.php:796 ../../include/bbcode.php:801
 #: ../../include/bbcode.php:804 ../../include/bbcode.php:807
@@ -2941,47 +2627,47 @@ msgstr "Vul de vereiste informatie in."
 msgid "Failed to store account information."
 msgstr "Account-informatie kon niet opgeslagen worden."
 
-#: ../../include/account.php:246
+#: ../../include/account.php:248
 #, php-format
 msgid "Registration confirmation for %s"
 msgstr "Registratiebevestiging voor %s"
 
-#: ../../include/account.php:312
+#: ../../include/account.php:314
 #, php-format
 msgid "Registration request at %s"
 msgstr "Registratiebevestiging voor %s"
 
-#: ../../include/account.php:336
+#: ../../include/account.php:338
 msgid "your registration password"
 msgstr "jouw registratiewachtwoord"
 
-#: ../../include/account.php:339 ../../include/account.php:399
+#: ../../include/account.php:341 ../../include/account.php:401
 #, php-format
 msgid "Registration details for %s"
 msgstr "Registratiegegevens voor %s"
 
-#: ../../include/account.php:408
+#: ../../include/account.php:410
 msgid "Account approved."
 msgstr "Account goedgekeurd"
 
-#: ../../include/account.php:447
+#: ../../include/account.php:449
 #, php-format
 msgid "Registration revoked for %s"
 msgstr "Registratie ingetrokken voor %s"
 
-#: ../../include/account.php:492
+#: ../../include/account.php:494
 msgid "Account verified. Please login."
 msgstr "Account is geverifieerd. Je kan inloggen."
 
-#: ../../include/account.php:705 ../../include/account.php:707
+#: ../../include/account.php:707 ../../include/account.php:709
 msgid "Click here to upgrade."
 msgstr "Klik hier om te upgraden."
 
-#: ../../include/account.php:713
+#: ../../include/account.php:715
 msgid "This action exceeds the limits set by your subscription plan."
 msgstr "Deze handeling overschrijdt de beperkingen die voor jouw abonnement gelden."
 
-#: ../../include/account.php:718
+#: ../../include/account.php:720
 msgid "This action is not available under your subscription plan."
 msgstr "Deze handeling is niet mogelijk met jouw abonnement."
 
@@ -3001,7 +2687,7 @@ msgstr "Antwoord van het kanaal op afstand was niet volledig."
 msgid "Channel was deleted and no longer exists."
 msgstr "Kanaal is verwijderd en bestaat niet meer."
 
-#: ../../include/follow.php:154
+#: ../../include/follow.php:152 ../../include/follow.php:180
 msgid "Protocol disabled."
 msgstr "Protocol uitgeschakeld."
 
@@ -3009,15 +2695,15 @@ msgstr "Protocol uitgeschakeld."
 msgid "Channel discovery failed."
 msgstr "Kanaal ontdekken mislukt."
 
-#: ../../include/follow.php:186
+#: ../../include/follow.php:196
 msgid "local account not found."
 msgstr "lokale account niet gevonden."
 
-#: ../../include/follow.php:210
+#: ../../include/follow.php:220
 msgid "Cannot connect to yourself."
 msgstr "Kan niet met jezelf verbinden"
 
-#: ../../include/security.php:345
+#: ../../include/security.php:381
 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."
@@ -3132,84 +2818,38 @@ msgstr "Kanalen die zich in geen enkele collectie bevinden"
 msgid "add"
 msgstr "toevoegen"
 
-#: ../../include/taxonomy.php:229 ../../include/taxonomy.php:250
-msgid "Tags"
-msgstr "Tags"
-
-#: ../../include/taxonomy.php:294
-msgid "Keywords"
-msgstr "Trefwoorden"
-
-#: ../../include/taxonomy.php:315
-msgid "have"
-msgstr "heb"
-
-#: ../../include/taxonomy.php:315
-msgid "has"
-msgstr "heeft"
-
-#: ../../include/taxonomy.php:316
-msgid "want"
-msgstr "wil"
-
-#: ../../include/taxonomy.php:316
-msgid "wants"
-msgstr "wil"
-
-#: ../../include/taxonomy.php:317 ../../include/ItemObject.php:254
-msgid "like"
-msgstr "vind dit leuk"
-
-#: ../../include/taxonomy.php:317
-msgid "likes"
-msgstr "vindt dit leuk"
-
-#: ../../include/taxonomy.php:318 ../../include/ItemObject.php:255
-msgid "dislike"
-msgstr "vind dit niet leuk"
+#: ../../include/zot.php:683
+msgid "Invalid data packet"
+msgstr "Datapakket ongeldig"
 
-#: ../../include/taxonomy.php:318
-msgid "dislikes"
-msgstr "vindt dit niet leuk"
+#: ../../include/zot.php:699
+msgid "Unable to verify channel signature"
+msgstr "Kanaalkenmerk kon niet worden geverifieerd.  "
 
-#: ../../include/dir_fns.php:126
-msgid "Directory Options"
-msgstr "Opties kanalengids"
+#: ../../include/zot.php:2235
+#, php-format
+msgid "Unable to verify site signature for %s"
+msgstr "Hubkenmerk voor %s kon niet worden geverifieerd"
 
-#: ../../include/dir_fns.php:128
-msgid "Safe Mode"
-msgstr "Veilig zoeken"
+#: ../../include/zot.php:3555
+msgid "invalid target signature"
+msgstr "ongeldig doelkenmerk"
 
-#: ../../include/dir_fns.php:128 ../../include/dir_fns.php:129
-#: ../../include/dir_fns.php:130 ../../mod/removeme.php:60
-#: ../../mod/mitem.php:154 ../../mod/mitem.php:155 ../../mod/mitem.php:228
-#: ../../mod/mitem.php:229 ../../mod/connedit.php:631
-#: ../../mod/connedit.php:659 ../../mod/filestorage.php:151
-#: ../../mod/filestorage.php:159 ../../mod/admin.php:386 ../../mod/menu.php:96
-#: ../../mod/menu.php:153 ../../mod/photos.php:589 ../../mod/settings.php:574
-#: ../../mod/api.php:106 ../../view/theme/redbasic/php/config.php:104
-#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1501
-msgid "No"
-msgstr "Nee"
+#: ../../include/message.php:18
+msgid "No recipient provided."
+msgstr "Geen ontvanger opgegeven."
 
-#: ../../include/dir_fns.php:128 ../../include/dir_fns.php:129
-#: ../../include/dir_fns.php:130 ../../mod/removeme.php:60
-#: ../../mod/mitem.php:154 ../../mod/mitem.php:155 ../../mod/mitem.php:228
-#: ../../mod/mitem.php:229 ../../mod/filestorage.php:151
-#: ../../mod/filestorage.php:159 ../../mod/admin.php:388 ../../mod/menu.php:96
-#: ../../mod/menu.php:153 ../../mod/photos.php:589 ../../mod/settings.php:574
-#: ../../mod/api.php:105 ../../view/theme/redbasic/php/config.php:104
-#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1501
-msgid "Yes"
-msgstr "Ja"
+#: ../../include/message.php:23
+msgid "[no subject]"
+msgstr "[geen onderwerp]"
 
-#: ../../include/dir_fns.php:129
-msgid "Public Forums Only"
-msgstr "Alleen openbare forums"
+#: ../../include/message.php:43
+msgid "Unable to determine sender."
+msgstr "Afzender kan niet bepaald worden."
 
-#: ../../include/dir_fns.php:130
-msgid "This Website Only"
-msgstr "Alleen deze hub"
+#: ../../include/message.php:218
+msgid "Stored post could not be verified."
+msgstr "Opgeslagen bericht kon niet worden geverifieerd."
 
 #: ../../include/identity.php:32
 msgid "Unable to obtain identity information from database"
@@ -3248,11 +2888,11 @@ msgstr "Niet in staat om aangemaakte identiteit te vinden"
 msgid "Default Profile"
 msgstr "Standaardprofiel"
 
-#: ../../include/identity.php:745
+#: ../../include/identity.php:769
 msgid "Requested channel is not available."
 msgstr "Opgevraagd kanaal is niet beschikbaar."
 
-#: ../../include/identity.php:791 ../../mod/achievements.php:11
+#: ../../include/identity.php:815 ../../mod/achievements.php:11
 #: ../../mod/filestorage.php:54 ../../mod/hcard.php:8 ../../mod/layouts.php:29
 #: ../../mod/editblock.php:29 ../../mod/profile.php:16
 #: ../../mod/webpages.php:29 ../../mod/blocks.php:29
@@ -3261,417 +2901,768 @@ msgstr "Opgevraagd kanaal is niet beschikbaar."
 msgid "Requested profile is not available."
 msgstr "Opgevraagd profiel is niet beschikbaar"
 
-#: ../../include/identity.php:954 ../../mod/profiles.php:774
+#: ../../include/identity.php:978 ../../mod/profiles.php:774
 msgid "Change profile photo"
 msgstr "Profielfoto veranderen"
 
-#: ../../include/identity.php:960
+#: ../../include/identity.php:984
 msgid "Profiles"
 msgstr "Profielen"
 
-#: ../../include/identity.php:960
+#: ../../include/identity.php:984
 msgid "Manage/edit profiles"
 msgstr "Profielen beheren/bewerken"
 
-#: ../../include/identity.php:961 ../../mod/profiles.php:775
+#: ../../include/identity.php:985 ../../mod/profiles.php:775
 msgid "Create New Profile"
 msgstr "Nieuw profiel aanmaken"
 
-#: ../../include/identity.php:964 ../../include/nav.php:90
+#: ../../include/identity.php:988 ../../include/nav.php:90
 msgid "Edit Profile"
 msgstr "Profiel bewerken"
 
-#: ../../include/identity.php:976 ../../mod/profiles.php:786
+#: ../../include/identity.php:1000 ../../mod/profiles.php:786
 msgid "Profile Image"
 msgstr "Profielfoto"
 
-#: ../../include/identity.php:979
+#: ../../include/identity.php:1003
 msgid "visible to everybody"
 msgstr "Voor iedereen zichtbaar"
 
-#: ../../include/identity.php:980 ../../mod/profiles.php:669
+#: ../../include/identity.php:1004 ../../mod/profiles.php:669
 #: ../../mod/profiles.php:790
 msgid "Edit visibility"
 msgstr "Zichtbaarheid bewerken"
 
-#: ../../include/identity.php:996 ../../include/identity.php:1236
+#: ../../include/identity.php:1020 ../../include/identity.php:1260
 msgid "Gender:"
 msgstr "Geslacht:"
 
-#: ../../include/identity.php:997 ../../include/identity.php:1280
+#: ../../include/identity.php:1021 ../../include/identity.php:1304
 msgid "Status:"
 msgstr "Status:"
 
-#: ../../include/identity.php:998 ../../include/identity.php:1291
+#: ../../include/identity.php:1022 ../../include/identity.php:1315
 msgid "Homepage:"
 msgstr "Homepagina:"
 
-#: ../../include/identity.php:999
+#: ../../include/identity.php:1023
 msgid "Online Now"
 msgstr "Nu online"
 
-#: ../../include/identity.php:1083 ../../include/identity.php:1161
+#: ../../include/identity.php:1107 ../../include/identity.php:1185
 #: ../../mod/ping.php:318
 msgid "g A l F d"
 msgstr "G:i, l d F"
 
-#: ../../include/identity.php:1084 ../../include/identity.php:1162
+#: ../../include/identity.php:1108 ../../include/identity.php:1186
 msgid "F d"
 msgstr "d F"
 
-#: ../../include/identity.php:1129 ../../include/identity.php:1201
+#: ../../include/identity.php:1153 ../../include/identity.php:1225
 #: ../../mod/ping.php:341
 msgid "[today]"
 msgstr "[vandaag]"
 
-#: ../../include/identity.php:1140
+#: ../../include/identity.php:1164
 msgid "Birthday Reminders"
 msgstr "Verjaardagsherinneringen"
 
-#: ../../include/identity.php:1141
+#: ../../include/identity.php:1165
 msgid "Birthdays this week:"
 msgstr "Verjaardagen deze week:"
 
-#: ../../include/identity.php:1194
+#: ../../include/identity.php:1218
 msgid "[No description]"
 msgstr "[Geen omschrijving]"
 
-#: ../../include/identity.php:1212
+#: ../../include/identity.php:1236
 msgid "Event Reminders"
 msgstr "Herinneringen"
 
-#: ../../include/identity.php:1213
+#: ../../include/identity.php:1237
 msgid "Events this week:"
 msgstr "Gebeurtenissen deze week:"
 
-#: ../../include/identity.php:1234 ../../mod/settings.php:1026
+#: ../../include/identity.php:1258 ../../mod/settings.php:1026
 msgid "Full Name:"
 msgstr "Volledige naam:"
 
-#: ../../include/identity.php:1241
+#: ../../include/identity.php:1265
 msgid "Like this channel"
 msgstr "Vind dit kanaal leuk"
 
-#: ../../include/identity.php:1265
+#: ../../include/identity.php:1289
 msgid "j F, Y"
 msgstr "F j Y"
 
-#: ../../include/identity.php:1266
+#: ../../include/identity.php:1290
 msgid "j F"
 msgstr "F j"
 
-#: ../../include/identity.php:1273
+#: ../../include/identity.php:1297
 msgid "Birthday:"
 msgstr "Geboortedatum:"
 
-#: ../../include/identity.php:1277 ../../mod/directory.php:297
+#: ../../include/identity.php:1301 ../../mod/directory.php:297
 msgid "Age:"
 msgstr "Leeftijd:"
 
-#: ../../include/identity.php:1286
+#: ../../include/identity.php:1310
 #, php-format
 msgid "for %1$d %2$s"
 msgstr "voor %1$d %2$s"
 
-#: ../../include/identity.php:1289 ../../mod/profiles.php:691
+#: ../../include/identity.php:1313 ../../mod/profiles.php:691
 msgid "Sexual Preference:"
 msgstr "Seksuele voorkeur:"
 
-#: ../../include/identity.php:1293 ../../mod/directory.php:313
+#: ../../include/identity.php:1317 ../../mod/directory.php:313
 #: ../../mod/profiles.php:693
 msgid "Hometown:"
 msgstr "Oorspronkelijk uit:"
 
-#: ../../include/identity.php:1295
+#: ../../include/identity.php:1319
 msgid "Tags:"
 msgstr "Tags:"
 
-#: ../../include/identity.php:1297 ../../mod/profiles.php:694
+#: ../../include/identity.php:1321 ../../mod/profiles.php:694
 msgid "Political Views:"
 msgstr "Politieke overtuigingen:"
 
-#: ../../include/identity.php:1299
+#: ../../include/identity.php:1323
 msgid "Religion:"
 msgstr "Religie:"
 
-#: ../../include/identity.php:1301 ../../mod/directory.php:315
+#: ../../include/identity.php:1325 ../../mod/directory.php:315
 msgid "About:"
 msgstr "Over:"
 
-#: ../../include/identity.php:1303
+#: ../../include/identity.php:1327
 msgid "Hobbies/Interests:"
 msgstr "Hobby's/interesses:"
 
-#: ../../include/identity.php:1305 ../../mod/profiles.php:697
+#: ../../include/identity.php:1329 ../../mod/profiles.php:697
 msgid "Likes:"
 msgstr "Houdt van:"
 
-#: ../../include/identity.php:1307 ../../mod/profiles.php:698
+#: ../../include/identity.php:1331 ../../mod/profiles.php:698
 msgid "Dislikes:"
 msgstr "Houdt niet van:"
 
-#: ../../include/identity.php:1309
+#: ../../include/identity.php:1333
 msgid "Contact information and Social Networks:"
 msgstr "Contactinformatie en sociale netwerken:"
 
-#: ../../include/identity.php:1311
+#: ../../include/identity.php:1335
 msgid "My other channels:"
 msgstr "Mijn andere kanalen"
 
-#: ../../include/identity.php:1313
+#: ../../include/identity.php:1337
 msgid "Musical interests:"
 msgstr "Muzikale interesses:"
 
-#: ../../include/identity.php:1315
+#: ../../include/identity.php:1339
 msgid "Books, literature:"
 msgstr "Boeken, literatuur:"
 
-#: ../../include/identity.php:1317
+#: ../../include/identity.php:1341
 msgid "Television:"
 msgstr "Televisie:"
 
-#: ../../include/identity.php:1319
+#: ../../include/identity.php:1343
 msgid "Film/dance/culture/entertainment:"
 msgstr "Films/dansen/cultuur/vermaak:"
 
-#: ../../include/identity.php:1321
+#: ../../include/identity.php:1345
 msgid "Love/Romance:"
 msgstr "Liefde/romantiek:"
 
-#: ../../include/identity.php:1323
+#: ../../include/identity.php:1347
 msgid "Work/employment:"
 msgstr "Werk/beroep:"
 
-#: ../../include/identity.php:1325
+#: ../../include/identity.php:1349
 msgid "School/education:"
 msgstr "School/opleiding:"
 
-#: ../../include/identity.php:1345
+#: ../../include/identity.php:1369
 msgid "Like this thing"
 msgstr "Vind dit ding leuk"
 
-#: ../../include/message.php:18
-msgid "No recipient provided."
-msgstr "Geen ontvanger opgegeven."
-
-#: ../../include/message.php:23
-msgid "[no subject]"
-msgstr "[geen onderwerp]"
+#: ../../include/taxonomy.php:229 ../../include/taxonomy.php:250
+msgid "Tags"
+msgstr "Tags"
 
-#: ../../include/message.php:45
-msgid "Unable to determine sender."
-msgstr "Afzender kan niet bepaald worden."
+#: ../../include/taxonomy.php:294
+msgid "Keywords"
+msgstr "Trefwoorden"
 
-#: ../../include/message.php:203
-msgid "Stored post could not be verified."
-msgstr "Opgeslagen bericht kon niet worden geverifieerd."
+#: ../../include/taxonomy.php:315
+msgid "have"
+msgstr "heb"
 
-#: ../../include/ItemObject.php:130
-msgid "Save to Folder"
-msgstr "In map opslaan"
+#: ../../include/taxonomy.php:315
+msgid "has"
+msgstr "heeft"
 
-#: ../../include/ItemObject.php:151
-msgid "I will attend"
-msgstr "Aanwezig"
+#: ../../include/taxonomy.php:316
+msgid "want"
+msgstr "wil"
 
-#: ../../include/ItemObject.php:151
-msgid "I will not attend"
-msgstr "Niet aanwezig"
+#: ../../include/taxonomy.php:316
+msgid "wants"
+msgstr "wil"
 
-#: ../../include/ItemObject.php:151
-msgid "I might attend"
-msgstr "Mogelijk aanwezig"
+#: ../../include/taxonomy.php:317
+msgid "likes"
+msgstr "vindt dit leuk"
 
-#: ../../include/ItemObject.php:161
-msgid "I agree"
-msgstr "Eens"
+#: ../../include/taxonomy.php:318
+msgid "dislikes"
+msgstr "vindt dit niet leuk"
 
-#: ../../include/ItemObject.php:161
-msgid "I disagree"
-msgstr "Oneens"
+#: ../../include/attach.php:243 ../../include/attach.php:329
+msgid "Item was not found."
+msgstr "Item niet gevonden"
 
-#: ../../include/ItemObject.php:161
-msgid "I abstain"
-msgstr "Onthouding"
+#: ../../include/attach.php:493
+msgid "No source file."
+msgstr "Geen bronbestand."
 
-#: ../../include/ItemObject.php:212
-msgid "Add Star"
-msgstr "Ster toevoegen"
+#: ../../include/attach.php:511
+msgid "Cannot locate file to replace"
+msgstr "Kan het te vervangen bestand niet vinden"
 
-#: ../../include/ItemObject.php:213
-msgid "Remove Star"
-msgstr "Ster verwijderen"
+#: ../../include/attach.php:529
+msgid "Cannot locate file to revise/update"
+msgstr "Kan het bestand wat aangepast moet worden niet vinden"
 
-#: ../../include/ItemObject.php:214
-msgid "Toggle Star Status"
-msgstr "Ster toevoegen of verwijderen"
+#: ../../include/attach.php:664
+#, php-format
+msgid "File exceeds size limit of %d"
+msgstr "Bestand is groter dan de toegelaten %d"
 
-#: ../../include/ItemObject.php:218
-msgid "starred"
-msgstr "met ster"
+#: ../../include/attach.php:678
+#, php-format
+msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
+msgstr "Je hebt jouw limiet van %1$.0f MB opslagruimte voor bijlagen bereikt."
 
-#: ../../include/ItemObject.php:236
-msgid "Add Tag"
-msgstr "Tag toevoegen"
+#: ../../include/attach.php:828
+msgid "File upload failed. Possible system limit or action terminated."
+msgstr "Uploaden van bestand mislukt. Mogelijk systeemlimiet bereikt of actie afgebroken."
 
-#: ../../include/ItemObject.php:254 ../../mod/photos.php:987
-msgid "I like this (toggle)"
-msgstr "Vind ik leuk"
+#: ../../include/attach.php:841
+msgid "Stored file could not be verified. Upload failed."
+msgstr "Opgeslagen bestand kon niet worden geverifieerd. Uploaden mislukt."
 
-#: ../../include/ItemObject.php:255 ../../mod/photos.php:988
-msgid "I don't like this (toggle)"
-msgstr "Vind ik niet leuk"
+#: ../../include/attach.php:889 ../../include/attach.php:905
+msgid "Path not available."
+msgstr "Pad niet beschikbaar."
 
-#: ../../include/ItemObject.php:259
-msgid "Share This"
-msgstr "Delen"
+#: ../../include/attach.php:951 ../../include/attach.php:1103
+msgid "Empty pathname"
+msgstr "Padnaam leeg"
 
-#: ../../include/ItemObject.php:259
-msgid "share"
-msgstr "delen"
+#: ../../include/attach.php:977
+msgid "duplicate filename or path"
+msgstr "dubbele bestandsnaam of pad"
 
-#: ../../include/ItemObject.php:276
-#, php-format
-msgid "%d comment"
-msgid_plural "%d comments"
-msgstr[0] "%d reactie"
-msgstr[1] "%d reacties weergeven"
+#: ../../include/attach.php:999
+msgid "Path not found."
+msgstr "Pad niet gevonden"
 
-#: ../../include/ItemObject.php:295 ../../include/ItemObject.php:296
-#, php-format
-msgid "View %s's profile - %s"
-msgstr "Profiel van %s bekijken - %s"
+#: ../../include/attach.php:1057
+msgid "mkdir failed."
+msgstr "directory aanmaken (mkdir) mislukt."
 
-#: ../../include/ItemObject.php:299
-msgid "to"
-msgstr "aan"
+#: ../../include/attach.php:1061
+msgid "database storage failed."
+msgstr "opslag in database mislukt."
 
-#: ../../include/ItemObject.php:300
-msgid "via"
-msgstr "via"
+#: ../../include/attach.php:1109
+msgid "Empty path"
+msgstr "Ontbrekend bestandspad"
 
-#: ../../include/ItemObject.php:301
-msgid "Wall-to-Wall"
-msgstr "Kanaal-naar-kanaal"
+#: ../../include/conversation.php:126 ../../mod/like.php:113
+msgid "channel"
+msgstr "kanaal"
 
-#: ../../include/ItemObject.php:302
-msgid "via Wall-To-Wall:"
-msgstr "via kanaal-naar-kanaal"
+#: ../../include/conversation.php:164 ../../mod/like.php:410
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
+msgstr "%1$s vindt %3$s van %2$s leuk"
 
-#: ../../include/ItemObject.php:305
-msgid "Delivery Report"
-msgstr "Afleveringsrapport"
+#: ../../include/conversation.php:167 ../../mod/like.php:412
+#, php-format
+msgid "%1$s doesn't like %2$s's %3$s"
+msgstr "%1$s vindt %3$s van %2$s niet leuk"
 
-#: ../../include/ItemObject.php:339
-msgid "Save Bookmarks"
-msgstr "Bladwijzers opslaan"
+#: ../../include/conversation.php:204
+#, php-format
+msgid "%1$s is now connected with %2$s"
+msgstr "%1$s is nu met %2$s verbonden"
 
-#: ../../include/ItemObject.php:340
-msgid "Add to Calendar"
-msgstr "Aan agenda toevoegen"
+#: ../../include/conversation.php:239
+#, php-format
+msgid "%1$s poked %2$s"
+msgstr "%1$s heeft %2$s aangestoten"
 
-#: ../../include/ItemObject.php:349
-msgid "Mark all seen"
-msgstr "Markeer alles als bekeken"
+#: ../../include/conversation.php:260 ../../mod/mood.php:63
+#, php-format
+msgctxt "mood"
+msgid "%1$s is %2$s"
+msgstr "%1$s is %2$s"
 
-#: ../../include/ItemObject.php:355 ../../mod/photos.php:1173
-msgctxt "noun"
+#: ../../include/conversation.php:574 ../../mod/photos.php:1060
+msgctxt "title"
 msgid "Likes"
 msgstr "vinden dit leuk"
 
-#: ../../include/ItemObject.php:356 ../../mod/photos.php:1174
-msgctxt "noun"
+#: ../../include/conversation.php:574 ../../mod/photos.php:1060
+msgctxt "title"
 msgid "Dislikes"
 msgstr "vinden dit niet leuk"
 
-#: ../../include/ItemObject.php:671 ../../mod/photos.php:1006
-#: ../../mod/photos.php:1124
-msgid "This is you"
-msgstr "Dit ben jij"
+#: ../../include/conversation.php:575 ../../mod/photos.php:1061
+msgctxt "title"
+msgid "Agree"
+msgstr "eens"
 
-#: ../../include/ItemObject.php:680
-msgid "Image"
-msgstr "Afbeelding"
+#: ../../include/conversation.php:575 ../../mod/photos.php:1061
+msgctxt "title"
+msgid "Disagree"
+msgstr "oneens"
 
-#: ../../include/ItemObject.php:681
-msgid "Insert Link"
-msgstr "Link invoegen"
+#: ../../include/conversation.php:575 ../../mod/photos.php:1061
+msgctxt "title"
+msgid "Abstain"
+msgstr "onthoudingen"
 
-#: ../../include/ItemObject.php:682
-msgid "Video"
-msgstr "Video"
+#: ../../include/conversation.php:576 ../../mod/photos.php:1062
+msgctxt "title"
+msgid "Attending"
+msgstr "aanwezig"
 
-#: ../../include/items.php:423 ../../mod/like.php:280 ../../mod/dreport.php:6
-#: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/profperm.php:23
-#: ../../mod/import_items.php:114 ../../index.php:360
-msgid "Permission denied"
-msgstr "Toegang geweigerd"
+#: ../../include/conversation.php:576 ../../mod/photos.php:1062
+msgctxt "title"
+msgid "Not attending"
+msgstr "niet aanwezig"
 
-#: ../../include/items.php:1128 ../../include/items.php:1174
-msgid "(Unknown)"
-msgstr "(Onbekend)"
+#: ../../include/conversation.php:576 ../../mod/photos.php:1062
+msgctxt "title"
+msgid "Might attend"
+msgstr "mogelijk aanwezig"
 
-#: ../../include/items.php:1371
-msgid "Visible to anybody on the internet."
-msgstr "Voor iedereen op het internet zichtbaar."
+#: ../../include/conversation.php:692
+#, php-format
+msgid "View %s's profile @ %s"
+msgstr "Bekijk het profiel van %s @ %s"
 
-#: ../../include/items.php:1373
-msgid "Visible to you only."
-msgstr "Alleen voor jou zichtbaar."
+#: ../../include/conversation.php:709
+msgid "Categories:"
+msgstr "Categorieën:"
 
-#: ../../include/items.php:1375
-msgid "Visible to anybody in this network."
-msgstr "Voor iedereen in dit netwerk zichtbaar."
+#: ../../include/conversation.php:710
+msgid "Filed under:"
+msgstr "Bewaard onder:"
 
-#: ../../include/items.php:1377
-msgid "Visible to anybody authenticated."
-msgstr "Voor iedereen die geauthenticeerd is zichtbaar."
+#: ../../include/conversation.php:737
+msgid "View in context"
+msgstr "In context bekijken"
 
-#: ../../include/items.php:1379
-#, php-format
-msgid "Visible to anybody on %s."
-msgstr "Voor iedereen op %s zichtbaar."
+#: ../../include/conversation.php:850
+msgid "remove"
+msgstr "verwijderen"
 
-#: ../../include/items.php:1381
-msgid "Visible to all connections."
-msgstr "Voor alle connecties zichtbaar."
+#: ../../include/conversation.php:854 ../../include/nav.php:241
+msgid "Loading..."
+msgstr "Aan het laden..."
 
-#: ../../include/items.php:1383
-msgid "Visible to approved connections."
-msgstr "Voor alle goedgekeurde connecties zichtbaar."
+#: ../../include/conversation.php:855
+msgid "Delete Selected Items"
+msgstr "Verwijder de geselecteerde items"
 
-#: ../../include/items.php:1385
-msgid "Visible to specific connections."
-msgstr "Voor specifieke connecties zichtbaar."
+#: ../../include/conversation.php:943
+msgid "View Source"
+msgstr "Bron weergeven"
 
-#: ../../include/items.php:4263 ../../mod/display.php:36
-#: ../../mod/filestorage.php:27 ../../mod/admin.php:127
-#: ../../mod/admin.php:979 ../../mod/admin.php:1179 ../../mod/thing.php:86
-#: ../../mod/viewsrc.php:20
-msgid "Item not found."
-msgstr "Item niet gevonden."
+#: ../../include/conversation.php:944
+msgid "Follow Thread"
+msgstr "Conversatie volgen"
 
-#: ../../include/items.php:4772 ../../mod/group.php:38 ../../mod/group.php:137
-msgid "Collection not found."
-msgstr "Collectie niet gevonden."
+#: ../../include/conversation.php:945
+msgid "View Status"
+msgstr "Status weergeven"
 
-#: ../../include/items.php:4788
-msgid "Collection is empty."
-msgstr "Collectie is leeg"
+#: ../../include/conversation.php:946 ../../include/nav.php:86
+#: ../../mod/connedit.php:493
+msgid "View Profile"
+msgstr "Profiel weergeven"
+
+#: ../../include/conversation.php:947
+msgid "View Photos"
+msgstr "Foto's weergeven"
+
+#: ../../include/conversation.php:948
+msgid "Activity/Posts"
+msgstr "Kanaal-activiteit"
+
+#: ../../include/conversation.php:950
+msgid "Edit Connection"
+msgstr "Connectie bewerken"
 
-#: ../../include/items.php:4795
+#: ../../include/conversation.php:951
+msgid "Send PM"
+msgstr "Privébericht verzenden"
+
+#: ../../include/conversation.php:1066
 #, php-format
-msgid "Collection: %s"
-msgstr "Collectie: %s"
+msgid "%s likes this."
+msgstr "%s vindt dit leuk."
 
-#: ../../include/items.php:4805 ../../mod/connedit.php:658
+#: ../../include/conversation.php:1066
 #, php-format
-msgid "Connection: %s"
-msgstr "Connectie: %s"
+msgid "%s doesn't like this."
+msgstr "%s vindt dit niet leuk."
 
-#: ../../include/items.php:4807
-msgid "Connection not found."
-msgstr "Connectie niet gevonden."
+#: ../../include/conversation.php:1070
+#, php-format
+msgid "<span  %1$s>%2$d people</span> like this."
+msgid_plural "<span  %1$s>%2$d people</span> like this."
+msgstr[0] "<span  %1$s>%2$d persoon</span> vindt dit leuk."
+msgstr[1] "<span  %1$s>%2$d personen</span> vinden dit leuk."
+
+#: ../../include/conversation.php:1072
+#, php-format
+msgid "<span  %1$s>%2$d people</span> don't like this."
+msgid_plural "<span  %1$s>%2$d people</span> don't like this."
+msgstr[0] "<span  %1$s>%2$d persoon</span> vindt dit niet leuk."
+msgstr[1] "<span  %1$s>%2$d personen</span> vinden dit niet leuk."
+
+#: ../../include/conversation.php:1078
+msgid "and"
+msgstr "en"
+
+#: ../../include/conversation.php:1081
+#, php-format
+msgid ", and %d other people"
+msgid_plural ", and %d other people"
+msgstr[0] ", en %d ander persoon"
+msgstr[1] ", en %d andere personen"
+
+#: ../../include/conversation.php:1082
+#, php-format
+msgid "%s like this."
+msgstr "%s vinden dit leuk."
+
+#: ../../include/conversation.php:1082
+#, php-format
+msgid "%s don't like this."
+msgstr "%s vinden dit niet leuk."
+
+#: ../../include/conversation.php:1145
+msgid "Visible to <strong>everybody</strong>"
+msgstr "Voor <strong>iedereen</strong> zichtbaar"
+
+#: ../../include/conversation.php:1146 ../../mod/mail.php:194
+#: ../../mod/mail.php:308
+msgid "Please enter a link URL:"
+msgstr "Vul een internetadres/URL in:"
+
+#: ../../include/conversation.php:1147
+msgid "Please enter a video link/URL:"
+msgstr "Vul een videolink/URL in:"
+
+#: ../../include/conversation.php:1148
+msgid "Please enter an audio link/URL:"
+msgstr "Vul een audiolink/URL in:"
+
+#: ../../include/conversation.php:1149
+msgid "Tag term:"
+msgstr "Tag:"
+
+#: ../../include/conversation.php:1150 ../../mod/filer.php:48
+msgid "Save to Folder:"
+msgstr "Bewaar in map: "
+
+#: ../../include/conversation.php:1151
+msgid "Where are you right now?"
+msgstr "Waar bevind je je op dit moment?"
+
+#: ../../include/conversation.php:1152 ../../mod/mail.php:195
+#: ../../mod/mail.php:309 ../../mod/editpost.php:54
+msgid "Expires YYYY-MM-DD HH:MM"
+msgstr "Verloopt op DD-MM-YYYY om HH:MM"
+
+#: ../../include/conversation.php:1179 ../../mod/photos.php:1025
+#: ../../mod/layouts.php:184 ../../mod/webpages.php:182
+#: ../../mod/blocks.php:154
+msgid "Share"
+msgstr "Delen"
+
+#: ../../include/conversation.php:1181
+msgid "Page link name"
+msgstr "Linknaam pagina"
+
+#: ../../include/conversation.php:1184
+msgid "Post as"
+msgstr "Bericht plaatsen als"
+
+#: ../../include/conversation.php:1191 ../../mod/editblock.php:142
+#: ../../mod/editpost.php:119 ../../mod/editlayout.php:140
+#: ../../mod/editwebpage.php:182
+msgid "Upload photo"
+msgstr "Foto uploaden"
+
+#: ../../include/conversation.php:1192
+msgid "upload photo"
+msgstr "foto uploaden"
+
+#: ../../include/conversation.php:1193 ../../mod/mail.php:240
+#: ../../mod/mail.php:369 ../../mod/editblock.php:143
+#: ../../mod/editpost.php:120 ../../mod/editlayout.php:141
+#: ../../mod/editwebpage.php:183
+msgid "Attach file"
+msgstr "Bestand toevoegen"
+
+#: ../../include/conversation.php:1194
+msgid "attach file"
+msgstr "bestand toevoegen"
+
+#: ../../include/conversation.php:1195 ../../mod/mail.php:241
+#: ../../mod/mail.php:370 ../../mod/editblock.php:144
+#: ../../mod/editpost.php:121 ../../mod/editlayout.php:142
+#: ../../mod/editwebpage.php:184
+msgid "Insert web link"
+msgstr "Weblink invoegen"
+
+#: ../../include/conversation.php:1196
+msgid "web link"
+msgstr "Weblink"
+
+#: ../../include/conversation.php:1197
+msgid "Insert video link"
+msgstr "Videolink invoegen"
+
+#: ../../include/conversation.php:1198
+msgid "video link"
+msgstr "videolink"
+
+#: ../../include/conversation.php:1199
+msgid "Insert audio link"
+msgstr "Audiolink invoegen"
+
+#: ../../include/conversation.php:1200
+msgid "audio link"
+msgstr "audiolink"
+
+#: ../../include/conversation.php:1201 ../../mod/editblock.php:148
+#: ../../mod/editpost.php:125 ../../mod/editlayout.php:146
+#: ../../mod/editwebpage.php:188
+msgid "Set your location"
+msgstr "Locatie instellen"
+
+#: ../../include/conversation.php:1202
+msgid "set location"
+msgstr "locatie instellen"
+
+#: ../../include/conversation.php:1203 ../../mod/editpost.php:127
+msgid "Toggle voting"
+msgstr "Stemmen in- of uitschakelen"
+
+#: ../../include/conversation.php:1206 ../../mod/editblock.php:149
+#: ../../mod/editpost.php:126 ../../mod/editlayout.php:147
+#: ../../mod/editwebpage.php:189
+msgid "Clear browser location"
+msgstr "Locatie van webbrowser wissen"
+
+#: ../../include/conversation.php:1207
+msgid "clear location"
+msgstr "locatie wissen"
+
+#: ../../include/conversation.php:1209 ../../mod/editblock.php:162
+#: ../../mod/editpost.php:142 ../../mod/editwebpage.php:205
+msgid "Title (optional)"
+msgstr "Titel (optioneel)"
+
+#: ../../include/conversation.php:1213 ../../mod/editblock.php:165
+#: ../../mod/editpost.php:144 ../../mod/editlayout.php:163
+#: ../../mod/editwebpage.php:207
+msgid "Categories (optional, comma-separated list)"
+msgstr "Categorieën (optioneel, door komma's gescheiden lijst)"
+
+#: ../../include/conversation.php:1215 ../../mod/editblock.php:151
+#: ../../mod/editpost.php:131 ../../mod/editlayout.php:149
+#: ../../mod/editwebpage.php:191
+msgid "Permission settings"
+msgstr "Permissies"
+
+#: ../../include/conversation.php:1216
+msgid "permissions"
+msgstr "permissies"
+
+#: ../../include/conversation.php:1224 ../../mod/editblock.php:159
+#: ../../mod/editpost.php:139 ../../mod/editlayout.php:156
+#: ../../mod/editwebpage.php:200
+msgid "Public post"
+msgstr "Openbaar bericht"
+
+#: ../../include/conversation.php:1226 ../../mod/editblock.php:166
+#: ../../mod/editpost.php:145 ../../mod/editlayout.php:164
+#: ../../mod/editwebpage.php:208
+msgid "Example: bob@example.com, mary@example.com"
+msgstr "Voorbeeld: bob@voorbeeld.nl, mary@voorbeeld.be"
+
+#: ../../include/conversation.php:1239 ../../mod/mail.php:245
+#: ../../mod/mail.php:374 ../../mod/editblock.php:176
+#: ../../mod/editpost.php:156 ../../mod/editlayout.php:173
+#: ../../mod/editwebpage.php:217
+msgid "Set expiration date"
+msgstr "Verloopdatum instellen"
+
+#: ../../include/conversation.php:1243 ../../mod/editpost.php:160
+#: ../../mod/events.php:691
+msgid "OK"
+msgstr "OK"
+
+#: ../../include/conversation.php:1244 ../../mod/fbrowser.php:82
+#: ../../mod/fbrowser.php:117 ../../mod/editpost.php:161
+#: ../../mod/events.php:690 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134
+#: ../../mod/settings.php:584 ../../mod/settings.php:610
+msgid "Cancel"
+msgstr "Annuleren"
+
+#: ../../include/conversation.php:1487
+msgid "Discover"
+msgstr "Ontdekken"
+
+#: ../../include/conversation.php:1490
+msgid "Imported public streams"
+msgstr "Openbare streams importeren"
+
+#: ../../include/conversation.php:1495
+msgid "Commented Order"
+msgstr "Nieuwe reacties bovenaan"
+
+#: ../../include/conversation.php:1498
+msgid "Sort by Comment Date"
+msgstr "Berichten met nieuwe reacties bovenaan"
+
+#: ../../include/conversation.php:1502
+msgid "Posted Order"
+msgstr "Nieuwe berichten bovenaan"
+
+#: ../../include/conversation.php:1505
+msgid "Sort by Post Date"
+msgstr "Nieuwe berichten bovenaan"
+
+#: ../../include/conversation.php:1510 ../../include/widgets.php:94
+msgid "Personal"
+msgstr "Persoonlijk"
+
+#: ../../include/conversation.php:1513
+msgid "Posts that mention or involve you"
+msgstr "Alleen berichten die jou vermelden of waar je op een andere manier bij betrokken bent"
+
+#: ../../include/conversation.php:1519 ../../mod/menu.php:112
+#: ../../mod/connections.php:72 ../../mod/connections.php:82
+msgid "New"
+msgstr "Nieuw"
+
+#: ../../include/conversation.php:1522
+msgid "Activity Stream - by date"
+msgstr "Activiteitenstroom - volgens datum"
+
+#: ../../include/conversation.php:1528
+msgid "Starred"
+msgstr "Met ster"
+
+#: ../../include/conversation.php:1531
+msgid "Favourite Posts"
+msgstr "Favoriete berichten"
+
+#: ../../include/conversation.php:1538
+msgid "Spam"
+msgstr "Spam"
+
+#: ../../include/conversation.php:1541
+msgid "Posts flagged as SPAM"
+msgstr "Berichten gemarkeerd als SPAM"
+
+#: ../../include/conversation.php:1585 ../../mod/admin.php:947
+msgid "Channel"
+msgstr "Kanaal"
+
+#: ../../include/conversation.php:1588
+msgid "Status Messages and Posts"
+msgstr "Berichten in dit kanaal"
+
+#: ../../include/conversation.php:1597
+msgid "About"
+msgstr "Over"
+
+#: ../../include/conversation.php:1600
+msgid "Profile Details"
+msgstr "Profiel"
+
+#: ../../include/conversation.php:1616
+msgid "Files and Storage"
+msgstr "Bestanden en opslagruimte"
+
+#: ../../include/conversation.php:1626 ../../include/conversation.php:1629
+msgid "Chatrooms"
+msgstr "Chatkanalen"
+
+#: ../../include/conversation.php:1642
+msgid "Saved Bookmarks"
+msgstr "Opgeslagen bladwijzers"
+
+#: ../../include/conversation.php:1652
+msgid "Manage Webpages"
+msgstr "Webpagina's beheren"
+
+#: ../../include/conversation.php:1711
+msgctxt "noun"
+msgid "Attending"
+msgid_plural "Attending"
+msgstr[0] "aanwezig"
+msgstr[1] "aanwezig"
+
+#: ../../include/conversation.php:1714
+msgctxt "noun"
+msgid "Not Attending"
+msgid_plural "Not Attending"
+msgstr[0] "niet aanwezig"
+msgstr[1] "niet aanwezig"
+
+#: ../../include/conversation.php:1717
+msgctxt "noun"
+msgid "Undecided"
+msgid_plural "Undecided"
+msgstr[0] "nog niet beslist"
+msgstr[1] "nog niet beslist"
+
+#: ../../include/conversation.php:1720
+msgctxt "noun"
+msgid "Agree"
+msgid_plural "Agrees"
+msgstr[0] "eens"
+msgstr[1] "eens"
+
+#: ../../include/conversation.php:1723
+msgctxt "noun"
+msgid "Disagree"
+msgid_plural "Disagrees"
+msgstr[0] "oneens"
+msgstr[1] "oneens"
+
+#: ../../include/conversation.php:1726
+msgctxt "noun"
+msgid "Abstain"
+msgid_plural "Abstains"
+msgstr[0] "onthouding"
+msgstr[1] "onthoudingen"
 
 #: ../../include/widgets.php:91 ../../include/nav.php:157
 #: ../../mod/apps.php:36
@@ -3731,19 +3722,19 @@ msgstr "Verwijder zoekterm"
 msgid "Archives"
 msgstr "Archieven"
 
-#: ../../include/widgets.php:427 ../../mod/connedit.php:567
+#: ../../include/widgets.php:427 ../../mod/connedit.php:566
 msgid "Me"
 msgstr "Ik"
 
-#: ../../include/widgets.php:428 ../../mod/connedit.php:568
+#: ../../include/widgets.php:428 ../../mod/connedit.php:567
 msgid "Family"
 msgstr "Familie"
 
-#: ../../include/widgets.php:430 ../../mod/connedit.php:570
+#: ../../include/widgets.php:430 ../../mod/connedit.php:569
 msgid "Acquaintances"
 msgstr "Kennissen"
 
-#: ../../include/widgets.php:431 ../../mod/connedit.php:571
+#: ../../include/widgets.php:431 ../../mod/connedit.php:570
 #: ../../mod/connections.php:88 ../../mod/connections.php:103
 msgid "All"
 msgstr "Alles"
@@ -3780,7 +3771,7 @@ msgstr "Verbonden applicaties"
 msgid "Export channel"
 msgstr "Kanaal exporteren"
 
-#: ../../include/widgets.php:529 ../../mod/connedit.php:658
+#: ../../include/widgets.php:529 ../../mod/connedit.php:657
 msgid "Connection Default Permissions"
 msgstr "Standaard permissies voor connecties"
 
@@ -3793,174 +3784,153 @@ msgid "Private Mail Menu"
 msgstr "Privéberichten"
 
 #: ../../include/widgets.php:569
-msgid "Check Mail"
-msgstr "Controleer op nieuwe berichten"
-
-#: ../../include/widgets.php:575
 msgid "Combined View"
 msgstr "Gecombineerd postvak"
 
-#: ../../include/widgets.php:580 ../../include/nav.php:191
+#: ../../include/widgets.php:574 ../../include/nav.php:191
 msgid "Inbox"
 msgstr "Postvak IN"
 
-#: ../../include/widgets.php:585 ../../include/nav.php:192
+#: ../../include/widgets.php:579 ../../include/nav.php:192
 msgid "Outbox"
 msgstr "Postvak UIT"
 
-#: ../../include/widgets.php:590 ../../include/nav.php:193
+#: ../../include/widgets.php:584 ../../include/nav.php:193
 msgid "New Message"
 msgstr "Nieuw bericht"
 
-#: ../../include/widgets.php:609 ../../include/widgets.php:621
+#: ../../include/widgets.php:603 ../../include/widgets.php:615
 msgid "Conversations"
 msgstr "Conversaties"
 
-#: ../../include/widgets.php:613
+#: ../../include/widgets.php:607
 msgid "Received Messages"
 msgstr "Ontvangen berichten"
 
-#: ../../include/widgets.php:617
+#: ../../include/widgets.php:611
 msgid "Sent Messages"
 msgstr "Verzonden berichten"
 
-#: ../../include/widgets.php:631
+#: ../../include/widgets.php:625
 msgid "No messages."
 msgstr "Geen berichten"
 
-#: ../../include/widgets.php:648
+#: ../../include/widgets.php:643
 msgid "Delete conversation"
 msgstr "Verwijder conversatie"
 
-#: ../../include/widgets.php:650
+#: ../../include/widgets.php:645
 msgid "D, d M Y - g:i A"
 msgstr "D, j M Y - G:i"
 
-#: ../../include/widgets.php:738
+#: ../../include/widgets.php:734
 msgid "Chat Rooms"
 msgstr "Chatkanalen"
 
-#: ../../include/widgets.php:758
+#: ../../include/widgets.php:754
 msgid "Bookmarked Chatrooms"
 msgstr "Bladwijzers van chatkanalen"
 
-#: ../../include/widgets.php:778
+#: ../../include/widgets.php:774
 msgid "Suggested Chatrooms"
 msgstr "Voorgestelde chatkanalen"
 
-#: ../../include/widgets.php:905 ../../include/widgets.php:963
+#: ../../include/widgets.php:901 ../../include/widgets.php:959
 msgid "photo/image"
 msgstr "foto/afbeelding"
 
-#: ../../include/widgets.php:1058 ../../include/widgets.php:1060
+#: ../../include/widgets.php:1054 ../../include/widgets.php:1056
 msgid "Rate Me"
 msgstr "Beoordeel mij"
 
-#: ../../include/widgets.php:1064
+#: ../../include/widgets.php:1060
 msgid "View Ratings"
 msgstr "Bekijk beoordelingen"
 
-#: ../../include/widgets.php:1075
+#: ../../include/widgets.php:1071
 msgid "Public Hubs"
 msgstr "Openbare hubs"
 
-#: ../../include/widgets.php:1123
+#: ../../include/widgets.php:1119
 msgid "Forums"
 msgstr "Forums"
 
-#: ../../include/widgets.php:1150
+#: ../../include/widgets.php:1146
 msgid "Tasks"
 msgstr "Taken"
 
-#: ../../include/widgets.php:1159
+#: ../../include/widgets.php:1155
 msgid "Documentation"
 msgstr "Documentatie"
 
-#: ../../include/widgets.php:1161
+#: ../../include/widgets.php:1157
 msgid "Project/Site Information"
 msgstr "Project- en hub-informatie"
 
-#: ../../include/widgets.php:1162
+#: ../../include/widgets.php:1158
 msgid "For Members"
 msgstr "Voor leden"
 
-#: ../../include/widgets.php:1163
+#: ../../include/widgets.php:1159
 msgid "For Administrators"
 msgstr "Voor beheerders"
 
-#: ../../include/widgets.php:1164
+#: ../../include/widgets.php:1160
 msgid "For Developers"
 msgstr "Voor ontwikkelaars"
 
-#: ../../include/widgets.php:1189 ../../mod/admin.php:410
+#: ../../include/widgets.php:1185 ../../mod/admin.php:410
 msgid "Site"
 msgstr "Hub-instellingen"
 
-#: ../../include/widgets.php:1190
+#: ../../include/widgets.php:1186
 msgid "Accounts"
 msgstr "Accounts"
 
-#: ../../include/widgets.php:1191 ../../mod/admin.php:939
+#: ../../include/widgets.php:1187 ../../mod/admin.php:939
 msgid "Channels"
 msgstr "Kanalen"
 
-#: ../../include/widgets.php:1192 ../../mod/admin.php:1031
+#: ../../include/widgets.php:1188 ../../mod/admin.php:1031
 #: ../../mod/admin.php:1071
 msgid "Plugins"
 msgstr "Plug-ins"
 
-#: ../../include/widgets.php:1193 ../../mod/admin.php:1231
+#: ../../include/widgets.php:1189 ../../mod/admin.php:1231
 #: ../../mod/admin.php:1265
 msgid "Themes"
 msgstr "Thema's"
 
-#: ../../include/widgets.php:1194
+#: ../../include/widgets.php:1190
 msgid "Inspect queue"
 msgstr "Inspecteer berichtenwachtrij"
 
-#: ../../include/widgets.php:1195
+#: ../../include/widgets.php:1191
 msgid "Profile Config"
 msgstr "Profielconfiguratie"
 
-#: ../../include/widgets.php:1196
+#: ../../include/widgets.php:1192
 msgid "DB updates"
 msgstr "Database-updates"
 
-#: ../../include/widgets.php:1214 ../../include/widgets.php:1220
+#: ../../include/widgets.php:1210 ../../include/widgets.php:1216
 #: ../../mod/admin.php:1350
 msgid "Logs"
 msgstr "Logboeken"
 
-#: ../../include/widgets.php:1218 ../../include/nav.php:210
+#: ../../include/widgets.php:1214 ../../include/nav.php:210
 msgid "Admin"
 msgstr "Beheer"
 
-#: ../../include/widgets.php:1219
+#: ../../include/widgets.php:1215
 msgid "Plugin Features"
 msgstr "Plug-in-opties"
 
-#: ../../include/widgets.php:1221
+#: ../../include/widgets.php:1217
 msgid "User registrations waiting for confirmation"
 msgstr "Accounts die op goedkeuring wachten"
 
-#: ../../include/zot.php:677
-msgid "Invalid data packet"
-msgstr "Datapakket ongeldig"
-
-#: ../../include/zot.php:693
-msgid "Unable to verify channel signature"
-msgstr "Kanaalkenmerk kon niet worden geverifieerd.  "
-
-#: ../../include/zot.php:2213
-#, php-format
-msgid "Unable to verify site signature for %s"
-msgstr "Hubkenmerk voor %s kon niet worden geverifieerd"
-
-#: ../../include/zot.php:3511
-msgid "invalid target signature"
-msgstr "ongeldig doelkenmerk"
-
-#: ../../include/nav.php:82 ../../include/nav.php:114 ../../boot.php:1496
+#: ../../include/nav.php:82 ../../include/nav.php:114 ../../boot.php:1502
 msgid "Logout"
 msgstr "Uitloggen"
 
@@ -4033,7 +4003,7 @@ msgstr "Authenticeer jezelf via (bijvoorbeeld) jouw hub"
 msgid "Home Page"
 msgstr "Homepage"
 
-#: ../../include/nav.php:149 ../../mod/register.php:224 ../../boot.php:1473
+#: ../../include/nav.php:149 ../../mod/register.php:224 ../../boot.php:1479
 msgid "Register"
 msgstr "Registreren"
 
@@ -4058,10 +4028,6 @@ msgid "Channel Directory"
 msgstr "Kanalengids"
 
 #: ../../include/nav.php:174
-msgid "Grid"
-msgstr "Grid"
-
-#: ../../include/nav.php:174
 msgid "Your grid"
 msgstr "Jouw grid"
 
@@ -4141,6 +4107,47 @@ msgstr "@kanaal, #tag, inhoud, ?hulp"
 msgid "Please wait..."
 msgstr "Wachten aub..."
 
+#: ../../include/dir_fns.php:126
+msgid "Directory Options"
+msgstr "Opties kanalengids"
+
+#: ../../include/dir_fns.php:128
+msgid "Safe Mode"
+msgstr "Veilig zoeken"
+
+#: ../../include/dir_fns.php:128 ../../include/dir_fns.php:129
+#: ../../include/dir_fns.php:130 ../../mod/removeme.php:60
+#: ../../mod/mitem.php:154 ../../mod/mitem.php:155 ../../mod/mitem.php:228
+#: ../../mod/mitem.php:229 ../../mod/connedit.php:630
+#: ../../mod/connedit.php:658 ../../mod/photos.php:625
+#: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159
+#: ../../mod/admin.php:386 ../../mod/menu.php:96 ../../mod/menu.php:153
+#: ../../mod/settings.php:574 ../../mod/api.php:106
+#: ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1507
+msgid "No"
+msgstr "Nee"
+
+#: ../../include/dir_fns.php:128 ../../include/dir_fns.php:129
+#: ../../include/dir_fns.php:130 ../../mod/removeme.php:60
+#: ../../mod/mitem.php:154 ../../mod/mitem.php:155 ../../mod/mitem.php:228
+#: ../../mod/mitem.php:229 ../../mod/photos.php:625
+#: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159
+#: ../../mod/admin.php:388 ../../mod/menu.php:96 ../../mod/menu.php:153
+#: ../../mod/settings.php:574 ../../mod/api.php:105
+#: ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1507
+msgid "Yes"
+msgstr "Ja"
+
+#: ../../include/dir_fns.php:129
+msgid "Public Forums Only"
+msgstr "Alleen openbare forums"
+
+#: ../../include/dir_fns.php:130
+msgid "This Website Only"
+msgstr "Alleen deze hub"
+
 #: ../../mod/achievements.php:34
 msgid "Some blurb about what to do when you're new here"
 msgstr "Welkom op $Projectname. Klik op de tab ontdekken of klik rechtsboven op de <a href=\"directory\">kanalengids</a>, om kanalen te vinden. Rechtsboven vind je ook <a href=\"directory\">apps</a>, waar je vrijwel alle functies van $Projectname kunt vinden. Voor <a href=\"directory\">hulp</a> met $Projectname klik je op het vraagteken."
@@ -4162,8 +4169,8 @@ msgstr "Kanalen voorstellen"
 msgid "Suggest a friend for %s"
 msgstr "Stel een kanaal voor aan %s"
 
-#: ../../mod/directory.php:59 ../../mod/display.php:13 ../../mod/search.php:13
-#: ../../mod/photos.php:453 ../../mod/ratings.php:82
+#: ../../mod/directory.php:59 ../../mod/display.php:13
+#: ../../mod/photos.php:489 ../../mod/search.php:13 ../../mod/ratings.php:82
 #: ../../mod/viewconnections.php:17
 msgid "Public access denied."
 msgstr "Openbare toegang geweigerd."
@@ -4708,240 +4715,240 @@ msgstr "Kon geen toegang krijgen tot de connectie-gegevens."
 msgid "Could not locate selected profile."
 msgstr "Kon het gekozen profiel niet vinden."
 
-#: ../../mod/connedit.php:219
+#: ../../mod/connedit.php:218
 msgid "Connection updated."
 msgstr "Connectie bijgewerkt."
 
-#: ../../mod/connedit.php:221
+#: ../../mod/connedit.php:220
 msgid "Failed to update connection record."
 msgstr "Bijwerken van connectie-gegevens mislukt."
 
-#: ../../mod/connedit.php:268
+#: ../../mod/connedit.php:267
 msgid "is now connected to"
 msgstr "is nu verbonden met"
 
-#: ../../mod/connedit.php:391
+#: ../../mod/connedit.php:390
 msgid "Could not access address book record."
 msgstr "Kon geen toegang krijgen tot de record van de connectie."
 
-#: ../../mod/connedit.php:405
+#: ../../mod/connedit.php:404
 msgid "Refresh failed - channel is currently unavailable."
 msgstr "Vernieuwen mislukt - kanaal is momenteel niet beschikbaar"
 
-#: ../../mod/connedit.php:414 ../../mod/connedit.php:423
-#: ../../mod/connedit.php:432 ../../mod/connedit.php:441
-#: ../../mod/connedit.php:454
+#: ../../mod/connedit.php:413 ../../mod/connedit.php:422
+#: ../../mod/connedit.php:431 ../../mod/connedit.php:440
+#: ../../mod/connedit.php:453
 msgid "Unable to set address book parameters."
 msgstr "Niet in staat om de parameters van connecties in te stellen."
 
-#: ../../mod/connedit.php:478
+#: ../../mod/connedit.php:477
 msgid "Connection has been removed."
 msgstr "Connectie is verwijderd"
 
-#: ../../mod/connedit.php:497
+#: ../../mod/connedit.php:496
 #, php-format
 msgid "View %s's profile"
 msgstr "Profiel van %s weergeven"
 
-#: ../../mod/connedit.php:501
+#: ../../mod/connedit.php:500
 msgid "Refresh Permissions"
 msgstr "Permissies vernieuwen"
 
-#: ../../mod/connedit.php:504
+#: ../../mod/connedit.php:503
 msgid "Fetch updated permissions"
 msgstr "Aangepaste permissies ophalen"
 
-#: ../../mod/connedit.php:508
+#: ../../mod/connedit.php:507
 msgid "Recent Activity"
 msgstr "Recente activiteit"
 
-#: ../../mod/connedit.php:511
+#: ../../mod/connedit.php:510
 msgid "View recent posts and comments"
 msgstr "Recente berichten en reacties weergeven"
 
-#: ../../mod/connedit.php:515 ../../mod/admin.php:785
+#: ../../mod/connedit.php:514 ../../mod/admin.php:785
 msgid "Unblock"
 msgstr "Deblokkeren"
 
-#: ../../mod/connedit.php:515 ../../mod/admin.php:784
+#: ../../mod/connedit.php:514 ../../mod/admin.php:784
 msgid "Block"
 msgstr "Blokkeren"
 
-#: ../../mod/connedit.php:518
+#: ../../mod/connedit.php:517
 msgid "Block (or Unblock) all communications with this connection"
 msgstr "Blokkeer (of deblokkeer) alle communicatie met deze connectie"
 
-#: ../../mod/connedit.php:519
+#: ../../mod/connedit.php:518
 msgid "This connection is blocked!"
 msgstr "Deze connectie is geblokkeerd!"
 
-#: ../../mod/connedit.php:523
+#: ../../mod/connedit.php:522
 msgid "Unignore"
 msgstr "Niet meer negeren"
 
-#: ../../mod/connedit.php:523 ../../mod/notifications.php:51
+#: ../../mod/connedit.php:522 ../../mod/notifications.php:51
 msgid "Ignore"
 msgstr "Negeren"
 
-#: ../../mod/connedit.php:526
+#: ../../mod/connedit.php:525
 msgid "Ignore (or Unignore) all inbound communications from this connection"
 msgstr "Negeer (of negeer niet meer) alle inkomende communicatie van deze connectie"
 
-#: ../../mod/connedit.php:527
+#: ../../mod/connedit.php:526
 msgid "This connection is ignored!"
 msgstr "Deze connectie wordt genegeerd!"
 
-#: ../../mod/connedit.php:531
+#: ../../mod/connedit.php:530
 msgid "Unarchive"
 msgstr "Niet meer archiveren"
 
-#: ../../mod/connedit.php:531
+#: ../../mod/connedit.php:530
 msgid "Archive"
 msgstr "Archiveren"
 
-#: ../../mod/connedit.php:534
+#: ../../mod/connedit.php:533
 msgid ""
 "Archive (or Unarchive) this connection - mark channel dead but keep content"
 msgstr "Archiveer (of dearchiveer) deze connectie - markeer het kanaal als dood, maar bewaar de inhoud"
 
-#: ../../mod/connedit.php:535
+#: ../../mod/connedit.php:534
 msgid "This connection is archived!"
 msgstr "Deze connectie is gearchiveerd!"
 
-#: ../../mod/connedit.php:539
+#: ../../mod/connedit.php:538
 msgid "Unhide"
 msgstr "Niet meer verbergen"
 
-#: ../../mod/connedit.php:539
+#: ../../mod/connedit.php:538
 msgid "Hide"
 msgstr "Verbergen"
 
-#: ../../mod/connedit.php:542
+#: ../../mod/connedit.php:541
 msgid "Hide or Unhide this connection from your other connections"
 msgstr "Deze connectie verbergen (of niet meer verbergen) voor jouw andere connecties"
 
-#: ../../mod/connedit.php:543
+#: ../../mod/connedit.php:542
 msgid "This connection is hidden!"
 msgstr "Deze connectie is verborgen!"
 
-#: ../../mod/connedit.php:550
+#: ../../mod/connedit.php:549
 msgid "Delete this connection"
 msgstr "Deze connectie verwijderen"
 
-#: ../../mod/connedit.php:631
+#: ../../mod/connedit.php:630
 msgid "Approve this connection"
 msgstr "Deze connectie accepteren"
 
-#: ../../mod/connedit.php:631
+#: ../../mod/connedit.php:630
 msgid "Accept connection to allow communication"
 msgstr "Keur deze connectie goed om communicatie toe te staan"
 
-#: ../../mod/connedit.php:636
+#: ../../mod/connedit.php:635
 msgid "Set Affinity"
 msgstr "Verwantschapsfilter instellen"
 
-#: ../../mod/connedit.php:639
+#: ../../mod/connedit.php:638
 msgid "Set Profile"
 msgstr "Profiel instellen"
 
-#: ../../mod/connedit.php:642
+#: ../../mod/connedit.php:641
 msgid "Set Affinity & Profile"
 msgstr "Verwantschapsfilter en profiel instellen"
 
-#: ../../mod/connedit.php:659
+#: ../../mod/connedit.php:658
 msgid "Apply these permissions automatically"
 msgstr "Deze permissies automatisch toepassen"
 
-#: ../../mod/connedit.php:661
+#: ../../mod/connedit.php:660
 msgid "This connection's address is"
 msgstr "Het adres van deze connectie is"
 
-#: ../../mod/connedit.php:664
+#: ../../mod/connedit.php:663
 msgid ""
 "The permissions indicated on this page will be applied to all new "
 "connections."
 msgstr "Permissies die op deze pagina staan vermeld worden op alle nieuwe connecties toegepast."
 
-#: ../../mod/connedit.php:666
+#: ../../mod/connedit.php:665
 msgid "Slide to adjust your degree of friendship"
 msgstr "Schuif om te bepalen hoe goed je iemand kent en/of mag"
 
-#: ../../mod/connedit.php:668
+#: ../../mod/connedit.php:667
 msgid "Slide to adjust your rating"
 msgstr "Gebruik de schuif om je beoordeling te geven"
 
-#: ../../mod/connedit.php:669 ../../mod/connedit.php:674
+#: ../../mod/connedit.php:668 ../../mod/connedit.php:673
 msgid "Optionally explain your rating"
 msgstr "Verklaar jouw beoordeling (niet verplicht)"
 
-#: ../../mod/connedit.php:671
+#: ../../mod/connedit.php:670
 msgid "Custom Filter"
 msgstr "Berichtenfilter"
 
-#: ../../mod/connedit.php:672
+#: ../../mod/connedit.php:671
 msgid "Only import posts with this text"
 msgstr "Importeer alleen berichten met deze tekst"
 
-#: ../../mod/connedit.php:672 ../../mod/connedit.php:673
+#: ../../mod/connedit.php:671 ../../mod/connedit.php:672
 msgid ""
 "words one per line or #tags or /patterns/, leave blank to import all posts"
 msgstr "woorden, #tags, /regex/ of talen (lang=iso639-1) (één per regel) - laat leeg om alle berichten te importeren"
 
-#: ../../mod/connedit.php:673
+#: ../../mod/connedit.php:672
 msgid "Do not import posts with this text"
 msgstr "Importeer geen berichten met deze tekst"
 
-#: ../../mod/connedit.php:675
+#: ../../mod/connedit.php:674
 msgid "This information is public!"
 msgstr "Deze informatie is openbaar!"
 
-#: ../../mod/connedit.php:680
+#: ../../mod/connedit.php:679
 msgid "Connection Pending Approval"
 msgstr "Connectie moet nog goedgekeurd worden"
 
-#: ../../mod/connedit.php:681
+#: ../../mod/connedit.php:680
 msgid "Connection Request"
 msgstr "Connectieverzoek"
 
-#: ../../mod/connedit.php:682
+#: ../../mod/connedit.php:681
 #, php-format
 msgid ""
 "(%s) would like to connect with you. Please approve this connection to allow"
 " communication."
 msgstr "(%s) wil met jou verbinden. Keur dit connectieverzoek goed om onderling te kunnen communiceren."
 
-#: ../../mod/connedit.php:683 ../../mod/admin.php:781
+#: ../../mod/connedit.php:682 ../../mod/admin.php:781
 msgid "Approve"
 msgstr "Goedkeuren"
 
-#: ../../mod/connedit.php:684
+#: ../../mod/connedit.php:683
 msgid "Approve Later"
 msgstr "Later goedkeuren"
 
-#: ../../mod/connedit.php:687
+#: ../../mod/connedit.php:686
 msgid "inherited"
 msgstr "geërfd"
 
-#: ../../mod/connedit.php:689
+#: ../../mod/connedit.php:688
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr "Kies het profiel dat je aan %s wil tonen wanneer hij/zij ingelogd jouw profiel wil bekijken."
 
-#: ../../mod/connedit.php:691
+#: ../../mod/connedit.php:690
 msgid "Their Settings"
 msgstr "Hun instellingen"
 
-#: ../../mod/connedit.php:692
+#: ../../mod/connedit.php:691
 msgid "My Settings"
 msgstr "Mijn instellingen"
 
-#: ../../mod/connedit.php:694
+#: ../../mod/connedit.php:693
 msgid "Individual Permissions"
 msgstr "Individuele permissies"
 
-#: ../../mod/connedit.php:695
+#: ../../mod/connedit.php:694
 msgid ""
 "Some permissions may be inherited from your channel's <a "
 "href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
@@ -4949,7 +4956,7 @@ msgid ""
 " settings here."
 msgstr "Sommige permissies worden mogelijk overgeërfd van de <a href=\"settings\">privacy-instellingen</a> van jouw kanaal, die een hogere prioriteit hebben dan deze individuele instellingen. Je kan je deze overgeërfde permissies hier <strong>niet</strong> veranderen."
 
-#: ../../mod/connedit.php:696
+#: ../../mod/connedit.php:695
 msgid ""
 "Some permissions may be inherited from your channel's <a "
 "href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
@@ -4957,7 +4964,7 @@ msgid ""
 "they wont have any impact unless the inherited setting changes."
 msgstr "Sommige permissies worden mogelijk overgeërfd van de <a href=\"settings\">privacy-instellingen</a> van jouw kanaal, die een hogere prioriteit hebben dan deze individuele permissies. Je kan de permissies hier veranderen, maar die hebben geen effect, tenzij de overgeërfde permissies worden veranderd. "
 
-#: ../../mod/connedit.php:697
+#: ../../mod/connedit.php:696
 msgid "Last update:"
 msgstr "Laatste wijziging:"
 
@@ -4984,50 +4991,164 @@ msgid ""
 " to correctly use this feature."
 msgstr "Waarschuwing: het veranderen van sommige instellingen kunnen jouw kanaal onklaar maken. Verlaat deze pagina, tenzij je weet waar je mee bezig bent en voldoende kennis bezit over hoe je deze functies moet gebruiken. "
 
-#: ../../mod/pubsites.php:16
-msgid "Public Sites"
-msgstr "Openbare hubs"
+#: ../../mod/photos.php:79
+msgid "Page owner information could not be retrieved."
+msgstr "Informatie over de pagina-eigenaar werd niet ontvangen."
 
-#: ../../mod/pubsites.php:19
-msgid ""
-"The listed sites allow public registration for the $Projectname network. All"
-" sites in the network are interlinked so membership on any of them conveys "
-"membership in the network as a whole. Some sites may require subscription or"
-" provide tiered service plans. The provider links <strong>may</strong> "
-"provide additional details."
-msgstr "Op de hier weergegeven hubs kan iedereen zich voor het $Projectname-netwerk aanmelden. Alle hubs in het $Projectname-netwerk zijn met elkaar verbonden, dus maakt het qua lidmaatschap niet uit waar je je aanmeldt. Op sommige hubs heb je eerst goedkeuring nodig en sommige hubs vereisen betaalde abonnementen voor uitbreidingen. <strong>Mogelijk</strong> wordt hierover op de hub zelf meer informatie gegeven."
+#: ../../mod/photos.php:100
+msgid "Album not found."
+msgstr "Album niet gevonden."
 
-#: ../../mod/pubsites.php:25
-msgid "Rate this hub"
-msgstr "Beoordeel deze hub"
+#: ../../mod/photos.php:127
+msgid "Delete Album"
+msgstr "Verwijder album"
 
-#: ../../mod/pubsites.php:26
-msgid "Site URL"
-msgstr "URL hub"
+#: ../../mod/photos.php:171 ../../mod/photos.php:1006
+msgid "Delete Photo"
+msgstr "Verwijder foto"
 
-#: ../../mod/pubsites.php:26
-msgid "Access Type"
-msgstr "Toegangstype"
+#: ../../mod/photos.php:500
+msgid "No photos selected"
+msgstr "Geen foto's geselecteerd"
 
-#: ../../mod/pubsites.php:26
-msgid "Registration Policy"
-msgstr "Registratiebeleid"
+#: ../../mod/photos.php:549
+msgid "Access to this item is restricted."
+msgstr "Toegang tot dit item is beperkt."
 
-#: ../../mod/pubsites.php:26 ../../mod/profiles.php:454
-msgid "Location"
-msgstr "Locatie"
+#: ../../mod/photos.php:588
+#, php-format
+msgid "%1$.2f MB of %2$.2f MB photo storage used."
+msgstr "%1$.2f MB van %2$.2f MB aan foto-opslag gebruikt."
 
-#: ../../mod/pubsites.php:26
-msgid "View hub ratings"
-msgstr "Bekijk hubbeoordelingen"
+#: ../../mod/photos.php:591
+#, php-format
+msgid "%1$.2f MB photo storage used."
+msgstr "%1$.2f MB aan foto-opslag gebruikt."
 
-#: ../../mod/pubsites.php:30
-msgid "Rate"
-msgstr "Beoordeel"
+#: ../../mod/photos.php:619
+msgid "Upload Photos"
+msgstr "Foto's uploaden"
 
-#: ../../mod/pubsites.php:31
-msgid "View ratings"
-msgstr "Bekijk beoordelingen"
+#: ../../mod/photos.php:623
+msgid "Enter an album name"
+msgstr "Vul een albumnaam in"
+
+#: ../../mod/photos.php:624
+msgid "or select an existing album (doubleclick)"
+msgstr "of kies een bestaand album (dubbelklikken)"
+
+#: ../../mod/photos.php:625
+msgid "Create a status post for this upload"
+msgstr "Plaats een bericht voor deze upload."
+
+#: ../../mod/photos.php:652
+msgid "Album name could not be decoded"
+msgstr "Albumnaam kon niet gedecodeerd worden"
+
+#: ../../mod/photos.php:696 ../../mod/photos.php:1233
+#: ../../mod/photos.php:1250
+msgid "Contact Photos"
+msgstr "Connectiefoto's"
+
+#: ../../mod/photos.php:724
+msgid "Show Newest First"
+msgstr "Nieuwste eerst weergeven"
+
+#: ../../mod/photos.php:726
+msgid "Show Oldest First"
+msgstr "Oudste eerst weergeven"
+
+#: ../../mod/photos.php:750 ../../mod/photos.php:1283
+msgid "View Photo"
+msgstr "Foto weergeven"
+
+#: ../../mod/photos.php:779
+msgid "Edit Album"
+msgstr "Album bewerken"
+
+#: ../../mod/photos.php:824
+msgid "Permission denied. Access to this item may be restricted."
+msgstr "Toegang geweigerd. Toegang tot dit item kan zijn beperkt."
+
+#: ../../mod/photos.php:826
+msgid "Photo not available"
+msgstr "Foto niet aanwezig"
+
+#: ../../mod/photos.php:884
+msgid "Use as profile photo"
+msgstr "Als profielfoto gebruiken"
+
+#: ../../mod/photos.php:891
+msgid "Private Photo"
+msgstr "Privéfoto"
+
+#: ../../mod/photos.php:902 ../../mod/events.php:528
+msgid "Previous"
+msgstr "Vorige"
+
+#: ../../mod/photos.php:906
+msgid "View Full Size"
+msgstr "Volledige grootte weergeven"
+
+#: ../../mod/photos.php:911 ../../mod/events.php:529 ../../mod/setup.php:285
+msgid "Next"
+msgstr "Volgende"
+
+#: ../../mod/photos.php:951 ../../mod/tagrm.php:133
+msgid "Remove"
+msgstr "Verwijderen"
+
+#: ../../mod/photos.php:985
+msgid "Edit photo"
+msgstr "Foto bewerken"
+
+#: ../../mod/photos.php:987
+msgid "Rotate CW (right)"
+msgstr "Draai met de klok mee (naar rechts)"
+
+#: ../../mod/photos.php:988
+msgid "Rotate CCW (left)"
+msgstr "Draai tegen de klok in (naar links)"
+
+#: ../../mod/photos.php:991
+msgid "Enter a new album name"
+msgstr "Vul een nieuwe albumnaam in"
+
+#: ../../mod/photos.php:992
+msgid "or select an existing one (doubleclick)"
+msgstr "of kies een bestaand album (dubbelklikken)"
+
+#: ../../mod/photos.php:995
+msgid "Caption"
+msgstr "Bijschrift"
+
+#: ../../mod/photos.php:997
+msgid "Add a Tag"
+msgstr "Tag toevoegen"
+
+#: ../../mod/photos.php:1001
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
+msgstr "Voorbeeld: @bob, @Barbara_Jansen, @jan@voorbeeld.nl"
+
+#: ../../mod/photos.php:1004
+msgid "Flag as adult in album view"
+msgstr "Markeer als voor volwassenen in albumweergave"
+
+#: ../../mod/photos.php:1196
+msgid "In This Photo:"
+msgstr "Op deze foto:"
+
+#: ../../mod/photos.php:1201
+msgid "Map"
+msgstr "Kaart"
+
+#: ../../mod/photos.php:1289
+msgid "View Album"
+msgstr "Album weergeven"
+
+#: ../../mod/photos.php:1312
+msgid "Recent Photos"
+msgstr "Recente foto's"
 
 #: ../../mod/filestorage.php:82
 msgid "Permission Denied."
@@ -5073,6 +5194,10 @@ msgstr "Toon URL van dit bestand"
 msgid "Notify your contacts about this file"
 msgstr "Jouw connecties over dit bestand berichten"
 
+#: ../../mod/regdir.php:45 ../../mod/dirsearch.php:21
+msgid "This site is not a directory server"
+msgstr "Deze hub is geen kanalengidshub (directoryserver)"
+
 #: ../../mod/layouts.php:121 ../../mod/layouts.php:179
 #: ../../mod/editlayout.php:161
 msgid "Layout Name"
@@ -5146,39 +5271,43 @@ msgstr "Ongeldige connectie."
 msgid "You must be logged in to see this page."
 msgstr "Je moet zijn ingelogd om deze pagina te kunnen bekijken."
 
-#: ../../mod/chat.php:171
+#: ../../mod/chat.php:174
 msgid "Room not found"
 msgstr "Chatkanaal niet gevonden"
 
-#: ../../mod/chat.php:182
+#: ../../mod/chat.php:185
 msgid "Leave Room"
 msgstr "Chatkanaal verlaten"
 
-#: ../../mod/chat.php:183
+#: ../../mod/chat.php:186
 msgid "Delete This Room"
 msgstr "Chatkanaal verwijderen"
 
-#: ../../mod/chat.php:184
+#: ../../mod/chat.php:187
 msgid "I am away right now"
 msgstr "Ik ben momenteel afwezig"
 
-#: ../../mod/chat.php:185
+#: ../../mod/chat.php:188
 msgid "I am online"
 msgstr "Ik ben online"
 
-#: ../../mod/chat.php:187
+#: ../../mod/chat.php:190
 msgid "Bookmark this room"
 msgstr "Chatkanaal aan bladwijzers toevoegen"
 
-#: ../../mod/chat.php:205 ../../mod/chat.php:227
+#: ../../mod/chat.php:208 ../../mod/chat.php:231
 msgid "New Chatroom"
 msgstr "Nieuw chatkanaal"
 
-#: ../../mod/chat.php:206
+#: ../../mod/chat.php:209
 msgid "Chatroom Name"
 msgstr "Naam chatkanaal"
 
-#: ../../mod/chat.php:223
+#: ../../mod/chat.php:210
+msgid "Expiration of chats (minutes)"
+msgstr "Aantal minuten voordat chatberichten worden verwijderd"
+
+#: ../../mod/chat.php:227
 #, php-format
 msgid "%1$s's Chatrooms"
 msgstr "Chatkanalen van %1$s"
@@ -5193,134 +5322,211 @@ msgstr "Items getagd met %s"
 msgid "Search results for: %s"
 msgstr "Zoekresultaten voor %s"
 
-#: ../../mod/message.php:34
+#: ../../mod/rate.php:158
+msgid "Website:"
+msgstr "Website:"
+
+#: ../../mod/rate.php:161
+#, php-format
+msgid "Remote Channel [%s] (not yet known on this site)"
+msgstr "Kanaal op afstand [%s] (nog niet op deze hub bekend)"
+
+#: ../../mod/rate.php:162
+msgid "Rating (this information is public)"
+msgstr "Beoordeling (deze informatie is openbaar)"
+
+#: ../../mod/rate.php:163
+msgid "Optionally explain your rating (this information is public)"
+msgstr "Verklaar jouw beoordeling (niet verplicht, deze informatie is openbaar)"
+
+#: ../../mod/mail.php:33
+msgid "Unable to lookup recipient."
+msgstr "Niet in staat om ontvanger op te zoeken."
+
+#: ../../mod/mail.php:41
+msgid "Unable to communicate with requested channel."
+msgstr "Niet in staat om met het aangevraagde kanaal te communiceren."
+
+#: ../../mod/mail.php:48
+msgid "Cannot verify requested channel."
+msgstr "Kan opgevraagd kanaal niet verifieren"
+
+#: ../../mod/mail.php:74
+msgid "Selected channel has private message restrictions. Send failed."
+msgstr "Gekozen kanaal heeft restricties voor privéberichten. Verzenden mislukt."
+
+#: ../../mod/mail.php:132
+msgid "Messages"
+msgstr "Berichten"
+
+#: ../../mod/mail.php:167
+msgid "Message recalled."
+msgstr "Bericht ingetrokken."
+
+#: ../../mod/mail.php:180
 msgid "Conversation removed."
 msgstr "Conversatie verwijderd"
 
-#: ../../mod/channel.php:97
-msgid "Insufficient permissions.  Request redirected to profile page."
-msgstr "Onvoldoende permissies.  Doorgestuurd naar profielpagina."
+#: ../../mod/mail.php:223
+msgid "Requested channel is not in this network"
+msgstr "Opgevraagd kanaal is niet in dit netwerk beschikbaar"
 
-#: ../../mod/editpost.php:20 ../../mod/editblock.php:78
-#: ../../mod/editblock.php:94 ../../mod/editlayout.php:76
-#: ../../mod/editwebpage.php:77
-msgid "Item not found"
-msgstr "Item niet gevonden"
+#: ../../mod/mail.php:231
+msgid "Send Private Message"
+msgstr "Privébericht versturen"
 
-#: ../../mod/editpost.php:31
-msgid "Item is not editable"
-msgstr "Item is niet te bewerken"
+#: ../../mod/mail.php:232 ../../mod/mail.php:361
+msgid "To:"
+msgstr "Aan:"
 
-#: ../../mod/editpost.php:55
-msgid "Delete item?"
-msgstr "Item verwijderen?"
+#: ../../mod/mail.php:235 ../../mod/mail.php:363
+msgid "Subject:"
+msgstr "Onderwerp:"
 
-#: ../../mod/editpost.php:122 ../../mod/editblock.php:145
-#: ../../mod/editlayout.php:143 ../../mod/editwebpage.php:185
-msgid "Insert YouTube video"
-msgstr "YouTube-video invoegen"
+#: ../../mod/mail.php:238 ../../mod/invite.php:131
+msgid "Your message:"
+msgstr "Jouw bericht:"
 
-#: ../../mod/editpost.php:123 ../../mod/editblock.php:146
-#: ../../mod/editlayout.php:144 ../../mod/editwebpage.php:186
-msgid "Insert Vorbis [.ogg] video"
-msgstr "Vorbis-video [.ogg] invoegen"
+#: ../../mod/mail.php:242
+msgid "Send"
+msgstr "Verzenden"
 
-#: ../../mod/editpost.php:124 ../../mod/editblock.php:147
-#: ../../mod/editlayout.php:145 ../../mod/editwebpage.php:187
-msgid "Insert Vorbis [.ogg] audio"
-msgstr "Vorbis-audio [.ogg] invoegen"
+#: ../../mod/mail.php:333
+msgid "Delete message"
+msgstr "Bericht verwijderen"
 
-#: ../../mod/editpost.php:165 ../../mod/rpost.php:128
-msgid "Edit post"
-msgstr "Bericht bewerken"
+#: ../../mod/mail.php:334
+msgid "Delivery report"
+msgstr "Afleveringsrapport"
+
+#: ../../mod/mail.php:335
+msgid "Recall message"
+msgstr "Bericht intrekken"
+
+#: ../../mod/mail.php:337
+msgid "Message has been recalled."
+msgstr "Bericht is ingetrokken."
+
+#: ../../mod/mail.php:354
+msgid "Delete Conversation"
+msgstr "Verwijder conversatie"
+
+#: ../../mod/mail.php:356
+msgid ""
+"No secure communications available. You <strong>may</strong> be able to "
+"respond from the sender's profile page."
+msgstr "Geen veilige communicatie beschikbaar. <strong>Mogelijk</strong> kan je reageren op de kanaalpagina van de afzender."
 
-#: ../../mod/dreport.php:15
+#: ../../mod/mail.php:360
+msgid "Send Reply"
+msgstr "Antwoord versturen"
+
+#: ../../mod/mail.php:365
+#, php-format
+msgid "Your message for %s (%s):"
+msgstr "Jouw privébericht aan %s (%s):"
+
+#: ../../mod/dreport.php:23
 msgid "Invalid message"
 msgstr "Ongeldig bericht"
 
-#: ../../mod/dreport.php:25
+#: ../../mod/dreport.php:55
 msgid "no results"
 msgstr "geen resultaten"
 
-#: ../../mod/dreport.php:30
+#: ../../mod/dreport.php:60
 #, php-format
 msgid "Delivery report for %1$s"
 msgstr "Afleveringsrapport voor %1$s"
 
-#: ../../mod/dreport.php:39
+#: ../../mod/dreport.php:74
 msgid "channel sync processed"
 msgstr "kanaalsync verwerkt"
 
-#: ../../mod/dreport.php:43
+#: ../../mod/dreport.php:78
 msgid "queued"
 msgstr "in wachtrij"
 
-#: ../../mod/dreport.php:47
+#: ../../mod/dreport.php:82
 msgid "posted"
 msgstr "verstuurd"
 
-#: ../../mod/dreport.php:51
+#: ../../mod/dreport.php:86
 msgid "accepted for delivery"
 msgstr "geaccepteerd om afgeleverd te worden"
 
-#: ../../mod/dreport.php:55
+#: ../../mod/dreport.php:90
 msgid "updated"
 msgstr "geüpdatet"
 
-#: ../../mod/dreport.php:58
+#: ../../mod/dreport.php:93
 msgid "update ignored"
 msgstr "update genegeerd"
 
-#: ../../mod/dreport.php:61
+#: ../../mod/dreport.php:96
 msgid "permission denied"
 msgstr "toegang geweigerd"
 
+#: ../../mod/dreport.php:100
+msgid "recipient not found"
+msgstr "ontvanger niet gevonden"
+
+#: ../../mod/dreport.php:103
+msgid "mail recalled"
+msgstr "Privébericht ingetrokken"
+
+#: ../../mod/dreport.php:106
+msgid "duplicate mail received"
+msgstr "dubbel privébericht ontvangen"
+
+#: ../../mod/dreport.php:109
+msgid "mail delivered"
+msgstr "privébericht afgeleverd"
+
+#: ../../mod/editblock.php:78 ../../mod/editblock.php:94
+#: ../../mod/editpost.php:20 ../../mod/editlayout.php:76
+#: ../../mod/editwebpage.php:77
+msgid "Item not found"
+msgstr "Item niet gevonden"
+
 #: ../../mod/editblock.php:118
 msgid "Delete block?"
 msgstr "Blok verwijderen"
 
-#: ../../mod/editblock.php:180
-msgid "Edit Block"
-msgstr "Blok bewerken"
-
-#: ../../mod/home.php:57 ../../mod/home.php:63 ../../mod/siteinfo.php:157
-msgid "$Projectname"
-msgstr "$Projectname"
-
-#: ../../mod/home.php:73
-#, php-format
-msgid "Welcome to %s"
-msgstr "Welkom op %s"
+#: ../../mod/editblock.php:145 ../../mod/editpost.php:122
+#: ../../mod/editlayout.php:143 ../../mod/editwebpage.php:185
+msgid "Insert YouTube video"
+msgstr "YouTube-video invoegen"
 
-#: ../../mod/item.php:174
-msgid "Unable to locate original post."
-msgstr "Niet in staat om de originele locatie van het bericht te vinden. "
+#: ../../mod/editblock.php:146 ../../mod/editpost.php:123
+#: ../../mod/editlayout.php:144 ../../mod/editwebpage.php:186
+msgid "Insert Vorbis [.ogg] video"
+msgstr "Vorbis-video [.ogg] invoegen"
 
-#: ../../mod/item.php:407
-msgid "Empty post discarded."
-msgstr "Leeg bericht geannuleerd"
+#: ../../mod/editblock.php:147 ../../mod/editpost.php:124
+#: ../../mod/editlayout.php:145 ../../mod/editwebpage.php:187
+msgid "Insert Vorbis [.ogg] audio"
+msgstr "Vorbis-audio [.ogg] invoegen"
 
-#: ../../mod/item.php:447
-msgid "Executable content type not permitted to this channel."
-msgstr "Uitvoerbare bestanden zijn niet toegestaan op dit kanaal."
+#: ../../mod/editblock.php:180
+msgid "Edit Block"
+msgstr "Blok bewerken"
 
-#: ../../mod/item.php:896
-msgid "System error. Post not saved."
-msgstr "Systeemfout. Bericht niet opgeslagen."
+#: ../../mod/dirsearch.php:29
+msgid "This directory server requires an access token"
+msgstr "Deze kanalengidshub (directoryserver) heeft een toegangs-token nodig"
 
-#: ../../mod/item.php:1163
-msgid "Unable to obtain post information from database."
-msgstr "Niet in staat om informatie over dit bericht uit de database te verkrijgen."
+#: ../../mod/editpost.php:31
+msgid "Item is not editable"
+msgstr "Item is niet te bewerken"
 
-#: ../../mod/item.php:1170
-#, php-format
-msgid "You have reached your limit of %1$.0f top level posts."
-msgstr "Je hebt jouw limiet van %1$.0f berichten bereikt."
+#: ../../mod/editpost.php:55
+msgid "Delete item?"
+msgstr "Item verwijderen?"
 
-#: ../../mod/item.php:1177
-#, php-format
-msgid "You have reached your limit of %1$.0f webpages."
-msgstr "Je hebt jouw limiet van %1$.0f webpagina's bereikt."
+#: ../../mod/editpost.php:165 ../../mod/rpost.php:128
+msgid "Edit post"
+msgstr "Bericht bewerken"
 
 #: ../../mod/oexchange.php:23
 msgid "Unable to find your hub."
@@ -6332,7 +6538,7 @@ msgid ""
 "Password reset failed."
 msgstr "Het verzoek kon niet worden geverifieerd. (Mogelijk heb je al eerder een verzoek ingediend.) Opnieuw instellen van wachtwoord is mislukt."
 
-#: ../../mod/lostpass.php:86 ../../boot.php:1505
+#: ../../mod/lostpass.php:86 ../../boot.php:1511
 msgid "Password Reset"
 msgstr "Wachtwoord vergeten?"
 
@@ -6381,186 +6587,19 @@ msgstr "E-mailadres"
 msgid "Reset"
 msgstr "Opnieuw instellen"
 
-#: ../../mod/photos.php:79
-msgid "Page owner information could not be retrieved."
-msgstr "Informatie over de pagina-eigenaar werd niet ontvangen."
-
-#: ../../mod/photos.php:100
-msgid "Album not found."
-msgstr "Album niet gevonden."
-
-#: ../../mod/photos.php:127
-msgid "Delete Album"
-msgstr "Verwijder album"
-
-#: ../../mod/photos.php:170 ../../mod/photos.php:970
-msgid "Delete Photo"
-msgstr "Verwijder foto"
-
-#: ../../mod/photos.php:464
-msgid "No photos selected"
-msgstr "Geen foto's geselecteerd"
-
-#: ../../mod/photos.php:513
-msgid "Access to this item is restricted."
-msgstr "Toegang tot dit item is beperkt."
-
-#: ../../mod/photos.php:552
-#, php-format
-msgid "%1$.2f MB of %2$.2f MB photo storage used."
-msgstr "%1$.2f MB van %2$.2f MB aan foto-opslag gebruikt."
+#: ../../mod/home.php:57 ../../mod/home.php:65 ../../mod/siteinfo.php:157
+msgid "$Projectname"
+msgstr "$Projectname"
 
-#: ../../mod/photos.php:555
+#: ../../mod/home.php:75
 #, php-format
-msgid "%1$.2f MB photo storage used."
-msgstr "%1$.2f MB aan foto-opslag gebruikt."
-
-#: ../../mod/photos.php:583
-msgid "Upload Photos"
-msgstr "Foto's uploaden"
-
-#: ../../mod/photos.php:587
-msgid "Enter an album name"
-msgstr "Vul een albumnaam in"
-
-#: ../../mod/photos.php:588
-msgid "or select an existing album (doubleclick)"
-msgstr "of kies een bestaand album (dubbelklikken)"
-
-#: ../../mod/photos.php:589
-msgid "Create a status post for this upload"
-msgstr "Plaats een bericht voor deze upload."
-
-#: ../../mod/photos.php:616
-msgid "Album name could not be decoded"
-msgstr "Albumnaam kon niet gedecodeerd worden"
-
-#: ../../mod/photos.php:660 ../../mod/photos.php:1197
-#: ../../mod/photos.php:1214
-msgid "Contact Photos"
-msgstr "Connectiefoto's"
-
-#: ../../mod/photos.php:688
-msgid "Show Newest First"
-msgstr "Nieuwste eerst weergeven"
-
-#: ../../mod/photos.php:690
-msgid "Show Oldest First"
-msgstr "Oudste eerst weergeven"
-
-#: ../../mod/photos.php:714 ../../mod/photos.php:1247
-msgid "View Photo"
-msgstr "Foto weergeven"
-
-#: ../../mod/photos.php:743
-msgid "Edit Album"
-msgstr "Album bewerken"
-
-#: ../../mod/photos.php:788
-msgid "Permission denied. Access to this item may be restricted."
-msgstr "Toegang geweigerd. Toegang tot dit item kan zijn beperkt."
-
-#: ../../mod/photos.php:790
-msgid "Photo not available"
-msgstr "Foto niet aanwezig"
-
-#: ../../mod/photos.php:848
-msgid "Use as profile photo"
-msgstr "Als profielfoto gebruiken"
-
-#: ../../mod/photos.php:855
-msgid "Private Photo"
-msgstr "Privéfoto"
-
-#: ../../mod/photos.php:866 ../../mod/events.php:528
-msgid "Previous"
-msgstr "Vorige"
-
-#: ../../mod/photos.php:870
-msgid "View Full Size"
-msgstr "Volledige grootte weergeven"
-
-#: ../../mod/photos.php:875 ../../mod/events.php:529 ../../mod/setup.php:285
-msgid "Next"
-msgstr "Volgende"
-
-#: ../../mod/photos.php:915 ../../mod/tagrm.php:133
-msgid "Remove"
-msgstr "Verwijderen"
-
-#: ../../mod/photos.php:949
-msgid "Edit photo"
-msgstr "Foto bewerken"
-
-#: ../../mod/photos.php:951
-msgid "Rotate CW (right)"
-msgstr "Draai met de klok mee (naar rechts)"
-
-#: ../../mod/photos.php:952
-msgid "Rotate CCW (left)"
-msgstr "Draai tegen de klok in (naar links)"
-
-#: ../../mod/photos.php:955
-msgid "Enter a new album name"
-msgstr "Vul een nieuwe albumnaam in"
-
-#: ../../mod/photos.php:956
-msgid "or select an existing one (doubleclick)"
-msgstr "of kies een bestaand album (dubbelklikken)"
-
-#: ../../mod/photos.php:959
-msgid "Caption"
-msgstr "Bijschrift"
-
-#: ../../mod/photos.php:961
-msgid "Add a Tag"
-msgstr "Tag toevoegen"
-
-#: ../../mod/photos.php:965
-msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
-msgstr "Voorbeeld: @bob, @Barbara_Jansen, @jan@voorbeeld.nl"
-
-#: ../../mod/photos.php:968
-msgid "Flag as adult in album view"
-msgstr "Markeer als voor volwassenen in albumweergave"
-
-#: ../../mod/photos.php:1160
-msgid "In This Photo:"
-msgstr "Op deze foto:"
-
-#: ../../mod/photos.php:1165
-msgid "Map"
-msgstr "Kaart"
-
-#: ../../mod/photos.php:1253
-msgid "View Album"
-msgstr "Album weergeven"
-
-#: ../../mod/photos.php:1276
-msgid "Recent Photos"
-msgstr "Recente foto's"
+msgid "Welcome to %s"
+msgstr "Welkom op %s"
 
 #: ../../mod/dav.php:121
 msgid "$Projectname channel"
 msgstr "$Projectname-kanaal"
 
-#: ../../mod/rate.php:157
-msgid "Website:"
-msgstr "Website:"
-
-#: ../../mod/rate.php:160
-#, php-format
-msgid "Remote Channel [%s] (not yet known on this site)"
-msgstr "Kanaal op afstand [%s] (nog niet op deze hub bekend)"
-
-#: ../../mod/rate.php:161
-msgid "Rating (this information is public)"
-msgstr "Beoordeling (deze informatie is openbaar)"
-
-#: ../../mod/rate.php:162
-msgid "Optionally explain your rating (this information is public)"
-msgstr "Verklaar jouw beoordeling (niet verplicht, deze informatie is openbaar)"
-
 #: ../../mod/events.php:21
 msgid "Calendar entries imported."
 msgstr "Agenda-items geïmporteerd."
@@ -6819,83 +6858,35 @@ msgstr "Website: "
 msgid "Description: "
 msgstr "Omschrijving: "
 
-#: ../../mod/regdir.php:45 ../../mod/dirsearch.php:21
-msgid "This site is not a directory server"
-msgstr "Deze hub is geen kanalengidshub (directoryserver)"
-
-#: ../../mod/mail.php:33
-msgid "Unable to lookup recipient."
-msgstr "Niet in staat om ontvanger op te zoeken."
-
-#: ../../mod/mail.php:41
-msgid "Unable to communicate with requested channel."
-msgstr "Niet in staat om met het aangevraagde kanaal te communiceren."
-
-#: ../../mod/mail.php:48
-msgid "Cannot verify requested channel."
-msgstr "Kan opgevraagd kanaal niet verifieren"
-
-#: ../../mod/mail.php:74
-msgid "Selected channel has private message restrictions. Send failed."
-msgstr "Gekozen kanaal heeft restricties voor privéberichten. Verzenden mislukt."
-
-#: ../../mod/mail.php:128
-msgid "Messages"
-msgstr "Berichten"
-
-#: ../../mod/mail.php:138
-msgid "Message deleted."
-msgstr "Bericht verwijderd."
-
-#: ../../mod/mail.php:154
-msgid "Message recalled."
-msgstr "Bericht ingetrokken."
-
-#: ../../mod/mail.php:221
-msgid "Send Private Message"
-msgstr "Privébericht versturen"
-
-#: ../../mod/mail.php:222 ../../mod/mail.php:352
-msgid "To:"
-msgstr "Aan:"
-
-#: ../../mod/mail.php:227 ../../mod/mail.php:341 ../../mod/mail.php:354
-msgid "Subject:"
-msgstr "Onderwerp:"
-
-#: ../../mod/mail.php:231 ../../mod/mail.php:357 ../../mod/invite.php:131
-msgid "Your message:"
-msgstr "Jouw bericht:"
-
-#: ../../mod/mail.php:238
-msgid "Send"
-msgstr "Verzenden"
+#: ../../mod/item.php:173
+msgid "Unable to locate original post."
+msgstr "Niet in staat om de originele locatie van het bericht te vinden. "
 
-#: ../../mod/mail.php:322
-msgid "Delete message"
-msgstr "Bericht verwijderen"
+#: ../../mod/item.php:417
+msgid "Empty post discarded."
+msgstr "Leeg bericht geannuleerd"
 
-#: ../../mod/mail.php:323
-msgid "Recall message"
-msgstr "Bericht intrekken"
+#: ../../mod/item.php:457
+msgid "Executable content type not permitted to this channel."
+msgstr "Uitvoerbare bestanden zijn niet toegestaan op dit kanaal."
 
-#: ../../mod/mail.php:325
-msgid "Message has been recalled."
-msgstr "Bericht is ingetrokken."
+#: ../../mod/item.php:906
+msgid "System error. Post not saved."
+msgstr "Systeemfout. Bericht niet opgeslagen."
 
-#: ../../mod/mail.php:345
-msgid "Delete Conversation"
-msgstr "Verwijder conversatie"
+#: ../../mod/item.php:1173
+msgid "Unable to obtain post information from database."
+msgstr "Niet in staat om informatie over dit bericht uit de database te verkrijgen."
 
-#: ../../mod/mail.php:347
-msgid ""
-"No secure communications available. You <strong>may</strong> be able to "
-"respond from the sender's profile page."
-msgstr "Geen veilige communicatie beschikbaar. <strong>Mogelijk</strong> kan je reageren op de kanaalpagina van de afzender."
+#: ../../mod/item.php:1180
+#, php-format
+msgid "You have reached your limit of %1$.0f top level posts."
+msgstr "Je hebt jouw limiet van %1$.0f berichten bereikt."
 
-#: ../../mod/mail.php:351
-msgid "Send Reply"
-msgstr "Antwoord versturen"
+#: ../../mod/item.php:1187
+#, php-format
+msgid "You have reached your limit of %1$.0f webpages."
+msgstr "Je hebt jouw limiet van %1$.0f webpagina's bereikt."
 
 #: ../../mod/webpages.php:191
 msgid "Page Title"
@@ -7024,6 +7015,55 @@ msgstr "Geen abonnementsbeperkingen gevonden."
 msgid "Item not available."
 msgstr "Item is niet aanwezig."
 
+#: ../../mod/pubsites.php:16
+msgid "Public Sites"
+msgstr "Openbare hubs"
+
+#: ../../mod/pubsites.php:19
+msgid ""
+"The listed sites allow public registration for the $Projectname network. All"
+" sites in the network are interlinked so membership on any of them conveys "
+"membership in the network as a whole. Some sites may require subscription or"
+" provide tiered service plans. The provider links <strong>may</strong> "
+"provide additional details."
+msgstr "Op de hier weergegeven hubs kan iedereen zich voor het $Projectname-netwerk aanmelden. Alle hubs in het $Projectname-netwerk zijn met elkaar verbonden, dus maakt het qua lidmaatschap niet uit waar je je aanmeldt. Op sommige hubs heb je eerst goedkeuring nodig en sommige hubs vereisen betaalde abonnementen voor uitbreidingen. <strong>Mogelijk</strong> wordt hierover op de hub zelf meer informatie gegeven."
+
+#: ../../mod/pubsites.php:25
+msgid "Rate this hub"
+msgstr "Beoordeel deze hub"
+
+#: ../../mod/pubsites.php:26
+msgid "Site URL"
+msgstr "URL hub"
+
+#: ../../mod/pubsites.php:26
+msgid "Access Type"
+msgstr "Toegangstype"
+
+#: ../../mod/pubsites.php:26
+msgid "Registration Policy"
+msgstr "Registratiebeleid"
+
+#: ../../mod/pubsites.php:26 ../../mod/profiles.php:454
+msgid "Location"
+msgstr "Locatie"
+
+#: ../../mod/pubsites.php:26
+msgid "Project"
+msgstr "Project"
+
+#: ../../mod/pubsites.php:26
+msgid "View hub ratings"
+msgstr "Bekijk hubbeoordelingen"
+
+#: ../../mod/pubsites.php:30
+msgid "Rate"
+msgstr "Beoordeel"
+
+#: ../../mod/pubsites.php:31
+msgid "View ratings"
+msgstr "Bekijk beoordelingen"
+
 #: ../../mod/sources.php:32
 msgid "Failed to create source. No channel selected."
 msgstr "Aanmaken bron mislukt. Geen kanaal geselecteerd."
@@ -7128,9 +7168,9 @@ msgstr "Vul jouw kanaaladres in (bijv. channel@example.com)"
 msgid "Authenticate"
 msgstr "Authenticeren"
 
-#: ../../mod/dirsearch.php:29
-msgid "This directory server requires an access token"
-msgstr "Deze kanalengidshub (directoryserver) heeft een toegangs-token nodig"
+#: ../../mod/channel.php:97
+msgid "Insufficient permissions.  Request redirected to profile page."
+msgstr "Onvoldoende permissies.  Doorgestuurd naar profielpagina."
 
 #: ../../mod/siteinfo.php:111
 #, php-format
@@ -7169,9 +7209,9 @@ msgstr "Draaiend op weblocatie"
 
 #: ../../mod/siteinfo.php:168
 msgid ""
-"Please visit <a href=\"https://redmatrix.me\">redmatrix.me</a> to learn more"
-" about $Projectname."
-msgstr "Bezoek <a href=\"https://redmatrix.me\">redmatrix.me</a> om meer over $Projectname te leren."
+"Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more "
+"about $Projectname."
+msgstr "Bezoek <a href=\"http://hubzilla.org\">hubzilla.org</a> "
 
 #: ../../mod/siteinfo.php:169
 msgid "Bug reports and issues: please visit"
@@ -7217,42 +7257,42 @@ msgstr "Waarschuwing: database-versies lopen %1$d updates achter."
 msgid "No channel. Import failed."
 msgstr "Geen kanaal. Importeren mislukt."
 
-#: ../../mod/import.php:493
+#: ../../mod/import.php:499
 msgid "You must be logged in to use this feature."
 msgstr "Je moet ingelogd zijn om dit onderdeel te kunnen gebruiken."
 
-#: ../../mod/import.php:498
+#: ../../mod/import.php:504
 msgid "Import Channel"
 msgstr "Kanaal importeren"
 
-#: ../../mod/import.php:499
+#: ../../mod/import.php:505
 msgid ""
 "Use this form to import an existing channel from a different server/hub. You"
 " may retrieve the channel identity from the old server/hub via the network "
 "or provide an export file."
 msgstr "Gebruik dit formulier om een bestaand kanaal te importeren van een andere hub. Je kan de kanaal-identiteit van de oude hub via het netwerk ontvangen of een exportbestand verstrekken."
 
-#: ../../mod/import.php:500 ../../mod/import_items.php:121
+#: ../../mod/import.php:506 ../../mod/import_items.php:121
 msgid "File to Upload"
 msgstr "Bestand om te uploaden"
 
-#: ../../mod/import.php:501
+#: ../../mod/import.php:507
 msgid "Or provide the old server/hub details"
 msgstr "Of vul de gegevens van de oude hub in"
 
-#: ../../mod/import.php:502
+#: ../../mod/import.php:508
 msgid "Your old identity address (xyz@example.com)"
 msgstr "Jouw oude kanaaladres (xyz@example.com)"
 
-#: ../../mod/import.php:503
+#: ../../mod/import.php:509
 msgid "Your old login email address"
 msgstr "Het e-mailadres van je oude account"
 
-#: ../../mod/import.php:504
+#: ../../mod/import.php:510
 msgid "Your old login password"
 msgstr "Wachtwoord van jouw oude account"
 
-#: ../../mod/import.php:505
+#: ../../mod/import.php:511
 msgid ""
 "For either option, please choose whether to make this hub your new primary "
 "address, or whether your old location should continue this role. You will be"
@@ -7260,17 +7300,17 @@ msgid ""
 "primary location for files, photos, and media."
 msgstr "Voor elke optie geldt dat je moet kiezen of je jouw primaire kanaaladres op deze hub wil instellen of dat jouw oude hub deze rol blijft vervullen."
 
-#: ../../mod/import.php:506
+#: ../../mod/import.php:512
 msgid "Make this hub my primary location"
 msgstr "Stel deze hub als mijn primaire locatie in"
 
-#: ../../mod/import.php:507
+#: ../../mod/import.php:513
 msgid ""
 "Import existing posts if possible (experimental - limited by available "
 "memory"
 msgstr "Importeer bestaande berichten wanneer mogelijk (experimenteel - afhankelijk van beschikbaar servergeheugen)"
 
-#: ../../mod/import.php:508
+#: ../../mod/import.php:514
 msgid ""
 "This process may take several minutes to complete. Please submit the form "
 "only once and leave this page open until finished."
@@ -8336,8 +8376,8 @@ msgid "Database Server Name"
 msgstr "Database Server Name"
 
 #: ../../mod/setup.php:315
-msgid "Default is localhost"
-msgstr "Default is localhost"
+msgid "Default is 127.0.0.1"
+msgstr "Default is 127.0.0.1"
 
 #: ../../mod/setup.php:316
 msgid "Database Port"
@@ -9129,51 +9169,51 @@ msgstr "Grootte profielfoto's van berichten instellen"
 msgid "Set size of followup author photos"
 msgstr "Grootte profielfoto's van reacties instellen"
 
-#: ../../boot.php:1302
+#: ../../boot.php:1308
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "Update %s mislukt. Zie foutenlogboek."
 
-#: ../../boot.php:1305
+#: ../../boot.php:1311
 #, php-format
 msgid "Update Error at %s"
 msgstr "Update-fout op %s"
 
-#: ../../boot.php:1472
+#: ../../boot.php:1478
 msgid ""
 "Create an account to access services and applications within the Hubzilla"
 msgstr "Maak een account aan om toegang te krijgen tot diensten en toepassingen van Hubzilla"
 
-#: ../../boot.php:1500
+#: ../../boot.php:1506
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: ../../boot.php:1501
+#: ../../boot.php:1507
 msgid "Remember me"
 msgstr "Aangemeld blijven"
 
-#: ../../boot.php:1504
+#: ../../boot.php:1510
 msgid "Forgot your password?"
 msgstr "Wachtwoord vergeten?"
 
-#: ../../boot.php:2130
+#: ../../boot.php:2136
 msgid "toggle mobile"
 msgstr "mobiele weergave omschakelen"
 
-#: ../../boot.php:2265
+#: ../../boot.php:2271
 msgid "Website SSL certificate is not valid. Please correct."
 msgstr "Het SSL-certificaat van deze website is ongeldig. Corrigeer dit a.u.b."
 
-#: ../../boot.php:2268
+#: ../../boot.php:2274
 #, php-format
 msgid "[hubzilla] Website SSL error for %s"
 msgstr "[hubzilla] Probleem met SSL-certificaat voor %s"
 
-#: ../../boot.php:2305
+#: ../../boot.php:2311
 msgid "Cron/Scheduled tasks not running."
 msgstr "Cron is niet actief"
 
-#: ../../boot.php:2309
+#: ../../boot.php:2315
 #, php-format
 msgid "[hubzilla] Cron tasks not running on %s"
 msgstr "[hubzilla] Cron-taken zijn niet actief op %s"
diff --git a/view/nl/hstrings.php b/view/nl/hstrings.php
index 422c65f3c..b04679372 100644
--- a/view/nl/hstrings.php
+++ b/view/nl/hstrings.php
@@ -5,6 +5,12 @@ function string_plural_select_nl($n){
 	return ($n != 1);;
 }}
 ;
+$a->strings["Attachments:"] = "Bijlagen:";
+$a->strings["l F d, Y \\@ g:i A"] = "l d F Y \\@ G:i";
+$a->strings["\$Projectname event notification:"] = "Notificatie \$Projectname-gebeurtenis:";
+$a->strings["Starts:"] = "Start:";
+$a->strings["Finishes:"] = "Einde:";
+$a->strings["Location:"] = "Plaats:";
 $a->strings["No username found in import file."] = "Geen gebruikersnaam in het importbestand gevonden.";
 $a->strings["Unable to create a unique channel address. Import failed."] = "Niet in staat om een uniek kanaaladres aan te maken. Importeren is mislukt.";
 $a->strings["Import completed."] = "Import voltooid.";
@@ -16,8 +22,6 @@ $a->strings["Calendar"] = "Agenda";
 $a->strings["Schedule Inbox"] = "Planning-postvak IN";
 $a->strings["Schedule Outbox"] = "Planning-postvak UIT";
 $a->strings["Unknown"] = "Onbekend";
-$a->strings["%1\$s used"] = "%1\$s gebruikt";
-$a->strings["%1\$s used of %2\$s (%3\$s&#37;)"] = "%1\$s van %2\$s gebruikt (%3\$s&#37;)";
 $a->strings["Files"] = "Bestanden";
 $a->strings["Total"] = "Totaal";
 $a->strings["Shared"] = "Gedeeld";
@@ -29,6 +33,9 @@ $a->strings["Size"] = "Grootte";
 $a->strings["Last Modified"] = "Laatst gewijzigd";
 $a->strings["Edit"] = "Bewerken";
 $a->strings["Delete"] = "Verwijderen";
+$a->strings["You are using %1\$s of your available file storage."] = "Je gebruikt %1\$s van de beschikbare bestandsopslag.";
+$a->strings["You are using %1\$s of %2\$s available file storage. (%3\$s&#37;)"] = "Je gebruikt %1\$s van totaal %2\$s beschikbare bestandsopslag. (%3\$s&#37;)";
+$a->strings["WARNING:"] = "WAARSCHUWING:";
 $a->strings["Create new folder"] = "Nieuwe map aanmaken";
 $a->strings["Upload file"] = "Bestand uploaden";
 $a->strings["Can view my normal stream and posts"] = "Kan mijn normale kanaalstream en berichten bekijken";
@@ -115,7 +122,7 @@ $a->strings["Post Composition Features"] = "Functies voor het opstellen van beri
 $a->strings["Use Markdown"] = "Markdown gebruiken";
 $a->strings["Allow use of \"Markdown\" to format posts"] = "Sta het gebruik van \"markdown\" toe om berichten mee op te maken.";
 $a->strings["Large Photos"] = "Grote foto's";
-$a->strings["Include large (640px) photo thumbnails in posts. If not enabled, use small (320px) photo thumbnails"] = "Toon grote (640px) voorbeeldfoto's in berichten. Standaard worden kleine voorbeeldfoto's (320px) getoond. ";
+$a->strings["Include large (1024px) photo thumbnails in posts. If not enabled, use small (640px) photo thumbnails"] = "Gebruik grotere foto's (1024px) in berichten. Wanneer dit is uitgeschakeld worden er kleinere foto's (640px) gebruikt.";
 $a->strings["Channel Sources"] = "Kanaalbronnen";
 $a->strings["Automatically import channel content from other channels or feeds"] = "Automatisch inhoud uit andere kanalen of feeds importeren.";
 $a->strings["Even More Encryption"] = "Extra encryptie";
@@ -259,308 +266,50 @@ $a->strings["New window"] = "Nieuw venster";
 $a->strings["Open the selected location in a different window or browser tab"] = "Open de geselecteerde locatie in een ander venster of tab";
 $a->strings["User '%s' deleted"] = "Account '%s' verwijderd";
 $a->strings["Cannot locate DNS info for database server '%s'"] = "Kan DNS-informatie voor databaseserver '%s' niet vinden";
-$a->strings["photo"] = "foto";
-$a->strings["event"] = "gebeurtenis";
-$a->strings["channel"] = "kanaal";
-$a->strings["status"] = "bericht";
-$a->strings["comment"] = "reactie";
-$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s vindt %3\$s van %2\$s leuk";
-$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s vindt %3\$s van %2\$s niet leuk";
-$a->strings["%1\$s is now connected with %2\$s"] = "%1\$s is nu met %2\$s verbonden";
-$a->strings["%1\$s poked %2\$s"] = "%1\$s heeft %2\$s aangestoten";
-$a->strings["poked"] = "aangestoten";
-$a->strings["__ctx:mood__ %1\$s is %2\$s"] = "%1\$s is %2\$s";
-$a->strings["__ctx:title__ Likes"] = "vinden dit leuk";
-$a->strings["__ctx:title__ Dislikes"] = "vinden dit niet leuk";
-$a->strings["__ctx:title__ Agree"] = "eens";
-$a->strings["__ctx:title__ Disagree"] = "oneens";
-$a->strings["__ctx:title__ Abstain"] = "onthoudingen";
-$a->strings["__ctx:title__ Attending"] = "aanwezig";
-$a->strings["__ctx:title__ Not attending"] = "niet aanwezig";
-$a->strings["__ctx:title__ Might attend"] = "mogelijk aanwezig";
-$a->strings["Select"] = "Kies";
-$a->strings["Private Message"] = "Privébericht";
-$a->strings["Message signature validated"] = "Berichtkenmerk gevalideerd";
-$a->strings["Message signature incorrect"] = "Berichtkenmerk onjuist";
-$a->strings["View %s's profile @ %s"] = "Bekijk het profiel van %s @ %s";
-$a->strings["Categories:"] = "Categorieën:";
-$a->strings["Filed under:"] = "Bewaard onder:";
-$a->strings["from %s"] = "van %s";
-$a->strings["last edited: %s"] = "laatst bewerkt: %s";
-$a->strings["Expires: %s"] = "Verloopt: %s";
-$a->strings["View in context"] = "In context bekijken";
-$a->strings["Please wait"] = "Even wachten";
-$a->strings["remove"] = "verwijderen";
-$a->strings["Loading..."] = "Aan het laden...";
-$a->strings["Delete Selected Items"] = "Verwijder de geselecteerde items";
-$a->strings["View Source"] = "Bron weergeven";
-$a->strings["Follow Thread"] = "Conversatie volgen";
-$a->strings["View Status"] = "Status weergeven";
-$a->strings["View Profile"] = "Profiel weergeven";
-$a->strings["View Photos"] = "Foto's weergeven";
-$a->strings["Activity/Posts"] = "Kanaal-activiteit";
-$a->strings["Edit Connection"] = "Connectie bewerken";
-$a->strings["Send PM"] = "Privébericht verzenden";
-$a->strings["Poke"] = "Aanstoten";
-$a->strings["%s likes this."] = "%s vindt dit leuk.";
-$a->strings["%s doesn't like this."] = "%s vindt dit niet leuk.";
-$a->strings["<span  %1\$s>%2\$d people</span> like this."] = array(
-	0 => "<span  %1\$s>%2\$d persoon</span> vindt dit leuk.",
-	1 => "<span  %1\$s>%2\$d personen</span> vinden dit leuk.",
-);
-$a->strings["<span  %1\$s>%2\$d people</span> don't like this."] = array(
-	0 => "<span  %1\$s>%2\$d persoon</span> vindt dit niet leuk.",
-	1 => "<span  %1\$s>%2\$d personen</span> vinden dit niet leuk.",
-);
-$a->strings["and"] = "en";
-$a->strings[", and %d other people"] = array(
-	0 => ", en %d ander persoon",
-	1 => ", en %d andere personen",
-);
-$a->strings["%s like this."] = "%s vinden dit leuk.";
-$a->strings["%s don't like this."] = "%s vinden dit niet leuk.";
-$a->strings["Visible to <strong>everybody</strong>"] = "Voor <strong>iedereen</strong> zichtbaar";
-$a->strings["Please enter a link URL:"] = "Vul een internetadres/URL in:";
-$a->strings["Please enter a video link/URL:"] = "Vul een videolink/URL in:";
-$a->strings["Please enter an audio link/URL:"] = "Vul een audiolink/URL in:";
-$a->strings["Tag term:"] = "Tag:";
-$a->strings["Save to Folder:"] = "Bewaar in map: ";
-$a->strings["Where are you right now?"] = "Waar bevind je je op dit moment?";
-$a->strings["Expires YYYY-MM-DD HH:MM"] = "Verloopt op DD-MM-YYYY om HH:MM";
-$a->strings["Preview"] = "Voorvertoning";
-$a->strings["Share"] = "Delen";
-$a->strings["Page link name"] = "Linknaam pagina";
-$a->strings["Post as"] = "Bericht plaatsen als";
-$a->strings["Bold"] = "Vet";
-$a->strings["Italic"] = "Cursief";
-$a->strings["Underline"] = "Onderstrepen";
-$a->strings["Quote"] = "Citeren";
-$a->strings["Code"] = "Broncode";
-$a->strings["Upload photo"] = "Foto uploaden";
-$a->strings["upload photo"] = "foto uploaden";
-$a->strings["Attach file"] = "Bestand toevoegen";
-$a->strings["attach file"] = "bestand toevoegen";
-$a->strings["Insert web link"] = "Weblink invoegen";
-$a->strings["web link"] = "Weblink";
-$a->strings["Insert video link"] = "Videolink invoegen";
-$a->strings["video link"] = "videolink";
-$a->strings["Insert audio link"] = "Audiolink invoegen";
-$a->strings["audio link"] = "audiolink";
-$a->strings["Set your location"] = "Locatie instellen";
-$a->strings["set location"] = "locatie instellen";
-$a->strings["Toggle voting"] = "Stemmen in- of uitschakelen";
-$a->strings["Clear browser location"] = "Locatie van webbrowser wissen";
-$a->strings["clear location"] = "locatie wissen";
-$a->strings["Title (optional)"] = "Titel (optioneel)";
-$a->strings["Categories (optional, comma-separated list)"] = "Categorieën (optioneel, door komma's gescheiden lijst)";
-$a->strings["Permission settings"] = "Permissies";
-$a->strings["permissions"] = "permissies";
-$a->strings["Public post"] = "Openbaar bericht";
-$a->strings["Example: bob@example.com, mary@example.com"] = "Voorbeeld: bob@voorbeeld.nl, mary@voorbeeld.be";
-$a->strings["Set expiration date"] = "Verloopdatum instellen";
-$a->strings["Encrypt text"] = "Tekst versleutelen";
-$a->strings["OK"] = "OK";
-$a->strings["Cancel"] = "Annuleren";
-$a->strings["Discover"] = "Ontdekken";
-$a->strings["Imported public streams"] = "Openbare streams importeren";
-$a->strings["Commented Order"] = "Nieuwe reacties bovenaan";
-$a->strings["Sort by Comment Date"] = "Berichten met nieuwe reacties bovenaan";
-$a->strings["Posted Order"] = "Nieuwe berichten bovenaan";
-$a->strings["Sort by Post Date"] = "Nieuwe berichten bovenaan";
-$a->strings["Personal"] = "Persoonlijk";
-$a->strings["Posts that mention or involve you"] = "Alleen berichten die jou vermelden of waar je op een andere manier bij betrokken bent";
-$a->strings["New"] = "Nieuw";
-$a->strings["Activity Stream - by date"] = "Activiteitenstroom - volgens datum";
-$a->strings["Starred"] = "Met ster";
-$a->strings["Favourite Posts"] = "Favoriete berichten";
-$a->strings["Spam"] = "Spam";
-$a->strings["Posts flagged as SPAM"] = "Berichten gemarkeerd als SPAM";
-$a->strings["Channel"] = "Kanaal";
-$a->strings["Status Messages and Posts"] = "Berichten in dit kanaal";
-$a->strings["About"] = "Over";
-$a->strings["Profile Details"] = "Profiel";
-$a->strings["Photos"] = "Foto's";
-$a->strings["Photo Albums"] = "Fotoalbums";
-$a->strings["Files and Storage"] = "Bestanden en opslagruimte";
-$a->strings["Chatrooms"] = "Chatkanalen";
-$a->strings["Bookmarks"] = "Bladwijzers";
-$a->strings["Saved Bookmarks"] = "Opgeslagen bladwijzers";
-$a->strings["Webpages"] = "Webpagina's";
-$a->strings["Manage Webpages"] = "Webpagina's beheren";
-$a->strings["View all"] = "Toon alles";
-$a->strings["__ctx:noun__ Like"] = array(
-	0 => "vindt dit leuk",
-	1 => "vinden dit leuk",
-);
-$a->strings["__ctx:noun__ Dislike"] = array(
-	0 => "vindt dit niet leuk",
-	1 => "vinden dit niet leuk",
-);
-$a->strings["__ctx:noun__ Attending"] = array(
-	0 => "aanwezig",
-	1 => "aanwezig",
-);
-$a->strings["__ctx:noun__ Not Attending"] = array(
-	0 => "niet aanwezig",
-	1 => "niet aanwezig",
-);
-$a->strings["__ctx:noun__ Undecided"] = array(
-	0 => "nog niet beslist",
-	1 => "nog niet beslist",
-);
-$a->strings["__ctx:noun__ Agree"] = array(
-	0 => "eens",
-	1 => "eens",
-);
-$a->strings["__ctx:noun__ Disagree"] = array(
-	0 => "oneens",
-	1 => "oneens",
-);
-$a->strings["__ctx:noun__ Abstain"] = array(
-	0 => "onthouding",
-	1 => "onthoudingen",
-);
+$a->strings["Permission denied"] = "Toegang geweigerd";
+$a->strings["(Unknown)"] = "(Onbekend)";
+$a->strings["Visible to anybody on the internet."] = "Voor iedereen op het internet zichtbaar.";
+$a->strings["Visible to you only."] = "Alleen voor jou zichtbaar.";
+$a->strings["Visible to anybody in this network."] = "Voor iedereen in dit netwerk zichtbaar.";
+$a->strings["Visible to anybody authenticated."] = "Voor iedereen die geauthenticeerd is zichtbaar.";
+$a->strings["Visible to anybody on %s."] = "Voor iedereen op %s zichtbaar.";
+$a->strings["Visible to all connections."] = "Voor alle connecties zichtbaar.";
+$a->strings["Visible to approved connections."] = "Voor alle goedgekeurde connecties zichtbaar.";
+$a->strings["Visible to specific connections."] = "Voor specifieke connecties zichtbaar.";
+$a->strings["Item not found."] = "Item niet gevonden.";
+$a->strings["Collection not found."] = "Collectie niet gevonden.";
+$a->strings["Collection is empty."] = "Collectie is leeg";
+$a->strings["Collection: %s"] = "Collectie: %s";
+$a->strings["Connection: %s"] = "Connectie: %s";
+$a->strings["Connection not found."] = "Connectie niet gevonden.";
 $a->strings["Public Timeline"] = "Openbare tijdlijn";
-$a->strings["Image exceeds website size limit of %lu bytes"] = "Afbeelding is groter dan op deze hub toegestane limiet van %lu bytes";
-$a->strings["Image file is empty."] = "Afbeeldingsbestand is leeg";
-$a->strings["Unable to process image"] = "Afbeelding kan niet verwerkt worden";
-$a->strings["Photo storage failed."] = "Foto kan niet worden opgeslagen";
-$a->strings["Upload New Photos"] = "Nieuwe foto's uploaden";
+$a->strings["view full size"] = "volledige grootte tonen";
 $a->strings["\$Projectname Notification"] = "\$Projectname-notificatie";
 $a->strings["\$projectname"] = "\$projectname";
 $a->strings["Thank You,"] = "Bedankt,";
 $a->strings["%s Administrator"] = "Beheerder %s";
-$a->strings["%s <!item_type!>"] = "%s <!item_type!>";
-$a->strings["[Red:Notify] New mail received at %s"] = "[Red:Notificatie] Nieuw privébericht ontvangen op %s";
-$a->strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s zond jou een nieuw privébericht om %3\$s.";
-$a->strings["%1\$s sent you %2\$s."] = "%1\$s zond jou %2\$s.";
-$a->strings["a private message"] = "een privébericht";
-$a->strings["Please visit %s to view and/or reply to your private messages."] = "Bezoek %s om je privéberichten te bekijken en/of er op te reageren.";
-$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s, %2\$s gaf een reactie op [zrl=%3\$s]een %4\$s[/zrl]";
-$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s, %2\$s gaf een reactie op [zrl=%3\$s]een %5\$s van %4\$s[/zrl]";
-$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s gaf een reactie op [zrl=%3\$s]jouw %4\$s[/zrl]";
-$a->strings["[Red:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Red:Notificatie] Reactie op conversatie #%1\$d door %2\$s";
-$a->strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = "%1\$s, %2\$s gaf een reactie op een bericht/conversatie die jij volgt.";
-$a->strings["Please visit %s to view and/or reply to the conversation."] = "Bezoek %s om de conversatie te bekijken en/of er op te reageren.";
-$a->strings["[Red:Notify] %s posted to your profile wall"] = "[Red:Notificatie] %s heeft een bericht op jouw kanaal geplaatst";
-$a->strings["%1\$s, %2\$s posted to your profile wall at %3\$s"] = "%1\$s, %2\$s heeft om %3\$s een bericht op jouw kanaal geplaatst";
-$a->strings["%1\$s, %2\$s posted to [zrl=%3\$s]your wall[/zrl]"] = "%1\$s, %2\$s heeft een bericht op [zrl=%3\$s]jouw kanaal[/zrl] geplaatst";
-$a->strings["[Red:Notify] %s tagged you"] = "[Red:Notificatie] %s heeft je genoemd";
-$a->strings["%1\$s, %2\$s tagged you at %3\$s"] = "%1\$s, %2\$s noemde jou op %3\$s";
-$a->strings["%1\$s, %2\$s [zrl=%3\$s]tagged you[/zrl]."] = "%1\$s, %2\$s [zrl=%3\$s]noemde jou[/zrl].";
-$a->strings["[Red:Notify] %1\$s poked you"] = "[Red:Notificatie] %1\$s heeft je aangestoten";
-$a->strings["%1\$s, %2\$s poked you at %3\$s"] = "%1\$s, %2\$s heeft je aangestoten op %3\$s";
-$a->strings["%1\$s, %2\$s [zrl=%2\$s]poked you[/zrl]."] = "%1\$s, %2\$s [zrl=%2\$s]heeft je aangestoten[/zrl].";
-$a->strings["[Red:Notify] %s tagged your post"] = "[Red:Notificatie] %s heeft jouw bericht getagd";
-$a->strings["%1\$s, %2\$s tagged your post at %3\$s"] = "%1\$s, %2\$s heeft jouw bericht om %3\$s getagd";
-$a->strings["%1\$s, %2\$s tagged [zrl=%3\$s]your post[/zrl]"] = "%1\$s, %2\$s heeft [zrl=%3\$s]jouw bericht[/zrl] getagd";
-$a->strings["[Red:Notify] Introduction received"] = "[Red:Notificatie] Connectieverzoek ontvangen";
-$a->strings["%1\$s, you've received an new connection request from '%2\$s' at %3\$s"] = "%1\$s, je hebt een nieuw connectieverzoek ontvangen van '%2\$s' op %3\$s";
-$a->strings["%1\$s, you've received [zrl=%2\$s]a new connection request[/zrl] from %3\$s."] = "%1\$s, je hebt een [zrl=%2\$s]nieuw connectieverzoek[/zrl] ontvangen van %3\$s.";
-$a->strings["You may visit their profile at %s"] = "Je kan het profiel bekijken op %s";
-$a->strings["Please visit %s to approve or reject the connection request."] = "Bezoek %s om het connectieverzoek te accepteren of af te wijzen.";
-$a->strings["[Red:Notify] Friend suggestion received"] = "[Red:Notificatie] Kanaalvoorstel ontvangen";
-$a->strings["%1\$s, you've received a friend suggestion from '%2\$s' at %3\$s"] = "%1\$s, je hebt een kanaalvoorstel ontvangen van '%2\$s' om %3\$s";
-$a->strings["%1\$s, you've received [zrl=%2\$s]a friend suggestion[/zrl] for %3\$s from %4\$s."] = "%1\$s, je hebt [zrl=%2\$s]een kanaalvoorstel[/zrl] ontvangen voor %3\$s van %4\$s.";
-$a->strings["Name:"] = "Naam:";
-$a->strings["Photo:"] = "Foto:";
-$a->strings["Please visit %s to approve or reject the suggestion."] = "Bezoek %s om het voorstel te accepteren of af te wijzen.";
-$a->strings["[Red:Notify]"] = "[Red:Notificatie]";
-$a->strings["view full size"] = "volledige grootte tonen";
 $a->strings["Administrator"] = "Beheerder";
 $a->strings["No Subject"] = "Geen onderwerp";
 $a->strings["%1\$s's bookmarks"] = "Bladwijzers van %1\$s";
-$a->strings["prev"] = "vorige";
-$a->strings["first"] = "eerste";
-$a->strings["last"] = "laatste";
-$a->strings["next"] = "volgende";
-$a->strings["older"] = "ouder";
-$a->strings["newer"] = "nieuwer";
-$a->strings["No connections"] = "Geen connecties";
-$a->strings["%d Connection"] = array(
-	0 => "%d connectie",
-	1 => "%d connecties",
-);
-$a->strings["View Connections"] = "Connecties weergeven";
-$a->strings["Search"] = "Zoeken";
-$a->strings["Save"] = "Opslaan";
-$a->strings["poke"] = "aanstoten";
-$a->strings["ping"] = "ping";
-$a->strings["pinged"] = "gepingd";
-$a->strings["prod"] = "por";
-$a->strings["prodded"] = "gepord";
-$a->strings["slap"] = "slaan";
-$a->strings["slapped"] = "sloeg";
-$a->strings["finger"] = "finger";
-$a->strings["fingered"] = "gefingerd";
-$a->strings["rebuff"] = "afpoeieren";
-$a->strings["rebuffed"] = "afgepoeierd";
-$a->strings["happy"] = "gelukkig";
-$a->strings["sad"] = "bedroefd";
-$a->strings["mellow"] = "mellow";
-$a->strings["tired"] = "moe";
-$a->strings["perky"] = "parmantig";
-$a->strings["angry"] = "boos";
-$a->strings["stupified"] = "beteuterd";
-$a->strings["puzzled"] = "verward";
-$a->strings["interested"] = "geïnteresseerd";
-$a->strings["bitter"] = "verbitterd";
-$a->strings["cheerful"] = "vrolijk";
-$a->strings["alive"] = "levendig";
-$a->strings["annoyed"] = "geërgerd";
-$a->strings["anxious"] = "bezorgd";
-$a->strings["cranky"] = "humeurig";
-$a->strings["disturbed"] = "verontrust";
-$a->strings["frustrated"] = "gefrustreerd ";
-$a->strings["depressed"] = "gedeprimeerd";
-$a->strings["motivated"] = "gemotiveerd";
-$a->strings["relaxed"] = "ontspannen";
-$a->strings["surprised"] = "verrast";
-$a->strings["May"] = "mei";
-$a->strings["unknown.???"] = "onbekend.???";
-$a->strings["bytes"] = "bytes";
-$a->strings["remove category"] = "categorie verwijderen";
-$a->strings["remove from file"] = "uit map verwijderen";
-$a->strings["Click to open/close"] = "Klik om te openen of te sluiten";
-$a->strings["Link to Source"] = "Originele locatie";
-$a->strings["default"] = "standaard";
-$a->strings["Page layout"] = "Pagina-lay-out";
-$a->strings["You can create your own with the layouts tool"] = "Je kan jouw eigen lay-out ontwerpen onder lay-outs";
-$a->strings["Page content type"] = "Opmaaktype pagina";
-$a->strings["Select an alternate language"] = "Kies een andere taal";
-$a->strings["activity"] = "activiteit";
-$a->strings["Design Tools"] = "Ontwerp-hulpmiddelen";
-$a->strings["Blocks"] = "Blokken";
-$a->strings["Menus"] = "Menu's";
-$a->strings["Layouts"] = "Lay-outs";
-$a->strings["Pages"] = "Pagina's";
 $a->strings["Visible to your default audience"] = "Voor iedereen zichtbaar, mits niet anders ingesteld";
 $a->strings["Show"] = "Tonen";
 $a->strings["Don't show"] = "Niet tonen";
 $a->strings["Permissions"] = "Permissies";
 $a->strings["Close"] = "Sluiten";
-$a->strings["Item was not found."] = "Item niet gevonden";
-$a->strings["No source file."] = "Geen bronbestand.";
-$a->strings["Cannot locate file to replace"] = "Kan het te vervangen bestand niet vinden";
-$a->strings["Cannot locate file to revise/update"] = "Kan het bestand wat aangepast moet worden niet vinden";
-$a->strings["File exceeds size limit of %d"] = "Bestand is groter dan de toegelaten %d";
-$a->strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Je hebt jouw limiet van %1$.0f MB opslagruimte voor bijlagen bereikt.";
-$a->strings["File upload failed. Possible system limit or action terminated."] = "Uploaden van bestand mislukt. Mogelijk systeemlimiet bereikt of actie afgebroken.";
-$a->strings["Stored file could not be verified. Upload failed."] = "Opgeslagen bestand kon niet worden geverifieerd. Uploaden mislukt.";
-$a->strings["Path not available."] = "Pad niet beschikbaar.";
-$a->strings["Empty pathname"] = "Padnaam leeg";
-$a->strings["duplicate filename or path"] = "dubbele bestandsnaam of pad";
-$a->strings["Path not found."] = "Pad niet gevonden";
-$a->strings["mkdir failed."] = "directory aanmaken (mkdir) mislukt.";
-$a->strings["database storage failed."] = "opslag in database mislukt.";
-$a->strings["Empty path"] = "Ontbrekend bestandspad";
 $a->strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "Kan geen dubbele kanaal-identificator op deze hub aanmaken. Importeren mislukt.";
 $a->strings["Channel clone failed. Import failed."] = "Het klonen van het kanaal is mislukt. Importeren mislukt.";
 $a->strings["Cloned channel not found. Import failed."] = "Gekloond kanaal niet gevonden. Importeren mislukt.";
+$a->strings["Image exceeds website size limit of %lu bytes"] = "Afbeelding is groter dan op deze hub toegestane limiet van %lu bytes";
+$a->strings["Image file is empty."] = "Afbeeldingsbestand is leeg";
+$a->strings["Unable to process image"] = "Afbeelding kan niet verwerkt worden";
+$a->strings["Photo storage failed."] = "Foto kan niet worden opgeslagen";
+$a->strings["Photo Albums"] = "Fotoalbums";
+$a->strings["Upload New Photos"] = "Nieuwe foto's uploaden";
 $a->strings["created a new post"] = "maakte een nieuw bericht aan";
 $a->strings["commented on %s's post"] = "gaf een reactie op een bericht van %s";
 $a->strings["New Page"] = "Nieuwe pagina";
 $a->strings["View"] = "Weergeven";
+$a->strings["Preview"] = "Voorvertoning";
 $a->strings["Actions"] = "Acties";
 $a->strings["Page Link"] = "Paginalink";
 $a->strings["Title"] = "Titel";
@@ -626,30 +375,32 @@ $a->strings["Don't care"] = "Maakt mij niks uit";
 $a->strings["Ask me"] = "Vraag het me";
 $a->strings["Embedded content"] = "Ingesloten inhoud";
 $a->strings["Embedding disabled"] = "Insluiten uitgeschakeld";
-$a->strings["l F d, Y \\@ g:i A"] = "l d F Y \\@ G:i";
-$a->strings["Starts:"] = "Start:";
-$a->strings["Finishes:"] = "Einde:";
-$a->strings["Location:"] = "Plaats:";
 $a->strings["This event has been added to your calendar."] = "Dit evenement is aan jouw agenda toegevoegd.";
+$a->strings["event"] = "gebeurtenis";
 $a->strings["Not specified"] = "Niet aangegeven";
 $a->strings["Needs Action"] = "Actie vereist";
 $a->strings["Completed"] = "Voltooid";
 $a->strings["In Process"] = "In behandeling";
 $a->strings["Cancelled"] = "Geannuleerd";
 $a->strings["Site Admin"] = "Hubbeheerder";
+$a->strings["Bookmarks"] = "Bladwijzers";
 $a->strings["Address Book"] = "Connecties";
 $a->strings["Login"] = "Inloggen";
 $a->strings["Channel Manager"] = "Kanaalbeheer";
-$a->strings["Matrix"] = "Matrix";
+$a->strings["Grid"] = "Grid";
 $a->strings["Settings"] = "Instellingen";
+$a->strings["Webpages"] = "Webpagina's";
 $a->strings["Channel Home"] = "Tijdlijn kanaal";
 $a->strings["Profile"] = "Profiel";
+$a->strings["Photos"] = "Foto's";
 $a->strings["Events"] = "Agenda";
 $a->strings["Directory"] = "Kanalengids";
 $a->strings["Help"] = "Hulp";
 $a->strings["Mail"] = "Privéberichten";
 $a->strings["Mood"] = "Stemming";
+$a->strings["Poke"] = "Aanstoten";
 $a->strings["Chat"] = "Chatten";
+$a->strings["Search"] = "Zoeken";
 $a->strings["Probe"] = "Onderzoeken";
 $a->strings["Suggest"] = "Voorstellen";
 $a->strings["Random Channel"] = "Willekeurig kanaal";
@@ -664,8 +415,170 @@ $a->strings["Purchase"] = "Aanschaffen";
 $a->strings["Logged out."] = "Uitgelogd.";
 $a->strings["Failed authentication"] = "Mislukte authenticatie";
 $a->strings["Login failed."] = "Inloggen mislukt.";
-$a->strings["Attachments:"] = "Bijlagen:";
-$a->strings["\$Projectname event notification:"] = "Notificatie \$Projectname-gebeurtenis:";
+$a->strings["%s <!item_type!>"] = "%s <!item_type!>";
+$a->strings["[Hubzilla:Notify] New mail received at %s"] = "[Hubzilla:Notificatie] Nieuw privébericht ontvangen op %s";
+$a->strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s zond jou een nieuw privébericht om %3\$s.";
+$a->strings["%1\$s sent you %2\$s."] = "%1\$s zond jou %2\$s.";
+$a->strings["a private message"] = "een privébericht";
+$a->strings["Please visit %s to view and/or reply to your private messages."] = "Bezoek %s om je privéberichten te bekijken en/of er op te reageren.";
+$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s, %2\$s gaf een reactie op [zrl=%3\$s]een %4\$s[/zrl]";
+$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s, %2\$s gaf een reactie op [zrl=%3\$s]een %5\$s van %4\$s[/zrl]";
+$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s gaf een reactie op [zrl=%3\$s]jouw %4\$s[/zrl]";
+$a->strings["[Hubzilla:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Hubzilla:Notificatie] Reactie op conversatie #%1\$d door %2\$s";
+$a->strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = "%1\$s, %2\$s gaf een reactie op een bericht/conversatie die jij volgt.";
+$a->strings["Please visit %s to view and/or reply to the conversation."] = "Bezoek %s om de conversatie te bekijken en/of er op te reageren.";
+$a->strings["[Hubzilla:Notify] %s posted to your profile wall"] = "[Hubzilla:Notificatie] %s heeft een bericht op jouw kanaal geplaatst";
+$a->strings["%1\$s, %2\$s posted to your profile wall at %3\$s"] = "%1\$s, %2\$s heeft om %3\$s een bericht op jouw kanaal geplaatst";
+$a->strings["%1\$s, %2\$s posted to [zrl=%3\$s]your wall[/zrl]"] = "%1\$s, %2\$s heeft een bericht op [zrl=%3\$s]jouw kanaal[/zrl] geplaatst";
+$a->strings["[Hubzilla:Notify] %s tagged you"] = "[Hubzilla:Notificatie] %s heeft je genoemd";
+$a->strings["%1\$s, %2\$s tagged you at %3\$s"] = "%1\$s, %2\$s noemde jou op %3\$s";
+$a->strings["%1\$s, %2\$s [zrl=%3\$s]tagged you[/zrl]."] = "%1\$s, %2\$s [zrl=%3\$s]noemde jou[/zrl].";
+$a->strings["[Hubzilla:Notify] %1\$s poked you"] = "[Hubzilla:Notificatie] %1\$s heeft je aangestoten";
+$a->strings["%1\$s, %2\$s poked you at %3\$s"] = "%1\$s, %2\$s heeft je aangestoten op %3\$s";
+$a->strings["%1\$s, %2\$s [zrl=%2\$s]poked you[/zrl]."] = "%1\$s, %2\$s [zrl=%2\$s]heeft je aangestoten[/zrl].";
+$a->strings["[Hubzilla:Notify] %s tagged your post"] = "[Hubzilla:Notificatie] %s heeft jouw bericht getagd";
+$a->strings["%1\$s, %2\$s tagged your post at %3\$s"] = "%1\$s, %2\$s heeft jouw bericht om %3\$s getagd";
+$a->strings["%1\$s, %2\$s tagged [zrl=%3\$s]your post[/zrl]"] = "%1\$s, %2\$s heeft [zrl=%3\$s]jouw bericht[/zrl] getagd";
+$a->strings["[Hubzilla:Notify] Introduction received"] = "[Hubzilla:Notificatie] Connectieverzoek ontvangen";
+$a->strings["%1\$s, you've received an new connection request from '%2\$s' at %3\$s"] = "%1\$s, je hebt een nieuw connectieverzoek ontvangen van '%2\$s' op %3\$s";
+$a->strings["%1\$s, you've received [zrl=%2\$s]a new connection request[/zrl] from %3\$s."] = "%1\$s, je hebt een [zrl=%2\$s]nieuw connectieverzoek[/zrl] ontvangen van %3\$s.";
+$a->strings["You may visit their profile at %s"] = "Je kan het profiel bekijken op %s";
+$a->strings["Please visit %s to approve or reject the connection request."] = "Bezoek %s om het connectieverzoek te accepteren of af te wijzen.";
+$a->strings["[Hubzilla:Notify] Friend suggestion received"] = "[Hubzilla:Notificatie] Kanaalvoorstel ontvangen";
+$a->strings["%1\$s, you've received a friend suggestion from '%2\$s' at %3\$s"] = "%1\$s, je hebt een kanaalvoorstel ontvangen van '%2\$s' om %3\$s";
+$a->strings["%1\$s, you've received [zrl=%2\$s]a friend suggestion[/zrl] for %3\$s from %4\$s."] = "%1\$s, je hebt [zrl=%2\$s]een kanaalvoorstel[/zrl] ontvangen voor %3\$s van %4\$s.";
+$a->strings["Name:"] = "Naam:";
+$a->strings["Photo:"] = "Foto:";
+$a->strings["Please visit %s to approve or reject the suggestion."] = "Bezoek %s om het voorstel te accepteren of af te wijzen.";
+$a->strings["[Hubzilla:Notify]"] = "[Hubzilla:Notificatie]";
+$a->strings["Private Message"] = "Privébericht";
+$a->strings["Select"] = "Kies";
+$a->strings["Save to Folder"] = "In map opslaan";
+$a->strings["I will attend"] = "Aanwezig";
+$a->strings["I will not attend"] = "Niet aanwezig";
+$a->strings["I might attend"] = "Mogelijk aanwezig";
+$a->strings["I agree"] = "Eens";
+$a->strings["I disagree"] = "Oneens";
+$a->strings["I abstain"] = "Onthouding";
+$a->strings["View all"] = "Toon alles";
+$a->strings["__ctx:noun__ Like"] = array(
+	0 => "vindt dit leuk",
+	1 => "vinden dit leuk",
+);
+$a->strings["__ctx:noun__ Dislike"] = array(
+	0 => "vindt dit niet leuk",
+	1 => "vinden dit niet leuk",
+);
+$a->strings["Add Star"] = "Ster toevoegen";
+$a->strings["Remove Star"] = "Ster verwijderen";
+$a->strings["Toggle Star Status"] = "Ster toevoegen of verwijderen";
+$a->strings["starred"] = "met ster";
+$a->strings["Message signature validated"] = "Berichtkenmerk gevalideerd";
+$a->strings["Message signature incorrect"] = "Berichtkenmerk onjuist";
+$a->strings["Add Tag"] = "Tag toevoegen";
+$a->strings["I like this (toggle)"] = "Vind ik leuk";
+$a->strings["like"] = "vind dit leuk";
+$a->strings["I don't like this (toggle)"] = "Vind ik niet leuk";
+$a->strings["dislike"] = "vind dit niet leuk";
+$a->strings["Share This"] = "Delen";
+$a->strings["share"] = "delen";
+$a->strings["%d comment"] = array(
+	0 => "%d reactie",
+	1 => "%d reacties weergeven",
+);
+$a->strings["View %s's profile - %s"] = "Profiel van %s bekijken - %s";
+$a->strings["to"] = "aan";
+$a->strings["via"] = "via";
+$a->strings["Wall-to-Wall"] = "Kanaal-naar-kanaal";
+$a->strings["via Wall-To-Wall:"] = "via kanaal-naar-kanaal";
+$a->strings["Delivery Report"] = "Afleveringsrapport";
+$a->strings["from %s"] = "van %s";
+$a->strings["last edited: %s"] = "laatst bewerkt: %s";
+$a->strings["Expires: %s"] = "Verloopt: %s";
+$a->strings["Save Bookmarks"] = "Bladwijzers opslaan";
+$a->strings["Add to Calendar"] = "Aan agenda toevoegen";
+$a->strings["Mark all seen"] = "Markeer alles als bekeken";
+$a->strings["__ctx:noun__ Likes"] = "vinden dit leuk";
+$a->strings["__ctx:noun__ Dislikes"] = "vinden dit niet leuk";
+$a->strings["Please wait"] = "Even wachten";
+$a->strings["This is you"] = "Dit ben jij";
+$a->strings["Bold"] = "Vet";
+$a->strings["Italic"] = "Cursief";
+$a->strings["Underline"] = "Onderstrepen";
+$a->strings["Quote"] = "Citeren";
+$a->strings["Code"] = "Broncode";
+$a->strings["Image"] = "Afbeelding";
+$a->strings["Insert Link"] = "Link invoegen";
+$a->strings["Video"] = "Video";
+$a->strings["Encrypt text"] = "Tekst versleutelen";
+$a->strings["prev"] = "vorige";
+$a->strings["first"] = "eerste";
+$a->strings["last"] = "laatste";
+$a->strings["next"] = "volgende";
+$a->strings["older"] = "ouder";
+$a->strings["newer"] = "nieuwer";
+$a->strings["No connections"] = "Geen connecties";
+$a->strings["%d Connection"] = array(
+	0 => "%d connectie",
+	1 => "%d connecties",
+);
+$a->strings["View Connections"] = "Connecties weergeven";
+$a->strings["Save"] = "Opslaan";
+$a->strings["poke"] = "aanstoten";
+$a->strings["poked"] = "aangestoten";
+$a->strings["ping"] = "ping";
+$a->strings["pinged"] = "gepingd";
+$a->strings["prod"] = "por";
+$a->strings["prodded"] = "gepord";
+$a->strings["slap"] = "slaan";
+$a->strings["slapped"] = "sloeg";
+$a->strings["finger"] = "finger";
+$a->strings["fingered"] = "gefingerd";
+$a->strings["rebuff"] = "afpoeieren";
+$a->strings["rebuffed"] = "afgepoeierd";
+$a->strings["happy"] = "gelukkig";
+$a->strings["sad"] = "bedroefd";
+$a->strings["mellow"] = "mellow";
+$a->strings["tired"] = "moe";
+$a->strings["perky"] = "parmantig";
+$a->strings["angry"] = "boos";
+$a->strings["stupified"] = "beteuterd";
+$a->strings["puzzled"] = "verward";
+$a->strings["interested"] = "geïnteresseerd";
+$a->strings["bitter"] = "verbitterd";
+$a->strings["cheerful"] = "vrolijk";
+$a->strings["alive"] = "levendig";
+$a->strings["annoyed"] = "geërgerd";
+$a->strings["anxious"] = "bezorgd";
+$a->strings["cranky"] = "humeurig";
+$a->strings["disturbed"] = "verontrust";
+$a->strings["frustrated"] = "gefrustreerd ";
+$a->strings["depressed"] = "gedeprimeerd";
+$a->strings["motivated"] = "gemotiveerd";
+$a->strings["relaxed"] = "ontspannen";
+$a->strings["surprised"] = "verrast";
+$a->strings["May"] = "mei";
+$a->strings["Unknown Attachment"] = "Onbekende bijlage";
+$a->strings["Attachment"] = "Bijlage";
+$a->strings["Size Unknown"] = "Onbekende grootte";
+$a->strings["remove category"] = "categorie verwijderen";
+$a->strings["remove from file"] = "uit map verwijderen";
+$a->strings["Click to open/close"] = "Klik om te openen of te sluiten";
+$a->strings["Link to Source"] = "Originele locatie";
+$a->strings["default"] = "standaard";
+$a->strings["Page layout"] = "Pagina-lay-out";
+$a->strings["You can create your own with the layouts tool"] = "Je kan jouw eigen lay-out ontwerpen onder lay-outs";
+$a->strings["Page content type"] = "Opmaaktype pagina";
+$a->strings["Select an alternate language"] = "Kies een andere taal";
+$a->strings["photo"] = "foto";
+$a->strings["status"] = "bericht";
+$a->strings["comment"] = "reactie";
+$a->strings["activity"] = "activiteit";
+$a->strings["Design Tools"] = "Ontwerp-hulpmiddelen";
+$a->strings["Blocks"] = "Blokken";
+$a->strings["Menus"] = "Menu's";
+$a->strings["Layouts"] = "Lay-outs";
+$a->strings["Pages"] = "Pagina's";
 $a->strings["Image/photo"] = "Afbeelding/foto";
 $a->strings["Encrypted content"] = "Versleutelde inhoud";
 $a->strings["Install %s element: "] = "Installeer %s-element: ";
@@ -735,22 +648,14 @@ $a->strings["Edit collection"] = "Collectie bewerken";
 $a->strings["Add new collection"] = "Nieuwe collectie toevoegen";
 $a->strings["Channels not in any collection"] = "Kanalen die zich in geen enkele collectie bevinden";
 $a->strings["add"] = "toevoegen";
-$a->strings["Tags"] = "Tags";
-$a->strings["Keywords"] = "Trefwoorden";
-$a->strings["have"] = "heb";
-$a->strings["has"] = "heeft";
-$a->strings["want"] = "wil";
-$a->strings["wants"] = "wil";
-$a->strings["like"] = "vind dit leuk";
-$a->strings["likes"] = "vindt dit leuk";
-$a->strings["dislike"] = "vind dit niet leuk";
-$a->strings["dislikes"] = "vindt dit niet leuk";
-$a->strings["Directory Options"] = "Opties kanalengids";
-$a->strings["Safe Mode"] = "Veilig zoeken";
-$a->strings["No"] = "Nee";
-$a->strings["Yes"] = "Ja";
-$a->strings["Public Forums Only"] = "Alleen openbare forums";
-$a->strings["This Website Only"] = "Alleen deze hub";
+$a->strings["Invalid data packet"] = "Datapakket ongeldig";
+$a->strings["Unable to verify channel signature"] = "Kanaalkenmerk kon niet worden geverifieerd.  ";
+$a->strings["Unable to verify site signature for %s"] = "Hubkenmerk voor %s kon niet worden geverifieerd";
+$a->strings["invalid target signature"] = "ongeldig doelkenmerk";
+$a->strings["No recipient provided."] = "Geen ontvanger opgegeven.";
+$a->strings["[no subject]"] = "[geen onderwerp]";
+$a->strings["Unable to determine sender."] = "Afzender kan niet bepaald worden.";
+$a->strings["Stored post could not be verified."] = "Opgeslagen bericht kon niet worden geverifieerd.";
 $a->strings["Unable to obtain identity information from database"] = "Niet in staat om identiteitsinformatie uit de database te verkrijgen";
 $a->strings["Empty name"] = "Ontbrekende naam";
 $a->strings["Name too long"] = "Naam te lang";
@@ -808,61 +713,156 @@ $a->strings["Love/Romance:"] = "Liefde/romantiek:";
 $a->strings["Work/employment:"] = "Werk/beroep:";
 $a->strings["School/education:"] = "School/opleiding:";
 $a->strings["Like this thing"] = "Vind dit ding leuk";
-$a->strings["No recipient provided."] = "Geen ontvanger opgegeven.";
-$a->strings["[no subject]"] = "[geen onderwerp]";
-$a->strings["Unable to determine sender."] = "Afzender kan niet bepaald worden.";
-$a->strings["Stored post could not be verified."] = "Opgeslagen bericht kon niet worden geverifieerd.";
-$a->strings["Save to Folder"] = "In map opslaan";
-$a->strings["I will attend"] = "Aanwezig";
-$a->strings["I will not attend"] = "Niet aanwezig";
-$a->strings["I might attend"] = "Mogelijk aanwezig";
-$a->strings["I agree"] = "Eens";
-$a->strings["I disagree"] = "Oneens";
-$a->strings["I abstain"] = "Onthouding";
-$a->strings["Add Star"] = "Ster toevoegen";
-$a->strings["Remove Star"] = "Ster verwijderen";
-$a->strings["Toggle Star Status"] = "Ster toevoegen of verwijderen";
-$a->strings["starred"] = "met ster";
-$a->strings["Add Tag"] = "Tag toevoegen";
-$a->strings["I like this (toggle)"] = "Vind ik leuk";
-$a->strings["I don't like this (toggle)"] = "Vind ik niet leuk";
-$a->strings["Share This"] = "Delen";
-$a->strings["share"] = "delen";
-$a->strings["%d comment"] = array(
-	0 => "%d reactie",
-	1 => "%d reacties weergeven",
+$a->strings["Tags"] = "Tags";
+$a->strings["Keywords"] = "Trefwoorden";
+$a->strings["have"] = "heb";
+$a->strings["has"] = "heeft";
+$a->strings["want"] = "wil";
+$a->strings["wants"] = "wil";
+$a->strings["likes"] = "vindt dit leuk";
+$a->strings["dislikes"] = "vindt dit niet leuk";
+$a->strings["Item was not found."] = "Item niet gevonden";
+$a->strings["No source file."] = "Geen bronbestand.";
+$a->strings["Cannot locate file to replace"] = "Kan het te vervangen bestand niet vinden";
+$a->strings["Cannot locate file to revise/update"] = "Kan het bestand wat aangepast moet worden niet vinden";
+$a->strings["File exceeds size limit of %d"] = "Bestand is groter dan de toegelaten %d";
+$a->strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Je hebt jouw limiet van %1$.0f MB opslagruimte voor bijlagen bereikt.";
+$a->strings["File upload failed. Possible system limit or action terminated."] = "Uploaden van bestand mislukt. Mogelijk systeemlimiet bereikt of actie afgebroken.";
+$a->strings["Stored file could not be verified. Upload failed."] = "Opgeslagen bestand kon niet worden geverifieerd. Uploaden mislukt.";
+$a->strings["Path not available."] = "Pad niet beschikbaar.";
+$a->strings["Empty pathname"] = "Padnaam leeg";
+$a->strings["duplicate filename or path"] = "dubbele bestandsnaam of pad";
+$a->strings["Path not found."] = "Pad niet gevonden";
+$a->strings["mkdir failed."] = "directory aanmaken (mkdir) mislukt.";
+$a->strings["database storage failed."] = "opslag in database mislukt.";
+$a->strings["Empty path"] = "Ontbrekend bestandspad";
+$a->strings["channel"] = "kanaal";
+$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s vindt %3\$s van %2\$s leuk";
+$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s vindt %3\$s van %2\$s niet leuk";
+$a->strings["%1\$s is now connected with %2\$s"] = "%1\$s is nu met %2\$s verbonden";
+$a->strings["%1\$s poked %2\$s"] = "%1\$s heeft %2\$s aangestoten";
+$a->strings["__ctx:mood__ %1\$s is %2\$s"] = "%1\$s is %2\$s";
+$a->strings["__ctx:title__ Likes"] = "vinden dit leuk";
+$a->strings["__ctx:title__ Dislikes"] = "vinden dit niet leuk";
+$a->strings["__ctx:title__ Agree"] = "eens";
+$a->strings["__ctx:title__ Disagree"] = "oneens";
+$a->strings["__ctx:title__ Abstain"] = "onthoudingen";
+$a->strings["__ctx:title__ Attending"] = "aanwezig";
+$a->strings["__ctx:title__ Not attending"] = "niet aanwezig";
+$a->strings["__ctx:title__ Might attend"] = "mogelijk aanwezig";
+$a->strings["View %s's profile @ %s"] = "Bekijk het profiel van %s @ %s";
+$a->strings["Categories:"] = "Categorieën:";
+$a->strings["Filed under:"] = "Bewaard onder:";
+$a->strings["View in context"] = "In context bekijken";
+$a->strings["remove"] = "verwijderen";
+$a->strings["Loading..."] = "Aan het laden...";
+$a->strings["Delete Selected Items"] = "Verwijder de geselecteerde items";
+$a->strings["View Source"] = "Bron weergeven";
+$a->strings["Follow Thread"] = "Conversatie volgen";
+$a->strings["View Status"] = "Status weergeven";
+$a->strings["View Profile"] = "Profiel weergeven";
+$a->strings["View Photos"] = "Foto's weergeven";
+$a->strings["Activity/Posts"] = "Kanaal-activiteit";
+$a->strings["Edit Connection"] = "Connectie bewerken";
+$a->strings["Send PM"] = "Privébericht verzenden";
+$a->strings["%s likes this."] = "%s vindt dit leuk.";
+$a->strings["%s doesn't like this."] = "%s vindt dit niet leuk.";
+$a->strings["<span  %1\$s>%2\$d people</span> like this."] = array(
+	0 => "<span  %1\$s>%2\$d persoon</span> vindt dit leuk.",
+	1 => "<span  %1\$s>%2\$d personen</span> vinden dit leuk.",
+);
+$a->strings["<span  %1\$s>%2\$d people</span> don't like this."] = array(
+	0 => "<span  %1\$s>%2\$d persoon</span> vindt dit niet leuk.",
+	1 => "<span  %1\$s>%2\$d personen</span> vinden dit niet leuk.",
+);
+$a->strings["and"] = "en";
+$a->strings[", and %d other people"] = array(
+	0 => ", en %d ander persoon",
+	1 => ", en %d andere personen",
+);
+$a->strings["%s like this."] = "%s vinden dit leuk.";
+$a->strings["%s don't like this."] = "%s vinden dit niet leuk.";
+$a->strings["Visible to <strong>everybody</strong>"] = "Voor <strong>iedereen</strong> zichtbaar";
+$a->strings["Please enter a link URL:"] = "Vul een internetadres/URL in:";
+$a->strings["Please enter a video link/URL:"] = "Vul een videolink/URL in:";
+$a->strings["Please enter an audio link/URL:"] = "Vul een audiolink/URL in:";
+$a->strings["Tag term:"] = "Tag:";
+$a->strings["Save to Folder:"] = "Bewaar in map: ";
+$a->strings["Where are you right now?"] = "Waar bevind je je op dit moment?";
+$a->strings["Expires YYYY-MM-DD HH:MM"] = "Verloopt op DD-MM-YYYY om HH:MM";
+$a->strings["Share"] = "Delen";
+$a->strings["Page link name"] = "Linknaam pagina";
+$a->strings["Post as"] = "Bericht plaatsen als";
+$a->strings["Upload photo"] = "Foto uploaden";
+$a->strings["upload photo"] = "foto uploaden";
+$a->strings["Attach file"] = "Bestand toevoegen";
+$a->strings["attach file"] = "bestand toevoegen";
+$a->strings["Insert web link"] = "Weblink invoegen";
+$a->strings["web link"] = "Weblink";
+$a->strings["Insert video link"] = "Videolink invoegen";
+$a->strings["video link"] = "videolink";
+$a->strings["Insert audio link"] = "Audiolink invoegen";
+$a->strings["audio link"] = "audiolink";
+$a->strings["Set your location"] = "Locatie instellen";
+$a->strings["set location"] = "locatie instellen";
+$a->strings["Toggle voting"] = "Stemmen in- of uitschakelen";
+$a->strings["Clear browser location"] = "Locatie van webbrowser wissen";
+$a->strings["clear location"] = "locatie wissen";
+$a->strings["Title (optional)"] = "Titel (optioneel)";
+$a->strings["Categories (optional, comma-separated list)"] = "Categorieën (optioneel, door komma's gescheiden lijst)";
+$a->strings["Permission settings"] = "Permissies";
+$a->strings["permissions"] = "permissies";
+$a->strings["Public post"] = "Openbaar bericht";
+$a->strings["Example: bob@example.com, mary@example.com"] = "Voorbeeld: bob@voorbeeld.nl, mary@voorbeeld.be";
+$a->strings["Set expiration date"] = "Verloopdatum instellen";
+$a->strings["OK"] = "OK";
+$a->strings["Cancel"] = "Annuleren";
+$a->strings["Discover"] = "Ontdekken";
+$a->strings["Imported public streams"] = "Openbare streams importeren";
+$a->strings["Commented Order"] = "Nieuwe reacties bovenaan";
+$a->strings["Sort by Comment Date"] = "Berichten met nieuwe reacties bovenaan";
+$a->strings["Posted Order"] = "Nieuwe berichten bovenaan";
+$a->strings["Sort by Post Date"] = "Nieuwe berichten bovenaan";
+$a->strings["Personal"] = "Persoonlijk";
+$a->strings["Posts that mention or involve you"] = "Alleen berichten die jou vermelden of waar je op een andere manier bij betrokken bent";
+$a->strings["New"] = "Nieuw";
+$a->strings["Activity Stream - by date"] = "Activiteitenstroom - volgens datum";
+$a->strings["Starred"] = "Met ster";
+$a->strings["Favourite Posts"] = "Favoriete berichten";
+$a->strings["Spam"] = "Spam";
+$a->strings["Posts flagged as SPAM"] = "Berichten gemarkeerd als SPAM";
+$a->strings["Channel"] = "Kanaal";
+$a->strings["Status Messages and Posts"] = "Berichten in dit kanaal";
+$a->strings["About"] = "Over";
+$a->strings["Profile Details"] = "Profiel";
+$a->strings["Files and Storage"] = "Bestanden en opslagruimte";
+$a->strings["Chatrooms"] = "Chatkanalen";
+$a->strings["Saved Bookmarks"] = "Opgeslagen bladwijzers";
+$a->strings["Manage Webpages"] = "Webpagina's beheren";
+$a->strings["__ctx:noun__ Attending"] = array(
+	0 => "aanwezig",
+	1 => "aanwezig",
+);
+$a->strings["__ctx:noun__ Not Attending"] = array(
+	0 => "niet aanwezig",
+	1 => "niet aanwezig",
+);
+$a->strings["__ctx:noun__ Undecided"] = array(
+	0 => "nog niet beslist",
+	1 => "nog niet beslist",
+);
+$a->strings["__ctx:noun__ Agree"] = array(
+	0 => "eens",
+	1 => "eens",
+);
+$a->strings["__ctx:noun__ Disagree"] = array(
+	0 => "oneens",
+	1 => "oneens",
+);
+$a->strings["__ctx:noun__ Abstain"] = array(
+	0 => "onthouding",
+	1 => "onthoudingen",
 );
-$a->strings["View %s's profile - %s"] = "Profiel van %s bekijken - %s";
-$a->strings["to"] = "aan";
-$a->strings["via"] = "via";
-$a->strings["Wall-to-Wall"] = "Kanaal-naar-kanaal";
-$a->strings["via Wall-To-Wall:"] = "via kanaal-naar-kanaal";
-$a->strings["Delivery Report"] = "Afleveringsrapport";
-$a->strings["Save Bookmarks"] = "Bladwijzers opslaan";
-$a->strings["Add to Calendar"] = "Aan agenda toevoegen";
-$a->strings["Mark all seen"] = "Markeer alles als bekeken";
-$a->strings["__ctx:noun__ Likes"] = "vinden dit leuk";
-$a->strings["__ctx:noun__ Dislikes"] = "vinden dit niet leuk";
-$a->strings["This is you"] = "Dit ben jij";
-$a->strings["Image"] = "Afbeelding";
-$a->strings["Insert Link"] = "Link invoegen";
-$a->strings["Video"] = "Video";
-$a->strings["Permission denied"] = "Toegang geweigerd";
-$a->strings["(Unknown)"] = "(Onbekend)";
-$a->strings["Visible to anybody on the internet."] = "Voor iedereen op het internet zichtbaar.";
-$a->strings["Visible to you only."] = "Alleen voor jou zichtbaar.";
-$a->strings["Visible to anybody in this network."] = "Voor iedereen in dit netwerk zichtbaar.";
-$a->strings["Visible to anybody authenticated."] = "Voor iedereen die geauthenticeerd is zichtbaar.";
-$a->strings["Visible to anybody on %s."] = "Voor iedereen op %s zichtbaar.";
-$a->strings["Visible to all connections."] = "Voor alle connecties zichtbaar.";
-$a->strings["Visible to approved connections."] = "Voor alle goedgekeurde connecties zichtbaar.";
-$a->strings["Visible to specific connections."] = "Voor specifieke connecties zichtbaar.";
-$a->strings["Item not found."] = "Item niet gevonden.";
-$a->strings["Collection not found."] = "Collectie niet gevonden.";
-$a->strings["Collection is empty."] = "Collectie is leeg";
-$a->strings["Collection: %s"] = "Collectie: %s";
-$a->strings["Connection: %s"] = "Connectie: %s";
-$a->strings["Connection not found."] = "Connectie niet gevonden.";
 $a->strings["Apps"] = "Apps";
 $a->strings["System"] = "Systeem";
 $a->strings["Create Personal App"] = "Persoonlijke app maken";
@@ -892,7 +892,6 @@ $a->strings["Export channel"] = "Kanaal exporteren";
 $a->strings["Connection Default Permissions"] = "Standaard permissies voor connecties";
 $a->strings["Premium Channel Settings"] = "Instellingen premiumkanaal";
 $a->strings["Private Mail Menu"] = "Privéberichten";
-$a->strings["Check Mail"] = "Controleer op nieuwe berichten";
 $a->strings["Combined View"] = "Gecombineerd postvak";
 $a->strings["Inbox"] = "Postvak IN";
 $a->strings["Outbox"] = "Postvak UIT";
@@ -929,10 +928,6 @@ $a->strings["Logs"] = "Logboeken";
 $a->strings["Admin"] = "Beheer";
 $a->strings["Plugin Features"] = "Plug-in-opties";
 $a->strings["User registrations waiting for confirmation"] = "Accounts die op goedkeuring wachten";
-$a->strings["Invalid data packet"] = "Datapakket ongeldig";
-$a->strings["Unable to verify channel signature"] = "Kanaalkenmerk kon niet worden geverifieerd.  ";
-$a->strings["Unable to verify site signature for %s"] = "Hubkenmerk voor %s kon niet worden geverifieerd";
-$a->strings["invalid target signature"] = "ongeldig doelkenmerk";
 $a->strings["Logout"] = "Uitloggen";
 $a->strings["End this session"] = "Beëindig deze sessie";
 $a->strings["Home"] = "Home";
@@ -957,7 +952,6 @@ $a->strings["Help and documentation"] = "Hulp en documentatie";
 $a->strings["Applications, utilities, links, games"] = "Apps";
 $a->strings["Search site @name, #tag, ?docs, content"] = "Zoek een @kanaal, doorzoek inhoud hub met tekst en #tags, of doorzoek ?documentatie ";
 $a->strings["Channel Directory"] = "Kanalengids";
-$a->strings["Grid"] = "Grid";
 $a->strings["Your grid"] = "Jouw grid";
 $a->strings["Mark all grid notifications seen"] = "Markeer alle gridnotificaties als bekeken";
 $a->strings["Channel home"] = "Tijdlijn kanaal";
@@ -978,6 +972,12 @@ $a->strings["Account/Channel Settings"] = "Account-/kanaal-instellingen";
 $a->strings["Site Setup and Configuration"] = "Hub instellen en beheren";
 $a->strings["@name, #tag, ?doc, content"] = "@kanaal, #tag, inhoud, ?hulp";
 $a->strings["Please wait..."] = "Wachten aub...";
+$a->strings["Directory Options"] = "Opties kanalengids";
+$a->strings["Safe Mode"] = "Veilig zoeken";
+$a->strings["No"] = "Nee";
+$a->strings["Yes"] = "Ja";
+$a->strings["Public Forums Only"] = "Alleen openbare forums";
+$a->strings["This Website Only"] = "Alleen deze hub";
 $a->strings["Some blurb about what to do when you're new here"] = "Welkom op \$Projectname. Klik op de tab ontdekken of klik rechtsboven op de <a href=\"directory\">kanalengids</a>, om kanalen te vinden. Rechtsboven vind je ook <a href=\"directory\">apps</a>, waar je vrijwel alle functies van \$Projectname kunt vinden. Voor <a href=\"directory\">hulp</a> met \$Projectname klik je op het vraagteken.";
 $a->strings["Contact not found."] = "Contact niet gevonden";
 $a->strings["Friend suggestion sent."] = "Kanaalvoorstel verzonden.";
@@ -1175,16 +1175,45 @@ $a->strings["Hub not found."] = "Hub niet gevonden.";
 $a->strings["This setting requires special processing and editing has been blocked."] = "Deze instelling vereist een speciaal proces  en bewerken is geblokkeerd.";
 $a->strings["Configuration Editor"] = "Configuratiebewerker";
 $a->strings["Warning: Changing some settings could render your channel inoperable. Please leave this page unless you are comfortable with and knowledgeable about how to correctly use this feature."] = "Waarschuwing: het veranderen van sommige instellingen kunnen jouw kanaal onklaar maken. Verlaat deze pagina, tenzij je weet waar je mee bezig bent en voldoende kennis bezit over hoe je deze functies moet gebruiken. ";
-$a->strings["Public Sites"] = "Openbare hubs";
-$a->strings["The listed sites allow public registration for the \$Projectname network. All sites in the network are interlinked so membership on any of them conveys membership in the network as a whole. Some sites may require subscription or provide tiered service plans. The provider links <strong>may</strong> provide additional details."] = "Op de hier weergegeven hubs kan iedereen zich voor het \$Projectname-netwerk aanmelden. Alle hubs in het \$Projectname-netwerk zijn met elkaar verbonden, dus maakt het qua lidmaatschap niet uit waar je je aanmeldt. Op sommige hubs heb je eerst goedkeuring nodig en sommige hubs vereisen betaalde abonnementen voor uitbreidingen. <strong>Mogelijk</strong> wordt hierover op de hub zelf meer informatie gegeven.";
-$a->strings["Rate this hub"] = "Beoordeel deze hub";
-$a->strings["Site URL"] = "URL hub";
-$a->strings["Access Type"] = "Toegangstype";
-$a->strings["Registration Policy"] = "Registratiebeleid";
-$a->strings["Location"] = "Locatie";
-$a->strings["View hub ratings"] = "Bekijk hubbeoordelingen";
-$a->strings["Rate"] = "Beoordeel";
-$a->strings["View ratings"] = "Bekijk beoordelingen";
+$a->strings["Page owner information could not be retrieved."] = "Informatie over de pagina-eigenaar werd niet ontvangen.";
+$a->strings["Album not found."] = "Album niet gevonden.";
+$a->strings["Delete Album"] = "Verwijder album";
+$a->strings["Delete Photo"] = "Verwijder foto";
+$a->strings["No photos selected"] = "Geen foto's geselecteerd";
+$a->strings["Access to this item is restricted."] = "Toegang tot dit item is beperkt.";
+$a->strings["%1$.2f MB of %2$.2f MB photo storage used."] = "%1$.2f MB van %2$.2f MB aan foto-opslag gebruikt.";
+$a->strings["%1$.2f MB photo storage used."] = "%1$.2f MB aan foto-opslag gebruikt.";
+$a->strings["Upload Photos"] = "Foto's uploaden";
+$a->strings["Enter an album name"] = "Vul een albumnaam in";
+$a->strings["or select an existing album (doubleclick)"] = "of kies een bestaand album (dubbelklikken)";
+$a->strings["Create a status post for this upload"] = "Plaats een bericht voor deze upload.";
+$a->strings["Album name could not be decoded"] = "Albumnaam kon niet gedecodeerd worden";
+$a->strings["Contact Photos"] = "Connectiefoto's";
+$a->strings["Show Newest First"] = "Nieuwste eerst weergeven";
+$a->strings["Show Oldest First"] = "Oudste eerst weergeven";
+$a->strings["View Photo"] = "Foto weergeven";
+$a->strings["Edit Album"] = "Album bewerken";
+$a->strings["Permission denied. Access to this item may be restricted."] = "Toegang geweigerd. Toegang tot dit item kan zijn beperkt.";
+$a->strings["Photo not available"] = "Foto niet aanwezig";
+$a->strings["Use as profile photo"] = "Als profielfoto gebruiken";
+$a->strings["Private Photo"] = "Privéfoto";
+$a->strings["Previous"] = "Vorige";
+$a->strings["View Full Size"] = "Volledige grootte weergeven";
+$a->strings["Next"] = "Volgende";
+$a->strings["Remove"] = "Verwijderen";
+$a->strings["Edit photo"] = "Foto bewerken";
+$a->strings["Rotate CW (right)"] = "Draai met de klok mee (naar rechts)";
+$a->strings["Rotate CCW (left)"] = "Draai tegen de klok in (naar links)";
+$a->strings["Enter a new album name"] = "Vul een nieuwe albumnaam in";
+$a->strings["or select an existing one (doubleclick)"] = "of kies een bestaand album (dubbelklikken)";
+$a->strings["Caption"] = "Bijschrift";
+$a->strings["Add a Tag"] = "Tag toevoegen";
+$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com"] = "Voorbeeld: @bob, @Barbara_Jansen, @jan@voorbeeld.nl";
+$a->strings["Flag as adult in album view"] = "Markeer als voor volwassenen in albumweergave";
+$a->strings["In This Photo:"] = "Op deze foto:";
+$a->strings["Map"] = "Kaart";
+$a->strings["View Album"] = "Album weergeven";
+$a->strings["Recent Photos"] = "Recente foto's";
 $a->strings["Permission Denied."] = "Toegang geweigerd";
 $a->strings["File not found."] = "Bestand niet gevonden.";
 $a->strings["Edit file permissions"] = "Bestandsrechten bewerken";
@@ -1196,6 +1225,7 @@ $a->strings["Copy/paste this URL to link file from a web page"] = "Kopieer/plak
 $a->strings["Share this file"] = "Dit bestand delen";
 $a->strings["Show URL to this file"] = "Toon URL van dit bestand";
 $a->strings["Notify your contacts about this file"] = "Jouw connecties over dit bestand berichten";
+$a->strings["This site is not a directory server"] = "Deze hub is geen kanalengidshub (directoryserver)";
 $a->strings["Layout Name"] = "Naam lay-out";
 $a->strings["Layout Description (Optional)"] = "Lay-out-omschrijving (optioneel)";
 $a->strings["Comanche page description language help"] = "Hulp met de paginabeschrijvingstaal Comanche";
@@ -1222,18 +1252,35 @@ $a->strings["I am online"] = "Ik ben online";
 $a->strings["Bookmark this room"] = "Chatkanaal aan bladwijzers toevoegen";
 $a->strings["New Chatroom"] = "Nieuw chatkanaal";
 $a->strings["Chatroom Name"] = "Naam chatkanaal";
+$a->strings["Expiration of chats (minutes)"] = "Aantal minuten voordat chatberichten worden verwijderd";
 $a->strings["%1\$s's Chatrooms"] = "Chatkanalen van %1\$s";
 $a->strings["Items tagged with: %s"] = "Items getagd met %s";
 $a->strings["Search results for: %s"] = "Zoekresultaten voor %s";
+$a->strings["Website:"] = "Website:";
+$a->strings["Remote Channel [%s] (not yet known on this site)"] = "Kanaal op afstand [%s] (nog niet op deze hub bekend)";
+$a->strings["Rating (this information is public)"] = "Beoordeling (deze informatie is openbaar)";
+$a->strings["Optionally explain your rating (this information is public)"] = "Verklaar jouw beoordeling (niet verplicht, deze informatie is openbaar)";
+$a->strings["Unable to lookup recipient."] = "Niet in staat om ontvanger op te zoeken.";
+$a->strings["Unable to communicate with requested channel."] = "Niet in staat om met het aangevraagde kanaal te communiceren.";
+$a->strings["Cannot verify requested channel."] = "Kan opgevraagd kanaal niet verifieren";
+$a->strings["Selected channel has private message restrictions. Send failed."] = "Gekozen kanaal heeft restricties voor privéberichten. Verzenden mislukt.";
+$a->strings["Messages"] = "Berichten";
+$a->strings["Message recalled."] = "Bericht ingetrokken.";
 $a->strings["Conversation removed."] = "Conversatie verwijderd";
-$a->strings["Insufficient permissions.  Request redirected to profile page."] = "Onvoldoende permissies.  Doorgestuurd naar profielpagina.";
-$a->strings["Item not found"] = "Item niet gevonden";
-$a->strings["Item is not editable"] = "Item is niet te bewerken";
-$a->strings["Delete item?"] = "Item verwijderen?";
-$a->strings["Insert YouTube video"] = "YouTube-video invoegen";
-$a->strings["Insert Vorbis [.ogg] video"] = "Vorbis-video [.ogg] invoegen";
-$a->strings["Insert Vorbis [.ogg] audio"] = "Vorbis-audio [.ogg] invoegen";
-$a->strings["Edit post"] = "Bericht bewerken";
+$a->strings["Requested channel is not in this network"] = "Opgevraagd kanaal is niet in dit netwerk beschikbaar";
+$a->strings["Send Private Message"] = "Privébericht versturen";
+$a->strings["To:"] = "Aan:";
+$a->strings["Subject:"] = "Onderwerp:";
+$a->strings["Your message:"] = "Jouw bericht:";
+$a->strings["Send"] = "Verzenden";
+$a->strings["Delete message"] = "Bericht verwijderen";
+$a->strings["Delivery report"] = "Afleveringsrapport";
+$a->strings["Recall message"] = "Bericht intrekken";
+$a->strings["Message has been recalled."] = "Bericht is ingetrokken.";
+$a->strings["Delete Conversation"] = "Verwijder conversatie";
+$a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Geen veilige communicatie beschikbaar. <strong>Mogelijk</strong> kan je reageren op de kanaalpagina van de afzender.";
+$a->strings["Send Reply"] = "Antwoord versturen";
+$a->strings["Your message for %s (%s):"] = "Jouw privébericht aan %s (%s):";
 $a->strings["Invalid message"] = "Ongeldig bericht";
 $a->strings["no results"] = "geen resultaten";
 $a->strings["Delivery report for %1\$s"] = "Afleveringsrapport voor %1\$s";
@@ -1244,17 +1291,20 @@ $a->strings["accepted for delivery"] = "geaccepteerd om afgeleverd te worden";
 $a->strings["updated"] = "geüpdatet";
 $a->strings["update ignored"] = "update genegeerd";
 $a->strings["permission denied"] = "toegang geweigerd";
+$a->strings["recipient not found"] = "ontvanger niet gevonden";
+$a->strings["mail recalled"] = "Privébericht ingetrokken";
+$a->strings["duplicate mail received"] = "dubbel privébericht ontvangen";
+$a->strings["mail delivered"] = "privébericht afgeleverd";
+$a->strings["Item not found"] = "Item niet gevonden";
 $a->strings["Delete block?"] = "Blok verwijderen";
+$a->strings["Insert YouTube video"] = "YouTube-video invoegen";
+$a->strings["Insert Vorbis [.ogg] video"] = "Vorbis-video [.ogg] invoegen";
+$a->strings["Insert Vorbis [.ogg] audio"] = "Vorbis-audio [.ogg] invoegen";
 $a->strings["Edit Block"] = "Blok bewerken";
-$a->strings["\$Projectname"] = "\$Projectname";
-$a->strings["Welcome to %s"] = "Welkom op %s";
-$a->strings["Unable to locate original post."] = "Niet in staat om de originele locatie van het bericht te vinden. ";
-$a->strings["Empty post discarded."] = "Leeg bericht geannuleerd";
-$a->strings["Executable content type not permitted to this channel."] = "Uitvoerbare bestanden zijn niet toegestaan op dit kanaal.";
-$a->strings["System error. Post not saved."] = "Systeemfout. Bericht niet opgeslagen.";
-$a->strings["Unable to obtain post information from database."] = "Niet in staat om informatie over dit bericht uit de database te verkrijgen.";
-$a->strings["You have reached your limit of %1$.0f top level posts."] = "Je hebt jouw limiet van %1$.0f berichten bereikt.";
-$a->strings["You have reached your limit of %1$.0f webpages."] = "Je hebt jouw limiet van %1$.0f webpagina's bereikt.";
+$a->strings["This directory server requires an access token"] = "Deze kanalengidshub (directoryserver) heeft een toegangs-token nodig";
+$a->strings["Item is not editable"] = "Item is niet te bewerken";
+$a->strings["Delete item?"] = "Item verwijderen?";
+$a->strings["Edit post"] = "Bericht bewerken";
 $a->strings["Unable to find your hub."] = "Niet in staat om je hub te vinden";
 $a->strings["Post successful."] = "Verzenden bericht geslaagd.";
 $a->strings["Theme settings updated."] = "Thema-instellingen bijgewerkt.";
@@ -1509,50 +1559,9 @@ $a->strings["Forgot your Password?"] = "Wachtwoord vergeten?";
 $a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Voer je e-mailadres in en verstuur deze om je wachtwoord opnieuw in te stellen. Controleer hierna hier je e-mail voor verdere instructies.";
 $a->strings["Email Address"] = "E-mailadres";
 $a->strings["Reset"] = "Opnieuw instellen";
-$a->strings["Page owner information could not be retrieved."] = "Informatie over de pagina-eigenaar werd niet ontvangen.";
-$a->strings["Album not found."] = "Album niet gevonden.";
-$a->strings["Delete Album"] = "Verwijder album";
-$a->strings["Delete Photo"] = "Verwijder foto";
-$a->strings["No photos selected"] = "Geen foto's geselecteerd";
-$a->strings["Access to this item is restricted."] = "Toegang tot dit item is beperkt.";
-$a->strings["%1$.2f MB of %2$.2f MB photo storage used."] = "%1$.2f MB van %2$.2f MB aan foto-opslag gebruikt.";
-$a->strings["%1$.2f MB photo storage used."] = "%1$.2f MB aan foto-opslag gebruikt.";
-$a->strings["Upload Photos"] = "Foto's uploaden";
-$a->strings["Enter an album name"] = "Vul een albumnaam in";
-$a->strings["or select an existing album (doubleclick)"] = "of kies een bestaand album (dubbelklikken)";
-$a->strings["Create a status post for this upload"] = "Plaats een bericht voor deze upload.";
-$a->strings["Album name could not be decoded"] = "Albumnaam kon niet gedecodeerd worden";
-$a->strings["Contact Photos"] = "Connectiefoto's";
-$a->strings["Show Newest First"] = "Nieuwste eerst weergeven";
-$a->strings["Show Oldest First"] = "Oudste eerst weergeven";
-$a->strings["View Photo"] = "Foto weergeven";
-$a->strings["Edit Album"] = "Album bewerken";
-$a->strings["Permission denied. Access to this item may be restricted."] = "Toegang geweigerd. Toegang tot dit item kan zijn beperkt.";
-$a->strings["Photo not available"] = "Foto niet aanwezig";
-$a->strings["Use as profile photo"] = "Als profielfoto gebruiken";
-$a->strings["Private Photo"] = "Privéfoto";
-$a->strings["Previous"] = "Vorige";
-$a->strings["View Full Size"] = "Volledige grootte weergeven";
-$a->strings["Next"] = "Volgende";
-$a->strings["Remove"] = "Verwijderen";
-$a->strings["Edit photo"] = "Foto bewerken";
-$a->strings["Rotate CW (right)"] = "Draai met de klok mee (naar rechts)";
-$a->strings["Rotate CCW (left)"] = "Draai tegen de klok in (naar links)";
-$a->strings["Enter a new album name"] = "Vul een nieuwe albumnaam in";
-$a->strings["or select an existing one (doubleclick)"] = "of kies een bestaand album (dubbelklikken)";
-$a->strings["Caption"] = "Bijschrift";
-$a->strings["Add a Tag"] = "Tag toevoegen";
-$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com"] = "Voorbeeld: @bob, @Barbara_Jansen, @jan@voorbeeld.nl";
-$a->strings["Flag as adult in album view"] = "Markeer als voor volwassenen in albumweergave";
-$a->strings["In This Photo:"] = "Op deze foto:";
-$a->strings["Map"] = "Kaart";
-$a->strings["View Album"] = "Album weergeven";
-$a->strings["Recent Photos"] = "Recente foto's";
+$a->strings["\$Projectname"] = "\$Projectname";
+$a->strings["Welcome to %s"] = "Welkom op %s";
 $a->strings["\$Projectname channel"] = "\$Projectname-kanaal";
-$a->strings["Website:"] = "Website:";
-$a->strings["Remote Channel [%s] (not yet known on this site)"] = "Kanaal op afstand [%s] (nog niet op deze hub bekend)";
-$a->strings["Rating (this information is public)"] = "Beoordeling (deze informatie is openbaar)";
-$a->strings["Optionally explain your rating (this information is public)"] = "Verklaar jouw beoordeling (niet verplicht, deze informatie is openbaar)";
 $a->strings["Calendar entries imported."] = "Agenda-items geïmporteerd.";
 $a->strings["No calendar entries found."] = "Geen agenda-items gevonden.";
 $a->strings["Event can not end before it has started."] = "Gebeurtenis kan niet eindigen voordat het is begonnen";
@@ -1615,25 +1624,13 @@ $a->strings["Ratings"] = "Waarderingen";
 $a->strings["Rating: "] = "Waardering: ";
 $a->strings["Website: "] = "Website: ";
 $a->strings["Description: "] = "Omschrijving: ";
-$a->strings["This site is not a directory server"] = "Deze hub is geen kanalengidshub (directoryserver)";
-$a->strings["Unable to lookup recipient."] = "Niet in staat om ontvanger op te zoeken.";
-$a->strings["Unable to communicate with requested channel."] = "Niet in staat om met het aangevraagde kanaal te communiceren.";
-$a->strings["Cannot verify requested channel."] = "Kan opgevraagd kanaal niet verifieren";
-$a->strings["Selected channel has private message restrictions. Send failed."] = "Gekozen kanaal heeft restricties voor privéberichten. Verzenden mislukt.";
-$a->strings["Messages"] = "Berichten";
-$a->strings["Message deleted."] = "Bericht verwijderd.";
-$a->strings["Message recalled."] = "Bericht ingetrokken.";
-$a->strings["Send Private Message"] = "Privébericht versturen";
-$a->strings["To:"] = "Aan:";
-$a->strings["Subject:"] = "Onderwerp:";
-$a->strings["Your message:"] = "Jouw bericht:";
-$a->strings["Send"] = "Verzenden";
-$a->strings["Delete message"] = "Bericht verwijderen";
-$a->strings["Recall message"] = "Bericht intrekken";
-$a->strings["Message has been recalled."] = "Bericht is ingetrokken.";
-$a->strings["Delete Conversation"] = "Verwijder conversatie";
-$a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Geen veilige communicatie beschikbaar. <strong>Mogelijk</strong> kan je reageren op de kanaalpagina van de afzender.";
-$a->strings["Send Reply"] = "Antwoord versturen";
+$a->strings["Unable to locate original post."] = "Niet in staat om de originele locatie van het bericht te vinden. ";
+$a->strings["Empty post discarded."] = "Leeg bericht geannuleerd";
+$a->strings["Executable content type not permitted to this channel."] = "Uitvoerbare bestanden zijn niet toegestaan op dit kanaal.";
+$a->strings["System error. Post not saved."] = "Systeemfout. Bericht niet opgeslagen.";
+$a->strings["Unable to obtain post information from database."] = "Niet in staat om informatie over dit bericht uit de database te verkrijgen.";
+$a->strings["You have reached your limit of %1$.0f top level posts."] = "Je hebt jouw limiet van %1$.0f berichten bereikt.";
+$a->strings["You have reached your limit of %1$.0f webpages."] = "Je hebt jouw limiet van %1$.0f webpagina's bereikt.";
 $a->strings["Page Title"] = "Paginatitel";
 $a->strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = "Maximum toegestane dagelijkse registraties op deze \$Projectname-hub bereikt. Probeer het morgen (UTC) nogmaals.";
 $a->strings["Please indicate acceptance of the Terms of Service. Registration failed."] = "Registratie mislukt. De gebruiksvoorwaarden dienen wel geaccepteerd te worden.";
@@ -1662,6 +1659,17 @@ $a->strings["By default only the instances of the channels located on this hub w
 $a->strings["Remove Account"] = "Account verwijderen";
 $a->strings["No service class restrictions found."] = "Geen abonnementsbeperkingen gevonden.";
 $a->strings["Item not available."] = "Item is niet aanwezig.";
+$a->strings["Public Sites"] = "Openbare hubs";
+$a->strings["The listed sites allow public registration for the \$Projectname network. All sites in the network are interlinked so membership on any of them conveys membership in the network as a whole. Some sites may require subscription or provide tiered service plans. The provider links <strong>may</strong> provide additional details."] = "Op de hier weergegeven hubs kan iedereen zich voor het \$Projectname-netwerk aanmelden. Alle hubs in het \$Projectname-netwerk zijn met elkaar verbonden, dus maakt het qua lidmaatschap niet uit waar je je aanmeldt. Op sommige hubs heb je eerst goedkeuring nodig en sommige hubs vereisen betaalde abonnementen voor uitbreidingen. <strong>Mogelijk</strong> wordt hierover op de hub zelf meer informatie gegeven.";
+$a->strings["Rate this hub"] = "Beoordeel deze hub";
+$a->strings["Site URL"] = "URL hub";
+$a->strings["Access Type"] = "Toegangstype";
+$a->strings["Registration Policy"] = "Registratiebeleid";
+$a->strings["Location"] = "Locatie";
+$a->strings["Project"] = "Project";
+$a->strings["View hub ratings"] = "Bekijk hubbeoordelingen";
+$a->strings["Rate"] = "Beoordeel";
+$a->strings["View ratings"] = "Bekijk beoordelingen";
 $a->strings["Failed to create source. No channel selected."] = "Aanmaken bron mislukt. Geen kanaal geselecteerd.";
 $a->strings["Source created."] = "Bron aangemaakt.";
 $a->strings["Source updated."] = "Bron aangemaakt.";
@@ -1687,7 +1695,7 @@ $a->strings["Authentication failed."] = "Authenticatie mislukt.";
 $a->strings["Remote Authentication"] = "Authenticatie op afstand";
 $a->strings["Enter your channel address (e.g. channel@example.com)"] = "Vul jouw kanaaladres in (bijv. channel@example.com)";
 $a->strings["Authenticate"] = "Authenticeren";
-$a->strings["This directory server requires an access token"] = "Deze kanalengidshub (directoryserver) heeft een toegangs-token nodig";
+$a->strings["Insufficient permissions.  Request redirected to profile page."] = "Onvoldoende permissies.  Doorgestuurd naar profielpagina.";
 $a->strings["Version %s"] = "Versie %s";
 $a->strings["Installed plugins/addons/apps:"] = "Ingeschakelde plug-ins/add-ons/apps:";
 $a->strings["No installed plugins/addons/apps"] = "Geen ingeschakelde plug-ins/add-ons/apps";
@@ -1696,7 +1704,7 @@ $a->strings["Tag: "] = "Tag: ";
 $a->strings["Last background fetch: "] = "Meest recente achtergrond-fetch:";
 $a->strings["Current load average: "] = "Gemiddelde systeembelasting is nu:";
 $a->strings["Running at web location"] = "Draaiend op weblocatie";
-$a->strings["Please visit <a href=\"https://redmatrix.me\">redmatrix.me</a> to learn more about \$Projectname."] = "Bezoek <a href=\"https://redmatrix.me\">redmatrix.me</a> om meer over \$Projectname te leren.";
+$a->strings["Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more about \$Projectname."] = "Bezoek <a href=\"http://hubzilla.org\">hubzilla.org</a> ";
 $a->strings["Bug reports and issues: please visit"] = "Bugrapporten en andere kwesties: bezoek";
 $a->strings["\$projectname issues"] = "\$projectname-issues";
 $a->strings["Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"] = "Voorstellen, lofbetuigingen, enz. - e-mail  \"redmatrix\" at librelist - dot com";
@@ -1974,7 +1982,7 @@ $a->strings["In order to install \$Projectname we need to know how to connect to
 $a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Please contact your hosting provider or site administrator if you have questions about these settings.";
 $a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "The database you specify below should already exist. If it does not, please create it before continuing.";
 $a->strings["Database Server Name"] = "Database Server Name";
-$a->strings["Default is localhost"] = "Default is localhost";
+$a->strings["Default is 127.0.0.1"] = "Default is 127.0.0.1";
 $a->strings["Database Port"] = "Database Port";
 $a->strings["Communication port number - use 0 for default"] = "Communication port number - use 0 for default";
 $a->strings["Database Login Name"] = "Database Login Name";
diff --git a/view/nl/messages.po b/view/nl/messages.po
index 1c8420890..0b3d7e3fd 100644
--- a/view/nl/messages.po
+++ b/view/nl/messages.po
@@ -9,10 +9,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Redmatrix\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-17 16:33-0700\n"
-"PO-Revision-Date: 2015-05-20 13:13+0000\n"
+"POT-Creation-Date: 2015-10-17 16:47-0700\n"
+"PO-Revision-Date: 2015-10-18 13:28+0000\n"
 "Last-Translator: jeroenpraat <jeroenpraat@xs4all.nl>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/red-matrix/language/nl/)\n"
+"Language-Team: Dutch (http://www.transifex.com/Friendica/red-matrix/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,15 +26,87 @@ msgstr "Kan DNS-informatie voor databaseserver '%s' niet vinden"
 
 #: ../../include/photo/photo_driver.php:687 ../../mod/profile_photo.php:143
 #: ../../mod/profile_photo.php:302 ../../mod/profile_photo.php:424
-#: ../../mod/photos.php:91 ../../mod/photos.php:625
+#: ../../mod/photos.php:92 ../../mod/photos.php:637
 msgid "Profile Photos"
 msgstr "Profielfoto's"
 
-#: ../../include/security.php:349
-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 "De beveiligings-token van het tekstvak was ongeldig. Dit is mogelijk het gevolg van dat er te lang (meer dan 3 uur) gewacht is om de tekst op te slaan. "
+#: ../../include/menu.php:107 ../../include/page_widgets.php:8
+#: ../../include/page_widgets.php:36 ../../include/RedDAV/RedBrowser.php:266
+#: ../../include/ItemObject.php:100 ../../include/apps.php:254
+#: ../../mod/webpages.php:181 ../../mod/thing.php:255
+#: ../../mod/connections.php:242 ../../mod/connections.php:255
+#: ../../mod/connections.php:274 ../../mod/blocks.php:153
+#: ../../mod/editpost.php:106 ../../mod/editlayout.php:133
+#: ../../mod/editwebpage.php:178 ../../mod/editblock.php:134
+#: ../../mod/menu.php:106 ../../mod/settings.php:650 ../../mod/layouts.php:183
+msgid "Edit"
+msgstr "Bewerken"
+
+#: ../../include/contact_selectors.php:56
+msgid "Frequently"
+msgstr "Regelmatig"
+
+#: ../../include/contact_selectors.php:57
+msgid "Hourly"
+msgstr "Elk uur"
+
+#: ../../include/contact_selectors.php:58
+msgid "Twice daily"
+msgstr "Twee keer per dag"
+
+#: ../../include/contact_selectors.php:59
+msgid "Daily"
+msgstr "Dagelijks"
+
+#: ../../include/contact_selectors.php:60
+msgid "Weekly"
+msgstr "Wekelijks"
+
+#: ../../include/contact_selectors.php:61
+msgid "Monthly"
+msgstr "Maandelijks"
+
+#: ../../include/contact_selectors.php:76
+msgid "Friendica"
+msgstr "Friendica"
+
+#: ../../include/contact_selectors.php:77
+msgid "OStatus"
+msgstr "OStatus"
+
+#: ../../include/contact_selectors.php:78
+msgid "RSS/Atom"
+msgstr "RSS/Atom"
+
+#: ../../include/contact_selectors.php:79 ../../mod/admin.php:822
+#: ../../mod/admin.php:831 ../../mod/id.php:15 ../../mod/id.php:16
+#: ../../boot.php:1552
+msgid "Email"
+msgstr "E-mail"
+
+#: ../../include/contact_selectors.php:80
+msgid "Diaspora"
+msgstr "Diaspora"
+
+#: ../../include/contact_selectors.php:81
+msgid "Facebook"
+msgstr "Facebook"
+
+#: ../../include/contact_selectors.php:82
+msgid "Zot!"
+msgstr "Zot!"
+
+#: ../../include/contact_selectors.php:83
+msgid "LinkedIn"
+msgstr "LinkedIn"
+
+#: ../../include/contact_selectors.php:84
+msgid "XMPP/IM"
+msgstr "XMPP/IM"
+
+#: ../../include/contact_selectors.php:85
+msgid "MySpace"
+msgstr "MySpace"
 
 #: ../../include/notify.php:23
 msgid "created a new post"
@@ -45,6 +117,18 @@ msgstr "maakte een nieuw bericht aan"
 msgid "commented on %s's post"
 msgstr "gaf een reactie op een bericht van %s"
 
+#: ../../include/Import/import_diaspora.php:17
+msgid "No username found in import file."
+msgstr "Geen gebruikersnaam in het importbestand gevonden."
+
+#: ../../include/Import/import_diaspora.php:42 ../../mod/import.php:156
+msgid "Unable to create a unique channel address. Import failed."
+msgstr "Niet in staat om een uniek kanaaladres aan te maken. Importeren is mislukt."
+
+#: ../../include/Import/import_diaspora.php:140 ../../mod/import.php:562
+msgid "Import completed."
+msgstr "Import voltooid."
+
 #: ../../include/group.php:26
 msgid ""
 "A deleted group with this name was revived. Existing item permissions "
@@ -56,7 +140,7 @@ msgstr "Een verwijderde collectie met deze naam is gereactiveerd. Bestaande item
 msgid "Default privacy group for new contacts"
 msgstr "Standaard privacy-collectie voor nieuwe kanalen"
 
-#: ../../include/group.php:254 ../../mod/admin.php:822
+#: ../../include/group.php:254 ../../mod/admin.php:831
 msgid "All Channels"
 msgstr "Alle kanalen"
 
@@ -96,7 +180,6 @@ msgstr "Jouw e-maildomein is op deze hub niet toegestaan"
 msgid "Your email address is already registered at this site."
 msgstr "Jouw e-mailadres is al op deze hub geregistreerd."
 
-
 #: ../../include/account.php:67
 msgid "An invitation is required."
 msgstr "Een uitnodiging is vereist"
@@ -124,7 +207,7 @@ msgid "Registration request at %s"
 msgstr "Registratiebevestiging voor %s"
 
 #: ../../include/account.php:314 ../../include/account.php:341
-#: ../../include/account.php:401
+#: ../../include/account.php:401 ../../include/network.php:1632
 msgid "Administrator"
 msgstr "Beheerder"
 
@@ -170,12 +253,12 @@ msgstr "Diversen"
 msgid "YYYY-MM-DD or MM-DD"
 msgstr "JJJJ-MM-DD of MM-DD"
 
-#: ../../include/datetime.php:235 ../../mod/events.php:635
+#: ../../include/datetime.php:235 ../../mod/events.php:672
 #: ../../mod/appman.php:91 ../../mod/appman.php:92
 msgid "Required"
 msgstr "Vereist"
 
-#: ../../include/datetime.php:262 ../../boot.php:2342
+#: ../../include/datetime.php:262 ../../boot.php:2353
 msgid "never"
 msgstr "nooit"
 
@@ -255,41 +338,69 @@ msgstr "Verjaardag van %1$s"
 msgid "Happy Birthday %1$s"
 msgstr "Gefeliciteerd met je verjaardag %1$s"
 
+#: ../../include/dir_fns.php:126
+msgid "Directory Options"
+msgstr "Opties kanalengids"
+
+#: ../../include/dir_fns.php:128
+msgid "Safe Mode"
+msgstr "Veilig zoeken"
+
+#: ../../include/dir_fns.php:128 ../../include/dir_fns.php:129
+#: ../../include/dir_fns.php:130 ../../mod/api.php:106
+#: ../../mod/photos.php:568 ../../mod/mitem.php:159 ../../mod/mitem.php:160
+#: ../../mod/mitem.php:232 ../../mod/mitem.php:233 ../../mod/menu.php:94
+#: ../../mod/menu.php:151 ../../mod/filestorage.php:151
+#: ../../mod/filestorage.php:159 ../../mod/admin.php:428
+#: ../../mod/settings.php:579 ../../mod/removeme.php:60
+#: ../../mod/connedit.php:647 ../../mod/connedit.php:675
+#: ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1554
+msgid "No"
+msgstr "Nee"
+
+#: ../../include/dir_fns.php:128 ../../include/dir_fns.php:129
+#: ../../include/dir_fns.php:130 ../../mod/api.php:105
+#: ../../mod/photos.php:568 ../../mod/mitem.php:159 ../../mod/mitem.php:160
+#: ../../mod/mitem.php:232 ../../mod/mitem.php:233 ../../mod/menu.php:94
+#: ../../mod/menu.php:151 ../../mod/filestorage.php:151
+#: ../../mod/filestorage.php:159 ../../mod/admin.php:430
+#: ../../mod/settings.php:579 ../../mod/removeme.php:60
+#: ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1554
+msgid "Yes"
+msgstr "Ja"
+
+#: ../../include/dir_fns.php:129
+msgid "Public Forums Only"
+msgstr "Alleen openbare forums"
+
+#: ../../include/dir_fns.php:130
+msgid "This Website Only"
+msgstr "Alleen deze hub"
+
 #: ../../include/page_widgets.php:6
 msgid "New Page"
 msgstr "Nieuwe pagina"
 
-#: ../../include/page_widgets.php:8 ../../include/page_widgets.php:36
-#: ../../include/RedDAV/RedBrowser.php:269 ../../include/ItemObject.php:100
-#: ../../include/apps.php:254 ../../include/menu.php:43
-#: ../../mod/settings.php:644 ../../mod/webpages.php:179
-#: ../../mod/thing.php:227 ../../mod/connections.php:382
-#: ../../mod/connections.php:395 ../../mod/connections.php:414
-#: ../../mod/blocks.php:152 ../../mod/editlayout.php:139
-#: ../../mod/editwebpage.php:178 ../../mod/editpost.php:113
-#: ../../mod/menu.php:100 ../../mod/editblock.php:140
-#: ../../mod/layouts.php:182
-msgid "Edit"
-msgstr "Bewerken"
-
-#: ../../include/page_widgets.php:39 ../../mod/webpages.php:185
-#: ../../mod/blocks.php:158 ../../mod/layouts.php:187
+#: ../../include/page_widgets.php:39 ../../mod/webpages.php:187
+#: ../../mod/blocks.php:159 ../../mod/layouts.php:188
 msgid "View"
 msgstr "Weergeven"
 
 #: ../../include/page_widgets.php:40 ../../include/ItemObject.php:677
-#: ../../include/conversation.php:1155 ../../mod/webpages.php:186
-#: ../../mod/events.php:653 ../../mod/photos.php:970
-#: ../../mod/editwebpage.php:214 ../../mod/editpost.php:149
-#: ../../mod/editblock.php:176
+#: ../../include/conversation.php:1166 ../../mod/webpages.php:188
+#: ../../mod/events.php:690 ../../mod/editpost.php:143
+#: ../../mod/photos.php:982 ../../mod/editwebpage.php:214
+#: ../../mod/editblock.php:170
 msgid "Preview"
 msgstr "Voorvertoning"
 
-#: ../../include/page_widgets.php:41 ../../mod/webpages.php:187
+#: ../../include/page_widgets.php:41 ../../mod/webpages.php:189
 msgid "Actions"
 msgstr "Acties"
 
-#: ../../include/page_widgets.php:42 ../../mod/webpages.php:188
+#: ../../include/page_widgets.php:42 ../../mod/webpages.php:190
 msgid "Page Link"
 msgstr "Paginalink"
 
@@ -297,89 +408,31 @@ msgstr "Paginalink"
 msgid "Title"
 msgstr "Titel"
 
-#: ../../include/page_widgets.php:44 ../../mod/webpages.php:190
-#: ../../mod/blocks.php:149 ../../mod/layouts.php:180
+#: ../../include/page_widgets.php:44 ../../mod/webpages.php:192
+#: ../../mod/blocks.php:150 ../../mod/menu.php:108 ../../mod/layouts.php:181
 msgid "Created"
 msgstr "Aangemaakt"
 
-#: ../../include/page_widgets.php:45 ../../mod/webpages.php:191
-#: ../../mod/blocks.php:150 ../../mod/layouts.php:181
+#: ../../include/page_widgets.php:45 ../../mod/webpages.php:193
+#: ../../mod/blocks.php:151 ../../mod/menu.php:109 ../../mod/layouts.php:182
 msgid "Edited"
 msgstr "Bewerkt"
 
-#: ../../include/api.php:1158
+#: ../../include/api.php:1267
 msgid "Public Timeline"
 msgstr "Openbare tijdlijn"
 
-#: ../../include/comanche.php:34 ../../mod/admin.php:386
+#: ../../include/comanche.php:34 ../../mod/admin.php:390
 #: ../../view/theme/apw/php/config.php:185
 msgid "Default"
 msgstr "Standaard"
 
-#: ../../include/dir_fns.php:143
-msgid "Directory Options"
-msgstr "Opties kanalengids"
-
-#: ../../include/dir_fns.php:144
-msgid "Alphabetic"
-msgstr "Alfabetisch"
-
-#: ../../include/dir_fns.php:145
-msgid "Reverse Alphabetic"
-msgstr "Omgekeerd alfabetisch"
-
-#: ../../include/dir_fns.php:146
-msgid "Newest to Oldest"
-msgstr "Nieuw naar oud"
-
-#: ../../include/dir_fns.php:147
-msgid "Oldest to Newest"
-msgstr "Oud naar nieuw"
-
-#: ../../include/dir_fns.php:148
-msgid "Sort"
-msgstr "Sorteren"
-
-#: ../../include/dir_fns.php:152
-msgid "Safe Mode"
-msgstr "Veilig zoeken"
-
-#: ../../include/dir_fns.php:154
-msgid "Public Forums Only"
-msgstr "Alleen openbare forums"
-
-#: ../../include/dir_fns.php:155
-msgid "This Website Only"
-msgstr "Alleen deze hub"
-
-#: ../../include/event.php:19 ../../include/bb2diaspora.php:451
-msgid "l F d, Y \\@ g:i A"
-msgstr "l d F Y \\@ G:i"
-
-#: ../../include/event.php:27 ../../include/bb2diaspora.php:457
-msgid "Starts:"
-msgstr "Start:"
-
-#: ../../include/event.php:37 ../../include/bb2diaspora.php:465
-msgid "Finishes:"
-msgstr "Einde:"
-
-#: ../../include/event.php:47 ../../include/bb2diaspora.php:473
-#: ../../include/identity.php:874 ../../mod/events.php:647
-#: ../../mod/directory.php:234
-msgid "Location:"
-msgstr "Plaats:"
-
-#: ../../include/event.php:391
-msgid "This event has been added to your calendar."
-msgstr "Dit evenement is aan jouw agenda toegevoegd."
-
 #: ../../include/js_strings.php:5
 msgid "Delete this item?"
 msgstr "Dit item verwijderen?"
 
 #: ../../include/js_strings.php:6 ../../include/ItemObject.php:667
-#: ../../mod/photos.php:968 ../../mod/photos.php:1086
+#: ../../mod/photos.php:980 ../../mod/photos.php:1098
 msgid "Comment"
 msgstr "Reactie"
 
@@ -407,7 +460,7 @@ msgstr "Wachtwoord te kort"
 msgid "Passwords do not match"
 msgstr "Wachtwoorden komen niet overeen"
 
-#: ../../include/js_strings.php:13 ../../mod/photos.php:39
+#: ../../include/js_strings.php:13 ../../mod/photos.php:40
 msgid "everybody"
 msgstr "iedereen"
 
@@ -436,6 +489,7 @@ msgid "Rate This Channel (this is public)"
 msgstr "Beoordeel dit kanaal (dit is openbaar)"
 
 #: ../../include/js_strings.php:20 ../../mod/rate.php:156
+#: ../../mod/connedit.php:683
 msgid "Rating"
 msgstr "Beoordeling"
 
@@ -444,25 +498,26 @@ msgid "Describe (optional)"
 msgstr "Omschrijving (optioneel)"
 
 #: ../../include/js_strings.php:22 ../../include/ItemObject.php:668
-#: ../../mod/settings.php:582 ../../mod/settings.php:684
-#: ../../mod/settings.php:710 ../../mod/settings.php:738
-#: ../../mod/settings.php:761 ../../mod/settings.php:843
-#: ../../mod/settings.php:1039 ../../mod/xchan.php:11 ../../mod/connect.php:93
-#: ../../mod/thing.php:275 ../../mod/thing.php:318 ../../mod/events.php:656
-#: ../../mod/group.php:81 ../../mod/setup.php:313 ../../mod/setup.php:358
-#: ../../mod/photos.php:565 ../../mod/photos.php:642 ../../mod/photos.php:929
-#: ../../mod/photos.php:969 ../../mod/photos.php:1087 ../../mod/pdledit.php:58
-#: ../../mod/import.php:504 ../../mod/chat.php:177 ../../mod/chat.php:211
-#: ../../mod/rate.php:167 ../../mod/invite.php:142 ../../mod/locs.php:105
-#: ../../mod/sources.php:104 ../../mod/sources.php:138
-#: ../../mod/filestorage.php:156 ../../mod/fsuggest.php:108
-#: ../../mod/poke.php:166 ../../mod/profiles.php:667 ../../mod/mitem.php:229
-#: ../../mod/admin.php:446 ../../mod/admin.php:810 ../../mod/admin.php:946
-#: ../../mod/admin.php:1077 ../../mod/admin.php:1271 ../../mod/admin.php:1356
-#: ../../mod/mood.php:134 ../../mod/connedit.php:679 ../../mod/mail.php:355
-#: ../../mod/appman.php:99 ../../mod/poll.php:68 ../../mod/bulksetclose.php:24
-#: ../../view/theme/apw/php/config.php:256
-#: ../../view/theme/redbasic/php/config.php:97
+#: ../../mod/xchan.php:11 ../../mod/connect.php:93 ../../mod/thing.php:303
+#: ../../mod/thing.php:346 ../../mod/events.php:511 ../../mod/events.php:693
+#: ../../mod/group.php:81 ../../mod/photos.php:577 ../../mod/photos.php:654
+#: ../../mod/photos.php:941 ../../mod/photos.php:981 ../../mod/photos.php:1099
+#: ../../mod/pdledit.php:58 ../../mod/import.php:592 ../../mod/chat.php:177
+#: ../../mod/chat.php:211 ../../mod/mitem.php:235 ../../mod/rate.php:167
+#: ../../mod/invite.php:142 ../../mod/locs.php:105 ../../mod/sources.php:104
+#: ../../mod/sources.php:138 ../../mod/filestorage.php:156
+#: ../../mod/fsuggest.php:108 ../../mod/poke.php:166
+#: ../../mod/profiles.php:667 ../../mod/setup.php:327 ../../mod/setup.php:367
+#: ../../mod/admin.php:453 ../../mod/admin.php:819 ../../mod/admin.php:986
+#: ../../mod/admin.php:1118 ../../mod/admin.php:1312 ../../mod/admin.php:1397
+#: ../../mod/settings.php:588 ../../mod/settings.php:692
+#: ../../mod/settings.php:718 ../../mod/settings.php:746
+#: ../../mod/settings.php:769 ../../mod/settings.php:854
+#: ../../mod/settings.php:1050 ../../mod/mood.php:134
+#: ../../mod/connedit.php:704 ../../mod/mail.php:355 ../../mod/appman.php:99
+#: ../../mod/pconfig.php:108 ../../mod/poll.php:68
+#: ../../mod/bulksetclose.php:24 ../../view/theme/apw/php/config.php:256
+#: ../../view/theme/redbasic/php/config.php:99
 msgid "Submit"
 msgstr "Opslaan"
 
@@ -547,15 +602,367 @@ msgstr " "
 msgid "timeago.numbers"
 msgstr "timeago.numbers"
 
-#: ../../include/RedDAV/RedBrowser.php:107
-#: ../../include/RedDAV/RedBrowser.php:268
-msgid "parent"
-msgstr "omhoog"
+#: ../../include/text.php:391
+msgid "prev"
+msgstr "vorige"
+
+#: ../../include/text.php:393
+msgid "first"
+msgstr "eerste"
+
+#: ../../include/text.php:422
+msgid "last"
+msgstr "laatste"
+
+#: ../../include/text.php:425
+msgid "next"
+msgstr "volgende"
+
+#: ../../include/text.php:435
+msgid "older"
+msgstr "ouder"
+
+#: ../../include/text.php:437
+msgid "newer"
+msgstr "nieuwer"
+
+#: ../../include/text.php:830
+msgid "No connections"
+msgstr "Geen connecties"
+
+#: ../../include/text.php:844
+#, php-format
+msgid "%d Connection"
+msgid_plural "%d Connections"
+msgstr[0] "%d connectie"
+msgstr[1] "%d connecties"
+
+#: ../../include/text.php:857 ../../mod/viewconnections.php:104
+msgid "View Connections"
+msgstr "Connecties weergeven"
+
+#: ../../include/text.php:914 ../../include/text.php:926
+#: ../../include/nav.php:165 ../../include/apps.php:147
+#: ../../mod/search.php:38
+msgid "Search"
+msgstr "Zoeken"
+
+#: ../../include/text.php:915 ../../include/text.php:927
+#: ../../include/widgets.php:192 ../../mod/rbmark.php:28
+#: ../../mod/rbmark.php:98 ../../mod/filer.php:50 ../../mod/admin.php:1457
+#: ../../mod/admin.php:1477
+msgid "Save"
+msgstr "Opslaan"
+
+#: ../../include/text.php:990
+msgid "poke"
+msgstr "aanstoten"
+
+#: ../../include/text.php:990 ../../include/conversation.php:243
+msgid "poked"
+msgstr "aangestoten"
+
+#: ../../include/text.php:991
+msgid "ping"
+msgstr "ping"
+
+#: ../../include/text.php:991
+msgid "pinged"
+msgstr "gepingd"
+
+#: ../../include/text.php:992
+msgid "prod"
+msgstr "por"
+
+#: ../../include/text.php:992
+msgid "prodded"
+msgstr "gepord"
+
+#: ../../include/text.php:993
+msgid "slap"
+msgstr "slaan"
+
+#: ../../include/text.php:993
+msgid "slapped"
+msgstr "sloeg"
+
+#: ../../include/text.php:994
+msgid "finger"
+msgstr "finger"
+
+#: ../../include/text.php:994
+msgid "fingered"
+msgstr "gefingerd"
+
+#: ../../include/text.php:995
+msgid "rebuff"
+msgstr "afpoeieren"
+
+#: ../../include/text.php:995
+msgid "rebuffed"
+msgstr "afgepoeierd"
+
+#: ../../include/text.php:1005
+msgid "happy"
+msgstr "gelukkig"
+
+#: ../../include/text.php:1006
+msgid "sad"
+msgstr "bedroefd"
+
+#: ../../include/text.php:1007
+msgid "mellow"
+msgstr "mellow"
+
+#: ../../include/text.php:1008
+msgid "tired"
+msgstr "moe"
+
+#: ../../include/text.php:1009
+msgid "perky"
+msgstr "parmantig"
+
+#: ../../include/text.php:1010
+msgid "angry"
+msgstr "boos"
+
+#: ../../include/text.php:1011
+msgid "stupified"
+msgstr "beteuterd"
+
+#: ../../include/text.php:1012
+msgid "puzzled"
+msgstr "verward"
+
+#: ../../include/text.php:1013
+msgid "interested"
+msgstr "geïnteresseerd"
+
+#: ../../include/text.php:1014
+msgid "bitter"
+msgstr "verbitterd"
+
+#: ../../include/text.php:1015
+msgid "cheerful"
+msgstr "vrolijk"
+
+#: ../../include/text.php:1016
+msgid "alive"
+msgstr "levendig"
+
+#: ../../include/text.php:1017
+msgid "annoyed"
+msgstr "geërgerd"
+
+#: ../../include/text.php:1018
+msgid "anxious"
+msgstr "bezorgd"
+
+#: ../../include/text.php:1019
+msgid "cranky"
+msgstr "humeurig"
+
+#: ../../include/text.php:1020
+msgid "disturbed"
+msgstr "verontrust"
+
+#: ../../include/text.php:1021
+msgid "frustrated"
+msgstr "gefrustreerd "
+
+#: ../../include/text.php:1022
+msgid "depressed"
+msgstr "gedeprimeerd"
+
+#: ../../include/text.php:1023
+msgid "motivated"
+msgstr "gemotiveerd"
+
+#: ../../include/text.php:1024
+msgid "relaxed"
+msgstr "ontspannen"
+
+#: ../../include/text.php:1025
+msgid "surprised"
+msgstr "verrast"
+
+#: ../../include/text.php:1197
+msgid "Monday"
+msgstr "maandag"
+
+#: ../../include/text.php:1197
+msgid "Tuesday"
+msgstr "dinsdag"
+
+#: ../../include/text.php:1197
+msgid "Wednesday"
+msgstr "woensdag"
+
+#: ../../include/text.php:1197
+msgid "Thursday"
+msgstr "donderdag"
+
+#: ../../include/text.php:1197
+msgid "Friday"
+msgstr "vrijdag"
+
+#: ../../include/text.php:1197
+msgid "Saturday"
+msgstr "zaterdag"
+
+#: ../../include/text.php:1197
+msgid "Sunday"
+msgstr "zondag"
+
+#: ../../include/text.php:1201
+msgid "January"
+msgstr "januari"
+
+#: ../../include/text.php:1201
+msgid "February"
+msgstr "februari"
+
+#: ../../include/text.php:1201
+msgid "March"
+msgstr "maart"
+
+#: ../../include/text.php:1201
+msgid "April"
+msgstr "april"
+
+#: ../../include/text.php:1201 ../../mod/uexport.php:58
+#: ../../mod/uexport.php:59
+msgid "May"
+msgstr "mei"
+
+#: ../../include/text.php:1201
+msgid "June"
+msgstr "juni"
 
-#: ../../include/RedDAV/RedBrowser.php:131 ../../include/text.php:2497
+#: ../../include/text.php:1201
+msgid "July"
+msgstr "juli"
+
+#: ../../include/text.php:1201
+msgid "August"
+msgstr "augustus"
+
+#: ../../include/text.php:1201
+msgid "September"
+msgstr "september"
+
+#: ../../include/text.php:1201
+msgid "October"
+msgstr "oktober"
+
+#: ../../include/text.php:1201
+msgid "November"
+msgstr "november"
+
+#: ../../include/text.php:1201
+msgid "December"
+msgstr "december"
+
+#: ../../include/text.php:1306
+msgid "unknown.???"
+msgstr "onbekend.???"
+
+#: ../../include/text.php:1307
+msgid "bytes"
+msgstr "bytes"
+
+#: ../../include/text.php:1343
+msgid "remove category"
+msgstr "categorie verwijderen"
+
+#: ../../include/text.php:1418
+msgid "remove from file"
+msgstr "uit map verwijderen"
+
+#: ../../include/text.php:1494 ../../include/text.php:1505
+msgid "Click to open/close"
+msgstr "Klik om te openen of te sluiten"
+
+#: ../../include/text.php:1661 ../../mod/events.php:474
+msgid "Link to Source"
+msgstr "Originele locatie"
+
+#: ../../include/text.php:1682 ../../include/text.php:1753
+msgid "default"
+msgstr "standaard"
+
+#: ../../include/text.php:1690
+msgid "Page layout"
+msgstr "Pagina-lay-out"
+
+#: ../../include/text.php:1690
+msgid "You can create your own with the layouts tool"
+msgstr "Je kan jouw eigen lay-out ontwerpen onder lay-outs"
+
+#: ../../include/text.php:1731
+msgid "Page content type"
+msgstr "Opmaaktype pagina"
+
+#: ../../include/text.php:1765
+msgid "Select an alternate language"
+msgstr "Kies een andere taal"
+
+#: ../../include/text.php:1884 ../../include/diaspora.php:2119
+#: ../../include/conversation.php:120 ../../mod/like.php:349
+#: ../../mod/subthread.php:72 ../../mod/subthread.php:174
+#: ../../mod/tagger.php:43
+msgid "photo"
+msgstr "foto"
+
+#: ../../include/text.php:1887 ../../include/conversation.php:123
+#: ../../mod/like.php:351 ../../mod/tagger.php:47
+msgid "event"
+msgstr "gebeurtenis"
+
+#: ../../include/text.php:1890 ../../include/diaspora.php:2119
+#: ../../include/conversation.php:148 ../../mod/like.php:349
+#: ../../mod/subthread.php:72 ../../mod/subthread.php:174
+msgid "status"
+msgstr "bericht"
+
+#: ../../include/text.php:1892 ../../include/conversation.php:150
+#: ../../mod/tagger.php:53
+msgid "comment"
+msgstr "reactie"
+
+#: ../../include/text.php:1897
+msgid "activity"
+msgstr "activiteit"
+
+#: ../../include/text.php:2192
+msgid "Design Tools"
+msgstr "Ontwerp-hulpmiddelen"
+
+#: ../../include/text.php:2195 ../../mod/blocks.php:147
+msgid "Blocks"
+msgstr "Blokken"
+
+#: ../../include/text.php:2196 ../../mod/menu.php:101
+msgid "Menus"
+msgstr "Menu's"
+
+#: ../../include/text.php:2197 ../../mod/layouts.php:174
+msgid "Layouts"
+msgstr "Lay-outs"
+
+#: ../../include/text.php:2198
+msgid "Pages"
+msgstr "Pagina's"
+
+#: ../../include/text.php:2549 ../../include/RedDAV/RedBrowser.php:131
 msgid "Collection"
 msgstr "map"
 
+#: ../../include/RedDAV/RedBrowser.php:107
+#: ../../include/RedDAV/RedBrowser.php:265
+msgid "parent"
+msgstr "omhoog"
+
 #: ../../include/RedDAV/RedBrowser.php:134
 msgid "Principal"
 msgstr "principal"
@@ -576,9 +983,9 @@ msgstr "Planning-postvak IN"
 msgid "Schedule Outbox"
 msgstr "Planning-postvak UIT"
 
-#: ../../include/RedDAV/RedBrowser.php:164 ../../include/conversation.php:1019
+#: ../../include/RedDAV/RedBrowser.php:164 ../../include/conversation.php:1030
 #: ../../include/apps.php:336 ../../include/apps.php:387
-#: ../../mod/photos.php:681 ../../mod/photos.php:1119
+#: ../../mod/photos.php:693 ../../mod/photos.php:1131
 msgid "Unknown"
 msgstr "Onbekend"
 
@@ -593,7 +1000,7 @@ msgid "%1$s used of %2$s (%3$s&#37;)"
 msgstr "%1$s van %2$s gebruikt (%3$s&#37;)"
 
 #: ../../include/RedDAV/RedBrowser.php:251 ../../include/nav.php:98
-#: ../../include/conversation.php:1609 ../../include/apps.php:135
+#: ../../include/conversation.php:1620 ../../include/apps.php:135
 #: ../../mod/fbrowser.php:114
 msgid "Files"
 msgstr "Bestanden"
@@ -607,52 +1014,51 @@ msgid "Shared"
 msgstr "Gedeeld"
 
 #: ../../include/RedDAV/RedBrowser.php:256
-#: ../../include/RedDAV/RedBrowser.php:306 ../../mod/webpages.php:178
-#: ../../mod/blocks.php:151 ../../mod/menu.php:104 ../../mod/layouts.php:174
-#: ../../mod/new_channel.php:121
+#: ../../include/RedDAV/RedBrowser.php:303 ../../mod/webpages.php:180
+#: ../../mod/blocks.php:152 ../../mod/menu.php:112
+#: ../../mod/new_channel.php:121 ../../mod/layouts.php:175
 msgid "Create"
 msgstr "Aanmaken"
 
 #: ../../include/RedDAV/RedBrowser.php:257
-#: ../../include/RedDAV/RedBrowser.php:308 ../../mod/profile_photo.php:362
-#: ../../mod/photos.php:706 ../../mod/photos.php:1236
+#: ../../include/RedDAV/RedBrowser.php:305 ../../mod/profile_photo.php:362
+#: ../../mod/photos.php:718 ../../mod/photos.php:1248
 msgid "Upload"
 msgstr "Uploaden"
 
-#: ../../include/RedDAV/RedBrowser.php:264 ../../mod/settings.php:584
-#: ../../mod/settings.php:610 ../../mod/admin.php:953
+#: ../../include/RedDAV/RedBrowser.php:261 ../../mod/admin.php:994
+#: ../../mod/settings.php:590 ../../mod/settings.php:616
 #: ../../mod/sharedwithme.php:95
 msgid "Name"
 msgstr "Naam"
 
-#: ../../include/RedDAV/RedBrowser.php:265
+#: ../../include/RedDAV/RedBrowser.php:262
 msgid "Type"
 msgstr "Type"
 
-#: ../../include/RedDAV/RedBrowser.php:266 ../../mod/sharedwithme.php:97
+#: ../../include/RedDAV/RedBrowser.php:263 ../../mod/sharedwithme.php:97
 msgid "Size"
 msgstr "Grootte"
 
-#: ../../include/RedDAV/RedBrowser.php:267 ../../mod/sharedwithme.php:98
+#: ../../include/RedDAV/RedBrowser.php:264 ../../mod/sharedwithme.php:98
 msgid "Last Modified"
 msgstr "Laatst gewijzigd"
 
-#: ../../include/RedDAV/RedBrowser.php:270 ../../include/ItemObject.php:120
-#: ../../include/conversation.php:660 ../../include/apps.php:255
-#: ../../mod/settings.php:645 ../../mod/webpages.php:181
-#: ../../mod/thing.php:228 ../../mod/group.php:176 ../../mod/blocks.php:154
-#: ../../mod/photos.php:1050 ../../mod/editlayout.php:107
-#: ../../mod/editwebpage.php:225 ../../mod/admin.php:817
-#: ../../mod/admin.php:948 ../../mod/editblock.php:113
-#: ../../mod/connedit.php:543
+#: ../../include/RedDAV/RedBrowser.php:267 ../../include/ItemObject.php:120
+#: ../../include/conversation.php:671 ../../include/apps.php:255
+#: ../../mod/webpages.php:183 ../../mod/thing.php:256 ../../mod/group.php:176
+#: ../../mod/blocks.php:155 ../../mod/photos.php:1062
+#: ../../mod/editlayout.php:178 ../../mod/editwebpage.php:225
+#: ../../mod/editblock.php:180 ../../mod/admin.php:826 ../../mod/admin.php:988
+#: ../../mod/settings.php:651 ../../mod/connedit.php:563
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: ../../include/RedDAV/RedBrowser.php:305
+#: ../../include/RedDAV/RedBrowser.php:302
 msgid "Create new folder"
 msgstr "Nieuwe map aanmaken"
 
-#: ../../include/RedDAV/RedBrowser.php:307
+#: ../../include/RedDAV/RedBrowser.php:304
 msgid "Upload file"
 msgstr "Bestand uploaden"
 
@@ -661,10 +1067,33 @@ msgstr "Bestand uploaden"
 msgid "%1$s's bookmarks"
 msgstr "Bladwijzers van %1$s"
 
-#: ../../include/network.php:632
+#: ../../include/network.php:635
 msgid "view full size"
 msgstr "volledige grootte tonen"
 
+#: ../../include/network.php:1585 ../../include/enotify.php:58
+msgid "$Projectname Notification"
+msgstr "$Projectname-notificatie"
+
+#: ../../include/network.php:1586 ../../include/enotify.php:59
+#: ../../include/diaspora.php:2522 ../../include/diaspora.php:2533
+#: ../../mod/p.php:46
+msgid "$projectname"
+msgstr "$projectname"
+
+#: ../../include/network.php:1588 ../../include/enotify.php:61
+msgid "Thank You,"
+msgstr "Bedankt,"
+
+#: ../../include/network.php:1590 ../../include/enotify.php:63
+#, php-format
+msgid "%s Administrator"
+msgstr "Beheerder %s"
+
+#: ../../include/network.php:1646
+msgid "No Subject"
+msgstr "Geen onderwerp"
+
 #: ../../include/features.php:38
 msgid "General Features"
 msgstr "Algemene functies"
@@ -773,7 +1202,7 @@ msgid ""
 "(320px) photo thumbnails"
 msgstr "Toon grote (640px) voorbeeldfoto's in berichten. Standaard worden kleine voorbeeldfoto's (320px) getoond. "
 
-#: ../../include/features.php:59 ../../include/widgets.php:546
+#: ../../include/features.php:59 ../../include/widgets.php:548
 #: ../../mod/sources.php:88
 msgid "Channel Sources"
 msgstr "Kanaalbronnen"
@@ -852,63 +1281,71 @@ msgid "Filter stream activity by depth of relationships"
 msgstr "Filter wat je in de Matrix ziet op hoe goed je iemand kent of mag"
 
 #: ../../include/features.php:74
+msgid "Connection Filtering"
+msgstr "berichtenfilters"
+
+#: ../../include/features.php:74
+msgid "Filter incoming posts from connections based on keywords/content"
+msgstr "Filter binnenkomende berichten van connecties aan de hand van trefwoorden/inhoud"
+
+#: ../../include/features.php:75
 msgid "Suggest Channels"
 msgstr "Kanalen voorstellen"
 
-#: ../../include/features.php:74
+#: ../../include/features.php:75
 msgid "Show channel suggestions"
 msgstr "Voor jou mogelijk interessante kanalen voorstellen"
 
-#: ../../include/features.php:79
+#: ../../include/features.php:80
 msgid "Post/Comment Tools"
 msgstr "Bericht- en reactiehulpmiddelen"
 
-#: ../../include/features.php:80
+#: ../../include/features.php:81
 msgid "Tagging"
 msgstr "Taggen"
 
-#: ../../include/features.php:80
+#: ../../include/features.php:81
 msgid "Ability to tag existing posts"
 msgstr "Mogelijkheid om bestaande berichten te taggen"
 
-#: ../../include/features.php:81
+#: ../../include/features.php:82
 msgid "Post Categories"
 msgstr "Categorieën berichten"
 
-#: ../../include/features.php:81
+#: ../../include/features.php:82
 msgid "Add categories to your posts"
 msgstr "Voeg categorieën toe aan je berichten"
 
-#: ../../include/features.php:82 ../../include/widgets.php:304
+#: ../../include/features.php:83 ../../include/widgets.php:304
 #: ../../include/contact_widgets.php:57
 msgid "Saved Folders"
 msgstr "Bewaarde mappen"
 
-#: ../../include/features.php:82
+#: ../../include/features.php:83
 msgid "Ability to file posts under folders"
 msgstr "Mogelijkheid om berichten in mappen op te slaan"
 
-#: ../../include/features.php:83
+#: ../../include/features.php:84
 msgid "Dislike Posts"
 msgstr "Vind berichten niet leuk"
 
-#: ../../include/features.php:83
+#: ../../include/features.php:84
 msgid "Ability to dislike posts/comments"
 msgstr "Mogelijkheid om berichten en reacties niet leuk te vinden"
 
-#: ../../include/features.php:84
+#: ../../include/features.php:85
 msgid "Star Posts"
 msgstr "Geef berichten een ster"
 
-#: ../../include/features.php:84
+#: ../../include/features.php:85
 msgid "Ability to mark special posts with a star indicator"
 msgstr "Mogelijkheid om speciale berichten met een ster te markeren"
 
-#: ../../include/features.php:85
+#: ../../include/features.php:86
 msgid "Tag Cloud"
 msgstr "Tagwolk"
 
-#: ../../include/features.php:85
+#: ../../include/features.php:86
 msgid "Provide a personal tag cloud on your channel page"
 msgstr "Zorgt voor een persoonlijke wolk met tags op jouw kanaalpagina"
 
@@ -918,7 +1355,7 @@ msgid "Categories"
 msgstr "Categorieën"
 
 #: ../../include/widgets.php:91 ../../include/nav.php:163
-#: ../../mod/apps.php:34
+#: ../../mod/apps.php:36
 msgid "Apps"
 msgstr "Apps"
 
@@ -926,7 +1363,7 @@ msgstr "Apps"
 msgid "System"
 msgstr "Systeem"
 
-#: ../../include/widgets.php:94 ../../include/conversation.php:1504
+#: ../../include/widgets.php:94 ../../include/conversation.php:1515
 msgid "Personal"
 msgstr "Persoonlijk"
 
@@ -939,9 +1376,9 @@ msgid "Edit Personal App"
 msgstr "Persoonlijke app bewerken"
 
 #: ../../include/widgets.php:136 ../../include/widgets.php:175
-#: ../../include/Contact.php:107 ../../include/conversation.php:945
-#: ../../include/identity.php:823 ../../mod/match.php:64
-#: ../../mod/directory.php:302 ../../mod/suggest.php:52
+#: ../../include/Contact.php:107 ../../include/conversation.php:956
+#: ../../include/identity.php:956 ../../mod/directory.php:316
+#: ../../mod/match.php:64 ../../mod/suggest.php:52
 msgid "Connect"
 msgstr "Verbinden"
 
@@ -949,7 +1386,7 @@ msgstr "Verbinden"
 msgid "Ignore/Hide"
 msgstr "Negeren/Verbergen"
 
-#: ../../include/widgets.php:143 ../../mod/connections.php:268
+#: ../../include/widgets.php:143 ../../mod/connections.php:128
 msgid "Suggestions"
 msgstr "Voorgestelde kanalen"
 
@@ -978,12 +1415,6 @@ msgstr "Voorbeeld: bob@example.com, http://example.com/barbara"
 msgid "Notes"
 msgstr "Aantekeningen"
 
-#: ../../include/widgets.php:192 ../../include/text.php:853
-#: ../../include/text.php:865 ../../mod/rbmark.php:28 ../../mod/rbmark.php:98
-#: ../../mod/filer.php:50 ../../mod/admin.php:1416 ../../mod/admin.php:1436
-msgid "Save"
-msgstr "Opslaan"
-
 #: ../../include/widgets.php:266
 msgid "Remove term"
 msgstr "Verwijder zoekterm"
@@ -997,135 +1428,140 @@ msgstr "Alles"
 msgid "Archives"
 msgstr "Archieven"
 
-#: ../../include/widgets.php:427 ../../mod/connedit.php:572
+#: ../../include/widgets.php:429 ../../mod/connedit.php:583
 msgid "Me"
 msgstr "Ik"
 
-#: ../../include/widgets.php:428 ../../mod/connedit.php:573
+#: ../../include/widgets.php:430 ../../mod/connedit.php:584
 msgid "Family"
 msgstr "Familie"
 
-#: ../../include/widgets.php:429 ../../include/identity.php:394
+#: ../../include/widgets.php:431 ../../include/identity.php:394
 #: ../../include/identity.php:395 ../../include/identity.php:402
-#: ../../include/profile_selectors.php:80 ../../mod/settings.php:339
-#: ../../mod/settings.php:343 ../../mod/settings.php:344
-#: ../../mod/settings.php:347 ../../mod/settings.php:358
-#: ../../mod/connedit.php:574
+#: ../../include/profile_selectors.php:80 ../../mod/settings.php:345
+#: ../../mod/settings.php:349 ../../mod/settings.php:350
+#: ../../mod/settings.php:353 ../../mod/settings.php:364
+#: ../../mod/connedit.php:585
 msgid "Friends"
 msgstr "Vrienden"
 
-#: ../../include/widgets.php:430 ../../mod/connedit.php:575
+#: ../../include/widgets.php:432 ../../mod/connedit.php:586
 msgid "Acquaintances"
 msgstr "Kennissen"
 
-#: ../../include/widgets.php:431 ../../mod/connections.php:231
-#: ../../mod/connections.php:246 ../../mod/connedit.php:576
+#: ../../include/widgets.php:433 ../../mod/connections.php:91
+#: ../../mod/connections.php:106 ../../mod/connedit.php:587
 msgid "All"
 msgstr "Alles"
 
-#: ../../include/widgets.php:450
+#: ../../include/widgets.php:452
 msgid "Refresh"
 msgstr "Vernieuwen"
 
-#: ../../include/widgets.php:485
+#: ../../include/widgets.php:487
 msgid "Account settings"
 msgstr "Account"
 
-#: ../../include/widgets.php:491
+#: ../../include/widgets.php:493
 msgid "Channel settings"
 msgstr "Kanaal"
 
-#: ../../include/widgets.php:497
+#: ../../include/widgets.php:499
 msgid "Additional features"
 msgstr "Extra functies"
 
-#: ../../include/widgets.php:503
+#: ../../include/widgets.php:505
 msgid "Feature/Addon settings"
 msgstr "Extra functie- en plugin-instellingen"
 
-#: ../../include/widgets.php:509
+#: ../../include/widgets.php:511
 msgid "Display settings"
 msgstr "Weergave"
 
-#: ../../include/widgets.php:515
+#: ../../include/widgets.php:517
 msgid "Connected apps"
 msgstr "Verbonden applicaties"
 
-#: ../../include/widgets.php:521
+#: ../../include/widgets.php:523
 msgid "Export channel"
 msgstr "Kanaal exporteren"
 
-#: ../../include/widgets.php:530 ../../mod/connedit.php:653
+#: ../../include/widgets.php:532 ../../mod/connedit.php:674
 msgid "Connection Default Permissions"
 msgstr "Standaard permissies voor connecties"
 
-#: ../../include/widgets.php:538
+#: ../../include/widgets.php:540
 msgid "Premium Channel Settings"
 msgstr "Instellingen premiumkanaal"
 
-#: ../../include/widgets.php:554 ../../include/nav.php:208
-#: ../../include/apps.php:134 ../../mod/admin.php:1038
-#: ../../mod/admin.php:1238
+#: ../../include/widgets.php:556 ../../include/nav.php:208
+#: ../../include/apps.php:134 ../../mod/admin.php:1079
+#: ../../mod/admin.php:1279
 msgid "Settings"
 msgstr "Instellingen"
 
-#: ../../include/widgets.php:567 ../../mod/message.php:31
+#: ../../include/widgets.php:569 ../../mod/message.php:31
 #: ../../mod/mail.php:128
 msgid "Messages"
 msgstr "Berichten"
 
-#: ../../include/widgets.php:570
+#: ../../include/widgets.php:572
 msgid "Check Mail"
 msgstr "Controleer op nieuwe berichten"
 
-#: ../../include/widgets.php:575 ../../include/nav.php:199
+#: ../../include/widgets.php:577 ../../include/nav.php:199
 msgid "New Message"
 msgstr "Nieuw bericht"
 
-#: ../../include/widgets.php:650
+#: ../../include/widgets.php:652
 msgid "Chat Rooms"
 msgstr "Chatkanalen"
 
-#: ../../include/widgets.php:670
+#: ../../include/widgets.php:672
 msgid "Bookmarked Chatrooms"
 msgstr "Bladwijzers van chatkanalen"
 
-#: ../../include/widgets.php:690
+#: ../../include/widgets.php:692
 msgid "Suggested Chatrooms"
 msgstr "Voorgestelde chatkanalen"
 
-#: ../../include/widgets.php:817 ../../include/widgets.php:875
+#: ../../include/widgets.php:819 ../../include/widgets.php:877
 msgid "photo/image"
 msgstr "foto/afbeelding"
 
-#: ../../include/widgets.php:970 ../../include/widgets.php:972
+#: ../../include/widgets.php:972 ../../include/widgets.php:974
 msgid "Rate Me"
 msgstr "Beoordeel mij"
 
-#: ../../include/widgets.php:976
+#: ../../include/widgets.php:978
 msgid "View Ratings"
 msgstr "Bekijk beoordelingen"
 
-#: ../../include/widgets.php:987
+#: ../../include/widgets.php:989
 msgid "Public Hubs"
 msgstr "Openbare hubs"
 
-#: ../../include/enotify.php:58
-msgid "Red Matrix Notification"
-msgstr "RedMatrix-notificatie"
+#: ../../include/event.php:22 ../../include/bb2diaspora.php:459
+msgid "l F d, Y \\@ g:i A"
+msgstr "l d F Y \\@ G:i"
 
-#: ../../include/enotify.php:59
-msgid "redmatrix"
-msgstr "RedMatrix"
+#: ../../include/event.php:30 ../../include/bb2diaspora.php:465
+msgid "Starts:"
+msgstr "Start:"
 
-#: ../../include/enotify.php:61
-msgid "Thank You,"
-msgstr "Bedankt,"
+#: ../../include/event.php:40 ../../include/bb2diaspora.php:473
+msgid "Finishes:"
+msgstr "Einde:"
 
-#: ../../include/enotify.php:63
-#, php-format
-msgid "%s Administrator"
-msgstr "Beheerder %s"
+#: ../../include/event.php:50 ../../include/bb2diaspora.php:481
+#: ../../include/identity.php:1007 ../../mod/directory.php:302
+#: ../../mod/events.php:684
+msgid "Location:"
+msgstr "Plaats:"
+
+#: ../../include/event.php:549
+msgid "This event has been added to your calendar."
+msgstr "Dit evenement is aan jouw agenda toegevoegd."
 
 #: ../../include/enotify.php:96
 #, php-format
@@ -1306,72 +1742,6 @@ msgstr "Bezoek %s om het voorstel te accepteren of af te wijzen."
 msgid "[Red:Notify]"
 msgstr "[Red:Notificatie]"
 
-#: ../../include/contact_selectors.php:56
-msgid "Frequently"
-msgstr "Regelmatig"
-
-#: ../../include/contact_selectors.php:57
-msgid "Hourly"
-msgstr "Elk uur"
-
-#: ../../include/contact_selectors.php:58
-msgid "Twice daily"
-msgstr "Twee keer per dag"
-
-#: ../../include/contact_selectors.php:59
-msgid "Daily"
-msgstr "Dagelijks"
-
-#: ../../include/contact_selectors.php:60
-msgid "Weekly"
-msgstr "Wekelijks"
-
-#: ../../include/contact_selectors.php:61
-msgid "Monthly"
-msgstr "Maandelijks"
-
-#: ../../include/contact_selectors.php:76
-msgid "Friendica"
-msgstr "Friendica"
-
-#: ../../include/contact_selectors.php:77
-msgid "OStatus"
-msgstr "OStatus"
-
-#: ../../include/contact_selectors.php:78
-msgid "RSS/Atom"
-msgstr "RSS/Atom"
-
-#: ../../include/contact_selectors.php:79 ../../mod/admin.php:813
-#: ../../mod/admin.php:822 ../../mod/id.php:15 ../../mod/id.php:16
-#: ../../boot.php:1542
-msgid "Email"
-msgstr "E-mail"
-
-#: ../../include/contact_selectors.php:80
-msgid "Diaspora"
-msgstr "Diaspora"
-
-#: ../../include/contact_selectors.php:81
-msgid "Facebook"
-msgstr "Facebook"
-
-#: ../../include/contact_selectors.php:82
-msgid "Zot!"
-msgstr "Zot!"
-
-#: ../../include/contact_selectors.php:83
-msgid "LinkedIn"
-msgstr "LinkedIn"
-
-#: ../../include/contact_selectors.php:84
-msgid "XMPP/IM"
-msgstr "XMPP/IM"
-
-#: ../../include/contact_selectors.php:85
-msgid "MySpace"
-msgstr "MySpace"
-
 #: ../../include/message.php:18
 msgid "No recipient provided."
 msgstr "Geen ontvanger opgegeven."
@@ -1388,6 +1758,28 @@ msgstr "Afzender kan niet bepaald worden."
 msgid "Stored post could not be verified."
 msgstr "Opgeslagen bericht kon niet worden geverifieerd."
 
+#: ../../include/diaspora.php:2148 ../../include/conversation.php:164
+#: ../../mod/like.php:397
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
+msgstr "%1$s vindt %3$s van %2$s leuk"
+
+#: ../../include/diaspora.php:2494
+msgid "Please choose"
+msgstr "Maak een keuze"
+
+#: ../../include/diaspora.php:2496
+msgid "Agree"
+msgstr "Eens"
+
+#: ../../include/diaspora.php:2498
+msgid "Disagree"
+msgstr "Oneens"
+
+#: ../../include/diaspora.php:2500
+msgid "Abstain"
+msgstr "onthouding"
+
 #: ../../include/follow.php:28
 msgid "Channel is blocked on this site."
 msgstr "Kanaal is op deze hub geblokkeerd."
@@ -1404,27 +1796,31 @@ msgstr "Antwoord van het kanaal op afstand was niet volledig."
 msgid "Channel was deleted and no longer exists."
 msgstr "Kanaal is verwijderd en bestaat niet meer."
 
-#: ../../include/follow.php:135 ../../include/follow.php:197
+#: ../../include/follow.php:135 ../../include/follow.php:206
 msgid "Protocol disabled."
 msgstr "Protocol uitgeschakeld."
 
-#: ../../include/follow.php:170
+#: ../../include/follow.php:144
+msgid "Protocol blocked for this channel."
+msgstr "Dit protocol is voor dit kanaal niet toegestaan."
+
+#: ../../include/follow.php:179
 msgid "Channel discovery failed."
 msgstr "Kanaal ontdekken mislukt."
 
-#: ../../include/follow.php:186
+#: ../../include/follow.php:195
 msgid "local account not found."
 msgstr "lokale account niet gevonden."
 
-#: ../../include/follow.php:215
+#: ../../include/follow.php:224
 msgid "Cannot connect to yourself."
 msgstr "Kan niet met jezelf verbinden"
 
-#: ../../include/ItemObject.php:89 ../../include/conversation.php:667
+#: ../../include/ItemObject.php:89 ../../include/conversation.php:678
 msgid "Private Message"
 msgstr "Privébericht"
 
-#: ../../include/ItemObject.php:126 ../../include/conversation.php:659
+#: ../../include/ItemObject.php:126 ../../include/conversation.php:670
 msgid "Select"
 msgstr "Kies"
 
@@ -1457,22 +1853,22 @@ msgid "I abstain"
 msgstr "Onthouding"
 
 #: ../../include/ItemObject.php:175 ../../include/ItemObject.php:187
-#: ../../include/conversation.php:1677 ../../mod/photos.php:1003
-#: ../../mod/photos.php:1015
+#: ../../include/conversation.php:1688 ../../mod/photos.php:1015
+#: ../../mod/photos.php:1027
 msgid "View all"
 msgstr "Toon alles"
 
 #: ../../include/ItemObject.php:179 ../../include/taxonomy.php:396
-#: ../../include/conversation.php:1701 ../../include/identity.php:1133
-#: ../../mod/photos.php:1007
+#: ../../include/conversation.php:1712 ../../include/identity.php:1266
+#: ../../mod/photos.php:1019
 msgctxt "noun"
 msgid "Like"
 msgid_plural "Likes"
 msgstr[0] "vindt dit leuk"
 msgstr[1] "vinden dit leuk"
 
-#: ../../include/ItemObject.php:184 ../../include/conversation.php:1704
-#: ../../mod/photos.php:1012
+#: ../../include/ItemObject.php:184 ../../include/conversation.php:1715
+#: ../../mod/photos.php:1024
 msgctxt "noun"
 msgid "Dislike"
 msgid_plural "Dislikes"
@@ -1495,11 +1891,11 @@ msgstr "Ster toevoegen of verwijderen"
 msgid "starred"
 msgstr "met ster"
 
-#: ../../include/ItemObject.php:227 ../../include/conversation.php:674
+#: ../../include/ItemObject.php:227 ../../include/conversation.php:685
 msgid "Message signature validated"
 msgstr "Berichtkenmerk gevalideerd"
 
-#: ../../include/ItemObject.php:228 ../../include/conversation.php:675
+#: ../../include/ItemObject.php:228 ../../include/conversation.php:686
 msgid "Message signature incorrect"
 msgstr "Berichtkenmerk onjuist"
 
@@ -1507,7 +1903,7 @@ msgstr "Berichtkenmerk onjuist"
 msgid "Add Tag"
 msgstr "Tag toevoegen"
 
-#: ../../include/ItemObject.php:254 ../../mod/photos.php:947
+#: ../../include/ItemObject.php:254 ../../mod/photos.php:959
 msgid "I like this (toggle)"
 msgstr "Vind ik leuk"
 
@@ -1515,7 +1911,7 @@ msgstr "Vind ik leuk"
 msgid "like"
 msgstr "vind dit leuk"
 
-#: ../../include/ItemObject.php:255 ../../mod/photos.php:948
+#: ../../include/ItemObject.php:255 ../../mod/photos.php:960
 msgid "I don't like this (toggle)"
 msgstr "Vind ik niet leuk"
 
@@ -1559,17 +1955,17 @@ msgstr "Kanaal-naar-kanaal"
 msgid "via Wall-To-Wall:"
 msgstr "via kanaal-naar-kanaal"
 
-#: ../../include/ItemObject.php:312 ../../include/conversation.php:716
+#: ../../include/ItemObject.php:312 ../../include/conversation.php:727
 #, php-format
 msgid "from %s"
 msgstr "van %s"
 
-#: ../../include/ItemObject.php:315 ../../include/conversation.php:719
+#: ../../include/ItemObject.php:315 ../../include/conversation.php:730
 #, php-format
 msgid "last edited: %s"
 msgstr "laatst bewerkt: %s"
 
-#: ../../include/ItemObject.php:316 ../../include/conversation.php:720
+#: ../../include/ItemObject.php:316 ../../include/conversation.php:731
 #, php-format
 msgid "Expires: %s"
 msgstr "Verloopt: %s"
@@ -1586,61 +1982,61 @@ msgstr "Aan agenda toevoegen"
 msgid "Mark all seen"
 msgstr "Markeer alles als bekeken"
 
-#: ../../include/ItemObject.php:353 ../../mod/photos.php:1133
+#: ../../include/ItemObject.php:353 ../../mod/photos.php:1145
 msgctxt "noun"
 msgid "Likes"
 msgstr "vinden dit leuk"
 
-#: ../../include/ItemObject.php:354 ../../mod/photos.php:1134
+#: ../../include/ItemObject.php:354 ../../mod/photos.php:1146
 msgctxt "noun"
 msgid "Dislikes"
 msgstr "vinden dit niet leuk"
 
 #: ../../include/ItemObject.php:359 ../../include/acl_selectors.php:249
-#: ../../mod/photos.php:1139
+#: ../../mod/photos.php:1151
 msgid "Close"
 msgstr "Sluiten"
 
-#: ../../include/ItemObject.php:364 ../../include/conversation.php:737
-#: ../../include/conversation.php:1209 ../../mod/photos.php:950
-#: ../../mod/editlayout.php:153 ../../mod/editwebpage.php:192
-#: ../../mod/editpost.php:130 ../../mod/editblock.php:155
+#: ../../include/ItemObject.php:364 ../../include/conversation.php:748
+#: ../../include/conversation.php:1220 ../../mod/editpost.php:123
+#: ../../mod/photos.php:962 ../../mod/editlayout.php:147
+#: ../../mod/editwebpage.php:192 ../../mod/editblock.php:149
 #: ../../mod/mail.php:241 ../../mod/mail.php:356
 msgid "Please wait"
 msgstr "Even wachten"
 
-#: ../../include/ItemObject.php:665 ../../mod/photos.php:966
-#: ../../mod/photos.php:1084
+#: ../../include/ItemObject.php:665 ../../mod/photos.php:978
+#: ../../mod/photos.php:1096
 msgid "This is you"
 msgstr "Dit ben jij"
 
-#: ../../include/ItemObject.php:669 ../../include/conversation.php:1181
-#: ../../mod/editlayout.php:140 ../../mod/editwebpage.php:179
-#: ../../mod/editpost.php:114 ../../mod/editblock.php:141
+#: ../../include/ItemObject.php:669 ../../include/conversation.php:1192
+#: ../../mod/editpost.php:107 ../../mod/editlayout.php:134
+#: ../../mod/editwebpage.php:179 ../../mod/editblock.php:135
 msgid "Bold"
 msgstr "Vet"
 
-#: ../../include/ItemObject.php:670 ../../include/conversation.php:1182
-#: ../../mod/editlayout.php:141 ../../mod/editwebpage.php:180
-#: ../../mod/editpost.php:115 ../../mod/editblock.php:142
+#: ../../include/ItemObject.php:670 ../../include/conversation.php:1193
+#: ../../mod/editpost.php:108 ../../mod/editlayout.php:135
+#: ../../mod/editwebpage.php:180 ../../mod/editblock.php:136
 msgid "Italic"
 msgstr "Cursief"
 
-#: ../../include/ItemObject.php:671 ../../include/conversation.php:1183
-#: ../../mod/editlayout.php:142 ../../mod/editwebpage.php:181
-#: ../../mod/editpost.php:116 ../../mod/editblock.php:143
+#: ../../include/ItemObject.php:671 ../../include/conversation.php:1194
+#: ../../mod/editpost.php:109 ../../mod/editlayout.php:136
+#: ../../mod/editwebpage.php:181 ../../mod/editblock.php:137
 msgid "Underline"
 msgstr "Onderstrepen"
 
-#: ../../include/ItemObject.php:672 ../../include/conversation.php:1184
-#: ../../mod/editlayout.php:143 ../../mod/editwebpage.php:182
-#: ../../mod/editpost.php:117 ../../mod/editblock.php:144
+#: ../../include/ItemObject.php:672 ../../include/conversation.php:1195
+#: ../../mod/editpost.php:110 ../../mod/editlayout.php:137
+#: ../../mod/editwebpage.php:182 ../../mod/editblock.php:138
 msgid "Quote"
 msgstr "Citeren"
 
-#: ../../include/ItemObject.php:673 ../../include/conversation.php:1185
-#: ../../mod/editlayout.php:144 ../../mod/editwebpage.php:183
-#: ../../mod/editpost.php:118 ../../mod/editblock.php:145
+#: ../../include/ItemObject.php:673 ../../include/conversation.php:1196
+#: ../../mod/editpost.php:111 ../../mod/editlayout.php:138
+#: ../../mod/editwebpage.php:183 ../../mod/editblock.php:139
 msgid "Code"
 msgstr "Broncode"
 
@@ -1656,8 +2052,8 @@ msgstr "Link invoegen"
 msgid "Video"
 msgstr "Video"
 
-#: ../../include/ItemObject.php:680 ../../include/conversation.php:1236
-#: ../../mod/editpost.php:157 ../../mod/mail.php:247 ../../mod/mail.php:361
+#: ../../include/ItemObject.php:680 ../../include/conversation.php:1247
+#: ../../mod/editpost.php:151 ../../mod/mail.php:247 ../../mod/mail.php:361
 msgid "Encrypt text"
 msgstr "Tekst versleutelen"
 
@@ -1669,7 +2065,7 @@ msgstr "Nieuw venster"
 msgid "Open the selected location in a different window or browser tab"
 msgstr "Open de geselecteerde locatie in een ander venster of tab"
 
-#: ../../include/Contact.php:215 ../../mod/admin.php:730
+#: ../../include/Contact.php:212
 #, php-format
 msgid "User '%s' deleted"
 msgstr "Account '%s' verwijderd"
@@ -1678,357 +2074,11 @@ msgstr "Account '%s' verwijderd"
 msgid "Attachments:"
 msgstr "Bijlagen:"
 
-#: ../../include/bb2diaspora.php:453
-msgid "Redmatrix event notification:"
-msgstr "Notificatie RedMatrix-gebeurtenis:"
+#: ../../include/bb2diaspora.php:461
+msgid "$Projectname event notification:"
+msgstr "Notificatie -gebeurtenis:"
 
-#: ../../include/text.php:329
-msgid "prev"
-msgstr "vorige"
-
-#: ../../include/text.php:331
-msgid "first"
-msgstr "eerste"
-
-#: ../../include/text.php:360
-msgid "last"
-msgstr "laatste"
-
-#: ../../include/text.php:363
-msgid "next"
-msgstr "volgende"
-
-#: ../../include/text.php:373
-msgid "older"
-msgstr "ouder"
-
-#: ../../include/text.php:375
-msgid "newer"
-msgstr "nieuwer"
-
-#: ../../include/text.php:768
-msgid "No connections"
-msgstr "Geen connecties"
-
-#: ../../include/text.php:782
-#, php-format
-msgid "%d Connection"
-msgid_plural "%d Connections"
-msgstr[0] "%d connectie"
-msgstr[1] "%d connecties"
-
-#: ../../include/text.php:795 ../../mod/viewconnections.php:104
-msgid "View Connections"
-msgstr "Connecties weergeven"
-
-#: ../../include/text.php:852 ../../include/text.php:864
-#: ../../include/nav.php:165 ../../include/apps.php:147
-#: ../../mod/search.php:38
-msgid "Search"
-msgstr "Zoeken"
-
-#: ../../include/text.php:928
-msgid "poke"
-msgstr "aanstoten"
-
-#: ../../include/text.php:928 ../../include/conversation.php:243
-msgid "poked"
-msgstr "aangestoten"
-
-#: ../../include/text.php:929
-msgid "ping"
-msgstr "ping"
-
-#: ../../include/text.php:929
-msgid "pinged"
-msgstr "gepingd"
-
-#: ../../include/text.php:930
-msgid "prod"
-msgstr "por"
-
-#: ../../include/text.php:930
-msgid "prodded"
-msgstr "gepord"
-
-#: ../../include/text.php:931
-msgid "slap"
-msgstr "slaan"
-
-#: ../../include/text.php:931
-msgid "slapped"
-msgstr "sloeg"
-
-#: ../../include/text.php:932
-msgid "finger"
-msgstr "finger"
-
-#: ../../include/text.php:932
-msgid "fingered"
-msgstr "gefingerd"
-
-#: ../../include/text.php:933
-msgid "rebuff"
-msgstr "afpoeieren"
-
-#: ../../include/text.php:933
-msgid "rebuffed"
-msgstr "afgepoeierd"
-
-#: ../../include/text.php:943
-msgid "happy"
-msgstr "gelukkig"
-
-#: ../../include/text.php:944
-msgid "sad"
-msgstr "bedroefd"
-
-#: ../../include/text.php:945
-msgid "mellow"
-msgstr "mellow"
-
-#: ../../include/text.php:946
-msgid "tired"
-msgstr "moe"
-
-#: ../../include/text.php:947
-msgid "perky"
-msgstr "parmantig"
-
-#: ../../include/text.php:948
-msgid "angry"
-msgstr "boos"
-
-#: ../../include/text.php:949
-msgid "stupified"
-msgstr "beteuterd"
-
-#: ../../include/text.php:950
-msgid "puzzled"
-msgstr "verward"
-
-#: ../../include/text.php:951
-msgid "interested"
-msgstr "geïnteresseerd"
-
-#: ../../include/text.php:952
-msgid "bitter"
-msgstr "verbitterd"
-
-#: ../../include/text.php:953
-msgid "cheerful"
-msgstr "vrolijk"
-
-#: ../../include/text.php:954
-msgid "alive"
-msgstr "levendig"
-
-#: ../../include/text.php:955
-msgid "annoyed"
-msgstr "geërgerd"
-
-#: ../../include/text.php:956
-msgid "anxious"
-msgstr "bezorgd"
-
-#: ../../include/text.php:957
-msgid "cranky"
-msgstr "humeurig"
-
-#: ../../include/text.php:958
-msgid "disturbed"
-msgstr "verontrust"
-
-#: ../../include/text.php:959
-msgid "frustrated"
-msgstr "gefrustreerd "
-
-#: ../../include/text.php:960
-msgid "depressed"
-msgstr "gedeprimeerd"
-
-#: ../../include/text.php:961
-msgid "motivated"
-msgstr "gemotiveerd"
-
-#: ../../include/text.php:962
-msgid "relaxed"
-msgstr "ontspannen"
-
-#: ../../include/text.php:963
-msgid "surprised"
-msgstr "verrast"
-
-#: ../../include/text.php:1135
-msgid "Monday"
-msgstr "maandag"
-
-#: ../../include/text.php:1135
-msgid "Tuesday"
-msgstr "dinsdag"
-
-#: ../../include/text.php:1135
-msgid "Wednesday"
-msgstr "woensdag"
-
-#: ../../include/text.php:1135
-msgid "Thursday"
-msgstr "donderdag"
-
-#: ../../include/text.php:1135
-msgid "Friday"
-msgstr "vrijdag"
-
-#: ../../include/text.php:1135
-msgid "Saturday"
-msgstr "zaterdag"
-
-#: ../../include/text.php:1135
-msgid "Sunday"
-msgstr "zondag"
-
-#: ../../include/text.php:1139
-msgid "January"
-msgstr "januari"
-
-#: ../../include/text.php:1139
-msgid "February"
-msgstr "februari"
-
-#: ../../include/text.php:1139
-msgid "March"
-msgstr "maart"
-
-#: ../../include/text.php:1139
-msgid "April"
-msgstr "april"
-
-#: ../../include/text.php:1139
-msgid "May"
-msgstr "mei"
-
-#: ../../include/text.php:1139
-msgid "June"
-msgstr "juni"
-
-#: ../../include/text.php:1139
-msgid "July"
-msgstr "juli"
-
-#: ../../include/text.php:1139
-msgid "August"
-msgstr "augustus"
-
-#: ../../include/text.php:1139
-msgid "September"
-msgstr "september"
-
-#: ../../include/text.php:1139
-msgid "October"
-msgstr "oktober"
-
-#: ../../include/text.php:1139
-msgid "November"
-msgstr "november"
-
-#: ../../include/text.php:1139
-msgid "December"
-msgstr "december"
-
-#: ../../include/text.php:1244
-msgid "unknown.???"
-msgstr "onbekend.???"
-
-#: ../../include/text.php:1245
-msgid "bytes"
-msgstr "bytes"
-
-#: ../../include/text.php:1281
-msgid "remove category"
-msgstr "categorie verwijderen"
-
-#: ../../include/text.php:1356
-msgid "remove from file"
-msgstr "uit map verwijderen"
-
-#: ../../include/text.php:1436 ../../include/text.php:1447
-#: ../../mod/connedit.php:661
-msgid "Click to open/close"
-msgstr "Klik om te openen of te sluiten"
-
-#: ../../include/text.php:1609 ../../mod/events.php:444
-msgid "Link to Source"
-msgstr "Originele locatie"
-
-#: ../../include/text.php:1630 ../../include/text.php:1701
-msgid "default"
-msgstr "standaard"
-
-#: ../../include/text.php:1638
-msgid "Page layout"
-msgstr "Pagina-lay-out"
-
-#: ../../include/text.php:1638
-msgid "You can create your own with the layouts tool"
-msgstr "Je kan jouw eigen lay-out ontwerpen onder lay-outs"
-
-#: ../../include/text.php:1679
-msgid "Page content type"
-msgstr "Opmaaktype pagina"
-
-#: ../../include/text.php:1713
-msgid "Select an alternate language"
-msgstr "Kies een andere taal"
-
-#: ../../include/text.php:1832 ../../include/conversation.php:120
-#: ../../include/diaspora.php:2081 ../../mod/like.php:346
-#: ../../mod/subthread.php:72 ../../mod/subthread.php:174
-#: ../../mod/tagger.php:43
-msgid "photo"
-msgstr "foto"
-
-#: ../../include/text.php:1835 ../../include/conversation.php:123
-#: ../../mod/like.php:348 ../../mod/tagger.php:47
-msgid "event"
-msgstr "gebeurtenis"
-
-#: ../../include/text.php:1838 ../../include/conversation.php:148
-#: ../../include/diaspora.php:2081 ../../mod/like.php:346
-#: ../../mod/subthread.php:72 ../../mod/subthread.php:174
-#: ../../mod/tagger.php:51
-msgid "status"
-msgstr "bericht"
-
-#: ../../include/text.php:1840 ../../include/conversation.php:150
-#: ../../mod/tagger.php:53
-msgid "comment"
-msgstr "reactie"
-
-#: ../../include/text.php:1845
-msgid "activity"
-msgstr "activiteit"
-
-#: ../../include/text.php:2140
-msgid "Design Tools"
-msgstr "Ontwerp-hulpmiddelen"
-
-#: ../../include/text.php:2143 ../../mod/blocks.php:146
-msgid "Blocks"
-msgstr "Blokken"
-
-#: ../../include/text.php:2144 ../../mod/menu.php:95
-msgid "Menus"
-msgstr "Menu's"
-
-#: ../../include/text.php:2145 ../../mod/layouts.php:173
-msgid "Layouts"
-msgstr "Lay-outs"
-
-#: ../../include/text.php:2146
-msgid "Pages"
-msgstr "Pagina's"
-
-#: ../../include/nav.php:87 ../../include/nav.php:120 ../../boot.php:1539
+#: ../../include/nav.php:87 ../../include/nav.php:120 ../../boot.php:1549
 msgid "Logout"
 msgstr "Uitloggen"
 
@@ -2044,8 +2094,8 @@ msgstr "Home"
 msgid "Your posts and conversations"
 msgstr "Jouw berichten en conversaties"
 
-#: ../../include/nav.php:91 ../../include/conversation.php:942
-#: ../../mod/connedit.php:494 ../../mod/connedit.php:660
+#: ../../include/nav.php:91 ../../include/conversation.php:953
+#: ../../mod/connedit.php:510
 msgid "View Profile"
 msgstr "Profiel weergeven"
 
@@ -2061,7 +2111,7 @@ msgstr "Bewerk profielen"
 msgid "Manage/Edit profiles"
 msgstr "Beheer/wijzig profielen"
 
-#: ../../include/nav.php:95 ../../include/identity.php:846
+#: ../../include/nav.php:95 ../../include/identity.php:979
 msgid "Edit Profile"
 msgstr "Profiel bewerken"
 
@@ -2069,7 +2119,7 @@ msgstr "Profiel bewerken"
 msgid "Edit your profile"
 msgstr "Jouw profiel bewerken"
 
-#: ../../include/nav.php:97 ../../include/conversation.php:1600
+#: ../../include/nav.php:97 ../../include/conversation.php:1611
 #: ../../include/apps.php:139 ../../mod/fbrowser.php:25
 msgid "Photos"
 msgstr "Foto's"
@@ -2090,7 +2140,7 @@ msgstr "Chatten"
 msgid "Your chatrooms"
 msgstr "Jouw chatkanalen"
 
-#: ../../include/nav.php:109 ../../include/conversation.php:1635
+#: ../../include/nav.php:109 ../../include/conversation.php:1646
 #: ../../include/apps.php:129
 msgid "Bookmarks"
 msgstr "Bladwijzers"
@@ -2099,8 +2149,8 @@ msgstr "Bladwijzers"
 msgid "Your bookmarks"
 msgstr "Jouw bladwijzers"
 
-#: ../../include/nav.php:113 ../../include/conversation.php:1645
-#: ../../include/apps.php:136 ../../mod/webpages.php:176
+#: ../../include/nav.php:113 ../../include/conversation.php:1656
+#: ../../include/apps.php:136 ../../mod/webpages.php:178
 msgid "Webpages"
 msgstr "Webpagina's"
 
@@ -2108,7 +2158,7 @@ msgstr "Webpagina's"
 msgid "Your webpages"
 msgstr "Jouw webpagina's"
 
-#: ../../include/nav.php:117 ../../include/apps.php:131 ../../boot.php:1540
+#: ../../include/nav.php:117 ../../include/apps.php:131 ../../boot.php:1550
 msgid "Login"
 msgstr "Inloggen"
 
@@ -2133,7 +2183,7 @@ msgstr "Authenticeer jezelf via (bijvoorbeeld) jouw hub"
 msgid "Home Page"
 msgstr "Homepage"
 
-#: ../../include/nav.php:155 ../../mod/register.php:224 ../../boot.php:1516
+#: ../../include/nav.php:155 ../../mod/register.php:224 ../../boot.php:1526
 msgid "Register"
 msgstr "Registreren"
 
@@ -2142,7 +2192,7 @@ msgid "Create an account"
 msgstr "Maak een account aan"
 
 #: ../../include/nav.php:160 ../../include/apps.php:142 ../../mod/help.php:67
-#: ../../mod/help.php:72 ../../mod/layouts.php:175
+#: ../../mod/help.php:72 ../../mod/layouts.php:176
 msgid "Help"
 msgstr "Hulp"
 
@@ -2159,7 +2209,6 @@ msgid "Search site content"
 msgstr "Inhoud van deze hub doorzoeken"
 
 #: ../../include/nav.php:168 ../../include/apps.php:141
-#: ../../mod/directory.php:366
 msgid "Directory"
 msgstr "Kanalengids"
 
@@ -2191,7 +2240,7 @@ msgstr "Tijdlijn kanaal"
 msgid "Mark all channel notifications seen"
 msgstr "Alle kanaalnotificaties als gelezen markeren"
 
-#: ../../include/nav.php:187 ../../mod/connections.php:407
+#: ../../include/nav.php:187 ../../mod/connections.php:267
 msgid "Connections"
 msgstr "Connecties"
 
@@ -2236,7 +2285,7 @@ msgid "Outbox"
 msgstr "Postvak UIT"
 
 #: ../../include/nav.php:202 ../../include/apps.php:140
-#: ../../mod/events.php:472
+#: ../../mod/events.php:503
 msgid "Events"
 msgstr "Agenda"
 
@@ -2273,7 +2322,7 @@ msgstr "Beheer"
 msgid "Site Setup and Configuration"
 msgstr "Hub instellen en beheren"
 
-#: ../../include/nav.php:247 ../../include/conversation.php:850
+#: ../../include/nav.php:247 ../../include/conversation.php:861
 msgid "Loading..."
 msgstr "Aan het laden..."
 
@@ -2340,164 +2389,11 @@ msgstr "Bezoek het %2$s van %1$s"
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr "%1$s heeft een aangepaste %2$s, %3$s veranderd."
 
-#: ../../include/bbcode.php:122 ../../include/bbcode.php:743
-#: ../../include/bbcode.php:746 ../../include/bbcode.php:751
-#: ../../include/bbcode.php:754 ../../include/bbcode.php:757
-#: ../../include/bbcode.php:760 ../../include/bbcode.php:765
-#: ../../include/bbcode.php:768 ../../include/bbcode.php:773
-#: ../../include/bbcode.php:776 ../../include/bbcode.php:779
-#: ../../include/bbcode.php:782
-msgid "Image/photo"
-msgstr "Afbeelding/foto"
-
-#: ../../include/bbcode.php:161 ../../include/bbcode.php:793
-msgid "Encrypted content"
-msgstr "Versleutelde inhoud"
-
-#: ../../include/bbcode.php:177
-msgid "Install design element: "
-msgstr "Installeer ontwerpelement: "
-
-#: ../../include/bbcode.php:190
-msgid "QR code"
-msgstr "QR-code"
-
-#: ../../include/bbcode.php:241
-#, php-format
-msgid "%1$s wrote the following %2$s %3$s"
-msgstr "%1$s schreef het volgende %2$s %3$s"
-
-#: ../../include/bbcode.php:243
-msgid "post"
-msgstr "bericht"
-
-#: ../../include/bbcode.php:493
-msgid "Different viewers will see this text differently"
-msgstr "Deze tekst wordt per persoon anders weergeven."
-
-#: ../../include/bbcode.php:704
-msgid "$1 spoiler"
-msgstr "$1 spoiler"
-
-#: ../../include/bbcode.php:731
-msgid "$1 wrote:"
-msgstr "$1 schreef:"
-
-#: ../../include/items.php:399 ../../mod/like.php:270
-#: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/profperm.php:23
-#: ../../mod/bulksetclose.php:11 ../../index.php:392
-msgid "Permission denied"
-msgstr "Toegang geweigerd"
-
-#: ../../include/items.php:1012 ../../include/items.php:1058
-msgid "(Unknown)"
-msgstr "(Onbekend)"
-
-#: ../../include/items.php:1226
-msgid "Visible to anybody on the internet."
-msgstr "Voor iedereen op het internet zichtbaar."
-
-#: ../../include/items.php:1228
-msgid "Visible to you only."
-msgstr "Alleen voor jou zichtbaar."
-
-#: ../../include/items.php:1230
-msgid "Visible to anybody in this network."
-msgstr "Voor iedereen in dit netwerk zichtbaar."
-
-#: ../../include/items.php:1232
-msgid "Visible to anybody authenticated."
-msgstr "Voor iedereen die geauthenticeerd is zichtbaar."
-
-#: ../../include/items.php:1234
-#, php-format
-msgid "Visible to anybody on %s."
-msgstr "Voor iedereen op %s zichtbaar."
-
-#: ../../include/items.php:1236
-msgid "Visible to all connections."
-msgstr "Voor alle connecties zichtbaar."
-
-#: ../../include/items.php:1238
-msgid "Visible to approved connections."
-msgstr "Voor alle goedgekeurde connecties zichtbaar."
-
-#: ../../include/items.php:1240
-msgid "Visible to specific connections."
-msgstr "Voor specifieke connecties zichtbaar."
-
-#: ../../include/items.php:4051 ../../mod/thing.php:74
-#: ../../mod/display.php:36 ../../mod/filestorage.php:27
-#: ../../mod/viewsrc.php:20 ../../mod/admin.php:167 ../../mod/admin.php:984
-#: ../../mod/admin.php:1184
-msgid "Item not found."
-msgstr "Item niet gevonden."
-
-#: ../../include/items.php:4124 ../../include/photos.php:26
-#: ../../include/attach.php:136 ../../include/attach.php:183
-#: ../../include/attach.php:246 ../../include/attach.php:260
-#: ../../include/attach.php:304 ../../include/attach.php:318
-#: ../../include/attach.php:343 ../../include/attach.php:539
-#: ../../include/attach.php:611 ../../include/chat.php:131
-#: ../../mod/profile.php:64 ../../mod/profile.php:72
-#: ../../mod/achievements.php:30 ../../mod/manage.php:6
-#: ../../mod/settings.php:564 ../../mod/api.php:26 ../../mod/api.php:31
-#: ../../mod/webpages.php:69 ../../mod/thing.php:241 ../../mod/thing.php:256
-#: ../../mod/thing.php:290 ../../mod/profile_photo.php:264
-#: ../../mod/profile_photo.php:277 ../../mod/block.php:22
-#: ../../mod/block.php:72 ../../mod/like.php:178 ../../mod/events.php:219
-#: ../../mod/group.php:9 ../../mod/setup.php:207 ../../mod/common.php:35
-#: ../../mod/connections.php:169 ../../mod/blocks.php:69
-#: ../../mod/blocks.php:76 ../../mod/photos.php:68 ../../mod/pdledit.php:21
-#: ../../mod/authtest.php:13 ../../mod/editlayout.php:63
-#: ../../mod/editlayout.php:87 ../../mod/chat.php:90 ../../mod/chat.php:95
-#: ../../mod/editwebpage.php:64 ../../mod/editwebpage.php:86
-#: ../../mod/editwebpage.php:101 ../../mod/editwebpage.php:125
-#: ../../mod/rate.php:110 ../../mod/editpost.php:13 ../../mod/invite.php:13
-#: ../../mod/invite.php:104 ../../mod/locs.php:77 ../../mod/sources.php:66
-#: ../../mod/menu.php:69 ../../mod/filestorage.php:18
-#: ../../mod/filestorage.php:73 ../../mod/filestorage.php:88
-#: ../../mod/filestorage.php:115 ../../mod/fsuggest.php:78
-#: ../../mod/poke.php:128 ../../mod/profiles.php:188
-#: ../../mod/profiles.php:576 ../../mod/viewsrc.php:14 ../../mod/mitem.php:115
-#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27
-#: ../../mod/editblock.php:65 ../../mod/register.php:72 ../../mod/item.php:206
-#: ../../mod/item.php:214 ../../mod/item.php:962 ../../mod/layouts.php:69
-#: ../../mod/layouts.php:76 ../../mod/layouts.php:87 ../../mod/id.php:71
-#: ../../mod/message.php:16 ../../mod/mood.php:111 ../../mod/connedit.php:331
-#: ../../mod/mail.php:114 ../../mod/notifications.php:66
-#: ../../mod/regmod.php:17 ../../mod/new_channel.php:68
-#: ../../mod/new_channel.php:99 ../../mod/appman.php:66
-#: ../../mod/network.php:12 ../../mod/page.php:28 ../../mod/page.php:79
-#: ../../mod/bookmarks.php:46 ../../mod/channel.php:100
-#: ../../mod/channel.php:219 ../../mod/channel.php:262
-#: ../../mod/suggest.php:26 ../../mod/service_limits.php:7
-#: ../../mod/sharedwithme.php:7 ../../index.php:190 ../../index.php:393
-msgid "Permission denied."
-msgstr "Toegang geweigerd"
-
-#: ../../include/items.php:4524 ../../mod/group.php:38 ../../mod/group.php:140
-#: ../../mod/bulksetclose.php:51
-msgid "Collection not found."
-msgstr "Collectie niet gevonden."
-
-#: ../../include/items.php:4540
-msgid "Collection is empty."
-msgstr "Collectie is leeg"
-
-#: ../../include/items.php:4547
-#, php-format
-msgid "Collection: %s"
-msgstr "Collectie: %s"
-
-#: ../../include/items.php:4557
-#, php-format
-msgid "Connection: %s"
-msgstr "Connectie: %s"
-
-#: ../../include/items.php:4559
-msgid "Connection not found."
-msgstr "Connectie niet gevonden."
+#: ../../include/security.php:349
+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 "De beveiligings-token van het tekstvak was ongeldig. Dit is mogelijk het gevolg van dat er te lang (meer dan 3 uur) gewacht is om de tekst op te slaan. "
 
 #: ../../include/permissions.php:26
 msgid "Can view my normal stream and posts"
@@ -2588,52 +2484,52 @@ msgid ""
 "Extremely advanced. Leave this alone unless you know what you are doing"
 msgstr "Zeer geavanceerd. Laat dit met rust, behalve als je weet wat je doet."
 
-#: ../../include/permissions.php:809
+#: ../../include/permissions.php:893
 msgid "Social Networking"
 msgstr "Sociaal netwerk"
 
-#: ../../include/permissions.php:809 ../../include/permissions.php:810
-#: ../../include/permissions.php:811
+#: ../../include/permissions.php:893 ../../include/permissions.php:894
+#: ../../include/permissions.php:895
 msgid "Mostly Public"
 msgstr "Vrijwel alles openbaar"
 
-#: ../../include/permissions.php:809 ../../include/permissions.php:810
-#: ../../include/permissions.php:811
+#: ../../include/permissions.php:893 ../../include/permissions.php:894
+#: ../../include/permissions.php:895
 msgid "Restricted"
 msgstr "Beperkt zichtbaar"
 
-#: ../../include/permissions.php:809 ../../include/permissions.php:810
+#: ../../include/permissions.php:893 ../../include/permissions.php:894
 msgid "Private"
 msgstr "Verborgen kanaal"
 
-#: ../../include/permissions.php:810
+#: ../../include/permissions.php:894
 msgid "Community Forum"
 msgstr "Groepsforum"
 
-#: ../../include/permissions.php:811
+#: ../../include/permissions.php:895
 msgid "Feed Republish"
 msgstr "Feed herpubliceren"
 
-#: ../../include/permissions.php:812
+#: ../../include/permissions.php:896
 msgid "Special Purpose"
 msgstr "Speciaal doel"
 
-#: ../../include/permissions.php:812
+#: ../../include/permissions.php:896
 msgid "Celebrity/Soapbox"
 msgstr "Beroemdheid/alleen volgen"
 
-#: ../../include/permissions.php:812
+#: ../../include/permissions.php:896
 msgid "Group Repository"
 msgstr "Groepsopslag"
 
-#: ../../include/permissions.php:813 ../../include/profile_selectors.php:6
+#: ../../include/permissions.php:897 ../../include/profile_selectors.php:6
 #: ../../include/profile_selectors.php:23
 #: ../../include/profile_selectors.php:61
 #: ../../include/profile_selectors.php:97
 msgid "Other"
 msgstr "Anders"
 
-#: ../../include/permissions.php:813
+#: ../../include/permissions.php:897
 msgid "Custom/Expert Mode"
 msgstr "Expertmodus/handmatig aanpassen"
 
@@ -2641,13 +2537,7 @@ msgstr "Expertmodus/handmatig aanpassen"
 msgid "channel"
 msgstr "kanaal"
 
-#: ../../include/conversation.php:164 ../../include/diaspora.php:2110
-#: ../../mod/like.php:394
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
-msgstr "%1$s vindt %3$s van %2$s leuk"
-
-#: ../../include/conversation.php:167 ../../mod/like.php:396
+#: ../../include/conversation.php:167 ../../mod/like.php:399
 #, php-format
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr "%1$s vindt %3$s van %2$s niet leuk"
@@ -2668,477 +2558,572 @@ msgctxt "mood"
 msgid "%1$s is %2$s"
 msgstr "%1$s is %2$s"
 
-#: ../../include/conversation.php:572 ../../mod/photos.php:984
+#: ../../include/conversation.php:583 ../../mod/photos.php:996
 msgctxt "title"
 msgid "Likes"
 msgstr "vinden dit leuk"
 
-#: ../../include/conversation.php:572 ../../mod/photos.php:984
+#: ../../include/conversation.php:583 ../../mod/photos.php:996
 msgctxt "title"
 msgid "Dislikes"
 msgstr "vinden dit niet leuk"
 
-#: ../../include/conversation.php:573 ../../mod/photos.php:985
+#: ../../include/conversation.php:584 ../../mod/photos.php:997
 msgctxt "title"
 msgid "Agree"
 msgstr "eens"
 
-#: ../../include/conversation.php:573 ../../mod/photos.php:985
+#: ../../include/conversation.php:584 ../../mod/photos.php:997
 msgctxt "title"
 msgid "Disagree"
 msgstr "oneens"
 
-#: ../../include/conversation.php:573 ../../mod/photos.php:985
+#: ../../include/conversation.php:584 ../../mod/photos.php:997
 msgctxt "title"
 msgid "Abstain"
-msgstr "onthoudingen"
+msgstr "onthouding"
 
-#: ../../include/conversation.php:574 ../../mod/photos.php:986
+#: ../../include/conversation.php:585 ../../mod/photos.php:998
 msgctxt "title"
 msgid "Attending"
 msgstr "aanwezig"
 
-#: ../../include/conversation.php:574 ../../mod/photos.php:986
+#: ../../include/conversation.php:585 ../../mod/photos.php:998
 msgctxt "title"
 msgid "Not attending"
 msgstr "niet aanwezig"
 
-#: ../../include/conversation.php:574 ../../mod/photos.php:986
+#: ../../include/conversation.php:585 ../../mod/photos.php:998
 msgctxt "title"
 msgid "Might attend"
 msgstr "mogelijk aanwezig"
 
-#: ../../include/conversation.php:692
+#: ../../include/conversation.php:703
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr "Bekijk het profiel van %s @ %s"
 
-#: ../../include/conversation.php:707
+#: ../../include/conversation.php:718
 msgid "Categories:"
 msgstr "Categorieën:"
 
-#: ../../include/conversation.php:708
+#: ../../include/conversation.php:719
 msgid "Filed under:"
 msgstr "Bewaard onder:"
 
-#: ../../include/conversation.php:735
+#: ../../include/conversation.php:746
 msgid "View in context"
 msgstr "In context bekijken"
 
-#: ../../include/conversation.php:846
+#: ../../include/conversation.php:857
 msgid "remove"
 msgstr "verwijderen"
 
-#: ../../include/conversation.php:851
+#: ../../include/conversation.php:862
 msgid "Delete Selected Items"
 msgstr "Verwijder de geselecteerde items"
 
-#: ../../include/conversation.php:939
+#: ../../include/conversation.php:950
 msgid "View Source"
 msgstr "Bron weergeven"
 
-#: ../../include/conversation.php:940
+#: ../../include/conversation.php:951
 msgid "Follow Thread"
 msgstr "Conversatie volgen"
 
-#: ../../include/conversation.php:941
+#: ../../include/conversation.php:952
 msgid "View Status"
 msgstr "Status weergeven"
 
-#: ../../include/conversation.php:943
+#: ../../include/conversation.php:954
 msgid "View Photos"
 msgstr "Foto's weergeven"
 
-#: ../../include/conversation.php:944
+#: ../../include/conversation.php:955
 msgid "Matrix Activity"
 msgstr "Kanaal-activiteit"
 
-#: ../../include/conversation.php:946
+#: ../../include/conversation.php:957
 msgid "Edit Contact"
 msgstr "Contact bewerken"
 
-#: ../../include/conversation.php:947
+#: ../../include/conversation.php:958
 msgid "Send PM"
 msgstr "Privébericht verzenden"
 
-#: ../../include/conversation.php:948 ../../include/apps.php:145
+#: ../../include/conversation.php:959 ../../include/apps.php:145
 msgid "Poke"
 msgstr "Aanstoten"
 
-#: ../../include/conversation.php:1062
+#: ../../include/conversation.php:1073
 #, php-format
 msgid "%s likes this."
 msgstr "%s vindt dit leuk."
 
-#: ../../include/conversation.php:1062
+#: ../../include/conversation.php:1073
 #, php-format
 msgid "%s doesn't like this."
 msgstr "%s vindt dit niet leuk."
 
-#: ../../include/conversation.php:1066
+#: ../../include/conversation.php:1077
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgid_plural "<span  %1$s>%2$d people</span> like this."
 msgstr[0] "<span  %1$s>%2$d persoon</span> vindt dit leuk."
 msgstr[1] "<span  %1$s>%2$d personen</span> vinden dit leuk."
 
-#: ../../include/conversation.php:1068
+#: ../../include/conversation.php:1079
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this."
 msgid_plural "<span  %1$s>%2$d people</span> don't like this."
 msgstr[0] "<span  %1$s>%2$d persoon</span> vindt dit niet leuk."
 msgstr[1] "<span  %1$s>%2$d personen</span> vinden dit niet leuk."
 
-#: ../../include/conversation.php:1074
+#: ../../include/conversation.php:1085
 msgid "and"
 msgstr "en"
 
-#: ../../include/conversation.php:1077
+#: ../../include/conversation.php:1088
 #, php-format
 msgid ", and %d other people"
 msgid_plural ", and %d other people"
 msgstr[0] ", en %d ander persoon"
 msgstr[1] ", en %d andere personen"
 
-#: ../../include/conversation.php:1078
+#: ../../include/conversation.php:1089
 #, php-format
 msgid "%s like this."
 msgstr "%s vinden dit leuk."
 
-#: ../../include/conversation.php:1078
+#: ../../include/conversation.php:1089
 #, php-format
 msgid "%s don't like this."
 msgstr "%s vinden dit niet leuk."
 
-#: ../../include/conversation.php:1140
+#: ../../include/conversation.php:1151
 msgid "Visible to <strong>everybody</strong>"
 msgstr "Voor <strong>iedereen</strong> zichtbaar"
 
-#: ../../include/conversation.php:1141 ../../mod/mail.php:174
+#: ../../include/conversation.php:1152 ../../mod/mail.php:174
 #: ../../mod/mail.php:289
 msgid "Please enter a link URL:"
 msgstr "Vul een internetadres/URL in:"
 
-#: ../../include/conversation.php:1142
+#: ../../include/conversation.php:1153
 msgid "Please enter a video link/URL:"
 msgstr "Vul een videolink/URL in:"
 
-#: ../../include/conversation.php:1143
+#: ../../include/conversation.php:1154
 msgid "Please enter an audio link/URL:"
 msgstr "Vul een audiolink/URL in:"
 
-#: ../../include/conversation.php:1144
+#: ../../include/conversation.php:1155
 msgid "Tag term:"
 msgstr "Tag:"
 
-#: ../../include/conversation.php:1145 ../../mod/filer.php:49
+#: ../../include/conversation.php:1156 ../../mod/filer.php:49
 msgid "Save to Folder:"
 msgstr "Bewaar in map: "
 
-#: ../../include/conversation.php:1146
+#: ../../include/conversation.php:1157
 msgid "Where are you right now?"
 msgstr "Waar bevind je je op dit moment?"
 
-#: ../../include/conversation.php:1147 ../../mod/editpost.php:52
+#: ../../include/conversation.php:1158 ../../mod/editpost.php:47
 #: ../../mod/mail.php:175 ../../mod/mail.php:290
 msgid "Expires YYYY-MM-DD HH:MM"
 msgstr "Verloopt op DD-MM-YYYY om HH:MM"
 
-#: ../../include/conversation.php:1174 ../../mod/webpages.php:180
-#: ../../mod/blocks.php:153 ../../mod/photos.php:949 ../../mod/layouts.php:183
+#: ../../include/conversation.php:1185 ../../mod/webpages.php:182
+#: ../../mod/blocks.php:154 ../../mod/photos.php:961 ../../mod/layouts.php:184
 msgid "Share"
 msgstr "Delen"
 
-#: ../../include/conversation.php:1176
+#: ../../include/conversation.php:1187
 msgid "Page link name"
 msgstr "Linknaam pagina"
 
-#: ../../include/conversation.php:1179
+#: ../../include/conversation.php:1190
 msgid "Post as"
 msgstr "Bericht plaatsen als"
 
-#: ../../include/conversation.php:1186 ../../mod/editlayout.php:145
-#: ../../mod/editwebpage.php:184 ../../mod/editpost.php:119
-#: ../../mod/editblock.php:147 ../../mod/mail.php:238 ../../mod/mail.php:352
+#: ../../include/conversation.php:1197 ../../mod/editpost.php:112
+#: ../../mod/editlayout.php:139 ../../mod/editwebpage.php:184
+#: ../../mod/editblock.php:141 ../../mod/mail.php:238 ../../mod/mail.php:352
 msgid "Upload photo"
 msgstr "Foto uploaden"
 
-#: ../../include/conversation.php:1187
+#: ../../include/conversation.php:1198
 msgid "upload photo"
 msgstr "foto uploaden"
 
-#: ../../include/conversation.php:1188 ../../mod/editlayout.php:146
-#: ../../mod/editwebpage.php:185 ../../mod/editpost.php:120
-#: ../../mod/editblock.php:148 ../../mod/mail.php:239 ../../mod/mail.php:353
+#: ../../include/conversation.php:1199 ../../mod/editpost.php:113
+#: ../../mod/editlayout.php:140 ../../mod/editwebpage.php:185
+#: ../../mod/editblock.php:142 ../../mod/mail.php:239 ../../mod/mail.php:353
 msgid "Attach file"
 msgstr "Bestand toevoegen"
 
-#: ../../include/conversation.php:1189
+#: ../../include/conversation.php:1200
 msgid "attach file"
 msgstr "bestand toevoegen"
 
-#: ../../include/conversation.php:1190 ../../mod/editlayout.php:147
-#: ../../mod/editwebpage.php:186 ../../mod/editpost.php:121
-#: ../../mod/editblock.php:149 ../../mod/mail.php:240 ../../mod/mail.php:354
+#: ../../include/conversation.php:1201 ../../mod/editpost.php:114
+#: ../../mod/editlayout.php:141 ../../mod/editwebpage.php:186
+#: ../../mod/editblock.php:143 ../../mod/mail.php:240 ../../mod/mail.php:354
 msgid "Insert web link"
 msgstr "Weblink invoegen"
 
-#: ../../include/conversation.php:1191
+#: ../../include/conversation.php:1202
 msgid "web link"
 msgstr "Weblink"
 
-#: ../../include/conversation.php:1192
+#: ../../include/conversation.php:1203
 msgid "Insert video link"
 msgstr "Videolink invoegen"
 
-#: ../../include/conversation.php:1193
+#: ../../include/conversation.php:1204
 msgid "video link"
 msgstr "videolink"
 
-#: ../../include/conversation.php:1194
+#: ../../include/conversation.php:1205
 msgid "Insert audio link"
 msgstr "Audiolink invoegen"
 
-#: ../../include/conversation.php:1195
+#: ../../include/conversation.php:1206
 msgid "audio link"
 msgstr "audiolink"
 
-#: ../../include/conversation.php:1196 ../../mod/editlayout.php:151
-#: ../../mod/editwebpage.php:190 ../../mod/editpost.php:125
-#: ../../mod/editblock.php:153
+#: ../../include/conversation.php:1207 ../../mod/editpost.php:118
+#: ../../mod/editlayout.php:145 ../../mod/editwebpage.php:190
+#: ../../mod/editblock.php:147
 msgid "Set your location"
 msgstr "Locatie instellen"
 
-#: ../../include/conversation.php:1197
+#: ../../include/conversation.php:1208
 msgid "set location"
 msgstr "locatie instellen"
 
-#: ../../include/conversation.php:1198 ../../mod/editpost.php:127
+#: ../../include/conversation.php:1209 ../../mod/editpost.php:120
 msgid "Toggle voting"
 msgstr "Stemmen in- of uitschakelen"
 
-#: ../../include/conversation.php:1201 ../../mod/editlayout.php:152
-#: ../../mod/editwebpage.php:191 ../../mod/editpost.php:126
-#: ../../mod/editblock.php:154
+#: ../../include/conversation.php:1212 ../../mod/editpost.php:119
+#: ../../mod/editlayout.php:146 ../../mod/editwebpage.php:191
+#: ../../mod/editblock.php:148
 msgid "Clear browser location"
 msgstr "Locatie van webbrowser wissen"
 
-#: ../../include/conversation.php:1202
+#: ../../include/conversation.php:1213
 msgid "clear location"
 msgstr "locatie wissen"
 
-#: ../../include/conversation.php:1204 ../../mod/editwebpage.php:207
-#: ../../mod/editpost.php:141 ../../mod/editblock.php:167
+#: ../../include/conversation.php:1215 ../../mod/editpost.php:135
+#: ../../mod/editwebpage.php:207 ../../mod/editblock.php:161
 msgid "Title (optional)"
 msgstr "Titel (optioneel)"
 
-#: ../../include/conversation.php:1208 ../../mod/editlayout.php:168
-#: ../../mod/editwebpage.php:209 ../../mod/editpost.php:143
-#: ../../mod/editblock.php:170
+#: ../../include/conversation.php:1219 ../../mod/editpost.php:137
+#: ../../mod/editlayout.php:162 ../../mod/editwebpage.php:209
+#: ../../mod/editblock.php:164
 msgid "Categories (optional, comma-separated list)"
 msgstr "Categorieën (optioneel, door komma's gescheiden lijst)"
 
-#: ../../include/conversation.php:1210 ../../mod/editlayout.php:154
-#: ../../mod/editwebpage.php:193 ../../mod/editpost.php:131
-#: ../../mod/editblock.php:156
+#: ../../include/conversation.php:1221 ../../mod/editpost.php:124
+#: ../../mod/editlayout.php:148 ../../mod/editwebpage.php:193
+#: ../../mod/editblock.php:150
 msgid "Permission settings"
 msgstr "Permissies"
 
-#: ../../include/conversation.php:1211
+#: ../../include/conversation.php:1222
 msgid "permissions"
 msgstr "permissies"
 
-#: ../../include/conversation.php:1219 ../../mod/editlayout.php:161
-#: ../../mod/editwebpage.php:202 ../../mod/editpost.php:138
-#: ../../mod/editblock.php:164
+#: ../../include/conversation.php:1230 ../../mod/editpost.php:132
+#: ../../mod/editlayout.php:155 ../../mod/editwebpage.php:202
+#: ../../mod/editblock.php:158
 msgid "Public post"
 msgstr "Openbaar bericht"
 
-#: ../../include/conversation.php:1221 ../../mod/editlayout.php:169
-#: ../../mod/editwebpage.php:210 ../../mod/editpost.php:144
-#: ../../mod/editblock.php:171
+#: ../../include/conversation.php:1232 ../../mod/editpost.php:138
+#: ../../mod/editlayout.php:163 ../../mod/editwebpage.php:210
+#: ../../mod/editblock.php:165
 msgid "Example: bob@example.com, mary@example.com"
 msgstr "Voorbeeld: bob@voorbeeld.nl, mary@voorbeeld.be"
 
-#: ../../include/conversation.php:1234 ../../mod/editlayout.php:178
-#: ../../mod/editwebpage.php:219 ../../mod/editpost.php:155
-#: ../../mod/editblock.php:181 ../../mod/mail.php:245 ../../mod/mail.php:359
+#: ../../include/conversation.php:1245 ../../mod/editpost.php:149
+#: ../../mod/editlayout.php:172 ../../mod/editwebpage.php:219
+#: ../../mod/editblock.php:175 ../../mod/mail.php:245 ../../mod/mail.php:359
 msgid "Set expiration date"
 msgstr "Verloopdatum instellen"
 
-#: ../../include/conversation.php:1238 ../../mod/events.php:637
-#: ../../mod/editpost.php:159
+#: ../../include/conversation.php:1249 ../../mod/events.php:674
+#: ../../mod/editpost.php:153
 msgid "OK"
 msgstr "OK"
 
-#: ../../include/conversation.php:1239 ../../mod/settings.php:583
-#: ../../mod/settings.php:609 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134
-#: ../../mod/events.php:636 ../../mod/fbrowser.php:82
-#: ../../mod/fbrowser.php:117 ../../mod/editpost.php:160
+#: ../../include/conversation.php:1250 ../../mod/tagrm.php:11
+#: ../../mod/tagrm.php:134 ../../mod/events.php:673 ../../mod/fbrowser.php:82
+#: ../../mod/fbrowser.php:117 ../../mod/editpost.php:154
+#: ../../mod/settings.php:589 ../../mod/settings.php:615
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: ../../include/conversation.php:1481
+#: ../../include/conversation.php:1492
 msgid "Discover"
 msgstr "Ontdekken"
 
-#: ../../include/conversation.php:1484
+#: ../../include/conversation.php:1495
 msgid "Imported public streams"
 msgstr "Openbare streams importeren"
 
-#: ../../include/conversation.php:1489
+#: ../../include/conversation.php:1500
 msgid "Commented Order"
 msgstr "Nieuwe reacties bovenaan"
 
-#: ../../include/conversation.php:1492
+#: ../../include/conversation.php:1503
 msgid "Sort by Comment Date"
 msgstr "Berichten met nieuwe reacties bovenaan"
 
-#: ../../include/conversation.php:1496
+#: ../../include/conversation.php:1507
 msgid "Posted Order"
 msgstr "Nieuwe berichten bovenaan"
 
-#: ../../include/conversation.php:1499
+#: ../../include/conversation.php:1510
 msgid "Sort by Post Date"
 msgstr "Nieuwe berichten bovenaan"
 
-#: ../../include/conversation.php:1507
+#: ../../include/conversation.php:1518
 msgid "Posts that mention or involve you"
 msgstr "Alleen berichten die jou vermelden of waar je op een andere manier bij betrokken bent"
 
-#: ../../include/conversation.php:1513 ../../mod/connections.php:212
-#: ../../mod/connections.php:225 ../../mod/menu.php:102
+#: ../../include/conversation.php:1524 ../../mod/connections.php:72
+#: ../../mod/connections.php:85 ../../mod/menu.php:110
 msgid "New"
 msgstr "Nieuw"
 
-#: ../../include/conversation.php:1516
+#: ../../include/conversation.php:1527
 msgid "Activity Stream - by date"
 msgstr "Activiteitenstroom - volgens datum"
 
-#: ../../include/conversation.php:1522
+#: ../../include/conversation.php:1533
 msgid "Starred"
 msgstr "Met ster"
 
-#: ../../include/conversation.php:1525
+#: ../../include/conversation.php:1536
 msgid "Favourite Posts"
 msgstr "Favoriete berichten"
 
-#: ../../include/conversation.php:1532
+#: ../../include/conversation.php:1543
 msgid "Spam"
 msgstr "Spam"
 
-#: ../../include/conversation.php:1535
+#: ../../include/conversation.php:1546
 msgid "Posts flagged as SPAM"
 msgstr "Berichten gemarkeerd als SPAM"
 
-#: ../../include/conversation.php:1579 ../../mod/admin.php:952
+#: ../../include/conversation.php:1590 ../../mod/admin.php:993
 msgid "Channel"
 msgstr "Kanaal"
 
-#: ../../include/conversation.php:1582
+#: ../../include/conversation.php:1593
 msgid "Status Messages and Posts"
 msgstr "Berichten in dit kanaal"
 
-#: ../../include/conversation.php:1591
+#: ../../include/conversation.php:1602
 msgid "About"
 msgstr "Over"
 
-#: ../../include/conversation.php:1594
+#: ../../include/conversation.php:1605
 msgid "Profile Details"
 msgstr "Profiel"
 
-#: ../../include/conversation.php:1603 ../../include/photos.php:359
+#: ../../include/conversation.php:1614 ../../include/photos.php:359
 msgid "Photo Albums"
 msgstr "Fotoalbums"
 
-#: ../../include/conversation.php:1612
+#: ../../include/conversation.php:1623
 msgid "Files and Storage"
 msgstr "Bestanden en opslagruimte"
 
-#: ../../include/conversation.php:1622 ../../include/conversation.php:1625
+#: ../../include/conversation.php:1633 ../../include/conversation.php:1636
 msgid "Chatrooms"
 msgstr "Chatkanalen"
 
-#: ../../include/conversation.php:1638
+#: ../../include/conversation.php:1649
 msgid "Saved Bookmarks"
 msgstr "Opgeslagen bladwijzers"
 
-#: ../../include/conversation.php:1648
+#: ../../include/conversation.php:1659
 msgid "Manage Webpages"
 msgstr "Webpagina's beheren"
 
-#: ../../include/conversation.php:1707
+#: ../../include/conversation.php:1718
 msgctxt "noun"
 msgid "Attending"
 msgid_plural "Attending"
 msgstr[0] "aanwezig"
 msgstr[1] "aanwezig"
 
-#: ../../include/conversation.php:1710
+#: ../../include/conversation.php:1721
 msgctxt "noun"
 msgid "Not Attending"
 msgid_plural "Not Attending"
 msgstr[0] "niet aanwezig"
 msgstr[1] "niet aanwezig"
 
-#: ../../include/conversation.php:1713
+#: ../../include/conversation.php:1724
 msgctxt "noun"
 msgid "Undecided"
 msgid_plural "Undecided"
 msgstr[0] "nog niet beslist"
 msgstr[1] "nog niet beslist"
 
-#: ../../include/conversation.php:1716
+#: ../../include/conversation.php:1727
 msgctxt "noun"
 msgid "Agree"
 msgid_plural "Agrees"
 msgstr[0] "eens"
 msgstr[1] "eens"
 
-#: ../../include/conversation.php:1719
+#: ../../include/conversation.php:1730
 msgctxt "noun"
 msgid "Disagree"
 msgid_plural "Disagrees"
 msgstr[0] "oneens"
 msgstr[1] "oneens"
 
-#: ../../include/conversation.php:1722
+#: ../../include/conversation.php:1733
 msgctxt "noun"
 msgid "Abstain"
 msgid_plural "Abstains"
 msgstr[0] "onthouding"
 msgstr[1] "onthoudingen"
 
-#: ../../include/photos.php:94
+#: ../../include/items.php:413 ../../mod/like.php:273
+#: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/profperm.php:23
+#: ../../mod/bulksetclose.php:11 ../../index.php:392
+msgid "Permission denied"
+msgstr "Toegang geweigerd"
+
+#: ../../include/items.php:1101 ../../include/items.php:1147
+msgid "(Unknown)"
+msgstr "(Onbekend)"
+
+#: ../../include/items.php:1373
+msgid "Visible to anybody on the internet."
+msgstr "Voor iedereen op het internet zichtbaar."
+
+#: ../../include/items.php:1375
+msgid "Visible to you only."
+msgstr "Alleen voor jou zichtbaar."
+
+#: ../../include/items.php:1377
+msgid "Visible to anybody in this network."
+msgstr "Voor iedereen in dit netwerk zichtbaar."
+
+#: ../../include/items.php:1379
+msgid "Visible to anybody authenticated."
+msgstr "Voor iedereen die geauthenticeerd is zichtbaar."
+
+#: ../../include/items.php:1381
 #, php-format
-msgid "Image exceeds website size limit of %lu bytes"
-msgstr "Afbeelding is groter dan op deze hub toegestane limiet van %lu bytes"
+msgid "Visible to anybody on %s."
+msgstr "Voor iedereen op %s zichtbaar."
 
-#: ../../include/photos.php:101
-msgid "Image file is empty."
-msgstr "Afbeeldingsbestand is leeg"
+#: ../../include/items.php:1383
+msgid "Visible to all connections."
+msgstr "Voor alle connecties zichtbaar."
 
-#: ../../include/photos.php:128 ../../mod/profile_photo.php:217
-msgid "Unable to process image"
-msgstr "Afbeelding kan niet verwerkt worden"
+#: ../../include/items.php:1385
+msgid "Visible to approved connections."
+msgstr "Voor alle goedgekeurde connecties zichtbaar."
 
-#: ../../include/photos.php:199
-msgid "Photo storage failed."
-msgstr "Foto kan niet worden opgeslagen"
+#: ../../include/items.php:1387
+msgid "Visible to specific connections."
+msgstr "Voor specifieke connecties zichtbaar."
 
-#: ../../include/photos.php:363
-msgid "Upload New Photos"
-msgstr "Nieuwe foto's uploaden"
+#: ../../include/items.php:4310 ../../mod/thing.php:74
+#: ../../mod/filestorage.php:27 ../../mod/viewsrc.php:20
+#: ../../mod/admin.php:167 ../../mod/admin.php:1025 ../../mod/admin.php:1225
+#: ../../mod/display.php:36
+msgid "Item not found."
+msgstr "Item niet gevonden."
 
-#: ../../include/zot.php:666
+#: ../../include/items.php:4383 ../../include/attach.php:137
+#: ../../include/attach.php:184 ../../include/attach.php:247
+#: ../../include/attach.php:261 ../../include/attach.php:305
+#: ../../include/attach.php:319 ../../include/attach.php:350
+#: ../../include/attach.php:546 ../../include/attach.php:618
+#: ../../include/chat.php:131 ../../include/photos.php:26
+#: ../../mod/profile.php:64 ../../mod/profile.php:72
+#: ../../mod/achievements.php:30 ../../mod/manage.php:6 ../../mod/api.php:26
+#: ../../mod/api.php:31 ../../mod/webpages.php:69 ../../mod/thing.php:269
+#: ../../mod/thing.php:284 ../../mod/thing.php:318
+#: ../../mod/profile_photo.php:264 ../../mod/profile_photo.php:277
+#: ../../mod/block.php:22 ../../mod/block.php:72 ../../mod/like.php:178
+#: ../../mod/events.php:249 ../../mod/group.php:9 ../../mod/item.php:206
+#: ../../mod/item.php:214 ../../mod/item.php:1005 ../../mod/network.php:12
+#: ../../mod/common.php:35 ../../mod/connections.php:29
+#: ../../mod/blocks.php:69 ../../mod/blocks.php:76 ../../mod/editpost.php:13
+#: ../../mod/photos.php:69 ../../mod/pdledit.php:21 ../../mod/authtest.php:13
+#: ../../mod/editlayout.php:63 ../../mod/editlayout.php:87
+#: ../../mod/chat.php:90 ../../mod/chat.php:95 ../../mod/mitem.php:111
+#: ../../mod/editwebpage.php:64 ../../mod/editwebpage.php:86
+#: ../../mod/editwebpage.php:101 ../../mod/editwebpage.php:125
+#: ../../mod/rate.php:110 ../../mod/editblock.php:65 ../../mod/invite.php:13
+#: ../../mod/invite.php:104 ../../mod/locs.php:77 ../../mod/sources.php:66
+#: ../../mod/menu.php:72 ../../mod/filestorage.php:18
+#: ../../mod/filestorage.php:73 ../../mod/filestorage.php:88
+#: ../../mod/filestorage.php:115 ../../mod/fsuggest.php:78
+#: ../../mod/poke.php:128 ../../mod/profiles.php:188
+#: ../../mod/profiles.php:576 ../../mod/viewsrc.php:14 ../../mod/setup.php:223
+#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27
+#: ../../mod/register.php:72 ../../mod/settings.php:570 ../../mod/id.php:71
+#: ../../mod/message.php:16 ../../mod/mood.php:111 ../../mod/connedit.php:348
+#: ../../mod/mail.php:114 ../../mod/notifications.php:66
+#: ../../mod/regmod.php:17 ../../mod/new_channel.php:68
+#: ../../mod/new_channel.php:99 ../../mod/appman.php:66
+#: ../../mod/layouts.php:69 ../../mod/layouts.php:76 ../../mod/layouts.php:87
+#: ../../mod/page.php:31 ../../mod/page.php:86 ../../mod/bookmarks.php:46
+#: ../../mod/channel.php:100 ../../mod/channel.php:219
+#: ../../mod/channel.php:262 ../../mod/suggest.php:26
+#: ../../mod/service_limits.php:7 ../../mod/sharedwithme.php:7
+#: ../../index.php:182 ../../index.php:393
+msgid "Permission denied."
+msgstr "Toegang geweigerd"
+
+#: ../../include/items.php:4787 ../../mod/group.php:38 ../../mod/group.php:140
+#: ../../mod/bulksetclose.php:51
+msgid "Collection not found."
+msgstr "Collectie niet gevonden."
+
+#: ../../include/items.php:4803
+msgid "Collection is empty."
+msgstr "Collectie is leeg"
+
+#: ../../include/items.php:4810
+#, php-format
+msgid "Collection: %s"
+msgstr "Collectie: %s"
+
+#: ../../include/items.php:4820 ../../mod/connedit.php:674
+#, php-format
+msgid "Connection: %s"
+msgstr "Connectie: %s"
+
+#: ../../include/items.php:4822
+msgid "Connection not found."
+msgstr "Connectie niet gevonden."
+
+#: ../../include/zot.php:684
 msgid "Invalid data packet"
 msgstr "Datapakket ongeldig"
 
-#: ../../include/zot.php:682
+#: ../../include/zot.php:700
 msgid "Unable to verify channel signature"
 msgstr "Kanaalkenmerk kon niet worden geverifieerd.  "
 
-#: ../../include/zot.php:2108
+#: ../../include/zot.php:2208
 #, php-format
 msgid "Unable to verify site signature for %s"
 msgstr "Hubkenmerk voor %s kon niet worden geverifieerd"
@@ -3170,7 +3155,7 @@ msgid_plural "%d invitations available"
 msgstr[0] "%d uitnodiging beschikbaar"
 msgstr[1] "%d uitnodigingen beschikbaar"
 
-#: ../../include/contact_widgets.php:19 ../../mod/admin.php:450
+#: ../../include/contact_widgets.php:19 ../../mod/admin.php:457
 msgid "Advanced"
 msgstr "Geavanceerd"
 
@@ -3190,12 +3175,12 @@ msgstr "Verbinden/volgen"
 msgid "Examples: Robert Morgenstein, Fishing"
 msgstr "Voorbeeld: Robert Morgenstein, vissen"
 
-#: ../../include/contact_widgets.php:26 ../../mod/connections.php:413
-#: ../../mod/directory.php:362 ../../mod/directory.php:367
+#: ../../include/contact_widgets.php:26 ../../mod/directory.php:379
+#: ../../mod/directory.php:384 ../../mod/connections.php:273
 msgid "Find"
 msgstr "Vinden"
 
-#: ../../include/contact_widgets.php:27 ../../mod/directory.php:366
+#: ../../include/contact_widgets.php:27 ../../mod/directory.php:383
 #: ../../mod/suggest.php:60
 msgid "Channel Suggestions"
 msgstr "Voorgestelde kanalen"
@@ -3235,67 +3220,67 @@ msgstr "Tonen"
 msgid "Don't show"
 msgstr "Niet tonen"
 
-#: ../../include/acl_selectors.php:248 ../../mod/events.php:654
-#: ../../mod/photos.php:559 ../../mod/photos.php:922 ../../mod/chat.php:209
+#: ../../include/acl_selectors.php:248 ../../mod/events.php:691
+#: ../../mod/photos.php:571 ../../mod/photos.php:934 ../../mod/chat.php:209
 #: ../../mod/filestorage.php:147
 msgid "Permissions"
 msgstr "Permissies"
 
-#: ../../include/attach.php:241 ../../include/attach.php:299
+#: ../../include/attach.php:242 ../../include/attach.php:300
 msgid "Item was not found."
 msgstr "Item niet gevonden"
 
-#: ../../include/attach.php:356
+#: ../../include/attach.php:363
 msgid "No source file."
 msgstr "Geen bronbestand."
 
-#: ../../include/attach.php:374
+#: ../../include/attach.php:381
 msgid "Cannot locate file to replace"
 msgstr "Kan het te vervangen bestand niet vinden"
 
-#: ../../include/attach.php:392
+#: ../../include/attach.php:399
 msgid "Cannot locate file to revise/update"
 msgstr "Kan het bestand wat aangepast moet worden niet vinden"
 
-#: ../../include/attach.php:403
+#: ../../include/attach.php:410
 #, php-format
 msgid "File exceeds size limit of %d"
 msgstr "Bestand is groter dan de toegelaten %d"
 
-#: ../../include/attach.php:415
+#: ../../include/attach.php:422
 #, php-format
 msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
 msgstr "Je hebt jouw limiet van %1$.0f MB opslagruimte voor bijlagen bereikt."
 
-#: ../../include/attach.php:498
+#: ../../include/attach.php:505
 msgid "File upload failed. Possible system limit or action terminated."
 msgstr "Uploaden van bestand mislukt. Mogelijk systeemlimiet bereikt of actie afgebroken."
 
-#: ../../include/attach.php:510
+#: ../../include/attach.php:517
 msgid "Stored file could not be verified. Upload failed."
 msgstr "Opgeslagen bestand kon niet worden geverifieerd. Uploaden mislukt."
 
-#: ../../include/attach.php:554 ../../include/attach.php:571
+#: ../../include/attach.php:561 ../../include/attach.php:578
 msgid "Path not available."
 msgstr "Pad niet beschikbaar."
 
-#: ../../include/attach.php:616
+#: ../../include/attach.php:623
 msgid "Empty pathname"
 msgstr "Padnaam leeg"
 
-#: ../../include/attach.php:632
+#: ../../include/attach.php:639
 msgid "duplicate filename or path"
 msgstr "dubbele bestandsnaam of pad"
 
-#: ../../include/attach.php:656
+#: ../../include/attach.php:663
 msgid "Path not found."
 msgstr "Pad niet gevonden"
 
-#: ../../include/attach.php:707
+#: ../../include/attach.php:714
 msgid "mkdir failed."
 msgstr "directory aanmaken (mkdir) mislukt."
 
-#: ../../include/attach.php:711
+#: ../../include/attach.php:718
 msgid "database storage failed."
 msgstr "opslag in database mislukt."
 
@@ -3336,205 +3321,206 @@ msgstr "Niet in staat om aangemaakte identiteit te vinden"
 msgid "Default Profile"
 msgstr "Standaardprofiel"
 
-#: ../../include/identity.php:630
+#: ../../include/identity.php:759
 msgid "Requested channel is not available."
 msgstr "Opgevraagd kanaal is niet beschikbaar."
 
-#: ../../include/identity.php:677 ../../mod/profile.php:16
+#: ../../include/identity.php:806 ../../mod/profile.php:16
 #: ../../mod/achievements.php:11 ../../mod/webpages.php:29
 #: ../../mod/connect.php:13 ../../mod/hcard.php:8 ../../mod/blocks.php:29
 #: ../../mod/editlayout.php:27 ../../mod/editwebpage.php:28
-#: ../../mod/filestorage.php:54 ../../mod/editblock.php:29
+#: ../../mod/editblock.php:29 ../../mod/filestorage.php:54
 #: ../../mod/layouts.php:29
 msgid "Requested profile is not available."
 msgstr "Opgevraagd profiel is niet beschikbaar"
 
-#: ../../include/identity.php:836 ../../mod/profiles.php:774
+#: ../../include/identity.php:969 ../../mod/profiles.php:774
 msgid "Change profile photo"
 msgstr "Profielfoto veranderen"
 
-#: ../../include/identity.php:842
+#: ../../include/identity.php:975
 msgid "Profiles"
 msgstr "Profielen"
 
-#: ../../include/identity.php:842
+#: ../../include/identity.php:975
 msgid "Manage/edit profiles"
 msgstr "Profielen beheren/bewerken"
 
-#: ../../include/identity.php:843 ../../mod/profiles.php:775
+#: ../../include/identity.php:976 ../../mod/profiles.php:775
 msgid "Create New Profile"
 msgstr "Nieuw profiel aanmaken"
 
-#: ../../include/identity.php:858 ../../mod/profiles.php:786
+#: ../../include/identity.php:991 ../../mod/profiles.php:786
 msgid "Profile Image"
 msgstr "Profielfoto"
 
-#: ../../include/identity.php:861
+#: ../../include/identity.php:994
 msgid "visible to everybody"
 msgstr "Voor iedereen zichtbaar"
 
-#: ../../include/identity.php:862 ../../mod/profiles.php:669
+#: ../../include/identity.php:995 ../../mod/profiles.php:669
 #: ../../mod/profiles.php:790
 msgid "Edit visibility"
 msgstr "Zichtbaarheid bewerken"
 
-#: ../../include/identity.php:878 ../../include/identity.php:1117
+#: ../../include/identity.php:1011 ../../include/identity.php:1250
 msgid "Gender:"
 msgstr "Geslacht:"
 
-#: ../../include/identity.php:879 ../../include/identity.php:1161
+#: ../../include/identity.php:1012 ../../include/identity.php:1294
 msgid "Status:"
 msgstr "Status:"
 
-#: ../../include/identity.php:880 ../../include/identity.php:1172
+#: ../../include/identity.php:1013 ../../include/identity.php:1305
 msgid "Homepage:"
 msgstr "Homepagina:"
 
-#: ../../include/identity.php:881
+#: ../../include/identity.php:1014
 msgid "Online Now"
 msgstr "Nu online"
 
-#: ../../include/identity.php:964 ../../include/identity.php:1042
+#: ../../include/identity.php:1097 ../../include/identity.php:1175
 #: ../../mod/ping.php:324
 msgid "g A l F d"
 msgstr "G:i, l d F"
 
-#: ../../include/identity.php:965 ../../include/identity.php:1043
+#: ../../include/identity.php:1098 ../../include/identity.php:1176
 msgid "F d"
 msgstr "d F"
 
-#: ../../include/identity.php:1010 ../../include/identity.php:1082
+#: ../../include/identity.php:1143 ../../include/identity.php:1215
 #: ../../mod/ping.php:346
 msgid "[today]"
 msgstr "[vandaag]"
 
-#: ../../include/identity.php:1021
+#: ../../include/identity.php:1154
 msgid "Birthday Reminders"
 msgstr "Verjaardagsherinneringen"
 
-#: ../../include/identity.php:1022
+#: ../../include/identity.php:1155
 msgid "Birthdays this week:"
 msgstr "Verjaardagen deze week:"
 
-#: ../../include/identity.php:1075
+#: ../../include/identity.php:1208
 msgid "[No description]"
 msgstr "[Geen omschrijving]"
 
-#: ../../include/identity.php:1093
+#: ../../include/identity.php:1226
 msgid "Event Reminders"
 msgstr "Herinneringen"
 
-#: ../../include/identity.php:1094
+#: ../../include/identity.php:1227
 msgid "Events this week:"
 msgstr "Gebeurtenissen deze week:"
 
-#: ../../include/identity.php:1107 ../../include/identity.php:1224
+#: ../../include/identity.php:1240 ../../include/identity.php:1357
 #: ../../include/apps.php:138 ../../mod/profperm.php:112
 msgid "Profile"
 msgstr "Profiel"
 
-#: ../../include/identity.php:1115 ../../mod/settings.php:1045
+#: ../../include/identity.php:1248 ../../mod/settings.php:1056
 msgid "Full Name:"
 msgstr "Volledige naam:"
 
-#: ../../include/identity.php:1122
+#: ../../include/identity.php:1255
 msgid "Like this channel"
 msgstr "Vind dit kanaal leuk"
 
-#: ../../include/identity.php:1146
+#: ../../include/identity.php:1279
 msgid "j F, Y"
 msgstr "F j Y"
 
-#: ../../include/identity.php:1147
+#: ../../include/identity.php:1280
 msgid "j F"
 msgstr "F j"
 
-#: ../../include/identity.php:1154
+#: ../../include/identity.php:1287
 msgid "Birthday:"
 msgstr "Geboortedatum:"
 
-#: ../../include/identity.php:1158
+#: ../../include/identity.php:1291 ../../mod/directory.php:297
 msgid "Age:"
 msgstr "Leeftijd:"
 
-#: ../../include/identity.php:1167
+#: ../../include/identity.php:1300
 #, php-format
 msgid "for %1$d %2$s"
 msgstr "voor %1$d %2$s"
 
-#: ../../include/identity.php:1170 ../../mod/profiles.php:691
+#: ../../include/identity.php:1303 ../../mod/profiles.php:691
 msgid "Sexual Preference:"
 msgstr "Seksuele voorkeur:"
 
-#: ../../include/identity.php:1174 ../../mod/profiles.php:693
+#: ../../include/identity.php:1307 ../../mod/directory.php:313
+#: ../../mod/profiles.php:693
 msgid "Hometown:"
 msgstr "Oorspronkelijk uit:"
 
-#: ../../include/identity.php:1176
+#: ../../include/identity.php:1309
 msgid "Tags:"
 msgstr "Tags:"
 
-#: ../../include/identity.php:1178 ../../mod/profiles.php:694
+#: ../../include/identity.php:1311 ../../mod/profiles.php:694
 msgid "Political Views:"
 msgstr "Politieke overtuigingen:"
 
-#: ../../include/identity.php:1180
+#: ../../include/identity.php:1313
 msgid "Religion:"
 msgstr "Religie:"
 
-#: ../../include/identity.php:1182
+#: ../../include/identity.php:1315 ../../mod/directory.php:315
 msgid "About:"
 msgstr "Over:"
 
-#: ../../include/identity.php:1184
+#: ../../include/identity.php:1317
 msgid "Hobbies/Interests:"
 msgstr "Hobby's/interesses:"
 
-#: ../../include/identity.php:1186 ../../mod/profiles.php:697
+#: ../../include/identity.php:1319 ../../mod/profiles.php:697
 msgid "Likes:"
 msgstr "Houdt van:"
 
-#: ../../include/identity.php:1188 ../../mod/profiles.php:698
+#: ../../include/identity.php:1321 ../../mod/profiles.php:698
 msgid "Dislikes:"
 msgstr "Houdt niet van:"
 
-#: ../../include/identity.php:1190
+#: ../../include/identity.php:1323
 msgid "Contact information and Social Networks:"
 msgstr "Contactinformatie en sociale netwerken:"
 
-#: ../../include/identity.php:1192
+#: ../../include/identity.php:1325
 msgid "My other channels:"
 msgstr "Mijn andere kanalen"
 
-#: ../../include/identity.php:1194
+#: ../../include/identity.php:1327
 msgid "Musical interests:"
 msgstr "Muzikale interesses:"
 
-#: ../../include/identity.php:1196
+#: ../../include/identity.php:1329
 msgid "Books, literature:"
 msgstr "Boeken, literatuur:"
 
-#: ../../include/identity.php:1198
+#: ../../include/identity.php:1331
 msgid "Television:"
 msgstr "Televisie:"
 
-#: ../../include/identity.php:1200
+#: ../../include/identity.php:1333
 msgid "Film/dance/culture/entertainment:"
 msgstr "Films/dansen/cultuur/vermaak:"
 
-#: ../../include/identity.php:1202
+#: ../../include/identity.php:1335
 msgid "Love/Romance:"
 msgstr "Liefde/romantiek:"
 
-#: ../../include/identity.php:1204
+#: ../../include/identity.php:1337
 msgid "Work/employment:"
 msgstr "Werk/beroep:"
 
-#: ../../include/identity.php:1206
+#: ../../include/identity.php:1339
 msgid "School/education:"
 msgstr "School/opleiding:"
 
-#: ../../include/identity.php:1226
+#: ../../include/identity.php:1359
 msgid "Like this thing"
 msgstr "Vind dit ding leuk"
 
@@ -3820,7 +3806,7 @@ msgid "Profile Photo"
 msgstr "Profielfoto"
 
 #: ../../include/apps.php:247 ../../mod/settings.php:84
-#: ../../mod/settings.php:608
+#: ../../mod/settings.php:614
 msgid "Update"
 msgstr "Bijwerken"
 
@@ -3832,6 +3818,73 @@ msgstr "Installeren"
 msgid "Purchase"
 msgstr "Aanschaffen"
 
+#: ../../include/bbcode.php:122 ../../include/bbcode.php:768
+#: ../../include/bbcode.php:771 ../../include/bbcode.php:776
+#: ../../include/bbcode.php:779 ../../include/bbcode.php:782
+#: ../../include/bbcode.php:785 ../../include/bbcode.php:790
+#: ../../include/bbcode.php:793 ../../include/bbcode.php:798
+#: ../../include/bbcode.php:801 ../../include/bbcode.php:804
+#: ../../include/bbcode.php:807
+msgid "Image/photo"
+msgstr "Afbeelding/foto"
+
+#: ../../include/bbcode.php:161 ../../include/bbcode.php:818
+msgid "Encrypted content"
+msgstr "Versleutelde inhoud"
+
+#: ../../include/bbcode.php:178
+#, php-format
+msgid "Install %s element: "
+msgstr "Installeer %s-element: "
+
+#: ../../include/bbcode.php:182
+#, php-format
+msgid ""
+"This post contains an installable %s element, however you lack permissions "
+"to install it on this site."
+msgstr "Dit bericht heeft een te installeren %s-element, maar je hebt geen permissies om het op deze hub te installeren."
+
+#: ../../include/bbcode.php:192 ../../mod/impel.php:37
+msgid "webpage"
+msgstr "Webpagina"
+
+#: ../../include/bbcode.php:195 ../../mod/impel.php:47
+msgid "layout"
+msgstr "lay-out"
+
+#: ../../include/bbcode.php:198 ../../mod/impel.php:42
+msgid "block"
+msgstr "blok"
+
+#: ../../include/bbcode.php:201 ../../mod/impel.php:54
+msgid "menu"
+msgstr "menu"
+
+#: ../../include/bbcode.php:215
+msgid "QR code"
+msgstr "QR-code"
+
+#: ../../include/bbcode.php:266
+#, php-format
+msgid "%1$s wrote the following %2$s %3$s"
+msgstr "%1$s schreef het volgende %2$s %3$s"
+
+#: ../../include/bbcode.php:268 ../../mod/tagger.php:51
+msgid "post"
+msgstr "bericht"
+
+#: ../../include/bbcode.php:518
+msgid "Different viewers will see this text differently"
+msgstr "Deze tekst wordt per persoon anders weergeven."
+
+#: ../../include/bbcode.php:729
+msgid "$1 spoiler"
+msgstr "$1 spoiler"
+
+#: ../../include/bbcode.php:756
+msgid "$1 wrote:"
+msgstr "$1 schreef:"
+
 #: ../../include/chat.php:23
 msgid "Missing room name"
 msgstr "Naam chatkanaal ontbreekt"
@@ -3852,6 +3905,27 @@ msgstr "Chatkanaal niet gevonden"
 msgid "Room is full"
 msgstr "Chatkanaal is vol"
 
+#: ../../include/photos.php:94
+#, php-format
+msgid "Image exceeds website size limit of %lu bytes"
+msgstr "Afbeelding is groter dan op deze hub toegestane limiet van %lu bytes"
+
+#: ../../include/photos.php:101
+msgid "Image file is empty."
+msgstr "Afbeeldingsbestand is leeg"
+
+#: ../../include/photos.php:128 ../../mod/profile_photo.php:217
+msgid "Unable to process image"
+msgstr "Afbeelding kan niet verwerkt worden"
+
+#: ../../include/photos.php:199
+msgid "Photo storage failed."
+msgstr "Foto kan niet worden opgeslagen"
+
+#: ../../include/photos.php:363
+msgid "Upload New Photos"
+msgstr "Nieuwe foto's uploaden"
+
 #: ../../mod/achievements.php:34
 msgid "Some blurb about what to do when you're new here"
 msgstr "Welkom op $Projectname. Klik op de tab ontdekken of klik rechtsboven op de <a href=\"directory\">kanalengids</a>, om kanalen te vinden. Rechtsboven vind je ook <a href=\"directory\">apps</a>, waar je vrijwel alle functies van $Projectname kunt vinden. Voor <a href=\"directory\">hulp</a> met $Projectname klik je op het vraagteken."
@@ -3895,599 +3969,94 @@ msgstr "%d nieuwe connectieverzoeken"
 msgid "Delegated Channels"
 msgstr "Uitbestede kanalen"
 
-#: ../../mod/settings.php:76
-msgid "Name is required"
-msgstr "Naam is vereist"
-
-#: ../../mod/settings.php:80
-msgid "Key and Secret are required"
-msgstr "Key en secret zijn vereist"
-
-#: ../../mod/settings.php:124
-msgid "Diaspora Policy Settings updated."
-msgstr "Beleidsinstellingen Diaspora bijgewerkt."
-
-#: ../../mod/settings.php:232
-msgid "Passwords do not match. Password unchanged."
-msgstr "Wachtwoorden komen niet overeen. Wachtwoord onveranderd."
-
-#: ../../mod/settings.php:236
-msgid "Empty passwords are not allowed. Password unchanged."
-msgstr "Lege wachtwoorden zijn niet toegestaan. Wachtwoord onveranderd."
-
-#: ../../mod/settings.php:250
-msgid "Password changed."
-msgstr "Wachtwoord veranderd."
-
-#: ../../mod/settings.php:252
-msgid "Password update failed. Please try again."
-msgstr "Bijwerken wachtwoord mislukt. Probeer opnieuw."
-
-#: ../../mod/settings.php:266
-msgid "Not valid email."
-msgstr "Geen geldig e-mailadres."
-
-#: ../../mod/settings.php:269
-msgid "Protected email address. Cannot change to that email."
-msgstr "Beschermd e-mailadres. Kan dat e-mailadres niet gebruiken."
-
-#: ../../mod/settings.php:278
-msgid "System failure storing new email. Please try again."
-msgstr "Systeemfout opslaan van nieuwe e-mail. Probeer het nog een keer."
-
-#: ../../mod/settings.php:517
-msgid "Settings updated."
-msgstr "Instellingen bijgewerkt."
-
-#: ../../mod/settings.php:573 ../../mod/api.php:106 ../../mod/photos.php:556
-#: ../../mod/menu.php:88 ../../mod/filestorage.php:151
-#: ../../mod/filestorage.php:159 ../../mod/admin.php:424
-#: ../../mod/removeme.php:60 ../../view/theme/redbasic/php/config.php:102
-#: ../../view/theme/redbasic/php/config.php:127 ../../boot.php:1544
-msgid "No"
-msgstr "Nee"
-
-#: ../../mod/settings.php:573 ../../mod/api.php:105 ../../mod/photos.php:556
-#: ../../mod/menu.php:88 ../../mod/filestorage.php:151
-#: ../../mod/filestorage.php:159 ../../mod/admin.php:426
-#: ../../mod/removeme.php:60 ../../view/theme/redbasic/php/config.php:102
-#: ../../view/theme/redbasic/php/config.php:127 ../../boot.php:1544
-msgid "Yes"
-msgstr "Ja"
-
-#: ../../mod/settings.php:581 ../../mod/settings.php:607
-#: ../../mod/settings.php:643
-msgid "Add application"
-msgstr "Applicatie toevoegen"
-
-#: ../../mod/settings.php:584
-msgid "Name of application"
-msgstr "Naam van applicatie"
-
-#: ../../mod/settings.php:585 ../../mod/settings.php:611
-msgid "Consumer Key"
-msgstr "Consumer key"
-
-#: ../../mod/settings.php:585 ../../mod/settings.php:586
-msgid "Automatically generated - change if desired. Max length 20"
-msgstr "Automatische gegenereerd - verander wanneer gewenst. Maximale lengte is 20"
-
-#: ../../mod/settings.php:586 ../../mod/settings.php:612
-msgid "Consumer Secret"
-msgstr "Consumer secret"
-
-#: ../../mod/settings.php:587 ../../mod/settings.php:613
-msgid "Redirect"
-msgstr "Redirect/doorverwijzing"
-
-#: ../../mod/settings.php:587
-msgid ""
-"Redirect URI - leave blank unless your application specifically requires "
-"this"
-msgstr "URI voor redirect - laat leeg, behalve wanneer de applicatie dit vereist"
-
-#: ../../mod/settings.php:588 ../../mod/settings.php:614
-msgid "Icon url"
-msgstr "URL van pictogram"
-
-#: ../../mod/settings.php:588
-msgid "Optional"
-msgstr "Optioneel"
-
-#: ../../mod/settings.php:599
-msgid "You can't edit this application."
-msgstr "Je kan deze applicatie niet bewerken"
-
-#: ../../mod/settings.php:642
-msgid "Connected Apps"
-msgstr "Verbonden applicaties"
-
-#: ../../mod/settings.php:646
-msgid "Client key starts with"
-msgstr "Client key begint met"
-
-#: ../../mod/settings.php:647
-msgid "No name"
-msgstr "Geen naam"
-
-#: ../../mod/settings.php:648
-msgid "Remove authorization"
-msgstr "Autorisatie verwijderen"
-
-#: ../../mod/settings.php:662
-msgid "No feature settings configured"
-msgstr "Geen extra functie- of plugin-instellingen"
-
-#: ../../mod/settings.php:678
-msgid "Feature/Addon Settings"
-msgstr "Extra functie- en plugin-instellingen"
-
-#: ../../mod/settings.php:680
-msgid "Settings for the built-in Diaspora emulator"
-msgstr "Instellingen voor de ingebouwde Diaspora-emulator"
-
-#: ../../mod/settings.php:681
-msgid "Allow any Diaspora member to comment on your public posts"
-msgstr "Sta toe dat elk Diaspora-lid op jouw openbare berichten kan reageren."
-
-#: ../../mod/settings.php:682
-msgid "Diaspora Policy Settings"
-msgstr "Beleidsinstellingen Diaspora"
-
-#: ../../mod/settings.php:683
-msgid "Prevent your hashtags from being redirected to other sites"
-msgstr "Voorkom dat jouw tags naar andere websites worden doorverwezen"
-
-#: ../../mod/settings.php:707
-msgid "Account Settings"
-msgstr "Account-instellingen"
-
-#: ../../mod/settings.php:708
-msgid "Enter New Password:"
-msgstr "Nieuw wachtwoord invoeren:"
-
-#: ../../mod/settings.php:709
-msgid "Confirm New Password:"
-msgstr "Nieuw wachtwoord bevestigen:"
-
-#: ../../mod/settings.php:709
-msgid "Leave password fields blank unless changing"
-msgstr "Laat de wachtwoordvelden leeg, behalve wanneer je deze wil veranderen"
-
-#: ../../mod/settings.php:711 ../../mod/settings.php:1046
-msgid "Email Address:"
-msgstr "E-mailadres:"
-
-#: ../../mod/settings.php:712 ../../mod/removeaccount.php:61
-msgid "Remove Account"
-msgstr "Account verwijderen"
-
-#: ../../mod/settings.php:713
-msgid "Remove this account including all its channels"
-msgstr "Dit account en al zijn kanalen verwijderen"
-
-#: ../../mod/settings.php:729
-msgid "Off"
-msgstr "Uit"
-
-#: ../../mod/settings.php:729
-msgid "On"
-msgstr "Aan"
-
-#: ../../mod/settings.php:736
-msgid "Additional Features"
-msgstr "Extra functies"
-
-#: ../../mod/settings.php:760
-msgid "Connector Settings"
-msgstr "Instellingen externe koppelingen"
-
-#: ../../mod/settings.php:799
-msgid "No special theme for mobile devices"
-msgstr "Geen speciaal thema voor mobiele apparaten"
+#: ../../mod/directory.php:59 ../../mod/photos.php:441 ../../mod/search.php:13
+#: ../../mod/ratings.php:82 ../../mod/viewconnections.php:17
+#: ../../mod/display.php:13
+msgid "Public access denied."
+msgstr "Openbare toegang geweigerd."
 
-#: ../../mod/settings.php:802
+#: ../../mod/directory.php:234
 #, php-format
-msgid "%s - (Experimental)"
-msgstr "%s - (experimenteel)"
-
-#: ../../mod/settings.php:805 ../../mod/admin.php:396
-msgid "mobile"
-msgstr "mobiel"
-
-#: ../../mod/settings.php:841
-msgid "Display Settings"
-msgstr "Weergave-instellingen"
-
-#: ../../mod/settings.php:847
-msgid "Display Theme:"
-msgstr "Gebruik thema:"
-
-#: ../../mod/settings.php:848
-msgid "Mobile Theme:"
-msgstr "Mobiel thema:"
-
-#: ../../mod/settings.php:849
-msgid "Enable user zoom on mobile devices"
-msgstr "Inzoomen op smartphones en tablets toestaan"
-
-#: ../../mod/settings.php:850
-msgid "Update browser every xx seconds"
-msgstr "Ververs de webbrowser om de zoveel seconde"
-
-#: ../../mod/settings.php:850
-msgid "Minimum of 10 seconds, no maximum"
-msgstr "Minimaal 10 seconde, geen maximum"
-
-#: ../../mod/settings.php:851
-msgid "Maximum number of conversations to load at any time:"
-msgstr "Maximaal aantal conversaties die per keer geladen worden:"
-
-#: ../../mod/settings.php:851
-msgid "Maximum of 100 items"
-msgstr "Maximaal 100 conversaties"
-
-#: ../../mod/settings.php:852
-msgid "Show emoticons (smilies) as images"
-msgstr "Toon emoticons (smilies) als afbeeldingen"
-
-#: ../../mod/settings.php:853
-msgid "Link post titles to source"
-msgstr "Berichtkoppen naar originele locatie linken"
-
-#: ../../mod/settings.php:854
-msgid "System Page Layout Editor - (advanced)"
-msgstr "Lay-out bewerken van systeempagina's (geavanceerd)"
-
-#: ../../mod/settings.php:857
-msgid "Use blog/list mode on channel page"
-msgstr "Gebruik blog/lijst-modus op kanaalpagina"
-
-#: ../../mod/settings.php:857 ../../mod/settings.php:858
-msgid "(comments displayed separately)"
-msgstr "(reacties worden afzonderlijk weergeven)"
-
-#: ../../mod/settings.php:858
-msgid "Use blog/list mode on matrix page"
-msgstr "Gebruik blog/lijst-modus op matrixpagina"
-
-#: ../../mod/settings.php:859
-msgid "Channel page max height of content (in pixels)"
-msgstr "Maximale hoogte berichtinhoud op kanaalpagina (in pixels)"
-
-#: ../../mod/settings.php:859 ../../mod/settings.php:860
-msgid "click to expand content exceeding this height"
-msgstr "klik om inhoud uit te klappen die deze hoogte overschrijdt"
-
-#: ../../mod/settings.php:860
-msgid "Matrix page max height of content (in pixels)"
-msgstr "Maximale hoogte berichtinhoud op matrixpagina (in pixels)"
-
-#: ../../mod/settings.php:894
-msgid "Nobody except yourself"
-msgstr "Niemand, behalve jezelf"
-
-#: ../../mod/settings.php:895
-msgid "Only those you specifically allow"
-msgstr "Alleen connecties met uitdrukkelijke toestemming"
-
-#: ../../mod/settings.php:896
-msgid "Approved connections"
-msgstr "Geaccepteerde connecties"
-
-#: ../../mod/settings.php:897
-msgid "Any connections"
-msgstr "Alle connecties"
-
-#: ../../mod/settings.php:898
-msgid "Anybody on this website"
-msgstr "Iedereen op deze hub"
-
-#: ../../mod/settings.php:899
-msgid "Anybody in this network"
-msgstr "Iedereen in dit netwerk"
-
-#: ../../mod/settings.php:900
-msgid "Anybody authenticated"
-msgstr "Geauthenticeerd"
-
-#: ../../mod/settings.php:901
-msgid "Anybody on the internet"
-msgstr "Iedereen op het internet"
-
-#: ../../mod/settings.php:975
-msgid "Publish your default profile in the network directory"
-msgstr "Publiceer je standaardprofiel in de kanalengids"
-
-#: ../../mod/settings.php:980
-msgid "Allow us to suggest you as a potential friend to new members?"
-msgstr "Sta ons toe om jouw kanaal als mogelijke connectie voor te stellen aan nieuwe kanalen"
-
-#: ../../mod/settings.php:984 ../../mod/profile_photo.php:366
-msgid "or"
-msgstr "of"
-
-#: ../../mod/settings.php:989
-msgid "Your channel address is"
-msgstr "Jouw kanaaladres is"
-
-#: ../../mod/settings.php:1037
-msgid "Channel Settings"
-msgstr "Kanaal-instellingen"
-
-#: ../../mod/settings.php:1044
-msgid "Basic Settings"
-msgstr "Basis-instellingen"
-
-#: ../../mod/settings.php:1047
-msgid "Your Timezone:"
-msgstr "Jouw tijdzone:"
-
-#: ../../mod/settings.php:1048
-msgid "Default Post Location:"
-msgstr "Standaardlocatie bericht:"
-
-#: ../../mod/settings.php:1048
-msgid "Geographical location to display on your posts"
-msgstr "Geografische locatie die bij het bericht moet worden vermeld"
-
-#: ../../mod/settings.php:1049
-msgid "Use Browser Location:"
-msgstr "Locatie van webbrowser gebruiken:"
-
-#: ../../mod/settings.php:1051
-msgid "Adult Content"
-msgstr "Inhoud voor volwassenen"
-
-#: ../../mod/settings.php:1051
-msgid ""
-"This channel frequently or regularly publishes adult content. (Please tag "
-"any adult material and/or nudity with #NSFW)"
-msgstr "Dit kanaal publiceert regelmatig of vaak materiaal dat alleen geschikt is voor volwassenen. (Gebruik de tag #NSFW in berichten met een seksueel getinte inhoud of ander voor minderjarigen ongeschikt materiaal)"
-
-#: ../../mod/settings.php:1053
-msgid "Security and Privacy Settings"
-msgstr "Veiligheids- en privacy-instellingen"
-
-#: ../../mod/settings.php:1055
-msgid "Your permissions are already configured. Click to view/adjust"
-msgstr "Jouw permissies zijn al ingesteld. Klik om ze te bekijken of aan te passen."
-
-#: ../../mod/settings.php:1057
-msgid "Hide my online presence"
-msgstr "Verberg mijn aanwezigheid"
-
-#: ../../mod/settings.php:1057
-msgid "Prevents displaying in your profile that you are online"
-msgstr "Voorkomt dat op je kanaalpagina te zien valt dat je momenteel op $Projectname aanwezig bent"
-
-#: ../../mod/settings.php:1059
-msgid "Simple Privacy Settings:"
-msgstr "Eenvoudige privacy-instellingen:"
-
-#: ../../mod/settings.php:1060
-msgid ""
-"Very Public - <em>extremely permissive (should be used with caution)</em>"
-msgstr "Zeer openbaar <em>(kanaal staat volledig open - moet met grote zorgvuldigheid gebruikt worden)</em>"
-
-#: ../../mod/settings.php:1061
-msgid ""
-"Typical - <em>default public, privacy when desired (similar to social "
-"network permissions but with improved privacy)</em>"
-msgstr "Normaal <em>(standaard openbaar, maar privacy wanneer noodzakelijk - vergelijkbaar met die van sociale netwerken, maar met verbeterde privacy)</em>"
-
-#: ../../mod/settings.php:1062
-msgid "Private - <em>default private, never open or public</em>"
-msgstr "Privé <em>(standaard privé en nooit openbaar)</em>"
-
-#: ../../mod/settings.php:1063
-msgid "Blocked - <em>default blocked to/from everybody</em>"
-msgstr "Geblokkeerd <em>(standaard geblokkeerd naar/van iedereen)</em>"
-
-#: ../../mod/settings.php:1065
-msgid "Allow others to tag your posts"
-msgstr "Anderen toestaan om je berichten te taggen"
-
-#: ../../mod/settings.php:1065
-msgid ""
-"Often used by the community to retro-actively flag inappropriate content"
-msgstr "Vaak in groepen/forums gebruikt om met terugwerkende kracht ongepast materiaal te markeren"
-
-#: ../../mod/settings.php:1067
-msgid "Advanced Privacy Settings"
-msgstr "Geavanceerde privacy-instellingen"
-
-#: ../../mod/settings.php:1069
-msgid "Expire other channel content after this many days"
-msgstr "Inhoud van andere kanalen na zoveel aantal dagen laten verlopen:"
-
-#: ../../mod/settings.php:1069
-msgid "0 or blank prevents expiration"
-msgstr "0 of leeg voorkomt het verlopen"
-
-#: ../../mod/settings.php:1070
-msgid "Maximum Friend Requests/Day:"
-msgstr "Maximum aantal connectieverzoeken per dag:"
-
-#: ../../mod/settings.php:1070
-msgid "May reduce spam activity"
-msgstr "Kan eventuele spam verminderen"
-
-#: ../../mod/settings.php:1071
-msgid "Default Post Permissions"
-msgstr "Standaard permissies voor nieuwe berichten"
-
-#: ../../mod/settings.php:1072 ../../mod/mitem.php:152 ../../mod/mitem.php:221
-msgid "(click to open/close)"
-msgstr "(klik om te openen/sluiten)"
-
-#: ../../mod/settings.php:1076
-msgid "Channel permissions category:"
-msgstr "Kanaaltype en -permissies:"
-
-#: ../../mod/settings.php:1082
-msgid "Maximum private messages per day from unknown people:"
-msgstr "Maximum aantal privé-berichten per dag van onbekende personen:"
-
-#: ../../mod/settings.php:1082
-msgid "Useful to reduce spamming"
-msgstr "Kan eventuele spam verminderen"
-
-#: ../../mod/settings.php:1085
-msgid "Notification Settings"
-msgstr "Notificatie-instellingen"
-
-#: ../../mod/settings.php:1086
-msgid "By default post a status message when:"
-msgstr "Plaats automatisch een statusbericht wanneer:"
-
-#: ../../mod/settings.php:1087
-msgid "accepting a friend request"
-msgstr "Een connectieverzoek wordt geaccepteerd"
-
-#: ../../mod/settings.php:1088
-msgid "joining a forum/community"
-msgstr "Je lid wordt van een forum/groep"
-
-#: ../../mod/settings.php:1089
-msgid "making an <em>interesting</em> profile change"
-msgstr "Er sprake is van een <em>interessante</em> profielwijziging"
-
-#: ../../mod/settings.php:1090
-msgid "Send a notification email when:"
-msgstr "Verzend een notificatie per e-mail wanneer:"
-
-#: ../../mod/settings.php:1091
-msgid "You receive a connection request"
-msgstr "Je een connectieverzoek ontvangt"
-
-#: ../../mod/settings.php:1092
-msgid "Your connections are confirmed"
-msgstr "Jouw connecties zijn bevestigd"
-
-#: ../../mod/settings.php:1093
-msgid "Someone writes on your profile wall"
-msgstr "Iemand iets op jouw kanaal heeft geschreven"
-
-#: ../../mod/settings.php:1094
-msgid "Someone writes a followup comment"
-msgstr "Iemand een reactie schrijft"
-
-#: ../../mod/settings.php:1095
-msgid "You receive a private message"
-msgstr "Je een privé-bericht ontvangt"
-
-#: ../../mod/settings.php:1096
-msgid "You receive a friend suggestion"
-msgstr "Je een kanaalvoorstel ontvangt"
-
-#: ../../mod/settings.php:1097
-msgid "You are tagged in a post"
-msgstr "Je expliciet in een bericht bent genoemd"
-
-#: ../../mod/settings.php:1098
-msgid "You are poked/prodded/etc. in a post"
-msgstr "Je bent in een bericht aangestoten/gepord/etc."
-
-#: ../../mod/settings.php:1101
-msgid "Show visual notifications including:"
-msgstr "Toon de volgende zichtbare notificaties:"
-
-#: ../../mod/settings.php:1103
-msgid "Unseen matrix activity"
-msgstr "Niet bekeken matrix-activiteit"
-
-#: ../../mod/settings.php:1104
-msgid "Unseen channel activity"
-msgstr "Niet bekeken kanaal-activiteit"
-
-#: ../../mod/settings.php:1105
-msgid "Unseen private messages"
-msgstr "Niet bekeken privéberichten"
-
-#: ../../mod/settings.php:1105 ../../mod/settings.php:1110
-#: ../../mod/settings.php:1111 ../../mod/settings.php:1112
-msgid "Recommended"
-msgstr "Aanbevolen"
+msgid "%d rating"
+msgid_plural "%d ratings"
+msgstr[0] "%d beoordeling"
+msgstr[1] "%d beoordelingen"
 
-#: ../../mod/settings.php:1106
-msgid "Upcoming events"
-msgstr "Aankomende gebeurtenissen"
+#: ../../mod/directory.php:245
+msgid "Gender: "
+msgstr "Geslacht:"
 
-#: ../../mod/settings.php:1107
-msgid "Events today"
-msgstr "Gebeurtissen van vandaag"
+#: ../../mod/directory.php:247
+msgid "Status: "
+msgstr "Status: "
 
-#: ../../mod/settings.php:1108
-msgid "Upcoming birthdays"
-msgstr "Aankomende verjaardagen"
+#: ../../mod/directory.php:249
+msgid "Homepage: "
+msgstr "Homepagina: "
 
-#: ../../mod/settings.php:1108
-msgid "Not available in all themes"
-msgstr "Niet in alle thema's beschikbaar"
+#: ../../mod/directory.php:308 ../../mod/events.php:682
+msgid "Description:"
+msgstr "Omschrijving:"
 
-#: ../../mod/settings.php:1109
-msgid "System (personal) notifications"
-msgstr "(Persoonlijke) systeemnotificaties"
+#: ../../mod/directory.php:317
+msgid "Public Forum:"
+msgstr "Openbaar forum:"
 
-#: ../../mod/settings.php:1110
-msgid "System info messages"
-msgstr "Systeemmededelingen"
+#: ../../mod/directory.php:320
+msgid "Keywords: "
+msgstr "Trefwoorden: "
 
-#: ../../mod/settings.php:1111
-msgid "System critical alerts"
-msgstr "Kritische systeemwaarschuwingen"
+#: ../../mod/directory.php:323
+msgid "Don't suggest"
+msgstr "Niet voorstellen"
 
-#: ../../mod/settings.php:1112
-msgid "New connections"
-msgstr "Nieuwe connecties"
+#: ../../mod/directory.php:325
+msgid "Common connections:"
+msgstr "Gemeenschappelijke connecties:"
 
-#: ../../mod/settings.php:1113
-msgid "System Registrations"
-msgstr "Nieuwe accountregistraties op deze hub"
+#: ../../mod/directory.php:374
+msgid "Global Directory"
+msgstr "Volledige kanalengids"
 
-#: ../../mod/settings.php:1114
-msgid ""
-"Also show new wall posts, private messages and connections under Notices"
-msgstr "Toon tevens nieuwe kanaalberichten, privéberichten en connecties onder Notificaties"
+#: ../../mod/directory.php:374
+msgid "Local Directory"
+msgstr "Lokale kanalengids"
 
-#: ../../mod/settings.php:1116
-msgid "Notify me of events this many days in advance"
-msgstr "Herinner mij zoveel dagen van te voren aan gebeurtenissen"
+#: ../../mod/directory.php:380
+msgid "Finding:"
+msgstr "Gezocht naar:"
 
-#: ../../mod/settings.php:1116
-msgid "Must be greater than 0"
-msgstr "Moet hoger dan 0 zijn"
+#: ../../mod/directory.php:385
+msgid "next page"
+msgstr "volgende pagina"
 
-#: ../../mod/settings.php:1118
-msgid "Advanced Account/Page Type Settings"
-msgstr "Instellingen geavanceerd account/paginatype"
+#: ../../mod/directory.php:385
+msgid "previous page"
+msgstr "vorige pagina"
 
-#: ../../mod/settings.php:1119
-msgid "Change the behaviour of this account for special situations"
-msgstr "Verander het gedrag van dit account voor speciale situaties"
+#: ../../mod/directory.php:386
+msgid "Sort options"
+msgstr "Sorteeropties"
 
-#: ../../mod/settings.php:1122
-msgid ""
-"Please enable expert mode (in <a href=\"settings/features\">Settings > "
-"Additional features</a>) to adjust!"
-msgstr "Schakel de expertmodus in (in <a href=\"settings/features\">Instellingen > Extra functies</a>) om aan te kunnen passen!"
+#: ../../mod/directory.php:387
+msgid "Alphabetic"
+msgstr "Alfabetisch"
 
-#: ../../mod/settings.php:1123
-msgid "Miscellaneous Settings"
-msgstr "Diverse instellingen"
+#: ../../mod/directory.php:388
+msgid "Reverse Alphabetic"
+msgstr "Omgekeerd alfabetisch"
 
-#: ../../mod/settings.php:1125
-msgid "Personal menu to display in your channel pages"
-msgstr "Persoonlijk menu om op je kanaalpagina's weer te geven"
+#: ../../mod/directory.php:389
+msgid "Newest to Oldest"
+msgstr "Nieuw naar oud"
 
-#: ../../mod/settings.php:1126 ../../mod/removeme.php:61
-msgid "Remove Channel"
-msgstr "Kanaal verwijderen"
+#: ../../mod/directory.php:390
+msgid "Oldest to Newest"
+msgstr "Oud naar nieuw"
 
-#: ../../mod/settings.php:1127
-msgid "Remove this channel."
-msgstr "Verwijder dit kanaal."
+#: ../../mod/directory.php:407
+msgid "No entries (some entries may be hidden)."
+msgstr "Niets gevonden (sommige kanalen kunnen verborgen zijn)."
 
 #: ../../mod/xchan.php:6
 msgid "Xchan Lookup"
@@ -4497,7 +4066,7 @@ msgstr "Xchan opzoeken"
 msgid "Lookup xchan beginning with (or webbie): "
 msgstr "Zoek een xchan (of webbie) die begint met:"
 
-#: ../../mod/xchan.php:37 ../../mod/menu.php:149 ../../mod/mitem.php:120
+#: ../../mod/xchan.php:37 ../../mod/mitem.php:116 ../../mod/menu.php:160
 msgid "Not found."
 msgstr "Niet gevonden."
 
@@ -4519,7 +4088,7 @@ msgid ""
 " and/or create new posts for you?"
 msgstr "Wil je deze applicatie toestemming geven om jouw berichten en connecties te zien, en/of nieuwe berichten voor jou te plaatsen?"
 
-#: ../../mod/webpages.php:189
+#: ../../mod/webpages.php:191
 msgid "Page Title"
 msgstr "Paginatitel"
 
@@ -4539,7 +4108,7 @@ msgstr "Verwijder item-tag"
 msgid "Select a tag to remove: "
 msgstr "Kies een tag om te verwijderen"
 
-#: ../../mod/tagrm.php:133 ../../mod/photos.php:875
+#: ../../mod/tagrm.php:133 ../../mod/photos.php:887
 msgid "Remove"
 msgstr "Verwijderen"
 
@@ -4590,56 +4159,56 @@ msgstr "Beperkt of premiumkanaal"
 msgid "Thing updated"
 msgstr "Ding bijgewerkt"
 
-#: ../../mod/thing.php:153
+#: ../../mod/thing.php:167
 msgid "Object store: failed"
 msgstr "Opslaan van ding mislukt"
 
-#: ../../mod/thing.php:157
+#: ../../mod/thing.php:171
 msgid "Thing added"
 msgstr "Ding toegevoegd"
 
-#: ../../mod/thing.php:175
+#: ../../mod/thing.php:203
 #, php-format
 msgid "OBJ: %1$s %2$s %3$s"
 msgstr "OBJ: %1$s %2$s %3$s"
 
-#: ../../mod/thing.php:226
+#: ../../mod/thing.php:254
 msgid "Show Thing"
 msgstr "Ding weergeven"
 
-#: ../../mod/thing.php:233
+#: ../../mod/thing.php:261
 msgid "item not found."
 msgstr "Item niet gevonden"
 
-#: ../../mod/thing.php:261
+#: ../../mod/thing.php:289
 msgid "Edit Thing"
 msgstr "Ding bewerken"
 
-#: ../../mod/thing.php:263 ../../mod/thing.php:310
+#: ../../mod/thing.php:291 ../../mod/thing.php:338
 msgid "Select a profile"
 msgstr "Kies een profiel"
 
-#: ../../mod/thing.php:267 ../../mod/thing.php:313
+#: ../../mod/thing.php:295 ../../mod/thing.php:341
 msgid "Post an activity"
 msgstr "Plaats een bericht"
 
-#: ../../mod/thing.php:267 ../../mod/thing.php:313
+#: ../../mod/thing.php:295 ../../mod/thing.php:341
 msgid "Only sends to viewers of the applicable profile"
 msgstr "Toont dit alleen aan diegene die het gekozen profiel mogen zien."
 
-#: ../../mod/thing.php:269 ../../mod/thing.php:315
+#: ../../mod/thing.php:297 ../../mod/thing.php:343
 msgid "Name of thing e.g. something"
 msgstr "Naam van ding"
 
-#: ../../mod/thing.php:271 ../../mod/thing.php:316
+#: ../../mod/thing.php:299 ../../mod/thing.php:344
 msgid "URL of thing (optional)"
 msgstr "URL van ding (optioneel)"
 
-#: ../../mod/thing.php:273 ../../mod/thing.php:317
+#: ../../mod/thing.php:301 ../../mod/thing.php:345
 msgid "URL for photo of thing (optional)"
 msgstr "URL van foto van ding (optioneel)"
 
-#: ../../mod/thing.php:308
+#: ../../mod/thing.php:336
 msgid "Add Thing to your Profile"
 msgstr "Ding aan je profiel toevoegen"
 
@@ -4647,20 +4216,11 @@ msgstr "Ding aan je profiel toevoegen"
 msgid "Item not available."
 msgstr "Item is niet aanwezig."
 
-#: ../../mod/probe.php:23 ../../mod/probe.php:29
+#: ../../mod/probe.php:24 ../../mod/probe.php:30
 #, php-format
 msgid "Fetching URL returns error: %1$s"
 msgstr "Ophalen URL gaf een foutmelding terug: %1$s"
 
-#: ../../mod/home.php:53
-msgid "Red Matrix - &quot;The Network&quot;"
-msgstr "RedMatrix - &quot;The Network&quot;"
-
-#: ../../mod/home.php:124
-#, php-format
-msgid "Welcome to %s"
-msgstr "Welkom op %s"
-
 #: ../../mod/profile_photo.php:108
 msgid "Image uploaded but image cropping failed."
 msgstr "Afbeelding geüpload, maar afbeelding kon niet worden bijgesneden. "
@@ -4700,6 +4260,10 @@ msgstr "Kies een profiel:"
 msgid "Upload Profile Photo"
 msgstr "Profielfoto uploaden"
 
+#: ../../mod/profile_photo.php:366 ../../mod/settings.php:995
+msgid "or"
+msgstr "of"
+
 #: ../../mod/profile_photo.php:366
 msgid "skip this step"
 msgstr "sla deze stap over"
@@ -4733,16 +4297,16 @@ msgstr "Uploaden afbeelding mislukt"
 msgid "Image size reduction [%s] failed."
 msgstr "Verkleinen [%s] van afbeelding mislukt."
 
-#: ../../mod/block.php:27 ../../mod/page.php:33
+#: ../../mod/block.php:27 ../../mod/page.php:36
 msgid "Invalid item."
 msgstr "Ongeldig item."
 
-#: ../../mod/block.php:39 ../../mod/wall_upload.php:29 ../../mod/page.php:45
+#: ../../mod/block.php:39 ../../mod/wall_upload.php:29 ../../mod/page.php:52
 msgid "Channel not found."
 msgstr "Kanaal niet gevonden."
 
-#: ../../mod/block.php:75 ../../mod/help.php:79 ../../mod/display.php:106
-#: ../../mod/page.php:82 ../../index.php:241
+#: ../../mod/block.php:75 ../../mod/display.php:110 ../../mod/help.php:79
+#: ../../mod/page.php:89 ../../index.php:241
 msgid "Page not found."
 msgstr "Pagina niet gevonden."
 
@@ -4756,9 +4320,9 @@ msgstr "Deze actie kan alleen door $Projectname-leden worden uitgevoerd."
 
 #: ../../mod/like.php:21
 msgid ""
-"Please <a href=\"rmagic\">login with your RedMatrix ID</a> or <a "
-"href=\"register\">register as a new RedMatrix member</a> to continue."
-msgstr "Je dient <a href=\"rmagic\">in te loggen met je RedMatrix-account</a> of <a href=\"register\">een nieuw RedMatrix-account te registreren</a> om verder te kunnen gaan."
+"Please <a href=\"rmagic\">login with your $Projectname ID</a> or <a "
+"href=\"register\">register as a new $Projectname member</a> to continue."
+msgstr "Je dient <a href=\"rmagic\">in te loggen met je $Projectname-account</a> of <a href=\"register\">een nieuw $Projectname-account te registreren</a> om verder te kunnen gaan."
 
 #: ../../mod/like.php:101 ../../mod/like.php:128 ../../mod/like.php:166
 msgid "Invalid request."
@@ -4772,143 +4336,155 @@ msgstr "ding"
 msgid "Channel unavailable."
 msgstr "Kanaal  niet beschikbaar."
 
-#: ../../mod/like.php:228
+#: ../../mod/like.php:231
 msgid "Previous action reversed."
 msgstr "Vorige actie omgedraaid"
 
-#: ../../mod/like.php:398
+#: ../../mod/like.php:401
 #, php-format
 msgid "%1$s agrees with %2$s's %3$s"
 msgstr "%1$s is het eens met %2$s's %3$s"
 
-#: ../../mod/like.php:400
+#: ../../mod/like.php:403
 #, php-format
 msgid "%1$s doesn't agree with %2$s's %3$s"
 msgstr "%1$s is het niet eens met %2$s's %3$s"
 
-#: ../../mod/like.php:402
+#: ../../mod/like.php:405
 #, php-format
 msgid "%1$s abstains from a decision on %2$s's %3$s"
 msgstr "%1$s onthoudt zich van een besluit over %2$s's %3$s"
 
-#: ../../mod/like.php:404
+#: ../../mod/like.php:407
 #, php-format
 msgid "%1$s is attending %2$s's %3$s"
 msgstr "%1$s is aanwezig op %2$s's %3$s"
 
-#: ../../mod/like.php:406
+#: ../../mod/like.php:409
 #, php-format
 msgid "%1$s is not attending %2$s's %3$s"
 msgstr "%1$s is niet aanwezig op %2$s's %3$s"
 
-#: ../../mod/like.php:408
+#: ../../mod/like.php:411
 #, php-format
 msgid "%1$s may attend %2$s's %3$s"
 msgstr "%1$s is mogelijk aanwezig op %2$s's %3$s"
 
-#: ../../mod/like.php:492
+#: ../../mod/like.php:507
 msgid "Action completed."
 msgstr "Actie voltooid"
 
-#: ../../mod/like.php:493
+#: ../../mod/like.php:508
 msgid "Thank you."
 msgstr "Bedankt"
 
-#: ../../mod/events.php:87
+#: ../../mod/events.php:21
+msgid "Calendar entries imported."
+msgstr "Agenda-items geïmporteerd."
+
+#: ../../mod/events.php:23
+msgid "No calendar entries found."
+msgstr "Geen agenda-items gevonden."
+
+#: ../../mod/events.php:101
 msgid "Event can not end before it has started."
 msgstr "Gebeurtenis kan niet eindigen voordat het is begonnen"
 
-#: ../../mod/events.php:89 ../../mod/events.php:98 ../../mod/events.php:116
+#: ../../mod/events.php:103 ../../mod/events.php:112 ../../mod/events.php:130
 msgid "Unable to generate preview."
 msgstr "Niet in staat om voorvertoning te genereren"
 
-#: ../../mod/events.php:96
+#: ../../mod/events.php:110
 msgid "Event title and start time are required."
 msgstr "Titel en begintijd van gebeurtenis zijn vereist."
 
-#: ../../mod/events.php:114
+#: ../../mod/events.php:128
 msgid "Event not found."
 msgstr "Gebeurtenis niet gevonden"
 
-#: ../../mod/events.php:396
+#: ../../mod/events.php:426
 msgid "l, F j"
 msgstr "l j F"
 
-#: ../../mod/events.php:418
+#: ../../mod/events.php:448
 msgid "Edit event"
 msgstr "Gebeurtenis bewerken"
 
-#: ../../mod/events.php:419
+#: ../../mod/events.php:449
 msgid "Delete event"
 msgstr "Gebeurtenis verwijderen"
 
-#: ../../mod/events.php:473
+#: ../../mod/events.php:483
+msgid "calendar"
+msgstr "agenda"
+
+#: ../../mod/events.php:504
 msgid "Create New Event"
 msgstr "Nieuwe gebeurtenis aanmaken"
 
-#: ../../mod/events.php:474 ../../mod/photos.php:827
+#: ../../mod/events.php:505 ../../mod/photos.php:839
 msgid "Previous"
 msgstr "Vorige"
 
-#: ../../mod/events.php:475 ../../mod/setup.php:265 ../../mod/photos.php:836
+#: ../../mod/events.php:506 ../../mod/photos.php:848 ../../mod/setup.php:281
 msgid "Next"
 msgstr "Volgende"
 
-#: ../../mod/events.php:476
+#: ../../mod/events.php:507
 msgid "Export"
 msgstr "Exporteren"
 
-#: ../../mod/events.php:504
+#: ../../mod/events.php:510
+msgid "Import"
+msgstr "Importeren"
+
+#: ../../mod/events.php:541
 msgid "Event removed"
 msgstr "Gebeurtenis verwijderd"
 
-#: ../../mod/events.php:507
+#: ../../mod/events.php:544
 msgid "Failed to remove event"
 msgstr "Verwijderen gebeurtenis mislukt"
 
-#: ../../mod/events.php:627
+#: ../../mod/events.php:664
 msgid "Event details"
 msgstr "Details van gebeurtenis"
 
-#: ../../mod/events.php:628
+#: ../../mod/events.php:665
 msgid "Starting date and Title are required."
 msgstr "Begintijd en titel zijn vereist."
 
-#: ../../mod/events.php:630
+#: ../../mod/events.php:667
 msgid "Categories (comma-separated list)"
 msgstr "Categorieën (door komma's gescheiden lijst)"
 
-#: ../../mod/events.php:632
+#: ../../mod/events.php:669
 msgid "Event Starts:"
 msgstr "Begin gebeurtenis:"
 
-#: ../../mod/events.php:639
+#: ../../mod/events.php:676
 msgid "Finish date/time is not known or not relevant"
 msgstr "Einddatum/-tijd is niet bekend of niet relevant"
 
-#: ../../mod/events.php:641
+#: ../../mod/events.php:678
 msgid "Event Finishes:"
 msgstr "Einde gebeurtenis:"
 
-#: ../../mod/events.php:643 ../../mod/events.php:644
+#: ../../mod/events.php:680 ../../mod/events.php:681
 msgid "Adjust for viewer timezone"
 msgstr "Aanpassen aan de tijdzone van wie deze gebeurtenis bekijkt"
 
-#: ../../mod/events.php:643
+#: ../../mod/events.php:680
 msgid ""
 "Important for events that happen in a particular place. Not practical for "
 "global holidays."
 msgstr "Belangrijk voor gebeurtenissen die op een bepaalde locatie plaatsvinden. Niet praktisch voor wereldwijde feestdagen."
 
-#: ../../mod/events.php:645
-msgid "Description:"
-msgstr "Omschrijving:"
-
-#: ../../mod/events.php:649
+#: ../../mod/events.php:686
 msgid "Title:"
 msgstr "Titel:"
 
-#: ../../mod/events.php:651
+#: ../../mod/events.php:688
 msgid "Share this event"
 msgstr "Deel deze gebeurtenis"
 
@@ -4923,12 +4499,12 @@ msgstr "Openbare hubs"
 
 #: ../../mod/pubsites.php:19
 msgid ""
-"The listed sites allow public registration into the Red Matrix. All sites in"
-" the matrix are interlinked so membership on any of them conveys membership "
-"in the matrix as a whole. Some sites may require subscription or provide "
-"tiered service plans. The provider links <strong>may</strong> provide "
-"additional details."
-msgstr "Op de hier weergegeven hubs kan iedereen zich voor de RedMatrix aanmelden. Alle hubs in de Matrix zijn met elkaar verbonden, dus maakt het qua lidmaatschap niet uit waar je je aanmeldt. Op sommige hubs heb je eerst goedkeuring nodig en sommige hubs vereisen betaalde abonnementen voor uitbreidingen. <strong>Mogelijk</strong> wordt hierover op de hub zelf meer informatie gegeven."
+"The listed sites allow public registration for the $Projectname network. All"
+" sites in the network are interlinked so membership on any of them conveys "
+"membership in the network as a whole. Some sites may require subscription or"
+" provide tiered service plans. The provider links <strong>may</strong> "
+"provide additional details."
+msgstr "Op de hier weergegeven hubs kan iedereen zich voor het $Projectname-netwerk aanmelden. Alle hubs in het $Projectname-netwerk zijn met elkaar verbonden, dus maakt het qua lidmaatschap niet uit waar je je aanmeldt. Op sommige hubs heb je eerst goedkeuring nodig en sommige hubs vereisen betaalde abonnementen voor uitbreidingen. <strong>Mogelijk</strong> wordt hierover op de hub zelf meer informatie gegeven."
 
 #: ../../mod/pubsites.php:25
 msgid "Rate this hub"
@@ -4962,13 +4538,13 @@ msgstr "Beoordeel"
 msgid "View ratings"
 msgstr "Bekijk beoordelingen"
 
-#: ../../mod/rpost.php:131 ../../mod/editpost.php:42
+#: ../../mod/rpost.php:131 ../../mod/editpost.php:158
 msgid "Edit post"
 msgstr "Bericht bewerken"
 
 #: ../../mod/dav.php:121
-msgid "RedMatrix channel"
-msgstr "RedMatrix-kanaal"
+msgid "$Projectname channel"
+msgstr "$Projectname-kanaal"
 
 #: ../../mod/group.php:20
 msgid "Collection created."
@@ -5031,15 +4607,15 @@ msgstr "Ingeschakelde plug-ins/add-ons/apps:"
 msgid "No installed plugins/addons/apps"
 msgstr "Geen ingeschakelde plug-ins/add-ons/apps"
 
-#: ../../mod/siteinfo.php:155
-msgid "Red"
-msgstr "Red"
+#: ../../mod/siteinfo.php:155 ../../mod/home.php:58 ../../mod/home.php:66
+msgid "$Projectname"
+msgstr "$Projectname"
 
 #: ../../mod/siteinfo.php:156
 msgid ""
-"This is a hub of redmatrix - a global cooperative network of decentralized "
-"privacy enhanced websites."
-msgstr "Dit is een hub van de RedMatrix - een wereldwijd coöperatief netwerk van gedecentraliseerde websites met verbeterde privacy."
+"This is a hub of $Projectname - a global cooperative network of "
+"decentralized privacy enhanced websites."
+msgstr "Dit is een $Projectname-hub - $Projectname is een wereldwijd coöperatief netwerk van gedecentraliseerde websites (hubs) met verbeterde privacy."
 
 #: ../../mod/siteinfo.php:158
 msgid "Tag: "
@@ -5056,415 +4632,84 @@ msgstr "Draaiend op weblocatie"
 #: ../../mod/siteinfo.php:164
 msgid ""
 "Please visit <a href=\"https://redmatrix.me\">redmatrix.me</a> to learn more"
-" about the Red Matrix."
-msgstr "Bezoek <a href=\"https://redmatrix.me\">RedMatrix.me</a> om meer over de RedMatrix te leren."
+" about $Projectname."
+msgstr "Bezoek <a href=\"https://redmatrix.me\">redmatrix.me</a> om meer over $Projectname te leren."
 
 #: ../../mod/siteinfo.php:165
 msgid "Bug reports and issues: please visit"
 msgstr "Bugrapporten en andere kwesties: bezoek"
 
+#: ../../mod/siteinfo.php:167
+msgid "$projectname issues"
+msgstr "$projectname-issues"
+
 #: ../../mod/siteinfo.php:168
 msgid ""
 "Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot "
 "com"
-msgstr "Voorstellen, lofbetuigingen, enz. - e-mail  \"redmatrix\" at librelist - dot com"
+msgstr "Voorstellen, lofbetuigingen, enz. - e-mail  \"redmatrix\" at librelist - punt - com"
 
 #: ../../mod/siteinfo.php:170
 msgid "Site Administrators"
 msgstr "Hubbeheerders: "
 
-#: ../../mod/help.php:49 ../../mod/help.php:55 ../../mod/help.php:61
-msgid "Help:"
-msgstr "Hulp:"
-
-#: ../../mod/help.php:76 ../../index.php:238
-msgid "Not Found"
-msgstr "Niet gevonden"
-
-#: ../../mod/setup.php:166
-msgid "Red Matrix Server - Setup"
-msgstr "RedMatrix Server - Setup"
-
-#: ../../mod/setup.php:172
-msgid "Could not connect to database."
-msgstr "Could not connect to database."
-
-#: ../../mod/setup.php:176
-msgid ""
-"Could not connect to specified site URL. Possible SSL certificate or DNS "
-"issue."
-msgstr "Could not connect to specified hub URL. Possible SSL certificate or DNS issue."
-
-#: ../../mod/setup.php:183
-msgid "Could not create table."
-msgstr "Could not create table."
-
-#: ../../mod/setup.php:189
-msgid "Your site database has been installed."
-msgstr "Your hub database has been installed."
-
-#: ../../mod/setup.php:194
-msgid ""
-"You may need to import the file \"install/schema_xxx.sql\" manually using a "
-"database client."
-msgstr "You may need to import the file \"install/schema_xxx.sql\" manually using a database client."
-
-#: ../../mod/setup.php:195 ../../mod/setup.php:264 ../../mod/setup.php:662
-msgid "Please see the file \"install/INSTALL.txt\"."
-msgstr "Please see the file \"install/INSTALL.txt\"."
-
-#: ../../mod/setup.php:261
-msgid "System check"
-msgstr "System check"
-
-#: ../../mod/setup.php:266
-msgid "Check again"
-msgstr "Check again"
-
-#: ../../mod/setup.php:289
-msgid "Database connection"
-msgstr "Database connection"
-
-#: ../../mod/setup.php:290
-msgid ""
-"In order to install Red Matrix we need to know how to connect to your "
-"database."
-msgstr "In order to install RedMatrix we need to know how to connect to your database."
-
-#: ../../mod/setup.php:291
-msgid ""
-"Please contact your hosting provider or site administrator if you have "
-"questions about these settings."
-msgstr "Please contact your hosting provider or site administrator if you have questions about these settings."
-
-#: ../../mod/setup.php:292
-msgid ""
-"The database you specify below should already exist. If it does not, please "
-"create it before continuing."
-msgstr "The database you specify below should already exist. If it does not, please create it before continuing."
-
-#: ../../mod/setup.php:296
-msgid "Database Server Name"
-msgstr "Database Server Name"
-
-#: ../../mod/setup.php:296
-msgid "Default is localhost"
-msgstr "Default is localhost"
-
-#: ../../mod/setup.php:297
-msgid "Database Port"
-msgstr "Database Port"
-
-#: ../../mod/setup.php:297
-msgid "Communication port number - use 0 for default"
-msgstr "Communication port number - use 0 for default"
-
-#: ../../mod/setup.php:298
-msgid "Database Login Name"
-msgstr "Database Login Name"
-
-#: ../../mod/setup.php:299
-msgid "Database Login Password"
-msgstr "Database Login Password"
-
-#: ../../mod/setup.php:300
-msgid "Database Name"
-msgstr "Database Name"
-
-#: ../../mod/setup.php:301
-msgid "Database Type"
-msgstr "Database Type"
-
-#: ../../mod/setup.php:303 ../../mod/setup.php:347
-msgid "Site administrator email address"
-msgstr "Hub administrator email address"
-
-#: ../../mod/setup.php:303 ../../mod/setup.php:347
-msgid ""
-"Your account email address must match this in order to use the web admin "
-"panel."
-msgstr "Your account email address must match this in order to use the web admin panel."
-
-#: ../../mod/setup.php:304 ../../mod/setup.php:349
-msgid "Website URL"
-msgstr "Hub URL"
-
-#: ../../mod/setup.php:304 ../../mod/setup.php:349
-msgid "Please use SSL (https) URL if available."
-msgstr "Please use SSL (https) URL if available."
-
-#: ../../mod/setup.php:307 ../../mod/setup.php:352
-msgid "Please select a default timezone for your website"
-msgstr "Please select a default timezone for your hub"
-
-#: ../../mod/setup.php:335
-msgid "Site settings"
-msgstr "Hub settings"
-
-#: ../../mod/setup.php:395
-msgid "Could not find a command line version of PHP in the web server PATH."
-msgstr "Could not find a command line version of PHP in the web server PATH."
-
-#: ../../mod/setup.php:396
-msgid ""
-"If you don't have a command line version of PHP installed on server, you "
-"will not be able to run background polling via cron."
-msgstr "If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron."
-
-#: ../../mod/setup.php:400
-msgid "PHP executable path"
-msgstr "PHP executable path"
-
-#: ../../mod/setup.php:400
-msgid ""
-"Enter full path to php executable. You can leave this blank to continue the "
-"installation."
-msgstr "Enter full path to php executable. You can leave this blank to continue the installation."
-
-#: ../../mod/setup.php:405
-msgid "Command line PHP"
-msgstr "Command line PHP"
-
-#: ../../mod/setup.php:414
-msgid ""
-"The command line version of PHP on your system does not have "
-"\"register_argc_argv\" enabled."
-msgstr "The command line version of PHP on your system does not have \"register_argc_argv\" enabled."
-
-#: ../../mod/setup.php:415
-msgid "This is required for message delivery to work."
-msgstr "This is required for message delivery to work."
-
-#: ../../mod/setup.php:417
-msgid "PHP register_argc_argv"
-msgstr "PHP register_argc_argv"
-
-#: ../../mod/setup.php:438
-msgid ""
-"Error: the \"openssl_pkey_new\" function on this system is not able to "
-"generate encryption keys"
-msgstr "Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"
-
-#: ../../mod/setup.php:439
-msgid ""
-"If running under Windows, please see "
-"\"http://www.php.net/manual/en/openssl.installation.php\"."
-msgstr "If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."
-
-#: ../../mod/setup.php:441
-msgid "Generate encryption keys"
-msgstr "Generate encryption keys"
-
-#: ../../mod/setup.php:448
-msgid "libCurl PHP module"
-msgstr "libCurl PHP module"
-
-#: ../../mod/setup.php:449
-msgid "GD graphics PHP module"
-msgstr "GD graphics PHP module"
-
-#: ../../mod/setup.php:450
-msgid "OpenSSL PHP module"
-msgstr "OpenSSL PHP module"
-
-#: ../../mod/setup.php:451
-msgid "mysqli or postgres PHP module"
-msgstr "mysqli or postgres PHP module"
-
-#: ../../mod/setup.php:452
-msgid "mb_string PHP module"
-msgstr "mb_string PHP module"
-
-#: ../../mod/setup.php:453
-msgid "mcrypt PHP module"
-msgstr "mcrypt PHP module"
-
-#: ../../mod/setup.php:458 ../../mod/setup.php:460
-msgid "Apache mod_rewrite module"
-msgstr "Apache mod_rewrite module"
-
-#: ../../mod/setup.php:458
-msgid ""
-"Error: Apache webserver mod-rewrite module is required but not installed."
-msgstr "Error: Apache webserver mod-rewrite module is required but not installed."
-
-#: ../../mod/setup.php:464 ../../mod/setup.php:467
-msgid "proc_open"
-msgstr "proc_open"
-
-#: ../../mod/setup.php:464
-msgid ""
-"Error: proc_open is required but is either not installed or has been "
-"disabled in php.ini"
-msgstr "Error: proc_open is required but is either not installed or has been disabled in php.ini"
-
-#: ../../mod/setup.php:472
-msgid "Error: libCURL PHP module required but not installed."
-msgstr "Error: libCURL PHP module required but not installed."
-
-#: ../../mod/setup.php:476
-msgid ""
-"Error: GD graphics PHP module with JPEG support required but not installed."
-msgstr "Error: GD graphics PHP module with JPEG support required but not installed."
-
-#: ../../mod/setup.php:480
-msgid "Error: openssl PHP module required but not installed."
-msgstr "Error: openssl PHP module required but not installed."
-
-#: ../../mod/setup.php:484
-msgid ""
-"Error: mysqli or postgres PHP module required but neither are installed."
-msgstr "Error: mysqli or postgres PHP module required but neither are installed."
-
-#: ../../mod/setup.php:488
-msgid "Error: mb_string PHP module required but not installed."
-msgstr "Error: mb_string PHP module required but not installed."
-
-#: ../../mod/setup.php:492
-msgid "Error: mcrypt PHP module required but not installed."
-msgstr "Error: mcrypt PHP module required but not installed."
-
-#: ../../mod/setup.php:508
-msgid ""
-"The web installer needs to be able to create a file called \".htconfig.php\""
-" in the top folder of your web server and it is unable to do so."
-msgstr "The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so."
-
-#: ../../mod/setup.php:509
-msgid ""
-"This is most often a permission setting, as the web server may not be able "
-"to write files in your folder - even if you can."
-msgstr "This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."
-
-#: ../../mod/setup.php:510
-msgid ""
-"At the end of this procedure, we will give you a text to save in a file "
-"named .htconfig.php in your Red top folder."
-msgstr "At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Red top folder."
-
-#: ../../mod/setup.php:511
-msgid ""
-"You can alternatively skip this procedure and perform a manual installation."
-" Please see the file \"install/INSTALL.txt\" for instructions."
-msgstr "You can alternatively skip this procedure and perform a manual installation. Please see the file \"install/INSTALL.txt\" for instructions."
+#: ../../mod/item.php:174
+msgid "Unable to locate original post."
+msgstr "Niet in staat om de originele locatie van het bericht te vinden. "
 
-#: ../../mod/setup.php:514
-msgid ".htconfig.php is writable"
-msgstr ".htconfig.php is writable"
+#: ../../mod/item.php:440
+msgid "Empty post discarded."
+msgstr "Leeg bericht geannuleerd"
 
-#: ../../mod/setup.php:524
-msgid ""
-"Red uses the Smarty3 template engine to render its web views. Smarty3 "
-"compiles templates to PHP to speed up rendering."
-msgstr "Red uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."
+#: ../../mod/item.php:480
+msgid "Executable content type not permitted to this channel."
+msgstr "Uitvoerbare bestanden zijn niet toegestaan op dit kanaal."
 
-#: ../../mod/setup.php:525
-#, php-format
-msgid ""
-"In order to store these compiled templates, the web server needs to have "
-"write access to the directory %s under the Red top level folder."
-msgstr "In order to store these compiled templates, the web server needs to have write access to the directory %s under the Red top level folder."
+#: ../../mod/item.php:914
+msgid "System error. Post not saved."
+msgstr "Systeemfout. Bericht niet opgeslagen."
 
-#: ../../mod/setup.php:526 ../../mod/setup.php:544
-msgid ""
-"Please ensure that the user that your web server runs as (e.g. www-data) has"
-" write access to this folder."
-msgstr "Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."
+#: ../../mod/item.php:1146
+msgid "Unable to obtain post information from database."
+msgstr "Niet in staat om informatie over dit bericht uit de database te verkrijgen."
 
-#: ../../mod/setup.php:527
+#: ../../mod/item.php:1153
 #, php-format
-msgid ""
-"Note: as a security measure, you should give the web server write access to "
-"%s only--not the template files (.tpl) that it contains."
-msgstr "Note: as a security measure, you should give the web server write access to %s only--not the template files (.tpl) that it contains."
+msgid "You have reached your limit of %1$.0f top level posts."
+msgstr "Je hebt jouw limiet van %1$.0f berichten bereikt."
 
-#: ../../mod/setup.php:530
+#: ../../mod/item.php:1160
 #, php-format
-msgid "%s is writable"
-msgstr "%s is writable"
-
-#: ../../mod/setup.php:543
-msgid ""
-"Red uses the store directory to save uploaded files. The web server needs to"
-" have write access to the store directory under the Red top level folder"
-msgstr "Red uses the store directory to save uploaded files. The web server needs to have write access to the store directory under the Red top level folder"
-
-#: ../../mod/setup.php:547
-msgid "store is writable"
-msgstr "store is writable"
-
-#: ../../mod/setup.php:577
-msgid ""
-"SSL certificate cannot be validated. Fix certificate or disable https access"
-" to this site."
-msgstr "SSL certificate cannot be validated. Fix certificate or disable https access to this hub."
-
-#: ../../mod/setup.php:578
-msgid ""
-"If you have https access to your website or allow connections to TCP port "
-"443 (the https: port), you MUST use a browser-valid certificate. You MUST "
-"NOT use self-signed certificates!"
-msgstr "If you have https access to your hub or allow connections to TCP port 443 (the https: port), you MUST use a browser-valid certificate. You MUST NOT use self-signed certificates!"
-
-#: ../../mod/setup.php:579
-msgid ""
-"This restriction is incorporated because public posts from you may for "
-"example contain references to images on your own hub."
-msgstr "This restriction is incorporated because public posts from you may for example contain references to images on your own hub."
-
-#: ../../mod/setup.php:580
-msgid ""
-"If your certificate is not recognized, members of other sites (who may "
-"themselves have valid certificates) will get a warning message on their own "
-"site complaining about security issues."
-msgstr "If your certificate is not recognized, members of other hubs (who may themselves have valid certificates) will get a warning message on their own hub complaining about security issues."
-
-#: ../../mod/setup.php:581
-msgid ""
-"This can cause usability issues elsewhere (not just on your own site) so we "
-"must insist on this requirement."
-msgstr "This can cause usability issues elsewhere (not just on your own hub) so we must insist on this requirement."
-
-#: ../../mod/setup.php:582
-msgid ""
-"Providers are available that issue free certificates which are browser-"
-"valid."
-msgstr "Providers are available that issue free certificates which are browser-valid."
+msgid "You have reached your limit of %1$.0f webpages."
+msgstr "Je hebt jouw limiet van %1$.0f webpagina's bereikt."
 
-#: ../../mod/setup.php:584
-msgid "SSL certificate validation"
-msgstr "SSL certificate validation"
+#: ../../mod/network.php:91
+msgid "No such group"
+msgstr "Collectie niet gevonden"
 
-#: ../../mod/setup.php:590
-msgid ""
-"Url rewrite in .htaccess is not working. Check your server "
-"configuration.Test: "
-msgstr "Url rewrite in .htaccess is not working. Check your server configuration.Test: "
+#: ../../mod/network.php:129
+msgid "No such channel"
+msgstr "Niet zo'n kanaal"
 
-#: ../../mod/setup.php:592
-msgid "Url rewrite is working"
-msgstr "Url rewrite is working"
+#: ../../mod/network.php:143
+msgid "Search Results For:"
+msgstr "Zoekresultaten voor:"
 
-#: ../../mod/setup.php:602
-msgid ""
-"The database configuration file \".htconfig.php\" could not be written. "
-"Please use the enclosed text to create a configuration file in your web "
-"server root."
-msgstr "The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."
+#: ../../mod/network.php:198
+msgid "Collection is empty"
+msgstr "Collectie is leeg"
 
-#: ../../mod/setup.php:625
-msgid "Errors encountered creating database tables."
-msgstr "Errors encountered creating database tables."
+#: ../../mod/network.php:207
+msgid "Collection: "
+msgstr "Collectie: "
 
-#: ../../mod/setup.php:660
-msgid "<h1>What next</h1>"
-msgstr "<h1>Wat nu</h1>"
+#: ../../mod/network.php:226
+msgid "Connection: "
+msgstr "Connectie: "
 
-#: ../../mod/setup.php:661
-msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the "
-"poller."
-msgstr "IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
+#: ../../mod/network.php:233
+msgid "Invalid connection."
+msgstr "Ongeldige connectie."
 
 #: ../../mod/common.php:10
 msgid "No channel."
@@ -5472,7 +4717,7 @@ msgstr "Geen kanaal."
 
 #: ../../mod/common.php:39
 msgid "Common connections"
-msgstr "Veel voorkomende connecties"
+msgstr "Gemeenschappelijke connecties"
 
 #: ../../mod/common.php:44
 msgid "No connections in common."
@@ -5482,261 +4727,273 @@ msgstr "Geen gemeenschappelijke connecties."
 msgid "This site is not a directory server"
 msgstr "Deze hub is geen kanalengidshub (directoryserver)"
 
-#: ../../mod/connections.php:37 ../../mod/connedit.php:75
-msgid "Could not access contact record."
-msgstr "Kon geen toegang krijgen tot de connectie-gegevens."
-
-#: ../../mod/connections.php:51 ../../mod/connedit.php:99
-msgid "Could not locate selected profile."
-msgstr "Kon het gekozen profiel niet vinden."
-
-#: ../../mod/connections.php:94 ../../mod/connedit.php:214
-msgid "Connection updated."
-msgstr "Connectie bijgewerkt."
-
-#: ../../mod/connections.php:96 ../../mod/connedit.php:216
-msgid "Failed to update connection record."
-msgstr "Bijwerken van connectie-gegevens mislukt."
-
-#: ../../mod/connections.php:192 ../../mod/connections.php:293
+#: ../../mod/connections.php:52 ../../mod/connections.php:153
 msgid "Blocked"
 msgstr "Geblokkeerd"
 
-#: ../../mod/connections.php:197 ../../mod/connections.php:300
+#: ../../mod/connections.php:57 ../../mod/connections.php:160
 msgid "Ignored"
 msgstr "Genegeerd"
 
-#: ../../mod/connections.php:202 ../../mod/connections.php:314
+#: ../../mod/connections.php:62 ../../mod/connections.php:174
 msgid "Hidden"
 msgstr "Verborgen"
 
-#: ../../mod/connections.php:207 ../../mod/connections.php:307
+#: ../../mod/connections.php:67 ../../mod/connections.php:167
 msgid "Archived"
 msgstr "Gearchiveerd"
 
-#: ../../mod/connections.php:271
+#: ../../mod/connections.php:131
 msgid "Suggest new connections"
 msgstr "Nieuwe kanalen voorstellen"
 
-#: ../../mod/connections.php:274
+#: ../../mod/connections.php:134
 msgid "New Connections"
 msgstr "Nieuwe connecties"
 
-#: ../../mod/connections.php:277
+#: ../../mod/connections.php:137
 msgid "Show pending (new) connections"
 msgstr "Nog te accepteren (nieuwe) connecties weergeven"
 
-#: ../../mod/connections.php:280 ../../mod/profperm.php:139
+#: ../../mod/connections.php:140 ../../mod/profperm.php:139
 msgid "All Connections"
 msgstr "Alle connecties"
 
-#: ../../mod/connections.php:283
+#: ../../mod/connections.php:143
 msgid "Show all connections"
 msgstr "Toon alle connecties"
 
-#: ../../mod/connections.php:286
+#: ../../mod/connections.php:146
 msgid "Unblocked"
 msgstr "Niet geblokkeerd"
 
-#: ../../mod/connections.php:289
+#: ../../mod/connections.php:149
 msgid "Only show unblocked connections"
 msgstr "Toon alleen niet geblokkeerde connecties"
 
-#: ../../mod/connections.php:296
+#: ../../mod/connections.php:156
 msgid "Only show blocked connections"
 msgstr "Toon alleen geblokkeerde connecties"
 
-#: ../../mod/connections.php:303
+#: ../../mod/connections.php:163
 msgid "Only show ignored connections"
 msgstr "Toon alleen genegeerde connecties"
 
-#: ../../mod/connections.php:310
+#: ../../mod/connections.php:170
 msgid "Only show archived connections"
 msgstr "Toon alleen gearchiveerde connecties"
 
-#: ../../mod/connections.php:317
+#: ../../mod/connections.php:177
 msgid "Only show hidden connections"
 msgstr "Toon alleen verborgen connecties"
 
-#: ../../mod/connections.php:372
+#: ../../mod/connections.php:232
 #, php-format
 msgid "%1$s [%2$s]"
 msgstr "%1$s [%2$s]"
 
-#: ../../mod/connections.php:373
+#: ../../mod/connections.php:233
 msgid "Edit connection"
 msgstr "Connectie bewerken"
 
-#: ../../mod/connections.php:411
+#: ../../mod/connections.php:271
 msgid "Search your connections"
 msgstr "Doorzoek jouw connecties"
 
-#: ../../mod/connections.php:412
+#: ../../mod/connections.php:272
 msgid "Finding: "
 msgstr "Zoeken naar: "
 
-#: ../../mod/blocks.php:95 ../../mod/blocks.php:147
+#: ../../mod/blocks.php:95 ../../mod/blocks.php:148
 msgid "Block Name"
 msgstr "Bloknaam"
 
-#: ../../mod/blocks.php:148
+#: ../../mod/blocks.php:149
 msgid "Block Title"
 msgstr "Bloktitel"
 
-#: ../../mod/tagger.php:96
-#, php-format
-msgid "%1$s tagged %2$s's %3$s with %4$s"
-msgstr "%1$s heeft het %3$s van %2$s getagd met %4$s"
+#: ../../mod/editpost.php:20 ../../mod/editlayout.php:76
+#: ../../mod/editwebpage.php:77 ../../mod/editblock.php:78
+#: ../../mod/editblock.php:94
+msgid "Item not found"
+msgstr "Item niet gevonden"
+
+#: ../../mod/editpost.php:31
+msgid "Item is not editable"
+msgstr "Item is niet te bewerken"
+
+#: ../../mod/editpost.php:48
+msgid "Delete item?"
+msgstr "Item verwijderen?"
+
+#: ../../mod/editpost.php:115 ../../mod/editlayout.php:142
+#: ../../mod/editwebpage.php:187 ../../mod/editblock.php:144
+msgid "Insert YouTube video"
+msgstr "YouTube-video invoegen"
+
+#: ../../mod/editpost.php:116 ../../mod/editlayout.php:143
+#: ../../mod/editwebpage.php:188 ../../mod/editblock.php:145
+msgid "Insert Vorbis [.ogg] video"
+msgstr "Vorbis-video [.ogg] invoegen"
+
+#: ../../mod/editpost.php:117 ../../mod/editlayout.php:144
+#: ../../mod/editwebpage.php:189 ../../mod/editblock.php:146
+msgid "Insert Vorbis [.ogg] audio"
+msgstr "Vorbis-audio [.ogg] invoegen"
 
 #: ../../mod/cloud.php:120
-msgid "RedMatrix - Guests: Username: {your email address}, Password: +++"
-msgstr "RedMatrix - gasttoegang: Toegangsnaam: {jouw e-mailadres}, wachtwoord: +++"
+msgid "$Projectname - Guests: Username: {your email address}, Password: +++"
+msgstr "$Projectname - gasttoegang: Accountnaam: {jouw e-mailadres}, wachtwoord: +++"
 
-#: ../../mod/photos.php:77
+#: ../../mod/photos.php:78
 msgid "Page owner information could not be retrieved."
 msgstr "Informatie over de pagina-eigenaar werd niet ontvangen."
 
-#: ../../mod/photos.php:97
+#: ../../mod/photos.php:98
 msgid "Album not found."
 msgstr "Album niet gevonden."
 
-#: ../../mod/photos.php:119 ../../mod/photos.php:643
+#: ../../mod/photos.php:120 ../../mod/photos.php:655
 msgid "Delete Album"
 msgstr "Verwijder album"
 
-#: ../../mod/photos.php:159 ../../mod/photos.php:930
+#: ../../mod/photos.php:160 ../../mod/photos.php:942
 msgid "Delete Photo"
 msgstr "Verwijder foto"
 
-#: ../../mod/photos.php:429 ../../mod/search.php:13 ../../mod/display.php:13
-#: ../../mod/ratings.php:82 ../../mod/directory.php:47
-#: ../../mod/viewconnections.php:17
-msgid "Public access denied."
-msgstr "Openbare toegang geweigerd."
-
-#: ../../mod/photos.php:440
+#: ../../mod/photos.php:452
 msgid "No photos selected"
 msgstr "Geen foto's geselecteerd"
 
-#: ../../mod/photos.php:484
+#: ../../mod/photos.php:496
 msgid "Access to this item is restricted."
 msgstr "Toegang tot dit item is beperkt."
 
-#: ../../mod/photos.php:523
+#: ../../mod/photos.php:535
 #, php-format
 msgid "%1$.2f MB of %2$.2f MB photo storage used."
 msgstr "%1$.2f MB van %2$.2f MB aan foto-opslag gebruikt."
 
-#: ../../mod/photos.php:526
+#: ../../mod/photos.php:538
 #, php-format
 msgid "%1$.2f MB photo storage used."
 msgstr "%1$.2f MB aan foto-opslag gebruikt."
 
-#: ../../mod/photos.php:550
+#: ../../mod/photos.php:562
 msgid "Upload Photos"
 msgstr "Foto's uploaden"
 
-#: ../../mod/photos.php:554 ../../mod/photos.php:636 ../../mod/photos.php:915
+#: ../../mod/photos.php:566 ../../mod/photos.php:648 ../../mod/photos.php:927
 msgid "Enter a new album name"
 msgstr "Vul een nieuwe albumnaam in"
 
-#: ../../mod/photos.php:555 ../../mod/photos.php:637 ../../mod/photos.php:916
+#: ../../mod/photos.php:567 ../../mod/photos.php:649 ../../mod/photos.php:928
 msgid "or select an existing one (doubleclick)"
 msgstr "of kies een bestaand album (dubbelklikken)"
 
-#: ../../mod/photos.php:556
+#: ../../mod/photos.php:568
 msgid "Create a status post for this upload"
 msgstr "Plaats een bericht voor deze upload."
 
-#: ../../mod/photos.php:584
+#: ../../mod/photos.php:596
 msgid "Album name could not be decoded"
 msgstr "Albumnaam kon niet gedecodeerd worden"
 
-#: ../../mod/photos.php:625 ../../mod/photos.php:1157
-#: ../../mod/photos.php:1173
+#: ../../mod/photos.php:637 ../../mod/photos.php:1169
+#: ../../mod/photos.php:1185
 msgid "Contact Photos"
 msgstr "Connectiefoto's"
 
-#: ../../mod/photos.php:649
+#: ../../mod/photos.php:661
 msgid "Show Newest First"
 msgstr "Nieuwste eerst weergeven"
 
-#: ../../mod/photos.php:651
+#: ../../mod/photos.php:663
 msgid "Show Oldest First"
 msgstr "Oudste eerst weergeven"
 
-#: ../../mod/photos.php:675 ../../mod/photos.php:1205
+#: ../../mod/photos.php:687 ../../mod/photos.php:1217
 msgid "View Photo"
 msgstr "Foto weergeven"
 
-#: ../../mod/photos.php:704
+#: ../../mod/photos.php:716
 msgid "Edit Album"
 msgstr "Album bewerken"
 
-#: ../../mod/photos.php:749
+#: ../../mod/photos.php:761
 msgid "Permission denied. Access to this item may be restricted."
 msgstr "Toegang geweigerd. Toegang tot dit item kan zijn beperkt."
 
-#: ../../mod/photos.php:751
+#: ../../mod/photos.php:763
 msgid "Photo not available"
 msgstr "Foto niet aanwezig"
 
-#: ../../mod/photos.php:809
+#: ../../mod/photos.php:821
 msgid "Use as profile photo"
 msgstr "Als profielfoto gebruiken"
 
-#: ../../mod/photos.php:816
+#: ../../mod/photos.php:828
 msgid "Private Photo"
 msgstr "Privéfoto"
 
-#: ../../mod/photos.php:831
+#: ../../mod/photos.php:843
 msgid "View Full Size"
 msgstr "Volledige grootte weergeven"
 
-#: ../../mod/photos.php:909
+#: ../../mod/photos.php:921
 msgid "Edit photo"
 msgstr "Foto bewerken"
 
-#: ../../mod/photos.php:911
+#: ../../mod/photos.php:923
 msgid "Rotate CW (right)"
 msgstr "Draai met de klok mee (naar rechts)"
 
-#: ../../mod/photos.php:912
+#: ../../mod/photos.php:924
 msgid "Rotate CCW (left)"
 msgstr "Draai tegen de klok in (naar links)"
 
-#: ../../mod/photos.php:919
+#: ../../mod/photos.php:931
 msgid "Caption"
 msgstr "Bijschrift"
 
-#: ../../mod/photos.php:921
+#: ../../mod/photos.php:933
 msgid "Add a Tag"
 msgstr "Tag toevoegen"
 
-#: ../../mod/photos.php:925
+#: ../../mod/photos.php:937
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
 msgstr "Voorbeeld: @bob, @Barbara_Jansen, @jan@voorbeeld.nl"
 
-#: ../../mod/photos.php:928
+#: ../../mod/photos.php:940
 msgid "Flag as adult in album view"
 msgstr "Markeer als voor volwassenen in albumweergave"
 
-#: ../../mod/photos.php:1120
+#: ../../mod/photos.php:1132
 msgid "In This Photo:"
 msgstr "Op deze foto:"
 
-#: ../../mod/photos.php:1125
+#: ../../mod/photos.php:1137
 msgid "Map"
 msgstr "Kaart"
 
-#: ../../mod/photos.php:1211
+#: ../../mod/photos.php:1223
 msgid "View Album"
 msgstr "Album weergeven"
 
-#: ../../mod/photos.php:1234
+#: ../../mod/photos.php:1246
 msgid "Recent Photos"
 msgstr "Recente foto's"
 
+#: ../../mod/search.php:206
+#, php-format
+msgid "Items tagged with: %s"
+msgstr "Items getagd met %s"
+
+#: ../../mod/search.php:208
+#, php-format
+msgid "Search results for: %s"
+msgstr "Zoekresultaten voor %s"
+
 #: ../../mod/match.php:22
 msgid "Profile Match"
 msgstr "Profielovereenkomst"
@@ -5826,76 +5083,76 @@ msgstr "- kies map -"
 msgid "Your service plan only allows %d channels."
 msgstr "Jouw abonnement staat maar %d kanalen toe."
 
-#: ../../mod/import.php:51
+#: ../../mod/import.php:60
 msgid "Nothing to import."
 msgstr "Niets gevonden om te importeren"
 
-#: ../../mod/import.php:75
+#: ../../mod/import.php:84
 msgid "Unable to download data from old server"
 msgstr "Niet in staat om gegevens van de oude hub te downloaden"
 
-#: ../../mod/import.php:81
+#: ../../mod/import.php:90
 msgid "Imported file is empty."
 msgstr "Geïmporteerde bestand is leeg"
 
-#: ../../mod/import.php:106
+#: ../../mod/import.php:110
+msgid "The data provided is not compatible with this project."
+msgstr "De geïmporteerde gegevens zijn niet compatibel met dit project."
+
+#: ../../mod/import.php:115
+#, php-format
+msgid "Warning: Database versions differ by %1$d updates."
+msgstr "Waarschuwing: database-versies lopen %1$d updates achter."
+
+#: ../../mod/import.php:135
 msgid ""
 "Cannot create a duplicate channel identifier on this system. Import failed."
 msgstr "Kan geen dubbele kanaal-identificator op deze hub aanmaken. Importeren mislukt."
 
-#: ../../mod/import.php:127
-msgid "Unable to create a unique channel address. Import failed."
-msgstr "Niet in staat om een uniek kanaaladres aan te maken. Importeren is mislukt."
-
-#: ../../mod/import.php:147
+#: ../../mod/import.php:176
 msgid "Channel clone failed. Import failed."
 msgstr "Het klonen van het kanaal is mislukt. Importeren mislukt."
 
-#: ../../mod/import.php:157
+#: ../../mod/import.php:186
 msgid "Cloned channel not found. Import failed."
 msgstr "Gekloond kanaal niet gevonden. Importeren mislukt."
 
-#: ../../mod/import.php:475
-msgid "Import completed."
-msgstr "Import voltooid."
-
-#: ../../mod/import.php:487
+#: ../../mod/import.php:574
 msgid "You must be logged in to use this feature."
 msgstr "Je moet ingelogd zijn om dit onderdeel te kunnen gebruiken."
 
-#: ../../mod/import.php:492
+#: ../../mod/import.php:579
 msgid "Import Channel"
 msgstr "Kanaal importeren"
 
-#: ../../mod/import.php:493
+#: ../../mod/import.php:580
 msgid ""
 "Use this form to import an existing channel from a different server/hub. You"
 " may retrieve the channel identity from the old server/hub via the network "
-"or provide an export file. Only identity and connections/relationships will "
-"be imported. Importation of content is not yet available."
-msgstr "Gebruik dit formulier om een bestaand kanaal te importeren van een andere hub. Je kan de kanaal-identiteit van de oude hub via het netwerk ontvangen of een exportbestand verstrekken. Alleen de identiteit en de connecties zullen geïmporteerd worden. Het importeren van inhoud is nog niet beschikbaar."
+"or provide an export file."
+msgstr "Gebruik dit formulier om een bestaand kanaal te importeren van een andere hub. Je kan de kanaal-identiteit van de oude hub via het netwerk ontvangen of een exportbestand verstrekken."
 
-#: ../../mod/import.php:494
+#: ../../mod/import.php:581
 msgid "File to Upload"
 msgstr "Bestand om te uploaden"
 
-#: ../../mod/import.php:495
+#: ../../mod/import.php:582
 msgid "Or provide the old server/hub details"
 msgstr "Of vul de gegevens van de oude hub in"
 
-#: ../../mod/import.php:496
+#: ../../mod/import.php:583
 msgid "Your old identity address (xyz@example.com)"
 msgstr "Jouw oude kanaaladres (xyz@example.com)"
 
-#: ../../mod/import.php:497
+#: ../../mod/import.php:584
 msgid "Your old login email address"
 msgstr "Het e-mailadres van je oude account"
 
-#: ../../mod/import.php:498
+#: ../../mod/import.php:585
 msgid "Your old login password"
 msgstr "Wachtwoord van jouw oude account"
 
-#: ../../mod/import.php:499
+#: ../../mod/import.php:586
 msgid ""
 "For either option, please choose whether to make this hub your new primary "
 "address, or whether your old location should continue this role. You will be"
@@ -5903,52 +5160,39 @@ msgid ""
 "primary location for files, photos, and media."
 msgstr "Voor elke optie geldt dat je moet kiezen of je jouw primaire kanaaladres op deze hub wil instellen of dat jouw oude hub deze rol blijft vervullen."
 
-#: ../../mod/import.php:500
+#: ../../mod/import.php:587
 msgid "Make this hub my primary location"
 msgstr "Stel deze hub als mijn primaire locatie in"
 
-#: ../../mod/import.php:501
-msgid "Import existing posts if possible"
-msgstr "Importeer bestaande berichten (wanneer mogelijk)"
-
-#: ../../mod/editlayout.php:76 ../../mod/editwebpage.php:77
-#: ../../mod/editpost.php:20 ../../mod/editblock.php:78
-#: ../../mod/editblock.php:94
-msgid "Item not found"
-msgstr "Item niet gevonden"
+#: ../../mod/import.php:588
+msgid ""
+"Import existing posts if possible (experimental - limited by available "
+"memory"
+msgstr "Importeer bestaande berichten wanneer mogelijk (experimenteel - afhankelijk van hoeveelheid geheugen hub)"
 
-#: ../../mod/editlayout.php:106
-msgid "Edit Layout"
-msgstr "Lay-out bewerken"
+#: ../../mod/import.php:589
+msgid ""
+"This process may take several minutes to complete. Please submit the form "
+"only once and leave this page open until finished."
+msgstr "Dit proces kan enkele minuten in beslag nemen. Klik maar één keer op opslaan en verlaat deze pagina niet alvorens het proces is voltooid."
 
-#: ../../mod/editlayout.php:117
+#: ../../mod/editlayout.php:111
 msgid "Delete layout?"
 msgstr "Lay-out verwijderen?"
 
-#: ../../mod/editlayout.php:148 ../../mod/editwebpage.php:187
-#: ../../mod/editpost.php:122 ../../mod/editblock.php:150
-msgid "Insert YouTube video"
-msgstr "YouTube-video invoegen"
-
-#: ../../mod/editlayout.php:149 ../../mod/editwebpage.php:188
-#: ../../mod/editpost.php:123 ../../mod/editblock.php:151
-msgid "Insert Vorbis [.ogg] video"
-msgstr "Vorbis-video [.ogg] invoegen"
-
-#: ../../mod/editlayout.php:150 ../../mod/editwebpage.php:189
-#: ../../mod/editpost.php:124 ../../mod/editblock.php:152
-msgid "Insert Vorbis [.ogg] audio"
-msgstr "Vorbis-audio [.ogg] invoegen"
-
-#: ../../mod/editlayout.php:164 ../../mod/layouts.php:124
+#: ../../mod/editlayout.php:158 ../../mod/layouts.php:124
 msgid "Layout Description (Optional)"
 msgstr "Lay-out-omschrijving (optioneel)"
 
-#: ../../mod/editlayout.php:166 ../../mod/layouts.php:121
-#: ../../mod/layouts.php:178
+#: ../../mod/editlayout.php:160 ../../mod/layouts.php:121
+#: ../../mod/layouts.php:179
 msgid "Layout Name"
 msgstr "Naam lay-out"
 
+#: ../../mod/editlayout.php:177
+msgid "Edit Layout"
+msgstr "Lay-out bewerken"
+
 #: ../../mod/chat.php:19 ../../mod/channel.php:25
 msgid "You must be logged in to see this page."
 msgstr "Je moet zijn ingelogd om deze pagina te kunnen bekijken."
@@ -5990,6 +5234,126 @@ msgstr "Naam chatkanaal"
 msgid "%1$s's Chatrooms"
 msgstr "Chatkanalen van %1$s"
 
+#: ../../mod/mitem.php:24 ../../mod/menu.php:138
+msgid "Menu not found."
+msgstr "Menu niet gevonden."
+
+#: ../../mod/mitem.php:48
+msgid "Unable to create element."
+msgstr "Niet in staat om onderdeel aan te maken."
+
+#: ../../mod/mitem.php:72
+msgid "Unable to update menu element."
+msgstr "Menu-onderdeel kan niet worden geüpdatet."
+
+#: ../../mod/mitem.php:88
+msgid "Unable to add menu element."
+msgstr "Menu-onderdeel kan niet worden toegevoegd."
+
+#: ../../mod/mitem.php:154 ../../mod/mitem.php:226
+msgid "Menu Item Permissions"
+msgstr "Permissies menu-item"
+
+#: ../../mod/mitem.php:155 ../../mod/mitem.php:227 ../../mod/settings.php:1083
+msgid "(click to open/close)"
+msgstr "(klik om te openen/sluiten)"
+
+#: ../../mod/mitem.php:157 ../../mod/mitem.php:173
+msgid "Link Name"
+msgstr "Linknaam"
+
+#: ../../mod/mitem.php:158 ../../mod/mitem.php:231
+msgid "Link or Submenu Target"
+msgstr "Linkdoel of submenu-doel"
+
+#: ../../mod/mitem.php:158
+msgid "Enter URL of the link or select a menu name to create a submenu"
+msgstr "Geef de URL van de link of kies een menunaam om een submenu aan te maken"
+
+#: ../../mod/mitem.php:159 ../../mod/mitem.php:232
+msgid "Use magic-auth if available"
+msgstr "Gebruik magic-auth wanneer beschikbaar"
+
+#: ../../mod/mitem.php:160 ../../mod/mitem.php:233
+msgid "Open link in new window"
+msgstr "Open link in nieuw venster"
+
+#: ../../mod/mitem.php:161 ../../mod/mitem.php:234
+msgid "Order in list"
+msgstr "Volgorde in lijst"
+
+#: ../../mod/mitem.php:161 ../../mod/mitem.php:234
+msgid "Higher numbers will sink to bottom of listing"
+msgstr "Hogere nummers komen onderaan de lijst terecht"
+
+#: ../../mod/mitem.php:162
+msgid "Submit and finish"
+msgstr "Opslaan en afsluiten"
+
+#: ../../mod/mitem.php:163
+msgid "Submit and continue"
+msgstr "Opslaan en doorgaan"
+
+#: ../../mod/mitem.php:171
+msgid "Menu:"
+msgstr "Menu:"
+
+#: ../../mod/mitem.php:174
+msgid "Link Target"
+msgstr "Linkdoel"
+
+#: ../../mod/mitem.php:177
+msgid "Edit menu"
+msgstr "Menu bewerken"
+
+#: ../../mod/mitem.php:180
+msgid "Edit element"
+msgstr "Onderdeel bewerken"
+
+#: ../../mod/mitem.php:181
+msgid "Drop element"
+msgstr "Onderdeel verwijderen"
+
+#: ../../mod/mitem.php:182
+msgid "New element"
+msgstr "Nieuw element"
+
+#: ../../mod/mitem.php:183
+msgid "Edit this menu container"
+msgstr "Deze menu-container bewerken"
+
+#: ../../mod/mitem.php:184
+msgid "Add menu element"
+msgstr "Menu-element toevoegen"
+
+#: ../../mod/mitem.php:185
+msgid "Delete this menu item"
+msgstr "Dit menu-item verwijderen"
+
+#: ../../mod/mitem.php:186
+msgid "Edit this menu item"
+msgstr "Dit menu-item bewerken"
+
+#: ../../mod/mitem.php:203
+msgid "Menu item not found."
+msgstr "Menu-item niet gevonden."
+
+#: ../../mod/mitem.php:215
+msgid "Menu item deleted."
+msgstr "Menu-item verwijderd."
+
+#: ../../mod/mitem.php:217
+msgid "Menu item could not be deleted."
+msgstr "Menu-item kon niet worden verwijderd."
+
+#: ../../mod/mitem.php:224
+msgid "Edit Menu Element"
+msgstr "Menu-element bewerken"
+
+#: ../../mod/mitem.php:230
+msgid "Link text"
+msgstr "Linktekst"
+
 #: ../../mod/editwebpage.php:152
 msgid "Delete webpage?"
 msgstr "Webpagina verwijderen?"
@@ -6014,7 +5378,7 @@ msgstr "Geen geldige account gevonden."
 msgid "Password reset request issued. Check your email."
 msgstr "Het verzoek om je wachtwoord opnieuw in te stellen is behandeld. Controleer je e-mail."
 
-#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:102
+#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:103
 #, php-format
 msgid "Site Member (%s)"
 msgstr "Lid van hub (%s)"
@@ -6030,52 +5394,52 @@ msgid ""
 "Password reset failed."
 msgstr "Het verzoek kon niet worden geverifieerd. (Mogelijk heb je al eerder een verzoek ingediend.) Opnieuw instellen van wachtwoord is mislukt."
 
-#: ../../mod/lostpass.php:85 ../../boot.php:1548
+#: ../../mod/lostpass.php:86 ../../boot.php:1558
 msgid "Password Reset"
 msgstr "Wachtwoord vergeten?"
 
-#: ../../mod/lostpass.php:86
+#: ../../mod/lostpass.php:87
 msgid "Your password has been reset as requested."
 msgstr "Jouw wachtwoord is opnieuw ingesteld zoals je had verzocht."
 
-#: ../../mod/lostpass.php:87
+#: ../../mod/lostpass.php:88
 msgid "Your new password is"
 msgstr "Jouw nieuwe wachtwoord is"
 
-#: ../../mod/lostpass.php:88
+#: ../../mod/lostpass.php:89
 msgid "Save or copy your new password - and then"
 msgstr "Kopieer of sla je nieuwe wachtwoord op - en"
 
-#: ../../mod/lostpass.php:89
+#: ../../mod/lostpass.php:90
 msgid "click here to login"
 msgstr "klik dan hier om in te loggen"
 
-#: ../../mod/lostpass.php:90
+#: ../../mod/lostpass.php:91
 msgid ""
 "Your password may be changed from the <em>Settings</em> page after "
 "successful login."
 msgstr "Jouw wachtwoord kan worden veranderd onder <em>instellingen</em>, nadat je succesvol bent ingelogd."
 
-#: ../../mod/lostpass.php:107
+#: ../../mod/lostpass.php:108
 #, php-format
 msgid "Your password has changed at %s"
 msgstr "Jouw wachtwoord op %s is veranderd"
 
-#: ../../mod/lostpass.php:122
+#: ../../mod/lostpass.php:123
 msgid "Forgot your Password?"
 msgstr "Wachtwoord vergeten?"
 
-#: ../../mod/lostpass.php:123
+#: ../../mod/lostpass.php:124
 msgid ""
 "Enter your email address and submit to have your password reset. Then check "
 "your email for further instructions."
 msgstr "Voer je e-mailadres in en verstuur deze om je wachtwoord opnieuw in te stellen. Controleer hierna hier je e-mail voor verdere instructies."
 
-#: ../../mod/lostpass.php:124
+#: ../../mod/lostpass.php:125
 msgid "Email Address"
 msgstr "E-mailadres"
 
-#: ../../mod/lostpass.php:125
+#: ../../mod/lostpass.php:126
 msgid "Reset"
 msgstr "Opnieuw instellen"
 
@@ -6088,21 +5452,21 @@ msgstr "Website:"
 msgid "Remote Channel [%s] (not yet known on this site)"
 msgstr "Kanaal op afstand [%s] (nog niet op deze hub bekend)"
 
-#: ../../mod/rate.php:161 ../../mod/connedit.php:663
+#: ../../mod/rate.php:161
 msgid "Rating (this information is public)"
 msgstr "Beoordeling (deze informatie is openbaar)"
 
-#: ../../mod/rate.php:162 ../../mod/connedit.php:664
+#: ../../mod/rate.php:162
 msgid "Optionally explain your rating (this information is public)"
 msgstr "Verklaar jouw beoordeling (niet verplicht, deze informatie is openbaar)"
 
-#: ../../mod/editpost.php:31
-msgid "Item is not editable"
-msgstr "Item is niet te bewerken"
+#: ../../mod/editblock.php:117
+msgid "Delete block?"
+msgstr "Blok verwijderen"
 
-#: ../../mod/editpost.php:53
-msgid "Delete item?"
-msgstr "Item verwijderen?"
+#: ../../mod/editblock.php:179
+msgid "Edit Block"
+msgstr "Blok bewerken"
 
 #: ../../mod/invite.php:25
 msgid "Total invitation limit exceeded."
@@ -6150,20 +5514,21 @@ msgid "Your message:"
 msgstr "Jouw bericht:"
 
 #: ../../mod/invite.php:132
-msgid "Please join my community on RedMatrix."
-msgstr "Hierbij nodig ik je uit om mij, en andere vrienden en kennissen, op de RedMatrix te vergezellen. Lees meer over de RedMatrix op https://redmatrix.me."
+msgid "Please join my community on $Projectname."
+msgstr "Hierbij nodig ik je uit om mij, en andere vrienden en kennissen, op $Projectname te vergezellen. Lees meer over $Projectname  op https://redmatrix.me."
 
 #: ../../mod/invite.php:134
 msgid "You will need to supply this invitation code: "
 msgstr "Je moet deze uitnodigingscode opgeven:"
 
 #: ../../mod/invite.php:135
-msgid "1. Register at any RedMatrix location (they are all inter-connected)"
-msgstr "1. Registreer je op een willekeurige RedMatrix-hub (ze zijn allemaal onderling met elkaar verbonden):"
+msgid ""
+"1. Register at any $Projectname location (they are all inter-connected)"
+msgstr "1. Registreer je op een willekeurige $Projectname-hub (ze zijn allemaal onderling met elkaar verbonden):"
 
 #: ../../mod/invite.php:137
-msgid "2. Enter my RedMatrix network address into the site searchbar."
-msgstr "2. Nadat je bent ingelogd en een kanaal hebt aangemaakt kan je mijn kanaaladres in het zoekveld invullen:"
+msgid "2. Enter my $Projectname network address into the site searchbar."
+msgstr "2. Nadat je bent ingelogd en een kanaal hebt aangemaakt kan je mijn $Projectname-kanaaladres in het zoekveld invullen:"
 
 #: ../../mod/invite.php:138
 msgid "or visit "
@@ -6264,102 +5629,94 @@ msgstr "Bron verwijderd"
 msgid "Unable to remove source."
 msgstr "Verwijderen bron mislukt."
 
-#: ../../mod/menu.php:44
+#: ../../mod/menu.php:45
 msgid "Unable to update menu."
 msgstr "Niet in staat om menu aan te passen"
 
-#: ../../mod/menu.php:53
+#: ../../mod/menu.php:56
 msgid "Unable to create menu."
 msgstr "Niet in staat om menu aan te maken."
 
-#: ../../mod/menu.php:86 ../../mod/menu.php:98
+#: ../../mod/menu.php:92 ../../mod/menu.php:104
 msgid "Menu Name"
 msgstr "Menunaam"
 
-#: ../../mod/menu.php:86
+#: ../../mod/menu.php:92
 msgid "Unique name (not visible on webpage) - required"
 msgstr "Unieke naam vereist (niet zichtbaar op webpagina)"
 
-#: ../../mod/menu.php:87 ../../mod/menu.php:99
+#: ../../mod/menu.php:93 ../../mod/menu.php:105
 msgid "Menu Title"
 msgstr "Menutitel"
 
-#: ../../mod/menu.php:87
+#: ../../mod/menu.php:93
 msgid "Visible on webpage - leave empty for no title"
 msgstr "Zichtbaar op webpagina (leeg laten voor geen titel)"
 
-#: ../../mod/menu.php:88
+#: ../../mod/menu.php:94
 msgid "Allow Bookmarks"
 msgstr "Bladwijzers toestaan"
 
-#: ../../mod/menu.php:88 ../../mod/menu.php:140
+#: ../../mod/menu.php:94 ../../mod/menu.php:151
 msgid "Menu may be used to store saved bookmarks"
 msgstr "Menu kan gebruikt worden om bladwijzers in op te slaan"
 
-#: ../../mod/menu.php:89
+#: ../../mod/menu.php:95 ../../mod/menu.php:153
 msgid "Submit and proceed"
 msgstr "Opslaan en doorgaan"
 
-#: ../../mod/menu.php:101
+#: ../../mod/menu.php:107
 msgid "Drop"
 msgstr "Verwijderen"
 
-#: ../../mod/menu.php:103
+#: ../../mod/menu.php:111
 msgid "Bookmarks allowed"
 msgstr "Bladwijzers toegestaan"
 
-#: ../../mod/menu.php:105
+#: ../../mod/menu.php:113
 msgid "Delete this menu"
 msgstr "Menu verwijderen"
 
-#: ../../mod/menu.php:106 ../../mod/menu.php:137
+#: ../../mod/menu.php:114 ../../mod/menu.php:148
 msgid "Edit menu contents"
 msgstr "Bewerk de inhoud van het menu"
 
-#: ../../mod/menu.php:107
+#: ../../mod/menu.php:115
 msgid "Edit this menu"
 msgstr "Dit menu bewerken"
 
-#: ../../mod/menu.php:121
+#: ../../mod/menu.php:130
 msgid "Menu could not be deleted."
 msgstr "Menu kon niet verwijderd worden."
 
-#: ../../mod/menu.php:129 ../../mod/mitem.php:24
-msgid "Menu not found."
-msgstr "Menu niet gevonden."
-
-#: ../../mod/menu.php:134
+#: ../../mod/menu.php:143
 msgid "Edit Menu"
 msgstr "Menu bewerken"
 
-#: ../../mod/menu.php:136
+#: ../../mod/menu.php:147
 msgid "Add or remove entries to this menu"
 msgstr "Items aan dit menu toevoegen of verwijder"
 
-#: ../../mod/menu.php:138
+#: ../../mod/menu.php:149
 msgid "Menu name"
 msgstr "Naam van menu"
 
-#: ../../mod/menu.php:138
+#: ../../mod/menu.php:149
 msgid "Must be unique, only seen by you"
 msgstr "Moet uniek zijn en is alleen zichtbaar voor jou."
 
-#: ../../mod/menu.php:139
+#: ../../mod/menu.php:150
 msgid "Menu title"
 msgstr "Titel van menu"
 
-#: ../../mod/menu.php:139
+#: ../../mod/menu.php:150
 msgid "Menu title as seen by others"
 msgstr "Titel van menu zoals anderen dat zien."
 
-#: ../../mod/menu.php:140
+#: ../../mod/menu.php:151
 msgid "Allow bookmarks"
 msgstr "Bladwijzers toestaan"
 
-#: ../../mod/menu.php:142
-msgid "Modify"
-msgstr "Wijzigen"
-
 #: ../../mod/filestorage.php:82
 msgid "Permission Denied."
 msgstr "Toegang geweigerd"
@@ -6461,23 +5818,16 @@ msgstr "Klik op een connectie om deze toe te voegen of te verwijderen"
 msgid "Visible To"
 msgstr "Zichtbaar voor"
 
-#: ../../mod/impel.php:33
-msgid "webpage"
-msgstr "Webpagina"
-
-#: ../../mod/impel.php:38
-msgid "block"
-msgstr "blok"
-
-#: ../../mod/impel.php:43
-msgid "layout"
-msgstr "lay-out"
-
-#: ../../mod/impel.php:117
+#: ../../mod/impel.php:191
 #, php-format
 msgid "%s element installed"
 msgstr "%s onderdeel geïnstalleerd"
 
+#: ../../mod/impel.php:194
+#, php-format
+msgid "%s element installation failed"
+msgstr "Installatie %s-element mislukt"
+
 #: ../../mod/profiles.php:18 ../../mod/profiles.php:174
 #: ../../mod/profiles.php:231 ../../mod/profiles.php:600
 msgid "Profile not found."
@@ -6545,13 +5895,13 @@ msgstr "Seksuele voorkeur"
 
 #: ../../mod/profiles.php:439
 msgid "Homepage"
-msgstr "Homepage"
+msgstr "Homepagina"
 
 #: ../../mod/profiles.php:443
 msgid "Interests"
 msgstr "Interesses"
 
-#: ../../mod/profiles.php:447 ../../mod/admin.php:953
+#: ../../mod/profiles.php:447 ../../mod/admin.php:994
 msgid "Address"
 msgstr "Kanaaladres"
 
@@ -6653,7 +6003,7 @@ msgstr "Sinds [datum]:"
 
 #: ../../mod/profiles.php:692
 msgid "Homepage URL:"
-msgstr "Adres homepage:"
+msgstr "URL homepagina:"
 
 #: ../../mod/profiles.php:695
 msgid "Religious Views:"
@@ -6719,7 +6069,7 @@ msgstr "School/onderwijs"
 msgid "This is your default profile."
 msgstr "Dit is jouw standaardprofiel"
 
-#: ../../mod/profiles.php:728 ../../mod/directory.php:218
+#: ../../mod/profiles.php:728
 msgid "Age: "
 msgstr "Leeftijd:"
 
@@ -6741,11 +6091,11 @@ msgstr "Geen beoordelingen"
 
 #: ../../mod/ratings.php:99
 msgid "Ratings"
-msgstr "Waarderingen"
+msgstr "Beoordelingen"
 
 #: ../../mod/ratings.php:100
 msgid "Rating: "
-msgstr "Waardering: "
+msgstr "Beoordeling:"
 
 #: ../../mod/ratings.php:101
 msgid "Website: "
@@ -6759,203 +6109,427 @@ msgstr "Omschrijving: "
 msgid "Source of Item"
 msgstr "Bron van item"
 
-#: ../../mod/mitem.php:51
-msgid "Unable to create element."
-msgstr "Niet in staat om onderdeel aan te maken."
+#: ../../mod/setup.php:187
+msgid "$Projectname Server - Setup"
+msgstr "$Projectname Server - Setup"
 
-#: ../../mod/mitem.php:74
-msgid "Unable to update menu element."
-msgstr "Menu-onderdeel kan niet worden geüpdatet."
+#: ../../mod/setup.php:191
+msgid "Could not connect to database."
+msgstr "Could not connect to database."
 
-#: ../../mod/mitem.php:89
-msgid "Unable to add menu element."
-msgstr "Menu-onderdeel kan niet worden toegevoegd."
+#: ../../mod/setup.php:195
+msgid ""
+"Could not connect to specified site URL. Possible SSL certificate or DNS "
+"issue."
+msgstr "Could not connect to specified hub URL. Possible SSL certificate or DNS issue."
 
-#: ../../mod/mitem.php:151 ../../mod/mitem.php:220
-msgid "Menu Item Permissions"
-msgstr "Permissies menu-item"
+#: ../../mod/setup.php:202
+msgid "Could not create table."
+msgstr "Could not create table."
 
-#: ../../mod/mitem.php:154 ../../mod/mitem.php:168
-msgid "Link Name"
-msgstr "Linknaam"
+#: ../../mod/setup.php:207
+msgid "Your site database has been installed."
+msgstr "Your hub database has been installed."
 
-#: ../../mod/mitem.php:155 ../../mod/mitem.php:169
-msgid "Link Target"
-msgstr "Linkdoel"
+#: ../../mod/setup.php:211
+msgid ""
+"You may need to import the file \"install/schema_xxx.sql\" manually using a "
+"database client."
+msgstr "You may need to import the file \"install/schema_xxx.sql\" manually using a database client."
 
-#: ../../mod/mitem.php:156 ../../mod/mitem.php:226
-msgid "Use RedMatrix magic-auth if available"
-msgstr "Gebruik RedMatrix' magic-auth wanneer beschikbaar"
+#: ../../mod/setup.php:212 ../../mod/setup.php:280 ../../mod/setup.php:730
+msgid "Please see the file \"install/INSTALL.txt\"."
+msgstr "Please see the file \"install/INSTALL.txt\"."
 
-#: ../../mod/mitem.php:157 ../../mod/mitem.php:227
-msgid "Open link in new window"
-msgstr "Open link in nieuw venster"
+#: ../../mod/setup.php:277
+msgid "System check"
+msgstr "System check"
 
-#: ../../mod/mitem.php:158 ../../mod/mitem.php:228
-msgid "Order in list"
-msgstr "Volgorde in lijst"
+#: ../../mod/setup.php:282
+msgid "Check again"
+msgstr "Check again"
 
-#: ../../mod/mitem.php:158 ../../mod/mitem.php:228
-msgid "Higher numbers will sink to bottom of listing"
-msgstr "Hogere nummers komen onderaan de lijst terecht"
+#: ../../mod/setup.php:304
+msgid "Database connection"
+msgstr "Database connection"
 
-#: ../../mod/mitem.php:159
-msgid "Submit and finish"
-msgstr "Opslaan en afsluiten"
+#: ../../mod/setup.php:305
+msgid ""
+"In order to install $Projectname we need to know how to connect to your "
+"database."
+msgstr "In order to install $Projectname we need to know how to connect to your database."
 
-#: ../../mod/mitem.php:160
-msgid "Submit and continue"
-msgstr "Opslaan en doorgaan"
+#: ../../mod/setup.php:306
+msgid ""
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
+msgstr "Please contact your hosting provider or site administrator if you have questions about these settings."
 
-#: ../../mod/mitem.php:166
-msgid "Menu:"
-msgstr "Menu:"
+#: ../../mod/setup.php:307
+msgid ""
+"The database you specify below should already exist. If it does not, please "
+"create it before continuing."
+msgstr "The database you specify below should already exist. If it does not, please create it before continuing."
 
-#: ../../mod/mitem.php:172
-msgid "Edit menu"
-msgstr "Menu bewerken"
+#: ../../mod/setup.php:311
+msgid "Database Server Name"
+msgstr "Database Server Name"
 
-#: ../../mod/mitem.php:175
-msgid "Edit element"
-msgstr "Onderdeel bewerken"
+#: ../../mod/setup.php:311
+msgid "Default is localhost"
+msgstr "Default is localhost"
 
-#: ../../mod/mitem.php:176
-msgid "Drop element"
-msgstr "Onderdeel verwijderen"
+#: ../../mod/setup.php:312
+msgid "Database Port"
+msgstr "Database Port"
 
-#: ../../mod/mitem.php:177
-msgid "New element"
-msgstr "Nieuw element"
+#: ../../mod/setup.php:312
+msgid "Communication port number - use 0 for default"
+msgstr "Communication port number - use 0 for default"
 
-#: ../../mod/mitem.php:178
-msgid "Edit this menu container"
-msgstr "Deze menu-container bewerken"
+#: ../../mod/setup.php:313
+msgid "Database Login Name"
+msgstr "Database Login Name"
 
-#: ../../mod/mitem.php:179
-msgid "Add menu element"
-msgstr "Menu-element toevoegen"
+#: ../../mod/setup.php:314
+msgid "Database Login Password"
+msgstr "Database Login Password"
 
-#: ../../mod/mitem.php:180
-msgid "Delete this menu item"
-msgstr "Dit menu-item verwijderen"
+#: ../../mod/setup.php:315
+msgid "Database Name"
+msgstr "Database Name"
 
-#: ../../mod/mitem.php:181
-msgid "Edit this menu item"
-msgstr "Dit menu-item bewerken"
+#: ../../mod/setup.php:316
+msgid "Database Type"
+msgstr "Database Type"
 
-#: ../../mod/mitem.php:198
-msgid "Menu item not found."
-msgstr "Menu-item niet gevonden."
+#: ../../mod/setup.php:318 ../../mod/setup.php:359
+msgid "Site administrator email address"
+msgstr "Hub administrator email address"
 
-#: ../../mod/mitem.php:209
-msgid "Menu item deleted."
-msgstr "Menu-item verwijderd."
+#: ../../mod/setup.php:318 ../../mod/setup.php:359
+msgid ""
+"Your account email address must match this in order to use the web admin "
+"panel."
+msgstr "Your account email address must match this in order to use the web admin panel."
 
-#: ../../mod/mitem.php:211
-msgid "Menu item could not be deleted."
-msgstr "Menu-item kon niet worden verwijderd."
+#: ../../mod/setup.php:319 ../../mod/setup.php:361
+msgid "Website URL"
+msgstr "Hub URL"
 
-#: ../../mod/mitem.php:218
-msgid "Edit Menu Element"
-msgstr "Menu-element bewerken"
+#: ../../mod/setup.php:319 ../../mod/setup.php:361
+msgid "Please use SSL (https) URL if available."
+msgstr "Please use SSL (https) URL if available."
 
-#: ../../mod/mitem.php:224
-msgid "Link text"
-msgstr "Linktekst"
+#: ../../mod/setup.php:321 ../../mod/setup.php:363
+msgid "Please select a default timezone for your website"
+msgstr "Please select a default timezone for your hub"
 
-#: ../../mod/mitem.php:225
-msgid "URL of link"
-msgstr "URL of link"
+#: ../../mod/setup.php:348
+msgid "Site settings"
+msgstr "Hub settings"
 
-#: ../../mod/openid.php:26
-msgid "OpenID protocol error. No ID returned."
-msgstr "OpenID-protocolfout. Geen ID terugontvangen."
+#: ../../mod/setup.php:413
+msgid "Could not find a command line version of PHP in the web server PATH."
+msgstr "Could not find a command line version of PHP in the web server PATH."
 
-#: ../../mod/openid.php:72 ../../mod/openid.php:180 ../../mod/post.php:286
-#, php-format
-msgid "Welcome %s. Remote authentication successful."
-msgstr "Welkom %s. Authenticatie op afstand geslaagd."
+#: ../../mod/setup.php:414
+msgid ""
+"If you don't have a command line version of PHP installed on server, you "
+"will not be able to run background polling via cron."
+msgstr "If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron."
+
+#: ../../mod/setup.php:418
+msgid "PHP executable path"
+msgstr "PHP executable path"
+
+#: ../../mod/setup.php:418
+msgid ""
+"Enter full path to php executable. You can leave this blank to continue the "
+"installation."
+msgstr "Enter full path to php executable. You can leave this blank to continue the installation."
+
+#: ../../mod/setup.php:423
+msgid "Command line PHP"
+msgstr "Command line PHP"
+
+#: ../../mod/setup.php:432
+msgid ""
+"The command line version of PHP on your system does not have "
+"\"register_argc_argv\" enabled."
+msgstr "The command line version of PHP on your system does not have \"register_argc_argv\" enabled."
+
+#: ../../mod/setup.php:433
+msgid "This is required for message delivery to work."
+msgstr "This is required for message delivery to work."
+
+#: ../../mod/setup.php:436
+msgid "PHP register_argc_argv"
+msgstr "PHP register_argc_argv"
 
-#: ../../mod/directory.php:224
+#: ../../mod/setup.php:454
 #, php-format
-msgid "%d rating"
-msgid_plural "%d ratings"
-msgstr[0] "%d beoordeling"
-msgstr[1] "%d beoordelingen"
+msgid ""
+"Your max allowed total upload size is set to %s. Maximum size of one file to"
+" upload is set to %s. You are allowed to upload up to %d files at once."
+msgstr "Your max allowed total upload size is set to %s. Maximum size of one file to upload is set to %s. You are allowed to upload up to %d files at once."
 
-#: ../../mod/directory.php:236
-msgid "Gender: "
-msgstr "Geslacht:"
+#: ../../mod/setup.php:459
+msgid "You can adjust these settings in the servers php.ini."
+msgstr "You can adjust these settings in the servers php.ini."
 
-#: ../../mod/directory.php:238
-msgid "Status: "
-msgstr "Status: "
+#: ../../mod/setup.php:461
+msgid "PHP upload limits"
+msgstr "PHP upload limits"
 
-#: ../../mod/directory.php:240
-msgid "Homepage: "
-msgstr "Homepage: "
+#: ../../mod/setup.php:484
+msgid ""
+"Error: the \"openssl_pkey_new\" function on this system is not able to "
+"generate encryption keys"
+msgstr "Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"
 
-#: ../../mod/directory.php:243
-msgid "Hometown: "
-msgstr "Oorspronkelijk uit: "
+#: ../../mod/setup.php:485
+msgid ""
+"If running under Windows, please see "
+"\"http://www.php.net/manual/en/openssl.installation.php\"."
+msgstr "If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."
 
-#: ../../mod/directory.php:245
-msgid "About: "
-msgstr "Over: "
+#: ../../mod/setup.php:488
+msgid "Generate encryption keys"
+msgstr "Generate encryption keys"
 
-#: ../../mod/directory.php:303
-msgid "Public Forum:"
-msgstr "Openbaar forum:"
+#: ../../mod/setup.php:500
+msgid "libCurl PHP module"
+msgstr "libCurl PHP module"
 
-#: ../../mod/directory.php:306
-msgid "Keywords: "
-msgstr "Trefwoorden: "
+#: ../../mod/setup.php:501
+msgid "GD graphics PHP module"
+msgstr "GD graphics PHP module"
+
+#: ../../mod/setup.php:502
+msgid "OpenSSL PHP module"
+msgstr "OpenSSL PHP module"
+
+#: ../../mod/setup.php:503
+msgid "mysqli or postgres PHP module"
+msgstr "mysqli or postgres PHP module"
+
+#: ../../mod/setup.php:504
+msgid "mb_string PHP module"
+msgstr "mb_string PHP module"
 
-#: ../../mod/directory.php:311
+#: ../../mod/setup.php:505
+msgid "mcrypt PHP module"
+msgstr "mcrypt PHP module"
+
+#: ../../mod/setup.php:506
+msgid "xml PHP module"
+msgstr "xml PHP module"
+
+#: ../../mod/setup.php:510 ../../mod/setup.php:512
+msgid "Apache mod_rewrite module"
+msgstr "Apache mod_rewrite module"
+
+#: ../../mod/setup.php:510
+msgid ""
+"Error: Apache webserver mod-rewrite module is required but not installed."
+msgstr "Error: Apache webserver mod-rewrite module is required but not installed."
+
+#: ../../mod/setup.php:516 ../../mod/setup.php:519
+msgid "proc_open"
+msgstr "proc_open"
+
+#: ../../mod/setup.php:516
+msgid ""
+"Error: proc_open is required but is either not installed or has been "
+"disabled in php.ini"
+msgstr "Error: proc_open is required but is either not installed or has been disabled in php.ini"
+
+#: ../../mod/setup.php:524
+msgid "Error: libCURL PHP module required but not installed."
+msgstr "Error: libCURL PHP module required but not installed."
+
+#: ../../mod/setup.php:528
+msgid ""
+"Error: GD graphics PHP module with JPEG support required but not installed."
+msgstr "Error: GD graphics PHP module with JPEG support required but not installed."
+
+#: ../../mod/setup.php:532
+msgid "Error: openssl PHP module required but not installed."
+msgstr "Error: openssl PHP module required but not installed."
+
+#: ../../mod/setup.php:536
+msgid ""
+"Error: mysqli or postgres PHP module required but neither are installed."
+msgstr "Error: mysqli or postgres PHP module required but neither are installed."
+
+#: ../../mod/setup.php:540
+msgid "Error: mb_string PHP module required but not installed."
+msgstr "Error: mb_string PHP module required but not installed."
+
+#: ../../mod/setup.php:544
+msgid "Error: mcrypt PHP module required but not installed."
+msgstr "Error: mcrypt PHP module required but not installed."
+
+#: ../../mod/setup.php:548
+msgid "Error: xml PHP module required for DAV but not installed."
+msgstr "Error: xml PHP module required for DAV but not installed."
+
+#: ../../mod/setup.php:566
+msgid ""
+"The web installer needs to be able to create a file called \".htconfig.php\""
+" in the top folder of your web server and it is unable to do so."
+msgstr "The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so."
+
+#: ../../mod/setup.php:567
+msgid ""
+"This is most often a permission setting, as the web server may not be able "
+"to write files in your folder - even if you can."
+msgstr "This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."
+
+#: ../../mod/setup.php:568
+msgid ""
+"At the end of this procedure, we will give you a text to save in a file "
+"named .htconfig.php in your Red top folder."
+msgstr "At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Red top folder."
+
+#: ../../mod/setup.php:569
+msgid ""
+"You can alternatively skip this procedure and perform a manual installation."
+" Please see the file \"install/INSTALL.txt\" for instructions."
+msgstr "You can alternatively skip this procedure and perform a manual installation. Please see the file \"install/INSTALL.txt\" for instructions."
+
+#: ../../mod/setup.php:572
+msgid ".htconfig.php is writable"
+msgstr ".htconfig.php is writable"
+
+#: ../../mod/setup.php:586
+msgid ""
+"Red uses the Smarty3 template engine to render its web views. Smarty3 "
+"compiles templates to PHP to speed up rendering."
+msgstr "Red uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."
+
+#: ../../mod/setup.php:587
 #, php-format
-msgid "Common connections: %s"
-msgstr "Gemeenschappelijke connecties: %s"
+msgid ""
+"In order to store these compiled templates, the web server needs to have "
+"write access to the directory %s under the Red top level folder."
+msgstr "In order to store these compiled templates, the web server needs to have write access to the directory %s under the Red top level folder."
 
-#: ../../mod/directory.php:363
-msgid "Finding:"
-msgstr "Gezocht naar:"
+#: ../../mod/setup.php:588 ../../mod/setup.php:609
+msgid ""
+"Please ensure that the user that your web server runs as (e.g. www-data) has"
+" write access to this folder."
+msgstr "Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."
 
-#: ../../mod/directory.php:368
-msgid "next page"
-msgstr "volgende pagina"
+#: ../../mod/setup.php:589
+#, php-format
+msgid ""
+"Note: as a security measure, you should give the web server write access to "
+"%s only--not the template files (.tpl) that it contains."
+msgstr "Note: as a security measure, you should give the web server write access to %s only--not the template files (.tpl) that it contains."
 
-#: ../../mod/directory.php:368
-msgid "previous page"
-msgstr "vorige pagina"
+#: ../../mod/setup.php:592
+#, php-format
+msgid "%s is writable"
+msgstr "%s is writable"
 
-#: ../../mod/directory.php:385
-msgid "No entries (some entries may be hidden)."
-msgstr "Niets gevonden (sommige kanalen kunnen verborgen zijn)."
+#: ../../mod/setup.php:608
+msgid ""
+"Red uses the store directory to save uploaded files. The web server needs to"
+" have write access to the store directory under the Red top level folder"
+msgstr "Red uses the store directory to save uploaded files. The web server needs to have write access to the store directory under the Red top level folder"
 
-#: ../../mod/uexport.php:33 ../../mod/uexport.php:34
-msgid "Export Channel"
-msgstr "Kanaal exporteren"
+#: ../../mod/setup.php:612
+msgid "store is writable"
+msgstr "store is writable"
 
-#: ../../mod/uexport.php:35
+#: ../../mod/setup.php:645
 msgid ""
-"Export your basic channel information to a small file.  This acts as a "
-"backup of your connections, permissions, profile and basic data, which can "
-"be used to import your data to a new hub, but\tdoes not contain your "
-"content."
-msgstr "Exporteer de basisinformatie van jouw kanaal naar een klein bestand. Dit fungeert als een back-up van jouw connecties, permissies, profiel en basisgegevens, die gebruikt kan worden om op een nieuwe hub jouw gegevens te importeren. Deze back-up bevat echter niet de inhoud van jouw kanaal."
+"SSL certificate cannot be validated. Fix certificate or disable https access"
+" to this site."
+msgstr "SSL certificate cannot be validated. Fix certificate or disable https access to this hub."
 
-#: ../../mod/uexport.php:36
-msgid "Export Content"
-msgstr "Inhoud exporteren"
+#: ../../mod/setup.php:646
+msgid ""
+"If you have https access to your website or allow connections to TCP port "
+"443 (the https: port), you MUST use a browser-valid certificate. You MUST "
+"NOT use self-signed certificates!"
+msgstr "If you have https access to your hub or allow connections to TCP port 443 (the https: port), you MUST use a browser-valid certificate. You MUST NOT use self-signed certificates!"
+
+#: ../../mod/setup.php:647
+msgid ""
+"This restriction is incorporated because public posts from you may for "
+"example contain references to images on your own hub."
+msgstr "This restriction is incorporated because public posts from you may for example contain references to images on your own hub."
+
+#: ../../mod/setup.php:648
+msgid ""
+"If your certificate is not recognized, members of other sites (who may "
+"themselves have valid certificates) will get a warning message on their own "
+"site complaining about security issues."
+msgstr "If your certificate is not recognized, members of other hubs (who may themselves have valid certificates) will get a warning message on their own hub complaining about security issues."
+
+#: ../../mod/setup.php:649
+msgid ""
+"This can cause usability issues elsewhere (not just on your own site) so we "
+"must insist on this requirement."
+msgstr "This can cause usability issues elsewhere (not just on your own hub) so we must insist on this requirement."
+
+#: ../../mod/setup.php:650
+msgid ""
+"Providers are available that issue free certificates which are browser-"
+"valid."
+msgstr "Providers are available that issue free certificates which are browser-valid."
+
+#: ../../mod/setup.php:652
+msgid "SSL certificate validation"
+msgstr "SSL certificate validation"
+
+#: ../../mod/setup.php:658
+msgid ""
+"Url rewrite in .htaccess is not working. Check your server "
+"configuration.Test: "
+msgstr "Url rewrite in .htaccess is not working. Check your server configuration.Test: "
 
-#: ../../mod/uexport.php:37
+#: ../../mod/setup.php:661
+msgid "Url rewrite is working"
+msgstr "Url rewrite is working"
+
+#: ../../mod/setup.php:670
+msgid ""
+"The database configuration file \".htconfig.php\" could not be written. "
+"Please use the enclosed text to create a configuration file in your web "
+"server root."
+msgstr "The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."
+
+#: ../../mod/setup.php:694
+msgid "Errors encountered creating database tables."
+msgstr "Errors encountered creating database tables."
+
+#: ../../mod/setup.php:728
+msgid "<h1>What next</h1>"
+msgstr "<h1>Wat nu</h1>"
+
+#: ../../mod/setup.php:729
 msgid ""
-"Export your channel information and all the content to a JSON backup. This "
-"backs up all of your connections, permissions, profile data and all of your "
-"content, but is generally not suitable for importing a channel to a new hub "
-"as this file may be VERY large.  Please be patient - it may take several "
-"minutes for this download to begin."
-msgstr "Exporteer informatie en alle inhoud van jouw kanaal naar een JSON-back-up. Dit slaat al jouw connecties, permissies, profielgegevens en de volledige inhoud van jouw kanaal op, maar is in het algemeen niet geschikt om op een nieuwe hub te importeren, omdat dit bestand ZEER groot kan worden. Wees geduldig - het kan enkele minuten duren voordat de download begint."
+"IMPORTANT: You will need to [manually] setup a scheduled task for the "
+"poller."
+msgstr "IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
+
+#: ../../mod/openid.php:26
+msgid "OpenID protocol error. No ID returned."
+msgstr "OpenID-protocolfout. Geen ID terugontvangen."
+
+#: ../../mod/openid.php:72 ../../mod/openid.php:180 ../../mod/post.php:287
+#, php-format
+msgid "Welcome %s. Remote authentication successful."
+msgstr "Welkom %s. Authenticatie op afstand geslaagd."
+
+#: ../../mod/tagger.php:96
+#, php-format
+msgid "%1$s tagged %2$s's %3$s with %4$s"
+msgstr "%1$s heeft het %3$s van %2$s getagd met %4$s"
 
 #: ../../mod/viewconnections.php:62
 msgid "No connections."
@@ -6974,7 +6548,7 @@ msgstr "ongeldig doelkenmerk"
 msgid "Theme settings updated."
 msgstr "Thema-instellingen bijgewerkt."
 
-#: ../../mod/admin.php:93 ../../mod/admin.php:445
+#: ../../mod/admin.php:93 ../../mod/admin.php:452
 msgid "Site"
 msgstr "Hub-instellingen"
 
@@ -6982,15 +6556,15 @@ msgstr "Hub-instellingen"
 msgid "Accounts"
 msgstr "Accounts"
 
-#: ../../mod/admin.php:95 ../../mod/admin.php:945
+#: ../../mod/admin.php:95 ../../mod/admin.php:985
 msgid "Channels"
 msgstr "Kanalen"
 
-#: ../../mod/admin.php:96 ../../mod/admin.php:1036 ../../mod/admin.php:1076
+#: ../../mod/admin.php:96 ../../mod/admin.php:1077 ../../mod/admin.php:1117
 msgid "Plugins"
 msgstr "Plug-ins"
 
-#: ../../mod/admin.php:97 ../../mod/admin.php:1236 ../../mod/admin.php:1270
+#: ../../mod/admin.php:97 ../../mod/admin.php:1277 ../../mod/admin.php:1311
 msgid "Themes"
 msgstr "Thema's"
 
@@ -7006,7 +6580,7 @@ msgstr "Profielconfiguratie"
 msgid "DB updates"
 msgstr "Database-updates"
 
-#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1355
+#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1396
 msgid "Logs"
 msgstr "Logboeken"
 
@@ -7050,10 +6624,10 @@ msgstr "# klonen"
 msgid "Message queues"
 msgstr "Berichtenwachtrij"
 
-#: ../../mod/admin.php:240 ../../mod/admin.php:444 ../../mod/admin.php:539
-#: ../../mod/admin.php:808 ../../mod/admin.php:944 ../../mod/admin.php:1035
-#: ../../mod/admin.php:1075 ../../mod/admin.php:1235 ../../mod/admin.php:1269
-#: ../../mod/admin.php:1354
+#: ../../mod/admin.php:240 ../../mod/admin.php:451 ../../mod/admin.php:548
+#: ../../mod/admin.php:817 ../../mod/admin.php:984 ../../mod/admin.php:1076
+#: ../../mod/admin.php:1116 ../../mod/admin.php:1276 ../../mod/admin.php:1310
+#: ../../mod/admin.php:1395
 msgid "Administration"
 msgstr "Beheer"
 
@@ -7065,7 +6639,7 @@ msgstr "Samenvatting"
 msgid "Registered accounts"
 msgstr "Geregistreerde accounts"
 
-#: ../../mod/admin.php:245 ../../mod/admin.php:543
+#: ../../mod/admin.php:245 ../../mod/admin.php:552
 msgid "Pending registrations"
 msgstr "Accounts die op goedkeuring wachten"
 
@@ -7073,7 +6647,7 @@ msgstr "Accounts die op goedkeuring wachten"
 msgid "Registered channels"
 msgstr "Geregistreerde kanalen"
 
-#: ../../mod/admin.php:247 ../../mod/admin.php:544
+#: ../../mod/admin.php:247 ../../mod/admin.php:553
 msgid "Active plugins"
 msgstr "Ingeschakelde plug-ins"
 
@@ -7081,629 +6655,680 @@ msgstr "Ingeschakelde plug-ins"
 msgid "Version"
 msgstr "Versie"
 
-#: ../../mod/admin.php:359
+#: ../../mod/admin.php:363
 msgid "Site settings updated."
 msgstr "Hub-instellingen bijgewerkt."
 
-#: ../../mod/admin.php:398
+#: ../../mod/admin.php:400 ../../mod/settings.php:813
+msgid "mobile"
+msgstr "mobiel"
+
+#: ../../mod/admin.php:402
 msgid "experimental"
 msgstr "experimenteel"
 
-#: ../../mod/admin.php:400
+#: ../../mod/admin.php:404
 msgid "unsupported"
 msgstr "Niet ondersteund"
 
-#: ../../mod/admin.php:425
+#: ../../mod/admin.php:429
 msgid "Yes - with approval"
 msgstr "Ja - met goedkeuring"
 
-#: ../../mod/admin.php:431
+#: ../../mod/admin.php:435
 msgid "My site is not a public server"
 msgstr "Mijn $Projectname-hub is niet openbaar"
 
-#: ../../mod/admin.php:432
+#: ../../mod/admin.php:436
 msgid "My site has paid access only"
 msgstr "Mijn $Projectname-hub kent alleen betaalde toegang"
 
-#: ../../mod/admin.php:433
+#: ../../mod/admin.php:437
 msgid "My site has free access only"
 msgstr "Mijn $Projectname-hub kent alleen gratis toegang"
 
-#: ../../mod/admin.php:434
+#: ../../mod/admin.php:438
 msgid "My site offers free accounts with optional paid upgrades"
 msgstr "Mijn $Projectname-hub biedt gratis accounts aan met betaalde uitbreidingen als optie"
 
-#: ../../mod/admin.php:447 ../../mod/register.php:207
+#: ../../mod/admin.php:454 ../../mod/register.php:207
 msgid "Registration"
 msgstr "Registratie"
 
-#: ../../mod/admin.php:448
+#: ../../mod/admin.php:455
 msgid "File upload"
 msgstr "Bestand uploaden"
 
-#: ../../mod/admin.php:449
+#: ../../mod/admin.php:456
 msgid "Policies"
 msgstr "Beleid"
 
-#: ../../mod/admin.php:454
+#: ../../mod/admin.php:461
 msgid "Site name"
 msgstr "Naam van deze $Projectname-hub"
 
-#: ../../mod/admin.php:455
+#: ../../mod/admin.php:462
 msgid "Banner/Logo"
 msgstr "Banner/logo"
 
-#: ../../mod/admin.php:456
+#: ../../mod/admin.php:463
 msgid "Administrator Information"
 msgstr "Informatie over de beheerder van deze hub"
 
-#: ../../mod/admin.php:456
+#: ../../mod/admin.php:463
 msgid ""
 "Contact information for site administrators.  Displayed on siteinfo page.  "
 "BBCode can be used here"
 msgstr "Contactinformatie voor hub-beheerders. Getoond op pagina met hub-informatie. Er kan hier bbcode gebruikt worden."
 
-#: ../../mod/admin.php:457
+#: ../../mod/admin.php:464
 msgid "System language"
 msgstr "Standaardtaal"
 
-#: ../../mod/admin.php:458
+#: ../../mod/admin.php:465
 msgid "System theme"
 msgstr "Standaardthema"
 
-#: ../../mod/admin.php:458
+#: ../../mod/admin.php:465
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
 msgstr "Standaardthema voor $Projectname-hub (kan door lid veranderd worden) - <a href='#' id='cnftheme'>verander thema-instellingen</a>"
 
-#: ../../mod/admin.php:459
+#: ../../mod/admin.php:466
 msgid "Mobile system theme"
 msgstr "Standaardthema voor mobiel"
 
-#: ../../mod/admin.php:459
+#: ../../mod/admin.php:466
 msgid "Theme for mobile devices"
 msgstr "Thema voor mobiele apparaten"
 
-#: ../../mod/admin.php:461
+#: ../../mod/admin.php:468
 msgid "Enable Diaspora Protocol"
 msgstr "Diaspora-protocol inschakelen"
 
-#: ../../mod/admin.php:461
+#: ../../mod/admin.php:468
 msgid "Communicate with Diaspora and Friendica - experimental"
 msgstr "Communiceer met Diaspora en Friendica (experimenteel)"
 
-#: ../../mod/admin.php:462
+#: ../../mod/admin.php:469
 msgid "Allow Feeds as Connections"
 msgstr "Sta feeds toe als connecties"
 
-#: ../../mod/admin.php:462
+#: ../../mod/admin.php:469
 msgid "(Heavy system resource usage)"
 msgstr "(sterk negatieve invloed op systeembronnen hub)"
 
-#: ../../mod/admin.php:463
+#: ../../mod/admin.php:470
 msgid "Maximum image size"
 msgstr "Maximale grootte van afbeeldingen"
 
-#: ../../mod/admin.php:463
+#: ../../mod/admin.php:470
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr "Maximale grootte in bytes voor afbeeldingen die worden geüpload. Standaard is 0, wat geen limiet betekend."
 
-#: ../../mod/admin.php:464
+#: ../../mod/admin.php:471
 msgid "Does this site allow new member registration?"
 msgstr "Staat deze hub nieuwe accounts toe?"
 
-#: ../../mod/admin.php:465
+#: ../../mod/admin.php:472
 msgid "Which best describes the types of account offered by this hub?"
 msgstr "Wat voor soort accounts biedt deze $Projectname-hub aan? Kies wat het meest in de buurt komt."
 
-#: ../../mod/admin.php:466
+#: ../../mod/admin.php:473
 msgid "Register text"
 msgstr "Tekst tijdens registratie"
 
-#: ../../mod/admin.php:466
+#: ../../mod/admin.php:473
 msgid "Will be displayed prominently on the registration page."
 msgstr "Tekst dat op de pagina voor het registreren van nieuwe accounts wordt getoond."
 
-#: ../../mod/admin.php:467
+#: ../../mod/admin.php:474
+msgid "Site homepage to show visitors (default: login box)"
+msgstr "Homepagina van deze hub die aan bezoekers wordt getoond (standaard: inlogformulier)"
+
+#: ../../mod/admin.php:474
+msgid ""
+"example: 'public' to show public stream, 'page/sys/home' to show a system "
+"webpage called 'home' or 'include:home.html' to include a file."
+msgstr "voorbeeld: 'public' om de openbare stream te tonen, 'page/sys/home' om de webpagina 'home' van het systeemkanaal te tonen of 'include:home.html' om een gewoon bestand te gebruiken."
+
+#: ../../mod/admin.php:475
+msgid "Preserve site homepage URL"
+msgstr "Behoudt de URL van de hub (/)"
+
+#: ../../mod/admin.php:475
+msgid ""
+"Present the site homepage in a frame at the original location instead of "
+"redirecting"
+msgstr "Toon de homepagina van de hub in een frame op de oorspronkelijke locatie (/), i.p.v. een doorverwijzing naar een andere locatie (bv. .../home.html)"
+
+#: ../../mod/admin.php:476
 msgid "Accounts abandoned after x days"
 msgstr "Accounts als verlaten beschouwen na zoveel aantal dagen:"
 
-#: ../../mod/admin.php:467
+#: ../../mod/admin.php:476
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr "Zal geen systeembronnen verspillen door polling van externe hubs voor verlaten accounts. Vul 0 in voor geen tijdslimiet."
 
-#: ../../mod/admin.php:468
+#: ../../mod/admin.php:477
 msgid "Allowed friend domains"
 msgstr "Toegestane domeinen"
 
-#: ../../mod/admin.php:468
+#: ../../mod/admin.php:477
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr "Komma-gescheiden lijst van domeinen waarvan kanalen connecties kunnen aangaan met kanalen op deze $Projectname-hub. Wildcards zijn toegestaan.\nLaat leeg om alle domeinen toe te laten."
 
-#: ../../mod/admin.php:469
+#: ../../mod/admin.php:478
 msgid "Allowed email domains"
 msgstr "Toegestane e-maildomeinen"
 
-#: ../../mod/admin.php:469
+#: ../../mod/admin.php:478
 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 "Door komma's gescheiden lijst met e-maildomeinen waarvan e-mailadressen op deze hub mogen registeren. Wildcards zijn toegestaan. Laat leeg om alle domeinen toe te laten."
 
-#: ../../mod/admin.php:470
+#: ../../mod/admin.php:479
 msgid "Not allowed email domains"
 msgstr "Niet toegestane e-maildomeinen"
 
-#: ../../mod/admin.php:470
+#: ../../mod/admin.php:479
 msgid ""
 "Comma separated list of domains which are not allowed in email addresses for"
 " registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains, unless allowed domains have been defined."
 msgstr "Door komma's gescheiden lijst met e-maildomeinen waarvan e-mailadressen niet op deze hub mogen registeren. Wildcards zijn toegestaan. Laat leeg om alle domeinen toe te staan, tenzij er toegestane domeinen zijn ingesteld. "
 
-#: ../../mod/admin.php:471
+#: ../../mod/admin.php:480
 msgid "Block public"
 msgstr "Openbare toegang blokkeren"
 
-#: ../../mod/admin.php:471
+#: ../../mod/admin.php:480
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently logged in."
 msgstr "Vink dit aan om alle normaliter openbare persoonlijke pagina's op deze hub alleen toegankelijk te maken voor ingelogde leden."
 
-#: ../../mod/admin.php:472
+#: ../../mod/admin.php:481
 msgid "Verify Email Addresses"
 msgstr "E-mailadres verifieren"
 
-#: ../../mod/admin.php:472
+#: ../../mod/admin.php:481
 msgid ""
 "Check to verify email addresses used in account registration (recommended)."
 msgstr "Inschakelen om e-mailadressen te verifiëren die tijdens de accountregistratie worden gebruikt (aanbevolen)."
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:482
 msgid "Force publish"
 msgstr "Dwing kanaalvermelding af"
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:482
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr "Vink dit aan om af te dwingen dat alle kanalen op deze hub in de kanalengids worden vermeld."
 
-#: ../../mod/admin.php:474
+#: ../../mod/admin.php:483
 msgid "Disable discovery tab"
 msgstr "Ontdekkingstab"
 
-#: ../../mod/admin.php:474
+#: ../../mod/admin.php:483
 msgid ""
 "Remove the tab in the network view with public content pulled from sources "
 "chosen for this site."
 msgstr "Verwijder de tab in de matrix-weergave waarin zich een selectie aan openbare berichten bevindt, die automatisch voor deze hub zijn uitgekozen."
 
-#: ../../mod/admin.php:475
-msgid "No login on Homepage"
-msgstr "Geen inlogformulier op de homepage"
+#: ../../mod/admin.php:484
+msgid "login on Homepage"
+msgstr "Inlogformulier op de homepagina"
 
-#: ../../mod/admin.php:475
+#: ../../mod/admin.php:484
 msgid ""
-"Check to hide the login form from your sites homepage when visitors arrive "
-"who are not logged in (e.g. when you put the content of the homepage in via "
-"the site channel)."
-msgstr "Vink dit aan om het inlogformulier op de homepage van deze hub, die niet-ingelogde bezoekers te zien krijgen, te verbergen. (bijvoorbeeld wanneer je een kanaal op deze $Projectname-hub als homepage gebruikt)"
+"Present a login box to visitors on the home page if no other content has "
+"been configured."
+msgstr "Toon een inlogformulier voor bezoekers op de homepagina wanneer geen andere inhoud is geconfigureerd. "
 
-#: ../../mod/admin.php:477
+#: ../../mod/admin.php:486
 msgid "Proxy user"
 msgstr "Gebruikersnaam proxy"
 
-#: ../../mod/admin.php:478
+#: ../../mod/admin.php:487
 msgid "Proxy URL"
 msgstr "URL proxy"
 
-#: ../../mod/admin.php:479
+#: ../../mod/admin.php:488
 msgid "Network timeout"
 msgstr "Netwerktimeout"
 
-#: ../../mod/admin.php:479
+#: ../../mod/admin.php:488
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr "Waarde is in seconden. Zet op 0 voor onbeperkt (niet aanbevolen)"
 
-#: ../../mod/admin.php:480
+#: ../../mod/admin.php:489
 msgid "Delivery interval"
 msgstr "Afleveringsinterval"
 
-#: ../../mod/admin.php:480
+#: ../../mod/admin.php:489
 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 "Vertraag de achtergrondprocessen voor het afleveren met een aantal seconden om de systeembelasting te verminderen. Aanbevolen: 4-5 voor shared hosts, 2-3 voor virtual private servers (VPS) en 0-1 voor grote dedicated servers."
 
-#: ../../mod/admin.php:481
+#: ../../mod/admin.php:490
 msgid "Poll interval"
 msgstr "Poll-interval"
 
-#: ../../mod/admin.php:481
+#: ../../mod/admin.php:490
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
 msgstr "De achtergrondprocessen voor het afleveren met zoveel seconden vertragen om de systeembelasting te verminderen. 0 om de afleveringsinterval te gebruiken."
 
-#: ../../mod/admin.php:482
+#: ../../mod/admin.php:491
 msgid "Maximum Load Average"
 msgstr "Maximaal gemiddelde systeembelasting"
 
-#: ../../mod/admin.php:482
+#: ../../mod/admin.php:491
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr "Maximale systeembelasting voordat de afleverings- en polllingsprocessen worden uitgesteld. Standaard is 50."
 
-#: ../../mod/admin.php:483
+#: ../../mod/admin.php:492
 msgid "Expiration period in days for imported (matrix/network) content"
 msgstr "Aantal dagen waarna geïmporteerde inhoud uit iemands matrix/netwerk-pagina wordt verwijderd."
 
-#: ../../mod/admin.php:483
+#: ../../mod/admin.php:492
 msgid "0 for no expiration of imported content"
 msgstr "Dit geldt alleen voor inhoud van andere kanalen, dus niet voor iemands eigen kanaal. 0 voor het niet verwijderen van geïmporteerde inhoud."
 
-#: ../../mod/admin.php:531
+#: ../../mod/admin.php:540
 msgid "No server found"
 msgstr "Geen hub gevonden"
 
-#: ../../mod/admin.php:538 ../../mod/admin.php:822
+#: ../../mod/admin.php:547 ../../mod/admin.php:831
 msgid "ID"
 msgstr "ID"
 
-#: ../../mod/admin.php:538
+#: ../../mod/admin.php:547
 msgid "for channel"
 msgstr "voor kanaal"
 
-#: ../../mod/admin.php:538
+#: ../../mod/admin.php:547
 msgid "on server"
 msgstr "op hub"
 
-#: ../../mod/admin.php:538
+#: ../../mod/admin.php:547
 msgid "Status"
 msgstr "Status"
 
-#: ../../mod/admin.php:540
+#: ../../mod/admin.php:549
 msgid "Server"
 msgstr "Hubbeheer"
 
-#: ../../mod/admin.php:557
+#: ../../mod/admin.php:566
 msgid "Update has been marked successful"
 msgstr "Update is als succesvol gemarkeerd"
 
-#: ../../mod/admin.php:567
+#: ../../mod/admin.php:576
 #, php-format
 msgid "Executing %s failed. Check system logs."
 msgstr "Uitvoeren van %s is mislukt. Controleer systeemlogboek."
 
-#: ../../mod/admin.php:570
+#: ../../mod/admin.php:579
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr "Update %s was geslaagd."
 
-#: ../../mod/admin.php:574
+#: ../../mod/admin.php:583
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr "Update %s gaf geen melding. Het is daarom niet bekend of deze geslaagd is."
 
-#: ../../mod/admin.php:577
+#: ../../mod/admin.php:586
 #, php-format
 msgid "Update function %s could not be found."
 msgstr "Update-functie %s kon niet gevonden worden."
 
-#: ../../mod/admin.php:593
+#: ../../mod/admin.php:602
 msgid "No failed updates."
 msgstr "Geen mislukte updates."
 
-#: ../../mod/admin.php:597
+#: ../../mod/admin.php:606
 msgid "Failed Updates"
 msgstr "Mislukte updates"
 
-#: ../../mod/admin.php:599
+#: ../../mod/admin.php:608
 msgid "Mark success (if update was manually applied)"
 msgstr "Markeer als geslaagd (wanneer de update handmatig was uitgevoerd)"
 
-#: ../../mod/admin.php:600
+#: ../../mod/admin.php:609
 msgid "Attempt to execute this update step automatically"
 msgstr "Poging om deze stap van de update automatisch uit te voeren."
 
-#: ../../mod/admin.php:632
+#: ../../mod/admin.php:641
 msgid "Queue Statistics"
 msgstr "Wachtrij-statistieken"
 
-#: ../../mod/admin.php:633
+#: ../../mod/admin.php:642
 msgid "Total Entries"
 msgstr "Aantal vermeldingen"
 
-#: ../../mod/admin.php:634
+#: ../../mod/admin.php:643
 msgid "Priority"
 msgstr "Prioriteit"
 
-#: ../../mod/admin.php:635
+#: ../../mod/admin.php:644
 msgid "Destination URL"
 msgstr "Doel-URL"
 
-#: ../../mod/admin.php:636
+#: ../../mod/admin.php:645
 msgid "Mark hub permanently offline"
 msgstr "Hub als permanent offline markeren"
 
-#: ../../mod/admin.php:637
+#: ../../mod/admin.php:646
 msgid "Empty queue for this hub"
 msgstr "Berichtenwachtrij voor deze hub legen"
 
-#: ../../mod/admin.php:638
+#: ../../mod/admin.php:647
 msgid "Last known contact"
 msgstr "Voor het laatst contact"
 
-#: ../../mod/admin.php:674
+#: ../../mod/admin.php:683
 #, php-format
-msgid "%s user blocked/unblocked"
-msgid_plural "%s users blocked/unblocked"
+msgid "%s account blocked/unblocked"
+msgid_plural "%s account blocked/unblocked"
 msgstr[0] "%s account geblokkeerd/gedeblokkeerd"
 msgstr[1] "%s accounts geblokkeerd/gedeblokkeerd"
 
-#: ../../mod/admin.php:682
+#: ../../mod/admin.php:691
 #, php-format
-msgid "%s user deleted"
-msgid_plural "%s users deleted"
+msgid "%s account deleted"
+msgid_plural "%s accounts deleted"
 msgstr[0] "%s account verwijderd"
 msgstr[1] "%s accounts verwijderd"
 
-#: ../../mod/admin.php:718
+#: ../../mod/admin.php:727
 msgid "Account not found"
 msgstr "Account niet gevonden"
 
-#: ../../mod/admin.php:738
+#: ../../mod/admin.php:739
 #, php-format
-msgid "User '%s' blocked"
-msgstr "Lid '%s' geblokkeerd"
+msgid "Account '%s' deleted"
+msgstr "Account '%s' verwijderd"
 
-#: ../../mod/admin.php:746
+#: ../../mod/admin.php:747
 #, php-format
-msgid "User '%s' unblocked"
+msgid "Account '%s' blocked"
+msgstr "Account '%s' geblokkeerd"
+
+#: ../../mod/admin.php:755
+#, php-format
+msgid "Account '%s' unblocked"
 msgstr "Account '%s' gedeblokkeerd"
 
-#: ../../mod/admin.php:809 ../../mod/admin.php:821
+#: ../../mod/admin.php:818 ../../mod/admin.php:830
 msgid "Users"
 msgstr "Accounts"
 
-#: ../../mod/admin.php:811 ../../mod/admin.php:947
+#: ../../mod/admin.php:820 ../../mod/admin.php:987
 msgid "select all"
 msgstr "alles selecteren"
 
-#: ../../mod/admin.php:812
+#: ../../mod/admin.php:821
 msgid "User registrations waiting for confirm"
 msgstr "Accounts die op goedkeuring wachten"
 
-#: ../../mod/admin.php:813
+#: ../../mod/admin.php:822
 msgid "Request date"
 msgstr "Tijd/datum verzoek"
 
-#: ../../mod/admin.php:814
+#: ../../mod/admin.php:823
 msgid "No registrations."
 msgstr "Geen verzoeken."
 
-#: ../../mod/admin.php:815
+#: ../../mod/admin.php:824 ../../mod/connedit.php:699
 msgid "Approve"
 msgstr "Goedkeuren"
 
-#: ../../mod/admin.php:816
+#: ../../mod/admin.php:825
 msgid "Deny"
 msgstr "Afkeuren"
 
-#: ../../mod/admin.php:818 ../../mod/connedit.php:517
-#: ../../mod/connedit.php:720
+#: ../../mod/admin.php:827 ../../mod/connedit.php:531
 msgid "Block"
 msgstr "Blokkeren"
 
-#: ../../mod/admin.php:819 ../../mod/connedit.php:517
-#: ../../mod/connedit.php:720
+#: ../../mod/admin.php:828 ../../mod/connedit.php:531
 msgid "Unblock"
 msgstr "Deblokkeren"
 
-#: ../../mod/admin.php:822
+#: ../../mod/admin.php:831
 msgid "Register date"
 msgstr "Geregistreerd"
 
-#: ../../mod/admin.php:822
+#: ../../mod/admin.php:831
 msgid "Last login"
 msgstr "Laatste keer ingelogd"
 
-#: ../../mod/admin.php:822
+#: ../../mod/admin.php:831
 msgid "Expires"
 msgstr "Verloopt"
 
-#: ../../mod/admin.php:822
+#: ../../mod/admin.php:831
 msgid "Service Class"
 msgstr "Abonnementen"
 
-#: ../../mod/admin.php:824
+#: ../../mod/admin.php:833
 msgid ""
-"Selected users will be deleted!\\n\\nEverything these users had posted on "
-"this site will be permanently deleted!\\n\\nAre you sure?"
+"Selected accounts will be deleted!\\n\\nEverything these accounts had posted"
+" on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Geselecteerde accounts (met bijbehorende kanalen) worden verwijderd!\\n\\nAlles wat deze accounts op deze hub hebben gepubliceerd wordt definitief verwijderd!\\n\\Weet je het zeker?"
 
-#: ../../mod/admin.php:825
+#: ../../mod/admin.php:834
 msgid ""
-"The user {0} will be deleted!\\n\\nEverything this user has posted on this "
-"site will be permanently deleted!\\n\\nAre you sure?"
+"The account {0} will be deleted!\\n\\nEverything this account has posted on "
+"this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Account {0} (met bijbehorende kanalen) wordt verwijderd !\\n\\nAlles wat dit account op deze hub heeft gepubliceerd wordt definitief verwijderd!\\n\\nWeet je het zeker?"
 
-#: ../../mod/admin.php:859
+#: ../../mod/admin.php:870
 #, php-format
 msgid "%s channel censored/uncensored"
 msgid_plural "%s channels censored/uncensored"
 msgstr[0] "%s kanaal gecensureerd/ongecensureerd"
 msgstr[1] "%s kanalen gecensureerd/ongecensureerd"
 
-#: ../../mod/admin.php:866
+#: ../../mod/admin.php:879
+#, php-format
+msgid "%s channel code allowed/disallowed"
+msgid_plural "%s channels code allowed/disallowed"
+msgstr[0] "Code toegestaan/niet toegestaan voor %s kanaal"
+msgstr[1] "Scripts toegestaan/niet toegestaan voor %s kanalen "
+
+#: ../../mod/admin.php:886
 #, php-format
 msgid "%s channel deleted"
 msgid_plural "%s channels deleted"
 msgstr[0] "%s kanaal verwijderd"
 msgstr[1] "%s kanalen verwijderd"
 
-#: ../../mod/admin.php:886
+#: ../../mod/admin.php:906
 msgid "Channel not found"
 msgstr "Kanaal niet gevonden"
 
-#: ../../mod/admin.php:897
+#: ../../mod/admin.php:917
 #, php-format
 msgid "Channel '%s' deleted"
 msgstr "Kanaal '%s' verwijderd"
 
-#: ../../mod/admin.php:908
+#: ../../mod/admin.php:929
+#, php-format
+msgid "Channel '%s' censored"
+msgstr "Kanaal '%s' gecensureerd"
+
+#: ../../mod/admin.php:929
 #, php-format
 msgid "Channel '%s' uncensored"
 msgstr "Kanaal '%s' ongecensureerd"
 
-#: ../../mod/admin.php:908
+#: ../../mod/admin.php:940
 #, php-format
-msgid "Channel '%s' censored"
-msgstr "Kanaal '%s' gecensureerd"
+msgid "Channel '%s' code allowed"
+msgstr "Scripts toegestaan voor kanaal '%s'"
+
+#: ../../mod/admin.php:940
+#, php-format
+msgid "Channel '%s' code disallowed"
+msgstr "Scripts niet toegestaan voor kanaal '%s'"
 
-#: ../../mod/admin.php:949
+#: ../../mod/admin.php:989
 msgid "Censor"
 msgstr "Censureren"
 
-#: ../../mod/admin.php:950
+#: ../../mod/admin.php:990
 msgid "Uncensor"
 msgstr "Niet censureren"
 
-#: ../../mod/admin.php:953
+#: ../../mod/admin.php:991
+msgid "Allow Code"
+msgstr "Scripts toestaan"
+
+#: ../../mod/admin.php:992
+msgid "Disallow Code"
+msgstr "Scripts niet toestaan"
+
+#: ../../mod/admin.php:994
 msgid "UID"
 msgstr "UID"
 
-#: ../../mod/admin.php:955
+#: ../../mod/admin.php:996
 msgid ""
 "Selected channels will be deleted!\\n\\nEverything that was posted in these "
 "channels on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Geselecteerde kanalen worden verwijderd!\\n\\nAlles wat in deze kanalen op deze hub werd gepubliceerd wordt definitief verwijderd!\\n\\nWeet je het zeker?"
 
-#: ../../mod/admin.php:956
+#: ../../mod/admin.php:997
 msgid ""
 "The channel {0} will be deleted!\\n\\nEverything that was posted in this "
 "channel on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Kanaal {0} wordt verwijderd!\\n\\nAlles wat in dit kanaal op deze hub werd gepubliceerd wordt definitief verwijderd!\\n\\nWeet je het zeker?"
 
-#: ../../mod/admin.php:996
+#: ../../mod/admin.php:1037
 #, php-format
 msgid "Plugin %s disabled."
 msgstr "Plug-in %s uitgeschakeld."
 
-#: ../../mod/admin.php:1000
+#: ../../mod/admin.php:1041
 #, php-format
 msgid "Plugin %s enabled."
 msgstr "Plug-in %s ingeschakeld"
 
-#: ../../mod/admin.php:1010 ../../mod/admin.php:1208
+#: ../../mod/admin.php:1051 ../../mod/admin.php:1249
 msgid "Disable"
 msgstr "Uitschakelen"
 
-#: ../../mod/admin.php:1013 ../../mod/admin.php:1210
+#: ../../mod/admin.php:1054 ../../mod/admin.php:1251
 msgid "Enable"
 msgstr "Inschakelen"
 
-#: ../../mod/admin.php:1037 ../../mod/admin.php:1237
+#: ../../mod/admin.php:1078 ../../mod/admin.php:1278
 msgid "Toggle"
 msgstr "Omschakelen"
 
-#: ../../mod/admin.php:1045 ../../mod/admin.php:1247
+#: ../../mod/admin.php:1086 ../../mod/admin.php:1288
 msgid "Author: "
 msgstr "Auteur: "
 
-#: ../../mod/admin.php:1046 ../../mod/admin.php:1248
+#: ../../mod/admin.php:1087 ../../mod/admin.php:1289
 msgid "Maintainer: "
 msgstr "Beheerder: "
 
-#: ../../mod/admin.php:1173
+#: ../../mod/admin.php:1214
 msgid "No themes found."
 msgstr "Geen thema's gevonden"
 
-#: ../../mod/admin.php:1229
+#: ../../mod/admin.php:1270
 msgid "Screenshot"
 msgstr "Schermafdruk"
 
-#: ../../mod/admin.php:1275
+#: ../../mod/admin.php:1316
 msgid "[Experimental]"
 msgstr "[Experimenteel]"
 
-#: ../../mod/admin.php:1276
+#: ../../mod/admin.php:1317
 msgid "[Unsupported]"
 msgstr "[Niet ondersteund]"
 
-#: ../../mod/admin.php:1300
+#: ../../mod/admin.php:1341
 msgid "Log settings updated."
 msgstr "Logboek-instellingen bijgewerkt."
 
-#: ../../mod/admin.php:1357
+#: ../../mod/admin.php:1398
 msgid "Clear"
 msgstr "Leegmaken"
 
-#: ../../mod/admin.php:1363
+#: ../../mod/admin.php:1404
 msgid "Debugging"
 msgstr "Debuggen"
 
-#: ../../mod/admin.php:1364
+#: ../../mod/admin.php:1405
 msgid "Log file"
 msgstr "Logbestand"
 
-#: ../../mod/admin.php:1364
+#: ../../mod/admin.php:1405
 msgid ""
 "Must be writable by web server. Relative to your Red top-level directory."
 msgstr "Moet door de webserver beschrijfbaar zijn. Relatief ten opzichte van de bovenste map van je $Projectname-installatie."
 
-#: ../../mod/admin.php:1365
+#: ../../mod/admin.php:1406
 msgid "Log level"
 msgstr "Logniveau"
 
-#: ../../mod/admin.php:1411
+#: ../../mod/admin.php:1452
 msgid "New Profile Field"
 msgstr "Nieuw profielveld"
 
-#: ../../mod/admin.php:1412 ../../mod/admin.php:1432
+#: ../../mod/admin.php:1453 ../../mod/admin.php:1473
 msgid "Field nickname"
 msgstr "Bijnaam voor veld"
 
-#: ../../mod/admin.php:1412 ../../mod/admin.php:1432
+#: ../../mod/admin.php:1453 ../../mod/admin.php:1473
 msgid "System name of field"
 msgstr "Systeemnaam voor veld"
 
-#: ../../mod/admin.php:1413 ../../mod/admin.php:1433
+#: ../../mod/admin.php:1454 ../../mod/admin.php:1474
 msgid "Input type"
 msgstr "Invoertype"
 
-#: ../../mod/admin.php:1414 ../../mod/admin.php:1434
+#: ../../mod/admin.php:1455 ../../mod/admin.php:1475
 msgid "Field Name"
 msgstr "Veldnaam"
 
-#: ../../mod/admin.php:1414 ../../mod/admin.php:1434
+#: ../../mod/admin.php:1455 ../../mod/admin.php:1475
 msgid "Label on profile pages"
 msgstr "Tekstlabel voor op profielpagina's"
 
-#: ../../mod/admin.php:1415 ../../mod/admin.php:1435
+#: ../../mod/admin.php:1456 ../../mod/admin.php:1476
 msgid "Help text"
 msgstr "Helptekst"
 
-#: ../../mod/admin.php:1415 ../../mod/admin.php:1435
+#: ../../mod/admin.php:1456 ../../mod/admin.php:1476
 msgid "Additional info (optional)"
 msgstr "Extra informatie (optioneel)"
 
-#: ../../mod/admin.php:1425
+#: ../../mod/admin.php:1466
 msgid "Field definition not found"
 msgstr "Velddefinitie niet gevonden"
 
-#: ../../mod/admin.php:1431
+#: ../../mod/admin.php:1472
 msgid "Edit Profile Field"
 msgstr "Profielveld bewerken"
 
@@ -7715,14 +7340,6 @@ msgstr "Niet in staat om je hub te vinden"
 msgid "Post successful."
 msgstr "Verzenden bericht geslaagd."
 
-#: ../../mod/editblock.php:112
-msgid "Edit Block"
-msgstr "Blok bewerken"
-
-#: ../../mod/editblock.php:123
-msgid "Delete block?"
-msgstr "Blok verwijderen"
-
 #: ../../mod/register.php:44
 msgid "Maximum daily site registrations exceeded. Please try again tomorrow."
 msgstr "Maximum toegestane dagelijkse registraties op deze $Projectname-hub bereikt. Probeer het morgen (UTC) nogmaals."
@@ -7838,39 +7455,25 @@ msgid ""
 "removed from the network"
 msgstr "Standaard worden alleen de kanalen die zich op deze hub bevinden uit het $Projectname-netwerk verwijderd"
 
-#: ../../mod/item.php:174
-msgid "Unable to locate original post."
-msgstr "Niet in staat om de originele locatie van het bericht te vinden. "
-
-#: ../../mod/item.php:437
-msgid "Empty post discarded."
-msgstr "Leeg bericht geannuleerd"
-
-#: ../../mod/item.php:479
-msgid "Executable content type not permitted to this channel."
-msgstr "Uitvoerbare bestanden zijn niet toegestaan op dit kanaal."
+#: ../../mod/removeaccount.php:61 ../../mod/settings.php:720
+msgid "Remove Account"
+msgstr "Account verwijderen"
 
-#: ../../mod/item.php:885
-msgid "System error. Post not saved."
-msgstr "Systeemfout. Bericht niet opgeslagen."
+#: ../../mod/help.php:49 ../../mod/help.php:55 ../../mod/help.php:61
+msgid "Help:"
+msgstr "Hulp:"
 
-#: ../../mod/item.php:1103
-msgid "Unable to obtain post information from database."
-msgstr "Niet in staat om informatie over dit bericht uit de database te verkrijgen."
+#: ../../mod/help.php:76 ../../index.php:238
+msgid "Not Found"
+msgstr "Niet gevonden"
 
-#: ../../mod/item.php:1110
-#, php-format
-msgid "You have reached your limit of %1$.0f top level posts."
-msgstr "Je hebt jouw limiet van %1$.0f berichten bereikt."
-
-#: ../../mod/item.php:1117
-#, php-format
-msgid "You have reached your limit of %1$.0f webpages."
-msgstr "Je hebt jouw limiet van %1$.0f webpagina's bereikt."
+#: ../../mod/help.php:100
+msgid "$Projectname Documentation"
+msgstr "$Projectname-documentatie"
 
 #: ../../mod/update_channel.php:43 ../../mod/update_display.php:25
 #: ../../mod/update_network.php:23 ../../mod/update_search.php:46
-#: ../../mod/update_home.php:21
+#: ../../mod/update_home.php:21 ../../mod/update_public.php:21
 msgid "[Embedded content - reload page to view]"
 msgstr "[Ingesloten inhoud - ververs pagina om te bekijken] "
 
@@ -7882,17 +7485,583 @@ msgstr "Privacy-informatie op afstand niet beschikbaar."
 msgid "Visible to:"
 msgstr "Zichtbaar voor:"
 
-#: ../../mod/layouts.php:175
-msgid "Comanche page description language help"
-msgstr "Hulp met de paginabeschrijvingstaal Comanche"
+#: ../../mod/settings.php:76
+msgid "Name is required"
+msgstr "Naam is vereist"
 
-#: ../../mod/layouts.php:179
-msgid "Layout Description"
-msgstr "Lay-out-omschrijving"
+#: ../../mod/settings.php:80
+msgid "Key and Secret are required"
+msgstr "Key en secret zijn vereist"
 
-#: ../../mod/layouts.php:184
-msgid "Download PDL file"
-msgstr "Download PDL-bestand"
+#: ../../mod/settings.php:130
+msgid "Diaspora Policy Settings updated."
+msgstr "Beleidsinstellingen Diaspora bijgewerkt."
+
+#: ../../mod/settings.php:238
+msgid "Passwords do not match. Password unchanged."
+msgstr "Wachtwoorden komen niet overeen. Wachtwoord onveranderd."
+
+#: ../../mod/settings.php:242
+msgid "Empty passwords are not allowed. Password unchanged."
+msgstr "Lege wachtwoorden zijn niet toegestaan. Wachtwoord onveranderd."
+
+#: ../../mod/settings.php:256
+msgid "Password changed."
+msgstr "Wachtwoord veranderd."
+
+#: ../../mod/settings.php:258
+msgid "Password update failed. Please try again."
+msgstr "Bijwerken wachtwoord mislukt. Probeer opnieuw."
+
+#: ../../mod/settings.php:272
+msgid "Not valid email."
+msgstr "Geen geldig e-mailadres."
+
+#: ../../mod/settings.php:275
+msgid "Protected email address. Cannot change to that email."
+msgstr "Beschermd e-mailadres. Kan dat e-mailadres niet gebruiken."
+
+#: ../../mod/settings.php:284
+msgid "System failure storing new email. Please try again."
+msgstr "Systeemfout opslaan van nieuwe e-mail. Probeer het nog een keer."
+
+#: ../../mod/settings.php:523
+msgid "Settings updated."
+msgstr "Instellingen bijgewerkt."
+
+#: ../../mod/settings.php:587 ../../mod/settings.php:613
+#: ../../mod/settings.php:649
+msgid "Add application"
+msgstr "Applicatie toevoegen"
+
+#: ../../mod/settings.php:590
+msgid "Name of application"
+msgstr "Naam van applicatie"
+
+#: ../../mod/settings.php:591 ../../mod/settings.php:617
+msgid "Consumer Key"
+msgstr "Consumer key"
+
+#: ../../mod/settings.php:591 ../../mod/settings.php:592
+msgid "Automatically generated - change if desired. Max length 20"
+msgstr "Automatische gegenereerd - verander wanneer gewenst. Maximale lengte is 20"
+
+#: ../../mod/settings.php:592 ../../mod/settings.php:618
+msgid "Consumer Secret"
+msgstr "Consumer secret"
+
+#: ../../mod/settings.php:593 ../../mod/settings.php:619
+msgid "Redirect"
+msgstr "Redirect/doorverwijzing"
+
+#: ../../mod/settings.php:593
+msgid ""
+"Redirect URI - leave blank unless your application specifically requires "
+"this"
+msgstr "URI voor redirect - laat leeg, behalve wanneer de applicatie dit vereist"
+
+#: ../../mod/settings.php:594 ../../mod/settings.php:620
+msgid "Icon url"
+msgstr "URL van pictogram"
+
+#: ../../mod/settings.php:594
+msgid "Optional"
+msgstr "Optioneel"
+
+#: ../../mod/settings.php:605
+msgid "You can't edit this application."
+msgstr "Je kan deze applicatie niet bewerken"
+
+#: ../../mod/settings.php:648
+msgid "Connected Apps"
+msgstr "Verbonden applicaties"
+
+#: ../../mod/settings.php:652
+msgid "Client key starts with"
+msgstr "Client key begint met"
+
+#: ../../mod/settings.php:653
+msgid "No name"
+msgstr "Geen naam"
+
+#: ../../mod/settings.php:654
+msgid "Remove authorization"
+msgstr "Autorisatie verwijderen"
+
+#: ../../mod/settings.php:668
+msgid "No feature settings configured"
+msgstr "Geen extra functie- of plugin-instellingen"
+
+#: ../../mod/settings.php:685
+msgid "Feature/Addon Settings"
+msgstr "Extra functie- en plugin-instellingen"
+
+#: ../../mod/settings.php:687
+msgid "Settings for the built-in Diaspora emulator"
+msgstr "Instellingen voor de ingebouwde Diaspora-emulator"
+
+#: ../../mod/settings.php:688
+msgid "Allow any Diaspora member to comment on your public posts"
+msgstr "Sta toe dat elk Diaspora-lid op jouw openbare berichten kan reageren."
+
+#: ../../mod/settings.php:689
+msgid "Enable the Diaspora protocol for this channel"
+msgstr "Diaspora-protocol voor dit kanaal inschakelen"
+
+#: ../../mod/settings.php:690
+msgid "Diaspora Policy Settings"
+msgstr "Beleidsinstellingen Diaspora"
+
+#: ../../mod/settings.php:691
+msgid "Prevent your hashtags from being redirected to other sites"
+msgstr "Voorkom dat jouw tags naar andere websites worden doorverwezen"
+
+#: ../../mod/settings.php:715
+msgid "Account Settings"
+msgstr "Account-instellingen"
+
+#: ../../mod/settings.php:716
+msgid "Enter New Password:"
+msgstr "Nieuw wachtwoord invoeren:"
+
+#: ../../mod/settings.php:717
+msgid "Confirm New Password:"
+msgstr "Nieuw wachtwoord bevestigen:"
+
+#: ../../mod/settings.php:717
+msgid "Leave password fields blank unless changing"
+msgstr "Laat de wachtwoordvelden leeg, behalve wanneer je deze wil veranderen"
+
+#: ../../mod/settings.php:719 ../../mod/settings.php:1057
+msgid "Email Address:"
+msgstr "E-mailadres:"
+
+#: ../../mod/settings.php:721
+msgid "Remove this account including all its channels"
+msgstr "Dit account en al zijn kanalen verwijderen"
+
+#: ../../mod/settings.php:737
+msgid "Off"
+msgstr "Uit"
+
+#: ../../mod/settings.php:737
+msgid "On"
+msgstr "Aan"
+
+#: ../../mod/settings.php:744
+msgid "Additional Features"
+msgstr "Extra functies"
+
+#: ../../mod/settings.php:768
+msgid "Connector Settings"
+msgstr "Instellingen externe koppelingen"
+
+#: ../../mod/settings.php:807
+msgid "No special theme for mobile devices"
+msgstr "Geen speciaal thema voor mobiele apparaten"
+
+#: ../../mod/settings.php:810
+#, php-format
+msgid "%s - (Experimental)"
+msgstr "%s - (experimenteel)"
+
+#: ../../mod/settings.php:849
+msgid "Display Settings"
+msgstr "Weergave-instellingen"
+
+#: ../../mod/settings.php:850
+msgid "Theme Settings"
+msgstr "Thema-instellingen"
+
+#: ../../mod/settings.php:851
+msgid "Custom Theme Settings"
+msgstr "Handmatige thema-instellingen"
+
+#: ../../mod/settings.php:852
+msgid "Content Settings"
+msgstr "Inhoudsinstellingen"
+
+#: ../../mod/settings.php:858
+msgid "Display Theme:"
+msgstr "Gebruik thema:"
+
+#: ../../mod/settings.php:859
+msgid "Mobile Theme:"
+msgstr "Mobiel thema:"
+
+#: ../../mod/settings.php:860
+msgid "Enable user zoom on mobile devices"
+msgstr "Inzoomen op smartphones en tablets toestaan"
+
+#: ../../mod/settings.php:861
+msgid "Update browser every xx seconds"
+msgstr "Ververs de webbrowser om de zoveel seconde"
+
+#: ../../mod/settings.php:861
+msgid "Minimum of 10 seconds, no maximum"
+msgstr "Minimaal 10 seconde, geen maximum"
+
+#: ../../mod/settings.php:862
+msgid "Maximum number of conversations to load at any time:"
+msgstr "Maximaal aantal conversaties die per keer geladen worden:"
+
+#: ../../mod/settings.php:862
+msgid "Maximum of 100 items"
+msgstr "Maximaal 100 conversaties"
+
+#: ../../mod/settings.php:863
+msgid "Show emoticons (smilies) as images"
+msgstr "Toon emoticons (smilies) als afbeeldingen"
+
+#: ../../mod/settings.php:864
+msgid "Link post titles to source"
+msgstr "Berichtkoppen naar originele locatie linken"
+
+#: ../../mod/settings.php:865
+msgid "System Page Layout Editor - (advanced)"
+msgstr "Lay-out bewerken van systeempagina's (geavanceerd)"
+
+#: ../../mod/settings.php:868
+msgid "Use blog/list mode on channel page"
+msgstr "Gebruik blog/lijst-modus op kanaalpagina"
+
+#: ../../mod/settings.php:868 ../../mod/settings.php:869
+msgid "(comments displayed separately)"
+msgstr "(reacties worden afzonderlijk weergeven)"
+
+#: ../../mod/settings.php:869
+msgid "Use blog/list mode on matrix page"
+msgstr "Gebruik blog/lijst-modus op matrixpagina"
+
+#: ../../mod/settings.php:870
+msgid "Channel page max height of content (in pixels)"
+msgstr "Maximale hoogte berichtinhoud op kanaalpagina (in pixels)"
+
+#: ../../mod/settings.php:870 ../../mod/settings.php:871
+msgid "click to expand content exceeding this height"
+msgstr "klik om inhoud uit te klappen die deze hoogte overschrijdt"
+
+#: ../../mod/settings.php:871
+msgid "Matrix page max height of content (in pixels)"
+msgstr "Maximale hoogte berichtinhoud op matrixpagina (in pixels)"
+
+#: ../../mod/settings.php:905
+msgid "Nobody except yourself"
+msgstr "Niemand, behalve jezelf"
+
+#: ../../mod/settings.php:906
+msgid "Only those you specifically allow"
+msgstr "Alleen connecties met uitdrukkelijke toestemming"
+
+#: ../../mod/settings.php:907
+msgid "Approved connections"
+msgstr "Geaccepteerde connecties"
+
+#: ../../mod/settings.php:908
+msgid "Any connections"
+msgstr "Alle connecties"
+
+#: ../../mod/settings.php:909
+msgid "Anybody on this website"
+msgstr "Iedereen op deze hub"
+
+#: ../../mod/settings.php:910
+msgid "Anybody in this network"
+msgstr "Iedereen in dit netwerk"
+
+#: ../../mod/settings.php:911
+msgid "Anybody authenticated"
+msgstr "Geauthenticeerd"
+
+#: ../../mod/settings.php:912
+msgid "Anybody on the internet"
+msgstr "Iedereen op het internet"
+
+#: ../../mod/settings.php:986
+msgid "Publish your default profile in the network directory"
+msgstr "Publiceer je standaardprofiel in de kanalengids"
+
+#: ../../mod/settings.php:991
+msgid "Allow us to suggest you as a potential friend to new members?"
+msgstr "Sta ons toe om jouw kanaal als mogelijke connectie voor te stellen aan nieuwe kanalen"
+
+#: ../../mod/settings.php:1000
+msgid "Your channel address is"
+msgstr "Jouw kanaaladres is"
+
+#: ../../mod/settings.php:1048
+msgid "Channel Settings"
+msgstr "Kanaal-instellingen"
+
+#: ../../mod/settings.php:1055
+msgid "Basic Settings"
+msgstr "Basis-instellingen"
+
+#: ../../mod/settings.php:1058
+msgid "Your Timezone:"
+msgstr "Jouw tijdzone:"
+
+#: ../../mod/settings.php:1059
+msgid "Default Post Location:"
+msgstr "Standaardlocatie bericht:"
+
+#: ../../mod/settings.php:1059
+msgid "Geographical location to display on your posts"
+msgstr "Geografische locatie die bij het bericht moet worden vermeld"
+
+#: ../../mod/settings.php:1060
+msgid "Use Browser Location:"
+msgstr "Locatie van webbrowser gebruiken:"
+
+#: ../../mod/settings.php:1062
+msgid "Adult Content"
+msgstr "Inhoud voor volwassenen"
+
+#: ../../mod/settings.php:1062
+msgid ""
+"This channel frequently or regularly publishes adult content. (Please tag "
+"any adult material and/or nudity with #NSFW)"
+msgstr "Dit kanaal publiceert regelmatig of vaak materiaal dat alleen geschikt is voor volwassenen. (Gebruik de tag #NSFW in berichten met een seksueel getinte inhoud of ander voor minderjarigen ongeschikt materiaal)"
+
+#: ../../mod/settings.php:1064
+msgid "Security and Privacy Settings"
+msgstr "Veiligheids- en privacy-instellingen"
+
+#: ../../mod/settings.php:1066
+msgid "Your permissions are already configured. Click to view/adjust"
+msgstr "Jouw permissies zijn al ingesteld. Klik om ze te bekijken of aan te passen."
+
+#: ../../mod/settings.php:1068
+msgid "Hide my online presence"
+msgstr "Verberg mijn aanwezigheid"
+
+#: ../../mod/settings.php:1068
+msgid "Prevents displaying in your profile that you are online"
+msgstr "Voorkomt dat op je kanaalpagina te zien valt dat je momenteel op $Projectname aanwezig bent"
+
+#: ../../mod/settings.php:1070
+msgid "Simple Privacy Settings:"
+msgstr "Eenvoudige privacy-instellingen:"
+
+#: ../../mod/settings.php:1071
+msgid ""
+"Very Public - <em>extremely permissive (should be used with caution)</em>"
+msgstr "Zeer openbaar <em>(kanaal staat volledig open - moet met grote zorgvuldigheid gebruikt worden)</em>"
+
+#: ../../mod/settings.php:1072
+msgid ""
+"Typical - <em>default public, privacy when desired (similar to social "
+"network permissions but with improved privacy)</em>"
+msgstr "Normaal <em>(standaard openbaar, maar privacy wanneer noodzakelijk - vergelijkbaar met die van sociale netwerken, maar met verbeterde privacy)</em>"
+
+#: ../../mod/settings.php:1073
+msgid "Private - <em>default private, never open or public</em>"
+msgstr "Privé <em>(standaard privé en nooit openbaar)</em>"
+
+#: ../../mod/settings.php:1074
+msgid "Blocked - <em>default blocked to/from everybody</em>"
+msgstr "Geblokkeerd <em>(standaard geblokkeerd naar/van iedereen)</em>"
+
+#: ../../mod/settings.php:1076
+msgid "Allow others to tag your posts"
+msgstr "Anderen toestaan om je berichten te taggen"
+
+#: ../../mod/settings.php:1076
+msgid ""
+"Often used by the community to retro-actively flag inappropriate content"
+msgstr "Vaak in groepen/forums gebruikt om met terugwerkende kracht ongepast materiaal te markeren"
+
+#: ../../mod/settings.php:1078
+msgid "Advanced Privacy Settings"
+msgstr "Geavanceerde privacy-instellingen"
+
+#: ../../mod/settings.php:1080
+msgid "Expire other channel content after this many days"
+msgstr "Inhoud van andere kanalen na zoveel aantal dagen laten verlopen:"
+
+#: ../../mod/settings.php:1080
+msgid "0 or blank prevents expiration"
+msgstr "0 of leeg voorkomt het verlopen"
+
+#: ../../mod/settings.php:1081
+msgid "Maximum Friend Requests/Day:"
+msgstr "Maximum aantal connectieverzoeken per dag:"
+
+#: ../../mod/settings.php:1081
+msgid "May reduce spam activity"
+msgstr "Kan eventuele spam verminderen"
+
+#: ../../mod/settings.php:1082
+msgid "Default Post Permissions"
+msgstr "Standaard permissies voor nieuwe berichten"
+
+#: ../../mod/settings.php:1087
+msgid "Channel permissions category:"
+msgstr "Kanaaltype en -permissies:"
+
+#: ../../mod/settings.php:1093
+msgid "Maximum private messages per day from unknown people:"
+msgstr "Maximum aantal privé-berichten per dag van onbekende personen:"
+
+#: ../../mod/settings.php:1093
+msgid "Useful to reduce spamming"
+msgstr "Kan eventuele spam verminderen"
+
+#: ../../mod/settings.php:1096
+msgid "Notification Settings"
+msgstr "Notificatie-instellingen"
+
+#: ../../mod/settings.php:1097
+msgid "By default post a status message when:"
+msgstr "Plaats automatisch een statusbericht wanneer:"
+
+#: ../../mod/settings.php:1098
+msgid "accepting a friend request"
+msgstr "Een connectieverzoek wordt geaccepteerd"
+
+#: ../../mod/settings.php:1099
+msgid "joining a forum/community"
+msgstr "Je lid wordt van een forum/groep"
+
+#: ../../mod/settings.php:1100
+msgid "making an <em>interesting</em> profile change"
+msgstr "Er sprake is van een <em>interessante</em> profielwijziging"
+
+#: ../../mod/settings.php:1101
+msgid "Send a notification email when:"
+msgstr "Verzend een notificatie per e-mail wanneer:"
+
+#: ../../mod/settings.php:1102
+msgid "You receive a connection request"
+msgstr "Je een connectieverzoek ontvangt"
+
+#: ../../mod/settings.php:1103
+msgid "Your connections are confirmed"
+msgstr "Jouw connecties zijn bevestigd"
+
+#: ../../mod/settings.php:1104
+msgid "Someone writes on your profile wall"
+msgstr "Iemand iets op jouw kanaal heeft geschreven"
+
+#: ../../mod/settings.php:1105
+msgid "Someone writes a followup comment"
+msgstr "Iemand een reactie schrijft"
+
+#: ../../mod/settings.php:1106
+msgid "You receive a private message"
+msgstr "Je een privé-bericht ontvangt"
+
+#: ../../mod/settings.php:1107
+msgid "You receive a friend suggestion"
+msgstr "Je een kanaalvoorstel ontvangt"
+
+#: ../../mod/settings.php:1108
+msgid "You are tagged in a post"
+msgstr "Je expliciet in een bericht bent genoemd"
+
+#: ../../mod/settings.php:1109
+msgid "You are poked/prodded/etc. in a post"
+msgstr "Je bent in een bericht aangestoten/gepord/etc."
+
+#: ../../mod/settings.php:1112
+msgid "Show visual notifications including:"
+msgstr "Toon de volgende zichtbare notificaties:"
+
+#: ../../mod/settings.php:1114
+msgid "Unseen matrix activity"
+msgstr "Niet bekeken matrix-activiteit"
+
+#: ../../mod/settings.php:1115
+msgid "Unseen channel activity"
+msgstr "Niet bekeken kanaal-activiteit"
+
+#: ../../mod/settings.php:1116
+msgid "Unseen private messages"
+msgstr "Niet bekeken privéberichten"
+
+#: ../../mod/settings.php:1116 ../../mod/settings.php:1121
+#: ../../mod/settings.php:1122 ../../mod/settings.php:1123
+msgid "Recommended"
+msgstr "Aanbevolen"
+
+#: ../../mod/settings.php:1117
+msgid "Upcoming events"
+msgstr "Aankomende gebeurtenissen"
+
+#: ../../mod/settings.php:1118
+msgid "Events today"
+msgstr "Gebeurtissen van vandaag"
+
+#: ../../mod/settings.php:1119
+msgid "Upcoming birthdays"
+msgstr "Aankomende verjaardagen"
+
+#: ../../mod/settings.php:1119
+msgid "Not available in all themes"
+msgstr "Niet in alle thema's beschikbaar"
+
+#: ../../mod/settings.php:1120
+msgid "System (personal) notifications"
+msgstr "(Persoonlijke) systeemnotificaties"
+
+#: ../../mod/settings.php:1121
+msgid "System info messages"
+msgstr "Systeemmededelingen"
+
+#: ../../mod/settings.php:1122
+msgid "System critical alerts"
+msgstr "Kritische systeemwaarschuwingen"
+
+#: ../../mod/settings.php:1123
+msgid "New connections"
+msgstr "Nieuwe connecties"
+
+#: ../../mod/settings.php:1124
+msgid "System Registrations"
+msgstr "Nieuwe accountregistraties op deze hub"
+
+#: ../../mod/settings.php:1125
+msgid ""
+"Also show new wall posts, private messages and connections under Notices"
+msgstr "Toon tevens nieuwe kanaalberichten, privéberichten en connecties onder Notificaties"
+
+#: ../../mod/settings.php:1127
+msgid "Notify me of events this many days in advance"
+msgstr "Herinner mij zoveel dagen van te voren aan gebeurtenissen"
+
+#: ../../mod/settings.php:1127
+msgid "Must be greater than 0"
+msgstr "Moet hoger dan 0 zijn"
+
+#: ../../mod/settings.php:1129
+msgid "Advanced Account/Page Type Settings"
+msgstr "Instellingen geavanceerd account/paginatype"
+
+#: ../../mod/settings.php:1130
+msgid "Change the behaviour of this account for special situations"
+msgstr "Verander het gedrag van dit account voor speciale situaties"
+
+#: ../../mod/settings.php:1133
+msgid ""
+"Please enable expert mode (in <a href=\"settings/features\">Settings > "
+"Additional features</a>) to adjust!"
+msgstr "Schakel de expertmodus in (in <a href=\"settings/features\">Instellingen > Extra functies</a>) om aan te kunnen passen!"
+
+#: ../../mod/settings.php:1134
+msgid "Miscellaneous Settings"
+msgstr "Diverse instellingen"
+
+#: ../../mod/settings.php:1136
+msgid "Personal menu to display in your channel pages"
+msgstr "Persoonlijk menu om op je kanaalpagina's weer te geven"
+
+#: ../../mod/settings.php:1137 ../../mod/removeme.php:61
+msgid "Remove Channel"
+msgstr "Kanaal verwijderen"
+
+#: ../../mod/settings.php:1138
+msgid "Remove this channel."
+msgstr "Verwijder dit kanaal."
 
 #: ../../mod/id.php:11
 msgid "First Name"
@@ -7974,6 +8143,114 @@ msgstr "Verwijder conversatie"
 msgid "D, d M Y - g:i A"
 msgstr "D, j M Y - G:i"
 
+#: ../../mod/uexport.php:50 ../../mod/uexport.php:51
+msgid "Export Channel"
+msgstr "Kanaal exporteren"
+
+#: ../../mod/uexport.php:52
+msgid ""
+"Export your basic channel information to a file.  This acts as a backup of "
+"your connections, permissions, profile and basic data, which can be used to "
+"import your data to a new server hub, but does not contain your content."
+msgstr "Exporteer de basisinformatie van jouw kanaal naar een bestand. Dit fungeert als een back-up van jouw connecties, permissies, profiel en basisgegevens, die gebruikt kan worden om op een nieuwe hub jouw gegevens te importeren. Deze back-up bevat echter niet de inhoud van jouw kanaal."
+
+#: ../../mod/uexport.php:53
+msgid "Export Content"
+msgstr "Inhoud exporteren"
+
+#: ../../mod/uexport.php:54
+msgid ""
+"Export your channel information and recent content to a JSON backup that can"
+" be restored or imported to another server hub. This backs up all of your "
+"connections, permissions, profile data and several months of posts. This "
+"file may be VERY large.  Please be patient - it may take several minutes for"
+" this download to begin."
+msgstr "Exporteer informatie en recente inhoud van jouw kanaal naar een JSON-back-up, wat kan worden gebruikt om jouw kanaal te herstellen of te importeren op een andere hub. Dit slaat al jouw connecties, permissies, profielgegevens en enkele maanden aan inhoud van jouw kanaal op. Dit bestand kan ZEER groot worden. Wees geduldig - het kan enkele minuten duren voordat de download begint."
+
+#: ../../mod/uexport.php:55
+msgid "Export your posts from a given year or month:"
+msgstr "Exporteer jouw berichten van een bepaald jaar of een bepaalde maand:"
+
+#: ../../mod/uexport.php:57
+msgid ""
+"You may also export your posts and conversations for a particular year or "
+"month. Click on one of the recent years or months below."
+msgstr "Je kan ook jouw berichten en conversaties van een bepaald jaar of een bepaalde maand exporteren. Klik hieronder op een van de recente jaren of maanden."
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Jan"
+msgstr "jan"
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Feb"
+msgstr "feb"
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Mar"
+msgstr "mrt"
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Apr"
+msgstr "apr"
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Jun"
+msgstr "jun"
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Jul"
+msgstr "jul"
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Aug"
+msgstr "aug"
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Sep"
+msgstr "sep"
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Oct"
+msgstr "okt"
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Nov"
+msgstr "nov"
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Dec"
+msgstr "dec"
+
+#: ../../mod/uexport.php:60
+msgid ""
+"If the export fails (possibly due to memory exhaustion on your server hub), "
+"please try again selecting a more limited date range."
+msgstr "Wanneer het exporteren mislukt (waarschijnlijk door een gebrek aan beschikbaar servergeheugen), kies een kleiner datumbereik en probeer het dan nogmaals."
+
+#: ../../mod/uexport.php:61
+#, php-format
+msgid ""
+"Or adjust the date in your browser location bar to select other dates. For "
+"example the year 2013; <a href=\"%1$s/2013\">%1$s/2013</a> or the month "
+"September 2013; <a href=\"%1$s/2013/9\">%1$s/2013/9</a>"
+msgstr "Of pas de datum aan in de adresbalk van je browser om zo andere jaren of maanden te kiezen. Bijvoorbeeld het jaar 2013; <a href=\"%1$s/2013\">%1$s/2013</a> of de maand september 2013; <a href=\"%1$s/2013/9\">%1$s/2013/9</a>."
+
+#: ../../mod/uexport.php:62
+msgid "Please visit"
+msgstr "Bezoek"
+
+#: ../../mod/uexport.php:62
+msgid "on another hub to import the backup files(s)."
+msgstr "op een andere hub om het back-upbestand of de back-upbestanden te importeren."
+
+#: ../../mod/uexport.php:63
+msgid ""
+"We advise you to clone the channel on the new hub first and than to import "
+"the backup file(s) (from the same channel) in chronological order. Importing"
+" the backup files into another channel will certainly give permission "
+"issues."
+msgstr "Wij adviseren om eerst het kanaal op de nieuwe hub te klonen en dan vervolgens het back-upbestand of de back-upbestanden in chronologische volgorde te importeren (van hetzelfde kanaal). Het importeren van back-upbestanden in een ander kanaal veroorzaakt zeker permissieproblemen."
+
 #: ../../mod/mood.php:131
 msgid "Set your current mood and tell your friends"
 msgstr "Noteer je huidige stemming en toon het aan je connecties"
@@ -7984,7 +8261,7 @@ msgstr "Totaal aantal stemmen"
 
 #: ../../mod/vote.php:98
 msgid "Average Rating"
-msgstr "Gemiddelde waardering"
+msgstr "Gemiddelde beoordeling"
 
 #: ../../mod/removeme.php:29
 msgid ""
@@ -8010,314 +8287,254 @@ msgid ""
 "removed from the network"
 msgstr "Standaard wordt alleen het kanaal dat zich op deze hub bevindt uit het $Projectname-netwerk verwijderd"
 
-#: ../../mod/connedit.php:262
+#: ../../mod/connedit.php:75
+msgid "Could not access contact record."
+msgstr "Kon geen toegang krijgen tot de connectie-gegevens."
+
+#: ../../mod/connedit.php:99
+msgid "Could not locate selected profile."
+msgstr "Kon het gekozen profiel niet vinden."
+
+#: ../../mod/connedit.php:219
+msgid "Connection updated."
+msgstr "Connectie bijgewerkt."
+
+#: ../../mod/connedit.php:221
+msgid "Failed to update connection record."
+msgstr "Bijwerken van connectie-gegevens mislukt."
+
+#: ../../mod/connedit.php:267
 msgid "is now connected to"
 msgstr "is nu verbonden met"
 
-#: ../../mod/connedit.php:375
+#: ../../mod/connedit.php:392
 msgid "Could not access address book record."
 msgstr "Kon geen toegang krijgen tot de record van de connectie."
 
-#: ../../mod/connedit.php:389
+#: ../../mod/connedit.php:406
 msgid "Refresh failed - channel is currently unavailable."
 msgstr "Vernieuwen mislukt - kanaal is momenteel niet beschikbaar"
 
-#: ../../mod/connedit.php:396
-msgid "Channel has been unblocked"
-msgstr "Kanaal is gedeblokkeerd"
-
-#: ../../mod/connedit.php:397
-msgid "Channel has been blocked"
-msgstr "Kanaal is geblokkeerd"
-
-#: ../../mod/connedit.php:401 ../../mod/connedit.php:413
-#: ../../mod/connedit.php:425 ../../mod/connedit.php:437
-#: ../../mod/connedit.php:453
+#: ../../mod/connedit.php:418 ../../mod/connedit.php:430
+#: ../../mod/connedit.php:442 ../../mod/connedit.php:454
+#: ../../mod/connedit.php:470
 msgid "Unable to set address book parameters."
 msgstr "Niet in staat om de parameters van connecties in te stellen."
 
-#: ../../mod/connedit.php:408
-msgid "Channel has been unignored"
-msgstr "Kanaal wordt niet meer genegeerd"
-
-#: ../../mod/connedit.php:409
-msgid "Channel has been ignored"
-msgstr "Kanaal wordt genegeerd"
-
-#: ../../mod/connedit.php:420
-msgid "Channel has been unarchived"
-msgstr "Kanaal is niet meer gearchiveerd"
-
-#: ../../mod/connedit.php:421
-msgid "Channel has been archived"
-msgstr "Kanaal is gearchiveerd"
-
-#: ../../mod/connedit.php:432
-msgid "Channel has been unhidden"
-msgstr "Kanaal is niet meer verborgen"
-
-#: ../../mod/connedit.php:433
-msgid "Channel has been hidden"
-msgstr "Kanaal is verborgen"
-
-#: ../../mod/connedit.php:448
-msgid "Channel has been approved"
-msgstr "Connectie/kanaal is geaccepteerd"
-
-#: ../../mod/connedit.php:449
-msgid "Channel has been unapproved"
-msgstr "Connectie/kanaal is afgewezen"
-
-#: ../../mod/connedit.php:477
+#: ../../mod/connedit.php:494
 msgid "Connection has been removed."
 msgstr "Connectie is verwijderd"
 
-#: ../../mod/connedit.php:497
+#: ../../mod/connedit.php:513
 #, php-format
 msgid "View %s's profile"
 msgstr "Profiel van %s weergeven"
 
-#: ../../mod/connedit.php:501
+#: ../../mod/connedit.php:517
 msgid "Refresh Permissions"
 msgstr "Permissies vernieuwen"
 
-#: ../../mod/connedit.php:504
+#: ../../mod/connedit.php:520
 msgid "Fetch updated permissions"
 msgstr "Aangepaste permissies ophalen"
 
-#: ../../mod/connedit.php:508
+#: ../../mod/connedit.php:524
 msgid "Recent Activity"
 msgstr "Recente activiteit"
 
-#: ../../mod/connedit.php:511
+#: ../../mod/connedit.php:527
 msgid "View recent posts and comments"
 msgstr "Recente berichten en reacties weergeven"
 
-#: ../../mod/connedit.php:520
+#: ../../mod/connedit.php:534
 msgid "Block (or Unblock) all communications with this connection"
 msgstr "Blokkeer (of deblokkeer) alle communicatie met deze connectie"
 
-#: ../../mod/connedit.php:524 ../../mod/connedit.php:721
+#: ../../mod/connedit.php:535
+msgid "This connection is blocked!"
+msgstr "Deze connectie is geblokkeerd!"
+
+#: ../../mod/connedit.php:539
 msgid "Unignore"
 msgstr "Niet meer negeren"
 
-#: ../../mod/connedit.php:524 ../../mod/connedit.php:721
-#: ../../mod/notifications.php:51
+#: ../../mod/connedit.php:539 ../../mod/notifications.php:51
 msgid "Ignore"
 msgstr "Negeren"
 
-#: ../../mod/connedit.php:527
+#: ../../mod/connedit.php:542
 msgid "Ignore (or Unignore) all inbound communications from this connection"
 msgstr "Negeer (of negeer niet meer) alle inkomende communicatie van deze connectie"
 
-#: ../../mod/connedit.php:530
+#: ../../mod/connedit.php:543
+msgid "This connection is ignored!"
+msgstr "Deze connectie wordt genegeerd!"
+
+#: ../../mod/connedit.php:547
 msgid "Unarchive"
 msgstr "Niet meer archiveren"
 
-#: ../../mod/connedit.php:530
+#: ../../mod/connedit.php:547
 msgid "Archive"
 msgstr "Archiveren"
 
-#: ../../mod/connedit.php:533
+#: ../../mod/connedit.php:550
 msgid ""
 "Archive (or Unarchive) this connection - mark channel dead but keep content"
 msgstr "Archiveer (of dearchiveer) deze connectie - markeer het kanaal als dood, maar bewaar de inhoud"
 
-#: ../../mod/connedit.php:536
+#: ../../mod/connedit.php:551
+msgid "This connection is archived!"
+msgstr "Deze connectie is gearchiveerd!"
+
+#: ../../mod/connedit.php:555
 msgid "Unhide"
 msgstr "Niet meer verbergen"
 
-#: ../../mod/connedit.php:536
+#: ../../mod/connedit.php:555
 msgid "Hide"
 msgstr "Verbergen"
 
-#: ../../mod/connedit.php:539
+#: ../../mod/connedit.php:558
 msgid "Hide or Unhide this connection from your other connections"
 msgstr "Deze connectie verbergen (of niet meer verbergen) voor jouw andere connecties"
 
-#: ../../mod/connedit.php:546
+#: ../../mod/connedit.php:559
+msgid "This connection is hidden!"
+msgstr "Deze connectie is verborgen!"
+
+#: ../../mod/connedit.php:566
 msgid "Delete this connection"
 msgstr "Deze connectie verwijderen"
 
-#: ../../mod/connedit.php:637 ../../mod/connedit.php:675
+#: ../../mod/connedit.php:647
 msgid "Approve this connection"
 msgstr "Deze connectie accepteren"
 
-#: ../../mod/connedit.php:637
+#: ../../mod/connedit.php:647
 msgid "Accept connection to allow communication"
 msgstr "Keur deze connectie goed om communicatie toe te staan"
 
-#: ../../mod/connedit.php:653
-#, php-format
-msgid "Connections: settings for %s"
-msgstr "Connecties: instellingen voor %s"
+#: ../../mod/connedit.php:652
+msgid "Set Affinity"
+msgstr "Verwantschapsfilter instellen"
 
-#: ../../mod/connedit.php:654
-msgid "Apply these permissions automatically"
-msgstr "Deze permissies automatisch toepassen"
+#: ../../mod/connedit.php:655
+msgid "Set Profile"
+msgstr "Profiel instellen"
 
 #: ../../mod/connedit.php:658
-msgid "Apply the permissions indicated on this page to all new connections."
-msgstr "Permissies die op deze pagina staan vermeldt op alle nieuwe connecties toepassen."
+msgid "Set Affinity & Profile"
+msgstr "Verwantschapsfilter en profiel instellen"
 
-#: ../../mod/connedit.php:662
-msgid "Slide to adjust your degree of friendship"
-msgstr "Schuif om te bepalen hoe goed je iemand kent en/of mag"
-
-#: ../../mod/connedit.php:671
-msgid ""
-"Default permissions for your channel type have (just) been applied. They "
-"have not yet been submitted. Please review the permissions on this page and "
-"make any desired changes at this time. This new connection may <em>not</em> "
-"be able to communicate with you until you submit this page, which will "
-"install and apply the selected permissions."
-msgstr "Voor jouw kanaaltype geldende standaard permissies zijn (zonet) toegepast. Ze zijn echter nog niet opgeslagen. Controleer de permissies op deze pagina en verander ze eventueel. Deze nieuwe connectie kan mogelijk nog <em>niet</em> met jou communiceren totdat je deze pagina opslaat, wat ervoor zorgt dat de gekozen permissies actief worden."
-
-#: ../../mod/connedit.php:674
-msgid "inherited"
-msgstr "geërfd"
+#: ../../mod/connedit.php:675
+msgid "Apply these permissions automatically"
+msgstr "Deze permissies automatisch toepassen"
 
 #: ../../mod/connedit.php:677
-msgid "Connection has no individual permissions!"
-msgstr "Connectie heeft geen individuele permissies!"
-
-#: ../../mod/connedit.php:678
-msgid ""
-"This may be appropriate based on your <a href=\"settings\">privacy "
-"settings</a>, though you may wish to review the \"Advanced Permissions\"."
-msgstr "Dit is mogelijk voldoende, wanneer er naar jouw <a href=\"settings\">privacy-instellingen</a> wordt gekeken.  Hoewel je wellicht de geavanceerde rechten wil nagaan."
+msgid "This connection's address is"
+msgstr "Het adres van deze connectie is"
 
 #: ../../mod/connedit.php:680
-msgid "Profile Visibility"
-msgstr "Zichtbaarheid profiel"
-
-#: ../../mod/connedit.php:681
-#, php-format
 msgid ""
-"Please choose the profile you would like to display to %s when viewing your "
-"profile securely."
-msgstr "Kies het profiel dat je aan %s wil tonen wanneer hij/zij ingelogd jouw profiel wil bekijken."
+"The permissions indicated on this page will be applied to all new "
+"connections."
+msgstr "Permissies die op deze pagina staan vermeld worden op alle nieuwe connecties toegepast."
 
 #: ../../mod/connedit.php:682
-msgid "Contact Information / Notes"
-msgstr "Informatie/aantekeningen over connectie"
+msgid "Slide to adjust your degree of friendship"
+msgstr "Schuif om te bepalen hoe goed je iemand kent en/of mag"
 
-#: ../../mod/connedit.php:683
-msgid "Edit contact notes"
-msgstr "Bewerk aantekeningen over contact"
+#: ../../mod/connedit.php:684
+msgid "Slide to adjust your rating"
+msgstr "Gebruik de schuif om je beoordeling te geven"
 
-#: ../../mod/connedit.php:685
-msgid "Their Settings"
-msgstr "Hun instellingen"
+#: ../../mod/connedit.php:685 ../../mod/connedit.php:690
+msgid "Optionally explain your rating"
+msgstr "Verklaar jouw beoordeling (niet verplicht)"
 
-#: ../../mod/connedit.php:686
-msgid "My Settings"
-msgstr "Mijn instellingen"
+#: ../../mod/connedit.php:687
+msgid "Custom Filter"
+msgstr "Berichtenfilter"
 
 #: ../../mod/connedit.php:688
+msgid "Only import posts with this text"
+msgstr "Importeer alleen berichten met deze tekst"
+
+#: ../../mod/connedit.php:688 ../../mod/connedit.php:689
 msgid ""
-"Default permissions for this channel type have (just) been applied. They "
-"have <em>not</em> been saved and there are currently no stored default "
-"permissions. Please review/edit the applied settings and click [Submit] to "
-"finalize."
-msgstr "Voor dit kanaaltype geldende standaard permissies zijn (zonet) toegepast. Ze zijn echter nog <em>niet</em> opgeslagen en er zijn momenteel geen standaard permissies aanwezig. Controleer/verander de permissies op deze pagina en klik op [Opslaan] om deze te activeren."
+"words one per line or #tags or /patterns/, leave blank to import all posts"
+msgstr "woorden (één per regel), #tags of /patterns/, laat leeg om alle berichten te importeren"
 
 #: ../../mod/connedit.php:689
-msgid "Clear/Disable Automatic Permissions"
-msgstr "Verwijderen/uitschakelen automatische permissies"
-
-#: ../../mod/connedit.php:690
-msgid "Forum Members"
-msgstr "Forumleden"
+msgid "Do not import posts with this text"
+msgstr "Importeer geen berichten met deze tekst"
 
 #: ../../mod/connedit.php:691
-msgid "Soapbox"
-msgstr "Zeepkist"
-
-#: ../../mod/connedit.php:692
-msgid "Full Sharing (typical social network permissions)"
-msgstr "Voluit delen (vergelijkbaar met die van sociale netwerken)"
-
-#: ../../mod/connedit.php:693
-msgid "Cautious Sharing "
-msgstr "Voorzichtig delen"
-
-#: ../../mod/connedit.php:694
-msgid "Follow Only"
-msgstr "Alleen volgen"
-
-#: ../../mod/connedit.php:695
-msgid "Individual Permissions"
-msgstr "Individuele permissies"
+msgid "This information is public!"
+msgstr "Deze informatie is openbaar!"
 
 #: ../../mod/connedit.php:696
-msgid ""
-"Some permissions may be inherited from your channel <a "
-"href=\"settings\">privacy settings</a>, which have higher priority than "
-"individual settings. Changing those inherited settings on this page will "
-"have no effect."
-msgstr "Sommige permissies kunnen worden overgeërfd van de <a href=\"settings\">privacy-instellingen</a> van jouw kanaal. Wanneer je deze geërfde instellingen op deze pagina veranderd heeft dat geen effect."
+msgid "Connection Pending Approval"
+msgstr "Connectie moet nog goedgekeurd worden"
 
 #: ../../mod/connedit.php:697
-msgid "Advanced Permissions"
-msgstr "Geavanceerde permissies"
+msgid "Connection Request"
+msgstr "Connectieverzoek"
 
 #: ../../mod/connedit.php:698
-msgid "Simple Permissions (select one and submit)"
-msgstr "Eenvoudige permissies (selecteer er één en opslaan)"
-
-#: ../../mod/connedit.php:702
 #, php-format
-msgid "Visit %s's profile - %s"
-msgstr "Profiel van %s bezoeken - %s"
+msgid ""
+"(%s) would like to connect with you. Please approve this connection to allow"
+" communication."
+msgstr "(%s) wil met jou verbinden. Keur dit connectieverzoek goed om onderling te kunnen communiceren."
 
-#: ../../mod/connedit.php:703
-msgid "Block/Unblock contact"
-msgstr "Connectie blokkeren/deblokkeren"
+#: ../../mod/connedit.php:700
+msgid "Approve Later"
+msgstr "Later goedkeuren"
 
-#: ../../mod/connedit.php:704
-msgid "Ignore contact"
-msgstr "Connectie negeren"
+#: ../../mod/connedit.php:703
+msgid "inherited"
+msgstr "geërfd"
 
 #: ../../mod/connedit.php:705
-msgid "Repair URL settings"
-msgstr "URL-instellingen repareren"
+#, php-format
+msgid ""
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
+msgstr "Kies het profiel dat je aan %s wil tonen wanneer hij/zij ingelogd jouw profiel wil bekijken."
 
-#: ../../mod/connedit.php:706
-msgid "View conversations"
-msgstr "Conversaties weergeven"
+#: ../../mod/connedit.php:707
+msgid "Their Settings"
+msgstr "Hun instellingen"
 
 #: ../../mod/connedit.php:708
-msgid "Delete contact"
-msgstr "Connectie verwijderen"
-
-#: ../../mod/connedit.php:712
-msgid "Last update:"
-msgstr "Laatste wijziging:"
-
-#: ../../mod/connedit.php:714
-msgid "Update public posts"
-msgstr "Openbare berichten updaten"
-
-#: ../../mod/connedit.php:716
-msgid "Update now"
-msgstr "Nu updaten"
+msgid "My Settings"
+msgstr "Mijn instellingen"
 
-#: ../../mod/connedit.php:722
-msgid "Currently blocked"
-msgstr "Momenteel geblokkeerd"
+#: ../../mod/connedit.php:710
+msgid "Individual Permissions"
+msgstr "Individuele permissies"
 
-#: ../../mod/connedit.php:723
-msgid "Currently ignored"
-msgstr "Momenteel genegeerd"
+#: ../../mod/connedit.php:711
+msgid ""
+"Some permissions may be inherited from your channel's <a "
+"href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
+"priority than individual settings. You can <strong>not</strong> change those"
+" settings here."
+msgstr "Sommige permissies worden mogelijk overgeërfd van de <a href=\"settings\">privacy-instellingen</a> van jouw kanaal, die een hogere prioriteit hebben dan deze individuele instellingen. Je kan je deze overgeërfde permissies hier <strong>niet</strong> veranderen."
 
-#: ../../mod/connedit.php:724
-msgid "Currently archived"
-msgstr "Momenteel gearchiveerd"
+#: ../../mod/connedit.php:712
+msgid ""
+"Some permissions may be inherited from your channel's <a "
+"href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
+"priority than individual settings. You can change those settings here but "
+"they wont have any impact unless the inherited setting changes."
+msgstr "Sommige permissies worden mogelijk overgeërfd van de <a href=\"settings\">privacy-instellingen</a> van jouw kanaal, die een hogere prioriteit hebben dan deze individuele permissies. Je kan de permissies hier veranderen, maar die hebben geen effect, tenzij de overgeërfde permissies worden veranderd. "
 
-#: ../../mod/connedit.php:725
-msgid "Currently pending"
-msgstr "Moeten nog geaccepteerd of afgewezen worden"
+#: ../../mod/connedit.php:713
+msgid "Last update:"
+msgstr "Laatste wijziging:"
 
 #: ../../mod/rmagic.php:40
 msgid ""
@@ -8427,7 +8644,7 @@ msgstr "Annuleren"
 msgid "Please login."
 msgstr "Inloggen."
 
-#: ../../mod/post.php:235
+#: ../../mod/post.php:236
 msgid ""
 "Remote authentication blocked. You are logged into this site locally. Please"
 " logout and retry."
@@ -8537,37 +8754,26 @@ msgstr "voegde jouw kanaal toe"
 msgid "posted an event"
 msgstr "plaatste een gebeurtenis"
 
-#: ../../mod/network.php:91
-msgid "No such group"
-msgstr "Collectie niet gevonden"
-
-#: ../../mod/network.php:129
-msgid "No such channel"
-msgstr "Niet zo'n kanaal"
-
-#: ../../mod/network.php:143
-msgid "Search Results For:"
-msgstr "Zoekresultaten voor:"
-
-#: ../../mod/network.php:198
-msgid "Collection is empty"
-msgstr "Collectie is leeg"
+#: ../../mod/layouts.php:176
+msgid "Comanche page description language help"
+msgstr "Hulp met de paginabeschrijvingstaal Comanche"
 
-#: ../../mod/network.php:207
-msgid "Collection: "
-msgstr "Collectie: "
+#: ../../mod/layouts.php:180
+msgid "Layout Description"
+msgstr "Lay-out-omschrijving"
 
-#: ../../mod/network.php:226
-msgid "Connection: "
-msgstr "Connectie: "
+#: ../../mod/layouts.php:185
+msgid "Download PDL file"
+msgstr "Download PDL-bestand"
 
-#: ../../mod/network.php:233
-msgid "Invalid connection."
-msgstr "Ongeldige connectie."
+#: ../../mod/home.php:75
+#, php-format
+msgid "Welcome to %s"
+msgstr "Welkom op %s"
 
-#: ../../mod/page.php:119
-msgid "Ipsum Lorem"
-msgstr "Lorem ipsum"
+#: ../../mod/page.php:126
+msgid "Lorem Ipsum"
+msgstr "Lorem Ipsum"
 
 #: ../../mod/bookmarks.php:38
 msgid "Bookmark added"
@@ -8585,6 +8791,21 @@ msgstr "Bladwijzers van mijn connecties"
 msgid "Insufficient permissions.  Request redirected to profile page."
 msgstr "Onvoldoende permissies.  Doorgestuurd naar profielpagina."
 
+#: ../../mod/pconfig.php:27 ../../mod/pconfig.php:60
+msgid "This setting requires special processing and editing has been blocked."
+msgstr "Deze instelling vereist een speciaal proces  en bewerken is geblokkeerd."
+
+#: ../../mod/pconfig.php:49
+msgid "Configuration Editor"
+msgstr "Configuratiebewerker"
+
+#: ../../mod/pconfig.php:50
+msgid ""
+"Warning: Changing some settings could render your channel inoperable. Please"
+" leave this page unless you are comfortable with and knowledgeable about how"
+" to correctly use this feature."
+msgstr "Waarschuwing: het veranderen van sommige instellingen kunnen jouw kanaal onklaar maken. Verlaat deze pagina, tenzij je weet waar je mee bezig bent en voldoende kennis bezit over hoe je deze functies moet gebruiken. "
+
 #: ../../mod/suggest.php:35
 msgid ""
 "No suggestions available. If this is a new site, please try again in 24 "
@@ -8593,7 +8814,7 @@ msgstr "Geen voorgestelde kanalen gevonden. Wanneer dit een nieuwe hub is, probe
 
 #: ../../mod/poll.php:64
 msgid "Poll"
-msgstr "Poll"
+msgstr "Peiling"
 
 #: ../../mod/poll.php:69
 msgid "View Results"
@@ -8633,7 +8854,7 @@ msgid "Monospace"
 msgstr "Monospace"
 
 #: ../../view/theme/apw/php/config.php:259
-#: ../../view/theme/redbasic/php/config.php:100
+#: ../../view/theme/redbasic/php/config.php:102
 msgid "Theme settings"
 msgstr "Thema-instellingen"
 
@@ -8642,7 +8863,7 @@ msgid "Set scheme"
 msgstr "Schema van thema instellen"
 
 #: ../../view/theme/apw/php/config.php:261
-#: ../../view/theme/redbasic/php/config.php:122
+#: ../../view/theme/redbasic/php/config.php:124
 msgid "Set font-size for posts and comments"
 msgstr "Lettergrootte voor berichten en reacties instellen"
 
@@ -8680,7 +8901,7 @@ msgstr "Achtergrondafbeelding instellen"
 
 #: ../../view/theme/apw/php/config.php:270
 msgid "Set background attachment"
-msgstr "Gedrag achtergrondafbeelding instellen"
+msgstr "Background-attachment instellen"
 
 #: ../../view/theme/apw/php/config.php:271
 msgid "Set background color"
@@ -8696,11 +8917,11 @@ msgstr "Achtergrondkleur van sectie instellen"
 
 #: ../../view/theme/apw/php/config.php:274
 msgid "Set color of items - use hex"
-msgstr "Tekstkleur van items instellen (gebruik hexadecimaal)"
+msgstr "Tekstkleur van items instellen (hexadecimaal)"
 
 #: ../../view/theme/apw/php/config.php:275
 msgid "Set color of links - use hex"
-msgstr "Kleur van links instellen (gebruik hexadecimaal)"
+msgstr "Kleur van links instellen (hexadecimaal)"
 
 #: ../../view/theme/apw/php/config.php:276
 msgid "Set max-width for items.  Default 400px"
@@ -8716,7 +8937,7 @@ msgstr "Breedte van de generieke content-wrapper instellen (standaard 48%)"
 
 #: ../../view/theme/apw/php/config.php:279
 msgid "Set color of fonts - use hex"
-msgstr "Tekstkleur instellen (gebruik hexadecimaal)"
+msgstr "Tekstkleur instellen (hexadecimaal)"
 
 #: ../../view/theme/apw/php/config.php:280
 msgid "Set background-size element"
@@ -8740,7 +8961,7 @@ msgstr "Kleur van de navigatiebalk"
 
 #: ../../view/theme/apw/php/config.php:285
 msgid "Item float"
-msgstr "Item float"
+msgstr "Positie van item (float)"
 
 #: ../../view/theme/apw/php/config.php:286
 msgid "Left offset of the section element"
@@ -8756,185 +8977,185 @@ msgstr "Breedte van sectie"
 
 #: ../../view/theme/apw/php/config.php:289
 msgid "Left offset of the aside"
-msgstr "Rechter offset van aside (zijbalk)"
+msgstr "Linker offset van de zijbalk (aside)"
 
 #: ../../view/theme/apw/php/config.php:290
 msgid "Right offset of the aside element"
-msgstr "Rechter offset van het aside-element"
+msgstr "Rechter offset van de zijbalk (aside)"
 
 #: ../../view/theme/redbasic/php/config.php:82
 msgid "Light (Red Matrix default)"
 msgstr "Light ($Projectname-standaard)"
 
-#: ../../view/theme/redbasic/php/config.php:101
+#: ../../view/theme/redbasic/php/config.php:103
 msgid "Select scheme"
 msgstr "Kies schema van thema"
 
-#: ../../view/theme/redbasic/php/config.php:102
+#: ../../view/theme/redbasic/php/config.php:104
 msgid "Narrow navbar"
 msgstr "Smalle navigatiebalk"
 
-#: ../../view/theme/redbasic/php/config.php:103
+#: ../../view/theme/redbasic/php/config.php:105
 msgid "Navigation bar background color"
 msgstr "Achtergrondkleur navigatiebalk"
 
-#: ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:106
 msgid "Navigation bar gradient top color"
 msgstr "Bovenste gradiëntkleur navigatiebalk"
 
-#: ../../view/theme/redbasic/php/config.php:105
+#: ../../view/theme/redbasic/php/config.php:107
 msgid "Navigation bar gradient bottom color"
 msgstr "Onderste gradiëntkleur navigatiebalk"
 
-#: ../../view/theme/redbasic/php/config.php:106
+#: ../../view/theme/redbasic/php/config.php:108
 msgid "Navigation active button gradient top color"
 msgstr "Bovenste gradiëntkleur actieve knop navigatiebalk"
 
-#: ../../view/theme/redbasic/php/config.php:107
+#: ../../view/theme/redbasic/php/config.php:109
 msgid "Navigation active button gradient bottom color"
 msgstr "Onderste gradiëntkleur actieve knop op navigatiebalk"
 
-#: ../../view/theme/redbasic/php/config.php:108
+#: ../../view/theme/redbasic/php/config.php:110
 msgid "Navigation bar border color "
 msgstr "Randkleur navigatiebalk "
 
-#: ../../view/theme/redbasic/php/config.php:109
+#: ../../view/theme/redbasic/php/config.php:111
 msgid "Navigation bar icon color "
 msgstr "Pictogramkleur navigatiebalk"
 
-#: ../../view/theme/redbasic/php/config.php:110
+#: ../../view/theme/redbasic/php/config.php:112
 msgid "Navigation bar active icon color "
 msgstr "Actieve pictogramkleur navigatiebalk"
 
-#: ../../view/theme/redbasic/php/config.php:111
+#: ../../view/theme/redbasic/php/config.php:113
 msgid "link color"
 msgstr "Linkkleur instellen"
 
-#: ../../view/theme/redbasic/php/config.php:112
+#: ../../view/theme/redbasic/php/config.php:114
 msgid "Set font-color for banner"
 msgstr "Tekstkleur van banner instellen"
 
-#: ../../view/theme/redbasic/php/config.php:113
+#: ../../view/theme/redbasic/php/config.php:115
 msgid "Set the background color"
 msgstr "Achtergrondkleur instellen"
 
-#: ../../view/theme/redbasic/php/config.php:114
+#: ../../view/theme/redbasic/php/config.php:116
 msgid "Set the background image"
 msgstr "Achtergrondafbeelding instellen"
 
-#: ../../view/theme/redbasic/php/config.php:115
+#: ../../view/theme/redbasic/php/config.php:117
 msgid "Set the background color of items"
 msgstr "Achtergrondkleur items instellen"
 
-#: ../../view/theme/redbasic/php/config.php:116
+#: ../../view/theme/redbasic/php/config.php:118
 msgid "Set the background color of comments"
 msgstr "Achtergrondkleur reacties instellen"
 
-#: ../../view/theme/redbasic/php/config.php:117
+#: ../../view/theme/redbasic/php/config.php:119
 msgid "Set the border color of comments"
 msgstr "Randkleur reacties instellen"
 
-#: ../../view/theme/redbasic/php/config.php:118
+#: ../../view/theme/redbasic/php/config.php:120
 msgid "Set the indent for comments"
 msgstr "Inspringen reacties instellen"
 
-#: ../../view/theme/redbasic/php/config.php:119
+#: ../../view/theme/redbasic/php/config.php:121
 msgid "Set the basic color for item icons"
 msgstr "Basiskleur itempictogrammen instellen"
 
-#: ../../view/theme/redbasic/php/config.php:120
+#: ../../view/theme/redbasic/php/config.php:122
 msgid "Set the hover color for item icons"
 msgstr "Hoverkleur itempictogrammen instellen"
 
-#: ../../view/theme/redbasic/php/config.php:121
+#: ../../view/theme/redbasic/php/config.php:123
 msgid "Set font-size for the entire application"
 msgstr "Tekstgrootte van de volledige applicatie instellen"
 
-#: ../../view/theme/redbasic/php/config.php:121
+#: ../../view/theme/redbasic/php/config.php:123
 msgid "Example: 14px"
 msgstr "Voorbeeld: 14px"
 
-#: ../../view/theme/redbasic/php/config.php:123
+#: ../../view/theme/redbasic/php/config.php:125
 msgid "Set font-color for posts and comments"
 msgstr "Tekstkleur van berichten en reacties"
 
-#: ../../view/theme/redbasic/php/config.php:124
+#: ../../view/theme/redbasic/php/config.php:126
 msgid "Set radius of corners"
 msgstr "Radius van hoeken instellen"
 
-#: ../../view/theme/redbasic/php/config.php:125
+#: ../../view/theme/redbasic/php/config.php:127
 msgid "Set shadow depth of photos"
 msgstr "Schaduwdiepte van foto's instellen"
 
-#: ../../view/theme/redbasic/php/config.php:126
+#: ../../view/theme/redbasic/php/config.php:128
 msgid "Set maximum width of content region in pixel"
 msgstr "Maximumbreedte conversatieruimte instellen (in pixels)"
 
-#: ../../view/theme/redbasic/php/config.php:126
+#: ../../view/theme/redbasic/php/config.php:128
 msgid "Leave empty for default width"
 msgstr "Laat leeg voor standaardbreedte"
 
-#: ../../view/theme/redbasic/php/config.php:127
+#: ../../view/theme/redbasic/php/config.php:129
 msgid "Center page content"
 msgstr "Inhoud centreren"
 
-#: ../../view/theme/redbasic/php/config.php:128
+#: ../../view/theme/redbasic/php/config.php:130
 msgid "Set minimum opacity of nav bar - to hide it"
 msgstr "Minimale ondoorzichtigheid navigatiebalk (- om te verbergen)"
 
-#: ../../view/theme/redbasic/php/config.php:129
+#: ../../view/theme/redbasic/php/config.php:131
 msgid "Set size of conversation author photo"
 msgstr "Grootte profielfoto's van berichten instellen"
 
-#: ../../view/theme/redbasic/php/config.php:130
+#: ../../view/theme/redbasic/php/config.php:132
 msgid "Set size of followup author photos"
 msgstr "Grootte profielfoto's van reacties instellen"
 
-#: ../../boot.php:1345
+#: ../../boot.php:1355
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "Update %s mislukt. Zie foutenlogboek."
 
-#: ../../boot.php:1348
+#: ../../boot.php:1358
 #, php-format
 msgid "Update Error at %s"
 msgstr "Update-fout op %s"
 
-#: ../../boot.php:1515
+#: ../../boot.php:1525
 msgid ""
 "Create an account to access services and applications within the Red Matrix"
 msgstr "Maak een account aan om toegang te krijgen tot diensten en toepassingen van $Projectname"
 
-#: ../../boot.php:1543
+#: ../../boot.php:1553
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: ../../boot.php:1544
+#: ../../boot.php:1554
 msgid "Remember me"
 msgstr "Aangemeld blijven"
 
-#: ../../boot.php:1547
+#: ../../boot.php:1557
 msgid "Forgot your password?"
 msgstr "Wachtwoord vergeten?"
 
-#: ../../boot.php:2166
+#: ../../boot.php:2177
 msgid "toggle mobile"
 msgstr "mobiele weergave omschakelen"
 
-#: ../../boot.php:2301
+#: ../../boot.php:2312
 msgid "Website SSL certificate is not valid. Please correct."
 msgstr "Het SSL-certificaat van deze website is ongeldig. Corrigeer dit a.u.b."
 
-#: ../../boot.php:2304
+#: ../../boot.php:2315
 #, php-format
 msgid "[red] Website SSL error for %s"
 msgstr "[red] Probleem met SSL-certificaat voor %s"
 
-#: ../../boot.php:2341
+#: ../../boot.php:2352
 msgid "Cron/Scheduled tasks not running."
 msgstr "Cron is niet actief"
 
-#: ../../boot.php:2345
+#: ../../boot.php:2356
 #, php-format
 msgid "[red] Cron tasks not running on %s"
 msgstr "[red] Cron-taken zijn niet actief op %s"
diff --git a/view/nl/strings.php b/view/nl/strings.php
index 37bb0c32b..865de908e 100644
--- a/view/nl/strings.php
+++ b/view/nl/strings.php
@@ -7,9 +7,28 @@ function string_plural_select_nl($n){
 ;
 $a->strings["Cannot locate DNS info for database server '%s'"] = "Kan DNS-informatie voor databaseserver '%s' niet vinden";
 $a->strings["Profile Photos"] = "Profielfoto's";
-$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "De beveiligings-token van het tekstvak was ongeldig. Dit is mogelijk het gevolg van dat er te lang (meer dan 3 uur) gewacht is om de tekst op te slaan. ";
+$a->strings["Edit"] = "Bewerken";
+$a->strings["Frequently"] = "Regelmatig";
+$a->strings["Hourly"] = "Elk uur";
+$a->strings["Twice daily"] = "Twee keer per dag";
+$a->strings["Daily"] = "Dagelijks";
+$a->strings["Weekly"] = "Wekelijks";
+$a->strings["Monthly"] = "Maandelijks";
+$a->strings["Friendica"] = "Friendica";
+$a->strings["OStatus"] = "OStatus";
+$a->strings["RSS/Atom"] = "RSS/Atom";
+$a->strings["Email"] = "E-mail";
+$a->strings["Diaspora"] = "Diaspora";
+$a->strings["Facebook"] = "Facebook";
+$a->strings["Zot!"] = "Zot!";
+$a->strings["LinkedIn"] = "LinkedIn";
+$a->strings["XMPP/IM"] = "XMPP/IM";
+$a->strings["MySpace"] = "MySpace";
 $a->strings["created a new post"] = "maakte een nieuw bericht aan";
 $a->strings["commented on %s's post"] = "gaf een reactie op een bericht van %s";
+$a->strings["No username found in import file."] = "Geen gebruikersnaam in het importbestand gevonden.";
+$a->strings["Unable to create a unique channel address. Import failed."] = "Niet in staat om een uniek kanaaladres aan te maken. Importeren is mislukt.";
+$a->strings["Import completed."] = "Import voltooid.";
 $a->strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Een verwijderde collectie met deze naam is gereactiveerd. Bestaande itemrechten  <strong>kunnen</strong> van toepassing zijn op deze collectie en toekomstige leden. Wanneer je dit niet zo bedoeld hebt, moet je een nieuwe collectie met een andere naam aanmaken.";
 $a->strings["Default privacy group for new contacts"] = "Standaard privacy-collectie voor nieuwe kanalen";
 $a->strings["All Channels"] = "Alle kanalen";
@@ -59,8 +78,13 @@ $a->strings["seconds"] = "seconden";
 $a->strings["__ctx:e.g. 22 hours ago, 1 minute ago__ %1\$d %2\$s ago"] = "%1\$d %2\$s geleden";
 $a->strings["%1\$s's birthday"] = "Verjaardag van %1\$s";
 $a->strings["Happy Birthday %1\$s"] = "Gefeliciteerd met je verjaardag %1\$s";
+$a->strings["Directory Options"] = "Opties kanalengids";
+$a->strings["Safe Mode"] = "Veilig zoeken";
+$a->strings["No"] = "Nee";
+$a->strings["Yes"] = "Ja";
+$a->strings["Public Forums Only"] = "Alleen openbare forums";
+$a->strings["This Website Only"] = "Alleen deze hub";
 $a->strings["New Page"] = "Nieuwe pagina";
-$a->strings["Edit"] = "Bewerken";
 $a->strings["View"] = "Weergeven";
 $a->strings["Preview"] = "Voorvertoning";
 $a->strings["Actions"] = "Acties";
@@ -70,20 +94,6 @@ $a->strings["Created"] = "Aangemaakt";
 $a->strings["Edited"] = "Bewerkt";
 $a->strings["Public Timeline"] = "Openbare tijdlijn";
 $a->strings["Default"] = "Standaard";
-$a->strings["Directory Options"] = "Opties kanalengids";
-$a->strings["Alphabetic"] = "Alfabetisch";
-$a->strings["Reverse Alphabetic"] = "Omgekeerd alfabetisch";
-$a->strings["Newest to Oldest"] = "Nieuw naar oud";
-$a->strings["Oldest to Newest"] = "Oud naar nieuw";
-$a->strings["Sort"] = "Sorteren";
-$a->strings["Safe Mode"] = "Veilig zoeken";
-$a->strings["Public Forums Only"] = "Alleen openbare forums";
-$a->strings["This Website Only"] = "Alleen deze hub";
-$a->strings["l F d, Y \\@ g:i A"] = "l d F Y \\@ G:i";
-$a->strings["Starts:"] = "Start:";
-$a->strings["Finishes:"] = "Einde:";
-$a->strings["Location:"] = "Plaats:";
-$a->strings["This event has been added to your calendar."] = "Dit evenement is aan jouw agenda toegevoegd.";
 $a->strings["Delete this item?"] = "Dit item verwijderen?";
 $a->strings["Comment"] = "Reactie";
 $a->strings["[+] show all"] = "[+] alle";
@@ -121,8 +131,95 @@ $a->strings["about a year"] = "ongeveer een jaar";
 $a->strings["%d years"] = "%d jaren";
 $a->strings[" "] = " ";
 $a->strings["timeago.numbers"] = "timeago.numbers";
-$a->strings["parent"] = "omhoog";
+$a->strings["prev"] = "vorige";
+$a->strings["first"] = "eerste";
+$a->strings["last"] = "laatste";
+$a->strings["next"] = "volgende";
+$a->strings["older"] = "ouder";
+$a->strings["newer"] = "nieuwer";
+$a->strings["No connections"] = "Geen connecties";
+$a->strings["%d Connection"] = array(
+	0 => "%d connectie",
+	1 => "%d connecties",
+);
+$a->strings["View Connections"] = "Connecties weergeven";
+$a->strings["Search"] = "Zoeken";
+$a->strings["Save"] = "Opslaan";
+$a->strings["poke"] = "aanstoten";
+$a->strings["poked"] = "aangestoten";
+$a->strings["ping"] = "ping";
+$a->strings["pinged"] = "gepingd";
+$a->strings["prod"] = "por";
+$a->strings["prodded"] = "gepord";
+$a->strings["slap"] = "slaan";
+$a->strings["slapped"] = "sloeg";
+$a->strings["finger"] = "finger";
+$a->strings["fingered"] = "gefingerd";
+$a->strings["rebuff"] = "afpoeieren";
+$a->strings["rebuffed"] = "afgepoeierd";
+$a->strings["happy"] = "gelukkig";
+$a->strings["sad"] = "bedroefd";
+$a->strings["mellow"] = "mellow";
+$a->strings["tired"] = "moe";
+$a->strings["perky"] = "parmantig";
+$a->strings["angry"] = "boos";
+$a->strings["stupified"] = "beteuterd";
+$a->strings["puzzled"] = "verward";
+$a->strings["interested"] = "geïnteresseerd";
+$a->strings["bitter"] = "verbitterd";
+$a->strings["cheerful"] = "vrolijk";
+$a->strings["alive"] = "levendig";
+$a->strings["annoyed"] = "geërgerd";
+$a->strings["anxious"] = "bezorgd";
+$a->strings["cranky"] = "humeurig";
+$a->strings["disturbed"] = "verontrust";
+$a->strings["frustrated"] = "gefrustreerd ";
+$a->strings["depressed"] = "gedeprimeerd";
+$a->strings["motivated"] = "gemotiveerd";
+$a->strings["relaxed"] = "ontspannen";
+$a->strings["surprised"] = "verrast";
+$a->strings["Monday"] = "maandag";
+$a->strings["Tuesday"] = "dinsdag";
+$a->strings["Wednesday"] = "woensdag";
+$a->strings["Thursday"] = "donderdag";
+$a->strings["Friday"] = "vrijdag";
+$a->strings["Saturday"] = "zaterdag";
+$a->strings["Sunday"] = "zondag";
+$a->strings["January"] = "januari";
+$a->strings["February"] = "februari";
+$a->strings["March"] = "maart";
+$a->strings["April"] = "april";
+$a->strings["May"] = "mei";
+$a->strings["June"] = "juni";
+$a->strings["July"] = "juli";
+$a->strings["August"] = "augustus";
+$a->strings["September"] = "september";
+$a->strings["October"] = "oktober";
+$a->strings["November"] = "november";
+$a->strings["December"] = "december";
+$a->strings["unknown.???"] = "onbekend.???";
+$a->strings["bytes"] = "bytes";
+$a->strings["remove category"] = "categorie verwijderen";
+$a->strings["remove from file"] = "uit map verwijderen";
+$a->strings["Click to open/close"] = "Klik om te openen of te sluiten";
+$a->strings["Link to Source"] = "Originele locatie";
+$a->strings["default"] = "standaard";
+$a->strings["Page layout"] = "Pagina-lay-out";
+$a->strings["You can create your own with the layouts tool"] = "Je kan jouw eigen lay-out ontwerpen onder lay-outs";
+$a->strings["Page content type"] = "Opmaaktype pagina";
+$a->strings["Select an alternate language"] = "Kies een andere taal";
+$a->strings["photo"] = "foto";
+$a->strings["event"] = "gebeurtenis";
+$a->strings["status"] = "bericht";
+$a->strings["comment"] = "reactie";
+$a->strings["activity"] = "activiteit";
+$a->strings["Design Tools"] = "Ontwerp-hulpmiddelen";
+$a->strings["Blocks"] = "Blokken";
+$a->strings["Menus"] = "Menu's";
+$a->strings["Layouts"] = "Lay-outs";
+$a->strings["Pages"] = "Pagina's";
 $a->strings["Collection"] = "map";
+$a->strings["parent"] = "omhoog";
 $a->strings["Principal"] = "principal";
 $a->strings["Addressbook"] = "Adresboek";
 $a->strings["Calendar"] = "Agenda";
@@ -145,6 +242,11 @@ $a->strings["Create new folder"] = "Nieuwe map aanmaken";
 $a->strings["Upload file"] = "Bestand uploaden";
 $a->strings["%1\$s's bookmarks"] = "Bladwijzers van %1\$s";
 $a->strings["view full size"] = "volledige grootte tonen";
+$a->strings["\$Projectname Notification"] = "\$Projectname-notificatie";
+$a->strings["\$projectname"] = "\$projectname";
+$a->strings["Thank You,"] = "Bedankt,";
+$a->strings["%s Administrator"] = "Beheerder %s";
+$a->strings["No Subject"] = "Geen onderwerp";
 $a->strings["General Features"] = "Algemene functies";
 $a->strings["Content Expiration"] = "Inhoud laten verlopen";
 $a->strings["Remove posts/comments and/or private messages at a future time"] = "Berichten, reacties en/of privéberichten na een bepaalde tijd verwijderen";
@@ -190,6 +292,8 @@ $a->strings["Network New Tab"] = "Nieuwe netwerktab";
 $a->strings["Enable tab to display all new Network activity"] = "Laat de tab alle nieuwe netwerkactiviteit tonen";
 $a->strings["Affinity Tool"] = "Verwantschapsfilter";
 $a->strings["Filter stream activity by depth of relationships"] = "Filter wat je in de Matrix ziet op hoe goed je iemand kent of mag";
+$a->strings["Connection Filtering"] = "berichtenfilters";
+$a->strings["Filter incoming posts from connections based on keywords/content"] = "Filter binnenkomende berichten van connecties aan de hand van trefwoorden/inhoud";
 $a->strings["Suggest Channels"] = "Kanalen voorstellen";
 $a->strings["Show channel suggestions"] = "Voor jou mogelijk interessante kanalen voorstellen";
 $a->strings["Post/Comment Tools"] = "Bericht- en reactiehulpmiddelen";
@@ -220,7 +324,6 @@ $a->strings["Add New Connection"] = "Nieuwe connectie toevoegen";
 $a->strings["Enter the channel address"] = "Vul het adres van het nieuwe kanaal in";
 $a->strings["Example: bob@example.com, http://example.com/barbara"] = "Voorbeeld: bob@example.com, http://example.com/barbara";
 $a->strings["Notes"] = "Aantekeningen";
-$a->strings["Save"] = "Opslaan";
 $a->strings["Remove term"] = "Verwijder zoekterm";
 $a->strings["Everything"] = "Alles";
 $a->strings["Archives"] = "Archieven";
@@ -250,10 +353,11 @@ $a->strings["photo/image"] = "foto/afbeelding";
 $a->strings["Rate Me"] = "Beoordeel mij";
 $a->strings["View Ratings"] = "Bekijk beoordelingen";
 $a->strings["Public Hubs"] = "Openbare hubs";
-$a->strings["\$Projectname Notification"] = "\$Projectname-notificatie";
-$a->strings["\$projectname"] = "\$projectname";
-$a->strings["Thank You,"] = "Bedankt,";
-$a->strings["%s Administrator"] = "Beheerder %s";
+$a->strings["l F d, Y \\@ g:i A"] = "l d F Y \\@ G:i";
+$a->strings["Starts:"] = "Start:";
+$a->strings["Finishes:"] = "Einde:";
+$a->strings["Location:"] = "Plaats:";
+$a->strings["This event has been added to your calendar."] = "Dit evenement is aan jouw agenda toegevoegd.";
 $a->strings["%s <!item_type!>"] = "%s <!item_type!>";
 $a->strings["[Red:Notify] New mail received at %s"] = "[Red:Notificatie] Nieuw privébericht ontvangen op %s";
 $a->strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s zond jou een nieuw privébericht om %3\$s.";
@@ -290,31 +394,21 @@ $a->strings["Name:"] = "Naam:";
 $a->strings["Photo:"] = "Foto:";
 $a->strings["Please visit %s to approve or reject the suggestion."] = "Bezoek %s om het voorstel te accepteren of af te wijzen.";
 $a->strings["[Red:Notify]"] = "[Red:Notificatie]";
-$a->strings["Frequently"] = "Regelmatig";
-$a->strings["Hourly"] = "Elk uur";
-$a->strings["Twice daily"] = "Twee keer per dag";
-$a->strings["Daily"] = "Dagelijks";
-$a->strings["Weekly"] = "Wekelijks";
-$a->strings["Monthly"] = "Maandelijks";
-$a->strings["Friendica"] = "Friendica";
-$a->strings["OStatus"] = "OStatus";
-$a->strings["RSS/Atom"] = "RSS/Atom";
-$a->strings["Email"] = "E-mail";
-$a->strings["Diaspora"] = "Diaspora";
-$a->strings["Facebook"] = "Facebook";
-$a->strings["Zot!"] = "Zot!";
-$a->strings["LinkedIn"] = "LinkedIn";
-$a->strings["XMPP/IM"] = "XMPP/IM";
-$a->strings["MySpace"] = "MySpace";
 $a->strings["No recipient provided."] = "Geen ontvanger opgegeven.";
 $a->strings["[no subject]"] = "[geen onderwerp]";
 $a->strings["Unable to determine sender."] = "Afzender kan niet bepaald worden.";
 $a->strings["Stored post could not be verified."] = "Opgeslagen bericht kon niet worden geverifieerd.";
+$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s vindt %3\$s van %2\$s leuk";
+$a->strings["Please choose"] = "Maak een keuze";
+$a->strings["Agree"] = "Eens";
+$a->strings["Disagree"] = "Oneens";
+$a->strings["Abstain"] = "onthouding";
 $a->strings["Channel is blocked on this site."] = "Kanaal is op deze hub geblokkeerd.";
 $a->strings["Channel location missing."] = "Ontbrekende kanaallocatie.";
 $a->strings["Response from remote channel was incomplete."] = "Antwoord van het kanaal op afstand was niet volledig.";
 $a->strings["Channel was deleted and no longer exists."] = "Kanaal is verwijderd en bestaat niet meer.";
 $a->strings["Protocol disabled."] = "Protocol uitgeschakeld.";
+$a->strings["Protocol blocked for this channel."] = "Dit protocol is voor dit kanaal niet toegestaan.";
 $a->strings["Channel discovery failed."] = "Kanaal ontdekken mislukt.";
 $a->strings["local account not found."] = "lokale account niet gevonden.";
 $a->strings["Cannot connect to yourself."] = "Kan niet met jezelf verbinden";
@@ -383,92 +477,6 @@ $a->strings["Open the selected location in a different window or browser tab"] =
 $a->strings["User '%s' deleted"] = "Account '%s' verwijderd";
 $a->strings["Attachments:"] = "Bijlagen:";
 $a->strings["\$Projectname event notification:"] = "Notificatie -gebeurtenis:";
-$a->strings["prev"] = "vorige";
-$a->strings["first"] = "eerste";
-$a->strings["last"] = "laatste";
-$a->strings["next"] = "volgende";
-$a->strings["older"] = "ouder";
-$a->strings["newer"] = "nieuwer";
-$a->strings["No connections"] = "Geen connecties";
-$a->strings["%d Connection"] = array(
-	0 => "%d connectie",
-	1 => "%d connecties",
-);
-$a->strings["View Connections"] = "Connecties weergeven";
-$a->strings["Search"] = "Zoeken";
-$a->strings["poke"] = "aanstoten";
-$a->strings["poked"] = "aangestoten";
-$a->strings["ping"] = "ping";
-$a->strings["pinged"] = "gepingd";
-$a->strings["prod"] = "por";
-$a->strings["prodded"] = "gepord";
-$a->strings["slap"] = "slaan";
-$a->strings["slapped"] = "sloeg";
-$a->strings["finger"] = "finger";
-$a->strings["fingered"] = "gefingerd";
-$a->strings["rebuff"] = "afpoeieren";
-$a->strings["rebuffed"] = "afgepoeierd";
-$a->strings["happy"] = "gelukkig";
-$a->strings["sad"] = "bedroefd";
-$a->strings["mellow"] = "mellow";
-$a->strings["tired"] = "moe";
-$a->strings["perky"] = "parmantig";
-$a->strings["angry"] = "boos";
-$a->strings["stupified"] = "beteuterd";
-$a->strings["puzzled"] = "verward";
-$a->strings["interested"] = "geïnteresseerd";
-$a->strings["bitter"] = "verbitterd";
-$a->strings["cheerful"] = "vrolijk";
-$a->strings["alive"] = "levendig";
-$a->strings["annoyed"] = "geërgerd";
-$a->strings["anxious"] = "bezorgd";
-$a->strings["cranky"] = "humeurig";
-$a->strings["disturbed"] = "verontrust";
-$a->strings["frustrated"] = "gefrustreerd ";
-$a->strings["depressed"] = "gedeprimeerd";
-$a->strings["motivated"] = "gemotiveerd";
-$a->strings["relaxed"] = "ontspannen";
-$a->strings["surprised"] = "verrast";
-$a->strings["Monday"] = "maandag";
-$a->strings["Tuesday"] = "dinsdag";
-$a->strings["Wednesday"] = "woensdag";
-$a->strings["Thursday"] = "donderdag";
-$a->strings["Friday"] = "vrijdag";
-$a->strings["Saturday"] = "zaterdag";
-$a->strings["Sunday"] = "zondag";
-$a->strings["January"] = "januari";
-$a->strings["February"] = "februari";
-$a->strings["March"] = "maart";
-$a->strings["April"] = "april";
-$a->strings["May"] = "mei";
-$a->strings["June"] = "juni";
-$a->strings["July"] = "juli";
-$a->strings["August"] = "augustus";
-$a->strings["September"] = "september";
-$a->strings["October"] = "oktober";
-$a->strings["November"] = "november";
-$a->strings["December"] = "december";
-$a->strings["unknown.???"] = "onbekend.???";
-$a->strings["bytes"] = "bytes";
-$a->strings["remove category"] = "categorie verwijderen";
-$a->strings["remove from file"] = "uit map verwijderen";
-$a->strings["Click to open/close"] = "Klik om te openen of te sluiten";
-$a->strings["Link to Source"] = "Originele locatie";
-$a->strings["default"] = "standaard";
-$a->strings["Page layout"] = "Pagina-lay-out";
-$a->strings["You can create your own with the layouts tool"] = "Je kan jouw eigen lay-out ontwerpen onder lay-outs";
-$a->strings["Page content type"] = "Opmaaktype pagina";
-$a->strings["Select an alternate language"] = "Kies een andere taal";
-$a->strings["photo"] = "foto";
-$a->strings["event"] = "gebeurtenis";
-$a->strings["status"] = "bericht";
-$a->strings["comment"] = "reactie";
-$a->strings["activity"] = "activiteit";
-$a->strings["Design Tools"] = "Ontwerp-hulpmiddelen";
-$a->strings["Blocks"] = "Blokken";
-$a->strings["Menus"] = "Menu's";
-$a->strings["Layouts"] = "Lay-outs";
-$a->strings["Pages"] = "Pagina's";
 $a->strings["Logout"] = "Uitloggen";
 $a->strings["End this session"] = "Beëindig deze sessie";
 $a->strings["Home"] = "Home";
@@ -544,32 +552,7 @@ $a->strings["public profile"] = "openbaar profiel";
 $a->strings["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "%1\$s veranderde %2\$s naar &ldquo;%3\$s&rdquo;";
 $a->strings["Visit %1\$s's %2\$s"] = "Bezoek het %2\$s van %1\$s";
 $a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s heeft een aangepaste %2\$s, %3\$s veranderd.";
-$a->strings["Image/photo"] = "Afbeelding/foto";
-$a->strings["Encrypted content"] = "Versleutelde inhoud";
-$a->strings["Install design element: "] = "Installeer ontwerpelement: ";
-$a->strings["QR code"] = "QR-code";
-$a->strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s schreef het volgende %2\$s %3\$s";
-$a->strings["post"] = "bericht";
-$a->strings["Different viewers will see this text differently"] = "Deze tekst wordt per persoon anders weergeven.";
-$a->strings["$1 spoiler"] = "$1 spoiler";
-$a->strings["$1 wrote:"] = "$1 schreef:";
-$a->strings["Permission denied"] = "Toegang geweigerd";
-$a->strings["(Unknown)"] = "(Onbekend)";
-$a->strings["Visible to anybody on the internet."] = "Voor iedereen op het internet zichtbaar.";
-$a->strings["Visible to you only."] = "Alleen voor jou zichtbaar.";
-$a->strings["Visible to anybody in this network."] = "Voor iedereen in dit netwerk zichtbaar.";
-$a->strings["Visible to anybody authenticated."] = "Voor iedereen die geauthenticeerd is zichtbaar.";
-$a->strings["Visible to anybody on %s."] = "Voor iedereen op %s zichtbaar.";
-$a->strings["Visible to all connections."] = "Voor alle connecties zichtbaar.";
-$a->strings["Visible to approved connections."] = "Voor alle goedgekeurde connecties zichtbaar.";
-$a->strings["Visible to specific connections."] = "Voor specifieke connecties zichtbaar.";
-$a->strings["Item not found."] = "Item niet gevonden.";
-$a->strings["Permission denied."] = "Toegang geweigerd";
-$a->strings["Collection not found."] = "Collectie niet gevonden.";
-$a->strings["Collection is empty."] = "Collectie is leeg";
-$a->strings["Collection: %s"] = "Collectie: %s";
-$a->strings["Connection: %s"] = "Connectie: %s";
-$a->strings["Connection not found."] = "Connectie niet gevonden.";
+$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "De beveiligings-token van het tekstvak was ongeldig. Dit is mogelijk het gevolg van dat er te lang (meer dan 3 uur) gewacht is om de tekst op te slaan. ";
 $a->strings["Can view my normal stream and posts"] = "Kan mijn normale kanaalstream en berichten bekijken";
 $a->strings["Can view my default channel profile"] = "Kan mijn standaard kanaalprofiel bekijken";
 $a->strings["Can view my photo albums"] = "Kan mijn fotoalbums bekijken";
@@ -604,7 +587,6 @@ $a->strings["Group Repository"] = "Groepsopslag";
 $a->strings["Other"] = "Anders";
 $a->strings["Custom/Expert Mode"] = "Expertmodus/handmatig aanpassen";
 $a->strings["channel"] = "kanaal";
-$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s vindt %3\$s van %2\$s leuk";
 $a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s vindt %3\$s van %2\$s niet leuk";
 $a->strings["%1\$s is now connected with %2\$s"] = "%1\$s is nu met %2\$s verbonden";
 $a->strings["%1\$s poked %2\$s"] = "%1\$s heeft %2\$s aangestoten";
@@ -613,7 +595,7 @@ $a->strings["__ctx:title__ Likes"] = "vinden dit leuk";
 $a->strings["__ctx:title__ Dislikes"] = "vinden dit niet leuk";
 $a->strings["__ctx:title__ Agree"] = "eens";
 $a->strings["__ctx:title__ Disagree"] = "oneens";
-$a->strings["__ctx:title__ Abstain"] = "onthoudingen";
+$a->strings["__ctx:title__ Abstain"] = "onthouding";
 $a->strings["__ctx:title__ Attending"] = "aanwezig";
 $a->strings["__ctx:title__ Not attending"] = "niet aanwezig";
 $a->strings["__ctx:title__ Might attend"] = "mogelijk aanwezig";
@@ -729,11 +711,23 @@ $a->strings["__ctx:noun__ Abstain"] = array(
 	0 => "onthouding",
 	1 => "onthoudingen",
 );
-$a->strings["Image exceeds website size limit of %lu bytes"] = "Afbeelding is groter dan op deze hub toegestane limiet van %lu bytes";
-$a->strings["Image file is empty."] = "Afbeeldingsbestand is leeg";
-$a->strings["Unable to process image"] = "Afbeelding kan niet verwerkt worden";
-$a->strings["Photo storage failed."] = "Foto kan niet worden opgeslagen";
-$a->strings["Upload New Photos"] = "Nieuwe foto's uploaden";
+$a->strings["Permission denied"] = "Toegang geweigerd";
+$a->strings["(Unknown)"] = "(Onbekend)";
+$a->strings["Visible to anybody on the internet."] = "Voor iedereen op het internet zichtbaar.";
+$a->strings["Visible to you only."] = "Alleen voor jou zichtbaar.";
+$a->strings["Visible to anybody in this network."] = "Voor iedereen in dit netwerk zichtbaar.";
+$a->strings["Visible to anybody authenticated."] = "Voor iedereen die geauthenticeerd is zichtbaar.";
+$a->strings["Visible to anybody on %s."] = "Voor iedereen op %s zichtbaar.";
+$a->strings["Visible to all connections."] = "Voor alle connecties zichtbaar.";
+$a->strings["Visible to approved connections."] = "Voor alle goedgekeurde connecties zichtbaar.";
+$a->strings["Visible to specific connections."] = "Voor specifieke connecties zichtbaar.";
+$a->strings["Item not found."] = "Item niet gevonden.";
+$a->strings["Permission denied."] = "Toegang geweigerd";
+$a->strings["Collection not found."] = "Collectie niet gevonden.";
+$a->strings["Collection is empty."] = "Collectie is leeg";
+$a->strings["Collection: %s"] = "Collectie: %s";
+$a->strings["Connection: %s"] = "Connectie: %s";
+$a->strings["Connection not found."] = "Connectie niet gevonden.";
 $a->strings["Invalid data packet"] = "Datapakket ongeldig";
 $a->strings["Unable to verify channel signature"] = "Kanaalkenmerk kon niet worden geverifieerd.  ";
 $a->strings["Unable to verify site signature for %s"] = "Hubkenmerk voor %s kon niet worden geverifieerd";
@@ -906,16 +900,30 @@ $a->strings["Profile Photo"] = "Profielfoto";
 $a->strings["Update"] = "Bijwerken";
 $a->strings["Install"] = "Installeren";
 $a->strings["Purchase"] = "Aanschaffen";
+$a->strings["Image/photo"] = "Afbeelding/foto";
+$a->strings["Encrypted content"] = "Versleutelde inhoud";
+$a->strings["Install %s element: "] = "Installeer %s-element: ";
+$a->strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Dit bericht heeft een te installeren %s-element, maar je hebt geen permissies om het op deze hub te installeren.";
+$a->strings["webpage"] = "Webpagina";
+$a->strings["layout"] = "lay-out";
+$a->strings["block"] = "blok";
+$a->strings["menu"] = "menu";
+$a->strings["QR code"] = "QR-code";
+$a->strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s schreef het volgende %2\$s %3\$s";
+$a->strings["post"] = "bericht";
+$a->strings["Different viewers will see this text differently"] = "Deze tekst wordt per persoon anders weergeven.";
+$a->strings["$1 spoiler"] = "$1 spoiler";
+$a->strings["$1 wrote:"] = "$1 schreef:";
 $a->strings["Missing room name"] = "Naam chatkanaal ontbreekt";
 $a->strings["Duplicate room name"] = "Naam chatkanaal bestaat al";
 $a->strings["Invalid room specifier."] = "Ongeldige omschrijving chatkanaal";
 $a->strings["Room not found."] = "Chatkanaal niet gevonden";
 $a->strings["Room is full"] = "Chatkanaal is vol";
-$a->strings["Please choose"] = "Maak een keuze";
-$a->strings["Agree"] = "Eens";
-$a->strings["Disagree"] = "Oneens";
-$a->strings["Abstain"] = "onthouding";
-$a->strings["projectname"] = "projectname";
+$a->strings["Image exceeds website size limit of %lu bytes"] = "Afbeelding is groter dan op deze hub toegestane limiet van %lu bytes";
+$a->strings["Image file is empty."] = "Afbeeldingsbestand is leeg";
+$a->strings["Unable to process image"] = "Afbeelding kan niet verwerkt worden";
+$a->strings["Photo storage failed."] = "Foto kan niet worden opgeslagen";
+$a->strings["Upload New Photos"] = "Nieuwe foto's uploaden";
 $a->strings["Some blurb about what to do when you're new here"] = "Welkom op \$Projectname. Klik op de tab ontdekken of klik rechtsboven op de <a href=\"directory\">kanalengids</a>, om kanalen te vinden. Rechtsboven vind je ook <a href=\"directory\">apps</a>, waar je vrijwel alle functies van \$Projectname kunt vinden. Voor <a href=\"directory\">hulp</a> met \$Projectname klik je op het vraagteken.";
 $a->strings["You have created %1$.0f of %2$.0f allowed channels."] = "Je hebt %1$.0f van totaal %2$.0f toegestane kanalen aangemaakt.";
 $a->strings["Create a new channel"] = "Nieuw kanaal aanmaken";
@@ -926,149 +934,30 @@ $a->strings["Make Default"] = "Als standaard instellen";
 $a->strings["%d new messages"] = "%d nieuwe berichten";
 $a->strings["%d new introductions"] = "%d nieuwe connectieverzoeken";
 $a->strings["Delegated Channels"] = "Uitbestede kanalen";
-$a->strings["Name is required"] = "Naam is vereist";
-$a->strings["Key and Secret are required"] = "Key en secret zijn vereist";
-$a->strings["Diaspora Policy Settings updated."] = "Beleidsinstellingen Diaspora bijgewerkt.";
-$a->strings["Passwords do not match. Password unchanged."] = "Wachtwoorden komen niet overeen. Wachtwoord onveranderd.";
-$a->strings["Empty passwords are not allowed. Password unchanged."] = "Lege wachtwoorden zijn niet toegestaan. Wachtwoord onveranderd.";
-$a->strings["Password changed."] = "Wachtwoord veranderd.";
-$a->strings["Password update failed. Please try again."] = "Bijwerken wachtwoord mislukt. Probeer opnieuw.";
-$a->strings["Not valid email."] = "Geen geldig e-mailadres.";
-$a->strings["Protected email address. Cannot change to that email."] = "Beschermd e-mailadres. Kan dat e-mailadres niet gebruiken.";
-$a->strings["System failure storing new email. Please try again."] = "Systeemfout opslaan van nieuwe e-mail. Probeer het nog een keer.";
-$a->strings["Settings updated."] = "Instellingen bijgewerkt.";
-$a->strings["No"] = "Nee";
-$a->strings["Yes"] = "Ja";
-$a->strings["Add application"] = "Applicatie toevoegen";
-$a->strings["Name of application"] = "Naam van applicatie";
-$a->strings["Consumer Key"] = "Consumer key";
-$a->strings["Automatically generated - change if desired. Max length 20"] = "Automatische gegenereerd - verander wanneer gewenst. Maximale lengte is 20";
-$a->strings["Consumer Secret"] = "Consumer secret";
-$a->strings["Redirect"] = "Redirect/doorverwijzing";
-$a->strings["Redirect URI - leave blank unless your application specifically requires this"] = "URI voor redirect - laat leeg, behalve wanneer de applicatie dit vereist";
-$a->strings["Icon url"] = "URL van pictogram";
-$a->strings["Optional"] = "Optioneel";
-$a->strings["You can't edit this application."] = "Je kan deze applicatie niet bewerken";
-$a->strings["Connected Apps"] = "Verbonden applicaties";
-$a->strings["Client key starts with"] = "Client key begint met";
-$a->strings["No name"] = "Geen naam";
-$a->strings["Remove authorization"] = "Autorisatie verwijderen";
-$a->strings["No feature settings configured"] = "Geen extra functie- of plugin-instellingen";
-$a->strings["Feature/Addon Settings"] = "Extra functie- en plugin-instellingen";
-$a->strings["Settings for the built-in Diaspora emulator"] = "Instellingen voor de ingebouwde Diaspora-emulator";
-$a->strings["Allow any Diaspora member to comment on your public posts"] = "Sta toe dat elk Diaspora-lid op jouw openbare berichten kan reageren.";
-$a->strings["Diaspora Policy Settings"] = "Beleidsinstellingen Diaspora";
-$a->strings["Prevent your hashtags from being redirected to other sites"] = "Voorkom dat jouw tags naar andere websites worden doorverwezen";
-$a->strings["Account Settings"] = "Account-instellingen";
-$a->strings["Enter New Password:"] = "Nieuw wachtwoord invoeren:";
-$a->strings["Confirm New Password:"] = "Nieuw wachtwoord bevestigen:";
-$a->strings["Leave password fields blank unless changing"] = "Laat de wachtwoordvelden leeg, behalve wanneer je deze wil veranderen";
-$a->strings["Email Address:"] = "E-mailadres:";
-$a->strings["Remove Account"] = "Account verwijderen";
-$a->strings["Remove this account including all its channels"] = "Dit account en al zijn kanalen verwijderen";
-$a->strings["Off"] = "Uit";
-$a->strings["On"] = "Aan";
-$a->strings["Additional Features"] = "Extra functies";
-$a->strings["Connector Settings"] = "Instellingen externe koppelingen";
-$a->strings["No special theme for mobile devices"] = "Geen speciaal thema voor mobiele apparaten";
-$a->strings["%s - (Experimental)"] = "%s - (experimenteel)";
-$a->strings["mobile"] = "mobiel";
-$a->strings["Display Settings"] = "Weergave-instellingen";
-$a->strings["Display Theme:"] = "Gebruik thema:";
-$a->strings["Mobile Theme:"] = "Mobiel thema:";
-$a->strings["Enable user zoom on mobile devices"] = "Inzoomen op smartphones en tablets toestaan";
-$a->strings["Update browser every xx seconds"] = "Ververs de webbrowser om de zoveel seconde";
-$a->strings["Minimum of 10 seconds, no maximum"] = "Minimaal 10 seconde, geen maximum";
-$a->strings["Maximum number of conversations to load at any time:"] = "Maximaal aantal conversaties die per keer geladen worden:";
-$a->strings["Maximum of 100 items"] = "Maximaal 100 conversaties";
-$a->strings["Show emoticons (smilies) as images"] = "Toon emoticons (smilies) als afbeeldingen";
-$a->strings["Link post titles to source"] = "Berichtkoppen naar originele locatie linken";
-$a->strings["System Page Layout Editor - (advanced)"] = "Lay-out bewerken van systeempagina's (geavanceerd)";
-$a->strings["Use blog/list mode on channel page"] = "Gebruik blog/lijst-modus op kanaalpagina";
-$a->strings["(comments displayed separately)"] = "(reacties worden afzonderlijk weergeven)";
-$a->strings["Use blog/list mode on matrix page"] = "Gebruik blog/lijst-modus op matrixpagina";
-$a->strings["Channel page max height of content (in pixels)"] = "Maximale hoogte berichtinhoud op kanaalpagina (in pixels)";
-$a->strings["click to expand content exceeding this height"] = "klik om inhoud uit te klappen die deze hoogte overschrijdt";
-$a->strings["Matrix page max height of content (in pixels)"] = "Maximale hoogte berichtinhoud op matrixpagina (in pixels)";
-$a->strings["Nobody except yourself"] = "Niemand, behalve jezelf";
-$a->strings["Only those you specifically allow"] = "Alleen connecties met uitdrukkelijke toestemming";
-$a->strings["Approved connections"] = "Geaccepteerde connecties";
-$a->strings["Any connections"] = "Alle connecties";
-$a->strings["Anybody on this website"] = "Iedereen op deze hub";
-$a->strings["Anybody in this network"] = "Iedereen in dit netwerk";
-$a->strings["Anybody authenticated"] = "Geauthenticeerd";
-$a->strings["Anybody on the internet"] = "Iedereen op het internet";
-$a->strings["Publish your default profile in the network directory"] = "Publiceer je standaardprofiel in de kanalengids";
-$a->strings["Allow us to suggest you as a potential friend to new members?"] = "Sta ons toe om jouw kanaal als mogelijke connectie voor te stellen aan nieuwe kanalen";
-$a->strings["or"] = "of";
-$a->strings["Your channel address is"] = "Jouw kanaaladres is";
-$a->strings["Channel Settings"] = "Kanaal-instellingen";
-$a->strings["Basic Settings"] = "Basis-instellingen";
-$a->strings["Your Timezone:"] = "Jouw tijdzone:";
-$a->strings["Default Post Location:"] = "Standaardlocatie bericht:";
-$a->strings["Geographical location to display on your posts"] = "Geografische locatie die bij het bericht moet worden vermeld";
-$a->strings["Use Browser Location:"] = "Locatie van webbrowser gebruiken:";
-$a->strings["Adult Content"] = "Inhoud voor volwassenen";
-$a->strings["This channel frequently or regularly publishes adult content. (Please tag any adult material and/or nudity with #NSFW)"] = "Dit kanaal publiceert regelmatig of vaak materiaal dat alleen geschikt is voor volwassenen. (Gebruik de tag #NSFW in berichten met een seksueel getinte inhoud of ander voor minderjarigen ongeschikt materiaal)";
-$a->strings["Security and Privacy Settings"] = "Veiligheids- en privacy-instellingen";
-$a->strings["Your permissions are already configured. Click to view/adjust"] = "Jouw permissies zijn al ingesteld. Klik om ze te bekijken of aan te passen.";
-$a->strings["Hide my online presence"] = "Verberg mijn aanwezigheid";
-$a->strings["Prevents displaying in your profile that you are online"] = "Voorkomt dat op je kanaalpagina te zien valt dat je momenteel op \$Projectname aanwezig bent";
-$a->strings["Simple Privacy Settings:"] = "Eenvoudige privacy-instellingen:";
-$a->strings["Very Public - <em>extremely permissive (should be used with caution)</em>"] = "Zeer openbaar <em>(kanaal staat volledig open - moet met grote zorgvuldigheid gebruikt worden)</em>";
-$a->strings["Typical - <em>default public, privacy when desired (similar to social network permissions but with improved privacy)</em>"] = "Normaal <em>(standaard openbaar, maar privacy wanneer noodzakelijk - vergelijkbaar met die van sociale netwerken, maar met verbeterde privacy)</em>";
-$a->strings["Private - <em>default private, never open or public</em>"] = "Privé <em>(standaard privé en nooit openbaar)</em>";
-$a->strings["Blocked - <em>default blocked to/from everybody</em>"] = "Geblokkeerd <em>(standaard geblokkeerd naar/van iedereen)</em>";
-$a->strings["Allow others to tag your posts"] = "Anderen toestaan om je berichten te taggen";
-$a->strings["Often used by the community to retro-actively flag inappropriate content"] = "Vaak in groepen/forums gebruikt om met terugwerkende kracht ongepast materiaal te markeren";
-$a->strings["Advanced Privacy Settings"] = "Geavanceerde privacy-instellingen";
-$a->strings["Expire other channel content after this many days"] = "Inhoud van andere kanalen na zoveel aantal dagen laten verlopen:";
-$a->strings["0 or blank prevents expiration"] = "0 of leeg voorkomt het verlopen";
-$a->strings["Maximum Friend Requests/Day:"] = "Maximum aantal connectieverzoeken per dag:";
-$a->strings["May reduce spam activity"] = "Kan eventuele spam verminderen";
-$a->strings["Default Post Permissions"] = "Standaard permissies voor nieuwe berichten";
-$a->strings["(click to open/close)"] = "(klik om te openen/sluiten)";
-$a->strings["Channel permissions category:"] = "Kanaaltype en -permissies:";
-$a->strings["Maximum private messages per day from unknown people:"] = "Maximum aantal privé-berichten per dag van onbekende personen:";
-$a->strings["Useful to reduce spamming"] = "Kan eventuele spam verminderen";
-$a->strings["Notification Settings"] = "Notificatie-instellingen";
-$a->strings["By default post a status message when:"] = "Plaats automatisch een statusbericht wanneer:";
-$a->strings["accepting a friend request"] = "Een connectieverzoek wordt geaccepteerd";
-$a->strings["joining a forum/community"] = "Je lid wordt van een forum/groep";
-$a->strings["making an <em>interesting</em> profile change"] = "Er sprake is van een <em>interessante</em> profielwijziging";
-$a->strings["Send a notification email when:"] = "Verzend een notificatie per e-mail wanneer:";
-$a->strings["You receive a connection request"] = "Je een connectieverzoek ontvangt";
-$a->strings["Your connections are confirmed"] = "Jouw connecties zijn bevestigd";
-$a->strings["Someone writes on your profile wall"] = "Iemand iets op jouw kanaal heeft geschreven";
-$a->strings["Someone writes a followup comment"] = "Iemand een reactie schrijft";
-$a->strings["You receive a private message"] = "Je een privé-bericht ontvangt";
-$a->strings["You receive a friend suggestion"] = "Je een kanaalvoorstel ontvangt";
-$a->strings["You are tagged in a post"] = "Je expliciet in een bericht bent genoemd";
-$a->strings["You are poked/prodded/etc. in a post"] = "Je bent in een bericht aangestoten/gepord/etc.";
-$a->strings["Show visual notifications including:"] = "Toon de volgende zichtbare notificaties:";
-$a->strings["Unseen matrix activity"] = "Niet bekeken matrix-activiteit";
-$a->strings["Unseen channel activity"] = "Niet bekeken kanaal-activiteit";
-$a->strings["Unseen private messages"] = "Niet bekeken privéberichten";
-$a->strings["Recommended"] = "Aanbevolen";
-$a->strings["Upcoming events"] = "Aankomende gebeurtenissen";
-$a->strings["Events today"] = "Gebeurtissen van vandaag";
-$a->strings["Upcoming birthdays"] = "Aankomende verjaardagen";
-$a->strings["Not available in all themes"] = "Niet in alle thema's beschikbaar";
-$a->strings["System (personal) notifications"] = "(Persoonlijke) systeemnotificaties";
-$a->strings["System info messages"] = "Systeemmededelingen";
-$a->strings["System critical alerts"] = "Kritische systeemwaarschuwingen";
-$a->strings["New connections"] = "Nieuwe connecties";
-$a->strings["System Registrations"] = "Nieuwe accountregistraties op deze hub";
-$a->strings["Also show new wall posts, private messages and connections under Notices"] = "Toon tevens nieuwe kanaalberichten, privéberichten en connecties onder Notificaties";
-$a->strings["Notify me of events this many days in advance"] = "Herinner mij zoveel dagen van te voren aan gebeurtenissen";
-$a->strings["Must be greater than 0"] = "Moet hoger dan 0 zijn";
-$a->strings["Advanced Account/Page Type Settings"] = "Instellingen geavanceerd account/paginatype";
-$a->strings["Change the behaviour of this account for special situations"] = "Verander het gedrag van dit account voor speciale situaties";
-$a->strings["Please enable expert mode (in <a href=\"settings/features\">Settings > Additional features</a>) to adjust!"] = "Schakel de expertmodus in (in <a href=\"settings/features\">Instellingen > Extra functies</a>) om aan te kunnen passen!";
-$a->strings["Miscellaneous Settings"] = "Diverse instellingen";
-$a->strings["Personal menu to display in your channel pages"] = "Persoonlijk menu om op je kanaalpagina's weer te geven";
-$a->strings["Remove Channel"] = "Kanaal verwijderen";
-$a->strings["Remove this channel."] = "Verwijder dit kanaal.";
+$a->strings["Public access denied."] = "Openbare toegang geweigerd.";
+$a->strings["%d rating"] = array(
+	0 => "%d beoordeling",
+	1 => "%d beoordelingen",
+);
+$a->strings["Gender: "] = "Geslacht:";
+$a->strings["Status: "] = "Status: ";
+$a->strings["Homepage: "] = "Homepagina: ";
+$a->strings["Description:"] = "Omschrijving:";
+$a->strings["Public Forum:"] = "Openbaar forum:";
+$a->strings["Keywords: "] = "Trefwoorden: ";
+$a->strings["Don't suggest"] = "Niet voorstellen";
+$a->strings["Common connections:"] = "Gemeenschappelijke connecties:";
+$a->strings["Global Directory"] = "Volledige kanalengids";
+$a->strings["Local Directory"] = "Lokale kanalengids";
+$a->strings["Finding:"] = "Gezocht naar:";
+$a->strings["next page"] = "volgende pagina";
+$a->strings["previous page"] = "vorige pagina";
+$a->strings["Sort options"] = "Sorteeropties";
+$a->strings["Alphabetic"] = "Alfabetisch";
+$a->strings["Reverse Alphabetic"] = "Omgekeerd alfabetisch";
+$a->strings["Newest to Oldest"] = "Nieuw naar oud";
+$a->strings["Oldest to Newest"] = "Oud naar nieuw";
+$a->strings["No entries (some entries may be hidden)."] = "Niets gevonden (sommige kanalen kunnen verborgen zijn).";
 $a->strings["Xchan Lookup"] = "Xchan opzoeken";
 $a->strings["Lookup xchan beginning with (or webbie): "] = "Zoek een xchan (of webbie) die begint met:";
 $a->strings["Not found."] = "Niet gevonden.";
@@ -1107,8 +996,6 @@ $a->strings["URL for photo of thing (optional)"] = "URL van foto van ding (optio
 $a->strings["Add Thing to your Profile"] = "Ding aan je profiel toevoegen";
 $a->strings["Item not available."] = "Item is niet aanwezig.";
 $a->strings["Fetching URL returns error: %1\$s"] = "Ophalen URL gaf een foutmelding terug: %1\$s";
-$a->strings["\$Projectname"] = "\$Projectname";
-$a->strings["Welcome to %s"] = "Welkom op %s";
 $a->strings["Image uploaded but image cropping failed."] = "Afbeelding geüpload, maar afbeelding kon niet worden bijgesneden. ";
 $a->strings["Image resize failed."] = "Afbeelding kon niet van grootte veranderd worden.";
 $a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Vernieuw de pagina met shift+R of shift+F5, of leeg je browserbuffer, wanneer de nieuwe foto niet meteen wordt weergegeven.";
@@ -1118,6 +1005,7 @@ $a->strings["Photo not available."] = "Foto niet beschikbaar.";
 $a->strings["Upload File:"] = "Bestand uploaden:";
 $a->strings["Select a profile:"] = "Kies een profiel:";
 $a->strings["Upload Profile Photo"] = "Profielfoto uploaden";
+$a->strings["or"] = "of";
 $a->strings["skip this step"] = "sla deze stap over";
 $a->strings["select a photo from your photo albums"] = "Kies een foto uit jouw fotoalbums";
 $a->strings["Crop Image"] = "Afbeelding bijsnijden";
@@ -1144,6 +1032,8 @@ $a->strings["%1\$s is not attending %2\$s's %3\$s"] = "%1\$s is niet aanwezig op
 $a->strings["%1\$s may attend %2\$s's %3\$s"] = "%1\$s is mogelijk aanwezig op %2\$s's %3\$s";
 $a->strings["Action completed."] = "Actie voltooid";
 $a->strings["Thank you."] = "Bedankt";
+$a->strings["Calendar entries imported."] = "Agenda-items geïmporteerd.";
+$a->strings["No calendar entries found."] = "Geen agenda-items gevonden.";
 $a->strings["Event can not end before it has started."] = "Gebeurtenis kan niet eindigen voordat het is begonnen";
 $a->strings["Unable to generate preview."] = "Niet in staat om voorvertoning te genereren";
 $a->strings["Event title and start time are required."] = "Titel en begintijd van gebeurtenis zijn vereist.";
@@ -1151,10 +1041,12 @@ $a->strings["Event not found."] = "Gebeurtenis niet gevonden";
 $a->strings["l, F j"] = "l j F";
 $a->strings["Edit event"] = "Gebeurtenis bewerken";
 $a->strings["Delete event"] = "Gebeurtenis verwijderen";
+$a->strings["calendar"] = "agenda";
 $a->strings["Create New Event"] = "Nieuwe gebeurtenis aanmaken";
 $a->strings["Previous"] = "Vorige";
 $a->strings["Next"] = "Volgende";
 $a->strings["Export"] = "Exporteren";
+$a->strings["Import"] = "Importeren";
 $a->strings["Event removed"] = "Gebeurtenis verwijderd";
 $a->strings["Failed to remove event"] = "Verwijderen gebeurtenis mislukt";
 $a->strings["Event details"] = "Details van gebeurtenis";
@@ -1165,7 +1057,6 @@ $a->strings["Finish date/time is not known or not relevant"] = "Einddatum/-tijd
 $a->strings["Event Finishes:"] = "Einde gebeurtenis:";
 $a->strings["Adjust for viewer timezone"] = "Aanpassen aan de tijdzone van wie deze gebeurtenis bekijkt";
 $a->strings["Important for events that happen in a particular place. Not practical for global holidays."] = "Belangrijk voor gebeurtenissen die op een bepaalde locatie plaatsvinden. Niet praktisch voor wereldwijde feestdagen.";
-$a->strings["Description:"] = "Omschrijving:";
 $a->strings["Title:"] = "Titel:";
 $a->strings["Share this event"] = "Deel deze gebeurtenis";
 $a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s volgt het %3\$s van %2\$s";
@@ -1196,103 +1087,34 @@ $a->strings["Click on a channel to add or remove."] = "Klik op een kanaal om dez
 $a->strings["Version %s"] = "Versie %s";
 $a->strings["Installed plugins/addons/apps:"] = "Ingeschakelde plug-ins/add-ons/apps:";
 $a->strings["No installed plugins/addons/apps"] = "Geen ingeschakelde plug-ins/add-ons/apps";
+$a->strings["\$Projectname"] = "\$Projectname";
 $a->strings["This is a hub of \$Projectname - a global cooperative network of decentralized privacy enhanced websites."] = "Dit is een \$Projectname-hub - \$Projectname is een wereldwijd coöperatief netwerk van gedecentraliseerde websites (hubs) met verbeterde privacy.";
 $a->strings["Tag: "] = "Tag: ";
 $a->strings["Last background fetch: "] = "Meest recente achtergrond-fetch:";
 $a->strings["Running at web location"] = "Draaiend op weblocatie";
 $a->strings["Please visit <a href=\"https://redmatrix.me\">redmatrix.me</a> to learn more about \$Projectname."] = "Bezoek <a href=\"https://redmatrix.me\">redmatrix.me</a> om meer over \$Projectname te leren.";
 $a->strings["Bug reports and issues: please visit"] = "Bugrapporten en andere kwesties: bezoek";
+$a->strings["\$projectname issues"] = "\$projectname-issues";
 $a->strings["Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"] = "Voorstellen, lofbetuigingen, enz. - e-mail  \"redmatrix\" at librelist - punt - com";
 $a->strings["Site Administrators"] = "Hubbeheerders: ";
-$a->strings["Help:"] = "Hulp:";
-$a->strings["Not Found"] = "Niet gevonden";
-$a->strings["\$Projectname Server - Setup"] = "\$Projectname Server - Setup";
-$a->strings["Could not connect to database."] = "Could not connect to database.";
-$a->strings["Could not connect to specified site URL. Possible SSL certificate or DNS issue."] = "Could not connect to specified hub URL. Possible SSL certificate or DNS issue.";
-$a->strings["Could not create table."] = "Could not create table.";
-$a->strings["Your site database has been installed."] = "Your hub database has been installed.";
-$a->strings["You may need to import the file \"install/schema_xxx.sql\" manually using a database client."] = "You may need to import the file \"install/schema_xxx.sql\" manually using a database client.";
-$a->strings["Please see the file \"install/INSTALL.txt\"."] = "Please see the file \"install/INSTALL.txt\".";
-$a->strings["System check"] = "System check";
-$a->strings["Check again"] = "Check again";
-$a->strings["Database connection"] = "Database connection";
-$a->strings["In order to install \$Projectname we need to know how to connect to your database."] = "In order to install \$Projectname we need to know how to connect to your database.";
-$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Please contact your hosting provider or site administrator if you have questions about these settings.";
-$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "The database you specify below should already exist. If it does not, please create it before continuing.";
-$a->strings["Database Server Name"] = "Database Server Name";
-$a->strings["Default is localhost"] = "Default is localhost";
-$a->strings["Database Port"] = "Database Port";
-$a->strings["Communication port number - use 0 for default"] = "Communication port number - use 0 for default";
-$a->strings["Database Login Name"] = "Database Login Name";
-$a->strings["Database Login Password"] = "Database Login Password";
-$a->strings["Database Name"] = "Database Name";
-$a->strings["Database Type"] = "Database Type";
-$a->strings["Site administrator email address"] = "Hub administrator email address";
-$a->strings["Your account email address must match this in order to use the web admin panel."] = "Your account email address must match this in order to use the web admin panel.";
-$a->strings["Website URL"] = "Hub URL";
-$a->strings["Please use SSL (https) URL if available."] = "Please use SSL (https) URL if available.";
-$a->strings["Please select a default timezone for your website"] = "Please select a default timezone for your hub";
-$a->strings["Site settings"] = "Hub settings";
-$a->strings["Could not find a command line version of PHP in the web server PATH."] = "Could not find a command line version of PHP in the web server PATH.";
-$a->strings["If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron."] = "If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron.";
-$a->strings["PHP executable path"] = "PHP executable path";
-$a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Enter full path to php executable. You can leave this blank to continue the installation.";
-$a->strings["Command line PHP"] = "Command line PHP";
-$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "The command line version of PHP on your system does not have \"register_argc_argv\" enabled.";
-$a->strings["This is required for message delivery to work."] = "This is required for message delivery to work.";
-$a->strings["PHP register_argc_argv"] = "PHP register_argc_argv";
-$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys";
-$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\".";
-$a->strings["Generate encryption keys"] = "Generate encryption keys";
-$a->strings["libCurl PHP module"] = "libCurl PHP module";
-$a->strings["GD graphics PHP module"] = "GD graphics PHP module";
-$a->strings["OpenSSL PHP module"] = "OpenSSL PHP module";
-$a->strings["mysqli or postgres PHP module"] = "mysqli or postgres PHP module";
-$a->strings["mb_string PHP module"] = "mb_string PHP module";
-$a->strings["mcrypt PHP module"] = "mcrypt PHP module";
-$a->strings["Apache mod_rewrite module"] = "Apache mod_rewrite module";
-$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Error: Apache webserver mod-rewrite module is required but not installed.";
-$a->strings["proc_open"] = "proc_open";
-$a->strings["Error: proc_open is required but is either not installed or has been disabled in php.ini"] = "Error: proc_open is required but is either not installed or has been disabled in php.ini";
-$a->strings["Error: libCURL PHP module required but not installed."] = "Error: libCURL PHP module required but not installed.";
-$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Error: GD graphics PHP module with JPEG support required but not installed.";
-$a->strings["Error: openssl PHP module required but not installed."] = "Error: openssl PHP module required but not installed.";
-$a->strings["Error: mysqli or postgres PHP module required but neither are installed."] = "Error: mysqli or postgres PHP module required but neither are installed.";
-$a->strings["Error: mb_string PHP module required but not installed."] = "Error: mb_string PHP module required but not installed.";
-$a->strings["Error: mcrypt PHP module required but not installed."] = "Error: mcrypt PHP module required but not installed.";
-$a->strings["The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so."] = "The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so.";
-$a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can.";
-$a->strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Red top folder."] = "At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Red top folder.";
-$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"install/INSTALL.txt\" for instructions."] = "You can alternatively skip this procedure and perform a manual installation. Please see the file \"install/INSTALL.txt\" for instructions.";
-$a->strings[".htconfig.php is writable"] = ".htconfig.php is writable";
-$a->strings["Red uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Red uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering.";
-$a->strings["In order to store these compiled templates, the web server needs to have write access to the directory %s under the Red top level folder."] = "In order to store these compiled templates, the web server needs to have write access to the directory %s under the Red top level folder.";
-$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder.";
-$a->strings["Note: as a security measure, you should give the web server write access to %s only--not the template files (.tpl) that it contains."] = "Note: as a security measure, you should give the web server write access to %s only--not the template files (.tpl) that it contains.";
-$a->strings["%s is writable"] = "%s is writable";
-$a->strings["Red uses the store directory to save uploaded files. The web server needs to have write access to the store directory under the Red top level folder"] = "Red uses the store directory to save uploaded files. The web server needs to have write access to the store directory under the Red top level folder";
-$a->strings["store is writable"] = "store is writable";
-$a->strings["SSL certificate cannot be validated. Fix certificate or disable https access to this site."] = "SSL certificate cannot be validated. Fix certificate or disable https access to this hub.";
-$a->strings["If you have https access to your website or allow connections to TCP port 443 (the https: port), you MUST use a browser-valid certificate. You MUST NOT use self-signed certificates!"] = "If you have https access to your hub or allow connections to TCP port 443 (the https: port), you MUST use a browser-valid certificate. You MUST NOT use self-signed certificates!";
-$a->strings["This restriction is incorporated because public posts from you may for example contain references to images on your own hub."] = "This restriction is incorporated because public posts from you may for example contain references to images on your own hub.";
-$a->strings["If your certificate is not recognized, members of other sites (who may themselves have valid certificates) will get a warning message on their own site complaining about security issues."] = "If your certificate is not recognized, members of other hubs (who may themselves have valid certificates) will get a warning message on their own hub complaining about security issues.";
-$a->strings["This can cause usability issues elsewhere (not just on your own site) so we must insist on this requirement."] = "This can cause usability issues elsewhere (not just on your own hub) so we must insist on this requirement.";
-$a->strings["Providers are available that issue free certificates which are browser-valid."] = "Providers are available that issue free certificates which are browser-valid.";
-$a->strings["SSL certificate validation"] = "SSL certificate validation";
-$a->strings["Url rewrite in .htaccess is not working. Check your server configuration.Test: "] = "Url rewrite in .htaccess is not working. Check your server configuration.Test: ";
-$a->strings["Url rewrite is working"] = "Url rewrite is working";
-$a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root.";
-$a->strings["Errors encountered creating database tables."] = "Errors encountered creating database tables.";
-$a->strings["<h1>What next</h1>"] = "<h1>Wat nu</h1>";
-$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANT: You will need to [manually] setup a scheduled task for the poller.";
+$a->strings["Unable to locate original post."] = "Niet in staat om de originele locatie van het bericht te vinden. ";
+$a->strings["Empty post discarded."] = "Leeg bericht geannuleerd";
+$a->strings["Executable content type not permitted to this channel."] = "Uitvoerbare bestanden zijn niet toegestaan op dit kanaal.";
+$a->strings["System error. Post not saved."] = "Systeemfout. Bericht niet opgeslagen.";
+$a->strings["Unable to obtain post information from database."] = "Niet in staat om informatie over dit bericht uit de database te verkrijgen.";
+$a->strings["You have reached your limit of %1$.0f top level posts."] = "Je hebt jouw limiet van %1$.0f berichten bereikt.";
+$a->strings["You have reached your limit of %1$.0f webpages."] = "Je hebt jouw limiet van %1$.0f webpagina's bereikt.";
+$a->strings["No such group"] = "Collectie niet gevonden";
+$a->strings["No such channel"] = "Niet zo'n kanaal";
+$a->strings["Search Results For:"] = "Zoekresultaten voor:";
+$a->strings["Collection is empty"] = "Collectie is leeg";
+$a->strings["Collection: "] = "Collectie: ";
+$a->strings["Connection: "] = "Connectie: ";
+$a->strings["Invalid connection."] = "Ongeldige connectie.";
 $a->strings["No channel."] = "Geen kanaal.";
-$a->strings["Common connections"] = "Veel voorkomende connecties";
+$a->strings["Common connections"] = "Gemeenschappelijke connecties";
 $a->strings["No connections in common."] = "Geen gemeenschappelijke connecties.";
 $a->strings["This site is not a directory server"] = "Deze hub is geen kanalengidshub (directoryserver)";
-$a->strings["Could not access contact record."] = "Kon geen toegang krijgen tot de connectie-gegevens.";
-$a->strings["Could not locate selected profile."] = "Kon het gekozen profiel niet vinden.";
-$a->strings["Connection updated."] = "Connectie bijgewerkt.";
-$a->strings["Failed to update connection record."] = "Bijwerken van connectie-gegevens mislukt.";
 $a->strings["Blocked"] = "Geblokkeerd";
 $a->strings["Ignored"] = "Genegeerd";
 $a->strings["Hidden"] = "Verborgen";
@@ -1314,13 +1136,17 @@ $a->strings["Search your connections"] = "Doorzoek jouw connecties";
 $a->strings["Finding: "] = "Zoeken naar: ";
 $a->strings["Block Name"] = "Bloknaam";
 $a->strings["Block Title"] = "Bloktitel";
-$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s heeft het %3\$s van %2\$s getagd met %4\$s";
+$a->strings["Item not found"] = "Item niet gevonden";
+$a->strings["Item is not editable"] = "Item is niet te bewerken";
+$a->strings["Delete item?"] = "Item verwijderen?";
+$a->strings["Insert YouTube video"] = "YouTube-video invoegen";
+$a->strings["Insert Vorbis [.ogg] video"] = "Vorbis-video [.ogg] invoegen";
+$a->strings["Insert Vorbis [.ogg] audio"] = "Vorbis-audio [.ogg] invoegen";
 $a->strings["\$Projectname - Guests: Username: {your email address}, Password: +++"] = "\$Projectname - gasttoegang: Accountnaam: {jouw e-mailadres}, wachtwoord: +++";
 $a->strings["Page owner information could not be retrieved."] = "Informatie over de pagina-eigenaar werd niet ontvangen.";
 $a->strings["Album not found."] = "Album niet gevonden.";
 $a->strings["Delete Album"] = "Verwijder album";
 $a->strings["Delete Photo"] = "Verwijder foto";
-$a->strings["Public access denied."] = "Openbare toegang geweigerd.";
 $a->strings["No photos selected"] = "Geen foto's geselecteerd";
 $a->strings["Access to this item is restricted."] = "Toegang tot dit item is beperkt.";
 $a->strings["%1$.2f MB of %2$.2f MB photo storage used."] = "%1$.2f MB van %2$.2f MB aan foto-opslag gebruikt.";
@@ -1351,6 +1177,8 @@ $a->strings["In This Photo:"] = "Op deze foto:";
 $a->strings["Map"] = "Kaart";
 $a->strings["View Album"] = "Album weergeven";
 $a->strings["Recent Photos"] = "Recente foto's";
+$a->strings["Items tagged with: %s"] = "Items getagd met %s";
+$a->strings["Search results for: %s"] = "Zoekresultaten voor %s";
 $a->strings["Profile Match"] = "Profielovereenkomst";
 $a->strings["No keywords to match. Please add keywords to your default profile."] = "Je hebt geen trefwoorden waarmee overeenkomsten gevonden kunnen worden. Voeg enkele trefwoorden aan je standaardprofiel toe.";
 $a->strings["is interested in:"] = "is geïnteresseerd in:";
@@ -1376,14 +1204,14 @@ $a->strings["Your service plan only allows %d channels."] = "Jouw abonnement sta
 $a->strings["Nothing to import."] = "Niets gevonden om te importeren";
 $a->strings["Unable to download data from old server"] = "Niet in staat om gegevens van de oude hub te downloaden";
 $a->strings["Imported file is empty."] = "Geïmporteerde bestand is leeg";
+$a->strings["The data provided is not compatible with this project."] = "De geïmporteerde gegevens zijn niet compatibel met dit project.";
+$a->strings["Warning: Database versions differ by %1\$d updates."] = "Waarschuwing: database-versies lopen %1\$d updates achter.";
 $a->strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "Kan geen dubbele kanaal-identificator op deze hub aanmaken. Importeren mislukt.";
-$a->strings["Unable to create a unique channel address. Import failed."] = "Niet in staat om een uniek kanaaladres aan te maken. Importeren is mislukt.";
 $a->strings["Channel clone failed. Import failed."] = "Het klonen van het kanaal is mislukt. Importeren mislukt.";
 $a->strings["Cloned channel not found. Import failed."] = "Gekloond kanaal niet gevonden. Importeren mislukt.";
-$a->strings["Import completed."] = "Import voltooid.";
 $a->strings["You must be logged in to use this feature."] = "Je moet ingelogd zijn om dit onderdeel te kunnen gebruiken.";
 $a->strings["Import Channel"] = "Kanaal importeren";
-$a->strings["Use this form to import an existing channel from a different server/hub. You may retrieve the channel identity from the old server/hub via the network or provide an export file. Only identity and connections/relationships will be imported. Importation of content is not yet available."] = "Gebruik dit formulier om een bestaand kanaal te importeren van een andere hub. Je kan de kanaal-identiteit van de oude hub via het netwerk ontvangen of een exportbestand verstrekken. Alleen de identiteit en de connecties zullen geïmporteerd worden. Het importeren van inhoud is nog niet beschikbaar.";
+$a->strings["Use this form to import an existing channel from a different server/hub. You may retrieve the channel identity from the old server/hub via the network or provide an export file."] = "Gebruik dit formulier om een bestaand kanaal te importeren van een andere hub. Je kan de kanaal-identiteit van de oude hub via het netwerk ontvangen of een exportbestand verstrekken.";
 $a->strings["File to Upload"] = "Bestand om te uploaden";
 $a->strings["Or provide the old server/hub details"] = "Of vul de gegevens van de oude hub in";
 $a->strings["Your old identity address (xyz@example.com)"] = "Jouw oude kanaaladres (xyz@example.com)";
@@ -1391,15 +1219,12 @@ $a->strings["Your old login email address"] = "Het e-mailadres van je oude accou
 $a->strings["Your old login password"] = "Wachtwoord van jouw oude account";
 $a->strings["For either option, please choose whether to make this hub your new primary address, or whether your old location should continue this role. You will be able to post from either location, but only one can be marked as the primary location for files, photos, and media."] = "Voor elke optie geldt dat je moet kiezen of je jouw primaire kanaaladres op deze hub wil instellen of dat jouw oude hub deze rol blijft vervullen.";
 $a->strings["Make this hub my primary location"] = "Stel deze hub als mijn primaire locatie in";
-$a->strings["Import existing posts if possible"] = "Importeer bestaande berichten (wanneer mogelijk)";
-$a->strings["Item not found"] = "Item niet gevonden";
-$a->strings["Edit Layout"] = "Lay-out bewerken";
+$a->strings["Import existing posts if possible (experimental - limited by available memory"] = "Importeer bestaande berichten wanneer mogelijk (experimenteel - afhankelijk van hoeveelheid geheugen hub)";
+$a->strings["This process may take several minutes to complete. Please submit the form only once and leave this page open until finished."] = "Dit proces kan enkele minuten in beslag nemen. Klik maar één keer op opslaan en verlaat deze pagina niet alvorens het proces is voltooid.";
 $a->strings["Delete layout?"] = "Lay-out verwijderen?";
-$a->strings["Insert YouTube video"] = "YouTube-video invoegen";
-$a->strings["Insert Vorbis [.ogg] video"] = "Vorbis-video [.ogg] invoegen";
-$a->strings["Insert Vorbis [.ogg] audio"] = "Vorbis-audio [.ogg] invoegen";
 $a->strings["Layout Description (Optional)"] = "Lay-out-omschrijving (optioneel)";
 $a->strings["Layout Name"] = "Naam lay-out";
+$a->strings["Edit Layout"] = "Lay-out bewerken";
 $a->strings["You must be logged in to see this page."] = "Je moet zijn ingelogd om deze pagina te kunnen bekijken.";
 $a->strings["Room not found"] = "Chatkanaal niet gevonden";
 $a->strings["Leave Room"] = "Chatkanaal verlaten";
@@ -1410,6 +1235,36 @@ $a->strings["Bookmark this room"] = "Chatkanaal aan bladwijzers toevoegen";
 $a->strings["New Chatroom"] = "Nieuw chatkanaal";
 $a->strings["Chatroom Name"] = "Naam chatkanaal";
 $a->strings["%1\$s's Chatrooms"] = "Chatkanalen van %1\$s";
+$a->strings["Menu not found."] = "Menu niet gevonden.";
+$a->strings["Unable to create element."] = "Niet in staat om onderdeel aan te maken.";
+$a->strings["Unable to update menu element."] = "Menu-onderdeel kan niet worden geüpdatet.";
+$a->strings["Unable to add menu element."] = "Menu-onderdeel kan niet worden toegevoegd.";
+$a->strings["Menu Item Permissions"] = "Permissies menu-item";
+$a->strings["(click to open/close)"] = "(klik om te openen/sluiten)";
+$a->strings["Link Name"] = "Linknaam";
+$a->strings["Link or Submenu Target"] = "Linkdoel of submenu-doel";
+$a->strings["Enter URL of the link or select a menu name to create a submenu"] = "Geef de URL van de link of kies een menunaam om een submenu aan te maken";
+$a->strings["Use magic-auth if available"] = "Gebruik magic-auth wanneer beschikbaar";
+$a->strings["Open link in new window"] = "Open link in nieuw venster";
+$a->strings["Order in list"] = "Volgorde in lijst";
+$a->strings["Higher numbers will sink to bottom of listing"] = "Hogere nummers komen onderaan de lijst terecht";
+$a->strings["Submit and finish"] = "Opslaan en afsluiten";
+$a->strings["Submit and continue"] = "Opslaan en doorgaan";
+$a->strings["Menu:"] = "Menu:";
+$a->strings["Link Target"] = "Linkdoel";
+$a->strings["Edit menu"] = "Menu bewerken";
+$a->strings["Edit element"] = "Onderdeel bewerken";
+$a->strings["Drop element"] = "Onderdeel verwijderen";
+$a->strings["New element"] = "Nieuw element";
+$a->strings["Edit this menu container"] = "Deze menu-container bewerken";
+$a->strings["Add menu element"] = "Menu-element toevoegen";
+$a->strings["Delete this menu item"] = "Dit menu-item verwijderen";
+$a->strings["Edit this menu item"] = "Dit menu-item bewerken";
+$a->strings["Menu item not found."] = "Menu-item niet gevonden.";
+$a->strings["Menu item deleted."] = "Menu-item verwijderd.";
+$a->strings["Menu item could not be deleted."] = "Menu-item kon niet worden verwijderd.";
+$a->strings["Edit Menu Element"] = "Menu-element bewerken";
+$a->strings["Link text"] = "Linktekst";
 $a->strings["Delete webpage?"] = "Webpagina verwijderen?";
 $a->strings["Page link title"] = "Titel van paginalink";
 $a->strings["Edit Webpage"] = "Webpagina bewerken";
@@ -1434,8 +1289,8 @@ $a->strings["Website:"] = "Website:";
 $a->strings["Remote Channel [%s] (not yet known on this site)"] = "Kanaal op afstand [%s] (nog niet op deze hub bekend)";
 $a->strings["Rating (this information is public)"] = "Beoordeling (deze informatie is openbaar)";
 $a->strings["Optionally explain your rating (this information is public)"] = "Verklaar jouw beoordeling (niet verplicht, deze informatie is openbaar)";
-$a->strings["Item is not editable"] = "Item is niet te bewerken";
-$a->strings["Delete item?"] = "Item verwijderen?";
+$a->strings["Delete block?"] = "Blok verwijderen";
+$a->strings["Edit Block"] = "Blok bewerken";
 $a->strings["Total invitation limit exceeded."] = "Limiet voor aantal uitnodigingen overschreden.";
 $a->strings["%s : Not a valid email address."] = "%s : Geen geldig e-mailadres.";
 $a->strings["Please join us on Red"] = "Uitnodiging voor \$Projectname";
@@ -1492,7 +1347,6 @@ $a->strings["Delete this menu"] = "Menu verwijderen";
 $a->strings["Edit menu contents"] = "Bewerk de inhoud van het menu";
 $a->strings["Edit this menu"] = "Dit menu bewerken";
 $a->strings["Menu could not be deleted."] = "Menu kon niet verwijderd worden.";
-$a->strings["Menu not found."] = "Menu niet gevonden.";
 $a->strings["Edit Menu"] = "Menu bewerken";
 $a->strings["Add or remove entries to this menu"] = "Items aan dit menu toevoegen of verwijder";
 $a->strings["Menu name"] = "Naam van menu";
@@ -1500,7 +1354,6 @@ $a->strings["Must be unique, only seen by you"] = "Moet uniek zijn en is alleen
 $a->strings["Menu title"] = "Titel van menu";
 $a->strings["Menu title as seen by others"] = "Titel van menu zoals anderen dat zien.";
 $a->strings["Allow bookmarks"] = "Bladwijzers toestaan";
-$a->strings["Modify"] = "Wijzigen";
 $a->strings["Permission Denied."] = "Toegang geweigerd";
 $a->strings["File not found."] = "Bestand niet gevonden.";
 $a->strings["Edit file permissions"] = "Bestandsrechten bewerken";
@@ -1526,10 +1379,8 @@ $a->strings["Invalid profile identifier."] = "Ongeldige profiel-identificator";
 $a->strings["Profile Visibility Editor"] = "Zichtbaarheid profiel ";
 $a->strings["Click on a contact to add or remove."] = "Klik op een connectie om deze toe te voegen of te verwijderen";
 $a->strings["Visible To"] = "Zichtbaar voor";
-$a->strings["webpage"] = "Webpagina";
-$a->strings["block"] = "blok";
-$a->strings["layout"] = "lay-out";
 $a->strings["%s element installed"] = "%s onderdeel geïnstalleerd";
+$a->strings["%s element installation failed"] = "Installatie %s-element mislukt";
 $a->strings["Profile not found."] = "Profiel niet gevonden.";
 $a->strings["Profile deleted."] = "Profiel verwijderd.";
 $a->strings["Profile-"] = "Profiel-";
@@ -1546,7 +1397,7 @@ $a->strings["Religion"] = "Religie";
 $a->strings["Political Views"] = "Politieke overtuigingen";
 $a->strings["Gender"] = "Geslacht";
 $a->strings["Sexual Preference"] = "Seksuele voorkeur";
-$a->strings["Homepage"] = "Homepage";
+$a->strings["Homepage"] = "Homepagina";
 $a->strings["Interests"] = "Interesses";
 $a->strings["Address"] = "Kanaaladres";
 $a->strings["Profile updated."] = "Profiel bijgewerkt";
@@ -1573,7 +1424,7 @@ $a->strings["<span class=\"heart\">&hearts;</span> Marital Status:"] = "<span cl
 $a->strings["Who: (if applicable)"] = "Wie (wanneer toepasselijk):";
 $a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Voorbeelden: petra123, Petra Jansen, petra@voorbeeld.nl";
 $a->strings["Since [date]:"] = "Sinds [datum]:";
-$a->strings["Homepage URL:"] = "Adres homepage:";
+$a->strings["Homepage URL:"] = "URL homepagina:";
 $a->strings["Religious Views:"] = "Religieuze overtuigingen";
 $a->strings["Keywords:"] = "Trefwoorden";
 $a->strings["Example: fishing photography software"] = "Voorbeeld: muziek, fotografie, software";
@@ -1595,60 +1446,98 @@ $a->strings["Edit/Manage Profiles"] = "Profielen bewerken/beheren";
 $a->strings["Add profile things"] = "Dingen aan je profiel toevoegen";
 $a->strings["Include desirable objects in your profile"] = "Voeg door jou gewenste dingen aan jouw profiel toe";
 $a->strings["No ratings"] = "Geen beoordelingen";
-$a->strings["Ratings"] = "Waarderingen";
-$a->strings["Rating: "] = "Waardering: ";
+$a->strings["Ratings"] = "Beoordelingen";
+$a->strings["Rating: "] = "Beoordeling:";
 $a->strings["Website: "] = "Website: ";
 $a->strings["Description: "] = "Omschrijving: ";
 $a->strings["Source of Item"] = "Bron van item";
-$a->strings["Unable to create element."] = "Niet in staat om onderdeel aan te maken.";
-$a->strings["Unable to update menu element."] = "Menu-onderdeel kan niet worden geüpdatet.";
-$a->strings["Unable to add menu element."] = "Menu-onderdeel kan niet worden toegevoegd.";
-$a->strings["Menu Item Permissions"] = "Permissies menu-item";
-$a->strings["Link Name"] = "Linknaam";
-$a->strings["Link Target"] = "Linkdoel";
-$a->strings["Use RedMatrix magic-auth if available"] = "Gebruik RedMatrix' magic-auth wanneer beschikbaar";
-$a->strings["Open link in new window"] = "Open link in nieuw venster";
-$a->strings["Order in list"] = "Volgorde in lijst";
-$a->strings["Higher numbers will sink to bottom of listing"] = "Hogere nummers komen onderaan de lijst terecht";
-$a->strings["Submit and finish"] = "Opslaan en afsluiten";
-$a->strings["Submit and continue"] = "Opslaan en doorgaan";
-$a->strings["Menu:"] = "Menu:";
-$a->strings["Edit menu"] = "Menu bewerken";
-$a->strings["Edit element"] = "Onderdeel bewerken";
-$a->strings["Drop element"] = "Onderdeel verwijderen";
-$a->strings["New element"] = "Nieuw element";
-$a->strings["Edit this menu container"] = "Deze menu-container bewerken";
-$a->strings["Add menu element"] = "Menu-element toevoegen";
-$a->strings["Delete this menu item"] = "Dit menu-item verwijderen";
-$a->strings["Edit this menu item"] = "Dit menu-item bewerken";
-$a->strings["Menu item not found."] = "Menu-item niet gevonden.";
-$a->strings["Menu item deleted."] = "Menu-item verwijderd.";
-$a->strings["Menu item could not be deleted."] = "Menu-item kon niet worden verwijderd.";
-$a->strings["Edit Menu Element"] = "Menu-element bewerken";
-$a->strings["Link text"] = "Linktekst";
-$a->strings["URL of link"] = "URL of link";
+$a->strings["\$Projectname Server - Setup"] = "\$Projectname Server - Setup";
+$a->strings["Could not connect to database."] = "Could not connect to database.";
+$a->strings["Could not connect to specified site URL. Possible SSL certificate or DNS issue."] = "Could not connect to specified hub URL. Possible SSL certificate or DNS issue.";
+$a->strings["Could not create table."] = "Could not create table.";
+$a->strings["Your site database has been installed."] = "Your hub database has been installed.";
+$a->strings["You may need to import the file \"install/schema_xxx.sql\" manually using a database client."] = "You may need to import the file \"install/schema_xxx.sql\" manually using a database client.";
+$a->strings["Please see the file \"install/INSTALL.txt\"."] = "Please see the file \"install/INSTALL.txt\".";
+$a->strings["System check"] = "System check";
+$a->strings["Check again"] = "Check again";
+$a->strings["Database connection"] = "Database connection";
+$a->strings["In order to install \$Projectname we need to know how to connect to your database."] = "In order to install \$Projectname we need to know how to connect to your database.";
+$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Please contact your hosting provider or site administrator if you have questions about these settings.";
+$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "The database you specify below should already exist. If it does not, please create it before continuing.";
+$a->strings["Database Server Name"] = "Database Server Name";
+$a->strings["Default is localhost"] = "Default is localhost";
+$a->strings["Database Port"] = "Database Port";
+$a->strings["Communication port number - use 0 for default"] = "Communication port number - use 0 for default";
+$a->strings["Database Login Name"] = "Database Login Name";
+$a->strings["Database Login Password"] = "Database Login Password";
+$a->strings["Database Name"] = "Database Name";
+$a->strings["Database Type"] = "Database Type";
+$a->strings["Site administrator email address"] = "Hub administrator email address";
+$a->strings["Your account email address must match this in order to use the web admin panel."] = "Your account email address must match this in order to use the web admin panel.";
+$a->strings["Website URL"] = "Hub URL";
+$a->strings["Please use SSL (https) URL if available."] = "Please use SSL (https) URL if available.";
+$a->strings["Please select a default timezone for your website"] = "Please select a default timezone for your hub";
+$a->strings["Site settings"] = "Hub settings";
+$a->strings["Could not find a command line version of PHP in the web server PATH."] = "Could not find a command line version of PHP in the web server PATH.";
+$a->strings["If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron."] = "If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron.";
+$a->strings["PHP executable path"] = "PHP executable path";
+$a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Enter full path to php executable. You can leave this blank to continue the installation.";
+$a->strings["Command line PHP"] = "Command line PHP";
+$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "The command line version of PHP on your system does not have \"register_argc_argv\" enabled.";
+$a->strings["This is required for message delivery to work."] = "This is required for message delivery to work.";
+$a->strings["PHP register_argc_argv"] = "PHP register_argc_argv";
+$a->strings["Your max allowed total upload size is set to %s. Maximum size of one file to upload is set to %s. You are allowed to upload up to %d files at once."] = "Your max allowed total upload size is set to %s. Maximum size of one file to upload is set to %s. You are allowed to upload up to %d files at once.";
+$a->strings["You can adjust these settings in the servers php.ini."] = "You can adjust these settings in the servers php.ini.";
+$a->strings["PHP upload limits"] = "PHP upload limits";
+$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys";
+$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\".";
+$a->strings["Generate encryption keys"] = "Generate encryption keys";
+$a->strings["libCurl PHP module"] = "libCurl PHP module";
+$a->strings["GD graphics PHP module"] = "GD graphics PHP module";
+$a->strings["OpenSSL PHP module"] = "OpenSSL PHP module";
+$a->strings["mysqli or postgres PHP module"] = "mysqli or postgres PHP module";
+$a->strings["mb_string PHP module"] = "mb_string PHP module";
+$a->strings["mcrypt PHP module"] = "mcrypt PHP module";
+$a->strings["xml PHP module"] = "xml PHP module";
+$a->strings["Apache mod_rewrite module"] = "Apache mod_rewrite module";
+$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Error: Apache webserver mod-rewrite module is required but not installed.";
+$a->strings["proc_open"] = "proc_open";
+$a->strings["Error: proc_open is required but is either not installed or has been disabled in php.ini"] = "Error: proc_open is required but is either not installed or has been disabled in php.ini";
+$a->strings["Error: libCURL PHP module required but not installed."] = "Error: libCURL PHP module required but not installed.";
+$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Error: GD graphics PHP module with JPEG support required but not installed.";
+$a->strings["Error: openssl PHP module required but not installed."] = "Error: openssl PHP module required but not installed.";
+$a->strings["Error: mysqli or postgres PHP module required but neither are installed."] = "Error: mysqli or postgres PHP module required but neither are installed.";
+$a->strings["Error: mb_string PHP module required but not installed."] = "Error: mb_string PHP module required but not installed.";
+$a->strings["Error: mcrypt PHP module required but not installed."] = "Error: mcrypt PHP module required but not installed.";
+$a->strings["Error: xml PHP module required for DAV but not installed."] = "Error: xml PHP module required for DAV but not installed.";
+$a->strings["The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so."] = "The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so.";
+$a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can.";
+$a->strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Red top folder."] = "At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Red top folder.";
+$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"install/INSTALL.txt\" for instructions."] = "You can alternatively skip this procedure and perform a manual installation. Please see the file \"install/INSTALL.txt\" for instructions.";
+$a->strings[".htconfig.php is writable"] = ".htconfig.php is writable";
+$a->strings["Red uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Red uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering.";
+$a->strings["In order to store these compiled templates, the web server needs to have write access to the directory %s under the Red top level folder."] = "In order to store these compiled templates, the web server needs to have write access to the directory %s under the Red top level folder.";
+$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder.";
+$a->strings["Note: as a security measure, you should give the web server write access to %s only--not the template files (.tpl) that it contains."] = "Note: as a security measure, you should give the web server write access to %s only--not the template files (.tpl) that it contains.";
+$a->strings["%s is writable"] = "%s is writable";
+$a->strings["Red uses the store directory to save uploaded files. The web server needs to have write access to the store directory under the Red top level folder"] = "Red uses the store directory to save uploaded files. The web server needs to have write access to the store directory under the Red top level folder";
+$a->strings["store is writable"] = "store is writable";
+$a->strings["SSL certificate cannot be validated. Fix certificate or disable https access to this site."] = "SSL certificate cannot be validated. Fix certificate or disable https access to this hub.";
+$a->strings["If you have https access to your website or allow connections to TCP port 443 (the https: port), you MUST use a browser-valid certificate. You MUST NOT use self-signed certificates!"] = "If you have https access to your hub or allow connections to TCP port 443 (the https: port), you MUST use a browser-valid certificate. You MUST NOT use self-signed certificates!";
+$a->strings["This restriction is incorporated because public posts from you may for example contain references to images on your own hub."] = "This restriction is incorporated because public posts from you may for example contain references to images on your own hub.";
+$a->strings["If your certificate is not recognized, members of other sites (who may themselves have valid certificates) will get a warning message on their own site complaining about security issues."] = "If your certificate is not recognized, members of other hubs (who may themselves have valid certificates) will get a warning message on their own hub complaining about security issues.";
+$a->strings["This can cause usability issues elsewhere (not just on your own site) so we must insist on this requirement."] = "This can cause usability issues elsewhere (not just on your own hub) so we must insist on this requirement.";
+$a->strings["Providers are available that issue free certificates which are browser-valid."] = "Providers are available that issue free certificates which are browser-valid.";
+$a->strings["SSL certificate validation"] = "SSL certificate validation";
+$a->strings["Url rewrite in .htaccess is not working. Check your server configuration.Test: "] = "Url rewrite in .htaccess is not working. Check your server configuration.Test: ";
+$a->strings["Url rewrite is working"] = "Url rewrite is working";
+$a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root.";
+$a->strings["Errors encountered creating database tables."] = "Errors encountered creating database tables.";
+$a->strings["<h1>What next</h1>"] = "<h1>Wat nu</h1>";
+$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANT: You will need to [manually] setup a scheduled task for the poller.";
 $a->strings["OpenID protocol error. No ID returned."] = "OpenID-protocolfout. Geen ID terugontvangen.";
 $a->strings["Welcome %s. Remote authentication successful."] = "Welkom %s. Authenticatie op afstand geslaagd.";
-$a->strings["%d rating"] = array(
-	0 => "%d beoordeling",
-	1 => "%d beoordelingen",
-);
-$a->strings["Gender: "] = "Geslacht:";
-$a->strings["Status: "] = "Status: ";
-$a->strings["Homepage: "] = "Homepage: ";
-$a->strings["Hometown: "] = "Oorspronkelijk uit: ";
-$a->strings["About: "] = "Over: ";
-$a->strings["Public Forum:"] = "Openbaar forum:";
-$a->strings["Keywords: "] = "Trefwoorden: ";
-$a->strings["Common connections: %s"] = "Gemeenschappelijke connecties: %s";
-$a->strings["Finding:"] = "Gezocht naar:";
-$a->strings["next page"] = "volgende pagina";
-$a->strings["previous page"] = "vorige pagina";
-$a->strings["No entries (some entries may be hidden)."] = "Niets gevonden (sommige kanalen kunnen verborgen zijn).";
-$a->strings["Export Channel"] = "Kanaal exporteren";
-$a->strings["Export your basic channel information to a small file.  This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new hub, but\tdoes not contain your content."] = "Exporteer de basisinformatie van jouw kanaal naar een klein bestand. Dit fungeert als een back-up van jouw connecties, permissies, profiel en basisgegevens, die gebruikt kan worden om op een nieuwe hub jouw gegevens te importeren. Deze back-up bevat echter niet de inhoud van jouw kanaal.";
-$a->strings["Export Content"] = "Inhoud exporteren";
-$a->strings["Export your channel information and all the content to a JSON backup. This backs up all of your connections, permissions, profile data and all of your content, but is generally not suitable for importing a channel to a new hub as this file may be VERY large.  Please be patient - it may take several minutes for this download to begin."] = "Exporteer informatie en alle inhoud van jouw kanaal naar een JSON-back-up. Dit slaat al jouw connecties, permissies, profielgegevens en de volledige inhoud van jouw kanaal op, maar is in het algemeen niet geschikt om op een nieuwe hub te importeren, omdat dit bestand ZEER groot kan worden. Wees geduldig - het kan enkele minuten duren voordat de download begint.";
+$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s heeft het %3\$s van %2\$s getagd met %4\$s";
 $a->strings["No connections."] = "Geen connecties.";
 $a->strings["Visit %s's profile [%s]"] = "Bezoek het profiel van %s [%s]";
 $a->strings["invalid target signature"] = "ongeldig doelkenmerk";
@@ -1680,6 +1569,7 @@ $a->strings["Registered channels"] = "Geregistreerde kanalen";
 $a->strings["Active plugins"] = "Ingeschakelde plug-ins";
 $a->strings["Version"] = "Versie";
 $a->strings["Site settings updated."] = "Hub-instellingen bijgewerkt.";
+$a->strings["mobile"] = "mobiel";
 $a->strings["experimental"] = "experimenteel";
 $a->strings["unsupported"] = "Niet ondersteund";
 $a->strings["Yes - with approval"] = "Ja - met goedkeuring";
@@ -1709,6 +1599,10 @@ $a->strings["Does this site allow new member registration?"] = "Staat deze hub n
 $a->strings["Which best describes the types of account offered by this hub?"] = "Wat voor soort accounts biedt deze \$Projectname-hub aan? Kies wat het meest in de buurt komt.";
 $a->strings["Register text"] = "Tekst tijdens registratie";
 $a->strings["Will be displayed prominently on the registration page."] = "Tekst dat op de pagina voor het registreren van nieuwe accounts wordt getoond.";
+$a->strings["Site homepage to show visitors (default: login box)"] = "Homepagina van deze hub die aan bezoekers wordt getoond (standaard: inlogformulier)";
+$a->strings["example: 'public' to show public stream, 'page/sys/home' to show a system webpage called 'home' or 'include:home.html' to include a file."] = "voorbeeld: 'public' om de openbare stream te tonen, 'page/sys/home' om de webpagina 'home' van het systeemkanaal te tonen of 'include:home.html' om een gewoon bestand te gebruiken.";
+$a->strings["Preserve site homepage URL"] = "Behoudt de URL van de hub (/)";
+$a->strings["Present the site homepage in a frame at the original location instead of redirecting"] = "Toon de homepagina van de hub in een frame op de oorspronkelijke locatie (/), i.p.v. een doorverwijzing naar een andere locatie (bv. .../home.html)";
 $a->strings["Accounts abandoned after x days"] = "Accounts als verlaten beschouwen na zoveel aantal dagen:";
 $a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Zal geen systeembronnen verspillen door polling van externe hubs voor verlaten accounts. Vul 0 in voor geen tijdslimiet.";
 $a->strings["Allowed friend domains"] = "Toegestane domeinen";
@@ -1725,8 +1619,8 @@ $a->strings["Force publish"] = "Dwing kanaalvermelding af";
 $a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Vink dit aan om af te dwingen dat alle kanalen op deze hub in de kanalengids worden vermeld.";
 $a->strings["Disable discovery tab"] = "Ontdekkingstab";
 $a->strings["Remove the tab in the network view with public content pulled from sources chosen for this site."] = "Verwijder de tab in de matrix-weergave waarin zich een selectie aan openbare berichten bevindt, die automatisch voor deze hub zijn uitgekozen.";
-$a->strings["No login on Homepage"] = "Geen inlogformulier op de homepage";
-$a->strings["Check to hide the login form from your sites homepage when visitors arrive who are not logged in (e.g. when you put the content of the homepage in via the site channel)."] = "Vink dit aan om het inlogformulier op de homepage van deze hub, die niet-ingelogde bezoekers te zien krijgen, te verbergen. (bijvoorbeeld wanneer je een kanaal op deze \$Projectname-hub als homepage gebruikt)";
+$a->strings["login on Homepage"] = "Inlogformulier op de homepagina";
+$a->strings["Present a login box to visitors on the home page if no other content has been configured."] = "Toon een inlogformulier voor bezoekers op de homepagina wanneer geen andere inhoud is geconfigureerd. ";
 $a->strings["Proxy user"] = "Gebruikersnaam proxy";
 $a->strings["Proxy URL"] = "URL proxy";
 $a->strings["Network timeout"] = "Netwerktimeout";
@@ -1792,16 +1686,24 @@ $a->strings["%s channel censored/uncensored"] = array(
 	0 => "%s kanaal gecensureerd/ongecensureerd",
 	1 => "%s kanalen gecensureerd/ongecensureerd",
 );
+$a->strings["%s channel code allowed/disallowed"] = array(
+	0 => "Code toegestaan/niet toegestaan voor %s kanaal",
+	1 => "Scripts toegestaan/niet toegestaan voor %s kanalen ",
+);
 $a->strings["%s channel deleted"] = array(
 	0 => "%s kanaal verwijderd",
 	1 => "%s kanalen verwijderd",
 );
 $a->strings["Channel not found"] = "Kanaal niet gevonden";
 $a->strings["Channel '%s' deleted"] = "Kanaal '%s' verwijderd";
-$a->strings["Channel '%s' uncensored"] = "Kanaal '%s' ongecensureerd";
 $a->strings["Channel '%s' censored"] = "Kanaal '%s' gecensureerd";
+$a->strings["Channel '%s' uncensored"] = "Kanaal '%s' ongecensureerd";
+$a->strings["Channel '%s' code allowed"] = "Scripts toegestaan voor kanaal '%s'";
+$a->strings["Channel '%s' code disallowed"] = "Scripts niet toegestaan voor kanaal '%s'";
 $a->strings["Censor"] = "Censureren";
 $a->strings["Uncensor"] = "Niet censureren";
+$a->strings["Allow Code"] = "Scripts toestaan";
+$a->strings["Disallow Code"] = "Scripts niet toestaan";
 $a->strings["UID"] = "UID";
 $a->strings["Selected channels will be deleted!\\n\\nEverything that was posted in these channels on this site will be permanently deleted!\\n\\nAre you sure?"] = "Geselecteerde kanalen worden verwijderd!\\n\\nAlles wat in deze kanalen op deze hub werd gepubliceerd wordt definitief verwijderd!\\n\\nWeet je het zeker?";
 $a->strings["The channel {0} will be deleted!\\n\\nEverything that was posted in this channel on this site will be permanently deleted!\\n\\nAre you sure?"] = "Kanaal {0} wordt verwijderd!\\n\\nAlles wat in dit kanaal op deze hub werd gepubliceerd wordt definitief verwijderd!\\n\\nWeet je het zeker?";
@@ -1834,8 +1736,6 @@ $a->strings["Field definition not found"] = "Velddefinitie niet gevonden";
 $a->strings["Edit Profile Field"] = "Profielveld bewerken";
 $a->strings["Unable to find your hub."] = "Niet in staat om je hub te vinden";
 $a->strings["Post successful."] = "Verzenden bericht geslaagd.";
-$a->strings["Edit Block"] = "Blok bewerken";
-$a->strings["Delete block?"] = "Blok verwijderen";
 $a->strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = "Maximum toegestane dagelijkse registraties op deze \$Projectname-hub bereikt. Probeer het morgen (UTC) nogmaals.";
 $a->strings["Please indicate acceptance of the Terms of Service. Registration failed."] = "Registratie mislukt. De gebruiksvoorwaarden dienen wel geaccepteerd te worden.";
 $a->strings["Passwords do not match."] = "Wachtwoorden komen niet met elkaar overeen.";
@@ -1861,19 +1761,154 @@ $a->strings["This action is permanent and can not be undone!"] = "Deze handeling
 $a->strings["Please enter your password for verification:"] = "Vul je wachtwoord in ter verificatie:";
 $a->strings["Remove this account, all its channels and all its channel clones from the network"] = "Dit account, al zijn kanalen en alle klonen van zijn kanalen uit het \$Projectname-netwerk verwijderen";
 $a->strings["By default only the instances of the channels located on this hub will be removed from the network"] = "Standaard worden alleen de kanalen die zich op deze hub bevinden uit het \$Projectname-netwerk verwijderd";
-$a->strings["Unable to locate original post."] = "Niet in staat om de originele locatie van het bericht te vinden. ";
-$a->strings["Empty post discarded."] = "Leeg bericht geannuleerd";
-$a->strings["Executable content type not permitted to this channel."] = "Uitvoerbare bestanden zijn niet toegestaan op dit kanaal.";
-$a->strings["System error. Post not saved."] = "Systeemfout. Bericht niet opgeslagen.";
-$a->strings["Unable to obtain post information from database."] = "Niet in staat om informatie over dit bericht uit de database te verkrijgen.";
-$a->strings["You have reached your limit of %1$.0f top level posts."] = "Je hebt jouw limiet van %1$.0f berichten bereikt.";
-$a->strings["You have reached your limit of %1$.0f webpages."] = "Je hebt jouw limiet van %1$.0f webpagina's bereikt.";
+$a->strings["Remove Account"] = "Account verwijderen";
+$a->strings["Help:"] = "Hulp:";
+$a->strings["Not Found"] = "Niet gevonden";
+$a->strings["\$Projectname Documentation"] = "\$Projectname-documentatie";
 $a->strings["[Embedded content - reload page to view]"] = "[Ingesloten inhoud - ververs pagina om te bekijken] ";
 $a->strings["Remote privacy information not available."] = "Privacy-informatie op afstand niet beschikbaar.";
 $a->strings["Visible to:"] = "Zichtbaar voor:";
-$a->strings["Comanche page description language help"] = "Hulp met de paginabeschrijvingstaal Comanche";
-$a->strings["Layout Description"] = "Lay-out-omschrijving";
-$a->strings["Download PDL file"] = "Download PDL-bestand";
+$a->strings["Name is required"] = "Naam is vereist";
+$a->strings["Key and Secret are required"] = "Key en secret zijn vereist";
+$a->strings["Diaspora Policy Settings updated."] = "Beleidsinstellingen Diaspora bijgewerkt.";
+$a->strings["Passwords do not match. Password unchanged."] = "Wachtwoorden komen niet overeen. Wachtwoord onveranderd.";
+$a->strings["Empty passwords are not allowed. Password unchanged."] = "Lege wachtwoorden zijn niet toegestaan. Wachtwoord onveranderd.";
+$a->strings["Password changed."] = "Wachtwoord veranderd.";
+$a->strings["Password update failed. Please try again."] = "Bijwerken wachtwoord mislukt. Probeer opnieuw.";
+$a->strings["Not valid email."] = "Geen geldig e-mailadres.";
+$a->strings["Protected email address. Cannot change to that email."] = "Beschermd e-mailadres. Kan dat e-mailadres niet gebruiken.";
+$a->strings["System failure storing new email. Please try again."] = "Systeemfout opslaan van nieuwe e-mail. Probeer het nog een keer.";
+$a->strings["Settings updated."] = "Instellingen bijgewerkt.";
+$a->strings["Add application"] = "Applicatie toevoegen";
+$a->strings["Name of application"] = "Naam van applicatie";
+$a->strings["Consumer Key"] = "Consumer key";
+$a->strings["Automatically generated - change if desired. Max length 20"] = "Automatische gegenereerd - verander wanneer gewenst. Maximale lengte is 20";
+$a->strings["Consumer Secret"] = "Consumer secret";
+$a->strings["Redirect"] = "Redirect/doorverwijzing";
+$a->strings["Redirect URI - leave blank unless your application specifically requires this"] = "URI voor redirect - laat leeg, behalve wanneer de applicatie dit vereist";
+$a->strings["Icon url"] = "URL van pictogram";
+$a->strings["Optional"] = "Optioneel";
+$a->strings["You can't edit this application."] = "Je kan deze applicatie niet bewerken";
+$a->strings["Connected Apps"] = "Verbonden applicaties";
+$a->strings["Client key starts with"] = "Client key begint met";
+$a->strings["No name"] = "Geen naam";
+$a->strings["Remove authorization"] = "Autorisatie verwijderen";
+$a->strings["No feature settings configured"] = "Geen extra functie- of plugin-instellingen";
+$a->strings["Feature/Addon Settings"] = "Extra functie- en plugin-instellingen";
+$a->strings["Settings for the built-in Diaspora emulator"] = "Instellingen voor de ingebouwde Diaspora-emulator";
+$a->strings["Allow any Diaspora member to comment on your public posts"] = "Sta toe dat elk Diaspora-lid op jouw openbare berichten kan reageren.";
+$a->strings["Enable the Diaspora protocol for this channel"] = "Diaspora-protocol voor dit kanaal inschakelen";
+$a->strings["Diaspora Policy Settings"] = "Beleidsinstellingen Diaspora";
+$a->strings["Prevent your hashtags from being redirected to other sites"] = "Voorkom dat jouw tags naar andere websites worden doorverwezen";
+$a->strings["Account Settings"] = "Account-instellingen";
+$a->strings["Enter New Password:"] = "Nieuw wachtwoord invoeren:";
+$a->strings["Confirm New Password:"] = "Nieuw wachtwoord bevestigen:";
+$a->strings["Leave password fields blank unless changing"] = "Laat de wachtwoordvelden leeg, behalve wanneer je deze wil veranderen";
+$a->strings["Email Address:"] = "E-mailadres:";
+$a->strings["Remove this account including all its channels"] = "Dit account en al zijn kanalen verwijderen";
+$a->strings["Off"] = "Uit";
+$a->strings["On"] = "Aan";
+$a->strings["Additional Features"] = "Extra functies";
+$a->strings["Connector Settings"] = "Instellingen externe koppelingen";
+$a->strings["No special theme for mobile devices"] = "Geen speciaal thema voor mobiele apparaten";
+$a->strings["%s - (Experimental)"] = "%s - (experimenteel)";
+$a->strings["Display Settings"] = "Weergave-instellingen";
+$a->strings["Theme Settings"] = "Thema-instellingen";
+$a->strings["Custom Theme Settings"] = "Handmatige thema-instellingen";
+$a->strings["Content Settings"] = "Inhoudsinstellingen";
+$a->strings["Display Theme:"] = "Gebruik thema:";
+$a->strings["Mobile Theme:"] = "Mobiel thema:";
+$a->strings["Enable user zoom on mobile devices"] = "Inzoomen op smartphones en tablets toestaan";
+$a->strings["Update browser every xx seconds"] = "Ververs de webbrowser om de zoveel seconde";
+$a->strings["Minimum of 10 seconds, no maximum"] = "Minimaal 10 seconde, geen maximum";
+$a->strings["Maximum number of conversations to load at any time:"] = "Maximaal aantal conversaties die per keer geladen worden:";
+$a->strings["Maximum of 100 items"] = "Maximaal 100 conversaties";
+$a->strings["Show emoticons (smilies) as images"] = "Toon emoticons (smilies) als afbeeldingen";
+$a->strings["Link post titles to source"] = "Berichtkoppen naar originele locatie linken";
+$a->strings["System Page Layout Editor - (advanced)"] = "Lay-out bewerken van systeempagina's (geavanceerd)";
+$a->strings["Use blog/list mode on channel page"] = "Gebruik blog/lijst-modus op kanaalpagina";
+$a->strings["(comments displayed separately)"] = "(reacties worden afzonderlijk weergeven)";
+$a->strings["Use blog/list mode on matrix page"] = "Gebruik blog/lijst-modus op matrixpagina";
+$a->strings["Channel page max height of content (in pixels)"] = "Maximale hoogte berichtinhoud op kanaalpagina (in pixels)";
+$a->strings["click to expand content exceeding this height"] = "klik om inhoud uit te klappen die deze hoogte overschrijdt";
+$a->strings["Matrix page max height of content (in pixels)"] = "Maximale hoogte berichtinhoud op matrixpagina (in pixels)";
+$a->strings["Nobody except yourself"] = "Niemand, behalve jezelf";
+$a->strings["Only those you specifically allow"] = "Alleen connecties met uitdrukkelijke toestemming";
+$a->strings["Approved connections"] = "Geaccepteerde connecties";
+$a->strings["Any connections"] = "Alle connecties";
+$a->strings["Anybody on this website"] = "Iedereen op deze hub";
+$a->strings["Anybody in this network"] = "Iedereen in dit netwerk";
+$a->strings["Anybody authenticated"] = "Geauthenticeerd";
+$a->strings["Anybody on the internet"] = "Iedereen op het internet";
+$a->strings["Publish your default profile in the network directory"] = "Publiceer je standaardprofiel in de kanalengids";
+$a->strings["Allow us to suggest you as a potential friend to new members?"] = "Sta ons toe om jouw kanaal als mogelijke connectie voor te stellen aan nieuwe kanalen";
+$a->strings["Your channel address is"] = "Jouw kanaaladres is";
+$a->strings["Channel Settings"] = "Kanaal-instellingen";
+$a->strings["Basic Settings"] = "Basis-instellingen";
+$a->strings["Your Timezone:"] = "Jouw tijdzone:";
+$a->strings["Default Post Location:"] = "Standaardlocatie bericht:";
+$a->strings["Geographical location to display on your posts"] = "Geografische locatie die bij het bericht moet worden vermeld";
+$a->strings["Use Browser Location:"] = "Locatie van webbrowser gebruiken:";
+$a->strings["Adult Content"] = "Inhoud voor volwassenen";
+$a->strings["This channel frequently or regularly publishes adult content. (Please tag any adult material and/or nudity with #NSFW)"] = "Dit kanaal publiceert regelmatig of vaak materiaal dat alleen geschikt is voor volwassenen. (Gebruik de tag #NSFW in berichten met een seksueel getinte inhoud of ander voor minderjarigen ongeschikt materiaal)";
+$a->strings["Security and Privacy Settings"] = "Veiligheids- en privacy-instellingen";
+$a->strings["Your permissions are already configured. Click to view/adjust"] = "Jouw permissies zijn al ingesteld. Klik om ze te bekijken of aan te passen.";
+$a->strings["Hide my online presence"] = "Verberg mijn aanwezigheid";
+$a->strings["Prevents displaying in your profile that you are online"] = "Voorkomt dat op je kanaalpagina te zien valt dat je momenteel op \$Projectname aanwezig bent";
+$a->strings["Simple Privacy Settings:"] = "Eenvoudige privacy-instellingen:";
+$a->strings["Very Public - <em>extremely permissive (should be used with caution)</em>"] = "Zeer openbaar <em>(kanaal staat volledig open - moet met grote zorgvuldigheid gebruikt worden)</em>";
+$a->strings["Typical - <em>default public, privacy when desired (similar to social network permissions but with improved privacy)</em>"] = "Normaal <em>(standaard openbaar, maar privacy wanneer noodzakelijk - vergelijkbaar met die van sociale netwerken, maar met verbeterde privacy)</em>";
+$a->strings["Private - <em>default private, never open or public</em>"] = "Privé <em>(standaard privé en nooit openbaar)</em>";
+$a->strings["Blocked - <em>default blocked to/from everybody</em>"] = "Geblokkeerd <em>(standaard geblokkeerd naar/van iedereen)</em>";
+$a->strings["Allow others to tag your posts"] = "Anderen toestaan om je berichten te taggen";
+$a->strings["Often used by the community to retro-actively flag inappropriate content"] = "Vaak in groepen/forums gebruikt om met terugwerkende kracht ongepast materiaal te markeren";
+$a->strings["Advanced Privacy Settings"] = "Geavanceerde privacy-instellingen";
+$a->strings["Expire other channel content after this many days"] = "Inhoud van andere kanalen na zoveel aantal dagen laten verlopen:";
+$a->strings["0 or blank prevents expiration"] = "0 of leeg voorkomt het verlopen";
+$a->strings["Maximum Friend Requests/Day:"] = "Maximum aantal connectieverzoeken per dag:";
+$a->strings["May reduce spam activity"] = "Kan eventuele spam verminderen";
+$a->strings["Default Post Permissions"] = "Standaard permissies voor nieuwe berichten";
+$a->strings["Channel permissions category:"] = "Kanaaltype en -permissies:";
+$a->strings["Maximum private messages per day from unknown people:"] = "Maximum aantal privé-berichten per dag van onbekende personen:";
+$a->strings["Useful to reduce spamming"] = "Kan eventuele spam verminderen";
+$a->strings["Notification Settings"] = "Notificatie-instellingen";
+$a->strings["By default post a status message when:"] = "Plaats automatisch een statusbericht wanneer:";
+$a->strings["accepting a friend request"] = "Een connectieverzoek wordt geaccepteerd";
+$a->strings["joining a forum/community"] = "Je lid wordt van een forum/groep";
+$a->strings["making an <em>interesting</em> profile change"] = "Er sprake is van een <em>interessante</em> profielwijziging";
+$a->strings["Send a notification email when:"] = "Verzend een notificatie per e-mail wanneer:";
+$a->strings["You receive a connection request"] = "Je een connectieverzoek ontvangt";
+$a->strings["Your connections are confirmed"] = "Jouw connecties zijn bevestigd";
+$a->strings["Someone writes on your profile wall"] = "Iemand iets op jouw kanaal heeft geschreven";
+$a->strings["Someone writes a followup comment"] = "Iemand een reactie schrijft";
+$a->strings["You receive a private message"] = "Je een privé-bericht ontvangt";
+$a->strings["You receive a friend suggestion"] = "Je een kanaalvoorstel ontvangt";
+$a->strings["You are tagged in a post"] = "Je expliciet in een bericht bent genoemd";
+$a->strings["You are poked/prodded/etc. in a post"] = "Je bent in een bericht aangestoten/gepord/etc.";
+$a->strings["Show visual notifications including:"] = "Toon de volgende zichtbare notificaties:";
+$a->strings["Unseen matrix activity"] = "Niet bekeken matrix-activiteit";
+$a->strings["Unseen channel activity"] = "Niet bekeken kanaal-activiteit";
+$a->strings["Unseen private messages"] = "Niet bekeken privéberichten";
+$a->strings["Recommended"] = "Aanbevolen";
+$a->strings["Upcoming events"] = "Aankomende gebeurtenissen";
+$a->strings["Events today"] = "Gebeurtissen van vandaag";
+$a->strings["Upcoming birthdays"] = "Aankomende verjaardagen";
+$a->strings["Not available in all themes"] = "Niet in alle thema's beschikbaar";
+$a->strings["System (personal) notifications"] = "(Persoonlijke) systeemnotificaties";
+$a->strings["System info messages"] = "Systeemmededelingen";
+$a->strings["System critical alerts"] = "Kritische systeemwaarschuwingen";
+$a->strings["New connections"] = "Nieuwe connecties";
+$a->strings["System Registrations"] = "Nieuwe accountregistraties op deze hub";
+$a->strings["Also show new wall posts, private messages and connections under Notices"] = "Toon tevens nieuwe kanaalberichten, privéberichten en connecties onder Notificaties";
+$a->strings["Notify me of events this many days in advance"] = "Herinner mij zoveel dagen van te voren aan gebeurtenissen";
+$a->strings["Must be greater than 0"] = "Moet hoger dan 0 zijn";
+$a->strings["Advanced Account/Page Type Settings"] = "Instellingen geavanceerd account/paginatype";
+$a->strings["Change the behaviour of this account for special situations"] = "Verander het gedrag van dit account voor speciale situaties";
+$a->strings["Please enable expert mode (in <a href=\"settings/features\">Settings > Additional features</a>) to adjust!"] = "Schakel de expertmodus in (in <a href=\"settings/features\">Instellingen > Extra functies</a>) om aan te kunnen passen!";
+$a->strings["Miscellaneous Settings"] = "Diverse instellingen";
+$a->strings["Personal menu to display in your channel pages"] = "Persoonlijk menu om op je kanaalpagina's weer te geven";
+$a->strings["Remove Channel"] = "Kanaal verwijderen";
+$a->strings["Remove this channel."] = "Verwijder dit kanaal.";
 $a->strings["First Name"] = "Voornaam";
 $a->strings["Last Name"] = "Achternaam";
 $a->strings["Nickname"] = "Bijnaam";
@@ -1894,28 +1929,44 @@ $a->strings["Conversation removed."] = "Conversatie verwijderd";
 $a->strings["No messages."] = "Geen berichten";
 $a->strings["Delete conversation"] = "Verwijder conversatie";
 $a->strings["D, d M Y - g:i A"] = "D, j M Y - G:i";
+$a->strings["Export Channel"] = "Kanaal exporteren";
+$a->strings["Export your basic channel information to a file.  This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new server hub, but does not contain your content."] = "Exporteer de basisinformatie van jouw kanaal naar een bestand. Dit fungeert als een back-up van jouw connecties, permissies, profiel en basisgegevens, die gebruikt kan worden om op een nieuwe hub jouw gegevens te importeren. Deze back-up bevat echter niet de inhoud van jouw kanaal.";
+$a->strings["Export Content"] = "Inhoud exporteren";
+$a->strings["Export your channel information and recent content to a JSON backup that can be restored or imported to another server hub. This backs up all of your connections, permissions, profile data and several months of posts. This file may be VERY large.  Please be patient - it may take several minutes for this download to begin."] = "Exporteer informatie en recente inhoud van jouw kanaal naar een JSON-back-up, wat kan worden gebruikt om jouw kanaal te herstellen of te importeren op een andere hub. Dit slaat al jouw connecties, permissies, profielgegevens en enkele maanden aan inhoud van jouw kanaal op. Dit bestand kan ZEER groot worden. Wees geduldig - het kan enkele minuten duren voordat de download begint.";
+$a->strings["Export your posts from a given year or month:"] = "Exporteer jouw berichten van een bepaald jaar of een bepaalde maand:";
+$a->strings["You may also export your posts and conversations for a particular year or month. Click on one of the recent years or months below."] = "Je kan ook jouw berichten en conversaties van een bepaald jaar of een bepaalde maand exporteren. Klik hieronder op een van de recente jaren of maanden.";
+$a->strings["Jan"] = "jan";
+$a->strings["Feb"] = "feb";
+$a->strings["Mar"] = "mrt";
+$a->strings["Apr"] = "apr";
+$a->strings["Jun"] = "jun";
+$a->strings["Jul"] = "jul";
+$a->strings["Aug"] = "aug";
+$a->strings["Sep"] = "sep";
+$a->strings["Oct"] = "okt";
+$a->strings["Nov"] = "nov";
+$a->strings["Dec"] = "dec";
+$a->strings["If the export fails (possibly due to memory exhaustion on your server hub), please try again selecting a more limited date range."] = "Wanneer het exporteren mislukt (waarschijnlijk door een gebrek aan beschikbaar servergeheugen), kies een kleiner datumbereik en probeer het dan nogmaals.";
+$a->strings["Or adjust the date in your browser location bar to select other dates. For example the year 2013; <a href=\"%1\$s/2013\">%1\$s/2013</a> or the month September 2013; <a href=\"%1\$s/2013/9\">%1\$s/2013/9</a>"] = "Of pas de datum aan in de adresbalk van je browser om zo andere jaren of maanden te kiezen. Bijvoorbeeld het jaar 2013; <a href=\"%1\$s/2013\">%1\$s/2013</a> of de maand september 2013; <a href=\"%1\$s/2013/9\">%1\$s/2013/9</a>.";
+$a->strings["Please visit"] = "Bezoek";
+$a->strings["on another hub to import the backup files(s)."] = "op een andere hub om het back-upbestand of de back-upbestanden te importeren.";
+$a->strings["We advise you to clone the channel on the new hub first and than to import the backup file(s) (from the same channel) in chronological order. Importing the backup files into another channel will certainly give permission issues."] = "Wij adviseren om eerst het kanaal op de nieuwe hub te klonen en dan vervolgens het back-upbestand of de back-upbestanden in chronologische volgorde te importeren (van hetzelfde kanaal). Het importeren van back-upbestanden in een ander kanaal veroorzaakt zeker permissieproblemen.";
 $a->strings["Set your current mood and tell your friends"] = "Noteer je huidige stemming en toon het aan je connecties";
 $a->strings["Total votes"] = "Totaal aantal stemmen";
-$a->strings["Average Rating"] = "Gemiddelde waardering";
+$a->strings["Average Rating"] = "Gemiddelde beoordeling";
 $a->strings["Channel removals are not allowed within 48 hours of changing the account password."] = "Het verwijderen van een kanaal is niet toegestaan binnen 48 uur nadat het wachtwoord van het account is veranderd.";
 $a->strings["Remove This Channel"] = "Verwijder dit kanaal";
 $a->strings["This channel will be completely removed from the network. "] = "Dit kanaal wordt volledig uit het \$Projectname-netwerk verwijderd.";
 $a->strings["Remove this channel and all its clones from the network"] = "Dit kanaal en alle klonen hiervan uit het \$Projectname-netwerk verwijderen";
 $a->strings["By default only the instance of the channel located on this hub will be removed from the network"] = "Standaard wordt alleen het kanaal dat zich op deze hub bevindt uit het \$Projectname-netwerk verwijderd";
+$a->strings["Could not access contact record."] = "Kon geen toegang krijgen tot de connectie-gegevens.";
+$a->strings["Could not locate selected profile."] = "Kon het gekozen profiel niet vinden.";
+$a->strings["Connection updated."] = "Connectie bijgewerkt.";
+$a->strings["Failed to update connection record."] = "Bijwerken van connectie-gegevens mislukt.";
 $a->strings["is now connected to"] = "is nu verbonden met";
 $a->strings["Could not access address book record."] = "Kon geen toegang krijgen tot de record van de connectie.";
 $a->strings["Refresh failed - channel is currently unavailable."] = "Vernieuwen mislukt - kanaal is momenteel niet beschikbaar";
-$a->strings["Channel has been unblocked"] = "Kanaal is gedeblokkeerd";
-$a->strings["Channel has been blocked"] = "Kanaal is geblokkeerd";
 $a->strings["Unable to set address book parameters."] = "Niet in staat om de parameters van connecties in te stellen.";
-$a->strings["Channel has been unignored"] = "Kanaal wordt niet meer genegeerd";
-$a->strings["Channel has been ignored"] = "Kanaal wordt genegeerd";
-$a->strings["Channel has been unarchived"] = "Kanaal is niet meer gearchiveerd";
-$a->strings["Channel has been archived"] = "Kanaal is gearchiveerd";
-$a->strings["Channel has been unhidden"] = "Kanaal is niet meer verborgen";
-$a->strings["Channel has been hidden"] = "Kanaal is verborgen";
-$a->strings["Channel has been approved"] = "Connectie/kanaal is geaccepteerd";
-$a->strings["Channel has been unapproved"] = "Connectie/kanaal is afgewezen";
 $a->strings["Connection has been removed."] = "Connectie is verwijderd";
 $a->strings["View %s's profile"] = "Profiel van %s weergeven";
 $a->strings["Refresh Permissions"] = "Permissies vernieuwen";
@@ -1923,56 +1974,48 @@ $a->strings["Fetch updated permissions"] = "Aangepaste permissies ophalen";
 $a->strings["Recent Activity"] = "Recente activiteit";
 $a->strings["View recent posts and comments"] = "Recente berichten en reacties weergeven";
 $a->strings["Block (or Unblock) all communications with this connection"] = "Blokkeer (of deblokkeer) alle communicatie met deze connectie";
+$a->strings["This connection is blocked!"] = "Deze connectie is geblokkeerd!";
 $a->strings["Unignore"] = "Niet meer negeren";
 $a->strings["Ignore"] = "Negeren";
 $a->strings["Ignore (or Unignore) all inbound communications from this connection"] = "Negeer (of negeer niet meer) alle inkomende communicatie van deze connectie";
+$a->strings["This connection is ignored!"] = "Deze connectie wordt genegeerd!";
 $a->strings["Unarchive"] = "Niet meer archiveren";
 $a->strings["Archive"] = "Archiveren";
 $a->strings["Archive (or Unarchive) this connection - mark channel dead but keep content"] = "Archiveer (of dearchiveer) deze connectie - markeer het kanaal als dood, maar bewaar de inhoud";
+$a->strings["This connection is archived!"] = "Deze connectie is gearchiveerd!";
 $a->strings["Unhide"] = "Niet meer verbergen";
 $a->strings["Hide"] = "Verbergen";
 $a->strings["Hide or Unhide this connection from your other connections"] = "Deze connectie verbergen (of niet meer verbergen) voor jouw andere connecties";
+$a->strings["This connection is hidden!"] = "Deze connectie is verborgen!";
 $a->strings["Delete this connection"] = "Deze connectie verwijderen";
 $a->strings["Approve this connection"] = "Deze connectie accepteren";
 $a->strings["Accept connection to allow communication"] = "Keur deze connectie goed om communicatie toe te staan";
-$a->strings["Connections: settings for %s"] = "Connecties: instellingen voor %s";
+$a->strings["Set Affinity"] = "Verwantschapsfilter instellen";
+$a->strings["Set Profile"] = "Profiel instellen";
+$a->strings["Set Affinity & Profile"] = "Verwantschapsfilter en profiel instellen";
 $a->strings["Apply these permissions automatically"] = "Deze permissies automatisch toepassen";
-$a->strings["Apply the permissions indicated on this page to all new connections."] = "Permissies die op deze pagina staan vermeldt op alle nieuwe connecties toepassen.";
+$a->strings["This connection's address is"] = "Het adres van deze connectie is";
+$a->strings["The permissions indicated on this page will be applied to all new connections."] = "Permissies die op deze pagina staan vermeld worden op alle nieuwe connecties toegepast.";
 $a->strings["Slide to adjust your degree of friendship"] = "Schuif om te bepalen hoe goed je iemand kent en/of mag";
-$a->strings["Default permissions for your channel type have (just) been applied. They have not yet been submitted. Please review the permissions on this page and make any desired changes at this time. This new connection may <em>not</em> be able to communicate with you until you submit this page, which will install and apply the selected permissions."] = "Voor jouw kanaaltype geldende standaard permissies zijn (zonet) toegepast. Ze zijn echter nog niet opgeslagen. Controleer de permissies op deze pagina en verander ze eventueel. Deze nieuwe connectie kan mogelijk nog <em>niet</em> met jou communiceren totdat je deze pagina opslaat, wat ervoor zorgt dat de gekozen permissies actief worden.";
+$a->strings["Slide to adjust your rating"] = "Gebruik de schuif om je beoordeling te geven";
+$a->strings["Optionally explain your rating"] = "Verklaar jouw beoordeling (niet verplicht)";
+$a->strings["Custom Filter"] = "Berichtenfilter";
+$a->strings["Only import posts with this text"] = "Importeer alleen berichten met deze tekst";
+$a->strings["words one per line or #tags or /patterns/, leave blank to import all posts"] = "woorden (één per regel), #tags of /patterns/, laat leeg om alle berichten te importeren";
+$a->strings["Do not import posts with this text"] = "Importeer geen berichten met deze tekst";
+$a->strings["This information is public!"] = "Deze informatie is openbaar!";
+$a->strings["Connection Pending Approval"] = "Connectie moet nog goedgekeurd worden";
+$a->strings["Connection Request"] = "Connectieverzoek";
+$a->strings["(%s) would like to connect with you. Please approve this connection to allow communication."] = "(%s) wil met jou verbinden. Keur dit connectieverzoek goed om onderling te kunnen communiceren.";
+$a->strings["Approve Later"] = "Later goedkeuren";
 $a->strings["inherited"] = "geërfd";
-$a->strings["Connection has no individual permissions!"] = "Connectie heeft geen individuele permissies!";
-$a->strings["This may be appropriate based on your <a href=\"settings\">privacy settings</a>, though you may wish to review the \"Advanced Permissions\"."] = "Dit is mogelijk voldoende, wanneer er naar jouw <a href=\"settings\">privacy-instellingen</a> wordt gekeken.  Hoewel je wellicht de geavanceerde rechten wil nagaan.";
-$a->strings["Profile Visibility"] = "Zichtbaarheid profiel";
 $a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Kies het profiel dat je aan %s wil tonen wanneer hij/zij ingelogd jouw profiel wil bekijken.";
-$a->strings["Contact Information / Notes"] = "Informatie/aantekeningen over connectie";
-$a->strings["Edit contact notes"] = "Bewerk aantekeningen over contact";
 $a->strings["Their Settings"] = "Hun instellingen";
 $a->strings["My Settings"] = "Mijn instellingen";
-$a->strings["Default permissions for this channel type have (just) been applied. They have <em>not</em> been saved and there are currently no stored default permissions. Please review/edit the applied settings and click [Submit] to finalize."] = "Voor dit kanaaltype geldende standaard permissies zijn (zonet) toegepast. Ze zijn echter nog <em>niet</em> opgeslagen en er zijn momenteel geen standaard permissies aanwezig. Controleer/verander de permissies op deze pagina en klik op [Opslaan] om deze te activeren.";
-$a->strings["Clear/Disable Automatic Permissions"] = "Verwijderen/uitschakelen automatische permissies";
-$a->strings["Forum Members"] = "Forumleden";
-$a->strings["Soapbox"] = "Zeepkist";
-$a->strings["Full Sharing (typical social network permissions)"] = "Voluit delen (vergelijkbaar met die van sociale netwerken)";
-$a->strings["Cautious Sharing "] = "Voorzichtig delen";
-$a->strings["Follow Only"] = "Alleen volgen";
 $a->strings["Individual Permissions"] = "Individuele permissies";
-$a->strings["Some permissions may be inherited from your channel <a href=\"settings\">privacy settings</a>, which have higher priority than individual settings. Changing those inherited settings on this page will have no effect."] = "Sommige permissies kunnen worden overgeërfd van de <a href=\"settings\">privacy-instellingen</a> van jouw kanaal. Wanneer je deze geërfde instellingen op deze pagina veranderd heeft dat geen effect.";
-$a->strings["Advanced Permissions"] = "Geavanceerde permissies";
-$a->strings["Simple Permissions (select one and submit)"] = "Eenvoudige permissies (selecteer er één en opslaan)";
-$a->strings["Visit %s's profile - %s"] = "Profiel van %s bezoeken - %s";
-$a->strings["Block/Unblock contact"] = "Connectie blokkeren/deblokkeren";
-$a->strings["Ignore contact"] = "Connectie negeren";
-$a->strings["Repair URL settings"] = "URL-instellingen repareren";
-$a->strings["View conversations"] = "Conversaties weergeven";
-$a->strings["Delete contact"] = "Connectie verwijderen";
+$a->strings["Some permissions may be inherited from your channel's <a href=\"settings\"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can <strong>not</strong> change those settings here."] = "Sommige permissies worden mogelijk overgeërfd van de <a href=\"settings\">privacy-instellingen</a> van jouw kanaal, die een hogere prioriteit hebben dan deze individuele instellingen. Je kan je deze overgeërfde permissies hier <strong>niet</strong> veranderen.";
+$a->strings["Some permissions may be inherited from your channel's <a href=\"settings\"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can change those settings here but they wont have any impact unless the inherited setting changes."] = "Sommige permissies worden mogelijk overgeërfd van de <a href=\"settings\">privacy-instellingen</a> van jouw kanaal, die een hogere prioriteit hebben dan deze individuele permissies. Je kan de permissies hier veranderen, maar die hebben geen effect, tenzij de overgeërfde permissies worden veranderd. ";
 $a->strings["Last update:"] = "Laatste wijziging:";
-$a->strings["Update public posts"] = "Openbare berichten updaten";
-$a->strings["Update now"] = "Nu updaten";
-$a->strings["Currently blocked"] = "Momenteel geblokkeerd";
-$a->strings["Currently ignored"] = "Momenteel genegeerd";
-$a->strings["Currently archived"] = "Momenteel gearchiveerd";
-$a->strings["Currently pending"] = "Moeten nog geaccepteerd of afgewezen worden";
 $a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "We hebben een probleem ontdekt tijdens het inloggen met de OpenID die je hebt verstrekt. Controleer de ID op typefouten.";
 $a->strings["The error message was:"] = "Het foutbericht was:";
 $a->strings["Authentication failed."] = "Authenticatie mislukt.";
@@ -2024,20 +2067,20 @@ $a->strings["Location (URL) to purchase app"] = "Locatie (URL) om de app aan te
 $a->strings["sent you a private message"] = "stuurde jou een privébericht";
 $a->strings["added your channel"] = "voegde jouw kanaal toe";
 $a->strings["posted an event"] = "plaatste een gebeurtenis";
-$a->strings["No such group"] = "Collectie niet gevonden";
-$a->strings["No such channel"] = "Niet zo'n kanaal";
-$a->strings["Search Results For:"] = "Zoekresultaten voor:";
-$a->strings["Collection is empty"] = "Collectie is leeg";
-$a->strings["Collection: "] = "Collectie: ";
-$a->strings["Connection: "] = "Connectie: ";
-$a->strings["Invalid connection."] = "Ongeldige connectie.";
-$a->strings["Ipsum Lorem"] = "Lorem ipsum";
+$a->strings["Comanche page description language help"] = "Hulp met de paginabeschrijvingstaal Comanche";
+$a->strings["Layout Description"] = "Lay-out-omschrijving";
+$a->strings["Download PDL file"] = "Download PDL-bestand";
+$a->strings["Welcome to %s"] = "Welkom op %s";
+$a->strings["Lorem Ipsum"] = "Lorem Ipsum";
 $a->strings["Bookmark added"] = "Bladwijzer toegevoegd";
 $a->strings["My Bookmarks"] = "Mijn bladwijzers";
 $a->strings["My Connections Bookmarks"] = "Bladwijzers van mijn connecties";
 $a->strings["Insufficient permissions.  Request redirected to profile page."] = "Onvoldoende permissies.  Doorgestuurd naar profielpagina.";
+$a->strings["This setting requires special processing and editing has been blocked."] = "Deze instelling vereist een speciaal proces  en bewerken is geblokkeerd.";
+$a->strings["Configuration Editor"] = "Configuratiebewerker";
+$a->strings["Warning: Changing some settings could render your channel inoperable. Please leave this page unless you are comfortable with and knowledgeable about how to correctly use this feature."] = "Waarschuwing: het veranderen van sommige instellingen kunnen jouw kanaal onklaar maken. Verlaat deze pagina, tenzij je weet waar je mee bezig bent en voldoende kennis bezit over hoe je deze functies moet gebruiken. ";
 $a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Geen voorgestelde kanalen gevonden. Wanneer dit een nieuwe hub is, probeer het dan over 24 uur weer.";
-$a->strings["Poll"] = "Poll";
+$a->strings["Poll"] = "Peiling";
 $a->strings["View Results"] = "Bekijk resultaten";
 $a->strings["No service class restrictions found."] = "Geen abonnementsbeperkingen gevonden.";
 $a->strings["Files: shared with me"] = "Bestanden: met mij gedeeld";
@@ -2058,27 +2101,27 @@ $a->strings["Set shadow color, default #000"] = "Schaduwkleur instellen (standaa
 $a->strings["Set radius size, default 5px"] = "Radius instellen (standaard 5px)";
 $a->strings["Set line-height for posts and comments"] = "Lijnhoogte voor berichten en reacties instellen";
 $a->strings["Set background image"] = "Achtergrondafbeelding instellen";
-$a->strings["Set background attachment"] = "Gedrag achtergrondafbeelding instellen";
+$a->strings["Set background attachment"] = "Background-attachment instellen";
 $a->strings["Set background color"] = "Achtergrondkleur instellen";
 $a->strings["Set section background image"] = "Achtergrondafbeelding van sectie instellen";
 $a->strings["Set section background color"] = "Achtergrondkleur van sectie instellen";
-$a->strings["Set color of items - use hex"] = "Tekstkleur van items instellen (gebruik hexadecimaal)";
-$a->strings["Set color of links - use hex"] = "Kleur van links instellen (gebruik hexadecimaal)";
+$a->strings["Set color of items - use hex"] = "Tekstkleur van items instellen (hexadecimaal)";
+$a->strings["Set color of links - use hex"] = "Kleur van links instellen (hexadecimaal)";
 $a->strings["Set max-width for items.  Default 400px"] = "Maximale breedte van items instellen (standaard 400px)";
 $a->strings["Set min-width for items.  Default 240px"] = "Minimale breedte van items instellen (standaard 240px)";
 $a->strings["Set the generic content wrapper width.  Default 48%"] = "Breedte van de generieke content-wrapper instellen (standaard 48%)";
-$a->strings["Set color of fonts - use hex"] = "Tekstkleur instellen (gebruik hexadecimaal)";
+$a->strings["Set color of fonts - use hex"] = "Tekstkleur instellen (hexadecimaal)";
 $a->strings["Set background-size element"] = "Grootte achtergrondafbeelding instellen";
 $a->strings["Item opacity"] = "Ondoorzichtigheid item";
 $a->strings["Display post previews only"] = "Alleen voorvertoning berichten weergeven";
 $a->strings["Display side bar on channel page"] = "Zijbalk op kanaalpagina weergeven";
 $a->strings["Colour of the navigation bar"] = "Kleur van de navigatiebalk";
-$a->strings["Item float"] = "Item float";
+$a->strings["Item float"] = "Positie van item (float)";
 $a->strings["Left offset of the section element"] = "Linker offset van het sectie-element";
 $a->strings["Right offset of the section element"] = "Rechter offset van het sectie-element";
 $a->strings["Section width"] = "Breedte van sectie";
-$a->strings["Left offset of the aside"] = "Rechter offset van aside (zijbalk)";
-$a->strings["Right offset of the aside element"] = "Rechter offset van het aside-element";
+$a->strings["Left offset of the aside"] = "Linker offset van de zijbalk (aside)";
+$a->strings["Right offset of the aside element"] = "Rechter offset van de zijbalk (aside)";
 $a->strings["Light (Red Matrix default)"] = "Light (\$Projectname-standaard)";
 $a->strings["Select scheme"] = "Kies schema van thema";
 $a->strings["Narrow navbar"] = "Smalle navigatiebalk";
diff --git a/view/nl/update_fail_eml.tpl b/view/nl/update_fail_eml.tpl
index d903a8a9f..171859344 100644
--- a/view/nl/update_fail_eml.tpl
+++ b/view/nl/update_fail_eml.tpl
@@ -1,13 +1,13 @@
 Hey, 

-I'm the RedMatrix hub at {{$sitename}};

+I'm the Hubzilla hub at {{$sitename}};

    

-The Red atrix developers released update {{$update}} recently, 

+The Hubzilla developers released update {{$update}} recently, 

 but when I tried to install it, something went terribly wrong.  

 This needs to be fixed soon and it requires human intervention. 

-Please contact a RedMatrix developer if you can not figure out how to 

+Please contact a Hubzilla developer if you can not figure out how to 

 fix it on your own. My database might be invalid. 

 

 The error message is '{{$error}}'.   

 

 Apologies for the inconvenience, 

-	your hub at {{$siteurl}}
\ No newline at end of file
+	your hub at {{$siteurl}}

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 2ff6c1eb4..9403b078e 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -129,7 +129,7 @@ pre code {
 
 code {
 	font-size: 1em;
-	padding: 5px;
+	padding: 1em;
 	border: 1px solid #ccc;
 	background: #ccc;
 	color: #000;
@@ -794,11 +794,11 @@ a.rateme, div.rateme {
 }
 
 #nav-search-text::-webkit-input-placeholder {
-	font-family: FontAwesome;
+	font-family: FontAwesome, sans-serif;
 }
 
 #nav-search-text::-moz-placeholder {
-	font-family: FontAwesome;
+	font-family: FontAwesome, sans-serif;
 }
 
 nav .acpopup {
@@ -1432,7 +1432,10 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover {
 .profile-match-connect { margin-top: 5px; }
 
 .reshared-content { margin-left: 20px; }
-.shared_header img { margin-right: 10px; }
+.shared_header img {
+	border-radius: $radiuspx;
+	margin-right: 10px;
+}
 
 .tag1 {
     font-size : 0.9em !important;
@@ -1526,22 +1529,6 @@ a .drop-icons:hover {
 	margin-right: 10px;
 	color: #FF0000;
 }
- 
-.attachlink {
-	float: left;
-	border: 1px solid black;
-	padding: 5px;
-	margin-right: 8px;
-}
-
-.attach-icons {
-	font-size: 1.4em;
-}
-
-.attach-clip {
-	margin-right: 3px;
-	font-size: 1.8em;
-}
 
 #menulist {
 	list-style-type: none;
@@ -1634,40 +1621,56 @@ img.mail-conv-sender-photo {
 }
 
 /* conversation */
+.nsfw-wrap {
+	text-align: center;
+	font-size: $body_font_size;
+}
 
-.wall-item-title {
-   font-size: $font_size;
+.wall-item-head {
+	padding: 10px 10px 0.5em 10px;
 }
 
-.hide-comments-outer,
-.thread-wrapper .wall-item-comment-wrapper,
-.wall-item-content-wrapper.comment {
-	margin-left: $comment_indent;
+.wall-item-content {
+	padding: 0.5em 10px;
+}
+
+.wall-photo-item {
+	/*padding: 0.5em 10px;*/
+}
+
+.wall-photo-item img {
+	max-width: 100% !important;
+	border-top-right-radius: $radiuspx;
+	border-top-left-radius: $radiuspx;
+}
+
+.wall-item-tools {
+	padding: 0.5em 10px 10px 10px;
+}
+
+
+.wall-item-title {
+	font-size: $font_size;
 }
 
 .wall-item-content-wrapper {
 	background-color: $item_colour;
-	padding: 10px;
 	border-top-right-radius: $radiuspx;
 	border-top-left-radius: $radiuspx;
 }
 
 .wall-item-content-wrapper.comment {
 	background-color: $comment_item_colour;
-	border-color: $comment_border_colour;
-	border-style: solid;
-	border-width: 0px 0px 0px 3px;
-	border-radius: 0px;
-	padding: 7px 10px 7px 7px;
+	border-top-right-radius: 0px;
+	border-top-left-radius: 0px;
 }
 
 .hide-comments-outer {
 	background-color: $comment_item_colour;
-	border-color: $comment_border_colour;
 	border-top-color: #ccc;
 	border-style: solid;
 	border-top-style: dashed;
-	border-width: 1px 0px 0px 3px;
+	border-width: 1px 0px 0px 0px;
 	text-align: center;
 	border-radius: 0px;
 }
@@ -1682,11 +1685,11 @@ img.mail-conv-sender-photo {
 	border-radius: 0px;
 	border-bottom-right-radius: $radiuspx;
 	border-bottom-left-radius: $radiuspx;
-	margin-top: 3px;
+	border-top: 3px solid $comment_item_colour;
 }
 
 .wall-item-comment-wrapper-wc {
-	margin-top: 0px;
+	border-top: 0px solid $comment_item_colour;
 }
 
 .wall-item-like,
@@ -1722,6 +1725,7 @@ img.mail-conv-sender-photo {
 }
 
 .wall-item-content,
+.mail-conv-body,
 .page-body {
 	font-size: $font_size;
 	clear: both;
@@ -1770,7 +1774,6 @@ img.mail-conv-sender-photo {
 
 .divgrow-showmore:hover {
 	border-top: 1px dashed #adadad;
-	text-decoration: underline;
 }
 
 
@@ -1868,7 +1871,6 @@ nav .dropdown-menu {
 	border: 1px solid #ccc;
 	box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.2);
 	border-radius:  $radiuspx;
-	background-color: #fff;
 }
 
 .section-title-wrapper {
@@ -1876,7 +1878,7 @@ nav .dropdown-menu {
 	background-color: $item_colour;
 	border-top-left-radius: $radiuspx;
 	border-top-right-radius: $radiuspx;
-	margin-bottom: 3px;
+	border-bottom: 3px solid $comment_item_colour;
 }
 
 .section-title-wrapper h2,
@@ -1891,20 +1893,20 @@ nav .dropdown-menu {
 .section-subtitle-wrapper {
 	padding: 7px 10px;
 	background-color: $item_colour;
-	margin-bottom: 3px;
+	border-bottom: 3px solid $comment_item_colour;
 }
 
 .section-content-tools-wrapper {
 	padding: 7px 10px;
 	background-color: $comment_item_colour;
-	margin-bottom: 3px
+	border-bottom: 3px solid $comment_item_colour;
 }
 
 .section-content-info-wrapper {
 	padding: 21px 10px;
 	color: #31708f;
 	background-color: #d9edf7;
-	margin-bottom: 3px;
+	border-bottom: 3px solid $comment_item_colour;
 	text-align: center;
 }
 
@@ -1912,7 +1914,7 @@ nav .dropdown-menu {
 	padding: 21px 10px;
 	color: #8a6d3b;
 	background-color: #fcf8e3;
-	margin-bottom: 3px;
+	border-bottom: 3px solid $comment_item_colour;
 	text-align: center;
 }
 
@@ -1920,7 +1922,7 @@ nav .dropdown-menu {
 	padding: 21px 10px;
 	color: #a94442;
 	background-color: #f2dede;
-	margin-bottom: 3px;
+	border-bottom: 3px solid $comment_item_colour;
 	text-align: center;
 }
 
diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css
index 4e8e23de5..7020309fc 100644
--- a/view/theme/redbasic/schema/dark.css
+++ b/view/theme/redbasic/schema/dark.css
@@ -5,13 +5,26 @@
 
 .vcard, #contact-block, .widget {
 	background-color: transparent;
-	border-bottom: 1px solid #fff;
+	border-bottom: 1px solid #333;
+	border-radius: 0px
+}
+
+#profile-photo-wrapper {
+	border:none;
+}
+
+.photo {
+	box-shadow: none;
 }
 
 .abook-pending-contact, .abook-permschange {
 	background: #402900;
 }
 
+.contact-entry-wrapper {
+	border: 1px solid #333;
+}
+
 #cboxContent a {
 	color: #000;
 }
@@ -75,7 +88,7 @@
     background-color: #111;
 }
 
-.btn-default {
+.btn {
 	background-color: #1e1e1e;
 	border-color: #222;
 	color: #ccc;
@@ -83,7 +96,7 @@
 	box-shadow: none;
 }
 
-.btn-default:hover, .btn-default:focus, .btn-default:active .btn-default.active {
+.btn:hover, .btn:focus, .btn:active {
 	background-color: #222;
 	border-color: #222;
 	color: #fff;
@@ -94,6 +107,40 @@
 	text-decoration: none;
 }
 
+.btn-primary, input#event-submit, input#rmagic-submit-button, input#lostpass-submit-button {
+    background-color: #337AB7;
+    color: #FFF;
+}
+
+.btn-primary:hover, .btn-primary:focus, input#event-submit:hover, input#event-submit:focus, input#rmagic-submit-button:hover, input#rmagic-submit-button:focus, input#lostpass-submit-button:hover, input#lostpass-submit-button:focus {
+    border-color: #204D74;
+    background-color: #286090;
+    color: #FFF;
+}
+
+.btn-success {
+    color: #FFF;
+    background-color: #5CB85C;
+    border-color: #4CAE4C;
+}
+
+.btn-success:hover, .btn-success:focus {
+    color: #FFF;
+    background-color: #449D44;
+    border-color: #398439;
+}
+
+.btn-danger {
+    background-color: #D9534F;
+    border-color: #D43F3A;
+	color: #FFF;
+}
+.btn-danger:hover, .btn-danger:focus {
+	color: #FFF;
+    background-color: #C9302C;
+    border-color: #AC2925;
+}
+
 .pager_first,
 .pager_last,
 .pager_prev,
@@ -177,6 +224,7 @@ nav .dropdown-menu {
     text-decoration: underline;
     background-color: #222;
 	color: #ccc;
+	border-color: #333;
 }
 
 aside .nav > li > a:hover, aside .nav > li > a:focus {
@@ -251,6 +299,18 @@ pre {
 	background: url('../img/gray_and_black_diagonal_stripes_background_seamless.gif');
 }
 
+.xdsoft_datepicker.active {
+	color: #222 !important;
+	text-decoration: none !important;
+}
+
+.xdsoft_datepicker.active:hover, .xdsoft_datepicker.active:focus {
+	color: #222 !important;
+	text-decoration: underline;
+}
+
+
+
 @media (min-width: 768px) {
   .nav-tabs.nav-justified > li > a {
     border-bottom: 1px solid #333;
diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl
index 4f5b69beb..cdc9de489 100644
--- a/view/theme/redbasic/tpl/theme_settings.tpl
+++ b/view/theme/redbasic/tpl/theme_settings.tpl
@@ -16,8 +16,8 @@
 	{{include file="field_colorinput.tpl" field=$background_image}}
 	{{include file="field_colorinput.tpl" field=$item_colour}}
 	{{include file="field_colorinput.tpl" field=$comment_item_colour}}
-	{{include file="field_colorinput.tpl" field=$comment_border_colour}}
-	{{include file="field_input.tpl" field=$comment_indent}}
+	{{*include file="field_colorinput.tpl" field=$comment_border_colour*}}
+	{{*include file="field_input.tpl" field=$comment_indent*}}
 	{{include file="field_input.tpl" field=$body_font_size}}
 	{{include file="field_input.tpl" field=$font_size}}
 	{{include file="field_colorinput.tpl" field=$font_colour}}
diff --git a/view/tpl/app.tpl b/view/tpl/app.tpl
index 727be5eba..3394cd2ae 100644
--- a/view/tpl/app.tpl
+++ b/view/tpl/app.tpl
@@ -1,23 +1,25 @@
 <div class="app-container">
-<div class="app-detail">
-<a href="{{$app.url}}" {{if $ap.target}}target="{{$ap.target}}" {{/if}}{{if $app.desc}}title="{{$app.desc}}{{if $app.price}} ({{$app.price}}){{/if}}"{{else}}title="{{$app.name}}"{{/if}}><img src="{{$app.photo}}" width="80" height="80" />
-<div class="app-name" style="text-align:center;">{{$app.name}}</div>
-</a>
-{{if $app.type !== 'system'}}
-{{if $purchase}}
-<a href="{{$app.page}}" class="btn btn-default" title="{{$purchase}}" ><i class="icon-external"></i></a>
-{{/if}}
-</div>
-{{if $install || $update || $delete }}
-<div class="app-tools">
-<form action="{{$hosturl}}appman" method="post">
-<input type="hidden" name="papp" value="{{$app.papp}}" />
-{{if $install}}<button type="submit" name="install" value="{{$install}}" class="btn btn-default" title="{{$install}}" ><i class="icon-download-alt" ></i></button>{{/if}}
-{{if $edit}}<input type="hidden" name="appid" value="{{$app.guid}}" /><button type="submit" name="edit" value="{{$edit}}" class="btn btn-default" title="{{$edit}}" ><i class="icon-pencil" ></i></button>{{/if}}
-{{if $delete}}<button type="submit" name="delete" value="{{$delete}}" class="btn btn-default" title="{{$delete}}" ><i class="icon-trash drop-icons"></i></button>{{/if}}
-</form>
-{{/if}}
-{{/if}}
-</div>
+	<div class="app-detail">
+		<a href="{{$app.url}}" {{if $ap.target}}target="{{$ap.target}}" {{/if}}{{if $app.desc}}title="{{$app.desc}}{{if $app.price}} ({{$app.price}}){{/if}}"{{else}}title="{{$app.name}}"{{/if}}><img src="{{$app.photo}}" width="80" height="80" />
+			<div class="app-name" style="text-align:center;">{{$app.name}}</div>
+		</a>
+	</div>
+	{{if $app.type !== 'system'}}
+	{{if $purchase}}
+	<div class="app-purchase">
+		<a href="{{$app.page}}" class="btn btn-default" title="{{$purchase}}" ><i class="icon-external"></i></a>
+	</div>
+	{{/if}}
+	{{if $install || $update || $delete }}
+	<div class="app-tools">
+		<form action="{{$hosturl}}appman" method="post">
+		<input type="hidden" name="papp" value="{{$app.papp}}" />
+		{{if $install}}<button type="submit" name="install" value="{{$install}}" class="btn btn-default" title="{{$install}}" ><i class="icon-download-alt" ></i></button>{{/if}}
+		{{if $edit}}<input type="hidden" name="appid" value="{{$app.guid}}" /><button type="submit" name="edit" value="{{$edit}}" class="btn btn-default" title="{{$edit}}" ><i class="icon-pencil" ></i></button>{{/if}}
+		{{if $delete}}<button type="submit" name="delete" value="{{$delete}}" class="btn btn-default" title="{{$delete}}" ><i class="icon-trash drop-icons"></i></button>{{/if}}
+		</form>
+	</div>
+	{{/if}}
+	{{/if}}
 </div>
 
diff --git a/view/tpl/chatroom_new.tpl b/view/tpl/chatroom_new.tpl
index c02e55c25..1317b672b 100644
--- a/view/tpl/chatroom_new.tpl
+++ b/view/tpl/chatroom_new.tpl
@@ -2,6 +2,7 @@
 
 <form action="chat" method="post" >
 {{include file="field_input.tpl" field=$name}}
+{{include file="field_input.tpl" field=$chat_expire}}
 <button id="dbtn-acl" class="btn btn-default" data-toggle="modal" data-target="#aclModal" onclick="return false;" >{{$permissions}}</button>
 {{$acl}}
 <div class="clear"></div>
diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl
index da708a98c..44e4eb54c 100644
--- a/view/tpl/cloud_actionspanel.tpl
+++ b/view/tpl/cloud_actionspanel.tpl
@@ -8,6 +8,7 @@
 	<div class="clear"></div>
 </div>
 <div id="files-upload-tools" class="section-content-tools-wrapper form-group">
+	{{if $quota.limit || $quota.used}}<div class="{{if $quota.warning}}section-content-danger-wrapper{{else}}section-content-info-wrapper{{/if}}">{{if $quota.warning}}<strong>{{$quota.warning}} </strong>{{/if}}{{$quota.desc}}</div>{{/if}}
 	<label for="files-upload">{{$upload_header}}</label>
 	<form method="post" action="" enctype="multipart/form-data">
 		<input type="hidden" name="sabreAction" value="put">
diff --git a/view/tpl/cloud_header.tpl b/view/tpl/cloud_header.tpl
index c75815d07..076fa16cb 100644
--- a/view/tpl/cloud_header.tpl
+++ b/view/tpl/cloud_header.tpl
@@ -4,8 +4,8 @@
 		{{if $is_owner}}
 		<a href="/sharedwithme" class="btn btn-xs btn-default"><i class="icon-cloud-download"></i>&nbsp;{{$shared}}</a>
 		{{/if}}
-		<button id="files-create-btn" class="btn btn-xs btn-primary" title="{{if $quota.limit || $quota.used}}{{$quota.desc}}{{/if}}" onclick="openClose('files-mkdir-tools'); closeMenu('files-upload-tools');"><i class="icon-folder-close-alt"></i>&nbsp;{{$create}}</button>
-		<button id="files-upload-btn" class="btn btn-xs btn-success" title="{{if $quota.limit || $quota.used}}{{$quota.desc}}{{/if}}" onclick="openClose('files-upload-tools'); closeMenu('files-mkdir-tools');"><i class="icon-upload"></i>&nbsp;{{$upload}}</button>
+		<button id="files-create-btn" class="btn btn-xs btn-primary" onclick="openClose('files-mkdir-tools'); closeMenu('files-upload-tools');"><i class="icon-folder-close-alt"></i>&nbsp;{{$create}}</button>
+		<button id="files-upload-btn" class="btn btn-xs btn-success" onclick="openClose('files-upload-tools'); closeMenu('files-mkdir-tools');"><i class="icon-upload"></i>&nbsp;{{$upload}}</button>
 	</div>
 	{{/if}}
 	<h2>{{$header}}</h2>
diff --git a/view/tpl/connection_template.tpl b/view/tpl/connection_template.tpl
index 47f01ef5d..35e97f3e9 100755
--- a/view/tpl/connection_template.tpl
+++ b/view/tpl/connection_template.tpl
@@ -4,6 +4,7 @@
 	</div>
 	<div class="contact-entry-photo-end" ></div>
 	<a href="{{$contact.url}}" title="{{$contact.img_hover}}" ><div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div></a>
+	<div class="contact-entry-name-end" ></div>
 	<div class="contact-entry-edit btn btn-default"><a href="{{$contact.link}}"><i class="icon-pencil connection-edit-icons"></i> {{$contact.edit}}</a></div>
 	<div class="contact-entry-end" ></div>
 </div>
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index dc8064f1a..760d64db0 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -8,51 +8,75 @@
 		<a name="{{$item.id}}" ></a>
 		<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" >
 			<div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" style="clear:both;">
-				<div class="wall-item-info" id="wall-item-info-{{$item.id}}" >
-					<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}">
-						<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}"><img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" /></a>
-					</div>
-					<div class="wall-item-photo-end" style="clear:both"></div>
-				</div>
-				{{if $item.title}}
-				<div class="wall-item-title" id="wall-item-title-{{$item.id}}">
-				<h3>{{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}}</h3>
+				{{if $item.photo}}
+				<div class="wall-photo-item" id="wall-photo-item-{{$item.id}}">
+					{{$item.photo}}
 				</div>
 				{{/if}}
-				{{if $item.lock}}
-				<div class="wall-item-lock dropdown">
-					<i class="icon-lock lockview dropdown-toggle" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul>&nbsp;
-				</div>
-				{{/if}}
-				<div class="wall-item-author">
-					<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}}&nbsp;{{$item.via}}&nbsp;<a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}
-				</div>
-				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">
-					{{if $item.verified}}<i class="icon-ok item-verified" title="{{$item.verified}}"></i>&nbsp;{{elseif $item.forged}}<i class="icon-exclamation item-forged" title="{{$item.forged}}"></i>&nbsp;{{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}},&nbsp;</span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}}&nbsp;{{$item.editedtime}}{{/if}}{{if $item.expiretime}}&nbsp;{{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}}&nbsp;<i class="icon-pencil"></i>{{/if}}&nbsp;{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}
+				<div class="wall-item-head">
+					<div class="wall-item-info" id="wall-item-info-{{$item.id}}" >
+						<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}">
+							<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}"><img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" /></a>
+						</div>
+						<div class="wall-item-photo-end" style="clear:both"></div>
+					</div>
+					{{if $item.title}}
+					<div class="wall-item-title" id="wall-item-title-{{$item.id}}">
+					<h3>{{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}}</h3>
+					</div>
+					{{/if}}
+					{{if $item.lock}}
+					<div class="wall-item-lock dropdown">
+						<i class="icon-lock lockview dropdown-toggle" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul>&nbsp;
+					</div>
+					{{/if}}
+					<div class="wall-item-author">
+						<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}}&nbsp;{{$item.via}}&nbsp;<a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}
+					</div>
+					<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">
+						{{if $item.verified}}<i class="icon-ok item-verified" title="{{$item.verified}}"></i>&nbsp;{{elseif $item.forged}}<i class="icon-exclamation item-forged" title="{{$item.forged}}"></i>&nbsp;{{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}},&nbsp;</span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}}&nbsp;{{$item.editedtime}}{{/if}}{{if $item.expiretime}}&nbsp;{{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}}&nbsp;<i class="icon-pencil"></i>{{/if}}&nbsp;{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}
+					</div>
+					<div class="clear"></div>
 				</div>
+
+				{{if $item.body}}
 				<div class="wall-item-content" id="wall-item-content-{{$item.id}}">
-					<div class="wall-item-title-end"></div>
 					<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >
 						{{$item.body}}
-						{{if $item.tags}}
-						<div class="body-tag">
-						{{foreach $item.tags as $tag}}
-							<span class='tag'>{{$tag}}</span>
-						{{/foreach}}
-						</div>
-						{{/if}}
-						{{if $item.has_cats}}
-						<div class="categorytags">
-							<span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
-						</div>
-						{{/if}}
-							{{if $item.has_folders}}
-						<div class="filesavetags">
-							<span>{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
-						</div>
-						{{/if}}
 					</div>
+					<div class="clear"></div>
 				</div>
+				{{/if}}
+				{{if $item.has_tags}}
+				<div class="wall-item-tools">
+					{{if $item.mentions}}
+					<div class="body-tags" id="item-mentions">
+						<span class="tag">{{$item.mentions}}</span>
+					</div>
+					{{/if}}
+					{{if $item.tags}}
+					<div class="body-tags" id="item-tags">
+						<span class="tag">{{$item.tags}}</span>
+					</div>
+					{{/if}}
+					{{if $item.categories}}
+					<div class="body-tags" id="item-categories">
+						<span class="tag">{{$item.categories}}</span>
+					</div>
+					{{/if}}
+					{{if $item.folders}}
+					<div class="body-tags" id="item-folders">
+						<span class="tag">{{$item.folders}}</span>
+					</div>
+					{{/if}}
+					{{if $item.attachments}}
+					<div class="body-tags" id="item-attachments">
+						<span class='tag'>{{$item.attachments}}</span>
+					</div>
+					{{/if}}
+					<div class="clear"></div>
+				</div>
+				{{/if}}
 				<div class="wall-item-tools">
 					<div class="wall-item-tools-right btn-group pull-right">
 						{{if $item.like}}
@@ -167,6 +191,7 @@
 					{{/foreach}}
 					</div>
 					{{/if}}
+					<div class="clear"></div>
 				</div>
 				<div class="clear"></div>
 			</div>
diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl
index 5487d5937..a3fb642ce 100755
--- a/view/tpl/conv_list.tpl
+++ b/view/tpl/conv_list.tpl
@@ -8,51 +8,73 @@
 		<a name="{{$item.id}}" ></a>
 		<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" >
 			<div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" style="clear:both;">
-				<div class="wall-item-info" id="wall-item-info-{{$item.id}}" >
-					<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}">
-						<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}"><img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" /></a>
-					</div>
-					<div class="wall-item-photo-end" style="clear:both"></div>
-				</div>
-				{{if $item.title}}
-				<div class="wall-item-title" id="wall-item-title-{{$item.id}}">
-				<h3>{{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}}</h3>
-				</div>
-				{{/if}}
-				{{if $item.lock}}
-				<div class="wall-item-lock dropdown">
-					<i class="icon-lock lockview dropdown-toggle" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul>&nbsp;
+				{{if $item.photo}}
+				<div class="wall-photo-item" id="wall-photo-item-{{$item.id}}">
+					{{$item.photo}}
 				</div>
 				{{/if}}
-				<div class="wall-item-author">
-					<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}}&nbsp;{{$item.via}}&nbsp;<a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}
-				</div>
-				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">
-					{{if $item.verified}}<i class="icon-ok item-verified" title="{{$item.verified}}"></i>&nbsp;{{elseif $item.forged}}<i class="icon-exclamation item-forged" title="{{$item.forged}}"></i>&nbsp;{{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}},&nbsp;</span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}}&nbsp;{{$item.editedtime}}{{/if}}{{if $item.expiretime}}&nbsp;{{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}}&nbsp;<i class="icon-pencil"></i>{{/if}}&nbsp;{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}
+				<div class="wall-item-head">
+					<div class="wall-item-info" id="wall-item-info-{{$item.id}}" >
+						<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}">
+							<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}"><img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" /></a>
+						</div>
+						<div class="wall-item-photo-end" style="clear:both"></div>
+					</div>
+					{{if $item.title}}
+					<div class="wall-item-title" id="wall-item-title-{{$item.id}}">
+					<h3>{{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}}</h3>
+					</div>
+					{{/if}}
+					{{if $item.lock}}
+					<div class="wall-item-lock dropdown">
+						<i class="icon-lock lockview dropdown-toggle" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul>&nbsp;
+					</div>
+					{{/if}}
+					<div class="wall-item-author">
+						<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}}&nbsp;{{$item.via}}&nbsp;<a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}
+					</div>
+					<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">
+						{{if $item.verified}}<i class="icon-ok item-verified" title="{{$item.verified}}"></i>&nbsp;{{elseif $item.forged}}<i class="icon-exclamation item-forged" title="{{$item.forged}}"></i>&nbsp;{{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}},&nbsp;</span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}}&nbsp;{{$item.editedtime}}{{/if}}{{if $item.expiretime}}&nbsp;{{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}}&nbsp;<i class="icon-pencil"></i>{{/if}}&nbsp;{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}
+					</div>
+					<div class="clear"></div>
 				</div>
-				<div class="wall-item-content conv-list-mode" id="wall-item-content-{{$item.id}}">
-					<div class="wall-item-title-end"></div>
-					<div class="wall-item-body wall-item-listbody" id="wall-item-body-{{$item.id}}" >
+				<div class="{{if $item.is_photo}}wall-photo-item{{else}}wall-item-content{{/if}}" id="wall-item-content-{{$item.id}}">
+					<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >
 						{{$item.body}}
-						{{if $item.tags}}
-						<div class="body-tag">
-						{{foreach $item.tags as $tag}}
-							<span class='tag'>{{$tag}}</span>
-						{{/foreach}}
-						</div>
-						{{/if}}
-						{{if $item.has_cats}}
-						<div class="categorytags">
-							<span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
-						</div>
-						{{/if}}
-							{{if $item.has_folders}}
-						<div class="filesavetags">
-							<span>{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
-						</div>
-						{{/if}}
 					</div>
+					<div class="clear"></div>
 				</div>
+				{{if $item.has_tags}}
+				<div class="wall-item-tools">
+					{{if $item.mentions}}
+					<div class="body-tags" id="item-mentions">
+						<span class="tag">{{$item.mentions}}</span>
+					</div>
+					{{/if}}
+					{{if $item.tags}}
+					<div class="body-tags" id="item-tags">
+						<span class="tag">{{$item.tags}}</span>
+					</div>
+					{{/if}}
+					{{if $item.categories}}
+					<div class="body-tags" id="item-categories">
+						<span class="tag">{{$item.categories}}</span>
+					</div>
+					{{/if}}
+					{{if $item.folders}}
+					<div class="body-tags" id="item-folders">
+						<span class="tag">{{$item.folders}}</span>
+					</div>
+					{{/if}}
+					{{if $item.attachments}}
+					<div class="body-tags" id="item-attachments">
+						<span class='tag'>{{$item.attachments}}</span>
+					</div>
+					{{/if}}
+					<div class="clear"></div>
+				</div>
+				{{/if}}
+
 				<div class="wall-item-tools">
 					<div class="wall-item-tools-right btn-group pull-right">
 						{{if $item.like}}
@@ -176,6 +198,7 @@
 						{{/foreach}}
 						{{/if}}
 					</div>
+					<div class="clear"></div>
 				</div>
 				<div class="clear"></div>
 			</div>
diff --git a/view/tpl/cropbody.tpl b/view/tpl/cropbody.tpl
index 4794c0b83..01d9a24a0 100755
--- a/view/tpl/cropbody.tpl
+++ b/view/tpl/cropbody.tpl
@@ -27,8 +27,8 @@
 			previewWrap: 'previewWrap',
 			minWidth: 300,
 			minHeight: 300,
-			maxWidth: 640,
-			maxHeight: 640,
+			maxWidth: 1024,
+			maxHeight: 1024,
 			ratioDim: { x: 100, y:100 },
 			displayOnInit: true,
 			onEndCrop: onEndCrop
diff --git a/view/tpl/email_notify_html.tpl b/view/tpl/email_notify_html.tpl
index ae3e8c012..a2159c885 100755
--- a/view/tpl/email_notify_html.tpl
+++ b/view/tpl/email_notify_html.tpl
@@ -7,7 +7,7 @@
 <body>
 <table style="border:1px solid #ccc; background-color: #FFFFFF; color: #000000;">
 	<tbody>
-	<tr><td colspan="2" style="background:#026D0D; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='{{$siteurl}}/images/ghash-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">{{$product}}</div><div style="clear: both;"></div></td></tr>
+	<tr><td colspan="2" style="background:#43488A; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='{{$siteurl}}/images/hz-white-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">{{$product}}</div><div style="clear: both;"></div></td></tr>
 
 
 	<tr><td style="padding-top:22px;" colspan="2">{{$preamble}}</td></tr>
diff --git a/view/tpl/item_attach.tpl b/view/tpl/item_attach.tpl
index eeea25967..7638f39e7 100644
--- a/view/tpl/item_attach.tpl
+++ b/view/tpl/item_attach.tpl
@@ -1,8 +1,5 @@
-<div class="clear"></div>
 {{if $attaches}}
-<div class="body-attach">
-	{{foreach $attaches as $a}}
-	<a href="{{$a.url}}" title="{{$a.title}}" class="attachlink" ><i class="icon-paper-clip attach-icons attach-clip"></i><i class="{{$a.icon}} attach-icons"></i></a>
-	{{/foreach}}
-</div>
+{{foreach $attaches as $a}}
+<a href="{{$a.url}}" title="{{$a.title}}" class="btn btn-xs btn-default"><i class="{{$a.icon}} attach-icons"></i>&nbsp;{{$a.label}}</a>
+{{/foreach}}
 {{/if}}
diff --git a/view/tpl/item_categories.tpl b/view/tpl/item_categories.tpl
index ec2639a6f..eea0e0b8f 100644
--- a/view/tpl/item_categories.tpl
+++ b/view/tpl/item_categories.tpl
@@ -1,7 +1,7 @@
 {{if $categories}}
 <div class="categorytags">
 {{foreach $categories as $cat}}
-<span class="item-category"><i class="icon-asterisk cat-icons"></i>&nbsp;{{if $cat.url}}<a href="{{$cat.url}}">{{$cat.term}}</a>{{else}}{{$cat.term}}{{/if}}</span>
+<span class="item-category"><i class="icon-asterisk cat-icons"></i>{{if $cat.url}}<a href="{{$cat.url}}">{{$cat.term}}</a>{{else}}{{$cat.term}}{{/if}}</span>
 {{/foreach}}
 </div>
 {{/if}}
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index 7e12c6bb3..b405e4ac8 100755
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -234,6 +234,19 @@ function enableOnUser(){
 		})
 	}
 
+	function jotGetPubDate() {
+		//reply = prompt("{{$expirewhen}}", $('#jot-expire').val());
+		$('#createdModal').modal();
+		$('#created-modal-OKButton').on('click', function() {
+			reply=$('#created-date').val();
+			if(reply && reply.length) {
+				$('#jot-created').val(reply);
+				$('#createdModal').modal('hide');
+			}
+		})
+	}
+
+
 	function jotShare(id) {
 		if ($('#jot-popup').length != 0) $('#jot-popup').show();
 
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 100dd15b9..75f6b0027 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -3,11 +3,12 @@
 		{{if $parent}}
 			<input type="hidden" name="parent" value="{{$parent}}" />
 		{{/if}}
-		<input type="hidden" name="type" value="{{$ptyp}}" />
+		<input type="hidden" name="obj_type" value="{{$ptyp}}" />
 		<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
 		<input type="hidden" name="return" value="{{$return_path}}" />
 		<input type="hidden" name="location" id="jot-location" value="{{$defloc}}" />
 		<input type="hidden" name="expire" id="jot-expire" value="{{$defexpire}}" />
+		<input type="hidden" name="created" id="jot-created" value="{{$defpublish}}" />
 		<input type="hidden" name="media_str" id="jot-media" value="" />
 		<input type="hidden" name="source" id="jot-source" value="{{$source}}" />
 		<input type="hidden" name="coord" id="jot-coord" value="" />
@@ -47,19 +48,19 @@
 		<div id="profile-jot-submit-wrapper" class="jothidden">
 			<div id="profile-jot-submit-left" class="btn-toolbar pull-left">
 				<div class="btn-group">
-					<button id="main-editor-bold" class="btn btn-default btn-sm" title="{{$bold}}" onclick="inserteditortag('b'); return false;">
+					<button id="main-editor-bold" class="btn btn-default btn-sm" title="{{$bold}}" onclick="inserteditortag('b', 'profile-jot-text'); return false;">
 						<i class="icon-bold jot-icons"></i>
 					</button>
-					<button id="main-editor-italic" class="btn btn-default btn-sm" title="{{$italic}}" onclick="inserteditortag('i'); return false;">
+					<button id="main-editor-italic" class="btn btn-default btn-sm" title="{{$italic}}" onclick="inserteditortag('i', 'profile-jot-text'); return false;">
 						<i class="icon-italic jot-icons"></i>
 					</button>
-					<button id="main-editor-underline" class="btn btn-default btn-sm" title="{{$underline}}" onclick="inserteditortag('u'); return false;">
+					<button id="main-editor-underline" class="btn btn-default btn-sm" title="{{$underline}}" onclick="inserteditortag('u', 'profile-jot-text'); return false;">
 						<i class="icon-underline jot-icons"></i>
 					</button>
-					<button id="main-editor-quote" class="btn btn-default btn-sm" title="{{$quote}}" onclick="inserteditortag('quote'); return false;">
+					<button id="main-editor-quote" class="btn btn-default btn-sm" title="{{$quote}}" onclick="inserteditortag('quote', 'profile-jot-text'); return false;">
 						<i class="icon-quote-left jot-icons"></i>
 					</button>
-					<button id="main-editor-code" class="btn btn-default btn-sm" title="{{$code}}" onclick="inserteditortag('code'); return false;">
+					<button id="main-editor-code" class="btn btn-default btn-sm" title="{{$code}}" onclick="inserteditortag('code', 'profile-jot-text'); return false;">
 						<i class="icon-terminal jot-icons"></i>
 					</button>
 				</div>
@@ -91,6 +92,11 @@
 						<i id="profile-expires" class="icon-eraser jot-icons"></i>
 					</button>
 				{{/if}}
+				{{if $feature_future}}
+					<button id="profile-future-wrapper" class="btn btn-default btn-sm" title="{{$future_txt}}" onclick="jotGetPubDate();return false;">
+						<i id="profile-future" class="icon-time jot-icons"></i>
+					</button>
+				{{/if}}
 				{{if $feature_encrypt}}
 					<button id="profile-encrypt-wrapper" class="btn btn-default btn-sm" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#profile-jot-text',$('#profile-jot-text').val());return false;">
 						<i id="profile-encrypt" class="icon-key jot-icons"></i>
@@ -180,6 +186,28 @@
   </div><!-- /.modal-dialog -->
 </div><!-- /.modal -->
 
+<!-- Modal for item created-->
+<div class="modal" id="createdModal" tabindex="-1" role="dialog" aria-labelledby="createdModalLabel" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+        <h4 class="modal-title" id="createdModalLabel">{{$future_txt}}</h4>
+      </div>
+     <!--  <div class="modal-body"> -->
+            <div class="modal-body form-group" style="width:90%">
+		<div class='date'><input type='text' placeholder='yyyy-mm-dd HH:MM' name='created_text' id='created-date' class="form-control" /></div><script type='text/javascript'>$(function () {var picker = $('#created-date').datetimepicker({format:'Y-m-d H:i', minDate: 0 }); })</script>
+            </div>
+      <!-- </div> -->
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal">{{$expiryModalCANCEL}}</button>
+        <button id="created-modal-OKButton" type="button" class="btn btn-primary">{{$expiryModalOK}}</button>
+      </div>
+    </div><!-- /.modal-content -->
+  </div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
+
+
 {{if $content || $attachment || $expanded}}
 <script>initEditor();</script>
 {{/if}}
diff --git a/view/tpl/lostpass.tpl b/view/tpl/lostpass.tpl
index f6fdb28d7..8ecfd215b 100755
--- a/view/tpl/lostpass.tpl
+++ b/view/tpl/lostpass.tpl
@@ -1,3 +1,4 @@
+<div class="generic-content-wrapper-styled">
 <h3>{{$title}}</h3>
 
 <p id="lostpass-desc">
@@ -8,11 +9,9 @@
 <div id="login-name-wrapper">
         <label for="login-name" id="label-login-name">{{$name}}</label>
         <input type="text" maxlength="60" name="login-name" id="login-name" value="" />
+		<input type="submit" name="submit" id="lostpass-submit-button" value="{{$submit}}" />
 </div>
 <div id="login-extra-end"></div>
-<div id="login-submit-wrapper" >
-        <input type="submit" name="submit" id="lostpass-submit-button" value="{{$submit}}" />
-</div>
 <div id="login-submit-end"></div>
 </form>
-
+</div>
diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl
index 09333ae11..4f54f1a6a 100755
--- a/view/tpl/mail_conv.tpl
+++ b/view/tpl/mail_conv.tpl
@@ -4,16 +4,38 @@
 	</div>
 	<div class="mail-conv-detail">
 		{{if $mail.is_recalled}}<strong>{{$mail.is_recalled}}</strong>{{/if}}
-		<div class="mail-conv-sender-name" ><a href="{{$mail.from_url}}">{{$mail.from_name}}</a></div>
+		<div class="mail-conv-sender-name"><a href="{{$mail.from_url}}">{{$mail.from_name}}</a></div>
 		<div class="mail-conv-date autotime wall-item-ago" title="{{$mail.date}}">{{$mail.date}}</div>
-		<div class="mail-conv-body">{{$mail.body}}</div>
-		<div class="btn-group pull-right" id="mail-conv-delete-wrapper-{{$mail.id}}" >
-			{{if $mail.can_recall}}
-			<a href="dreport/mail/{{$mail.mid}}" title="{{$mail.dreport}}" id="mail-conv-dreport-icon-{{$mail.id}}" class="btn btn-default" ><i class="icon-barcode mail-icons"></i></a>
-			<a href="mail/{{$mail.mailbox}}/recall/{{$mail.id}}" title="{{$mail.recall}}" id="mail-conv-recall-icon-{{$mail.id}}" class="btn btn-default" ><i class="icon-undo mail-icons"></i></a>
-			{{/if}}
-			<a href="#" onclick="dropItem('mail/{{$mail.mailbox}}/drop/{{$mail.id}}', '#mail-{{$mail.id}}'); return false;" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="btn btn-default" ><i class="icon-trash mail-icons"></i></a>
+	</div>
+	<div class="clear"></div>
+	<div class="mail-conv-content">
+		<div class="mail-conv-body">
+			{{$mail.body}}
+			<div class="clear"></div>
+		</div>
+		<div class="pull-right dropdown">
+			<button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" id="mail-item-menu-{{$mail.id}}">
+				<i class="icon-caret-down"></i>
+			</button>
+			<ul class="dropdown-menu" role="menu" aria-labelledby="mail-item-menu-{{$mail.id}}">
+				{{if $mail.can_recall}}
+				<li>
+					<a href="mail/{{$mail.mailbox}}/recall/{{$mail.id}}" title="{{$mail.recall}}" id="mail-conv-recall-icon-{{$mail.id}}"><i class="icon-undo mail-icons"></i>&nbsp;{{$mail.recall}}</a>
+				</li>
+				{{/if}}
+				<li>
+					<a href="#" onclick="dropItem('mail/{{$mail.mailbox}}/drop/{{$mail.id}}', '#mail-{{$mail.id}}'); return false;" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}"><i class="icon-trash mail-icons"></i>&nbsp;{{$mail.delete}}</a>
+				</li>
+				{{if $mail.can_recall}}
+				<li class="divider"></li>
+				<li>
+					<a href="dreport/mail/{{$mail.mid}}" title="{{$mail.dreport}}" id="mail-conv-dreport-icon-{{$mail.id}}">{{$mail.dreport}}</a>
+				</li>
+				{{/if}}
+			</ul>
+
 		</div>
+		<div class="clear"></div>
 	</div>
 	<div class="clear"></div>
 </div>
diff --git a/view/tpl/mail_display.tpl b/view/tpl/mail_display.tpl
index 789c25ade..24e763571 100755
--- a/view/tpl/mail_display.tpl
+++ b/view/tpl/mail_display.tpl
@@ -1,6 +1,8 @@
 <div class="generic-content-wrapper">
 	<div class="section-title-wrapper">
+		{{if $mailbox == 'combined'}}
 		<a class="btn btn-xs btn-danger pull-right" href="mail/{{$mailbox}}/dropconv/{{$thread_id}}" onclick="return confirmDelete();"><i class="icon-trash"></i> {{$delete}}</a>
+		{{/if}}
 		<h2>{{$prvmsg_header}}</h2>
 		<div class="clear"></div>
 	</div>
diff --git a/view/tpl/message_side.tpl b/view/tpl/message_side.tpl
index b3bb94d71..6ea63c21e 100755
--- a/view/tpl/message_side.tpl
+++ b/view/tpl/message_side.tpl
@@ -1,7 +1,6 @@
 <div class="widget">
 	<h3>{{$title}}</h3>
 	<ul class="nav nav-pills nav-stacked">
-		<li><a href="{{$check.url}}"{{if $check.sel}} class="active"{{/if}}>{{$check.label}}</a></li>
 		<li><a href="{{$combined.url}}"{{if $combined.sel}} class="active"{{/if}}>{{$combined.label}}</a></li>
 		<li><a href="{{$inbox.url}}"{{if $inbox.sel}} class="active"{{/if}}>{{$inbox.label}}</a></li>
 		<li><a href="{{$outbox.url}}"{{if $outbox.sel}} class="active"{{/if}}>{{$outbox.label}}</a></li>
diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl
index 2119d3b02..3407e152c 100755
--- a/view/tpl/msg-header.tpl
+++ b/view/tpl/msg-header.tpl
@@ -48,30 +48,32 @@ else
 <script type="text/javascript" src="view/js/ajaxupload.js" ></script>
 <script>
 	$(document).ready(function() {
-		var uploader = new window.AjaxUpload(
-			'prvmail-upload-wrapper',
-			{ action: 'wall_upload/{{$nickname}}',
+
+		var file_uploader = new window.AjaxUpload(
+			'prvmail-attach-wrapper',
+			{ action: 'wall_attach/{{$nickname}}',
 				name: 'userfile',
 				onSubmit: function(file,ext) { $('#prvmail-rotator').spin('tiny'); },
 				onComplete: function(file,response) {
 					addmailtext(response);
 					$('#prvmail-rotator').spin(false);
-				}				 
+				}
 			}
 		);
 
-		var file_uploader = new window.AjaxUpload(
-			'prvmail-attach-wrapper',
+		var file_uploader_sub = new window.AjaxUpload(
+			'prvmail-attach-sub',
 			{ action: 'wall_attach/{{$nickname}}',
 				name: 'userfile',
 				onSubmit: function(file,ext) { $('#prvmail-rotator').spin('tiny'); },
 				onComplete: function(file,response) {
 					addmailtext(response);
 					$('#prvmail-rotator').spin(false);
-				}				 
+				}
 			}
 		);
 
+
 	});
 
 	function prvmailJotGetLink() {
diff --git a/view/tpl/myapps.tpl b/view/tpl/myapps.tpl
index ccb995849..32d544a86 100755
--- a/view/tpl/myapps.tpl
+++ b/view/tpl/myapps.tpl
@@ -1,7 +1,8 @@
+<div class="generic-content-wrapper-styled">
 <h3>{{$title}}</h3>
 
 {{foreach $apps as $ap}}
 {{$ap}}
 {{/foreach}}
 <div class="clear"></div>
-
+</div>
diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl
index 0ce9c36a8..d22f82f8e 100755
--- a/view/tpl/photo_album.tpl
+++ b/view/tpl/photo_album.tpl
@@ -18,11 +18,13 @@
 	</div>
 	{{$upload_form}}
 	{{$album_edit.1}}
-	<div id="photo-album-contents">
-		{{foreach $photos as $photo}}
-			{{include file="photo_top.tpl"}}
-		{{/foreach}}
-		<div id="page-end"></div>
+	<div class="section-content-wrapper-np">
+		<div id="photo-album-contents">
+			{{foreach $photos as $photo}}
+				{{include file="photo_top.tpl"}}
+			{{/foreach}}
+			<div id="page-end"></div>
+		</div>
 	</div>
 </div>
 <div class="photos-end"></div>
diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl
index 225b4f6b0..867a1e87b 100755
--- a/view/tpl/photo_view.tpl
+++ b/view/tpl/photo_view.tpl
@@ -133,14 +133,14 @@
 			{{/if}}
 			{{if $likebuttons}}
 			<div class="photo-item-tools-right btn-group pull-right">
-				<button type="button" class="btn btn-default btn-sm" onclick="dolike({{$id}},'like'); return false">
-					<i class="icon-thumbs-up-alt" title="{{$likethis}}"></i>
+				<button type="button" class="btn btn-default btn-sm" onclick="dolike({{$likebuttons.id}},'like'); return false">
+					<i class="icon-thumbs-up-alt" title="{{$likebuttons.likethis}}"></i>
 				</button>
-				<button type="button" class="btn btn-default btn-sm" onclick="dolike({{$id}},'dislike'); return false">
-					<i class="icon-thumbs-down-alt" title="{{$nolike}}"></i>
+				<button type="button" class="btn btn-default btn-sm" onclick="dolike({{$likebuttons.id}},'dislike'); return false">
+					<i class="icon-thumbs-down-alt" title="{{$likebuttons.nolike}}"></i>
 				</button>
 			</div>
-			<div id="like-rotator-{{$id}}" class="photo-like-rotator pull-right"></div>
+			<div id="like-rotator-{{$likebuttons.id}}" class="photo-like-rotator pull-right"></div>
 			{{/if}}
 			<div class="clear"></div>
 		</div>
diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl
index 15faa4a34..46ac65e87 100755
--- a/view/tpl/photos_recent.tpl
+++ b/view/tpl/photos_recent.tpl
@@ -7,11 +7,13 @@
 		<div class="clear"></div>
 	</div>
 	{{$upload_form}}
-	<div id="photo-album-contents">
-		{{foreach $photos as $photo}}
-			{{include file="photo_top.tpl"}}
-		{{/foreach}}
-		<div id="page-end"></div>
+	<div class="section-content-wrapper-np">
+		<div id="photo-album-contents">
+			{{foreach $photos as $photo}}
+				{{include file="photo_top.tpl"}}
+			{{/foreach}}
+			<div id="page-end"></div>
+		</div>
 	</div>
 </div>
 <div class="photos-end"></div>
diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl
index bf02c614d..11a08204d 100755
--- a/view/tpl/photos_upload.tpl
+++ b/view/tpl/photos_upload.tpl
@@ -21,7 +21,11 @@
 			<div class="form-group">
 				<input id="photos-upload-choose" type="file" name="userfile" />
 			</div>
+			{{include file="field_input.tpl" field=$caption}}
 			{{include file="field_checkbox.tpl" field=$visible}}
+			<div id="body-textarea">
+			{{include file="field_textarea.tpl" field=$body}}
+			</div>
 			<div class="pull-right btn-group form-group">
 				<div class="btn-group">
 					{{if $lockstate}}
@@ -37,8 +41,11 @@
 			<div class="clear"></div>
 
 			{{if $uploader}}
-
+			{{include file="field_input.tpl" field=$caption}}
 			{{include file="field_checkbox.tpl" field=$visible}}
+			<div id="body-textarea">
+			{{include file="field_textarea.tpl" field=$body}}
+			</div>
 			<div id="photos-upload-perms" class="btn-group pull-right">
 				{{if $lockstate}}
 				<button class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
diff --git a/view/tpl/prep.tpl b/view/tpl/prep.tpl
index 7bef7a417..debba13a8 100644
--- a/view/tpl/prep.tpl
+++ b/view/tpl/prep.tpl
@@ -1,3 +1,4 @@
+<div class="generic-content-wrapper-styled">
 <h1>{{$header}}</h1>
 
 {{if $site}}
@@ -27,8 +28,4 @@
 </div>
 {{/foreach}}
 {{/if}}
-
-
-
-
-
+</div>
diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl
index a83896f32..b0ea8b753 100755
--- a/view/tpl/prv_message.tpl
+++ b/view/tpl/prv_message.tpl
@@ -1,56 +1,109 @@
-<h3>{{$header}}</h3>
+{{if $new}}
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$header}}</h2>
+	</div>
+	<div class="section-content-wrapper">
+{{/if}}
+		<div id="prvmail-wrapper" >
+			<form id="prvmail-form" action="mail" method="post" >
 
-<div id="prvmail-wrapper" >
-<form id="prvmail-form" action="mail" method="post" >
+				<input type="hidden" id="inp-prvmail-expires" name="expires" value="{{$defexpire}}" />
+				<input type="hidden" name="media_str" id="jot-media" value="" />
 
-{{$parent}}
+				{{if $new}}
+				<div class="form-group">
+					<label for="recip">{{$to}}</label>
+					<input class="form-control" type="text" id="recip" name="messagerecip" value="{{$prefill}}" maxlength="255" />
+					<input type="hidden" id="recip-complete" name="messageto" value="{{$preid}}">
+				</div>
+				<div class="form-group">
+					<label for="prvmail-subject">{{$subject}}</label>
+					<input class="form-control" type="text" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" />
+				</div>
+				{{/if}}
 
-<div id="prvmail-to-label">{{$to}}</div>
+				{{if $reply}}
+				<input type="hidden" name="replyto" value="{{$parent}}" />
+				<input type="hidden" name="messageto" value="{{$recphash}}" />
+				<input type="hidden" name="subject" value="{{$subjtxt}}" />
+				{{/if}}
 
-{{if $showinputs}}
-<input class="form-control" type="text" id="recip" name="messagerecip" value="{{$prefill}}" maxlength="255" tabindex="10" />
-<input type="hidden" id="recip-complete" name="messageto" value="{{$preid}}">
-{{else}}
-{{$select}}
-{{/if}}
+				<div class="form-group">
+					<label for="prvmail-text">{{$yourmessage}}</label>
+					<textarea class="form-control" id="prvmail-text" name="body"">{{$text}}</textarea>
+				</div>
 
-<input type="hidden" id="inp-prvmail-expires" name="expires" value="{{$defexpire}}" />
-<input type="hidden" name="media_str" id="jot-media" value="" />
-
-<div id="prvmail-subject-label">{{$subject}}</div>
-<input class="form-control" type="text" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" {{$readonly}} tabindex="11" />
-
-<div id="prvmail-message-label">{{$yourmessage}}</div>
-<textarea class="prvmail-text form-control" id="prvmail-text" name="body" tabindex="12">{{$text}}</textarea>
-
-
-<div id="prvmail-submit-wrapper" >
-	<input type="submit" id="prvmail-submit" name="submit" value="{{$submit}}" tabindex="13" />
-	<button id="prvmail-upload-wrapper" class="btn btn-default btn-sm" >
-		<i id="prvmail-upload" class="icon-camera jot-icons" title="{{$upload}}"></i>
-	</button> 
-
-	<button id="prvmail-attach-wrapper" class="btn btn-default btn-sm" >
-		<i id="prvmail-attach" class="icon-paper-clip jot-icons" title="{{$attach}}"></i>
-	</button> 
-
-	<button id="prvmail-link-wrapper" class="btn btn-default btn-sm" onclick="prvmailJotGetLink(); return false;" >
-		<i id="prvmail-link" class="icon-link jot-icons" title="{{$insert}}" ></i>
-	</button> 
-	{{if $feature_expire}}
-	<button id="prvmail-expire-wrapper" class="btn btn-default btn-sm" onclick="prvmailGetExpiry();return false;" >
-		<i id="prvmail-expires" class="icon-eraser jot-icons" title="{{$expires}}" ></i>
-	</button>
-	{{/if}}
-	{{if $feature_encrypt}}
-	<button id="prvmail-encrypt-wrapper" class="btn btn-default btn-sm" onclick="red_encrypt('{{$cipher}}','#prvmail-text',$('#prvmail-text').val());return false;">
-		<i id="prvmail-encrypt" class="icon-key jot-icons" title="{{$encrypt}}" ></i>
-	</button> 
-	{{/if}}
-	<div id="prvmail-rotator-wrapper" >
-		<div id="prvmail-rotator"></div>
-	</div> 
-</div>
-<div id="prvmail-end" class="clear"></div>
-</form>
+				<div id="prvmail-submit-wrapper" class="form-group">
+					<div id="prvmail-submit" class="pull-right">
+						<button class="btn btn-primary btn-sm" type="submit" id="prvmail-submit" name="submit" value="{{$submit}}">{{$submit}}</button>
+					</div>
+					<div id="prvmail-tools" class="btn-toolbar pull-left">
+						<div class="btn-group">
+							<button id="main-editor-bold" class="btn btn-default btn-sm" title="{{$bold}}" onclick="inserteditortag('b', 'prvmail-text'); return false;">
+								<i class="icon-bold jot-icons"></i>
+							</button>
+							<button id="main-editor-italic" class="btn btn-default btn-sm" title="{{$italic}}" onclick="inserteditortag('i', 'prvmail-text'); return false;">
+								<i class="icon-italic jot-icons"></i>
+							</button>
+							<button id="main-editor-underline" class="btn btn-default btn-sm" title="{{$underline}}" onclick="inserteditortag('u', 'prvmail-text'); return false;">
+								<i class="icon-underline jot-icons"></i>
+							</button>
+							<button id="main-editor-quote" class="btn btn-default btn-sm" title="{{$quote}}" onclick="inserteditortag('quote', 'prvmail-text'); return false;">
+								<i class="icon-quote-left jot-icons"></i>
+							</button>
+							<button id="main-editor-code" class="btn btn-default btn-sm" title="{{$code}}" onclick="inserteditortag('code', 'prvmail-text'); return false;">
+								<i class="icon-terminal jot-icons"></i>
+							</button>
+						</div>
+						<div class="btn-group hidden-xs">
+							<button id="prvmail-attach-wrapper" class="btn btn-default btn-sm" >
+								<i id="prvmail-attach" class="icon-paper-clip jot-icons" title="{{$attach}}"></i>
+							</button>
+							<button id="prvmail-link-wrapper" class="btn btn-default btn-sm" onclick="prvmailJotGetLink(); return false;" >
+								<i id="prvmail-link" class="icon-link jot-icons" title="{{$insert}}" ></i>
+							</button>
+						</div>
+						{{if $feature_expire || $feature_encrypt}}
+						<div class="btn-group hidden-sm hidden-xs">
+							{{if $feature_expire}}
+							<button id="prvmail-expire-wrapper" class="btn btn-default btn-sm" onclick="prvmailGetExpiry();return false;" >
+								<i id="prvmail-expires" class="icon-eraser jot-icons" title="{{$expires}}" ></i>
+							</button>
+							{{/if}}
+							{{if $feature_encrypt}}
+							<button id="prvmail-encrypt-wrapper" class="btn btn-default btn-sm" onclick="red_encrypt('{{$cipher}}','#prvmail-text',$('#prvmail-text').val());return false;">
+								<i id="prvmail-encrypt" class="icon-key jot-icons" title="{{$encrypt}}" ></i>
+							</button>
+							{{/if}}
+						</div>
+						{{/if}}
+
+						<div class="btn-group visible-xs visible-sm">
+							<button type="button" id="more-tools" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
+								<i id="more-tools-icon" class="icon-caret-down jot-icons"></i>
+							</button>
+							<ul class="dropdown-menu dropdown-menu-right" role="menu">
+								<li class="visible-xs"><a href="#" id="prvmail-attach-sub"><i class="icon-paper-clip"></i>&nbsp;{{$attach}}</a></li>
+								<li class="visible-xs"><a href="#" onclick="prvmailJotGetLink(); return false;" ><i class="icon-link"></i>&nbsp;{{$insert}}</a></li>
+								{{if $feature_expire || $feature_encrypt}}
+								<li class="divider visible-xs"></li>
+								<li class="visible-sm visible-xs"><a href="#" onclick="prvmailGetExpiry(); return false;"><i id="prvmail-expires" class="icon-eraser"></i>&nbsp;{{$expires}}</a></li>
+								<li class="visible-sm visible-xs"><a href="#" onclick="red_encrypt('{{$cipher}}','#prvmail-text',$('#prvmail-text').val()); return false;"><i class="icon-key"></i>&nbsp;{{$encrypt}}</a></li>
+								{{/if}}
+							</ul>
+						</div>
+
+
+					</div>
+					<div id="prvmail-rotator-wrapper" class="pull-left">
+						<div id="prvmail-rotator"></div>
+					</div>
+					<div class="clear"></div>
+				</div>
+			</form>
+		</div>
+{{if $new}}
+	</div>
 </div>
+{{/if}}
diff --git a/view/tpl/rating_form.tpl b/view/tpl/rating_form.tpl
index 95c2eb03f..d072a0b3c 100644
--- a/view/tpl/rating_form.tpl
+++ b/view/tpl/rating_form.tpl
@@ -19,4 +19,4 @@
 
 <input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" />
 
-</form>
\ No newline at end of file
+</form>
diff --git a/view/tpl/rmagic.tpl b/view/tpl/rmagic.tpl
index 58df71718..d0f7aab64 100755
--- a/view/tpl/rmagic.tpl
+++ b/view/tpl/rmagic.tpl
@@ -1,3 +1,4 @@
+<div class="generic-content-wrapper-styled">
 <h3>{{$title}}</h3>
 
 <form action="rmagic" method="post" >
@@ -9,3 +10,4 @@
 	<div id="rmagic-submit-end" class="rmagic-field-end"></div>
 
 </form>
+</div>
diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl
index 256443b84..b44e1c39e 100755
--- a/view/tpl/search_item.tpl
+++ b/view/tpl/search_item.tpl
@@ -2,33 +2,73 @@
 	<a name="{{$item.id}}" ></a>
 	<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-outside-wrapper-{{$item.id}}" >
 		<div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" style="clear:both;">
-			<div class="wall-item-info{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-info-{{$item.id}}" >
-				<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}">
-					<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}"><img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" /></a>
-				</div>
-				<div class="wall-item-photo-end" style="clear:both"></div>
-			</div>
-			{{if $item.title}}
-			<div class="wall-item-title" id="wall-item-title-{{$item.id}}"><h3>{{$item.title}}</h3></div>
-			{{/if}}
-			{{if $item.lock}}
-			<div class="wall-item-lock dropdown">
-				<i class="icon-lock lockview dropdown-toggle" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul>&nbsp;
+			{{if $item.photo}}
+			<div class="wall-photo-item" id="wall-photo-item-{{$item.id}}">
+				{{$item.photo}}
 			</div>
 			{{/if}}
-			<div class="wall-item-author">
-				<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}}&nbsp;{{$item.via}}&nbsp;<a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}
-			</div>
-			<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">
-				{{if $item.verified}}<i class="icon-ok item-verified" title="{{$item.verified}}"></i>&nbsp;{{elseif $item.forged}}<i class="icon-remove item-forged" title="{{$item.forged}}"></i>&nbsp;{{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}},&nbsp;</span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}}&nbsp;{{$item.editedtime}}{{/if}}{{if $item.expiretime}}&nbsp;{{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}}&nbsp;<i class="icon-pencil"></i>{{/if}}&nbsp;{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}
+			<div class="wall-item-head">
+				<div class="wall-item-info" id="wall-item-info-{{$item.id}}" >
+					<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}">
+						<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}"><img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" /></a>
+					</div>
+					<div class="wall-item-photo-end" style="clear:both"></div>
+				</div>
+				{{if $item.title}}
+				<div class="wall-item-title" id="wall-item-title-{{$item.id}}">
+				<h3>{{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}}</h3>
+				</div>
+				{{/if}}
+				{{if $item.lock}}
+				<div class="wall-item-lock dropdown">
+					<i class="icon-lock lockview dropdown-toggle" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i><ul id="panel-{{$item.id}}" class="lockview-panel dropdown-menu"></ul>&nbsp;
+				</div>
+				{{/if}}
+				<div class="wall-item-author">
+					<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}}&nbsp;{{$item.via}}&nbsp;<a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}
+				</div>
+				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">
+					{{if $item.verified}}<i class="icon-ok item-verified" title="{{$item.verified}}"></i>&nbsp;{{elseif $item.forged}}<i class="icon-exclamation item-forged" title="{{$item.forged}}"></i>&nbsp;{{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}},&nbsp;</span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}}&nbsp;{{$item.editedtime}}{{/if}}{{if $item.expiretime}}&nbsp;{{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}}&nbsp;<i class="icon-pencil"></i>{{/if}}&nbsp;{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}
+				</div>
+				<div class="clear"></div>
 			</div>
-			<div class="wall-item-content" id="wall-item-content-{{$item.id}}">
-				<div class="wall-item-title-end"></div>
+			<div class="{{if $item.is_photo}}wall-photo-item{{else}}wall-item-content{{/if}}" id="wall-item-content-{{$item.id}}">
 				<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >
 					{{$item.body}}
 				</div>
+				<div class="clear"></div>
 			</div>
-				<div class="wall-item-tools">
+			{{if $item.has_tags}}
+			<div class="wall-item-tools">
+				{{if $item.mentions}}
+				<div class="body-tags" id="item-mentions">
+					<span class="tag">{{$item.mentions}}</span>
+				</div>
+				{{/if}}
+				{{if $item.tags}}
+				<div class="body-tags" id="item-tags">
+					<span class="tag">{{$item.tags}}</span>
+				</div>
+				{{/if}}
+				{{if $item.categories}}
+				<div class="body-tags" id="item-categories">
+					<span class="tag">{{$item.categories}}</span>
+				</div>
+				{{/if}}
+				{{if $item.folders}}
+				<div class="body-tags" id="item-folders">
+					<span class="tag">{{$item.folders}}</span>
+				</div>
+				{{/if}}
+				{{if $item.attachments}}
+				<div class="body-tags" id="item-attachments">
+					<span class='tag'>{{$item.attachments}}</span>
+				</div>
+				{{/if}}
+				<div class="clear"></div>
+			</div>
+			{{/if}}
+			<div class="wall-item-tools">
 				<div class="wall-item-tools-right btn-group pull-right">
 					<button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown">
 						<i class="icon-caret-down"></i>
@@ -39,16 +79,12 @@
 						{{/if}}
 						{{if $item.drop.dropping}}
 						<li role="presentation" class="divider"></li>
-						<li><a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" title="{{$item.drop.delete}}" ><i class="icon-remove"></i> {{$item.drop.delete}}</a></li>
+						<li><a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" title="{{$item.drop.delete}}" ><i class="icon-trash"></i> {{$item.drop.delete}}</a></li>
 						{{/if}}
 					</ul>
 				</div>
+				<div class="clear"></div>
 			</div>
-			{{* we dont' use this do we?
-			{{if $item.drop.pagedrop}}
-			<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />
-			{{/if}}
-			*}}
 			<div class="clear"></div>
 		</div>
 		<div class="wall-item-wrapper-end"></div>