aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--LICENSE2
-rw-r--r--README.md43
-rw-r--r--app/bugreport.apd2
-rw-r--r--assets/hashlogo.svg2
-rw-r--r--assets/home.html26
-rw-r--r--assets/nb-no/wide.css6
-rw-r--r--assets/wide.css6
-rwxr-xr-xboot.php85
-rw-r--r--doc/Comparison-of-activity-stream-networks.md4
-rw-r--r--doc/Developers.md4
-rw-r--r--doc/Plugins.md2
-rw-r--r--doc/README.md45
-rw-r--r--doc/Remove-Account.md1
-rw-r--r--doc/addons.bb2
-rw-r--r--doc/addons_gnusocial.bb7
-rw-r--r--doc/campaign.bb2
-rw-r--r--doc/classRedmatrix_1_1Import_1_1Import-members.html131
-rw-r--r--doc/classRedmatrix_1_1Import_1_1Import.html446
-rw-r--r--doc/credits.bb1
-rw-r--r--doc/de/features.bb1
-rw-r--r--doc/de/main.bb1
-rw-r--r--doc/dev_beginner.bb6
-rw-r--r--doc/developers.bb2
-rw-r--r--doc/diaspora_compat.md6
-rw-r--r--doc/encryption.bb2
-rw-r--r--doc/external-resource-links.bb2
-rw-r--r--doc/faq_developers.bb1
-rw-r--r--doc/hidden_configs.bb1
-rw-r--r--doc/history.md3
-rw-r--r--doc/html/index.php7
-rw-r--r--doc/main.bb4
-rw-r--r--doc/red2pi.bb4
-rw-r--r--doc/roadmap.bb2
-rw-r--r--doc/to_do_code.bb2
-rw-r--r--doc/troubleshooting.bb2
-rw-r--r--doc/what_is_zot.bb2
-rw-r--r--images/ghash-32.pngbin0 -> 1824 bytes
-rw-r--r--images/redmatrix_logo.svg2
-rw-r--r--images/rm.svg2
-rw-r--r--include/Contact.php52
-rw-r--r--include/ConversationObject.php2
-rw-r--r--include/Import/Importer.php4
-rw-r--r--include/Import/refimport.php15
-rw-r--r--include/ItemObject.php22
-rw-r--r--include/RedDAV/RedBasicAuth.php2
-rw-r--r--include/RedDAV/RedBrowser.php2
-rw-r--r--include/RedDAV/RedDirectory.php2
-rw-r--r--include/RedDAV/RedFile.php4
-rw-r--r--include/activities.php5
-rw-r--r--include/api.php16
-rw-r--r--include/attach.php30
-rw-r--r--include/bb2diaspora.php2
-rw-r--r--include/bbcode.php46
-rw-r--r--include/comanche.php2
-rw-r--r--include/conversation.php17
-rwxr-xr-xinclude/diaspora.php56
-rw-r--r--include/dir_fns.php14
-rw-r--r--include/enotify.php9
-rw-r--r--include/event.php54
-rw-r--r--include/expire.php4
-rw-r--r--include/externals.php20
-rw-r--r--include/group.php5
-rw-r--r--include/hubloc.php15
-rw-r--r--include/identity.php20
-rwxr-xr-xinclude/items.php392
-rw-r--r--include/message.php22
-rw-r--r--include/network.php5
-rw-r--r--include/notifier.php42
-rw-r--r--include/notify.php5
-rw-r--r--include/onedirsync.php2
-rw-r--r--include/photo/photo_driver.php36
-rw-r--r--include/photos.php89
-rw-r--r--include/poller.php5
-rw-r--r--include/reddav.php4
-rw-r--r--include/socgraph.php25
-rw-r--r--include/statistics_fns.php9
-rw-r--r--include/taxonomy.php8
-rw-r--r--include/text.php78
-rw-r--r--include/widgets.php14
-rw-r--r--include/zot.php231
-rw-r--r--install/INSTALL.txt40
-rwxr-xr-xinstall/htconfig.sample.php4
-rw-r--r--install/schema_mysql.sql545
-rw-r--r--install/schema_postgres.sql3
-rw-r--r--library/certs/README.md2
-rw-r--r--mod/acl.php30
-rw-r--r--mod/admin.php12
-rw-r--r--mod/block.php8
-rw-r--r--mod/blocks.php34
-rw-r--r--mod/channel.php21
-rw-r--r--mod/cloud.php6
-rw-r--r--mod/connections.php13
-rw-r--r--mod/connedit.php4
-rw-r--r--mod/dav.php6
-rw-r--r--mod/dirsearch.php23
-rw-r--r--mod/display.php8
-rw-r--r--mod/editblock.php14
-rw-r--r--mod/editlayout.php2
-rw-r--r--mod/editpost.php2
-rw-r--r--mod/editwebpage.php4
-rwxr-xr-xmod/events.php7
-rw-r--r--mod/filer.php3
-rw-r--r--mod/group.php6
-rw-r--r--mod/home.php4
-rw-r--r--mod/impel.php11
-rw-r--r--mod/import.php12
-rw-r--r--mod/item.php70
-rw-r--r--mod/layouts.php10
-rwxr-xr-xmod/like.php31
-rw-r--r--mod/locs.php20
-rw-r--r--mod/manage.php9
-rw-r--r--mod/message.php2
-rwxr-xr-xmod/mood.php11
-rw-r--r--mod/network.php11
-rw-r--r--mod/openid.php7
-rw-r--r--mod/p.php5
-rw-r--r--mod/page.php18
-rw-r--r--mod/photos.php53
-rw-r--r--mod/ping.php19
-rwxr-xr-xmod/poke.php11
-rw-r--r--mod/post.php30
-rw-r--r--mod/profile_photo.php24
-rw-r--r--mod/siteinfo.php2
-rw-r--r--mod/starred.php8
-rwxr-xr-xmod/subthread.php32
-rw-r--r--mod/tagger.php6
-rw-r--r--mod/thing.php4
-rw-r--r--mod/viewconnections.php13
-rw-r--r--mod/viewsrc.php5
-rw-r--r--mod/webpages.php2
-rw-r--r--mod/zfinger.php2
-rw-r--r--util/Doxyfile2
-rw-r--r--util/README2
-rw-r--r--util/messages.po10
-rwxr-xr-xutil/run_xgettext.sh6
-rwxr-xr-xutil/shredder/ShredOAuth.sh28
-rwxr-xr-xutil/shredder/shredder2
-rw-r--r--util/strings.php2278
-rw-r--r--util/zotsh/README.txt2
-rw-r--r--view/cs/htconfig.tpl2
-rw-r--r--view/cs/update_fail_eml.tpl2
-rw-r--r--view/css/mod_events.css2
-rw-r--r--view/de/messages.po8715
-rw-r--r--view/de/strings.php1964
-rw-r--r--view/en-au/htconfig.tpl2
-rw-r--r--view/en-au/update_fail_eml.tpl2
-rw-r--r--view/en-gb/htconfig.tpl2
-rw-r--r--view/en-gb/strings.php4
-rw-r--r--view/en-gb/update_fail_eml.tpl2
-rw-r--r--view/en/cert_bad_eml.tpl4
-rw-r--r--view/en/htconfig.tpl2
-rw-r--r--view/en/update_fail_eml.tpl2
-rw-r--r--view/eo/htconfig.tpl2
-rw-r--r--view/eo/update_fail_eml.tpl2
-rw-r--r--view/es/htconfig.tpl2
-rw-r--r--view/es/update_fail_eml.tpl2
-rw-r--r--view/fr/messages.po48
-rw-r--r--view/fr/strings.php32
-rw-r--r--view/it/htconfig.tpl2
-rw-r--r--view/it/messages.po118
-rw-r--r--view/it/strings.php74
-rw-r--r--view/it/update_fail_eml.tpl2
-rw-r--r--view/nb-no/htconfig.tpl2
-rw-r--r--view/nb-no/messages.po86
-rw-r--r--view/nb-no/strings.php38
-rw-r--r--view/nb-no/update_fail_eml.tpl2
-rw-r--r--view/nl/messages.po783
-rw-r--r--view/nl/strings.php75
-rw-r--r--view/pt-br/htconfig.tpl2
-rw-r--r--view/pt-br/messages.po6326
-rw-r--r--view/pt-br/strings.php1110
-rw-r--r--view/pt-br/update_fail_eml.tpl2
-rw-r--r--view/ru/htconfig.tpl2
-rw-r--r--view/ru/messages.po42
-rw-r--r--view/ru/strings.php28
-rw-r--r--view/ru/update_fail_eml.tpl2
-rw-r--r--view/sv/htconfig.tpl2
-rw-r--r--view/sv/messages.po86
-rw-r--r--view/sv/strings.php38
-rw-r--r--view/sv/update_fail_eml.tpl2
-rw-r--r--view/theme/redbasic/php/config.php2
-rw-r--r--view/theme/redbasic/php/theme.php2
-rwxr-xr-xview/tpl/email_notify_html.tpl2
-rwxr-xr-xview/tpl/head.tpl2
-rwxr-xr-xview/tpl/nav.tpl2
-rwxr-xr-xview/tpl/opensearch.tpl4
-rw-r--r--view/tpl/pdledit.tpl2
187 files changed, 13050 insertions, 12398 deletions
diff --git a/LICENSE b/LICENSE
index 7656d552e..40cc07bb5 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2010-2015 RedMatrix
+Copyright (c) 2010-2015 Hubzilla
All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/README.md b/README.md
index 2deabff8b..90585a906 100644
--- a/README.md
+++ b/README.md
@@ -1,15 +1,42 @@
-![the Red Matrix](images/rm.png)
-Note: please update your repository pointers to https://github.com/redmatrix/redmatrix .
+Hubzilla
+========
-One of the traditional problems with independent publishing on the internet has always been the fact that independent publishers often operate as isolated islands within their own website, and spend most of their resources attracting visitors. The rise of corporate providers and social networking services alleviated many of these problems; however centralisation has led to a situation where your content is no longer under your direct control. It is shared fully with corporate advertisers and governments, but ironically you are now often asked to pay money to ensure that your friends can see it. What if you could have advantages of scale and connections that centralisation typically offers whilst maintaining independent control over your own web presence?
+###Websites. Redefined.
-The RedMatrix is a super network created from a huge number of smaller independent and autonomous websites - which are linked together into a cooperative publishing and social platform. It consists of an open source webapp providing a complete multi-user **decentralised** publishing, sharing, and communications system - known as a "hub". Each hub provides communications (private messaging, chat, blogging, forums, and social networking), along with media management (photos, events, files, web pages, shareable apps) for its members; all in a feature-rich platform. These hubs automatically reach out and connect with each other and the rest of the matrix. Privacy and content ownership always remain under the direct personal control of the individual; and permission to access any item can be granted or denied to anybody in the entire matrix.
-What makes the RedMatrix unique is what we call "magic authentication" - which is based on our groundbreaking work in decentralised identity services. No other platform provides this ability. Within the matrix the boundaries between different hubs are blurred or seemingly non-existent. Identity in the matrix is considered transient and potentially nomadic. "Who you are" has nothing to do with "what computer you're connected to", and website content can adapt itself according to who is viewing it. You have the ability to "clone" your identity to other hubs; which allows you to continue to communicate with your friends seamlessly if your primary hub is ever disabled (temporarily or permanently).
+![Hubzilla](images/ghash-32.png)
-The RedMatrix is ideal for communities of any size, from private individuals and families to online forums, business websites, and organisations. It can be used by anybody who has communications or web content that they wish to share, but where they desire complete control of whom they share it with.
+**What are Hubs?**
-The Red Matrix is free and open source distributed under the MIT license.
+Hubs are independent general-purpose websites that not only connect with their associated members and viewers, but also connect together to exchange personal communications and other information with each other.
+This allows hub members on any hub to securely and privately share anything; with anybody, on any hub - anywhere; or share stuff publicly with anybody on the internet if desired.
-For a list of public hubs see [redmatrix.me/pubsites](https://redmatrix.me/pubsites). For installation instructions see [install/INSTALL.txt](install/INSTALL.txt)
+**Hubzilla** is the server software which makes this possible. It is a sophisticated and unique combination of an open source content management system and a decentralised identity, communications, and permissions framework and protocol suite, built using common webserver technology (PHP/MySQL/Apache, although Mariadb or Postgres and Nginx could also be used - we're pretty easy). The end result is a level of systems integration, privacy control, and communications features that you wouldn't think are possible in either a content management system or a decentralised communications network. It also brings a new level of cooperation and privacy to the web and introduces the concept of personally owned "single sign-on" to web services across the entire internet.
+
+Hubzilla hubs are
+
+* decentralised
+* inherently social
+* optionally inter-networked with other hubs
+* privacy-enabled (privacy exclusions work across the entire internet to any registered identity on any compatible hubs)
+
+Possible website applications include
+
+* decentralised social networking nodes
+* personal cloud storage
+* file dropboxes
+* managing organisational communications and activities
+* collaboration and community decision-making
+* small business websites
+* public and private media/file libraries
+* blogs
+* event promotion
+* feed aggregation and republishing
+* forums
+* dating websites
+* pretty much anything you can do on a traditional blog or community website, but that you could do better if you could easily connect it with other websites or privately share things across website boundaries.
+
+
+
+This project is under development and is not yet available for general use. \ No newline at end of file
diff --git a/app/bugreport.apd b/app/bugreport.apd
index ea1f87b34..3714f0626 100644
--- a/app/bugreport.apd
+++ b/app/bugreport.apd
@@ -1,3 +1,3 @@
-url: https://github.com/redmatrix/redmatrix/issues
+url: https://github.com/redmatrix/hubzilla/issues
name: Bug Report
photo: $baseurl/app/bugreport.png
diff --git a/assets/hashlogo.svg b/assets/hashlogo.svg
index 903a5c894..c056a621e 100644
--- a/assets/hashlogo.svg
+++ b/assets/hashlogo.svg
@@ -15,7 +15,7 @@
version="1.1"
inkscape:version="0.48.4 r9939"
sodipodi:docname="hashlogo.svg"
- inkscape:export-filename="/run/user/1000/gvfs/sftp:host=jeroenpraat.nl,port=69,user=root/var/www/redmatrix/assets/hashlogo2.png"
+ inkscape:export-filename="/run/user/1000/gvfs/sftp:host=jeroenpraat.nl,port=69,user=root/var/www/hubzilla/assets/hashlogo2.png"
inkscape:export-xdpi="156.42857"
inkscape:export-ydpi="156.42857">
<defs
diff --git a/assets/home.html b/assets/home.html
index 036f9bcc9..653715669 100644
--- a/assets/home.html
+++ b/assets/home.html
@@ -293,18 +293,18 @@ One of the traditional problems with independent publishing on the internet has
</div>
<br />
<div class="tr" style="font-size: 1.4em; color: #666; margin-left: 75px; margin-right: 75px;">
-The RedMatrix is a super network created from a huge number of smaller independent and autonomous websites - which are linked together into a cooperative publishing and social platform. It consists of an open source webapp providing a complete multi-user <strong>decentralised</strong> publishing, sharing, and communications system - known as a "hub". Each hub provides communications (private messaging, chat, blogging, forums, and social networking), along with media management (photos, events, files, web pages, shareable apps) for its members; all in a feature-rich platform. These hubs automatically reach out and connect with each other and the rest of the matrix. Privacy and content ownership always remain under the direct personal control of the individual; and permission to access any item can be granted or denied to anybody in the entire matrix.
+The Hubzilla is a super network created from a huge number of smaller independent and autonomous websites - which are linked together into a cooperative publishing and social platform. It consists of an open source webapp providing a complete multi-user <strong>decentralised</strong> publishing, sharing, and communications system - known as a "hub". Each hub provides communications (private messaging, chat, blogging, forums, and social networking), along with media management (photos, events, files, web pages, shareable apps) for its members; all in a feature-rich platform. These hubs automatically reach out and connect with each other and the rest of the matrix. Privacy and content ownership always remain under the direct personal control of the individual; and permission to access any item can be granted or denied to anybody in the entire matrix.
</div>
<br />
<div class="tr" style="font-size: 1.4em; color: #666; margin-left: 75px; margin-right: 75px;">
-What makes the RedMatrix unique is what we call "magic authentication" - which is based on our groundbreaking work in decentralised identity services. No other platform provides this ability. Within the matrix the boundaries between different hubs are blurred or seemingly non-existent. Identity in the matrix is considered transient and potentially nomadic. "Who you are" has nothing to do with "what computer you're connected to", and website content can adapt itself according to who is viewing it. You have the ability to "clone" your identity to other hubs; which allows you to continue to communicate with your friends seamlessly if your primary hub is ever disabled (temporarily or permanently).
+What makes the Hubzilla unique is what we call "magic authentication" - which is based on our groundbreaking work in decentralised identity services. No other platform provides this ability. Within the matrix the boundaries between different hubs are blurred or seemingly non-existent. Identity in the matrix is considered transient and potentially nomadic. "Who you are" has nothing to do with "what computer you're connected to", and website content can adapt itself according to who is viewing it. You have the ability to "clone" your identity to other hubs; which allows you to continue to communicate with your friends seamlessly if your primary hub is ever disabled (temporarily or permanently).
</div>
<br />
<div class="tr" style="font-size: 1.4em; color: #666; margin-left: 75px; margin-right: 75px;">
-The RedMatrix is ideal for communities of any size, from private individuals and families to online forums, business websites, and organisations. It can be used by anybody who has communications or web content that they wish to share, but where they desire complete control of whom they share it with.<br />
+The Hubzilla is ideal for communities of any size, from private individuals and families to online forums, business websites, and organisations. It can be used by anybody who has communications or web content that they wish to share, but where they desire complete control of whom they share it with.<br />
</div>
<br />
-<div style="margin-bottom: 15px; color: #808080; font-size: 1.8em;"><strong>RedMatrix - &quot;The Network&quot;</strong></div>
+<div style="margin-bottom: 15px; color: #808080; font-size: 1.8em;"><strong>Hubzilla - &quot;The Network&quot;</strong></div>
<div style="font-size: 1.4em;">
<a href="register" style="color: white; padding:10px; background-color: #c60032; border-radius: 10px;">Sign up now!</a>
<a href="donate" style="color: white; padding:10px; background-color: #c60032; border-radius: 10px;">Donate / Sponsor</a>
@@ -331,7 +331,7 @@ La Matrice <span style="color: #c60032;">Rouge</span> est unique; elle transport
La Matrice <span style="color: #c60032;">Rouge</span> est un outil id&eacute;al pour toutes les communaut&eacute;s en passant par les particuliers et les familles tout en incluant les forums, sites-web d'affaires ainsi que les organisations. C&#039;est une solution de remplacement, non n&eacute;gligeable, aux r&eacute;seaux sociaux actuels rendue accessible &agrave; tous ceux qui sont soucieux de leur vie priv&eacute;e et qui souhaitent conserver le contr&ocirc;le de leur pr&eacute;sence sur internet.<br />
</div>
<br />
-<div style="margin-bottom: 15px; color: #808080; font-size: 1.8em;"><strong>RedMatrix - &quot;The Network&quot;</strong></div>
+<div style="margin-bottom: 15px; color: #808080; font-size: 1.8em;"><strong>Hubzilla - &quot;The Network&quot;</strong></div>
<div style="font-size: 1.4em;">
<a href="register" style="color: white; padding:10px; background-color: #c60032; border-radius: 10px;">M'inscrire!</a>
<a href="donate" style="color: white; padding:10px; background-color: #c60032; border-radius: 10px;">Dons / Sponsors</a>
@@ -347,18 +347,18 @@ Een van de traditionele problemen met onafhankelijke internetpublicaties is dat
</div>
<br />
<div class="tr" style="font-size: 1.4em; color: #666; margin-left: 75px; margin-right: 75px;">
-De RedMatrix is een supernetwerk bestaande uit een enorme hoeveelheid kleinere onafhankelijke en autonome websites, die aan elkaar gekoppeld een co&ouml;peratief publicatie en sociaal platform vormen. Het bestaat uit een opensource webapplicatie die een compleet <strong>gedecentraliseerd</strong> multi-user publicatie-, communicatie- en social media-systeem biedt, een “hub” geheten. Elke hub verzorgt de communicatie (privéberichten, chatten, bloggen, forums en een sociaal netwerk) en het mediabeheer (foto's, agenda, webpagina's en apps) voor zijn leden; alles in een functie-rijke omgeving. Deze hubs maken automatisch contact met elkaar en de rest van de matrix. Het individu blijft altijd directe controle houden over zijn/haar privacy en eigendom; en aan elk item in de gehele matrix kan aan wie dan ook toegang verleend of geweigerd worden.
+De Hubzilla is een supernetwerk bestaande uit een enorme hoeveelheid kleinere onafhankelijke en autonome websites, die aan elkaar gekoppeld een co&ouml;peratief publicatie en sociaal platform vormen. Het bestaat uit een opensource webapplicatie die een compleet <strong>gedecentraliseerd</strong> multi-user publicatie-, communicatie- en social media-systeem biedt, een “hub” geheten. Elke hub verzorgt de communicatie (privéberichten, chatten, bloggen, forums en een sociaal netwerk) en het mediabeheer (foto's, agenda, webpagina's en apps) voor zijn leden; alles in een functie-rijke omgeving. Deze hubs maken automatisch contact met elkaar en de rest van de matrix. Het individu blijft altijd directe controle houden over zijn/haar privacy en eigendom; en aan elk item in de gehele matrix kan aan wie dan ook toegang verleend of geweigerd worden.
</div>
<br />
<div class="tr" style="font-size: 1.4em; color: #666; margin-left: 75px; margin-right: 75px;">
-Wat de Red Matrix uniek maakt is de zogenaamde “magische authenticatie”. Gebaseerd op ons baanbrekende werk in gedecentraliseerde identificatie. Geen enkel ander platform biedt deze mogelijkheid. Binnen de matrix zijn de grenzen tussen verschillende websites vervaagd of lijken ze niet meer te bestaan. Een identiteit is binnen de matrix niet statisch en kan zelfs een nomadenbestaan leiden. “Wie je bent” heeft niets te maken met “welke computerserver je verbonden bent” en de inhoud van webpagina's kan zich hierdoor aanpassen aan wie er naar kijkt. Je hebt de mogelijkheid om jouw “identiteit” naar andere hubs te klonen; waardoor je zonder onderbrekingen kan blijven communiceren met je vrienden, wanneer jouw primaire hub is uitgeschakeld (tijdelijk of permanent).
+Wat de Hubzilla uniek maakt is de zogenaamde “magische authenticatie”. Gebaseerd op ons baanbrekende werk in gedecentraliseerde identificatie. Geen enkel ander platform biedt deze mogelijkheid. Binnen de matrix zijn de grenzen tussen verschillende websites vervaagd of lijken ze niet meer te bestaan. Een identiteit is binnen de matrix niet statisch en kan zelfs een nomadenbestaan leiden. “Wie je bent” heeft niets te maken met “welke computerserver je verbonden bent” en de inhoud van webpagina's kan zich hierdoor aanpassen aan wie er naar kijkt. Je hebt de mogelijkheid om jouw “identiteit” naar andere hubs te klonen; waardoor je zonder onderbrekingen kan blijven communiceren met je vrienden, wanneer jouw primaire hub is uitgeschakeld (tijdelijk of permanent).
</div>
<br />
<div class="tr" style="font-size: 1.4em; color: #666; margin-left: 75px; margin-right: 75px;">
-De RedMatrix is ideaal voor groepen mensen van welke omvang dan ook, van kleine groepen vrienden en families, tot online forums, zakenwebsites, en organisaties. Het kan door iedereen gebruikt worden die wil communiceren of internetpublicaties wil delen, maar de volledige controle wenst met wie zij willen communiceren en delen.<br />
+De Hubzilla is ideaal voor groepen mensen van welke omvang dan ook, van kleine groepen vrienden en families, tot online forums, zakenwebsites, en organisaties. Het kan door iedereen gebruikt worden die wil communiceren of internetpublicaties wil delen, maar de volledige controle wenst met wie zij willen communiceren en delen.<br />
</div>
<br />
-<div style="margin-bottom: 15px; color: #808080; font-size: 1.8em;"><strong>RedMatrix - &quot;The Network&quot;</strong></div>
+<div style="margin-bottom: 15px; color: #808080; font-size: 1.8em;"><strong>Hubzilla - &quot;The Network&quot;</strong></div>
<div style="font-size: 1.4em;">
<a href="register" style="color: white; padding:10px; background-color: #c60032; border-radius: 10px;">Meld je nu aan!</a>
<a href="donate" style="color: white; padding:10px; background-color: #c60032; border-radius: 10px;">schenking</a>
@@ -374,18 +374,18 @@ Ett av de vanliga problemen med oberoende publicering p&aring; n&auml;tet har al
</div>
<br />
<div class="tr" style="font-size: 1.4em; color: #666; margin-left: 75px; margin-right: 75px;">
-RedMatrix &auml;r ett n&auml;tverk sammansatt av ett stort antal mindre, oberoende och sj&auml;lvst&auml;ndiga webbplatser, sammankopplade till en samverkande publicerings- och kommunikationsplattform. Mjukvaran best&aring;r av en webbapplikation sl&auml;ppt som &ouml;ppen k&auml;llkod, som tillhandah&aring;ller ett <strong>decentraliserat</strong> fleranv&auml;ndarsystem f&ouml;r kommunikation, publicering och delning, och n&auml;r den k&ouml;rs utg&ouml;r en nod i n&auml;tverket. Varje nod erbjuder s&aring;v&auml;l kommunikationsverktyg (privata meddelanden, chatt, blogg, forum och traditionellt socialt n&auml;tverkande) som filhantering (foton, kalenderh&auml;ndelser, filer, webbsidor, delbara till&auml;ggsprogram) f&ouml;r alla medlemmar; alltihop i en sammanh&aring;llen plattform. Dessa noder tar automatiskt kontakt med varandra och resten av n&auml;tverket. Sekretess och inneh&aring;llsstyrning &auml;r alltid under din direkta personliga kontroll, och beh&ouml;righet till inl&auml;gg eller filer kan ges eller nekas vem som helst i n&auml;tverket.
+Hubzilla &auml;r ett n&auml;tverk sammansatt av ett stort antal mindre, oberoende och sj&auml;lvst&auml;ndiga webbplatser, sammankopplade till en samverkande publicerings- och kommunikationsplattform. Mjukvaran best&aring;r av en webbapplikation sl&auml;ppt som &ouml;ppen k&auml;llkod, som tillhandah&aring;ller ett <strong>decentraliserat</strong> fleranv&auml;ndarsystem f&ouml;r kommunikation, publicering och delning, och n&auml;r den k&ouml;rs utg&ouml;r en nod i n&auml;tverket. Varje nod erbjuder s&aring;v&auml;l kommunikationsverktyg (privata meddelanden, chatt, blogg, forum och traditionellt socialt n&auml;tverkande) som filhantering (foton, kalenderh&auml;ndelser, filer, webbsidor, delbara till&auml;ggsprogram) f&ouml;r alla medlemmar; alltihop i en sammanh&aring;llen plattform. Dessa noder tar automatiskt kontakt med varandra och resten av n&auml;tverket. Sekretess och inneh&aring;llsstyrning &auml;r alltid under din direkta personliga kontroll, och beh&ouml;righet till inl&auml;gg eller filer kan ges eller nekas vem som helst i n&auml;tverket.
</div>
<br />
<div class="tr" style="font-size: 1.4em; color: #666; margin-left: 75px; margin-right: 75px;">
-Det som g&ouml;r RedMatrix unikt &auml;r vad vi kallar "magisk fj&auml;rrinloggning" som &auml;r baserad p&aring; v&aring;rt banbrytande arbete med en decentraliserad identitetshantering. Ingen annan plattform vi k&auml;nner till erbjuder i dagsl&auml;get n&aring;got liknande. Inom n&auml;tverket &auml;r gr&auml;nserna mellan de olika noderna utsuddade eller till synes icke-existerande. En identitet i n&auml;tverket kan vara &ouml;verg&aring;ende och potentiellt nomadisk. "Vem du &auml;r" har inget att g&ouml;ra med "vilken dator du ansluter till inom n&auml;tverket" och webbsidornas inneh&aring;ll kan skapas s&aring; att det anpassar sig utifr&aring;n vem som tittar p&aring; det. Du har m&ouml;jlighet att "klona" din identitet till andra noder, vilket l&aring;ter dig forts&auml;tta att kommunicera med dina v&auml;nner utan avbrott om din prim&auml;ra nod skulle bli otillg&auml;nglig (tillf&auml;lligt eller permanent).
+Det som g&ouml;r Hubzilla unikt &auml;r vad vi kallar "magisk fj&auml;rrinloggning" som &auml;r baserad p&aring; v&aring;rt banbrytande arbete med en decentraliserad identitetshantering. Ingen annan plattform vi k&auml;nner till erbjuder i dagsl&auml;get n&aring;got liknande. Inom n&auml;tverket &auml;r gr&auml;nserna mellan de olika noderna utsuddade eller till synes icke-existerande. En identitet i n&auml;tverket kan vara &ouml;verg&aring;ende och potentiellt nomadisk. "Vem du &auml;r" har inget att g&ouml;ra med "vilken dator du ansluter till inom n&auml;tverket" och webbsidornas inneh&aring;ll kan skapas s&aring; att det anpassar sig utifr&aring;n vem som tittar p&aring; det. Du har m&ouml;jlighet att "klona" din identitet till andra noder, vilket l&aring;ter dig forts&auml;tta att kommunicera med dina v&auml;nner utan avbrott om din prim&auml;ra nod skulle bli otillg&auml;nglig (tillf&auml;lligt eller permanent).
</div>
<br />
<div class="tr" style="font-size: 1.4em; color: #666; margin-left: 75px; margin-right: 75px;">
-RedMatrix passar f&ouml;r grupper av alla storlekar - alltifr&aring;n privatpersoner och familjer till n&auml;tforum, f&ouml;retagswebbplatser och organisationer. Det kan anv&auml;ndas av alla som har inneh&aring;ll de &ouml;nskar dela med sig av och samtidigt ha full kontroll &ouml;ver vem de delar det med.
+Hubzilla passar f&ouml;r grupper av alla storlekar - alltifr&aring;n privatpersoner och familjer till n&auml;tforum, f&ouml;retagswebbplatser och organisationer. Det kan anv&auml;ndas av alla som har inneh&aring;ll de &ouml;nskar dela med sig av och samtidigt ha full kontroll &ouml;ver vem de delar det med.
</div>
<br />
-<div style="margin-bottom: 15px; color: #808080; font-size: 1.8em;"><strong>RedMatrix - "N&auml;tverket"</strong></div>
+<div style="margin-bottom: 15px; color: #808080; font-size: 1.8em;"><strong>Hubzilla - "N&auml;tverket"</strong></div>
<div style="font-size: 1.4em;">
<a href="register" style="color: white; padding:10px; background-color: #c60032; border-radius: 10px;">Registrera dig nu!</a>
<a href="donate" style="color: white; padding:10px; background-color: #c60032; border-radius: 10px;">Ge ett bidrag / Sponsra</a>
diff --git a/assets/nb-no/wide.css b/assets/nb-no/wide.css
index 77b7370a3..fe5e8ed6d 100644
--- a/assets/nb-no/wide.css
+++ b/assets/nb-no/wide.css
@@ -3,10 +3,10 @@ body {
color: #111111;
/*color: rgba(0,0,0,0.0); */
text-align: center;
- /* background-image: url("redmatrixbkgd.jpg"); */
+ /* background-image: url("hubzillabkgd.jpg"); */
/*background: #ececec;*/
padding:0 0 22px 0;
- /* background: url(redmatrixbkgd.jpg) no-repeat center center scroll; */
+ /* background: url(hubzillabkgd.jpg) no-repeat center center scroll; */
/*
-webkit-background-size: cover;
-moz-background-size: cover;
@@ -31,7 +31,7 @@ color:#C60032;font-size:1.2em;width:700px;margin-right:auto;margin-left:auto;tex
left:0;
width:100%;
height: 55px;
- /* background-image: url("redmatrixbkgd.jpg"); */
+ /* background-image: url("hubzillabkgd.jpg"); */
background: rgba(198, 0, 50, 0.8);
background-size:3000px 55px;
/* background: #afafaf;*/
diff --git a/assets/wide.css b/assets/wide.css
index 77b7370a3..fe5e8ed6d 100644
--- a/assets/wide.css
+++ b/assets/wide.css
@@ -3,10 +3,10 @@ body {
color: #111111;
/*color: rgba(0,0,0,0.0); */
text-align: center;
- /* background-image: url("redmatrixbkgd.jpg"); */
+ /* background-image: url("hubzillabkgd.jpg"); */
/*background: #ececec;*/
padding:0 0 22px 0;
- /* background: url(redmatrixbkgd.jpg) no-repeat center center scroll; */
+ /* background: url(hubzillabkgd.jpg) no-repeat center center scroll; */
/*
-webkit-background-size: cover;
-moz-background-size: cover;
@@ -31,7 +31,7 @@ color:#C60032;font-size:1.2em;width:700px;margin-right:auto;margin-left:auto;tex
left:0;
width:100%;
height: 55px;
- /* background-image: url("redmatrixbkgd.jpg"); */
+ /* background-image: url("hubzillabkgd.jpg"); */
background: rgba(198, 0, 50, 0.8);
background-size:3000px 55px;
/* background: #afafaf;*/
diff --git a/boot.php b/boot.php
index 886ce3670..ed84f3ab8 100755
--- a/boot.php
+++ b/boot.php
@@ -5,9 +5,9 @@
*/
/**
- * Red Matrix.
+ * Hubzilla.
*
- * The Red Matrix (aka "Red") is an open source decentralised communications
+ * The Hubzilla (aka "Red") is an open source decentralised communications
* platform combined with a decentralised identity/authentication framework
* wrapped in an extensible content management system, providing website designers
* the ability to embed fully decentralised communications and social tools
@@ -45,7 +45,7 @@ require_once('include/Contact.php');
require_once('include/account.php');
-define ( 'PLATFORM_NAME', 'redmatrix' );
+define ( 'PLATFORM_NAME', 'hubzilla' );
define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R');
define ( 'ZOT_REVISION', 1 );
@@ -80,9 +80,9 @@ $DIRECTORY_FALLBACK_SERVERS = array(
'https://zothub.com',
'https://zotid.net',
'https://red.zottel.red',
- 'https://redmatrix.info',
+ 'https://hubzilla.info',
'https://my.federated.social',
- 'https://redmatrix.nl'
+ 'https://hubzilla.nl'
);
@@ -230,15 +230,16 @@ define ( 'PAGE_REMOVED', 0x8000 );
/**
- * Photo types
+ * Photo usage types
*/
define ( 'PHOTO_NORMAL', 0x0000 );
define ( 'PHOTO_PROFILE', 0x0001 );
define ( 'PHOTO_XCHAN', 0x0002 );
define ( 'PHOTO_THING', 0x0004 );
-define ( 'PHOTO_ADULT', 0x0008 );
+define ( 'PHOTO_COVER', 0x0010 );
+define ( 'PHOTO_ADULT', 0x0008 );
define ( 'PHOTO_FLAG_OS', 0x4000 );
/**
@@ -399,36 +400,6 @@ define ( 'VNOTIFY_INTRO', 0x0200 );
define ( 'VNOTIFY_REGISTER', 0x0400 );
-// We need a flag to designate that a site is a
-// global directory mirror, but probably doesn't
-// belong in hubloc.
-// This indicates a need for an 'xsite' table
-// which contains only sites and not people.
-// Then we might have to revisit hubloc as a
-// linked structure between xchan and xsite
-
-define ( 'HUBLOC_FLAGS_PRIMARY', 0x0001);
-define ( 'HUBLOC_FLAGS_UNVERIFIED', 0x0002);
-define ( 'HUBLOC_FLAGS_ORPHANCHECK', 0x0004);
-define ( 'HUBLOC_FLAGS_DELETED', 0x1000);
-
-define ( 'XCHAN_FLAGS_NORMAL', 0x0000);
-define ( 'XCHAN_FLAGS_HIDDEN', 0x0001);
-define ( 'XCHAN_FLAGS_ORPHAN', 0x0002);
-define ( 'XCHAN_FLAGS_CENSORED', 0x0004);
-define ( 'XCHAN_FLAGS_SELFCENSORED', 0x0008);
-define ( 'XCHAN_FLAGS_SYSTEM', 0x0010);
-define ( 'XCHAN_FLAGS_PUBFORUM', 0x0020);
-define ( 'XCHAN_FLAGS_DELETED', 0x1000);
-/*
- * Traficlights for Administration of HubLoc
- * to detect problems in inter server communication
- */
-define ('HUBLOC_NOTUSED', 0x0000);
-define ('HUBLOC_SEND_ERROR', 0x0001);
-define ('HUBLOC_RECEIVE_ERROR', 0x0002);
-define ('HUBLOC_WORKS', 0x0004);
-define ('HUBLOC_OFFLINE', 0x0008);
/**
* Tag/term types
@@ -550,41 +521,25 @@ define ( 'ACCOUNT_ROLE_ADMIN', 0x1000 );
*/
define ( 'ITEM_VISIBLE', 0x0000);
-define ( 'ITEM_HIDDEN', 0x0001);
+//define ( 'ITEM_HIDDEN', 0x0001);
define ( 'ITEM_BLOCKED', 0x0002);
define ( 'ITEM_MODERATED', 0x0004);
define ( 'ITEM_SPAM', 0x0008);
-define ( 'ITEM_DELETED', 0x0010);
+//define ( 'ITEM_DELETED', 0x0010);
define ( 'ITEM_UNPUBLISHED', 0x0020);
-define ( 'ITEM_WEBPAGE', 0x0040); // is a static web page, not a conversational item
+//define ( 'ITEM_WEBPAGE', 0x0040); // is a static web page, not a conversational item
define ( 'ITEM_DELAYED_PUBLISH', 0x0080);
define ( 'ITEM_BUILDBLOCK', 0x0100); // Named thusly to make sure nobody confuses this with ITEM_BLOCKED
-define ( 'ITEM_PDL', 0x0200); // Page Description Language - e.g. Comanche
+//define ( 'ITEM_PDL', 0x0200); // Page Description Language - e.g. Comanche
define ( 'ITEM_BUG', 0x0400); // Is a bug, can be used by the internal bug tracker
define ( 'ITEM_PENDING_REMOVE', 0x0800); // deleted, notification period has lapsed
-
-/**
- * Item Flags
- */
-
-define ( 'ITEM_ORIGIN', 0x0001);
-define ( 'ITEM_UNSEEN', 0x0002);
-define ( 'ITEM_STARRED', 0x0004);
-define ( 'ITEM_UPLINK', 0x0008);
-define ( 'ITEM_CONSENSUS', 0x0010); // an item which may present agree/disagree/abstain options
-define ( 'ITEM_WALL', 0x0020);
-define ( 'ITEM_THREAD_TOP', 0x0040);
-define ( 'ITEM_NOTSHOWN', 0x0080); // technically visible but not normally shown (e.g. like/dislike)
-define ( 'ITEM_NSFW', 0x0100);
-define ( 'ITEM_RELAY', 0x0200); // used only in the communication layers, not stored
-define ( 'ITEM_MENTIONSME', 0x0400);
-define ( 'ITEM_NOCOMMENT', 0x0800); // commenting/followups are disabled
-define ( 'ITEM_OBSCURED', 0x1000); // bit-mangled to protect from casual browsing by site admin
-define ( 'ITEM_VERIFIED', 0x2000); // Signature verification was successful
-define ( 'ITEM_RETAINED', 0x4000); // We looked at this item once to decide whether or not to expire it, and decided not to.
-define ( 'ITEM_RSS', 0x8000); // Item comes from a feed. Use this to decide whether to link the title
// Don't make us evaluate this same item again.
+define ( 'ITEM_TYPE_POST', 0 );
+define ( 'ITEM_TYPE_BLOCK', 1 );
+define ( 'ITEM_TYPE_PDL', 2 );
+define ( 'ITEM_TYPE_WEBPAGE', 3 );
+
define ( 'DBTYPE_MYSQL', 0 );
define ( 'DBTYPE_POSTGRES', 1 );
@@ -1522,7 +1477,7 @@ function login($register = false, $form_id = 'main-login', $hiddens=false) {
$reglink = 'register';
$reg = array(
- 'title' => t('Create an account to access services and applications within the Red Matrix'),
+ 'title' => t('Create an account to access services and applications within the Hubzilla'),
'desc' => t('Register'),
'link' => (($register) ? $reglink : 'pubsites')
);
@@ -2191,7 +2146,7 @@ function construct_page(&$a) {
}
/**
- * @brief Returns RedMatrix's root directory.
+ * @brief Returns Hubzilla's root directory.
*
* @return string
*/
@@ -2299,7 +2254,7 @@ function z_check_cert() {
/**
* @brief Send email to admin if server has an invalid certificate.
*
- * If a RedMatrix hub is available over https it must have a publicly valid
+ * If a Hubzilla hub is available over https it must have a publicly valid
* certificate.
*/
function cert_bad_email() {
diff --git a/doc/Comparison-of-activity-stream-networks.md b/doc/Comparison-of-activity-stream-networks.md
index 9d8972d7c..d76ae1006 100644
--- a/doc/Comparison-of-activity-stream-networks.md
+++ b/doc/Comparison-of-activity-stream-networks.md
@@ -4,7 +4,7 @@ The goal of this table was to provide an overview of the security and privacy pr
| project | license | distributed | supports node isolation | server-to-server encryption | 1-click E2EE* | database encryption sceme | supports cloning[^5] | encryption of private messages | PFS chat | wall-to-wall interaction | supports post editing and unsend private message | other |
|-----------+---------------+-------------+-------------------------+-------------------------------------------+------------------------------------------+-----------------------------------------------------+-------------------------+-------------------------------------------------------------------------------------------------+-----------------------------------------------+--------------------------------------------------------------+--------------------------------------------------+------------------------------------------------------------------------------|
-| redmatrix | ISC aka MIT | yes | yes | Zot (PKI) + TLS | yes (via JavaScript, AES-256) | content obfuscation, private keys hidden in the DB. | yes, partly implemented | impossible to message privately in plaintext | no | yes, multiple separated channels possible within one account | yes | privacy built in, run your own @ home, nodes are called hubs |
+| hubzilla | ISC aka MIT | yes | yes | Zot (PKI) + TLS | yes (via JavaScript, AES-256) | content obfuscation, private keys hidden in the DB. | yes, partly implemented | impossible to message privately in plaintext | no | yes, multiple separated channels possible within one account | yes | privacy built in, run your own @ home, nodes are called hubs |
| diaspora | AGPLv3orlater | yes | no[^1] | PKI + SSL/TLS[^1] | no[^2] | mostly plaintext | no | ? | no | yes, no naming policy | no | nodes are called pods |
| facebook | proprietary | no | no | planned, probably not implemented yet[^3] | implemented but not offered to users[^4] | unknown | no, walled garden | no, 3-d party plugin Cryptocat and pidgin is availiable but the user is not informed about this | no, with Cryptocat: yes, with pidgin+OTR: yes | only one wall allowed | only post editing | "real name"-policy enforced, advertising-driven, for profit company US-based |
| twitter | proprietary | no | no | unknown | no | unknown, probably none | no, walled garden | no | no | yes | only post editing | advertising-driven, for profit company US-based |
@@ -20,4 +20,4 @@ This table was edited with emacs using org-mode.
[^4]: http://www.computerworld.com/article/2488773/cybercrime-hacking/facebook-holds-back-on-end-to-end-encryption.html
-[^5]: see the redmatrix help files for details about this feature.
+[^5]: see the hubzilla help files for details about this feature.
diff --git a/doc/Developers.md b/doc/Developers.md
index e6f113bca..b19b4fc2f 100644
--- a/doc/Developers.md
+++ b/doc/Developers.md
@@ -1,4 +1,4 @@
-Red Developer Guide
+Developer Guide
===================
**Here is how you can join us.**
@@ -8,7 +8,7 @@ doing development.
Create your own github account.
-You may fork/clone the Red repository from [https://github.com/redmatrix/redmatrix.git](https://github.com/redmatrix/redmatrix.git).
+You may fork/clone the Red repository from [https://github.com/redmatrix/hubzilla.git](https://github.com/redmatrix/hubzilla.git).
Follow the instructions provided here: [http://help.github.com/fork-a-repo/](http://help.github.com/fork-a-repo/)
to create and use your own tracking fork on github
diff --git a/doc/Plugins.md b/doc/Plugins.md
index f92f4c3f2..7d802fc5c 100644
--- a/doc/Plugins.md
+++ b/doc/Plugins.md
@@ -1,3 +1,4 @@
+
Creating Plugins/Addons for the $Projectname
==========================================
@@ -7,6 +8,7 @@ So you want to make the $Projectname do something it doesn't already do. There a
In your $Projectname folder/directory, you will probably see a sub-directory called 'addon'. If you don't have one already, go ahead and create it.
+
mkdir addon
Then figure out a name for your addon. You probably have at least a vague idea of what you want it to do. For our example I'm going to create a plugin called 'randplace' that provides a somewhat random location for each of your posts. The name of your plugin is used to find the functions we need to access and is part of the function names, so to be safe, use only simple text characters.
diff --git a/doc/README.md b/doc/README.md
index 68183577e..90585a906 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -1,11 +1,42 @@
-![the $Projectname](images/rm-480x115.png)
-The $Projectname (aka "red") is an open source webapp platform providing a complete **decentralised** publishing, sharing, and communications system. It combines communications (private messaging, chat and social networking), and media management (photos, events, files, web pages, app distribution) with enough features to make your head spin.
+Hubzilla
+========
-What makes the $Projectname unique is what we call "magic authentication" - which is based on our groundbreaking work in decentralised identity services. This ties all $Projectname sites and channels together into a single super-network where the boundaries between different websites are blurred or seemingly non-existent; where "who you are" has nothing to do with "what computer you're connected to", and where website content can adapt itself according to who is viewing it.
+###Websites. Redefined.
-Warning: After experiencing magic authentication and nomadic identity, you may find it disconcerting and a bit "primitive" to go back to the old internet. You shouldn't need hundreds of different passwords to use the web ... or be totally isolated from your friends and family because a server or router in another country is having "*issues*".
-For the average person, the biggest advantage of decentralised identity is that you decide who you want to share your stuff with, and if somebody isn't on your list, they're not going to see it. It's all under your control (we're big on privacy). Use the $Projectname as a social network or a business website or for personal cloud storage or media publishing - or any number of other uses; limited only by your imagination.
-
-The $Projectname is free and open source distributed under the MIT license.
+![Hubzilla](images/ghash-32.png)
+
+**What are Hubs?**
+
+Hubs are independent general-purpose websites that not only connect with their associated members and viewers, but also connect together to exchange personal communications and other information with each other.
+This allows hub members on any hub to securely and privately share anything; with anybody, on any hub - anywhere; or share stuff publicly with anybody on the internet if desired.
+
+**Hubzilla** is the server software which makes this possible. It is a sophisticated and unique combination of an open source content management system and a decentralised identity, communications, and permissions framework and protocol suite, built using common webserver technology (PHP/MySQL/Apache, although Mariadb or Postgres and Nginx could also be used - we're pretty easy). The end result is a level of systems integration, privacy control, and communications features that you wouldn't think are possible in either a content management system or a decentralised communications network. It also brings a new level of cooperation and privacy to the web and introduces the concept of personally owned "single sign-on" to web services across the entire internet.
+
+Hubzilla hubs are
+
+* decentralised
+* inherently social
+* optionally inter-networked with other hubs
+* privacy-enabled (privacy exclusions work across the entire internet to any registered identity on any compatible hubs)
+
+Possible website applications include
+
+* decentralised social networking nodes
+* personal cloud storage
+* file dropboxes
+* managing organisational communications and activities
+* collaboration and community decision-making
+* small business websites
+* public and private media/file libraries
+* blogs
+* event promotion
+* feed aggregation and republishing
+* forums
+* dating websites
+* pretty much anything you can do on a traditional blog or community website, but that you could do better if you could easily connect it with other websites or privately share things across website boundaries.
+
+
+
+This project is under development and is not yet available for general use. \ No newline at end of file
diff --git a/doc/Remove-Account.md b/doc/Remove-Account.md
index e846f0366..a8ef733a6 100644
--- a/doc/Remove-Account.md
+++ b/doc/Remove-Account.md
@@ -14,6 +14,7 @@ Visit the URL
https://yoursite/removeme
(replace 'yoursite' with the domain name of your $Projectname site).
+
You will need to confirm your password and the channel you are currently logged into will be removed.
This is irreversible.
diff --git a/doc/addons.bb b/doc/addons.bb
index 120f668ae..1be88150d 100644
--- a/doc/addons.bb
+++ b/doc/addons.bb
@@ -61,7 +61,7 @@
[h3]Addon Repositories[/h3]
-[url=https://github.com/redmatrix/redmatrix-addons]https://github.com/redmatrix/redmatrix-addons[/url] Main project addon repository
+[url=https://github.com/redmatrix/hubzilla-addons]https://github.com/redmatrix/hubzilla-addons[/url] Main project addon repository
[url=https://github.com/23n/red-addons]https://github.com/23n/red-addons[/url] Oliver's repository (mayan_places and flip)
diff --git a/doc/addons_gnusocial.bb b/doc/addons_gnusocial.bb
index ff3aefe45..dfdce5f6a 100644
--- a/doc/addons_gnusocial.bb
+++ b/doc/addons_gnusocial.bb
@@ -10,13 +10,14 @@ Next, click the link to Register a new application. That brings up the new appli
Icon. I uploaded the $Projectname icon located at this link, after saving it to my computer:
-https://github.com/redmatrix/redmatrix/blob/master/images/rm-32.png
+https://github.com/redmatrix/hubzilla/blob/master/images/rm-32.png
-Name. Give the application an appropriate name. I called mine redmatrix. You might prefer r2g.
+Name. Give the application an appropriate name. I called mine hubzilla. You might prefer r2g.
Description. Use this field to describe the purpose of the application. I put something to the effect of use for crossposting from $Projectname to GNUsocial.
-Source URL. Put the main domain name of the Red site you're using. Don't forget to put the "s" in https://yourredmatrixsite.com. If your Red installation is a subdomain, that would probably be called for.
+
+Source URL. Put the main domain name of the Red site you're using. Don't forget to put the "s" in https://yourhubzillasite.com. If your Red installation is a subdomain, that would probably be called for.
Organization. Since $Projectname is unorganized, I put that. If you use your installation for a group or business, that might be a good option.
diff --git a/doc/campaign.bb b/doc/campaign.bb
index 68a2ac63d..48f28f0c0 100644
--- a/doc/campaign.bb
+++ b/doc/campaign.bb
@@ -153,7 +153,7 @@ Each contributor at this level gets their own $Projectname virtual private serve
We're a handful of volunteers, and we understand that not everyone can contribute by donating money. There are many other ways you can in getting the Matrix to version 1.0!
-First, you can checkout our source code on github: https://github.com/redmatrix/redmatrix
+First, you can checkout our source code on github: https://github.com/redmatrix/hubzilla
Maybe you can dive in and help us out with some development.
diff --git a/doc/classRedmatrix_1_1Import_1_1Import-members.html b/doc/classRedmatrix_1_1Import_1_1Import-members.html
new file mode 100644
index 000000000..d5e2f9277
--- /dev/null
+++ b/doc/classRedmatrix_1_1Import_1_1Import-members.html
@@ -0,0 +1,131 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
+<meta name="generator" content="Doxygen 1.8.3.1"/>
+<title>The Hubzilla: Member List</title>
+<link href="tabs.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="navtree.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="resize.js"></script>
+<script type="text/javascript" src="navtree.js"></script>
+<script type="text/javascript">
+ $(document).ready(initResizable);
+ $(window).load(resizeHeight);
+</script>
+<link href="search/search.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+ $(document).ready(function() { searchBox.OnSelectItem(0); });
+</script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
+<div id="titlearea">
+<table cellspacing="0" cellpadding="0">
+ <tbody>
+ <tr style="height: 56px;">
+ <td id="projectlogo"><img alt="Logo" src="rm-64.png"/></td>
+ <td style="padding-left: 0.5em;">
+ <div id="projectname">The Hubzilla
+ </div>
+ </td>
+ </tr>
+ </tbody>
+</table>
+</div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.3.1 -->
+<script type="text/javascript">
+var searchBox = new SearchBox("searchBox", "search",false,'Search');
+</script>
+ <div id="navrow1" class="tabs">
+ <ul class="tablist">
+ <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+ <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+ <li><a href="namespaces.html"><span>Namespaces</span></a></li>
+ <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+ <li><a href="files.html"><span>Files</span></a></li>
+ <li>
+ <div id="MSearchBox" class="MSearchBoxInactive">
+ <span class="left">
+ <img id="MSearchSelect" src="search/mag_sel.png"
+ onmouseover="return searchBox.OnSearchSelectShow()"
+ onmouseout="return searchBox.OnSearchSelectHide()"
+ alt=""/>
+ <input type="text" id="MSearchField" value="Search" accesskey="S"
+ onfocus="searchBox.OnSearchFieldFocus(true)"
+ onblur="searchBox.OnSearchFieldFocus(false)"
+ onkeyup="searchBox.OnSearchFieldChange(event)"/>
+ </span><span class="right">
+ <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+ </span>
+ </div>
+ </li>
+ </ul>
+ </div>
+ <div id="navrow2" class="tabs2">
+ <ul class="tablist">
+ <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+ <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+ <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+ <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+ </ul>
+ </div>
+</div><!-- top -->
+<div id="side-nav" class="ui-resizable side-nav-resizable">
+ <div id="nav-tree">
+ <div id="nav-tree-contents">
+ <div id="nav-sync" class="sync"></div>
+ </div>
+ </div>
+ <div id="splitbar" style="-moz-user-select:none;"
+ class="ui-resizable-handle">
+ </div>
+</div>
+<script type="text/javascript">
+$(document).ready(function(){initNavTree('classHubzilla_1_1Import_1_1Import.html','');});
+</script>
+<div id="doc-content">
+<!-- window showing the filter options -->
+<div id="MSearchSelectWindow"
+ onmouseover="return searchBox.OnSearchSelectShow()"
+ onmouseout="return searchBox.OnSearchSelectHide()"
+ onkeydown="return searchBox.OnSearchSelectKey(event)">
+<a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(0)"><span class="SelectionMark">&#160;</span>All</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(1)"><span class="SelectionMark">&#160;</span>Classes</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(2)"><span class="SelectionMark">&#160;</span>Namespaces</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(3)"><span class="SelectionMark">&#160;</span>Files</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(4)"><span class="SelectionMark">&#160;</span>Functions</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(5)"><span class="SelectionMark">&#160;</span>Variables</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(6)"><span class="SelectionMark">&#160;</span>Pages</a></div>
+
+<!-- iframe showing the search results (closed by default) -->
+<div id="MSearchResultsWindow">
+<iframe src="javascript:void(0)" frameborder="0"
+ name="MSearchResults" id="MSearchResults">
+</iframe>
+</div>
+
+<div class="header">
+ <div class="headertitle">
+<div class="title">Hubzilla\Import\Import Member List</div> </div>
+</div><!--header-->
+<div class="contents">
+
+<p>This is the complete list of members for <a class="el" href="classHubzilla_1_1Import_1_1Import.html">Hubzilla\Import\Import</a>, including all inherited members.</p>
+<table class="directory">
+ <tr class="even"><td class="entry"><a class="el" href="classHubzilla_1_1Import_1_1Import.html#a864aac9fadb4846f5d9f840e8e0f440f">$credentials</a></td><td class="entry"><a class="el" href="classHubzilla_1_1Import_1_1Import.html">Hubzilla\Import\Import</a></td><td class="entry"><span class="mlabel">private</span></td></tr>
+ <tr><td class="entry"><a class="el" href="classHubzilla_1_1Import_1_1Import.html#ad0d2bdc3b388220479063915b4f5c2fc">$itemlist</a></td><td class="entry"><a class="el" href="classHubzilla_1_1Import_1_1Import.html">Hubzilla\Import\Import</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+ <tr class="even"><td class="entry"><a class="el" href="classHubzilla_1_1Import_1_1Import.html#a0a05dac405ccc5b617b7b7b3c8ed783c">$items</a></td><td class="entry"><a class="el" href="classHubzilla_1_1Import_1_1Import.html">Hubzilla\Import\Import</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+ <tr><td class="entry"><a class="el" href="classHubzilla_1_1Import_1_1Import.html#a88c2eeba8d0cba3e7c12a2c45ba0fbc6">$src_items</a></td><td class="entry"><a class="el" href="classHubzilla_1_1Import_1_1Import.html">Hubzilla\Import\Import</a></td><td class="entry"><span class="mlabel">protected</span></td></tr>
+ <tr class="even"><td class="entry"><a class="el" href="classHubzilla_1_1Import_1_1Import.html#a5434325afb2c633c52540127d717800a">convert_child</a>($child)</td><td class="entry"><a class="el" href="classHubzilla_1_1Import_1_1Import.html">Hubzilla\Import\Import</a></td><td class="entry"></td></tr>
+ <tr><td class="entry"><a class="el" href="classHubzilla_1_1Import_1_1Import.html#a107703a43a1b0ceb2af7ae470cb3f218">convert_item</a>($item_ident)</td><td class="entry"><a class="el" href="classHubzilla_1_1Import_1_1Import.html">Hubzilla\Import\Import</a></td><td class="entry"></td></tr>
+ <tr class="even"><td class="entry"><a class="el" href="classHubzilla_1_1Import_1_1Import.html#addf6e53dacd971eaab49be4b17a767d6">convert_taxonomy</a>($item_ident)</td><td class="entry"><a class="el" href="classHubzilla_1_1Import_1_1Import.html">Hubzilla\Import\Import</a></td><td class="entry"></td></tr>
+ <tr><td class="entry"><a class="el" href="classHubzilla_1_1Import_1_1Import.html#a57561904b0f127e0d9a3e2c33688daf8">get_children</a>($item_ident)</td><td class="entry"><a class="el" href="classHubzilla_1_1Import_1_1Import.html">Hubzilla\Import\Import</a></td><td class="entry"></td></tr>
+ <tr class="even"><td class="entry"><a class="el" href="classHubzilla_1_1Import_1_1Import.html#a24134929d9a8a682da2036a0bf326367">get_credentials</a>()</td><td class="entry"><a class="el" href="classHubzilla_1_1Import_1_1Import.html">Hubzilla\Import\Import</a></td><td class="entry"></td></tr>
+ <tr><td class="entry"><a class="el" href="classHubzilla_1_1Import_1_1Import.html#a27987a41cb703a796f1821baeb4774a2">get_item</a>($item_ident)</td><td class="entry"><a class="el" href="classHubzilla_1_1Import_1_1Import.html">Hubzilla\Import\Import</a></td><td class="entry"></td></tr>
+ <tr class="even"><td class="entry"><a class="el" href="classHubzilla_1_1Import_1_1Import.html#a772c28edf36aaf8e66007a95004c4059">get_item_ident</a>($item)</td><td class="entry"><a class="el" href="classHubzilla_1_1Import_1_1Import.html">Hubzilla\Import\Import</a></td><td class="entry"></td></tr>
+ <tr><td class="entry"><a class="el" href="classHubzilla_1_1Import_1_1Import.html#a855cd5a79b95d269ae8737fae774e3bc">get_itemlist</a>()</td><td class="entry"><a class="el" href="classHubzilla_1_1Import_1_1Import.html">Hubzilla\Import\Import</a></td><td class="entry"></td></tr>
+ <tr class="even"><td class="entry"><a class="el" href="classHubzilla_1_1Import_1_1Import.html#ae3c6472bea1a44025bc2e152604eb20c">get_taxonomy</a>($item_ident)</td><td class="entry"><a class="el" href="classHubzilla_1_1Import_1_1Import.html">Hubzilla\Import\Import</a></td><td class="entry"></td></tr>
+ <tr><td class="entry"><a class="el" href="classHubzilla_1_1Import_1_1Import.html#a8d138a9a7d4f79b81d3446ca216a602c">run</a>()</td><td class="entry"><a class="el" href="classHubzilla_1_1Import_1_1Import.html">Hubzilla\Import\Import</a></td><td class="entry"></td></tr>
+ <tr class="even"><td class="entry"><a class="el" href="classHubzilla_1_1Import_1_1Import.html#a33ed595de044c0ec1cd84cca719e31dc">store</a>($item, $update=false)</td><td class="entry"><a class="el" href="classHubzilla_1_1Import_1_1Import.html">Hubzilla\Import\Import</a></td><td class="entry"></td></tr>
+</table></div><!-- contents -->
+</div><!-- doc-content --> \ No newline at end of file
diff --git a/doc/classRedmatrix_1_1Import_1_1Import.html b/doc/classRedmatrix_1_1Import_1_1Import.html
new file mode 100644
index 000000000..9a7128d65
--- /dev/null
+++ b/doc/classRedmatrix_1_1Import_1_1Import.html
@@ -0,0 +1,446 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
+<meta name="generator" content="Doxygen 1.8.3.1"/>
+<title>The Hubzilla: Hubzilla\Import\Import Class Reference</title>
+<link href="tabs.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="navtree.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="resize.js"></script>
+<script type="text/javascript" src="navtree.js"></script>
+<script type="text/javascript">
+ $(document).ready(initResizable);
+ $(window).load(resizeHeight);
+</script>
+<link href="search/search.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="search/search.js"></script>
+<script type="text/javascript">
+ $(document).ready(function() { searchBox.OnSelectItem(0); });
+</script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
+<div id="titlearea">
+<table cellspacing="0" cellpadding="0">
+ <tbody>
+ <tr style="height: 56px;">
+ <td id="projectlogo"><img alt="Logo" src="rm-64.png"/></td>
+ <td style="padding-left: 0.5em;">
+ <div id="projectname">The Hubzilla
+ </div>
+ </td>
+ </tr>
+ </tbody>
+</table>
+</div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.3.1 -->
+<script type="text/javascript">
+var searchBox = new SearchBox("searchBox", "search",false,'Search');
+</script>
+ <div id="navrow1" class="tabs">
+ <ul class="tablist">
+ <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+ <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+ <li><a href="namespaces.html"><span>Namespaces</span></a></li>
+ <li class="current"><a href="annotated.html"><span>Classes</span></a></li>
+ <li><a href="files.html"><span>Files</span></a></li>
+ <li>
+ <div id="MSearchBox" class="MSearchBoxInactive">
+ <span class="left">
+ <img id="MSearchSelect" src="search/mag_sel.png"
+ onmouseover="return searchBox.OnSearchSelectShow()"
+ onmouseout="return searchBox.OnSearchSelectHide()"
+ alt=""/>
+ <input type="text" id="MSearchField" value="Search" accesskey="S"
+ onfocus="searchBox.OnSearchFieldFocus(true)"
+ onblur="searchBox.OnSearchFieldFocus(false)"
+ onkeyup="searchBox.OnSearchFieldChange(event)"/>
+ </span><span class="right">
+ <a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
+ </span>
+ </div>
+ </li>
+ </ul>
+ </div>
+ <div id="navrow2" class="tabs2">
+ <ul class="tablist">
+ <li><a href="annotated.html"><span>Class&#160;List</span></a></li>
+ <li><a href="classes.html"><span>Class&#160;Index</span></a></li>
+ <li><a href="hierarchy.html"><span>Class&#160;Hierarchy</span></a></li>
+ <li><a href="functions.html"><span>Class&#160;Members</span></a></li>
+ </ul>
+ </div>
+</div><!-- top -->
+<div id="side-nav" class="ui-resizable side-nav-resizable">
+ <div id="nav-tree">
+ <div id="nav-tree-contents">
+ <div id="nav-sync" class="sync"></div>
+ </div>
+ </div>
+ <div id="splitbar" style="-moz-user-select:none;"
+ class="ui-resizable-handle">
+ </div>
+</div>
+<script type="text/javascript">
+$(document).ready(function(){initNavTree('classHubzilla_1_1Import_1_1Import.html','');});
+</script>
+<div id="doc-content">
+<!-- window showing the filter options -->
+<div id="MSearchSelectWindow"
+ onmouseover="return searchBox.OnSearchSelectShow()"
+ onmouseout="return searchBox.OnSearchSelectHide()"
+ onkeydown="return searchBox.OnSearchSelectKey(event)">
+<a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(0)"><span class="SelectionMark">&#160;</span>All</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(1)"><span class="SelectionMark">&#160;</span>Classes</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(2)"><span class="SelectionMark">&#160;</span>Namespaces</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(3)"><span class="SelectionMark">&#160;</span>Files</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(4)"><span class="SelectionMark">&#160;</span>Functions</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(5)"><span class="SelectionMark">&#160;</span>Variables</a><a class="SelectItem" href="javascript:void(0)" onclick="searchBox.OnSelectItem(6)"><span class="SelectionMark">&#160;</span>Pages</a></div>
+
+<!-- iframe showing the search results (closed by default) -->
+<div id="MSearchResultsWindow">
+<iframe src="javascript:void(0)" frameborder="0"
+ name="MSearchResults" id="MSearchResults">
+</iframe>
+</div>
+
+<div class="header">
+ <div class="summary">
+<a href="#pub-methods">Public Member Functions</a> &#124;
+<a href="#pro-attribs">Protected Attributes</a> &#124;
+<a href="#pri-attribs">Private Attributes</a> &#124;
+<a href="classHubzilla_1_1Import_1_1Import-members.html">List of all members</a> </div>
+ <div class="headertitle">
+<div class="title">Hubzilla\Import\Import Class Reference</div> </div>
+</div><!--header-->
+<div class="contents">
+<table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-methods"></a>
+Public Member Functions</h2></td></tr>
+<tr class="memitem:a24134929d9a8a682da2036a0bf326367"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classHubzilla_1_1Import_1_1Import.html#a24134929d9a8a682da2036a0bf326367">get_credentials</a> ()</td></tr>
+<tr class="separator:a24134929d9a8a682da2036a0bf326367"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a855cd5a79b95d269ae8737fae774e3bc"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classHubzilla_1_1Import_1_1Import.html#a855cd5a79b95d269ae8737fae774e3bc">get_itemlist</a> ()</td></tr>
+<tr class="separator:a855cd5a79b95d269ae8737fae774e3bc"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a772c28edf36aaf8e66007a95004c4059"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classHubzilla_1_1Import_1_1Import.html#a772c28edf36aaf8e66007a95004c4059">get_item_ident</a> ($item)</td></tr>
+<tr class="separator:a772c28edf36aaf8e66007a95004c4059"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a27987a41cb703a796f1821baeb4774a2"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classHubzilla_1_1Import_1_1Import.html#a27987a41cb703a796f1821baeb4774a2">get_item</a> ($item_ident)</td></tr>
+<tr class="separator:a27987a41cb703a796f1821baeb4774a2"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ae3c6472bea1a44025bc2e152604eb20c"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classHubzilla_1_1Import_1_1Import.html#ae3c6472bea1a44025bc2e152604eb20c">get_taxonomy</a> ($item_ident)</td></tr>
+<tr class="separator:ae3c6472bea1a44025bc2e152604eb20c"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a57561904b0f127e0d9a3e2c33688daf8"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classHubzilla_1_1Import_1_1Import.html#a57561904b0f127e0d9a3e2c33688daf8">get_children</a> ($item_ident)</td></tr>
+<tr class="separator:a57561904b0f127e0d9a3e2c33688daf8"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a107703a43a1b0ceb2af7ae470cb3f218"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classHubzilla_1_1Import_1_1Import.html#a107703a43a1b0ceb2af7ae470cb3f218">convert_item</a> ($item_ident)</td></tr>
+<tr class="separator:a107703a43a1b0ceb2af7ae470cb3f218"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:addf6e53dacd971eaab49be4b17a767d6"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classHubzilla_1_1Import_1_1Import.html#addf6e53dacd971eaab49be4b17a767d6">convert_taxonomy</a> ($item_ident)</td></tr>
+<tr class="separator:addf6e53dacd971eaab49be4b17a767d6"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a5434325afb2c633c52540127d717800a"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classHubzilla_1_1Import_1_1Import.html#a5434325afb2c633c52540127d717800a">convert_child</a> ($child)</td></tr>
+<tr class="separator:a5434325afb2c633c52540127d717800a"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a33ed595de044c0ec1cd84cca719e31dc"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classHubzilla_1_1Import_1_1Import.html#a33ed595de044c0ec1cd84cca719e31dc">store</a> ($item, $update=false)</td></tr>
+<tr class="separator:a33ed595de044c0ec1cd84cca719e31dc"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a8d138a9a7d4f79b81d3446ca216a602c"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classHubzilla_1_1Import_1_1Import.html#a8d138a9a7d4f79b81d3446ca216a602c">run</a> ()</td></tr>
+<tr class="separator:a8d138a9a7d4f79b81d3446ca216a602c"><td class="memSeparator" colspan="2">&#160;</td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pro-attribs"></a>
+Protected Attributes</h2></td></tr>
+<tr class="memitem:ad0d2bdc3b388220479063915b4f5c2fc"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classHubzilla_1_1Import_1_1Import.html#ad0d2bdc3b388220479063915b4f5c2fc">$itemlist</a> = null</td></tr>
+<tr class="separator:ad0d2bdc3b388220479063915b4f5c2fc"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a88c2eeba8d0cba3e7c12a2c45ba0fbc6"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classHubzilla_1_1Import_1_1Import.html#a88c2eeba8d0cba3e7c12a2c45ba0fbc6">$src_items</a> = null</td></tr>
+<tr class="separator:a88c2eeba8d0cba3e7c12a2c45ba0fbc6"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a0a05dac405ccc5b617b7b7b3c8ed783c"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classHubzilla_1_1Import_1_1Import.html#a0a05dac405ccc5b617b7b7b3c8ed783c">$items</a> = null</td></tr>
+<tr class="separator:a0a05dac405ccc5b617b7b7b3c8ed783c"><td class="memSeparator" colspan="2">&#160;</td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pri-attribs"></a>
+Private Attributes</h2></td></tr>
+<tr class="memitem:a864aac9fadb4846f5d9f840e8e0f440f"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classHubzilla_1_1Import_1_1Import.html#a864aac9fadb4846f5d9f840e8e0f440f">$credentials</a> = null</td></tr>
+<tr class="separator:a864aac9fadb4846f5d9f840e8e0f440f"><td class="memSeparator" colspan="2">&#160;</td></tr>
+</table>
+<h2 class="groupheader">Member Function Documentation</h2>
+<a class="anchor" id="a5434325afb2c633c52540127d717800a"></a>
+<div class="memitem">
+<div class="memproto">
+ <table class="memname">
+ <tr>
+ <td class="memname">Hubzilla\Import\Import::convert_child </td>
+ <td>(</td>
+ <td class="paramtype">&#160;</td>
+ <td class="paramname"><em>$child</em></td><td>)</td>
+ <td></td>
+ </tr>
+ </table>
+</div><div class="memdoc">
+
+<p>Referenced by <a class="el" href="classHubzilla_1_1Import_1_1Import.html#a8d138a9a7d4f79b81d3446ca216a602c">Hubzilla\Import\Import\run()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a107703a43a1b0ceb2af7ae470cb3f218"></a>
+<div class="memitem">
+<div class="memproto">
+ <table class="memname">
+ <tr>
+ <td class="memname">Hubzilla\Import\Import::convert_item </td>
+ <td>(</td>
+ <td class="paramtype">&#160;</td>
+ <td class="paramname"><em>$item_ident</em></td><td>)</td>
+ <td></td>
+ </tr>
+ </table>
+</div><div class="memdoc">
+
+<p>Referenced by <a class="el" href="classHubzilla_1_1Import_1_1Import.html#a8d138a9a7d4f79b81d3446ca216a602c">Hubzilla\Import\Import\run()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="addf6e53dacd971eaab49be4b17a767d6"></a>
+<div class="memitem">
+<div class="memproto">
+ <table class="memname">
+ <tr>
+ <td class="memname">Hubzilla\Import\Import::convert_taxonomy </td>
+ <td>(</td>
+ <td class="paramtype">&#160;</td>
+ <td class="paramname"><em>$item_ident</em></td><td>)</td>
+ <td></td>
+ </tr>
+ </table>
+</div><div class="memdoc">
+
+<p>Referenced by <a class="el" href="classHubzilla_1_1Import_1_1Import.html#a8d138a9a7d4f79b81d3446ca216a602c">Hubzilla\Import\Import\run()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a57561904b0f127e0d9a3e2c33688daf8"></a>
+<div class="memitem">
+<div class="memproto">
+ <table class="memname">
+ <tr>
+ <td class="memname">Hubzilla\Import\Import::get_children </td>
+ <td>(</td>
+ <td class="paramtype">&#160;</td>
+ <td class="paramname"><em>$item_ident</em></td><td>)</td>
+ <td></td>
+ </tr>
+ </table>
+</div><div class="memdoc">
+
+<p>Referenced by <a class="el" href="classHubzilla_1_1Import_1_1Import.html#a8d138a9a7d4f79b81d3446ca216a602c">Hubzilla\Import\Import\run()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a24134929d9a8a682da2036a0bf326367"></a>
+<div class="memitem">
+<div class="memproto">
+ <table class="memname">
+ <tr>
+ <td class="memname">Hubzilla\Import\Import::get_credentials </td>
+ <td>(</td>
+ <td class="paramname"></td><td>)</td>
+ <td></td>
+ </tr>
+ </table>
+</div><div class="memdoc">
+
+<p>Referenced by <a class="el" href="classHubzilla_1_1Import_1_1Import.html#a8d138a9a7d4f79b81d3446ca216a602c">Hubzilla\Import\Import\run()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a27987a41cb703a796f1821baeb4774a2"></a>
+<div class="memitem">
+<div class="memproto">
+ <table class="memname">
+ <tr>
+ <td class="memname">Hubzilla\Import\Import::get_item </td>
+ <td>(</td>
+ <td class="paramtype">&#160;</td>
+ <td class="paramname"><em>$item_ident</em></td><td>)</td>
+ <td></td>
+ </tr>
+ </table>
+</div><div class="memdoc">
+
+<p>Referenced by <a class="el" href="classHubzilla_1_1Import_1_1Import.html#a8d138a9a7d4f79b81d3446ca216a602c">Hubzilla\Import\Import\run()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a772c28edf36aaf8e66007a95004c4059"></a>
+<div class="memitem">
+<div class="memproto">
+ <table class="memname">
+ <tr>
+ <td class="memname">Hubzilla\Import\Import::get_item_ident </td>
+ <td>(</td>
+ <td class="paramtype">&#160;</td>
+ <td class="paramname"><em>$item</em></td><td>)</td>
+ <td></td>
+ </tr>
+ </table>
+</div><div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a855cd5a79b95d269ae8737fae774e3bc"></a>
+<div class="memitem">
+<div class="memproto">
+ <table class="memname">
+ <tr>
+ <td class="memname">Hubzilla\Import\Import::get_itemlist </td>
+ <td>(</td>
+ <td class="paramname"></td><td>)</td>
+ <td></td>
+ </tr>
+ </table>
+</div><div class="memdoc">
+
+<p>Referenced by <a class="el" href="classHubzilla_1_1Import_1_1Import.html#a8d138a9a7d4f79b81d3446ca216a602c">Hubzilla\Import\Import\run()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ae3c6472bea1a44025bc2e152604eb20c"></a>
+<div class="memitem">
+<div class="memproto">
+ <table class="memname">
+ <tr>
+ <td class="memname">Hubzilla\Import\Import::get_taxonomy </td>
+ <td>(</td>
+ <td class="paramtype">&#160;</td>
+ <td class="paramname"><em>$item_ident</em></td><td>)</td>
+ <td></td>
+ </tr>
+ </table>
+</div><div class="memdoc">
+
+<p>Referenced by <a class="el" href="classHubzilla_1_1Import_1_1Import.html#a8d138a9a7d4f79b81d3446ca216a602c">Hubzilla\Import\Import\run()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a8d138a9a7d4f79b81d3446ca216a602c"></a>
+<div class="memitem">
+<div class="memproto">
+ <table class="memname">
+ <tr>
+ <td class="memname">Hubzilla\Import\Import::run </td>
+ <td>(</td>
+ <td class="paramname"></td><td>)</td>
+ <td></td>
+ </tr>
+ </table>
+</div><div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a33ed595de044c0ec1cd84cca719e31dc"></a>
+<div class="memitem">
+<div class="memproto">
+ <table class="memname">
+ <tr>
+ <td class="memname">Hubzilla\Import\Import::store </td>
+ <td>(</td>
+ <td class="paramtype">&#160;</td>
+ <td class="paramname"><em>$item</em>, </td>
+ </tr>
+ <tr>
+ <td class="paramkey"></td>
+ <td></td>
+ <td class="paramtype">&#160;</td>
+ <td class="paramname"><em>$update</em> = <code>false</code>&#160;</td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>)</td>
+ <td></td><td></td>
+ </tr>
+ </table>
+</div><div class="memdoc">
+
+</div>
+</div>
+<h2 class="groupheader">Member Data Documentation</h2>
+<a class="anchor" id="a864aac9fadb4846f5d9f840e8e0f440f"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="mlabels">
+ <tr>
+ <td class="mlabels-left">
+ <table class="memname">
+ <tr>
+ <td class="memname">Hubzilla\Import\Import::$credentials = null</td>
+ </tr>
+ </table>
+ </td>
+ <td class="mlabels-right">
+<span class="mlabels"><span class="mlabel">private</span></span> </td>
+ </tr>
+</table>
+</div><div class="memdoc">
+
+<p>Referenced by <a class="el" href="classHubzilla_1_1Import_1_1Import.html#a24134929d9a8a682da2036a0bf326367">Hubzilla\Import\Import\get_credentials()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="ad0d2bdc3b388220479063915b4f5c2fc"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="mlabels">
+ <tr>
+ <td class="mlabels-left">
+ <table class="memname">
+ <tr>
+ <td class="memname">Hubzilla\Import\Import::$itemlist = null</td>
+ </tr>
+ </table>
+ </td>
+ <td class="mlabels-right">
+<span class="mlabels"><span class="mlabel">protected</span></span> </td>
+ </tr>
+</table>
+</div><div class="memdoc">
+
+<p>Referenced by <a class="el" href="classHubzilla_1_1Import_1_1Import.html#a855cd5a79b95d269ae8737fae774e3bc">Hubzilla\Import\Import\get_itemlist()</a>.</p>
+
+</div>
+</div>
+<a class="anchor" id="a0a05dac405ccc5b617b7b7b3c8ed783c"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="mlabels">
+ <tr>
+ <td class="mlabels-left">
+ <table class="memname">
+ <tr>
+ <td class="memname">Hubzilla\Import\Import::$items = null</td>
+ </tr>
+ </table>
+ </td>
+ <td class="mlabels-right">
+<span class="mlabels"><span class="mlabel">protected</span></span> </td>
+ </tr>
+</table>
+</div><div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a88c2eeba8d0cba3e7c12a2c45ba0fbc6"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="mlabels">
+ <tr>
+ <td class="mlabels-left">
+ <table class="memname">
+ <tr>
+ <td class="memname">Hubzilla\Import\Import::$src_items = null</td>
+ </tr>
+ </table>
+ </td>
+ <td class="mlabels-right">
+<span class="mlabels"><span class="mlabel">protected</span></span> </td>
+ </tr>
+</table>
+</div><div class="memdoc">
+
+</div>
+</div>
+<hr/>The documentation for this class was generated from the following file:<ul>
+<li>include/Import/<a class="el" href="Importer_8php.html">Importer.php</a></li>
+</ul>
+</div><!-- contents -->
+</div><!-- doc-content --> \ No newline at end of file
diff --git a/doc/credits.bb b/doc/credits.bb
index d2b39b009..4923bdadc 100644
--- a/doc/credits.bb
+++ b/doc/credits.bb
@@ -63,7 +63,6 @@ tonnerkiller
Antoine G
Christian Drechsler
Ludovic Grossard
-$ProjectnameCanada
Stanislav Lechev [0xAF]
aweiher
bufalo1973
diff --git a/doc/de/features.bb b/doc/de/features.bb
index 2603fdd14..6bee360eb 100644
--- a/doc/de/features.bb
+++ b/doc/de/features.bb
@@ -12,6 +12,7 @@ Eines der Design-Ziele von Red ist einfache Kommunikations über das Web, ohne d
Wenn Du in der $Projectname einen Kontakt hinzufügst (und das Beziehungs-Tool aktiviert hast), hast Du die Möglichkeit, einen „Grad der Freundschaft“ zu bestimmen. Bespiel: Wenn Du ein Blog eines Bekannten hinzufügst, könntest Du ihm den Freundschaftsgrad „Bekannte“ (Acquaintances) geben.
+
[img]https://friendicared.net/photo/b07b0262e3146325508b81a9d1ae4a1e-0.png[/img]
Wenn Du aber den privaten Kanal eines Freundes hinzufügst, wäre der Freundschaftsgrad „Freunde“ vermutlich passender.
diff --git a/doc/de/main.bb b/doc/de/main.bb
index 7627e157e..fa2168f79 100644
--- a/doc/de/main.bb
+++ b/doc/de/main.bb
@@ -80,7 +80,6 @@ Zot ist das großartige neue Kommunikationsprotokoll, das extra für die Red-Mat
[url=https://zothub.com/channel/one]Entwickler-Kanal[/url]
[url=https://federated.social/channel/postgres]Postgres-spezifischer Admin-Support-Kanal[/url]
-
[url=[baseurl]/help/credits]$Projectname Credits[/url]
[size=large][b]Über diesen Red-Server[/b][/size]
diff --git a/doc/dev_beginner.bb b/doc/dev_beginner.bb
index 33b0edc95..729625713 100644
--- a/doc/dev_beginner.bb
+++ b/doc/dev_beginner.bb
@@ -174,8 +174,8 @@ It is a good idea to read the whole manual! Git is different to other version co
Now you should
[list]
[*] create an account at github.com
-[*] fork https://github.com/redmatrix/redmatrix
-[*] fork https://github.com/redmatrix/redmatrix-addons
+[*] fork https://github.com/redmatrix/hubzilla
+[*] fork https://github.com/redmatrix/hubzilla-addons
[/list]
If you not want to use GIT from the command line - there is a usefull Eclipse plugin named ""Eclipse Mylyn to GitHub connector".
@@ -362,7 +362,7 @@ surfer@debian:/var/www$ git checkout -b dev_beginning
Make sure your local repository is up-to-date with the main project.
Add the original repository as a remote named “upstream” if not done yet
[code]
-surfer@debian:/var/www$ git remote add upstream https://github.com/redmatrix/redmatrix
+surfer@debian:/var/www$ git remote add upstream https://github.com/redmatrix/hubzilla
[/code]
Fetch the newest work from that remote
diff --git a/doc/developers.bb b/doc/developers.bb
index bec9914c8..e9dddc695 100644
--- a/doc/developers.bb
+++ b/doc/developers.bb
@@ -9,7 +9,7 @@ doing development.
Create your own github account.
-You may fork/clone the Red repository from [url=https://github.com/redmatrix/redmatrix.git]https://github.com/redmatrix/redmatrix.git[/url]
+You may fork/clone the Red repository from [url=https://github.com/redmatrix/hubzilla.git]https://github.com/redmatrix/hubzilla.git[/url]
Follow the instructions provided here: [url=http://help.github.com/fork-a-repo/]http://help.github.com/fork-a-repo/[/url]
to create and use your own tracking fork on github
diff --git a/doc/diaspora_compat.md b/doc/diaspora_compat.md
index eb7ec656d..255b565a2 100644
--- a/doc/diaspora_compat.md
+++ b/doc/diaspora_compat.md
@@ -1,12 +1,12 @@
##Diaspora Compatibility
-Diaspora protocol compatibility is presently considered an ***experimental*** feature. It may not be available on all sites and presents some serious compatibility issues with redmatrix. At the moment these compatibility issues will be shared with "Friendica-over-Diaspora" protocol communications.
+Diaspora protocol compatibility is presently considered an ***experimental*** feature. It may not be available on all sites and presents some serious compatibility issues with hubzilla. At the moment these compatibility issues will be shared with "Friendica-over-Diaspora" protocol communications.
Private mail retraction (unsend) will not be possible on Diaspora.
Private posts and their associated comments are sent in plaintext email notifications in Diaspora and Friendica. This is a major privacy issue and affects any private communications you have where *any* member of the conversation is on another network. Be aware of it.
-Access control only works on posts and comments. Diaspora members will get permission denied trying to access any other access controlled redmatrix objects such as files, photos, webpages, chatrooms, etc. In the case of private photos that are linked to posts, they will see a "prohibited sign" instead of the photo. Diaspora has no concept of private media. There is no workaround except to make your media resources public (to everybody on the internet).
+Access control only works on posts and comments. Diaspora members will get permission denied trying to access any other access controlled hubzilla objects such as files, photos, webpages, chatrooms, etc. In the case of private photos that are linked to posts, they will see a "prohibited sign" instead of the photo. Diaspora has no concept of private media. There is no workaround except to make your media resources public (to everybody on the internet).
Edited posts will not be delivered. Diaspora members will see the original post/comment without edits. There is no mechanism in the protocol to update an existing post. We cannot delete it and submit another invisibly because the message-id will change and we need to keep the same message-id on our own network. The only workaround is to delete the post/comment and do it over. We may eventually provide a way to delete the out of date copy only from Diaspora and keep it intact on networks that can handle edits.
@@ -32,7 +32,7 @@ Community tags will not work. We will send a tagging activity as a comment. It w
Privacy tags (@!somebody) will not be available to Diaspora members. These tags may have to be stripped or obscured to prevent them from being hijacked - which could result in privacy issues.
-Plus-tagged redmatrix forums should work from Diaspora.
+Plus-tagged hubzilla forums should work from Diaspora.
Premium channel redirects will not be sent. If you allow Diaspora connections, they will not see that you have a premium channel.
diff --git a/doc/encryption.bb b/doc/encryption.bb
index ae51bd9fa..9985f4b33 100644
--- a/doc/encryption.bb
+++ b/doc/encryption.bb
@@ -2,6 +2,7 @@
Full disclosure: The encryption $Projectname uses per default is not absolutely waterproof. There [i]are[/i] known procedures to circumvent it. [i]But[/i] this takes a lot of effort and needs to be done individually for each channel. And to make this clear: Other services store your messages in plaintext, therefore we regard this approach as a [i]significant[/i] improvement for your privacy. Plus you are always free to use further encryption and password protection if you so desire.
+
To explain this in more detail:
- each channel has its key pair
@@ -13,4 +14,5 @@ So what is the scope of security? Full disclosure: This might be great, but it i
We believe that the NSA-level dragnet plaintext extracting mass surveillance is probably not possible due to the design of the zot protocol. Dedicated attacks including hacking into one hub to obtain the server logs and database only partly reveal what is going on between people communication between different hubs. We believe that this makes it much more expensive for state-level attackers to access your content in $Projectname.
+
We gladly accept help improving the security of the system and auditing it as well.
diff --git a/doc/external-resource-links.bb b/doc/external-resource-links.bb
index f5f87aef7..412e84467 100644
--- a/doc/external-resource-links.bb
+++ b/doc/external-resource-links.bb
@@ -15,6 +15,6 @@
[*][url=https://addons.mozilla.org/en-US/firefox/addon/redshare/]Redshare for Firefox[/url]
[*][url=https://github.com/cvogeley/red-for-android]Red for Android[/url]
[*][url=https://github.com/zzottel/feed2red]feed2red.pl (posts Atom/RSS feeds to channel)[/url]
-[*][url=https://wordpress.org/plugins/redmatrix-wp/]WordPress gateway (combine with wppost addon for full features)[/url]
+[*][url=https://wordpress.org/plugins/hubzilla-wp/]WordPress gateway (combine with wppost addon for full features)[/url]
#include doc/macros/main_footer.bb;
diff --git a/doc/faq_developers.bb b/doc/faq_developers.bb
index 6591de3f2..027efe8f4 100644
--- a/doc/faq_developers.bb
+++ b/doc/faq_developers.bb
@@ -5,6 +5,7 @@
[h3]What does $a mean?[/h3]
$a is a class defined in boot.php and passed all around $Projectname as a global reference variable. It defines everything necessary for the $Projectname application: Server variables, URL arguments, page structures, layouts, content, installed plugins, output device info, theme info, identity of the observer and (potential) page owner ...
+
We don't ever create more than one instance and always modify the elements of the single instance. The mechanics of this are somewhat tricky. If you have a function that is passed $a and needs to modify $a you need to declare it as a reference with '&' e.g.
[code]function foo(&$a) { $a->something = 'x'; // whatever };
diff --git a/doc/hidden_configs.bb b/doc/hidden_configs.bb
index 576c53f08..76213851c 100644
--- a/doc/hidden_configs.bb
+++ b/doc/hidden_configs.bb
@@ -1,6 +1,7 @@
[b]Advanced Configurations for Administrators[/b]
$Projectname contains many configuration options hidden from the main admin panel.
+
These are generally options considered too niche, confusing, or advanced for
the average member. These settings can be activated from the the top level Red
directory with the syntax [code]util/config cat key value[/code] for a site
diff --git a/doc/history.md b/doc/history.md
index 78cc9aaa4..614696435 100644
--- a/doc/history.md
+++ b/doc/history.md
@@ -1,5 +1,5 @@
$Projectname History
-=================
+====================
$Projectname is a collaborative effort by the $Projectname community and based on work introduced in Friendica by the Friendica community. The core design, the project mission, and software base itself were created/written primarily by Mike Macgirvin and represent the culmination of over a decade of software design using variations of this platform and an evolving vision of the role of communication software in our lives. Many others have contributed to this work, both conceptually and in terms of actual code (way too many to list individually).
@@ -44,6 +44,7 @@ The concept of identity-aware content was alien to anything that existed previou
Over time a few federation components re-emerged. The ability to view RSS feeds was important to many people. Diaspora never really managed to re-write their protocol, so that was re-implemented and allowed $Projectname to connect with Diaspora and Friendica again (Friendica still had their Diaspora protocol intact, so this was the most common language now remaining on the free web - despite its faults). Diaspora communications aren't able to make use of the advanced identity features, but they work for basic communications.
+
Mike resigned from the project as an active coordinator in early 2015.
#include doc/macros/main_footer.bb;
diff --git a/doc/html/index.php b/doc/html/index.php
index 07da8b8d9..4ef28aada 100644
--- a/doc/html/index.php
+++ b/doc/html/index.php
@@ -1,10 +1,17 @@
<!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/main.bb b/doc/main.bb
index 1d323b918..506f228e4 100644
--- a/doc/main.bb
+++ b/doc/main.bb
@@ -77,8 +77,8 @@ Zot is the great new communicaton protocol invented especially for the $Projectn
[size=large][b]External Resources[/b][/size]
[zrl=[baseurl]/help/external-resource-links]External Resource Links[/zrl]
-[url=https://github.com/redmatrix/redmatrix]Main Website[/url]
-[url=https://github.com/redmatrix/redmatrix-addons]Addon Website[/url]
+[url=https://github.com/redmatrix/hubzilla]Main Website[/url]
+[url=https://github.com/redmatrix/hubzilla-addons]Addon Website[/url]
[url=https://zothub.com/channel/one]Development Channel[/url]
[url=https://federated.social/channel/postgres]Postgres-specific $Projectname Admin Support Channel[/url]
diff --git a/doc/red2pi.bb b/doc/red2pi.bb
index cede35fd9..18e7d325a 100644
--- a/doc/red2pi.bb
+++ b/doc/red2pi.bb
@@ -239,10 +239,10 @@ Cleanup: Remove the directory www/ (Git will not create files and folders in dir
Remove directory[code]pi@pi /var $ sudo rm -rf www/[/code]
Download the sources of $Projectname from GIT
-[code]pi@pi /var $ sudo git clone https://github.com/redmatrix/redmatrix.git www[/code]
+[code]pi@pi /var $ sudo git clone https://github.com/redmatrix/hubzilla.git www[/code]
Download the sources of the addons from GIT
-[code]pi@pi /var/www $ sudo git clone https://github.com/redmatrix/redmatrix-addons.git addon[/code]
+[code]pi@pi /var/www $ sudo git clone https://github.com/redmatrix/hubzilla-addons.git addon[/code]
Make user www-data the owner of the whole web directory (including subdirectories and files)
(TODO: This step has to be proofed by the next installation.)
diff --git a/doc/roadmap.bb b/doc/roadmap.bb
index b4788fda1..641fef4ca 100644
--- a/doc/roadmap.bb
+++ b/doc/roadmap.bb
@@ -49,5 +49,5 @@ Evangelism
Libzot
DNS abstraction for V3
- Allow a channel to live in an arbitrary "DNS" namespace, for instance "mike@core.redmatrix". Use our directories and zot to find the actual DNS location via redirection. This could potentially allow hubs to be hidden behind tor or alt-roots and accessible only via the matrix.
+ Allow a channel to live in an arbitrary "DNS" namespace, for instance "mike@core.hubzilla". Use our directories and zot to find the actual DNS location via redirection. This could potentially allow hubs to be hidden behind tor or alt-roots and accessible only via the matrix.
\ No newline at end of file
diff --git a/doc/to_do_code.bb b/doc/to_do_code.bb
index 73acdc7bb..b3b75473f 100644
--- a/doc/to_do_code.bb
+++ b/doc/to_do_code.bb
@@ -9,7 +9,7 @@ We need much more than this, but here are areas where developers can help. Pleas
[li]Infinite scroll improvements (i.e. embedded page links) see http://scrollsample.appspot.com/items
[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]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 hubzilla ability[/li]
[li]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]implement oembed provider interface[/li]
diff --git a/doc/troubleshooting.bb b/doc/troubleshooting.bb
index 6628e2df8..1a2bd7f12 100644
--- a/doc/troubleshooting.bb
+++ b/doc/troubleshooting.bb
@@ -14,7 +14,7 @@ In the case of "500" errors, the issues may often be logged in your webserver lo
We encourage you to try to the best of your abilities to use these logs combined with the source code in your possession to troubleshoot issues and find their cause. The community is often able to help, but only you have access to your site logfiles and it is considered a security risk to share them.
-If a code issue has been uncovered, please report it on the project bugtracker (https://github.com/redmatrix/redmatrix/issues). Again provide as much detail as possible to avoid us going back and forth asking questions about your configuration or how to duplicate the problem, so that we can get right to the problem and figure out what to do about it. You are also welcome to offer your own solutions and submit patches. In fact we encourage this as we are all volunteers and have little spare time available. The more people that help, the easier the workload for everybody. It's OK if your solution isn't perfect. Every little bit helps and perhaps we can improve on it.
+If a code issue has been uncovered, please report it on the project bugtracker (https://github.com/redmatrix/hubzilla/issues). Again provide as much detail as possible to avoid us going back and forth asking questions about your configuration or how to duplicate the problem, so that we can get right to the problem and figure out what to do about it. You are also welcome to offer your own solutions and submit patches. In fact we encourage this as we are all volunteers and have little spare time available. The more people that help, the easier the workload for everybody. It's OK if your solution isn't perfect. Every little bit helps and perhaps we can improve on it.
#include doc/macros/troubleshooting_footer.bb;
#include doc/macros/main_footer.bb;
diff --git a/doc/what_is_zot.bb b/doc/what_is_zot.bb
index 765600806..50df9e392 100644
--- a/doc/what_is_zot.bb
+++ b/doc/what_is_zot.bb
@@ -55,7 +55,7 @@ For more detailed, technical information about Zot, check out the following link
- [url=https://github.com/friendica/red/wiki/zot]Zot development specification[/url]
- - [url=https://github.com/redmatrix/redmatrix/blob/master/include/zot.php]Zot reference implementation in PHP[/url]
+ - [url=https://github.com/redmatrix/hubzilla/blob/master/include/zot.php]Zot reference implementation in PHP[/url]
#include doc/macros/main_footer.bb;
diff --git a/images/ghash-32.png b/images/ghash-32.png
new file mode 100644
index 000000000..6b4913b82
--- /dev/null
+++ b/images/ghash-32.png
Binary files differ
diff --git a/images/redmatrix_logo.svg b/images/redmatrix_logo.svg
index cb98a7fb5..840c3e624 100644
--- a/images/redmatrix_logo.svg
+++ b/images/redmatrix_logo.svg
@@ -14,7 +14,7 @@
id="svg3053"
version="1.1"
inkscape:version="0.48.4 r9939"
- sodipodi:docname="redmatrix.svg">
+ sodipodi:docname="hubzilla.svg">
<defs
id="defs3055" />
<sodipodi:namedview
diff --git a/images/rm.svg b/images/rm.svg
index 903a5c894..c056a621e 100644
--- a/images/rm.svg
+++ b/images/rm.svg
@@ -15,7 +15,7 @@
version="1.1"
inkscape:version="0.48.4 r9939"
sodipodi:docname="hashlogo.svg"
- inkscape:export-filename="/run/user/1000/gvfs/sftp:host=jeroenpraat.nl,port=69,user=root/var/www/redmatrix/assets/hashlogo2.png"
+ inkscape:export-filename="/run/user/1000/gvfs/sftp:host=jeroenpraat.nl,port=69,user=root/var/www/hubzilla/assets/hashlogo2.png"
inkscape:export-xdpi="156.42857"
inkscape:export-ydpi="156.42857">
<defs
diff --git a/include/Contact.php b/include/Contact.php
index 9490fd2da..7e7649b94 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -22,9 +22,8 @@ function rconnect_url($channel_id,$xchan) {
if(($r) && ($r[0]['xchan_follow']))
return $r[0]['xchan_follow'];
- $r = q("select hubloc_url from hubloc where hubloc_hash = '%s' and ( hubloc_flags & %d )>0 limit 1",
- dbesc($xchan),
- intval(HUBLOC_FLAGS_PRIMARY)
+ $r = q("select hubloc_url from hubloc where hubloc_hash = '%s' and hubloc_primary = 1 limit 1",
+ dbesc($xchan)
);
if($r)
@@ -272,14 +271,12 @@ function channel_remove($channel_id, $local = true, $unset_session=true) {
);
- $r = q("update hubloc set hubloc_flags = (hubloc_flags | %d) where hubloc_hash = '%s'",
- intval(HUBLOC_FLAGS_DELETED),
+ $r = q("update hubloc set hubloc_deleted = 1 where hubloc_hash = '%s'",
dbesc($channel['channel_hash'])
);
- $r = q("update xchan set xchan_flags = (xchan_flags | %d) where xchan_hash = '%s'",
- intval(XCHAN_FLAGS_DELETED),
+ $r = q("update xchan set xchan_deleted = 1 where xchan_hash = '%s'",
dbesc($channel['channel_hash'])
);
@@ -312,8 +309,7 @@ function channel_remove($channel_id, $local = true, $unset_session=true) {
intval($channel_id)
);
- $r = q("update hubloc set hubloc_flags = (hubloc_flags | %d) where hubloc_hash = '%s' and hubloc_url = '%s' ",
- intval(HUBLOC_FLAGS_DELETED),
+ $r = q("update hubloc set hubloc_deleted = 1 where hubloc_hash = '%s' and hubloc_url = '%s' ",
dbesc($channel['channel_hash']),
dbesc(z_root())
);
@@ -322,16 +318,14 @@ function channel_remove($channel_id, $local = true, $unset_session=true) {
$hublocs = 0;
- $r = q("select hubloc_id from hubloc where hubloc_hash = '%s' and not (hubloc_flags & %d)>0",
- dbesc($channel['channel_hash']),
- intval(HUBLOC_FLAGS_DELETED)
+ $r = q("select hubloc_id from hubloc where hubloc_hash = '%s' and hubloc_deleted = 0",
+ dbesc($channel['channel_hash'])
);
if($r)
$hublocs = count($r);
if(! $hublocs) {
- $r = q("update xchan set xchan_flags = (xchan_flags | %d) where xchan_hash = '%s' ",
- intval(XCHAN_FLAGS_DELETED),
+ $r = q("update xchan set xchan_deleted = 1 where xchan_hash = '%s' ",
dbesc($channel['channel_hash'])
);
}
@@ -374,10 +368,8 @@ function mark_orphan_hubsxchans() {
if($dirmode == DIRECTORY_MODE_NORMAL)
return;
- $r = q("update hubloc set hubloc_status = (hubloc_status | %d) where (hubloc_status & %d) = 0
+ $r = q("update hubloc set hubloc_error = 1 where hubloc_error = 0
and hubloc_network = 'zot' and hubloc_connected < %s - interval %s",
- intval(HUBLOC_OFFLINE),
- intval(HUBLOC_OFFLINE),
db_utcnow(), db_quoteinterval('36 day')
);
@@ -394,27 +386,21 @@ function mark_orphan_hubsxchans() {
// }
- $r = q("select hubloc_id, hubloc_hash from hubloc where (hubloc_status & %d)>0 and not (hubloc_flags & %d)>0",
- intval(HUBLOC_OFFLINE),
- intval(HUBLOC_FLAGS_ORPHANCHECK)
- );
+ $r = q("select hubloc_id, hubloc_hash from hubloc where hubloc_error = 0 and hubloc_orphancheck = 0");
if($r) {
foreach($r as $rr) {
// see if any other hublocs are still alive for this channel
- $x = q("select * from hubloc where hubloc_hash = '%s' and not (hubloc_status & %d)>0",
- dbesc($rr['hubloc_hash']),
- intval(HUBLOC_OFFLINE)
+ $x = q("select * from hubloc where hubloc_hash = '%s' and hubloc_error = 0",
+ dbesc($rr['hubloc_hash'])
);
if($x) {
// yes - if the xchan was marked as an orphan, undo it
- $y = q("update xchan set xchan_flags = (xchan_flags & ~%d) where (xchan_flags & %d)>0 and xchan_hash = '%s'",
- intval(XCHAN_FLAGS_ORPHAN),
- intval(XCHAN_FLAGS_ORPHAN),
+ $y = q("update xchan set xchan_orphan = 0 where xchan_orphan = 1 and xchan_hash = '%s'",
dbesc($rr['hubloc_hash'])
);
@@ -423,16 +409,14 @@ function mark_orphan_hubsxchans() {
// nope - mark the xchan as an orphan
- $y = q("update xchan set xchan_flags = (xchan_flags | %d) where xchan_hash = '%s'",
- intval(XCHAN_FLAGS_ORPHAN),
+ $y = q("update xchan set xchan_orphan = 1 where xchan_hash = '%s'",
dbesc($rr['hubloc_hash'])
);
}
// mark that we've checked this entry so we don't need to do it again
- $y = q("update hubloc set hubloc_flags = (hubloc_flags | %d) where hubloc_id = %d",
- intval(HUBLOC_FLAGS_ORPHANCHECK),
+ $y = q("update hubloc set hubloc_orphancheck = 1 where hubloc_id = %d",
dbesc($rr['hubloc_id'])
);
}
@@ -501,13 +485,11 @@ function remove_all_xchan_resources($xchan, $channel_id = 0) {
// directory servers need to keep the record around for sync purposes - mark it deleted
- $r = q("update hubloc set hubloc_flags = (hubloc_flags | %d) where hubloc_hash = '%s'",
- intval(HUBLOC_FLAGS_DELETED),
+ $r = q("update hubloc set hubloc_deleted = 1 where hubloc_hash = '%s'",
dbesc($xchan)
);
- $r = q("update xchan set xchan_flags = (xchan_flags | %d) where xchan_hash = '%s'",
- intval(XCHAN_FLAGS_DELETED),
+ $r = q("update xchan set xchan_deleted = 1 where xchan_hash = '%s'",
dbesc($xchan)
);
}
diff --git a/include/ConversationObject.php b/include/ConversationObject.php
index af0bb8d2c..9598bf543 100644
--- a/include/ConversationObject.php
+++ b/include/ConversationObject.php
@@ -166,7 +166,7 @@ class Conversation extends BaseObject {
if(($item->get_data_value('author_xchan') === $ob_hash) || ($item->get_data_value('owner_xchan') === $ob_hash))
$item->set_commentable(true);
- if($item->get_data_value('item_flags') & ITEM_NOCOMMENT) {
+ if(intval($item->get_data_value('item_nocomment'))) {
$item->set_commentable(false);
}
elseif(($this->observer) && (! $item->is_commentable())) {
diff --git a/include/Import/Importer.php b/include/Import/Importer.php
index 5e684cd8e..cddfac7b5 100644
--- a/include/Import/Importer.php
+++ b/include/Import/Importer.php
@@ -1,11 +1,11 @@
<?php /** @file */
-namespace RedMatrix\Import;
+namespace Hubzilla\Import;
/**
* @brief Class Import
*
- * @package RedMatrix\Import
+ * @package Hubzilla\Import
*/
class Import {
diff --git a/include/Import/refimport.php b/include/Import/refimport.php
index b9b6bf639..7d32e143f 100644
--- a/include/Import/refimport.php
+++ b/include/Import/refimport.php
@@ -88,7 +88,11 @@ function refimport_content(&$a) {
$arr['author_xchan'] = $channel['channel_hash'];
$arr['owner_xchan'] = $channel['channel_hash'];
$arr['app'] = REFLECT_BLOGNAME;
- $arr['item_flags'] = ITEM_ORIGIN|ITEM_WALL|ITEM_THREAD_TOP;
+
+ $arr['item_origin'] = 1;
+ $arr['item_wall'] = 1;
+ $arr['item_thread_top'] = 1;
+
$arr['verb'] = ACTIVITY_POST;
// this is an assumption
@@ -205,7 +209,7 @@ function reflect_find_user($users,$name) {
function reflect_comment_store($channel,$post,$comment,$user) {
- // if the commenter was the channel owner, use their redmatrix xchan
+ // if the commenter was the channel owner, use their hubzilla xchan
if($comment['author'] === REFLECT_EXPORTUSERNAME && $comment['registered'])
$hash = $channel['xchan_hash'];
@@ -256,7 +260,12 @@ function reflect_comment_store($channel,$post,$comment,$user) {
$arr['edited'] = $comment['created'];
$arr['author_xchan'] = $hash;
$arr['owner_xchan'] = $channel['channel_hash'];
- $arr['item_flags'] = ITEM_ORIGIN|ITEM_WALL;
+<<<<<<< HEAD
+ $arr['item_origin'] = 1;
+=======
+ $arr['item_flags'] = ITEM_ORIGIN;
+>>>>>>> master
+ $arr['item_wall'] = 1;
$arr['verb'] = ACTIVITY_POST;
$arr['comment_policy'] = 'contacts';
diff --git a/include/ItemObject.php b/include/ItemObject.php
index d5601edf5..d23c1c658 100644
--- a/include/ItemObject.php
+++ b/include/ItemObject.php
@@ -152,7 +152,7 @@ class Item extends BaseObject {
}
}
- $consensus = (($item['item_flags'] & ITEM_CONSENSUS) ? true : false);
+ $consensus = (intval($item['item_consensus']) ? true : false);
if($consensus) {
$response_verbs[] = 'agree';
$response_verbs[] = 'disagree';
@@ -212,9 +212,9 @@ class Item extends BaseObject {
'do' => t("Add Star"),
'undo' => t("Remove Star"),
'toggle' => t("Toggle Star Status"),
- 'classdo' => (($item['item_flags'] & ITEM_STARRED) ? "hidden" : ""),
- 'classundo' => (($item['item_flags'] & ITEM_STARRED) ? "" : "hidden"),
- 'isstarred' => (($item['item_flags'] & ITEM_STARRED) ? "starred icon-star" : "unstarred icon-star-empty"),
+ 'classdo' => (intval($item['item_starred']) ? "hidden" : ""),
+ 'classundo' => (intval($item['item_starred']) ? "" : "hidden"),
+ 'isstarred' => (intval($item['item_starred']) ? "starred icon-star" : "unstarred icon-star-empty"),
'starred' => t('starred'),
);
@@ -224,9 +224,9 @@ class Item extends BaseObject {
}
- $verified = (($item['item_flags'] & ITEM_VERIFIED) ? t('Message signature validated') : '');
- $forged = ((($item['sig']) && (! ($item['item_flags'] & ITEM_VERIFIED))) ? t('Message signature incorrect') : '');
- $unverified = '' ; // (($this->is_wall_to_wall() && (! ($item['item_flags'] & ITEM_VERIFIED))) ? t('Message cannot be verified') : '');
+ $verified = (intval($item['item_verified']) ? t('Message signature validated') : '');
+ $forged = ((($item['sig']) && (! intval($item['item_verified']))) ? t('Message signature incorrect') : '');
+ $unverified = '' ; // (($this->is_wall_to_wall() && (! intval($item['item_verified']))) ? t('Message cannot be verified') : '');
@@ -373,12 +373,16 @@ class Item extends BaseObject {
$result['children'] = array();
$nb_children = count($children);
+ $visible_comments = get_config('system','expanded_comments');
+ if($visible_comments === false)
+ $visible_comments = 3;
+
if(($this->get_display_mode() === 'normal') && ($nb_children > 0)) {
foreach($children as $child) {
$result['children'][] = $child->get_template_data($conv_responses, $thread_level + 1);
}
// Collapse
- if(($nb_children > 2) || ($thread_level > 1)) {
+ if(($nb_children > $visible_comments) || ($thread_level > 1)) {
$result['children'][0]['comment_firstcollapsed'] = true;
$result['children'][0]['num_comments'] = $comment_count_txt;
$result['children'][0]['hide_text'] = t('[+] show all');
@@ -386,7 +390,7 @@ class Item extends BaseObject {
$result['children'][$nb_children - 1]['comment_lastcollapsed'] = true;
}
else {
- $result['children'][$nb_children - 3]['comment_lastcollapsed'] = true;
+ $result['children'][$nb_children - ($visible_comments + 1)]['comment_lastcollapsed'] = true;
}
}
}
diff --git a/include/RedDAV/RedBasicAuth.php b/include/RedDAV/RedBasicAuth.php
index 19dd9a5f0..3c944a22d 100644
--- a/include/RedDAV/RedBasicAuth.php
+++ b/include/RedDAV/RedBasicAuth.php
@@ -1,6 +1,6 @@
<?php
-namespace RedMatrix\RedDAV;
+namespace Hubzilla\RedDAV;
use Sabre\DAV;
diff --git a/include/RedDAV/RedBrowser.php b/include/RedDAV/RedBrowser.php
index a0330d7cc..40d1ce0a1 100644
--- a/include/RedDAV/RedBrowser.php
+++ b/include/RedDAV/RedBrowser.php
@@ -1,6 +1,6 @@
<?php
-namespace RedMatrix\RedDAV;
+namespace Hubzilla\RedDAV;
use Sabre\DAV;
diff --git a/include/RedDAV/RedDirectory.php b/include/RedDAV/RedDirectory.php
index 922be378d..229e25835 100644
--- a/include/RedDAV/RedDirectory.php
+++ b/include/RedDAV/RedDirectory.php
@@ -1,6 +1,6 @@
<?php
-namespace RedMatrix\RedDAV;
+namespace Hubzilla\RedDAV;
use Sabre\DAV;
diff --git a/include/RedDAV/RedFile.php b/include/RedDAV/RedFile.php
index b7aa5473a..d15bfeb8e 100644
--- a/include/RedDAV/RedFile.php
+++ b/include/RedDAV/RedFile.php
@@ -1,6 +1,6 @@
<?php
-namespace RedMatrix\RedDAV;
+namespace Hubzilla\RedDAV;
use Sabre\DAV;
@@ -29,7 +29,7 @@ class RedFile extends DAV\Node implements DAV\IFile {
private $data;
/**
* @see \Sabre\DAV\Auth\Backend\BackendInterface
- * @var \RedMatrix\RedDAV\RedBasicAuth
+ * @var \Hubzilla\RedDAV\RedBasicAuth
*/
private $auth;
/**
diff --git a/include/activities.php b/include/activities.php
index ca8863e51..df43f1f6f 100644
--- a/include/activities.php
+++ b/include/activities.php
@@ -21,7 +21,10 @@ function profile_activity($changed, $value) {
$arr['uid'] = local_channel();
$arr['aid'] = $self['channel_account_id'];
$arr['owner_xchan'] = $arr['author_xchan'] = $self['xchan_hash'];
- $arr['item_flags'] = ITEM_WALL|ITEM_ORIGIN|ITEM_THREAD_TOP;
+
+ $arr['item_wall'] = 1;
+ $arr['item_origin'] = 1;
+ $arr['item_thread_top'] = 1;
$arr['verb'] = ACTIVITY_UPDATE;
$arr['obj_type'] = ACTIVITY_OBJ_PROFILE;
diff --git a/include/api.php b/include/api.php
index 6eede68f4..e4c4b5240 100644
--- a/include/api.php
+++ b/include/api.php
@@ -347,10 +347,9 @@ require_once('include/items.php');
// count public wall messages
$r = q("SELECT COUNT(`id`) as `count` FROM `item`
WHERE `uid` = %d
- AND ( item_flags & %d )>0 and item_restrict = 0
+ AND item_wall = 1 and item_restrict = 0
AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`=''",
- intval($usr[0]['channel_id']),
- intval(ITEM_WALL)
+ intval($usr[0]['channel_id'])
);
$countitms = $r[0]['count'];
}
@@ -374,9 +373,8 @@ require_once('include/items.php');
$countfollowers = $r[0]['count'];
}
- $r = q("SELECT count(`id`) as `count` FROM item where ( item_flags & %d )>0 and uid = %d and item_restrict = 0",
- intval($uinfo[0]['channel_id']),
- intval(ITEM_STARRED)
+ $r = q("SELECT count(`id`) as `count` FROM item where item_starred = 1 and uid = %d and item_restrict = 0",
+ intval($uinfo[0]['channel_id'])
);
$starred = $r[0]['count'];
@@ -1116,7 +1114,7 @@ require_once('include/items.php');
// at the network timeline just mark everything seen.
if (api_user() == $user_info['uid']) {
- $r = q("UPDATE `item` SET item_unseen = 0 where item_unseen = 1 and uid = %d",
+ $r = q("UPDATE item SET item_unseen = 0 WHERE item_unseen = 1 and uid = %d",
intval($user_info['uid'])
);
}
@@ -1823,7 +1821,7 @@ require_once('include/items.php');
'in_reply_to_user_id' => $in_reply_to_user_id,
'in_reply_to_screen_name' => $in_reply_to_screen_name,
'geo' => '',
- 'favorited' => (($item['item_flags'] & ITEM_STARRED) ? true : false),
+ 'favorited' => (intval($item['item_starred']) ? true : false),
'user' => $status_user ,
'statusnet_html' => trim(prepare_text($item['body'],$item['mimetype'])),
@@ -1971,7 +1969,7 @@ require_once('include/items.php');
'broughtbyurl' => '', 'timezone' => 'UTC', 'closed' => $closed, 'inviteonly' => 'false',
'private' => $private, 'textlimit' => $textlimit, 'sslserver' => $sslserver, 'ssl' => $ssl,
'shorturllength' => '30',
- 'redmatrix' => array(
+ 'hubzilla' => array(
'PLATFORM_NAME' => PLATFORM_NAME,
'RED_VERSION' => RED_VERSION,
'ZOT_REVISION' => ZOT_REVISION,
diff --git a/include/attach.php b/include/attach.php
index 4bbda9530..6fe440bd5 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -1036,9 +1036,13 @@ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid,
$mid = item_message_id();
- $objtype = ACTIVITY_OBJ_FILE;
+ $arr = array();
- $item_flags = ITEM_WALL|ITEM_ORIGIN;
+ $arr['item_wall'] = 1;
+ $arr['item_origin'] = 1;
+ $arr['item_unseen'] = 1;
+
+ $objtype = ACTIVITY_OBJ_FILE;
$private = (($arr_allow_cid[0] || $arr_allow_gid[0] || $arr_deny_cid[0] || $arr_deny_gid[0]) ? 1 : 0);
@@ -1077,23 +1081,20 @@ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid,
$u_mid = item_message_id();
- $arr = array();
-
$arr['aid'] = get_account_id();
$arr['uid'] = $channel_id;
$arr['mid'] = $u_mid;
$arr['parent_mid'] = $u_mid;
- $arr['item_flags'] = $item_flags;
- $arr['item_unseen'] = 1;
$arr['author_xchan'] = $poster['xchan_hash'];
$arr['owner_xchan'] = $poster['xchan_hash'];
$arr['title'] = '';
- $arr['allow_cid'] = perms2str($u_arr_allow_cid);
- $arr['allow_gid'] = perms2str($u_arr_allow_gid);
- $arr['deny_cid'] = perms2str($u_arr_deny_cid);
- $arr['deny_gid'] = perms2str($u_arr_deny_gid);
- $arr['item_restrict'] = ITEM_HIDDEN;
- $arr['item_private'] = $private;
+ //updates should be visible to everybody -> perms may have changed
+ $arr['allow_cid'] = '';
+ $arr['allow_gid'] = '';
+ $arr['deny_cid'] = '';
+ $arr['deny_gid'] = '';
+ $arr['item_hidden'] = 1;
+ $arr['item_private'] = 0;
$arr['verb'] = ACTIVITY_UPDATE;
$arr['obj_type'] = $objtype;
$arr['object'] = $u_jsonobject;
@@ -1124,7 +1125,8 @@ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid,
$arr['uid'] = $channel_id;
$arr['mid'] = $mid;
$arr['parent_mid'] = $mid;
- $arr['item_flags'] = $item_flags;
+ $arr['item_wall'] = 1;
+ $arr['item_origin'] = 1;
$arr['item_unseen'] = 1;
$arr['author_xchan'] = $poster['xchan_hash'];
$arr['owner_xchan'] = $poster['xchan_hash'];
@@ -1133,7 +1135,7 @@ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid,
$arr['allow_gid'] = perms2str($arr_allow_gid);
$arr['deny_cid'] = perms2str($arr_deny_cid);
$arr['deny_gid'] = perms2str($arr_deny_gid);
- $arr['item_restrict'] = ITEM_HIDDEN;
+ $arr['item_hidden'] = 1;
$arr['item_private'] = $private;
$arr['verb'] = (($update) ? ACTIVITY_UPDATE : ACTIVITY_POST);
$arr['obj_type'] = $objtype;
diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 8129ab5e6..fc82cb48c 100644
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -326,7 +326,7 @@ function bb2diaspora_itembody($item, $force_update = false) {
$newitem = $item;
- if(array_key_exists('item_flags',$item) && ($item['item_flags'] & ITEM_OBSCURED)) {
+ if(array_key_exists('item_obscured',$item) && intval($item['item_obscured'])) {
$key = get_config('system','prvkey');
$b = json_decode($item['body'],true);
// if called from diaspora_process_outbound, this decoding has already been done.
diff --git a/include/bbcode.php b/include/bbcode.php
index 1f5a65399..1239e5497 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -399,10 +399,49 @@ function bb_sanitize_style($input) {
return '<span style="' . $css_string_san . '">' . $input[2] . '</span>';
}
+function bb_observer($Text) {
+
+ $a = get_app();
+
+ $observer = $a->get_observer();
+
+ if ((strpos($Text,'[/observer]') !== false) || (strpos($Text,'[/rpost]') !== false)) {
+ if ($observer) {
+ $Text = preg_replace("/\[observer\=1\](.*?)\[\/observer\]/ism", '$1', $Text);
+ $Text = preg_replace("/\[observer\=0\].*?\[\/observer\]/ism", '', $Text);
+ $Text = preg_replace_callback("/\[rpost(=(.*?))?\](.*?)\[\/rpost\]/ism", 'rpost_callback', $Text);
+ } else {
+ $Text = preg_replace("/\[observer\=1\].*?\[\/observer\]/ism", '', $Text);
+ $Text = preg_replace("/\[observer\=0\](.*?)\[\/observer\]/ism", '$1', $Text);
+ $Text = preg_replace("/\[rpost(=.*?)?\](.*?)\[\/rpost\]/ism", '', $Text);
+ }
+ }
+
+ $channel = $a->get_channel();
+
+ if (strpos($Text,'[/channel]') !== false) {
+ if ($channel) {
+ $Text = preg_replace("/\[channel\=1\](.*?)\[\/channel\]/ism", '$1', $Text);
+ $Text = preg_replace("/\[channel\=0\].*?\[\/channel\]/ism", '', $Text);
+ } else {
+ $Text = preg_replace("/\[channel\=1\].*?\[\/channel\]/ism", '', $Text);
+ $Text = preg_replace("/\[channel\=0\](.*?)\[\/channel\]/ism", '$1', $Text);
+ }
+ }
+
+ return $Text;
+}
+
+
+
+
+
+
+
// BBcode 2 HTML was written by WAY2WEB.net
// extended to work with Mistpark/Friendica/Red - Mike Macgirvin
-function bbcode($Text, $preserve_nl = false, $tryoembed = true) {
+function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false) {
$a = get_app();
@@ -438,7 +477,8 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true) {
// process [observer] tags before we do anything else because we might
// be stripping away stuff that then doesn't need to be worked on anymore
- if(get_config('system','item_cache'))
+
+ if($cache)
$observer = false;
else
$observer = $a->get_observer();
@@ -455,7 +495,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true) {
}
}
- if(get_config('system','item_cache'))
+ if($cache)
$channel = false;
else
$channel = $a->get_channel();
diff --git a/include/comanche.php b/include/comanche.php
index cb46985eb..57056ae2a 100644
--- a/include/comanche.php
+++ b/include/comanche.php
@@ -5,7 +5,7 @@ require_once('include/menu.php');
require_once('include/widgets.php');
// When editing a webpage - a dropdown is needed to select a page layout
-// On submit, the pdl_select value (which is the mid of an item with item_restrict = ITEM_PDL) is stored in
+// On submit, the pdl_select value (which is the mid of an item with item_type = ITEM_TYPE_PDL) is stored in
// the webpage's resource_id, with resource_type 'pdl'.
// Then when displaying a webpage, we can see if it has a pdl attached. If not we'll
diff --git a/include/conversation.php b/include/conversation.php
index fb012667e..fe48ed2f5 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -96,7 +96,7 @@ function localize_item(&$item){
if(! $item['object'])
return;
- if($item['item_flags'] & ITEM_THREAD_TOP)
+ if(intval($item['item_thread_top']))
return;
$obj = json_decode_plus($item['object']);
@@ -356,21 +356,12 @@ function localize_item(&$item){
}
}
*/
- // add sparkle links to appropriate permalinks
-
-// $x = stristr($item['plink'],'/display/');
-// if($x) {
-// $sparkle = false;
-// $y = best_link_url($item,$sparkle,true);
- // if($sparkle)
-// $item['plink'] = $y . '?f=&url=' . $item['plink'];
-// }
// if item body was obscured and we changed it, re-obscure it
// FIXME - we need a better filter than just the string 'data'; try and
// match the fact that it's json encoded
- if(($item['item_flags'] & ITEM_OBSCURED)
+ if(intval($item['item_obscured'])
&& strlen($item['body']) && (! strpos($item['body'],'data'))) {
$item['body'] = json_encode(crypto_encapsulate($item['body'],get_config('system','pubkey')));
}
@@ -671,8 +662,8 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $
$likebuttons = false;
$shareable = false;
- $verified = (($item['item_flags'] & ITEM_VERIFIED) ? t('Message signature validated') : '');
- $forged = ((($item['sig']) && (! ($item['item_flags'] & ITEM_VERIFIED))) ? t('Message signature incorrect') : '');
+ $verified = (intval($item['item_verified']) ? t('Message signature validated') : '');
+ $forged = ((($item['sig']) && (! intval($item['item_verified']))) ? t('Message signature incorrect') : '');
$unverified = '';
diff --git a/include/diaspora.php b/include/diaspora.php
index 25e0027b2..8968ee5f4 100755
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -175,7 +175,7 @@ function diaspora_process_outbound($arr) {
$target_item = $arr['target_item'];
- if($target_item && array_key_exists('item_flags',$target_item) && ($target_item['item_flags'] & ITEM_OBSCURED)) {
+ if($target_item && array_key_exists('item_obscured',$target_item) && intval($target_item['item_obscured'])) {
$key = get_config('system','prvkey');
if($target_item['title'])
$target_item['title'] = crypto_unencapsulate(json_decode($target_item['title'],true),$key);
@@ -224,7 +224,7 @@ function diaspora_process_outbound($arr) {
if(! $contact['xchan_pubkey'])
continue;
- if(($target_item['item_restrict'] & ITEM_DELETED)
+ if(intval($target_item['item_deleted'])
&& (($target_item['mid'] === $target_item['parent_mid']) || $arr['followup'])) {
// send both top-level retractions and relayable retractions for owner to relay
diaspora_send_retraction($target_item,$arr['channel'],$contact);
@@ -253,8 +253,8 @@ function diaspora_process_outbound($arr) {
$contact = $arr['hub'];
- if(($target_item['deleted'])
- && ($target_item['mid'] === $target_item['parent_mod'])) {
+ if(intval($target_item['item_deleted'])
+ && ($target_item['mid'] === $target_item['parent_mid'])) {
// top-level retraction
logger('delivery: diaspora retract: ' . $loc);
diaspora_send_retraction($target_item,$arr['channel'],$contact,true);
@@ -330,7 +330,7 @@ function find_diaspora_person_by_handle($handle) {
if(! $person) {
// try webfinger. Make sure to distinguish between diaspora,
- // redmatrix w/diaspora protocol and friendica w/diaspora protocol.
+ // hubzilla w/diaspora protocol and friendica w/diaspora protocol.
$result = discover_by_webbie($handle);
if($result) {
@@ -709,6 +709,7 @@ function diaspora_request($importer,$xml) {
$msg = t('You have started sharing with a $Projectname premium channel.');
$msg .= t('$Projectname premium channels are not available for sharing with Diaspora members. This sharing request has been blocked.') . "\r";
+
$msg .= t('Please do not reply to this message, as this channel is not sharing with you and any reply will not be seen by the recipient.') . "\r";
$created = datetime_convert('UTC','UTC',$item['created'],'Y-m-d H:i:s \U\T\C');
@@ -965,9 +966,8 @@ function diaspora_post($importer,$xml,$msg) {
$datarray['app'] = $app;
- $datarray['item_flags'] = ITEM_THREAD_TOP;
$datarray['item_unseen'] = 1;
-
+ $datarray['item_thread_top'] = 1;
$tgroup = tgroup_check($importer['channel_id'],$datarray);
@@ -976,7 +976,6 @@ function diaspora_post($importer,$xml,$msg) {
return 202;
}
-
$result = item_store($datarray);
return;
@@ -1524,7 +1523,7 @@ function diaspora_comment($importer,$xml,$msg) {
$key = get_config('system','pubkey');
$x = array('signer' => $diaspora_handle, 'body' => $text,
'signed_text' => $signed_data, 'signature' => base64_encode($author_signature));
- $datarray['diaspora_meta'] = json_encode(crypto_encapsulate(json_encode($x),$key));
+ $datarray['diaspora_meta'] = json_encode($x);
}
@@ -1548,7 +1547,7 @@ function diaspora_comment($importer,$xml,$msg) {
if($result && $result['success'])
$message_id = $result['item_id'];
- if(($parent_item['item_flags'] & ITEM_ORIGIN) && (! $parent_author_signature)) {
+ if(intval($parent_item['item_origin']) && (! $parent_author_signature)) {
// if the message isn't already being relayed, notify others
// the existence of parent_author_signature means the parent_author or owner
// is already relaying.
@@ -1705,11 +1704,10 @@ function diaspora_conversation($importer,$xml,$msg) {
continue;
}
- $key = get_config('system','pubkey');
if($subject)
- $subject = json_encode(crypto_encapsulate($subject,$key));
+ $subject = str_rot47(base64url_encode($subject));
if($body)
- $body = json_encode(crypto_encapsulate($body,$key));
+ $body = str_rot47(base64url_encode($body));
q("insert into mail ( `channel_id`, `convid`, `from_xchan`,`to_xchan`,`title`,`body`,`mail_flags`,`mid`,`parent_mid`,`created`) values ( %d, %d, '%s', '%s', '%s', '%s', %d, '%s', '%s', '%s')",
intval($importer['channel_id']),
@@ -1839,9 +1837,9 @@ function diaspora_message($importer,$xml,$msg) {
$key = get_config('system','pubkey');
if($subject)
- $subject = json_encode(crypto_encapsulate($subject,$key));
+ $subject = str_rot47(base64url_encode($subject));
if($body)
- $body = json_encode(crypto_encapsulate($body,$key));
+ $body = str_rot47(base64url_encode($body));
q("insert into mail ( `channel_id`, `convid`, `from_xchan`,`to_xchan`,`title`,`body`,`mail_flags`,`mid`,`parent_mid`,`created`) values ( %d, %d, '%s', '%s', '%s', '%s', '%d','%s','%s','%s')",
intval($importer['channel_id']),
@@ -2138,7 +2136,7 @@ function diaspora_like($importer,$xml,$msg) {
$key = get_config('system','pubkey');
$x = array('signer' => $diaspora_handle, 'body' => $text,
'signed_text' => $signed_data, 'signature' => base64_encode($author_signature));
- $arr['diaspora_meta'] = json_encode(crypto_encapsulate(json_encode($x),$key));
+ $arr['diaspora_meta'] = json_encode($x);
}
$x = item_store($arr);
@@ -2150,7 +2148,7 @@ function diaspora_like($importer,$xml,$msg) {
// the existence of parent_author_signature means the parent_author or owner
// is already relaying. The parent_item['origin'] indicates the message was created on our system
- if(($parent_item['item_flags'] & ITEM_ORIGIN) && (! $parent_author_signature))
+ if(intval($parent_item['item_origin']) && (! $parent_author_signature))
proc_run('php','include/notifier.php','comment-import',$message_id);
return;
@@ -2259,19 +2257,12 @@ function diaspora_signed_retraction($importer,$xml,$msg) {
$r[0]['parent']
);
if($p) {
- if(($p[0]['item_flags'] & ITEM_ORIGIN) && (! $parent_author_signature)) {
-// FIXME so we can relay this
-// q("insert into sign (`retract_iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ",
-// $r[0]['id'],
-// dbesc($signed_data),
-// dbesc($sig),
-// dbesc($diaspora_handle)
-// );
+ if(intval($p[0]['item_origin']) && (! $parent_author_signature)) {
// the existence of parent_author_signature would have meant the parent_author or owner
// is already relaying.
- logger('diaspora_signed_retraction: relaying relayable_retraction');
+ logger('diaspora_signed_retraction: relaying relayable_retraction');
proc_run('php','include/notifier.php','drop',$r[0]['id']);
}
}
@@ -2617,7 +2608,7 @@ function diaspora_send_followup($item,$owner,$contact,$public_batch = false) {
$target_type = 'Post';
$positive = 'true';
- if(($item_['item_restrict'] & ITEM_DELETED))
+ if(intval($item['item_deleted']))
logger('diaspora_send_followup: received deleted "like". Those should go to diaspora_send_retraction');
}
else {
@@ -2713,7 +2704,7 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) {
$relay_retract = false;
$sql_sign_id = 'iid';
- if( $item['item_restrict'] & ITEM_DELETED) {
+ if( intval($item['item_deleted'])) {
$relay_retract = true;
$target_type = ( ($item['verb'] === ACTIVITY_LIKE) ? 'Like' : 'Comment');
@@ -2725,7 +2716,7 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) {
$like = true;
$target_type = ( $parent['mid'] === $parent['parent_mid'] ? 'Post' : 'Comment');
-// $positive = (($item['item_restrict'] & ITEM_DELETED) ? 'false' : 'true');
+// $positive = (intval($item['item_deleted']) ? 'false' : 'true');
$positive = 'true';
$tpl = get_markup_template('diaspora_like_relay.tpl');
@@ -2875,11 +2866,10 @@ function diaspora_send_mail($item,$owner,$contact) {
);
if(array_key_exists('mail_flags',$item) && ($item['mail_flags'] & MAIL_OBSCURED)) {
- $key = get_config('system','prvkey');
-// if($item['title'])
-// $item['title'] = crypto_unencapsulate(json_decode_plus($item['title']),$key);
+ if($item['title'])
+ $item['title'] = base64url_decode(str_rot47($item['title']));
if($item['body'])
- $item['body'] = crypto_unencapsulate(json_decode_plus($item['body']),$key);
+ $item['body'] = base64url_decode(str_rot47($item['body']));
}
diff --git a/include/dir_fns.php b/include/dir_fns.php
index 77c78558c..902a0c1a3 100644
--- a/include/dir_fns.php
+++ b/include/dir_fns.php
@@ -414,19 +414,13 @@ function local_dir_update($uid, $force) {
logger('hidden: ' . $hidden);
- $r = q("select xchan_flags from xchan where xchan_hash = '%s' limit 1",
+ $r = q("select xchan_hidden from xchan where xchan_hash = '%s' limit 1",
dbesc($p[0]['channel_hash'])
);
- // Be careful - XCHAN_FLAGS_HIDDEN should evaluate to 1
- if (($r[0]['xchan_flags'] & XCHAN_FLAGS_HIDDEN) != $hidden)
- $new_flags = $r[0]['xchan_flags'] ^ XCHAN_FLAGS_HIDDEN;
- else
- $new_flags = $r[0]['xchan_flags'];
-
- if ($new_flags != $r[0]['xchan_flags']) {
- $r = q("update xchan set xchan_flags = %d where xchan_hash = '%s'",
- intval($new_flags),
+ if(intval($r[0]['xchan_hidden']) != $hidden) {
+ $r = q("update xchan set xchan_hidden = %d where xchan_hash = '%s'",
+ intval($hidden),
dbesc($p[0]['channel_hash'])
);
}
diff --git a/include/enotify.php b/include/enotify.php
index b1aae816b..cd49a9b34 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -82,8 +82,9 @@ function notification($params) {
localize_item($i);
$title = $i['title'];
$body = $i['body'];
- $private = (($i['item_private']) || ($i['item_flags'] & ITEM_OBSCURED));
- } else {
+ $private = (($i['item_private']) || intval($i['item_obscured']));
+ }
+ else {
$title = $params['item']['title'];
$body = $params['item']['body'];
}
@@ -171,7 +172,7 @@ function notification($params) {
$item_post_type);
// "your post"
- if($p[0]['owner']['xchan_name'] == $p[0]['author']['xchan_name'] && ($p[0]['item_flags'] & ITEM_WALL))
+ if($p[0]['owner']['xchan_name'] == $p[0]['author']['xchan_name'] && intval($p[0]['item_wall']))
$dest_str = sprintf(t('%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]'),
$recip['channel_name'],
'[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]',
@@ -642,4 +643,4 @@ class enotify {
);
logger("notification: enotify::send returns " . $res, LOGGER_DEBUG);
}
-} \ No newline at end of file
+}
diff --git a/include/event.php b/include/event.php
index 0b1e56ae2..0d8b2132b 100644
--- a/include/event.php
+++ b/include/event.php
@@ -471,48 +471,50 @@ function event_store_item($arr, $event) {
$private = (($arr['allow_cid'] || $arr['allow_gid'] || $arr['deny_cid'] || $arr['deny_gid']) ? 1 : 0);
+ $item_wall = 0;
+ $item_origin = 0;
+ $item_thread_top = 0;
+
if($item) {
$item_arr['id'] = $item['id'];
}
else {
$wall = (($z[0]['channel_hash'] == $event['event_xchan']) ? true : false);
-
- $item_flags = ITEM_THREAD_TOP;
+ $item_thread_top = 1;
if($wall) {
- $item_flags |= ITEM_WALL;
- $item_flags |= ITEM_ORIGIN;
+ $item_wall = 1;
+ $item_origin = 1;
}
- $item_arr['item_flags'] = $item_flags;
}
if(! $arr['mid'])
$arr['mid'] = item_message_id();
- $item_arr['aid'] = $z[0]['channel_account_id'];
- $item_arr['uid'] = $arr['uid'];
- $item_arr['author_xchan'] = $arr['event_xchan'];
- $item_arr['mid'] = $arr['mid'];
- $item_arr['parent_mid'] = $arr['mid'];
-
- $item_arr['owner_xchan'] = (($wall) ? $z[0]['channel_hash'] : $arr['event_xchan']);
- $item_arr['author_xchan'] = $arr['event_xchan'];
- $item_arr['title'] = $arr['summary'];
- $item_arr['allow_cid'] = $arr['allow_cid'];
- $item_arr['allow_gid'] = $arr['allow_gid'];
- $item_arr['deny_cid'] = $arr['deny_cid'];
- $item_arr['deny_gid'] = $arr['deny_gid'];
- $item_arr['item_private'] = $private;
- $item_arr['verb'] = ACTIVITY_POST;
+ $item_arr['aid'] = $z[0]['channel_account_id'];
+ $item_arr['uid'] = $arr['uid'];
+ $item_arr['author_xchan'] = $arr['event_xchan'];
+ $item_arr['mid'] = $arr['mid'];
+ $item_arr['parent_mid'] = $arr['mid'];
+ $item_arr['owner_xchan'] = (($wall) ? $z[0]['channel_hash'] : $arr['event_xchan']);
+ $item_arr['author_xchan'] = $arr['event_xchan'];
+ $item_arr['title'] = $arr['summary'];
+ $item_arr['allow_cid'] = $arr['allow_cid'];
+ $item_arr['allow_gid'] = $arr['allow_gid'];
+ $item_arr['deny_cid'] = $arr['deny_cid'];
+ $item_arr['deny_gid'] = $arr['deny_gid'];
+ $item_arr['item_private'] = $private;
+ $item_arr['verb'] = ACTIVITY_POST;
+ $item_arr['item_wall'] = $item_wall;
+ $item_arr['item_origin'] = $item_origin;
+ $item_arr['item_thread_top'] = $item_thread_top;;
if(array_key_exists('term', $arr))
$item_arr['term'] = $arr['term'];
- $item_arr['resource_type'] = 'event';
- $item_arr['resource_id'] = $event['event_hash'];
-
- $item_arr['obj_type'] = ACTIVITY_OBJ_EVENT;
-
- $item_arr['body'] = $prefix . format_event_bbcode($arr);
+ $item_arr['resource_type'] = 'event';
+ $item_arr['resource_id'] = $event['event_hash'];
+ $item_arr['obj_type'] = ACTIVITY_OBJ_EVENT;
+ $item_arr['body'] = $prefix . format_event_bbcode($arr);
// if it's local send the permalink to the channel page.
// otherwise we'll fallback to /display/$message_id
diff --git a/include/expire.php b/include/expire.php
index e5d456896..8ba9f746b 100644
--- a/include/expire.php
+++ b/include/expire.php
@@ -12,9 +12,7 @@ function expire_run($argv, $argc){
// perform final cleanup on previously delete items
- $r = q("select id from item where (item_restrict & %d) > 0 and (item_restrict & %d) = 0
- and changed < %s - INTERVAL %s",
- intval(ITEM_DELETED),
+ $r = q("select id from item where item_deleted = 1 and not (item_restrict & %d)>0 and changed < %s - INTERVAL %s",
intval(ITEM_PENDING_REMOVE),
db_utcnow(), db_quoteinterval('10 DAY')
);
diff --git a/include/externals.php b/include/externals.php
index b0f853dc6..3b6d170d5 100644
--- a/include/externals.php
+++ b/include/externals.php
@@ -93,26 +93,6 @@ function externals_run($argv, $argc){
$results = process_delivery(array('hash' => 'undefined'), get_item_elements($message),
array(array('hash' => $sys['xchan_hash'])), false, true);
$total ++;
-// $z = q("select id from item where mid = '%s' and uid = %d limit 1",
-// dbesc($message['message_id']),
-// intval($sys['channel_id'])
-// );
-$z = null;
- if($z) {
- $flag_bits = ITEM_WALL|ITEM_ORIGIN|ITEM_UPLINK;
- // preserve the source
-
- $r = q("update item set source_xchan = owner_xchan where id = %d",
- intval($z[0]['id'])
- );
-
- $r = q("update item set item_flags = ( item_flags | %d ), owner_xchan = '%s'
- where id = %d",
- intval($flag_bits),
- dbesc($sys['xchan_hash']),
- intval($z[0]['id'])
- );
- }
}
logger('externals: import_public_posts: ' . $total . ' messages imported', LOGGER_DEBUG);
}
diff --git a/include/group.php b/include/group.php
index fe55ec23f..a5e25fb76 100644
--- a/include/group.php
+++ b/include/group.php
@@ -200,11 +200,10 @@ function group_get_members($gid) {
if(intval($gid)) {
$r = q("SELECT * FROM `group_member`
LEFT JOIN abook ON abook_xchan = `group_member`.`xchan` left join xchan on xchan_hash = abook_xchan
- WHERE `gid` = %d AND abook_channel = %d and `group_member`.`uid` = %d and not ( xchan_flags & %d )>0 and not ( abook_flags & %d )>0 and not ( abook_flags & %d )>0 ORDER BY xchan_name ASC ",
+ WHERE `gid` = %d AND abook_channel = %d and `group_member`.`uid` = %d and xchan_deleted = 0 and not ( abook_flags & %d )>0 and not ( abook_flags & %d )>0 ORDER BY xchan_name ASC ",
intval($gid),
intval(local_channel()),
intval(local_channel()),
- intval(XCHAN_FLAGS_DELETED),
intval(ABOOK_FLAG_BLOCKED),
intval(ABOOK_FLAG_PENDING)
);
@@ -245,7 +244,7 @@ function group_side($every="connections",$each="group",$edit = false, $group_id
$o = '';
- if(! local_channel())
+ if(! (local_channel() && feature_enabled(local_channel(),'groups')))
return '';
$groups = array();
diff --git a/include/hubloc.php b/include/hubloc.php
index a4efe1c75..515223f53 100644
--- a/include/hubloc.php
+++ b/include/hubloc.php
@@ -96,8 +96,7 @@ function remove_obsolete_hublocs() {
? intval(get_config('system','delivery_interval')) : 2 );
foreach($r as $rr) {
- q("update hubloc set hubloc_flags = (hubloc_flags | %d) where hubloc_id = %d",
- intval(HUBLOC_FLAGS_DELETED),
+ q("update hubloc set hubloc_deleted = 1 where hubloc_id = %d",
intval($rr['hubloc_id'])
);
@@ -121,7 +120,7 @@ function hubloc_change_primary($hubloc) {
logger('no hubloc');
return false;
}
- if(! ($hubloc['hubloc_flags'] & HUBLOC_FLAGS_PRIMARY)) {
+ if(! (intval($hubloc['hubloc_primary']))) {
logger('not primary: ' . $hubloc['hubloc_url']);
return false;
}
@@ -206,7 +205,7 @@ function xchan_store($arr) {
if(! $arr['photo'])
$arr['photo'] = z_root() . '/' . get_default_profile_photo();
- $r = q("insert into xchan ( xchan_hash, xchan_guid, xchan_guid_sig, xchan_pubkey, xchan_addr, xchan_url, xchan_connurl, xchan_follow, xchan_connpage, xchan_name, xchan_network, xchan_instance_url, xchan_flags, xchan_name_date ) values ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s','%s','%s','%s',%d,'%s') ",
+ $r = q("insert into xchan ( xchan_hash, xchan_guid, xchan_guid_sig, xchan_pubkey, xchan_addr, xchan_url, xchan_connurl, xchan_follow, xchan_connpage, xchan_name, xchan_network, xchan_instance_url, xchan_hidden, xchan_orphan, xchan_censored, xchan_selfcensored, xchan_system, xchan_pubforum, xchan_deleted, xchan_name_date ) values ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s','%s','%s','%s',%d, %d, %d, %d, %d, %d, %d, '%s') ",
dbesc($arr['hash']),
dbesc($arr['guid']),
dbesc($arr['guid_sig']),
@@ -219,7 +218,13 @@ function xchan_store($arr) {
dbesc($arr['name']),
dbesc($arr['network']),
dbesc($arr['instance_url']),
- intval($arr['flags']),
+ intval($arr['hidden']),
+ intval($arr['orphan']),
+ intval($arr['censored']),
+ intval($arr['selfcensored']),
+ intval($arr['system']),
+ intval($arr['pubforum']),
+ intval($arr['deleted']),
dbesc(datetime_convert())
);
if(! $r)
diff --git a/include/identity.php b/include/identity.php
index 06d8a4cf8..b07706ae0 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -100,7 +100,7 @@ function create_sys_channel() {
'name' => 'System',
'pageflags' => PAGE_SYSTEM,
'publish' => 0,
- 'xchanflags' => XCHAN_FLAGS_SYSTEM
+ 'system' => 1
));
}
@@ -201,7 +201,7 @@ function create_identity($arr) {
$name = escape_tags($arr['name']);
$pageflags = ((x($arr,'pageflags')) ? intval($arr['pageflags']) : PAGE_NORMAL);
- $xchanflags = ((x($arr,'xchanflags')) ? intval($arr['xchanflags']) : XCHAN_FLAGS_NORMAL);
+ $system = ((x($arr,'system')) ? intval($arr['system']) : 0);
$name_error = validate_channelname($arr['name']);
if($name_error) {
$ret['message'] = $name_error;
@@ -300,14 +300,14 @@ function create_identity($arr) {
// Create a verified hub location pointing to this site.
- $r = q("insert into hubloc ( hubloc_guid, hubloc_guid_sig, hubloc_hash, hubloc_addr, hubloc_flags,
+ $r = q("insert into hubloc ( hubloc_guid, hubloc_guid_sig, hubloc_hash, hubloc_addr, hubloc_primary,
hubloc_url, hubloc_url_sig, hubloc_host, hubloc_callback, hubloc_sitekey, hubloc_network )
values ( '%s', '%s', '%s', '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s' )",
dbesc($guid),
dbesc($sig),
dbesc($hash),
dbesc($ret['channel']['channel_address'] . '@' . get_app()->get_hostname()),
- intval(($primary) ? HUBLOC_FLAGS_PRIMARY : 0),
+ intval($primary),
dbesc(z_root()),
dbesc(base64url_encode(rsa_sign(z_root(),$ret['channel']['channel_prvkey']))),
dbesc(get_app()->get_hostname()),
@@ -320,7 +320,7 @@ function create_identity($arr) {
$newuid = $ret['channel']['channel_id'];
- $r = q("insert into xchan ( xchan_hash, xchan_guid, xchan_guid_sig, xchan_pubkey, xchan_photo_l, xchan_photo_m, xchan_photo_s, xchan_addr, xchan_url, xchan_follow, xchan_connurl, xchan_name, xchan_network, xchan_photo_date, xchan_name_date, xchan_flags ) values ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d)",
+ $r = q("insert into xchan ( xchan_hash, xchan_guid, xchan_guid_sig, xchan_pubkey, xchan_photo_l, xchan_photo_m, xchan_photo_s, xchan_addr, xchan_url, xchan_follow, xchan_connurl, xchan_name, xchan_network, xchan_photo_date, xchan_name_date, xchan_system ) values ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d)",
dbesc($hash),
dbesc($guid),
dbesc($sig),
@@ -336,7 +336,7 @@ function create_identity($arr) {
dbesc('zot'),
dbesc(datetime_convert()),
dbesc(datetime_convert()),
- intval($xchanflags)
+ intval($system)
);
// Not checking return value.
@@ -583,9 +583,7 @@ function identity_basic_export($channel_id, $items = false) {
/** @warning this may run into memory limits on smaller systems */
- $r = q("select * from item where (item_flags & %d)>0 and not (item_restrict & %d)>0 and uid = %d",
- intval(ITEM_WALL),
- intval(ITEM_DELETED),
+ $r = q("select * from item where item_wall = 1 and item_deleted = 0 and uid = %d",
intval($channel_id)
);
if($r) {
@@ -1372,7 +1370,7 @@ function get_default_profile_photo($size = 175) {
}
/**
- * @brief Test whether a given identity is NOT a member of the Red Matrix.
+ * @brief Test whether a given identity is NOT a member of the Hubzilla.
*
* @param string $s;
* xchan_hash of the identity in question
@@ -1383,7 +1381,7 @@ function is_foreigner($s) {
}
/**
- * @brief Test whether a given identity is a member of the Red Matrix.
+ * @brief Test whether a given identity is a member of the Hubzilla.
*
* @param string $s;
* xchan_hash of the identity in question
diff --git a/include/items.php b/include/items.php
index 71d4213b7..cc777788c 100755
--- a/include/items.php
+++ b/include/items.php
@@ -382,12 +382,12 @@ function post_activity_item($arr) {
if((($arr['parent']) && $arr['parent'] != $arr['id']) || (($arr['parent_mid']) && $arr['parent_mid'] != $arr['mid']))
$is_comment = true;
- if(! x($arr,'item_flags')) {
- if($is_comment)
- $arr['item_flags'] = ITEM_ORIGIN;
- else
- $arr['item_flags'] = ITEM_ORIGIN | ITEM_WALL | ITEM_THREAD_TOP;
- }
+ if(! array_key_exists('item_origin',$arr))
+ $arr['item_origin'] = 1;
+ if(! array_key_exists('item_wall',$arr) && (! $is_comment))
+ $arr['item_wall'] = 1;
+ if(! array_key_exists('item_thread_top',$arr) && (! $is_comment))
+ $arr['item_thread_top'] = 1;
$channel = get_app()->get_channel();
$observer = get_app()->get_observer();
@@ -414,17 +414,9 @@ function post_activity_item($arr) {
if($channel) {
if($channel['channel_hash'] === $arr['author_xchan']) {
$arr['sig'] = base64url_encode(rsa_sign($arr['body'],$channel['channel_prvkey']));
- $arr['item_flags'] = $arr['item_flags'] | ITEM_VERIFIED;
+ $arr['item_verified'] = 1;
}
}
-
- logger('Encrypting local storage');
- $key = get_config('system','pubkey');
- $arr['item_flags'] = $arr['item_flags'] | ITEM_OBSCURED;
- if($arr['title'])
- $arr['title'] = json_encode(crypto_encapsulate($arr['title'],$key));
- if($arr['body'])
- $arr['body'] = json_encode(crypto_encapsulate($arr['body'],$key));
}
$arr['mid'] = ((x($arr,'mid')) ? $arr['mid'] : item_message_id());
@@ -446,7 +438,7 @@ function post_activity_item($arr) {
$arr['comment_policy'] = map_scope($channel['channel_w_comment']);
- if ((! $arr['plink']) && ($arr['item_flags'] & ITEM_THREAD_TOP)) {
+ if ((! $arr['plink']) && (intval($arr['item_thread_top']))) {
$arr['plink'] = z_root() . '/channel/' . $channel['channel_address'] . '/?f=&mid=' . $arr['mid'];
}
@@ -851,7 +843,7 @@ function get_item_elements($x) {
$arr['sig'] = (($x['signature']) ? htmlspecialchars($x['signature'], ENT_COMPAT,'UTF-8',false) : '');
- $arr['diaspora_meta'] = (($x['diaspora_signature']) ? json_encode(crypto_encapsulate($x['diaspora_signature'],$key)) : '');
+ $arr['diaspora_meta'] = (($x['diaspora_signature']) ? json_encode($x['diaspora_signature']) : '');
$arr['object'] = activity_sanitise($x['object']);
$arr['target'] = activity_sanitise($x['target']);
@@ -863,11 +855,12 @@ function get_item_elements($x) {
$arr['item_flags'] = 0;
if(array_key_exists('flags',$x) && in_array('consensus',$x['flags']))
- $arr['item_flags'] |= ITEM_CONSENSUS;
+ $arr['item_consensus'] = 1;
+
if(array_key_exists('flags',$x) && in_array('deleted',$x['flags']))
- $arr['item_restrict'] |= ITEM_DELETED;
+ $arr['item_deleted'] = 1;
if(array_key_exists('flags',$x) && in_array('hidden',$x['flags']))
- $arr['item_restrict'] |= ITEM_HIDDEN;
+ $arr['item_hidden'] = 1;
// Here's the deal - the site might be down or whatever but if there's a new person you've never
// seen before sending stuff to your stream, we MUST be able to look them up and import their data from their
@@ -895,26 +888,11 @@ function get_item_elements($x) {
dbesc($arr['author_xchan'])
);
if($r && rsa_verify($x['body'],base64url_decode($arr['sig']),$r[0]['xchan_pubkey']))
- $arr['item_flags'] |= ITEM_VERIFIED;
+ $arr['item_verified'] = 1;
else
logger('get_item_elements: message verification failed.');
}
-
- // if it's a private post, encrypt it in the DB.
- // We have to do that here because we need to cleanse the input and prevent bad stuff from getting in,
- // and we need plaintext to do that.
-
-
- if(intval($arr['item_private'])) {
- $arr['item_flags'] = $arr['item_flags'] | ITEM_OBSCURED;
- if($arr['title'])
- $arr['title'] = json_encode(crypto_encapsulate($arr['title'],$key));
- if($arr['body'])
- $arr['body'] = json_encode(crypto_encapsulate($arr['body'],$key));
- }
-
-
if(array_key_exists('revision',$x)) {
// extended export encoding
@@ -1112,7 +1090,7 @@ function encode_item($item,$mirror = false) {
$key = get_config('system','prvkey');
- if(array_key_exists('item_flags',$item) && ($item['item_flags'] & ITEM_OBSCURED)) {
+ if(array_key_exists('item_obscured',$item) && intval($item['item_obscured'])) {
if($item['title'])
$item['title'] = crypto_unencapsulate(json_decode_plus($item['title']),$key);
if($item['body'])
@@ -1178,7 +1156,7 @@ function encode_item($item,$mirror = false) {
$x['public_scope'] = $scope;
- if($item['item_flags'] & ITEM_NOCOMMENT)
+ if($item['item_nocomment'])
$x['comment_scope'] = 'none';
else
$x['comment_scope'] = $c_scope;
@@ -1186,9 +1164,15 @@ function encode_item($item,$mirror = false) {
if($item['term'])
$x['tags'] = encode_item_terms($item['term']);
- if($item['diaspora_meta'])
- $x['diaspora_signature'] = crypto_unencapsulate(json_decode($item['diaspora_meta'],true),$key);
-
+ if($item['diaspora_meta']) {
+ $z = json_decode($item['diaspora_meta'],true);
+ if($z) {
+ if(array_key_exists('iv',$z))
+ $x['diaspora_signature'] = crypto_unencapsulate($z,$key);
+ else
+ $x['diaspora_signature'] = $z;
+ }
+ }
logger('encode_item: ' . print_r($x,true), LOGGER_DATA);
return $x;
@@ -1401,15 +1385,15 @@ function encode_item_flags($item) {
$ret = array();
- if($item['item_restrict'] & ITEM_DELETED)
+ if(intval($item['item_deleted']))
$ret[] = 'deleted';
- if($item['item_restrict'] & ITEM_HIDDEN)
+ if(intval($item['item_hidden']))
$ret[] = 'hidden';
- if($item['item_flags'] & ITEM_THREAD_TOP)
+ if(intval($item['item_thread_top']))
$ret[] = 'thread_parent';
- if($item['item_flags'] & ITEM_NSFW)
+ if(intval($item['item_nsfw']))
$ret[] = 'nsfw';
- if($item['item_flags'] & ITEM_CONSENSUS)
+ if(intval($item['item_consensus']))
$ret[] = 'consensus';
if($item['item_private'])
$ret[] = 'private';
@@ -1423,11 +1407,10 @@ function encode_mail($item) {
$x['encoding'] = 'zot';
if(array_key_exists('mail_flags',$item) && ($item['mail_flags'] & MAIL_OBSCURED)) {
- $key = get_config('system','prvkey');
if($item['title'])
- $item['title'] = crypto_unencapsulate(json_decode_plus($item['title']),$key);
+ $item['title'] = base64url_decode(str_rot47($item['title']));
if($item['body'])
- $item['body'] = crypto_unencapsulate(json_decode_plus($item['body']),$key);
+ $item['body'] = base64url_decode(str_rot47($item['body']));
}
$x['message_id'] = $item['mid'];
@@ -1479,13 +1462,15 @@ function get_mail_elements($x) {
$key = get_config('system','pubkey');
$arr['mail_flags'] |= MAIL_OBSCURED;
- $arr['body'] = htmlspecialchars($arr['body'],ENT_COMPAT,'UTF-8',false);
- if($arr['body'])
- $arr['body'] = json_encode(crypto_encapsulate($arr['body'],$key));
- $arr['title'] = htmlspecialchars($arr['title'],ENT_COMPAT,'UTF-8',false);
- if($arr['title'])
- $arr['title'] = json_encode(crypto_encapsulate($arr['title'],$key));
+ if($arr['body']) {
+ $arr['body'] = str_rot47(base64url_encode($arr['body']));
+ $arr['body'] = htmlspecialchars($arr['body'],ENT_COMPAT,'UTF-8',false);
+ }
+ if($arr['title']) {
+ $arr['title'] = str_rot47(base64url_encode($arr['title']));
+ $arr['title'] = htmlspecialchars($arr['title'],ENT_COMPAT,'UTF-8',false);
+ }
if($arr['created'] > datetime_convert())
$arr['created'] = datetime_convert();
@@ -1567,7 +1552,7 @@ function get_atom_elements($feed, $item, &$author) {
$res['title'] = unxmlify($item->get_title());
$res['body'] = unxmlify($item->get_content());
$res['plink'] = unxmlify($item->get_link(0));
- $res['item_flags'] = ITEM_RSS;
+ $res['item_rss'] = 1;
// removing the content of the title if its identically to the body
@@ -2007,11 +1992,11 @@ function item_store($arr, $allow_exec = false) {
// If a page layout is provided, ensure it exists and belongs to us.
if(array_key_exists('layout_mid',$arr) && $arr['layout_mid']) {
- $l = q("select item_restrict from item where mid = '%s' and uid = %d limit 1",
+ $l = q("select item_type from item where mid = '%s' and uid = %d limit 1",
dbesc($arr['layout_mid']),
intval($arr['uid'])
);
- if((! $l) || (! ($l[0]['item_restrict'] & ITEM_PDL)))
+ if((! $l) || (! ($l[0]['item_type'] != ITEM_TYPE_PDL)))
unset($arr['layout_mid']);
}
@@ -2041,11 +2026,12 @@ function item_store($arr, $allow_exec = false) {
$arr['deny_gid'] = ((x($arr,'deny_gid')) ? trim($arr['deny_gid']) : '');
$arr['item_private'] = ((x($arr,'item_private')) ? intval($arr['item_private']) : 0 );
$arr['item_flags'] = ((x($arr,'item_flags')) ? intval($arr['item_flags']) : 0 );
+ $arr['item_wall'] = ((x($arr,'item_wall')) ? intval($arr['item_wall']) : 0 );
// only detect language if we have text content, and if the post is private but not yet
// obscured, make it so.
- if(! ($arr['item_flags'] & ITEM_OBSCURED)) {
+ if((! array_key_exists('item_obscured',$arr)) || $arr['item_obscured'] == 0) {
$arr['lang'] = detect_language($arr['body']);
// apply the input filter here - if it is obscured it has been filtered already
@@ -2055,7 +2041,7 @@ function item_store($arr, $allow_exec = false) {
$channel = get_app()->get_channel();
if($channel['channel_hash'] === $arr['author_xchan']) {
$arr['sig'] = base64url_encode(rsa_sign($arr['body'],$channel['channel_prvkey']));
- $arr['item_flags'] |= ITEM_VERIFIED;
+ $arr['item_verified'] = 1;
}
}
@@ -2071,14 +2057,6 @@ function item_store($arr, $allow_exec = false) {
}
$arr = $translate['item'];
}
- if($arr['item_private']) {
- $key = get_config('system','pubkey');
- $arr['item_flags'] = $arr['item_flags'] | ITEM_OBSCURED;
- if($arr['title'])
- $arr['title'] = json_encode(crypto_encapsulate($arr['title'],$key));
- if($arr['body'])
- $arr['body'] = json_encode(crypto_encapsulate($arr['body'],$key));
- }
}
if((x($arr,'object')) && is_array($arr['object'])) {
@@ -2125,11 +2103,12 @@ function item_store($arr, $allow_exec = false) {
$arr['public_policy'] = ((x($arr,'public_policy')) ? notags(trim($arr['public_policy'])) : '' );
$arr['comment_policy'] = ((x($arr,'comment_policy')) ? notags(trim($arr['comment_policy'])) : 'contacts' );
+
+ if(! array_key_exists('item_unseen',$arr))
+ $arr['item_unseen'] = 1;
- $arr['item_unseen'] = ((array_key_exists('item_unseen',$arr)) ? intval($arr['item_unseen']) : 1);
-
- if($arr['comment_policy'] == 'none')
- $arr['item_flags'] = $arr['item_flags'] | ITEM_NOCOMMENT;
+ if((! array_key_exists('item_nocomment',$arr)) && ($arr['comment_policy'] == 'none'))
+ $arr['item_nocomment'] = 1;
// handle time travelers
// Allow a bit of fudge in case somebody just has a slightly slow/fast clock
@@ -2153,7 +2132,7 @@ function item_store($arr, $allow_exec = false) {
$deny_gid = $arr['deny_gid'];
$public_policy = $arr['public_policy'];
$comments_closed = $arr['comments_closed'];
- $arr['item_flags'] = $arr['item_flags'] | ITEM_THREAD_TOP;
+ $arr['item_thread_top'] = 1;
}
else {
@@ -2203,7 +2182,7 @@ function item_store($arr, $allow_exec = false) {
}
$parent_id = $r[0]['id'];
- $parent_deleted = $r[0]['item_restrict'] & ITEM_DELETED;
+ $parent_deleted = $r[0]['item_deleted'];
$allow_cid = $r[0]['allow_cid'];
$allow_gid = $r[0]['allow_gid'];
$deny_cid = $r[0]['deny_cid'];
@@ -2211,8 +2190,8 @@ function item_store($arr, $allow_exec = false) {
$public_policy = $r[0]['public_policy'];
$comments_closed = $r[0]['comments_closed'];
- if($r[0]['item_flags'] & ITEM_WALL)
- $arr['item_flags'] = $arr['item_flags'] | ITEM_WALL;
+ if(intval($r[0]['item_wall']))
+ $arr['item_wall'] = 1;
// An uplinked comment might arrive with a downstream owner.
// Fix it.
@@ -2231,7 +2210,7 @@ function item_store($arr, $allow_exec = false) {
// The original author commented, but as this is a comment, the permissions
// weren't fixed up so it will still show the comment as private unless we fix it here.
- if((intval($r[0]['item_flags']) & ITEM_UPLINK) && (! $r[0]['item_private']))
+ if(intval($r[0]['item_uplink']) && (! $r[0]['item_private']))
$arr['item_private'] = 0;
}
else {
@@ -2242,7 +2221,7 @@ function item_store($arr, $allow_exec = false) {
}
if($parent_deleted)
- $arr['item_restrict'] = $arr['item_restrict'] | ITEM_DELETED;
+ $arr['item_deleted'] = 1;
$r = q("SELECT `id` FROM `item` WHERE `mid` = '%s' AND `uid` = %d LIMIT 1",
dbesc($arr['mid']),
@@ -2419,14 +2398,7 @@ function item_store_update($arr,$allow_exec = false) {
// override the unseen flag with the original
- if(intval($arr['item_flags']))
- $arr['item_unseen'] = 0;
-
- if($orig[0]['item_flags'] & ITEM_VERIFIED)
- $orig[0]['item_flags'] = $orig[0]['item_flags'] ^ ITEM_VERIFIED;
-
- if($orig[0]['item_flags'] & ITEM_OBSCURED)
- $orig[0]['item_flags'] = $orig[0]['item_flags'] ^ ITEM_OBSCURED;
+ $arr['item_unseen'] = $orig[0]['item_unseen'];
$arr['item_flags'] = intval($arr['item_flags']) | $orig[0]['item_flags'];
$arr['item_restrict'] = intval($arr['item_restrict']) | $orig[0]['item_restrict'];
@@ -2442,19 +2414,19 @@ function item_store_update($arr,$allow_exec = false) {
return $ret;
}
- if(! ($arr['item_flags'] & ITEM_OBSCURED)) {
+ if((! array_key_exists('item_obscured', $arr)) || $arr['item_obscured'] == 0) {
$arr['lang'] = detect_language($arr['body']);
- // apply the input filter here - if it is obscured it has been filtered already
- $arr['body'] = z_input_filter($arr['uid'],$arr['body'],$arr['mimetype']);
-
- if(local_channel() && (! $arr['sig'])) {
- $channel = get_app()->get_channel();
- if($channel['channel_hash'] === $arr['author_xchan']) {
- $arr['sig'] = base64url_encode(rsa_sign($arr['body'],$channel['channel_prvkey']));
- $arr['item_flags'] |= ITEM_VERIFIED;
- }
- }
+ // apply the input filter here - if it is obscured it has been filtered already
+ $arr['body'] = z_input_filter($arr['uid'],$arr['body'],$arr['mimetype']);
+
+ if(local_channel() && (! $arr['sig'])) {
+ $channel = get_app()->get_channel();
+ if($channel['channel_hash'] === $arr['author_xchan']) {
+ $arr['sig'] = base64url_encode(rsa_sign($arr['body'],$channel['channel_prvkey']));
+ $arr['item_verified'] = 1;
+ }
+ }
$allowed_languages = get_pconfig($arr['uid'],'system','allowed_languages');
@@ -2468,14 +2440,6 @@ function item_store_update($arr,$allow_exec = false) {
}
$arr = $translate['item'];
}
- if($arr['item_private']) {
- $key = get_config('system','pubkey');
- $arr['item_flags'] = $arr['item_flags'] | ITEM_OBSCURED;
- if($arr['title'])
- $arr['title'] = json_encode(crypto_encapsulate($arr['title'],$key));
- if($arr['body'])
- $arr['body'] = json_encode(crypto_encapsulate($arr['body'],$key));
- }
}
if((x($arr,'object')) && is_array($arr['object'])) {
@@ -2535,6 +2499,7 @@ function item_store_update($arr,$allow_exec = false) {
$arr['title'] = ((array_key_exists('title',$arr) && strlen($arr['title'])) ? trim($arr['title']) : '');
$arr['body'] = ((array_key_exists('body',$arr) && strlen($arr['body'])) ? trim($arr['body']) : '');
+ $arr['html'] = ((array_key_exists('html',$arr) && strlen($arr['html'])) ? trim($arr['html']) : '');
$arr['attach'] = ((x($arr,'attach')) ? notags(trim($arr['attach'])) : $orig[0]['attach']);
$arr['app'] = ((x($arr,'app')) ? notags(trim($arr['app'])) : $orig[0]['app']);
@@ -2649,11 +2614,10 @@ function store_diaspora_comment_sig($datarray, $channel, $parent_item, $post_id,
$x = array('signer' => $diaspora_handle, 'body' => $signed_body, 'signed_text' => $signed_text, 'signature' => base64_encode($authorsig));
- $key = get_config('system','pubkey');
- $y = crypto_encapsulate(json_encode($x),$key);
+ $y = json_encode($x);
$r = q("update item set diaspora_meta = '%s' where id = %d",
- dbesc(json_encode($y)),
+ dbesc($y),
intval($post_id)
);
@@ -2778,8 +2742,8 @@ function tag_deliver($uid, $item_id) {
$item = $i[0];
- if(($item['source_xchan']) && ($item['item_flags'] & ITEM_UPLINK)
- && ($item['item_flags'] & ITEM_THREAD_TOP) && ($item['edited'] != $item['created'])) {
+ if(($item['source_xchan']) && intval($item['item_uplink'])
+ && intval($item['item_thread_top']) && ($item['edited'] != $item['created'])) {
// this is an update (edit) to a post which was already processed by us and has a second delivery chain
// Just start the second delivery chain to deliver the updated post
proc_run('php','include/notifier.php','tgroup',$item['id']);
@@ -2878,13 +2842,13 @@ function tag_deliver($uid, $item_id) {
// This might be a followup (e.g. comment) by the original post author to a tagged forum
// If so setup a second delivery chain
- if( ! ($item['item_flags'] & ITEM_THREAD_TOP)) {
+ if( ! intval($item['item_thread_top'])) {
$x = q("select * from item where id = parent and parent = %d and uid = %d limit 1",
intval($item['parent']),
intval($uid)
);
- if(($x) && ($x[0]['item_flags'] & ITEM_UPLINK)) {
+ if(($x) && intval($x[0]['item_uplink'])) {
start_delivery_chain($u[0],$item,$item_id,$x[0]);
}
}
@@ -2912,9 +2876,8 @@ function tag_deliver($uid, $item_id) {
if($mention) {
logger('tag_deliver: mention found for ' . $u[0]['channel_name']);
-
- $r = q("update item set item_flags = ( item_flags | %d ) where id = %d",
- intval(ITEM_MENTIONSME),
+
+ $r = q("update item set item_mentionsme = 1 where id = %d",
intval($item_id)
);
@@ -2924,7 +2887,7 @@ function tag_deliver($uid, $item_id) {
$body = '';
- if($item['item_flags'] & ITEM_OBSCURED) {
+ if(intval($item['item_obscured'])) {
$key = get_config('system','prvkey');
if($item['body'])
$body = crypto_unencapsulate(json_decode_plus($item['body']),$key);
@@ -3008,10 +2971,8 @@ function tag_deliver($uid, $item_id) {
// prevent delivery looping - only proceed
// if the message originated elsewhere and is a top-level post
- if(($item['item_flags'] & ITEM_WALL)
- || ($item['item_flags'] & ITEM_ORIGIN)
- || (!($item['item_flags'] & ITEM_THREAD_TOP))
- || ($item['id'] != $item['parent'])) {
+
+ if(intval($item['item_wall']) || intval($item['item_origin']) || (! intval($item['item_thread_top'])) || ($item['id'] != $item['parent'])) {
logger('tag_deliver: item was local or a comment. rejected.');
return;
}
@@ -3036,10 +2997,9 @@ function tgroup_check($uid,$item) {
// or is a followup and we have already accepted the top level post as an uplink
if($item['mid'] != $item['parent_mid']) {
- $r = q("select id from item where mid = '%s' and uid = %d and ( item_flags & %d )>0 limit 1",
+ $r = q("select id from item where mid = '%s' and uid = %d and item_uplink = 1 limit 1",
dbesc($item['parent_mid']),
- intval($uid),
- intval(ITEM_UPLINK)
+ intval($uid)
);
if($r)
return true;
@@ -3085,7 +3045,7 @@ function tgroup_check($uid,$item) {
$body = $item['body'];
- if(array_key_exists('item_flags',$item) && ($item['item_flags'] & ITEM_OBSCURED) && $body) {
+ if(array_key_exists('item_obscured',$item) && intval($item['item_obscured']) && $body) {
$key = get_config('system','prvkey');
$body = crypto_unencapsulate(json_decode($body,true),$key);
}
@@ -3148,20 +3108,14 @@ function start_delivery_chain($channel, $item, $item_id, $parent) {
if((! $private) && $new_public_policy)
$private = 1;
- $flag_bits = $item['item_flags'] | ITEM_WALL;
-
- // The message didn't necessarily originate on this site, (we'll honour it if it did),
- // but the parent post of this thread will be reset as a local post, as it is the top of
- // this delivery chain and is coming from this site, regardless of where the original
- // originated.
- if(! $parent)
- $flag_bits = $flag_bits | ITEM_ORIGIN;
+ $item_wall = 1;
+ $item_origin = 1;
+ $item_uplink = 0;
+ $item_nocomment = 0;
+ $item_obscured = 0;
- // unset the nocomment bit if it's there.
-
- if($flag_bits & ITEM_NOCOMMENT)
- $flag_bits = $flag_bits ^ ITEM_NOCOMMENT;
+ $flag_bits = $item['item_flags'];
// maintain the original source, which will be the original item owner and was stored in source_xchan
// when we created the delivery fork
@@ -3173,7 +3127,7 @@ function start_delivery_chain($channel, $item, $item_id, $parent) {
);
}
else {
- $flag_bits = $flag_bits | ITEM_UPLINK;
+ $item_uplink = 1;
$r = q("update item set source_xchan = owner_xchan where id = %d",
intval($item_id)
);
@@ -3182,29 +3136,22 @@ function start_delivery_chain($channel, $item, $item_id, $parent) {
$title = $item['title'];
$body = $item['body'];
- if($private) {
- if(!($flag_bits & ITEM_OBSCURED)) {
- $key = get_config('system','pubkey');
- $flag_bits = $flag_bits|ITEM_OBSCURED;
- if($title)
- $title = json_encode(crypto_encapsulate($title,$key));
- if($body)
- $body = json_encode(crypto_encapsulate($body,$key));
- }
- }
- else {
+ if(! $private) {
if($flag_bits & ITEM_OBSCURED) {
$key = get_config('system','prvkey');
- $flag_bits = $flag_bits ^ ITEM_OBSCURED;
if($title)
$title = crypto_unencapsulate(json_decode($title,true),$key);
if($body)
$body = crypto_unencapsulate(json_decode($body,true),$key);
+ $item_obscured = 0;
}
}
- $r = q("update item set item_flags = %d, owner_xchan = '%s', allow_cid = '%s', allow_gid = '%s',
- deny_cid = '%s', deny_gid = '%s', item_private = %d, public_policy = '%s', comment_policy = '%s', title = '%s', body = '%s' where id = %d",
+ $r = q("update item set item_uplink = %d, item_nocomment = %d, item_obscured = %d, item_flags = %d, owner_xchan = '%s', allow_cid = '%s', allow_gid = '%s',
+ deny_cid = '%s', deny_gid = '%s', item_private = %d, public_policy = '%s', comment_policy = '%s', title = '%s', body = '%s', item_wall = %d, item_origin = %d where id = %d",
+ intval($item_uplink),
+ intval($item_nocomment),
+ intval($item_obscured),
intval($flag_bits),
dbesc($channel['channel_hash']),
dbesc($channel['channel_allow_cid']),
@@ -3216,6 +3163,8 @@ function start_delivery_chain($channel, $item, $item_id, $parent) {
dbesc(map_scope($channel['channel_w_comment'])),
dbesc($title),
dbesc($body),
+ intval($item_wall),
+ $intval($item_origin),
intval($item_id)
);
@@ -3462,7 +3411,7 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
if($r) {
$item = $r[0];
- if(! ($item['item_restrict'] & ITEM_DELETED)) {
+ if(! intval($item['item_deleted'])) {
logger('consume_feed: deleting item ' . $item['id'] . ' mid=' . base64url_decode($item['mid']), LOGGER_DEBUG);
drop_item($item['id'],false);
}
@@ -3957,22 +3906,21 @@ function item_expire($uid,$days) {
$expire_network_only = 1;
+ $sql_extra = ((intval($expire_network_only)) ? " AND item_wall = 0 " : "");
+
$expire_limit = get_config('system','expire_limit');
if(! intval($expire_limit))
$expire_limit = 5000;
- $sql_extra = ((intval($expire_network_only)) ? " AND (item_flags & " . intval(ITEM_WALL) . ") = 0 " : "");
-
$r = q("SELECT * FROM `item`
WHERE `uid` = %d
AND `created` < %s - INTERVAL %s
AND `id` = `parent`
$sql_extra
- AND ( item_flags & %d ) = 0
- AND ( item_restrict = 0 ) LIMIT $expire_limit ",
+ AND item_retained = 0
+ AND (item_restrict = 0 ) LIMIT $expire_limit ",
intval($uid),
- db_utcnow(), db_quoteinterval(intval($days).' DAY'),
- intval(ITEM_RETAINED)
+ db_utcnow(), db_quoteinterval(intval($days).' DAY')
);
if(! $r)
@@ -3996,7 +3944,7 @@ function item_expire($uid,$days) {
retain_item($item['id']);
continue;
}
- if($item['item_flags'] & ITEM_STARRED) {
+ if(intval($item['item_starred'])) {
retain_item($item['id']);
continue;
}
@@ -4008,8 +3956,7 @@ function item_expire($uid,$days) {
}
function retain_item($id) {
- $r = q("update item set item_flags = (item_flags | %d ) where id = %d",
- intval(ITEM_RETAINED),
+ $r = q("update item set item_retained = 1 where id = %d",
intval($id)
);
}
@@ -4054,7 +4001,7 @@ function drop_item($id,$interactive = true,$stage = DROPITEM_NORMAL,$force = fal
intval($id)
);
- if((! $r) || (($r[0]['item_restrict'] & ITEM_DELETED) && ($stage === DROPITEM_NORMAL))) {
+ if((! $r) || (intval($r[0]['item_deleted']) && ($stage === DROPITEM_NORMAL))) {
if(! $interactive)
return 0;
notice( t('Item not found.') . EOL);
@@ -4090,10 +4037,16 @@ function drop_item($id,$interactive = true,$stage = DROPITEM_NORMAL,$force = fal
// set the deleted flag immediately on this item just in case the
// hook calls a remote process which loops. We'll delete it properly in a second.
- $r = q("UPDATE item SET item_restrict = ( item_restrict | %d ) WHERE id = %d",
- intval(($linked_item && ! $force) ? ITEM_HIDDEN : ITEM_DELETED),
- intval($item['id'])
- );
+ if(($linked_item) && (! $force)) {
+ $r = q("UPDATE item SET item_hidden = 1 WHERE id = %d",
+ intval($item['id'])
+ );
+ }
+ else {
+ $r = q("UPDATE item SET item_deleted = 1 WHERE id = %d",
+ intval($item['id'])
+ );
+ }
$arr = array('item' => $item, 'interactive' => $interactive, 'stage' => $stage);
call_hooks('drop_item', $arr );
@@ -4122,7 +4075,7 @@ function drop_item($id,$interactive = true,$stage = DROPITEM_NORMAL,$force = fal
// We'll rely on the undocumented behaviour that DROPITEM_PHASE1 is (hopefully) only
// set if we know we're going to send delete notifications out to others.
- if((($item['item_flags'] & ITEM_WALL) && ($stage != DROPITEM_PHASE2)) || ($stage == DROPITEM_PHASE1))
+ if((intval($item['item_wall']) && ($stage != DROPITEM_PHASE2)) || ($stage == DROPITEM_PHASE1))
proc_run('php','include/notifier.php','drop',$notify_id);
goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
@@ -4164,30 +4117,37 @@ function delete_item_lowlevel($item, $stage = DROPITEM_NORMAL, $force = false) {
break;
case DROPITEM_PHASE1:
- $r = q("UPDATE item SET item_restrict = ( item_restrict | %d ),
- changed = '%s', edited = '%s' WHERE id = %d",
- intval(($linked_item && ! $force) ? ITEM_HIDDEN : ITEM_DELETED),
- dbesc(datetime_convert()),
- dbesc(datetime_convert()),
- intval($item['id'])
- );
+ if($linked_item && ! $force) {
+ $r = q("UPDATE item SET item_hidden = 1,
+ changed = '%s', edited = '%s' WHERE id = %d",
+ dbesc(datetime_convert()),
+ dbesc(datetime_convert()),
+ intval($item['id'])
+ );
+ }
+ else {
+ $r = q("UPDATE item set item_deleted = 1, changed = '%s', edited = '%s' where if = %d",
+ dbesc(datetime_convert()),
+ dbesc(datetime_convert()),
+ intval($item['id'])
+ );
+ }
+
break;
case DROPITEM_NORMAL:
default:
if($linked_item && ! $force) {
- $r = q("UPDATE item SET item_restrict = ( item_restrict | %d ),
+ $r = q("UPDATE item SET item_hidden = 1,
changed = '%s', edited = '%s' WHERE id = %d",
- intval(ITEM_HIDDEN),
dbesc(datetime_convert()),
dbesc(datetime_convert()),
intval($item['id'])
);
}
else {
- $r = q("UPDATE item SET item_restrict = ( item_restrict | %d ), body = '', title = '',
+ $r = q("UPDATE item SET item_deleted = 1, body = '', title = '',
changed = '%s', edited = '%s' WHERE id = %d",
- intval(ITEM_DELETED),
dbesc(datetime_convert()),
dbesc(datetime_convert()),
intval($item['id'])
@@ -4232,7 +4192,7 @@ function delete_item_lowlevel($item, $stage = DROPITEM_NORMAL, $force = false) {
function first_post_date($uid,$wall = false) {
- $wall_sql = (($wall) ? sprintf(" and (item_flags & %d)>0 ", ITEM_WALL) : "" );
+ $wall_sql = (($wall) ? " and item_wall = 1 " : "" );
$r = q("select id, created from item
where item_restrict = %d and uid = %d and id = parent $wall_sql
@@ -4439,20 +4399,18 @@ function zot_feed($uid,$observer_hash,$arr) {
if(is_sys_channel($uid)) {
$r = q("SELECT parent, created, postopts from item
WHERE uid != %d
- AND item_private = 0 AND item_restrict = 0 AND uid in (" . stream_perms_api_uids(PERMS_PUBLIC,10,1) . ")
- AND (item_flags & %d) > 0
- $sql_extra GROUP BY parent ORDER BY created ASC $limit",
- intval($uid),
- intval(ITEM_WALL)
+ and uid in (" . stream_perms_api_uids(PERMS_PUBLIC,10,1) . ") AND item_restrict = 0
+ AND item_wall = 1
+ and item_private = 0 $sql_extra GROUP BY parent ORDER BY created ASC $limit",
+ intval($uid)
);
}
else {
$r = q("SELECT parent, created, postopts from item
WHERE uid = %d AND item_restrict = 0
- AND (item_flags & %d) > 0
+ AND item_wall = 1
$sql_extra GROUP BY parent ORDER BY created ASC $limit",
- intval($uid),
- intval(ITEM_WALL)
+ intval($uid)
);
}
@@ -4516,13 +4474,13 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C
}
if($arr['star'])
- $sql_options .= " and (item_flags & " . intval(ITEM_STARRED) . ")>0 ";
+ $sql_options .= " and item_starred = 1 ";
if($arr['wall'])
- $sql_options .= " and (item_flags & " . intval(ITEM_WALL) . ")>0 ";
-
- $sql_extra = " AND item.parent IN ( SELECT parent FROM item WHERE (item_flags & " . intval(ITEM_THREAD_TOP) . ")>0 $sql_options ) ";
-
+ $sql_options .= " and item_wall = 1 ";
+
+ $sql_extra = " AND item.parent IN ( SELECT parent FROM item WHERE item_thread_top = 1 $sql_options ) ";
+
if($arr['since_id'])
$sql_extra .= " and item.id > " . $since_id . " ";
@@ -4585,24 +4543,24 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C
}
if($arr['search']) {
- if(strpos($arr['search'],'#') === 0)
- $sql_extra .= term_query('item',substr($arr['search'],1),TERM_HASHTAG);
- else
- $sql_extra .= sprintf(" AND item.body like '%s' ",
- dbesc(protect_sprintf('%' . $arr['search'] . '%'))
- );
- }
- if (strlen($arr['file'])) {
- $sql_extra .= term_query('item',$arr['files'],TERM_FILE);
- }
+ if(strpos($arr['search'],'#') === 0)
+ $sql_extra .= term_query('item',substr($arr['search'],1),TERM_HASHTAG);
+ else
+ $sql_extra .= sprintf(" AND item.body like '%s' ",
+ dbesc(protect_sprintf('%' . $arr['search'] . '%'))
+ );
+ }
- if ($arr['conv'] && $channel) {
- $sql_extra .= sprintf(" AND parent IN (SELECT distinct parent from item where ( author_xchan like '%s' or ( item_flags & %d )>0)) ",
- dbesc(protect_sprintf($uidhash)),
- intval(ITEM_MENTIONSME)
- );
- }
+ if(strlen($arr['file'])) {
+ $sql_extra .= term_query('item',$arr['files'],TERM_FILE);
+ }
+
+ if($arr['conv'] && $channel) {
+ $sql_extra .= sprintf(" AND parent IN (SELECT distinct parent from item where ( author_xchan like '%s' or item_mentionsme = 1 )) ",
+ dbesc(protect_sprintf($uidhash))
+ );
+ }
if (($client_mode & CLIENT_MODE_UPDATE) && (! ($client_mode & CLIENT_MODE_LOAD))) {
// only setup pagination on initial page view
@@ -4637,19 +4595,19 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C
}
}
- $simple_update = (($client_mode & CLIENT_MODE_UPDATE) ? " and ( item.item_unseen = 1 ) " : '');
- if ($client_mode & CLIENT_MODE_LOAD)
- $simple_update = '';
+ $simple_update = (($client_mode & CLIENT_MODE_UPDATE) ? " and item.item_unseen = 1 " : '');
+ if($client_mode & CLIENT_MODE_LOAD)
+ $simple_update = '';
//$start = dba_timer();
require_once('include/security.php');
$sql_extra .= item_permissions_sql($channel['channel_id'],$observer_hash);
- if ($arr['pages'])
- $item_restrict = " AND (item_restrict & " . ITEM_WEBPAGE . ") ";
+ if($arr['pages'])
+ $item_restrict = " AND item_type = " . ITEM_TYPE_WEBPAGE . " ";
else
- $item_restrict = " AND item_restrict = 0 ";
+ $item_restrict = " AND item_type = 0 ";
if ($arr['nouveau'] && ($client_mode & CLIENT_MODE_LOAD) && $channel) {
// "New Item View" - show all items unthreaded in reverse created date order
@@ -4753,11 +4711,11 @@ function update_remote_id($channel,$post_id,$webpage,$pagetitle,$namespace,$remo
if(! $post_id)
return;
- if($webpage & ITEM_WEBPAGE)
+ if($webpage == ITEM_TYPE_WEBPAGE)
$page_type = 'WEBPAGE';
- elseif($webpage & ITEM_BUILDBLOCK)
+ elseif($webpage == ITEM_TYPE_BLOCK)
$page_type = 'BUILDBLOCK';
- elseif($webpage & ITEM_PDL)
+ elseif($webpage == ITEM_TYPE_PDL)
$page_type = 'PDL';
elseif($namespace && $remote_id) {
$page_type = $namespace;
diff --git a/include/message.php b/include/message.php
index bfc92cd6d..8f1430e64 100644
--- a/include/message.php
+++ b/include/message.php
@@ -163,11 +163,10 @@ function send_message($uid = 0, $recipient='', $body='', $subject='', $replyto='
$jattach = (($attachments) ? json_encode($attachments) : '');
- $key = get_config('system','pubkey');
if($subject)
- $subject = json_encode(crypto_encapsulate($subject,$key));
+ $subject = str_rot47(base64url_encode($subject));
if($body)
- $body = json_encode(crypto_encapsulate($body,$key));
+ $body = str_rot47(base64url_encode($body));
@@ -242,6 +241,8 @@ function private_messages_list($uid, $mailbox = '', $start = 0, $numitems = 0) {
$where = '';
$limit = '';
+ $t0 = dba_timer();
+
if($numitems)
$limit = " LIMIT " . intval($numitems) . " OFFSET " . intval($start);
@@ -284,11 +285,10 @@ function private_messages_list($uid, $mailbox = '', $start = 0, $numitems = 0) {
$r[$k]['to'] = find_xchan_in_array($rr['to_xchan'],$c);
$r[$k]['seen'] = (($rr['mail_flags'] & MAIL_SEEN) ? 1 : 0);
if($r[$k]['mail_flags'] & MAIL_OBSCURED) {
- $key = get_config('system','prvkey');
if($r[$k]['title'])
- $r[$k]['title'] = crypto_unencapsulate(json_decode_plus($r[$k]['title']),$key);
+ $r[$k]['title'] = base64url_decode(str_rot47($r[$k]['title']));
if($r[$k]['body'])
- $r[$k]['body'] = crypto_unencapsulate(json_decode_plus($r[$k]['body']),$key);
+ $r[$k]['body'] = base64url_decode(str_rot47($r[$k]['body']));
}
}
@@ -323,11 +323,10 @@ function private_messages_fetch_message($channel_id, $messageitem_id, $updatesee
$messages[$k]['from'] = find_xchan_in_array($message['from_xchan'],$c);
$messages[$k]['to'] = find_xchan_in_array($message['to_xchan'],$c);
if($messages[$k]['mail_flags'] & MAIL_OBSCURED) {
- $key = get_config('system','prvkey');
if($messages[$k]['title'])
- $messages[$k]['title'] = crypto_unencapsulate(json_decode_plus($messages[$k]['title']),$key);
+ $messages[$k]['title'] = base64url_decode(str_rot47($messages[$k]['title']));
if($messages[$k]['body'])
- $messages[$k]['body'] = crypto_unencapsulate(json_decode_plus($messages[$k]['body']),$key);
+ $messages[$k]['body'] = base64url_decode(str_rot47($messages[$k]['body']));
}
}
@@ -411,11 +410,10 @@ function private_messages_fetch_conversation($channel_id, $messageitem_id, $upda
$messages[$k]['from'] = find_xchan_in_array($message['from_xchan'],$c);
$messages[$k]['to'] = find_xchan_in_array($message['to_xchan'],$c);
if($messages[$k]['mail_flags'] & MAIL_OBSCURED) {
- $key = get_config('system','prvkey');
if($messages[$k]['title'])
- $messages[$k]['title'] = crypto_unencapsulate(json_decode_plus($messages[$k]['title']),$key);
+ $messages[$k]['title'] = base64url_decode(str_rot47($messages[$k]['title']));
if($messages[$k]['body'])
- $messages[$k]['body'] = crypto_unencapsulate(json_decode_plus($messages[$k]['body']),$key);
+ $messages[$k]['body'] = base64url_decode(str_rot47($messages[$k]['body']));
}
}
diff --git a/include/network.php b/include/network.php
index e0c8885fd..fb336fbb4 100644
--- a/include/network.php
+++ b/include/network.php
@@ -1158,7 +1158,7 @@ function discover_by_webbie($webbie) {
if(! $r) {
- $r = q("insert into hubloc ( hubloc_guid, hubloc_hash, hubloc_addr, hubloc_network, hubloc_url, hubloc_host, hubloc_callback, hubloc_updated, hubloc_flags ) values ('%s','%s','%s','%s','%s','%s','%s','%s', %d)",
+ $r = q("insert into hubloc ( hubloc_guid, hubloc_hash, hubloc_addr, hubloc_network, hubloc_url, hubloc_host, hubloc_callback, hubloc_updated, hubloc_primary ) values ('%s','%s','%s','%s','%s','%s','%s','%s', 1)",
dbesc($guid),
dbesc($addr),
dbesc($addr),
@@ -1166,8 +1166,7 @@ function discover_by_webbie($webbie) {
dbesc(trim($diaspora_base,'/')),
dbesc($hostname),
dbesc($notify),
- dbescdate(datetime_convert()),
- intval(HUBLOC_FLAGS_PRIMARY)
+ dbescdate(datetime_convert())
);
}
$photos = import_profile_photo($vcard['photo'],$addr);
diff --git a/include/notifier.php b/include/notifier.php
index 46f9eb1de..ffdd80403 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -228,11 +228,9 @@ function notifier_run($argv, $argc){
$normal_mode = false;
$expire = true;
- $items = q("SELECT * FROM item WHERE uid = %d AND ( item_flags & %d )>0
- AND ( item_restrict & %d )>0 AND `changed` > %s - INTERVAL %s",
+ $items = q("SELECT * FROM item WHERE uid = %d AND item_wall = 1
+ AND item_deleted = 1 AND `changed` > %s - INTERVAL %s",
intval($item_id),
- intval(ITEM_WALL),
- intval(ITEM_DELETED),
db_utcnow(), db_quoteinterval('10 MINUTE')
);
$uid = $item_id;
@@ -338,19 +336,22 @@ function notifier_run($argv, $argc){
$target_item = $r[0];
$deleted_item = false;
- if($target_item['item_restrict'] & ITEM_DELETED) {
+ if(intval($target_item['item_deleted'])) {
logger('notifier: target item ITEM_DELETED', LOGGER_DEBUG);
$deleted_item = true;
}
- if(strpos($target_item['postopts'],'nodeliver') !== false) {
- logger('notifier: target item is undeliverable', LOGGER_DEBUG);
+ if(intval($target_item['item_type']) != ITEM_TYPE_POST) {
+ 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'])) {
+ logger('notifier: target item not published, so not forwardable', LOGGER_DEBUG);
return;
}
- $unforwardable = ITEM_UNPUBLISHED|ITEM_DELAYED_PUBLISH|ITEM_WEBPAGE|ITEM_BUILDBLOCK|ITEM_PDL;
- if($target_item['item_restrict'] & $unforwardable) {
- logger('notifier: target item not forwardable: flags ' . $target_item['item_restrict'], LOGGER_DEBUG);
+ if(strpos($target_item['postopts'],'nodeliver') !== false) {
+ logger('notifier: target item is undeliverable', LOGGER_DEBUG);
return;
}
@@ -407,10 +408,7 @@ function notifier_run($argv, $argc){
// flag on comments for an extended period. So we'll also call comment_local_origin() which looks at
// the hostname in the message_id and provides a second (fallback) opinion.
- $relay_to_owner = (((! $top_level_post) && ($target_item['item_flags'] & ITEM_ORIGIN) && comment_local_origin($target_item))
- ? true
- : false
- );
+ $relay_to_owner = (((! $top_level_post) && (intval($target_item['item_origin'])) && comment_local_origin($target_item)) ? true : false);
@@ -421,11 +419,10 @@ function notifier_run($argv, $argc){
logger('notifier: relay_to_owner: ' . (($relay_to_owner) ? 'true' : 'false'), LOGGER_DATA);
logger('notifier: top_level_post: ' . (($top_level_post) ? 'true' : 'false'), LOGGER_DATA);
- logger('notifier: target_item_flags: ' . $target_item['item_flags'] . ' ' . (($target_item['item_flags'] & ITEM_ORIGIN ) ? 'true' : 'false'), LOGGER_DATA);
// tag_deliver'd post which needs to be sent back to the original author
- if(($cmd === 'uplink') && ($parent_item['item_flags'] & ITEM_UPLINK) && (! $top_level_post)) {
+ if(($cmd === 'uplink') && intval($parent_item['item_uplink']) && (! $top_level_post)) {
logger('notifier: uplink');
$uplink = true;
}
@@ -446,7 +443,7 @@ function notifier_run($argv, $argc){
// if our parent is a tag_delivery recipient, uplink to the original author causing
// a delivery fork.
- if(($parent_item['item_flags'] & ITEM_UPLINK) && (! $top_level_post) && ($cmd !== 'uplink')) {
+ if(intval($parent_item['item_uplink']) && (! $top_level_post) && ($cmd !== 'uplink')) {
logger('notifier: uplinking this item');
proc_run('php','include/notifier.php','uplink',$item_id);
}
@@ -459,7 +456,7 @@ function notifier_run($argv, $argc){
// don't send deletions onward for other people's stuff
// TODO verify this is needed - copied logic from same place in old code
- if(($target_item['item_restrict'] & ITEM_DELETED) && (!($target_item['item_flags'] & ITEM_WALL))) {
+ if(intval($target_item['item_deleted']) && (! intval($target_item['item_wall']))) {
logger('notifier: ignoring delete notification for non-wall item');
return;
}
@@ -541,15 +538,12 @@ function notifier_run($argv, $argc){
// aren't the owner or author.
- $r = q("select hubloc_guid, hubloc_url, hubloc_sitekey, hubloc_network, hubloc_flags, hubloc_callback, hubloc_host from hubloc
+ $r = q("select * from hubloc
where hubloc_hash in (" . implode(',',$recipients) . ") order by hubloc_connected desc limit 1");
}
else {
- $r = q("select hubloc_guid, hubloc_url, hubloc_sitekey, hubloc_network, hubloc_flags, hubloc_callback, hubloc_host from hubloc
- where hubloc_hash in (" . implode(',',$recipients) . ") and not (hubloc_flags & %d) > 0 and not (hubloc_status & %d) > 0",
- intval(HUBLOC_FLAGS_DELETED),
- intval(HUBLOC_OFFLINE)
- );
+ $r = q("select * from hubloc where hubloc_hash in (" . implode(',',$recipients) . ")
+ and hubloc_error = 0 and hubloc_deleted = 0");
}
if(! $r) {
diff --git a/include/notify.php b/include/notify.php
index eef838664..2b032b56b 100644
--- a/include/notify.php
+++ b/include/notify.php
@@ -5,9 +5,6 @@ function format_notification($item) {
$ret = '';
-// return array();
-
-
require_once('include/conversation.php');
// Call localize_item with the "brief" flag to get a one line status for activities.
@@ -19,7 +16,7 @@ function format_notification($item) {
$itemem_text = $item['localize'];
}
else {
- $itemem_text = (($item['item_flags'] & ITEM_THREAD_TOP)
+ $itemem_text = (($item['item_thread_top'])
? t('created a new post')
: sprintf( t('commented on %s\'s post'), $item['owner']['xchan_name']));
}
diff --git a/include/onedirsync.php b/include/onedirsync.php
index de8dab92d..ce516da9d 100644
--- a/include/onedirsync.php
+++ b/include/onedirsync.php
@@ -41,7 +41,7 @@ function onedirsync_run($argv, $argc){
intval(UPDATE_FLAGS_UPDATED)
);
if($x) {
- $y = q("update updates set ud_flags = ( ud_flags | %d ) where ud_addr = '%s' and ( ud_flags & %d ) = 0 and ud_date < '%s' ",
+ $y = q("update updates set ud_flags = ( ud_flags | %d ) where ud_addr = '%s' and ( ud_flags & %d ) = 0 and ud_date != '%s'",
intval(UPDATE_FLAGS_UPDATED),
dbesc($r[0]['ud_addr']),
intval(UPDATE_FLAGS_UPDATED),
diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php
index 6f508bf72..1ec031a1a 100644
--- a/include/photo/photo_driver.php
+++ b/include/photo/photo_driver.php
@@ -302,7 +302,6 @@ abstract class photo_driver {
$p['filename'] = (($arr['filename']) ? $arr['filename'] : '');
$p['album'] = (($arr['album']) ? $arr['album'] : '');
$p['scale'] = ((intval($arr['scale'])) ? intval($arr['scale']) : 0);
- $p['photo_flags'] = ((intval($arr['photo_flags'])) ? intval($arr['photo_flags']) : 0);
$p['allow_cid'] = (($arr['allow_cid']) ? $arr['allow_cid'] : '');
$p['allow_gid'] = (($arr['allow_gid']) ? $arr['allow_gid'] : '');
$p['deny_cid'] = (($arr['deny_cid']) ? $arr['deny_cid'] : '');
@@ -311,11 +310,7 @@ abstract class photo_driver {
$p['edited'] = (($arr['edited']) ? $arr['edited'] : $p['created']);
$p['title'] = (($arr['title']) ? $arr['title'] : '');
$p['description'] = (($arr['description']) ? $arr['description'] : '');
-
- // temporary until we get rid of photo['profile'] and just use photo['photo_flags']
- // but this will require updating all existing photos in the DB.
-
- $p['profile'] = (($p['photo_flags'] & PHOTO_PROFILE) ? 1 : 0);
+ $p['photo_usage'] = intval($arr['photo_usage']);
$x = q("select id from photo where resource_id = '%s' and uid = %d and xchan = '%s' and `scale` = %d limit 1",
@@ -340,8 +335,7 @@ abstract class photo_driver {
`data` = '%s',
`size` = %d,
`scale` = %d,
- `profile` = %d,
- `photo_flags` = %d,
+ `photo_usage` = %d,
`title` = '%s',
`description` = '%s',
`allow_cid` = '%s',
@@ -364,8 +358,7 @@ abstract class photo_driver {
dbescbin($this->imageString()),
intval(strlen($this->imageString())),
intval($p['scale']),
- intval($p['profile']),
- intval($p['photo_flags']),
+ intval($p['photo_usage']),
dbesc($p['title']),
dbesc($p['description']),
dbesc($p['allow_cid']),
@@ -377,8 +370,8 @@ abstract class photo_driver {
}
else {
$r = q("INSERT INTO `photo`
- ( `aid`, `uid`, `xchan`, `resource_id`, `created`, `edited`, `filename`, type, `album`, `height`, `width`, `data`, `size`, `scale`, `profile`, `photo_flags`, `title`, `description`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid` )
- VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', %d, %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s' )",
+ ( `aid`, `uid`, `xchan`, `resource_id`, `created`, `edited`, `filename`, type, `album`, `height`, `width`, `data`, `size`, `scale`, `photo_usage`, `title`, `description`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid` )
+ VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s' )",
intval($p['aid']),
intval($p['uid']),
dbesc($p['xchan']),
@@ -393,8 +386,7 @@ abstract class photo_driver {
dbescbin($this->imageString()),
intval(strlen($this->imageString())),
intval($p['scale']),
- intval($p['profile']),
- intval($p['photo_flags']),
+ intval($p['photo_usage']),
dbesc($p['title']),
dbesc($p['description']),
dbesc($p['allow_cid']),
@@ -406,7 +398,7 @@ abstract class photo_driver {
return $r;
}
- public function store($aid, $uid, $xchan, $rid, $filename, $album, $scale, $profile = 0, $allow_cid = '', $allow_gid = '', $deny_cid = '', $deny_gid = '') {
+ public function store($aid, $uid, $xchan, $rid, $filename, $album, $scale, $usage = PHOTO_NORMAL, $allow_cid = '', $allow_gid = '', $deny_cid = '', $deny_gid = '') {
$x = q("select id from photo where `resource_id` = '%s' and uid = %d and `xchan` = '%s' and `scale` = %d limit 1",
dbesc($rid),
@@ -430,7 +422,7 @@ abstract class photo_driver {
`data` = '%s',
`size` = %d,
`scale` = %d,
- `profile` = %d,
+ `photo_usage` = %d,
`allow_cid` = '%s',
`allow_gid` = '%s',
`deny_cid` = '%s',
@@ -451,7 +443,7 @@ abstract class photo_driver {
dbescbin($this->imageString()),
intval(strlen($this->imageString())),
intval($scale),
- intval($profile),
+ intval($photo_usage),
dbesc($allow_cid),
dbesc($allow_gid),
dbesc($deny_cid),
@@ -461,7 +453,7 @@ abstract class photo_driver {
}
else {
$r = q("INSERT INTO `photo`
- ( `aid`, `uid`, `xchan`, `resource_id`, `created`, `edited`, `filename`, type, `album`, `height`, `width`, `data`, `size`, `scale`, `profile`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid` )
+ ( `aid`, `uid`, `xchan`, `resource_id`, `created`, `edited`, `filename`, type, `album`, `height`, `width`, `data`, `size`, `scale`, `photo_usage`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid` )
VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', %d, %d, %d, '%s', '%s', '%s', '%s' )",
intval($aid),
intval($uid),
@@ -477,7 +469,7 @@ abstract class photo_driver {
dbescbin($this->imageString()),
intval(strlen($this->imageString())),
intval($scale),
- intval($profile),
+ intval($photo_usage),
dbesc($allow_cid),
dbesc($allow_gid),
dbesc($deny_cid),
@@ -569,7 +561,7 @@ function import_profile_photo($photo,$xchan,$thing = false) {
if($thing)
$hash = photo_new_resource();
else {
- $r = q("select resource_id from photo where xchan = '%s' and (photo_flags & %d )>0 and scale = 4 limit 1",
+ $r = q("select resource_id from photo where xchan = '%s' and photo_usage = %d and scale = 4 limit 1",
dbesc($xchan),
intval(PHOTO_XCHAN)
);
@@ -622,7 +614,7 @@ function import_profile_photo($photo,$xchan,$thing = false) {
else
$photo_failure = true;
- $p = array('xchan' => $xchan,'resource_id' => $hash, 'filename' => basename($photo), 'album' => $album, 'photo_flags' => $flags, 'scale' => 4);
+ $p = array('xchan' => $xchan,'resource_id' => $hash, 'filename' => basename($photo), 'album' => $album, 'photo_usage' => $flags, 'scale' => 4);
$r = $img->save($p);
@@ -684,7 +676,7 @@ function import_channel_photo($photo,$type,$aid,$uid) {
$img->scaleImageSquare(175);
- $p = array('aid' => $aid, 'uid' => $uid, 'resource_id' => $hash, 'filename' => $filename, 'album' => t('Profile Photos'), 'photo_flags' => PHOTO_PROFILE, 'scale' => 4);
+ $p = array('aid' => $aid, 'uid' => $uid, 'resource_id' => $hash, 'filename' => $filename, 'album' => t('Profile Photos'), 'photo_usage' => PHOTO_PROFILE, 'scale' => 4);
$r = $img->save($p);
diff --git a/include/photos.php b/include/photos.php
index 1672e310a..dcf2978bb 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -156,7 +156,7 @@ function photo_upload($channel, $observer, $args) {
$errors = false;
$p = array('aid' => $account_id, 'uid' => $channel_id, 'xchan' => $visitor, 'resource_id' => $photo_hash,
- 'filename' => $filename, 'album' => $album, 'scale' => 0, 'photo_flags' => PHOTO_NORMAL,
+ 'filename' => $filename, 'album' => $album, 'scale' => 0, 'photo_usage' => PHOTO_NORMAL,
'allow_cid' => $str_contact_allow, 'allow_gid' => $str_group_allow,
'deny_cid' => $str_contact_deny, 'deny_gid' => $str_group_deny
);
@@ -210,6 +210,9 @@ function photo_upload($channel, $observer, $args) {
// Create item container
+
+ $item_hidden = (($visible) ? 0 : 1 );
+
$lat = $lon = null;
if($exif && $exif['GPS']) {
@@ -219,8 +222,6 @@ function photo_upload($channel, $observer, $args) {
}
}
- $item_flags = ITEM_WALL|ITEM_ORIGIN|ITEM_THREAD_TOP;
- $item_restrict = (($visible) ? ITEM_VISIBLE : ITEM_HIDDEN);
$title = '';
$mid = item_message_id();
@@ -229,22 +230,24 @@ function photo_upload($channel, $observer, $args) {
if($lat && $lon)
$arr['coord'] = $lat . ' ' . $lon;
- $arr['aid'] = $account_id;
- $arr['uid'] = $channel_id;
- $arr['mid'] = $mid;
- $arr['parent_mid'] = $mid;
- $arr['item_flags'] = $item_flags;
- $arr['item_restrict'] = $item_restrict;
- $arr['resource_type'] = 'photo';
- $arr['resource_id'] = $photo_hash;
- $arr['owner_xchan'] = $channel['channel_hash'];
- $arr['author_xchan'] = $observer['xchan_hash'];
- $arr['title'] = $title;
- $arr['allow_cid'] = $str_contact_allow;
- $arr['allow_gid'] = $str_group_allow;
- $arr['deny_cid'] = $str_contact_deny;
- $arr['deny_gid'] = $str_group_deny;
- $arr['verb'] = ACTIVITY_POST;
+ $arr['aid'] = $account_id;
+ $arr['uid'] = $channel_id;
+ $arr['mid'] = $mid;
+ $arr['parent_mid'] = $mid;
+ $arr['item_hidden'] = $item_hidden;
+ $arr['resource_type'] = 'photo';
+ $arr['resource_id'] = $photo_hash;
+ $arr['owner_xchan'] = $channel['channel_hash'];
+ $arr['author_xchan'] = $observer['xchan_hash'];
+ $arr['title'] = $title;
+ $arr['allow_cid'] = $str_contact_allow;
+ $arr['allow_gid'] = $str_group_allow;
+ $arr['deny_cid'] = $str_contact_deny;
+ $arr['deny_gid'] = $str_group_deny;
+ $arr['verb'] = ACTIVITY_POST;
+ $arr['item_wall'] = 1;
+ $arr['item_origin'] = 1;
+ $arr['item_thread_top'] = 1;
$arr['plink'] = z_root() . '/channel/' . $channel['channel_address'] . '/?f=&mid=' . $arr['mid'];
@@ -310,7 +313,7 @@ function photos_albums_list($channel, $observer) {
$sql_extra = permissions_sql($channel_id);
- $albums = q("SELECT count( distinct resource_id ) as total, album from photo where uid = %d and ( photo_flags = %d or photo_flags = %d ) $sql_extra group by album order by max(created) desc",
+ $albums = q("SELECT count( distinct resource_id ) as total, album from photo where uid = %d and photo_usage IN ( %d, %d ) $sql_extra group by album order by max(created) desc",
intval($channel_id),
intval(PHOTO_NORMAL),
intval(PHOTO_PROFILE)
@@ -390,7 +393,7 @@ function photos_list_photos($channel, $observer, $album = '') {
$ret = array('success' => false);
- $r = q("select resource_id, created, edited, title, description, album, filename, type, height, width, size, scale, profile, photo_flags, allow_cid, allow_gid, deny_cid, deny_gid from photo where uid = %d and ( photo_flags = %d or photo_flags = %d ) $sql_extra ",
+ $r = q("select resource_id, created, edited, title, description, album, filename, type, height, width, size, scale, photo_usage, allow_cid, allow_gid, deny_cid, deny_gid from photo where uid = %d and photo_usage in ( %d, %d ) $sql_extra ",
intval($channel_id),
intval(PHOTO_NORMAL),
intval(PHOTO_PROFILE)
@@ -488,32 +491,34 @@ function photos_create_item($channel, $creator_hash, $photo, $visible = false) {
// Create item container
- $item_flags = ITEM_WALL|ITEM_ORIGIN|ITEM_THREAD_TOP;
- $item_restrict = (($visible) ? ITEM_VISIBLE : ITEM_HIDDEN);
+
+ $item_hidden = (($visible) ? 0 : 1 );
$mid = item_message_id();
$arr = array();
- $arr['aid'] = $channel['channel_account_id'];
- $arr['uid'] = $channel['channel_id'];
- $arr['mid'] = $mid;
- $arr['parent_mid'] = $mid;
- $arr['item_flags'] = $item_flags;
- $arr['item_restrict'] = $item_restrict;
- $arr['resource_type'] = 'photo';
- $arr['resource_id'] = $photo['resource_id'];
- $arr['owner_xchan'] = $channel['channel_hash'];
- $arr['author_xchan'] = $creator_hash;
-
- $arr['allow_cid'] = $photo['allow_cid'];
- $arr['allow_gid'] = $photo['allow_gid'];
- $arr['deny_cid'] = $photo['deny_cid'];
- $arr['deny_gid'] = $photo['deny_gid'];
-
- $arr['plink'] = z_root() . '/channel/' . $channel['channel_address'] . '/?f=&mid=' . $arr['mid'];
-
- $arr['body'] = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo['resource_id'] . ']'
+ $arr['aid'] = $channel['channel_account_id'];
+ $arr['uid'] = $channel['channel_id'];
+ $arr['mid'] = $mid;
+ $arr['parent_mid'] = $mid;
+ $arr['item_wall'] = 1;
+ $arr['item_origin'] = 1;
+ $arr['item_thread_top'] = 1;
+ $arr['item_hidden'] = $item_hidden;
+ $arr['resource_type'] = 'photo';
+ $arr['resource_id'] = $photo['resource_id'];
+ $arr['owner_xchan'] = $channel['channel_hash'];
+ $arr['author_xchan'] = $creator_hash;
+
+ $arr['allow_cid'] = $photo['allow_cid'];
+ $arr['allow_gid'] = $photo['allow_gid'];
+ $arr['deny_cid'] = $photo['deny_cid'];
+ $arr['deny_gid'] = $photo['deny_gid'];
+
+ $arr['plink'] = z_root() . '/channel/' . $channel['channel_address'] . '/?f=&mid=' . $arr['mid'];
+
+ $arr['body'] = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo['resource_id'] . ']'
. '[zmg]' . z_root() . '/photo/' . $photo['resource_id'] . '-' . $photo['scale'] . '[/zmg]'
. '[/zrl]';
diff --git a/include/poller.php b/include/poller.php
index bc48c3f00..a175d59b5 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -59,10 +59,9 @@ function poller_run($argv, $argc){
// expire any expired items
$r = q("select id from item where expires != '%s' and expires < %s
- and ( item_restrict & %d ) = 0 ",
+ and item_deleted = 0 ",
dbesc(NULL_DATE),
- db_utcnow(),
- intval(ITEM_DELETED)
+ db_utcnow()
);
if($r) {
require_once('include/items.php');
diff --git a/include/reddav.php b/include/reddav.php
index 750ca1b24..c39f08f4d 100644
--- a/include/reddav.php
+++ b/include/reddav.php
@@ -1,7 +1,7 @@
<?php
/**
* @file include/reddav.php
- * @brief some DAV related functions for RedMatrix.
+ * @brief some DAV related functions for Hubzilla.
*
* This file contains some functions which did not fit into one of the RedDAV
* classes.
@@ -19,7 +19,7 @@
*/
use Sabre\DAV;
-use RedMatrix\RedDAV;
+use Hubzilla\RedDAV;
require_once('vendor/autoload.php');
require_once('include/attach.php');
diff --git a/include/socgraph.php b/include/socgraph.php
index 0ad7c4034..45ab9a366 100644
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -40,7 +40,7 @@ function poco_load($xchan = '', $url = null) {
return;
}
- $url = $url . '?f=&fields=displayName,hash,urls,photos,rating' ;
+ $url = $url . '?f=&fields=displayName,hash,urls,photos' ;
logger('poco_load: ' . $url, LOGGER_DEBUG);
@@ -115,8 +115,6 @@ function poco_load($xchan = '', $url = null) {
$name = $entry['displayName'];
$hash = $entry['hash'];
- $rating = ((array_key_exists('rating',$entry) && (! is_array($entry['rating']))) ? intval($entry['rating']) : 0);
- $rating_text = ((array_key_exists('rating_text',$entry)) ? escape_tags($entry['rating_text']) :'');
if(x($entry,'urls') && is_array($entry['urls'])) {
foreach($entry['urls'] as $url) {
@@ -329,15 +327,13 @@ function suggestion_query($uid, $myxchan, $start = 0, $limit = 80) {
and not xlink_link in ( select abook_xchan from abook where abook_channel = %d )
and not xlink_link in ( select xchan from xign where uid = %d )
and xlink_xchan != ''
+ and xchan_hidden = 0
+ and xchan_deleted = 0
and xlink_static = 0
- and not ( xchan_flags & %d )>0
- and not ( xchan_flags & %d )>0
group by xchan_hash order by total desc limit %d offset %d ",
intval($uid),
intval($uid),
intval($uid),
- intval(XCHAN_FLAGS_HIDDEN),
- intval(XCHAN_FLAGS_DELETED),
intval($limit),
intval($start)
);
@@ -350,14 +346,12 @@ function suggestion_query($uid, $myxchan, $start = 0, $limit = 80) {
where xlink_xchan = ''
and not xlink_link in ( select abook_xchan from abook where abook_channel = %d )
and not xlink_link in ( select xchan from xign where uid = %d )
+ and xchan_hidden = 0
+ and xchan_deleted = 0
and xlink_static = 0
- and not ( xchan_flags & %d )>0
- and not ( xchan_flags & %d )>0
group by xchan_hash order by total desc limit %d offset %d ",
intval($uid),
intval($uid),
- intval(XCHAN_FLAGS_HIDDEN),
- intval(XCHAN_FLAGS_DELETED),
intval($limit),
intval($start)
);
@@ -580,13 +574,6 @@ function poco($a,$extended = false) {
$entry['preferredUsername'] = substr($rr['xchan_addr'],0,strpos($rr['xchan_addr'],'@'));
if($fields_ret['photos'])
$entry['photos'] = array(array('value' => $rr['xchan_photo_l'], 'mimetype' => $rr['xchan_photo_mimetype'], 'type' => 'profile'));
- if($fields_ret['rating']) {
- $entry['rating'] = ((array_key_exists('abook_rating',$rr)) ? intval($rr['abook_rating']) : 0);
- $entry['rating_text'] = ((array_key_exists('abook_rating_text',$rr)) ? $rr['abook_rating_text'] : '');
- // maybe this should be a composite calculated rating in $system_mode
- if($system_mode)
- $entry['rating'] = 0;
- }
$ret['entry'][] = $entry;
}
}
@@ -609,4 +596,4 @@ function poco($a,$extended = false) {
else
http_status_exit(500);
-} \ No newline at end of file
+}
diff --git a/include/statistics_fns.php b/include/statistics_fns.php
index 288925a2c..ce2eee5e7 100644
--- a/include/statistics_fns.php
+++ b/include/statistics_fns.php
@@ -23,8 +23,7 @@ function update_channels_active_halfyear_stat() {
$s .= ',';
$s .= intval($rr['channel_id']);
}
- $x = q("select uid from item where uid in ( $s ) and (item_flags & %d)>0 and created > %s - INTERVAL %s group by uid",
- intval(ITEM_WALL),
+ $x = q("select uid from item where uid in ( $s ) and item_wall = 1 and created > %s - INTERVAL %s group by uid",
db_utcnow(), db_quoteinterval('6 MONTH')
);
if($x) {
@@ -50,8 +49,7 @@ function update_channels_active_monthly_stat() {
$s .= ',';
$s .= intval($rr['channel_id']);
}
- $x = q("select uid from item where uid in ( $s ) and ( item_flags & %d )>0 and created > %s - INTERVAL %s group by uid",
- intval(ITEM_WALL),
+ $x = q("select uid from item where uid in ( $s ) and item_wall = 1 and created > %s - INTERVAL %s group by uid",
db_utcnow(), db_quoteinterval('1 MONTH')
);
if($x) {
@@ -66,8 +64,7 @@ function update_channels_active_monthly_stat() {
}
function update_local_posts_stat() {
- $posts = q("SELECT COUNT(*) AS local_posts FROM `item` WHERE (item_flags & %d)>0 ",
- intval(ITEM_WALL) );
+ $posts = q("SELECT COUNT(*) AS local_posts FROM `item` WHERE item_wall = 1 ");
if (is_array($posts)) {
$local_posts_stat = intval($posts[0]["local_posts"]);
set_config('system','local_posts_stat',$local_posts_stat);
diff --git a/include/taxonomy.php b/include/taxonomy.php
index fa540ac56..ea41369ad 100644
--- a/include/taxonomy.php
+++ b/include/taxonomy.php
@@ -111,8 +111,10 @@ function tagadelic($uid, $count = 0, $authors = '', $flags = 0, $restrict = 0, $
$sql_options = item_permissions_sql($uid);
$count = intval($count);
- if($flags)
- $sql_options .= " and ((item_flags & " . intval($flags) . ") = " . intval($flags) . ") ";
+ if($flags) {
+ if($flags === 'wall')
+ $sql_options .= " and item_wall = 1 ";
+ }
if($authors) {
if(! is_array($authors))
@@ -125,7 +127,7 @@ function tagadelic($uid, $count = 0, $authors = '', $flags = 0, $restrict = 0, $
// Fetch tags
$r = q("select term, count(term) as total from term left join item on term.oid = item.id
where term.uid = %d and term.type = %d
- and otype = %d and item_restrict = %d
+ and otype = %d and item_type = %d and item_private = 0
$sql_options
group by term order by total desc %s",
intval($uid),
diff --git a/include/text.php b/include/text.php
index 9c6fe3622..e1923aed6 100644
--- a/include/text.php
+++ b/include/text.php
@@ -579,9 +579,9 @@ function attribute_contains($attr, $s) {
}
/**
- * @brief Logging function for RedMatrix.
+ * @brief Logging function for Hubzilla.
*
- * Logging output is configured through RedMatrix's system config. The log file
+ * Logging output is configured through Hubzilla's system config. The log file
* is set in system logfile, log level in system loglevel and to enable logging
* set system debugging.
*
@@ -747,7 +747,7 @@ function get_tags($s) {
// make sure the longer tags are returned first so that if two or more have common substrings
// we'll replace the longest ones first. Otherwise the common substring would be found in
// both strings and the string replacement would link both to the shorter strings and
- // fail to link the longer string. RedMatrix github issue #378
+ // fail to link the longer string. Hubzilla github issue #378
usort($ret,'tag_sort_length');
@@ -812,20 +812,21 @@ function contact_block() {
return;
$is_owner = ((local_channel() && local_channel() == $a->profile['uid']) ? true : false);
+ $sql_extra = '';
$abook_flags = ABOOK_FLAG_PENDING|ABOOK_FLAG_SELF;
- $xchan_flags = XCHAN_FLAGS_ORPHAN|XCHAN_FLAGS_DELETED;
+
if(! $is_owner) {
$abook_flags = $abook_flags | ABOOK_FLAG_HIDDEN;
- $xchan_flags = $xchan_flags | XCHAN_FLAGS_HIDDEN;
+ $sql_extra = " and xchan_hidden = 0 ";
}
if((! is_array($a->profile)) || ($a->profile['hide_friends']))
return $o;
- $r = q("SELECT COUNT(abook_id) AS total FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d and ( abook_flags & %d ) = 0 and ( xchan_flags & %d ) = 0",
+
+ $r = q("SELECT COUNT(abook_id) AS total FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d and not ( abook_flags & %d )>0 and xchan_orphan = 0 and xchan_deleted = 0 $sql_extra",
intval($a->profile['uid']),
- intval($abook_flags),
- intval($xchan_flags)
+ intval($abook_flags)
);
if(count($r)) {
$total = intval($r[0]['total']);
@@ -834,14 +835,13 @@ function contact_block() {
$contacts = t('No connections');
$micropro = null;
} else {
-
+
$randfunc = db_getfunc('RAND');
-
- $r = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash WHERE abook_channel = %d AND ( abook_flags & %d ) = 0 and ( xchan_flags & %d ) = 0 ORDER BY $randfunc LIMIT %d",
- intval($a->profile['uid']),
- intval($abook_flags|ABOOK_FLAG_ARCHIVED),
- intval($xchan_flags),
- intval($shown)
+
+ $r = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash WHERE abook_channel = %d AND not ( abook_flags & %d)>0 and xchan_orphan = 0 and xchan_deleted = 0 $sql_extra ORDER BY $randfunc LIMIT %d",
+ intval($a->profile['uid']),
+ intval($abook_flags|ABOOK_FLAG_ARCHIVED),
+ intval($shown)
);
if(count($r)) {
@@ -1245,7 +1245,7 @@ function link_compare($a, $b) {
function unobscure(&$item) {
- if(array_key_exists('item_flags',$item) && ($item['item_flags'] & ITEM_OBSCURED)) {
+ if(array_key_exists('item_obscured',$item) && intval($item['item_obscured'])) {
$key = get_config('system','prvkey');
if($item['title'])
$item['title'] = crypto_unencapsulate(json_decode_plus($item['title']),$key);
@@ -1264,11 +1264,10 @@ function unobscure(&$item) {
function unobscure_mail(&$item) {
if(array_key_exists('mail_flags',$item) && ($item['mail_flags'] & MAIL_OBSCURED)) {
- $key = get_config('system','prvkey');
if($item['title'])
- $item['title'] = crypto_unencapsulate(json_decode_plus($item['title']),$key);
+ $item['title'] = base64url_decode(str_rot47($item['title']));
if($item['body'])
- $item['body'] = crypto_unencapsulate(json_decode_plus($item['body']),$key);
+ $item['body'] = base64url_decode(str_rot47($item['body']));
}
}
@@ -1445,16 +1444,24 @@ function generate_named_map($location) {
function prepare_body(&$item,$attach = false) {
- call_hooks('prepare_body_init', $item);
-
- unobscure($item);
-
- $s = prepare_text($item['body'],$item['mimetype']);
+ if($item['html']) {
+ $s = bb_observer($item['html']);
+ }
+ else {
+ call_hooks('prepare_body_init', $item);
+ unobscure($item);
+ $s = prepare_text($item['body'],$item['mimetype'], true);
+ }
$prep_arr = array('item' => $item, 'html' => $s);
call_hooks('prepare_body', $prep_arr);
$s = $prep_arr['html'];
+ q("update item set html = '%s' where id = %d",
+ dbesc($s),
+ intval($item['id'])
+ );
+
if(! $attach) {
return $s;
}
@@ -1513,7 +1520,6 @@ function prepare_body(&$item,$attach = false) {
$prep_arr = array('item' => $item, 'html' => $s);
call_hooks('prepare_body_final', $prep_arr);
-
return $prep_arr['html'];
}
@@ -1524,7 +1530,7 @@ function prepare_body(&$item,$attach = false) {
* @param sting $content_type
* @return string
*/
-function prepare_text($text, $content_type = 'text/bbcode') {
+function prepare_text($text, $content_type = 'text/bbcode', $cache = false) {
switch($content_type) {
case 'text/plain':
@@ -1562,9 +1568,9 @@ function prepare_text($text, $content_type = 'text/bbcode') {
require_once('include/bbcode.php');
if(stristr($text,'[nosmile]'))
- $s = bbcode($text);
+ $s = bbcode($text,false,true,$cache);
else
- $s = smilies(bbcode($text));
+ $s = smilies(bbcode($text,false,true,$cache));
$s = zidify_links($s);
break;
}
@@ -1676,9 +1682,9 @@ function unamp($s) {
}
function layout_select($channel_id, $current = '') {
- $r = q("select mid,sid from item left join item_id on iid = item.id where service = 'PDL' and item.uid = item_id.uid and item_id.uid = %d and (item_restrict & %d)>0",
+ $r = q("select mid,sid from item left join item_id on iid = item.id where service = 'PDL' and item.uid = item_id.uid and item_id.uid = %d and item_type = %d ",
intval($channel_id),
- intval(ITEM_PDL)
+ intval(ITEM_TYPE_PDL)
);
if($r) {
@@ -2031,13 +2037,13 @@ 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_flags & " . intval(HUBLOC_FLAGS_PRIMARY) . " )>0",
+ where xchan_hash in (" . 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_flags & " . intval(HUBLOC_FLAGS_PRIMARY) . " )>0");
+ where xchan_hash in (" . implode(',', $arr) . ") and hubloc_primary = 1");
}
$xchans = q("select * from xchan where xchan_hash in (" . implode(',',$arr) . ") and xchan_network in ('rss','unknown')");
if(! $chans)
@@ -2065,7 +2071,7 @@ function xchan_mail_query(&$item) {
if(count($arr)) {
$chans = q("select xchan.*,hubloc.* from xchan left join hubloc on hubloc_hash = xchan_hash
- where xchan_hash in (" . implode(',', $arr) . ") and ( hubloc_flags & " . intval(HUBLOC_FLAGS_PRIMARY) . " )>0");
+ where xchan_hash in (" . implode(',', $arr) . ") and hubloc_primary = 1");
}
if($chans) {
$item['from'] = find_xchan_in_array($item['from_xchan'],$chans);
@@ -2614,3 +2620,9 @@ function userReadableSize($size) {
return $ret;
}
+
+function str_rot47($str) {
+ return strtr($str,
+ '!"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~',
+ 'PQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~!"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNO');
+}
diff --git a/include/widgets.php b/include/widgets.php
index 4a9032a21..86f65cdee 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -29,7 +29,7 @@ function widget_tagcloud($args) {
$type = TERM_CATEGORY;
// FIXME there exists no $authors variable
- $r = tagadelic($uid, $count, $authors, $flags, ITEM_WEBPAGE, $type);
+ $r = tagadelic($uid, $count, $authors, $flags, ITEM_TYPE_WEBPAGE, $type);
if($r) {
$o = '<div class="tagblock widget"><h3>' . t('Categories') . '</h3><div class="tags" align="center">';
@@ -393,7 +393,7 @@ function widget_tagcloud_wall($arr) {
$limit = ((array_key_exists('limit', $arr)) ? intval($arr['limit']) : 50);
if(feature_enabled($a->profile['profile_uid'], 'tagadelic'))
- return wtagblock($a->profile['profile_uid'], $limit, $a->profile['channel_hash'], ITEM_WALL);
+ return wtagblock($a->profile['profile_uid'], $limit, $a->profile['channel_hash'], 'wall');
return '';
}
@@ -408,7 +408,7 @@ function widget_catcloud_wall($arr) {
$limit = ((array_key_exists('limit',$arr)) ? intval($arr['limit']) : 50);
- return catblock($a->profile['profile_uid'], $limit, $a->profile['channel_hash'], ITEM_WALL);
+ return catblock($a->profile['profile_uid'], $limit, $a->profile['channel_hash'], 'wall');
}
@@ -704,7 +704,7 @@ function widget_item($arr) {
require_once('include/security.php');
$sql_extra = item_permissions_sql($uid);
- $r = q("select * from item where mid = '%s' and uid = %d and item_restrict = " . intval(ITEM_WEBPAGE) . " $sql_extra limit 1",
+ $r = q("select * from item where mid = '%s' and uid = %d and item_type = " . intval(ITEM_TYPE_WEBPAGE) . " $sql_extra limit 1",
dbesc($arr['mid']),
intval($uid)
);
@@ -902,10 +902,10 @@ function widget_random_block($arr) {
$r = q("select item.* from item left join item_id on item.id = item_id.iid
where item.uid = %d and sid like '%s' and service = 'BUILDBLOCK' and
- item_restrict = %d $sql_options order by $randfunc limit 1",
+ item_type = %d $sql_options order by $randfunc limit 1",
intval($channel_id),
dbesc('%' . $contains . '%'),
- intval(ITEM_BUILDBLOCK)
+ intval(ITEM_TYPE_BUILDBLOCK)
);
if($r) {
@@ -986,3 +986,5 @@ function widget_pubsites() {
return;
return '<div class="widget"><ul class="nav nav-pills"><li><a href="pubsites">' . t('Public Hubs') . '</a></li></ul></div>';
}
+
+
diff --git a/include/zot.php b/include/zot.php
index 02ac1301b..5f93ba75b 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -1,7 +1,7 @@
<?php
/**
* @file include/zot.php
- * @brief RedMatrix implementation of zot protocol.
+ * @brief Hubzilla implementation of zot protocol.
*
* https://github.com/friendica/red/wiki/zot
* https://github.com/friendica/red/wiki/Zot---A-High-Level-Overview
@@ -80,9 +80,8 @@ function zot_get_hublocs($hash) {
/* Only search for active hublocs - e.g. those that haven't been marked deleted */
- $ret = q("select * from hubloc where hubloc_hash = '%s' and not ( hubloc_flags & %d )>0 order by hubloc_url ",
- dbesc($hash),
- intval(HUBLOC_FLAGS_DELETED)
+ $ret = q("select * from hubloc where hubloc_hash = '%s' and hubloc_deleted != 0 order by hubloc_url ",
+ dbesc($hash)
);
return $ret;
@@ -200,9 +199,8 @@ function zot_finger($webbie, $channel = null, $autofallback = true) {
$r = q("select xchan.*, hubloc.* from xchan
left join hubloc on xchan_hash = hubloc_hash
- where xchan_addr = '%s' and (hubloc_flags & %d) > 0 limit 1",
- dbesc($xchan_addr),
- intval(HUBLOC_FLAGS_PRIMARY)
+ where xchan_addr = '%s' and hubloc_primary = 1 limit 1",
+ dbesc($xchan_addr)
);
if ($r) {
@@ -709,43 +707,36 @@ function import_xchan($arr,$ud_flags = UPDATE_FLAGS_UPDATED, $ud_arr = null) {
$hidden = (1 - intval($arr['searchable']));
- // Be careful - XCHAN_FLAGS_HIDDEN should evaluate to 1
- if(($r[0]['xchan_flags'] & XCHAN_FLAGS_HIDDEN) != $hidden)
- $new_flags = $r[0]['xchan_flags'] ^ XCHAN_FLAGS_HIDDEN;
- else
- $new_flags = $r[0]['xchan_flags'];
-
- $adult = (($r[0]['xchan_flags'] & XCHAN_FLAGS_SELFCENSORED) ? true : false);
- $adult_changed = ((intval($adult) != intval($arr['adult_content'])) ? true : false);
- if($adult_changed)
- $new_flags = $new_flags ^ XCHAN_FLAGS_SELFCENSORED;
-
- $deleted = (($r[0]['xchan_flags'] & XCHAN_FLAGS_DELETED) ? true : false);
- $deleted_changed = ((intval($deleted) != intval($arr['deleted'])) ? true : false);
- if($deleted_changed)
- $new_flags = $new_flags ^ XCHAN_FLAGS_DELETED;
-
- $public_forum = (($r[0]['xchan_flags'] & XCHAN_FLAGS_PUBFORUM) ? true : false);
- $pubforum_changed = ((intval($public_forum) != intval($arr['public_forum'])) ? true : false);
- if($pubforum_changed)
- $new_flags = $r[0]['xchan_flags'] ^ XCHAN_FLAGS_PUBFORUM;
-
- if(($r[0]['xchan_name_date'] != $arr['name_updated'])
- || ($r[0]['xchan_connurl'] != $arr['connections_url'])
- || ($r[0]['xchan_flags'] != $new_flags)
+ $hidden_changed = $adult_changed = $deleted_changed = $pubforum_changed = 0;
+
+ if(intval($r[0]['xchan_hidden']) != (1 - intval($arr['searchable'])))
+ $hidden_changed = 1;
+ if(intval($r[0]['xchan_selfcensored']) != intval($arr['adult_content']))
+ $adult_changed = 1;
+ if(intval($r[0]['xchan_deleted']) != intval($arr['deleted']))
+ $deleted_changed = 1;
+ if(intval($r[0]['xchan_pubforum']) != intval($arr['public_forum']))
+ $pubforum_changed = 1;
+
+ if(($r[0]['xchan_name_date'] != $arr['name_updated'])
+ || ($r[0]['xchan_connurl'] != $arr['connections_url'])
|| ($r[0]['xchan_addr'] != $arr['address'])
|| ($r[0]['xchan_follow'] != $arr['follow_url'])
- || ($r[0]['xchan_connpage'] != $arr['connect_url'])
- || ($r[0]['xchan_url'] != $arr['url'])) {
- $r = q("update xchan set xchan_name = '%s', xchan_name_date = '%s', xchan_connurl = '%s', xchan_follow = '%s',
- xchan_connpage = '%s', xchan_flags = %d,
+ || ($r[0]['xchan_connpage'] != $arr['connect_url'])
+ || ($r[0]['xchan_url'] != $arr['url'])
+ || $hidden_changed || adult_changed || deleted_changed || $pubforum_changed ) {
+ $r = q("update xchan set xchan_name = '%s', xchan_name_date = '%s', xchan_connurl = '%s', xchan_follow = '%s',
+ xchan_connpage = '%s', xchan_hidden = %d, xchan_selfcensored = %d, xchan_deleted = %d, xchan_pubforum = %d,
xchan_addr = '%s', xchan_url = '%s' where xchan_hash = '%s'",
dbesc(($arr['name']) ? $arr['name'] : '-'),
dbesc($arr['name_updated']),
dbesc($arr['connections_url']),
dbesc($arr['follow_url']),
dbesc($arr['connect_url']),
- intval($new_flags),
+ intval(1 - intval($arr['searchable'])),
+ intval($arr['adult_content']),
+ intval($arr['deleted']),
+ intval($arr['public_forum']),
dbesc($arr['address']),
dbesc($arr['url']),
dbesc($xchan_hash)
@@ -764,20 +755,9 @@ function import_xchan($arr,$ud_flags = UPDATE_FLAGS_UPDATED, $ud_arr = null) {
&& ($arr['site']['url'] != z_root()))
$arr['searchable'] = false;
- $hidden = (1 - intval($arr['searchable']));
-
- if($hidden)
- $new_flags = XCHAN_FLAGS_HIDDEN;
- else
- $new_flags = 0;
- if($arr['adult_content'])
- $new_flags |= XCHAN_FLAGS_SELFCENSORED;
- if(array_key_exists('deleted',$arr) && $arr['deleted'])
- $new_flags |= XCHAN_FLAGS_DELETED;
-
$x = q("insert into xchan ( xchan_hash, xchan_guid, xchan_guid_sig, xchan_pubkey, xchan_photo_mimetype,
- xchan_photo_l, xchan_addr, xchan_url, xchan_connurl, xchan_follow, xchan_connpage, xchan_name, xchan_network, xchan_photo_date, xchan_name_date, xchan_flags)
- values ( '%s', '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d) ",
+ xchan_photo_l, xchan_addr, xchan_url, xchan_connurl, xchan_follow, xchan_connpage, xchan_name, xchan_network, xchan_photo_date, xchan_name_date, xchan_hidden, xchan_selfcensored, xchan_deleted, xchan_pubforum )
+ values ( '%s', '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d) ",
dbesc($xchan_hash),
dbesc($arr['guid']),
dbesc($arr['guid_sig']),
@@ -793,7 +773,10 @@ function import_xchan($arr,$ud_flags = UPDATE_FLAGS_UPDATED, $ud_arr = null) {
dbesc('zot'),
dbescdate($arr['photo_updated']),
dbescdate($arr['name_updated']),
- intval($new_flags)
+ intval(1 - intval($arr['searchable'])),
+ intval($arr['adult_content']),
+ intval($arr['deleted']),
+ intval($arr['public_forum'])
);
$what .= 'new_xchan';
@@ -1542,11 +1525,11 @@ function process_delivery($sender, $arr, $deliveries, $relay, $public = false, $
if(($channel['channel_pageflags'] & PAGE_SYSTEM) && (! $arr['item_private']) && (! $relay)) {
$local_public = true;
- $r = q("select xchan_flags from xchan where xchan_hash = '%s' limit 1",
+ $r = q("select xchan_selfcensored from xchan where xchan_hash = '%s' limit 1",
dbesc($sender['hash'])
);
// don't import sys channel posts from selfcensored authors
- if($r && ($r[0]['xchan_flags'] & XCHAN_FLAGS_SELFCENSORED)) {
+ if($r && (intval($r[0]['xchan_selfcensored']))) {
$local_public = false;
continue;
}
@@ -1560,13 +1543,10 @@ function process_delivery($sender, $arr, $deliveries, $relay, $public = false, $
// This is our own post, possibly coming from a channel clone
if($arr['owner_xchan'] == $d['hash']) {
- $arr['item_flags'] = $arr['item_flags'] | ITEM_WALL;
+ $arr['item_wall'] = 1;
}
else {
- // clear the wall flag if it is set
- if($arr['item_flags'] & ITEM_WALL) {
- $arr['item_flags'] = ($arr['item_flags'] ^ ITEM_WALL);
- }
+ $arr['item_wall'] = 0;
}
if((! perm_is_allowed($channel['channel_id'],$sender['hash'],$perm)) && (! $tag_delivery) && (! $local_public)) {
@@ -1654,7 +1634,7 @@ function process_delivery($sender, $arr, $deliveries, $relay, $public = false, $
}
}
- if($arr['item_restrict'] & ITEM_DELETED) {
+ if(intval($arr['item_deleted'])) {
// remove_community_tag is a no-op if this isn't a community tag activity
remove_community_tag($sender,$arr,$channel['channel_id']);
@@ -1677,15 +1657,16 @@ function process_delivery($sender, $arr, $deliveries, $relay, $public = false, $
continue;
}
- $r = q("select id, edited, item_restrict, item_flags, mid, parent_mid from item where mid = '%s' and uid = %d limit 1",
+ $r = q("select * from item where mid = '%s' and uid = %d limit 1",
dbesc($arr['mid']),
intval($channel['channel_id'])
);
if($r) {
// We already have this post.
$item_id = $r[0]['id'];
- if($r[0]['item_restrict'] & ITEM_DELETED) {
- // It was deleted locally.
+
+ if(intval($r[0]['item_deleted'])) {
+ // It was deleted locally.
$result[] = array($d['hash'],'update ignored',$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>',$arr['mid']);
continue;
}
@@ -1700,9 +1681,10 @@ function process_delivery($sender, $arr, $deliveries, $relay, $public = false, $
}
else {
$result[] = array($d['hash'],'update ignored',$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>',$arr['mid']);
- // We need this line to ensure wall-to-wall comments are relayed (by falling through to the relay bit),
- // and at the same time not relay any other relayable posts more than once, because to do so is very wasteful.
- if(! ($r[0]['item_flags'] & ITEM_ORIGIN))
+
+ // We need this line to ensure wall-to-wall comments are relayed (by falling through to the relay bit),
+ // and at the same time not relay any other relayable posts more than once, because to do so is very wasteful.
+ if(! intval($r[0]['item_origin']))
continue;
}
}
@@ -1849,7 +1831,12 @@ function delete_imported_item($sender, $item, $uid, $relay) {
$item_found = false;
$post_id = 0;
- $r = q("select id, item_restrict, author_xchan, owner_xchan, source_xchan from item where mid = '%s' and uid = %d limit 1",
+
+ $r = q("select id, item_deleted from item where ( author_xchan = '%s' or owner_xchan = '%s' or source_xchan = '%s' )
+ and mid = '%s' and uid = %d limit 1",
+ dbesc($sender['hash']),
+ dbesc($sender['hash']),
+ dbesc($sender['hash']),
dbesc($item['mid']),
intval($uid)
);
@@ -1881,8 +1868,10 @@ function delete_imported_item($sender, $item, $uid, $relay) {
return false;
}
+ require_once('include/items.php');
+
if ($item_found) {
- if ($r[0]['item_restrict'] & ITEM_DELETED) {
+ if (intval($r[0]['item_deleted'])) {
logger('delete_imported_item: item was already deleted');
if (! $relay)
return false;
@@ -1894,9 +1883,8 @@ function delete_imported_item($sender, $item, $uid, $relay) {
// back, and we aren't going to (or shouldn't at any rate) delete it again in the future - so losing
// this information from the metadata should have no other discernible impact.
- if (($r[0]['id'] != $r[0]['parent']) && ($r[0]['item_flags'] & ITEM_ORIGIN)) {
- q("update item set item_flags = %d where id = %d and uid = %d",
- intval($r[0]['item_flags'] ^ ITEM_ORIGIN),
+ if (($r[0]['id'] != $r[0]['parent']) && intval($r[0]['item_origin'])) {
+ q("update item set item_origin = 0 where id = %d and uid = %d",
intval($r[0]['id']),
intval($r[0]['uid'])
);
@@ -2157,23 +2145,16 @@ function sync_locations($sender, $arr, $absolute = false) {
$current_site = true;
}
- // If it is the site we're currently talking to, and it's marked offline,
- // either we have some bad information - or the thing came back to life.
-
- if(($current_site) && ($r[0]['hubloc_status'] & HUBLOC_OFFLINE)) {
- q("update hubloc set hubloc_status = (hubloc_status & ~%d) where hubloc_id = %d",
- intval(HUBLOC_OFFLINE),
+ if($current_site && intval($r[0]['hubloc_error'])) {
+ q("update hubloc set hubloc_error = 0 where hubloc_id = %d",
intval($r[0]['hubloc_id'])
);
- if($r[0]['hubloc_flags'] & HUBLOC_FLAGS_ORPHANCHECK) {
- q("update hubloc set hubloc_flags = (hubloc_flags & ~%d) where hubloc_id = %d",
- intval(HUBLOC_FLAGS_ORPHANCHECK),
+ if(intval($r[0]['hubloc_orphancheck'])) {
+ q("update hubloc set hubloc_orphancheck = 0 where hubloc_id = %d",
intval($r[0]['hubloc_id'])
);
}
- q("update xchan set xchan_flags = (xchan_flags & ~%d) where (xchan_flags & %d)>0 and xchan_hash = '%s'",
- intval(XCHAN_FLAGS_ORPHAN),
- intval(XCHAN_FLAGS_ORPHAN),
+ q("update xchan set xchan_orphan = 0 where xchan_orphan = 1 and xchan_hash = '%s'",
dbesc($sender['hash'])
);
}
@@ -2189,9 +2170,8 @@ function sync_locations($sender, $arr, $absolute = false) {
}
}
- if(($r[0]['hubloc_flags'] & HUBLOC_FLAGS_PRIMARY) && (! $location['primary'])) {
- $m = q("update hubloc set hubloc_flags = (hubloc_flags & ~%d), hubloc_updated = '%s' where hubloc_id = %d",
- intval(HUBLOC_FLAGS_PRIMARY),
+ if(intval($r[0]['hubloc_primary']) && (! $location['primary'])) {
+ $m = q("update hubloc set hubloc_primary = 0, hubloc_updated = '%s' where hubloc_id = %d",
dbesc(datetime_convert()),
intval($r[0]['hubloc_id'])
);
@@ -2200,14 +2180,13 @@ function sync_locations($sender, $arr, $absolute = false) {
$what .= 'primary_hub ';
$changed = true;
}
- elseif((! ($r[0]['hubloc_flags'] & HUBLOC_FLAGS_PRIMARY)) && ($location['primary'])) {
- $m = q("update hubloc set hubloc_flags = (hubloc_flags | %d), hubloc_updated = '%s' where hubloc_id = %d",
- intval(HUBLOC_FLAGS_PRIMARY),
+ elseif((! intval($r[0]['hubloc_primary'])) && ($location['primary'])) {
+ $m = q("update hubloc set hubloc_primary = 1, hubloc_updated = '%s' where hubloc_id = %d",
dbesc(datetime_convert()),
intval($r[0]['hubloc_id'])
);
// make sure hubloc_change_primary() has current data
- $r[0]['hubloc_flags'] = $r[0]['hubloc_flags'] ^ HUBLOC_FLAGS_PRIMARY;
+ $r[0]['hubloc_primary'] = intval($location['primary']);
hubloc_change_primary($r[0]);
$what .= 'primary_hub ';
$changed = true;
@@ -2220,18 +2199,17 @@ function sync_locations($sender, $arr, $absolute = false) {
$changed = true;
}
}
- if(($r[0]['hubloc_flags'] & HUBLOC_FLAGS_DELETED) && (! $location['deleted'])) {
- $n = q("update hubloc set hubloc_flags = (hubloc_flags & ~%d), hubloc_updated = '%s' where hubloc_id = %d",
- intval(HUBLOC_FLAGS_DELETED),
+ if((intval($r[0]['hubloc_deleted']) && (! $location['deleted']))
+ || ((! (intval($r[0]['hubloc_deleted']))) && ($location['deleted']))) {
+ $n = q("update hubloc set hubloc_deleted = 0, hubloc_updated = '%s' where hubloc_id = %d",
dbesc(datetime_convert()),
intval($r[0]['hubloc_id'])
);
$what .= 'delete_hub ';
$changed = true;
}
- elseif((! ($r[0]['hubloc_flags'] & HUBLOC_FLAGS_DELETED)) && ($location['deleted'])) {
- $n = q("update hubloc set hubloc_flags = (hubloc_flags | %d), hubloc_updated = '%s' where hubloc_id = %d",
- intval(HUBLOC_FLAGS_DELETED),
+ elseif((! intval($r[0]['hubloc_deleted'])) && ($location['deleted'])) {
+ $n = q("update hubloc set hubloc_deleted = 1, hubloc_updated = '%s' where hubloc_id = %d",
dbesc(datetime_convert()),
intval($r[0]['hubloc_id'])
);
@@ -2245,22 +2223,20 @@ function sync_locations($sender, $arr, $absolute = false) {
// New hub claiming to be primary. Make it so by removing any existing primaries.
if(intval($location['primary'])) {
- $r = q("update hubloc set hubloc_flags = (hubloc_flags & ~%d), hubloc_updated = '%s' where hubloc_hash = '%s' and (hubloc_flags & %d )>0",
- intval(HUBLOC_FLAGS_PRIMARY),
+ $r = q("update hubloc set hubloc_primary = 0, hubloc_updated = '%s' where hubloc_hash = '%s' and hubloc_primary = 1",
dbesc(datetime_convert()),
- dbesc($sender['hash']),
- intval(HUBLOC_FLAGS_PRIMARY)
+ dbesc($sender['hash'])
);
}
logger('sync_locations: new hub: ' . $location['url']);
- $r = q("insert into hubloc ( hubloc_guid, hubloc_guid_sig, hubloc_hash, hubloc_addr, hubloc_network, hubloc_flags, hubloc_url, hubloc_url_sig, hubloc_host, hubloc_callback, hubloc_sitekey, hubloc_updated, hubloc_connected)
+ $r = q("insert into hubloc ( hubloc_guid, hubloc_guid_sig, hubloc_hash, hubloc_addr, hubloc_network, hubloc_primary, hubloc_url, hubloc_url_sig, hubloc_host, hubloc_callback, hubloc_sitekey, hubloc_updated, hubloc_connected)
values ( '%s','%s','%s','%s', '%s', %d ,'%s','%s','%s','%s','%s','%s','%s')",
dbesc($sender['guid']),
dbesc($sender['guid_sig']),
dbesc($sender['hash']),
dbesc($location['address']),
dbesc('zot'),
- intval((intval($location['primary'])) ? HUBLOC_FLAGS_PRIMARY : 0),
+ intval($location['primary']),
dbesc($location['url']),
dbesc($location['url_sig']),
dbesc($location['host']),
@@ -2288,8 +2264,7 @@ function sync_locations($sender, $arr, $absolute = false) {
foreach($xisting as $x) {
if(! array_key_exists('updated',$x)) {
logger('sync_locations: deleting unreferenced hub location ' . $x['hubloc_url']);
- $r = q("update hubloc set hubloc_flags = (hubloc_flags & ~%d), hubloc_updated = '%s' where hubloc_id = %d",
- intval(HUBLOC_FLAGS_DELETED),
+ $r = q("update hubloc set hubloc_deleted = 1, hubloc_updated = '%s' where hubloc_id = %d",
dbesc(datetime_convert()),
intval($x['hubloc_id'])
);
@@ -2318,20 +2293,19 @@ function zot_encode_locations($channel) {
$ret = array();
$x = zot_get_hublocs($channel['channel_hash']);
- if ($x && count($x)) {
- foreach ($x as $hub) {
- if (! ($hub['hubloc_flags'] & HUBLOC_FLAGS_UNVERIFIED)) {
- $ret[] = array(
- 'host' => $hub['hubloc_host'],
- 'address' => $hub['hubloc_addr'],
- 'primary' => (($hub['hubloc_flags'] & HUBLOC_FLAGS_PRIMARY) ? true : false),
- 'url' => $hub['hubloc_url'],
- 'url_sig' => $hub['hubloc_url_sig'],
- 'callback' => $hub['hubloc_callback'],
- 'sitekey' => $hub['hubloc_sitekey'],
- 'deleted' => (($hub['hubloc_flags'] & HUBLOC_FLAGS_DELETED) ? true : false)
- );
- }
+
+ if($x && count($x)) {
+ foreach($x as $hub) {
+ $ret[] = array(
+ 'host' => $hub['hubloc_host'],
+ 'address' => $hub['hubloc_addr'],
+ 'primary' => (intval($hub['hubloc_primary']) ? true : false),
+ 'url' => $hub['hubloc_url'],
+ 'url_sig' => $hub['hubloc_url_sig'],
+ 'callback' => $hub['hubloc_callback'],
+ 'sitekey' => $hub['hubloc_sitekey'],
+ 'deleted' => (intval($hub['hubloc_deleted']) ? true : false)
+ );
}
}
@@ -2387,9 +2361,8 @@ function import_directory_profile($hash, $profile, $addr, $ud_flags = UPDATE_FLA
// These are not translated, so the German "erwachsenen" keyword will not censor the directory profile. Only the English form - "adult".
- if (in_arrayi('nsfw', $clean) || in_arrayi('adult', $clean)) {
- q("update xchan set xchan_flags = (xchan_flags | %d) where xchan_hash = '%s'",
- intval(XCHAN_FLAGS_SELFCENSORED),
+ if(in_arrayi('nsfw',$clean) || in_arrayi('adult',$clean)) {
+ q("update xchan set xchan_selfcensored = 1 where xchan_hash = '%s'",
dbesc($hash)
);
}
@@ -2983,6 +2956,9 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) {
. "' where abook_xchan = '" . dbesc($clean['abook_xchan']) . "' and abook_channel = " . intval($channel['channel_id']));
}
}
+
+
+
}
}
@@ -3199,11 +3175,11 @@ function get_rpost_path($observer) {
* @return boolean|string return false or a hash
*/
function import_author_zot($x) {
- $hash = make_xchan_hash($x['guid'], $x['guid_sig']);
- $r = q("select hubloc_url from hubloc where hubloc_guid = '%s' and hubloc_guid_sig = '%s' and (hubloc_flags & %d)>0 limit 1",
+
+ $hash = make_xchan_hash($x['guid'],$x['guid_sig']);
+ $r = q("select hubloc_url from hubloc where hubloc_guid = '%s' and hubloc_guid_sig = '%s' and hubloc_primary = 1 limit 1",
dbesc($x['guid']),
- dbesc($x['guid_sig']),
- intval(HUBLOC_FLAGS_PRIMARY)
+ dbesc($x['guid_sig'])
);
if ($r) {
@@ -3273,12 +3249,9 @@ function zot_process_message_request($data) {
if ($messages) {
$env_recips = null;
- $r = q("select hubloc_guid, hubloc_url, hubloc_sitekey, hubloc_network, hubloc_flags, hubloc_callback, hubloc_host
- from hubloc where hubloc_hash = '%s' and not (hubloc_flags & %d)>0
- and not (hubloc_status & %d)>0 ",
- dbesc($sender_hash),
- intval(HUBLOC_FLAGS_DELETED),
- intval(HUBLOC_OFFLINE)
+ $r = q("select * from hubloc where hubloc_hash = '%s' and not hubloc_error and not hubloc_deleted
+ group by hubloc_sitekey",
+ dbesc($sender_hash)
);
if (! $r) {
logger('no hubs');
diff --git a/install/INSTALL.txt b/install/INSTALL.txt
index 7c4209896..003defeed 100644
--- a/install/INSTALL.txt
+++ b/install/INSTALL.txt
@@ -1,23 +1,23 @@
-Red Matrix Installation
+Hubzilla Installation
-We've tried very hard to ensure that the Red Matrix will run on commodity
+We've tried very hard to ensure that the Hubzilla will run on commodity
hosting platforms - such as those used to host Wordpress blogs and Drupal
websites. It will run on most any Linux VPS system. Windows LAMP platforms
such as XAMPP and WAMP are not officially supported at this time - however
we welcome patches if you manage to get it working.
-Be aware that the Red Matrix is more than a simple web application. It is a
+Be aware that the Hubzilla is more than a simple web application. It is a
complex communications system which more closely resembles an email server
than a web server. For reliability and performance, messages are delivered in
the background and are queued for later delivery when sites are down. This
kind of functionality requires a bit more of the host system than the typical
blog. Not every PHP/MySQL hosting provider will be able to support the
-Red Matrix. Many will - but please review the requirements and confirm these
+Hubzilla. Many will - but please review the requirements and confirm these
with your hosting provider prior to installation. (And preferably before
entering into a long-term contract.)
If you encounter installation issues, please let us know via the Github issue
-tracker (https://github.com/redmatrix/redmatrix/issues). Please be as clear as you
+tracker (https://github.com/redmatrix/hubzilla/issues). Please be as clear as you
can about your operating environment and provide as much detail as possible
about any error messages you may see, so that we can prevent it from happening
in the future. Due to the large variety of operating systems and PHP platforms
@@ -29,7 +29,7 @@ issues.
Before you begin: Choose a domain name or subdomain name for your server.
-The Red Matrix can only be installed into the root of a domain or
+The Hubzilla can only be installed into the root of a domain or
sub-domain, and can not be installed using alternate TCP ports.
Decide if you will use SSL and obtain an SSL certificate before software
@@ -57,7 +57,7 @@ Free "browser-valid" certificates are available from providers such as StartSSL.
If you do NOT use SSL, there may be a delay of up to a minute for the initial
install script - while we check the SSL port to see if anything responds there.
-When communicating with new sites, Red Matrix always attempts connection on the
+When communicating with new sites, Hubzilla always attempts connection on the
SSL port first, before falling back to a less secure connection. If you do not
use SSL, your webserver must not listen on port 443 at all.
@@ -87,7 +87,7 @@ use SSL, your webserver must not listen on port 443 at all.
- Installation into a top-level domain or sub-domain (without a
directory/path component in the URL) is REQUIRED.
-2. Unpack the RedMatrix files into the root of your web server document area.
+2. Unpack the Hubzilla files into the root of your web server document area.
If you copy the directory tree to your webserver, make sure that you
also copy .htaccess - as "dot" files are often hidden and aren't normally
@@ -98,7 +98,7 @@ use SSL, your webserver must not listen on port 443 at all.
software much easier to update. The Linux command to clone the repository
into a directory "mywebsite" would be
- git clone https://github.com/redmatrix/redmatrix.git mywebsite
+ git clone https://github.com/redmatrix/hubzilla.git mywebsite
- and then you can pick up the latest changes at any time with
@@ -126,10 +126,10 @@ use SSL, your webserver must not listen on port 443 at all.
cd mywebsite
- Then you should clone the addon repository (separately). We'll give this repository
- a nickname of 'matrix'. You can pull in other redmatrix addon repositories by
+ a nickname of 'matrix'. You can pull in other hubzilla addon repositories by
giving them different nicknames.
- util/add_addon_repo https://github.com/redmatrix/redmatrix-addons.git matrix
+ util/add_addon_repo https://github.com/redmatrix/hubzilla-addons.git matrix
- For keeping the addon tree updated, you should be on your top level website
directory and issue an update command for that repository.
@@ -186,7 +186,7 @@ one shown, substituting for your unique paths and settings:
You can generally find the location of PHP by executing "which php". If you
have troubles with this section please contact your hosting provider for
-assistance. RedMatrix will not work correctly if you cannot perform this step.
+assistance. Hubzilla will not work correctly if you cannot perform this step.
You should also be sure that $a->config['system']['php_path'] is set correctly,
it should look like (changing it to the correct PHP location)
@@ -233,7 +233,7 @@ generally be world-readable.
Ensure that mod-rewite is installed and working, and that your
.htaccess file is being used. To verify the latter, create a file test.out
-containing the word "test" in the top directory of the RedMatrix, make it world
+containing the word "test" in the top directory of the Hubzilla, make it world
readable and point your web browser to
http://yoursitenamehere.com/test.out
@@ -283,7 +283,7 @@ Retry the installation. As soon as the database has been created,
#####################################################################
- Some configurations with "suhosin" security are configured without
-an ability to run external processes. The Red Matrix requires this ability.
+an ability to run external processes. The Hubzilla requires this ability.
Following are some notes provided by one of our members.
#####################################################################
@@ -293,26 +293,26 @@ certain functions like proc_open, as configured in /etc/php5/conf.d/suhosin.ini:
suhosin.executor.func.blacklist = proc_open, ...
-For those sites like Red Matrix that really need these functions they can be
-enabled, e.g. in /etc/apache2/sites-available/redmatrix:
+For those sites like Hubzilla that really need these functions they can be
+enabled, e.g. in /etc/apache2/sites-available/hubzilla:
- <Directory /var/www/redmatrix/>
+ <Directory /var/www/hubzilla/>
php_admin_value suhosin.executor.func.blacklist none
php_admin_value suhosin.executor.eval.blacklist none
</Directory>
-This enables every function for Red Matrix if accessed via browser, but not for
+This enables every function for Hubzilla if accessed via browser, but not for
the cronjob that is called via php command line. I attempted to enable it for
cron by using something like
- */10 * * * * cd /var/www/redmatrix/ && sudo -u www-data /usr/bin/php
+ */10 * * * * cd /var/www/hubzilla/ && sudo -u www-data /usr/bin/php
-d suhosin.executor.func.blacklist=none -d suhosin.executor.eval.blacklist=none
-f include/poller.php
This worked well for simple test cases, but the cron job still failed with
a fatal error:
suhosin[22962]: ALERT - function within blacklist called: proc_open() (attacker
-'REMOTE_ADDR not set', file '/var/www/redmatrix/boot.php', line 1341)
+'REMOTE_ADDR not set', file '/var/www/hubzilla/boot.php', line 1341)
After a while I noticed, that include/poller.php calls further php script via
proc_open. These scripts themselves also use proc_open and fail, because they
diff --git a/install/htconfig.sample.php b/install/htconfig.sample.php
index 25ac2df7c..21697a951 100755
--- a/install/htconfig.sample.php
+++ b/install/htconfig.sample.php
@@ -3,7 +3,7 @@
// If automatic system installation fails:
// Copy or rename this file to .htconfig.php in the top level
-// Red Matrix directory
+// Hubzilla directory
// Why .htconfig.php? Because it contains sensitive information which could
// give somebody complete control of your database. Apache's default
@@ -40,7 +40,7 @@ $default_timezone = 'America/Los_Angeles';
// What is your site name?
$a->config['system']['baseurl'] = 'https://myredsite.example';
-$a->config['system']['sitename'] = "Red Matrix";
+$a->config['system']['sitename'] = "Hubzilla";
$a->config['system']['location_hash'] = 'if the auto install failed, put a unique random string here';
diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql
index 8e3d5a7b4..407565f79 100644
--- a/install/schema_mysql.sql
+++ b/install/schema_mysql.sql
@@ -1,8 +1,3 @@
--- --------------------------------------------------------
-
---
--- Table structure for table `abook`
---
CREATE TABLE IF NOT EXISTS `abook` (
`abook_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -12,13 +7,19 @@ CREATE TABLE IF NOT EXISTS `abook` (
`abook_my_perms` int(11) NOT NULL DEFAULT '0',
`abook_their_perms` int(11) NOT NULL DEFAULT '0',
`abook_closeness` tinyint(3) unsigned NOT NULL DEFAULT '99',
- `abook_rating` int(11) NOT NULL DEFAULT '0',
- `abook_rating_text` TEXT NOT NULL DEFAULT '',
`abook_created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`abook_updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`abook_connected` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`abook_dob` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`abook_flags` int(11) NOT NULL DEFAULT '0',
+ `abook_blocked` tinyint(4) NOT NULL DEFAULT '0',
+ `abook_ignored` tinyint(4) NOT NULL DEFAULT '0',
+ `abook_hidden` tinyint(4) NOT NULL DEFAULT '0',
+ `abook_archived` tinyint(4) NOT NULL DEFAULT '0',
+ `abook_pending` tinyint(4) NOT NULL DEFAULT '0',
+ `abook_unconnected` tinyint(4) NOT NULL DEFAULT '0',
+ `abook_self` tinyint(4) NOT NULL DEFAULT '0',
+ `abook_feed` tinyint(4) NOT NULL DEFAULT '0',
`abook_profile` char(64) NOT NULL DEFAULT '',
PRIMARY KEY (`abook_id`),
KEY `abook_account` (`abook_account`),
@@ -33,16 +34,16 @@ CREATE TABLE IF NOT EXISTS `abook` (
KEY `abook_profile` (`abook_profile`),
KEY `abook_dob` (`abook_dob`),
KEY `abook_connected` (`abook_connected`),
- KEY `abook_rating` (`abook_rating`),
- KEY `abook_channel_closeness` (`abook_channel`,`abook_closeness`)
+ KEY `abook_blocked` (`abook_blocked`),
+ KEY `abook_ignored` (`abook_ignored`),
+ KEY `abook_hidden` (`abook_hidden`),
+ KEY `abook_archived` (`abook_archived`),
+ KEY `abook_pending` (`abook_pending`),
+ KEY `abook_unconnected` (`abook_unconnected`),
+ KEY `abook_self` (`abook_self`),
+ KEY `abook_feed` (`abook_feed`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- --------------------------------------------------------
-
---
--- Table structure for table `account`
---
-
CREATE TABLE IF NOT EXISTS `account` (
`account_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`account_parent` int(10) unsigned NOT NULL DEFAULT '0',
@@ -76,12 +77,6 @@ CREATE TABLE IF NOT EXISTS `account` (
KEY `account_password_changed` (`account_password_changed`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- --------------------------------------------------------
-
---
--- Table structure for table `addon`
---
-
CREATE TABLE IF NOT EXISTS `addon` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`name` char(255) NOT NULL DEFAULT '',
@@ -94,13 +89,7 @@ CREATE TABLE IF NOT EXISTS `addon` (
KEY `hidden` (`hidden`),
KEY `name` (`name`),
KEY `installed` (`installed`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `app`
---
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `app` (
`id` int(11) NOT NULL AUTO_INCREMENT,
@@ -125,13 +114,7 @@ CREATE TABLE IF NOT EXISTS `app` (
KEY `app_version` (`app_version`),
KEY `app_channel` (`app_channel`),
KEY `app_price` (`app_price`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `attach`
---
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `attach` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -145,6 +128,10 @@ CREATE TABLE IF NOT EXISTS `attach` (
`revision` int(10) unsigned NOT NULL DEFAULT '0',
`folder` char(64) NOT NULL DEFAULT '',
`flags` int(10) unsigned NOT NULL DEFAULT '0',
+ `is_dir` tinyint(1) NOT NULL DEFAULT '0',
+ `os_storage` tinyint(1) NOT NULL DEFAULT '0',
+ `os_path` mediumtext NOT NULL,
+ `display_path` mediumtext NOT NULL,
`data` longblob NOT NULL,
`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`edited` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
@@ -164,14 +151,10 @@ CREATE TABLE IF NOT EXISTS `attach` (
KEY `revision` (`revision`),
KEY `folder` (`folder`),
KEY `flags` (`flags`),
- KEY `creator` (`creator`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `auth_codes`
---
+ KEY `creator` (`creator`),
+ KEY `is_dir` (`is_dir`),
+ KEY `os_storage` (`os_storage`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `auth_codes` (
`id` varchar(40) NOT NULL DEFAULT '',
@@ -182,12 +165,6 @@ CREATE TABLE IF NOT EXISTS `auth_codes` (
PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- --------------------------------------------------------
-
---
--- Table structure for table `cache`
---
-
CREATE TABLE IF NOT EXISTS `cache` (
`k` char(255) NOT NULL DEFAULT '',
`v` text NOT NULL,
@@ -195,12 +172,6 @@ CREATE TABLE IF NOT EXISTS `cache` (
PRIMARY KEY (`k`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- --------------------------------------------------------
-
---
--- Table structure for table `channel`
---
-
CREATE TABLE IF NOT EXISTS `channel` (
`channel_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`channel_account_id` int(10) unsigned NOT NULL DEFAULT '0',
@@ -283,16 +254,10 @@ CREATE TABLE IF NOT EXISTS `channel` (
KEY `channel_deleted` (`channel_deleted`),
KEY `channel_a_republish` (`channel_a_republish`),
KEY `channel_dirdate` (`channel_dirdate`),
- KEY `channel_lastpost` (`channel_lastpost`),
- KEY `channel_w_like` (`channel_w_like`)
+ KEY `channel_w_like` (`channel_w_like`),
+ KEY `channel_lastpost` (`channel_lastpost`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- --------------------------------------------------------
-
---
--- Table structure for table `chat`
---
-
CREATE TABLE IF NOT EXISTS `chat` (
`chat_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`chat_room` int(10) unsigned NOT NULL DEFAULT '0',
@@ -303,13 +268,7 @@ CREATE TABLE IF NOT EXISTS `chat` (
KEY `chat_room` (`chat_room`),
KEY `chat_xchan` (`chat_xchan`),
KEY `created` (`created`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `chatpresence`
---
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `chatpresence` (
`cp_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -325,12 +284,6 @@ CREATE TABLE IF NOT EXISTS `chatpresence` (
KEY `cp_status` (`cp_status`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- --------------------------------------------------------
-
---
--- Table structure for table `chatroom`
---
-
CREATE TABLE IF NOT EXISTS `chatroom` (
`cr_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`cr_aid` int(10) unsigned NOT NULL DEFAULT '0',
@@ -350,13 +303,7 @@ CREATE TABLE IF NOT EXISTS `chatroom` (
KEY `cr_created` (`cr_created`),
KEY `cr_edited` (`cr_edited`),
KEY `cr_expire` (`cr_expire`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `clients`
---
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `clients` (
`client_id` varchar(20) NOT NULL DEFAULT '',
@@ -368,12 +315,6 @@ CREATE TABLE IF NOT EXISTS `clients` (
PRIMARY KEY (`client_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- --------------------------------------------------------
-
---
--- Table structure for table `config`
---
-
CREATE TABLE IF NOT EXISTS `config` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`cat` char(255) CHARACTER SET ascii NOT NULL DEFAULT '',
@@ -383,12 +324,6 @@ CREATE TABLE IF NOT EXISTS `config` (
UNIQUE KEY `access` (`cat`,`k`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- --------------------------------------------------------
-
---
--- Table structure for table `conv`
---
-
CREATE TABLE IF NOT EXISTS `conv` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`guid` char(255) NOT NULL DEFAULT '',
@@ -403,12 +338,6 @@ CREATE TABLE IF NOT EXISTS `conv` (
KEY `updated` (`updated`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- --------------------------------------------------------
-
---
--- Table structure for table `event`
---
-
CREATE TABLE IF NOT EXISTS `event` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`aid` int(10) unsigned NOT NULL DEFAULT '0',
@@ -443,12 +372,6 @@ CREATE TABLE IF NOT EXISTS `event` (
KEY `event_xchan` (`event_xchan`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- --------------------------------------------------------
-
---
--- Table structure for table `fcontact`
---
-
CREATE TABLE IF NOT EXISTS `fcontact` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`url` char(255) NOT NULL,
@@ -471,12 +394,6 @@ CREATE TABLE IF NOT EXISTS `fcontact` (
KEY `network` (`network`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- --------------------------------------------------------
-
---
--- Table structure for table `ffinder`
---
-
CREATE TABLE IF NOT EXISTS `ffinder` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`uid` int(10) unsigned NOT NULL,
@@ -488,12 +405,6 @@ CREATE TABLE IF NOT EXISTS `ffinder` (
KEY `fid` (`fid`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- --------------------------------------------------------
-
---
--- Table structure for table `fserver`
---
-
CREATE TABLE IF NOT EXISTS `fserver` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`server` char(255) NOT NULL DEFAULT '',
@@ -504,12 +415,6 @@ CREATE TABLE IF NOT EXISTS `fserver` (
KEY `posturl` (`posturl`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- --------------------------------------------------------
-
---
--- Table structure for table `fsuggest`
---
-
CREATE TABLE IF NOT EXISTS `fsuggest` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`uid` int(11) NOT NULL DEFAULT '0',
@@ -523,12 +428,6 @@ CREATE TABLE IF NOT EXISTS `fsuggest` (
PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- --------------------------------------------------------
-
---
--- Table structure for table `groups`
---
-
CREATE TABLE IF NOT EXISTS `groups` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`hash` char(255) NOT NULL DEFAULT '',
@@ -543,12 +442,6 @@ CREATE TABLE IF NOT EXISTS `groups` (
KEY `hash` (`hash`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- --------------------------------------------------------
-
---
--- Table structure for table `group_member`
---
-
CREATE TABLE IF NOT EXISTS `group_member` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`uid` int(10) unsigned NOT NULL DEFAULT '0',
@@ -560,12 +453,6 @@ CREATE TABLE IF NOT EXISTS `group_member` (
KEY `xchan` (`xchan`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- --------------------------------------------------------
-
---
--- Table structure for table `hook`
---
-
CREATE TABLE IF NOT EXISTS `hook` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`hook` char(255) NOT NULL DEFAULT '',
@@ -574,13 +461,7 @@ CREATE TABLE IF NOT EXISTS `hook` (
`priority` int(11) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`id`),
KEY `hook` (`hook`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `hubloc`
---
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `hubloc` (
`hubloc_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -599,6 +480,10 @@ CREATE TABLE IF NOT EXISTS `hubloc` (
`hubloc_sitekey` text NOT NULL,
`hubloc_updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`hubloc_connected` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+ `hubloc_primary` tinyint(1) NOT NULL DEFAULT '0',
+ `hubloc_orphancheck` tinyint(1) NOT NULL DEFAULT '0',
+ `hubloc_error` tinyint(1) NOT NULL DEFAULT '0',
+ `hubloc_deleted` tinyint(1) NOT NULL DEFAULT '0',
PRIMARY KEY (`hubloc_id`),
KEY `hubloc_url` (`hubloc_url`),
KEY `hubloc_guid` (`hubloc_guid`),
@@ -609,15 +494,13 @@ CREATE TABLE IF NOT EXISTS `hubloc` (
KEY `hubloc_updated` (`hubloc_updated`),
KEY `hubloc_connected` (`hubloc_connected`),
KEY `hubloc_status` (`hubloc_status`),
- KEY `hubloc_network` (`hubloc_network`)
+ KEY `hubloc_network` (`hubloc_network`),
+ KEY `hubloc_primary` (`hubloc_primary`),
+ KEY `hubloc_orphancheck` (`hubloc_orphancheck`),
+ KEY `hubloc_deleted` (`hubloc_deleted`),
+ KEY `hubloc_error` (`hubloc_error`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- --------------------------------------------------------
-
---
--- Table structure for table `issue`
---
-
CREATE TABLE IF NOT EXISTS `issue` (
`issue_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`issue_created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
@@ -635,12 +518,6 @@ CREATE TABLE IF NOT EXISTS `issue` (
KEY `issue_component` (`issue_component`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- --------------------------------------------------------
-
---
--- Table structure for table `item`
---
-
CREATE TABLE IF NOT EXISTS `item` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`mid` char(255) CHARACTER SET ascii NOT NULL DEFAULT '',
@@ -662,6 +539,7 @@ CREATE TABLE IF NOT EXISTS `item` (
`mimetype` char(255) NOT NULL DEFAULT '',
`title` text NOT NULL,
`body` mediumtext NOT NULL,
+ `html` mediumtext NOT NULL,
`app` char(255) NOT NULL DEFAULT '',
`lang` char(64) NOT NULL DEFAULT '',
`revision` int(10) unsigned NOT NULL DEFAULT '0',
@@ -690,8 +568,26 @@ CREATE TABLE IF NOT EXISTS `item` (
`deny_gid` mediumtext NOT NULL,
`item_restrict` int(11) NOT NULL DEFAULT '0',
`item_flags` int(11) NOT NULL DEFAULT '0',
- `item_private` tinyint(4) NOT NULL DEFAULT '0',
- `item_unseen` smallint(1) NOT NULL DEFAULT '0',
+ `item_private` tinyint(1) NOT NULL DEFAULT '0',
+ `item_origin` tinyint(1) NOT NULL DEFAULT '0',
+ `item_unseen` tinyint(1) NOT NULL DEFAULT '0',
+ `item_starred` tinyint(1) NOT NULL DEFAULT '0',
+ `item_uplink` tinyint(1) NOT NULL DEFAULT '0',
+ `item_consensus` tinyint(1) NOT NULL DEFAULT '0',
+ `item_wall` tinyint(1) NOT NULL DEFAULT '0',
+ `item_thread_top` tinyint(1) NOT NULL DEFAULT '0',
+ `item_notshown` tinyint(1) NOT NULL DEFAULT '0',
+ `item_nsfw` tinyint(1) NOT NULL DEFAULT '0',
+ `item_relay` tinyint(1) NOT NULL DEFAULT '0',
+ `item_mentionsme` tinyint(1) NOT NULL DEFAULT '0',
+ `item_nocomment` tinyint(1) NOT NULL DEFAULT '0',
+ `item_obscured` tinyint(1) NOT NULL DEFAULT '0',
+ `item_verified` tinyint(1) NOT NULL DEFAULT '0',
+ `item_retained` tinyint(1) NOT NULL DEFAULT '0',
+ `item_rss` tinyint(1) NOT NULL DEFAULT '0',
+ `item_deleted` tinyint(1) NOT NULL DEFAULT '0',
+ `item_type` int(11) NOT NULL DEFAULT '0',
+ `item_hidden` tinyint(1) NOT NULL DEFAULT '0',
PRIMARY KEY (`id`),
KEY `uid` (`uid`),
KEY `parent` (`parent`),
@@ -721,7 +617,25 @@ CREATE TABLE IF NOT EXISTS `item` (
KEY `public_policy` (`public_policy`),
KEY `comments_closed` (`comments_closed`),
KEY `changed` (`changed`),
+ KEY `item_origin` (`item_origin`),
KEY `item_unseen` (`item_unseen`),
+ KEY `item_starred` (`item_starred`),
+ KEY `item_uplink` (`item_uplink`),
+ KEY `item_wall` (`item_wall`),
+ KEY `item_thread_top` (`item_thread_top`),
+ KEY `item_notshown` (`item_notshown`),
+ KEY `item_nsfw` (`item_nsfw`),
+ KEY `item_relay` (`item_relay`),
+ KEY `item_mentionsme` (`item_mentionsme`),
+ KEY `item_nocomment` (`item_nocomment`),
+ KEY `item_obscured` (`item_obscured`),
+ KEY `item_verified` (`item_verified`),
+ KEY `item_retained` (`item_retained`),
+ KEY `item_rss` (`item_rss`),
+ KEY `item_deleted` (`item_deleted`),
+ KEY `item_type` (`item_type`),
+ KEY `item_hidden` (`item_hidden`),
+ KEY `item_consensus` (`item_consensus`),
FULLTEXT KEY `title` (`title`),
FULLTEXT KEY `body` (`body`),
FULLTEXT KEY `allow_cid` (`allow_cid`),
@@ -730,12 +644,6 @@ CREATE TABLE IF NOT EXISTS `item` (
FULLTEXT KEY `deny_gid` (`deny_gid`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- --------------------------------------------------------
-
---
--- Table structure for table `item_id`
---
-
CREATE TABLE IF NOT EXISTS `item_id` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`iid` int(11) NOT NULL DEFAULT '0',
@@ -749,12 +657,6 @@ CREATE TABLE IF NOT EXISTS `item_id` (
KEY `iid` (`iid`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- --------------------------------------------------------
-
---
--- Table structure for table `likes`
---
-
CREATE TABLE IF NOT EXISTS `likes` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`channel_id` int(10) unsigned NOT NULL DEFAULT '0',
@@ -773,13 +675,7 @@ CREATE TABLE IF NOT EXISTS `likes` (
KEY `target_type` (`target_type`),
KEY `channel_id` (`channel_id`),
KEY `target_id` (`target_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `mail`
---
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `mail` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -794,6 +690,12 @@ CREATE TABLE IF NOT EXISTS `mail` (
`attach` mediumtext NOT NULL,
`mid` char(255) NOT NULL DEFAULT '',
`parent_mid` char(255) NOT NULL DEFAULT '',
+ `mail_deleted` tinyint(4) NOT NULL DEFAULT '0',
+ `mail_replied` tinyint(4) NOT NULL DEFAULT '0',
+ `mail_isreply` tinyint(4) NOT NULL DEFAULT '0',
+ `mail_seen` tinyint(4) NOT NULL DEFAULT '0',
+ `mail_recalled` tinyint(4) NOT NULL DEFAULT '0',
+ `mail_obscured` smallint(6) NOT NULL DEFAULT '0',
`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`expires` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
PRIMARY KEY (`id`),
@@ -806,15 +708,15 @@ CREATE TABLE IF NOT EXISTS `mail` (
KEY `mid` (`mid`),
KEY `parent_mid` (`parent_mid`),
KEY `expires` (`expires`),
- KEY `convid` (`convid`)
+ KEY `convid` (`convid`),
+ KEY `mail_deleted` (`mail_deleted`),
+ KEY `mail_replied` (`mail_replied`),
+ KEY `mail_isreply` (`mail_isreply`),
+ KEY `mail_seen` (`mail_seen`),
+ KEY `mail_recalled` (`mail_recalled`),
+ KEY `mail_obscured` (`mail_obscured`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- --------------------------------------------------------
-
---
--- Table structure for table `manage`
---
-
CREATE TABLE IF NOT EXISTS `manage` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`uid` int(11) NOT NULL DEFAULT '0',
@@ -824,12 +726,6 @@ CREATE TABLE IF NOT EXISTS `manage` (
KEY `xchan` (`xchan`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- --------------------------------------------------------
-
---
--- Table structure for table `menu`
---
-
CREATE TABLE IF NOT EXISTS `menu` (
`menu_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`menu_channel_id` int(10) unsigned NOT NULL DEFAULT '0',
@@ -846,12 +742,6 @@ CREATE TABLE IF NOT EXISTS `menu` (
KEY `menu_edited` (`menu_edited`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- --------------------------------------------------------
-
---
--- Table structure for table `menu_item`
---
-
CREATE TABLE IF NOT EXISTS `menu_item` (
`mitem_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`mitem_link` char(255) NOT NULL DEFAULT '',
@@ -868,13 +758,7 @@ CREATE TABLE IF NOT EXISTS `menu_item` (
KEY `mitem_channel_id` (`mitem_channel_id`),
KEY `mitem_menu_id` (`mitem_menu_id`),
KEY `mitem_flags` (`mitem_flags`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `notify`
---
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `notify` (
`id` int(11) NOT NULL AUTO_INCREMENT,
@@ -904,12 +788,6 @@ CREATE TABLE IF NOT EXISTS `notify` (
KEY `aid` (`aid`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- --------------------------------------------------------
-
---
--- Table structure for table `obj`
---
-
CREATE TABLE IF NOT EXISTS `obj` (
`obj_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`obj_page` char(64) NOT NULL DEFAULT '',
@@ -927,13 +805,7 @@ CREATE TABLE IF NOT EXISTS `obj` (
KEY `obj_type` (`obj_type`),
KEY `obj_channel` (`obj_channel`),
KEY `obj_obj` (`obj_obj`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `outq`
---
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `outq` (
`outq_hash` char(255) NOT NULL,
@@ -947,7 +819,7 @@ CREATE TABLE IF NOT EXISTS `outq` (
`outq_updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`outq_notify` mediumtext NOT NULL,
`outq_msg` mediumtext NOT NULL,
- `outq_priority` smallint NOT NULL DEFAULT '0',
+ `outq_priority` smallint(6) NOT NULL DEFAULT '0',
PRIMARY KEY (`outq_hash`),
KEY `outq_account` (`outq_account`),
KEY `outq_channel` (`outq_channel`),
@@ -959,12 +831,6 @@ CREATE TABLE IF NOT EXISTS `outq` (
KEY `outq_priority` (`outq_priority`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- --------------------------------------------------------
-
---
--- Table structure for table `pconfig`
---
-
CREATE TABLE IF NOT EXISTS `pconfig` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`uid` int(11) NOT NULL DEFAULT '0',
@@ -975,12 +841,6 @@ CREATE TABLE IF NOT EXISTS `pconfig` (
UNIQUE KEY `access` (`uid`,`cat`,`k`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- --------------------------------------------------------
-
---
--- Table structure for table `photo`
---
-
CREATE TABLE IF NOT EXISTS `photo` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`aid` int(10) unsigned NOT NULL DEFAULT '0',
@@ -999,7 +859,12 @@ CREATE TABLE IF NOT EXISTS `photo` (
`size` int(10) unsigned NOT NULL DEFAULT '0',
`data` mediumblob NOT NULL,
`scale` tinyint(3) NOT NULL DEFAULT '0',
+ `photo_usage` smallint(6) NOT NULL DEFAULT '0',
`profile` tinyint(1) NOT NULL DEFAULT '0',
+ `is_nsfw` tinyint(1) NOT NULL DEFAULT '0',
+ `os_storage` tinyint(1) NOT NULL DEFAULT '0',
+ `os_path` mediumtext NOT NULL,
+ `display_path` mediumtext NOT NULL,
`photo_flags` int(10) unsigned NOT NULL DEFAULT '0',
`allow_cid` mediumtext NOT NULL,
`allow_gid` mediumtext NOT NULL,
@@ -1015,15 +880,12 @@ CREATE TABLE IF NOT EXISTS `photo` (
KEY `aid` (`aid`),
KEY `xchan` (`xchan`),
KEY `size` (`size`),
- KEY `resource_id` (`resource_id`)
+ KEY `resource_id` (`resource_id`),
+ KEY `is_nsfw` (`is_nsfw`),
+ KEY `os_storage` (`os_storage`),
+ KEY `photo_usage` (`photo_usage`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- --------------------------------------------------------
-
---
--- Table structure for table `poll`
---
-
CREATE TABLE IF NOT EXISTS `poll` (
`poll_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`poll_channel` int(10) unsigned NOT NULL DEFAULT '0',
@@ -1036,12 +898,6 @@ CREATE TABLE IF NOT EXISTS `poll` (
KEY `poll_votes` (`poll_votes`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- --------------------------------------------------------
-
---
--- Table structure for table `poll_elm`
---
-
CREATE TABLE IF NOT EXISTS `poll_elm` (
`pelm_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`pelm_poll` int(10) unsigned NOT NULL DEFAULT '0',
@@ -1053,12 +909,6 @@ CREATE TABLE IF NOT EXISTS `poll_elm` (
KEY `pelm_result` (`pelm_result`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- --------------------------------------------------------
-
---
--- Table structure for table `profdef`
---
-
CREATE TABLE IF NOT EXISTS `profdef` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`field_name` char(255) NOT NULL DEFAULT '',
@@ -1068,13 +918,7 @@ CREATE TABLE IF NOT EXISTS `profdef` (
`field_inputs` mediumtext NOT NULL,
PRIMARY KEY (`id`),
KEY `field_name` (`field_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `profext`
---
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `profext` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -1086,13 +930,7 @@ CREATE TABLE IF NOT EXISTS `profext` (
KEY `channel_id` (`channel_id`),
KEY `hash` (`hash`),
KEY `k` (`k`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `profile`
---
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `profile` (
`id` int(11) NOT NULL AUTO_INCREMENT,
@@ -1156,12 +994,6 @@ CREATE TABLE IF NOT EXISTS `profile` (
KEY `profile_guid` (`profile_guid`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- --------------------------------------------------------
-
---
--- Table structure for table `profile_check`
---
-
CREATE TABLE IF NOT EXISTS `profile_check` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`uid` int(10) unsigned NOT NULL DEFAULT '0',
@@ -1177,12 +1009,6 @@ CREATE TABLE IF NOT EXISTS `profile_check` (
KEY `expire` (`expire`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- --------------------------------------------------------
-
---
--- Table structure for table `register`
---
-
CREATE TABLE IF NOT EXISTS `register` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`hash` char(255) NOT NULL DEFAULT '',
@@ -1196,12 +1022,6 @@ CREATE TABLE IF NOT EXISTS `register` (
KEY `uid` (`uid`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- --------------------------------------------------------
-
---
--- Table structure for table `session`
---
-
CREATE TABLE IF NOT EXISTS `session` (
`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
`sid` char(255) NOT NULL DEFAULT '',
@@ -1212,12 +1032,6 @@ CREATE TABLE IF NOT EXISTS `session` (
KEY `expire` (`expire`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- --------------------------------------------------------
-
---
--- Table structure for table `shares`
---
-
CREATE TABLE IF NOT EXISTS `shares` (
`share_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`share_type` int(11) NOT NULL DEFAULT '0',
@@ -1229,12 +1043,6 @@ CREATE TABLE IF NOT EXISTS `shares` (
KEY `share_xchan` (`share_xchan`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- --------------------------------------------------------
-
---
--- Table structure for table `sign`
---
-
CREATE TABLE IF NOT EXISTS `sign` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`iid` int(10) unsigned NOT NULL DEFAULT '0',
@@ -1245,13 +1053,7 @@ CREATE TABLE IF NOT EXISTS `sign` (
PRIMARY KEY (`id`),
KEY `iid` (`iid`),
KEY `retract_iid` (`retract_iid`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `site`
---
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `site` (
`site_url` char(255) NOT NULL,
@@ -1265,7 +1067,7 @@ CREATE TABLE IF NOT EXISTS `site` (
`site_sellpage` char(255) NOT NULL DEFAULT '',
`site_location` char(255) NOT NULL DEFAULT '',
`site_realm` char(255) NOT NULL DEFAULT '',
- `site_valid` smallint NOT NULL DEFAULT '0',
+ `site_valid` smallint(6) NOT NULL DEFAULT '0',
PRIMARY KEY (`site_url`),
KEY `site_flags` (`site_flags`),
KEY `site_update` (`site_update`),
@@ -1278,12 +1080,6 @@ CREATE TABLE IF NOT EXISTS `site` (
KEY `site_valid` (`site_valid`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- --------------------------------------------------------
-
---
--- Table structure for table `source`
---
-
CREATE TABLE IF NOT EXISTS `source` (
`src_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`src_channel_id` int(10) unsigned NOT NULL DEFAULT '0',
@@ -1294,13 +1090,7 @@ CREATE TABLE IF NOT EXISTS `source` (
KEY `src_channel_id` (`src_channel_id`),
KEY `src_channel_xchan` (`src_channel_xchan`),
KEY `src_xchan` (`src_xchan`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `spam`
---
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `spam` (
`id` int(11) NOT NULL AUTO_INCREMENT,
@@ -1316,12 +1106,6 @@ CREATE TABLE IF NOT EXISTS `spam` (
KEY `term` (`term`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- --------------------------------------------------------
-
---
--- Table structure for table `sys_perms`
---
-
CREATE TABLE IF NOT EXISTS `sys_perms` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`cat` char(255) NOT NULL DEFAULT '',
@@ -1331,12 +1115,6 @@ CREATE TABLE IF NOT EXISTS `sys_perms` (
PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- --------------------------------------------------------
-
---
--- Table structure for table `term`
---
-
CREATE TABLE IF NOT EXISTS `term` (
`tid` int(10) unsigned NOT NULL AUTO_INCREMENT,
`aid` int(10) unsigned NOT NULL DEFAULT '0',
@@ -1361,12 +1139,6 @@ CREATE TABLE IF NOT EXISTS `term` (
KEY `parent_hash` (`parent_hash`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- --------------------------------------------------------
-
---
--- Table structure for table `tokens`
---
-
CREATE TABLE IF NOT EXISTS `tokens` (
`id` varchar(40) NOT NULL DEFAULT '',
`secret` text NOT NULL,
@@ -1380,12 +1152,6 @@ CREATE TABLE IF NOT EXISTS `tokens` (
KEY `uid` (`uid`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- --------------------------------------------------------
-
---
--- Table structure for table `updates`
---
-
CREATE TABLE IF NOT EXISTS `updates` (
`ud_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`ud_hash` char(128) NOT NULL DEFAULT '',
@@ -1403,12 +1169,6 @@ CREATE TABLE IF NOT EXISTS `updates` (
KEY `ud_last` (`ud_last`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- --------------------------------------------------------
-
---
--- Table structure for table `verify`
---
-
CREATE TABLE IF NOT EXISTS `verify` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`channel` int(10) unsigned NOT NULL DEFAULT '0',
@@ -1424,12 +1184,6 @@ CREATE TABLE IF NOT EXISTS `verify` (
KEY `created` (`created`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- --------------------------------------------------------
-
---
--- Table structure for table `vote`
---
-
CREATE TABLE IF NOT EXISTS `vote` (
`vote_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`vote_poll` int(11) NOT NULL DEFAULT '0',
@@ -1442,12 +1196,6 @@ CREATE TABLE IF NOT EXISTS `vote` (
KEY `vote_element` (`vote_element`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- --------------------------------------------------------
-
---
--- Table structure for table `xchan`
---
-
CREATE TABLE IF NOT EXISTS `xchan` (
`xchan_hash` char(255) NOT NULL,
`xchan_guid` char(255) NOT NULL DEFAULT '',
@@ -1468,6 +1216,13 @@ CREATE TABLE IF NOT EXISTS `xchan` (
`xchan_flags` int(10) unsigned NOT NULL DEFAULT '0',
`xchan_photo_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`xchan_name_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+ `xchan_hidden` tinyint(1) NOT NULL DEFAULT '0',
+ `xchan_orphan` tinyint(1) NOT NULL DEFAULT '0',
+ `xchan_censored` tinyint(1) NOT NULL DEFAULT '0',
+ `xchan_selfcensored` tinyint(1) NOT NULL DEFAULT '0',
+ `xchan_system` tinyint(1) NOT NULL DEFAULT '0',
+ `xchan_pubforum` tinyint(1) NOT NULL DEFAULT '0',
+ `xchan_deleted` tinyint(1) NOT NULL DEFAULT '0',
PRIMARY KEY (`xchan_hash`),
KEY `xchan_guid` (`xchan_guid`),
KEY `xchan_addr` (`xchan_addr`),
@@ -1477,15 +1232,16 @@ CREATE TABLE IF NOT EXISTS `xchan` (
KEY `xchan_flags` (`xchan_flags`),
KEY `xchan_connurl` (`xchan_connurl`),
KEY `xchan_instance_url` (`xchan_instance_url`),
- KEY `xchan_follow` (`xchan_follow`)
+ KEY `xchan_follow` (`xchan_follow`),
+ KEY `xchan_hidden` (`xchan_hidden`),
+ KEY `xchan_orphan` (`xchan_orphan`),
+ KEY `xchan_censored` (`xchan_censored`),
+ KEY `xchan_selfcensored` (`xchan_selfcensored`),
+ KEY `xchan_system` (`xchan_system`),
+ KEY `xchan_pubforum` (`xchan_pubforum`),
+ KEY `xchan_deleted` (`xchan_deleted`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- --------------------------------------------------------
-
---
--- Table structure for table `xchat`
---
-
CREATE TABLE IF NOT EXISTS `xchat` (
`xchat_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`xchat_url` char(255) NOT NULL DEFAULT '',
@@ -1499,12 +1255,6 @@ CREATE TABLE IF NOT EXISTS `xchat` (
KEY `xchat_edited` (`xchat_edited`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- --------------------------------------------------------
-
---
--- Table structure for table `xconfig`
---
-
CREATE TABLE IF NOT EXISTS `xconfig` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`xchan` char(255) NOT NULL DEFAULT '',
@@ -1517,12 +1267,6 @@ CREATE TABLE IF NOT EXISTS `xconfig` (
KEY `k` (`k`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- --------------------------------------------------------
-
---
--- Table structure for table `xign`
---
-
CREATE TABLE IF NOT EXISTS `xign` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`uid` int(11) NOT NULL DEFAULT '0',
@@ -1532,21 +1276,15 @@ CREATE TABLE IF NOT EXISTS `xign` (
KEY `xchan` (`xchan`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- --------------------------------------------------------
-
---
--- Table structure for table `xlink`
---
-
CREATE TABLE IF NOT EXISTS `xlink` (
`xlink_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`xlink_xchan` char(255) NOT NULL DEFAULT '',
`xlink_link` char(255) NOT NULL DEFAULT '',
`xlink_rating` int(11) NOT NULL DEFAULT '0',
- `xlink_rating_text` TEXT NOT NULL DEFAULT '',
+ `xlink_rating_text` text NOT NULL,
`xlink_updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`xlink_static` tinyint(1) NOT NULL DEFAULT '0',
- `xlink_sig` text NOT NULL DEFAULT '',
+ `xlink_sig` text NOT NULL,
PRIMARY KEY (`xlink_id`),
KEY `xlink_xchan` (`xlink_xchan`),
KEY `xlink_link` (`xlink_link`),
@@ -1555,27 +1293,16 @@ CREATE TABLE IF NOT EXISTS `xlink` (
KEY `xlink_static` (`xlink_static`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- --------------------------------------------------------
-
---
--- Table structure for table `xperm`
---
-
CREATE TABLE IF NOT EXISTS `xperm` (
- `xp_id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ,
- `xp_client` VARCHAR( 20 ) NOT NULL DEFAULT '',
- `xp_channel` INT UNSIGNED NOT NULL DEFAULT '0',
- `xp_perm` VARCHAR( 64 ) NOT NULL DEFAULT '',
+ `xp_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `xp_client` varchar(20) NOT NULL DEFAULT '',
+ `xp_channel` int(10) unsigned NOT NULL DEFAULT '0',
+ `xp_perm` varchar(64) NOT NULL DEFAULT '',
+ PRIMARY KEY (`xp_id`),
KEY `xp_client` (`xp_client`),
KEY `xp_channel` (`xp_channel`),
KEY `xp_perm` (`xp_perm`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `xprof`
---
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `xprof` (
`xprof_hash` char(255) NOT NULL,
@@ -1607,12 +1334,6 @@ CREATE TABLE IF NOT EXISTS `xprof` (
KEY `xprof_hometown` (`xprof_hometown`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
--- --------------------------------------------------------
-
---
--- Table structure for table `xtag`
---
-
CREATE TABLE IF NOT EXISTS `xtag` (
`xtag_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`xtag_hash` char(255) NOT NULL DEFAULT '',
diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql
index 48f3fe0fc..0db9e341f 100644
--- a/install/schema_postgres.sql
+++ b/install/schema_postgres.sql
@@ -502,6 +502,7 @@ CREATE TABLE "item" (
"mimetype" text NOT NULL DEFAULT '',
"title" text NOT NULL,
"body" text NOT NULL,
+ "html" text NOT NULL,
"app" text NOT NULL DEFAULT '',
"lang" varchar(64) NOT NULL DEFAULT '',
"revision" bigint NOT NULL DEFAULT '0',
@@ -532,6 +533,7 @@ CREATE TABLE "item" (
"item_flags" bigint NOT NULL DEFAULT '0',
"item_private" numeric(4) NOT NULL DEFAULT '0',
"item_unseen" smallint NOT NULL DEFAULT '0',
+ "item_wall" smallint NOT NULL DEFAULT '0',
"item_search_vector" tsvector,
PRIMARY KEY ("id")
);
@@ -564,6 +566,7 @@ create index "item_public_policy" on item ("public_policy");
create index "item_comment_policy" on item ("comment_policy");
create index "item_layout_mid" on item ("layout_mid");
create index "item_unseen" on item ("item_unseen");
+create index "item_wall" on item ("item_wall");
-- fulltext indexes
create index "item_search_idx" on item USING gist("item_search_vector");
diff --git a/library/certs/README.md b/library/certs/README.md
index 9a2ca7eca..36a0cf30c 100644
--- a/library/certs/README.md
+++ b/library/certs/README.md
@@ -1 +1 @@
-This directory contains *browser valid* certs for use with redmatrix when using curl (server to server communication). The cacert.pem file in this directory is downloaded (when necessary) from the curl repository and tracks the Mozilla built-in certs. Additionally we've discovered we occasionally require intermediate certs from some cert providers which Mozilla and other browsers obtain automatically but curl does not. You may add these here if required. All these files are concatenated to create the library/cacert.pem file which we will use. \ No newline at end of file
+This directory contains *browser valid* certs for use with hubzilla when using curl (server to server communication). The cacert.pem file in this directory is downloaded (when necessary) from the curl repository and tracks the Mozilla built-in certs. Additionally we've discovered we occasionally require intermediate certs from some cert providers which Mozilla and other browsers obtain automatically but curl does not. You may add these here if required. All these files are concatenated to create the library/cacert.pem file which we will use. \ No newline at end of file
diff --git a/mod/acl.php b/mod/acl.php
index e919bb912..ba2159dbc 100644
--- a/mod/acl.php
+++ b/mod/acl.php
@@ -94,19 +94,18 @@ function acl_init(&$a){
$r = q("SELECT abook_id as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, abook_their_perms, abook_flags
FROM abook left join xchan on abook_xchan = xchan_hash
- WHERE (abook_channel = %d $extra_channels_sql) AND not ( abook_flags & %d )>0 and not (xchan_flags & %d )>0 $sql_extra2 order by $order_extra2 xchan_name asc" ,
+ WHERE (abook_channel = %d $extra_channels_sql) AND not ( abook_flags & %d )>0 and xchan_deleted = 0 $sql_extra2 order by $order_extra2 xchan_name asc" ,
intval(local_channel()),
- intval(ABOOK_FLAG_BLOCKED|ABOOK_FLAG_PENDING|ABOOK_FLAG_ARCHIVED),
- intval(XCHAN_FLAGS_DELETED)
+ intval(ABOOK_FLAG_BLOCKED|ABOOK_FLAG_PENDING|ABOOK_FLAG_ARCHIVED)
);
}
else { // Visitors
$r = q("SELECT xchan_hash as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, 0 as abook_their_perms, 0 as abook_flags
FROM xchan left join xlink on xlink_link = xchan_hash
- WHERE xlink_xchan = '%s' AND NOT (xchan_flags & %d) > 0 $sql_extra2 order by $order_extra2 xchan_name asc" ,
- dbesc(get_observer_hash()),
- intval(XCHAN_FLAGS_DELETED));
+ WHERE xlink_xchan = '%s' AND xchan_deleted = 0 $sql_extra2 order by $order_extra2 xchan_name asc" ,
+ dbesc(get_observer_hash())
+ );
// Find contacts of extra channels
// This is probably more complicated than it needs to be
@@ -120,9 +119,8 @@ function acl_init(&$a){
$r2 = q("SELECT abook_id as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, abook_their_perms, abook_flags
FROM abook left join xchan on abook_xchan = xchan_hash
- WHERE abook_channel IN ($extra_channels_sql) $known_hashes_sql AND not ( abook_flags & %d )>0 and not (xchan_flags & %d )>0 $sql_extra2 order by $order_extra2 xchan_name asc" ,
- intval(ABOOK_FLAG_BLOCKED|ABOOK_FLAG_PENDING|ABOOK_FLAG_ARCHIVED|ABOOK_FLAG_HIDDEN),
- intval(XCHAN_FLAGS_DELETED)
+ WHERE abook_channel IN ($extra_channels_sql) $known_hashes_sql AND not ( abook_flags & %d )>0 and xchan_deleted = 0 $sql_extra2 order by $order_extra2 xchan_name asc" ,
+ intval(ABOOK_FLAG_BLOCKED|ABOOK_FLAG_PENDING|ABOOK_FLAG_ARCHIVED|ABOOK_FLAG_HIDDEN)
);
if($r2)
$r = array_merge($r,$r2);
@@ -152,8 +150,7 @@ function acl_init(&$a){
if((count($r) < 100) && $type == 'c') {
$r2 = q("SELECT substr(xchan_hash,1,18) as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, 0 as abook_their_perms, 0 as abook_flags
FROM xchan
- WHERE not (xchan_flags & %d )>0 $sql_extra2 order by $order_extra2 xchan_name asc" ,
- intval(XCHAN_FLAGS_DELETED)
+ WHERE xchan_deleted = 0 $sql_extra2 order by $order_extra2 xchan_name asc"
);
if($r2)
$r = array_merge($r,$r2);
@@ -165,24 +162,21 @@ function acl_init(&$a){
$r = q("SELECT xchan_hash as id, xchan_name as name, xchan_addr as nick, xchan_photo_s as micro, xchan_url as url
FROM abook left join xchan on abook_xchan = xchan_hash
WHERE abook_channel = %d and ( (abook_their_perms = null) or (abook_their_perms & %d )>0)
- and not (xchan_flags & %d)>0
+ and xchan_deleted = 0
$sql_extra3
ORDER BY `xchan_name` ASC ",
intval(local_channel()),
- intval(PERMS_W_MAIL),
- intval(XCHAN_FLAGS_DELETED)
+ intval(PERMS_W_MAIL)
);
}
elseif(($type == 'a') || ($type == 'p')) {
$r = q("SELECT abook_id as id, xchan_name as name, xchan_hash as hash, xchan_addr as nick, xchan_photo_s as micro, xchan_network as network, xchan_url as url, xchan_addr as attag , abook_their_perms FROM abook left join xchan on abook_xchan = xchan_hash
WHERE abook_channel = %d
- and not (xchan_flags & %d)>0
+ and xchan_deleted = 0
$sql_extra3
ORDER BY xchan_name ASC ",
- intval(local_channel()),
- intval(XCHAN_FLAGS_DELETED)
-
+ intval(local_channel())
);
}
diff --git a/mod/admin.php b/mod/admin.php
index 54ee04776..d3bbd8d01 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -1,7 +1,7 @@
<?php
/**
* @file mod/admin.php
- * @brief RedMatrix's admin controller.
+ * @brief Hubzilla's admin controller.
*
* Controller for the /admin/ area.
*/
@@ -89,6 +89,7 @@ function admin_content(&$a) {
*/
// array( url, name, extra css classes )
+
$aside = array(
'site' => array($a->get_baseurl(true)."/admin/site/", t("Site") , "site"),
'users' => array($a->get_baseurl(true)."/admin/users/", t("Accounts") , "users"),
@@ -99,6 +100,7 @@ function admin_content(&$a) {
// 'hubloc' => array($a->get_baseurl(true)."/admin/hubloc/", t("Server") , "server"),
'profs' => array(z_root() . '/admin/profs', t('Profile Config'), 'profs'),
'dbsync' => array($a->get_baseurl(true)."/admin/dbsync/", t('DB updates'), "dbsync")
+
);
/* get plugins admin page */
@@ -148,9 +150,9 @@ function admin_content(&$a) {
case 'themes':
$o = admin_page_themes($a);
break;
- case 'hubloc':
- $o = admin_page_hubloc($a);
- break;
+// case 'hubloc':
+// $o = admin_page_hubloc($a);
+// break;
case 'logs':
$o = admin_page_logs($a);
break;
@@ -1468,4 +1470,4 @@ function admin_page_profs(&$a) {
'$submit' => t('Save')
));
}
-} \ No newline at end of file
+}
diff --git a/mod/block.php b/mod/block.php
index 043b0e9e8..fb5645d8a 100644
--- a/mod/block.php
+++ b/mod/block.php
@@ -50,10 +50,10 @@ function block_content(&$a) {
$r = q("select item.* from item left join item_id on item.id = item_id.iid
where item.uid = %d and sid = '%s' and service = 'BUILDBLOCK' and
- item_restrict = %d $sql_options $revision limit 1",
+ item_type = %d $sql_options $revision limit 1",
intval($u[0]['channel_id']),
dbesc($page_id),
- intval(ITEM_BUILDBLOCK)
+ intval(ITEM_TYPE_BUILDBLOCK)
);
if(! $r) {
@@ -62,10 +62,10 @@ function block_content(&$a) {
$x = q("select item.* from item left join item_id on item.id = item_id.iid
where item.uid = %d and sid = '%s' and service = 'BUILDBLOCK' and
- item_restrict = %d $revision limit 1",
+ item_type = %d $revision limit 1",
intval($u[0]['channel_id']),
dbesc($page_id),
- intval(ITEM_BUILDBLOCK)
+ intval(ITEM_TYPE_BUILDBLOCK)
);
if($x) {
// Yes, it's there. You just aren't allowed to see it.
diff --git a/mod/blocks.php b/mod/blocks.php
index 11e7d4a30..95979a304 100644
--- a/mod/blocks.php
+++ b/mod/blocks.php
@@ -84,7 +84,7 @@ function blocks_content(&$a) {
}
$x = array(
- 'webpage' => ITEM_BUILDBLOCK,
+ 'webpage' => ITEM_TYPE_BUILDBLOCK,
'is_owner' => true,
'nickname' => $a->profile['channel_address'],
'lockstate' => (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
@@ -108,9 +108,9 @@ function blocks_content(&$a) {
$editor = status_editor($a,$x);
$r = q("select iid, sid, mid, title, body, mimetype, created, edited from item_id left join item on item_id.iid = item.id
- where item_id.uid = %d and service = 'BUILDBLOCK' and item_restrict = %d order by item.created desc",
+ where item_id.uid = %d and service = 'BUILDBLOCK' and item_type = %d order by item.created desc",
intval($owner),
- intval(ITEM_BUILDBLOCK)
+ intval(ITEM_TYPE_BUILDBLOCK)
);
$pages = null;
@@ -143,21 +143,21 @@ function blocks_content(&$a) {
$url = z_root() . '/editblock/' . $which;
$o .= replace_macros(get_markup_template('blocklist.tpl'), array(
- '$baseurl' => $url,
- '$title' => t('Blocks'),
- '$name' => t('Block Name'),
+ '$baseurl' => $url,
+ '$title' => t('Blocks'),
+ '$name' => t('Block Name'),
'$blocktitle' => t('Block Title'),
- '$created' => t('Created'),
- '$edited' => t('Edited'),
- '$create' => t('Create'),
- '$edit' => t('Edit'),
- '$share' => t('Share'),
- '$delete' => t('Delete'),
- '$editor' => $editor,
- '$pages' => $pages,
- '$channel' => $which,
- '$view' => t('View'),
- '$preview' => '1',
+ '$created' => t('Created'),
+ '$edited' => t('Edited'),
+ '$create' => t('Create'),
+ '$edit' => t('Edit'),
+ '$share' => t('Share'),
+ '$delete' => t('Delete'),
+ '$editor' => $editor,
+ '$pages' => $pages,
+ '$channel' => $which,
+ '$view' => t('View'),
+ '$preview' => '1',
));
return $o;
diff --git a/mod/channel.php b/mod/channel.php
index b06602994..65af36b59 100644
--- a/mod/channel.php
+++ b/mod/channel.php
@@ -166,21 +166,19 @@ function channel_content(&$a, $update = 0, $load = false) {
if(($update) && (! $load)) {
if ($mid) {
$r = q("SELECT parent AS item_id from item where mid like '%s' and uid = %d AND item_restrict = 0
- AND (item_flags & %d) > 0 $simple_update $sql_extra limit 1",
+ AND item_wall = 1 AND item_unseen = 1 $sql_extra limit 1",
dbesc($mid . '%'),
- intval($a->profile['profile_uid']),
- intval(ITEM_WALL)
+ intval($a->profile['profile_uid'])
);
} else {
$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 AND item_restrict = 0
- AND (item_flags & %d) > 0 $simple_update
+ AND item_wall = 1 AND item_unseen = 1
AND ((abook.abook_flags & %d) = 0 or abook.abook_flags is null)
$sql_extra
ORDER BY created DESC",
intval($a->profile['profile_uid']),
- intval(ITEM_WALL),
intval(ABOOK_FLAG_BLOCKED)
);
$_SESSION['loadtime'] = datetime_convert();
@@ -210,10 +208,9 @@ function channel_content(&$a, $update = 0, $load = false) {
if($load || ($_COOKIE['jsAvailable'] != 1)) {
if ($mid) {
$r = q("SELECT parent AS item_id from item where mid = '%s' and uid = %d AND item_restrict = 0
- AND (item_flags & %d)>0 $sql_extra limit 1",
+ AND item_wall = 1 $sql_extra limit 1",
dbesc($mid),
- intval($a->profile['profile_uid']),
- intval(ITEM_WALL)
+ intval($a->profile['profile_uid'])
);
if (! $r) {
notice( t('Permission denied.') . EOL);
@@ -223,13 +220,11 @@ function channel_content(&$a, $update = 0, $load = false) {
$r = q("SELECT distinct id AS item_id, created FROM item
left join abook on item.author_xchan = abook.abook_xchan
WHERE uid = %d AND item_restrict = 0
- AND (item_flags & %d)>0 and (item_flags & %d)>0
+ AND item_wall = 1 and item_thread_top = 1
AND ((abook.abook_flags & %d) = 0 or abook.abook_flags is null)
$sql_extra $sql_extra2
ORDER BY created DESC $pager_sql ",
intval($a->profile['profile_uid']),
- intval(ITEM_WALL),
- intval(ITEM_THREAD_TOP),
intval(ABOOK_FLAG_BLOCKED)
);
}
@@ -338,9 +333,7 @@ function channel_content(&$a, $update = 0, $load = false) {
}
if($is_owner && $update_unseen) {
- $r = q("UPDATE item SET item_unseen = 0 WHERE item_unseen = 1
- AND (item_flags & %d) > 0 AND uid = %d $update_unseen",
- intval(ITEM_WALL),
+ $r = q("UPDATE item SET item_unseen = 0 where item_unseen = 1 and item_wall = 1 AND uid = %d $update_unseen",
intval(local_channel())
);
}
diff --git a/mod/cloud.php b/mod/cloud.php
index 4b5d45f97..defdc3451 100644
--- a/mod/cloud.php
+++ b/mod/cloud.php
@@ -1,13 +1,13 @@
<?php
/**
* @file mod/cloud.php
- * @brief Initialize RedMatrix's cloud (SabreDAV).
+ * @brief Initialize Hubzilla's cloud (SabreDAV).
*
* Module for accessing the DAV storage area.
*/
use Sabre\DAV;
-use RedMatrix\RedDAV;
+use Hubzilla\RedDAV;
// composer autoloader for SabreDAV
require_once('vendor/autoload.php');
@@ -126,7 +126,7 @@ function cloud_init(&$a) {
}
require_once('include/RedDAV/RedBrowser.php');
- // provide a directory view for the cloud in Red Matrix
+ // provide a directory view for the cloud in Hubzilla
$browser = new RedDAV\RedBrowser($auth);
$auth->setBrowserPlugin($browser);
diff --git a/mod/connections.php b/mod/connections.php
index 469d3a62f..c732cf272 100644
--- a/mod/connections.php
+++ b/mod/connections.php
@@ -214,11 +214,10 @@ function connections_content(&$a) {
nav_set_selected('intros');
break;
case 'ifpending':
- $r = q("SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and (abook_flags & %d)>0 and not ((abook_flags & %d)>0 or (xchan_flags & %d)>0)",
+ $r = q("SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and (abook_flags & %d)>0 and not ((abook_flags & %d)>0 or xchan_deleted = 1 or xchan_orphan = 1)",
intval(local_channel()),
intval(ABOOK_FLAG_PENDING),
- intval(ABOOK_FLAG_SELF|ABOOK_FLAG_IGNORED),
- intval(XCHAN_FLAGS_DELETED|XCHAN_FLAGS_ORPHAN)
+ intval(ABOOK_FLAG_SELF|ABOOK_FLAG_IGNORED)
);
if($r && $r[0]['total']) {
$search_flags = ABOOK_FLAG_PENDING;
@@ -343,10 +342,9 @@ function connections_content(&$a) {
}
$r = q("SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash
- where abook_channel = %d and not (abook_flags & %d)>0 and not (xchan_flags & %d )>0 $sql_extra $sql_extra2 ",
+ where abook_channel = %d and not (abook_flags & %d)>0 and xchan_deleted = 0 and xchan_orphan = 0 $sql_extra $sql_extra2 ",
intval(local_channel()),
- intval(ABOOK_FLAG_SELF),
- intval(XCHAN_FLAGS_DELETED|XCHAN_FLAGS_ORPHAN)
+ intval(ABOOK_FLAG_SELF)
);
if($r) {
$a->set_pager_total($r[0]['total']);
@@ -354,10 +352,9 @@ function connections_content(&$a) {
}
$r = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash
- WHERE abook_channel = %d and not (abook_flags & %d)>0 and not ( xchan_flags & %d)>0 $sql_extra $sql_extra2 ORDER BY xchan_name LIMIT %d OFFSET %d ",
+ WHERE abook_channel = %d and not (abook_flags & %d)>0 and xchan_deleted = 0 and xchan_orphan = 0 $sql_extra $sql_extra2 ORDER BY xchan_name LIMIT %d OFFSET %d ",
intval(local_channel()),
intval(ABOOK_FLAG_SELF),
- intval(XCHAN_FLAGS_DELETED|XCHAN_FLAGS_ORPHAN),
intval($a->pager['itemspage']),
intval($a->pager['start'])
);
diff --git a/mod/connedit.php b/mod/connedit.php
index cb524547c..91fa2f324 100644
--- a/mod/connedit.php
+++ b/mod/connedit.php
@@ -240,7 +240,9 @@ function connedit_post(&$a) {
&& (intval(get_pconfig($channel['channel_id'],'system','post_newfriend')))) {
$xarr = array();
$xarr['verb'] = ACTIVITY_FRIEND;
- $xarr['item_flags'] = ITEM_WALL|ITEM_ORIGIN|ITEM_THREAD_TOP;
+ $xarr['item_wall'] = 1;
+ $xarr['item_origin'] = 1;
+ $xarr['item_thread_top'] = 1;
$xarr['owner_xchan'] = $xarr['author_xchan'] = $channel['channel_hash'];
$xarr['allow_cid'] = $channel['channel_allow_cid'];
$xarr['allow_gid'] = $channel['channel_allow_gid'];
diff --git a/mod/dav.php b/mod/dav.php
index 2f811a7f0..2321aec75 100644
--- a/mod/dav.php
+++ b/mod/dav.php
@@ -1,13 +1,13 @@
<?php
/**
* @file mod/dav.php
- * @brief Initialize RedMatrix's cloud (SabreDAV).
+ * @brief Initialize Hubzilla's cloud (SabreDAV).
*
* Module for accessing the DAV storage area from a DAV client.
*/
use Sabre\DAV;
-use RedMatrix\RedDAV;
+use Hubzilla\RedDAV;
// composer autoloader for SabreDAV
require_once('vendor/autoload.php');
@@ -127,7 +127,7 @@ function dav_init(&$a) {
}
require_once('include/RedDAV/RedBrowser.php');
- // provide a directory view for the cloud in Red Matrix
+ // provide a directory view for the cloud in Hubzilla
$browser = new RedDAV\RedBrowser($auth);
$auth->setBrowserPlugin($browser);
diff --git a/mod/dirsearch.php b/mod/dirsearch.php
index d997020b2..132ed252b 100644
--- a/mod/dirsearch.php
+++ b/mod/dirsearch.php
@@ -127,7 +127,6 @@ function dirsearch_content(&$a) {
if($forums)
$safesql .= dir_flag_build(' AND ','xchan_flags',XCHAN_FLAGS_PUBFORUM, $forums);
-
// we only support an age range currently. You must set both agege
// (greater than or equal) and agele (less than or equal)
@@ -170,21 +169,16 @@ function dirsearch_content(&$a) {
$sql_extra .= " and xchan_addr like '%%" . get_app()->get_hostname() . "' ";
}
-
- $safesql .= (($safe > 0) ? " and not ( xchan_flags & " . intval(XCHAN_FLAGS_CENSORED|XCHAN_FLAGS_SELFCENSORED) . " )>0 " : '');
+ $safesql = (($safe > 0) ? " and xchan_censored = 0 and xchan_selfcensored = 0 " : '');
if($safe < 0)
- $safesql .= " and ( xchan_flags & " . intval(XCHAN_FLAGS_CENSORED|XCHAN_FLAGS_SELFCENSORED) . " )>0 ";
+ $safesql = " and ( xchan_censored = 1 OR xchan_selfcensored = 1 ) ";
if($limit)
$qlimit = " LIMIT $limit ";
else {
$qlimit = " LIMIT " . intval($perpage) . " OFFSET " . intval($startrec);
if($return_total) {
- $r = q("SELECT COUNT(xchan_hash) AS `total` FROM xchan left join xprof on xchan_hash = xprof_hash where $logic $sql_extra and xchan_network = 'zot' and not ( xchan_flags & %d)>0 and not ( xchan_flags & %d )>0 and not ( xchan_flags & %d )>0 $safesql ",
- intval(XCHAN_FLAGS_HIDDEN),
- intval(XCHAN_FLAGS_ORPHAN),
- intval(XCHAN_FLAGS_DELETED)
- );
+ $r = q("SELECT COUNT(xchan_hash) AS `total` FROM xchan left join xprof on xchan_hash = xprof_hash where $logic $sql_extra and xchan_network = 'zot' and xchan_hidden = 0 and xchan_orphan = 0 and xchan_deleted = 0 $safesql ");
if($r) {
$ret['total_items'] = $r[0]['total'];
}
@@ -251,13 +245,10 @@ function dirsearch_content(&$a) {
json_return_and_die($spkt);
}
else {
-
- $r = q("SELECT xchan.*, xprof.* from xchan left join xprof on xchan_hash = xprof_hash where ( $logic $sql_extra ) $hub_query and xchan_network = 'zot' and not ( xchan_flags & %d )>0 and not ( xchan_flags & %d )>0 and not ( xchan_flags & %d )>0 $safesql $order $qlimit ",
- intval(XCHAN_FLAGS_HIDDEN),
- intval(XCHAN_FLAGS_ORPHAN),
- intval(XCHAN_FLAGS_DELETED)
+ $r = q("SELECT xchan.*, xprof.* from xchan left join xprof on xchan_hash = xprof_hash
+ where ( $logic $sql_extra ) $hub_query and xchan_network = 'zot' and xchan_hidden = 0 and xchan_orphan = 0 and xchan_deleted = 0
+ $safesql $order $qlimit "
);
-
$ret['page'] = $page + 1;
$ret['records'] = count($r);
}
@@ -283,7 +274,7 @@ function dirsearch_content(&$a) {
$entry['name'] = $rr['xchan_name'];
$entry['hash'] = $rr['xchan_hash'];
- $entry['public_forum'] = (($rr['xchan_flags'] & XCHAN_FLAGS_PUBFORUM) ? true : false);
+ $entry['public_forum'] = (intval($rr['xchan_pubforum']) ? true : false);
$entry['url'] = $rr['xchan_url'];
$entry['photo_l'] = $rr['xchan_photo_l'];
diff --git a/mod/display.php b/mod/display.php
index b5daea2de..33fb83e70 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -81,7 +81,7 @@ function display_content(&$a, $update = 0, $load = false) {
$target_item = null;
- $r = q("select id, uid, mid, parent_mid, item_restrict from item where mid like '%s' limit 1",
+ $r = q("select id, uid, mid, parent_mid, item_type, item_deleted from item where mid like '%s' limit 1",
dbesc($item_hash . '%')
);
@@ -91,7 +91,7 @@ function display_content(&$a, $update = 0, $load = false) {
$r = null;
- if($target_item['item_restrict'] & ITEM_WEBPAGE) {
+ if($target_item['item_type'] == ITEM_TYPE_WEBPAGE) {
$x = q("select * from channel where channel_id = %d limit 1",
intval($target_item['uid'])
);
@@ -247,7 +247,7 @@ function display_content(&$a, $update = 0, $load = false) {
}
if($updateable) {
- $x = q("UPDATE item SET item_unseen = 0 WHERE item_unseen = 1 AND uid = %d and parent = %d ",
+ $x = q("UPDATE item SET item_unseen = 0 where item_unseen = 1 AND uid = %d and parent = %d ",
intval(local_channel()),
intval($r[0]['parent'])
);
@@ -266,7 +266,7 @@ function display_content(&$a, $update = 0, $load = false) {
dbesc($item_hash)
);
if($r) {
- if($r[0]['item_flags'] & ITEM_DELETED) {
+ if(intval($r[0]['item_deleted'])) {
notice( t('Item has been removed.') . EOL );
}
else {
diff --git a/mod/editblock.php b/mod/editblock.php
index a0ece8133..9f9770e77 100644
--- a/mod/editblock.php
+++ b/mod/editblock.php
@@ -136,14 +136,14 @@ function editblock_content(&$a) {
$o .= replace_macros($tpl,array(
'$return_path' => $rp,
'$action' => 'item',
- '$webpage' => ITEM_BUILDBLOCK,
+ '$webpage' => ITEM_TYPE_BUILDBLOCK,
'$share' => t('Edit'),
- '$bold' => t('Bold'),
- '$italic' => t('Italic'),
- '$underline' => t('Underline'),
- '$quote' => t('Quote'),
- '$code' => t('Code'),
- '$writefiles' => (perm_is_allowed($owner, get_observer_hash(), 'post_photos') || perm_is_allowed($owner, get_observer_hash(), 'write_storage')),
+ '$bold' => t('Bold'),
+ '$italic' => t('Italic'),
+ '$underline' => t('Underline'),
+ '$quote' => t('Quote'),
+ '$code' => t('Code'),
+ '$writefiles' => (perm_is_allowed($owner, get_observer_hash(), 'post_photos') || perm_is_allowed($owner, get_observer_hash(), 'write_storage')),
'$upload' => t('Upload photo'),
'$attach' => t('Attach file'),
'$weblink' => t('Insert web link'),
diff --git a/mod/editlayout.php b/mod/editlayout.php
index 8ab5aab22..d61a14a48 100644
--- a/mod/editlayout.php
+++ b/mod/editlayout.php
@@ -135,7 +135,7 @@ function editlayout_content(&$a) {
$o .= replace_macros($tpl,array(
'$return_path' => $rp,
'$action' => 'item',
- '$webpage' => ITEM_PDL,
+ '$webpage' => ITEM_TYPE_PDL,
'$share' => t('Edit'),
'$bold' => t('Bold'),
'$italic' => t('Italic'),
diff --git a/mod/editpost.php b/mod/editpost.php
index 81bb91b2a..66196b2d2 100644
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -55,7 +55,7 @@ function editpost_content(&$a) {
- if($itm[0]['item_flags'] & ITEM_OBSCURED) {
+ if(intval($itm[0]['item_obscured'])) {
$key = get_config('system','prvkey');
if($itm[0]['title'])
$itm[0]['title'] = crypto_unencapsulate(json_decode_plus($itm[0]['title']),$key);
diff --git a/mod/editwebpage.php b/mod/editwebpage.php
index cdf5d8c20..3b0b543a6 100644
--- a/mod/editwebpage.php
+++ b/mod/editwebpage.php
@@ -102,7 +102,7 @@ function editwebpage_content(&$a) {
return;
}
- if($itm[0]['item_flags'] & ITEM_OBSCURED) {
+ if(intval($itm[0]['item_obscured'])) {
$key = get_config('system','prvkey');
if($itm[0]['title'])
$itm[0]['title'] = crypto_unencapsulate(json_decode_plus($itm[0]['title']),$key);
@@ -169,7 +169,7 @@ function editwebpage_content(&$a) {
$editor = replace_macros($tpl,array(
'$return_path' => $rp,
- '$webpage' => ITEM_WEBPAGE,
+ '$webpage' => ITEM_TYPE_WEBPAGE,
'$placeholdpagetitle' => t('Page link title'),
'$pagetitle' => $page_title,
'$writefiles' => (perm_is_allowed($owner, get_observer_hash(), 'post_photos') || perm_is_allowed($owner, get_observer_hash(), 'write_storage')),
diff --git a/mod/events.php b/mod/events.php
index 289ddfb15..a89bbb760 100755
--- a/mod/events.php
+++ b/mod/events.php
@@ -414,8 +414,9 @@ function events_content(&$a) {
$is_first = ($d !== $last_date);
$last_date = $d;
-// FIXME
- $edit = (($rr['item_flags'] & ITEM_WALL) ? array($a->get_baseurl().'/events/event/'.$rr['event_hash'],t('Edit event'),'','') : null);
+
+ $edit = (intval($rr['item_wall']) ? array($a->get_baseurl().'/events/event/'.$rr['event_hash'],t('Edit event'),'','') : null);
+
$drop = array($a->get_baseurl().'/events/drop/'.$rr['event_hash'],t('Delete event'),'','');
$title = strip_tags(html_entity_decode(bbcode($rr['summary']),ENT_QUOTES,'UTF-8'));
@@ -632,7 +633,7 @@ function events_content(&$a) {
'$s_text' => t('Event Starts:'),
'$stext' => $stext,
'$ftext' => $ftext,
- '$required' => ' <span class="required" title="' . t('Required') . '">*</span>',
+ '$required' => '<span class="required" title="' . t('Required') . '">*</span>',
'$ModalCANCEL' => t('Cancel'),
'$ModalOK' => t('OK'),
'$s_dsel' => datetimesel($f,new DateTime(),DateTime::createFromFormat('Y',$syear+5),DateTime::createFromFormat('Y-m-d H:i',"$syear-$smonth-$sday $shour:$sminute"),'start_text',true,true,'','',true),
diff --git a/mod/filer.php b/mod/filer.php
index e8160bba2..8d69503b2 100644
--- a/mod/filer.php
+++ b/mod/filer.php
@@ -27,8 +27,7 @@ function filer_content(&$a) {
intval(local_channel())
);
if($r) {
- $x = q("update item set item_flags = ( item_flags | %d ) where id = %d and uid = %d",
- intval(ITEM_RETAINED),
+ $x = q("update item set item_retained = 1 where id = %d and uid = %d",
intval($r[0]['parent']),
intval(local_channel())
);
diff --git a/mod/group.php b/mod/group.php
index 66297d6ac..f3984f9c8 100644
--- a/mod/group.php
+++ b/mod/group.php
@@ -117,10 +117,9 @@ function group_content(&$a) {
check_form_security_token_ForbiddenOnErr('group_member_change', 't');
- $r = q("SELECT abook_xchan from abook left join xchan on abook_xchan = xchan_hash where abook_xchan = '%s' and abook_channel = %d and not (xchan_flags & %d)>0 and not (abook_flags & %d)>0 and not (abook_flags & %d)>0 limit 1",
+ $r = q("SELECT abook_xchan from abook left join xchan on abook_xchan = xchan_hash where abook_xchan = '%s' and abook_channel = %d and xchan_deleted = 0 and not (abook_flags & %d)>0 and not (abook_flags & %d)>0 limit 1",
dbesc(base64url_decode(argv(2))),
intval(local_channel()),
- intval(XCHAN_FLAGS_DELETED),
intval(ABOOK_FLAG_BLOCKED),
intval(ABOOK_FLAG_PENDING)
);
@@ -211,10 +210,9 @@ function group_content(&$a) {
group_rmv_member(local_channel(),$group['name'],$member['xchan_hash']);
}
- $r = q("SELECT abook.*, xchan.* FROM `abook` left join xchan on abook_xchan = xchan_hash WHERE `abook_channel` = %d AND not (abook_flags & %d)>0 and not (xchan_flags & %d)>0 and not (abook_flags & %d)>0 order by xchan_name asc",
+ $r = q("SELECT abook.*, xchan.* FROM `abook` left join xchan on abook_xchan = xchan_hash WHERE `abook_channel` = %d AND not (abook_flags & %d)>0 and xchan_deleted = 0 and not (abook_flags & %d)>0 order by xchan_name asc",
intval(local_channel()),
intval(ABOOK_FLAG_BLOCKED),
- intval(XCHAN_FLAGS_DELETED),
intval(ABOOK_FLAG_PENDING)
);
diff --git a/mod/home.php b/mod/home.php
index 03133a217..202a4d2d7 100644
--- a/mod/home.php
+++ b/mod/home.php
@@ -82,7 +82,7 @@ function home_content(&$a, $update = 0, $load = false) {
$r = q("select item.* from item left join item_id on item.id = item_id.iid
where item.uid = %d and ( sid = '%s' or sid like '%s' ) and service = 'WEBPAGE' and
- item_restrict = %d ORDER BY $randfunc limit 1",
+ item_type = %d ORDER BY $randfunc limit 1",
intval($u[0]['channel_id']),
dbesc($page_id),
dbesc($randpage_id),
@@ -190,7 +190,7 @@ function home_content(&$a, $update = 0, $load = false) {
if(get_config('system','site_firehose')) {
require_once('include/security.php');
- $uids = " and item.uid in ( " . stream_perms_api_uids(PERMS_PUBLIC) . " ) and item_private = 0 and (item_flags & " . intval(ITEM_WALL) . " ) > 0 ";
+ $uids = " and item.uid in ( " . stream_perms_api_uids(PERMS_PUBLIC) . " ) and item_private = 0 and item_wall = 1 ";
}
else {
$sys = get_sys_channel();
diff --git a/mod/impel.php b/mod/impel.php
index dcc82c9ba..711547624 100644
--- a/mod/impel.php
+++ b/mod/impel.php
@@ -32,17 +32,17 @@ function impel_init(&$a) {
switch($j['type']) {
case 'webpage':
- $arr['item_restrict'] = ITEM_WEBPAGE;
+ $arr['item_type'] = ITEM_TYPE_WEBPAGE;
$namespace = 'WEBPAGE';
$installed_type = t('webpage');
break;
case 'block':
- $arr['item_restrict'] = ITEM_BUILDBLOCK;
+ $arr['item_type'] = ITEM_TYPE_BLOCK;
$namespace = 'BUILDBLOCK';
$installed_type = t('block');
break;
case 'layout':
- $arr['item_restrict'] = ITEM_PDL;
+ $arr['item_type'] = ITEM_TYPE_PDL;
$namespace = 'PDL';
$installed_type = t('layout');
break;
@@ -113,7 +113,8 @@ function impel_init(&$a) {
dbesc($namespace),
intval(local_channel())
);
- $i = q("select id, edited, item_restrict from item where mid = '%s' and uid = %d limit 1",
+
+ $i = q("select id, edited, item_deleted from item where mid = '%s' and uid = %d limit 1",
dbesc($arr['mid']),
intval(local_channel())
);
@@ -126,7 +127,7 @@ function impel_init(&$a) {
$x = item_store_update($arr,$execflag);
}
else {
- if(($i) && ($i[0]['item_restrict'] & ITEM_DELETED)) {
+ if(($i) && (intval($i[0]['item_deleted']))) {
// was partially deleted already, finish it off
q("delete from item where mid = '%s' and uid = %d",
dbesc($arr['mid']),
diff --git a/mod/import.php b/mod/import.php
index 088c5cb61..030b714bc 100644
--- a/mod/import.php
+++ b/mod/import.php
@@ -200,8 +200,8 @@ function import_post(&$a) {
'url' => $hubloc['hubloc_url'],
'url_sig' => $hubloc['hubloc_url_sig']
);
- if(($hubloc['hubloc_hash'] === $channel['channel_hash']) && ($hubloc['hubloc_flags'] & HUBLOC_FLAGS_PRIMARY) && ($seize))
- $hubloc['hubloc_flags'] = ($hubloc['hubloc_flags'] ^ HUBLOC_FLAGS_PRIMARY);
+ if(($hubloc['hubloc_hash'] === $channel['channel_hash']) && intval($hubloc['hubloc_primary']) && ($seize))
+ $hubloc['hubloc_primary'] = 0;
if(! zot_gethub($arr)) {
unset($hubloc['hubloc_id']);
@@ -220,7 +220,7 @@ function import_post(&$a) {
// create new hubloc for the new channel at this site
- $r = q("insert into hubloc ( hubloc_guid, hubloc_guid_sig, hubloc_hash, hubloc_addr, hubloc_network, hubloc_flags,
+ $r = q("insert into hubloc ( hubloc_guid, hubloc_guid_sig, hubloc_hash, hubloc_addr, hubloc_network, hubloc_primary,
hubloc_url, hubloc_url_sig, hubloc_host, hubloc_callback, hubloc_sitekey )
values ( '%s', '%s', '%s', '%s', '%s', %d, '%s', '%s', '%s', '%s', '%s' )",
dbesc($channel['channel_guid']),
@@ -228,7 +228,7 @@ function import_post(&$a) {
dbesc($channel['channel_hash']),
dbesc($channel['channel_address'] . '@' . get_app()->get_hostname()),
dbesc('zot'),
- intval(($seize) ? HUBLOC_FLAGS_PRIMARY : 0),
+ intval(($seize) ? 1 : 0),
dbesc(z_root()),
dbesc(base64url_encode(rsa_sign(z_root(),$channel['channel_prvkey']))),
dbesc(get_app()->get_hostname()),
@@ -239,9 +239,7 @@ function import_post(&$a) {
// reset the original primary hubloc if it is being seized
if($seize)
- $r = q("update hubloc set hubloc_flags = (hubloc_flags & ~%d) where (hubloc_flags & %d)>0 and hubloc_hash = '%s' and hubloc_url != '%s' ",
- intval(HUBLOC_FLAGS_PRIMARY),
- intval(HUBLOC_FLAGS_PRIMARY),
+ $r = q("update hubloc set hubloc_primary = 0 where hubloc_primary = 1 and hubloc_hash = '%s' and hubloc_url != '%s' ",
dbesc($channel['channel_hash']),
dbesc(z_root())
);
diff --git a/mod/item.php b/mod/item.php
index d8eff5647..8365aefb0 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -115,7 +115,7 @@ function item_post(&$a) {
* Check service class limits
*/
if ($uid && !(x($_REQUEST,'parent')) && !(x($_REQUEST,'post_id'))) {
- $ret = item_check_service_class($uid,(($_REQUEST['webpage'] == ITEM_WEBPAGE) ? true : false));
+ $ret = item_check_service_class($uid,(($_REQUEST['webpage'] == ITEM_TYPE_WEBPAGE) ? true : false));
if (!$ret['success']) {
notice( t($ret['message']) . EOL) ;
if(x($_REQUEST,'return'))
@@ -295,7 +295,7 @@ function item_post(&$a) {
// For comments, We need to additionally look at the parent and see if it's a wall post that originated locally.
if($observer['xchan_name'] != $owner_xchan['xchan_name']) {
- if($parent_item && ($parent_item['item_flags'] & (ITEM_WALL|ITEM_ORIGIN)) == (ITEM_WALL|ITEM_ORIGIN)) {
+ if(($parent_item) && ($parent_item['item_wall'] && $parent_item['item_origin'])) {
$walltowall_comment = true;
$walltowall = true;
}
@@ -347,11 +347,6 @@ function item_post(&$a) {
$body = $_REQUEST['body'];
$item_flags = $orig_post['item_flags'];
- // force us to recalculate if we need to obscure this post
-
- if($item_flags & ITEM_OBSCURED)
- $item_flags = ($item_flags ^ ITEM_OBSCURED);
-
$item_restrict = $orig_post['item_restrict'];
$postopts = $orig_post['postopts'];
$created = $orig_post['created'];
@@ -658,31 +653,27 @@ function item_post(&$a) {
}
}
- $item_unseen = 1;
-
+
+ $item_unseen = ((local_channel() != $profile_uid) ? 1 : 0);
+ $item_wall = (($post_type === 'wall' || $post_type === 'wall-comment') ? 1 : 0);
+ $item_origin = (($origin) ? 1 : 0);
+
// determine if this is a wall post
if($parent) {
- if($parent_item['item_flags'] & ITEM_WALL) {
- $item_flags = $item_flags | ITEM_WALL;
- }
+ $item_wall = $parent_item['item_wall'];
}
else {
if(! $webpage) {
- $item_flags = $item_flags | ITEM_WALL;
+ $item_wall = 1;
}
}
- if($origin)
- $item_flags = $item_flags | ITEM_ORIGIN;
if($moderated)
$item_restrict = $item_restrict | ITEM_MODERATED;
- if($webpage)
- $item_restrict = $item_restrict | $webpage;
-
if(! strlen($verb))
$verb = ACTIVITY_POST ;
@@ -706,14 +697,10 @@ function item_post(&$a) {
$datarray = array();
- if(! $parent) {
- $item_flags = $item_flags | ITEM_THREAD_TOP;
- }
+ $item_thead_top = ((! $parent) ? 1 : 0);
- if($consensus)
- $item_flags |= ITEM_CONSENSUS;
- if ((! $plink) && ($item_flags & ITEM_THREAD_TOP)) {
+ if ((! $plink) && ($item_thread_top)) {
$plink = z_root() . '/channel/' . $channel['channel_address'] . '/?f=&mid=' . $mid;
}
@@ -743,11 +730,17 @@ function item_post(&$a) {
$datarray['deny_cid'] = $str_contact_deny;
$datarray['deny_gid'] = $str_group_deny;
$datarray['item_private'] = $private;
+ $datarray['item_wall'] = $item_wall;
$datarray['attach'] = $attachments;
$datarray['thr_parent'] = $thr_parent;
$datarray['postopts'] = $postopts;
$datarray['item_restrict'] = $item_restrict;
$datarray['item_flags'] = $item_flags;
+ $datarray['item_unseen'] = $item_unseen;
+ $datarray['item_wall'] = $item_wall;
+ $datarray['item_origin'] = $item_origin;
+ $datarray['item_type'] = $webpage;
+ $datarray['item_thread_top'] = $item_thread_top;
$datarray['layout_mid'] = $layout_mid;
$datarray['public_policy'] = $public_policy;
$datarray['comment_policy'] = map_scope($channel['channel_w_comment']);
@@ -799,17 +792,9 @@ function item_post(&$a) {
if($uid) {
if($channel['channel_hash'] === $datarray['author_xchan']) {
$datarray['sig'] = base64url_encode(rsa_sign($datarray['body'],$channel['channel_prvkey']));
- $datarray['item_flags'] = $datarray['item_flags'] | ITEM_VERIFIED;
+ $datarray['item_verified'] = 1;
}
}
-
- logger('Encrypting local storage');
- $key = get_config('system','pubkey');
- $datarray['item_flags'] = $datarray['item_flags'] | ITEM_OBSCURED;
- if($datarray['title'])
- $datarray['title'] = json_encode(crypto_encapsulate($datarray['title'],$key));
- if($datarray['body'])
- $datarray['body'] = json_encode(crypto_encapsulate($datarray['body'],$key));
}
if($orig_post) {
@@ -843,7 +828,7 @@ function item_post(&$a) {
// only send comment notification if this is a wall-to-wall comment,
// otherwise it will happen during delivery
- if(($datarray['owner_xchan'] != $datarray['author_xchan']) && ($parent_item['item_flags'] & ITEM_WALL)) {
+ if(($datarray['owner_xchan'] != $datarray['author_xchan']) && (intval($parent_item['item_wall']))) {
notification(array(
'type' => NOTIFY_COMMENT,
'from_xchan' => $datarray['author_xchan'],
@@ -885,9 +870,8 @@ function item_post(&$a) {
// This way we don't see every picture in your new photo album posted to your wall at once.
// They will show up as people comment on them.
- if($parent_item['item_restrict'] & ITEM_HIDDEN) {
- $r = q("UPDATE `item` SET `item_restrict` = %d WHERE `id` = %d",
- intval($parent_item['item_restrict'] - ITEM_HIDDEN),
+ if(intval($parent_item['item_hidden'])) {
+ $r = q("UPDATE item SET item_hidden = 0 WHERE id = %d",
intval($parent_item['id'])
);
}
@@ -1096,17 +1080,15 @@ function item_check_service_class($channel_id,$iswebpage) {
$ret = array('success' => false, $message => '');
if ($iswebpage) {
- // note: we aren't counting comanche templates and blocks, only webpages
- $r = q("select count(id) as total from item where parent = id
- and ( item_restrict & %d ) > 0 and ( item_restrict & %d ) = 0 and uid = %d ",
- intval(ITEM_WEBPAGE),
- intval(ITEM_DELETED),
+ $r = q("select count(i.id) as total from item i
+ right join channel c on (i.author_xchan=c.channel_hash and i.uid=c.channel_id )
+ and i.parent=i.id and i.item_type = %d and i.item_deleted = 0 and i.uid= %d ",
+ intval(ITEM_TYPE_WEBPAGE),
intval($channel_id)
);
}
else {
- $r = q("select count(id) as total from item where parent = id and item_restrict = 0 and (item_flags & %d) > 0 and uid = %d ",
- intval(ITEM_WALL),
+ $r = q("select count(id) as total from item where parent = id and item_restrict = 0 and item_wall = 1 and uid = %d ",
intval($channel_id)
);
}
diff --git a/mod/layouts.php b/mod/layouts.php
index 88bc0647d..daae1ba5a 100644
--- a/mod/layouts.php
+++ b/mod/layouts.php
@@ -99,7 +99,7 @@ function layouts_content(&$a) {
dbesc(argv(3))
);
if($r) {
- header('Content-type: application/x-redmatrix-layout');
+ header('Content-type: application/x-hubzilla-layout');
header('Content-disposition: attachment; filename="' . $r[0]['sid'] . '.pdl"');
echo json_encode($r);
killme();
@@ -111,7 +111,7 @@ function layouts_content(&$a) {
// This lets you post pages at other people's channels.
$x = array(
- 'webpage' => ITEM_PDL,
+ 'webpage' => ITEM_TYPE_PDL,
'is_owner' => true,
'nickname' => $a->profile['channel_address'],
'bang' => '',
@@ -134,10 +134,10 @@ function layouts_content(&$a) {
$editor = status_editor($a,$x);
- $r = q("select iid, sid, mid, title, body, mimetype, created, edited from item_id left join item on item_id.iid = item.id
- where item_id.uid = %d and service = 'PDL' and item_restrict = %d order by item.created desc",
+ $r = q("select iid, sid, mid, title, body, mimetype, created, edited, item_type from item_id left join item on item_id.iid = item.id
+ where item_id.uid = %d and service = 'PDL' and item_type = %d order by item.created desc",
intval($owner),
- intval(ITEM_PDL)
+ intval(ITEM_TYPE_PDL)
);
$pages = null;
diff --git a/mod/like.php b/mod/like.php
index e79ff5f48..57939885a 100755
--- a/mod/like.php
+++ b/mod/like.php
@@ -241,9 +241,10 @@ function like_content(&$a) {
// get the item. Allow linked photos (which are normally hidden) to be liked
- $r = q("SELECT * FROM item WHERE id = %d and (item_restrict = 0 or item_restrict = %d) LIMIT 1",
- intval($item_id),
- intval(ITEM_HIDDEN)
+ $r = q("SELECT * FROM item WHERE id = %d
+ and item_blocked = 0 and item_moderated = 0 and item_spam = 0
+ and item_deleted = 0 and item_unpublished = 0 and item_delayed_publish = 0 LIMIT 1",
+ intval($item_id)
);
if(! $item_id || (! $r)) {
@@ -338,9 +339,12 @@ function like_content(&$a) {
$mid = item_message_id();
- if($extended_like) {
- $item_flags = ITEM_THREAD_TOP|ITEM_ORIGIN|ITEM_WALL;
+ $arr = array();
+ if($extended_like) {
+ $arr['item_thread_top'] = 1;
+ $arr['item_origin'] = 1;
+ $arr['item_wall'] = 1;
}
else {
$post_type = (($item['resource_type'] === 'photo') ? t('photo') : t('status'));
@@ -372,18 +376,19 @@ function like_content(&$a) {
),
));
- if(! ($item['item_flags'] & ITEM_THREAD_TOP))
+ if(! intval($item['item_thread_top']))
$post_type = 'comment';
- $item_flags = ITEM_ORIGIN | ITEM_NOTSHOWN;
- if($item['item_flags'] & ITEM_WALL)
- $item_flags |= ITEM_WALL;
+ $arr['item_origin'] = 1;
+ $arr['item_notshown'] = 1;
+
+ if(intval($item['item_wall']))
+ $arr['item_wall'] = 1;
// if this was a linked photo and was hidden, unhide it.
- if($item['item_restrict'] & ITEM_HIDDEN) {
- $r = q("update item set item_restrict = (item_restrict ^ %d) where id = %d",
- intval(ITEM_HIDDEN),
+ if(intval($item['item_hidden'])) {
+ $r = q("update item set item_hidden = 0 where id = %d",
intval($item['id'])
);
}
@@ -411,7 +416,6 @@ function like_content(&$a) {
killme();
- $arr = array();
if($extended_like) {
$ulink = '[zrl=' . $ch[0]['xchan_url'] . ']' . $ch[0]['xchan_name'] . '[/zrl]';
@@ -437,6 +441,7 @@ function like_content(&$a) {
$arr['aid'] = (($extended_like) ? $ch[0]['channel_account_id'] : $owner_aid);
$arr['uid'] = $owner_uid;
$arr['item_flags'] = $item_flags;
+ $arr['item_wall'] = $item_wall;
$arr['parent_mid'] = (($extended_like) ? $mid : $item['mid']);
$arr['owner_xchan'] = (($extended_like) ? $ch[0]['xchan_hash'] : $thread_owner['xchan_hash']);
$arr['author_xchan'] = $observer['xchan_hash'];
diff --git a/mod/locs.php b/mod/locs.php
index 5b04bb343..3f8bd9029 100644
--- a/mod/locs.php
+++ b/mod/locs.php
@@ -22,13 +22,10 @@ function locs_post(&$a) {
return;
}
- $r = q("update hubloc set hubloc_flags = (hubloc_flags - %d) where (hubloc_flags & %d)>0 and hubloc_hash = '%s' ",
- intval(HUBLOC_FLAGS_PRIMARY),
- intval(HUBLOC_FLAGS_PRIMARY),
+ $r = q("update hubloc set hubloc_primary = 0 where hubloc_primary = 1 and hubloc_hash = '%s' ",
dbesc($channel['channel_hash'])
);
- $r = q("update hubloc set hubloc_flags = (hubloc_flags | %d) where hubloc_id = %d and hubloc_hash = '%s'",
- intval(HUBLOC_FLAGS_PRIMARY),
+ $r = q("update hubloc set hubloc_primary = 1 where hubloc_id = %d and hubloc_hash = '%s'",
intval($hubloc_id),
dbesc($channel['channel_hash'])
);
@@ -42,7 +39,7 @@ function locs_post(&$a) {
$hubloc_id = intval($_REQUEST['drop']);
if($hubloc_id) {
- $r = q("select hubloc_id, hubloc_flags from hubloc where hubloc_id = %d and hubloc_url != '%s' and hubloc_hash = '%s' limit 1",
+ $r = q("select * from hubloc where hubloc_id = %d and hubloc_url != '%s' and hubloc_hash = '%s' limit 1",
intval($hubloc_id),
dbesc(z_root()),
dbesc($channel['channel_hash'])
@@ -52,12 +49,12 @@ function locs_post(&$a) {
notice( t('Location not found.') . EOL);
return;
}
- if($r[0]['hubloc_flags'] & HUBLOC_FLAGS_PRIMARY) {
+ if(intval($r[0]['hubloc_primary'])) {
notice( t('Primary location cannot be removed.') . EOL);
return;
}
- $r = q("update hubloc set hubloc_flags = (hubloc_flags | %d) where hubloc_id = %d and hubloc_hash = '%s'",
- intval(HUBLOC_FLAGS_DELETED),
+
+ $r = q("update hubloc set hubloc_deleted = 1 where hubloc_id = %d and hubloc_hash = '%s'",
intval($hubloc_id),
dbesc($channel['channel_hash'])
);
@@ -72,7 +69,6 @@ function locs_post(&$a) {
function locs_content(&$a) {
-
if(! local_channel()) {
notice( t('Permission denied.') . EOL);
return;
@@ -91,8 +87,8 @@ function locs_content(&$a) {
for($x = 0; $x < count($r); $x ++) {
- $r[$x]['primary'] = (($r[$x]['hubloc_flags'] & HUBLOC_FLAGS_PRIMARY) ? true : false);
- $r[$x]['deleted'] = (($r[$x]['hubloc_flags'] & HUBLOC_FLAGS_DELETED) ? true : false);
+ $r[$x]['primary'] = (intval($r[$x]['hubloc_primary']) ? true : false);
+ $r[$x]['deleted'] = (intval($r[$x]['hubloc_deleted']) ? true : false);
}
diff --git a/mod/manage.php b/mod/manage.php
index 3712be6f1..bb6c010f6 100644
--- a/mod/manage.php
+++ b/mod/manage.php
@@ -56,14 +56,14 @@ function manage_content(&$a) {
$channels[$x]['default_links'] = '1';
- $c = q("SELECT id, item_restrict, item_flags FROM item
+ $c = q("SELECT id, item_restrict, item_wall FROM item
WHERE item_restrict = 0 and item_unseen = 1 and uid = %d",
intval($channels[$x]['channel_id'])
);
if($c) {
foreach ($c as $it) {
- if($it['item_flags'] & ITEM_WALL)
+ if(intval($it['item_wall']))
$channels[$x]['home'] ++;
else
$channels[$x]['network'] ++;
@@ -71,11 +71,10 @@ function manage_content(&$a) {
}
- $intr = q("SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and (abook_flags & %d)>0 and not ((abook_flags & %d)>0 or (xchan_flags & %d)>0)",
+ $intr = q("SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and (abook_flags & %d)>0 and not ((abook_flags & %d)>0 or xchan_deleted = 1 or xchan_orphan = 1)",
intval($channels[$x]['channel_id']),
intval(ABOOK_FLAG_PENDING),
- intval(ABOOK_FLAG_SELF|ABOOK_FLAG_IGNORED),
- intval(XCHAN_FLAGS_DELETED|XCHAN_FLAGS_ORPHAN)
+ intval(ABOOK_FLAG_SELF|ABOOK_FLAG_IGNORED)
);
if($intr)
diff --git a/mod/message.php b/mod/message.php
index 4a1ff26d1..9cf4b6987 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -25,7 +25,6 @@ function message_content(&$a) {
$cipher = 'aes256';
-
$tpl = get_markup_template('mail_head.tpl');
$header = replace_macros($tpl, array(
'$messages' => t('Messages'),
@@ -49,7 +48,6 @@ function message_content(&$a) {
// private_messages_list() can do other more complicated stuff, for now keep it simple
-
$r = private_messages_list(local_channel(), '', $a->pager['start'], $a->pager['itemspage']);
if(! $r) {
diff --git a/mod/mood.php b/mod/mood.php
index 7663b2632..92a4f391b 100755
--- a/mod/mood.php
+++ b/mod/mood.php
@@ -61,9 +61,6 @@ function mood_init(&$a) {
$mid = item_message_id();
$action = sprintf( t('%1$s is %2$s','mood'), '[zrl=' . $poster['xchan_url'] . ']' . $poster['xchan_name'] . '[/zrl]' , $verbs[$verb]);
- $item_flags = ITEM_WALL|ITEM_ORIGIN;
- if(! $parent_mid)
- $item_flags |= ITEM_THREAD_TOP;
$arr = array();
@@ -71,7 +68,6 @@ function mood_init(&$a) {
$arr['uid'] = $uid;
$arr['mid'] = $mid;
$arr['parent_mid'] = (($parent_mid) ? $parent_mid : $mid);
- $arr['item_flags'] = $item_flags;
$arr['author_xchan'] = $poster['xchan_hash'];
$arr['owner_xchan'] = (($parent_mid) ? $r[0]['owner_xchan'] : $poster['xchan_hash']);
$arr['title'] = '';
@@ -82,8 +78,13 @@ function mood_init(&$a) {
$arr['item_private'] = $private;
$arr['verb'] = $activity;
$arr['body'] = $action;
+ $arr['item_origin'] = 1;
+ $arr['item_wall'] = 1;
+ $arr['item_unseen'] = 1;
+ if(! $parent_mid)
+ $item['item_thread_top'] = 1;
- if ((! $arr['plink']) && ($arr['item_flags'] & ITEM_THREAD_TOP)) {
+ if ((! $arr['plink']) && intval($arr['item_thread_top'])) {
$arr['plink'] = z_root() . '/channel/' . $channel['channel_address'] . '/?f=&mid=' . $arr['mid'];
}
diff --git a/mod/network.php b/mod/network.php
index d96c6830d..9ebdf7198 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -176,12 +176,12 @@ function network_content(&$a, $update = 0, $load = false) {
$sql_options = (($star)
- ? " and (item_flags & " . intval(ITEM_STARRED) . ") > 0"
+ ? " and item_starred = 1 "
: '');
$sql_nets = '';
- $sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE (item_flags & " . intval(ITEM_THREAD_TOP) . ")>0 $sql_options ) ";
+ $sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE item_thread_top = 1 $sql_options ) ";
if($group) {
$contact_str = '';
@@ -324,9 +324,8 @@ function network_content(&$a, $update = 0, $load = false) {
}
if($conv) {
- $sql_extra .= sprintf(" AND parent IN (SELECT distinct(parent) from item where ( author_xchan like '%s' or ( item_flags & %d ) > 0) and item_restrict = 0 ) ",
- dbesc(protect_sprintf($channel['channel_hash'])),
- intval(ITEM_MENTIONSME)
+ $sql_extra .= sprintf(" AND parent IN (SELECT distinct(parent) from item where ( author_xchan like '%s' or item_mentionsme = 1 )) ",
+ dbesc(protect_sprintf($channel['channel_hash']))
);
}
@@ -500,7 +499,7 @@ function network_content(&$a, $update = 0, $load = false) {
}
if(($update_unseen) && (! $firehose))
- $r = q("UPDATE item SET item_unseen = 0 where item_unseen = 1 AND uid = %d $update_unseen ",
+ $r = q("UPDATE item SET item_unseen = 0 WHERE item_unseen = 1 AND uid = %d $update_unseen ",
intval(local_channel())
);
diff --git a/mod/openid.php b/mod/openid.php
index 1af95a81c..70da2690a 100644
--- a/mod/openid.php
+++ b/mod/openid.php
@@ -131,8 +131,8 @@ function openid_content(&$a) {
$x = q("insert into xchan ( xchan_hash, xchan_guid, xchan_guid_sig, xchan_pubkey, xchan_photo_mimetype,
xchan_photo_l, xchan_addr, xchan_url, xchan_connurl, xchan_follow, xchan_connpage, xchan_name, xchan_network, xchan_photo_date,
- xchan_name_date, xchan_flags)
- values ( '%s', '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d) ",
+ xchan_name_date, xchan_hidden)
+ values ( '%s', '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', 1) ",
dbesc($url),
dbesc(''),
dbesc(''),
@@ -147,8 +147,7 @@ function openid_content(&$a) {
dbesc($name),
dbesc($network),
dbesc(datetime_convert()),
- dbesc(datetime_convert()),
- intval(XCHAN_FLAGS_HIDDEN)
+ dbesc(datetime_convert())
);
if($x) {
$r = q("select * from xchan where xchan_hash = '%s' limit 1",
diff --git a/mod/p.php b/mod/p.php
index 924fd7eba..4e411a17b 100644
--- a/mod/p.php
+++ b/mod/p.php
@@ -11,9 +11,8 @@ function p_init(&$a) {
$mid = str_replace('.xml','',argv(1));
- $r = q("select * from item where mid = '%s' and (item_flags & %d)>0 and item_private = 0 limit 1",
- dbesc($mid),
- intval(ITEM_WALL)
+ $r = q("select * from item where mid = '%s' and item_wall = 1 and item_private = 0 limit 1",
+ dbesc($mid)
);
diff --git a/mod/page.php b/mod/page.php
index 25b4d8888..c37dc7d0b 100644
--- a/mod/page.php
+++ b/mod/page.php
@@ -59,12 +59,12 @@ function page_init(&$a) {
$sql_options = item_permissions_sql($u[0]['channel_id']);
$r = q("select item.* from item left join item_id on item.id = item_id.iid
- where item.uid = %d and sid = '%s' and (( service = 'WEBPAGE' and
- item_restrict = %d ) or ( service = 'PDL' and item_restrict = %d )) $sql_options $revision limit 1",
+ where item.uid = %d and sid = '%s' and (( service = 'WEBPAGE' and item_type = %d )
+ OR ( service = 'PDL' AND item_type = %d )) $sql_options $revision limit 1",
intval($u[0]['channel_id']),
dbesc($page_id),
- intval(ITEM_WEBPAGE),
- intval(ITEM_PDL)
+ intval(ITEM_TYPE_WEBPAGE),
+ intval(ITEM_TYPE_PDL)
);
if(! $r) {
@@ -72,10 +72,10 @@ function page_init(&$a) {
$x = q("select item.* from item left join item_id on item.id = item_id.iid
where item.uid = %d and sid = '%s' and service = 'WEBPAGE' and
- item_restrict = %d $revision limit 1",
+ item_type = %d $revision limit 1",
intval($u[0]['channel_id']),
dbesc($page_id),
- intval(ITEM_WEBPAGE)
+ intval(ITEM_TYPE_WEBPAGE)
);
if($x) {
// Yes, it's there. You just aren't allowed to see it.
@@ -87,7 +87,7 @@ function page_init(&$a) {
return;
}
- if($r[0]['item_restrict'] == ITEM_PDL) {
+ if($r[0]['item_type'] == ITEM_TYPE_PDL) {
require_once('include/comanche.php');
comanche_parser(get_app(),$r[0]['body']);
get_app()->pdl = $r[0]['body'];
@@ -118,8 +118,8 @@ function page_content(&$a) {
if(! $r)
return;
- if($r[0]['item_restrict'] == ITEM_PDL) {
- $r[0]['body'] = t('Ipsum Lorem');
+ if($r[0]['item_type'] == ITEM_TYPE_PDL) {
+ $r[0]['body'] = t('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.');
$r[0]['mimetype'] = 'text/plain';
$r[0]['title'] = '';
diff --git a/mod/photos.php b/mod/photos.php
index 296aab67f..3338e22ab 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -180,19 +180,8 @@ function photos_post(&$a) {
intval($page_owner_uid)
);
if(count($i)) {
- q("UPDATE `item` SET item_restrict = (item_restrict | %d), `edited` = '%s', `changed` = '%s' WHERE `parent_mid` = '%s' AND `uid` = %d",
- intval(ITEM_DELETED),
- dbesc(datetime_convert()),
- dbesc(datetime_convert()),
- dbesc($i[0]['mid']),
- intval($page_owner_uid)
- );
-
+ drop_item($i[0]['id'],true,DROPITEM_PHASE1);
$url = $a->get_baseurl();
- $drop_id = intval($i[0]['id']);
-
- if($i[0]['visible'])
- proc_run('php',"include/notifier.php","drop","$drop_id");
}
}
@@ -206,7 +195,7 @@ function photos_post(&$a) {
$rawtags = ((x($_POST,'newtag')) ? notags(trim($_POST['newtag'])) : '');
$item_id = ((x($_POST,'item_id')) ? intval($_POST['item_id']) : 0);
$albname = ((x($_POST,'albname')) ? notags(trim($_POST['albname'])) : '');
- $adult = ((x($_POST,'adult')) ? intval($_POST['adult']) : 0);
+ $is_nsfw = ((x($_POST,'adult')) ? intval($_POST['adult']) : 0);
$str_group_allow = perms2str($_POST['group_allow']);
$str_contact_allow = perms2str($_POST['contact_allow']);
$str_group_deny = perms2str($_POST['group_deny']);
@@ -295,10 +284,10 @@ function photos_post(&$a) {
$item_private = (($str_contact_allow || $str_group_allow || $str_contact_deny || $str_group_deny) ? true : false);
- $old_adult = (($p[0]['photo_flags'] & PHOTO_ADULT) ? 1 : 0);
- if($old_adult != $adult) {
- $r = q("update photo set photo_flags = ( photo_flags ^ %d) where resource_id = '%s' and uid = %d",
- intval(PHOTO_ADULT),
+ $old_is_nsfw = $p[0]['is_nsfw'];
+ if($old_is_nsfw != $is_nsfw) {
+ $r = q("update photo set is_nsfw = %d where resource_id = '%s' and uid = %d",
+ intval($is_nsfw),
dbesc($resource_id),
intval($page_owner_uid)
);
@@ -589,11 +578,12 @@ function photos_content(&$a) {
$album = hex2bin($datum);
$r = q("SELECT `resource_id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` = '%s'
- AND `scale` <= 4 and ((photo_flags = %d) or (photo_flags & %d ) > 0) $sql_extra GROUP BY `resource_id`",
+ AND `scale` <= 4 and photo_usage IN ( %d, %d ) and is_nsfw = %d $sql_extra GROUP BY `resource_id`",
intval($owner_uid),
dbesc($album),
intval(PHOTO_NORMAL),
- intval(($unsafe) ? (PHOTO_PROFILE|PHOTO_ADULT) : PHOTO_PROFILE)
+ intval(PHOTO_PROFILE),
+ intval($unsafe)
);
if(count($r)) {
$a->set_pager_total(count($r));
@@ -609,13 +599,14 @@ function photos_content(&$a) {
$r = q("SELECT p.resource_id, p.id, p.filename, p.type, p.scale, p.description, p.created FROM photo p INNER JOIN
- (SELECT resource_id, max(scale) scale FROM photo WHERE uid = %d AND album = '%s' AND scale <= 4 AND (photo_flags = %d or photo_flags = %d ) $sql_extra GROUP BY resource_id) ph
+ (SELECT resource_id, max(scale) scale FROM photo WHERE uid = %d AND album = '%s' AND scale <= 4 AND photo_usage IN ( %d, %d ) and is_nsfw = %d $sql_extra GROUP BY resource_id) ph
ON (p.resource_id = ph.resource_id AND p.scale = ph.scale)
ORDER BY created $order LIMIT %d OFFSET %d",
intval($owner_uid),
dbesc($album),
- intvaL(PHOTO_NORMAL),
- intval(($unsafe) ? (PHOTO_PROFILE|PHOTO_ADULT) : PHOTO_PROFILE),
+ intval(PHOTO_NORMAL),
+ intval(PHOTO_PROFILE),
+ intval($unsafe),
intval($a->pager['itemspage']),
intval($a->pager['start'])
);
@@ -731,7 +722,7 @@ function photos_content(&$a) {
// fetch image, item containing image, then comments
- $ph = q("SELECT aid,uid,xchan,resource_id,created,edited,title,`description`,album,filename,`type`,height,width,`size`,scale,profile,photo_flags,allow_cid,allow_gid,deny_cid,deny_gid FROM `photo` WHERE `uid` = %d AND `resource_id` = '%s'
+ $ph = q("SELECT aid,uid,xchan,resource_id,created,edited,title,`description`,album,filename,`type`,height,width,`size`,scale,photo_usage,is_nsfw,allow_cid,allow_gid,deny_cid,deny_gid FROM `photo` WHERE `uid` = %d AND `resource_id` = '%s'
$sql_extra ORDER BY `scale` ASC ",
intval($owner_uid),
dbesc($datum)
@@ -878,8 +869,8 @@ function photos_content(&$a) {
}
}
- if((local_channel()) && (local_channel() == $link_item['uid'])) {
- q("UPDATE `item` SET item_unseen = 0 WHERE item_unseen = 1 AND parent = %d AND uid = %d ",
+ if((local_channel()) && (local_user() == $link_item['uid'])) {
+ q("UPDATE `item` SET item_unseen = 0 WHERE parent = %d and uid = %d and item_unseen = 1",
intval($link_item['parent']),
intval(local_channel())
);
@@ -925,7 +916,7 @@ function photos_content(&$a) {
'help_tags' => t('Example: @bob, @Barbara_Jensen, @jim@example.com'),
'item_id' => ((count($linked_items)) ? $link_item['id'] : 0),
'adult_enabled' => feature_enabled($owner_uid,'adult_photo_flagging'),
- 'adult' => array('adult',t('Flag as adult in album view'), (($ph[0]['photo_flags'] & PHOTO_ADULT) ? 1 : 0),''),
+ 'adult' => array('adult',t('Flag as adult in album view'), intval($ph[0]['is_nsfw']),''),
'submit' => t('Submit'),
'delete' => t('Delete Photo')
);
@@ -1151,12 +1142,13 @@ function photos_content(&$a) {
//$o = '';
$r = q("SELECT `resource_id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s'
- and ((photo_flags = %d) or (photo_flags & %d) > 0) $sql_extra GROUP BY `resource_id`",
+ and photo_usage in ( %d, %d ) and is_nsfw = %d $sql_extra GROUP BY `resource_id`",
intval($a->data['channel']['channel_id']),
dbesc('Contact Photos'),
dbesc( t('Contact Photos')),
intval(PHOTO_NORMAL),
- intval(($unsafe) ? (PHOTO_PROFILE|PHOTO_ADULT) : PHOTO_PROFILE)
+ intval(PHOTO_PROFILE),
+ intval($unsafe)
);
if(count($r)) {
$a->set_pager_total(count($r));
@@ -1166,13 +1158,14 @@ function photos_content(&$a) {
$r = q("SELECT p.resource_id, p.id, p.filename, p.type, p.album, p.scale, p.created FROM photo p INNER JOIN
(SELECT resource_id, max(scale) scale FROM photo
WHERE uid=%d AND album != '%s' AND album != '%s'
- AND (photo_flags = %d or ( photo_flags & %d ) > 0 ) $sql_extra group by resource_id) ph
+ AND photo_usage IN ( %d, %d ) and is_nsfw = %d $sql_extra group by resource_id) ph
ON (p.resource_id = ph.resource_id and p.scale = ph.scale) ORDER by p.created DESC LIMIT %d OFFSET %d",
intval($a->data['channel']['channel_id']),
dbesc('Contact Photos'),
dbesc( t('Contact Photos')),
intval(PHOTO_NORMAL),
- intval(($unsafe) ? (PHOTO_PROFILE|PHOTO_ADULT) : PHOTO_PROFILE),
+ intval(PHOTO_PROFILE),
+ intval($unsafe),
intval($a->pager['itemspage']),
intval($a->pager['start'])
);
diff --git a/mod/ping.php b/mod/ping.php
index b676726fe..d43694358 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -156,8 +156,7 @@ function ping_init(&$a) {
);
break;
case 'home':
- $r = q("update item set item_unseen = 0 where item_unseen = 1 and (item_flags & %d) > 0 and uid = %d",
- intval(ITEM_WALL),
+ $r = q("update item set item_unseen = 0 where item_unseen = 1 and item_wall = 1 and uid = %d",
intval(local_channel())
);
break;
@@ -282,7 +281,7 @@ function ping_init(&$a) {
if($r) {
xchan_query($r);
foreach($r as $item) {
- if((argv(1) === 'home') && (! ($item['item_flags'] & ITEM_WALL)))
+ if((argv(1) === 'home') && (! intval($item['item_wall'])))
continue;
$result[] = format_notification($item);
}
@@ -295,11 +294,10 @@ function ping_init(&$a) {
if(argc() > 1 && (argv(1) === 'intros')) {
$result = array();
- $r = q("SELECT * FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and (abook_flags & %d) > 0 and not ((abook_flags & %d) > 0 or (xchan_flags & %d) > 0) ORDER BY abook_created DESC LIMIT 50",
+ $r = q("SELECT * FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and (abook_flags & %d) > 0 and not ((abook_flags & %d) > 0 or xchan_deleted = 1 or xchan_orphan = 1) ORDER BY abook_created DESC LIMIT 50",
intval(local_channel()),
intval(ABOOK_FLAG_PENDING),
- intval(ABOOK_FLAG_SELF|ABOOK_FLAG_IGNORED),
- intval(XCHAN_FLAGS_DELETED|XCHAN_FLAGS_ORPHAN)
+ intval(ABOOK_FLAG_SELF|ABOOK_FLAG_IGNORED)
);
if($r) {
@@ -379,7 +377,7 @@ function ping_init(&$a) {
if($vnotify & (VNOTIFY_NETWORK|VNOTIFY_CHANNEL)) {
$r = q("SELECT id, item_restrict, item_flags FROM item
- WHERE item_restrict = 0 and item_unseen = 1 and uid = %d
+ WHERE (item_restrict = 0) and item_unseen = 1 and uid = %d
and author_xchan != '%s'",
intval(local_channel()),
dbesc($ob_hash)
@@ -390,7 +388,7 @@ function ping_init(&$a) {
call_hooks('network_ping', $arr);
foreach ($r as $it) {
- if($it['item_flags'] & ITEM_WALL)
+ if(intval($it['item_wall']))
$result['home'] ++;
else
$result['network'] ++;
@@ -406,11 +404,10 @@ function ping_init(&$a) {
$t2 = dba_timer();
if($vnotify & VNOTIFY_INTRO) {
- $intr = q("SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and (abook_flags & %d) > 0 and not ((abook_flags & %d) > 0 or (xchan_flags & %d) > 0)",
+ $intr = q("SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and (abook_flags & %d) > 0 and not ((abook_flags & %d) > 0 or xchan_deleted = 1 or xchan_orphan = 1)",
intval(local_channel()),
intval(ABOOK_FLAG_PENDING),
- intval(ABOOK_FLAG_SELF|ABOOK_FLAG_IGNORED),
- intval(XCHAN_FLAGS_DELETED|XCHAN_FLAGS_ORPHAN)
+ intval(ABOOK_FLAG_SELF|ABOOK_FLAG_IGNORED)
);
$t3 = dba_timer();
diff --git a/mod/poke.php b/mod/poke.php
index 6257a2821..f66d28956 100755
--- a/mod/poke.php
+++ b/mod/poke.php
@@ -87,10 +87,8 @@ function poke_init(&$a) {
$arr = array();
- $arr['item_flags'] = ITEM_WALL | ITEM_ORIGIN;
- if($parent_item)
- $arr['item_flags'] |= ITEM_THREAD_TOP;
+ $arr['item_wall'] = 1;
$arr['owner_xchan'] = (($parent_item) ? $parent_item['owner_xchan'] : $channel['channel_hash']);
$arr['parent_mid'] = (($parent_mid) ? $parent_mid : $mid);
$arr['title'] = '';
@@ -115,6 +113,13 @@ function poke_init(&$a) {
$arr['object'] = json_encode($obj);
+ $arr['item_origin'] = 1;
+ $arr['item_wall'] = 1;
+ $arr['item_unseen'] = 1;
+ if(! $parent_item)
+ $item['item_thread_top'] = 1;
+
+
post_activity_item($arr);
return;
diff --git a/mod/post.php b/mod/post.php
index 95931a3f0..fe0860cc6 100644
--- a/mod/post.php
+++ b/mod/post.php
@@ -285,20 +285,13 @@ function post_init(&$a) {
$a->set_groups(init_groups_visitor($_SESSION['visitor_id']));
info(sprintf( t('Welcome %s. Remote authentication successful.'),$x[0]['xchan_name']));
logger('mod_zot: auth success from ' . $x[0]['xchan_addr']);
- q("update hubloc set hubloc_status = (hubloc_status | %d ) where hubloc_id = %d ",
- intval(HUBLOC_WORKS),
- intval($x[0]['hubloc_id'])
- );
- } else {
- if ($test) {
+ }
+ else {
+ if($test) {
$ret['message'] .= 'auth failure. ' . print_r($_REQUEST,true) . print_r($j,true) . EOL;
json_return_and_die($ret);
}
logger('mod_zot: magic-auth failure - not authenticated: ' . $x[0]['xchan_addr']);
- q("update hubloc set hubloc_status = (hubloc_status | %d ) where hubloc_id = %d ",
- intval(HUBLOC_RECEIVE_ERROR),
- intval($x[0]['hubloc_id'])
- );
}
/**
@@ -693,20 +686,16 @@ function post_post(&$a) {
// a dead hub came back to life - reset any tombstones we might have
- if ($hub['hubloc_status'] & HUBLOC_OFFLINE) {
- q("update hubloc set hubloc_status = (hubloc_status & ~%d) where hubloc_id = %d",
- intval(HUBLOC_OFFLINE),
+ if(intval($hub['hubloc_error'])) {
+ q("update hubloc set hubloc_error = 0 where hubloc_id = %d",
intval($hub['hubloc_id'])
);
- if ($r[0]['hubloc_flags'] & HUBLOC_FLAGS_ORPHANCHECK) {
- q("update hubloc set hubloc_flags = (hubloc_flags & ~%d) where hubloc_id = %d",
- intval(HUBLOC_FLAGS_ORPHANCHECK),
+ if(intval($r[0]['hubloc_orphancheck'])) {
+ q("update hubloc set hubloc_orhpancheck = 0 where hubloc_id = %d",
intval($hub['hubloc_id'])
);
}
- q("update xchan set xchan_flags = (xchan_flags & ~%d) where (xchan_flags & %d)>0 and xchan_hash = '%s'",
- intval(XCHAN_FLAGS_ORPHAN),
- intval(XCHAN_FLAGS_ORPHAN),
+ q("update xchan set xchan_orphan = 0 where xchan_orphan = 1 and xchan_hash = '%s'",
dbesc($hub['hubloc_hash'])
);
}
@@ -718,8 +707,7 @@ function post_post(&$a) {
* Get rid of them (mark them deleted). There's a good chance they were re-installs.
*/
- q("update hubloc set hubloc_flags = ( hubloc_flags | %d ) where hubloc_url = '%s' and hubloc_sitekey != '%s' ",
- intval(HUBLOC_FLAGS_DELETED),
+ q("update hubloc set hubloc_deleted = 1 where hubloc_url = '%s' and hubloc_sitekey != '%s' ",
dbesc($hub['hubloc_url']),
dbesc($hub['hubloc_sitekey'])
);
diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index fd5ea2af2..9fe042500 100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -143,7 +143,7 @@ function profile_photo_post(&$a) {
'filename' => $base_image['filename'], 'album' => t('Profile Photos'));
$p['scale'] = 4;
- $p['photo_flags'] = (($is_default_profile) ? PHOTO_PROFILE : PHOTO_NORMAL);
+ $p['photo_usage'] = (($is_default_profile) ? PHOTO_PROFILE : PHOTO_NORMAL);
$r1 = $im->save($p);
@@ -170,13 +170,9 @@ function profile_photo_post(&$a) {
// If setting for the default profile, unset the profile photo flag from any other photos I own
if($is_default_profile) {
- $r = q("UPDATE photo SET profile = 0 WHERE profile = 1 AND resource_id != '%s' AND `uid` = %d",
- dbesc($base_image['resource_id']),
- intval(local_channel())
- );
- $r = q("UPDATE photo SET photo_flags = ( photo_flags & ~%d ) WHERE ( photo_flags & %d )>0
+ $r = q("UPDATE photo SET photo_usage = %d WHERE photo_usage = %d
AND resource_id != '%s' AND `uid` = %d",
- intval(PHOTO_PROFILE),
+ intval(PHOTO_NORMAL),
intval(PHOTO_PROFILE),
dbesc($base_image['resource_id']),
intval(local_channel())
@@ -301,20 +297,12 @@ function profile_photo_content(&$a) {
if(($r[0]['album'] == t('Profile Photos')) && ($havescale)) {
// unset any existing profile photos
- $r = q("UPDATE photo SET profile = 0 WHERE profile = 1 AND uid = %d",
- intval(local_channel()));
- $r = q("UPDATE photo SET photo_flags = (photo_flags & ~%d ) WHERE (photo_flags & %d )>0 AND uid = %d",
- intval(PHOTO_PROFILE),
+ $r = q("UPDATE photo SET photo_usage = %d WHERE photo_usage = %d AND uid = %d",
+ intval(PHOTO_NORMAL),
intval(PHOTO_PROFILE),
intval(local_channel()));
- // set all sizes of this one as profile photos
- $r = q("UPDATE photo SET profile = 1 WHERE uid = %d AND resource_id = '%s'",
- intval(local_channel()),
- dbesc($resource_id)
- );
-
- $r = q("UPDATE photo SET photo_flags = ( photo_flags | %d ) WHERE uid = %d AND resource_id = '%s'",
+ $r = q("UPDATE photo SET photo_usage = %d WHERE uid = %d AND resource_id = '%s'",
intval(PHOTO_PROFILE),
intval(local_channel()),
dbesc($resource_id)
diff --git a/mod/siteinfo.php b/mod/siteinfo.php
index 904228f13..1282e2f17 100644
--- a/mod/siteinfo.php
+++ b/mod/siteinfo.php
@@ -163,7 +163,7 @@ function siteinfo_content(&$a) {
'$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.'),
'$bug_text' => t('Bug reports and issues: please visit'),
- '$bug_link_url' => 'https://github.com/redmatrix/redmatrix/issues',
+ '$bug_link_url' => 'https://github.com/redmatrix/hubzilla/issues',
'$bug_link_text' => '$projectname issues',
'$contact' => t('Suggestions, praise, etc. - please email "redmatrix" at librelist - dot com'),
'$donate' => $donate,
diff --git a/mod/starred.php b/mod/starred.php
index b6736fd85..103e5f4b4 100644
--- a/mod/starred.php
+++ b/mod/starred.php
@@ -19,15 +19,15 @@ function starred_init(&$a) {
if(! count($r))
killme();
- $item_flags = ( $r[0]['item_flags'] ^ ITEM_STARRED );
+ $item_starred = (intval($r[0]['item_starred']) ? 0 : 1);
- $r = q("UPDATE item SET item_flags = %d WHERE uid = %d and id = %d",
- intval($item_flags),
+ $r = q("UPDATE item SET item_starred = %d WHERE uid = %d and id = %d",
+ intval($item_starred),
intval(local_channel()),
intval($message_id)
);
header('Content-type: application/json');
- echo json_encode(array('result' => (($item_flags & ITEM_STARRED) ? 1 : 0)));
+ echo json_encode(array('result' => $item_starred));
killme();
}
diff --git a/mod/subthread.php b/mod/subthread.php
index eeb8f131d..9cfe5c24d 100755
--- a/mod/subthread.php
+++ b/mod/subthread.php
@@ -96,30 +96,28 @@ function subthread_content(&$a) {
),
));
- if(! ($item['item_flags'] & ITEM_THREAD_TOP))
+ if(! intval($item['item_thread_top']))
$post_type = 'comment';
-
$bodyverb = t('%1$s is following %2$s\'s %3$s');
- $item_flags = ITEM_ORIGIN | ITEM_NOTSHOWN;
- if($item['item_flags'] & ITEM_WALL)
- $item_flags |= ITEM_WALL;
-
-
$arr = array();
- $arr['mid'] = $mid;
- $arr['aid'] = $owner_aid;
- $arr['uid'] = $owner_uid;
- $arr['item_flags'] = $item_flags;
- $arr['parent'] = $item['id'];
- $arr['parent_mid'] = $item['mid'];
- $arr['thr_parent'] = $item['mid'];
- $arr['owner_xchan'] = $thread_owner['xchan_hash'];
- $arr['author_xchan'] = $observer['xchan_hash'];
+ $arr['mid'] = $mid;
+ $arr['aid'] = $owner_aid;
+ $arr['uid'] = $owner_uid;
+ $arr['parent'] = $item['id'];
+ $arr['parent_mid'] = $item['mid'];
+ $arr['thr_parent'] = $item['mid'];
+ $arr['owner_xchan'] = $thread_owner['xchan_hash'];
+ $arr['author_xchan'] = $observer['xchan_hash'];
+ $arr['item_origin'] = 1;
+ $arr['item_notshown'] = 1;
+ if(intval($item['item_wall']))
+ $arr['item_wall'] = 1;
+ else
+ $arr['item_wall'] = 0;
-
$ulink = '[zrl=' . $item_author['xchan_url'] . ']' . $item_author['xchan_name'] . '[/zrl]';
$alink = '[zrl=' . $observer['xchan_url'] . ']' . $observer['xchan_name'] . '[/zrl]';
$plink = '[zrl=' . $a->get_baseurl() . '/display/' . $item['mid'] . ']' . $post_type . '[/zrl]';
diff --git a/mod/tagger.php b/mod/tagger.php
index aafad58cf..c6365d707 100644
--- a/mod/tagger.php
+++ b/mod/tagger.php
@@ -107,11 +107,9 @@ function tagger_content(&$a) {
$arr['owner_xchan'] = $item['owner_xchan'];
$arr['author_xchan'] = $channel['channel_hash'];
+ $arr['item_origin'] = 1;
+ $arr['item_wall'] = ((intval($item['item_wall'])) ? 1 : 0);
- $arr['item_flags'] = ITEM_ORIGIN;
- if($item['item_flags'] & ITEM_WALL)
- $arr['item_flags'] |= ITEM_WALL;
-
$ulink = '[zrl=' . $channel['xchan_url'] . ']' . $channel['channel_name'] . '[/zrl]';
$alink = '[zrl=' . $item['xchan_url'] . ']' . $item['xchan_name'] . '[/zrl]';
$plink = '[zrl=' . $item['plink'] . ']' . $post_type . '[/zrl]';
diff --git a/mod/thing.php b/mod/thing.php
index c6b70fbb4..b4b8ad027 100644
--- a/mod/thing.php
+++ b/mod/thing.php
@@ -177,7 +177,9 @@ function thing_init(&$a) {
$arr['owner_xchan'] = $channel['channel_hash'];
$arr['author_xchan'] = $channel['channel_hash'];
- $arr['item_flags'] = ITEM_ORIGIN|ITEM_WALL|ITEM_THREAD_TOP;
+ $arr['item_origin'] = 1;
+ $arr['item_wall'] = 1;
+ $arr['item_thread_top'] = 1;
$ulink = '[zrl=' . $channel['xchan_url'] . ']' . $channel['channel_name'] . '[/zrl]';
$plink = '[zrl=' . $term['url'] . ']' . $term['term'] . '[/zrl]';
diff --git a/mod/viewconnections.php b/mod/viewconnections.php
index ef6681e64..c1da07292 100644
--- a/mod/viewconnections.php
+++ b/mod/viewconnections.php
@@ -35,25 +35,24 @@ function viewconnections_content(&$a) {
$is_owner = ((local_channel() && local_channel() == $a->profile['uid']) ? true : false);
$abook_flags = ABOOK_FLAG_PENDING|ABOOK_FLAG_SELF;
- $xchan_flags = XCHAN_FLAGS_ORPHAN|XCHAN_FLAGS_DELETED;
+ $sql_extra = '';
+
if(! $is_owner) {
$abook_flags = $abook_flags | ABOOK_FLAG_HIDDEN;
- $xchan_flags = $xchan_flags | XCHAN_FLAGS_HIDDEN;
+ $sql_extra = " and xchan_hidden = 0 ";
}
- $r = q("SELECT count(*) as total FROM abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and not (abook_flags & %d )>0 and not ( xchan_flags & %d )>0 ",
+ $r = q("SELECT count(*) as total FROM abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and not (abook_flags & %d )>0 and xchan_orphan = 0 and xchan_deleted = 0 $sql_extra ",
intval($a->profile['uid']),
- intval($abook_flags),
- intval($xchan_flags)
+ intval($abook_flags)
);
if($r) {
$a->set_pager_total($r[0]['total']);
}
- $r = q("SELECT * FROM abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and not ( abook_flags & %d )>0 and not ( xchan_flags & %d )>0 order by xchan_name LIMIT %d OFFSET %d ",
+ $r = q("SELECT * FROM abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and not ( abook_flags & %d )>0 and xchan_orphan = 0 and xchan_deleted = 0 $sql_extra order by xchan_name LIMIT %d OFFSET %d ",
intval($a->profile['uid']),
intval($abook_flags),
- intval($xchan_flags),
intval($a->pager['itemspage']),
intval($a->pager['start'])
);
diff --git a/mod/viewsrc.php b/mod/viewsrc.php
index 3125ae4c0..931175a44 100644
--- a/mod/viewsrc.php
+++ b/mod/viewsrc.php
@@ -20,15 +20,16 @@ function viewsrc_content(&$a) {
notice( t('Item not found.') . EOL);
}
+
if(local_channel() && $item_id) {
- $r = q("select item_flags, body, id from item where item_restrict = 0 and uid in (%d , %d) and id = %d limit 1",
+ $r = q("select id, item_flags, item_obscured, body from item where item_restrict = 0 and uid in (%d , %d) and id = %d limit 1",
intval(local_channel()),
intval($sys['channel_id']),
intval($item_id)
);
if($r) {
- if($r[0]['item_flags'] & ITEM_OBSCURED)
+ if(intval($r[0]['item_obscured']))
$r[0]['body'] = crypto_unencapsulate(json_decode($r[0]['body'],true),get_config('system','prvkey'));
$o = (($json) ? json_encode($r[0]['body']) : str_replace("\n",'<br />',$r[0]['body']));
}
diff --git a/mod/webpages.php b/mod/webpages.php
index 62abfb34a..f7043d5e1 100644
--- a/mod/webpages.php
+++ b/mod/webpages.php
@@ -102,7 +102,7 @@ function webpages_content(&$a) {
$o = profile_tabs($a, $is_owner, $a->profile['channel_address']);
$x = array(
- 'webpage' => ITEM_WEBPAGE,
+ 'webpage' => ITEM_TYPE_WEBPAGE,
'is_owner' => true,
'nickname' => $a->profile['channel_address'],
'lockstate' => (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
diff --git a/mod/zfinger.php b/mod/zfinger.php
index 6b93b3410..37243922c 100644
--- a/mod/zfinger.php
+++ b/mod/zfinger.php
@@ -104,7 +104,7 @@ function zfinger_init(&$a) {
$adult_channel = (($e['channel_pageflags'] & PAGE_ADULT) ? true : false);
$censored = (($e['channel_pageflags'] & PAGE_CENSORED) ? true : false);
$searchable = (($e['channel_pageflags'] & PAGE_HIDDEN) ? false : true);
- $deleted = (($e['xchan_flags'] & XCHAN_FLAGS_DELETED) ? true : false);
+ $deleted = (intval($e['xchan_deleted']) ? true : false);
if($deleted || $censored || $sys_channel)
$searchable = false;
diff --git a/util/Doxyfile b/util/Doxyfile
index f700c2abe..55acd46eb 100644
--- a/util/Doxyfile
+++ b/util/Doxyfile
@@ -1,6 +1,6 @@
INPUT = README.md index.php boot.php mod/ include/ util/ view/ version.inc
RECURSIVE = YES
-PROJECT_NAME = "The RedMatrix"
+PROJECT_NAME = "The Hubzilla"
PROJECT_LOGO = images/rm-64.png
EXCLUDE = .htconfig.php library/ doc/ vendor/ .git/ util/zotsh/easywebdav/
EXCLUDE_PATTERNS = *smarty3* *strings.php *.out *test*
diff --git a/util/README b/util/README
index 9d8fe299c..991a3fe51 100644
--- a/util/README
+++ b/util/README
@@ -115,7 +115,7 @@ When strings are added or modified in source, you could run
to extract strings from source files and join them with the existing .po file:
new strings are added, the existing are not overwritten.
-If you already translated the RedMatrix using strings.php, you could import your old
+If you already translated the Hubzilla using strings.php, you could import your old
translation to messages.po. Run:
$ php util/php2po.php view/<language>/strings.php
diff --git a/util/messages.po b/util/messages.po
index 8cc8ee7f1..2aea612b2 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -1,5 +1,5 @@
-# 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.
# Mike Macgirvin, 2012
#
@@ -5086,7 +5086,7 @@ msgstr ""
#: ../../mod/siteinfo.php:168
msgid ""
-"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"
+"Suggestions, praise, etc. - please email \"hubzilla\" at librelist - dot com"
msgstr ""
#: ../../mod/siteinfo.php:170
@@ -8778,7 +8778,7 @@ msgid "Right offset of the aside element"
msgstr ""
#: ../../view/theme/redbasic/php/config.php:82
-msgid "Light (Red Matrix default)"
+msgid "Light (Hubzilla default)"
msgstr ""
#: ../../view/theme/redbasic/php/config.php:101
@@ -8917,7 +8917,7 @@ msgstr ""
#: ../../boot.php:1525
msgid ""
-"Create an account to access services and applications within the Red Matrix"
+"Create an account to access services and applications within the Hubzilla"
msgstr ""
#: ../../boot.php:1553
diff --git a/util/run_xgettext.sh b/util/run_xgettext.sh
index 3eca8a8b3..c85ab53df 100755
--- a/util/run_xgettext.sh
+++ b/util/run_xgettext.sh
@@ -65,12 +65,12 @@ then
sed -i "s/YEAR THE PACKAGE'S COPYRIGHT HOLDER//g" "$OUTFILE"
sed -i "s/FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.//g" "$OUTFILE"
sed -i "s/PACKAGE VERSION//g" "$OUTFILE"
- sed -i "s/PACKAGE/RedMatrix $ADDONNAME addon/g" "$OUTFILE"
+ sed -i "s/PACKAGE/Hubzilla $ADDONNAME addon/g" "$OUTFILE"
sed -i "s/CHARSET/UTF-8/g" "$OUTFILE"
sed -i '/^\"Plural-Forms/d' "$OUTFILE"
else
- sed -i "s/SOME DESCRIPTIVE TITLE./Red Matrix Project/g" "$OUTFILE"
- sed -i "s/YEAR THE PACKAGE'S COPYRIGHT HOLDER/2012-2014 the Red Matrix Project/g" "$OUTFILE"
+ sed -i "s/SOME DESCRIPTIVE TITLE./Hubzilla Project/g" "$OUTFILE"
+ sed -i "s/YEAR THE PACKAGE'S COPYRIGHT HOLDER/2012-2014 the Hubzilla Project/g" "$OUTFILE"
sed -i "s/FIRST AUTHOR <EMAIL@ADDRESS>, YEAR./Mike Macgirvin, 2012/g" "$OUTFILE"
sed -i "s/PACKAGE VERSION/$F9KVERSION/g" "$OUTFILE"
sed -i "s/PACKAGE/Red/g" "$OUTFILE"
diff --git a/util/shredder/ShredOAuth.sh b/util/shredder/ShredOAuth.sh
index f39d6f7c4..e21bea353 100755
--- a/util/shredder/ShredOAuth.sh
+++ b/util/shredder/ShredOAuth.sh
@@ -27,13 +27,13 @@ F_API_VERSION="1"
# Friendica API endpoints
-F_ACCOUNF_UPDATE_PROFILE_IMAGE="${redmatrix_url}/api/account/update_profile_image"
-F_STATUSES_UPDATE="${redmatrix_url}/api/statuses/update"
-F_STATUSES_HOME_TIMELINE="${redmatrix_url}/api/statuses/home_timeline"
+F_ACCOUNF_UPDATE_PROFILE_IMAGE="${hubzilla_url}/api/account/update_profile_image"
+F_STATUSES_UPDATE="${hubzilla_url}/api/statuses/update"
+F_STATUSES_HOME_TIMELINE="${hubzilla_url}/api/statuses/home_timeline"
-F_REQUESF_TOKEN=${redmatrix_url}'/api/oauth/request_token'
-F_ACCESS_TOKEN=${redmatrix_url}'/api/oauth/access_token'
-F_AUTHORIZE_TOKEN=${redmatrix_url}'/api/oauth/authorize'
+F_REQUESF_TOKEN=${hubzilla_url}'/api/oauth/request_token'
+F_ACCESS_TOKEN=${hubzilla_url}'/api/oauth/access_token'
+F_AUTHORIZE_TOKEN=${hubzilla_url}'/api/oauth/authorize'
# Source OAuth.sh
@@ -76,7 +76,7 @@ FO_access_token_helper () {
# Request Token
- local auth_header="$(_OAuth_authorization_header 'Authorization' "$redmatrix_url/" "$oauth_consumer_key" "$oauth_consumer_secret" '' '' "$oauth_signature_method" "$oauth_version" "$(OAuth_nonce)" "$(OAuth_timestamp)" 'POST' "$F_REQUESF_TOKEN" "$(OAuth_param 'oauth_callback' 'oob')"), $(OAuth_param_quote 'oauth_callback' 'oob')"
+ local auth_header="$(_OAuth_authorization_header 'Authorization' "$hubzilla_url/" "$oauth_consumer_key" "$oauth_consumer_secret" '' '' "$oauth_signature_method" "$oauth_version" "$(OAuth_nonce)" "$(OAuth_timestamp)" 'POST' "$F_REQUESF_TOKEN" "$(OAuth_param 'oauth_callback' 'oob')"), $(OAuth_param_quote 'oauth_callback' 'oob')"
# echo $auth_header
# echo $F_REQUESF_TOKEN
@@ -95,7 +95,7 @@ FO_access_token_helper () {
# Access Token
- local auth_header="$(_OAuth_authorization_header 'Authorization' "$redmatrix_url/" "$oauth_consumer_key" "$oauth_consumer_secret" "$_oauth_token" "$_oauth_token_secret" "$oauth_signature_method" "$oauth_version" "$(OAuth_nonce)" "$(OAuth_timestamp)" 'POST' "$F_ACCESS_TOKEN" "$(OAuth_param 'oauth_verifier' "$PIN")"), $(OAuth_param_quote 'oauth_verifier' "$PIN")"
+ local auth_header="$(_OAuth_authorization_header 'Authorization' "$hubzilla_url/" "$oauth_consumer_key" "$oauth_consumer_secret" "$_oauth_token" "$_oauth_token_secret" "$oauth_signature_method" "$oauth_version" "$(OAuth_nonce)" "$(OAuth_timestamp)" 'POST' "$F_ACCESS_TOKEN" "$(OAuth_param 'oauth_verifier' "$PIN")"), $(OAuth_param_quote 'oauth_verifier' "$PIN")"
resp=$(curl -s -d "" -H "$auth_header" "$F_ACCESS_TOKEN")
FO_rval=$?
@@ -133,7 +133,7 @@ FO_statuses_update () {
[[ "$3" != "" ]] && params[${#params[@]}]=$(OAuth_param 'in_reply_to_status_id' "$3") && local in_reply_to_status_id=( '--data-urlencode' "in_reply_to_status_id=$3" )
- local auth_header=$(OAuth_authorization_header 'Authorization' "$redmatrix_url" '' '' 'POST' "$F_STATUSES_UPDATE.$format" ${params[@]})
+ local auth_header=$(OAuth_authorization_header 'Authorization' "$hubzilla_url" '' '' 'POST' "$F_STATUSES_UPDATE.$format" ${params[@]})
FO_ret=$(curl -s -H "$auth_header" --data-urlencode "status=$2" --data-urlencode "source=shred" ${in_reply_to_status_id[@]} "$F_STATUSES_UPDATE.$format")
@@ -163,7 +163,7 @@ FO_statuses_home_timeline () {
$(OAuth_param 'count' $count)
)
- local auth_header=$(OAuth_authorization_header 'Authorization' "$redmatrix_url" '' '' 'GET' "$F_STATUSES_HOME_TIMELINE.$format" ${params[@]})
+ local auth_header=$(OAuth_authorization_header 'Authorization' "$hubzilla_url" '' '' 'GET' "$F_STATUSES_HOME_TIMELINE.$format" ${params[@]})
convscreen=$(OAuth_PE "$screen_name");
FO_ret=$(curl -s --get "${F_STATUSES_HOME_TIMELINE}.${format}" --data "screen_name=${convscreen}&count=${count}" --header "${auth_header}")
@@ -204,12 +204,12 @@ FO_command () {
local auth_header='';
if [ "$post" == '1' ]; then
- auth_header=$(OAuth_authorization_header 'Authorization' "$redmatrix_url" '' '' 'POST' "${redmatrix_url}/api/${command}.json" ${params[@]})
- FO_ret=$(curl -s "${redmatrix_url}/api/${command}.json" --data-urlencode "${data}" --header "${auth_header}")
+ auth_header=$(OAuth_authorization_header 'Authorization' "$hubzilla_url" '' '' 'POST' "${hubzilla_url}/api/${command}.json" ${params[@]})
+ FO_ret=$(curl -s "${hubzilla_url}/api/${command}.json" --data-urlencode "${data}" --header "${auth_header}")
else
- auth_header=$(OAuth_authorization_header 'Authorization' "$redmatrix_url" '' '' 'GET' "${redmatrix_url}/api/${command}.json" ${params[@]})
- FO_ret=$(curl -s --get "${redmatrix_url}/api/${command}.json" --data "${data}" --header "${auth_header}")
+ auth_header=$(OAuth_authorization_header 'Authorization' "$hubzilla_url" '' '' 'GET' "${hubzilla_url}/api/${command}.json" ${params[@]})
+ FO_ret=$(curl -s --get "${hubzilla_url}/api/${command}.json" --data "${data}" --header "${auth_header}")
fi
diff --git a/util/shredder/shredder b/util/shredder/shredder
index ac84f0541..61e6b1fd4 100755
--- a/util/shredder/shredder
+++ b/util/shredder/shredder
@@ -45,7 +45,7 @@ Use -h -c command to get options for the command.
show_config_help () {
echo "Please create $FCLI_RC with:
-redmatrix_url=YOR_SERVER_URL (no trailing /)
+hubzilla_url=YOR_SERVER_URL (no trailing /)
oauth_consumer_key=YOUR_CONSUMER_KEY
oauth_consumer_secret=YOUR_CONSUMER_SECRET
diff --git a/util/strings.php b/util/strings.php
index cfd6538e0..e3fdb6461 100644
--- a/util/strings.php
+++ b/util/strings.php
@@ -3,10 +3,382 @@
;
$a->strings["Cannot locate DNS info for database server '%s'"] = "";
$a->strings["Profile Photos"] = "";
-$a->strings["Embedded content"] = "";
-$a->strings["Embedding disabled"] = "";
+$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."] = "";
$a->strings["created a new post"] = "";
$a->strings["commented on %s's post"] = "";
+$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."] = "";
+$a->strings["Default privacy group for new contacts"] = "";
+$a->strings["All Channels"] = "";
+$a->strings["edit"] = "";
+$a->strings["Collections"] = "";
+$a->strings["Edit collection"] = "";
+$a->strings["Add new collection"] = "";
+$a->strings["Channels not in any collection"] = "";
+$a->strings["add"] = "";
+$a->strings["Not a valid email address"] = "";
+$a->strings["Your email domain is not among those allowed on this site"] = "";
+$a->strings["Your email address is already registered at this site."] = "";
+$a->strings["An invitation is required."] = "";
+$a->strings["Invitation could not be verified."] = "";
+$a->strings["Please enter the required information."] = "";
+$a->strings["Failed to store account information."] = "";
+$a->strings["Registration confirmation for %s"] = "";
+$a->strings["Registration request at %s"] = "";
+$a->strings["Administrator"] = "";
+$a->strings["your registration password"] = "";
+$a->strings["Registration details for %s"] = "";
+$a->strings["Account approved."] = "";
+$a->strings["Registration revoked for %s"] = "";
+$a->strings["Account verified. Please login."] = "";
+$a->strings["Click here to upgrade."] = "";
+$a->strings["This action exceeds the limits set by your subscription plan."] = "";
+$a->strings["This action is not available under your subscription plan."] = "";
+$a->strings["Miscellaneous"] = "";
+$a->strings["YYYY-MM-DD or MM-DD"] = "";
+$a->strings["Required"] = "";
+$a->strings["never"] = "";
+$a->strings["less than a second ago"] = "";
+$a->strings["year"] = "";
+$a->strings["years"] = "";
+$a->strings["month"] = "";
+$a->strings["months"] = "";
+$a->strings["week"] = "";
+$a->strings["weeks"] = "";
+$a->strings["day"] = "";
+$a->strings["days"] = "";
+$a->strings["hour"] = "";
+$a->strings["hours"] = "";
+$a->strings["minute"] = "";
+$a->strings["minutes"] = "";
+$a->strings["second"] = "";
+$a->strings["seconds"] = "";
+$a->strings["__ctx:e.g. 22 hours ago, 1 minute ago__ %1\$d %2\$s ago"] = "";
+$a->strings["%1\$s's birthday"] = "";
+$a->strings["Happy Birthday %1\$s"] = "";
+$a->strings["New Page"] = "";
+$a->strings["Edit"] = "";
+$a->strings["View"] = "";
+$a->strings["Preview"] = "";
+$a->strings["Actions"] = "";
+$a->strings["Page Link"] = "";
+$a->strings["Title"] = "";
+$a->strings["Created"] = "";
+$a->strings["Edited"] = "";
+$a->strings["Public Timeline"] = "";
+$a->strings["Default"] = "";
+$a->strings["Directory Options"] = "";
+$a->strings["Alphabetic"] = "";
+$a->strings["Reverse Alphabetic"] = "";
+$a->strings["Newest to Oldest"] = "";
+$a->strings["Oldest to Newest"] = "";
+$a->strings["Sort"] = "";
+$a->strings["Safe Mode"] = "";
+$a->strings["Public Forums Only"] = "";
+$a->strings["This Website Only"] = "";
+$a->strings["l F d, Y \\@ g:i A"] = "";
+$a->strings["Starts:"] = "";
+$a->strings["Finishes:"] = "";
+$a->strings["Location:"] = "";
+$a->strings["This event has been added to your calendar."] = "";
+$a->strings["Delete this item?"] = "";
+$a->strings["Comment"] = "";
+$a->strings["[+] show all"] = "";
+$a->strings["[-] show less"] = "";
+$a->strings["[+] expand"] = "";
+$a->strings["[-] collapse"] = "";
+$a->strings["Password too short"] = "";
+$a->strings["Passwords do not match"] = "";
+$a->strings["everybody"] = "";
+$a->strings["Secret Passphrase"] = "";
+$a->strings["Passphrase hint"] = "";
+$a->strings["Notice: Permissions have changed but have not yet been submitted."] = "";
+$a->strings["close all"] = "";
+$a->strings["Nothing new here"] = "";
+$a->strings["Rate This Channel (this is public)"] = "";
+$a->strings["Rating"] = "";
+$a->strings["Describe (optional)"] = "";
+$a->strings["Submit"] = "";
+$a->strings["Please enter a link URL"] = "";
+$a->strings["Unsaved changes. Are you sure you wish to leave this page?"] = "";
+$a->strings["timeago.prefixAgo"] = "";
+$a->strings["timeago.prefixFromNow"] = "";
+$a->strings["ago"] = "";
+$a->strings["from now"] = "";
+$a->strings["less than a minute"] = "";
+$a->strings["about a minute"] = "";
+$a->strings["%d minutes"] = "";
+$a->strings["about an hour"] = "";
+$a->strings["about %d hours"] = "";
+$a->strings["a day"] = "";
+$a->strings["%d days"] = "";
+$a->strings["about a month"] = "";
+$a->strings["%d months"] = "";
+$a->strings["about a year"] = "";
+$a->strings["%d years"] = "";
+$a->strings[" "] = "";
+$a->strings["timeago.numbers"] = "";
+$a->strings["parent"] = "";
+$a->strings["Collection"] = "";
+$a->strings["Principal"] = "";
+$a->strings["Addressbook"] = "";
+$a->strings["Calendar"] = "";
+$a->strings["Schedule Inbox"] = "";
+$a->strings["Schedule Outbox"] = "";
+$a->strings["Unknown"] = "";
+$a->strings["%1\$s used"] = "";
+$a->strings["%1\$s used of %2\$s (%3\$s&#37;)"] = "";
+$a->strings["Files"] = "";
+$a->strings["Total"] = "";
+$a->strings["Shared"] = "";
+$a->strings["Create"] = "";
+$a->strings["Upload"] = "";
+$a->strings["Name"] = "";
+$a->strings["Type"] = "";
+$a->strings["Size"] = "";
+$a->strings["Last Modified"] = "";
+$a->strings["Delete"] = "";
+$a->strings["Create new folder"] = "";
+$a->strings["Upload file"] = "";
+$a->strings["%1\$s's bookmarks"] = "";
+$a->strings["view full size"] = "";
+$a->strings["General Features"] = "";
+$a->strings["Content Expiration"] = "";
+$a->strings["Remove posts/comments and/or private messages at a future time"] = "";
+$a->strings["Multiple Profiles"] = "";
+$a->strings["Ability to create multiple profiles"] = "";
+$a->strings["Advanced Profiles"] = "";
+$a->strings["Additional profile sections and selections"] = "";
+$a->strings["Profile Import/Export"] = "";
+$a->strings["Save and load profile details across sites/channels"] = "";
+$a->strings["Web Pages"] = "";
+$a->strings["Provide managed web pages on your channel"] = "";
+$a->strings["Private Notes"] = "";
+$a->strings["Enables a tool to store notes and reminders"] = "";
+$a->strings["Navigation Channel Select"] = "";
+$a->strings["Change channels directly from within the navigation dropdown menu"] = "";
+$a->strings["Photo Location"] = "";
+$a->strings["If location data is available on uploaded photos, link this to a map."] = "";
+$a->strings["Expert Mode"] = "";
+$a->strings["Enable Expert Mode to provide advanced configuration options"] = "";
+$a->strings["Premium Channel"] = "";
+$a->strings["Allows you to set restrictions and terms on those that connect with your channel"] = "";
+$a->strings["Post Composition Features"] = "";
+$a->strings["Use Markdown"] = "";
+$a->strings["Allow use of \"Markdown\" to format posts"] = "";
+$a->strings["Large Photos"] = "";
+$a->strings["Include large (640px) photo thumbnails in posts. If not enabled, use small (320px) photo thumbnails"] = "";
+$a->strings["Channel Sources"] = "";
+$a->strings["Automatically import channel content from other channels or feeds"] = "";
+$a->strings["Even More Encryption"] = "";
+$a->strings["Allow optional encryption of content end-to-end with a shared secret key"] = "";
+$a->strings["Enable voting tools"] = "";
+$a->strings["Provide a class of post which others can vote on"] = "";
+$a->strings["Network and Stream Filtering"] = "";
+$a->strings["Search by Date"] = "";
+$a->strings["Ability to select posts by date ranges"] = "";
+$a->strings["Collections Filter"] = "";
+$a->strings["Enable widget to display Network posts only from selected collections"] = "";
+$a->strings["Saved Searches"] = "";
+$a->strings["Save search terms for re-use"] = "";
+$a->strings["Network Personal Tab"] = "";
+$a->strings["Enable tab to display only Network posts that you've interacted on"] = "";
+$a->strings["Network New Tab"] = "";
+$a->strings["Enable tab to display all new Network activity"] = "";
+$a->strings["Affinity Tool"] = "";
+$a->strings["Filter stream activity by depth of relationships"] = "";
+$a->strings["Suggest Channels"] = "";
+$a->strings["Show channel suggestions"] = "";
+$a->strings["Post/Comment Tools"] = "";
+$a->strings["Tagging"] = "";
+$a->strings["Ability to tag existing posts"] = "";
+$a->strings["Post Categories"] = "";
+$a->strings["Add categories to your posts"] = "";
+$a->strings["Saved Folders"] = "";
+$a->strings["Ability to file posts under folders"] = "";
+$a->strings["Dislike Posts"] = "";
+$a->strings["Ability to dislike posts/comments"] = "";
+$a->strings["Star Posts"] = "";
+$a->strings["Ability to mark special posts with a star indicator"] = "";
+$a->strings["Tag Cloud"] = "";
+$a->strings["Provide a personal tag cloud on your channel page"] = "";
+$a->strings["Categories"] = "";
+$a->strings["Apps"] = "";
+$a->strings["System"] = "";
+$a->strings["Personal"] = "";
+$a->strings["Create Personal App"] = "";
+$a->strings["Edit Personal App"] = "";
+$a->strings["Connect"] = "";
+$a->strings["Ignore/Hide"] = "";
+$a->strings["Suggestions"] = "";
+$a->strings["See more..."] = "";
+$a->strings["You have %1$.0f of %2$.0f allowed connections."] = "";
+$a->strings["Add New Connection"] = "";
+$a->strings["Enter the channel address"] = "";
+$a->strings["Example: bob@example.com, http://example.com/barbara"] = "";
+$a->strings["Notes"] = "";
+$a->strings["Save"] = "";
+$a->strings["Remove term"] = "";
+$a->strings["Everything"] = "";
+$a->strings["Archives"] = "";
+$a->strings["Me"] = "";
+$a->strings["Family"] = "";
+$a->strings["Friends"] = "";
+$a->strings["Acquaintances"] = "";
+$a->strings["All"] = "";
+$a->strings["Refresh"] = "";
+$a->strings["Account settings"] = "";
+$a->strings["Channel settings"] = "";
+$a->strings["Additional features"] = "";
+$a->strings["Feature/Addon settings"] = "";
+$a->strings["Display settings"] = "";
+$a->strings["Connected apps"] = "";
+$a->strings["Export channel"] = "";
+$a->strings["Connection Default Permissions"] = "";
+$a->strings["Premium Channel Settings"] = "";
+$a->strings["Settings"] = "";
+$a->strings["Messages"] = "";
+$a->strings["Check Mail"] = "";
+$a->strings["New Message"] = "";
+$a->strings["Chat Rooms"] = "";
+$a->strings["Bookmarked Chatrooms"] = "";
+$a->strings["Suggested Chatrooms"] = "";
+$a->strings["photo/image"] = "";
+$a->strings["Rate Me"] = "";
+$a->strings["View Ratings"] = "";
+$a->strings["Public Hubs"] = "";
+$a->strings["\$Projectname Notification"] = "";
+$a->strings["\$projectname"] = "";
+$a->strings["Thank You,"] = "";
+$a->strings["%s Administrator"] = "";
+$a->strings["%s <!item_type!>"] = "";
+$a->strings["[Red:Notify] New mail received at %s"] = "";
+$a->strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "";
+$a->strings["%1\$s sent you %2\$s."] = "";
+$a->strings["a private message"] = "";
+$a->strings["Please visit %s to view and/or reply to your private messages."] = "";
+$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = "";
+$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "";
+$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "";
+$a->strings["[Red:Notify] Comment to conversation #%1\$d by %2\$s"] = "";
+$a->strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = "";
+$a->strings["Please visit %s to view and/or reply to the conversation."] = "";
+$a->strings["[Red:Notify] %s posted to your profile wall"] = "";
+$a->strings["%1\$s, %2\$s posted to your profile wall at %3\$s"] = "";
+$a->strings["%1\$s, %2\$s posted to [zrl=%3\$s]your wall[/zrl]"] = "";
+$a->strings["[Red:Notify] %s tagged you"] = "";
+$a->strings["%1\$s, %2\$s tagged you at %3\$s"] = "";
+$a->strings["%1\$s, %2\$s [zrl=%3\$s]tagged you[/zrl]."] = "";
+$a->strings["[Red:Notify] %1\$s poked you"] = "";
+$a->strings["%1\$s, %2\$s poked you at %3\$s"] = "";
+$a->strings["%1\$s, %2\$s [zrl=%2\$s]poked you[/zrl]."] = "";
+$a->strings["[Red:Notify] %s tagged your post"] = "";
+$a->strings["%1\$s, %2\$s tagged your post at %3\$s"] = "";
+$a->strings["%1\$s, %2\$s tagged [zrl=%3\$s]your post[/zrl]"] = "";
+$a->strings["[Red:Notify] Introduction received"] = "";
+$a->strings["%1\$s, you've received an new connection request from '%2\$s' at %3\$s"] = "";
+$a->strings["%1\$s, you've received [zrl=%2\$s]a new connection request[/zrl] from %3\$s."] = "";
+$a->strings["You may visit their profile at %s"] = "";
+$a->strings["Please visit %s to approve or reject the connection request."] = "";
+$a->strings["[Red:Notify] Friend suggestion received"] = "";
+$a->strings["%1\$s, you've received a friend suggestion from '%2\$s' at %3\$s"] = "";
+$a->strings["%1\$s, you've received [zrl=%2\$s]a friend suggestion[/zrl] for %3\$s from %4\$s."] = "";
+$a->strings["Name:"] = "";
+$a->strings["Photo:"] = "";
+$a->strings["Please visit %s to approve or reject the suggestion."] = "";
+$a->strings["[Red:Notify]"] = "";
+$a->strings["Frequently"] = "";
+$a->strings["Hourly"] = "";
+$a->strings["Twice daily"] = "";
+$a->strings["Daily"] = "";
+$a->strings["Weekly"] = "";
+$a->strings["Monthly"] = "";
+$a->strings["Friendica"] = "";
+$a->strings["OStatus"] = "";
+$a->strings["RSS/Atom"] = "";
+$a->strings["Email"] = "";
+$a->strings["Diaspora"] = "";
+$a->strings["Facebook"] = "";
+$a->strings["Zot!"] = "";
+$a->strings["LinkedIn"] = "";
+$a->strings["XMPP/IM"] = "";
+$a->strings["MySpace"] = "";
+$a->strings["No recipient provided."] = "";
+$a->strings["[no subject]"] = "";
+$a->strings["Unable to determine sender."] = "";
+$a->strings["Stored post could not be verified."] = "";
+$a->strings["Channel is blocked on this site."] = "";
+$a->strings["Channel location missing."] = "";
+$a->strings["Response from remote channel was incomplete."] = "";
+$a->strings["Channel was deleted and no longer exists."] = "";
+$a->strings["Protocol disabled."] = "";
+$a->strings["Channel discovery failed."] = "";
+$a->strings["local account not found."] = "";
+$a->strings["Cannot connect to yourself."] = "";
+$a->strings["Private Message"] = "";
+$a->strings["Select"] = "";
+$a->strings["Save to Folder"] = "";
+$a->strings["I will attend"] = "";
+$a->strings["I will not attend"] = "";
+$a->strings["I might attend"] = "";
+$a->strings["I agree"] = "";
+$a->strings["I disagree"] = "";
+$a->strings["I abstain"] = "";
+$a->strings["View all"] = "";
+$a->strings["__ctx:noun__ Like"] = array(
+ 0 => "",
+ 1 => "",
+);
+$a->strings["__ctx:noun__ Dislike"] = array(
+ 0 => "",
+ 1 => "",
+);
+$a->strings["Add Star"] = "";
+$a->strings["Remove Star"] = "";
+$a->strings["Toggle Star Status"] = "";
+$a->strings["starred"] = "";
+$a->strings["Message signature validated"] = "";
+$a->strings["Message signature incorrect"] = "";
+$a->strings["Add Tag"] = "";
+$a->strings["I like this (toggle)"] = "";
+$a->strings["like"] = "";
+$a->strings["I don't like this (toggle)"] = "";
+$a->strings["dislike"] = "";
+$a->strings["Share This"] = "";
+$a->strings["share"] = "";
+$a->strings["%d comment"] = array(
+ 0 => "",
+ 1 => "",
+);
+$a->strings["View %s's profile - %s"] = "";
+$a->strings["to"] = "";
+$a->strings["via"] = "";
+$a->strings["Wall-to-Wall"] = "";
+$a->strings["via Wall-To-Wall:"] = "";
+$a->strings["from %s"] = "";
+$a->strings["last edited: %s"] = "";
+$a->strings["Expires: %s"] = "";
+$a->strings["Save Bookmarks"] = "";
+$a->strings["Add to Calendar"] = "";
+$a->strings["Mark all seen"] = "";
+$a->strings["__ctx:noun__ Likes"] = "";
+$a->strings["__ctx:noun__ Dislikes"] = "";
+$a->strings["Close"] = "";
+$a->strings["Please wait"] = "";
+$a->strings["This is you"] = "";
+$a->strings["Bold"] = "";
+$a->strings["Italic"] = "";
+$a->strings["Underline"] = "";
+$a->strings["Quote"] = "";
+$a->strings["Code"] = "";
+$a->strings["Image"] = "";
+$a->strings["Insert Link"] = "";
+$a->strings["Video"] = "";
+$a->strings["Encrypt text"] = "";
+$a->strings["New window"] = "";
+$a->strings["Open the selected location in a different window or browser tab"] = "";
+$a->strings["User '%s' deleted"] = "";
+$a->strings["Attachments:"] = "";
+$a->strings["\$Projectname event notification:"] = "";
$a->strings["prev"] = "";
$a->strings["first"] = "";
$a->strings["last"] = "";
@@ -20,7 +392,6 @@ $a->strings["%d Connection"] = array(
);
$a->strings["View Connections"] = "";
$a->strings["Search"] = "";
-$a->strings["Save"] = "";
$a->strings["poke"] = "";
$a->strings["poked"] = "";
$a->strings["ping"] = "";
@@ -79,84 +450,21 @@ $a->strings["remove category"] = "";
$a->strings["remove from file"] = "";
$a->strings["Click to open/close"] = "";
$a->strings["Link to Source"] = "";
-$a->strings["Select a page layout: "] = "";
$a->strings["default"] = "";
-$a->strings["Page content type: "] = "";
+$a->strings["Page layout"] = "";
+$a->strings["You can create your own with the layouts tool"] = "";
+$a->strings["Page content type"] = "";
$a->strings["Select an alternate language"] = "";
$a->strings["photo"] = "";
$a->strings["event"] = "";
$a->strings["status"] = "";
$a->strings["comment"] = "";
$a->strings["activity"] = "";
-$a->strings["Design"] = "";
+$a->strings["Design Tools"] = "";
$a->strings["Blocks"] = "";
$a->strings["Menus"] = "";
$a->strings["Layouts"] = "";
$a->strings["Pages"] = "";
-$a->strings["New Page"] = "";
-$a->strings["Edit"] = "";
-$a->strings["View"] = "";
-$a->strings["Preview"] = "";
-$a->strings["Actions"] = "";
-$a->strings["Page Link"] = "";
-$a->strings["Title"] = "";
-$a->strings["Created"] = "";
-$a->strings["Edited"] = "";
-$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."] = "";
-$a->strings["Not a valid email address"] = "";
-$a->strings["Your email domain is not among those allowed on this site"] = "";
-$a->strings["Your email address is already registered at this site."] = "";
-$a->strings["An invitation is required."] = "";
-$a->strings["Invitation could not be verified."] = "";
-$a->strings["Please enter the required information."] = "";
-$a->strings["Failed to store account information."] = "";
-$a->strings["Registration confirmation for %s"] = "";
-$a->strings["Registration request at %s"] = "";
-$a->strings["Administrator"] = "";
-$a->strings["your registration password"] = "";
-$a->strings["Registration details for %s"] = "";
-$a->strings["Account approved."] = "";
-$a->strings["Registration revoked for %s"] = "";
-$a->strings["Account verified. Please login."] = "";
-$a->strings["Permission denied."] = "";
-$a->strings["Image exceeds website size limit of %lu bytes"] = "";
-$a->strings["Image file is empty."] = "";
-$a->strings["Unable to process image"] = "";
-$a->strings["Photo storage failed."] = "";
-$a->strings["Photo Albums"] = "";
-$a->strings["Upload New Photos"] = "";
-$a->strings["Visible to everybody"] = "";
-$a->strings["Show"] = "";
-$a->strings["Don't show"] = "";
-$a->strings["Permissions"] = "";
-$a->strings["Close"] = "";
-$a->strings[" and "] = "";
-$a->strings["public profile"] = "";
-$a->strings["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "";
-$a->strings["Visit %1\$s's %2\$s"] = "";
-$a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "";
-$a->strings["Public Timeline"] = "";
-$a->strings["Item was not found."] = "";
-$a->strings["No source file."] = "";
-$a->strings["Cannot locate file to replace"] = "";
-$a->strings["Cannot locate file to revise/update"] = "";
-$a->strings["File exceeds size limit of %d"] = "";
-$a->strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "";
-$a->strings["File upload failed. Possible system limit or action terminated."] = "";
-$a->strings["Stored file could not be verified. Upload failed."] = "";
-$a->strings["Path not available."] = "";
-$a->strings["Empty pathname"] = "";
-$a->strings["duplicate filename or path"] = "";
-$a->strings["Path not found."] = "";
-$a->strings["mkdir failed."] = "";
-$a->strings["database storage failed."] = "";
-$a->strings["Click here to upgrade."] = "";
-$a->strings["This action exceeds the limits set by your subscription plan."] = "";
-$a->strings["This action is not available under your subscription plan."] = "";
-$a->strings["l F d, Y \\@ g:i A"] = "";
-$a->strings["Starts:"] = "";
-$a->strings["Finishes:"] = "";
-$a->strings["Location:"] = "";
$a->strings["Logout"] = "";
$a->strings["End this session"] = "";
$a->strings["Home"] = "";
@@ -169,7 +477,6 @@ $a->strings["Edit Profile"] = "";
$a->strings["Edit your profile"] = "";
$a->strings["Photos"] = "";
$a->strings["Your photos"] = "";
-$a->strings["Files"] = "";
$a->strings["Your files"] = "";
$a->strings["Chat"] = "";
$a->strings["Your chatrooms"] = "";
@@ -180,17 +487,17 @@ $a->strings["Your webpages"] = "";
$a->strings["Login"] = "";
$a->strings["Sign in"] = "";
$a->strings["%s - click to logout"] = "";
+$a->strings["Remote authentication"] = "";
$a->strings["Click to authenticate to your home hub"] = "";
$a->strings["Home Page"] = "";
$a->strings["Register"] = "";
$a->strings["Create an account"] = "";
$a->strings["Help"] = "";
$a->strings["Help and documentation"] = "";
-$a->strings["Apps"] = "";
$a->strings["Applications, utilities, links, games"] = "";
$a->strings["Search site content"] = "";
$a->strings["Directory"] = "";
-$a->strings["Channel Locator"] = "";
+$a->strings["Channel Directory"] = "";
$a->strings["Matrix"] = "";
$a->strings["Your matrix"] = "";
$a->strings["Mark all matrix notifications seen"] = "";
@@ -208,183 +515,100 @@ $a->strings["See all private messages"] = "";
$a->strings["Mark all private messages seen"] = "";
$a->strings["Inbox"] = "";
$a->strings["Outbox"] = "";
-$a->strings["New Message"] = "";
$a->strings["Events"] = "";
$a->strings["Event Calendar"] = "";
$a->strings["See all events"] = "";
$a->strings["Mark all events seen"] = "";
-$a->strings["Channel Select"] = "";
+$a->strings["Channel Manager"] = "";
$a->strings["Manage Your Channels"] = "";
-$a->strings["Settings"] = "";
$a->strings["Account/Channel Settings"] = "";
$a->strings["Admin"] = "";
$a->strings["Site Setup and Configuration"] = "";
-$a->strings["Nothing new here"] = "";
+$a->strings["Loading..."] = "";
+$a->strings["@name, #tag, content"] = "";
$a->strings["Please wait..."] = "";
-$a->strings["%1\$s's bookmarks"] = "";
$a->strings["Tags"] = "";
$a->strings["Keywords"] = "";
$a->strings["have"] = "";
$a->strings["has"] = "";
$a->strings["want"] = "";
$a->strings["wants"] = "";
-$a->strings["like"] = "";
$a->strings["likes"] = "";
-$a->strings["dislike"] = "";
$a->strings["dislikes"] = "";
-$a->strings["__ctx:noun__ Like"] = array(
- 0 => "",
- 1 => "",
-);
-$a->strings["Default"] = "";
-$a->strings["Frequently"] = "";
-$a->strings["Hourly"] = "";
-$a->strings["Twice daily"] = "";
-$a->strings["Daily"] = "";
-$a->strings["Weekly"] = "";
-$a->strings["Monthly"] = "";
-$a->strings["Friendica"] = "";
-$a->strings["OStatus"] = "";
-$a->strings["RSS/Atom"] = "";
-$a->strings["Email"] = "";
-$a->strings["Diaspora"] = "";
-$a->strings["Facebook"] = "";
-$a->strings["Zot!"] = "";
-$a->strings["LinkedIn"] = "";
-$a->strings["XMPP/IM"] = "";
-$a->strings["MySpace"] = "";
-$a->strings["%d invitation available"] = array(
- 0 => "",
- 1 => "",
-);
-$a->strings["Advanced"] = "";
-$a->strings["Find Channels"] = "";
-$a->strings["Enter name or interest"] = "";
-$a->strings["Connect/Follow"] = "";
-$a->strings["Examples: Robert Morgenstein, Fishing"] = "";
-$a->strings["Find"] = "";
-$a->strings["Channel Suggestions"] = "";
-$a->strings["Random Profile"] = "";
-$a->strings["Invite Friends"] = "";
-$a->strings["Exammple: name=fred and country=iceland"] = "";
-$a->strings["Advanced Find"] = "";
-$a->strings["Saved Folders"] = "";
-$a->strings["Everything"] = "";
-$a->strings["Categories"] = "";
-$a->strings["%d connection in common"] = array(
- 0 => "",
- 1 => "",
-);
-$a->strings["show more"] = "";
-$a->strings["This event has been added to your calendar."] = "";
-$a->strings["Invalid data packet"] = "";
-$a->strings["Unable to verify channel signature"] = "";
-$a->strings["Unable to verify site signature for %s"] = "";
-$a->strings["Miscellaneous"] = "";
-$a->strings["year"] = "";
-$a->strings["month"] = "";
-$a->strings["day"] = "";
-$a->strings["never"] = "";
-$a->strings["less than a second ago"] = "";
-$a->strings["years"] = "";
-$a->strings["months"] = "";
-$a->strings["week"] = "";
-$a->strings["weeks"] = "";
-$a->strings["days"] = "";
-$a->strings["hour"] = "";
-$a->strings["hours"] = "";
-$a->strings["minute"] = "";
-$a->strings["minutes"] = "";
-$a->strings["second"] = "";
-$a->strings["seconds"] = "";
-$a->strings["%1\$d %2\$s ago"] = "";
-$a->strings["%1\$s's birthday"] = "";
-$a->strings["Happy Birthday %1\$s"] = "";
-$a->strings["Sort Options"] = "";
-$a->strings["Alphabetic"] = "";
-$a->strings["Reverse Alphabetic"] = "";
-$a->strings["Newest to Oldest"] = "";
-$a->strings["Enable Safe Search"] = "";
-$a->strings["Disable Safe Search"] = "";
-$a->strings["Safe Mode"] = "";
-$a->strings["Red Matrix Notification"] = "";
-$a->strings["redmatrix"] = "";
-$a->strings["Thank You,"] = "";
-$a->strings["%s Administrator"] = "";
-$a->strings["%s <!item_type!>"] = "";
-$a->strings["[Red:Notify] New mail received at %s"] = "";
-$a->strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "";
-$a->strings["%1\$s sent you %2\$s."] = "";
-$a->strings["a private message"] = "";
-$a->strings["Please visit %s to view and/or reply to your private messages."] = "";
-$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = "";
-$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "";
-$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "";
-$a->strings["[Red:Notify] Comment to conversation #%1\$d by %2\$s"] = "";
-$a->strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = "";
-$a->strings["Please visit %s to view and/or reply to the conversation."] = "";
-$a->strings["[Red:Notify] %s posted to your profile wall"] = "";
-$a->strings["%1\$s, %2\$s posted to your profile wall at %3\$s"] = "";
-$a->strings["%1\$s, %2\$s posted to [zrl=%3\$s]your wall[/zrl]"] = "";
-$a->strings["[Red:Notify] %s tagged you"] = "";
-$a->strings["%1\$s, %2\$s tagged you at %3\$s"] = "";
-$a->strings["%1\$s, %2\$s [zrl=%3\$s]tagged you[/zrl]."] = "";
-$a->strings["[Red:Notify] %1\$s poked you"] = "";
-$a->strings["%1\$s, %2\$s poked you at %3\$s"] = "";
-$a->strings["%1\$s, %2\$s [zrl=%2\$s]poked you[/zrl]."] = "";
-$a->strings["[Red:Notify] %s tagged your post"] = "";
-$a->strings["%1\$s, %2\$s tagged your post at %3\$s"] = "";
-$a->strings["%1\$s, %2\$s tagged [zrl=%3\$s]your post[/zrl]"] = "";
-$a->strings["[Red:Notify] Introduction received"] = "";
-$a->strings["%1\$s, you've received an new connection request from '%2\$s' at %3\$s"] = "";
-$a->strings["%1\$s, you've received [zrl=%2\$s]a new connection request[/zrl] from %3\$s."] = "";
-$a->strings["You may visit their profile at %s"] = "";
-$a->strings["Please visit %s to approve or reject the connection request."] = "";
-$a->strings["[Red:Notify] Friend suggestion received"] = "";
-$a->strings["%1\$s, you've received a friend suggestion from '%2\$s' at %3\$s"] = "";
-$a->strings["%1\$s, you've received [zrl=%2\$s]a friend suggestion[/zrl] for %3\$s from %4\$s."] = "";
-$a->strings["Name:"] = "";
-$a->strings["Photo:"] = "";
-$a->strings["Please visit %s to approve or reject the suggestion."] = "";
-$a->strings["parent"] = "";
-$a->strings["Collection"] = "";
-$a->strings["Principal"] = "";
-$a->strings["Addressbook"] = "";
-$a->strings["Calendar"] = "";
-$a->strings["Schedule Inbox"] = "";
-$a->strings["Schedule Outbox"] = "";
-$a->strings["Unknown"] = "";
-$a->strings["%1\$s used"] = "";
-$a->strings["%1\$s used of %2\$s (%3\$s&#37;)"] = "";
-$a->strings["Name"] = "";
-$a->strings["Type"] = "";
-$a->strings["Size"] = "";
-$a->strings["Last Modified"] = "";
-$a->strings["Delete"] = "";
-$a->strings["Total"] = "";
-$a->strings["Create new folder"] = "";
-$a->strings["Create"] = "";
-$a->strings["Upload file"] = "";
-$a->strings["Upload"] = "";
+$a->strings[" and "] = "";
+$a->strings["public profile"] = "";
+$a->strings["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "";
+$a->strings["Visit %1\$s's %2\$s"] = "";
+$a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "";
+$a->strings["Permission denied"] = "";
+$a->strings["(Unknown)"] = "";
+$a->strings["Visible to anybody on the internet."] = "";
+$a->strings["Visible to you only."] = "";
+$a->strings["Visible to anybody in this network."] = "";
+$a->strings["Visible to anybody authenticated."] = "";
+$a->strings["Visible to anybody on %s."] = "";
+$a->strings["Visible to all connections."] = "";
+$a->strings["Visible to approved connections."] = "";
+$a->strings["Visible to specific connections."] = "";
+$a->strings["Item not found."] = "";
+$a->strings["Permission denied."] = "";
+$a->strings["Collection not found."] = "";
+$a->strings["Collection is empty."] = "";
+$a->strings["Collection: %s"] = "";
+$a->strings["Connection: %s"] = "";
+$a->strings["Connection not found."] = "";
+$a->strings["Can view my normal stream and posts"] = "";
+$a->strings["Can view my default channel profile"] = "";
+$a->strings["Can view my photo albums"] = "";
+$a->strings["Can view my connections"] = "";
+$a->strings["Can view my file storage"] = "";
+$a->strings["Can view my webpages"] = "";
+$a->strings["Can send me their channel stream and posts"] = "";
+$a->strings["Can post on my channel page (\"wall\")"] = "";
+$a->strings["Can comment on or like my posts"] = "";
+$a->strings["Can send me private mail messages"] = "";
+$a->strings["Can post photos to my photo albums"] = "";
+$a->strings["Can like/dislike stuff"] = "";
+$a->strings["Profiles and things other than posts/comments"] = "";
+$a->strings["Can forward to all my channel contacts via post @mentions"] = "";
+$a->strings["Advanced - useful for creating group forum channels"] = "";
+$a->strings["Can chat with me (when available)"] = "";
+$a->strings["Can write to my file storage"] = "";
+$a->strings["Can edit my webpages"] = "";
+$a->strings["Can source my public posts in derived channels"] = "";
+$a->strings["Somewhat advanced - very useful in open communities"] = "";
+$a->strings["Can administer my channel resources"] = "";
+$a->strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "";
+$a->strings["Social Networking"] = "";
+$a->strings["Mostly Public"] = "";
+$a->strings["Restricted"] = "";
+$a->strings["Private"] = "";
+$a->strings["Community Forum"] = "";
+$a->strings["Feed Republish"] = "";
+$a->strings["Special Purpose"] = "";
+$a->strings["Celebrity/Soapbox"] = "";
+$a->strings["Group Repository"] = "";
+$a->strings["Other"] = "";
+$a->strings["Custom/Expert Mode"] = "";
$a->strings["channel"] = "";
$a->strings["%1\$s likes %2\$s's %3\$s"] = "";
$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "";
$a->strings["%1\$s is now connected with %2\$s"] = "";
$a->strings["%1\$s poked %2\$s"] = "";
$a->strings["__ctx:mood__ %1\$s is %2\$s"] = "";
-$a->strings["Select"] = "";
-$a->strings["Private Message"] = "";
-$a->strings["Message is verified"] = "";
+$a->strings["__ctx:title__ Likes"] = "";
+$a->strings["__ctx:title__ Dislikes"] = "";
+$a->strings["__ctx:title__ Agree"] = "";
+$a->strings["__ctx:title__ Disagree"] = "";
+$a->strings["__ctx:title__ Abstain"] = "";
+$a->strings["__ctx:title__ Attending"] = "";
+$a->strings["__ctx:title__ Not attending"] = "";
+$a->strings["__ctx:title__ Might attend"] = "";
$a->strings["View %s's profile @ %s"] = "";
$a->strings["Categories:"] = "";
$a->strings["Filed under:"] = "";
-$a->strings[" from %s"] = "";
-$a->strings["last edited: %s"] = "";
-$a->strings["Expires: %s"] = "";
$a->strings["View in context"] = "";
-$a->strings["Please wait"] = "";
$a->strings["remove"] = "";
-$a->strings["Loading..."] = "";
$a->strings["Delete Selected Items"] = "";
$a->strings["View Source"] = "";
$a->strings["Follow Thread"] = "";
@@ -420,7 +644,7 @@ $a->strings["Save to Folder:"] = "";
$a->strings["Where are you right now?"] = "";
$a->strings["Expires YYYY-MM-DD HH:MM"] = "";
$a->strings["Share"] = "";
-$a->strings["Page link title"] = "";
+$a->strings["Page link name"] = "";
$a->strings["Post as"] = "";
$a->strings["Upload photo"] = "";
$a->strings["upload photo"] = "";
@@ -434,16 +658,16 @@ $a->strings["Insert audio link"] = "";
$a->strings["audio link"] = "";
$a->strings["Set your location"] = "";
$a->strings["set location"] = "";
+$a->strings["Toggle voting"] = "";
$a->strings["Clear browser location"] = "";
$a->strings["clear location"] = "";
-$a->strings["Set title"] = "";
-$a->strings["Categories (comma-separated list)"] = "";
+$a->strings["Title (optional)"] = "";
+$a->strings["Categories (optional, comma-separated list)"] = "";
$a->strings["Permission settings"] = "";
$a->strings["permissions"] = "";
$a->strings["Public post"] = "";
$a->strings["Example: bob@example.com, mary@example.com"] = "";
$a->strings["Set expiration date"] = "";
-$a->strings["Encrypt text"] = "";
$a->strings["OK"] = "";
$a->strings["Cancel"] = "";
$a->strings["Discover"] = "";
@@ -452,7 +676,6 @@ $a->strings["Commented Order"] = "";
$a->strings["Sort by Comment Date"] = "";
$a->strings["Posted Order"] = "";
$a->strings["Sort by Post Date"] = "";
-$a->strings["Personal"] = "";
$a->strings["Posts that mention or involve you"] = "";
$a->strings["New"] = "";
$a->strings["Activity Stream - by date"] = "";
@@ -464,88 +687,94 @@ $a->strings["Channel"] = "";
$a->strings["Status Messages and Posts"] = "";
$a->strings["About"] = "";
$a->strings["Profile Details"] = "";
+$a->strings["Photo Albums"] = "";
$a->strings["Files and Storage"] = "";
$a->strings["Chatrooms"] = "";
$a->strings["Saved Bookmarks"] = "";
$a->strings["Manage Webpages"] = "";
-$a->strings["General Features"] = "";
-$a->strings["Content Expiration"] = "";
-$a->strings["Remove posts/comments and/or private messages at a future time"] = "";
-$a->strings["Multiple Profiles"] = "";
-$a->strings["Ability to create multiple profiles"] = "";
-$a->strings["Advanced Profiles"] = "";
-$a->strings["Additional profile sections and selections"] = "";
-$a->strings["Profile Import/Export"] = "";
-$a->strings["Save and load profile details across sites/channels"] = "";
-$a->strings["Web Pages"] = "";
-$a->strings["Provide managed web pages on your channel"] = "";
-$a->strings["Private Notes"] = "";
-$a->strings["Enables a tool to store notes and reminders"] = "";
-$a->strings["Extended Identity Sharing"] = "";
-$a->strings["Share your identity with all websites on the internet. When disabled, identity is only shared with sites in the matrix."] = "";
-$a->strings["Expert Mode"] = "";
-$a->strings["Enable Expert Mode to provide advanced configuration options"] = "";
-$a->strings["Premium Channel"] = "";
-$a->strings["Allows you to set restrictions and terms on those that connect with your channel"] = "";
-$a->strings["Post Composition Features"] = "";
-$a->strings["Use Markdown"] = "";
-$a->strings["Allow use of \"Markdown\" to format posts"] = "";
-$a->strings["Post Preview"] = "";
-$a->strings["Allow previewing posts and comments before publishing them"] = "";
-$a->strings["Channel Sources"] = "";
-$a->strings["Automatically import channel content from other channels or feeds"] = "";
-$a->strings["Even More Encryption"] = "";
-$a->strings["Allow optional encryption of content end-to-end with a shared secret key"] = "";
-$a->strings["Network and Stream Filtering"] = "";
-$a->strings["Search by Date"] = "";
-$a->strings["Ability to select posts by date ranges"] = "";
-$a->strings["Collections Filter"] = "";
-$a->strings["Enable widget to display Network posts only from selected collections"] = "";
-$a->strings["Saved Searches"] = "";
-$a->strings["Save search terms for re-use"] = "";
-$a->strings["Network Personal Tab"] = "";
-$a->strings["Enable tab to display only Network posts that you've interacted on"] = "";
-$a->strings["Network New Tab"] = "";
-$a->strings["Enable tab to display all new Network activity"] = "";
-$a->strings["Affinity Tool"] = "";
-$a->strings["Filter stream activity by depth of relationships"] = "";
-$a->strings["Suggest Channels"] = "";
-$a->strings["Show channel suggestions"] = "";
-$a->strings["Post/Comment Tools"] = "";
-$a->strings["Edit Sent Posts"] = "";
-$a->strings["Edit and correct posts and comments after sending"] = "";
-$a->strings["Tagging"] = "";
-$a->strings["Ability to tag existing posts"] = "";
-$a->strings["Post Categories"] = "";
-$a->strings["Add categories to your posts"] = "";
-$a->strings["Ability to file posts under folders"] = "";
-$a->strings["Dislike Posts"] = "";
-$a->strings["Ability to dislike posts/comments"] = "";
-$a->strings["Star Posts"] = "";
-$a->strings["Ability to mark special posts with a star indicator"] = "";
-$a->strings["Tag Cloud"] = "";
-$a->strings["Provide a personal tag cloud on your channel page"] = "";
-$a->strings["Channel is blocked on this site."] = "";
-$a->strings["Channel location missing."] = "";
-$a->strings["Response from remote channel was incomplete."] = "";
-$a->strings["Channel was deleted and no longer exists."] = "";
-$a->strings["Channel discovery failed."] = "";
-$a->strings["local account not found."] = "";
-$a->strings["Cannot connect to yourself."] = "";
-$a->strings["Missing room name"] = "";
-$a->strings["Duplicate room name"] = "";
-$a->strings["Invalid room specifier."] = "";
-$a->strings["Room not found."] = "";
-$a->strings["Room is full"] = "";
-$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."] = "";
-$a->strings["Default privacy group for new contacts"] = "";
-$a->strings["All Channels"] = "";
-$a->strings["edit"] = "";
-$a->strings["Collections"] = "";
-$a->strings["Edit collection"] = "";
-$a->strings["Create a new collection"] = "";
-$a->strings["Channels not in any collection"] = "";
-$a->strings["add"] = "";
+$a->strings["__ctx:noun__ Attending"] = array(
+ 0 => "",
+ 1 => "",
+);
+$a->strings["__ctx:noun__ Not Attending"] = array(
+ 0 => "",
+ 1 => "",
+);
+$a->strings["__ctx:noun__ Undecided"] = array(
+ 0 => "",
+ 1 => "",
+);
+$a->strings["__ctx:noun__ Agree"] = array(
+ 0 => "",
+ 1 => "",
+);
+$a->strings["__ctx:noun__ Disagree"] = array(
+ 0 => "",
+ 1 => "",
+);
+$a->strings["__ctx:noun__ Abstain"] = array(
+ 0 => "",
+ 1 => "",
+);
+$a->strings["Image/photo"] = "";
+$a->strings["Encrypted content"] = "";
+$a->strings["Install design element: "] = "";
+$a->strings["QR code"] = "";
+$a->strings["%1\$s wrote the following %2\$s %3\$s"] = "";
+$a->strings["post"] = "";
+$a->strings["Different viewers will see this text differently"] = "";
+$a->strings["$1 spoiler"] = "";
+$a->strings["$1 wrote:"] = "";
+$a->strings["Image exceeds website size limit of %lu bytes"] = "";
+$a->strings["Image file is empty."] = "";
+$a->strings["Unable to process image"] = "";
+$a->strings["Photo storage failed."] = "";
+$a->strings["Upload New Photos"] = "";
+$a->strings["Invalid data packet"] = "";
+$a->strings["Unable to verify channel signature"] = "";
+$a->strings["Unable to verify site signature for %s"] = "";
+$a->strings["Embedded content"] = "";
+$a->strings["Embedding disabled"] = "";
+$a->strings["Logged out."] = "";
+$a->strings["Failed authentication"] = "";
+$a->strings["Login failed."] = "";
+$a->strings["%d invitation available"] = array(
+ 0 => "",
+ 1 => "",
+);
+$a->strings["Advanced"] = "";
+$a->strings["Find Channels"] = "";
+$a->strings["Enter name or interest"] = "";
+$a->strings["Connect/Follow"] = "";
+$a->strings["Examples: Robert Morgenstein, Fishing"] = "";
+$a->strings["Find"] = "";
+$a->strings["Channel Suggestions"] = "";
+$a->strings["Random Profile"] = "";
+$a->strings["Invite Friends"] = "";
+$a->strings["Advanced example: name=fred and country=iceland"] = "";
+$a->strings["%d connection in common"] = array(
+ 0 => "",
+ 1 => "",
+);
+$a->strings["show more"] = "";
+$a->strings["Visible to your default audience"] = "";
+$a->strings["Show"] = "";
+$a->strings["Don't show"] = "";
+$a->strings["Permissions"] = "";
+$a->strings["Item was not found."] = "";
+$a->strings["No source file."] = "";
+$a->strings["Cannot locate file to replace"] = "";
+$a->strings["Cannot locate file to revise/update"] = "";
+$a->strings["File exceeds size limit of %d"] = "";
+$a->strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "";
+$a->strings["File upload failed. Possible system limit or action terminated."] = "";
+$a->strings["Stored file could not be verified. Upload failed."] = "";
+$a->strings["Path not available."] = "";
+$a->strings["Empty pathname"] = "";
+$a->strings["duplicate filename or path"] = "";
+$a->strings["Path not found."] = "";
+$a->strings["mkdir failed."] = "";
+$a->strings["database storage failed."] = "";
$a->strings["Unable to obtain identity information from database"] = "";
$a->strings["Empty name"] = "";
$a->strings["Name too long"] = "";
@@ -555,10 +784,8 @@ $a->strings["Reserved nickname. Please choose another."] = "";
$a->strings["Nickname has unsupported characters or is already being used on this site."] = "";
$a->strings["Unable to retrieve created identity"] = "";
$a->strings["Default Profile"] = "";
-$a->strings["Friends"] = "";
$a->strings["Requested channel is not available."] = "";
$a->strings["Requested profile is not available."] = "";
-$a->strings["Connect"] = "";
$a->strings["Change profile photo"] = "";
$a->strings["Profiles"] = "";
$a->strings["Manage/edit profiles"] = "";
@@ -605,128 +832,6 @@ $a->strings["Love/Romance:"] = "";
$a->strings["Work/employment:"] = "";
$a->strings["School/education:"] = "";
$a->strings["Like this thing"] = "";
-$a->strings["view full size"] = "";
-$a->strings["Site Admin"] = "";
-$a->strings["Address Book"] = "";
-$a->strings["Mood"] = "";
-$a->strings["Probe"] = "";
-$a->strings["Suggest"] = "";
-$a->strings["Update"] = "";
-$a->strings["Install"] = "";
-$a->strings["Purchase"] = "";
-$a->strings["Image/photo"] = "";
-$a->strings["Encrypted content"] = "";
-$a->strings["QR code"] = "";
-$a->strings["%1\$s wrote the following %2\$s %3\$s"] = "";
-$a->strings["post"] = "";
-$a->strings["$1 wrote:"] = "";
-$a->strings["No recipient provided."] = "";
-$a->strings["[no subject]"] = "";
-$a->strings["Unable to determine sender."] = "";
-$a->strings["Stored post could not be verified."] = "";
-$a->strings["System"] = "";
-$a->strings["Create Personal App"] = "";
-$a->strings["Edit Personal App"] = "";
-$a->strings["Ignore/Hide"] = "";
-$a->strings["Suggestions"] = "";
-$a->strings["See more..."] = "";
-$a->strings["You have %1$.0f of %2$.0f allowed connections."] = "";
-$a->strings["Add New Connection"] = "";
-$a->strings["Enter the channel address"] = "";
-$a->strings["Example: bob@example.com, http://example.com/barbara"] = "";
-$a->strings["Notes"] = "";
-$a->strings["Remove term"] = "";
-$a->strings["Archives"] = "";
-$a->strings["Refresh"] = "";
-$a->strings["Me"] = "";
-$a->strings["Best Friends"] = "";
-$a->strings["Co-workers"] = "";
-$a->strings["Former Friends"] = "";
-$a->strings["Acquaintances"] = "";
-$a->strings["Everybody"] = "";
-$a->strings["Account settings"] = "";
-$a->strings["Channel settings"] = "";
-$a->strings["Additional features"] = "";
-$a->strings["Feature settings"] = "";
-$a->strings["Display settings"] = "";
-$a->strings["Connected apps"] = "";
-$a->strings["Export channel"] = "";
-$a->strings["Automatic Permissions (Advanced)"] = "";
-$a->strings["Premium Channel Settings"] = "";
-$a->strings["Check Mail"] = "";
-$a->strings["Chat Rooms"] = "";
-$a->strings["Bookmarked Chatrooms"] = "";
-$a->strings["Suggested Chatrooms"] = "";
-$a->strings["Save to Folder"] = "";
-$a->strings["View all"] = "";
-$a->strings["__ctx:noun__ Dislike"] = array(
- 0 => "",
- 1 => "",
-);
-$a->strings["Add Star"] = "";
-$a->strings["Remove Star"] = "";
-$a->strings["Toggle Star Status"] = "";
-$a->strings["starred"] = "";
-$a->strings["Add Tag"] = "";
-$a->strings["I like this (toggle)"] = "";
-$a->strings["I don't like this (toggle)"] = "";
-$a->strings["Share This"] = "";
-$a->strings["share"] = "";
-$a->strings["View %s's profile - %s"] = "";
-$a->strings["to"] = "";
-$a->strings["via"] = "";
-$a->strings["Wall-to-Wall"] = "";
-$a->strings["via Wall-To-Wall:"] = "";
-$a->strings["Save Bookmarks"] = "";
-$a->strings["Add to Calendar"] = "";
-$a->strings["__ctx:noun__ Likes"] = "";
-$a->strings["__ctx:noun__ Dislikes"] = "";
-$a->strings["%d comment"] = array(
- 0 => "",
- 1 => "",
-);
-$a->strings["[+] show all"] = "";
-$a->strings["This is you"] = "";
-$a->strings["Comment"] = "";
-$a->strings["Submit"] = "";
-$a->strings["Bold"] = "";
-$a->strings["Italic"] = "";
-$a->strings["Underline"] = "";
-$a->strings["Quote"] = "";
-$a->strings["Code"] = "";
-$a->strings["Image"] = "";
-$a->strings["Link"] = "";
-$a->strings["Video"] = "";
-$a->strings["Delete this item?"] = "";
-$a->strings["[-] show less"] = "";
-$a->strings["[+] expand"] = "";
-$a->strings["[-] collapse"] = "";
-$a->strings["Password too short"] = "";
-$a->strings["Passwords do not match"] = "";
-$a->strings["everybody"] = "";
-$a->strings["Secret Passphrase"] = "";
-$a->strings["Passphrase hint"] = "";
-$a->strings["Notice: Permissions have changed but have not yet been submitted."] = "";
-$a->strings["close all"] = "";
-$a->strings["timeago.prefixAgo"] = "";
-$a->strings["timeago.prefixFromNow"] = "";
-$a->strings["ago"] = "";
-$a->strings["from now"] = "";
-$a->strings["less than a minute"] = "";
-$a->strings["about a minute"] = "";
-$a->strings["%d minutes"] = "";
-$a->strings["about an hour"] = "";
-$a->strings["about %d hours"] = "";
-$a->strings["a day"] = "";
-$a->strings["%d days"] = "";
-$a->strings["about a month"] = "";
-$a->strings["%d months"] = "";
-$a->strings["about a year"] = "";
-$a->strings["%d years"] = "";
-$a->strings[" "] = "";
-$a->strings["timeago.numbers"] = "";
-$a->strings["New window"] = "";
-$a->strings["Open the selected location in a different window or browser tab"] = "";
$a->strings["Male"] = "";
$a->strings["Female"] = "";
$a->strings["Currently Male"] = "";
@@ -739,7 +844,6 @@ $a->strings["Transsexual"] = "";
$a->strings["Hermaphrodite"] = "";
$a->strings["Neuter"] = "";
$a->strings["Non-specific"] = "";
-$a->strings["Other"] = "";
$a->strings["Undecided"] = "";
$a->strings["Males"] = "";
$a->strings["Females"] = "";
@@ -784,74 +888,43 @@ $a->strings["Uncertain"] = "";
$a->strings["It's complicated"] = "";
$a->strings["Don't care"] = "";
$a->strings["Ask me"] = "";
-$a->strings["Logged out."] = "";
-$a->strings["Failed authentication"] = "";
-$a->strings["Login failed."] = "";
-$a->strings["Permission denied"] = "";
-$a->strings["(Unknown)"] = "";
-$a->strings["Item not found."] = "";
-$a->strings["Collection not found."] = "";
-$a->strings["Collection is empty."] = "";
-$a->strings["Collection: %s"] = "";
-$a->strings["Connection: %s"] = "";
-$a->strings["Connection not found."] = "";
-$a->strings["Can view my \"public\" stream and posts"] = "";
-$a->strings["Can view my \"public\" channel profile"] = "";
-$a->strings["Can view my \"public\" photo albums"] = "";
-$a->strings["Can view my \"public\" address book"] = "";
-$a->strings["Can view my \"public\" file storage"] = "";
-$a->strings["Can view my \"public\" pages"] = "";
-$a->strings["Can send me their channel stream and posts"] = "";
-$a->strings["Can post on my channel page (\"wall\")"] = "";
-$a->strings["Can comment on or like my posts"] = "";
-$a->strings["Can send me private mail messages"] = "";
-$a->strings["Can post photos to my photo albums"] = "";
-$a->strings["Can like/dislike stuff"] = "";
-$a->strings["Can forward to all my channel contacts via post @mentions"] = "";
-$a->strings["Advanced - useful for creating group forum channels"] = "";
-$a->strings["Can chat with me (when available)"] = "";
-$a->strings["Can write to my \"public\" file storage"] = "";
-$a->strings["Can edit my \"public\" pages"] = "";
-$a->strings["Can source my \"public\" posts in derived channels"] = "";
-$a->strings["Somewhat advanced - very useful in open communities"] = "";
-$a->strings["Can administer my channel resources"] = "";
-$a->strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "";
-$a->strings["Set your current mood and tell your friends"] = "";
-$a->strings["Menu not found."] = "";
-$a->strings["Menu element updated."] = "";
-$a->strings["Unable to update menu element."] = "";
-$a->strings["Menu element added."] = "";
-$a->strings["Unable to add menu element."] = "";
-$a->strings["Not found."] = "";
-$a->strings["Manage Menu Elements"] = "";
-$a->strings["Edit menu"] = "";
-$a->strings["Edit element"] = "";
-$a->strings["Drop element"] = "";
-$a->strings["New element"] = "";
-$a->strings["Edit this menu container"] = "";
-$a->strings["Add menu element"] = "";
-$a->strings["Delete this menu item"] = "";
-$a->strings["Edit this menu item"] = "";
-$a->strings["New Menu Element"] = "";
-$a->strings["Menu Item Permissions"] = "";
-$a->strings["(click to open/close)"] = "";
-$a->strings["Link text"] = "";
-$a->strings["URL of link"] = "";
-$a->strings["Use Red magic-auth if available"] = "";
-$a->strings["Open link in new window"] = "";
-$a->strings["Order in list"] = "";
-$a->strings["Higher numbers will sink to bottom of listing"] = "";
-$a->strings["Menu item not found."] = "";
-$a->strings["Menu item deleted."] = "";
-$a->strings["Menu item could not be deleted."] = "";
-$a->strings["Edit Menu Element"] = "";
-$a->strings["Modify"] = "";
-$a->strings["sent you a private message"] = "";
-$a->strings["added your channel"] = "";
-$a->strings["posted an event"] = "";
-$a->strings["network"] = "";
+$a->strings["Site Admin"] = "";
+$a->strings["Address Book"] = "";
+$a->strings["Mood"] = "";
+$a->strings["Probe"] = "";
+$a->strings["Suggest"] = "";
+$a->strings["Random Channel"] = "";
+$a->strings["Invite"] = "";
+$a->strings["Features"] = "";
+$a->strings["Language"] = "";
+$a->strings["Post"] = "";
+$a->strings["Profile Photo"] = "";
+$a->strings["Update"] = "";
+$a->strings["Install"] = "";
+$a->strings["Purchase"] = "";
+$a->strings["Missing room name"] = "";
+$a->strings["Duplicate room name"] = "";
+$a->strings["Invalid room specifier."] = "";
+$a->strings["Room not found."] = "";
+$a->strings["Room is full"] = "";
+$a->strings["Please choose"] = "";
+$a->strings["Agree"] = "";
+$a->strings["Disagree"] = "";
+$a->strings["Abstain"] = "";
+$a->strings["projectname"] = "";
+$a->strings["Some blurb about what to do when you're new here"] = "";
+$a->strings["You have created %1$.0f of %2$.0f allowed channels."] = "";
+$a->strings["Create a new channel"] = "";
+$a->strings["Current Channel"] = "";
+$a->strings["Switch to one of your channels by selecting it."] = "";
+$a->strings["Default Channel"] = "";
+$a->strings["Make Default"] = "";
+$a->strings["%d new messages"] = "";
+$a->strings["%d new introductions"] = "";
+$a->strings["Delegated Channels"] = "";
$a->strings["Name is required"] = "";
$a->strings["Key and Secret are required"] = "";
+$a->strings["Diaspora Policy Settings updated."] = "";
$a->strings["Passwords do not match. Password unchanged."] = "";
$a->strings["Empty passwords are not allowed. Password unchanged."] = "";
$a->strings["Password changed."] = "";
@@ -860,6 +933,8 @@ $a->strings["Not valid email."] = "";
$a->strings["Protected email address. Cannot change to that email."] = "";
$a->strings["System failure storing new email. Please try again."] = "";
$a->strings["Settings updated."] = "";
+$a->strings["No"] = "";
+$a->strings["Yes"] = "";
$a->strings["Add application"] = "";
$a->strings["Name of application"] = "";
$a->strings["Consumer Key"] = "";
@@ -875,30 +950,42 @@ $a->strings["Client key starts with"] = "";
$a->strings["No name"] = "";
$a->strings["Remove authorization"] = "";
$a->strings["No feature settings configured"] = "";
-$a->strings["Feature Settings"] = "";
+$a->strings["Feature/Addon Settings"] = "";
+$a->strings["Settings for the built-in Diaspora emulator"] = "";
+$a->strings["Allow any Diaspora member to comment on your public posts"] = "";
+$a->strings["Diaspora Policy Settings"] = "";
+$a->strings["Prevent your hashtags from being redirected to other sites"] = "";
$a->strings["Account Settings"] = "";
-$a->strings["Password Settings"] = "";
-$a->strings["New Password:"] = "";
-$a->strings["Confirm:"] = "";
+$a->strings["Enter New Password:"] = "";
+$a->strings["Confirm New Password:"] = "";
$a->strings["Leave password fields blank unless changing"] = "";
$a->strings["Email Address:"] = "";
$a->strings["Remove Account"] = "";
-$a->strings["Warning: This action is permanent and cannot be reversed."] = "";
+$a->strings["Remove this account including all its channels"] = "";
$a->strings["Off"] = "";
$a->strings["On"] = "";
$a->strings["Additional Features"] = "";
$a->strings["Connector Settings"] = "";
$a->strings["No special theme for mobile devices"] = "";
$a->strings["%s - (Experimental)"] = "";
+$a->strings["mobile"] = "";
$a->strings["Display Settings"] = "";
$a->strings["Display Theme:"] = "";
$a->strings["Mobile Theme:"] = "";
+$a->strings["Enable user zoom on mobile devices"] = "";
$a->strings["Update browser every xx seconds"] = "";
$a->strings["Minimum of 10 seconds, no maximum"] = "";
$a->strings["Maximum number of conversations to load at any time:"] = "";
$a->strings["Maximum of 100 items"] = "";
-$a->strings["Don't show emoticons"] = "";
+$a->strings["Show emoticons (smilies) as images"] = "";
+$a->strings["Link post titles to source"] = "";
$a->strings["System Page Layout Editor - (advanced)"] = "";
+$a->strings["Use blog/list mode on channel page"] = "";
+$a->strings["(comments displayed separately)"] = "";
+$a->strings["Use blog/list mode on matrix page"] = "";
+$a->strings["Channel page max height of content (in pixels)"] = "";
+$a->strings["click to expand content exceeding this height"] = "";
+$a->strings["Matrix page max height of content (in pixels)"] = "";
$a->strings["Nobody except yourself"] = "";
$a->strings["Only those you specifically allow"] = "";
$a->strings["Approved connections"] = "";
@@ -908,8 +995,6 @@ $a->strings["Anybody in this network"] = "";
$a->strings["Anybody authenticated"] = "";
$a->strings["Anybody on the internet"] = "";
$a->strings["Publish your default profile in the network directory"] = "";
-$a->strings["No"] = "";
-$a->strings["Yes"] = "";
$a->strings["Allow us to suggest you as a potential friend to new members?"] = "";
$a->strings["or"] = "";
$a->strings["Your channel address is"] = "";
@@ -922,6 +1007,7 @@ $a->strings["Use Browser Location:"] = "";
$a->strings["Adult Content"] = "";
$a->strings["This channel frequently or regularly publishes adult content. (Please tag any adult material and/or nudity with #NSFW)"] = "";
$a->strings["Security and Privacy Settings"] = "";
+$a->strings["Your permissions are already configured. Click to view/adjust"] = "";
$a->strings["Hide my online presence"] = "";
$a->strings["Prevents displaying in your profile that you are online"] = "";
$a->strings["Simple Privacy Settings:"] = "";
@@ -937,6 +1023,8 @@ $a->strings["0 or blank prevents expiration"] = "";
$a->strings["Maximum Friend Requests/Day:"] = "";
$a->strings["May reduce spam activity"] = "";
$a->strings["Default Post Permissions"] = "";
+$a->strings["(click to open/close)"] = "";
+$a->strings["Channel permissions category:"] = "";
$a->strings["Maximum private messages per day from unknown people:"] = "";
$a->strings["Useful to reduce spamming"] = "";
$a->strings["Notification Settings"] = "";
@@ -953,28 +1041,70 @@ $a->strings["You receive a private message"] = "";
$a->strings["You receive a friend suggestion"] = "";
$a->strings["You are tagged in a post"] = "";
$a->strings["You are poked/prodded/etc. in a post"] = "";
+$a->strings["Show visual notifications including:"] = "";
+$a->strings["Unseen matrix activity"] = "";
+$a->strings["Unseen channel activity"] = "";
+$a->strings["Unseen private messages"] = "";
+$a->strings["Recommended"] = "";
+$a->strings["Upcoming events"] = "";
+$a->strings["Events today"] = "";
+$a->strings["Upcoming birthdays"] = "";
+$a->strings["Not available in all themes"] = "";
+$a->strings["System (personal) notifications"] = "";
+$a->strings["System info messages"] = "";
+$a->strings["System critical alerts"] = "";
+$a->strings["New connections"] = "";
+$a->strings["System Registrations"] = "";
+$a->strings["Also show new wall posts, private messages and connections under Notices"] = "";
+$a->strings["Notify me of events this many days in advance"] = "";
+$a->strings["Must be greater than 0"] = "";
$a->strings["Advanced Account/Page Type Settings"] = "";
$a->strings["Change the behaviour of this account for special situations"] = "";
$a->strings["Please enable expert mode (in <a href=\"settings/features\">Settings > Additional features</a>) to adjust!"] = "";
$a->strings["Miscellaneous Settings"] = "";
$a->strings["Personal menu to display in your channel pages"] = "";
-$a->strings["Remove this channel"] = "";
-$a->strings["Poke/Prod"] = "";
-$a->strings["poke, prod or do other things to somebody"] = "";
-$a->strings["Recipient"] = "";
-$a->strings["Choose what you wish to do to recipient"] = "";
-$a->strings["Make this post private"] = "";
+$a->strings["Remove Channel"] = "";
+$a->strings["Remove this channel."] = "";
+$a->strings["Xchan Lookup"] = "";
+$a->strings["Lookup xchan beginning with (or webbie): "] = "";
+$a->strings["Not found."] = "";
$a->strings["Authorize application connection"] = "";
$a->strings["Return to your app and insert this Securty Code:"] = "";
$a->strings["Please login to continue."] = "";
$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "";
-$a->strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "";
-$a->strings["Welcome %s. Remote authentication successful."] = "";
+$a->strings["Page Title"] = "";
+$a->strings["Channel added."] = "";
+$a->strings["Tag removed"] = "";
+$a->strings["Remove Item Tag"] = "";
+$a->strings["Select a tag to remove: "] = "";
+$a->strings["Remove"] = "";
+$a->strings["Continue"] = "";
+$a->strings["Premium Channel Setup"] = "";
+$a->strings["Enable premium channel connection restrictions"] = "";
+$a->strings["Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc."] = "";
+$a->strings["This channel may require additional steps or acknowledgement of the following conditions prior to connecting:"] = "";
+$a->strings["Potential connections will then see the following text before proceeding:"] = "";
+$a->strings["By continuing, I certify that I have complied with any instructions provided on this page."] = "";
+$a->strings["(No specific instructions have been provided by the channel owner.)"] = "";
+$a->strings["Restricted or Premium Channel"] = "";
+$a->strings["Thing updated"] = "";
+$a->strings["Object store: failed"] = "";
+$a->strings["Thing added"] = "";
+$a->strings["OBJ: %1\$s %2\$s %3\$s"] = "";
+$a->strings["Show Thing"] = "";
+$a->strings["item not found."] = "";
+$a->strings["Edit Thing"] = "";
+$a->strings["Select a profile"] = "";
+$a->strings["Post an activity"] = "";
+$a->strings["Only sends to viewers of the applicable profile"] = "";
+$a->strings["Name of thing e.g. something"] = "";
+$a->strings["URL of thing (optional)"] = "";
+$a->strings["URL for photo of thing (optional)"] = "";
+$a->strings["Add Thing to your Profile"] = "";
$a->strings["Item not available."] = "";
$a->strings["Fetching URL returns error: %1\$s"] = "";
-$a->strings["Invalid item."] = "";
-$a->strings["Channel not found."] = "";
-$a->strings["Page not found."] = "";
+$a->strings["\$Projectname"] = "";
+$a->strings["Welcome to %s"] = "";
$a->strings["Image uploaded but image cropping failed."] = "";
$a->strings["Image resize failed."] = "";
$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "";
@@ -992,287 +1122,97 @@ $a->strings["Done Editing"] = "";
$a->strings["Image uploaded successfully."] = "";
$a->strings["Image upload failed."] = "";
$a->strings["Image size reduction [%s] failed."] = "";
-$a->strings["Block Name"] = "";
-$a->strings["Profile not found."] = "";
-$a->strings["Profile deleted."] = "";
-$a->strings["Profile-"] = "";
-$a->strings["New profile created."] = "";
-$a->strings["Profile unavailable to clone."] = "";
-$a->strings["Profile unavailable to export."] = "";
-$a->strings["Profile Name is required."] = "";
-$a->strings["Marital Status"] = "";
-$a->strings["Romantic Partner"] = "";
-$a->strings["Likes"] = "";
-$a->strings["Dislikes"] = "";
-$a->strings["Work/Employment"] = "";
-$a->strings["Religion"] = "";
-$a->strings["Political Views"] = "";
-$a->strings["Gender"] = "";
-$a->strings["Sexual Preference"] = "";
-$a->strings["Homepage"] = "";
-$a->strings["Interests"] = "";
-$a->strings["Address"] = "";
-$a->strings["Location"] = "";
-$a->strings["Profile updated."] = "";
-$a->strings["Hide your contact/friend list from viewers of this profile?"] = "";
-$a->strings["Edit Profile Details"] = "";
-$a->strings["View this profile"] = "";
-$a->strings["Change Profile Photo"] = "";
-$a->strings["Create a new profile using these settings"] = "";
-$a->strings["Clone this profile"] = "";
-$a->strings["Delete this profile"] = "";
-$a->strings["Import profile from file"] = "";
-$a->strings["Export profile to file"] = "";
-$a->strings["Profile Name:"] = "";
-$a->strings["Your Full Name:"] = "";
-$a->strings["Title/Description:"] = "";
-$a->strings["Your Gender:"] = "";
-$a->strings["Birthday (%s):"] = "";
-$a->strings["Street Address:"] = "";
-$a->strings["Locality/City:"] = "";
-$a->strings["Postal/Zip Code:"] = "";
-$a->strings["Country:"] = "";
-$a->strings["Region/State:"] = "";
-$a->strings["<span class=\"heart\">&hearts;</span> Marital Status:"] = "";
-$a->strings["Who: (if applicable)"] = "";
-$a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "";
-$a->strings["Since [date]:"] = "";
-$a->strings["Homepage URL:"] = "";
-$a->strings["Religious Views:"] = "";
-$a->strings["Keywords:"] = "";
-$a->strings["Example: fishing photography software"] = "";
-$a->strings["Used in directory listings"] = "";
-$a->strings["Tell us about yourself..."] = "";
-$a->strings["Hobbies/Interests"] = "";
-$a->strings["Contact information and Social Networks"] = "";
-$a->strings["My other channels"] = "";
-$a->strings["Musical interests"] = "";
-$a->strings["Books, literature"] = "";
-$a->strings["Television"] = "";
-$a->strings["Film/dance/culture/entertainment"] = "";
-$a->strings["Love/romance"] = "";
-$a->strings["Work/employment"] = "";
-$a->strings["School/education"] = "";
-$a->strings["This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet."] = "";
-$a->strings["Age: "] = "";
-$a->strings["Edit/Manage Profiles"] = "";
-$a->strings["Add profile things"] = "";
-$a->strings["Include desirable objects in your profile"] = "";
-$a->strings["Bookmark added"] = "";
-$a->strings["My Bookmarks"] = "";
-$a->strings["My Connections Bookmarks"] = "";
-$a->strings["Invalid profile identifier."] = "";
-$a->strings["Profile Visibility Editor"] = "";
-$a->strings["Click on a contact to add or remove."] = "";
-$a->strings["Visible To"] = "";
-$a->strings["All Connections"] = "";
+$a->strings["Invalid item."] = "";
+$a->strings["Channel not found."] = "";
+$a->strings["Page not found."] = "";
+$a->strings["Like/Dislike"] = "";
+$a->strings["This action is restricted to members."] = "";
+$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."] = "";
+$a->strings["Invalid request."] = "";
+$a->strings["thing"] = "";
+$a->strings["Channel unavailable."] = "";
+$a->strings["Previous action reversed."] = "";
+$a->strings["%1\$s agrees with %2\$s's %3\$s"] = "";
+$a->strings["%1\$s doesn't agree with %2\$s's %3\$s"] = "";
+$a->strings["%1\$s abstains from a decision on %2\$s's %3\$s"] = "";
+$a->strings["%1\$s is attending %2\$s's %3\$s"] = "";
+$a->strings["%1\$s is not attending %2\$s's %3\$s"] = "";
+$a->strings["%1\$s may attend %2\$s's %3\$s"] = "";
+$a->strings["Action completed."] = "";
+$a->strings["Thank you."] = "";
+$a->strings["Event can not end before it has started."] = "";
+$a->strings["Unable to generate preview."] = "";
+$a->strings["Event title and start time are required."] = "";
+$a->strings["Event not found."] = "";
+$a->strings["l, F j"] = "";
+$a->strings["Edit event"] = "";
+$a->strings["Delete event"] = "";
+$a->strings["Create New Event"] = "";
+$a->strings["Previous"] = "";
+$a->strings["Next"] = "";
+$a->strings["Export"] = "";
+$a->strings["Event removed"] = "";
+$a->strings["Failed to remove event"] = "";
+$a->strings["Event details"] = "";
+$a->strings["Starting date and Title are required."] = "";
+$a->strings["Categories (comma-separated list)"] = "";
+$a->strings["Event Starts:"] = "";
+$a->strings["Finish date/time is not known or not relevant"] = "";
+$a->strings["Event Finishes:"] = "";
+$a->strings["Adjust for viewer timezone"] = "";
+$a->strings["Important for events that happen in a particular place. Not practical for global holidays."] = "";
+$a->strings["Description:"] = "";
+$a->strings["Title:"] = "";
+$a->strings["Share this event"] = "";
+$a->strings["%1\$s is following %2\$s's %3\$s"] = "";
$a->strings["Public Sites"] = "";
-$a->strings["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."] = "";
+$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."] = "";
+$a->strings["Rate this hub"] = "";
$a->strings["Site URL"] = "";
$a->strings["Access Type"] = "";
$a->strings["Registration Policy"] = "";
-$a->strings["You must be logged in to see this page."] = "";
-$a->strings["Insufficient permissions. Request redirected to profile page."] = "";
-$a->strings["Select a bookmark folder"] = "";
-$a->strings["Save Bookmark"] = "";
-$a->strings["URL of bookmark"] = "";
-$a->strings["Description"] = "";
-$a->strings["Or enter new bookmark folder name"] = "";
-$a->strings["Room not found"] = "";
-$a->strings["Leave Room"] = "";
-$a->strings["Delete This Room"] = "";
-$a->strings["I am away right now"] = "";
-$a->strings["I am online"] = "";
-$a->strings["Bookmark this room"] = "";
-$a->strings["New Chatroom"] = "";
-$a->strings["Chatroom Name"] = "";
-$a->strings["%1\$s's Chatrooms"] = "";
-$a->strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = "";
-$a->strings["Please indicate acceptance of the Terms of Service. Registration failed."] = "";
-$a->strings["Passwords do not match."] = "";
-$a->strings["Registration successful. Please check your email for validation instructions."] = "";
-$a->strings["Your registration is pending approval by the site owner."] = "";
-$a->strings["Your registration can not be processed."] = "";
-$a->strings["Registration on this site/hub is by approval only."] = "";
-$a->strings["<a href=\"pubsites\">Register at another affiliated site/hub</a>"] = "";
-$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "";
-$a->strings["Terms of Service"] = "";
-$a->strings["I accept the %s for this website"] = "";
-$a->strings["I am over 13 years of age and accept the %s for this website"] = "";
-$a->strings["Registration"] = "";
-$a->strings["Membership on this site is by invitation only."] = "";
-$a->strings["Please enter your invitation code"] = "";
-$a->strings["Your email address"] = "";
-$a->strings["Choose a password"] = "";
-$a->strings["Please re-enter your password"] = "";
-$a->strings["Away"] = "";
-$a->strings["Online"] = "";
-$a->strings["Please login."] = "";
-$a->strings["Red Matrix - Guests: Username: {your email address}, Password: +++"] = "";
-$a->strings["Channel removals are not allowed within 48 hours of changing the account password."] = "";
-$a->strings["Remove This Channel"] = "";
-$a->strings["This will completely remove this channel from the network. Once this has been done it is not recoverable."] = "";
-$a->strings["Please enter your password for verification:"] = "";
-$a->strings["Remove this channel and all its clones from the network"] = "";
-$a->strings["By default only the instance of the channel located on this hub will be removed from the network"] = "";
-$a->strings["Remove Channel"] = "";
-$a->strings["No channel."] = "";
-$a->strings["Common connections"] = "";
-$a->strings["No connections in common."] = "";
-$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "";
-$a->strings["The error message was:"] = "";
-$a->strings["Authentication failed."] = "";
-$a->strings["Remote Authentication"] = "";
-$a->strings["Enter your channel address (e.g. channel@example.com)"] = "";
-$a->strings["Authenticate"] = "";
-$a->strings["Continue"] = "";
-$a->strings["Premium Channel Setup"] = "";
-$a->strings["Enable premium channel connection restrictions"] = "";
-$a->strings["Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc."] = "";
-$a->strings["This channel may require additional steps or acknowledgement of the following conditions prior to connecting:"] = "";
-$a->strings["Potential connections will then see the following text before proceeding:"] = "";
-$a->strings["By continuing, I certify that I have complied with any instructions provided on this page."] = "";
-$a->strings["(No specific instructions have been provided by the channel owner.)"] = "";
-$a->strings["Restricted or Premium Channel"] = "";
-$a->strings["No such group"] = "";
-$a->strings["Search Results For:"] = "";
-$a->strings["Collection is empty"] = "";
-$a->strings["Collection: "] = "";
-$a->strings["Connection: "] = "";
-$a->strings["Invalid connection."] = "";
-$a->strings["Could not access contact record."] = "";
-$a->strings["Could not locate selected profile."] = "";
-$a->strings["Connection updated."] = "";
-$a->strings["Failed to update connection record."] = "";
-$a->strings["Blocked"] = "";
-$a->strings["Ignored"] = "";
-$a->strings["Hidden"] = "";
-$a->strings["Archived"] = "";
-$a->strings["All"] = "";
-$a->strings["Suggest new connections"] = "";
-$a->strings["New Connections"] = "";
-$a->strings["Show pending (new) connections"] = "";
-$a->strings["Show all connections"] = "";
-$a->strings["Unblocked"] = "";
-$a->strings["Only show unblocked connections"] = "";
-$a->strings["Only show blocked connections"] = "";
-$a->strings["Only show ignored connections"] = "";
-$a->strings["Only show archived connections"] = "";
-$a->strings["Only show hidden connections"] = "";
-$a->strings["%1\$s [%2\$s]"] = "";
-$a->strings["Edit contact"] = "";
-$a->strings["Search your connections"] = "";
-$a->strings["Finding: "] = "";
+$a->strings["Location"] = "";
+$a->strings["View hub ratings"] = "";
+$a->strings["Rate"] = "";
+$a->strings["View ratings"] = "";
$a->strings["Edit post"] = "";
-$a->strings["is now connected to"] = "";
-$a->strings["Could not access address book record."] = "";
-$a->strings["Refresh failed - channel is currently unavailable."] = "";
-$a->strings["Channel has been unblocked"] = "";
-$a->strings["Channel has been blocked"] = "";
-$a->strings["Unable to set address book parameters."] = "";
-$a->strings["Channel has been unignored"] = "";
-$a->strings["Channel has been ignored"] = "";
-$a->strings["Channel has been unarchived"] = "";
-$a->strings["Channel has been archived"] = "";
-$a->strings["Channel has been unhidden"] = "";
-$a->strings["Channel has been hidden"] = "";
-$a->strings["Channel has been approved"] = "";
-$a->strings["Channel has been unapproved"] = "";
-$a->strings["Connection has been removed."] = "";
-$a->strings["View %s's profile"] = "";
-$a->strings["Refresh Permissions"] = "";
-$a->strings["Fetch updated permissions"] = "";
-$a->strings["Recent Activity"] = "";
-$a->strings["View recent posts and comments"] = "";
-$a->strings["Unblock"] = "";
-$a->strings["Block"] = "";
-$a->strings["Block or Unblock this connection"] = "";
-$a->strings["Unignore"] = "";
-$a->strings["Ignore"] = "";
-$a->strings["Ignore or Unignore this connection"] = "";
-$a->strings["Unarchive"] = "";
-$a->strings["Archive"] = "";
-$a->strings["Archive or Unarchive this connection"] = "";
-$a->strings["Unhide"] = "";
-$a->strings["Hide"] = "";
-$a->strings["Hide or Unhide this connection"] = "";
-$a->strings["Delete this connection"] = "";
-$a->strings["Approve this connection"] = "";
-$a->strings["Accept connection to allow communication"] = "";
-$a->strings["Automatic Permissions Settings"] = "";
-$a->strings["Connections: settings for %s"] = "";
-$a->strings["When receiving a channel introduction, any permissions provided here will be applied to the new connection automatically and the introduction approved. Leave this page if you do not wish to use this feature."] = "";
-$a->strings["Slide to adjust your degree of friendship"] = "";
-$a->strings["inherited"] = "";
-$a->strings["Connection has no individual permissions!"] = "";
-$a->strings["This may be appropriate based on your <a href=\"settings\">privacy settings</a>, though you may wish to review the \"Advanced Permissions\"."] = "";
-$a->strings["Profile Visibility"] = "";
-$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "";
-$a->strings["Contact Information / Notes"] = "";
-$a->strings["Edit contact notes"] = "";
-$a->strings["Their Settings"] = "";
-$a->strings["My Settings"] = "";
-$a->strings["Clear/Disable Automatic Permissions"] = "";
-$a->strings["Forum Members"] = "";
-$a->strings["Soapbox"] = "";
-$a->strings["Full Sharing (typical social network permissions)"] = "";
-$a->strings["Cautious Sharing "] = "";
-$a->strings["Follow Only"] = "";
-$a->strings["Individual Permissions"] = "";
-$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."] = "";
-$a->strings["Advanced Permissions"] = "";
-$a->strings["Simple Permissions (select one and submit)"] = "";
-$a->strings["Visit %s's profile - %s"] = "";
-$a->strings["Block/Unblock contact"] = "";
-$a->strings["Ignore contact"] = "";
-$a->strings["Repair URL settings"] = "";
-$a->strings["View conversations"] = "";
-$a->strings["Delete contact"] = "";
-$a->strings["Last update:"] = "";
-$a->strings["Update public posts"] = "";
-$a->strings["Update now"] = "";
-$a->strings["Currently blocked"] = "";
-$a->strings["Currently ignored"] = "";
-$a->strings["Currently archived"] = "";
-$a->strings["Currently pending"] = "";
-$a->strings["Hide this contact from others"] = "";
-$a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "";
-$a->strings["No potential page delegates located."] = "";
-$a->strings["Delegate Page Management"] = "";
-$a->strings["Delegates are able to manage all aspects of this account/page except for basic account settings. Please do not delegate your personal account to anybody that you do not trust completely."] = "";
-$a->strings["Existing Page Managers"] = "";
-$a->strings["Existing Page Delegates"] = "";
-$a->strings["Potential Delegates"] = "";
-$a->strings["Remove"] = "";
-$a->strings["Add"] = "";
-$a->strings["No entries."] = "";
-$a->strings["Public access denied."] = "";
-$a->strings["Gender: "] = "";
-$a->strings["Finding:"] = "";
-$a->strings["next page"] = "";
-$a->strings["previous page"] = "";
-$a->strings["No entries (some entries may be hidden)."] = "";
-$a->strings["Status: "] = "";
-$a->strings["Sexual Preference: "] = "";
-$a->strings["Homepage: "] = "";
-$a->strings["Hometown: "] = "";
-$a->strings["About: "] = "";
-$a->strings["Keywords: "] = "";
-$a->strings["This site is not a directory server"] = "";
-$a->strings["Red Matrix - &quot;The Network&quot;"] = "";
-$a->strings["Welcome to %s"] = "";
-$a->strings["Red Matrix Server - Setup"] = "";
+$a->strings["\$Projectname channel"] = "";
+$a->strings["Collection created."] = "";
+$a->strings["Could not create collection."] = "";
+$a->strings["Collection updated."] = "";
+$a->strings["Create a collection of channels."] = "";
+$a->strings["Collection Name: "] = "";
+$a->strings["Members are visible to other channels"] = "";
+$a->strings["Collection removed."] = "";
+$a->strings["Unable to remove collection."] = "";
+$a->strings["Collection Editor"] = "";
+$a->strings["Members"] = "";
+$a->strings["All Connected Channels"] = "";
+$a->strings["Click on a channel to add or remove."] = "";
+$a->strings["Version %s"] = "";
+$a->strings["Installed plugins/addons/apps:"] = "";
+$a->strings["No installed plugins/addons/apps"] = "";
+$a->strings["This is a hub of \$Projectname - a global cooperative network of decentralized privacy enhanced websites."] = "";
+$a->strings["Tag: "] = "";
+$a->strings["Last background fetch: "] = "";
+$a->strings["Running at web location"] = "";
+$a->strings["Please visit <a href=\"https://redmatrix.me\">redmatrix.me</a> to learn more about \$Projectname."] = "";
+$a->strings["Bug reports and issues: please visit"] = "";
+$a->strings["Suggestions, praise, etc. - please email \"hubzilla\" at librelist - dot com"] = "";
+$a->strings["Site Administrators"] = "";
+$a->strings["Help:"] = "";
+$a->strings["Not Found"] = "";
+$a->strings["\$Projectname Server - Setup"] = "";
$a->strings["Could not connect to database."] = "";
$a->strings["Could not connect to specified site URL. Possible SSL certificate or DNS issue."] = "";
$a->strings["Could not create table."] = "";
$a->strings["Your site database has been installed."] = "";
-$a->strings["You may need to import the file \"install/database.sql\" manually using phpmyadmin or mysql."] = "";
+$a->strings["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\"."] = "";
$a->strings["System check"] = "";
-$a->strings["Next"] = "";
$a->strings["Check again"] = "";
$a->strings["Database connection"] = "";
-$a->strings["In order to install Red Matrix we need to know how to connect to your database."] = "";
+$a->strings["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."] = "";
$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "";
$a->strings["Database Server Name"] = "";
@@ -1282,6 +1222,7 @@ $a->strings["Communication port number - use 0 for default"] = "";
$a->strings["Database Login Name"] = "";
$a->strings["Database Login Password"] = "";
$a->strings["Database Name"] = "";
+$a->strings["Database Type"] = "";
$a->strings["Site administrator email address"] = "";
$a->strings["Your account email address must match this in order to use the web admin panel."] = "";
$a->strings["Website URL"] = "";
@@ -1302,7 +1243,7 @@ $a->strings["Generate encryption keys"] = "";
$a->strings["libCurl PHP module"] = "";
$a->strings["GD graphics PHP module"] = "";
$a->strings["OpenSSL PHP module"] = "";
-$a->strings["mysqli PHP module"] = "";
+$a->strings["mysqli or postgres PHP module"] = "";
$a->strings["mb_string PHP module"] = "";
$a->strings["mcrypt PHP module"] = "";
$a->strings["Apache mod_rewrite module"] = "";
@@ -1312,7 +1253,7 @@ $a->strings["Error: proc_open is required but is either not installed or has bee
$a->strings["Error: libCURL PHP module required but not installed."] = "";
$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "";
$a->strings["Error: openssl PHP module required but not installed."] = "";
-$a->strings["Error: mysqli PHP module required but not installed."] = "";
+$a->strings["Error: mysqli or postgres PHP module required but neither are installed."] = "";
$a->strings["Error: mb_string PHP module required but not installed."] = "";
$a->strings["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."] = "";
@@ -1334,73 +1275,189 @@ $a->strings["If your certificate is not recognized, members of other sites (who
$a->strings["This can cause usability issues elsewhere (not just on your own site) so we must insist on this requirement."] = "";
$a->strings["Providers are available that issue free certificates which are browser-valid."] = "";
$a->strings["SSL certificate validation"] = "";
-$a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = "";
+$a->strings["Url rewrite in .htaccess is not working. Check your server configuration.Test: "] = "";
$a->strings["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."] = "";
$a->strings["Errors encountered creating database tables."] = "";
$a->strings["<h1>What next</h1>"] = "";
$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "";
-$a->strings["Item not found"] = "";
-$a->strings["Edit Block"] = "";
-$a->strings["Delete block?"] = "";
-$a->strings["Insert YouTube video"] = "";
-$a->strings["Insert Vorbis [.ogg] video"] = "";
-$a->strings["Insert Vorbis [.ogg] audio"] = "";
-$a->strings["Delete Block"] = "";
-$a->strings["Layout updated."] = "";
-$a->strings["Edit System Page Description"] = "";
-$a->strings["Layout not found."] = "";
-$a->strings["Module Name:"] = "";
-$a->strings["Layout Help"] = "";
-$a->strings["Edit Layout"] = "";
-$a->strings["Delete layout?"] = "";
-$a->strings["Delete Layout"] = "";
-$a->strings["Item is not editable"] = "";
-$a->strings["Delete item?"] = "";
-$a->strings["Edit Webpage"] = "";
-$a->strings["Delete webpage?"] = "";
-$a->strings["Delete Webpage"] = "";
-$a->strings["Version %s"] = "";
-$a->strings["Installed plugins/addons/apps:"] = "";
-$a->strings["No installed plugins/addons/apps"] = "";
-$a->strings["Red"] = "";
-$a->strings["This is a hub of the Red Matrix - a global cooperative network of decentralized privacy enhanced websites."] = "";
-$a->strings["Running at web location"] = "";
-$a->strings["Please visit <a href=\"http://getzot.com\">GetZot.com</a> to learn more about the Red Matrix."] = "";
-$a->strings["Bug reports and issues: please visit"] = "";
-$a->strings["Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"] = "";
-$a->strings["Site Administrators"] = "";
+$a->strings["No channel."] = "";
+$a->strings["Common connections"] = "";
+$a->strings["No connections in common."] = "";
+$a->strings["This site is not a directory server"] = "";
+$a->strings["Could not access contact record."] = "";
+$a->strings["Could not locate selected profile."] = "";
+$a->strings["Connection updated."] = "";
+$a->strings["Failed to update connection record."] = "";
+$a->strings["Blocked"] = "";
+$a->strings["Ignored"] = "";
+$a->strings["Hidden"] = "";
+$a->strings["Archived"] = "";
+$a->strings["Suggest new connections"] = "";
+$a->strings["New Connections"] = "";
+$a->strings["Show pending (new) connections"] = "";
+$a->strings["All Connections"] = "";
+$a->strings["Show all connections"] = "";
+$a->strings["Unblocked"] = "";
+$a->strings["Only show unblocked connections"] = "";
+$a->strings["Only show blocked connections"] = "";
+$a->strings["Only show ignored connections"] = "";
+$a->strings["Only show archived connections"] = "";
+$a->strings["Only show hidden connections"] = "";
+$a->strings["%1\$s [%2\$s]"] = "";
+$a->strings["Edit connection"] = "";
+$a->strings["Search your connections"] = "";
+$a->strings["Finding: "] = "";
+$a->strings["Block Name"] = "";
+$a->strings["Block Title"] = "";
+$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "";
+$a->strings["\$Projectname - Guests: Username: {your email address}, Password: +++"] = "";
$a->strings["Page owner information could not be retrieved."] = "";
$a->strings["Album not found."] = "";
$a->strings["Delete Album"] = "";
$a->strings["Delete Photo"] = "";
+$a->strings["Public access denied."] = "";
$a->strings["No photos selected"] = "";
$a->strings["Access to this item is restricted."] = "";
-$a->strings["You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."] = "";
-$a->strings["You have used %1$.2f Mbytes of photo storage."] = "";
+$a->strings["%1$.2f MB of %2$.2f MB photo storage used."] = "";
+$a->strings["%1$.2f MB photo storage used."] = "";
$a->strings["Upload Photos"] = "";
-$a->strings["New album name: "] = "";
-$a->strings["or existing album name: "] = "";
-$a->strings["Do not show a status post for this upload"] = "";
+$a->strings["Enter a new album name"] = "";
+$a->strings["or select an existing one (doubleclick)"] = "";
+$a->strings["Create a status post for this upload"] = "";
+$a->strings["Album name could not be decoded"] = "";
$a->strings["Contact Photos"] = "";
-$a->strings["Edit Album"] = "";
$a->strings["Show Newest First"] = "";
$a->strings["Show Oldest First"] = "";
$a->strings["View Photo"] = "";
+$a->strings["Edit Album"] = "";
$a->strings["Permission denied. Access to this item may be restricted."] = "";
$a->strings["Photo not available"] = "";
$a->strings["Use as profile photo"] = "";
+$a->strings["Private Photo"] = "";
$a->strings["View Full Size"] = "";
$a->strings["Edit photo"] = "";
$a->strings["Rotate CW (right)"] = "";
$a->strings["Rotate CCW (left)"] = "";
-$a->strings["New album name"] = "";
$a->strings["Caption"] = "";
$a->strings["Add a Tag"] = "";
-$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"] = "";
+$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com"] = "";
+$a->strings["Flag as adult in album view"] = "";
$a->strings["In This Photo:"] = "";
+$a->strings["Map"] = "";
$a->strings["View Album"] = "";
$a->strings["Recent Photos"] = "";
+$a->strings["Profile Match"] = "";
+$a->strings["No keywords to match. Please add keywords to your default profile."] = "";
+$a->strings["is interested in:"] = "";
+$a->strings["No matches"] = "";
+$a->strings["Away"] = "";
+$a->strings["Online"] = "";
+$a->strings["Select a bookmark folder"] = "";
+$a->strings["Save Bookmark"] = "";
+$a->strings["URL of bookmark"] = "";
+$a->strings["Description"] = "";
+$a->strings["Or enter new bookmark folder name"] = "";
+$a->strings["No more system notifications."] = "";
+$a->strings["System Notifications"] = "";
+$a->strings["network"] = "";
+$a->strings["RSS"] = "";
+$a->strings["Layout updated."] = "";
+$a->strings["Edit System Page Description"] = "";
+$a->strings["Layout not found."] = "";
+$a->strings["Module Name:"] = "";
+$a->strings["Layout Help"] = "";
+$a->strings["- select -"] = "";
+$a->strings["Your service plan only allows %d channels."] = "";
+$a->strings["Nothing to import."] = "";
+$a->strings["Unable to download data from old server"] = "";
+$a->strings["Imported file is empty."] = "";
+$a->strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "";
+$a->strings["Unable to create a unique channel address. Import failed."] = "";
+$a->strings["Channel clone failed. Import failed."] = "";
+$a->strings["Cloned channel not found. Import failed."] = "";
+$a->strings["Import completed."] = "";
+$a->strings["You must be logged in to use this feature."] = "";
+$a->strings["Import Channel"] = "";
+$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."] = "";
+$a->strings["File to Upload"] = "";
+$a->strings["Or provide the old server/hub details"] = "";
+$a->strings["Your old identity address (xyz@example.com)"] = "";
+$a->strings["Your old login email address"] = "";
+$a->strings["Your old login password"] = "";
+$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."] = "";
+$a->strings["Make this hub my primary location"] = "";
+$a->strings["Import existing posts if possible"] = "";
+$a->strings["Item not found"] = "";
+$a->strings["Edit Layout"] = "";
+$a->strings["Delete layout?"] = "";
+$a->strings["Insert YouTube video"] = "";
+$a->strings["Insert Vorbis [.ogg] video"] = "";
+$a->strings["Insert Vorbis [.ogg] audio"] = "";
+$a->strings["Layout Description (Optional)"] = "";
+$a->strings["Layout Name"] = "";
+$a->strings["You must be logged in to see this page."] = "";
+$a->strings["Room not found"] = "";
+$a->strings["Leave Room"] = "";
+$a->strings["Delete This Room"] = "";
+$a->strings["I am away right now"] = "";
+$a->strings["I am online"] = "";
+$a->strings["Bookmark this room"] = "";
+$a->strings["New Chatroom"] = "";
+$a->strings["Chatroom Name"] = "";
+$a->strings["%1\$s's Chatrooms"] = "";
+$a->strings["Delete webpage?"] = "";
+$a->strings["Page link title"] = "";
+$a->strings["Edit Webpage"] = "";
+$a->strings["This directory server requires an access token"] = "";
+$a->strings["No valid account found."] = "";
+$a->strings["Password reset request issued. Check your email."] = "";
+$a->strings["Site Member (%s)"] = "";
+$a->strings["Password reset requested at %s"] = "";
+$a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "";
+$a->strings["Password Reset"] = "";
+$a->strings["Your password has been reset as requested."] = "";
+$a->strings["Your new password is"] = "";
+$a->strings["Save or copy your new password - and then"] = "";
+$a->strings["click here to login"] = "";
+$a->strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "";
+$a->strings["Your password has changed at %s"] = "";
+$a->strings["Forgot your Password?"] = "";
+$a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "";
+$a->strings["Email Address"] = "";
+$a->strings["Reset"] = "";
+$a->strings["Website:"] = "";
+$a->strings["Remote Channel [%s] (not yet known on this site)"] = "";
+$a->strings["Rating (this information is public)"] = "";
+$a->strings["Optionally explain your rating (this information is public)"] = "";
+$a->strings["Item is not editable"] = "";
+$a->strings["Delete item?"] = "";
+$a->strings["Total invitation limit exceeded."] = "";
+$a->strings["%s : Not a valid email address."] = "";
+$a->strings["Please join us on Red"] = "";
+$a->strings["Invitation limit exceeded. Please contact your site administrator."] = "";
+$a->strings["%s : Message delivery failed."] = "";
+$a->strings["%d message sent."] = array(
+ 0 => "",
+ 1 => "",
+);
+$a->strings["You have no more invitations available"] = "";
+$a->strings["Send invitations"] = "";
+$a->strings["Enter email addresses, one per line:"] = "";
+$a->strings["Your message:"] = "";
+$a->strings["Please join my community on \$Projectname."] = "";
+$a->strings["You will need to supply this invitation code: "] = "";
+$a->strings["1. Register at any \$Projectname location (they are all inter-connected)"] = "";
+$a->strings["2. Enter my \$Projectname network address into the site searchbar."] = "";
+$a->strings["or visit "] = "";
+$a->strings["3. Click [Connect]"] = "";
+$a->strings["Location not found."] = "";
+$a->strings["Primary location cannot be removed."] = "";
+$a->strings["No locations found."] = "";
+$a->strings["Manage Channel Locations"] = "";
+$a->strings["Location (address)"] = "";
+$a->strings["Primary Location"] = "";
+$a->strings["Drop location"] = "";
$a->strings["Failed to create source. No channel selected."] = "";
$a->strings["Source created."] = "";
$a->strings["Source updated."] = "";
@@ -1416,24 +1473,30 @@ $a->strings["Edit Source"] = "";
$a->strings["Delete Source"] = "";
$a->strings["Source removed"] = "";
$a->strings["Unable to remove source."] = "";
-$a->strings["- select -"] = "";
-$a->strings["Event title and start time are required."] = "";
-$a->strings["Event not found."] = "";
-$a->strings["l, F j"] = "";
-$a->strings["Edit event"] = "";
-$a->strings["Create New Event"] = "";
-$a->strings["Previous"] = "";
-$a->strings["hour:minute"] = "";
-$a->strings["Event details"] = "";
-$a->strings["Format is %s %s. Starting date and Title are required."] = "";
-$a->strings["Event Starts:"] = "";
-$a->strings["Required"] = "";
-$a->strings["Finish date/time is not known or not relevant"] = "";
-$a->strings["Event Finishes:"] = "";
-$a->strings["Adjust for viewer timezone"] = "";
-$a->strings["Description:"] = "";
-$a->strings["Title:"] = "";
-$a->strings["Share this event"] = "";
+$a->strings["Unable to update menu."] = "";
+$a->strings["Unable to create menu."] = "";
+$a->strings["Menu Name"] = "";
+$a->strings["Unique name (not visible on webpage) - required"] = "";
+$a->strings["Menu Title"] = "";
+$a->strings["Visible on webpage - leave empty for no title"] = "";
+$a->strings["Allow Bookmarks"] = "";
+$a->strings["Menu may be used to store saved bookmarks"] = "";
+$a->strings["Submit and proceed"] = "";
+$a->strings["Drop"] = "";
+$a->strings["Bookmarks allowed"] = "";
+$a->strings["Delete this menu"] = "";
+$a->strings["Edit menu contents"] = "";
+$a->strings["Edit this menu"] = "";
+$a->strings["Menu could not be deleted."] = "";
+$a->strings["Menu not found."] = "";
+$a->strings["Edit Menu"] = "";
+$a->strings["Add or remove entries to this menu"] = "";
+$a->strings["Menu name"] = "";
+$a->strings["Must be unique, only seen by you"] = "";
+$a->strings["Menu title"] = "";
+$a->strings["Menu title as seen by others"] = "";
+$a->strings["Allow bookmarks"] = "";
+$a->strings["Modify"] = "";
$a->strings["Permission Denied."] = "";
$a->strings["File not found."] = "";
$a->strings["Edit file permissions"] = "";
@@ -1442,56 +1505,158 @@ $a->strings["Include all files and sub folders"] = "";
$a->strings["Return to file list"] = "";
$a->strings["Copy/paste this code to attach file to a post"] = "";
$a->strings["Copy/paste this URL to link file from a web page"] = "";
-$a->strings["Channel added."] = "";
-$a->strings["%1\$s is following %2\$s's %3\$s"] = "";
+$a->strings["Share this file"] = "";
+$a->strings["Show URL to this file"] = "";
+$a->strings["Notify your contacts about this file"] = "";
$a->strings["Contact not found."] = "";
$a->strings["Friend suggestion sent."] = "";
$a->strings["Suggest Friends"] = "";
$a->strings["Suggest a friend for %s"] = "";
-$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "";
-$a->strings["Collection created."] = "";
-$a->strings["Could not create collection."] = "";
-$a->strings["Collection updated."] = "";
-$a->strings["Create a collection of channels."] = "";
-$a->strings["Collection Name: "] = "";
-$a->strings["Members are visible to other channels"] = "";
-$a->strings["Collection removed."] = "";
-$a->strings["Unable to remove collection."] = "";
-$a->strings["Collection Editor"] = "";
-$a->strings["Members"] = "";
-$a->strings["All Connected Channels"] = "";
-$a->strings["Click on a channel to add or remove."] = "";
-$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "";
-$a->strings["Help:"] = "";
-$a->strings["Not Found"] = "";
-$a->strings["Tag removed"] = "";
-$a->strings["Remove Item Tag"] = "";
-$a->strings["Select a tag to remove: "] = "";
+$a->strings["Hub not found."] = "";
+$a->strings["Poke/Prod"] = "";
+$a->strings["poke, prod or do other things to somebody"] = "";
+$a->strings["Recipient"] = "";
+$a->strings["Choose what you wish to do to recipient"] = "";
+$a->strings["Make this post private"] = "";
+$a->strings["Invalid profile identifier."] = "";
+$a->strings["Profile Visibility Editor"] = "";
+$a->strings["Click on a contact to add or remove."] = "";
+$a->strings["Visible To"] = "";
+$a->strings["webpage"] = "";
+$a->strings["block"] = "";
+$a->strings["layout"] = "";
+$a->strings["%s element installed"] = "";
+$a->strings["Profile not found."] = "";
+$a->strings["Profile deleted."] = "";
+$a->strings["Profile-"] = "";
+$a->strings["New profile created."] = "";
+$a->strings["Profile unavailable to clone."] = "";
+$a->strings["Profile unavailable to export."] = "";
+$a->strings["Profile Name is required."] = "";
+$a->strings["Marital Status"] = "";
+$a->strings["Romantic Partner"] = "";
+$a->strings["Likes"] = "";
+$a->strings["Dislikes"] = "";
+$a->strings["Work/Employment"] = "";
+$a->strings["Religion"] = "";
+$a->strings["Political Views"] = "";
+$a->strings["Gender"] = "";
+$a->strings["Sexual Preference"] = "";
+$a->strings["Homepage"] = "";
+$a->strings["Interests"] = "";
+$a->strings["Address"] = "";
+$a->strings["Profile updated."] = "";
+$a->strings["Hide your contact/friend list from viewers of this profile?"] = "";
+$a->strings["Edit Profile Details"] = "";
+$a->strings["View this profile"] = "";
+$a->strings["Change Profile Photo"] = "";
+$a->strings["Create a new profile using these settings"] = "";
+$a->strings["Clone this profile"] = "";
+$a->strings["Delete this profile"] = "";
+$a->strings["Import profile from file"] = "";
+$a->strings["Export profile to file"] = "";
+$a->strings["Profile Name:"] = "";
+$a->strings["Your Full Name:"] = "";
+$a->strings["Title/Description:"] = "";
+$a->strings["Your Gender:"] = "";
+$a->strings["Birthday :"] = "";
+$a->strings["Street Address:"] = "";
+$a->strings["Locality/City:"] = "";
+$a->strings["Postal/Zip Code:"] = "";
+$a->strings["Country:"] = "";
+$a->strings["Region/State:"] = "";
+$a->strings["<span class=\"heart\">&hearts;</span> Marital Status:"] = "";
+$a->strings["Who: (if applicable)"] = "";
+$a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "";
+$a->strings["Since [date]:"] = "";
+$a->strings["Homepage URL:"] = "";
+$a->strings["Religious Views:"] = "";
+$a->strings["Keywords:"] = "";
+$a->strings["Example: fishing photography software"] = "";
+$a->strings["Used in directory listings"] = "";
+$a->strings["Tell us about yourself..."] = "";
+$a->strings["Hobbies/Interests"] = "";
+$a->strings["Contact information and Social Networks"] = "";
+$a->strings["My other channels"] = "";
+$a->strings["Musical interests"] = "";
+$a->strings["Books, literature"] = "";
+$a->strings["Television"] = "";
+$a->strings["Film/dance/culture/entertainment"] = "";
+$a->strings["Love/romance"] = "";
+$a->strings["Work/employment"] = "";
+$a->strings["School/education"] = "";
+$a->strings["This is your default profile."] = "";
+$a->strings["Age: "] = "";
+$a->strings["Edit/Manage Profiles"] = "";
+$a->strings["Add profile things"] = "";
+$a->strings["Include desirable objects in your profile"] = "";
+$a->strings["No ratings"] = "";
+$a->strings["Ratings"] = "";
+$a->strings["Rating: "] = "";
+$a->strings["Website: "] = "";
+$a->strings["Description: "] = "";
+$a->strings["Source of Item"] = "";
+$a->strings["OpenID protocol error. No ID returned."] = "";
+$a->strings["Welcome %s. Remote authentication successful."] = "";
+$a->strings["%d rating"] = array(
+ 0 => "",
+ 1 => "",
+);
+$a->strings["Gender: "] = "";
+$a->strings["Status: "] = "";
+$a->strings["Homepage: "] = "";
+$a->strings["Hometown: "] = "";
+$a->strings["About: "] = "";
+$a->strings["Public Forum:"] = "";
+$a->strings["Keywords: "] = "";
+$a->strings["Common connections: %s"] = "";
+$a->strings["Finding:"] = "";
+$a->strings["next page"] = "";
+$a->strings["previous page"] = "";
+$a->strings["No entries (some entries may be hidden)."] = "";
+$a->strings["Export Channel"] = "";
+$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."] = "";
+$a->strings["Export Content"] = "";
+$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."] = "";
+$a->strings["No connections."] = "";
+$a->strings["Visit %s's profile [%s]"] = "";
+$a->strings["invalid target signature"] = "";
$a->strings["Theme settings updated."] = "";
$a->strings["Site"] = "";
$a->strings["Accounts"] = "";
$a->strings["Channels"] = "";
$a->strings["Plugins"] = "";
$a->strings["Themes"] = "";
-$a->strings["Server"] = "";
+$a->strings["Inspect queue"] = "";
+$a->strings["Profile Config"] = "";
$a->strings["DB updates"] = "";
$a->strings["Logs"] = "";
$a->strings["Plugin Features"] = "";
$a->strings["User registrations waiting for confirmation"] = "";
+$a->strings["# Accounts"] = "";
+$a->strings["# blocked accounts"] = "";
+$a->strings["# expired accounts"] = "";
+$a->strings["# expiring accounts"] = "";
+$a->strings["# Channels"] = "";
+$a->strings["# primary"] = "";
+$a->strings["# clones"] = "";
$a->strings["Message queues"] = "";
$a->strings["Administration"] = "";
$a->strings["Summary"] = "";
-$a->strings["Registered users"] = "";
+$a->strings["Registered accounts"] = "";
$a->strings["Pending registrations"] = "";
-$a->strings["Version"] = "";
+$a->strings["Registered channels"] = "";
$a->strings["Active plugins"] = "";
+$a->strings["Version"] = "";
$a->strings["Site settings updated."] = "";
-$a->strings["No special theme for accessibility"] = "";
+$a->strings["experimental"] = "";
+$a->strings["unsupported"] = "";
$a->strings["Yes - with approval"] = "";
$a->strings["My site is not a public server"] = "";
$a->strings["My site has paid access only"] = "";
$a->strings["My site has free access only"] = "";
$a->strings["My site offers free accounts with optional paid upgrades"] = "";
+$a->strings["Registration"] = "";
$a->strings["File upload"] = "";
$a->strings["Policies"] = "";
$a->strings["Site name"] = "";
@@ -1503,10 +1668,10 @@ $a->strings["System theme"] = "";
$a->strings["Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"] = "";
$a->strings["Mobile system theme"] = "";
$a->strings["Theme for mobile devices"] = "";
-$a->strings["Accessibility system theme"] = "";
-$a->strings["Accessibility theme"] = "";
-$a->strings["Channel to use for this website's static pages"] = "";
-$a->strings["Site Channel"] = "";
+$a->strings["Enable Diaspora Protocol"] = "";
+$a->strings["Communicate with Diaspora and Friendica - experimental"] = "";
+$a->strings["Allow Feeds as Connections"] = "";
+$a->strings["(Heavy system resource usage)"] = "";
$a->strings["Maximum image size"] = "";
$a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "";
$a->strings["Does this site allow new member registration?"] = "";
@@ -1519,8 +1684,12 @@ $a->strings["Allowed friend domains"] = "";
$a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "";
$a->strings["Allowed email domains"] = "";
$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"] = "";
+$a->strings["Not allowed email domains"] = "";
+$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."] = "";
$a->strings["Block public"] = "";
$a->strings["Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."] = "";
+$a->strings["Verify Email Addresses"] = "";
+$a->strings["Check to verify email addresses used in account registration (recommended)."] = "";
$a->strings["Force publish"] = "";
$a->strings["Check to force all profiles on this site to be listed in the site directory."] = "";
$a->strings["Disable discovery tab"] = "";
@@ -1537,11 +1706,14 @@ $a->strings["Poll interval"] = "";
$a->strings["Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval."] = "";
$a->strings["Maximum Load Average"] = "";
$a->strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "";
+$a->strings["Expiration period in days for imported (matrix/network) content"] = "";
+$a->strings["0 for no expiration of imported content"] = "";
$a->strings["No server found"] = "";
$a->strings["ID"] = "";
$a->strings["for channel"] = "";
$a->strings["on server"] = "";
$a->strings["Status"] = "";
+$a->strings["Server"] = "";
$a->strings["Update has been marked successful"] = "";
$a->strings["Executing %s failed. Check system logs."] = "";
$a->strings["Update %s was successfully applied."] = "";
@@ -1551,6 +1723,13 @@ $a->strings["No failed updates."] = "";
$a->strings["Failed Updates"] = "";
$a->strings["Mark success (if update was manually applied)"] = "";
$a->strings["Attempt to execute this update step automatically"] = "";
+$a->strings["Queue Statistics"] = "";
+$a->strings["Total Entries"] = "";
+$a->strings["Priority"] = "";
+$a->strings["Destination URL"] = "";
+$a->strings["Mark hub permanently offline"] = "";
+$a->strings["Empty queue for this hub"] = "";
+$a->strings["Last known contact"] = "";
$a->strings["%s user blocked/unblocked"] = array(
0 => "",
1 => "",
@@ -1560,9 +1739,8 @@ $a->strings["%s user deleted"] = array(
1 => "",
);
$a->strings["Account not found"] = "";
-$a->strings["User '%s' deleted"] = "";
-$a->strings["User '%s' unblocked"] = "";
$a->strings["User '%s' blocked"] = "";
+$a->strings["User '%s' unblocked"] = "";
$a->strings["Users"] = "";
$a->strings["select all"] = "";
$a->strings["User registrations waiting for confirm"] = "";
@@ -1570,6 +1748,8 @@ $a->strings["Request date"] = "";
$a->strings["No registrations."] = "";
$a->strings["Approve"] = "";
$a->strings["Deny"] = "";
+$a->strings["Block"] = "";
+$a->strings["Unblock"] = "";
$a->strings["Register date"] = "";
$a->strings["Last login"] = "";
$a->strings["Expires"] = "";
@@ -1610,166 +1790,221 @@ $a->strings["Debugging"] = "";
$a->strings["Log file"] = "";
$a->strings["Must be writable by web server. Relative to your Red top-level directory."] = "";
$a->strings["Log level"] = "";
-$a->strings["Thing updated"] = "";
-$a->strings["Object store: failed"] = "";
-$a->strings["Thing added"] = "";
-$a->strings["OBJ: %1\$s %2\$s %3\$s"] = "";
-$a->strings["Show Thing"] = "";
-$a->strings["item not found."] = "";
-$a->strings["Edit Thing"] = "";
-$a->strings["Select a profile"] = "";
-$a->strings["Post an activity"] = "";
-$a->strings["Only sends to viewers of the applicable profile"] = "";
-$a->strings["Name of thing e.g. something"] = "";
-$a->strings["URL of thing (optional)"] = "";
-$a->strings["URL for photo of thing (optional)"] = "";
-$a->strings["Add Thing to your Profile"] = "";
-$a->strings["Nothing to import."] = "";
-$a->strings["Unable to download data from old server"] = "";
-$a->strings["Imported file is empty."] = "";
-$a->strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "";
-$a->strings["Channel clone failed. Import failed."] = "";
-$a->strings["Cloned channel not found. Import failed."] = "";
-$a->strings["Import completed."] = "";
-$a->strings["You must be logged in to use this feature."] = "";
-$a->strings["Import Channel"] = "";
-$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."] = "";
-$a->strings["File to Upload"] = "";
-$a->strings["Or provide the old server/hub details"] = "";
-$a->strings["Your old identity address (xyz@example.com)"] = "";
-$a->strings["Your old login email address"] = "";
-$a->strings["Your old login password"] = "";
-$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."] = "";
-$a->strings["Make this hub my primary location"] = "";
-$a->strings["Total invitation limit exceeded."] = "";
-$a->strings["%s : Not a valid email address."] = "";
-$a->strings["Please join us on Red"] = "";
-$a->strings["Invitation limit exceeded. Please contact your site administrator."] = "";
-$a->strings["%s : Message delivery failed."] = "";
-$a->strings["%d message sent."] = array(
- 0 => "",
- 1 => "",
-);
-$a->strings["You have no more invitations available"] = "";
-$a->strings["Send invitations"] = "";
-$a->strings["Enter email addresses, one per line:"] = "";
-$a->strings["Your message:"] = "";
-$a->strings["You are cordially invited to join me and some other close friends on the Red Matrix - a revolutionary new decentralized communication and information tool."] = "";
-$a->strings["You will need to supply this invitation code: \$invite_code"] = "";
-$a->strings["Please visit my channel at"] = "";
-$a->strings["Once you have registered (on ANY Red Matrix site - they are all inter-connected), please connect with my Red Matrix channel address:"] = "";
-$a->strings["Click the [Register] link on the following page to join."] = "";
-$a->strings["For more information about the Red Matrix Project and why it has the potential to change the internet as we know it, please visit http://getzot.com"] = "";
+$a->strings["New Profile Field"] = "";
+$a->strings["Field nickname"] = "";
+$a->strings["System name of field"] = "";
+$a->strings["Input type"] = "";
+$a->strings["Field Name"] = "";
+$a->strings["Label on profile pages"] = "";
+$a->strings["Help text"] = "";
+$a->strings["Additional info (optional)"] = "";
+$a->strings["Field definition not found"] = "";
+$a->strings["Edit Profile Field"] = "";
+$a->strings["Unable to find your hub."] = "";
+$a->strings["Post successful."] = "";
+$a->strings["Edit Block"] = "";
+$a->strings["Delete block?"] = "";
+$a->strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = "";
+$a->strings["Please indicate acceptance of the Terms of Service. Registration failed."] = "";
+$a->strings["Passwords do not match."] = "";
+$a->strings["Registration successful. Please check your email for validation instructions."] = "";
+$a->strings["Your registration is pending approval by the site owner."] = "";
+$a->strings["Your registration can not be processed."] = "";
+$a->strings["Registration on this site/hub is by approval only."] = "";
+$a->strings["<a href=\"pubsites\">Register at another affiliated site/hub</a>"] = "";
+$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "";
+$a->strings["Terms of Service"] = "";
+$a->strings["I accept the %s for this website"] = "";
+$a->strings["I am over 13 years of age and accept the %s for this website"] = "";
+$a->strings["Membership on this site is by invitation only."] = "";
+$a->strings["Please enter your invitation code"] = "";
+$a->strings["Your email address"] = "";
+$a->strings["Choose a password"] = "";
+$a->strings["Please re-enter your password"] = "";
+$a->strings["Account removals are not allowed within 48 hours of changing the account password."] = "";
+$a->strings["Remove This Account"] = "";
+$a->strings["WARNING: "] = "";
+$a->strings["This account and all its channels will be completely removed from the network. "] = "";
+$a->strings["This action is permanent and can not be undone!"] = "";
+$a->strings["Please enter your password for verification:"] = "";
+$a->strings["Remove this account, all its channels and all its channel clones from the network"] = "";
+$a->strings["By default only the instances of the channels located on this hub will be removed from the network"] = "";
$a->strings["Unable to locate original post."] = "";
$a->strings["Empty post discarded."] = "";
$a->strings["Executable content type not permitted to this channel."] = "";
$a->strings["System error. Post not saved."] = "";
+$a->strings["Unable to obtain post information from database."] = "";
$a->strings["You have reached your limit of %1$.0f top level posts."] = "";
$a->strings["You have reached your limit of %1$.0f webpages."] = "";
$a->strings["[Embedded content - reload page to view]"] = "";
-$a->strings["Help with this feature"] = "";
-$a->strings["Layout Name"] = "";
-$a->strings["Like/Dislike"] = "";
-$a->strings["This action is restricted to members."] = "";
-$a->strings["Please <a href=\"rmagic\">login with your RedMatrix ID</a> or <a href=\"register\">register as a new RedMatrix member</a> to continue."] = "";
-$a->strings["Invalid request."] = "";
-$a->strings["thing"] = "";
-$a->strings["Channel unavailable."] = "";
-$a->strings["Previous action reversed."] = "";
-$a->strings["Action completed."] = "";
-$a->strings["Thank you."] = "";
$a->strings["Remote privacy information not available."] = "";
$a->strings["Visible to:"] = "";
-$a->strings["No connections."] = "";
-$a->strings["Visit %s's profile [%s]"] = "";
-$a->strings["View Connnections"] = "";
-$a->strings["No valid account found."] = "";
-$a->strings["Password reset request issued. Check your email."] = "";
-$a->strings["Site Member (%s)"] = "";
-$a->strings["Password reset requested at %s"] = "";
-$a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "";
-$a->strings["Password Reset"] = "";
-$a->strings["Your password has been reset as requested."] = "";
-$a->strings["Your new password is"] = "";
-$a->strings["Save or copy your new password - and then"] = "";
-$a->strings["click here to login"] = "";
-$a->strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "";
-$a->strings["Your password has changed at %s"] = "";
-$a->strings["Forgot your Password?"] = "";
-$a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "";
-$a->strings["Email Address"] = "";
-$a->strings["Reset"] = "";
-$a->strings["Hub not found."] = "";
+$a->strings["Comanche page description language help"] = "";
+$a->strings["Layout Description"] = "";
+$a->strings["Download PDL file"] = "";
+$a->strings["First Name"] = "";
+$a->strings["Last Name"] = "";
+$a->strings["Nickname"] = "";
+$a->strings["Full Name"] = "";
+$a->strings["Profile Photo 16px"] = "";
+$a->strings["Profile Photo 32px"] = "";
+$a->strings["Profile Photo 48px"] = "";
+$a->strings["Profile Photo 64px"] = "";
+$a->strings["Profile Photo 80px"] = "";
+$a->strings["Profile Photo 128px"] = "";
+$a->strings["Timezone"] = "";
+$a->strings["Homepage URL"] = "";
+$a->strings["Birth Year"] = "";
+$a->strings["Birth Month"] = "";
+$a->strings["Birth Day"] = "";
+$a->strings["Birthdate"] = "";
+$a->strings["Conversation removed."] = "";
+$a->strings["No messages."] = "";
+$a->strings["Delete conversation"] = "";
+$a->strings["D, d M Y - g:i A"] = "";
+$a->strings["Unable to create element."] = "";
+$a->strings["Unable to update menu element."] = "";
+$a->strings["Unable to add menu element."] = "";
+$a->strings["Menu Item Permissions"] = "";
+$a->strings["Link Name"] = "";
+$a->strings["Link or Submenu Target"] = "";
+$a->strings["Enter URL of the link or select a menu name to create a submenu"] = "";
+$a->strings["Use magic-auth if available"] = "";
+$a->strings["Open link in new window"] = "";
+$a->strings["Order in list"] = "";
+$a->strings["Higher numbers will sink to bottom of listing"] = "";
+$a->strings["Submit and finish"] = "";
+$a->strings["Submit and continue"] = "";
+$a->strings["Menu:"] = "";
+$a->strings["Link Target"] = "";
+$a->strings["Edit menu"] = "";
+$a->strings["Edit element"] = "";
+$a->strings["Drop element"] = "";
+$a->strings["New element"] = "";
+$a->strings["Edit this menu container"] = "";
+$a->strings["Add menu element"] = "";
+$a->strings["Delete this menu item"] = "";
+$a->strings["Edit this menu item"] = "";
+$a->strings["Menu item not found."] = "";
+$a->strings["Menu item deleted."] = "";
+$a->strings["Menu item could not be deleted."] = "";
+$a->strings["Edit Menu Element"] = "";
+$a->strings["Link text"] = "";
+$a->strings["Set your current mood and tell your friends"] = "";
$a->strings["Total votes"] = "";
$a->strings["Average Rating"] = "";
+$a->strings["Channel removals are not allowed within 48 hours of changing the account password."] = "";
+$a->strings["Remove This Channel"] = "";
+$a->strings["This channel will be completely removed from the network. "] = "";
+$a->strings["Remove this channel and all its clones from the network"] = "";
+$a->strings["By default only the instance of the channel located on this hub will be removed from the network"] = "";
+$a->strings["is now connected to"] = "";
+$a->strings["Could not access address book record."] = "";
+$a->strings["Refresh failed - channel is currently unavailable."] = "";
+$a->strings["Channel has been unblocked"] = "";
+$a->strings["Channel has been blocked"] = "";
+$a->strings["Unable to set address book parameters."] = "";
+$a->strings["Channel has been unignored"] = "";
+$a->strings["Channel has been ignored"] = "";
+$a->strings["Channel has been unarchived"] = "";
+$a->strings["Channel has been archived"] = "";
+$a->strings["Channel has been unhidden"] = "";
+$a->strings["Channel has been hidden"] = "";
+$a->strings["Channel has been approved"] = "";
+$a->strings["Channel has been unapproved"] = "";
+$a->strings["Connection has been removed."] = "";
+$a->strings["View %s's profile"] = "";
+$a->strings["Refresh Permissions"] = "";
+$a->strings["Fetch updated permissions"] = "";
+$a->strings["Recent Activity"] = "";
+$a->strings["View recent posts and comments"] = "";
+$a->strings["Block (or Unblock) all communications with this connection"] = "";
+$a->strings["Unignore"] = "";
+$a->strings["Ignore"] = "";
+$a->strings["Ignore (or Unignore) all inbound communications from this connection"] = "";
+$a->strings["Unarchive"] = "";
+$a->strings["Archive"] = "";
+$a->strings["Archive (or Unarchive) this connection - mark channel dead but keep content"] = "";
+$a->strings["Unhide"] = "";
+$a->strings["Hide"] = "";
+$a->strings["Hide or Unhide this connection from your other connections"] = "";
+$a->strings["Delete this connection"] = "";
+$a->strings["Approve this connection"] = "";
+$a->strings["Accept connection to allow communication"] = "";
+$a->strings["Connections: settings for %s"] = "";
+$a->strings["Apply these permissions automatically"] = "";
+$a->strings["Apply the permissions indicated on this page to all new connections."] = "";
+$a->strings["Slide to adjust your degree of friendship"] = "";
+$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."] = "";
+$a->strings["inherited"] = "";
+$a->strings["Connection has no individual permissions!"] = "";
+$a->strings["This may be appropriate based on your <a href=\"settings\">privacy settings</a>, though you may wish to review the \"Advanced Permissions\"."] = "";
+$a->strings["Profile Visibility"] = "";
+$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "";
+$a->strings["Contact Information / Notes"] = "";
+$a->strings["Edit contact notes"] = "";
+$a->strings["Their Settings"] = "";
+$a->strings["My Settings"] = "";
+$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."] = "";
+$a->strings["Clear/Disable Automatic Permissions"] = "";
+$a->strings["Forum Members"] = "";
+$a->strings["Soapbox"] = "";
+$a->strings["Full Sharing (typical social network permissions)"] = "";
+$a->strings["Cautious Sharing "] = "";
+$a->strings["Follow Only"] = "";
+$a->strings["Individual Permissions"] = "";
+$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."] = "";
+$a->strings["Advanced Permissions"] = "";
+$a->strings["Simple Permissions (select one and submit)"] = "";
+$a->strings["Visit %s's profile - %s"] = "";
+$a->strings["Block/Unblock contact"] = "";
+$a->strings["Ignore contact"] = "";
+$a->strings["Repair URL settings"] = "";
+$a->strings["View conversations"] = "";
+$a->strings["Delete contact"] = "";
+$a->strings["Last update:"] = "";
+$a->strings["Update public posts"] = "";
+$a->strings["Update now"] = "";
+$a->strings["Currently blocked"] = "";
+$a->strings["Currently ignored"] = "";
+$a->strings["Currently archived"] = "";
+$a->strings["Currently pending"] = "";
+$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "";
+$a->strings["The error message was:"] = "";
+$a->strings["Authentication failed."] = "";
+$a->strings["Remote Authentication"] = "";
+$a->strings["Enter your channel address (e.g. channel@example.com)"] = "";
+$a->strings["Authenticate"] = "";
$a->strings["Unable to lookup recipient."] = "";
$a->strings["Unable to communicate with requested channel."] = "";
$a->strings["Cannot verify requested channel."] = "";
$a->strings["Selected channel has private message restrictions. Send failed."] = "";
-$a->strings["Messages"] = "";
$a->strings["Message deleted."] = "";
$a->strings["Message recalled."] = "";
$a->strings["Send Private Message"] = "";
$a->strings["To:"] = "";
$a->strings["Subject:"] = "";
+$a->strings["Send"] = "";
$a->strings["Message not found."] = "";
$a->strings["Delete message"] = "";
$a->strings["Recall message"] = "";
$a->strings["Message has been recalled."] = "";
$a->strings["Private Conversation"] = "";
-$a->strings["Delete conversation"] = "";
$a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "";
$a->strings["Send Reply"] = "";
-$a->strings["You have created %1$.0f of %2$.0f allowed channels."] = "";
-$a->strings["Create a new channel"] = "";
-$a->strings["Channel Manager"] = "";
-$a->strings["Current Channel"] = "";
-$a->strings["Attach to one of your channels by selecting it."] = "";
-$a->strings["Default Channel"] = "";
-$a->strings["Make Default"] = "";
-$a->strings["Wall Photos"] = "";
-$a->strings["Profile Match"] = "";
-$a->strings["No keywords to match. Please add keywords to your default profile."] = "";
-$a->strings["is interested in:"] = "";
-$a->strings["No matches"] = "";
-$a->strings["Menu updated."] = "";
-$a->strings["Unable to update menu."] = "";
-$a->strings["Menu created."] = "";
-$a->strings["Unable to create menu."] = "";
-$a->strings["Manage Menus"] = "";
-$a->strings["Drop"] = "";
-$a->strings["Create a new menu"] = "";
-$a->strings["Delete this menu"] = "";
-$a->strings["Edit menu contents"] = "";
-$a->strings["Edit this menu"] = "";
-$a->strings["New Menu"] = "";
-$a->strings["Menu name"] = "";
-$a->strings["Must be unique, only seen by you"] = "";
-$a->strings["Menu title"] = "";
-$a->strings["Menu title as seen by others"] = "";
-$a->strings["Allow bookmarks"] = "";
-$a->strings["Menu may be used to store saved bookmarks"] = "";
-$a->strings["Menu deleted."] = "";
-$a->strings["Menu could not be deleted."] = "";
-$a->strings["Edit Menu"] = "";
-$a->strings["Add or remove entries to this menu"] = "";
-$a->strings["Conversation removed."] = "";
-$a->strings["No messages."] = "";
-$a->strings["D, d M Y - g:i A"] = "";
+$a->strings["Invalid request identifier."] = "";
+$a->strings["Discard"] = "";
+$a->strings["Please login."] = "";
+$a->strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "";
$a->strings["Add a Channel"] = "";
$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."] = "";
$a->strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "] = "";
$a->strings["Choose a short nickname"] = "";
$a->strings["Your nickname will be used to create an easily remembered channel address (like an email address) which you can share with others."] = "";
$a->strings["Or <a href=\"import\">import an existing channel</a> from another location"] = "";
-$a->strings["Invalid request identifier."] = "";
-$a->strings["Discard"] = "";
-$a->strings["No more system notifications."] = "";
-$a->strings["System Notifications"] = "";
-$a->strings["Unable to find your hub."] = "";
-$a->strings["Post successful."] = "";
-$a->strings["invalid target signature"] = "";
-$a->strings["OpenID protocol error. No ID returned."] = "";
+$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"] = "";
+$a->strings["Channel Type"] = "";
+$a->strings["Read more about roles"] = "";
$a->strings["App installed."] = "";
$a->strings["Malformed app."] = "";
$a->strings["Embed code"] = "";
@@ -1782,8 +2017,29 @@ $a->strings["80 x 80 pixels - optional"] = "";
$a->strings["Version ID"] = "";
$a->strings["Price of app"] = "";
$a->strings["Location (URL) to purchase app"] = "";
+$a->strings["sent you a private message"] = "";
+$a->strings["added your channel"] = "";
+$a->strings["posted an event"] = "";
+$a->strings["No such group"] = "";
+$a->strings["No such channel"] = "";
+$a->strings["Search Results For:"] = "";
+$a->strings["Collection is empty"] = "";
+$a->strings["Collection: "] = "";
+$a->strings["Connection: "] = "";
+$a->strings["Invalid connection."] = "";
+$a->strings["Ipsum Lorem"] = "";
+$a->strings["Bookmark added"] = "";
+$a->strings["My Bookmarks"] = "";
+$a->strings["My Connections Bookmarks"] = "";
+$a->strings["Insufficient permissions. Request redirected to profile page."] = "";
+$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "";
$a->strings["Poll"] = "";
$a->strings["View Results"] = "";
+$a->strings["No service class restrictions found."] = "";
+$a->strings["Files: shared with me"] = "";
+$a->strings["NEW"] = "";
+$a->strings["Remove all files"] = "";
+$a->strings["Remove this file"] = "";
$a->strings["Schema Default"] = "";
$a->strings["Sans-Serif"] = "";
$a->strings["Monospace"] = "";
@@ -1819,10 +2075,8 @@ $a->strings["Right offset of the section element"] = "";
$a->strings["Section width"] = "";
$a->strings["Left offset of the aside"] = "";
$a->strings["Right offset of the aside element"] = "";
-$a->strings["None"] = "";
-$a->strings["Header image"] = "";
-$a->strings["Header image only on profile pages"] = "";
-$a->strings["Light (Red Matrix default)"] = "";
+$a->strings["Light (Hubzilla default)"] = "";
+$a->strings["Select scheme"] = "";
$a->strings["Narrow navbar"] = "";
$a->strings["Navigation bar background color"] = "";
$a->strings["Navigation bar gradient top color"] = "";
@@ -1843,22 +2097,24 @@ $a->strings["Set the indent for comments"] = "";
$a->strings["Set the basic color for item icons"] = "";
$a->strings["Set the hover color for item icons"] = "";
$a->strings["Set font-size for the entire application"] = "";
+$a->strings["Example: 14px"] = "";
$a->strings["Set font-color for posts and comments"] = "";
$a->strings["Set radius of corners"] = "";
$a->strings["Set shadow depth of photos"] = "";
-$a->strings["Set maximum width of conversation regions"] = "";
-$a->strings["Center conversation regions"] = "";
+$a->strings["Set maximum width of content region in pixel"] = "";
+$a->strings["Leave empty for default width"] = "";
+$a->strings["Center page content"] = "";
$a->strings["Set minimum opacity of nav bar - to hide it"] = "";
$a->strings["Set size of conversation author photo"] = "";
$a->strings["Set size of followup author photos"] = "";
-$a->strings["Sloppy photo albums"] = "";
-$a->strings["Are you a clean desk or a messy desk person?"] = "";
$a->strings["Update %s failed. See error logs."] = "";
$a->strings["Update Error at %s"] = "";
-$a->strings["Create an account to access services and applications within the Red Matrix"] = "";
+$a->strings["Create an account to access services and applications within the Hubzilla"] = "";
$a->strings["Password"] = "";
$a->strings["Remember me"] = "";
$a->strings["Forgot your password?"] = "";
-$a->strings["permission denied"] = "";
-$a->strings["Got Zot?"] = "";
$a->strings["toggle mobile"] = "";
+$a->strings["Website SSL certificate is not valid. Please correct."] = "";
+$a->strings["[red] Website SSL error for %s"] = "";
+$a->strings["Cron/Scheduled tasks not running."] = "";
+$a->strings["[red] Cron tasks not running on %s"] = "";
diff --git a/util/zotsh/README.txt b/util/zotsh/README.txt
index 5d03aec2c..3f31bba7f 100644
--- a/util/zotsh/README.txt
+++ b/util/zotsh/README.txt
@@ -14,7 +14,7 @@ Extract somewere and launch zotsh.py
Description
-----------
-ZotSH is a command line WebDAV client for RedMatrix.
+ZotSH is a command line WebDAV client for Hubzilla.
It knows how to magic-auth to remote hubs using Zot.
ZotSH uses 'easywebdav' library (0) with small modifications
diff --git a/view/cs/htconfig.tpl b/view/cs/htconfig.tpl
index 096143798..cc4087f96 100644
--- a/view/cs/htconfig.tpl
+++ b/view/cs/htconfig.tpl
@@ -30,7 +30,7 @@ $default_timezone = '{{$timezone}}';
// What is your site name?
$a->config['system']['baseurl'] = '{{$siteurl}}';
-$a->config['system']['sitename'] = "Red Matrix";
+$a->config['system']['sitename'] = "Hubzilla";
$a->config['system']['location_hash'] = '{{$site_id}}';
// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
diff --git a/view/cs/update_fail_eml.tpl b/view/cs/update_fail_eml.tpl
index a7df8fc2f..61f44b1e6 100644
--- a/view/cs/update_fail_eml.tpl
+++ b/view/cs/update_fail_eml.tpl
@@ -1,7 +1,7 @@
Hey,
I'm the web server at {{$sitename}};
-The Red Matrix 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 Red developer if you can not figure out how to
diff --git a/view/css/mod_events.css b/view/css/mod_events.css
index f2ffb9a2e..a8e6415c7 100644
--- a/view/css/mod_events.css
+++ b/view/css/mod_events.css
@@ -40,6 +40,7 @@
#event-datetime-break {
clear: both;
}
+
#event-nofinish-break {
margin-bottom: 10px;
}
@@ -51,3 +52,4 @@
#event-edit-preview-btn {
margin-right: 15px;
}
+
diff --git a/view/de/messages.po b/view/de/messages.po
index 0098fe439..ef27fd162 100644
--- a/view/de/messages.po
+++ b/view/de/messages.po
@@ -24,10 +24,10 @@
# sasiflo <transiflex@sasiflo.de>, 2014
msgid ""
msgstr ""
-"Project-Id-Version: Redmatrix\n"
+"Project-Id-Version: Red Matrix\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-01 00:03-0700\n"
-"PO-Revision-Date: 2015-05-08 12:52+0000\n"
+"POT-Creation-Date: 2015-02-20 00:04-0800\n"
+"PO-Revision-Date: 2015-02-27 09:55+0000\n"
"Last-Translator: zottel <transifex@zottel.net>\n"
"Language-Team: German (http://www.transifex.com/projects/p/red-matrix/language/de/)\n"
"MIME-Version: 1.0\n"
@@ -36,22 +36,84 @@ msgstr ""
"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../../include/dba/dba_driver.php:141
+#: ../../include/dba/dba_driver.php:142
#, php-format
msgid "Cannot locate DNS info for database server '%s'"
msgstr "Kann die DNS-Informationen für den Datenbank-Server '%s' nicht finden"
-#: ../../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
+#: ../../include/photo/photo_driver.php:680 ../../include/photos.php:52
+#: ../../mod/profile_photo.php:143 ../../mod/profile_photo.php:302
+#: ../../mod/profile_photo.php:424 ../../mod/photos.php:91
+#: ../../mod/photos.php:625
msgid "Profile Photos"
msgstr "Profilfotos"
-#: ../../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 "Das Security-Token des Formulars war nicht korrekt. Das ist wahrscheinlich passiert, weil das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde."
+#: ../../include/photos.php:15 ../../include/attach.php:137
+#: ../../include/attach.php:184 ../../include/attach.php:247
+#: ../../include/attach.php:261 ../../include/attach.php:301
+#: ../../include/attach.php:315 ../../include/attach.php:339
+#: ../../include/attach.php:532 ../../include/attach.php:606
+#: ../../include/chat.php:116 ../../include/items.php:4072
+#: ../../mod/profile.php:64 ../../mod/profile.php:72
+#: ../../mod/achievements.php:30 ../../mod/editblock.php:65
+#: ../../mod/manage.php:6 ../../mod/api.php:26 ../../mod/api.php:31
+#: ../../mod/blocks.php:67 ../../mod/blocks.php:75 ../../mod/connedit.php:321
+#: ../../mod/editpost.php:13 ../../mod/profile_photo.php:264
+#: ../../mod/profile_photo.php:277 ../../mod/block.php:22
+#: ../../mod/block.php:72 ../../mod/network.php:12 ../../mod/events.php:219
+#: ../../mod/settings.php:560 ../../mod/group.php:9 ../../mod/setup.php:207
+#: ../../mod/common.php:35 ../../mod/suggest.php:26
+#: ../../mod/connections.php:169 ../../mod/item.php:197 ../../mod/item.php:205
+#: ../../mod/item.php:938 ../../mod/thing.php:247 ../../mod/thing.php:264
+#: ../../mod/thing.php:299 ../../mod/pdledit.php:21 ../../mod/appman.php:66
+#: ../../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:118 ../../mod/rate.php:110
+#: ../../mod/invite.php:13 ../../mod/invite.php:104 ../../mod/locs.php:77
+#: ../../mod/sources.php:66 ../../mod/menu.php:61 ../../mod/filestorage.php:18
+#: ../../mod/filestorage.php:72 ../../mod/filestorage.php:87
+#: ../../mod/filestorage.php:114 ../../mod/fsuggest.php:78
+#: ../../mod/poke.php:128 ../../mod/profiles.php:188
+#: ../../mod/profiles.php:576 ../../mod/viewsrc.php:14
+#: ../../mod/webpages.php:67 ../../mod/delegate.php:6
+#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27
+#: ../../mod/regmod.php:17 ../../mod/message.php:16 ../../mod/mitem.php:106
+#: ../../mod/mood.php:111 ../../mod/layouts.php:67 ../../mod/layouts.php:74
+#: ../../mod/layouts.php:85 ../../mod/like.php:178 ../../mod/mail.php:114
+#: ../../mod/notifications.php:66 ../../mod/new_channel.php:68
+#: ../../mod/new_channel.php:99 ../../mod/photos.php:68 ../../mod/page.php:28
+#: ../../mod/page.php:78 ../../mod/bookmarks.php:46 ../../mod/channel.php:90
+#: ../../mod/channel.php:199 ../../mod/channel.php:242
+#: ../../mod/register.php:72 ../../mod/service_limits.php:7
+#: ../../mod/sharedwithme.php:7 ../../index.php:190 ../../index.php:390
+msgid "Permission denied."
+msgstr "Zugang verweigert"
+
+#: ../../include/photos.php:105
+#, php-format
+msgid "Image exceeds website size limit of %lu bytes"
+msgstr "Bild überschreitet das Limit der Webseite von %lu bytes"
+
+#: ../../include/photos.php:112
+msgid "Image file is empty."
+msgstr "Bilddatei ist leer."
+
+#: ../../include/photos.php:141 ../../mod/profile_photo.php:217
+msgid "Unable to process image"
+msgstr "Kann Bild nicht verarbeiten"
+
+#: ../../include/photos.php:213
+msgid "Photo storage failed."
+msgstr "Foto speichern schlug fehl"
+
+#: ../../include/photos.php:355 ../../include/conversation.php:1589
+msgid "Photo Albums"
+msgstr "Fotoalben"
+
+#: ../../include/photos.php:359
+msgid "Upload New Photos"
+msgstr "Lade neue Fotos hoch"
#: ../../include/notify.php:23
msgid "created a new post"
@@ -62,340 +124,879 @@ msgstr "Neuer Beitrag wurde erzeugt"
msgid "commented on %s's post"
msgstr "hat %s's Beitrag kommentiert"
-#: ../../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 "Es hat früher schon einmal eine Sammlung mit diesem Namen existiert, die gelöscht wurde. Es <strong>könnten</strong> von damals noch Elemente (Beiträge, Dateien etc.) vorhanden sein, die allen jetzigen und zukünftigen Mitgliedern dieser Sammlung den Zugriff erlauben. Wenn das nicht Dein Plan war, erstelle bitte eine neue Sammlung mit einem anderen Namen."
+#: ../../include/page_widgets.php:6
+msgid "New Page"
+msgstr "Neue Seite"
-#: ../../include/group.php:235
-msgid "Default privacy group for new contacts"
-msgstr "Standard-Sammlung für neue Kontakte"
+#: ../../include/page_widgets.php:8 ../../include/page_widgets.php:36
+#: ../../include/RedDAV/RedBrowser.php:267 ../../include/ItemObject.php:100
+#: ../../include/apps.php:254 ../../include/menu.php:42
+#: ../../mod/editblock.php:143 ../../mod/blocks.php:132
+#: ../../mod/editpost.php:113 ../../mod/settings.php:645
+#: ../../mod/connections.php:382 ../../mod/connections.php:395
+#: ../../mod/connections.php:414 ../../mod/thing.php:233
+#: ../../mod/editlayout.php:139 ../../mod/editwebpage.php:174
+#: ../../mod/menu.php:78 ../../mod/webpages.php:162 ../../mod/layouts.php:167
+msgid "Edit"
+msgstr "Bearbeiten"
-#: ../../include/group.php:254 ../../mod/admin.php:822
-msgid "All Channels"
-msgstr "Alle Kanäle"
+#: ../../include/page_widgets.php:39 ../../mod/blocks.php:135
+#: ../../mod/webpages.php:165 ../../mod/layouts.php:171
+msgid "View"
+msgstr "Ansicht"
-#: ../../include/group.php:276
-msgid "edit"
-msgstr "Bearbeiten"
+#: ../../include/page_widgets.php:40 ../../include/ItemObject.php:677
+#: ../../include/conversation.php:1152 ../../mod/events.php:651
+#: ../../mod/webpages.php:166 ../../mod/photos.php:964
+msgid "Preview"
+msgstr "Vorschau"
-#: ../../include/group.php:298
-msgid "Collections"
-msgstr "Sammlungen"
+#: ../../include/page_widgets.php:41 ../../mod/webpages.php:167
+msgid "Actions"
+msgstr "Aktionen"
-#: ../../include/group.php:299
-msgid "Edit collection"
-msgstr "Sammlung bearbeiten"
+#: ../../include/page_widgets.php:42 ../../mod/webpages.php:168
+msgid "Page Link"
+msgstr "Seiten-Link"
-#: ../../include/group.php:300
-msgid "Add new collection"
-msgstr "Neue Sammlung hinzufügen"
+#: ../../include/page_widgets.php:43 ../../mod/webpages.php:169
+msgid "Title"
+msgstr "Titel"
-#: ../../include/group.php:301
-msgid "Channels not in any collection"
-msgstr "Kanäle, die nicht in einer Sammlung sind"
+#: ../../include/page_widgets.php:44 ../../mod/webpages.php:170
+msgid "Created"
+msgstr "Erstellt"
+
+#: ../../include/page_widgets.php:45 ../../mod/webpages.php:171
+msgid "Edited"
+msgstr "Geändert"
+
+#: ../../include/widgets.php:35 ../../include/taxonomy.php:255
+#: ../../include/contact_widgets.php:92
+msgid "Categories"
+msgstr "Kategorien"
+
+#: ../../include/widgets.php:91 ../../include/nav.php:163
+#: ../../mod/apps.php:34
+msgid "Apps"
+msgstr "Apps"
+
+#: ../../include/widgets.php:92
+msgid "System"
+msgstr "System"
+
+#: ../../include/widgets.php:94 ../../include/conversation.php:1494
+msgid "Personal"
+msgstr "Persönlich"
+
+#: ../../include/widgets.php:95
+msgid "Create Personal App"
+msgstr "Persönliche App erstellen"
+
+#: ../../include/widgets.php:96
+msgid "Edit Personal App"
+msgstr "Persönliche App bearbeiten"
+
+#: ../../include/widgets.php:136 ../../include/widgets.php:175
+#: ../../include/identity.php:840 ../../include/Contact.php:107
+#: ../../include/conversation.php:940 ../../mod/suggest.php:51
+#: ../../mod/directory.php:272 ../../mod/match.php:62
+msgid "Connect"
+msgstr "Verbinden"
+
+#: ../../include/widgets.php:138 ../../mod/suggest.php:53
+msgid "Ignore/Hide"
+msgstr "Ignorieren/Verstecken"
+
+#: ../../include/widgets.php:143 ../../mod/connections.php:268
+msgid "Suggestions"
+msgstr "Vorschläge"
+
+#: ../../include/widgets.php:144
+msgid "See more..."
+msgstr "Mehr anzeigen …"
+
+#: ../../include/widgets.php:166
+#, php-format
+msgid "You have %1$.0f of %2$.0f allowed connections."
+msgstr "Du bist %1$.0f von maximal %2$.0f erlaubten Verbindungen eingegangen."
-#: ../../include/group.php:303 ../../include/widgets.php:275
+#: ../../include/widgets.php:172
+msgid "Add New Connection"
+msgstr "Neue Verbindung hinzufügen"
+
+#: ../../include/widgets.php:173
+msgid "Enter the channel address"
+msgstr "Adresse des Kanals eingeben"
+
+#: ../../include/widgets.php:174
+msgid "Example: bob@example.com, http://example.com/barbara"
+msgstr "Beispiel: bob@beispiel.com, http://beispiel.com/barbara"
+
+#: ../../include/widgets.php:190
+msgid "Notes"
+msgstr "Notizen"
+
+#: ../../include/widgets.php:192 ../../include/text.php:838
+#: ../../include/text.php:850 ../../mod/filer.php:50 ../../mod/rbmark.php:28
+#: ../../mod/rbmark.php:98 ../../mod/admin.php:1344 ../../mod/admin.php:1365
+msgid "Save"
+msgstr "Speichern"
+
+#: ../../include/widgets.php:264
+msgid "Remove term"
+msgstr "Eintrag löschen"
+
+#: ../../include/widgets.php:272 ../../include/features.php:72
+msgid "Saved Searches"
+msgstr "Gespeicherte Suchanfragen"
+
+#: ../../include/widgets.php:273 ../../include/group.php:303
msgid "add"
msgstr "hinzufügen"
-#: ../../include/account.php:27
-msgid "Not a valid email address"
-msgstr "Ungültige E-Mail-Adresse"
+#: ../../include/widgets.php:302 ../../include/features.php:84
+#: ../../include/contact_widgets.php:57
+msgid "Saved Folders"
+msgstr "Gespeicherte Ordner"
-#: ../../include/account.php:29
-msgid "Your email domain is not among those allowed on this site"
-msgstr "Deine E-Mail-Adresse ist dieser Seite nicht erlaubt"
+#: ../../include/widgets.php:305 ../../include/contact_widgets.php:60
+#: ../../include/contact_widgets.php:95
+msgid "Everything"
+msgstr "Alles"
-#: ../../include/account.php:35
-msgid "Your email address is already registered at this site."
-msgstr "Deine E-Mail-Adresse ist auf dieser Seite bereits registriert."
+#: ../../include/widgets.php:347
+msgid "Archives"
+msgstr "Archive"
-#: ../../include/account.php:67
-msgid "An invitation is required."
-msgstr "Eine Einladung ist erforderlich."
+#: ../../include/widgets.php:425
+msgid "Refresh"
+msgstr "Aktualisieren"
-#: ../../include/account.php:71
-msgid "Invitation could not be verified."
-msgstr "Die Einladung konnte nicht bestätigt werden"
+#: ../../include/widgets.php:426 ../../mod/connedit.php:563
+msgid "Me"
+msgstr "Ich"
-#: ../../include/account.php:121
-msgid "Please enter the required information."
-msgstr "Bitte gib die erforderlichen Informationen ein."
+#: ../../include/widgets.php:427 ../../mod/connedit.php:566
+msgid "Best Friends"
+msgstr "Beste Freunde"
-#: ../../include/account.php:188
-msgid "Failed to store account information."
-msgstr "Speichern der Account-Informationen fehlgeschlagen"
+#: ../../include/widgets.php:428 ../../include/identity.php:387
+#: ../../include/identity.php:388 ../../include/identity.php:395
+#: ../../include/profile_selectors.php:80 ../../mod/connedit.php:567
+#: ../../mod/settings.php:335 ../../mod/settings.php:339
+#: ../../mod/settings.php:340 ../../mod/settings.php:343
+#: ../../mod/settings.php:354
+msgid "Friends"
+msgstr "Freunde"
-#: ../../include/account.php:246
+#: ../../include/widgets.php:429
+msgid "Co-workers"
+msgstr "Kollegen"
+
+#: ../../include/widgets.php:430 ../../mod/connedit.php:568
+msgid "Former Friends"
+msgstr "ehem. Freunde"
+
+#: ../../include/widgets.php:431 ../../mod/connedit.php:569
+msgid "Acquaintances"
+msgstr "Bekannte"
+
+#: ../../include/widgets.php:432
+msgid "Everybody"
+msgstr "Jeder"
+
+#: ../../include/widgets.php:466
+msgid "Account settings"
+msgstr "Konto-Einstellungen"
+
+#: ../../include/widgets.php:472
+msgid "Channel settings"
+msgstr "Kanal-Einstellungen"
+
+#: ../../include/widgets.php:478
+msgid "Additional features"
+msgstr "Zusätzliche Funktionen"
+
+#: ../../include/widgets.php:484
+msgid "Feature/Addon settings"
+msgstr "Plugin-Einstellungen"
+
+#: ../../include/widgets.php:490
+msgid "Display settings"
+msgstr "Anzeige-Einstellungen"
+
+#: ../../include/widgets.php:496
+msgid "Connected apps"
+msgstr "Verbundene Apps"
+
+#: ../../include/widgets.php:502
+msgid "Export channel"
+msgstr "Kanal exportieren"
+
+#: ../../include/widgets.php:511 ../../mod/connedit.php:627
+msgid "Connection Default Permissions"
+msgstr "Standardzugriffsrechte für neue Verbindungen:"
+
+#: ../../include/widgets.php:519
+msgid "Premium Channel Settings"
+msgstr "Premium-Kanal-Einstellungen"
+
+#: ../../include/widgets.php:527 ../../include/features.php:61
+#: ../../mod/sources.php:88
+msgid "Channel Sources"
+msgstr "Kanal-Quellen"
+
+#: ../../include/widgets.php:535 ../../include/nav.php:210
+#: ../../include/apps.php:134 ../../mod/admin.php:956 ../../mod/admin.php:1161
+msgid "Settings"
+msgstr "Einstellungen"
+
+#: ../../include/widgets.php:548 ../../mod/message.php:31
+#: ../../mod/mail.php:128
+msgid "Messages"
+msgstr "Nachrichten"
+
+#: ../../include/widgets.php:551
+msgid "Check Mail"
+msgstr "E-Mails abrufen"
+
+#: ../../include/widgets.php:556 ../../include/nav.php:201
+msgid "New Message"
+msgstr "Neue Nachricht"
+
+#: ../../include/widgets.php:634
+msgid "Chat Rooms"
+msgstr "Chaträume"
+
+#: ../../include/widgets.php:654
+msgid "Bookmarked Chatrooms"
+msgstr "Gespeicherte Chatrooms"
+
+#: ../../include/widgets.php:674
+msgid "Suggested Chatrooms"
+msgstr "Chatraum-Vorschläge"
+
+#: ../../include/widgets.php:801 ../../include/widgets.php:859
+msgid "photo/image"
+msgstr "Foto/Bild"
+
+#: ../../include/widgets.php:954 ../../include/widgets.php:956
+msgid "Rate Me"
+msgstr "Bewerte mich"
+
+#: ../../include/widgets.php:960
+msgid "View Ratings"
+msgstr "Bewertungen ansehen"
+
+#: ../../include/widgets.php:971
+msgid "Public Hubs"
+msgstr "Öffentliche Hubs"
+
+#: ../../include/enotify.php:41
+msgid "Red Matrix Notification"
+msgstr "Red Matrix Benachrichtigung"
+
+#: ../../include/enotify.php:42
+msgid "redmatrix"
+msgstr "redmatrix"
+
+#: ../../include/enotify.php:44
+msgid "Thank You,"
+msgstr "Danke."
+
+#: ../../include/enotify.php:46
#, php-format
-msgid "Registration confirmation for %s"
-msgstr "Registrierungsbestätigung für %s"
+msgid "%s Administrator"
+msgstr "der Administrator von %s"
-#: ../../include/account.php:312
+#: ../../include/enotify.php:81
#, php-format
-msgid "Registration request at %s"
-msgstr "Registrierungsanfrage auf %s"
+msgid "%s <!item_type!>"
+msgstr "%s <!item_type!>"
-#: ../../include/account.php:314 ../../include/account.php:341
-#: ../../include/account.php:401
-msgid "Administrator"
-msgstr "Administrator"
+#: ../../include/enotify.php:85
+#, php-format
+msgid "[Red:Notify] New mail received at %s"
+msgstr "[Red:Benachrichtigung] Neue Mail auf %s empfangen"
-#: ../../include/account.php:336
-msgid "your registration password"
-msgstr "Dein Registrierungspasswort"
+#: ../../include/enotify.php:87
+#, php-format
+msgid "%1$s, %2$s sent you a new private message at %3$s."
+msgstr "%1$s, %2$s hat Dir eine private Nachricht auf %3$s gesendet."
-#: ../../include/account.php:339 ../../include/account.php:399
+#: ../../include/enotify.php:88
#, php-format
-msgid "Registration details for %s"
-msgstr "Registrierungsdetails für %s"
+msgid "%1$s sent you %2$s."
+msgstr "%1$s hat Dir %2$s geschickt."
-#: ../../include/account.php:408
-msgid "Account approved."
-msgstr "Account bestätigt."
+#: ../../include/enotify.php:88
+msgid "a private message"
+msgstr "eine private Nachricht"
-#: ../../include/account.php:447
+#: ../../include/enotify.php:89
#, php-format
-msgid "Registration revoked for %s"
-msgstr "Registrierung für %s widerrufen"
+msgid "Please visit %s to view and/or reply to your private messages."
+msgstr "Bitte besuche %s, um die private Nachricht anzusehen und/oder darauf zu antworten."
-#: ../../include/account.php:492
-msgid "Account verified. Please login."
-msgstr "Konto geprüft. Bitte melde Dich an!"
+#: ../../include/enotify.php:144
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
+msgstr "%1$s, %2$s hat [zrl=%3$s]einen %4$s[/zrl] kommentiert"
-#: ../../include/account.php:705 ../../include/account.php:707
-msgid "Click here to upgrade."
-msgstr "Klicke hier, um das Upgrade durchzuführen."
+#: ../../include/enotify.php:152
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
+msgstr "%1$s, %2$s hat [zrl=%3$s]%4$ss %5$s[/zrl] kommentiert"
-#: ../../include/account.php:713
-msgid "This action exceeds the limits set by your subscription plan."
-msgstr "Diese Aktion überschreitet die Grenzen Ihres Abonnements."
+#: ../../include/enotify.php:161
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
+msgstr "%1$s, %2$s hat [zrl=%3$s]Deinen %4$s[/zrl] kommentiert"
-#: ../../include/account.php:718
-msgid "This action is not available under your subscription plan."
-msgstr "Diese Aktion ist in Ihrem Abonnement nicht verfügbar."
+#: ../../include/enotify.php:172
+#, php-format
+msgid "[Red:Notify] Comment to conversation #%1$d by %2$s"
+msgstr "[Red:Benachrichtigung] Kommentar in Unterhaltung #%1$d von %2$s"
-#: ../../include/datetime.php:48
-msgid "Miscellaneous"
-msgstr "Verschiedenes"
+#: ../../include/enotify.php:173
+#, php-format
+msgid "%1$s, %2$s commented on an item/conversation you have been following."
+msgstr "%1$s, %2$s hat eine Unterhaltung kommentiert, der Du folgst."
-#: ../../include/datetime.php:132
-msgid "YYYY-MM-DD or MM-DD"
-msgstr "JJJJ-MM-TT oder MM-TT"
+#: ../../include/enotify.php:176 ../../include/enotify.php:191
+#: ../../include/enotify.php:217 ../../include/enotify.php:236
+#: ../../include/enotify.php:250
+#, php-format
+msgid "Please visit %s to view and/or reply to the conversation."
+msgstr "Bitte besuche %s, um die Unterhaltung anzusehen und/oder zu kommentieren."
-#: ../../include/datetime.php:235 ../../mod/events.php:635
-#: ../../mod/appman.php:91 ../../mod/appman.php:92
-msgid "Required"
-msgstr "Erforderlich"
+#: ../../include/enotify.php:182
+#, php-format
+msgid "[Red:Notify] %s posted to your profile wall"
+msgstr "[Red:Hinweis] %s schrieb auf Deine Pinnwand"
-#: ../../include/datetime.php:262 ../../boot.php:2342
-msgid "never"
-msgstr "Nie"
+#: ../../include/enotify.php:184
+#, php-format
+msgid "%1$s, %2$s posted to your profile wall at %3$s"
+msgstr "%1$s, %2$s hat auf Deine Pinnwand auf %3$s geschrieben"
-#: ../../include/datetime.php:268
-msgid "less than a second ago"
-msgstr "Vor weniger als einer Sekunde"
+#: ../../include/enotify.php:186
+#, php-format
+msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
+msgstr "%1$s, %2$s hat auf [zrl=%3$s]Deine Pinnwand[/zrl] geschrieben"
-#: ../../include/datetime.php:271
-msgid "year"
-msgstr "Jahr"
+#: ../../include/enotify.php:210
+#, php-format
+msgid "[Red:Notify] %s tagged you"
+msgstr "[Red:Benachrichtigung] %s hat Dich erwähnt"
-#: ../../include/datetime.php:271
-msgid "years"
-msgstr "Jahre"
+#: ../../include/enotify.php:211
+#, php-format
+msgid "%1$s, %2$s tagged you at %3$s"
+msgstr "%1$s, %2$s hat Dich auf %3$s erwähnt"
-#: ../../include/datetime.php:272
-msgid "month"
-msgstr "Monat"
+#: ../../include/enotify.php:212
+#, php-format
+msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
+msgstr "%1$s, %2$s [zrl=%3$s]hat Dich erwähnt[/zrl]."
-#: ../../include/datetime.php:272
-msgid "months"
-msgstr "Monate"
+#: ../../include/enotify.php:225
+#, php-format
+msgid "[Red:Notify] %1$s poked you"
+msgstr "[Red:Benachrichtigung] %1$s hat Dich angestupst"
-#: ../../include/datetime.php:273
-msgid "week"
-msgstr "Woche"
+#: ../../include/enotify.php:226
+#, php-format
+msgid "%1$s, %2$s poked you at %3$s"
+msgstr "%1$s, %2$s hat Dich auf %3$s angestupst"
-#: ../../include/datetime.php:273
-msgid "weeks"
-msgstr "Wochen"
+#: ../../include/enotify.php:227
+#, php-format
+msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
+msgstr "%1$s, %2$s [zrl=%2$s]hat Dich angestupst[/zrl]."
-#: ../../include/datetime.php:274
-msgid "day"
-msgstr "Tag"
+#: ../../include/enotify.php:243
+#, php-format
+msgid "[Red:Notify] %s tagged your post"
+msgstr "[Red:Benachrichtigung] %s hat Deinen Beitrag verschlagwortet"
-#: ../../include/datetime.php:274
-msgid "days"
-msgstr "Tage"
+#: ../../include/enotify.php:244
+#, php-format
+msgid "%1$s, %2$s tagged your post at %3$s"
+msgstr "%1$s, %2$s hat Deinen Beitrag auf %3$s verschlagwortet"
-#: ../../include/datetime.php:275
-msgid "hour"
-msgstr "Stunde"
+#: ../../include/enotify.php:245
+#, php-format
+msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
+msgstr "%1$s, %2$s hat [zrl=%3$s]Deinen Beitrag[/zrl] verschlagwortet"
-#: ../../include/datetime.php:275
-msgid "hours"
-msgstr "Stunden"
+#: ../../include/enotify.php:257
+msgid "[Red:Notify] Introduction received"
+msgstr "[Red:Benachrichtigung] Vorstellung erhalten"
-#: ../../include/datetime.php:276
-msgid "minute"
-msgstr "Minute"
+#: ../../include/enotify.php:258
+#, php-format
+msgid "%1$s, you've received an new connection request from '%2$s' at %3$s"
+msgstr "%1$s, Du hast eine neue Verbindungsanfrage von '%2$s' auf %3$s erhalten"
-#: ../../include/datetime.php:276
-msgid "minutes"
-msgstr "Minuten"
+#: ../../include/enotify.php:259
+#, php-format
+msgid ""
+"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s."
+msgstr "%1$s, Du hast [zrl=%2$s]eine neue Verbindungsanfrage[/zrl] von %3$s erhalten."
-#: ../../include/datetime.php:277
-msgid "second"
-msgstr "Sekunde"
+#: ../../include/enotify.php:263 ../../include/enotify.php:282
+#, php-format
+msgid "You may visit their profile at %s"
+msgstr "Du kannst Dir das Profil unter %s ansehen"
-#: ../../include/datetime.php:277
-msgid "seconds"
-msgstr "Sekunden"
+#: ../../include/enotify.php:265
+#, php-format
+msgid "Please visit %s to approve or reject the connection request."
+msgstr "Bitte besuche %s , um die Verbindungsanfrage anzunehmen oder abzulehnen."
-#: ../../include/datetime.php:285
+#: ../../include/enotify.php:272
+msgid "[Red:Notify] Friend suggestion received"
+msgstr "[Red:Benachrichtigung] Freundschaftsvorschlag erhalten"
+
+#: ../../include/enotify.php:273
#, php-format
-msgctxt "e.g. 22 hours ago, 1 minute ago"
-msgid "%1$d %2$s ago"
-msgstr "vor %1$d %2$s"
+msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
+msgstr "%1$s, Du hast einen Kontaktvorschlag von „%2$s“ auf %3$s erhalten"
-#: ../../include/datetime.php:519
+#: ../../include/enotify.php:274
#, php-format
-msgid "%1$s's birthday"
-msgstr "%1$ss Geburtstag"
+msgid ""
+"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from "
+"%4$s."
+msgstr "%1$s, Du hast [zrl=%2$s]einen Kontaktvorschlag[/zrl] für %3$s von %4$s erhalten."
+
+#: ../../include/enotify.php:280
+msgid "Name:"
+msgstr "Name:"
+
+#: ../../include/enotify.php:281
+msgid "Photo:"
+msgstr "Foto:"
-#: ../../include/datetime.php:520
+#: ../../include/enotify.php:284
#, php-format
-msgid "Happy Birthday %1$s"
-msgstr "Alles Gute zum Geburtstag, %1$s"
+msgid "Please visit %s to approve or reject the suggestion."
+msgstr "Bitte besuche %s um den Vorschlag zu akzeptieren oder abzulehnen."
-#: ../../include/page_widgets.php:6
-msgid "New Page"
-msgstr "Neue Seite"
+#: ../../include/enotify.php:499
+msgid "[Red:Notify]"
+msgstr "[Red:Benachrichtigung]"
-#: ../../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 "Bearbeiten"
+#: ../../include/text.php:320
+msgid "prev"
+msgstr "vorherige"
-#: ../../include/page_widgets.php:39 ../../mod/webpages.php:185
-#: ../../mod/blocks.php:158 ../../mod/layouts.php:187
-msgid "View"
-msgstr "Ansicht"
+#: ../../include/text.php:322
+msgid "first"
+msgstr "erste"
-#: ../../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
-msgid "Preview"
-msgstr "Vorschau"
+#: ../../include/text.php:351
+msgid "last"
+msgstr "letzte"
-#: ../../include/page_widgets.php:41 ../../mod/webpages.php:187
-msgid "Actions"
-msgstr "Aktionen"
+#: ../../include/text.php:354
+msgid "next"
+msgstr "nächste"
-#: ../../include/page_widgets.php:42 ../../mod/webpages.php:188
-msgid "Page Link"
-msgstr "Seiten-Link"
+#: ../../include/text.php:366
+msgid "older"
+msgstr "älter"
-#: ../../include/page_widgets.php:43
-msgid "Title"
-msgstr "Titel"
+#: ../../include/text.php:368
+msgid "newer"
+msgstr "neuer"
-#: ../../include/page_widgets.php:44 ../../mod/webpages.php:190
-#: ../../mod/blocks.php:149 ../../mod/layouts.php:180
-msgid "Created"
-msgstr "Erstellt"
+#: ../../include/text.php:751
+msgid "No connections"
+msgstr "Keine Verbindungen"
-#: ../../include/page_widgets.php:45 ../../mod/webpages.php:191
-#: ../../mod/blocks.php:150 ../../mod/layouts.php:181
-msgid "Edited"
-msgstr "Geändert"
+#: ../../include/text.php:767
+#, php-format
+msgid "%d Connection"
+msgid_plural "%d Connections"
+msgstr[0] "%d Verbindung"
+msgstr[1] "%d Verbindungen"
-#: ../../include/api.php:1158
-msgid "Public Timeline"
-msgstr "Öffentliche Zeitleiste"
+#: ../../include/text.php:780 ../../mod/viewconnections.php:86
+msgid "View Connections"
+msgstr "Verbindungen anzeigen"
-#: ../../include/comanche.php:34 ../../mod/admin.php:386
-#: ../../view/theme/apw/php/config.php:185
-msgid "Default"
+#: ../../include/text.php:837 ../../include/text.php:849
+#: ../../include/nav.php:165 ../../include/apps.php:147
+#: ../../mod/search.php:34
+msgid "Search"
+msgstr "Suche"
+
+#: ../../include/text.php:916
+msgid "poke"
+msgstr "anstupsen"
+
+#: ../../include/text.php:916 ../../include/conversation.php:243
+msgid "poked"
+msgstr "stupste"
+
+#: ../../include/text.php:917
+msgid "ping"
+msgstr "anpingen"
+
+#: ../../include/text.php:917
+msgid "pinged"
+msgstr "pingte"
+
+#: ../../include/text.php:918
+msgid "prod"
+msgstr "knuffen"
+
+#: ../../include/text.php:918
+msgid "prodded"
+msgstr "knuffte"
+
+#: ../../include/text.php:919
+msgid "slap"
+msgstr "ohrfeigen"
+
+#: ../../include/text.php:919
+msgid "slapped"
+msgstr "ohrfeigte"
+
+#: ../../include/text.php:920
+msgid "finger"
+msgstr "befummeln"
+
+#: ../../include/text.php:920
+msgid "fingered"
+msgstr "befummelte"
+
+#: ../../include/text.php:921
+msgid "rebuff"
+msgstr "eine Abfuhr erteilen"
+
+#: ../../include/text.php:921
+msgid "rebuffed"
+msgstr "zurückgewiesen"
+
+#: ../../include/text.php:931
+msgid "happy"
+msgstr "glücklich"
+
+#: ../../include/text.php:932
+msgid "sad"
+msgstr "traurig"
+
+#: ../../include/text.php:933
+msgid "mellow"
+msgstr "sanft"
+
+#: ../../include/text.php:934
+msgid "tired"
+msgstr "müde"
+
+#: ../../include/text.php:935
+msgid "perky"
+msgstr "frech"
+
+#: ../../include/text.php:936
+msgid "angry"
+msgstr "sauer"
+
+#: ../../include/text.php:937
+msgid "stupified"
+msgstr "verblüfft"
+
+#: ../../include/text.php:938
+msgid "puzzled"
+msgstr "verwirrt"
+
+#: ../../include/text.php:939
+msgid "interested"
+msgstr "interessiert"
+
+#: ../../include/text.php:940
+msgid "bitter"
+msgstr "verbittert"
+
+#: ../../include/text.php:941
+msgid "cheerful"
+msgstr "fröhlich"
+
+#: ../../include/text.php:942
+msgid "alive"
+msgstr "lebendig"
+
+#: ../../include/text.php:943
+msgid "annoyed"
+msgstr "verärgert"
+
+#: ../../include/text.php:944
+msgid "anxious"
+msgstr "unruhig"
+
+#: ../../include/text.php:945
+msgid "cranky"
+msgstr "schrullig"
+
+#: ../../include/text.php:946
+msgid "disturbed"
+msgstr "verstört"
+
+#: ../../include/text.php:947
+msgid "frustrated"
+msgstr "frustriert"
+
+#: ../../include/text.php:948
+msgid "depressed"
+msgstr "deprimiert"
+
+#: ../../include/text.php:949
+msgid "motivated"
+msgstr "motiviert"
+
+#: ../../include/text.php:950
+msgid "relaxed"
+msgstr "entspannt"
+
+#: ../../include/text.php:951
+msgid "surprised"
+msgstr "überrascht"
+
+#: ../../include/text.php:1117
+msgid "Monday"
+msgstr "Montag"
+
+#: ../../include/text.php:1117
+msgid "Tuesday"
+msgstr "Dienstag"
+
+#: ../../include/text.php:1117
+msgid "Wednesday"
+msgstr "Mittwoch"
+
+#: ../../include/text.php:1117
+msgid "Thursday"
+msgstr "Donnerstag"
+
+#: ../../include/text.php:1117
+msgid "Friday"
+msgstr "Freitag"
+
+#: ../../include/text.php:1117
+msgid "Saturday"
+msgstr "Samstag"
+
+#: ../../include/text.php:1117
+msgid "Sunday"
+msgstr "Sonntag"
+
+#: ../../include/text.php:1121
+msgid "January"
+msgstr "Januar"
+
+#: ../../include/text.php:1121
+msgid "February"
+msgstr "Februar"
+
+#: ../../include/text.php:1121
+msgid "March"
+msgstr "März"
+
+#: ../../include/text.php:1121
+msgid "April"
+msgstr "April"
+
+#: ../../include/text.php:1121
+msgid "May"
+msgstr "Mai"
+
+#: ../../include/text.php:1121
+msgid "June"
+msgstr "Juni"
+
+#: ../../include/text.php:1121
+msgid "July"
+msgstr "Juli"
+
+#: ../../include/text.php:1121
+msgid "August"
+msgstr "August"
+
+#: ../../include/text.php:1121
+msgid "September"
+msgstr "September"
+
+#: ../../include/text.php:1121
+msgid "October"
+msgstr "Oktober"
+
+#: ../../include/text.php:1121
+msgid "November"
+msgstr "November"
+
+#: ../../include/text.php:1121
+msgid "December"
+msgstr "Dezember"
+
+#: ../../include/text.php:1199
+msgid "unknown.???"
+msgstr "unbekannt.???"
+
+#: ../../include/text.php:1200
+msgid "bytes"
+msgstr "Bytes"
+
+#: ../../include/text.php:1236
+msgid "remove category"
+msgstr "Kategorie entfernen"
+
+#: ../../include/text.php:1305
+msgid "remove from file"
+msgstr "aus der Datei entfernen"
+
+#: ../../include/text.php:1381 ../../include/text.php:1392
+#: ../../mod/connedit.php:635
+msgid "Click to open/close"
+msgstr "Klicke zum Öffnen/Schließen"
+
+#: ../../include/text.php:1540 ../../mod/events.php:444
+msgid "Link to Source"
+msgstr "Link zur Quelle"
+
+#: ../../include/text.php:1559
+msgid "Select a page layout: "
+msgstr "Ein Seiten-Layout auswählen:"
+
+#: ../../include/text.php:1562 ../../include/text.php:1622
+msgid "default"
msgstr "Standard"
-#: ../../include/dir_fns.php:143
-msgid "Directory Options"
-msgstr "Verzeichnisoptionen"
+#: ../../include/text.php:1595
+msgid "Page content type: "
+msgstr "Content-Typ der Seite:"
-#: ../../include/dir_fns.php:144
-msgid "Alphabetic"
-msgstr "alphabetisch"
+#: ../../include/text.php:1634
+msgid "Select an alternate language"
+msgstr "Wähle eine alternative Sprache"
-#: ../../include/dir_fns.php:145
-msgid "Reverse Alphabetic"
-msgstr "Entgegengesetzt alphabetisch"
+#: ../../include/text.php:1753 ../../include/diaspora.php:1909
+#: ../../include/conversation.php:120 ../../mod/subthread.php:72
+#: ../../mod/subthread.php:174 ../../mod/tagger.php:43 ../../mod/like.php:335
+msgid "photo"
+msgstr "Foto"
-#: ../../include/dir_fns.php:146
-msgid "Newest to Oldest"
-msgstr "Neueste zuerst"
+#: ../../include/text.php:1756 ../../include/conversation.php:123
+#: ../../mod/tagger.php:47 ../../mod/like.php:337
+msgid "event"
+msgstr "Termin"
-#: ../../include/dir_fns.php:147
-msgid "Oldest to Newest"
-msgstr "Älteste zuerst"
+#: ../../include/text.php:1759 ../../include/diaspora.php:1909
+#: ../../include/conversation.php:148 ../../mod/subthread.php:72
+#: ../../mod/subthread.php:174 ../../mod/tagger.php:51 ../../mod/like.php:335
+msgid "status"
+msgstr "Status"
-#: ../../include/dir_fns.php:148
-msgid "Sort"
-msgstr "Sortieren"
+#: ../../include/text.php:1761 ../../include/conversation.php:150
+#: ../../mod/tagger.php:53
+msgid "comment"
+msgstr "Kommentar"
-#: ../../include/dir_fns.php:152
-msgid "Safe Mode"
-msgstr "Sicherer Modus"
+#: ../../include/text.php:1766
+msgid "activity"
+msgstr "Aktivität"
-#: ../../include/dir_fns.php:154
-msgid "Public Forums Only"
-msgstr "Nur öffentliche Foren"
+#: ../../include/text.php:2053
+msgid "Design"
+msgstr "Design"
-#: ../../include/dir_fns.php:155
-msgid "This Website Only"
-msgstr "Nur diese Website"
+#: ../../include/text.php:2056
+msgid "Blocks"
+msgstr "Blöcke"
-#: ../../include/event.php:19 ../../include/bb2diaspora.php:451
-msgid "l F d, Y \\@ g:i A"
-msgstr "l, d. F Y, H:i"
+#: ../../include/text.php:2057
+msgid "Menus"
+msgstr "Menüs"
-#: ../../include/event.php:27 ../../include/bb2diaspora.php:457
-msgid "Starts:"
-msgstr "Beginnt:"
+#: ../../include/text.php:2058
+msgid "Layouts"
+msgstr "Layouts"
-#: ../../include/event.php:37 ../../include/bb2diaspora.php:465
-msgid "Finishes:"
-msgstr "Endet:"
+#: ../../include/text.php:2059
+msgid "Pages"
+msgstr "Seiten"
-#: ../../include/event.php:47 ../../include/bb2diaspora.php:473
-#: ../../include/identity.php:874 ../../mod/events.php:647
-#: ../../mod/directory.php:234
-msgid "Location:"
-msgstr "Ort:"
+#: ../../include/text.php:2395 ../../include/RedDAV/RedBrowser.php:130
+msgid "Collection"
+msgstr "Ordner"
-#: ../../include/event.php:391
-msgid "This event has been added to your calendar."
-msgstr "Dieser Termin wurde zu Deinem Kalender hinzugefügt"
+#: ../../include/attach.php:242 ../../include/attach.php:296
+msgid "Item was not found."
+msgstr "Beitrag wurde nicht gefunden."
+
+#: ../../include/attach.php:352
+msgid "No source file."
+msgstr "Keine Quelldatei."
+
+#: ../../include/attach.php:369
+msgid "Cannot locate file to replace"
+msgstr "Kann Datei zum Ersetzen nicht finden"
+
+#: ../../include/attach.php:387
+msgid "Cannot locate file to revise/update"
+msgstr "Kann Datei zum Prüfen/Aktualisieren nicht finden"
+
+#: ../../include/attach.php:398
+#, php-format
+msgid "File exceeds size limit of %d"
+msgstr "Datei überschreitet das Größen-Limit von %d"
+
+#: ../../include/attach.php:410
+#, php-format
+msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
+msgstr "Die Größe Deiner Datei-Anhänge hat das Maximum von %1$.0f MByte erreicht."
+
+#: ../../include/attach.php:493
+msgid "File upload failed. Possible system limit or action terminated."
+msgstr "Datei-Upload fehlgeschlagen. Mögliche Systembegrenzung oder abgebrochener Prozess."
+
+#: ../../include/attach.php:505
+msgid "Stored file could not be verified. Upload failed."
+msgstr "Gespeichert Datei konnte nicht verifiziert werden. Upload abgebrochen."
+
+#: ../../include/attach.php:547 ../../include/attach.php:564
+msgid "Path not available."
+msgstr "Pfad nicht verfügbar."
+
+#: ../../include/attach.php:611
+msgid "Empty pathname"
+msgstr "Leere Pfadangabe"
+
+#: ../../include/attach.php:627
+msgid "duplicate filename or path"
+msgstr "doppelter Dateiname oder Pfad"
+
+#: ../../include/attach.php:651
+msgid "Path not found."
+msgstr "Pfad nicht gefunden."
+
+#: ../../include/attach.php:702
+msgid "mkdir failed."
+msgstr "mkdir fehlgeschlagen."
+
+#: ../../include/attach.php:706
+msgid "database storage failed."
+msgstr "Speichern in der Datenbank fehlgeschlagen."
#: ../../include/js_strings.php:5
msgid "Delete this item?"
msgstr "Dieses Element löschen?"
#: ../../include/js_strings.php:6 ../../include/ItemObject.php:667
-#: ../../mod/photos.php:968 ../../mod/photos.php:1086
+#: ../../mod/photos.php:962 ../../mod/photos.php:1080
msgid "Comment"
msgstr "Kommentar"
@@ -460,215 +1061,199 @@ msgid "Describe (optional)"
msgstr "Beschreibung (optional)"
#: ../../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
+#: ../../mod/xchan.php:11 ../../mod/connedit.php:653 ../../mod/connect.php:93
+#: ../../mod/events.php:654 ../../mod/settings.php:583
+#: ../../mod/settings.php:708 ../../mod/settings.php:737
+#: ../../mod/settings.php:760 ../../mod/settings.php:842
+#: ../../mod/settings.php:1038 ../../mod/group.php:81 ../../mod/setup.php:313
+#: ../../mod/setup.php:358 ../../mod/thing.php:284 ../../mod/thing.php:327
+#: ../../mod/pdledit.php:58 ../../mod/appman.php:99 ../../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:155
+#: ../../mod/fsuggest.php:108 ../../mod/poke.php:166
+#: ../../mod/profiles.php:667 ../../mod/admin.php:416 ../../mod/admin.php:728
+#: ../../mod/admin.php:864 ../../mod/admin.php:997 ../../mod/admin.php:1196
+#: ../../mod/admin.php:1283 ../../mod/mood.php:134 ../../mod/mail.php:355
+#: ../../mod/photos.php:565 ../../mod/photos.php:642 ../../mod/photos.php:923
+#: ../../mod/photos.php:963 ../../mod/photos.php:1081 ../../mod/poll.php:68
#: ../../view/theme/apw/php/config.php:256
-#: ../../view/theme/redbasic/php/config.php:97
+#: ../../view/theme/redbasic/php/config.php:99
msgid "Submit"
msgstr "Bestätigen"
-#: ../../include/js_strings.php:23
-msgid "Please enter a link URL"
-msgstr "Bitte geben Sie eine Link-URL ein"
-
#: ../../include/js_strings.php:24
-msgid "Unsaved changes. Are you sure you wish to leave this page?"
-msgstr "Ungespeicherte Änderungen. Sind Sie sicher, dass Sie diese Seite verlassen möchten?"
-
-#: ../../include/js_strings.php:26
msgid "timeago.prefixAgo"
msgstr "timeago.prefixAgo"
-#: ../../include/js_strings.php:27
+#: ../../include/js_strings.php:25
msgid "timeago.prefixFromNow"
msgstr " "
-#: ../../include/js_strings.php:28
+#: ../../include/js_strings.php:26
msgid "ago"
msgstr "her"
-#: ../../include/js_strings.php:29
+#: ../../include/js_strings.php:27
msgid "from now"
msgstr "von jetzt"
-#: ../../include/js_strings.php:30
+#: ../../include/js_strings.php:28
msgid "less than a minute"
msgstr "weniger als eine Minute"
-#: ../../include/js_strings.php:31
+#: ../../include/js_strings.php:29
msgid "about a minute"
msgstr "ungefähr eine Minute"
-#: ../../include/js_strings.php:32
+#: ../../include/js_strings.php:30
#, php-format
msgid "%d minutes"
msgstr "%d Minuten"
-#: ../../include/js_strings.php:33
+#: ../../include/js_strings.php:31
msgid "about an hour"
msgstr "ungefähr eine Stunde"
-#: ../../include/js_strings.php:34
+#: ../../include/js_strings.php:32
#, php-format
msgid "about %d hours"
msgstr "ungefähr %d Stunden"
-#: ../../include/js_strings.php:35
+#: ../../include/js_strings.php:33
msgid "a day"
msgstr "ein Tag"
-#: ../../include/js_strings.php:36
+#: ../../include/js_strings.php:34
#, php-format
msgid "%d days"
msgstr "%d Tage"
-#: ../../include/js_strings.php:37
+#: ../../include/js_strings.php:35
msgid "about a month"
msgstr "ungefähr ein Monat"
-#: ../../include/js_strings.php:38
+#: ../../include/js_strings.php:36
#, php-format
msgid "%d months"
msgstr "%d Monate"
-#: ../../include/js_strings.php:39
+#: ../../include/js_strings.php:37
msgid "about a year"
msgstr "ungefähr ein Jahr"
-#: ../../include/js_strings.php:40
+#: ../../include/js_strings.php:38
#, php-format
msgid "%d years"
msgstr "%d Jahre"
-#: ../../include/js_strings.php:41
+#: ../../include/js_strings.php:39
msgid " "
msgstr " "
-#: ../../include/js_strings.php:42
+#: ../../include/js_strings.php:40
msgid "timeago.numbers"
msgstr "timeago.numbers"
-#: ../../include/RedDAV/RedBrowser.php:107
-#: ../../include/RedDAV/RedBrowser.php:268
+#: ../../include/RedDAV/RedBrowser.php:106
+#: ../../include/RedDAV/RedBrowser.php:266
msgid "parent"
msgstr "Übergeordnetes Verzeichnis"
-#: ../../include/RedDAV/RedBrowser.php:131 ../../include/text.php:2497
-msgid "Collection"
-msgstr "Ordner"
-
-#: ../../include/RedDAV/RedBrowser.php:134
+#: ../../include/RedDAV/RedBrowser.php:133
msgid "Principal"
msgstr "Prinzipal"
-#: ../../include/RedDAV/RedBrowser.php:137
+#: ../../include/RedDAV/RedBrowser.php:136
msgid "Addressbook"
msgstr "Adressbuch"
-#: ../../include/RedDAV/RedBrowser.php:140
+#: ../../include/RedDAV/RedBrowser.php:139
msgid "Calendar"
msgstr "Kalender"
-#: ../../include/RedDAV/RedBrowser.php:143
+#: ../../include/RedDAV/RedBrowser.php:142
msgid "Schedule Inbox"
msgstr "Posteingang für überwachte Kalender"
-#: ../../include/RedDAV/RedBrowser.php:146
+#: ../../include/RedDAV/RedBrowser.php:145
msgid "Schedule Outbox"
msgstr "Postausgang für überwachte Kalender"
-#: ../../include/RedDAV/RedBrowser.php:164 ../../include/conversation.php:1019
-#: ../../include/apps.php:336 ../../include/apps.php:387
-#: ../../mod/photos.php:681 ../../mod/photos.php:1119
+#: ../../include/RedDAV/RedBrowser.php:163 ../../include/apps.php:336
+#: ../../include/apps.php:387 ../../include/conversation.php:1019
+#: ../../mod/connedit.php:570 ../../mod/photos.php:681
+#: ../../mod/photos.php:1113
msgid "Unknown"
msgstr "Unbekannt"
-#: ../../include/RedDAV/RedBrowser.php:227
+#: ../../include/RedDAV/RedBrowser.php:225
#, php-format
msgid "%1$s used"
msgstr "%1$s verwendet"
-#: ../../include/RedDAV/RedBrowser.php:232
+#: ../../include/RedDAV/RedBrowser.php:230
#, php-format
msgid "%1$s used of %2$s (%3$s&#37;)"
msgstr "%1$s von %2$s verwendet (%3$s&#37;)"
-#: ../../include/RedDAV/RedBrowser.php:251 ../../include/nav.php:98
-#: ../../include/conversation.php:1609 ../../include/apps.php:135
+#: ../../include/RedDAV/RedBrowser.php:249 ../../include/nav.php:98
+#: ../../include/apps.php:135 ../../include/conversation.php:1595
#: ../../mod/fbrowser.php:114
msgid "Files"
msgstr "Dateien"
-#: ../../include/RedDAV/RedBrowser.php:253
+#: ../../include/RedDAV/RedBrowser.php:251
msgid "Total"
msgstr "Summe"
-#: ../../include/RedDAV/RedBrowser.php:255
+#: ../../include/RedDAV/RedBrowser.php:253
msgid "Shared"
msgstr "Geteilt"
-#: ../../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:254
+#: ../../include/RedDAV/RedBrowser.php:303 ../../mod/menu.php:100
+#: ../../mod/mitem.php:169 ../../mod/new_channel.php:121
msgid "Create"
msgstr "Erstelle"
-#: ../../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:255
+#: ../../include/RedDAV/RedBrowser.php:305 ../../mod/profile_photo.php:362
+#: ../../mod/photos.php:706 ../../mod/photos.php:1228
msgid "Upload"
msgstr "Hochladen"
-#: ../../include/RedDAV/RedBrowser.php:264 ../../mod/settings.php:584
-#: ../../mod/settings.php:610 ../../mod/admin.php:953
-#: ../../mod/sharedwithme.php:95
+#: ../../include/RedDAV/RedBrowser.php:262 ../../mod/settings.php:585
+#: ../../mod/settings.php:611 ../../mod/admin.php:871
+#: ../../mod/sharedwithme.php:100
msgid "Name"
msgstr "Name"
-#: ../../include/RedDAV/RedBrowser.php:265
+#: ../../include/RedDAV/RedBrowser.php:263
msgid "Type"
msgstr "Typ"
-#: ../../include/RedDAV/RedBrowser.php:266 ../../mod/sharedwithme.php:97
+#: ../../include/RedDAV/RedBrowser.php:264 ../../mod/sharedwithme.php:101
msgid "Size"
msgstr "Größe"
-#: ../../include/RedDAV/RedBrowser.php:267 ../../mod/sharedwithme.php:98
+#: ../../include/RedDAV/RedBrowser.php:265 ../../mod/sharedwithme.php:102
msgid "Last Modified"
msgstr "Zuletzt geändert"
-#: ../../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:268 ../../include/ItemObject.php:120
+#: ../../include/apps.php:255 ../../include/conversation.php:645
+#: ../../mod/connedit.php:533 ../../mod/settings.php:646
+#: ../../mod/group.php:176 ../../mod/thing.php:234 ../../mod/admin.php:735
+#: ../../mod/admin.php:866 ../../mod/photos.php:1044
msgid "Delete"
msgstr "Löschen"
-#: ../../include/RedDAV/RedBrowser.php:305
+#: ../../include/RedDAV/RedBrowser.php:302
msgid "Create new folder"
msgstr "Neuen Ordner anlegen"
-#: ../../include/RedDAV/RedBrowser.php:307
+#: ../../include/RedDAV/RedBrowser.php:304
msgid "Upload file"
msgstr "Datei hochladen"
@@ -677,9 +1262,54 @@ msgstr "Datei hochladen"
msgid "%1$s's bookmarks"
msgstr "%1$ss Lesezeichen"
-#: ../../include/network.php:632
-msgid "view full size"
-msgstr "In Vollbildansicht anschauen"
+#: ../../include/taxonomy.php:215 ../../include/taxonomy.php:234
+msgid "Tags"
+msgstr "Schlagwörter"
+
+#: ../../include/taxonomy.php:274
+msgid "Keywords"
+msgstr "Schlüsselwörter"
+
+#: ../../include/taxonomy.php:299
+msgid "have"
+msgstr "habe"
+
+#: ../../include/taxonomy.php:299
+msgid "has"
+msgstr "hat"
+
+#: ../../include/taxonomy.php:300
+msgid "want"
+msgstr "will"
+
+#: ../../include/taxonomy.php:300
+msgid "wants"
+msgstr "will"
+
+#: ../../include/taxonomy.php:301 ../../include/ItemObject.php:254
+msgid "like"
+msgstr "mag"
+
+#: ../../include/taxonomy.php:301
+msgid "likes"
+msgstr "gefällt"
+
+#: ../../include/taxonomy.php:302 ../../include/ItemObject.php:255
+msgid "dislike"
+msgstr "verurteile"
+
+#: ../../include/taxonomy.php:302
+msgid "dislikes"
+msgstr "missfällt"
+
+#: ../../include/taxonomy.php:385 ../../include/identity.php:1155
+#: ../../include/ItemObject.php:179 ../../include/conversation.php:1692
+#: ../../mod/photos.php:1001
+msgctxt "noun"
+msgid "Like"
+msgid_plural "Likes"
+msgstr[0] "Gefällt mir"
+msgstr[1] "Gefällt mir"
#: ../../include/features.php:38
msgid "General Features"
@@ -731,7 +1361,7 @@ msgstr "Private Notizen"
#: ../../include/features.php:45
msgid "Enables a tool to store notes and reminders"
-msgstr "Aktiviert ein Werkzeug zum Speichern von Notizen und Erinnerungen"
+msgstr "Werkzeug zum Speichern von Notizen und Erinnerungen aktivieren"
#: ../../include/features.php:46
msgid "Navigation Channel Select"
@@ -741,586 +1371,200 @@ msgstr "Kanal-Auswahl in der Navigationsleiste"
msgid "Change channels directly from within the navigation dropdown menu"
msgstr "Wechsle direkt über das Navigationsmenü zu anderen Kanälen"
-#: ../../include/features.php:47
-msgid "Photo Location"
-msgstr "Aufnahmeort"
+#: ../../include/features.php:50
+msgid "Extended Identity Sharing"
+msgstr "Erweitertes Teilen von Identitäten"
-#: ../../include/features.php:47
-msgid "If location data is available on uploaded photos, link this to a map."
-msgstr "Aufnahmeort auf einer Karte verlinken, falls verfügbar."
+#: ../../include/features.php:50
+msgid ""
+"Share your identity with all websites on the internet. When disabled, "
+"identity is only shared with sites in the matrix."
+msgstr "Teile Deine Identität mit allen Webseiten im Internet. Ist dies deaktiviert, wird Deine Identität nur mit Red-Servern geteilt."
-#: ../../include/features.php:49
+#: ../../include/features.php:51
msgid "Expert Mode"
msgstr "Expertenmodus"
-#: ../../include/features.php:49
+#: ../../include/features.php:51
msgid "Enable Expert Mode to provide advanced configuration options"
msgstr "Aktiviere den Expertenmodus, um fortgeschrittene Konfigurationsoptionen zu aktivieren"
-#: ../../include/features.php:50
+#: ../../include/features.php:52
msgid "Premium Channel"
msgstr "Premium-Kanal"
-#: ../../include/features.php:50
+#: ../../include/features.php:52
msgid ""
"Allows you to set restrictions and terms on those that connect with your "
"channel"
msgstr "Ermöglicht es, Einschränkungen und Bedingungen für Verbindungen dieses Kanals festzulegen"
-#: ../../include/features.php:55
+#: ../../include/features.php:57
msgid "Post Composition Features"
msgstr "Nachbearbeitungsfunktionen"
-#: ../../include/features.php:57
+#: ../../include/features.php:59
msgid "Use Markdown"
msgstr "Markdown benutzen"
-#: ../../include/features.php:57
+#: ../../include/features.php:59
msgid "Allow use of \"Markdown\" to format posts"
msgstr "Erlaube die Verwendung von \"Markdown\"-Syntax zur Formatierung von Beiträgen"
-#: ../../include/features.php:58
+#: ../../include/features.php:60
msgid "Large Photos"
msgstr "Große Fotos"
-#: ../../include/features.php:58
+#: ../../include/features.php:60
msgid ""
"Include large (640px) photo thumbnails in posts. If not enabled, use small "
"(320px) photo thumbnails"
msgstr "Große Vorschaubilder (640px) in Beiträgen anzeigen. Ist das deaktiviert, werden kleine Vorschaubilder (320px) angezeigt."
-#: ../../include/features.php:59 ../../include/widgets.php:546
-#: ../../mod/sources.php:88
-msgid "Channel Sources"
-msgstr "Kanal-Quellen"
-
-#: ../../include/features.php:59
+#: ../../include/features.php:61
msgid "Automatically import channel content from other channels or feeds"
msgstr "Importiere automatisch Inhalte für diesen Kanal von anderen Kanälen oder Feeds"
-#: ../../include/features.php:60
+#: ../../include/features.php:62
msgid "Even More Encryption"
msgstr "Noch mehr Verschlüsselung"
-#: ../../include/features.php:60
+#: ../../include/features.php:62
msgid ""
"Allow optional encryption of content end-to-end with a shared secret key"
msgstr "Erlaube optionale Verschlüsselung von Inhalten (Ende-zu-Ende mit geteiltem Sicherheitsschlüssel)"
-#: ../../include/features.php:61
+#: ../../include/features.php:63
msgid "Enable voting tools"
msgstr "Umfragewerkzeuge aktivieren"
-#: ../../include/features.php:61
+#: ../../include/features.php:63
msgid "Provide a class of post which others can vote on"
msgstr "Aktiviere die Umfragewerkzeuge, um anderen die Möglichkeit zu geben, Deinem Beitrag zuzustimmen, ihn abzulehnen oder sich zu enthalten. (Muss im Beitrag selbst noch aktiviert werden.)"
-#: ../../include/features.php:67
+#: ../../include/features.php:64
+msgid "Flag Adult Photos"
+msgstr "Nicht jugendfreie Fotos markieren"
+
+#: ../../include/features.php:64
+msgid "Provide photo edit option to hide adult photos from default album view"
+msgstr "Stellt eine Option zum Verstecken von Fotos mit nicht jugendfreien Inhalten in der Standard-Albumansicht bereit"
+
+#: ../../include/features.php:69
msgid "Network and Stream Filtering"
msgstr "Netzwerk- und Stream-Filter"
-#: ../../include/features.php:68
+#: ../../include/features.php:70
msgid "Search by Date"
msgstr "Suche nach Datum"
-#: ../../include/features.php:68
+#: ../../include/features.php:70
msgid "Ability to select posts by date ranges"
msgstr "Möglichkeit, Beiträge nach Zeiträumen auszuwählen"
-#: ../../include/features.php:69
+#: ../../include/features.php:71
msgid "Collections Filter"
msgstr "Filter für Sammlung"
-#: ../../include/features.php:69
+#: ../../include/features.php:71
msgid "Enable widget to display Network posts only from selected collections"
msgstr "Aktiviere nur Netzwerk-Beiträge von ausgewählten Sammlungen"
-#: ../../include/features.php:70 ../../include/widgets.php:274
-msgid "Saved Searches"
-msgstr "Gespeicherte Suchanfragen"
-
-#: ../../include/features.php:70
+#: ../../include/features.php:72
msgid "Save search terms for re-use"
msgstr "Suchbegriffe zur Wiederverwendung abspeichern"
-#: ../../include/features.php:71
+#: ../../include/features.php:73
msgid "Network Personal Tab"
msgstr "Persönlicher Netzwerkreiter"
-#: ../../include/features.php:71
+#: ../../include/features.php:73
msgid "Enable tab to display only Network posts that you've interacted on"
msgstr "Aktiviere Reiter nur für die Netzwerk-Beiträge, mit denen Du interagiert hast"
-#: ../../include/features.php:72
+#: ../../include/features.php:74
msgid "Network New Tab"
msgstr "Netzwerkreiter Neu"
-#: ../../include/features.php:72
+#: ../../include/features.php:74
msgid "Enable tab to display all new Network activity"
msgstr "Aktiviere Reiter, um alle neuen Netzwerkaktivitäten zu zeigen"
-#: ../../include/features.php:73
+#: ../../include/features.php:75
msgid "Affinity Tool"
-msgstr "Beziehungswerkzeug"
+msgstr "Beziehungs-Tool"
-#: ../../include/features.php:73
+#: ../../include/features.php:75
msgid "Filter stream activity by depth of relationships"
msgstr "Filter Aktivitätenstream nach Tiefe der Beziehung"
-#: ../../include/features.php:74
+#: ../../include/features.php:76
msgid "Suggest Channels"
msgstr "Kanäle vorschlagen"
-#: ../../include/features.php:74
+#: ../../include/features.php:76
msgid "Show channel suggestions"
msgstr "Kanalvorschläge anzeigen"
-#: ../../include/features.php:79
+#: ../../include/features.php:81
msgid "Post/Comment Tools"
-msgstr "Beitrag-/Kommentarwerkzeuge"
+msgstr "Beitrag-/Kommentar-Tools"
-#: ../../include/features.php:80
+#: ../../include/features.php:82
msgid "Tagging"
msgstr "Verschlagworten"
-#: ../../include/features.php:80
+#: ../../include/features.php:82
msgid "Ability to tag existing posts"
msgstr "Möglichkeit, um existierende Beiträge zu verschlagworten"
-#: ../../include/features.php:81
+#: ../../include/features.php:83
msgid "Post Categories"
msgstr "Beitrags-Kategorien"
-#: ../../include/features.php:81
+#: ../../include/features.php:83
msgid "Add categories to your posts"
msgstr "Kategorien für Beiträge"
-#: ../../include/features.php:82 ../../include/widgets.php:304
-#: ../../include/contact_widgets.php:57
-msgid "Saved Folders"
-msgstr "Gespeicherte Ordner"
-
-#: ../../include/features.php:82
+#: ../../include/features.php:84
msgid "Ability to file posts under folders"
msgstr "Möglichkeit, Beiträge in Verzeichnissen zu sammeln"
-#: ../../include/features.php:83
+#: ../../include/features.php:85
msgid "Dislike Posts"
msgstr "Gefällt-mir-nicht Beiträge"
-#: ../../include/features.php:83
+#: ../../include/features.php:85
msgid "Ability to dislike posts/comments"
msgstr "„Gefällt mir nicht“ ermöglichen"
-#: ../../include/features.php:84
+#: ../../include/features.php:86
msgid "Star Posts"
msgstr "Beiträge mit Sternchen versehen"
-#: ../../include/features.php:84
+#: ../../include/features.php:86
msgid "Ability to mark special posts with a star indicator"
msgstr "Möglichkeit, spezielle Beiträge mit Sternchen-Symbol zu markieren"
-#: ../../include/features.php:85
+#: ../../include/features.php:87
msgid "Tag Cloud"
msgstr "Schlagwort-Wolke"
-#: ../../include/features.php:85
+#: ../../include/features.php:87
msgid "Provide a personal tag cloud on your channel page"
msgstr "Persönliche Schlagwort-Wolke auf Deiner Kanal-Seite anzeigen"
-#: ../../include/widgets.php:35 ../../include/taxonomy.php:264
-#: ../../include/contact_widgets.php:92
-msgid "Categories"
-msgstr "Kategorien"
-
-#: ../../include/widgets.php:91 ../../include/nav.php:163
-#: ../../mod/apps.php:34
-msgid "Apps"
-msgstr "Apps"
-
-#: ../../include/widgets.php:92
-msgid "System"
-msgstr "System"
-
-#: ../../include/widgets.php:94 ../../include/conversation.php:1504
-msgid "Personal"
-msgstr "Persönlich"
-
-#: ../../include/widgets.php:95
-msgid "Create Personal App"
-msgstr "Persönliche App erstellen"
-
-#: ../../include/widgets.php:96
-msgid "Edit Personal App"
-msgstr "Persönliche App bearbeiten"
-
-#: ../../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
-msgid "Connect"
-msgstr "Verbinden"
-
-#: ../../include/widgets.php:138 ../../mod/suggest.php:54
-msgid "Ignore/Hide"
-msgstr "Ignorieren/Verstecken"
-
-#: ../../include/widgets.php:143 ../../mod/connections.php:268
-msgid "Suggestions"
-msgstr "Vorschläge"
-
-#: ../../include/widgets.php:144
-msgid "See more..."
-msgstr "Mehr anzeigen …"
-
-#: ../../include/widgets.php:166
-#, php-format
-msgid "You have %1$.0f of %2$.0f allowed connections."
-msgstr "Du bist %1$.0f von maximal %2$.0f erlaubten Verbindungen eingegangen."
-
-#: ../../include/widgets.php:172
-msgid "Add New Connection"
-msgstr "Neue Verbindung hinzufügen"
-
-#: ../../include/widgets.php:173
-msgid "Enter the channel address"
-msgstr "Adresse des Kanals eingeben"
-
-#: ../../include/widgets.php:174
-msgid "Example: bob@example.com, http://example.com/barbara"
-msgstr "Beispiel: bob@beispiel.com, http://beispiel.com/barbara"
-
-#: ../../include/widgets.php:190
-msgid "Notes"
-msgstr "Notizen"
-
-#: ../../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 "Speichern"
-
-#: ../../include/widgets.php:266
-msgid "Remove term"
-msgstr "Eintrag löschen"
-
-#: ../../include/widgets.php:307 ../../include/contact_widgets.php:60
-#: ../../include/contact_widgets.php:95
-msgid "Everything"
-msgstr "Alles"
-
-#: ../../include/widgets.php:349
-msgid "Archives"
-msgstr "Archive"
-
-#: ../../include/widgets.php:427 ../../mod/connedit.php:572
-msgid "Me"
-msgstr "Ich"
-
-#: ../../include/widgets.php:428 ../../mod/connedit.php:573
-msgid "Family"
-msgstr "Familie"
-
-#: ../../include/widgets.php:429 ../../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
-msgid "Friends"
-msgstr "Freunde"
-
-#: ../../include/widgets.php:430 ../../mod/connedit.php:575
-msgid "Acquaintances"
-msgstr "Bekannte"
-
-#: ../../include/widgets.php:431 ../../mod/connections.php:231
-#: ../../mod/connections.php:246 ../../mod/connedit.php:576
-msgid "All"
-msgstr "Alle"
-
-#: ../../include/widgets.php:450
-msgid "Refresh"
-msgstr "Aktualisieren"
-
-#: ../../include/widgets.php:485
-msgid "Account settings"
-msgstr "Konto-Einstellungen"
-
-#: ../../include/widgets.php:491
-msgid "Channel settings"
-msgstr "Kanal-Einstellungen"
-
-#: ../../include/widgets.php:497
-msgid "Additional features"
-msgstr "Zusätzliche Funktionen"
-
-#: ../../include/widgets.php:503
-msgid "Feature/Addon settings"
-msgstr "Plugin-Einstellungen"
-
-#: ../../include/widgets.php:509
-msgid "Display settings"
-msgstr "Anzeige-Einstellungen"
-
-#: ../../include/widgets.php:515
-msgid "Connected apps"
-msgstr "Verbundene Apps"
-
-#: ../../include/widgets.php:521
-msgid "Export channel"
-msgstr "Kanal exportieren"
-
-#: ../../include/widgets.php:530 ../../mod/connedit.php:653
-msgid "Connection Default Permissions"
-msgstr "Standardzugriffsrechte für neue Verbindungen:"
-
-#: ../../include/widgets.php:538
-msgid "Premium Channel Settings"
-msgstr "Premium-Kanal-Einstellungen"
-
-#: ../../include/widgets.php:554 ../../include/nav.php:208
-#: ../../include/apps.php:134 ../../mod/admin.php:1038
-#: ../../mod/admin.php:1238
-msgid "Settings"
-msgstr "Einstellungen"
-
-#: ../../include/widgets.php:567 ../../mod/message.php:31
-#: ../../mod/mail.php:128
-msgid "Messages"
-msgstr "Nachrichten"
-
-#: ../../include/widgets.php:570
-msgid "Check Mail"
-msgstr "E-Mails abrufen"
-
-#: ../../include/widgets.php:575 ../../include/nav.php:199
-msgid "New Message"
-msgstr "Neue Nachricht"
-
-#: ../../include/widgets.php:650
-msgid "Chat Rooms"
-msgstr "Chaträume"
-
-#: ../../include/widgets.php:670
-msgid "Bookmarked Chatrooms"
-msgstr "Gespeicherte Chatrooms"
-
-#: ../../include/widgets.php:690
-msgid "Suggested Chatrooms"
-msgstr "Chatraum-Vorschläge"
-
-#: ../../include/widgets.php:817 ../../include/widgets.php:875
-msgid "photo/image"
-msgstr "Foto/Bild"
-
-#: ../../include/widgets.php:970 ../../include/widgets.php:972
-msgid "Rate Me"
-msgstr "Bewerte mich"
-
-#: ../../include/widgets.php:976
-msgid "View Ratings"
-msgstr "Bewertungen ansehen"
-
-#: ../../include/widgets.php:987
-msgid "Public Hubs"
-msgstr "Öffentliche Hubs"
-
-#: ../../include/enotify.php:58
-msgid "Red Matrix Notification"
-msgstr "Red Matrix Benachrichtigung"
-
-#: ../../include/enotify.php:59
-msgid "redmatrix"
-msgstr "redmatrix"
-
-#: ../../include/enotify.php:61
-msgid "Thank You,"
-msgstr "Danke."
-
-#: ../../include/enotify.php:63
-#, php-format
-msgid "%s Administrator"
-msgstr "der Administrator von %s"
-
-#: ../../include/enotify.php:96
-#, php-format
-msgid "%s <!item_type!>"
-msgstr "%s <!item_type!>"
-
-#: ../../include/enotify.php:100
-#, php-format
-msgid "[Red:Notify] New mail received at %s"
-msgstr "[Red:Benachrichtigung] Neue Mail auf %s empfangen"
-
-#: ../../include/enotify.php:102
-#, php-format
-msgid "%1$s, %2$s sent you a new private message at %3$s."
-msgstr "%1$s, %2$s hat Dir eine private Nachricht auf %3$s gesendet."
-
-#: ../../include/enotify.php:103
-#, php-format
-msgid "%1$s sent you %2$s."
-msgstr "%1$s hat Dir %2$s geschickt."
-
-#: ../../include/enotify.php:103
-msgid "a private message"
-msgstr "eine private Nachricht"
-
-#: ../../include/enotify.php:104
-#, php-format
-msgid "Please visit %s to view and/or reply to your private messages."
-msgstr "Bitte besuche %s, um die private Nachricht anzusehen und/oder darauf zu antworten."
-
-#: ../../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 hat [zrl=%3$s]einen %4$s[/zrl] kommentiert"
-
-#: ../../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 hat [zrl=%3$s]%4$ss %5$s[/zrl] kommentiert"
-
-#: ../../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 hat [zrl=%3$s]Deinen %4$s[/zrl] kommentiert"
-
-#: ../../include/enotify.php:186
-#, php-format
-msgid "[Red:Notify] Comment to conversation #%1$d by %2$s"
-msgstr "[Red:Benachrichtigung] Kommentar in Unterhaltung #%1$d von %2$s"
-
-#: ../../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 hat eine Unterhaltung kommentiert, der Du folgst."
-
-#: ../../include/enotify.php:190 ../../include/enotify.php:205
-#: ../../include/enotify.php:231 ../../include/enotify.php:249
-#: ../../include/enotify.php:263
-#, php-format
-msgid "Please visit %s to view and/or reply to the conversation."
-msgstr "Bitte besuche %s, um die Unterhaltung anzusehen und/oder zu kommentieren."
-
-#: ../../include/enotify.php:196
-#, php-format
-msgid "[Red:Notify] %s posted to your profile wall"
-msgstr "[Red:Hinweis] %s schrieb auf Deine Pinnwand"
-
-#: ../../include/enotify.php:198
-#, php-format
-msgid "%1$s, %2$s posted to your profile wall at %3$s"
-msgstr "%1$s, %2$s hat auf Deine Pinnwand auf %3$s geschrieben"
-
-#: ../../include/enotify.php:200
-#, php-format
-msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
-msgstr "%1$s, %2$s hat auf [zrl=%3$s]Deine Pinnwand[/zrl] geschrieben"
-
-#: ../../include/enotify.php:224
-#, php-format
-msgid "[Red:Notify] %s tagged you"
-msgstr "[Red:Benachrichtigung] %s hat Dich erwähnt"
-
-#: ../../include/enotify.php:225
-#, php-format
-msgid "%1$s, %2$s tagged you at %3$s"
-msgstr "%1$s, %2$s hat Dich auf %3$s erwähnt"
-
-#: ../../include/enotify.php:226
-#, php-format
-msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
-msgstr "%1$s, %2$s [zrl=%3$s]hat Dich erwähnt[/zrl]."
-
-#: ../../include/enotify.php:238
-#, php-format
-msgid "[Red:Notify] %1$s poked you"
-msgstr "[Red:Benachrichtigung] %1$s hat Dich angestupst"
-
-#: ../../include/enotify.php:239
-#, php-format
-msgid "%1$s, %2$s poked you at %3$s"
-msgstr "%1$s, %2$s hat Dich auf %3$s angestupst"
-
-#: ../../include/enotify.php:240
-#, php-format
-msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
-msgstr "%1$s, %2$s [zrl=%2$s]hat Dich angestupst[/zrl]."
-
-#: ../../include/enotify.php:256
-#, php-format
-msgid "[Red:Notify] %s tagged your post"
-msgstr "[Red:Benachrichtigung] %s hat Deinen Beitrag verschlagwortet"
-
-#: ../../include/enotify.php:257
-#, php-format
-msgid "%1$s, %2$s tagged your post at %3$s"
-msgstr "%1$s, %2$s hat Deinen Beitrag auf %3$s verschlagwortet"
-
-#: ../../include/enotify.php:258
-#, php-format
-msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
-msgstr "%1$s, %2$s hat [zrl=%3$s]Deinen Beitrag[/zrl] verschlagwortet"
-
-#: ../../include/enotify.php:270
-msgid "[Red:Notify] Introduction received"
-msgstr "[Red:Benachrichtigung] Vorstellung erhalten"
-
-#: ../../include/enotify.php:271
-#, php-format
-msgid "%1$s, you've received an new connection request from '%2$s' at %3$s"
-msgstr "%1$s, Du hast eine neue Verbindungsanfrage von '%2$s' auf %3$s erhalten"
-
-#: ../../include/enotify.php:272
-#, php-format
-msgid ""
-"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s."
-msgstr "%1$s, Du hast [zrl=%2$s]eine neue Verbindungsanfrage[/zrl] von %3$s erhalten."
-
-#: ../../include/enotify.php:276 ../../include/enotify.php:295
-#, php-format
-msgid "You may visit their profile at %s"
-msgstr "Du kannst Dir das Profil unter %s ansehen"
-
-#: ../../include/enotify.php:278
-#, php-format
-msgid "Please visit %s to approve or reject the connection request."
-msgstr "Bitte besuche %s , um die Verbindungsanfrage anzunehmen oder abzulehnen."
-
-#: ../../include/enotify.php:285
-msgid "[Red:Notify] Friend suggestion received"
-msgstr "[Red:Benachrichtigung] Freundschaftsvorschlag erhalten"
-
-#: ../../include/enotify.php:286
-#, php-format
-msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
-msgstr "%1$s, Du hast einen Kontaktvorschlag von „%2$s“ auf %3$s erhalten"
-
-#: ../../include/enotify.php:287
-#, php-format
-msgid ""
-"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from "
-"%4$s."
-msgstr "%1$s, Du hast [zrl=%2$s]einen Kontaktvorschlag[/zrl] für %3$s von %4$s erhalten."
-
-#: ../../include/enotify.php:293
-msgid "Name:"
-msgstr "Name:"
-
-#: ../../include/enotify.php:294
-msgid "Photo:"
-msgstr "Foto:"
+#: ../../include/auth.php:130
+msgid "Logged out."
+msgstr "Ausgeloggt."
-#: ../../include/enotify.php:297
-#, php-format
-msgid "Please visit %s to approve or reject the suggestion."
-msgstr "Bitte besuche %s um den Vorschlag zu akzeptieren oder abzulehnen."
+#: ../../include/auth.php:271
+msgid "Failed authentication"
+msgstr "Authentifizierung fehlgeschlagen"
-#: ../../include/enotify.php:508
-msgid "[Red:Notify]"
-msgstr "[Red:Benachrichtigung]"
+#: ../../include/auth.php:285 ../../mod/openid.php:190
+msgid "Login failed."
+msgstr "Login fehlgeschlagen."
#: ../../include/contact_selectors.php:56
msgid "Frequently"
@@ -1358,9 +1602,8 @@ msgstr "OStatus"
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
+#: ../../include/contact_selectors.php:79 ../../mod/admin.php:731
+#: ../../mod/admin.php:740 ../../boot.php:1554
msgid "Email"
msgstr "E-Mail"
@@ -1388,663 +1631,476 @@ msgstr "XMPP/IM"
msgid "MySpace"
msgstr "MySpace"
-#: ../../include/message.php:18
-msgid "No recipient provided."
-msgstr "Kein Empfänger angegeben"
-
-#: ../../include/message.php:23
-msgid "[no subject]"
-msgstr "[no subject]"
-
-#: ../../include/message.php:45
-msgid "Unable to determine sender."
-msgstr "Kann Absender nicht bestimmen."
-
-#: ../../include/message.php:200
-msgid "Stored post could not be verified."
-msgstr "Gespeicherter Beitrag konnten nicht überprüft werden."
-
-#: ../../include/follow.php:28
-msgid "Channel is blocked on this site."
-msgstr "Der Kanal ist auf dieser Seite blockiert "
-
-#: ../../include/follow.php:33
-msgid "Channel location missing."
-msgstr "Adresse des Kanals fehlt."
-
-#: ../../include/follow.php:83
-msgid "Response from remote channel was incomplete."
-msgstr "Antwort des entfernten Kanals war unvollständig."
-
-#: ../../include/follow.php:100
-msgid "Channel was deleted and no longer exists."
-msgstr "Kanal wurde gelöscht und existiert nicht mehr."
-
-#: ../../include/follow.php:135 ../../include/follow.php:197
-msgid "Protocol disabled."
-msgstr "Protokoll deaktiviert."
-
-#: ../../include/follow.php:170
-msgid "Channel discovery failed."
-msgstr "Kanalsuche fehlgeschlagen"
-
-#: ../../include/follow.php:186
-msgid "local account not found."
-msgstr "Lokales Konto nicht gefunden."
-
-#: ../../include/follow.php:215
-msgid "Cannot connect to yourself."
-msgstr "Du kannst Dich nicht mit Dir selbst verbinden."
-
-#: ../../include/ItemObject.php:89 ../../include/conversation.php:667
-msgid "Private Message"
-msgstr "Private Nachricht"
-
-#: ../../include/ItemObject.php:126 ../../include/conversation.php:659
-msgid "Select"
-msgstr "Auswählen"
-
-#: ../../include/ItemObject.php:130
-msgid "Save to Folder"
-msgstr "In Ordner speichern"
-
-#: ../../include/ItemObject.php:151
-msgid "I will attend"
-msgstr "Ich werde teilnehmen"
-
-#: ../../include/ItemObject.php:151
-msgid "I will not attend"
-msgstr "Ich werde nicht teilnehmen"
-
-#: ../../include/ItemObject.php:151
-msgid "I might attend"
-msgstr "Ich werde vielleicht teilnehmen"
-
-#: ../../include/ItemObject.php:161
-msgid "I agree"
-msgstr "Ich stimme zu"
-
-#: ../../include/ItemObject.php:161
-msgid "I disagree"
-msgstr "Ich lehne ab"
-
-#: ../../include/ItemObject.php:161
-msgid "I abstain"
-msgstr "Ich enthalte mich"
-
-#: ../../include/ItemObject.php:175 ../../include/ItemObject.php:187
-#: ../../include/conversation.php:1677 ../../mod/photos.php:1003
-#: ../../mod/photos.php:1015
-msgid "View all"
-msgstr "Alles anzeigen"
-
-#: ../../include/ItemObject.php:179 ../../include/taxonomy.php:396
-#: ../../include/conversation.php:1701 ../../include/identity.php:1133
-#: ../../mod/photos.php:1007
-msgctxt "noun"
-msgid "Like"
-msgid_plural "Likes"
-msgstr[0] "Gefällt mir"
-msgstr[1] "Gefällt mir"
-
-#: ../../include/ItemObject.php:184 ../../include/conversation.php:1704
-#: ../../mod/photos.php:1012
-msgctxt "noun"
-msgid "Dislike"
-msgid_plural "Dislikes"
-msgstr[0] "Gefällt nicht"
-msgstr[1] "Gefällt nicht"
-
-#: ../../include/ItemObject.php:212
-msgid "Add Star"
-msgstr "Stern hinzufügen"
-
-#: ../../include/ItemObject.php:213
-msgid "Remove Star"
-msgstr "Stern entfernen"
-
-#: ../../include/ItemObject.php:214
-msgid "Toggle Star Status"
-msgstr "Markierungsstatus (Stern) umschalten"
-
-#: ../../include/ItemObject.php:218
-msgid "starred"
-msgstr "markiert"
-
-#: ../../include/ItemObject.php:227 ../../include/conversation.php:674
-msgid "Message signature validated"
-msgstr "Signatur überprüft"
+#: ../../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 "Es hat früher schon einmal eine Sammlung mit diesem Namen existiert, die gelöscht wurde. Es <strong>könnten</strong> von damals noch Elemente (Beiträge, Dateien etc.) vorhanden sein, die allen jetzigen und zukünftigen Mitgliedern dieser Sammlung den Zugriff erlauben. Wenn das nicht Dein Plan war, erstelle bitte eine neue Sammlung mit einem anderen Namen."
-#: ../../include/ItemObject.php:228 ../../include/conversation.php:675
-msgid "Message signature incorrect"
-msgstr "Signatur nicht korrekt"
+#: ../../include/group.php:235
+msgid "Default privacy group for new contacts"
+msgstr "Standard-Sammlung für neue Kontakte"
-#: ../../include/ItemObject.php:236
-msgid "Add Tag"
-msgstr "Tag hinzufügen"
+#: ../../include/group.php:254 ../../mod/admin.php:740
+msgid "All Channels"
+msgstr "Alle Kanäle"
-#: ../../include/ItemObject.php:254 ../../mod/photos.php:947
-msgid "I like this (toggle)"
-msgstr "Mir gefällt das (Umschalter)"
+#: ../../include/group.php:276
+msgid "edit"
+msgstr "Bearbeiten"
-#: ../../include/ItemObject.php:254 ../../include/taxonomy.php:310
-msgid "like"
-msgstr "mag"
+#: ../../include/group.php:298
+msgid "Collections"
+msgstr "Sammlungen"
-#: ../../include/ItemObject.php:255 ../../mod/photos.php:948
-msgid "I don't like this (toggle)"
-msgstr "Mir gefällt das nicht (Umschalter)"
+#: ../../include/group.php:299
+msgid "Edit collection"
+msgstr "Sammlung bearbeiten"
-#: ../../include/ItemObject.php:255 ../../include/taxonomy.php:311
-msgid "dislike"
-msgstr "verurteile"
+#: ../../include/group.php:300
+msgid "Create a new collection"
+msgstr "Neue Sammlung erzeugen"
-#: ../../include/ItemObject.php:259
-msgid "Share This"
-msgstr "Teilen"
+#: ../../include/group.php:301
+msgid "Channels not in any collection"
+msgstr "Kanäle, die nicht in einer Sammlung sind"
-#: ../../include/ItemObject.php:259
-msgid "share"
-msgstr "Teilen"
+#: ../../include/identity.php:31 ../../mod/item.php:1078
+msgid "Unable to obtain identity information from database"
+msgstr "Kann keine Identitäts-Informationen aus Datenbank beziehen"
-#: ../../include/ItemObject.php:276
-#, php-format
-msgid "%d comment"
-msgid_plural "%d comments"
-msgstr[0] "%d Kommentar"
-msgstr[1] "%d Kommentare"
+#: ../../include/identity.php:66
+msgid "Empty name"
+msgstr "Namensfeld leer"
-#: ../../include/ItemObject.php:294 ../../include/ItemObject.php:295
-#, php-format
-msgid "View %s's profile - %s"
-msgstr "Schaue Dir %ss Profil an – %s"
+#: ../../include/identity.php:68
+msgid "Name too long"
+msgstr "Name ist zu lang"
-#: ../../include/ItemObject.php:298
-msgid "to"
-msgstr "an"
+#: ../../include/identity.php:169
+msgid "No account identifier"
+msgstr "Keine Account-Kennung"
-#: ../../include/ItemObject.php:299
-msgid "via"
-msgstr "via"
+#: ../../include/identity.php:182
+msgid "Nickname is required."
+msgstr "Spitzname ist erforderlich."
-#: ../../include/ItemObject.php:300
-msgid "Wall-to-Wall"
-msgstr "Wall-to-Wall"
+#: ../../include/identity.php:196
+msgid "Reserved nickname. Please choose another."
+msgstr "Reservierter Kurzname. Bitte wähle einen anderen."
-#: ../../include/ItemObject.php:301
-msgid "via Wall-To-Wall:"
-msgstr "via Wall-To-Wall:"
+#: ../../include/identity.php:201 ../../include/dimport.php:34
+msgid ""
+"Nickname has unsupported characters or is already being used on this site."
+msgstr "Der Spitzname enthält nicht-unterstütze Zeichen oder wird bereits auf dieser Seite genutzt."
-#: ../../include/ItemObject.php:312 ../../include/conversation.php:716
-#, php-format
-msgid "from %s"
-msgstr "via %s"
+#: ../../include/identity.php:283
+msgid "Unable to retrieve created identity"
+msgstr "Kann die erstellte Identität nicht empfangen"
-#: ../../include/ItemObject.php:315 ../../include/conversation.php:719
-#, php-format
-msgid "last edited: %s"
-msgstr "zuletzt bearbeitet: %s"
+#: ../../include/identity.php:343
+msgid "Default Profile"
+msgstr "Standard-Profil"
-#: ../../include/ItemObject.php:316 ../../include/conversation.php:720
-#, php-format
-msgid "Expires: %s"
-msgstr "Verfällt: %s"
+#: ../../include/identity.php:643
+msgid "Requested channel is not available."
+msgstr "Angeforderte Kanal nicht verfügbar."
-#: ../../include/ItemObject.php:337
-msgid "Save Bookmarks"
-msgstr "Favoriten speichern"
+#: ../../include/identity.php:691 ../../mod/profile.php:16
+#: ../../mod/achievements.php:11 ../../mod/editblock.php:29
+#: ../../mod/blocks.php:29 ../../mod/connect.php:13 ../../mod/hcard.php:8
+#: ../../mod/editlayout.php:28 ../../mod/editwebpage.php:28
+#: ../../mod/filestorage.php:53 ../../mod/webpages.php:29
+#: ../../mod/layouts.php:29
+msgid "Requested profile is not available."
+msgstr "Erwünschte Profil ist nicht verfügbar."
-#: ../../include/ItemObject.php:338
-msgid "Add to Calendar"
-msgstr "Zum Kalender hinzufügen"
+#: ../../include/identity.php:854 ../../mod/profiles.php:774
+msgid "Change profile photo"
+msgstr "Profilfoto ändern"
-#: ../../include/ItemObject.php:347
-msgid "Mark all seen"
-msgstr "Alle als gelesen markieren"
+#: ../../include/identity.php:861
+msgid "Profiles"
+msgstr "Profile"
-#: ../../include/ItemObject.php:353 ../../mod/photos.php:1133
-msgctxt "noun"
-msgid "Likes"
-msgstr "Gefällt mir"
+#: ../../include/identity.php:861
+msgid "Manage/edit profiles"
+msgstr "Profile verwalten/bearbeiten"
-#: ../../include/ItemObject.php:354 ../../mod/photos.php:1134
-msgctxt "noun"
-msgid "Dislikes"
-msgstr "Gefällt nicht"
+#: ../../include/identity.php:862 ../../mod/profiles.php:775
+msgid "Create New Profile"
+msgstr "Neues Profil erstellen"
-#: ../../include/ItemObject.php:359 ../../include/acl_selectors.php:249
-#: ../../mod/photos.php:1139
-msgid "Close"
-msgstr "Schließen"
+#: ../../include/identity.php:865 ../../include/nav.php:95
+msgid "Edit Profile"
+msgstr "Profile bearbeiten"
-#: ../../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
-#: ../../mod/mail.php:241 ../../mod/mail.php:356
-msgid "Please wait"
-msgstr "Bitte warten"
+#: ../../include/identity.php:878 ../../mod/profiles.php:786
+msgid "Profile Image"
+msgstr "Profilfoto:"
-#: ../../include/ItemObject.php:665 ../../mod/photos.php:966
-#: ../../mod/photos.php:1084
-msgid "This is you"
-msgstr "Das bist Du"
+#: ../../include/identity.php:881
+msgid "visible to everybody"
+msgstr "sichtbar für jeden"
-#: ../../include/ItemObject.php:669 ../../include/conversation.php:1181
-#: ../../mod/editlayout.php:140 ../../mod/editwebpage.php:179
-#: ../../mod/editpost.php:114 ../../mod/editblock.php:141
-msgid "Bold"
-msgstr "Fett"
+#: ../../include/identity.php:882 ../../mod/profiles.php:669
+#: ../../mod/profiles.php:790
+msgid "Edit visibility"
+msgstr "Sichtbarkeit bearbeiten"
-#: ../../include/ItemObject.php:670 ../../include/conversation.php:1182
-#: ../../mod/editlayout.php:141 ../../mod/editwebpage.php:180
-#: ../../mod/editpost.php:115 ../../mod/editblock.php:142
-msgid "Italic"
-msgstr "Kursiv"
+#: ../../include/identity.php:894 ../../include/bb2diaspora.php:450
+#: ../../include/event.php:40 ../../mod/events.php:645
+#: ../../mod/directory.php:204
+msgid "Location:"
+msgstr "Ort:"
-#: ../../include/ItemObject.php:671 ../../include/conversation.php:1183
-#: ../../mod/editlayout.php:142 ../../mod/editwebpage.php:181
-#: ../../mod/editpost.php:116 ../../mod/editblock.php:143
-msgid "Underline"
-msgstr "Unterstrichen"
+#: ../../include/identity.php:898 ../../include/identity.php:1139
+msgid "Gender:"
+msgstr "Geschlecht:"
-#: ../../include/ItemObject.php:672 ../../include/conversation.php:1184
-#: ../../mod/editlayout.php:143 ../../mod/editwebpage.php:182
-#: ../../mod/editpost.php:117 ../../mod/editblock.php:144
-msgid "Quote"
-msgstr "Zitat"
+#: ../../include/identity.php:899 ../../include/identity.php:1183
+msgid "Status:"
+msgstr "Status:"
-#: ../../include/ItemObject.php:673 ../../include/conversation.php:1185
-#: ../../mod/editlayout.php:144 ../../mod/editwebpage.php:183
-#: ../../mod/editpost.php:118 ../../mod/editblock.php:145
-msgid "Code"
-msgstr "Code"
+#: ../../include/identity.php:900 ../../include/identity.php:1194
+msgid "Homepage:"
+msgstr "Homepage:"
-#: ../../include/ItemObject.php:674
-msgid "Image"
-msgstr "Bild"
+#: ../../include/identity.php:901
+msgid "Online Now"
+msgstr "gerade online"
-#: ../../include/ItemObject.php:675
-msgid "Insert Link"
-msgstr "Link einfügen"
+#: ../../include/identity.php:983 ../../include/identity.php:1063
+#: ../../mod/ping.php:324
+msgid "g A l F d"
+msgstr "l, d. F, G:i \\U\\h\\r"
-#: ../../include/ItemObject.php:676
-msgid "Video"
-msgstr "Video"
+#: ../../include/identity.php:984 ../../include/identity.php:1064
+msgid "F d"
+msgstr "d. F"
-#: ../../include/ItemObject.php:680 ../../include/conversation.php:1236
-#: ../../mod/editpost.php:157 ../../mod/mail.php:247 ../../mod/mail.php:361
-msgid "Encrypt text"
-msgstr "Text verschlüsseln"
+#: ../../include/identity.php:1029 ../../include/identity.php:1104
+#: ../../mod/ping.php:346
+msgid "[today]"
+msgstr "[Heute]"
-#: ../../include/Contact.php:124
-msgid "New window"
-msgstr "Neues Fenster"
+#: ../../include/identity.php:1041
+msgid "Birthday Reminders"
+msgstr "Geburtstags Erinnerungen"
-#: ../../include/Contact.php:125
-msgid "Open the selected location in a different window or browser tab"
-msgstr "Öffne die markierte Adresse in einem neuen Browser Fenster oder Tab"
+#: ../../include/identity.php:1042
+msgid "Birthdays this week:"
+msgstr "Geburtstage in dieser Woche:"
-#: ../../include/Contact.php:215 ../../mod/admin.php:730
-#, php-format
-msgid "User '%s' deleted"
-msgstr "Benutzer '%s' gelöscht"
+#: ../../include/identity.php:1097
+msgid "[No description]"
+msgstr "[Keine Beschreibung]"
-#: ../../include/bb2diaspora.php:373
-msgid "Attachments:"
-msgstr "Anhänge:"
+#: ../../include/identity.php:1115
+msgid "Event Reminders"
+msgstr "Termin-Erinnerungen"
-#: ../../include/bb2diaspora.php:453
-msgid "Redmatrix event notification:"
-msgstr "RedMatrix Termin-Benachrichtigung:"
+#: ../../include/identity.php:1116
+msgid "Events this week:"
+msgstr "Termine in dieser Woche:"
-#: ../../include/text.php:329
-msgid "prev"
-msgstr "vorherige"
+#: ../../include/identity.php:1129 ../../include/identity.php:1246
+#: ../../include/apps.php:138 ../../mod/profperm.php:112
+msgid "Profile"
+msgstr "Profil"
-#: ../../include/text.php:331
-msgid "first"
-msgstr "erste"
+#: ../../include/identity.php:1137 ../../mod/settings.php:1044
+msgid "Full Name:"
+msgstr "Voller Name:"
-#: ../../include/text.php:360
-msgid "last"
-msgstr "letzte"
+#: ../../include/identity.php:1144
+msgid "Like this channel"
+msgstr "Dieser Kanal gefällt mir"
-#: ../../include/text.php:363
-msgid "next"
-msgstr "nächste"
+#: ../../include/identity.php:1168
+msgid "j F, Y"
+msgstr "j. F Y"
-#: ../../include/text.php:373
-msgid "older"
-msgstr "älter"
+#: ../../include/identity.php:1169
+msgid "j F"
+msgstr "j. F"
-#: ../../include/text.php:375
-msgid "newer"
-msgstr "neuer"
+#: ../../include/identity.php:1176
+msgid "Birthday:"
+msgstr "Geburtstag:"
-#: ../../include/text.php:768
-msgid "No connections"
-msgstr "Keine Verbindungen"
+#: ../../include/identity.php:1180
+msgid "Age:"
+msgstr "Alter:"
-#: ../../include/text.php:782
+#: ../../include/identity.php:1189
#, php-format
-msgid "%d Connection"
-msgid_plural "%d Connections"
-msgstr[0] "%d Verbindung"
-msgstr[1] "%d Verbindungen"
-
-#: ../../include/text.php:795 ../../mod/viewconnections.php:104
-msgid "View Connections"
-msgstr "Verbindungen anzeigen"
-
-#: ../../include/text.php:852 ../../include/text.php:864
-#: ../../include/nav.php:165 ../../include/apps.php:147
-#: ../../mod/search.php:38
-msgid "Search"
-msgstr "Suche"
-
-#: ../../include/text.php:928
-msgid "poke"
-msgstr "anstupsen"
-
-#: ../../include/text.php:928 ../../include/conversation.php:243
-msgid "poked"
-msgstr "stupste"
-
-#: ../../include/text.php:929
-msgid "ping"
-msgstr "anpingen"
-
-#: ../../include/text.php:929
-msgid "pinged"
-msgstr "pingte"
-
-#: ../../include/text.php:930
-msgid "prod"
-msgstr "knuffen"
-
-#: ../../include/text.php:930
-msgid "prodded"
-msgstr "knuffte"
-
-#: ../../include/text.php:931
-msgid "slap"
-msgstr "ohrfeigen"
-
-#: ../../include/text.php:931
-msgid "slapped"
-msgstr "ohrfeigte"
-
-#: ../../include/text.php:932
-msgid "finger"
-msgstr "befummeln"
+msgid "for %1$d %2$s"
+msgstr "seit %1$d %2$s"
-#: ../../include/text.php:932
-msgid "fingered"
-msgstr "befummelte"
+#: ../../include/identity.php:1192 ../../mod/profiles.php:691
+msgid "Sexual Preference:"
+msgstr "Sexuelle Orientierung:"
-#: ../../include/text.php:933
-msgid "rebuff"
-msgstr "eine Abfuhr erteilen"
+#: ../../include/identity.php:1196 ../../mod/profiles.php:693
+msgid "Hometown:"
+msgstr "Heimatstadt:"
-#: ../../include/text.php:933
-msgid "rebuffed"
-msgstr "zurückgewiesen"
+#: ../../include/identity.php:1198
+msgid "Tags:"
+msgstr "Schlagworte:"
-#: ../../include/text.php:943
-msgid "happy"
-msgstr "glücklich"
+#: ../../include/identity.php:1200 ../../mod/profiles.php:694
+msgid "Political Views:"
+msgstr "Politische Ansichten:"
-#: ../../include/text.php:944
-msgid "sad"
-msgstr "traurig"
+#: ../../include/identity.php:1202
+msgid "Religion:"
+msgstr "Religion:"
-#: ../../include/text.php:945
-msgid "mellow"
-msgstr "sanft"
+#: ../../include/identity.php:1204
+msgid "About:"
+msgstr "Über:"
-#: ../../include/text.php:946
-msgid "tired"
-msgstr "müde"
+#: ../../include/identity.php:1206
+msgid "Hobbies/Interests:"
+msgstr "Hobbys/Interessen:"
-#: ../../include/text.php:947
-msgid "perky"
-msgstr "frech"
+#: ../../include/identity.php:1208 ../../mod/profiles.php:697
+msgid "Likes:"
+msgstr "Gefällt:"
-#: ../../include/text.php:948
-msgid "angry"
-msgstr "sauer"
+#: ../../include/identity.php:1210 ../../mod/profiles.php:698
+msgid "Dislikes:"
+msgstr "Gefällt nicht:"
-#: ../../include/text.php:949
-msgid "stupified"
-msgstr "verblüfft"
+#: ../../include/identity.php:1212
+msgid "Contact information and Social Networks:"
+msgstr "Kontaktinformation und soziale Netzwerke:"
-#: ../../include/text.php:950
-msgid "puzzled"
-msgstr "verwirrt"
+#: ../../include/identity.php:1214
+msgid "My other channels:"
+msgstr "Meine anderen Kanäle:"
-#: ../../include/text.php:951
-msgid "interested"
-msgstr "interessiert"
+#: ../../include/identity.php:1216
+msgid "Musical interests:"
+msgstr "Musikalische Interessen:"
-#: ../../include/text.php:952
-msgid "bitter"
-msgstr "verbittert"
+#: ../../include/identity.php:1218
+msgid "Books, literature:"
+msgstr "Bücher, Literatur:"
-#: ../../include/text.php:953
-msgid "cheerful"
-msgstr "fröhlich"
+#: ../../include/identity.php:1220
+msgid "Television:"
+msgstr "Fernsehen:"
-#: ../../include/text.php:954
-msgid "alive"
-msgstr "lebendig"
+#: ../../include/identity.php:1222
+msgid "Film/dance/culture/entertainment:"
+msgstr "Film/Tanz/Kultur/Unterhaltung:"
-#: ../../include/text.php:955
-msgid "annoyed"
-msgstr "verärgert"
+#: ../../include/identity.php:1224
+msgid "Love/Romance:"
+msgstr "Liebe/Romantik:"
-#: ../../include/text.php:956
-msgid "anxious"
-msgstr "unruhig"
+#: ../../include/identity.php:1226
+msgid "Work/employment:"
+msgstr "Arbeit/Anstellung:"
-#: ../../include/text.php:957
-msgid "cranky"
-msgstr "schrullig"
+#: ../../include/identity.php:1228
+msgid "School/education:"
+msgstr "Schule/Ausbildung:"
-#: ../../include/text.php:958
-msgid "disturbed"
-msgstr "verstört"
+#: ../../include/identity.php:1248
+msgid "Like this thing"
+msgstr "Gefällt mir"
-#: ../../include/text.php:959
-msgid "frustrated"
-msgstr "frustriert"
+#: ../../include/message.php:18
+msgid "No recipient provided."
+msgstr "Kein Empfänger angegeben"
-#: ../../include/text.php:960
-msgid "depressed"
-msgstr "deprimiert"
+#: ../../include/message.php:23
+msgid "[no subject]"
+msgstr "[no subject]"
-#: ../../include/text.php:961
-msgid "motivated"
-msgstr "motiviert"
+#: ../../include/message.php:45
+msgid "Unable to determine sender."
+msgstr "Kann Absender nicht bestimmen."
-#: ../../include/text.php:962
-msgid "relaxed"
-msgstr "entspannt"
+#: ../../include/message.php:200
+msgid "Stored post could not be verified."
+msgstr "Gespeicherter Beitrag konnten nicht überprüft werden."
-#: ../../include/text.php:963
-msgid "surprised"
-msgstr "überrascht"
+#: ../../include/follow.php:28
+msgid "Channel is blocked on this site."
+msgstr "Der Kanal ist auf dieser Seite blockiert "
-#: ../../include/text.php:1135
-msgid "Monday"
-msgstr "Montag"
+#: ../../include/follow.php:33
+msgid "Channel location missing."
+msgstr "Adresse des Kanals fehlt."
-#: ../../include/text.php:1135
-msgid "Tuesday"
-msgstr "Dienstag"
+#: ../../include/follow.php:83
+msgid "Response from remote channel was incomplete."
+msgstr "Antwort des entfernten Kanals war unvollständig."
-#: ../../include/text.php:1135
-msgid "Wednesday"
-msgstr "Mittwoch"
+#: ../../include/follow.php:100
+msgid "Channel was deleted and no longer exists."
+msgstr "Kanal wurde gelöscht und existiert nicht mehr."
-#: ../../include/text.php:1135
-msgid "Thursday"
-msgstr "Donnerstag"
+#: ../../include/follow.php:135 ../../include/follow.php:197
+msgid "Protocol disabled."
+msgstr "Protokoll deaktiviert."
-#: ../../include/text.php:1135
-msgid "Friday"
-msgstr "Freitag"
+#: ../../include/follow.php:170
+msgid "Channel discovery failed."
+msgstr "Kanalsuche fehlgeschlagen"
-#: ../../include/text.php:1135
-msgid "Saturday"
-msgstr "Samstag"
+#: ../../include/follow.php:186
+msgid "local account not found."
+msgstr "Lokales Konto nicht gefunden."
-#: ../../include/text.php:1135
-msgid "Sunday"
-msgstr "Sonntag"
+#: ../../include/follow.php:215
+msgid "Cannot connect to yourself."
+msgstr "Du kannst Dich nicht mit Dir selbst verbinden."
-#: ../../include/text.php:1139
-msgid "January"
-msgstr "Januar"
+#: ../../include/comanche.php:35 ../../mod/admin.php:357
+#: ../../view/theme/apw/php/config.php:185
+msgid "Default"
+msgstr "Standard"
-#: ../../include/text.php:1139
-msgid "February"
-msgstr "Februar"
+#: ../../include/datetime.php:35
+msgid "Miscellaneous"
+msgstr "Verschiedenes"
-#: ../../include/text.php:1139
-msgid "March"
-msgstr "März"
+#: ../../include/datetime.php:113
+msgid "YYYY-MM-DD or MM-DD"
+msgstr "JJJJ-MM-TT oder MM-TT"
-#: ../../include/text.php:1139
-msgid "April"
-msgstr "April"
+#: ../../include/datetime.php:212 ../../mod/events.php:633
+#: ../../mod/appman.php:91 ../../mod/appman.php:92
+msgid "Required"
+msgstr "Benötigt"
-#: ../../include/text.php:1139
-msgid "May"
-msgstr "Mai"
+#: ../../include/datetime.php:231
+msgid "never"
+msgstr "Nie"
-#: ../../include/text.php:1139
-msgid "June"
-msgstr "Juni"
+#: ../../include/datetime.php:237
+msgid "less than a second ago"
+msgstr "Vor weniger als einer Sekunde"
-#: ../../include/text.php:1139
-msgid "July"
-msgstr "Juli"
+#: ../../include/datetime.php:240
+msgid "year"
+msgstr "Jahr"
-#: ../../include/text.php:1139
-msgid "August"
-msgstr "August"
+#: ../../include/datetime.php:240
+msgid "years"
+msgstr "Jahre"
-#: ../../include/text.php:1139
-msgid "September"
-msgstr "September"
+#: ../../include/datetime.php:241
+msgid "month"
+msgstr "Monat"
-#: ../../include/text.php:1139
-msgid "October"
-msgstr "Oktober"
+#: ../../include/datetime.php:241
+msgid "months"
+msgstr "Monate"
-#: ../../include/text.php:1139
-msgid "November"
-msgstr "November"
+#: ../../include/datetime.php:242
+msgid "week"
+msgstr "Woche"
-#: ../../include/text.php:1139
-msgid "December"
-msgstr "Dezember"
+#: ../../include/datetime.php:242
+msgid "weeks"
+msgstr "Wochen"
-#: ../../include/text.php:1244
-msgid "unknown.???"
-msgstr "unbekannt.???"
+#: ../../include/datetime.php:243
+msgid "day"
+msgstr "Tag"
-#: ../../include/text.php:1245
-msgid "bytes"
-msgstr "Bytes"
+#: ../../include/datetime.php:243
+msgid "days"
+msgstr "Tage"
-#: ../../include/text.php:1281
-msgid "remove category"
-msgstr "Kategorie entfernen"
+#: ../../include/datetime.php:244
+msgid "hour"
+msgstr "Stunde"
-#: ../../include/text.php:1356
-msgid "remove from file"
-msgstr "aus der Datei entfernen"
+#: ../../include/datetime.php:244
+msgid "hours"
+msgstr "Stunden"
-#: ../../include/text.php:1436 ../../include/text.php:1447
-#: ../../mod/connedit.php:661
-msgid "Click to open/close"
-msgstr "Klicke zum Öffnen/Schließen"
+#: ../../include/datetime.php:245
+msgid "minute"
+msgstr "Minute"
-#: ../../include/text.php:1609 ../../mod/events.php:444
-msgid "Link to Source"
-msgstr "Link zur Quelle"
+#: ../../include/datetime.php:245
+msgid "minutes"
+msgstr "Minuten"
-#: ../../include/text.php:1630 ../../include/text.php:1701
-msgid "default"
-msgstr "Standard"
+#: ../../include/datetime.php:246
+msgid "second"
+msgstr "Sekunde"
-#: ../../include/text.php:1638
-msgid "Page layout"
-msgstr "Seitengestaltung"
+#: ../../include/datetime.php:246
+msgid "seconds"
+msgstr "Sekunden"
-#: ../../include/text.php:1638
-msgid "You can create your own with the layouts tool"
-msgstr "Mit dem Layouts-Werkzeug kannst Du Deine eigenen Layouts erstellen"
+#: ../../include/datetime.php:255
+#, php-format
+msgid "%1$d %2$s ago"
+msgstr "vor %1$d %2$s"
-#: ../../include/text.php:1679
-msgid "Page content type"
-msgstr "Art des Seiteninhalts"
+#: ../../include/datetime.php:463
+#, php-format
+msgid "%1$s's birthday"
+msgstr "%1$ss Geburtstag"
-#: ../../include/text.php:1713
-msgid "Select an alternate language"
-msgstr "Wähle eine alternative Sprache"
+#: ../../include/datetime.php:464
+#, php-format
+msgid "Happy Birthday %1$s"
+msgstr "Alles Gute zum Geburtstag, %1$s"
-#: ../../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/bb2diaspora.php:349
+msgid "Attachments:"
+msgstr "Anhänge:"
-#: ../../include/text.php:1835 ../../include/conversation.php:123
-#: ../../mod/like.php:348 ../../mod/tagger.php:47
-msgid "event"
-msgstr "Termin"
+#: ../../include/bb2diaspora.php:428 ../../include/event.php:11
+msgid "l F d, Y \\@ g:i A"
+msgstr "l, d. F Y, H:i"
-#: ../../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 "Status"
+#: ../../include/bb2diaspora.php:430
+msgid "Redmatrix event notification:"
+msgstr "RedMatrix Termin-Benachrichtigung:"
-#: ../../include/text.php:1840 ../../include/conversation.php:150
-#: ../../mod/tagger.php:53
-msgid "comment"
-msgstr "Kommentar"
+#: ../../include/bb2diaspora.php:434 ../../include/event.php:20
+msgid "Starts:"
+msgstr "Beginnt:"
-#: ../../include/text.php:1845
-msgid "activity"
-msgstr "Aktivität"
+#: ../../include/bb2diaspora.php:442 ../../include/event.php:30
+msgid "Finishes:"
+msgstr "Endet:"
-#: ../../include/text.php:2140
-msgid "Design Tools"
-msgstr "Gestaltungswerkzeuge"
+#: ../../include/chat.php:10
+msgid "Missing room name"
+msgstr "Der Chatraum hat keinen Namen"
-#: ../../include/text.php:2143 ../../mod/blocks.php:146
-msgid "Blocks"
-msgstr "Blöcke"
+#: ../../include/chat.php:19
+msgid "Duplicate room name"
+msgstr "Name des Chatraums bereits vergeben"
-#: ../../include/text.php:2144 ../../mod/menu.php:95
-msgid "Menus"
-msgstr "Menüs"
+#: ../../include/chat.php:68 ../../include/chat.php:76
+msgid "Invalid room specifier."
+msgstr "Ungültiger Raumbezeichner."
-#: ../../include/text.php:2145 ../../mod/layouts.php:173
-msgid "Layouts"
-msgstr "Gestaltungen"
+#: ../../include/chat.php:105
+msgid "Room not found."
+msgstr "Chatraum konnte nicht gefunden werden."
-#: ../../include/text.php:2146
-msgid "Pages"
-msgstr "Seiten"
+#: ../../include/chat.php:126
+msgid "Room is full"
+msgstr "Der Raum ist voll"
-#: ../../include/nav.php:87 ../../include/nav.php:120 ../../boot.php:1539
+#: ../../include/nav.php:87 ../../include/nav.php:120 ../../boot.php:1551
msgid "Logout"
msgstr "Abmelden"
@@ -2060,8 +2116,8 @@ msgstr "Home"
msgid "Your posts and conversations"
msgstr "Deine Beiträge und Unterhaltungen"
-#: ../../include/nav.php:91 ../../include/conversation.php:942
-#: ../../mod/connedit.php:494 ../../mod/connedit.php:660
+#: ../../include/nav.php:91 ../../include/conversation.php:937
+#: ../../mod/connedit.php:484 ../../mod/connedit.php:634
msgid "View Profile"
msgstr "Profil ansehen"
@@ -2077,16 +2133,12 @@ msgstr "Profile bearbeiten"
msgid "Manage/Edit profiles"
msgstr "Profile verwalten"
-#: ../../include/nav.php:95 ../../include/identity.php:846
-msgid "Edit Profile"
-msgstr "Profile bearbeiten"
-
#: ../../include/nav.php:95
msgid "Edit your profile"
msgstr "Profil bearbeiten"
-#: ../../include/nav.php:97 ../../include/conversation.php:1600
-#: ../../include/apps.php:139 ../../mod/fbrowser.php:25
+#: ../../include/nav.php:97 ../../include/apps.php:139
+#: ../../include/conversation.php:1586 ../../mod/fbrowser.php:25
msgid "Photos"
msgstr "Fotos"
@@ -2106,8 +2158,8 @@ msgstr "Chat"
msgid "Your chatrooms"
msgstr "Deine Chaträume"
-#: ../../include/nav.php:109 ../../include/conversation.php:1635
-#: ../../include/apps.php:129
+#: ../../include/nav.php:109 ../../include/apps.php:129
+#: ../../include/conversation.php:1621
msgid "Bookmarks"
msgstr "Lesezeichen"
@@ -2115,8 +2167,8 @@ msgstr "Lesezeichen"
msgid "Your bookmarks"
msgstr "Deine Lesezeichen"
-#: ../../include/nav.php:113 ../../include/conversation.php:1645
-#: ../../include/apps.php:136 ../../mod/webpages.php:176
+#: ../../include/nav.php:113 ../../include/apps.php:136
+#: ../../include/conversation.php:1632 ../../mod/webpages.php:160
msgid "Webpages"
msgstr "Webseiten"
@@ -2124,7 +2176,7 @@ msgstr "Webseiten"
msgid "Your webpages"
msgstr "Deine Webseiten"
-#: ../../include/nav.php:117 ../../include/apps.php:131 ../../boot.php:1540
+#: ../../include/nav.php:117 ../../include/apps.php:131 ../../boot.php:1552
msgid "Login"
msgstr "Anmelden"
@@ -2149,7 +2201,7 @@ msgstr "Klicke, um Dich über Deinen Heimat-Server zu authentifizieren"
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:1528
msgid "Register"
msgstr "Registrieren"
@@ -2158,7 +2210,7 @@ msgid "Create an account"
msgstr "Erzeuge ein Konto"
#: ../../include/nav.php:160 ../../include/apps.php:142 ../../mod/help.php:67
-#: ../../mod/help.php:72 ../../mod/layouts.php:175
+#: ../../mod/help.php:72
msgid "Help"
msgstr "Hilfe"
@@ -2175,7 +2227,7 @@ msgid "Search site content"
msgstr "Durchsuche Seiten-Inhalt"
#: ../../include/nav.php:168 ../../include/apps.php:141
-#: ../../mod/directory.php:366
+#: ../../mod/directory.php:334
msgid "Directory"
msgstr "Verzeichnis"
@@ -2183,155 +2235,343 @@ msgstr "Verzeichnis"
msgid "Channel Directory"
msgstr "Kanal-Verzeichnis"
-#: ../../include/nav.php:180 ../../include/apps.php:133
+#: ../../include/nav.php:182 ../../include/apps.php:133
msgid "Matrix"
msgstr "Matrix"
-#: ../../include/nav.php:180
+#: ../../include/nav.php:182
msgid "Your matrix"
msgstr "Deine Matrix"
-#: ../../include/nav.php:181
+#: ../../include/nav.php:183
msgid "Mark all matrix notifications seen"
msgstr "Markiere alle Matrix-Benachrichtigungen als angesehen"
-#: ../../include/nav.php:183 ../../include/apps.php:137
+#: ../../include/nav.php:185 ../../include/apps.php:137
msgid "Channel Home"
msgstr "Mein Kanal"
-#: ../../include/nav.php:183
+#: ../../include/nav.php:185
msgid "Channel home"
msgstr "Mein Kanal"
-#: ../../include/nav.php:184
+#: ../../include/nav.php:186
msgid "Mark all channel notifications seen"
msgstr "Markiere alle Kanal-Benachrichtigungen als angesehen"
-#: ../../include/nav.php:187 ../../mod/connections.php:407
+#: ../../include/nav.php:189 ../../mod/connections.php:407
msgid "Connections"
msgstr "Verbindungen"
-#: ../../include/nav.php:190
+#: ../../include/nav.php:192
msgid "Notices"
msgstr "Benachrichtigungen"
-#: ../../include/nav.php:190
+#: ../../include/nav.php:192
msgid "Notifications"
msgstr "Benachrichtigungen"
-#: ../../include/nav.php:191
+#: ../../include/nav.php:193
msgid "See all notifications"
msgstr "Alle Benachrichtigungen ansehen"
-#: ../../include/nav.php:192 ../../mod/notifications.php:99
+#: ../../include/nav.php:194 ../../mod/notifications.php:99
msgid "Mark all system notifications seen"
msgstr "Markiere alle System-Benachrichtigungen als gesehen"
-#: ../../include/nav.php:194 ../../include/apps.php:143
+#: ../../include/nav.php:196 ../../include/apps.php:143
msgid "Mail"
msgstr "Mail"
-#: ../../include/nav.php:194
+#: ../../include/nav.php:196
msgid "Private mail"
msgstr "Persönliche Mail"
-#: ../../include/nav.php:195
+#: ../../include/nav.php:197
msgid "See all private messages"
msgstr "Alle persönlichen Nachrichten ansehen"
-#: ../../include/nav.php:196
+#: ../../include/nav.php:198
msgid "Mark all private messages seen"
msgstr "Markiere alle persönlichen Nachrichten als gesehen"
-#: ../../include/nav.php:197
+#: ../../include/nav.php:199
msgid "Inbox"
msgstr "Eingang"
-#: ../../include/nav.php:198
+#: ../../include/nav.php:200
msgid "Outbox"
msgstr "Ausgang"
-#: ../../include/nav.php:202 ../../include/apps.php:140
+#: ../../include/nav.php:204 ../../include/apps.php:140
#: ../../mod/events.php:472
msgid "Events"
msgstr "Termine"
-#: ../../include/nav.php:202
+#: ../../include/nav.php:204
msgid "Event Calendar"
msgstr "Terminkalender"
-#: ../../include/nav.php:203
+#: ../../include/nav.php:205
msgid "See all events"
msgstr "Alle Termine ansehen"
-#: ../../include/nav.php:204
+#: ../../include/nav.php:206
msgid "Mark all events seen"
msgstr "Markiere alle Termine als gesehen"
-#: ../../include/nav.php:206 ../../include/apps.php:132
-#: ../../mod/manage.php:166
+#: ../../include/nav.php:208 ../../include/apps.php:132
+#: ../../mod/manage.php:148
msgid "Channel Manager"
msgstr "Kanal-Manager"
-#: ../../include/nav.php:206
+#: ../../include/nav.php:208
msgid "Manage Your Channels"
msgstr "Verwalte Deine Kanäle"
-#: ../../include/nav.php:208
+#: ../../include/nav.php:210
msgid "Account/Channel Settings"
msgstr "Konto-/Kanal-Einstellungen"
-#: ../../include/nav.php:216 ../../mod/admin.php:120
+#: ../../include/nav.php:218 ../../mod/admin.php:123
msgid "Admin"
msgstr "Administration"
-#: ../../include/nav.php:216
+#: ../../include/nav.php:218
msgid "Site Setup and Configuration"
msgstr "Seiten-Einrichtung und -Konfiguration"
-#: ../../include/nav.php:247 ../../include/conversation.php:850
+#: ../../include/nav.php:249 ../../include/conversation.php:842
msgid "Loading..."
msgstr "Lädt ..."
-#: ../../include/nav.php:252
+#: ../../include/nav.php:254
msgid "@name, #tag, content"
msgstr "@Name, #Schlagwort, Text"
-#: ../../include/nav.php:253
+#: ../../include/nav.php:255
msgid "Please wait..."
msgstr "Bitte warten..."
-#: ../../include/taxonomy.php:222 ../../include/taxonomy.php:243
-msgid "Tags"
-msgstr "Schlagwörter"
+#: ../../include/security.php:357
+msgid ""
+"The form security token was not correct. This probably happened because the "
+"form has been opened for too long (>3 hours) before submitting it."
+msgstr "Das Security-Token des Formulars war nicht korrekt. Das ist wahrscheinlich passiert, weil das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde."
-#: ../../include/taxonomy.php:287
-msgid "Keywords"
-msgstr "Schlüsselwörter"
+#: ../../include/ItemObject.php:89 ../../include/conversation.php:652
+msgid "Private Message"
+msgstr "Private Nachricht"
-#: ../../include/taxonomy.php:308
-msgid "have"
-msgstr "habe"
+#: ../../include/ItemObject.php:126 ../../include/conversation.php:644
+msgid "Select"
+msgstr "Auswählen"
-#: ../../include/taxonomy.php:308
-msgid "has"
-msgstr "hat"
+#: ../../include/ItemObject.php:130
+msgid "Save to Folder"
+msgstr "In Ordner speichern"
-#: ../../include/taxonomy.php:309
-msgid "want"
-msgstr "will"
+#: ../../include/ItemObject.php:151
+msgid "I will attend"
+msgstr "Ich werde teilnehmen"
-#: ../../include/taxonomy.php:309
-msgid "wants"
-msgstr "will"
+#: ../../include/ItemObject.php:151
+msgid "I will not attend"
+msgstr "Ich werde nicht teilnehmen"
-#: ../../include/taxonomy.php:310
-msgid "likes"
-msgstr "gefällt"
+#: ../../include/ItemObject.php:151
+msgid "I might attend"
+msgstr "Ich werde vielleicht teilnehmen"
-#: ../../include/taxonomy.php:311
-msgid "dislikes"
-msgstr "missfällt"
+#: ../../include/ItemObject.php:161
+msgid "I agree"
+msgstr "Ich stimme zu"
+
+#: ../../include/ItemObject.php:161
+msgid "I disagree"
+msgstr "Ich lehne ab"
+
+#: ../../include/ItemObject.php:161
+msgid "I abstain"
+msgstr "Ich enthalte mich"
+
+#: ../../include/ItemObject.php:175 ../../include/ItemObject.php:187
+#: ../../include/conversation.php:1667 ../../mod/photos.php:997
+#: ../../mod/photos.php:1009
+msgid "View all"
+msgstr "Alles anzeigen"
+
+#: ../../include/ItemObject.php:184 ../../include/conversation.php:1695
+#: ../../mod/photos.php:1006
+msgctxt "noun"
+msgid "Dislike"
+msgid_plural "Dislikes"
+msgstr[0] "Gefällt nicht"
+msgstr[1] "Gefällt nicht"
+
+#: ../../include/ItemObject.php:212
+msgid "Add Star"
+msgstr "Stern hinzufügen"
+
+#: ../../include/ItemObject.php:213
+msgid "Remove Star"
+msgstr "Stern entfernen"
+
+#: ../../include/ItemObject.php:214
+msgid "Toggle Star Status"
+msgstr "Markierungsstatus (Stern) umschalten"
+
+#: ../../include/ItemObject.php:218
+msgid "starred"
+msgstr "markiert"
+
+#: ../../include/ItemObject.php:227 ../../include/conversation.php:659
+msgid "Message signature validated"
+msgstr "Signatur überprüft"
+
+#: ../../include/ItemObject.php:228 ../../include/conversation.php:660
+msgid "Message signature incorrect"
+msgstr "Signatur nicht korrekt"
+
+#: ../../include/ItemObject.php:236
+msgid "Add Tag"
+msgstr "Tag hinzufügen"
+
+#: ../../include/ItemObject.php:254 ../../mod/photos.php:941
+msgid "I like this (toggle)"
+msgstr "Mir gefällt das (Umschalter)"
+
+#: ../../include/ItemObject.php:255 ../../mod/photos.php:942
+msgid "I don't like this (toggle)"
+msgstr "Mir gefällt das nicht (Umschalter)"
+
+#: ../../include/ItemObject.php:259
+msgid "Share This"
+msgstr "Teilen"
+
+#: ../../include/ItemObject.php:259
+msgid "share"
+msgstr "Teilen"
+
+#: ../../include/ItemObject.php:276
+#, php-format
+msgid "%d comment"
+msgid_plural "%d comments"
+msgstr[0] "%d Kommentar"
+msgstr[1] "%d Kommentare"
+
+#: ../../include/ItemObject.php:294 ../../include/ItemObject.php:295
+#, php-format
+msgid "View %s's profile - %s"
+msgstr "Schaue Dir %ss Profil an – %s"
+
+#: ../../include/ItemObject.php:298
+msgid "to"
+msgstr "an"
+
+#: ../../include/ItemObject.php:299
+msgid "via"
+msgstr "via"
+
+#: ../../include/ItemObject.php:300
+msgid "Wall-to-Wall"
+msgstr "Wall-to-Wall"
+
+#: ../../include/ItemObject.php:301
+msgid "via Wall-To-Wall:"
+msgstr "via Wall-To-Wall:"
+
+#: ../../include/ItemObject.php:312 ../../include/conversation.php:704
+#, php-format
+msgid " from %s"
+msgstr "von %s"
+
+#: ../../include/ItemObject.php:315 ../../include/conversation.php:707
+#, php-format
+msgid "last edited: %s"
+msgstr "zuletzt bearbeitet: %s"
+
+#: ../../include/ItemObject.php:316 ../../include/conversation.php:708
+#, php-format
+msgid "Expires: %s"
+msgstr "Verfällt: %s"
+
+#: ../../include/ItemObject.php:337
+msgid "Save Bookmarks"
+msgstr "Favoriten speichern"
+
+#: ../../include/ItemObject.php:338
+msgid "Add to Calendar"
+msgstr "Zum Kalender hinzufügen"
+
+#: ../../include/ItemObject.php:347
+msgid "Mark all seen"
+msgstr "Alle als gelesen markieren"
+
+#: ../../include/ItemObject.php:353 ../../mod/photos.php:1125
+msgctxt "noun"
+msgid "Likes"
+msgstr "Gefällt mir"
+
+#: ../../include/ItemObject.php:354 ../../mod/photos.php:1126
+msgctxt "noun"
+msgid "Dislikes"
+msgstr "Gefällt nicht"
+
+#: ../../include/ItemObject.php:359 ../../include/acl_selectors.php:249
+#: ../../mod/photos.php:1131
+msgid "Close"
+msgstr "Schließen"
+
+#: ../../include/ItemObject.php:364 ../../include/conversation.php:725
+#: ../../include/conversation.php:1198 ../../mod/editblock.php:152
+#: ../../mod/editpost.php:125 ../../mod/editlayout.php:148
+#: ../../mod/editwebpage.php:183 ../../mod/mail.php:241 ../../mod/mail.php:356
+#: ../../mod/photos.php:944
+msgid "Please wait"
+msgstr "Bitte warten"
+
+#: ../../include/ItemObject.php:665 ../../mod/photos.php:960
+#: ../../mod/photos.php:1078
+msgid "This is you"
+msgstr "Das bist Du"
+
+#: ../../include/ItemObject.php:669
+msgid "Bold"
+msgstr "Fett"
+
+#: ../../include/ItemObject.php:670
+msgid "Italic"
+msgstr "Kursiv"
+
+#: ../../include/ItemObject.php:671
+msgid "Underline"
+msgstr "Unterstrichen"
+
+#: ../../include/ItemObject.php:672
+msgid "Quote"
+msgstr "Zitat"
+
+#: ../../include/ItemObject.php:673
+msgid "Code"
+msgstr "Code"
+
+#: ../../include/ItemObject.php:674
+msgid "Image"
+msgstr "Bild"
+
+#: ../../include/ItemObject.php:675
+msgid "Link"
+msgstr "Link"
+
+#: ../../include/ItemObject.php:676
+msgid "Video"
+msgstr "Video"
+
+#: ../../include/ItemObject.php:680 ../../include/conversation.php:1224
+#: ../../mod/editpost.php:152 ../../mod/mail.php:247 ../../mod/mail.php:361
+msgid "Encrypt text"
+msgstr "Text verschlüsseln"
#: ../../include/activities.php:39
msgid " and "
@@ -2356,314 +2596,669 @@ msgstr "Besuche %1$s's %2$s"
msgid "%1$s has an updated %2$s, changing %3$s."
msgstr "%1$s hat ein aktualisiertes %2$s, %3$s wurde verändert."
-#: ../../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 "Bild/Foto"
+#: ../../include/dir_fns.php:96
+msgid "Directory Options"
+msgstr "Verzeichnisoptionen"
-#: ../../include/bbcode.php:161 ../../include/bbcode.php:793
-msgid "Encrypted content"
-msgstr "Verschlüsselter Inhalt"
+#: ../../include/dir_fns.php:97
+msgid "Alphabetic"
+msgstr "alphabetisch"
-#: ../../include/bbcode.php:177
-msgid "Install design element: "
-msgstr "Gestaltungselement installieren:"
+#: ../../include/dir_fns.php:98
+msgid "Reverse Alphabetic"
+msgstr "Entgegengesetzt alphabetisch"
-#: ../../include/bbcode.php:190
-msgid "QR code"
-msgstr "QR-Code"
+#: ../../include/dir_fns.php:99
+msgid "Newest to Oldest"
+msgstr "Neueste zuerst"
-#: ../../include/bbcode.php:241
-#, php-format
-msgid "%1$s wrote the following %2$s %3$s"
-msgstr "%1$s schrieb den folgenden %2$s %3$s"
+#: ../../include/dir_fns.php:100
+msgid "Oldest to Newest"
+msgstr "Älteste zuerst"
-#: ../../include/bbcode.php:243
-msgid "post"
-msgstr "Beitrag"
+#: ../../include/dir_fns.php:101
+msgid "Public Forums Only"
+msgstr "Nur öffentliche Foren"
-#: ../../include/bbcode.php:493
-msgid "Different viewers will see this text differently"
-msgstr "Verschiedene Betrachter werden diesen Text unterschiedlich sehen"
+#: ../../include/dir_fns.php:103
+msgid "Sort"
+msgstr "Sortieren"
-#: ../../include/bbcode.php:704
-msgid "$1 spoiler"
-msgstr "$1 Spoiler"
+#: ../../include/dir_fns.php:119
+msgid "Enable Safe Search"
+msgstr "Sichere Suche einschalten"
-#: ../../include/bbcode.php:731
-msgid "$1 wrote:"
-msgstr "$1 schrieb:"
+#: ../../include/dir_fns.php:121
+msgid "Disable Safe Search"
+msgstr "Sichere Suche ausschalten"
-#: ../../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
+#: ../../include/dir_fns.php:123
+msgid "Safe Mode"
+msgstr "Sicherer Modus"
+
+#: ../../include/items.php:382 ../../mod/subthread.php:49
+#: ../../mod/group.php:68 ../../mod/profperm.php:23 ../../mod/like.php:270
+#: ../../index.php:389
msgid "Permission denied"
msgstr "Keine Berechtigung"
-#: ../../include/items.php:1012 ../../include/items.php:1058
+#: ../../include/items.php:979 ../../include/items.php:1024
msgid "(Unknown)"
msgstr "(Unbekannt)"
-#: ../../include/items.php:1226
+#: ../../include/items.php:1181
msgid "Visible to anybody on the internet."
msgstr "Für jeden im Internet sichtbar."
-#: ../../include/items.php:1228
+#: ../../include/items.php:1183
msgid "Visible to you only."
msgstr "Nur für Dich sichtbar."
-#: ../../include/items.php:1230
+#: ../../include/items.php:1185
msgid "Visible to anybody in this network."
msgstr "Für jedes Mitglied der RedMatrix sichtbar."
-#: ../../include/items.php:1232
+#: ../../include/items.php:1187
msgid "Visible to anybody authenticated."
msgstr "Für jeden sichtbar, der angemeldet ist."
-#: ../../include/items.php:1234
+#: ../../include/items.php:1189
#, php-format
msgid "Visible to anybody on %s."
msgstr "Für jeden auf %s sichtbar."
-#: ../../include/items.php:1236
+#: ../../include/items.php:1191
msgid "Visible to all connections."
msgstr "Für alle Verbindungen sichtbar."
-#: ../../include/items.php:1238
+#: ../../include/items.php:1193
msgid "Visible to approved connections."
msgstr "Nur für akzeptierte Verbindungen sichtbar."
-#: ../../include/items.php:1240
+#: ../../include/items.php:1195
msgid "Visible to specific connections."
msgstr "Sichtbar für bestimmte Verbindungen."
-#: ../../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
+#: ../../include/items.php:4002 ../../mod/thing.php:76
+#: ../../mod/display.php:32 ../../mod/filestorage.php:27
+#: ../../mod/viewsrc.php:20 ../../mod/admin.php:168 ../../mod/admin.php:901
+#: ../../mod/admin.php:1104
msgid "Item not found."
msgstr "Element nicht gefunden."
-#: ../../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 "Zugang verweigert"
-
-#: ../../include/items.php:4524 ../../mod/group.php:38 ../../mod/group.php:140
-#: ../../mod/bulksetclose.php:51
+#: ../../include/items.php:4455 ../../mod/group.php:38 ../../mod/group.php:140
msgid "Collection not found."
msgstr "Sammlung nicht gefunden"
-#: ../../include/items.php:4540
+#: ../../include/items.php:4470
msgid "Collection is empty."
msgstr "Sammlung ist leer."
-#: ../../include/items.php:4547
+#: ../../include/items.php:4477
#, php-format
msgid "Collection: %s"
msgstr "Sammlung: %s"
-#: ../../include/items.php:4557
+#: ../../include/items.php:4488
#, php-format
msgid "Connection: %s"
msgstr "Verbindung: %s"
-#: ../../include/items.php:4559
+#: ../../include/items.php:4491
msgid "Connection not found."
msgstr "Die Verbindung wurde nicht gefunden."
-#: ../../include/permissions.php:26
-msgid "Can view my normal stream and posts"
-msgstr "Kann meine normalen Beiträge sehen"
+#: ../../include/event.php:376
+msgid "This event has been added to your calendar."
+msgstr "Dieser Termin wurde zu Deinem Kalender hinzugefügt"
-#: ../../include/permissions.php:27
-msgid "Can view my default channel profile"
-msgstr "Kann mein Standardprofil sehen"
+#: ../../include/Contact.php:124
+msgid "New window"
+msgstr "Neues Fenster"
-#: ../../include/permissions.php:28
-msgid "Can view my photo albums"
-msgstr "Kann meine Fotoalben betrachten"
+#: ../../include/Contact.php:125
+msgid "Open the selected location in a different window or browser tab"
+msgstr "Öffne die markierte Adresse in einem neuen Browser Fenster oder Tab"
-#: ../../include/permissions.php:29
-msgid "Can view my connections"
-msgstr "Kann meine Verbindungen sehen"
+#: ../../include/Contact.php:215 ../../mod/admin.php:651
+#, php-format
+msgid "User '%s' deleted"
+msgstr "Benutzer '%s' gelöscht"
-#: ../../include/permissions.php:30
-msgid "Can view my file storage"
-msgstr "Kann meine Dateiordner lesen"
+#: ../../include/network.php:613
+msgid "view full size"
+msgstr "In Vollbildansicht anschauen"
-#: ../../include/permissions.php:31
-msgid "Can view my webpages"
-msgstr "Kann meine Webseiten sehen"
+#: ../../include/diaspora.php:1938 ../../include/conversation.php:164
+#: ../../mod/like.php:383
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
+msgstr "%1$s gefällt %2$ss %3$s"
-#: ../../include/permissions.php:34
-msgid "Can send me their channel stream and posts"
-msgstr "Kann mir die Beiträge aus seinem/ihrem Kanal schicken"
+#: ../../include/bbcode.php:115 ../../include/bbcode.php:694
+#: ../../include/bbcode.php:697 ../../include/bbcode.php:702
+#: ../../include/bbcode.php:705 ../../include/bbcode.php:708
+#: ../../include/bbcode.php:711 ../../include/bbcode.php:716
+#: ../../include/bbcode.php:719 ../../include/bbcode.php:724
+#: ../../include/bbcode.php:727 ../../include/bbcode.php:730
+#: ../../include/bbcode.php:733
+msgid "Image/photo"
+msgstr "Bild/Foto"
-#: ../../include/permissions.php:35
-msgid "Can post on my channel page (\"wall\")"
-msgstr "Kann auf meiner Kanal-Seite (\"wall\") Beiträge veröffentlichen"
+#: ../../include/bbcode.php:150 ../../include/bbcode.php:744
+msgid "Encrypted content"
+msgstr "Verschlüsselter Inhalt"
-#: ../../include/permissions.php:36
-msgid "Can comment on or like my posts"
-msgstr "Darf meine Beiträge kommentieren und mögen/nicht mögen"
+#: ../../include/bbcode.php:168
+msgid "Install design element: "
+msgstr "Design-Element installieren:"
-#: ../../include/permissions.php:37
-msgid "Can send me private mail messages"
-msgstr "Kann mir private Nachrichten schicken"
+#: ../../include/bbcode.php:174
+msgid "QR code"
+msgstr "QR-Code"
-#: ../../include/permissions.php:38
-msgid "Can post photos to my photo albums"
-msgstr "Kann Fotos in meinen Fotoalben veröffentlichen"
+#: ../../include/bbcode.php:223
+#, php-format
+msgid "%1$s wrote the following %2$s %3$s"
+msgstr "%1$s schrieb den folgenden %2$s %3$s"
-#: ../../include/permissions.php:39
-msgid "Can like/dislike stuff"
-msgstr "Kann andere Elemente mögen/nicht mögen"
+#: ../../include/bbcode.php:225
+msgid "post"
+msgstr "Beitrag"
-#: ../../include/permissions.php:39
-msgid "Profiles and things other than posts/comments"
-msgstr "Profile und alles außer Beiträge und Kommentare"
+#: ../../include/bbcode.php:447
+msgid "Different viewers will see this text differently"
+msgstr "Verschiedene Betrachter werden diesen Text unterschiedlich sehen"
-#: ../../include/permissions.php:41
-msgid "Can forward to all my channel contacts via post @mentions"
-msgstr "Kann an alle meine Kontakte via @-Erwähnung Nachrichten weiterleiten"
+#: ../../include/bbcode.php:662
+msgid "$1 spoiler"
+msgstr "$1 Spoiler"
-#: ../../include/permissions.php:41
-msgid "Advanced - useful for creating group forum channels"
-msgstr "Fortgeschritten - sinnvoll, um Gruppen-Kanäle/-Foren zu erstellen"
+#: ../../include/bbcode.php:682
+msgid "$1 wrote:"
+msgstr "$1 schrieb:"
-#: ../../include/permissions.php:42
-msgid "Can chat with me (when available)"
-msgstr "Kann mit mir chatten (wenn verfügbar)"
+#: ../../include/contact_widgets.php:14
+#, php-format
+msgid "%d invitation available"
+msgid_plural "%d invitations available"
+msgstr[0] "%d Einladung verfügbar"
+msgstr[1] "%d Einladungen verfügbar"
-#: ../../include/permissions.php:43
-msgid "Can write to my file storage"
-msgstr "Kann in meine Dateiordner schreiben"
+#: ../../include/contact_widgets.php:19 ../../mod/admin.php:420
+msgid "Advanced"
+msgstr "Fortgeschritten"
-#: ../../include/permissions.php:44
-msgid "Can edit my webpages"
-msgstr "Kann meine Webseiten bearbeiten"
+#: ../../include/contact_widgets.php:22
+msgid "Find Channels"
+msgstr "Finde Kanäle"
-#: ../../include/permissions.php:46
-msgid "Can source my public posts in derived channels"
-msgstr "Kann meine öffentlichen Beiträge als Quellen für Kanäle verwenden"
+#: ../../include/contact_widgets.php:23
+msgid "Enter name or interest"
+msgstr "Name oder Interessen eingeben"
-#: ../../include/permissions.php:46
-msgid "Somewhat advanced - very useful in open communities"
-msgstr "Etwas fortgeschritten – sehr nützlich in offenen Gemeinschaften"
+#: ../../include/contact_widgets.php:24
+msgid "Connect/Follow"
+msgstr "Verbinden/Folgen"
-#: ../../include/permissions.php:48
-msgid "Can administer my channel resources"
-msgstr "Kann meine Kanäle administrieren"
+#: ../../include/contact_widgets.php:25
+msgid "Examples: Robert Morgenstein, Fishing"
+msgstr "Beispiele: Robert Morgenstein, Angeln"
-#: ../../include/permissions.php:48
-msgid ""
-"Extremely advanced. Leave this alone unless you know what you are doing"
-msgstr "Sehr fortgeschritten. Bearbeite das nur, wenn Du genau weißt, was Du tust"
+#: ../../include/contact_widgets.php:26 ../../mod/connections.php:413
+#: ../../mod/directory.php:330 ../../mod/directory.php:335
+msgid "Find"
+msgstr "Finde"
-#: ../../include/permissions.php:809
-msgid "Social Networking"
-msgstr "Soziales Netzwerk"
+#: ../../include/contact_widgets.php:27 ../../mod/suggest.php:59
+#: ../../mod/directory.php:334
+msgid "Channel Suggestions"
+msgstr "Kanal-Vorschläge"
-#: ../../include/permissions.php:809 ../../include/permissions.php:810
-#: ../../include/permissions.php:811
-msgid "Mostly Public"
-msgstr "Weitgehend öffentlich"
+#: ../../include/contact_widgets.php:29
+msgid "Random Profile"
+msgstr "Zufallsprofil"
-#: ../../include/permissions.php:809 ../../include/permissions.php:810
-#: ../../include/permissions.php:811
-msgid "Restricted"
-msgstr "Beschränkt"
+#: ../../include/contact_widgets.php:30
+msgid "Invite Friends"
+msgstr "Lade Freunde ein"
-#: ../../include/permissions.php:809 ../../include/permissions.php:810
-msgid "Private"
-msgstr "Privat"
+#: ../../include/contact_widgets.php:32
+msgid "Advanced example: name=fred and country=iceland"
+msgstr "Fortgeschrittenes Beispiel: name=fred and country=iceland"
-#: ../../include/permissions.php:810
-msgid "Community Forum"
-msgstr "Forum"
+#: ../../include/contact_widgets.php:125
+#, php-format
+msgid "%d connection in common"
+msgid_plural "%d connections in common"
+msgstr[0] "%d gemeinsame Verbindung"
+msgstr[1] "%d gemeinsame Verbindungen"
-#: ../../include/permissions.php:811
-msgid "Feed Republish"
-msgstr "Teilen von Feeds"
+#: ../../include/contact_widgets.php:130
+msgid "show more"
+msgstr "mehr zeigen"
-#: ../../include/permissions.php:812
-msgid "Special Purpose"
-msgstr "Für besondere Zwecke"
+#: ../../include/acl_selectors.php:240
+msgid "Visible to your default audience"
+msgstr "Standard-Sichtbarkeit"
-#: ../../include/permissions.php:812
-msgid "Celebrity/Soapbox"
-msgstr "Mitteilungs-Kanal (keine Kommentare)"
+#: ../../include/acl_selectors.php:241
+msgid "Show"
+msgstr "Anzeigen"
-#: ../../include/permissions.php:812
-msgid "Group Repository"
-msgstr "Gruppenarchiv"
+#: ../../include/acl_selectors.php:242
+msgid "Don't show"
+msgstr "Nicht anzeigen"
+
+#: ../../include/acl_selectors.php:248 ../../mod/events.php:652
+#: ../../mod/chat.php:209 ../../mod/filestorage.php:146
+#: ../../mod/photos.php:559 ../../mod/photos.php:916
+msgid "Permissions"
+msgstr "Berechtigungen"
+
+#: ../../include/api.php:1081
+msgid "Public Timeline"
+msgstr "Öffentliche Zeitleiste"
+
+#: ../../include/zot.php:673
+msgid "Invalid data packet"
+msgstr "Ungültiges Datenpaket"
-#: ../../include/permissions.php:813 ../../include/profile_selectors.php:6
+#: ../../include/zot.php:689
+msgid "Unable to verify channel signature"
+msgstr "Konnte die Signatur des Kanals nicht verifizieren"
+
+#: ../../include/zot.php:1961
+#, php-format
+msgid "Unable to verify site signature for %s"
+msgstr "Kann die Signatur der Seite von %s nicht verifizieren"
+
+#: ../../include/profile_selectors.php:6
+#: ../../include/profile_selectors.php:23
+msgid "Male"
+msgstr "Männlich"
+
+#: ../../include/profile_selectors.php:6
+#: ../../include/profile_selectors.php:23
+msgid "Female"
+msgstr "Weiblich"
+
+#: ../../include/profile_selectors.php:6
+msgid "Currently Male"
+msgstr "Momentan männlich"
+
+#: ../../include/profile_selectors.php:6
+msgid "Currently Female"
+msgstr "Momentan weiblich"
+
+#: ../../include/profile_selectors.php:6
+msgid "Mostly Male"
+msgstr "Größtenteils männlich"
+
+#: ../../include/profile_selectors.php:6
+msgid "Mostly Female"
+msgstr "Größtenteils weiblich"
+
+#: ../../include/profile_selectors.php:6
+msgid "Transgender"
+msgstr "Transsexuell"
+
+#: ../../include/profile_selectors.php:6
+msgid "Intersex"
+msgstr "Zwischengeschlechtlich"
+
+#: ../../include/profile_selectors.php:6
+msgid "Transsexual"
+msgstr "Transsexuell"
+
+#: ../../include/profile_selectors.php:6
+msgid "Hermaphrodite"
+msgstr "Zwitter"
+
+#: ../../include/profile_selectors.php:6
+msgid "Neuter"
+msgstr "Geschlechtslos"
+
+#: ../../include/profile_selectors.php:6
+msgid "Non-specific"
+msgstr "unklar"
+
+#: ../../include/profile_selectors.php:6
#: ../../include/profile_selectors.php:23
#: ../../include/profile_selectors.php:61
-#: ../../include/profile_selectors.php:97
+#: ../../include/profile_selectors.php:97 ../../include/permissions.php:814
msgid "Other"
msgstr "Andere"
-#: ../../include/permissions.php:813
-msgid "Custom/Expert Mode"
-msgstr "Benutzerdefiniert/Expertenmodus"
+#: ../../include/profile_selectors.php:6
+msgid "Undecided"
+msgstr "Unentschieden"
+
+#: ../../include/profile_selectors.php:42
+#: ../../include/profile_selectors.php:61
+msgid "Males"
+msgstr "Männer"
+
+#: ../../include/profile_selectors.php:42
+#: ../../include/profile_selectors.php:61
+msgid "Females"
+msgstr "Frauen"
+
+#: ../../include/profile_selectors.php:42
+msgid "Gay"
+msgstr "Schwul"
+
+#: ../../include/profile_selectors.php:42
+msgid "Lesbian"
+msgstr "Lesbisch"
+
+#: ../../include/profile_selectors.php:42
+msgid "No Preference"
+msgstr "Keine Bevorzugung"
+
+#: ../../include/profile_selectors.php:42
+msgid "Bisexual"
+msgstr "Bisexuell"
+
+#: ../../include/profile_selectors.php:42
+msgid "Autosexual"
+msgstr "Autosexuell"
+
+#: ../../include/profile_selectors.php:42
+msgid "Abstinent"
+msgstr "Enthaltsam"
+
+#: ../../include/profile_selectors.php:42
+msgid "Virgin"
+msgstr "Jungfräulich"
+
+#: ../../include/profile_selectors.php:42
+msgid "Deviant"
+msgstr "Abweichend"
+
+#: ../../include/profile_selectors.php:42
+msgid "Fetish"
+msgstr "Fetisch"
+
+#: ../../include/profile_selectors.php:42
+msgid "Oodles"
+msgstr "Unmengen"
+
+#: ../../include/profile_selectors.php:42
+msgid "Nonsexual"
+msgstr "Sexlos"
+
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Single"
+msgstr "Single"
+
+#: ../../include/profile_selectors.php:80
+msgid "Lonely"
+msgstr "Einsam"
+
+#: ../../include/profile_selectors.php:80
+msgid "Available"
+msgstr "Verfügbar"
+
+#: ../../include/profile_selectors.php:80
+msgid "Unavailable"
+msgstr "Nicht verfügbar"
+
+#: ../../include/profile_selectors.php:80
+msgid "Has crush"
+msgstr "Verguckt"
+
+#: ../../include/profile_selectors.php:80
+msgid "Infatuated"
+msgstr "Verknallt"
+
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Dating"
+msgstr "Lerne gerade jemanden kennen"
+
+#: ../../include/profile_selectors.php:80
+msgid "Unfaithful"
+msgstr "Treulos"
+
+#: ../../include/profile_selectors.php:80
+msgid "Sex Addict"
+msgstr "Sexabhängig"
+
+#: ../../include/profile_selectors.php:80
+msgid "Friends/Benefits"
+msgstr "Freunde/Begünstigte"
+
+#: ../../include/profile_selectors.php:80
+msgid "Casual"
+msgstr "Lose"
+
+#: ../../include/profile_selectors.php:80
+msgid "Engaged"
+msgstr "Verlobt"
+
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Married"
+msgstr "Verheiratet"
+
+#: ../../include/profile_selectors.php:80
+msgid "Imaginarily married"
+msgstr "Gewissermaßen verheiratet"
+
+#: ../../include/profile_selectors.php:80
+msgid "Partners"
+msgstr "Partner"
+
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Cohabiting"
+msgstr "Lebensgemeinschaft"
+
+#: ../../include/profile_selectors.php:80
+msgid "Common law"
+msgstr "Informelle Ehe"
+
+#: ../../include/profile_selectors.php:80
+msgid "Happy"
+msgstr "Glücklich"
+
+#: ../../include/profile_selectors.php:80
+msgid "Not looking"
+msgstr "Nicht Ausschau haltend"
+
+#: ../../include/profile_selectors.php:80
+msgid "Swinger"
+msgstr "Swinger"
+
+#: ../../include/profile_selectors.php:80
+msgid "Betrayed"
+msgstr "Betrogen"
+
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Separated"
+msgstr "Getrennt"
+
+#: ../../include/profile_selectors.php:80
+msgid "Unstable"
+msgstr "Labil"
+
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Divorced"
+msgstr "Geschieden"
+
+#: ../../include/profile_selectors.php:80
+msgid "Imaginarily divorced"
+msgstr "Gewissermaßen geschieden"
+
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Widowed"
+msgstr "Verwitwet"
+
+#: ../../include/profile_selectors.php:80
+msgid "Uncertain"
+msgstr "Ungewiss"
+
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "It's complicated"
+msgstr "Es ist kompliziert"
+
+#: ../../include/profile_selectors.php:80
+msgid "Don't care"
+msgstr "Interessiert mich nicht"
+
+#: ../../include/profile_selectors.php:80
+msgid "Ask me"
+msgstr "Frag mich mal"
+
+#: ../../include/apps.php:128
+msgid "Site Admin"
+msgstr "Hub-Administration"
+
+#: ../../include/apps.php:130
+msgid "Address Book"
+msgstr "Adressbuch"
+
+#: ../../include/apps.php:144 ../../mod/mood.php:130
+msgid "Mood"
+msgstr "Laune"
+
+#: ../../include/apps.php:145 ../../include/conversation.php:943
+msgid "Poke"
+msgstr "Anstupsen"
+
+#: ../../include/apps.php:148
+msgid "Probe"
+msgstr "Testen"
+
+#: ../../include/apps.php:149
+msgid "Suggest"
+msgstr "Empfehlen"
+
+#: ../../include/apps.php:150
+msgid "Random Channel"
+msgstr "Zufälliger Kanal"
+
+#: ../../include/apps.php:151
+msgid "Invite"
+msgstr "Einladen"
+
+#: ../../include/apps.php:152
+msgid "Features"
+msgstr "Funktionen"
+
+#: ../../include/apps.php:153
+msgid "Language"
+msgstr "Sprache"
+
+#: ../../include/apps.php:154
+msgid "Post"
+msgstr "Beitrag"
+
+#: ../../include/apps.php:155
+msgid "Profile Photo"
+msgstr "Profilfoto"
+
+#: ../../include/apps.php:247 ../../mod/settings.php:81
+#: ../../mod/settings.php:609
+msgid "Update"
+msgstr "Aktualisieren"
+
+#: ../../include/apps.php:247
+msgid "Install"
+msgstr "Installieren"
+
+#: ../../include/apps.php:252
+msgid "Purchase"
+msgstr "Kaufen"
+
+#: ../../include/account.php:23
+msgid "Not a valid email address"
+msgstr "Ungültige E-Mail-Adresse"
+
+#: ../../include/account.php:25
+msgid "Your email domain is not among those allowed on this site"
+msgstr "Deine E-Mail-Adresse ist dieser Seite nicht erlaubt"
+
+#: ../../include/account.php:31
+msgid "Your email address is already registered at this site."
+msgstr "Deine E-Mail-Adresse ist auf dieser Seite bereits registriert."
+
+#: ../../include/account.php:64
+msgid "An invitation is required."
+msgstr "Eine Einladung wird benötigt"
+
+#: ../../include/account.php:68
+msgid "Invitation could not be verified."
+msgstr "Die Einladung konnte nicht bestätigt werden"
+
+#: ../../include/account.php:119
+msgid "Please enter the required information."
+msgstr "Bitte gib die benötigten Informationen ein."
+
+#: ../../include/account.php:187
+msgid "Failed to store account information."
+msgstr "Speichern der Account-Informationen fehlgeschlagen"
+
+#: ../../include/account.php:245
+#, php-format
+msgid "Registration confirmation for %s"
+msgstr "Registrierungsbestätigung für %s"
+
+#: ../../include/account.php:313
+#, php-format
+msgid "Registration request at %s"
+msgstr "Registrierungsanfrage auf %s"
+
+#: ../../include/account.php:315 ../../include/account.php:342
+#: ../../include/account.php:399
+msgid "Administrator"
+msgstr "Administrator"
+
+#: ../../include/account.php:337
+msgid "your registration password"
+msgstr "Dein Registrierungspasswort"
+
+#: ../../include/account.php:340 ../../include/account.php:397
+#, php-format
+msgid "Registration details for %s"
+msgstr "Registrierungsdetails für %s"
+
+#: ../../include/account.php:406
+msgid "Account approved."
+msgstr "Account bestätigt."
+
+#: ../../include/account.php:440
+#, php-format
+msgid "Registration revoked for %s"
+msgstr "Registrierung für %s widerrufen"
+
+#: ../../include/account.php:486
+msgid "Account verified. Please login."
+msgstr "Konto geprüft. Bitte melde Dich an!"
+
+#: ../../include/account.php:674 ../../include/account.php:676
+msgid "Click here to upgrade."
+msgstr "Klicke hier, um das Upgrade durchzuführen."
+
+#: ../../include/account.php:682
+msgid "This action exceeds the limits set by your subscription plan."
+msgstr "Diese Aktion überschreitet die Grenzen Ihres Abonnements."
+
+#: ../../include/account.php:687
+msgid "This action is not available under your subscription plan."
+msgstr "Diese Aktion ist in Ihrem Abonnement nicht verfügbar."
#: ../../include/conversation.php:126 ../../mod/like.php:113
msgid "channel"
msgstr "Kanal"
-#: ../../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 gefällt %2$ss %3$s"
-
-#: ../../include/conversation.php:167 ../../mod/like.php:396
+#: ../../include/conversation.php:167 ../../mod/like.php:385
#, php-format
msgid "%1$s doesn't like %2$s's %3$s"
msgstr "%1$s gefällt %2$ss %3$s nicht"
@@ -2678,1870 +3273,1960 @@ msgstr "%1$s ist jetzt mit %2$s verbunden"
msgid "%1$s poked %2$s"
msgstr "%1$s stupste %2$s an"
-#: ../../include/conversation.php:260 ../../mod/mood.php:63
+#: ../../include/conversation.php:261 ../../mod/mood.php:63
#, php-format
msgctxt "mood"
msgid "%1$s is %2$s"
msgstr "%1$s ist %2$s"
-#: ../../include/conversation.php:572 ../../mod/photos.php:984
+#: ../../include/conversation.php:556 ../../mod/photos.php:978
msgctxt "title"
msgid "Likes"
msgstr "Gefällt mir"
-#: ../../include/conversation.php:572 ../../mod/photos.php:984
+#: ../../include/conversation.php:556 ../../mod/photos.php:978
msgctxt "title"
msgid "Dislikes"
msgstr "Gefällt mir nicht"
-#: ../../include/conversation.php:573 ../../mod/photos.php:985
+#: ../../include/conversation.php:557 ../../mod/photos.php:979
msgctxt "title"
msgid "Agree"
msgstr "Zustimmungen"
-#: ../../include/conversation.php:573 ../../mod/photos.php:985
+#: ../../include/conversation.php:557 ../../mod/photos.php:979
msgctxt "title"
msgid "Disagree"
msgstr "Ablehnungen"
-#: ../../include/conversation.php:573 ../../mod/photos.php:985
+#: ../../include/conversation.php:557 ../../mod/photos.php:979
msgctxt "title"
msgid "Abstain"
msgstr "Enthaltungen"
-#: ../../include/conversation.php:574 ../../mod/photos.php:986
+#: ../../include/conversation.php:558 ../../mod/photos.php:980
msgctxt "title"
msgid "Attending"
msgstr "Zusagen"
-#: ../../include/conversation.php:574 ../../mod/photos.php:986
+#: ../../include/conversation.php:558 ../../mod/photos.php:980
msgctxt "title"
msgid "Not attending"
msgstr "Absagen"
-#: ../../include/conversation.php:574 ../../mod/photos.php:986
+#: ../../include/conversation.php:558 ../../mod/photos.php:980
msgctxt "title"
msgid "Might attend"
msgstr "Vielleicht"
-#: ../../include/conversation.php:692
+#: ../../include/conversation.php:680
#, php-format
msgid "View %s's profile @ %s"
msgstr "%ss Profil auf %s ansehen"
-#: ../../include/conversation.php:707
+#: ../../include/conversation.php:695
msgid "Categories:"
msgstr "Kategorien:"
-#: ../../include/conversation.php:708
+#: ../../include/conversation.php:696
msgid "Filed under:"
msgstr "Gespeichert unter:"
-#: ../../include/conversation.php:735
+#: ../../include/conversation.php:723
msgid "View in context"
msgstr "Im Zusammenhang anschauen"
-#: ../../include/conversation.php:846
+#: ../../include/conversation.php:838
msgid "remove"
msgstr "lösche"
-#: ../../include/conversation.php:851
+#: ../../include/conversation.php:843
msgid "Delete Selected Items"
msgstr "Lösche die ausgewählten Elemente"
-#: ../../include/conversation.php:939
+#: ../../include/conversation.php:934
msgid "View Source"
msgstr "Quelle anzeigen"
-#: ../../include/conversation.php:940
+#: ../../include/conversation.php:935
msgid "Follow Thread"
msgstr "Unterhaltung folgen"
-#: ../../include/conversation.php:941
+#: ../../include/conversation.php:936
msgid "View Status"
msgstr "Status ansehen"
-#: ../../include/conversation.php:943
+#: ../../include/conversation.php:938
msgid "View Photos"
msgstr "Fotos ansehen"
-#: ../../include/conversation.php:944
+#: ../../include/conversation.php:939
msgid "Matrix Activity"
msgstr "Matrix-Aktivität"
-#: ../../include/conversation.php:946
+#: ../../include/conversation.php:941
msgid "Edit Contact"
msgstr "Kontakt bearbeiten"
-#: ../../include/conversation.php:947
+#: ../../include/conversation.php:942
msgid "Send PM"
msgstr "Sende PN"
-#: ../../include/conversation.php:948 ../../include/apps.php:145
-msgid "Poke"
-msgstr "Anstupsen"
-
-#: ../../include/conversation.php:1062
+#: ../../include/conversation.php:1061
#, php-format
msgid "%s likes this."
msgstr "%s gefällt das."
-#: ../../include/conversation.php:1062
+#: ../../include/conversation.php:1061
#, php-format
msgid "%s doesn't like this."
msgstr "%s gefällt das nicht."
-#: ../../include/conversation.php:1066
+#: ../../include/conversation.php:1065
#, 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 Person</span> gefällt das."
msgstr[1] "<span %1$s>%2$d Leuten</span> gefällt das."
-#: ../../include/conversation.php:1068
+#: ../../include/conversation.php:1067
#, 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 Person</span> gefällt das nicht."
msgstr[1] "<span %1$s>%2$d Leuten</span> gefällt das nicht."
-#: ../../include/conversation.php:1074
+#: ../../include/conversation.php:1073
msgid "and"
msgstr "und"
-#: ../../include/conversation.php:1077
+#: ../../include/conversation.php:1076
#, php-format
msgid ", and %d other people"
msgid_plural ", and %d other people"
msgstr[0] ""
msgstr[1] ", und %d andere"
-#: ../../include/conversation.php:1078
+#: ../../include/conversation.php:1077
#, php-format
msgid "%s like this."
msgstr "%s gefällt das."
-#: ../../include/conversation.php:1078
+#: ../../include/conversation.php:1077
#, php-format
msgid "%s don't like this."
msgstr "%s gefällt das nicht."
-#: ../../include/conversation.php:1140
+#: ../../include/conversation.php:1136
msgid "Visible to <strong>everybody</strong>"
msgstr "Sichtbar für <strong>jeden</strong>"
-#: ../../include/conversation.php:1141 ../../mod/mail.php:174
+#: ../../include/conversation.php:1137 ../../mod/mail.php:174
#: ../../mod/mail.php:289
msgid "Please enter a link URL:"
msgstr "Gib eine URL ein:"
-#: ../../include/conversation.php:1142
+#: ../../include/conversation.php:1138
msgid "Please enter a video link/URL:"
msgstr "Gib einen Video-Link/URL ein:"
-#: ../../include/conversation.php:1143
+#: ../../include/conversation.php:1139
msgid "Please enter an audio link/URL:"
msgstr "Gib einen Audio-Link/URL ein:"
-#: ../../include/conversation.php:1144
+#: ../../include/conversation.php:1140
msgid "Tag term:"
msgstr "Schlagwort:"
-#: ../../include/conversation.php:1145 ../../mod/filer.php:49
+#: ../../include/conversation.php:1141 ../../mod/filer.php:49
msgid "Save to Folder:"
msgstr "Speichern in Ordner:"
-#: ../../include/conversation.php:1146
+#: ../../include/conversation.php:1142
msgid "Where are you right now?"
msgstr "Wo bist Du jetzt grade?"
-#: ../../include/conversation.php:1147 ../../mod/editpost.php:52
+#: ../../include/conversation.php:1143 ../../mod/editpost.php:52
#: ../../mod/mail.php:175 ../../mod/mail.php:290
msgid "Expires YYYY-MM-DD HH:MM"
msgstr "Verfällt YYYY-MM-DD 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:1170 ../../mod/editblock.php:198
+#: ../../mod/editlayout.php:193 ../../mod/editwebpage.php:230
+#: ../../mod/layouts.php:168 ../../mod/photos.php:943
msgid "Share"
msgstr "Teilen"
-#: ../../include/conversation.php:1176
-msgid "Page link name"
-msgstr "Link zur Seite"
+#: ../../include/conversation.php:1172 ../../mod/editwebpage.php:170
+msgid "Page link title"
+msgstr "Seitentitel-Link"
-#: ../../include/conversation.php:1179
+#: ../../include/conversation.php:1175
msgid "Post as"
msgstr "Veröffentlichen 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:1176 ../../mod/editblock.php:144
+#: ../../mod/editpost.php:114 ../../mod/editlayout.php:140
+#: ../../mod/editwebpage.php:175 ../../mod/mail.php:238 ../../mod/mail.php:352
msgid "Upload photo"
msgstr "Foto hochladen"
-#: ../../include/conversation.php:1187
+#: ../../include/conversation.php:1177
msgid "upload photo"
msgstr "Foto hochladen"
-#: ../../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:1178 ../../mod/editblock.php:145
+#: ../../mod/editpost.php:115 ../../mod/editlayout.php:141
+#: ../../mod/editwebpage.php:176 ../../mod/mail.php:239 ../../mod/mail.php:353
msgid "Attach file"
msgstr "Datei anhängen"
-#: ../../include/conversation.php:1189
+#: ../../include/conversation.php:1179
msgid "attach file"
msgstr "Datei anfügen"
-#: ../../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:1180 ../../mod/editblock.php:146
+#: ../../mod/editpost.php:116 ../../mod/editlayout.php:142
+#: ../../mod/editwebpage.php:177 ../../mod/mail.php:240 ../../mod/mail.php:354
msgid "Insert web link"
msgstr "Link einfügen"
-#: ../../include/conversation.php:1191
+#: ../../include/conversation.php:1181
msgid "web link"
msgstr "Web-Link"
-#: ../../include/conversation.php:1192
+#: ../../include/conversation.php:1182
msgid "Insert video link"
msgstr "Video-Link einfügen"
-#: ../../include/conversation.php:1193
+#: ../../include/conversation.php:1183
msgid "video link"
msgstr "Video-Link"
-#: ../../include/conversation.php:1194
+#: ../../include/conversation.php:1184
msgid "Insert audio link"
msgstr "Audio-Link einfügen"
-#: ../../include/conversation.php:1195
+#: ../../include/conversation.php:1185
msgid "audio link"
msgstr "Audio-Link"
-#: ../../include/conversation.php:1196 ../../mod/editlayout.php:151
-#: ../../mod/editwebpage.php:190 ../../mod/editpost.php:125
-#: ../../mod/editblock.php:153
+#: ../../include/conversation.php:1186 ../../mod/editblock.php:150
+#: ../../mod/editpost.php:120 ../../mod/editlayout.php:146
+#: ../../mod/editwebpage.php:181
msgid "Set your location"
-msgstr "Legen Sie Ihren Standort fest"
+msgstr "Standort"
-#: ../../include/conversation.php:1197
+#: ../../include/conversation.php:1187
msgid "set location"
-msgstr "Standort festlegen"
+msgstr "Standort"
-#: ../../include/conversation.php:1198 ../../mod/editpost.php:127
+#: ../../include/conversation.php:1188 ../../mod/editpost.php:122
msgid "Toggle voting"
msgstr "Umfragewerkzeug aktivieren"
-#: ../../include/conversation.php:1201 ../../mod/editlayout.php:152
-#: ../../mod/editwebpage.php:191 ../../mod/editpost.php:126
-#: ../../mod/editblock.php:154
+#: ../../include/conversation.php:1191 ../../mod/editblock.php:151
+#: ../../mod/editpost.php:121 ../../mod/editlayout.php:147
+#: ../../mod/editwebpage.php:182
msgid "Clear browser location"
msgstr "Browser-Standort löschen"
-#: ../../include/conversation.php:1202
+#: ../../include/conversation.php:1192
msgid "clear location"
msgstr "Standort löschen"
-#: ../../include/conversation.php:1204 ../../mod/editwebpage.php:207
-#: ../../mod/editpost.php:141 ../../mod/editblock.php:167
+#: ../../include/conversation.php:1194 ../../mod/editblock.php:164
+#: ../../mod/editpost.php:136 ../../mod/editlayout.php:159
+#: ../../mod/editwebpage.php:198
msgid "Title (optional)"
msgstr "Titel (optional)"
-#: ../../include/conversation.php:1208 ../../mod/editlayout.php:168
-#: ../../mod/editwebpage.php:209 ../../mod/editpost.php:143
-#: ../../mod/editblock.php:170
+#: ../../include/conversation.php:1197 ../../mod/editblock.php:167
+#: ../../mod/editpost.php:138 ../../mod/editlayout.php:162
+#: ../../mod/editwebpage.php:200
msgid "Categories (optional, comma-separated list)"
msgstr "Kategorien (optional, kommagetrennte Liste)"
-#: ../../include/conversation.php:1210 ../../mod/editlayout.php:154
-#: ../../mod/editwebpage.php:193 ../../mod/editpost.php:131
-#: ../../mod/editblock.php:156
+#: ../../include/conversation.php:1199 ../../mod/editblock.php:153
+#: ../../mod/editpost.php:126 ../../mod/editlayout.php:149
+#: ../../mod/editwebpage.php:184
msgid "Permission settings"
msgstr "Berechtigungs-Einstellungen"
-#: ../../include/conversation.php:1211
+#: ../../include/conversation.php:1200
msgid "permissions"
msgstr "Berechtigungen"
-#: ../../include/conversation.php:1219 ../../mod/editlayout.php:161
-#: ../../mod/editwebpage.php:202 ../../mod/editpost.php:138
-#: ../../mod/editblock.php:164
+#: ../../include/conversation.php:1207 ../../mod/editblock.php:161
+#: ../../mod/editpost.php:133 ../../mod/editlayout.php:156
+#: ../../mod/editwebpage.php:193
msgid "Public post"
msgstr "Öffentlicher Beitrag"
-#: ../../include/conversation.php:1221 ../../mod/editlayout.php:169
-#: ../../mod/editwebpage.php:210 ../../mod/editpost.php:144
-#: ../../mod/editblock.php:171
+#: ../../include/conversation.php:1209 ../../mod/editblock.php:168
+#: ../../mod/editpost.php:139 ../../mod/editlayout.php:163
+#: ../../mod/editwebpage.php:201
msgid "Example: bob@example.com, mary@example.com"
msgstr "Beispiel: bob@example.com, mary@example.com"
-#: ../../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:1222 ../../mod/editblock.php:178
+#: ../../mod/editpost.php:150 ../../mod/editlayout.php:173
+#: ../../mod/editwebpage.php:210 ../../mod/mail.php:245 ../../mod/mail.php:359
msgid "Set expiration date"
-msgstr "Verfallsdatum festlegen"
+msgstr "Verfallsdatum"
-#: ../../include/conversation.php:1238 ../../mod/events.php:637
-#: ../../mod/editpost.php:159
+#: ../../include/conversation.php:1226 ../../mod/editpost.php:154
+#: ../../mod/events.php:635
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:1227 ../../mod/editpost.php:155
+#: ../../mod/events.php:634 ../../mod/fbrowser.php:82
+#: ../../mod/fbrowser.php:117 ../../mod/settings.php:584
+#: ../../mod/settings.php:610 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134
msgid "Cancel"
msgstr "Abbrechen"
-#: ../../include/conversation.php:1481
+#: ../../include/conversation.php:1471
msgid "Discover"
msgstr "Entdecken"
-#: ../../include/conversation.php:1484
+#: ../../include/conversation.php:1474
msgid "Imported public streams"
msgstr "Importierte öffentliche Beiträge"
-#: ../../include/conversation.php:1489
+#: ../../include/conversation.php:1479
msgid "Commented Order"
msgstr "Neueste Kommentare"
-#: ../../include/conversation.php:1492
+#: ../../include/conversation.php:1482
msgid "Sort by Comment Date"
msgstr "Nach Kommentardatum sortiert"
-#: ../../include/conversation.php:1496
+#: ../../include/conversation.php:1486
msgid "Posted Order"
msgstr "Neueste Beiträge"
-#: ../../include/conversation.php:1499
+#: ../../include/conversation.php:1489
msgid "Sort by Post Date"
msgstr "Nach Beitragsdatum sortiert"
-#: ../../include/conversation.php:1507
+#: ../../include/conversation.php:1497
msgid "Posts that mention or involve you"
msgstr "Beiträge mit Beteiligung Deinerseits"
-#: ../../include/conversation.php:1513 ../../mod/connections.php:212
-#: ../../mod/connections.php:225 ../../mod/menu.php:102
+#: ../../include/conversation.php:1503 ../../mod/connections.php:212
+#: ../../mod/connections.php:225 ../../mod/menu.php:80
msgid "New"
msgstr "Neu"
-#: ../../include/conversation.php:1516
+#: ../../include/conversation.php:1506
msgid "Activity Stream - by date"
msgstr "Activity Stream – nach Datum sortiert"
-#: ../../include/conversation.php:1522
+#: ../../include/conversation.php:1512
msgid "Starred"
msgstr "Markiert"
-#: ../../include/conversation.php:1525
+#: ../../include/conversation.php:1515
msgid "Favourite Posts"
msgstr "Markierte Beiträge"
-#: ../../include/conversation.php:1532
+#: ../../include/conversation.php:1522
msgid "Spam"
msgstr "Spam"
-#: ../../include/conversation.php:1535
+#: ../../include/conversation.php:1525
msgid "Posts flagged as SPAM"
msgstr "Nachrichten, die als SPAM markiert wurden"
-#: ../../include/conversation.php:1579 ../../mod/admin.php:952
+#: ../../include/conversation.php:1565 ../../mod/admin.php:870
msgid "Channel"
msgstr "Kanal"
-#: ../../include/conversation.php:1582
+#: ../../include/conversation.php:1568
msgid "Status Messages and Posts"
msgstr "Statusnachrichten und Beiträge"
-#: ../../include/conversation.php:1591
+#: ../../include/conversation.php:1577
msgid "About"
msgstr "Über"
-#: ../../include/conversation.php:1594
+#: ../../include/conversation.php:1580
msgid "Profile Details"
msgstr "Profil-Details"
-#: ../../include/conversation.php:1603 ../../include/photos.php:359
-msgid "Photo Albums"
-msgstr "Fotoalben"
-
-#: ../../include/conversation.php:1612
+#: ../../include/conversation.php:1598
msgid "Files and Storage"
msgstr "Dateien und Speicher"
-#: ../../include/conversation.php:1622 ../../include/conversation.php:1625
+#: ../../include/conversation.php:1608 ../../include/conversation.php:1611
msgid "Chatrooms"
msgstr "Chaträume"
-#: ../../include/conversation.php:1638
+#: ../../include/conversation.php:1624
msgid "Saved Bookmarks"
msgstr "Gespeicherte Lesezeichen"
-#: ../../include/conversation.php:1648
+#: ../../include/conversation.php:1635
msgid "Manage Webpages"
msgstr "Webseiten verwalten"
-#: ../../include/conversation.php:1707
+#: ../../include/conversation.php:1698
msgctxt "noun"
msgid "Attending"
msgid_plural "Attending"
msgstr[0] "Zusage"
msgstr[1] "Zusagen"
-#: ../../include/conversation.php:1710
+#: ../../include/conversation.php:1701
msgctxt "noun"
msgid "Not Attending"
msgid_plural "Not Attending"
msgstr[0] "Absage"
msgstr[1] "Absagen"
-#: ../../include/conversation.php:1713
+#: ../../include/conversation.php:1704
msgctxt "noun"
msgid "Undecided"
msgid_plural "Undecided"
msgstr[0] " Unentschlossen"
msgstr[1] "Unentschlossene"
-#: ../../include/conversation.php:1716
+#: ../../include/conversation.php:1707
msgctxt "noun"
msgid "Agree"
msgid_plural "Agrees"
msgstr[0] "Zustimmung"
msgstr[1] "Zustimmungen"
-#: ../../include/conversation.php:1719
+#: ../../include/conversation.php:1710
msgctxt "noun"
msgid "Disagree"
msgid_plural "Disagrees"
msgstr[0] "Ablehnung"
msgstr[1] "Ablehnungen"
-#: ../../include/conversation.php:1722
+#: ../../include/conversation.php:1713
msgctxt "noun"
msgid "Abstain"
msgid_plural "Abstains"
msgstr[0] "Enthaltung"
msgstr[1] "Enthaltungen"
-#: ../../include/photos.php:94
-#, php-format
-msgid "Image exceeds website size limit of %lu bytes"
-msgstr "Bild überschreitet das Limit der Webseite von %lu bytes"
+#: ../../include/oembed.php:171
+msgid "Embedded content"
+msgstr "Eingebetteter Inhalt"
-#: ../../include/photos.php:101
-msgid "Image file is empty."
-msgstr "Bilddatei ist leer."
+#: ../../include/oembed.php:180
+msgid "Embedding disabled"
+msgstr "Einbetten ausgeschaltet"
-#: ../../include/photos.php:128 ../../mod/profile_photo.php:217
-msgid "Unable to process image"
-msgstr "Kann Bild nicht verarbeiten"
+#: ../../include/permissions.php:26
+msgid "Can view my normal stream and posts"
+msgstr "Kann meine normalen Beiträge sehen"
-#: ../../include/photos.php:199
-msgid "Photo storage failed."
-msgstr "Foto speichern schlug fehl"
+#: ../../include/permissions.php:27
+msgid "Can view my default channel profile"
+msgstr "Kann mein Standardprofil sehen"
-#: ../../include/photos.php:363
-msgid "Upload New Photos"
-msgstr "Lade neue Fotos hoch"
+#: ../../include/permissions.php:28
+msgid "Can view my photo albums"
+msgstr "Kann meine Fotoalben betrachten"
-#: ../../include/zot.php:666
-msgid "Invalid data packet"
-msgstr "Ungültiges Datenpaket"
+#: ../../include/permissions.php:29
+msgid "Can view my connections"
+msgstr "Kann meine Verbindungen sehen"
-#: ../../include/zot.php:682
-msgid "Unable to verify channel signature"
-msgstr "Konnte die Signatur des Kanals nicht verifizieren"
+#: ../../include/permissions.php:30
+msgid "Can view my file storage"
+msgstr "Kann meine Dateiordner lesen"
-#: ../../include/zot.php:2108
-#, php-format
-msgid "Unable to verify site signature for %s"
-msgstr "Kann die Signatur der Seite von %s nicht verifizieren"
+#: ../../include/permissions.php:31
+msgid "Can view my webpages"
+msgstr "Kann meine Webseiten sehen"
-#: ../../include/oembed.php:183
-msgid "Embedded content"
-msgstr "Eingebetteter Inhalt"
+#: ../../include/permissions.php:34
+msgid "Can send me their channel stream and posts"
+msgstr "Kann mir die Beiträge aus seinem/ihrem Kanal schicken"
-#: ../../include/oembed.php:192
-msgid "Embedding disabled"
-msgstr "Einbetten ausgeschaltet"
+#: ../../include/permissions.php:35
+msgid "Can post on my channel page (\"wall\")"
+msgstr "Kann auf meiner Kanal-Seite (\"wall\") Beiträge veröffentlichen"
-#: ../../include/auth.php:131
-msgid "Logged out."
-msgstr "Ausgeloggt."
+#: ../../include/permissions.php:36
+msgid "Can comment on or like my posts"
+msgstr "Darf meine Beiträge kommentieren und mögen/nicht mögen"
-#: ../../include/auth.php:272
-msgid "Failed authentication"
-msgstr "Authentifizierung fehlgeschlagen"
+#: ../../include/permissions.php:37
+msgid "Can send me private mail messages"
+msgstr "Kann mir private Nachrichten schicken"
-#: ../../include/auth.php:286 ../../mod/openid.php:190
-msgid "Login failed."
-msgstr "Login fehlgeschlagen."
+#: ../../include/permissions.php:38
+msgid "Can post photos to my photo albums"
+msgstr "Kann Fotos in meinen Fotoalben veröffentlichen"
-#: ../../include/contact_widgets.php:14
-#, php-format
-msgid "%d invitation available"
-msgid_plural "%d invitations available"
-msgstr[0] "%d Einladung verfügbar"
-msgstr[1] "%d Einladungen verfügbar"
+#: ../../include/permissions.php:39
+msgid "Can like/dislike stuff"
+msgstr "Kann andere Elemente mögen/nicht mögen"
-#: ../../include/contact_widgets.php:19 ../../mod/admin.php:450
-msgid "Advanced"
-msgstr "Fortgeschritten"
+#: ../../include/permissions.php:39
+msgid "Profiles and things other than posts/comments"
+msgstr "Profile und alles außer Beiträge und Kommentare"
-#: ../../include/contact_widgets.php:22
-msgid "Find Channels"
-msgstr "Finde Kanäle"
+#: ../../include/permissions.php:41
+msgid "Can forward to all my channel contacts via post @mentions"
+msgstr "Kann an alle meine Kontakte via @-Erwähnung Nachrichten weiterleiten"
-#: ../../include/contact_widgets.php:23
-msgid "Enter name or interest"
-msgstr "Name oder Interessen eingeben"
+#: ../../include/permissions.php:41
+msgid "Advanced - useful for creating group forum channels"
+msgstr "Fortgeschritten - sinnvoll, um Gruppen-Kanäle/-Foren zu erstellen"
-#: ../../include/contact_widgets.php:24
-msgid "Connect/Follow"
-msgstr "Verbinden/Folgen"
+#: ../../include/permissions.php:42
+msgid "Can chat with me (when available)"
+msgstr "Kann mit mir chatten (wenn verfügbar)"
-#: ../../include/contact_widgets.php:25
-msgid "Examples: Robert Morgenstein, Fishing"
-msgstr "Beispiele: Robert Morgenstein, Angeln"
+#: ../../include/permissions.php:43
+msgid "Can write to my file storage"
+msgstr "Kann in meine Dateiordner schreiben"
-#: ../../include/contact_widgets.php:26 ../../mod/connections.php:413
-#: ../../mod/directory.php:362 ../../mod/directory.php:367
-msgid "Find"
-msgstr "Finde"
+#: ../../include/permissions.php:44
+msgid "Can edit my webpages"
+msgstr "Kann meine Webseiten bearbeiten"
-#: ../../include/contact_widgets.php:27 ../../mod/directory.php:366
-#: ../../mod/suggest.php:60
-msgid "Channel Suggestions"
-msgstr "Kanal-Vorschläge"
+#: ../../include/permissions.php:46
+msgid "Can source my public posts in derived channels"
+msgstr "Kann meine öffentlichen Beiträge als Quellen für Kanäle verwenden"
-#: ../../include/contact_widgets.php:29
-msgid "Random Profile"
-msgstr "Zufallsprofil"
+#: ../../include/permissions.php:46
+msgid "Somewhat advanced - very useful in open communities"
+msgstr "Etwas fortgeschritten – sehr nützlich in offenen Gemeinschaften"
-#: ../../include/contact_widgets.php:30
-msgid "Invite Friends"
-msgstr "Lade Freunde ein"
+#: ../../include/permissions.php:48
+msgid "Can administer my channel resources"
+msgstr "Kann meine Kanäle administrieren"
-#: ../../include/contact_widgets.php:32
-msgid "Advanced example: name=fred and country=iceland"
-msgstr "Fortgeschrittenes Beispiel: name=fred and country=iceland"
+#: ../../include/permissions.php:48
+msgid ""
+"Extremely advanced. Leave this alone unless you know what you are doing"
+msgstr "Sehr fortgeschritten. Bearbeite das nur, wenn Du genau weißt, was Du tust"
-#: ../../include/contact_widgets.php:125
-#, php-format
-msgid "%d connection in common"
-msgid_plural "%d connections in common"
-msgstr[0] "%d gemeinsame Verbindung"
-msgstr[1] "%d gemeinsame Verbindungen"
+#: ../../include/permissions.php:810
+msgid "Social Networking"
+msgstr "Soziales Netzwerk"
-#: ../../include/contact_widgets.php:130
-msgid "show more"
-msgstr "mehr zeigen"
+#: ../../include/permissions.php:810 ../../include/permissions.php:811
+#: ../../include/permissions.php:812
+msgid "Mostly Public"
+msgstr "Weitgehend öffentlich"
-#: ../../include/acl_selectors.php:240
-msgid "Visible to your default audience"
-msgstr "Standard-Sichtbarkeit"
+#: ../../include/permissions.php:810 ../../include/permissions.php:811
+#: ../../include/permissions.php:812
+msgid "Restricted"
+msgstr "Beschränkt"
-#: ../../include/acl_selectors.php:241
-msgid "Show"
-msgstr "Anzeigen"
+#: ../../include/permissions.php:810 ../../include/permissions.php:811
+msgid "Private"
+msgstr "Privat"
-#: ../../include/acl_selectors.php:242
-msgid "Don't show"
-msgstr "Nicht anzeigen"
+#: ../../include/permissions.php:811
+msgid "Community Forum"
+msgstr "Forum"
-#: ../../include/acl_selectors.php:248 ../../mod/events.php:654
-#: ../../mod/photos.php:559 ../../mod/photos.php:922 ../../mod/chat.php:209
-#: ../../mod/filestorage.php:147
-msgid "Permissions"
-msgstr "Berechtigungen"
+#: ../../include/permissions.php:812
+msgid "Feed Republish"
+msgstr "Teilen von Feeds"
-#: ../../include/attach.php:241 ../../include/attach.php:299
-msgid "Item was not found."
-msgstr "Beitrag wurde nicht gefunden."
+#: ../../include/permissions.php:813
+msgid "Special Purpose"
+msgstr "Für besondere Zwecke"
-#: ../../include/attach.php:356
-msgid "No source file."
-msgstr "Keine Quelldatei."
+#: ../../include/permissions.php:813
+msgid "Celebrity/Soapbox"
+msgstr "Mitteilungs-Kanal (keine Kommentare)"
-#: ../../include/attach.php:374
-msgid "Cannot locate file to replace"
-msgstr "Kann Datei zum Ersetzen nicht finden"
+#: ../../include/permissions.php:813
+msgid "Group Repository"
+msgstr "Gruppenarchiv"
-#: ../../include/attach.php:392
-msgid "Cannot locate file to revise/update"
-msgstr "Kann Datei zum Prüfen/Aktualisieren nicht finden"
+#: ../../include/permissions.php:814
+msgid "Custom/Expert Mode"
+msgstr "Benutzerdefiniert/Expertenmodus"
+
+#: ../../mod/achievements.php:34
+msgid "Some blurb about what to do when you're new here"
+msgstr "Ein Hinweis, was man tun kann, wenn man neu hier ist"
+
+#: ../../mod/editblock.php:79 ../../mod/editblock.php:95
+#: ../../mod/editpost.php:20 ../../mod/editlayout.php:78
+#: ../../mod/editwebpage.php:77
+msgid "Item not found"
+msgstr "Element nicht gefunden"
+
+#: ../../mod/editblock.php:115
+msgid "Edit Block"
+msgstr "Block bearbeiten"
+
+#: ../../mod/editblock.php:125
+msgid "Delete block?"
+msgstr "Block löschen?"
+
+#: ../../mod/editblock.php:147 ../../mod/editpost.php:117
+#: ../../mod/editlayout.php:143 ../../mod/editwebpage.php:178
+msgid "Insert YouTube video"
+msgstr "YouTube-Video einfügen"
+
+#: ../../mod/editblock.php:148 ../../mod/editpost.php:118
+#: ../../mod/editlayout.php:144 ../../mod/editwebpage.php:179
+msgid "Insert Vorbis [.ogg] video"
+msgstr "Vorbis [.ogg]-Video einfügen"
+
+#: ../../mod/editblock.php:149 ../../mod/editpost.php:119
+#: ../../mod/editlayout.php:145 ../../mod/editwebpage.php:180
+msgid "Insert Vorbis [.ogg] audio"
+msgstr "Vorbis [.ogg]-Audio einfügen"
+
+#: ../../mod/editblock.php:183
+msgid "Delete Block"
+msgstr "Block löschen"
-#: ../../include/attach.php:403
+#: ../../mod/manage.php:136
#, php-format
-msgid "File exceeds size limit of %d"
-msgstr "Datei überschreitet das Größen-Limit von %d"
+msgid "You have created %1$.0f of %2$.0f allowed channels."
+msgstr "Du hast %1$.0f von maximal %2$.0f erlaubten Kanälen eingerichtet."
+
+#: ../../mod/manage.php:144
+msgid "Create a new channel"
+msgstr "Neuen Kanal anlegen"
+
+#: ../../mod/manage.php:149
+msgid "Current Channel"
+msgstr "Aktueller Kanal"
-#: ../../include/attach.php:415
+#: ../../mod/manage.php:151
+msgid "Switch to one of your channels by selecting it."
+msgstr "Wechsle zu einem Deiner Kanäle, indem Du auf ihn klickst."
+
+#: ../../mod/manage.php:152
+msgid "Default Channel"
+msgstr "Standard Kanal"
+
+#: ../../mod/manage.php:153
+msgid "Make Default"
+msgstr "Zum Standard machen"
+
+#: ../../mod/manage.php:156
#, php-format
-msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
-msgstr "Die Größe Deiner Datei-Anhänge hat das Maximum von %1$.0f MByte erreicht."
+msgid "%d new messages"
+msgstr "%d neue Nachrichten"
-#: ../../include/attach.php:498
-msgid "File upload failed. Possible system limit or action terminated."
-msgstr "Datei-Upload fehlgeschlagen. Mögliche Systembegrenzung oder abgebrochener Prozess."
+#: ../../mod/manage.php:157
+#, php-format
+msgid "%d new introductions"
+msgstr "%d neue Vorstellungen"
-#: ../../include/attach.php:510
-msgid "Stored file could not be verified. Upload failed."
-msgstr "Gespeichert Datei konnte nicht verifiziert werden. Upload abgebrochen."
+#: ../../mod/xchan.php:6
+msgid "Xchan Lookup"
+msgstr "Xchan-Suche"
-#: ../../include/attach.php:554 ../../include/attach.php:571
-msgid "Path not available."
-msgstr "Pfad nicht verfügbar."
+#: ../../mod/xchan.php:9
+msgid "Lookup xchan beginning with (or webbie): "
+msgstr "Nach xchans oder Webbies (Kanal-Adressen) suchen, die wie folgt beginnen:"
-#: ../../include/attach.php:616
-msgid "Empty pathname"
-msgstr "Leere Pfadangabe"
+#: ../../mod/xchan.php:37 ../../mod/menu.php:136 ../../mod/mitem.php:111
+msgid "Not found."
+msgstr "Nicht gefunden."
-#: ../../include/attach.php:632
-msgid "duplicate filename or path"
-msgstr "doppelter Dateiname oder Pfad"
+#: ../../mod/api.php:76 ../../mod/api.php:102
+msgid "Authorize application connection"
+msgstr "Zugriff für die Anwendung autorisieren"
-#: ../../include/attach.php:656
-msgid "Path not found."
-msgstr "Pfad nicht gefunden."
+#: ../../mod/api.php:77
+msgid "Return to your app and insert this Securty Code:"
+msgstr "Trage folgenden Sicherheitscode in der Anwendung ein:"
-#: ../../include/attach.php:707
-msgid "mkdir failed."
-msgstr "mkdir fehlgeschlagen."
+#: ../../mod/api.php:89
+msgid "Please login to continue."
+msgstr "Zum Weitermachen, bitte einloggen."
-#: ../../include/attach.php:711
-msgid "database storage failed."
-msgstr "Speichern in der Datenbank fehlgeschlagen."
+#: ../../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 "Möchtest Du dieser Anwendung erlauben, Deine Nachrichten und Kontakte abzurufen und/oder neue Nachrichten für Dich zu erstellen?"
-#: ../../include/identity.php:33
-msgid "Unable to obtain identity information from database"
-msgstr "Kann keine Identitäts-Informationen aus Datenbank beziehen"
+#: ../../mod/api.php:105 ../../mod/settings.php:974 ../../mod/settings.php:979
+#: ../../mod/settings.php:1064 ../../mod/admin.php:396
+msgid "Yes"
+msgstr "Ja"
-#: ../../include/identity.php:67
-msgid "Empty name"
-msgstr "Namensfeld leer"
+#: ../../mod/api.php:106 ../../mod/settings.php:974 ../../mod/settings.php:979
+#: ../../mod/settings.php:1064 ../../mod/admin.php:394
+msgid "No"
+msgstr "Nein"
-#: ../../include/identity.php:70
-msgid "Name too long"
-msgstr "Name ist zu lang"
+#: ../../mod/blocks.php:99
+msgid "Block Name"
+msgstr "Block-Name"
-#: ../../include/identity.php:186
-msgid "No account identifier"
-msgstr "Keine Account-Kennung"
+#: ../../mod/connedit.php:75 ../../mod/connections.php:37
+msgid "Could not access contact record."
+msgstr "Konnte nicht auf den Kontakteintrag zugreifen."
-#: ../../include/identity.php:198
-msgid "Nickname is required."
-msgstr "Spitzname ist erforderlich."
+#: ../../mod/connedit.php:99 ../../mod/connections.php:51
+msgid "Could not locate selected profile."
+msgstr "Gewähltes Profil nicht gefunden."
-#: ../../include/identity.php:212
-msgid "Reserved nickname. Please choose another."
-msgstr "Reservierter Kurzname. Bitte wähle einen anderen."
+#: ../../mod/connedit.php:204 ../../mod/connections.php:94
+msgid "Connection updated."
+msgstr "Verbindung aktualisiert."
-#: ../../include/identity.php:217 ../../include/dimport.php:34
-msgid ""
-"Nickname has unsupported characters or is already being used on this site."
-msgstr "Der Spitzname enthält nicht-unterstütze Zeichen oder wird bereits auf dieser Seite genutzt."
+#: ../../mod/connedit.php:206 ../../mod/connections.php:96
+msgid "Failed to update connection record."
+msgstr "Konnte den Verbindungseintrag nicht aktualisieren."
-#: ../../include/identity.php:292
-msgid "Unable to retrieve created identity"
-msgstr "Kann die erstellte Identität nicht empfangen"
+#: ../../mod/connedit.php:252
+msgid "is now connected to"
+msgstr "ist jetzt verbunden mit"
-#: ../../include/identity.php:350
-msgid "Default Profile"
-msgstr "Standard-Profil"
+#: ../../mod/connedit.php:365
+msgid "Could not access address book record."
+msgstr "Konnte nicht auf den Adressbuch-Eintrag zugreifen."
-#: ../../include/identity.php:630
-msgid "Requested channel is not available."
-msgstr "Angeforderte Kanal nicht verfügbar."
+#: ../../mod/connedit.php:379
+msgid "Refresh failed - channel is currently unavailable."
+msgstr "Aktualisierung fehlgeschlagen – der Kanal ist im Moment nicht erreichbar."
-#: ../../include/identity.php:677 ../../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/layouts.php:29
-msgid "Requested profile is not available."
-msgstr "Erwünschte Profil ist nicht verfügbar."
+#: ../../mod/connedit.php:386
+msgid "Channel has been unblocked"
+msgstr "Kanal nicht mehr blockiert"
-#: ../../include/identity.php:836 ../../mod/profiles.php:774
-msgid "Change profile photo"
-msgstr "Profilfoto ändern"
+#: ../../mod/connedit.php:387
+msgid "Channel has been blocked"
+msgstr "Kanal blockiert"
-#: ../../include/identity.php:842
-msgid "Profiles"
-msgstr "Profile"
+#: ../../mod/connedit.php:391 ../../mod/connedit.php:403
+#: ../../mod/connedit.php:415 ../../mod/connedit.php:427
+#: ../../mod/connedit.php:443
+msgid "Unable to set address book parameters."
+msgstr "Konnte die Adressbuch-Parameter nicht setzen."
-#: ../../include/identity.php:842
-msgid "Manage/edit profiles"
-msgstr "Profile verwalten/bearbeiten"
+#: ../../mod/connedit.php:398
+msgid "Channel has been unignored"
+msgstr "Kanal wird nicht mehr ignoriert"
-#: ../../include/identity.php:843 ../../mod/profiles.php:775
-msgid "Create New Profile"
-msgstr "Neues Profil erstellen"
+#: ../../mod/connedit.php:399
+msgid "Channel has been ignored"
+msgstr "Kanal wird ignoriert"
-#: ../../include/identity.php:858 ../../mod/profiles.php:786
-msgid "Profile Image"
-msgstr "Profilfoto:"
+#: ../../mod/connedit.php:410
+msgid "Channel has been unarchived"
+msgstr "Kanal wurde aus dem Archiv zurück geholt"
-#: ../../include/identity.php:861
-msgid "visible to everybody"
-msgstr "sichtbar für jeden"
+#: ../../mod/connedit.php:411
+msgid "Channel has been archived"
+msgstr "Kanal wurde archiviert"
-#: ../../include/identity.php:862 ../../mod/profiles.php:669
-#: ../../mod/profiles.php:790
-msgid "Edit visibility"
-msgstr "Sichtbarkeit bearbeiten"
+#: ../../mod/connedit.php:422
+msgid "Channel has been unhidden"
+msgstr "Kanal wird nicht mehr versteckt"
-#: ../../include/identity.php:878 ../../include/identity.php:1117
-msgid "Gender:"
-msgstr "Geschlecht:"
+#: ../../mod/connedit.php:423
+msgid "Channel has been hidden"
+msgstr "Kanal wurde versteckt"
-#: ../../include/identity.php:879 ../../include/identity.php:1161
-msgid "Status:"
-msgstr "Status:"
+#: ../../mod/connedit.php:438
+msgid "Channel has been approved"
+msgstr "Kanal wurde zugelassen"
-#: ../../include/identity.php:880 ../../include/identity.php:1172
-msgid "Homepage:"
-msgstr "Homepage:"
+#: ../../mod/connedit.php:439
+msgid "Channel has been unapproved"
+msgstr "Zulassung des Kanals entfernt"
-#: ../../include/identity.php:881
-msgid "Online Now"
-msgstr "gerade online"
+#: ../../mod/connedit.php:467
+msgid "Connection has been removed."
+msgstr "Verbindung wurde gelöscht."
-#: ../../include/identity.php:964 ../../include/identity.php:1042
-#: ../../mod/ping.php:324
-msgid "g A l F d"
-msgstr "l, j. F, G:i \\U\\h\\r"
+#: ../../mod/connedit.php:487
+#, php-format
+msgid "View %s's profile"
+msgstr "%ss Profil ansehen"
-#: ../../include/identity.php:965 ../../include/identity.php:1043
-msgid "F d"
-msgstr "d. F"
+#: ../../mod/connedit.php:491
+msgid "Refresh Permissions"
+msgstr "Zugriffsrechte neu laden"
-#: ../../include/identity.php:1010 ../../include/identity.php:1082
-#: ../../mod/ping.php:346
-msgid "[today]"
-msgstr "[Heute]"
+#: ../../mod/connedit.php:494
+msgid "Fetch updated permissions"
+msgstr "Aktualisierte Zugriffsrechte abfragen"
-#: ../../include/identity.php:1021
-msgid "Birthday Reminders"
-msgstr "Geburtstags Erinnerungen"
+#: ../../mod/connedit.php:498
+msgid "Recent Activity"
+msgstr "Kürzliche Aktivitäten"
-#: ../../include/identity.php:1022
-msgid "Birthdays this week:"
-msgstr "Geburtstage in dieser Woche:"
+#: ../../mod/connedit.php:501
+msgid "View recent posts and comments"
+msgstr "Betrachte die neuesten Beiträge und Kommentare"
-#: ../../include/identity.php:1075
-msgid "[No description]"
-msgstr "[Keine Beschreibung]"
+#: ../../mod/connedit.php:507 ../../mod/connedit.php:694
+#: ../../mod/admin.php:737
+msgid "Unblock"
+msgstr "Freigeben"
-#: ../../include/identity.php:1093
-msgid "Event Reminders"
-msgstr "Termin-Erinnerungen"
+#: ../../mod/connedit.php:507 ../../mod/connedit.php:694
+#: ../../mod/admin.php:736
+msgid "Block"
+msgstr "Blockieren"
-#: ../../include/identity.php:1094
-msgid "Events this week:"
-msgstr "Termine in dieser Woche:"
+#: ../../mod/connedit.php:510
+msgid "Block (or Unblock) all communications with this connection"
+msgstr "Jegliche Kommunikation mit dieser Verbindung blockieren/zulassen"
-#: ../../include/identity.php:1107 ../../include/identity.php:1224
-#: ../../include/apps.php:138 ../../mod/profperm.php:112
-msgid "Profile"
-msgstr "Profil"
+#: ../../mod/connedit.php:514 ../../mod/connedit.php:695
+msgid "Unignore"
+msgstr "Nicht ignorieren"
-#: ../../include/identity.php:1115 ../../mod/settings.php:1045
-msgid "Full Name:"
-msgstr "Voller Name:"
+#: ../../mod/connedit.php:514 ../../mod/connedit.php:695
+#: ../../mod/notifications.php:51
+msgid "Ignore"
+msgstr "Ignorieren"
-#: ../../include/identity.php:1122
-msgid "Like this channel"
-msgstr "Dieser Kanal gefällt mir"
+#: ../../mod/connedit.php:517
+msgid "Ignore (or Unignore) all inbound communications from this connection"
+msgstr "Jegliche eingehende Kommunikation von dieser Verbindung ignorieren/zulassen"
-#: ../../include/identity.php:1146
-msgid "j F, Y"
-msgstr "j. F Y"
+#: ../../mod/connedit.php:520
+msgid "Unarchive"
+msgstr "Aus Archiv zurückholen"
-#: ../../include/identity.php:1147
-msgid "j F"
-msgstr "j. F"
+#: ../../mod/connedit.php:520
+msgid "Archive"
+msgstr "Archivieren"
-#: ../../include/identity.php:1154
-msgid "Birthday:"
-msgstr "Geburtstag:"
+#: ../../mod/connedit.php:523
+msgid ""
+"Archive (or Unarchive) this connection - mark channel dead but keep content"
+msgstr "Verbindung archivieren/aus dem Archiv zurückholen (Archiv = Kanal als erloschen markieren, aber die Beiträge behalten)"
-#: ../../include/identity.php:1158
-msgid "Age:"
-msgstr "Alter:"
+#: ../../mod/connedit.php:526
+msgid "Unhide"
+msgstr "Wieder sichtbar machen"
+
+#: ../../mod/connedit.php:526
+msgid "Hide"
+msgstr "Verstecken"
+
+#: ../../mod/connedit.php:529
+msgid "Hide or Unhide this connection from your other connections"
+msgstr "Diese Verbindung vor anderen Verbindungen verstecken/zeigen"
+
+#: ../../mod/connedit.php:536
+msgid "Delete this connection"
+msgstr "Verbindung löschen"
+
+#: ../../mod/connedit.php:611 ../../mod/connedit.php:649
+msgid "Approve this connection"
+msgstr "Verbindung genehmigen"
-#: ../../include/identity.php:1167
+#: ../../mod/connedit.php:611
+msgid "Accept connection to allow communication"
+msgstr "Akzeptiere die Verbindung, um Kommunikation zu ermöglichen"
+
+#: ../../mod/connedit.php:627
#, php-format
-msgid "for %1$d %2$s"
-msgstr "seit %1$d %2$s"
+msgid "Connections: settings for %s"
+msgstr "Verbindungseinstellungen für %s"
-#: ../../include/identity.php:1170 ../../mod/profiles.php:691
-msgid "Sexual Preference:"
-msgstr "Sexuelle Orientierung:"
+#: ../../mod/connedit.php:628
+msgid "Apply these permissions automatically"
+msgstr "Diese Berechtigungen automatisch anwenden"
-#: ../../include/identity.php:1174 ../../mod/profiles.php:693
-msgid "Hometown:"
-msgstr "Heimatstadt:"
+#: ../../mod/connedit.php:632
+msgid "Apply the permissions indicated on this page to all new connections."
+msgstr "Wende die auf dieser Seite gewählten Berechtigungen auf alle neuen Verbindungen an."
-#: ../../include/identity.php:1176
-msgid "Tags:"
-msgstr "Schlagworte:"
+#: ../../mod/connedit.php:636
+msgid "Slide to adjust your degree of friendship"
+msgstr "Verschieben, um den Grad der Freundschaft zu einzustellen"
-#: ../../include/identity.php:1178 ../../mod/profiles.php:694
-msgid "Political Views:"
-msgstr "Politische Ansichten:"
+#: ../../mod/connedit.php:637 ../../mod/rate.php:161
+msgid "Rating (this information is public)"
+msgstr "Bewertung (öffentlich sichtbar)"
-#: ../../include/identity.php:1180
-msgid "Religion:"
-msgstr "Religion:"
+#: ../../mod/connedit.php:638 ../../mod/rate.php:162
+msgid "Optionally explain your rating (this information is public)"
+msgstr "Optional kannst du deine Bewertung erklären (öffentlich sichtbar)"
-#: ../../include/identity.php:1182
-msgid "About:"
-msgstr "Über:"
+#: ../../mod/connedit.php:645
+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 "Die voreingestellten Zugriffsrechte der Kategorie Deines Kanals sind hier zu sehen, wurden aber noch nicht gespeichert. Bitte sieh Dir die Zugriffsrechte auf dieser Seite an und ändere sie, wenn Du willst. Dieser Kontakt kann evtl. <em>nicht</em> mit Dir kommunizieren, bevor Du nicht auf dieser Seite auf „Senden“ geklickt hast – erst dieser Klick speichert die gewünschten Zugriffsrechte."
-#: ../../include/identity.php:1184
-msgid "Hobbies/Interests:"
-msgstr "Hobbys/Interessen:"
+#: ../../mod/connedit.php:648
+msgid "inherited"
+msgstr "geerbt"
-#: ../../include/identity.php:1186 ../../mod/profiles.php:697
-msgid "Likes:"
-msgstr "Gefällt:"
+#: ../../mod/connedit.php:651
+msgid "Connection has no individual permissions!"
+msgstr "Diese Verbindung hat keine individuellen Zugriffsrechte!"
-#: ../../include/identity.php:1188 ../../mod/profiles.php:698
-msgid "Dislikes:"
-msgstr "Gefällt nicht:"
+#: ../../mod/connedit.php:652
+msgid ""
+"This may be appropriate based on your <a href=\"settings\">privacy "
+"settings</a>, though you may wish to review the \"Advanced Permissions\"."
+msgstr "Abhängig von Deinen <a href=\"settings\">Privatsphäre-Einstellungen</a> könnte das passen, eventuell solltest Du aber die „Zugriffsrechte für Fortgeschrittene“ überprüfen."
-#: ../../include/identity.php:1190
-msgid "Contact information and Social Networks:"
-msgstr "Kontaktinformation und soziale Netzwerke:"
+#: ../../mod/connedit.php:654
+msgid "Profile Visibility"
+msgstr "Sichtbarkeit des Profils"
-#: ../../include/identity.php:1192
-msgid "My other channels:"
-msgstr "Meine anderen Kanäle:"
+#: ../../mod/connedit.php:655
+#, php-format
+msgid ""
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
+msgstr "Bitte wähle ein Profil, das wir %s zeigen sollen, wenn Deine Profilseite über eine verifizierte Verbindung aufgerufen wird."
-#: ../../include/identity.php:1194
-msgid "Musical interests:"
-msgstr "Musikalische Interessen:"
+#: ../../mod/connedit.php:656
+msgid "Contact Information / Notes"
+msgstr "Kontaktinformationen / Notizen"
-#: ../../include/identity.php:1196
-msgid "Books, literature:"
-msgstr "Bücher, Literatur:"
+#: ../../mod/connedit.php:657
+msgid "Edit contact notes"
+msgstr "Kontaktnotizen bearbeiten"
-#: ../../include/identity.php:1198
-msgid "Television:"
-msgstr "Fernsehen:"
+#: ../../mod/connedit.php:659
+msgid "Their Settings"
+msgstr "Deren Einstellungen"
-#: ../../include/identity.php:1200
-msgid "Film/dance/culture/entertainment:"
-msgstr "Film/Tanz/Kultur/Unterhaltung:"
+#: ../../mod/connedit.php:660
+msgid "My Settings"
+msgstr "Meine Einstellungen"
-#: ../../include/identity.php:1202
-msgid "Love/Romance:"
-msgstr "Liebe/Romantik:"
+#: ../../mod/connedit.php:662
+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 "Die voreingestellten Zugriffsrechte der Kategorie Deines Kanals sind hier zu sehen, wurden aber noch <em>nicht</em> gespeichert, und Du hast keine Voreinstellungen für die Zugriffsrechte von Verbindungen angelegt. Bitte sieht Dir die Einstellungen an, ändere sie bei Bedarf und klicke [Senden], um den Vorgang abzuschließen."
-#: ../../include/identity.php:1204
-msgid "Work/employment:"
-msgstr "Arbeit/Anstellung:"
+#: ../../mod/connedit.php:663
+msgid "Clear/Disable Automatic Permissions"
+msgstr "Automatische Berechtigungen abschalten/entfernen"
-#: ../../include/identity.php:1206
-msgid "School/education:"
-msgstr "Schule/Ausbildung:"
+#: ../../mod/connedit.php:664
+msgid "Forum Members"
+msgstr "Forum Mitglieder"
-#: ../../include/identity.php:1226
-msgid "Like this thing"
-msgstr "Gefällt mir"
+#: ../../mod/connedit.php:665
+msgid "Soapbox"
+msgstr "Marktschreier"
-#: ../../include/profile_selectors.php:6
-#: ../../include/profile_selectors.php:23 ../../mod/id.php:103
-msgid "Male"
-msgstr "Männlich"
+#: ../../mod/connedit.php:666
+msgid "Full Sharing (typical social network permissions)"
+msgstr "Vollumfängliches Teilen (übliche Berechtigungen in sozialen Netzwerken)"
-#: ../../include/profile_selectors.php:6
-#: ../../include/profile_selectors.php:23 ../../mod/id.php:105
-msgid "Female"
-msgstr "Weiblich"
+#: ../../mod/connedit.php:667
+msgid "Cautious Sharing "
+msgstr "Vorsichtiges Teilen"
-#: ../../include/profile_selectors.php:6
-msgid "Currently Male"
-msgstr "Momentan männlich"
+#: ../../mod/connedit.php:668
+msgid "Follow Only"
+msgstr "Nur folgen"
-#: ../../include/profile_selectors.php:6
-msgid "Currently Female"
-msgstr "Momentan weiblich"
+#: ../../mod/connedit.php:669
+msgid "Individual Permissions"
+msgstr "Individuelle Zugriffsrechte"
-#: ../../include/profile_selectors.php:6
-msgid "Mostly Male"
-msgstr "Größtenteils männlich"
+#: ../../mod/connedit.php:670
+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 "Einige Berechtigungen werden von den globalen <a href=\"settings\">Sicherheits- und Privatsphäre-Einstellungen</a> dieses Kanals geerbt, die eine höhere Priorität haben als die Einstellungen bei einer Verbindung. Werden geerbte Einstellungen hier geändert, hat das keine Auswirkungen."
-#: ../../include/profile_selectors.php:6
-msgid "Mostly Female"
-msgstr "Größtenteils weiblich"
+#: ../../mod/connedit.php:671
+msgid "Advanced Permissions"
+msgstr "Zugriffsrechte für Fortgeschrittene"
-#: ../../include/profile_selectors.php:6
-msgid "Transgender"
-msgstr "Transsexuell"
+#: ../../mod/connedit.php:672
+msgid "Simple Permissions (select one and submit)"
+msgstr "Einfache Berechtigungs-Einstellungen (wähle eine aus und klicke auf Senden)"
-#: ../../include/profile_selectors.php:6
-msgid "Intersex"
-msgstr "Zwischengeschlechtlich"
+#: ../../mod/connedit.php:676
+#, php-format
+msgid "Visit %s's profile - %s"
+msgstr "%ss Profil besuchen - %s"
-#: ../../include/profile_selectors.php:6
-msgid "Transsexual"
-msgstr "Transsexuell"
+#: ../../mod/connedit.php:677
+msgid "Block/Unblock contact"
+msgstr "Kontakt blockieren/freigeben"
-#: ../../include/profile_selectors.php:6
-msgid "Hermaphrodite"
-msgstr "Zwitter"
+#: ../../mod/connedit.php:678
+msgid "Ignore contact"
+msgstr "Kontakt ignorieren"
-#: ../../include/profile_selectors.php:6
-msgid "Neuter"
-msgstr "Geschlechtslos"
+#: ../../mod/connedit.php:679
+msgid "Repair URL settings"
+msgstr "URL-Einstellungen reparieren"
-#: ../../include/profile_selectors.php:6
-msgid "Non-specific"
-msgstr "unklar"
+#: ../../mod/connedit.php:680
+msgid "View conversations"
+msgstr "Unterhaltungen anzeigen"
-#: ../../include/profile_selectors.php:6
-msgid "Undecided"
-msgstr "Unentschieden"
+#: ../../mod/connedit.php:682
+msgid "Delete contact"
+msgstr "Kontakt löschen"
-#: ../../include/profile_selectors.php:42
-#: ../../include/profile_selectors.php:61
-msgid "Males"
-msgstr "Männer"
+#: ../../mod/connedit.php:686
+msgid "Last update:"
+msgstr "Letzte Aktualisierung:"
-#: ../../include/profile_selectors.php:42
-#: ../../include/profile_selectors.php:61
-msgid "Females"
-msgstr "Frauen"
+#: ../../mod/connedit.php:688
+msgid "Update public posts"
+msgstr "Öffentliche Beiträge aktualisieren"
-#: ../../include/profile_selectors.php:42
-msgid "Gay"
-msgstr "Schwul"
+#: ../../mod/connedit.php:690
+msgid "Update now"
+msgstr "Jetzt aktualisieren"
-#: ../../include/profile_selectors.php:42
-msgid "Lesbian"
-msgstr "Lesbisch"
+#: ../../mod/connedit.php:696
+msgid "Currently blocked"
+msgstr "Derzeit blockiert"
-#: ../../include/profile_selectors.php:42
-msgid "No Preference"
-msgstr "Keine Bevorzugung"
+#: ../../mod/connedit.php:697
+msgid "Currently ignored"
+msgstr "Derzeit ignoriert"
-#: ../../include/profile_selectors.php:42
-msgid "Bisexual"
-msgstr "Bisexuell"
+#: ../../mod/connedit.php:698
+msgid "Currently archived"
+msgstr "Derzeit archiviert"
-#: ../../include/profile_selectors.php:42
-msgid "Autosexual"
-msgstr "Autosexuell"
+#: ../../mod/connedit.php:699
+msgid "Currently pending"
+msgstr "Derzeit anstehend"
-#: ../../include/profile_selectors.php:42
-msgid "Abstinent"
-msgstr "Enthaltsam"
+#: ../../mod/home.php:48
+msgid "Red Matrix - &quot;The Network&quot;"
+msgstr "RedMatrix – &quot;Das Netzwerk&quot;"
-#: ../../include/profile_selectors.php:42
-msgid "Virgin"
-msgstr "Jungfräulich"
+#: ../../mod/home.php:101
+#, php-format
+msgid "Welcome to %s"
+msgstr "Willkommen auf %s"
-#: ../../include/profile_selectors.php:42
-msgid "Deviant"
-msgstr "Abweichend"
+#: ../../mod/connect.php:56 ../../mod/connect.php:104
+msgid "Continue"
+msgstr "Fortfahren"
-#: ../../include/profile_selectors.php:42
-msgid "Fetish"
-msgstr "Fetisch"
+#: ../../mod/connect.php:85
+msgid "Premium Channel Setup"
+msgstr "Premium-Kanal-Einrichtung"
-#: ../../include/profile_selectors.php:42
-msgid "Oodles"
-msgstr "Unmengen"
+#: ../../mod/connect.php:87
+msgid "Enable premium channel connection restrictions"
+msgstr "Einschränkungen für einen Premium-Kanal aktivieren"
-#: ../../include/profile_selectors.php:42
-msgid "Nonsexual"
-msgstr "Sexlos"
+#: ../../mod/connect.php:88
+msgid ""
+"Please enter your restrictions or conditions, such as paypal receipt, usage "
+"guidelines, etc."
+msgstr "Bitte gib Deine Nutzungsbedingungen ein, z.B. Paypal-Quittung, Richtlinien etc."
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Single"
-msgstr "Single"
+#: ../../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 "Unter Umständen sind weitere Schritte oder die Bestätigung der folgenden Bedingungen vor dem Verbinden mit diesem Kanal nötig."
-#: ../../include/profile_selectors.php:80
-msgid "Lonely"
-msgstr "Einsam"
+#: ../../mod/connect.php:91
+msgid ""
+"Potential connections will then see the following text before proceeding:"
+msgstr "Potentielle Kontakte werden den folgenden Text sehen, bevor fortgefahren wird:"
-#: ../../include/profile_selectors.php:80
-msgid "Available"
-msgstr "Verfügbar"
+#: ../../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 "Indem ich fortfahre, bestätige ich die Erfüllung aller Anweisungen auf dieser Seite."
-#: ../../include/profile_selectors.php:80
-msgid "Unavailable"
-msgstr "Nicht verfügbar"
+#: ../../mod/connect.php:101
+msgid "(No specific instructions have been provided by the channel owner.)"
+msgstr "(Der Kanal-Besitzer hat keine speziellen Anweisungen hinterlegt.)"
-#: ../../include/profile_selectors.php:80
-msgid "Has crush"
-msgstr "Verguckt"
+#: ../../mod/connect.php:109
+msgid "Restricted or Premium Channel"
+msgstr "Eingeschränkter oder Premium-Kanal"
-#: ../../include/profile_selectors.php:80
-msgid "Infatuated"
-msgstr "Verknallt"
+#: ../../mod/editpost.php:31
+msgid "Item is not editable"
+msgstr "Element kann nicht bearbeitet werden."
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Dating"
-msgstr "Lerne gerade jemanden kennen"
+#: ../../mod/editpost.php:42 ../../mod/rpost.php:97
+msgid "Edit post"
+msgstr "Bearbeite Beitrag"
-#: ../../include/profile_selectors.php:80
-msgid "Unfaithful"
-msgstr "Treulos"
+#: ../../mod/editpost.php:53
+msgid "Delete item?"
+msgstr "Eintrag löschen?"
-#: ../../include/profile_selectors.php:80
-msgid "Sex Addict"
-msgstr "Sexabhängig"
+#: ../../mod/attach.php:9
+msgid "Item not available."
+msgstr "Element nicht verfügbar."
-#: ../../include/profile_selectors.php:80
-msgid "Friends/Benefits"
-msgstr "Freunde/Begünstigte"
+#: ../../mod/probe.php:23 ../../mod/probe.php:29
+#, php-format
+msgid "Fetching URL returns error: %1$s"
+msgstr "Abrufen der URL gab einen Fehler zurück: %1$s"
-#: ../../include/profile_selectors.php:80
-msgid "Casual"
-msgstr "Lose"
+#: ../../mod/dav.php:121
+msgid "RedMatrix channel"
+msgstr "RedMatrix-Kanal"
-#: ../../include/profile_selectors.php:80
-msgid "Engaged"
-msgstr "Verlobt"
+#: ../../mod/profile_photo.php:108
+msgid "Image uploaded but image cropping failed."
+msgstr "Bild hochgeladen, aber das Zurechtschneiden schlug fehl."
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Married"
-msgstr "Verheiratet"
+#: ../../mod/profile_photo.php:162
+msgid "Image resize failed."
+msgstr "Bild-Anpassung fehlgeschlagen."
-#: ../../include/profile_selectors.php:80
-msgid "Imaginarily married"
-msgstr "Gewissermaßen verheiratet"
+#: ../../mod/profile_photo.php:206
+msgid ""
+"Shift-reload the page or clear browser cache if the new photo does not "
+"display immediately."
+msgstr "Leere den Browser Cache oder nutze Umschalten-Neu Laden, falls das neue Foto nicht sofort angezeigt wird."
-#: ../../include/profile_selectors.php:80
-msgid "Partners"
-msgstr "Partner"
+#: ../../mod/profile_photo.php:233
+#, php-format
+msgid "Image exceeds size limit of %d"
+msgstr "Bild ist größer als das Limit von %d"
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Cohabiting"
-msgstr "Lebensgemeinschaft"
+#: ../../mod/profile_photo.php:242
+msgid "Unable to process image."
+msgstr "Kann Bild nicht verarbeiten."
-#: ../../include/profile_selectors.php:80
-msgid "Common law"
-msgstr "Informelle Ehe"
+#: ../../mod/profile_photo.php:291 ../../mod/profile_photo.php:340
+msgid "Photo not available."
+msgstr "Foto nicht verfügbar."
-#: ../../include/profile_selectors.php:80
-msgid "Happy"
-msgstr "Glücklich"
+#: ../../mod/profile_photo.php:359
+msgid "Upload File:"
+msgstr "Datei hochladen:"
-#: ../../include/profile_selectors.php:80
-msgid "Not looking"
-msgstr "Nicht Ausschau haltend"
+#: ../../mod/profile_photo.php:360
+msgid "Select a profile:"
+msgstr "Wähle ein Profil:"
-#: ../../include/profile_selectors.php:80
-msgid "Swinger"
-msgstr "Swinger"
+#: ../../mod/profile_photo.php:361
+msgid "Upload Profile Photo"
+msgstr "Lade neues Profilfoto hoch"
-#: ../../include/profile_selectors.php:80
-msgid "Betrayed"
-msgstr "Betrogen"
+#: ../../mod/profile_photo.php:366 ../../mod/settings.php:983
+msgid "or"
+msgstr "oder"
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Separated"
-msgstr "Getrennt"
+#: ../../mod/profile_photo.php:366
+msgid "skip this step"
+msgstr "diesen Schritt überspringen"
-#: ../../include/profile_selectors.php:80
-msgid "Unstable"
-msgstr "Labil"
+#: ../../mod/profile_photo.php:366
+msgid "select a photo from your photo albums"
+msgstr "ein Foto aus meinen Fotoalben"
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Divorced"
-msgstr "Geschieden"
+#: ../../mod/profile_photo.php:382
+msgid "Crop Image"
+msgstr "Bild zuschneiden"
-#: ../../include/profile_selectors.php:80
-msgid "Imaginarily divorced"
-msgstr "Gewissermaßen geschieden"
+#: ../../mod/profile_photo.php:383
+msgid "Please adjust the image cropping for optimum viewing."
+msgstr "Bitte schneide das Bild für eine optimale Anzeige passend zu."
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Widowed"
-msgstr "Verwitwet"
+#: ../../mod/profile_photo.php:385
+msgid "Done Editing"
+msgstr "Bearbeitung fertigstellen"
-#: ../../include/profile_selectors.php:80
-msgid "Uncertain"
-msgstr "Ungewiss"
+#: ../../mod/profile_photo.php:428
+msgid "Image uploaded successfully."
+msgstr "Bild erfolgreich hochgeladen."
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "It's complicated"
-msgstr "Es ist kompliziert"
+#: ../../mod/profile_photo.php:430
+msgid "Image upload failed."
+msgstr "Hochladen des Bilds fehlgeschlagen."
-#: ../../include/profile_selectors.php:80
-msgid "Don't care"
-msgstr "Interessiert mich nicht"
+#: ../../mod/profile_photo.php:439
+#, php-format
+msgid "Image size reduction [%s] failed."
+msgstr "Reduzierung der Bildgröße [%s] fehlgeschlagen."
-#: ../../include/profile_selectors.php:80
-msgid "Ask me"
-msgstr "Frag mich mal"
+#: ../../mod/block.php:27 ../../mod/page.php:33
+msgid "Invalid item."
+msgstr "Ungültiges Element."
-#: ../../include/apps.php:128
-msgid "Site Admin"
-msgstr "Hub-Administration"
+#: ../../mod/block.php:39 ../../mod/wall_upload.php:29 ../../mod/page.php:45
+msgid "Channel not found."
+msgstr "Kanal nicht gefunden."
-#: ../../include/apps.php:130
-msgid "Address Book"
-msgstr "Adressbuch"
+#: ../../mod/block.php:75 ../../mod/help.php:79 ../../mod/display.php:102
+#: ../../mod/page.php:81 ../../index.php:241
+msgid "Page not found."
+msgstr "Seite nicht gefunden."
-#: ../../include/apps.php:144 ../../mod/mood.php:130
-msgid "Mood"
-msgstr "Laune"
+#: ../../mod/network.php:84
+msgid "No such group"
+msgstr "Sammlung nicht gefunden"
-#: ../../include/apps.php:148
-msgid "Probe"
-msgstr "Testen"
+#: ../../mod/network.php:122
+msgid "Search Results For:"
+msgstr "Suchergebnisse für:"
-#: ../../include/apps.php:149
-msgid "Suggest"
-msgstr "Empfehlen"
+#: ../../mod/network.php:176
+msgid "Collection is empty"
+msgstr "Sammlung ist leer"
-#: ../../include/apps.php:150
-msgid "Random Channel"
-msgstr "Zufälliger Kanal"
+#: ../../mod/network.php:184
+msgid "Collection: "
+msgstr "Sammlung:"
-#: ../../include/apps.php:151
-msgid "Invite"
-msgstr "Einladen"
+#: ../../mod/network.php:197
+msgid "Connection: "
+msgstr "Verbindung:"
-#: ../../include/apps.php:152
-msgid "Features"
-msgstr "Funktionen"
+#: ../../mod/network.php:200
+msgid "Invalid connection."
+msgstr "Ungültige Verbindung."
-#: ../../include/apps.php:153 ../../mod/id.php:28
-msgid "Language"
-msgstr "Sprache"
+#: ../../mod/events.php:87
+msgid "Event can not end before it has started."
+msgstr "Termin-Ende liegt vor dem Beginn."
-#: ../../include/apps.php:154
-msgid "Post"
-msgstr "Beitrag"
+#: ../../mod/events.php:89 ../../mod/events.php:98 ../../mod/events.php:116
+msgid "Unable to generate preview."
+msgstr "Vorschau konnte nicht erzeugt werden."
-#: ../../include/apps.php:155 ../../mod/id.php:17 ../../mod/id.php:18
-#: ../../mod/id.php:19
-msgid "Profile Photo"
-msgstr "Profilfoto"
+#: ../../mod/events.php:96
+msgid "Event title and start time are required."
+msgstr "Titel und Startzeit des Termins sind erforderlich."
-#: ../../include/apps.php:247 ../../mod/settings.php:84
-#: ../../mod/settings.php:608
-msgid "Update"
-msgstr "Aktualisieren"
+#: ../../mod/events.php:114
+msgid "Event not found."
+msgstr "Termin nicht gefunden."
-#: ../../include/apps.php:247
-msgid "Install"
-msgstr "Installieren"
+#: ../../mod/events.php:396
+msgid "l, F j"
+msgstr "l, j. F"
-#: ../../include/apps.php:252
-msgid "Purchase"
-msgstr "Kaufen"
+#: ../../mod/events.php:418
+msgid "Edit event"
+msgstr "Termin bearbeiten"
-#: ../../include/chat.php:23
-msgid "Missing room name"
-msgstr "Der Chatraum hat keinen Namen"
+#: ../../mod/events.php:419
+msgid "Delete event"
+msgstr "Termin löschen"
-#: ../../include/chat.php:32
-msgid "Duplicate room name"
-msgstr "Name des Chatraums bereits vergeben"
+#: ../../mod/events.php:473
+msgid "Create New Event"
+msgstr "Neuen Termin erstellen"
-#: ../../include/chat.php:82 ../../include/chat.php:90
-msgid "Invalid room specifier."
-msgstr "Ungültiger Raumbezeichner."
+#: ../../mod/events.php:474 ../../mod/photos.php:827
+msgid "Previous"
+msgstr "Voriges"
-#: ../../include/chat.php:120
-msgid "Room not found."
-msgstr "Chatraum konnte nicht gefunden werden."
+#: ../../mod/events.php:475 ../../mod/setup.php:265 ../../mod/photos.php:836
+msgid "Next"
+msgstr "Nächste"
-#: ../../include/chat.php:141
-msgid "Room is full"
-msgstr "Der Raum ist voll"
+#: ../../mod/events.php:476
+msgid "Export"
+msgstr "Exportieren"
-#: ../../mod/achievements.php:34
-msgid "Some blurb about what to do when you're new here"
-msgstr "Ein Hinweis, was man tun kann, wenn man neu hier ist"
+#: ../../mod/events.php:504
+msgid "Event removed"
+msgstr "Termin gelöscht"
-#: ../../mod/manage.php:136
-#, php-format
-msgid "You have created %1$.0f of %2$.0f allowed channels."
-msgstr "Du hast %1$.0f von maximal %2$.0f erlaubten Kanälen eingerichtet."
+#: ../../mod/events.php:507
+msgid "Failed to remove event"
+msgstr "Termin konnte nicht gelöscht werden"
-#: ../../mod/manage.php:144
-msgid "Create a new channel"
-msgstr "Neuen Kanal anlegen"
+#: ../../mod/events.php:625
+msgid "Event details"
+msgstr "Termin-Details"
-#: ../../mod/manage.php:167
-msgid "Current Channel"
-msgstr "Aktueller Kanal"
+#: ../../mod/events.php:626
+msgid "Starting date and Title are required."
+msgstr "Startdatum und Titel sind erforderlich."
-#: ../../mod/manage.php:169
-msgid "Switch to one of your channels by selecting it."
-msgstr "Wechsle zu einem Deiner Kanäle, indem Du auf ihn klickst."
+#: ../../mod/events.php:628
+msgid "Categories (comma-separated list)"
+msgstr "Kategorien (Kommagetrennte Liste)"
-#: ../../mod/manage.php:170
-msgid "Default Channel"
-msgstr "Standard Kanal"
+#: ../../mod/events.php:630
+msgid "Event Starts:"
+msgstr "Termin beginnt:"
-#: ../../mod/manage.php:171
-msgid "Make Default"
-msgstr "Zum Standard machen"
+#: ../../mod/events.php:637
+msgid "Finish date/time is not known or not relevant"
+msgstr "Ende Datum/Zeit sind unbekannt oder unwichtig"
-#: ../../mod/manage.php:174
-#, php-format
-msgid "%d new messages"
-msgstr "%d neue Nachrichten"
+#: ../../mod/events.php:639
+msgid "Event Finishes:"
+msgstr "Termin endet:"
+
+#: ../../mod/events.php:641 ../../mod/events.php:642
+msgid "Adjust for viewer timezone"
+msgstr "An die Zeitzone des Betrachters anpassen"
-#: ../../mod/manage.php:175
+#: ../../mod/events.php:641
+msgid ""
+"Important for events that happen in a particular place. Not practical for "
+"global holidays."
+msgstr "Wichtig für Veranstaltungen die an bestimmten Orten stattfinden. Nicht sinnvoll für globale Feiertage / Ferien."
+
+#: ../../mod/events.php:643
+msgid "Description:"
+msgstr "Beschreibung:"
+
+#: ../../mod/events.php:647
+msgid "Title:"
+msgstr "Titel:"
+
+#: ../../mod/events.php:649
+msgid "Share this event"
+msgstr "Den Termin teilen"
+
+#: ../../mod/subthread.php:103
#, php-format
-msgid "%d new introductions"
-msgstr "%d neue Vorstellungen"
+msgid "%1$s is following %2$s's %3$s"
+msgstr "%1$s folgt nun %2$ss %3$s"
+
+#: ../../mod/pubsites.php:16
+msgid "Public Sites"
+msgstr "Öffentliche Server"
-#: ../../mod/manage.php:177
-msgid "Delegated Channels"
-msgstr "Delegierte Kanäle"
+#: ../../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 "Die hier aufgeführten Server erlauben Dir, einen Account in der Red-Matrix anzulegen. Alle Server der Matrix sind miteinander verbunden, so dass die Mitgliedschaft auf einem Server eine Verbindung zu beliebigen anderen Servern der Matrix ermöglicht. Es könnte sein, dass einige dieser Server kostenpflichtig sind oder abgestufte, je nach Umfang kostenpflichtige Mitgliedschaften anbieten. Auf den jeweiligen Seiten <strong>könnten</strong> nähere Details dazu stehen."
-#: ../../mod/settings.php:76
+#: ../../mod/pubsites.php:25
+msgid "Rate this hub"
+msgstr "Bewerte diesen Hub"
+
+#: ../../mod/pubsites.php:26
+msgid "Site URL"
+msgstr "Server-URL"
+
+#: ../../mod/pubsites.php:26
+msgid "Access Type"
+msgstr "Zugangstyp"
+
+#: ../../mod/pubsites.php:26
+msgid "Registration Policy"
+msgstr "Registrierungsrichtlinien"
+
+#: ../../mod/pubsites.php:26 ../../mod/profiles.php:454
+msgid "Location"
+msgstr "Ort"
+
+#: ../../mod/pubsites.php:26
+msgid "View hub ratings"
+msgstr "Bewertungen dieses Hubs ansehen"
+
+#: ../../mod/pubsites.php:30
+msgid "Rate"
+msgstr "Bewerten"
+
+#: ../../mod/pubsites.php:31
+msgid "View ratings"
+msgstr "Bewertungen ansehen"
+
+#: ../../mod/settings.php:73
msgid "Name is required"
msgstr "Name ist erforderlich"
-#: ../../mod/settings.php:80
+#: ../../mod/settings.php:77
msgid "Key and Secret are required"
-msgstr "Schlüssel und Geheimnis sind erforderlich"
+msgstr "Schlüssel und Geheimnis werden benötigt"
-#: ../../mod/settings.php:124
+#: ../../mod/settings.php:120
msgid "Diaspora Policy Settings updated."
msgstr "Diaspora-Einstellungen aktualisiert."
-#: ../../mod/settings.php:232
+#: ../../mod/settings.php:228
msgid "Passwords do not match. Password unchanged."
msgstr "Kennwörter stimmen nicht überein. Kennwort nicht verändert."
-#: ../../mod/settings.php:236
+#: ../../mod/settings.php:232
msgid "Empty passwords are not allowed. Password unchanged."
msgstr "Leere Kennwörter sind nicht erlaubt. Kennwort nicht verändert."
-#: ../../mod/settings.php:250
+#: ../../mod/settings.php:246
msgid "Password changed."
msgstr "Kennwort geändert."
-#: ../../mod/settings.php:252
+#: ../../mod/settings.php:248
msgid "Password update failed. Please try again."
msgstr "Kennwortänderung fehlgeschlagen. Bitte versuche es noch einmal."
-#: ../../mod/settings.php:266
+#: ../../mod/settings.php:262
msgid "Not valid email."
msgstr "Keine gültige E-Mail Adresse."
-#: ../../mod/settings.php:269
+#: ../../mod/settings.php:265
msgid "Protected email address. Cannot change to that email."
msgstr "Geschützte E-Mail Adresse. Diese kann nicht verändert werden."
-#: ../../mod/settings.php:278
+#: ../../mod/settings.php:274
msgid "System failure storing new email. Please try again."
msgstr "Systemfehler während des Speicherns der neuen Mail. Bitte versuche es noch einmal."
-#: ../../mod/settings.php:517
+#: ../../mod/settings.php:513
msgid "Settings updated."
msgstr "Einstellungen aktualisiert."
-#: ../../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 "Nein"
-
-#: ../../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
+#: ../../mod/settings.php:582 ../../mod/settings.php:608
+#: ../../mod/settings.php:644
msgid "Add application"
msgstr "Anwendung hinzufügen"
-#: ../../mod/settings.php:584
+#: ../../mod/settings.php:585
msgid "Name of application"
msgstr "Name der Anwendung"
-#: ../../mod/settings.php:585 ../../mod/settings.php:611
+#: ../../mod/settings.php:586 ../../mod/settings.php:612
msgid "Consumer Key"
msgstr "Consumer Key"
-#: ../../mod/settings.php:585 ../../mod/settings.php:586
+#: ../../mod/settings.php:586 ../../mod/settings.php:587
msgid "Automatically generated - change if desired. Max length 20"
msgstr "Automatisch erzeugt – ändern, falls erwünscht. Maximale Länge 20"
-#: ../../mod/settings.php:586 ../../mod/settings.php:612
+#: ../../mod/settings.php:587 ../../mod/settings.php:613
msgid "Consumer Secret"
msgstr "Consumer Secret"
-#: ../../mod/settings.php:587 ../../mod/settings.php:613
+#: ../../mod/settings.php:588 ../../mod/settings.php:614
msgid "Redirect"
msgstr "Umleitung"
-#: ../../mod/settings.php:587
+#: ../../mod/settings.php:588
msgid ""
"Redirect URI - leave blank unless your application specifically requires "
"this"
msgstr "Umleitungs-URl – lasse das leer, solange Deine Anwendung es nicht explizit erfordert"
-#: ../../mod/settings.php:588 ../../mod/settings.php:614
+#: ../../mod/settings.php:589 ../../mod/settings.php:615
msgid "Icon url"
msgstr "Symbol-URL"
-#: ../../mod/settings.php:588
+#: ../../mod/settings.php:589
msgid "Optional"
msgstr "Optional"
-#: ../../mod/settings.php:599
+#: ../../mod/settings.php:600
msgid "You can't edit this application."
msgstr "Diese Anwendung kann nicht bearbeitet werden."
-#: ../../mod/settings.php:642
+#: ../../mod/settings.php:643
msgid "Connected Apps"
msgstr "Verbundene Apps"
-#: ../../mod/settings.php:646
+#: ../../mod/settings.php:647
msgid "Client key starts with"
msgstr "Client Key beginnt mit"
-#: ../../mod/settings.php:647
+#: ../../mod/settings.php:648
msgid "No name"
msgstr "Kein Name"
-#: ../../mod/settings.php:648
+#: ../../mod/settings.php:649
msgid "Remove authorization"
msgstr "Authorisierung aufheben"
-#: ../../mod/settings.php:662
+#: ../../mod/settings.php:663
msgid "No feature settings configured"
msgstr "Keine Funktions-Einstellungen konfiguriert"
-#: ../../mod/settings.php:678
-msgid "Feature/Addon Settings"
-msgstr "Feature-/Addon-Einstellungen"
-
-#: ../../mod/settings.php:680
-msgid "Settings for the built-in Diaspora emulator"
-msgstr "Einstellungen für den eingebauten Diaspora-Emulator"
-
-#: ../../mod/settings.php:681
-msgid "Allow any Diaspora member to comment on your public posts"
-msgstr "Jedem Diaspora-Mitglied erlauben, Deine öffentlichen Beiträge zu kommentieren"
+#: ../../mod/settings.php:676
+msgid "Feature Settings"
+msgstr "Funktions-Einstellungen"
-#: ../../mod/settings.php:682
+#: ../../mod/settings.php:679
msgid "Diaspora Policy Settings"
msgstr "Diaspora-Einstellungen"
-#: ../../mod/settings.php:683
-msgid "Prevent your hashtags from being redirected to other sites"
-msgstr "Verhindern, dass Deine hashtags zu anderen Seiten umgeleitet werden"
+#: ../../mod/settings.php:680
+msgid "Allow any Diaspora member to comment on your public posts."
+msgstr "Allen Diaspora-Mitgliedern erlauben, Deine öffentlichen Beiträge zu kommentieren."
-#: ../../mod/settings.php:707
+#: ../../mod/settings.php:681
+msgid "Submit Diaspora Policy Settings"
+msgstr "Diaspora-Einstellungen speichern"
+
+#: ../../mod/settings.php:704
msgid "Account Settings"
msgstr "Konto-Einstellungen"
-#: ../../mod/settings.php:708
-msgid "Enter New Password:"
-msgstr "Neues Passwort eingeben:"
+#: ../../mod/settings.php:705
+msgid "Password Settings"
+msgstr "Kennwort-Einstellungen"
+
+#: ../../mod/settings.php:706
+msgid "New Password:"
+msgstr "Neues Passwort:"
-#: ../../mod/settings.php:709
-msgid "Confirm New Password:"
-msgstr "Neues Passwort bestätigen:"
+#: ../../mod/settings.php:707
+msgid "Confirm:"
+msgstr "Bestätigen:"
-#: ../../mod/settings.php:709
+#: ../../mod/settings.php:707
msgid "Leave password fields blank unless changing"
msgstr "Lasse die Passwort-Felder leer, außer Du möchtest das Passwort ändern"
-#: ../../mod/settings.php:711 ../../mod/settings.php:1046
+#: ../../mod/settings.php:709 ../../mod/settings.php:1045
msgid "Email Address:"
msgstr "Email Adresse:"
-#: ../../mod/settings.php:712 ../../mod/removeaccount.php:61
+#: ../../mod/settings.php:710 ../../mod/removeaccount.php:61
msgid "Remove Account"
msgstr "Konto entfernen"
-#: ../../mod/settings.php:713
-msgid "Remove this account including all its channels"
-msgstr "Dieses Konto inklusive all seiner Kanäle löschen"
+#: ../../mod/settings.php:711
+msgid "Remove this account from this server including all its channels"
+msgstr "Lösche dieses Konto einschließlich aller zugehörigen Kanäle von diesem Server"
+
+#: ../../mod/settings.php:712 ../../mod/settings.php:1126
+msgid "Warning: This action is permanent and cannot be reversed."
+msgstr "Achtung: Diese Aktion ist endgültig und kann nicht rückgängig gemacht werden."
-#: ../../mod/settings.php:729
+#: ../../mod/settings.php:728
msgid "Off"
msgstr "Aus"
-#: ../../mod/settings.php:729
+#: ../../mod/settings.php:728
msgid "On"
msgstr "An"
-#: ../../mod/settings.php:736
+#: ../../mod/settings.php:735
msgid "Additional Features"
msgstr "Zusätzliche Funktionen"
-#: ../../mod/settings.php:760
+#: ../../mod/settings.php:759
msgid "Connector Settings"
msgstr "Connector-Einstellungen"
-#: ../../mod/settings.php:799
+#: ../../mod/settings.php:798
msgid "No special theme for mobile devices"
msgstr "Keine spezielle Theme für mobile Geräte"
-#: ../../mod/settings.php:802
+#: ../../mod/settings.php:801
#, php-format
msgid "%s - (Experimental)"
msgstr "%s – (experimentell)"
-#: ../../mod/settings.php:805 ../../mod/admin.php:396
+#: ../../mod/settings.php:804 ../../mod/admin.php:367
msgid "mobile"
msgstr "mobil"
-#: ../../mod/settings.php:841
+#: ../../mod/settings.php:840
msgid "Display Settings"
msgstr "Anzeige-Einstellungen"
-#: ../../mod/settings.php:847
+#: ../../mod/settings.php:846
msgid "Display Theme:"
msgstr "Anzeige-Theme:"
-#: ../../mod/settings.php:848
+#: ../../mod/settings.php:847
msgid "Mobile Theme:"
msgstr "Mobile Theme:"
-#: ../../mod/settings.php:849
+#: ../../mod/settings.php:848
msgid "Enable user zoom on mobile devices"
msgstr "Zoom auf Mobilgeräten aktivieren"
-#: ../../mod/settings.php:850
+#: ../../mod/settings.php:849
msgid "Update browser every xx seconds"
msgstr "Browser alle xx Sekunden aktualisieren"
-#: ../../mod/settings.php:850
+#: ../../mod/settings.php:849
msgid "Minimum of 10 seconds, no maximum"
msgstr "Minimum 10 Sekunden, kein Maximum"
-#: ../../mod/settings.php:851
+#: ../../mod/settings.php:850
msgid "Maximum number of conversations to load at any time:"
msgstr "Maximale Anzahl von Unterhaltungen, die auf einmal geladen werden sollen:"
-#: ../../mod/settings.php:851
+#: ../../mod/settings.php:850
msgid "Maximum of 100 items"
msgstr "Maximum: 100 Beiträge"
-#: ../../mod/settings.php:852
-msgid "Show emoticons (smilies) as images"
-msgstr "Emoticons (Smilies) als Bilder anzeigen"
+#: ../../mod/settings.php:851
+msgid "Don't show emoticons"
+msgstr "Emoticons nicht anzeigen"
-#: ../../mod/settings.php:853
+#: ../../mod/settings.php:852
msgid "Link post titles to source"
msgstr "Beitragstitel zum Originalbeitrag verlinken"
-#: ../../mod/settings.php:854
+#: ../../mod/settings.php:853
msgid "System Page Layout Editor - (advanced)"
-msgstr "Systemseitengestaltungseditor - (erweitert)"
+msgstr "System-Seitenlayout-Editor (für Experten)"
-#: ../../mod/settings.php:857
+#: ../../mod/settings.php:856
msgid "Use blog/list mode on channel page"
msgstr "Blog-/Listenmodus auf der Kanalseite verwenden"
-#: ../../mod/settings.php:857 ../../mod/settings.php:858
+#: ../../mod/settings.php:856 ../../mod/settings.php:857
msgid "(comments displayed separately)"
msgstr "(Kommentare werden separat angezeigt)"
-#: ../../mod/settings.php:858
+#: ../../mod/settings.php:857
msgid "Use blog/list mode on matrix page"
msgstr "Blog-/Listenmodus auf der Matrixseite verwenden"
-#: ../../mod/settings.php:859
+#: ../../mod/settings.php:858
msgid "Channel page max height of content (in pixels)"
msgstr "Maximale Höhe von Beitragsblöcken auf der Kanalseite (in Pixeln)"
-#: ../../mod/settings.php:859 ../../mod/settings.php:860
+#: ../../mod/settings.php:858 ../../mod/settings.php:859
msgid "click to expand content exceeding this height"
msgstr "Blöcke, deren Inhalt diese Höhe überschreitet, können per Klick vergrößert werden."
-#: ../../mod/settings.php:860
+#: ../../mod/settings.php:859
msgid "Matrix page max height of content (in pixels)"
msgstr "Maximale Höhe von Beitragsblöcken auf der Matrixseite (in Pixeln)"
-#: ../../mod/settings.php:894
+#: ../../mod/settings.php:893
msgid "Nobody except yourself"
msgstr "Niemand außer Dir selbst"
-#: ../../mod/settings.php:895
+#: ../../mod/settings.php:894
msgid "Only those you specifically allow"
msgstr "Nur die, denen Du es explizit erlaubst"
-#: ../../mod/settings.php:896
+#: ../../mod/settings.php:895
msgid "Approved connections"
msgstr "Angenommene Verbindungen"
-#: ../../mod/settings.php:897
+#: ../../mod/settings.php:896
msgid "Any connections"
msgstr "Beliebige Verbindungen"
-#: ../../mod/settings.php:898
+#: ../../mod/settings.php:897
msgid "Anybody on this website"
msgstr "Jeder auf dieser Website"
-#: ../../mod/settings.php:899
+#: ../../mod/settings.php:898
msgid "Anybody in this network"
msgstr "Alle Red-Nutzer"
-#: ../../mod/settings.php:900
+#: ../../mod/settings.php:899
msgid "Anybody authenticated"
msgstr "Jeder authentifizierte"
-#: ../../mod/settings.php:901
+#: ../../mod/settings.php:900
msgid "Anybody on the internet"
msgstr "Jeder im Internet"
-#: ../../mod/settings.php:975
+#: ../../mod/settings.php:974
msgid "Publish your default profile in the network directory"
msgstr "Standard-Profil im Netzwerk-Verzeichnis veröffentlichen"
-#: ../../mod/settings.php:980
+#: ../../mod/settings.php:979
msgid "Allow us to suggest you as a potential friend to new members?"
msgstr "Dürfen wir Dich neuen Mitgliedern als potentiellen Kontakt vorschlagen?"
-#: ../../mod/settings.php:984 ../../mod/profile_photo.php:366
-msgid "or"
-msgstr "oder"
-
-#: ../../mod/settings.php:989
+#: ../../mod/settings.php:988
msgid "Your channel address is"
msgstr "Deine Kanal-Adresse lautet"
-#: ../../mod/settings.php:1037
+#: ../../mod/settings.php:1036
msgid "Channel Settings"
msgstr "Kanal-Einstellungen"
-#: ../../mod/settings.php:1044
+#: ../../mod/settings.php:1043
msgid "Basic Settings"
msgstr "Grundeinstellungen"
-#: ../../mod/settings.php:1047
+#: ../../mod/settings.php:1046
msgid "Your Timezone:"
msgstr "Ihre Zeitzone:"
-#: ../../mod/settings.php:1048
+#: ../../mod/settings.php:1047
msgid "Default Post Location:"
msgstr "Standardstandort:"
-#: ../../mod/settings.php:1048
+#: ../../mod/settings.php:1047
msgid "Geographical location to display on your posts"
msgstr "Geografischer Ort, der bei Deinen Beiträgen angezeigt werden soll"
-#: ../../mod/settings.php:1049
+#: ../../mod/settings.php:1048
msgid "Use Browser Location:"
msgstr "Standort des Browsers verwenden:"
-#: ../../mod/settings.php:1051
+#: ../../mod/settings.php:1050
msgid "Adult Content"
msgstr "Nicht jugendfreie Inhalte"
-#: ../../mod/settings.php:1051
+#: ../../mod/settings.php:1050
msgid ""
"This channel frequently or regularly publishes adult content. (Please tag "
"any adult material and/or nudity with #NSFW)"
msgstr "Dieser Kanal veröffentlicht regelmäßig Inhalte, die für Minderjährige ungeeignet sind. (Bitte markiere solche Inhalte mit dem Schlagwort #NSFW)"
-#: ../../mod/settings.php:1053
+#: ../../mod/settings.php:1052
msgid "Security and Privacy Settings"
msgstr "Sicherheits- und Datenschutz-Einstellungen"
-#: ../../mod/settings.php:1055
+#: ../../mod/settings.php:1054
msgid "Your permissions are already configured. Click to view/adjust"
msgstr "Deine Zugriffsrechte sind schon konfiguriert. Klicke hier, um sie zu betrachten oder zu ändern"
-#: ../../mod/settings.php:1057
+#: ../../mod/settings.php:1056
msgid "Hide my online presence"
msgstr "Meine Online-Präsenz verbergen"
-#: ../../mod/settings.php:1057
+#: ../../mod/settings.php:1056
msgid "Prevents displaying in your profile that you are online"
msgstr "Verhindert die Anzeige Deines Online-Status in deinem Profil"
-#: ../../mod/settings.php:1059
+#: ../../mod/settings.php:1058
msgid "Simple Privacy Settings:"
msgstr "Einfache Privatsphäre-Einstellungen"
-#: ../../mod/settings.php:1060
+#: ../../mod/settings.php:1059
msgid ""
"Very Public - <em>extremely permissive (should be used with caution)</em>"
msgstr "Komplett offen – <em>extrem ungeschützt (mit großer Vorsicht verwenden!)</em>"
-#: ../../mod/settings.php:1061
+#: ../../mod/settings.php:1060
msgid ""
"Typical - <em>default public, privacy when desired (similar to social "
"network permissions but with improved privacy)</em>"
msgstr "Typisch – <em>Standard öffentlich, Privatsphäre, wo sie erwünscht ist (ähnlich den Einstellungen in sozialen Netzwerken, aber mit besser geschützter Privatsphäre)</em>"
-#: ../../mod/settings.php:1062
+#: ../../mod/settings.php:1061
msgid "Private - <em>default private, never open or public</em>"
msgstr "Privat – <em>Standard privat, nie offen oder öffentlich</em>"
-#: ../../mod/settings.php:1063
+#: ../../mod/settings.php:1062
msgid "Blocked - <em>default blocked to/from everybody</em>"
msgstr "Blockiert – <em>Alle standardmäßig blockiert</em>"
-#: ../../mod/settings.php:1065
+#: ../../mod/settings.php:1064
msgid "Allow others to tag your posts"
msgstr "Erlaube anderen, Deine Beiträge zu verschlagworten"
-#: ../../mod/settings.php:1065
+#: ../../mod/settings.php:1064
msgid ""
"Often used by the community to retro-actively flag inappropriate content"
msgstr "Wird oft von der Community genutzt um rückwirkend anstößigen Inhalt zu markieren"
-#: ../../mod/settings.php:1067
+#: ../../mod/settings.php:1066
msgid "Advanced Privacy Settings"
msgstr "Fortgeschrittene Privatsphäre-Einstellungen"
-#: ../../mod/settings.php:1069
+#: ../../mod/settings.php:1068
msgid "Expire other channel content after this many days"
msgstr "Den Inhalt anderer Kanäle nach dieser Anzahl Tage verfallen lassen"
-#: ../../mod/settings.php:1069
+#: ../../mod/settings.php:1068
msgid "0 or blank prevents expiration"
msgstr "0 oder kein Inhalt verhindern das Verfallen"
-#: ../../mod/settings.php:1070
+#: ../../mod/settings.php:1069
msgid "Maximum Friend Requests/Day:"
msgstr "Maximale Kontaktanfragen pro Tag:"
-#: ../../mod/settings.php:1070
+#: ../../mod/settings.php:1069
msgid "May reduce spam activity"
msgstr "Kann die Spam-Aktivität verringern"
-#: ../../mod/settings.php:1071
+#: ../../mod/settings.php:1070
msgid "Default Post Permissions"
msgstr "Standardeinstellungen für Beitrags-Zugriffsrechte"
-#: ../../mod/settings.php:1072 ../../mod/mitem.php:152 ../../mod/mitem.php:221
+#: ../../mod/settings.php:1071 ../../mod/mitem.php:161 ../../mod/mitem.php:204
msgid "(click to open/close)"
msgstr "(zum öffnen/schließen anklicken)"
-#: ../../mod/settings.php:1076
+#: ../../mod/settings.php:1075
msgid "Channel permissions category:"
msgstr "Zugriffsrechte-Kategorie des Kanals:"
-#: ../../mod/settings.php:1082
+#: ../../mod/settings.php:1081
msgid "Maximum private messages per day from unknown people:"
msgstr "Maximale Anzahl privater Nachrichten pro Tag von unbekannten Leuten:"
-#: ../../mod/settings.php:1082
+#: ../../mod/settings.php:1081
msgid "Useful to reduce spamming"
msgstr "Nützlich, um Spam zu verringern"
-#: ../../mod/settings.php:1085
+#: ../../mod/settings.php:1084
msgid "Notification Settings"
msgstr "Benachrichtigungs-Einstellungen"
-#: ../../mod/settings.php:1086
+#: ../../mod/settings.php:1085
msgid "By default post a status message when:"
msgstr "Sende standardmäßig Status-Nachrichten, wenn:"
-#: ../../mod/settings.php:1087
+#: ../../mod/settings.php:1086
msgid "accepting a friend request"
msgstr "Du eine Verbindungsanfrage annimmst"
-#: ../../mod/settings.php:1088
+#: ../../mod/settings.php:1087
msgid "joining a forum/community"
msgstr "Du einem Forum beitrittst"
-#: ../../mod/settings.php:1089
+#: ../../mod/settings.php:1088
msgid "making an <em>interesting</em> profile change"
msgstr "Du eine <em>interessante</em> Änderung an Deinem Profil vornimmst"
-#: ../../mod/settings.php:1090
+#: ../../mod/settings.php:1089
msgid "Send a notification email when:"
msgstr "Eine E-Mail-Benachrichtigung senden, wenn:"
-#: ../../mod/settings.php:1091
+#: ../../mod/settings.php:1090
msgid "You receive a connection request"
msgstr "Du eine Verbindungsanfrage erhältst"
-#: ../../mod/settings.php:1092
+#: ../../mod/settings.php:1091
msgid "Your connections are confirmed"
msgstr "Eine Verbindung bestätigt wurde"
-#: ../../mod/settings.php:1093
+#: ../../mod/settings.php:1092
msgid "Someone writes on your profile wall"
msgstr "Jemand auf Deine Pinnwand schreibt"
-#: ../../mod/settings.php:1094
+#: ../../mod/settings.php:1093
msgid "Someone writes a followup comment"
msgstr "Jemand einen Beitrag kommentiert"
-#: ../../mod/settings.php:1095
+#: ../../mod/settings.php:1094
msgid "You receive a private message"
msgstr "Du eine private Nachricht erhältst"
-#: ../../mod/settings.php:1096
+#: ../../mod/settings.php:1095
msgid "You receive a friend suggestion"
msgstr "Du einen Kontaktvorschlag erhältst"
-#: ../../mod/settings.php:1097
+#: ../../mod/settings.php:1096
msgid "You are tagged in a post"
msgstr "Du in einem Beitrag erwähnt wurdest"
-#: ../../mod/settings.php:1098
+#: ../../mod/settings.php:1097
msgid "You are poked/prodded/etc. in a post"
msgstr "Du in einem Beitrag angestupst/geknufft/o.ä. wurdest"
-#: ../../mod/settings.php:1101
+#: ../../mod/settings.php:1100
msgid "Show visual notifications including:"
msgstr "Visuelle Benachrichtigungen anzeigen für:"
-#: ../../mod/settings.php:1103
+#: ../../mod/settings.php:1102
msgid "Unseen matrix activity"
msgstr "Ungesehene Matrix-Aktivität"
-#: ../../mod/settings.php:1104
+#: ../../mod/settings.php:1103
msgid "Unseen channel activity"
msgstr "Ungesehene Kanal-Aktivität"
-#: ../../mod/settings.php:1105
+#: ../../mod/settings.php:1104
msgid "Unseen private messages"
msgstr "Ungelesene persönliche Nachrichten"
-#: ../../mod/settings.php:1105 ../../mod/settings.php:1110
-#: ../../mod/settings.php:1111 ../../mod/settings.php:1112
+#: ../../mod/settings.php:1104 ../../mod/settings.php:1109
+#: ../../mod/settings.php:1110 ../../mod/settings.php:1111
msgid "Recommended"
msgstr "Empfohlen"
-#: ../../mod/settings.php:1106
+#: ../../mod/settings.php:1105
msgid "Upcoming events"
msgstr "Baldige Termine"
-#: ../../mod/settings.php:1107
+#: ../../mod/settings.php:1106
msgid "Events today"
msgstr "Heutige Termine"
-#: ../../mod/settings.php:1108
+#: ../../mod/settings.php:1107
msgid "Upcoming birthdays"
msgstr "Baldige Geburtstage"
-#: ../../mod/settings.php:1108
+#: ../../mod/settings.php:1107
msgid "Not available in all themes"
msgstr "Nicht in allen Themes verfügbar"
-#: ../../mod/settings.php:1109
+#: ../../mod/settings.php:1108
msgid "System (personal) notifications"
msgstr "System – (persönliche) Benachrichtigungen"
-#: ../../mod/settings.php:1110
+#: ../../mod/settings.php:1109
msgid "System info messages"
msgstr "System – Info-Nachrichten"
-#: ../../mod/settings.php:1111
+#: ../../mod/settings.php:1110
msgid "System critical alerts"
msgstr "System – kritische Warnungen"
-#: ../../mod/settings.php:1112
+#: ../../mod/settings.php:1111
msgid "New connections"
msgstr "Neue Verbindungen"
-#: ../../mod/settings.php:1113
+#: ../../mod/settings.php:1112
msgid "System Registrations"
msgstr "System – Registrierungen"
-#: ../../mod/settings.php:1114
+#: ../../mod/settings.php:1113
msgid ""
"Also show new wall posts, private messages and connections under Notices"
msgstr "Zeigt neue Pinnwand-Nachrichten, private Nachrichten und Verbindungen unter Benachrichtigungen an"
-#: ../../mod/settings.php:1116
+#: ../../mod/settings.php:1115
msgid "Notify me of events this many days in advance"
msgstr "Benachrichtige mich zu Terminen so viele Tage im Voraus"
-#: ../../mod/settings.php:1116
+#: ../../mod/settings.php:1115
msgid "Must be greater than 0"
msgstr "Muss größer als 0 sein"
-#: ../../mod/settings.php:1118
+#: ../../mod/settings.php:1117
msgid "Advanced Account/Page Type Settings"
msgstr "Erweiterte Account- und Seitenart-Einstellungen"
-#: ../../mod/settings.php:1119
+#: ../../mod/settings.php:1118
msgid "Change the behaviour of this account for special situations"
msgstr "Ändere das Verhalten dieses Accounts unter speziellen Umständen"
-#: ../../mod/settings.php:1122
+#: ../../mod/settings.php:1121
msgid ""
"Please enable expert mode (in <a href=\"settings/features\">Settings > "
"Additional features</a>) to adjust!"
msgstr "Aktiviere den Expertenmodus (unter <a href=\"settings/features\">Settings > Zusätzliche Funktionen</a>), um hier Einstellungen vorzunehmen!"
-#: ../../mod/settings.php:1123
+#: ../../mod/settings.php:1122
msgid "Miscellaneous Settings"
msgstr "Sonstige Einstellungen"
-#: ../../mod/settings.php:1125
+#: ../../mod/settings.php:1124
msgid "Personal menu to display in your channel pages"
msgstr "Eigenes Menü zur Anzeige auf den Seiten deines Kanals"
-#: ../../mod/settings.php:1126 ../../mod/removeme.php:61
-msgid "Remove Channel"
-msgstr "Kanal löschen"
-
-#: ../../mod/settings.php:1127
-msgid "Remove this channel."
+#: ../../mod/settings.php:1125
+msgid "Remove this channel"
msgstr "Diesen Kanal löschen"
-#: ../../mod/xchan.php:6
-msgid "Xchan Lookup"
-msgstr "Xchan-Suche"
-
-#: ../../mod/xchan.php:9
-msgid "Lookup xchan beginning with (or webbie): "
-msgstr "Nach xchans oder Webbies (Kanal-Adressen) suchen, die wie folgt beginnen:"
-
-#: ../../mod/xchan.php:37 ../../mod/menu.php:149 ../../mod/mitem.php:120
-msgid "Not found."
-msgstr "Nicht gefunden."
-
-#: ../../mod/api.php:76 ../../mod/api.php:102
-msgid "Authorize application connection"
-msgstr "Zugriff für die Anwendung autorisieren"
-
-#: ../../mod/api.php:77
-msgid "Return to your app and insert this Securty Code:"
-msgstr "Trage folgenden Sicherheitscode in der Anwendung ein:"
-
-#: ../../mod/api.php:89
-msgid "Please login to continue."
-msgstr "Zum Weitermachen, bitte einloggen."
-
-#: ../../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 "Möchtest Du dieser Anwendung erlauben, Deine Nachrichten und Kontakte abzurufen und/oder neue Nachrichten für Dich zu erstellen?"
-
-#: ../../mod/webpages.php:189
-msgid "Page Title"
-msgstr "Seitentitel"
-
-#: ../../mod/follow.php:25
-msgid "Channel added."
-msgstr "Kanal hinzugefügt."
+#: ../../mod/cloud.php:120
+msgid "RedMatrix - Guests: Username: {your email address}, Password: +++"
+msgstr "RedMatrix – Gäste: Username: {Deine E-Mail-Adresse}, Passwort: +++"
#: ../../mod/tagrm.php:44 ../../mod/tagrm.php:94
msgid "Tag removed"
@@ -4555,437 +5240,10 @@ msgstr "Schlagwort entfernen"
msgid "Select a tag to remove: "
msgstr "Schlagwort zum Entfernen auswählen:"
-#: ../../mod/tagrm.php:133 ../../mod/photos.php:875
+#: ../../mod/tagrm.php:133 ../../mod/delegate.php:130 ../../mod/photos.php:873
msgid "Remove"
msgstr "Entferne"
-#: ../../mod/connect.php:56 ../../mod/connect.php:104
-msgid "Continue"
-msgstr "Fortfahren"
-
-#: ../../mod/connect.php:85
-msgid "Premium Channel Setup"
-msgstr "Premium-Kanal-Einrichtung"
-
-#: ../../mod/connect.php:87
-msgid "Enable premium channel connection restrictions"
-msgstr "Einschränkungen für einen Premium-Kanal aktivieren"
-
-#: ../../mod/connect.php:88
-msgid ""
-"Please enter your restrictions or conditions, such as paypal receipt, usage "
-"guidelines, etc."
-msgstr "Bitte gib Deine Nutzungsbedingungen ein, z.B. Paypal-Quittung, Richtlinien 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 "Unter Umständen sind weitere Schritte oder die Bestätigung der folgenden Bedingungen vor dem Verbinden mit diesem Kanal nötig."
-
-#: ../../mod/connect.php:91
-msgid ""
-"Potential connections will then see the following text before proceeding:"
-msgstr "Potentielle Kontakte werden den folgenden Text sehen, bevor fortgefahren wird:"
-
-#: ../../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 "Indem ich fortfahre, bestätige ich die Erfüllung aller Anweisungen auf dieser Seite."
-
-#: ../../mod/connect.php:101
-msgid "(No specific instructions have been provided by the channel owner.)"
-msgstr "(Der Kanal-Besitzer hat keine speziellen Anweisungen hinterlegt.)"
-
-#: ../../mod/connect.php:109
-msgid "Restricted or Premium Channel"
-msgstr "Eingeschränkter oder Premium-Kanal"
-
-#: ../../mod/thing.php:94
-msgid "Thing updated"
-msgstr "Sache aktualisiert"
-
-#: ../../mod/thing.php:153
-msgid "Object store: failed"
-msgstr "Speichern des Objekts fehlgeschlagen"
-
-#: ../../mod/thing.php:157
-msgid "Thing added"
-msgstr "Sache hinzugefügt"
-
-#: ../../mod/thing.php:175
-#, php-format
-msgid "OBJ: %1$s %2$s %3$s"
-msgstr "OBJ: %1$s %2$s %3$s"
-
-#: ../../mod/thing.php:226
-msgid "Show Thing"
-msgstr "Sache anzeigen"
-
-#: ../../mod/thing.php:233
-msgid "item not found."
-msgstr "Eintrag nicht gefunden"
-
-#: ../../mod/thing.php:261
-msgid "Edit Thing"
-msgstr "Sache bearbeiten"
-
-#: ../../mod/thing.php:263 ../../mod/thing.php:310
-msgid "Select a profile"
-msgstr "Wähle ein Profil"
-
-#: ../../mod/thing.php:267 ../../mod/thing.php:313
-msgid "Post an activity"
-msgstr "Aktivitätsnachricht senden"
-
-#: ../../mod/thing.php:267 ../../mod/thing.php:313
-msgid "Only sends to viewers of the applicable profile"
-msgstr "Nur an Betrachter des ausgewählten Profils senden"
-
-#: ../../mod/thing.php:269 ../../mod/thing.php:315
-msgid "Name of thing e.g. something"
-msgstr "Name der Sache, z. B. irgendwas"
-
-#: ../../mod/thing.php:271 ../../mod/thing.php:316
-msgid "URL of thing (optional)"
-msgstr "URL der Sache (optional)"
-
-#: ../../mod/thing.php:273 ../../mod/thing.php:317
-msgid "URL for photo of thing (optional)"
-msgstr "URL eines Fotos der Sache (optional)"
-
-#: ../../mod/thing.php:308
-msgid "Add Thing to your Profile"
-msgstr "Die Sache Deinem Profil hinzufügen"
-
-#: ../../mod/attach.php:9
-msgid "Item not available."
-msgstr "Element nicht verfügbar."
-
-#: ../../mod/probe.php:23 ../../mod/probe.php:29
-#, php-format
-msgid "Fetching URL returns error: %1$s"
-msgstr "Abrufen der URL gab einen Fehler zurück: %1$s"
-
-#: ../../mod/home.php:53
-msgid "Red Matrix - &quot;The Network&quot;"
-msgstr "RedMatrix – &quot;Das Netzwerk&quot;"
-
-#: ../../mod/home.php:124
-#, php-format
-msgid "Welcome to %s"
-msgstr "Willkommen auf %s"
-
-#: ../../mod/profile_photo.php:108
-msgid "Image uploaded but image cropping failed."
-msgstr "Bild hochgeladen, aber das Zurechtschneiden schlug fehl."
-
-#: ../../mod/profile_photo.php:162
-msgid "Image resize failed."
-msgstr "Bild-Anpassung fehlgeschlagen."
-
-#: ../../mod/profile_photo.php:206
-msgid ""
-"Shift-reload the page or clear browser cache if the new photo does not "
-"display immediately."
-msgstr "Leere den Browser Cache oder nutze Umschalten-Neu Laden, falls das neue Foto nicht sofort angezeigt wird."
-
-#: ../../mod/profile_photo.php:233
-#, php-format
-msgid "Image exceeds size limit of %d"
-msgstr "Bild ist größer als das Limit von %d"
-
-#: ../../mod/profile_photo.php:242
-msgid "Unable to process image."
-msgstr "Kann Bild nicht verarbeiten."
-
-#: ../../mod/profile_photo.php:291 ../../mod/profile_photo.php:340
-msgid "Photo not available."
-msgstr "Foto nicht verfügbar."
-
-#: ../../mod/profile_photo.php:359
-msgid "Upload File:"
-msgstr "Datei hochladen:"
-
-#: ../../mod/profile_photo.php:360
-msgid "Select a profile:"
-msgstr "Wähle ein Profil:"
-
-#: ../../mod/profile_photo.php:361
-msgid "Upload Profile Photo"
-msgstr "Lade neues Profilfoto hoch"
-
-#: ../../mod/profile_photo.php:366
-msgid "skip this step"
-msgstr "diesen Schritt überspringen"
-
-#: ../../mod/profile_photo.php:366
-msgid "select a photo from your photo albums"
-msgstr "ein Foto aus meinen Fotoalben"
-
-#: ../../mod/profile_photo.php:382
-msgid "Crop Image"
-msgstr "Bild zuschneiden"
-
-#: ../../mod/profile_photo.php:383
-msgid "Please adjust the image cropping for optimum viewing."
-msgstr "Bitte schneide das Bild für eine optimale Anzeige passend zu."
-
-#: ../../mod/profile_photo.php:385
-msgid "Done Editing"
-msgstr "Bearbeitung fertigstellen"
-
-#: ../../mod/profile_photo.php:428
-msgid "Image uploaded successfully."
-msgstr "Bild erfolgreich hochgeladen."
-
-#: ../../mod/profile_photo.php:430
-msgid "Image upload failed."
-msgstr "Hochladen des Bilds fehlgeschlagen."
-
-#: ../../mod/profile_photo.php:439
-#, php-format
-msgid "Image size reduction [%s] failed."
-msgstr "Reduzierung der Bildgröße [%s] fehlgeschlagen."
-
-#: ../../mod/block.php:27 ../../mod/page.php:33
-msgid "Invalid item."
-msgstr "Ungültiges Element."
-
-#: ../../mod/block.php:39 ../../mod/wall_upload.php:29 ../../mod/page.php:45
-msgid "Channel not found."
-msgstr "Kanal nicht gefunden."
-
-#: ../../mod/block.php:75 ../../mod/help.php:79 ../../mod/display.php:106
-#: ../../mod/page.php:82 ../../index.php:241
-msgid "Page not found."
-msgstr "Seite nicht gefunden."
-
-#: ../../mod/like.php:15
-msgid "Like/Dislike"
-msgstr "Mögen/Nicht mögen"
-
-#: ../../mod/like.php:20
-msgid "This action is restricted to members."
-msgstr "Diese Aktion kann nur von Mitgliedern ausgeführt werden."
-
-#: ../../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 "Bitte <a href=\"rmagic\">melde Dich mit Deiner RedMatrix-ID an</a> oder <a href=\"register\">registriere Dich als neues Mitglied der RedMatrix</a>, um fortzufahren."
-
-#: ../../mod/like.php:101 ../../mod/like.php:128 ../../mod/like.php:166
-msgid "Invalid request."
-msgstr "Ungültige Anfrage."
-
-#: ../../mod/like.php:143
-msgid "thing"
-msgstr "Sache"
-
-#: ../../mod/like.php:189
-msgid "Channel unavailable."
-msgstr "Kanal nicht vorhanden."
-
-#: ../../mod/like.php:228
-msgid "Previous action reversed."
-msgstr "Die vorherige Aktion wurde rückgängig gemacht."
-
-#: ../../mod/like.php:398
-#, php-format
-msgid "%1$s agrees with %2$s's %3$s"
-msgstr "%1$s stimmt %2$ss %3$s zu"
-
-#: ../../mod/like.php:400
-#, php-format
-msgid "%1$s doesn't agree with %2$s's %3$s"
-msgstr "%1$s lehnt %2$ss %3$s ab"
-
-#: ../../mod/like.php:402
-#, php-format
-msgid "%1$s abstains from a decision on %2$s's %3$s"
-msgstr "%1$s enthält sich zu %2$ss %3$s"
-
-#: ../../mod/like.php:404
-#, php-format
-msgid "%1$s is attending %2$s's %3$s"
-msgstr "%1$s nimmt an %2$ss %3$s teil"
-
-#: ../../mod/like.php:406
-#, php-format
-msgid "%1$s is not attending %2$s's %3$s"
-msgstr "%1$s nimmt an %2$ss %3$s nicht teil"
-
-#: ../../mod/like.php:408
-#, php-format
-msgid "%1$s may attend %2$s's %3$s"
-msgstr "%1$s nimmt vielleicht an %2$ss %3$s teil"
-
-#: ../../mod/like.php:492
-msgid "Action completed."
-msgstr "Aktion durchgeführt."
-
-#: ../../mod/like.php:493
-msgid "Thank you."
-msgstr "Vielen Dank."
-
-#: ../../mod/events.php:87
-msgid "Event can not end before it has started."
-msgstr "Termin-Ende liegt vor dem Beginn."
-
-#: ../../mod/events.php:89 ../../mod/events.php:98 ../../mod/events.php:116
-msgid "Unable to generate preview."
-msgstr "Vorschau konnte nicht erzeugt werden."
-
-#: ../../mod/events.php:96
-msgid "Event title and start time are required."
-msgstr "Titel und Startzeit des Termins sind erforderlich."
-
-#: ../../mod/events.php:114
-msgid "Event not found."
-msgstr "Termin nicht gefunden."
-
-#: ../../mod/events.php:396
-msgid "l, F j"
-msgstr "l, j. F"
-
-#: ../../mod/events.php:418
-msgid "Edit event"
-msgstr "Termin bearbeiten"
-
-#: ../../mod/events.php:419
-msgid "Delete event"
-msgstr "Termin löschen"
-
-#: ../../mod/events.php:473
-msgid "Create New Event"
-msgstr "Neuen Termin erstellen"
-
-#: ../../mod/events.php:474 ../../mod/photos.php:827
-msgid "Previous"
-msgstr "Voriges"
-
-#: ../../mod/events.php:475 ../../mod/setup.php:265 ../../mod/photos.php:836
-msgid "Next"
-msgstr "Nächste"
-
-#: ../../mod/events.php:476
-msgid "Export"
-msgstr "Exportieren"
-
-#: ../../mod/events.php:504
-msgid "Event removed"
-msgstr "Termin gelöscht"
-
-#: ../../mod/events.php:507
-msgid "Failed to remove event"
-msgstr "Termin konnte nicht gelöscht werden"
-
-#: ../../mod/events.php:627
-msgid "Event details"
-msgstr "Termin-Details"
-
-#: ../../mod/events.php:628
-msgid "Starting date and Title are required."
-msgstr "Startdatum und Titel sind erforderlich."
-
-#: ../../mod/events.php:630
-msgid "Categories (comma-separated list)"
-msgstr "Kategorien (Kommagetrennte Liste)"
-
-#: ../../mod/events.php:632
-msgid "Event Starts:"
-msgstr "Termin beginnt:"
-
-#: ../../mod/events.php:639
-msgid "Finish date/time is not known or not relevant"
-msgstr "Ende Datum/Zeit sind unbekannt oder unwichtig"
-
-#: ../../mod/events.php:641
-msgid "Event Finishes:"
-msgstr "Termin endet:"
-
-#: ../../mod/events.php:643 ../../mod/events.php:644
-msgid "Adjust for viewer timezone"
-msgstr "An die Zeitzone des Betrachters anpassen"
-
-#: ../../mod/events.php:643
-msgid ""
-"Important for events that happen in a particular place. Not practical for "
-"global holidays."
-msgstr "Wichtig für Veranstaltungen die an bestimmten Orten stattfinden. Nicht sinnvoll für globale Feiertage / Ferien."
-
-#: ../../mod/events.php:645
-msgid "Description:"
-msgstr "Beschreibung:"
-
-#: ../../mod/events.php:649
-msgid "Title:"
-msgstr "Titel:"
-
-#: ../../mod/events.php:651
-msgid "Share this event"
-msgstr "Den Termin teilen"
-
-#: ../../mod/subthread.php:103
-#, php-format
-msgid "%1$s is following %2$s's %3$s"
-msgstr "%1$s folgt nun %2$ss %3$s"
-
-#: ../../mod/pubsites.php:16
-msgid "Public Sites"
-msgstr "Öffentliche Server"
-
-#: ../../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 "Die hier aufgeführten Server erlauben Dir, einen Account in der Red-Matrix anzulegen. Alle Server der Matrix sind miteinander verbunden, so dass die Mitgliedschaft auf einem Server eine Verbindung zu beliebigen anderen Servern der Matrix ermöglicht. Es könnte sein, dass einige dieser Server kostenpflichtig sind oder abgestufte, je nach Umfang kostenpflichtige Mitgliedschaften anbieten. Auf den jeweiligen Seiten <strong>könnten</strong> nähere Details dazu stehen."
-
-#: ../../mod/pubsites.php:25
-msgid "Rate this hub"
-msgstr "Bewerte diesen Hub"
-
-#: ../../mod/pubsites.php:26
-msgid "Site URL"
-msgstr "Server-URL"
-
-#: ../../mod/pubsites.php:26
-msgid "Access Type"
-msgstr "Zugangstyp"
-
-#: ../../mod/pubsites.php:26
-msgid "Registration Policy"
-msgstr "Registrierungsrichtlinien"
-
-#: ../../mod/pubsites.php:26 ../../mod/profiles.php:454
-msgid "Location"
-msgstr "Ort"
-
-#: ../../mod/pubsites.php:26
-msgid "View hub ratings"
-msgstr "Bewertungen dieses Hubs ansehen"
-
-#: ../../mod/pubsites.php:30
-msgid "Rate"
-msgstr "Bewerten"
-
-#: ../../mod/pubsites.php:31
-msgid "View ratings"
-msgstr "Bewertungen ansehen"
-
-#: ../../mod/rpost.php:131 ../../mod/editpost.php:42
-msgid "Edit post"
-msgstr "Bearbeite Beitrag"
-
-#: ../../mod/dav.php:121
-msgid "RedMatrix channel"
-msgstr "RedMatrix-Kanal"
-
#: ../../mod/group.php:20
msgid "Collection created."
msgstr "Sammlung erstellt."
@@ -5022,70 +5280,70 @@ msgstr "Löschen der Sammlung nicht möglich."
msgid "Collection Editor"
msgstr "Sammlung-Editor"
-#: ../../mod/group.php:196 ../../mod/bulksetclose.php:89
+#: ../../mod/group.php:196
msgid "Members"
msgstr "Mitglieder"
-#: ../../mod/group.php:198 ../../mod/bulksetclose.php:91
+#: ../../mod/group.php:198
msgid "All Connected Channels"
msgstr "Alle verbundenen Kanäle"
-#: ../../mod/group.php:233 ../../mod/bulksetclose.php:126
+#: ../../mod/group.php:233
msgid "Click on a channel to add or remove."
msgstr "Wähle einen Kanal zum hinzufügen oder entfernen aus."
-#: ../../mod/siteinfo.php:112
+#: ../../mod/siteinfo.php:93
#, php-format
msgid "Version %s"
msgstr "Version %s"
-#: ../../mod/siteinfo.php:133
+#: ../../mod/siteinfo.php:114
msgid "Installed plugins/addons/apps:"
msgstr "Installierte Plugins/Addons/Apps"
-#: ../../mod/siteinfo.php:146
+#: ../../mod/siteinfo.php:127
msgid "No installed plugins/addons/apps"
msgstr "Keine installierten Plugins/Addons/Apps"
-#: ../../mod/siteinfo.php:155
+#: ../../mod/siteinfo.php:136
msgid "Red"
msgstr "Red"
-#: ../../mod/siteinfo.php:156
+#: ../../mod/siteinfo.php:137
msgid ""
-"This is a hub of redmatrix - a global cooperative network of decentralized "
-"privacy enhanced websites."
-msgstr "Dieser Hub ist Teil der RedMatrix – ein globales, kooperatives Netzwerk aus dezentralen Websites, die Rücksicht auf Deine Privatsphäre nehmen."
+"This is a hub of the Red Matrix - a global cooperative network of "
+"decentralized privacy enhanced websites."
+msgstr "Dieser Hub ist Teil der RedMatrix – eines globalen, kooperativen Netzwerks aus dezentralen Websites, die Rücksicht auf Deine Privatsphäre nehmen."
-#: ../../mod/siteinfo.php:158
+#: ../../mod/siteinfo.php:139
msgid "Tag: "
msgstr "Schlagwort: "
-#: ../../mod/siteinfo.php:160
+#: ../../mod/siteinfo.php:141
msgid "Last background fetch: "
msgstr "Letzter Hintergrundabruf:"
-#: ../../mod/siteinfo.php:163
+#: ../../mod/siteinfo.php:144
msgid "Running at web location"
msgstr "Erreichbar unter der Web-Adresse"
-#: ../../mod/siteinfo.php:164
+#: ../../mod/siteinfo.php:145
msgid ""
-"Please visit <a href=\"https://redmatrix.me\">redmatrix.me</a> to learn more"
+"Please visit <a href=\"https://redmatrix.me\">RedMatrix.me</a> to learn more"
" about the Red Matrix."
-msgstr "Bitte besuche <a href=\"https://redmatrix.me\">RedMatrix.me</a>, um mehr über RedMatrix zu erfahren."
+msgstr "Bitte besuchen Sie <a href=\"https://redmatrix.me\">RedMatrix.me</a>, um mehr über RedMatrix zu erfahren."
-#: ../../mod/siteinfo.php:165
+#: ../../mod/siteinfo.php:146
msgid "Bug reports and issues: please visit"
msgstr "Probleme oder Fehler gefunden? Bitte besuche"
-#: ../../mod/siteinfo.php:168
+#: ../../mod/siteinfo.php:149
msgid ""
"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot "
"com"
msgstr "Vorschläge, Lob, usw.: E-Mail an 'redmatrix' at librelist - dot - com"
-#: ../../mod/siteinfo.php:170
+#: ../../mod/siteinfo.php:151
msgid "Site Administrators"
msgstr "Administratoren"
@@ -5249,7 +5507,7 @@ msgstr "Bei der Kommandozeilen-Version von PHP auf Deinem System ist \"register_
#: ../../mod/setup.php:415
msgid "This is required for message delivery to work."
-msgstr "Das ist für die funktionierende Auslieferung von Nachrichten erforderlich."
+msgstr "Das wird benötigt, damit die Auslieferung von Nachrichten funktioniert."
#: ../../mod/setup.php:417
msgid "PHP register_argc_argv"
@@ -5302,7 +5560,7 @@ msgstr "Apache-mod_rewrite-Modul"
#: ../../mod/setup.php:458
msgid ""
"Error: Apache webserver mod-rewrite module is required but not installed."
-msgstr "Fehler: Das Apache-Modul mod-rewrite ist erforderlich, aber nicht installiert."
+msgstr "Fehler: Das Apache-Modul mod-rewrite wird benötigt, ist aber nicht installiert."
#: ../../mod/setup.php:464 ../../mod/setup.php:467
msgid "proc_open"
@@ -5312,20 +5570,20 @@ msgstr "proc_open"
msgid ""
"Error: proc_open is required but is either not installed or has been "
"disabled in php.ini"
-msgstr "Fehler: proc_open ist erforderlich, aber entweder nicht installiert oder wurde in der php.ini deaktiviert"
+msgstr "Fehler: proc_open wird benötigt, ist aber entweder nicht installiert oder wurde in der php.ini deaktiviert"
#: ../../mod/setup.php:472
msgid "Error: libCURL PHP module required but not installed."
-msgstr "Fehler: Das PHP-Modul libCURL ist erforderlich, aber nicht installiert."
+msgstr "Fehler: Das PHP-Modul libCURL wird benötigt, ist aber nicht installiert."
#: ../../mod/setup.php:476
msgid ""
"Error: GD graphics PHP module with JPEG support required but not installed."
-msgstr "Fehler: Das PHP-Modul GD-Grafik mit JPEG-Unterstützung ist erforderlich, aber nicht installiert."
+msgstr "Fehler: Das PHP-Modul GD-Grafik mit JPEG-Unterstützung wird benötigt, ist aber nicht installiert."
#: ../../mod/setup.php:480
msgid "Error: openssl PHP module required but not installed."
-msgstr "Fehler: Das PHP-Modul openssl ist erforderlich, aber nicht installiert."
+msgstr "Fehler: Das PHP-Modul openssl wird benötigt, ist aber nicht installiert."
#: ../../mod/setup.php:484
msgid ""
@@ -5334,11 +5592,11 @@ msgstr "Fehler: Das mysqli oder postgres PHP-Modul ist erforderlich, aber keines
#: ../../mod/setup.php:488
msgid "Error: mb_string PHP module required but not installed."
-msgstr "Fehler: Das PHP-Modul mb_string ist erforderlich, aber nicht installiert."
+msgstr "Fehler: Das PHP-Modul mb_string wird benötigt, ist aber nicht installiert."
#: ../../mod/setup.php:492
msgid "Error: mcrypt PHP module required but not installed."
-msgstr "Fehler: Das PHP-Modul mcrypt ist erforderlich, aber nicht installiert."
+msgstr "Fehler: Das PHP-Modul mcrypt wird benötigt, ist aber nicht installiert."
#: ../../mod/setup.php:508
msgid ""
@@ -5494,25 +5752,11 @@ msgstr "Gemeinsame Verbindungen"
msgid "No connections in common."
msgstr "Keine gemeinsamen Verbindungen."
-#: ../../mod/regdir.php:45 ../../mod/dirsearch.php:21
-msgid "This site is not a directory server"
-msgstr "Diese Website ist kein Verzeichnis-Server"
-
-#: ../../mod/connections.php:37 ../../mod/connedit.php:75
-msgid "Could not access contact record."
-msgstr "Konnte nicht auf den Kontakteintrag zugreifen."
-
-#: ../../mod/connections.php:51 ../../mod/connedit.php:99
-msgid "Could not locate selected profile."
-msgstr "Gewähltes Profil nicht gefunden."
-
-#: ../../mod/connections.php:94 ../../mod/connedit.php:214
-msgid "Connection updated."
-msgstr "Verbindung aktualisiert."
-
-#: ../../mod/connections.php:96 ../../mod/connedit.php:216
-msgid "Failed to update connection record."
-msgstr "Konnte den Verbindungseintrag nicht aktualisieren."
+#: ../../mod/suggest.php:35
+msgid ""
+"No suggestions available. If this is a new site, please try again in 24 "
+"hours."
+msgstr "Keine Vorschläge vorhanden. Wenn das ein neuer Server ist, versuche es in 24 Stunden noch einmal."
#: ../../mod/connections.php:192 ../../mod/connections.php:293
msgid "Blocked"
@@ -5530,6 +5774,10 @@ msgstr "Versteckt"
msgid "Archived"
msgstr "Archiviert"
+#: ../../mod/connections.php:231 ../../mod/connections.php:246
+msgid "All"
+msgstr "Alle"
+
#: ../../mod/connections.php:271
msgid "Suggest new connections"
msgstr "Neue Verbindungen vorschlagen"
@@ -5591,183 +5839,116 @@ msgstr "Verbindungen durchsuchen"
msgid "Finding: "
msgstr "Ergebnisse:"
-#: ../../mod/blocks.php:95 ../../mod/blocks.php:147
-msgid "Block Name"
-msgstr "Datenblockname"
+#: ../../mod/impel.php:33
+msgid "webpage"
+msgstr "Webseite"
-#: ../../mod/blocks.php:148
-msgid "Block Title"
-msgstr "Titel des Blocks"
+#: ../../mod/impel.php:38
+msgid "block"
+msgstr "Block"
+
+#: ../../mod/impel.php:43
+msgid "layout"
+msgstr "Layout"
+
+#: ../../mod/impel.php:117
+#, php-format
+msgid "%s element installed"
+msgstr "Element für %s installiert"
#: ../../mod/tagger.php:96
#, php-format
msgid "%1$s tagged %2$s's %3$s with %4$s"
msgstr "%1$s hat %2$ss %3$s mit %4$s verschlagwortet"
-#: ../../mod/cloud.php:120
-msgid "RedMatrix - Guests: Username: {your email address}, Password: +++"
-msgstr "RedMatrix – Gäste: Username: {Deine E-Mail-Adresse}, Passwort: +++"
-
-#: ../../mod/photos.php:77
-msgid "Page owner information could not be retrieved."
-msgstr "Informationen über den Besitzer der Seite konnten nicht gefunden werden."
-
-#: ../../mod/photos.php:97
-msgid "Album not found."
-msgstr "Album nicht gefunden."
-
-#: ../../mod/photos.php:119 ../../mod/photos.php:643
-msgid "Delete Album"
-msgstr "Album löschen"
-
-#: ../../mod/photos.php:159 ../../mod/photos.php:930
-msgid "Delete Photo"
-msgstr "Foto löschen"
+#: ../../mod/item.php:165
+msgid "Unable to locate original post."
+msgstr "Originalbeitrag nicht gefunden."
-#: ../../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 "Öffentlicher Zugang verweigert."
+#: ../../mod/item.php:424
+msgid "Empty post discarded."
+msgstr "Leeren Beitrag verworfen."
-#: ../../mod/photos.php:440
-msgid "No photos selected"
-msgstr "Keine Fotos ausgewählt"
+#: ../../mod/item.php:466
+msgid "Executable content type not permitted to this channel."
+msgstr "Ausführbarer Content-Typ ist für diesen Kanal nicht freigegeben."
-#: ../../mod/photos.php:484
-msgid "Access to this item is restricted."
-msgstr "Der Zugriff auf dieses Foto ist eingeschränkt."
+#: ../../mod/item.php:865
+msgid "System error. Post not saved."
+msgstr "Systemfehler. Beitrag nicht gespeichert."
-#: ../../mod/photos.php:523
+#: ../../mod/item.php:1083
#, php-format
-msgid "%1$.2f MB of %2$.2f MB photo storage used."
-msgstr "%1$.2f MB von %2$.2f MB Foto-Speicher belegt."
+msgid "You have reached your limit of %1$.0f top level posts."
+msgstr "Du hast die maximale Anzahl von %1$.0f Beiträgen erreicht."
-#: ../../mod/photos.php:526
+#: ../../mod/item.php:1089
#, php-format
-msgid "%1$.2f MB photo storage used."
-msgstr "%1$.2f MB Foto-Speicher belegt."
-
-#: ../../mod/photos.php:550
-msgid "Upload Photos"
-msgstr "Fotos hochladen"
-
-#: ../../mod/photos.php:554 ../../mod/photos.php:636 ../../mod/photos.php:915
-msgid "Enter a new album name"
-msgstr "Gib einen Namen für ein neues Album ein"
-
-#: ../../mod/photos.php:555 ../../mod/photos.php:637 ../../mod/photos.php:916
-msgid "or select an existing one (doubleclick)"
-msgstr "oder wähle ein bereits vorhandenes aus (Doppelklick)"
-
-#: ../../mod/photos.php:556
-msgid "Create a status post for this upload"
-msgstr "Einen Statusbeitrag für diesen Upload erzeugen"
-
-#: ../../mod/photos.php:584
-msgid "Album name could not be decoded"
-msgstr "Albumname konnte nicht dekodiert werden"
-
-#: ../../mod/photos.php:625 ../../mod/photos.php:1157
-#: ../../mod/photos.php:1173
-msgid "Contact Photos"
-msgstr "Kontakt-Bilder"
-
-#: ../../mod/photos.php:649
-msgid "Show Newest First"
-msgstr "Neueste zuerst anzeigen"
-
-#: ../../mod/photos.php:651
-msgid "Show Oldest First"
-msgstr "Älteste zuerst anzeigen"
-
-#: ../../mod/photos.php:675 ../../mod/photos.php:1205
-msgid "View Photo"
-msgstr "Foto ansehen"
-
-#: ../../mod/photos.php:704
-msgid "Edit Album"
-msgstr "Album bearbeiten"
-
-#: ../../mod/photos.php:749
-msgid "Permission denied. Access to this item may be restricted."
-msgstr "Berechtigung verweigert. Der Zugriff ist wahrscheinlich eingeschränkt worden."
-
-#: ../../mod/photos.php:751
-msgid "Photo not available"
-msgstr "Foto nicht verfügbar"
-
-#: ../../mod/photos.php:809
-msgid "Use as profile photo"
-msgstr "Als Profilfoto verwenden"
-
-#: ../../mod/photos.php:816
-msgid "Private Photo"
-msgstr "Privates Foto"
-
-#: ../../mod/photos.php:831
-msgid "View Full Size"
-msgstr "In voller Größe anzeigen"
+msgid "You have reached your limit of %1$.0f webpages."
+msgstr "Du hast die maximale Anzahl von %1$.0f Webseiten erreicht."
-#: ../../mod/photos.php:909
-msgid "Edit photo"
-msgstr "Foto bearbeiten"
+#: ../../mod/search.php:13 ../../mod/display.php:9 ../../mod/ratings.php:82
+#: ../../mod/directory.php:22 ../../mod/viewconnections.php:17
+#: ../../mod/photos.php:429
+msgid "Public access denied."
+msgstr "Öffentlicher Zugang verweigert."
-#: ../../mod/photos.php:911
-msgid "Rotate CW (right)"
-msgstr "Drehen im UZS (rechts)"
+#: ../../mod/thing.php:96
+msgid "Thing updated"
+msgstr "Sache aktualisiert"
-#: ../../mod/photos.php:912
-msgid "Rotate CCW (left)"
-msgstr "Drehen gegen UZS (links)"
+#: ../../mod/thing.php:156
+msgid "Object store: failed"
+msgstr "Speichern des Objekts fehlgeschlagen"
-#: ../../mod/photos.php:919
-msgid "Caption"
-msgstr "Bildunterschrift"
+#: ../../mod/thing.php:160
+msgid "Thing added"
+msgstr "Sache hinzugefügt"
-#: ../../mod/photos.php:921
-msgid "Add a Tag"
-msgstr "Schlagwort hinzufügen"
+#: ../../mod/thing.php:180
+#, php-format
+msgid "OBJ: %1$s %2$s %3$s"
+msgstr "OBJ: %1$s %2$s %3$s"
-#: ../../mod/photos.php:925
-msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
-msgstr "Beispiele: @ben, @Karl_Prester, @lieschen@example.com"
+#: ../../mod/thing.php:232
+msgid "Show Thing"
+msgstr "Sache anzeigen"
-#: ../../mod/photos.php:928
-msgid "Flag as adult in album view"
-msgstr "In der Albumansicht als nicht jugendfrei markieren"
+#: ../../mod/thing.php:239
+msgid "item not found."
+msgstr "Eintrag nicht gefunden"
-#: ../../mod/photos.php:1120
-msgid "In This Photo:"
-msgstr "Auf diesem Foto:"
+#: ../../mod/thing.php:270
+msgid "Edit Thing"
+msgstr "Sache bearbeiten"
-#: ../../mod/photos.php:1125
-msgid "Map"
-msgstr "Karte"
+#: ../../mod/thing.php:272 ../../mod/thing.php:319
+msgid "Select a profile"
+msgstr "Wähle ein Profil"
-#: ../../mod/photos.php:1211
-msgid "View Album"
-msgstr "Album ansehen"
+#: ../../mod/thing.php:276 ../../mod/thing.php:322
+msgid "Post an activity"
+msgstr "Aktivitätsnachricht senden"
-#: ../../mod/photos.php:1234
-msgid "Recent Photos"
-msgstr "Neueste Fotos"
+#: ../../mod/thing.php:276 ../../mod/thing.php:322
+msgid "Only sends to viewers of the applicable profile"
+msgstr "Nur an Betrachter des ausgewählten Profils senden"
-#: ../../mod/match.php:22
-msgid "Profile Match"
-msgstr "Profil-Übereinstimmungen"
+#: ../../mod/thing.php:278 ../../mod/thing.php:324
+msgid "Name of thing e.g. something"
+msgstr "Name der Sache, z. B. irgendwas"
-#: ../../mod/match.php:31
-msgid "No keywords to match. Please add keywords to your default profile."
-msgstr "Keine Schlüsselwörter für den Abgleich gefunden. Bitte füge Schlüsselwörter zu Deinem Standardprofil hinzu."
+#: ../../mod/thing.php:280 ../../mod/thing.php:325
+msgid "URL of thing (optional)"
+msgstr "URL der Sache (optional)"
-#: ../../mod/match.php:63
-msgid "is interested in:"
-msgstr "interessiert sich für:"
+#: ../../mod/thing.php:282 ../../mod/thing.php:326
+msgid "URL for photo of thing (optional)"
+msgstr "URL eines Fotos der Sache (optional)"
-#: ../../mod/match.php:70
-msgid "No matches"
-msgstr "Keine Übereinstimmungen"
+#: ../../mod/thing.php:317
+msgid "Add Thing to your Profile"
+msgstr "Die Sache Deinem Profil hinzufügen"
#: ../../mod/chatsvc.php:111
msgid "Away"
@@ -5777,25 +5958,9 @@ msgstr "Abwesend"
msgid "Online"
msgstr "Online"
-#: ../../mod/rbmark.php:88
-msgid "Select a bookmark folder"
-msgstr "Lesezeichenordner wählen"
-
-#: ../../mod/rbmark.php:93
-msgid "Save Bookmark"
-msgstr "Lesezeichen speichern"
-
-#: ../../mod/rbmark.php:94
-msgid "URL of bookmark"
-msgstr "URL des Lesezeichens"
-
-#: ../../mod/rbmark.php:95 ../../mod/appman.php:93
-msgid "Description"
-msgstr "Beschreibung"
-
-#: ../../mod/rbmark.php:99
-msgid "Or enter new bookmark folder name"
-msgstr "Oder gib einen neuen Namen für den Lesezeichenordner ein"
+#: ../../mod/follow.php:25
+msgid "Channel added."
+msgstr "Kanal hinzugefügt."
#: ../../mod/notify.php:53 ../../mod/notifications.php:94
msgid "No more system notifications."
@@ -5815,7 +5980,7 @@ msgstr "RSS"
#: ../../mod/pdledit.php:13
msgid "Layout updated."
-msgstr "Gestaltung aktualisiert."
+msgstr "Layout aktualisiert."
#: ../../mod/pdledit.php:28 ../../mod/pdledit.php:53
msgid "Edit System Page Description"
@@ -5823,15 +5988,67 @@ msgstr "Systemseitenbeschreibung bearbeiten"
#: ../../mod/pdledit.php:48
msgid "Layout not found."
-msgstr "Gestaltung nicht gefunden."
+msgstr "Layout nicht gefunden."
#: ../../mod/pdledit.php:54
msgid "Module Name:"
msgstr "Modulname:"
-#: ../../mod/pdledit.php:55
+#: ../../mod/pdledit.php:55 ../../mod/layouts.php:107
msgid "Layout Help"
-msgstr "Gestaltungshilfe"
+msgstr "Layout-Hilfe"
+
+#: ../../mod/appman.php:28 ../../mod/appman.php:44
+msgid "App installed."
+msgstr "App installiert."
+
+#: ../../mod/appman.php:37
+msgid "Malformed app."
+msgstr "Fehlerhafte App."
+
+#: ../../mod/appman.php:80
+msgid "Embed code"
+msgstr "Code einbetten"
+
+#: ../../mod/appman.php:86
+msgid "Edit App"
+msgstr "App bearbeiten"
+
+#: ../../mod/appman.php:86
+msgid "Create App"
+msgstr "App erstellen"
+
+#: ../../mod/appman.php:91
+msgid "Name of app"
+msgstr "Name der App"
+
+#: ../../mod/appman.php:92
+msgid "Location (URL) of app"
+msgstr "Ort (URL) der App"
+
+#: ../../mod/appman.php:93 ../../mod/rbmark.php:95
+msgid "Description"
+msgstr "Beschreibung"
+
+#: ../../mod/appman.php:94
+msgid "Photo icon URL"
+msgstr "URL zum Icon"
+
+#: ../../mod/appman.php:94
+msgid "80 x 80 pixels - optional"
+msgstr "80 x 80 Pixel – optional"
+
+#: ../../mod/appman.php:95
+msgid "Version ID"
+msgstr "Versions-ID"
+
+#: ../../mod/appman.php:96
+msgid "Price of app"
+msgstr "Preis der App"
+
+#: ../../mod/appman.php:97
+msgid "Location (URL) to purchase app"
+msgstr "Ort (URL), um die App zu kaufen"
#: ../../mod/filer.php:49
msgid "- select -"
@@ -5927,43 +6144,17 @@ msgstr "Dieser Red-Server ist mein primärer Server."
msgid "Import existing posts if possible"
msgstr "Existierende Beiträge importieren, falls möglich"
-#: ../../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 "Element nicht gefunden"
-
-#: ../../mod/editlayout.php:106
+#: ../../mod/editlayout.php:108
msgid "Edit Layout"
-msgstr "Gestaltung bearbeiten"
+msgstr "Layout bearbeiten"
#: ../../mod/editlayout.php:117
msgid "Delete layout?"
-msgstr "Gestaltung löschen?"
-
-#: ../../mod/editlayout.php:148 ../../mod/editwebpage.php:187
-#: ../../mod/editpost.php:122 ../../mod/editblock.php:150
-msgid "Insert YouTube video"
-msgstr "YouTube-Video einfügen"
-
-#: ../../mod/editlayout.php:149 ../../mod/editwebpage.php:188
-#: ../../mod/editpost.php:123 ../../mod/editblock.php:151
-msgid "Insert Vorbis [.ogg] video"
-msgstr "Vorbis [.ogg]-Video einfügen"
-
-#: ../../mod/editlayout.php:150 ../../mod/editwebpage.php:189
-#: ../../mod/editpost.php:124 ../../mod/editblock.php:152
-msgid "Insert Vorbis [.ogg] audio"
-msgstr "Vorbis [.ogg]-Audio einfügen"
-
-#: ../../mod/editlayout.php:164 ../../mod/layouts.php:124
-msgid "Layout Description (Optional)"
-msgstr "Gestaltungsbeschreibung (Optional)"
+msgstr "Layout löschen?"
-#: ../../mod/editlayout.php:166 ../../mod/layouts.php:121
-#: ../../mod/layouts.php:178
-msgid "Layout Name"
-msgstr "Gestaltungsname"
+#: ../../mod/editlayout.php:178
+msgid "Delete Layout"
+msgstr "Layout löschen"
#: ../../mod/chat.php:19 ../../mod/channel.php:25
msgid "You must be logged in to see this page."
@@ -6006,21 +6197,21 @@ msgstr "Name des Chatraums"
msgid "%1$s's Chatrooms"
msgstr "%1$ss Chaträume"
-#: ../../mod/editwebpage.php:152
+#: ../../mod/editwebpage.php:140
+msgid "Edit Webpage"
+msgstr "Webseite bearbeiten"
+
+#: ../../mod/editwebpage.php:150
msgid "Delete webpage?"
msgstr "Webseite löschen?"
-#: ../../mod/editwebpage.php:173
-msgid "Page link title"
-msgstr "Seitentitel-Link"
+#: ../../mod/editwebpage.php:215
+msgid "Delete Webpage"
+msgstr "Webseite löschen"
-#: ../../mod/editwebpage.php:224
-msgid "Edit Webpage"
-msgstr "Webseite bearbeiten"
-
-#: ../../mod/dirsearch.php:29
-msgid "This directory server requires an access token"
-msgstr "Dieser Verzeichnis-Server benötigt ein Zugangstoken"
+#: ../../mod/dirsearch.php:20 ../../mod/regdir.php:22
+msgid "This site is not a directory server"
+msgstr "Diese Website ist kein Verzeichnis-Server"
#: ../../mod/lostpass.php:15
msgid "No valid account found."
@@ -6046,7 +6237,7 @@ msgid ""
"Password reset failed."
msgstr "Die Anfrage konnte nicht verifiziert werden. (Vielleicht hast Du schon einmal auf den Link in der E-Mail geklickt?) Passwort-Rücksetzung fehlgeschlagen."
-#: ../../mod/lostpass.php:85 ../../boot.php:1548
+#: ../../mod/lostpass.php:85 ../../boot.php:1560
msgid "Password Reset"
msgstr "Zurücksetzen des Kennworts"
@@ -6104,22 +6295,6 @@ msgstr "Webseite:"
msgid "Remote Channel [%s] (not yet known on this site)"
msgstr "Kanal [%s] (auf diesem Server noch unbekannt)"
-#: ../../mod/rate.php:161 ../../mod/connedit.php:663
-msgid "Rating (this information is public)"
-msgstr "Bewertung (öffentlich sichtbar)"
-
-#: ../../mod/rate.php:162 ../../mod/connedit.php:664
-msgid "Optionally explain your rating (this information is public)"
-msgstr "Optional kannst du deine Bewertung erklären (öffentlich sichtbar)"
-
-#: ../../mod/editpost.php:31
-msgid "Item is not editable"
-msgstr "Element kann nicht bearbeitet werden."
-
-#: ../../mod/editpost.php:53
-msgid "Delete item?"
-msgstr "Eintrag löschen?"
-
#: ../../mod/invite.php:25
msgid "Total invitation limit exceeded."
msgstr "Einladungslimit überschritten."
@@ -6280,145 +6455,145 @@ msgstr "Quelle gelöscht"
msgid "Unable to remove source."
msgstr "Konnte die Quelle nicht löschen."
-#: ../../mod/menu.php:44
+#: ../../mod/menu.php:31
+msgid "Menu updated."
+msgstr "Menü aktualisiert."
+
+#: ../../mod/menu.php:35
msgid "Unable to update menu."
msgstr "Kann Menü nicht aktualisieren."
-#: ../../mod/menu.php:53
+#: ../../mod/menu.php:40
+msgid "Menu created."
+msgstr "Menü erstellt."
+
+#: ../../mod/menu.php:44
msgid "Unable to create menu."
msgstr "Kann Menü nicht erstellen."
-#: ../../mod/menu.php:86 ../../mod/menu.php:98
-msgid "Menu Name"
-msgstr "Name des Menüs"
+#: ../../mod/menu.php:76
+msgid "Manage Menus"
+msgstr "Menüs verwalten"
-#: ../../mod/menu.php:86
-msgid "Unique name (not visible on webpage) - required"
-msgstr "Eindeutiger Name (nicht sichtbar auf der Webseite) – erforderlich"
-
-#: ../../mod/menu.php:87 ../../mod/menu.php:99
-msgid "Menu Title"
-msgstr "Menütitel"
-
-#: ../../mod/menu.php:87
-msgid "Visible on webpage - leave empty for no title"
-msgstr "Sichtbar auf der Webseite – für keinen Titel leer lassen"
-
-#: ../../mod/menu.php:88
-msgid "Allow Bookmarks"
-msgstr "Lesezeichen erlauben"
-
-#: ../../mod/menu.php:88 ../../mod/menu.php:140
-msgid "Menu may be used to store saved bookmarks"
-msgstr "Im Menü können gespeicherte Lesezeichen abgelegt werden"
-
-#: ../../mod/menu.php:89
-msgid "Submit and proceed"
-msgstr "Absenden und fortfahren"
-
-#: ../../mod/menu.php:101
+#: ../../mod/menu.php:79
msgid "Drop"
msgstr "Löschen"
-#: ../../mod/menu.php:103
+#: ../../mod/menu.php:81
msgid "Bookmarks allowed"
msgstr "Lesezeichen erlaubt"
-#: ../../mod/menu.php:105
+#: ../../mod/menu.php:82
+msgid "Create a new menu"
+msgstr "Neues Menü erstellen"
+
+#: ../../mod/menu.php:83
msgid "Delete this menu"
msgstr "Lösche dieses Menü"
-#: ../../mod/menu.php:106 ../../mod/menu.php:137
+#: ../../mod/menu.php:84 ../../mod/menu.php:125
msgid "Edit menu contents"
msgstr "Bearbeite Menü Inhalte"
-#: ../../mod/menu.php:107
+#: ../../mod/menu.php:85
msgid "Edit this menu"
msgstr "Dieses Menü bearbeiten"
-#: ../../mod/menu.php:121
-msgid "Menu could not be deleted."
-msgstr "Menü konnte nicht gelöscht werden."
+#: ../../mod/menu.php:96
+msgid "New Menu"
+msgstr "Neues Menü"
-#: ../../mod/menu.php:129 ../../mod/mitem.php:24
-msgid "Menu not found."
-msgstr "Menü nicht gefunden"
-
-#: ../../mod/menu.php:134
-msgid "Edit Menu"
-msgstr "Menü bearbeiten"
-
-#: ../../mod/menu.php:136
-msgid "Add or remove entries to this menu"
-msgstr "Einträge zu diesem Menü hinzufügen oder entfernen"
-
-#: ../../mod/menu.php:138
+#: ../../mod/menu.php:97 ../../mod/menu.php:126
msgid "Menu name"
msgstr "Menü Name"
-#: ../../mod/menu.php:138
+#: ../../mod/menu.php:97 ../../mod/menu.php:126
msgid "Must be unique, only seen by you"
msgstr "Muss eindeutig sein, ist aber nur für Dich sichtbar"
-#: ../../mod/menu.php:139
+#: ../../mod/menu.php:98 ../../mod/menu.php:127
msgid "Menu title"
msgstr "Menü Titel"
-#: ../../mod/menu.php:139
+#: ../../mod/menu.php:98 ../../mod/menu.php:127
msgid "Menu title as seen by others"
msgstr "Menü Titel wie er von anderen gesehen wird"
-#: ../../mod/menu.php:140
+#: ../../mod/menu.php:99 ../../mod/menu.php:128
msgid "Allow bookmarks"
msgstr "Erlaube Lesezeichen"
-#: ../../mod/menu.php:142
+#: ../../mod/menu.php:99 ../../mod/menu.php:128
+msgid "Menu may be used to store saved bookmarks"
+msgstr "Im Menü können gespeicherte Lesezeichen abgelegt werden"
+
+#: ../../mod/menu.php:108 ../../mod/mitem.php:24
+msgid "Menu not found."
+msgstr "Menü nicht gefunden"
+
+#: ../../mod/menu.php:114
+msgid "Menu deleted."
+msgstr "Menü gelöscht."
+
+#: ../../mod/menu.php:116
+msgid "Menu could not be deleted."
+msgstr "Menü konnte nicht gelöscht werden."
+
+#: ../../mod/menu.php:122
+msgid "Edit Menu"
+msgstr "Menü bearbeiten"
+
+#: ../../mod/menu.php:124
+msgid "Add or remove entries to this menu"
+msgstr "Einträge zu diesem Menü hinzufügen oder entfernen"
+
+#: ../../mod/menu.php:130 ../../mod/mitem.php:213
msgid "Modify"
msgstr "Ändern"
-#: ../../mod/filestorage.php:82
+#: ../../mod/filestorage.php:81
msgid "Permission Denied."
msgstr "Zugriff verweigert."
-#: ../../mod/filestorage.php:98
+#: ../../mod/filestorage.php:97
msgid "File not found."
msgstr "Datei nicht gefunden."
-#: ../../mod/filestorage.php:141
+#: ../../mod/filestorage.php:140
msgid "Edit file permissions"
msgstr "Dateiberechtigungen bearbeiten"
-#: ../../mod/filestorage.php:150
+#: ../../mod/filestorage.php:149
msgid "Set/edit permissions"
msgstr "Berechtigungen setzen/ändern"
-#: ../../mod/filestorage.php:151
+#: ../../mod/filestorage.php:150
msgid "Include all files and sub folders"
msgstr "Alle Dateien und Unterverzeichnisse einbinden"
-#: ../../mod/filestorage.php:152
+#: ../../mod/filestorage.php:151
msgid "Return to file list"
msgstr "Zurück zur Dateiliste"
-#: ../../mod/filestorage.php:154
+#: ../../mod/filestorage.php:153
msgid "Copy/paste this code to attach file to a post"
msgstr "Diesen Code kopieren und einfügen, um die Datei an einen Beitrag anzuhängen"
-#: ../../mod/filestorage.php:155
+#: ../../mod/filestorage.php:154
msgid "Copy/paste this URL to link file from a web page"
msgstr "Diese URL verwenden, um von einer Webseite aus auf die Datei zu verlinken"
-#: ../../mod/filestorage.php:157
-msgid "Share this file"
-msgstr "Diese Datei freigeben"
+#: ../../mod/filestorage.php:156
+msgid "Attach this file to a new post"
+msgstr "Diese Datei an einen neuen Beitrag anhängen"
-#: ../../mod/filestorage.php:158
+#: ../../mod/filestorage.php:157
msgid "Show URL to this file"
msgstr "URL zu dieser Datei anzeigen"
-#: ../../mod/filestorage.php:159
-msgid "Notify your contacts about this file"
-msgstr "Meine Kontakte über diese Datei benachrichtigen"
+#: ../../mod/filestorage.php:158
+msgid "Do not show in shared with me folder of your connections"
+msgstr "Nicht im Ordner „Dateien, die mit mir geteilt wurden“ meiner Verbindungen anzeigen"
#: ../../mod/fsuggest.php:20 ../../mod/fsuggest.php:92
msgid "Contact not found."
@@ -6437,7 +6612,7 @@ msgstr "Kontakte vorschlagen"
msgid "Suggest a friend for %s"
msgstr "Schlage %s einen Kontakt vor"
-#: ../../mod/magic.php:69
+#: ../../mod/magic.php:70
msgid "Hub not found."
msgstr "Server nicht gefunden."
@@ -6477,22 +6652,13 @@ msgstr "Klicke auf einen Kontakt, um ihn hinzuzufügen oder zu entfernen."
msgid "Visible To"
msgstr "Sichtbar für"
-#: ../../mod/impel.php:33
-msgid "webpage"
-msgstr "Webseite"
-
-#: ../../mod/impel.php:38
-msgid "block"
-msgstr "Block"
-
-#: ../../mod/impel.php:43
-msgid "layout"
-msgstr "Gestaltung"
+#: ../../mod/lockview.php:31
+msgid "Remote privacy information not available."
+msgstr "Privatsphäre-Einstellungen anderer Nutzer sind nicht verfügbar."
-#: ../../mod/impel.php:117
-#, php-format
-msgid "%s element installed"
-msgstr "Element für %s installiert"
+#: ../../mod/lockview.php:52
+msgid "Visible to:"
+msgstr "Sichtbar für:"
#: ../../mod/profiles.php:18 ../../mod/profiles.php:174
#: ../../mod/profiles.php:231 ../../mod/profiles.php:600
@@ -6521,7 +6687,7 @@ msgstr "Dieses Profil kann nicht exportiert werden."
#: ../../mod/profiles.php:241
msgid "Profile Name is required."
-msgstr "Profilname ist erforderlich."
+msgstr "Profil-Name erforderlich."
#: ../../mod/profiles.php:404
msgid "Marital Status"
@@ -6551,7 +6717,7 @@ msgstr "Religion"
msgid "Political Views"
msgstr "Politische Ansichten"
-#: ../../mod/profiles.php:431 ../../mod/id.php:33
+#: ../../mod/profiles.php:431
msgid "Gender"
msgstr "Geschlecht"
@@ -6567,7 +6733,7 @@ msgstr "Webseite"
msgid "Interests"
msgstr "Hobbys/Interessen"
-#: ../../mod/profiles.php:447 ../../mod/admin.php:953
+#: ../../mod/profiles.php:447 ../../mod/admin.php:871
msgid "Address"
msgstr "Adresse"
@@ -6735,7 +6901,7 @@ msgstr "Schule/Ausbildung"
msgid "This is your default profile."
msgstr "Das ist Dein Standardprofil."
-#: ../../mod/profiles.php:728 ../../mod/directory.php:218
+#: ../../mod/profiles.php:728 ../../mod/directory.php:188
msgid "Age: "
msgstr "Alter:"
@@ -6771,183 +6937,108 @@ msgstr "Webseite: "
msgid "Description: "
msgstr "Beschreibung: "
-#: ../../mod/viewsrc.php:38
-msgid "Source of Item"
-msgstr "Quelle des Elements"
+#: ../../mod/delegate.php:95
+msgid "No potential page delegates located."
+msgstr "Keine potentiellen Bevollmächtigten für die Seite gefunden."
-#: ../../mod/mitem.php:51
-msgid "Unable to create element."
-msgstr "Element konnte nicht erstellt werden."
+#: ../../mod/delegate.php:121
+msgid "Delegate Page Management"
+msgstr "Delegiere das Management für diese Seite"
-#: ../../mod/mitem.php:74
-msgid "Unable to update menu element."
-msgstr "Kann Menü-Element nicht aktualisieren."
-
-#: ../../mod/mitem.php:89
-msgid "Unable to add menu element."
-msgstr "Kann Menü-Bestandteil nicht hinzufügen."
-
-#: ../../mod/mitem.php:151 ../../mod/mitem.php:220
-msgid "Menu Item Permissions"
-msgstr "Zugriffsrechte des Menü-Elements"
-
-#: ../../mod/mitem.php:154 ../../mod/mitem.php:168
-msgid "Link Name"
-msgstr "Name des Links"
-
-#: ../../mod/mitem.php:155 ../../mod/mitem.php:169
-msgid "Link Target"
-msgstr "Ziel des Links"
-
-#: ../../mod/mitem.php:156 ../../mod/mitem.php:226
-msgid "Use RedMatrix magic-auth if available"
-msgstr "Verwende die automatische RedMatrix-Authentifizierung (magic-auth), wenn verfügbar"
-
-#: ../../mod/mitem.php:157 ../../mod/mitem.php:227
-msgid "Open link in new window"
-msgstr "Öffne Link in neuem Fenster"
-
-#: ../../mod/mitem.php:158 ../../mod/mitem.php:228
-msgid "Order in list"
-msgstr "Reihenfolge in der Liste"
-
-#: ../../mod/mitem.php:158 ../../mod/mitem.php:228
-msgid "Higher numbers will sink to bottom of listing"
-msgstr "Größere Nummern werden weiter unten in der Auflistung einsortiert"
-
-#: ../../mod/mitem.php:159
-msgid "Submit and finish"
-msgstr "Absenden und fertigstellen"
-
-#: ../../mod/mitem.php:160
-msgid "Submit and continue"
-msgstr "Absenden und fortfahren"
-
-#: ../../mod/mitem.php:166
-msgid "Menu:"
-msgstr "Menü:"
-
-#: ../../mod/mitem.php:172
-msgid "Edit menu"
-msgstr "Menü bearbeiten"
-
-#: ../../mod/mitem.php:175
-msgid "Edit element"
-msgstr "Bestandteil bearbeiten"
-
-#: ../../mod/mitem.php:176
-msgid "Drop element"
-msgstr "Bestandteil löschen"
-
-#: ../../mod/mitem.php:177
-msgid "New element"
-msgstr "Neues Bestandteil"
-
-#: ../../mod/mitem.php:178
-msgid "Edit this menu container"
-msgstr "Diesen Menü-Container bearbeiten"
-
-#: ../../mod/mitem.php:179
-msgid "Add menu element"
-msgstr "Menüelement hinzufügen"
-
-#: ../../mod/mitem.php:180
-msgid "Delete this menu item"
-msgstr "Lösche dieses Menü-Bestandteil"
-
-#: ../../mod/mitem.php:181
-msgid "Edit this menu item"
-msgstr "Bearbeite dieses Menü-Bestandteil"
+#: ../../mod/delegate.php:123
+msgid ""
+"Delegates are able to manage all aspects of this account/page except for "
+"basic account settings. Please do not delegate your personal account to "
+"anybody that you do not trust completely."
+msgstr "Bevollmächtigte sind in der Lage, alle Aspekte dieses Kontos/dieser Seite zu verwalten, abgesehen von den Grundeinstellungen des Kontos. Gib niemandem eine Bevollmächtigung für Deinen privaten Account, dem Du nicht absolut vertraust!"
-#: ../../mod/mitem.php:198
-msgid "Menu item not found."
-msgstr "Menü-Bestandteil nicht gefunden."
+#: ../../mod/delegate.php:124
+msgid "Existing Page Managers"
+msgstr "Vorhandene Seitenmanager"
-#: ../../mod/mitem.php:209
-msgid "Menu item deleted."
-msgstr "Menü-Bestandteil gelöscht."
+#: ../../mod/delegate.php:126
+msgid "Existing Page Delegates"
+msgstr "Vorhandene Bevollmächtigte für die Seite"
-#: ../../mod/mitem.php:211
-msgid "Menu item could not be deleted."
-msgstr "Menü-Bestandteil kann nicht gelöscht werden."
+#: ../../mod/delegate.php:128
+msgid "Potential Delegates"
+msgstr "Potentielle Bevollmächtigte"
-#: ../../mod/mitem.php:218
-msgid "Edit Menu Element"
-msgstr "Bearbeite Menü-Bestandteil"
+#: ../../mod/delegate.php:131
+msgid "Add"
+msgstr "Hinzufügen"
-#: ../../mod/mitem.php:224
-msgid "Link text"
-msgstr "Link Text"
-
-#: ../../mod/mitem.php:225
-msgid "URL of link"
-msgstr "URL des Links"
-
-#: ../../mod/openid.php:26
-msgid "OpenID protocol error. No ID returned."
-msgstr "OpenID Protokollfehler. Keine ID zurückgegeben."
-
-#: ../../mod/openid.php:72 ../../mod/openid.php:180 ../../mod/post.php:286
-#, php-format
-msgid "Welcome %s. Remote authentication successful."
-msgstr "Willkommen %s. Entfernte Authentifizierung erfolgreich."
+#: ../../mod/delegate.php:132
+msgid "No entries."
+msgstr "Keine Einträge."
-#: ../../mod/directory.php:224
+#: ../../mod/directory.php:194
#, php-format
msgid "%d rating"
msgid_plural "%d ratings"
msgstr[0] "%d Bewertung"
msgstr[1] "%d Bewertungen"
-#: ../../mod/directory.php:236
+#: ../../mod/directory.php:206
msgid "Gender: "
msgstr "Geschlecht:"
-#: ../../mod/directory.php:238
+#: ../../mod/directory.php:208
msgid "Status: "
msgstr "Status:"
-#: ../../mod/directory.php:240
+#: ../../mod/directory.php:210
msgid "Homepage: "
msgstr "Webseite:"
-#: ../../mod/directory.php:243
+#: ../../mod/directory.php:213
msgid "Hometown: "
msgstr "Wohnort:"
-#: ../../mod/directory.php:245
+#: ../../mod/directory.php:215
msgid "About: "
msgstr "Über:"
-#: ../../mod/directory.php:303
+#: ../../mod/directory.php:273
msgid "Public Forum:"
msgstr "Öffentliches Forum:"
-#: ../../mod/directory.php:306
+#: ../../mod/directory.php:276
msgid "Keywords: "
msgstr "Schlüsselwörter:"
-#: ../../mod/directory.php:311
-#, php-format
-msgid "Common connections: %s"
-msgstr "Gemeinsame Verbindungen: %s"
-
-#: ../../mod/directory.php:363
+#: ../../mod/directory.php:331
msgid "Finding:"
msgstr "Ergebnisse:"
-#: ../../mod/directory.php:368
+#: ../../mod/directory.php:336
msgid "next page"
msgstr "nächste Seite"
-#: ../../mod/directory.php:368
+#: ../../mod/directory.php:336
msgid "previous page"
msgstr "vorherige Seite"
-#: ../../mod/directory.php:385
+#: ../../mod/directory.php:353
msgid "No entries (some entries may be hidden)."
msgstr "Keine Einträge gefunden (einige könnten versteckt sein)."
+#: ../../mod/rbmark.php:88
+msgid "Select a bookmark folder"
+msgstr "Lesezeichenordner wählen"
+
+#: ../../mod/rbmark.php:93
+msgid "Save Bookmark"
+msgstr "Lesezeichen speichern"
+
+#: ../../mod/rbmark.php:94
+msgid "URL of bookmark"
+msgstr "URL des Lesezeichens"
+
+#: ../../mod/rbmark.php:99
+msgid "Or enter new bookmark folder name"
+msgstr "Oder gib einen neuen Namen für den Lesezeichenordner ein"
+
#: ../../mod/uexport.php:33 ../../mod/uexport.php:34
msgid "Export Channel"
msgstr "Kanal exportieren"
@@ -6973,11 +7064,11 @@ msgid ""
"minutes for this download to begin."
msgstr "Exportiert Deine Kanal-Informationen sowie alle zugehörigen Inhalte in eine JSON-Sicherungsdatei. Die sichert alle Verbindungen, Berechtigungen, Profildaten und Inhalte Deines Kanals, ist aber nicht unbedingt für den Import eines Kanals auf einem anderen Hub geeignet, da die Datei SEHR groß werden kann. Bitte habe ein wenig Geduld – es kann mehrere Minuten dauern, bis der Download startet."
-#: ../../mod/viewconnections.php:62
+#: ../../mod/viewconnections.php:58
msgid "No connections."
msgstr "Keine Verbindungen."
-#: ../../mod/viewconnections.php:75
+#: ../../mod/viewconnections.php:71
#, php-format
msgid "Visit %s's profile [%s]"
msgstr "%ss Profil [%s] besuchen"
@@ -6990,736 +7081,654 @@ msgstr "Ungültige Signatur des Ziels"
msgid "Theme settings updated."
msgstr "Theme-Einstellungen aktualisiert."
-#: ../../mod/admin.php:93 ../../mod/admin.php:445
+#: ../../mod/admin.php:97 ../../mod/admin.php:415
msgid "Site"
msgstr "Seite"
-#: ../../mod/admin.php:94
+#: ../../mod/admin.php:98
msgid "Accounts"
msgstr "Konten"
-#: ../../mod/admin.php:95 ../../mod/admin.php:945
+#: ../../mod/admin.php:99 ../../mod/admin.php:863
msgid "Channels"
msgstr "Kanäle"
-#: ../../mod/admin.php:96 ../../mod/admin.php:1036 ../../mod/admin.php:1076
+#: ../../mod/admin.php:100 ../../mod/admin.php:954 ../../mod/admin.php:996
msgid "Plugins"
msgstr "Plug-Ins"
-#: ../../mod/admin.php:97 ../../mod/admin.php:1236 ../../mod/admin.php:1270
+#: ../../mod/admin.php:101 ../../mod/admin.php:1159 ../../mod/admin.php:1195
msgid "Themes"
msgstr "Themes"
-#: ../../mod/admin.php:98
-msgid "Inspect queue"
-msgstr "Warteschlange kontrollieren"
+#: ../../mod/admin.php:102 ../../mod/admin.php:517
+msgid "Server"
+msgstr "Server"
-#: ../../mod/admin.php:100
+#: ../../mod/admin.php:103
msgid "Profile Config"
msgstr "Profilkonfiguration"
-#: ../../mod/admin.php:101
+#: ../../mod/admin.php:104
msgid "DB updates"
msgstr "DB-Aktualisierungen"
-#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1355
+#: ../../mod/admin.php:118 ../../mod/admin.php:125 ../../mod/admin.php:1282
msgid "Logs"
msgstr "Protokolle"
-#: ../../mod/admin.php:121
+#: ../../mod/admin.php:124
msgid "Plugin Features"
msgstr "Plug-In Funktionen"
-#: ../../mod/admin.php:123
+#: ../../mod/admin.php:126
msgid "User registrations waiting for confirmation"
msgstr "Nutzer-Anmeldungen, die auf Bestätigung warten"
-#: ../../mod/admin.php:200
-msgid "# Accounts"
-msgstr "Anzahl der Konten"
-
-#: ../../mod/admin.php:201
-msgid "# blocked accounts"
-msgstr "Anzahl der blockierten Konten"
-
-#: ../../mod/admin.php:202
-msgid "# expired accounts"
-msgstr "Anzahl der abgelaufenen Konten"
-
-#: ../../mod/admin.php:203
-msgid "# expiring accounts"
-msgstr "Anzahl der ablaufenden Konten"
-
-#: ../../mod/admin.php:216
-msgid "# Channels"
-msgstr "Anzahl der Kanäle"
-
-#: ../../mod/admin.php:217
-msgid "# primary"
-msgstr "Anzahl der primären Kanäle"
-
-#: ../../mod/admin.php:218
-msgid "# clones"
-msgstr "Anzahl der Klone"
-
-#: ../../mod/admin.php:224
+#: ../../mod/admin.php:206
msgid "Message queues"
msgstr "Nachrichten-Warteschlangen"
-#: ../../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:211 ../../mod/admin.php:414 ../../mod/admin.php:516
+#: ../../mod/admin.php:726 ../../mod/admin.php:862 ../../mod/admin.php:953
+#: ../../mod/admin.php:995 ../../mod/admin.php:1158 ../../mod/admin.php:1194
+#: ../../mod/admin.php:1281
msgid "Administration"
msgstr "Administration"
-#: ../../mod/admin.php:241
+#: ../../mod/admin.php:212
msgid "Summary"
msgstr "Zusammenfassung"
-#: ../../mod/admin.php:244
-msgid "Registered accounts"
-msgstr "Registrierte Konten"
+#: ../../mod/admin.php:214
+msgid "Registered users"
+msgstr "Registrierte Benutzer"
-#: ../../mod/admin.php:245 ../../mod/admin.php:543
+#: ../../mod/admin.php:216 ../../mod/admin.php:520
msgid "Pending registrations"
msgstr "Ausstehende Registrierungen"
-#: ../../mod/admin.php:246
-msgid "Registered channels"
-msgstr "Registrierte Kanäle"
+#: ../../mod/admin.php:217
+msgid "Version"
+msgstr "Version"
-#: ../../mod/admin.php:247 ../../mod/admin.php:544
+#: ../../mod/admin.php:219 ../../mod/admin.php:521
msgid "Active plugins"
msgstr "Aktive Plug-Ins"
-#: ../../mod/admin.php:248
-msgid "Version"
-msgstr "Version"
-
-#: ../../mod/admin.php:359
+#: ../../mod/admin.php:330
msgid "Site settings updated."
-msgstr "Seiteneinstellungen aktualisiert."
+msgstr "Site-Einstellungen aktualisiert."
-#: ../../mod/admin.php:398
+#: ../../mod/admin.php:369
msgid "experimental"
msgstr "experimentell"
-#: ../../mod/admin.php:400
+#: ../../mod/admin.php:371
msgid "unsupported"
msgstr "nicht unterstützt"
-#: ../../mod/admin.php:425
+#: ../../mod/admin.php:395
msgid "Yes - with approval"
msgstr "Ja - mit Zustimmung"
-#: ../../mod/admin.php:431
+#: ../../mod/admin.php:401
msgid "My site is not a public server"
msgstr "Mein Server ist kein öffentlicher Server"
-#: ../../mod/admin.php:432
+#: ../../mod/admin.php:402
msgid "My site has paid access only"
msgstr "Mein Server erlaubt nur bezahlten Zugang"
-#: ../../mod/admin.php:433
+#: ../../mod/admin.php:403
msgid "My site has free access only"
msgstr "Mein Server erlaubt ausschließlich freien Zugang"
-#: ../../mod/admin.php:434
+#: ../../mod/admin.php:404
msgid "My site offers free accounts with optional paid upgrades"
msgstr "Mein Server bietet kostenlose Konten mit der Möglichkeit zu bezahlten Upgrades"
-#: ../../mod/admin.php:447 ../../mod/register.php:207
+#: ../../mod/admin.php:417 ../../mod/register.php:207
msgid "Registration"
msgstr "Registrierung"
-#: ../../mod/admin.php:448
+#: ../../mod/admin.php:418
msgid "File upload"
msgstr "Dateiupload"
-#: ../../mod/admin.php:449
+#: ../../mod/admin.php:419
msgid "Policies"
msgstr "Richtlinien"
-#: ../../mod/admin.php:454
+#: ../../mod/admin.php:424
msgid "Site name"
msgstr "Seitenname"
-#: ../../mod/admin.php:455
+#: ../../mod/admin.php:425
msgid "Banner/Logo"
msgstr "Banner/Logo"
-#: ../../mod/admin.php:456
+#: ../../mod/admin.php:426
msgid "Administrator Information"
msgstr "Administrator-Informationen"
-#: ../../mod/admin.php:456
+#: ../../mod/admin.php:426
msgid ""
"Contact information for site administrators. Displayed on siteinfo page. "
"BBCode can be used here"
msgstr "Kontaktinformationen für Administratoren des Servers. Wird auf der siteinfo-Seite angezeigt. BBCode kann verwendet werden."
-#: ../../mod/admin.php:457
+#: ../../mod/admin.php:427
msgid "System language"
msgstr "System-Sprache"
-#: ../../mod/admin.php:458
+#: ../../mod/admin.php:428
msgid "System theme"
msgstr "System-Theme"
-#: ../../mod/admin.php:458
+#: ../../mod/admin.php:428
msgid ""
"Default system theme - may be over-ridden by user profiles - <a href='#' "
"id='cnftheme'>change theme settings</a>"
msgstr "Standard-System-Theme – kann durch Nutzerprofile überschieben werden – <a href='#' id='cnftheme'>Theme-Einstellungen ändern</a>"
-#: ../../mod/admin.php:459
+#: ../../mod/admin.php:429
msgid "Mobile system theme"
msgstr "Mobile System-Theme:"
-#: ../../mod/admin.php:459
+#: ../../mod/admin.php:429
msgid "Theme for mobile devices"
msgstr "Theme für mobile Geräte"
-#: ../../mod/admin.php:461
+#: ../../mod/admin.php:431
msgid "Enable Diaspora Protocol"
msgstr "Diaspora-Protokoll aktivieren"
-#: ../../mod/admin.php:461
+#: ../../mod/admin.php:431
msgid "Communicate with Diaspora and Friendica - experimental"
msgstr "Kommunikation mit Diaspora und Friendica – experimentell"
-#: ../../mod/admin.php:462
+#: ../../mod/admin.php:432
msgid "Allow Feeds as Connections"
msgstr "Feeds als Verbindungen erlauben"
-#: ../../mod/admin.php:462
+#: ../../mod/admin.php:432
msgid "(Heavy system resource usage)"
msgstr "(führt zu hoher Systemlast)"
-#: ../../mod/admin.php:463
+#: ../../mod/admin.php:433
msgid "Maximum image size"
msgstr "Maximale Bildgröße"
-#: ../../mod/admin.php:463
+#: ../../mod/admin.php:433
msgid ""
"Maximum size in bytes of uploaded images. Default is 0, which means no "
"limits."
msgstr "Maximale Größe hochgeladener Bilder in Bytes. Standard ist 0 (keine Einschränkung)."
-#: ../../mod/admin.php:464
+#: ../../mod/admin.php:434
msgid "Does this site allow new member registration?"
msgstr "Erlaubt dieser Server die Registrierung neuer Nutzer?"
-#: ../../mod/admin.php:465
+#: ../../mod/admin.php:435
msgid "Which best describes the types of account offered by this hub?"
msgstr "Was ist die passendste Beschreibung der Konten auf diesem Hub?"
-#: ../../mod/admin.php:466
+#: ../../mod/admin.php:436
msgid "Register text"
msgstr "Registrierungstext"
-#: ../../mod/admin.php:466
+#: ../../mod/admin.php:436
msgid "Will be displayed prominently on the registration page."
msgstr "Wird gut sichtbar auf der Registrierungs-Seite angezeigt."
-#: ../../mod/admin.php:467
+#: ../../mod/admin.php:437
msgid "Accounts abandoned after x days"
msgstr "Konten gelten nach X Tagen als unbenutzt"
-#: ../../mod/admin.php:467
+#: ../../mod/admin.php:437
msgid ""
"Will not waste system resources polling external sites for abandonded "
"accounts. Enter 0 for no time limit."
msgstr "Verschwende keine Systemressourcen auf das Pollen von externen Seiten, wenn das Konto nicht mehr benutzt wird. Trage hier 0 für kein zeitliches Limit."
-#: ../../mod/admin.php:468
+#: ../../mod/admin.php:438
msgid "Allowed friend domains"
msgstr "Erlaubte Domains für Kontakte"
-#: ../../mod/admin.php:468
+#: ../../mod/admin.php:438
msgid ""
"Comma separated list of domains which are allowed to establish friendships "
"with this site. Wildcards are accepted. Empty to allow any domains"
msgstr "Liste der Domains, die für Freundschaften erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben."
-#: ../../mod/admin.php:469
+#: ../../mod/admin.php:439
msgid "Allowed email domains"
msgstr "Erlaubte Domains für E-Mails"
-#: ../../mod/admin.php:469
+#: ../../mod/admin.php:439
msgid ""
"Comma separated list of domains which are allowed in email addresses for "
"registrations to this site. Wildcards are accepted. Empty to allow any "
"domains"
msgstr "Liste der Domains, die für E-Mail-Adressen bei der Registrierung erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben."
-#: ../../mod/admin.php:470
+#: ../../mod/admin.php:440
msgid "Not allowed email domains"
msgstr "Nicht erlaubte Domains für E-Mails"
-#: ../../mod/admin.php:470
+#: ../../mod/admin.php:440
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 "Domains in E-Mail-Adressen, die keine Erlaubnis erhalten, sich auf Deinem Hub zu registrieren. Mehrere Domains können durch Kommas getrennt werden. Platzhalter (*/?) sind möglich. Keine Eingabe bedeutet keine Einschränkung, unabhängig davon, ob unter erlaubte Domains etwas eingegeben wurde."
-#: ../../mod/admin.php:471
+#: ../../mod/admin.php:441
msgid "Block public"
msgstr "Öffentlichen Zugriff blockieren"
-#: ../../mod/admin.php:471
+#: ../../mod/admin.php:441
msgid ""
"Check to block public access to all otherwise public personal pages on this "
"site unless you are currently logged in."
msgstr "Zugriff auf sonst öffentliche persönliche Seiten blockieren, wenn man nicht eingeloggt ist."
-#: ../../mod/admin.php:472
+#: ../../mod/admin.php:442
msgid "Verify Email Addresses"
msgstr "E-Mail-Adressen überprüfen"
-#: ../../mod/admin.php:472
+#: ../../mod/admin.php:442
msgid ""
"Check to verify email addresses used in account registration (recommended)."
msgstr "Aktivieren, um die Überprüfung von E-Mail-Adressen bei der Registrierung von Benutzerkonten zu aktivieren (empfohlen)."
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:443
msgid "Force publish"
msgstr "Veröffentlichung erzwingen"
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:443
msgid ""
"Check to force all profiles on this site to be listed in the site directory."
msgstr "Die Veröffentlichung aller Profile dieses Servers im Verzeichnis erzwingen."
-#: ../../mod/admin.php:474
+#: ../../mod/admin.php:444
msgid "Disable discovery tab"
msgstr "Den „Entdecken“-Reiter ausblenden"
-#: ../../mod/admin.php:474
+#: ../../mod/admin.php:444
msgid ""
"Remove the tab in the network view with public content pulled from sources "
"chosen for this site."
msgstr "Entferne den „Entdecken“-Reiter aus der Matrix-Seite, in dem öffentliche Inhalte angezeigt werden, die von anderen RedMatrix-Hubs geholt wurden."
-#: ../../mod/admin.php:475
+#: ../../mod/admin.php:445
msgid "No login on Homepage"
msgstr "Kein Login auf der Homepage"
-#: ../../mod/admin.php:475
+#: ../../mod/admin.php:445
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 "Aktivieren, um das Login-Formular auf der Startseite der Seite zu verbergen (z.B. weil es das Layout der Homepage des Seiten-Kanals stört)."
-#: ../../mod/admin.php:477
+#: ../../mod/admin.php:447
msgid "Proxy user"
msgstr "Proxy Benutzer"
-#: ../../mod/admin.php:478
+#: ../../mod/admin.php:448
msgid "Proxy URL"
msgstr "Proxy URL"
-#: ../../mod/admin.php:479
+#: ../../mod/admin.php:449
msgid "Network timeout"
msgstr "Netzwerk-Timeout"
-#: ../../mod/admin.php:479
+#: ../../mod/admin.php:449
msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
msgstr "Wert in Sekunden. 0 für unbegrenzt (nicht empfohlen)."
-#: ../../mod/admin.php:480
+#: ../../mod/admin.php:450
msgid "Delivery interval"
msgstr "Auslieferung Intervall"
-#: ../../mod/admin.php:480
+#: ../../mod/admin.php:450
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 "Verzögere im Hintergrund laufende Auslieferungsprozesse um die angegebene Anzahl Sekunden, um die Systemlast zu verringern. Empfehlungen: 4-5 für Shared Hosts, 2-3 für VPS, 0-1 für große dedizierte Server."
-#: ../../mod/admin.php:481
+#: ../../mod/admin.php:451
msgid "Poll interval"
msgstr "Abfrageintervall"
-#: ../../mod/admin.php:481
+#: ../../mod/admin.php:451
msgid ""
"Delay background polling processes by this many seconds to reduce system "
"load. If 0, use delivery interval."
msgstr "Verzögere Hintergrundprozesse um diese Anzahl Sekunden, um die Systemlast zu reduzieren. Bei 0 wird das Auslieferungsintervall verwendet."
-#: ../../mod/admin.php:482
+#: ../../mod/admin.php:452
msgid "Maximum Load Average"
msgstr "Maximales Load Average"
-#: ../../mod/admin.php:482
+#: ../../mod/admin.php:452
msgid ""
"Maximum system load before delivery and poll processes are deferred - "
"default 50."
msgstr "Maximale Systemlast, bevor Verteil- und Empfangsprozesse verschoben werden – Standard 50"
-#: ../../mod/admin.php:483
-msgid "Expiration period in days for imported (matrix/network) content"
-msgstr "Setze den Zeitraum (in Tagen), ab wann importierte Inhalte aus der RedMatrix (dem Netzwerk) ablaufen sollen"
-
-#: ../../mod/admin.php:483
-msgid "0 for no expiration of imported content"
-msgstr "Setze 0, damit importierte Inhalte niemals ablaufen (entfernt werden)"
-
-#: ../../mod/admin.php:531
+#: ../../mod/admin.php:508
msgid "No server found"
msgstr "Kein Server gefunden"
-#: ../../mod/admin.php:538 ../../mod/admin.php:822
+#: ../../mod/admin.php:515 ../../mod/admin.php:740
msgid "ID"
msgstr "ID"
-#: ../../mod/admin.php:538
+#: ../../mod/admin.php:515
msgid "for channel"
msgstr "für Kanal"
-#: ../../mod/admin.php:538
+#: ../../mod/admin.php:515
msgid "on server"
msgstr "auf Server"
-#: ../../mod/admin.php:538
+#: ../../mod/admin.php:515
msgid "Status"
msgstr "Status"
-#: ../../mod/admin.php:540
-msgid "Server"
-msgstr "Server"
-
-#: ../../mod/admin.php:557
+#: ../../mod/admin.php:536
msgid "Update has been marked successful"
msgstr "Update wurde als erfolgreich markiert"
-#: ../../mod/admin.php:567
+#: ../../mod/admin.php:546
#, php-format
msgid "Executing %s failed. Check system logs."
msgstr "Ausführen von %s fehlgeschlagen. Überprüfe die Systemprotokolle."
-#: ../../mod/admin.php:570
+#: ../../mod/admin.php:549
#, php-format
msgid "Update %s was successfully applied."
msgstr "Update %s wurde erfolgreich ausgeführt."
-#: ../../mod/admin.php:574
+#: ../../mod/admin.php:553
#, php-format
msgid "Update %s did not return a status. Unknown if it succeeded."
msgstr "Update %s lieferte keinen Rückgabewert. Erfolg unbekannt."
-#: ../../mod/admin.php:577
+#: ../../mod/admin.php:556
#, php-format
msgid "Update function %s could not be found."
msgstr "Update-Funktion %s konnte nicht gefunden werden."
-#: ../../mod/admin.php:593
+#: ../../mod/admin.php:571
msgid "No failed updates."
msgstr "Keine fehlgeschlagenen Aktualisierungen."
-#: ../../mod/admin.php:597
+#: ../../mod/admin.php:575
msgid "Failed Updates"
msgstr "Fehlgeschlagene Aktualisierungen"
-#: ../../mod/admin.php:599
+#: ../../mod/admin.php:577
msgid "Mark success (if update was manually applied)"
msgstr "Als erfolgreich markieren (wenn das Update manuell ausgeführt wurde)"
-#: ../../mod/admin.php:600
+#: ../../mod/admin.php:578
msgid "Attempt to execute this update step automatically"
msgstr "Versuche, diesen Updateschritt automatisch auszuführen"
-#: ../../mod/admin.php:632
-msgid "Queue Statistics"
-msgstr "Warteschlangenstatistiken"
-
-#: ../../mod/admin.php:633
-msgid "Total Entries"
-msgstr "Einträge insgesamt"
-
-#: ../../mod/admin.php:634
-msgid "Priority"
-msgstr "Priorität"
-
-#: ../../mod/admin.php:635
-msgid "Destination URL"
-msgstr "Ziel-URL"
-
-#: ../../mod/admin.php:636
-msgid "Mark hub permanently offline"
-msgstr "Hub als permanent offline markieren"
-
-#: ../../mod/admin.php:637
-msgid "Empty queue for this hub"
-msgstr "Warteschlange für diesen Hub leeren"
-
-#: ../../mod/admin.php:638
-msgid "Last known contact"
-msgstr "Letzter bekannter Kontakt"
-
-#: ../../mod/admin.php:674
+#: ../../mod/admin.php:604
#, php-format
msgid "%s user blocked/unblocked"
msgid_plural "%s users blocked/unblocked"
msgstr[0] "%s Nutzer blockiert/freigegeben"
msgstr[1] "%s Nutzer blockiert/freigegeben"
-#: ../../mod/admin.php:682
+#: ../../mod/admin.php:611
#, php-format
msgid "%s user deleted"
msgid_plural "%s users deleted"
msgstr[0] "%s Nutzer gelöscht"
msgstr[1] "%s Nutzer gelöscht"
-#: ../../mod/admin.php:718
+#: ../../mod/admin.php:640
msgid "Account not found"
msgstr "Konto nicht gefunden"
-#: ../../mod/admin.php:738
-#, php-format
-msgid "User '%s' blocked"
-msgstr "Benutzer '%s' blockiert"
-
-#: ../../mod/admin.php:746
+#: ../../mod/admin.php:660
#, php-format
msgid "User '%s' unblocked"
msgstr "Benutzer '%s' freigegeben"
-#: ../../mod/admin.php:809 ../../mod/admin.php:821
+#: ../../mod/admin.php:660
+#, php-format
+msgid "User '%s' blocked"
+msgstr "Benutzer '%s' blockiert"
+
+#: ../../mod/admin.php:727 ../../mod/admin.php:739
msgid "Users"
msgstr "Benutzer"
-#: ../../mod/admin.php:811 ../../mod/admin.php:947
+#: ../../mod/admin.php:729 ../../mod/admin.php:865
msgid "select all"
msgstr "Alle auswählen"
-#: ../../mod/admin.php:812
+#: ../../mod/admin.php:730
msgid "User registrations waiting for confirm"
msgstr "Neuanmeldungen, die auf Deine Bestätigung warten"
-#: ../../mod/admin.php:813
+#: ../../mod/admin.php:731
msgid "Request date"
msgstr "Antragsdatum"
-#: ../../mod/admin.php:814
+#: ../../mod/admin.php:732
msgid "No registrations."
msgstr "Keine Registrierungen."
-#: ../../mod/admin.php:815
+#: ../../mod/admin.php:733
msgid "Approve"
msgstr "Genehmigen"
-#: ../../mod/admin.php:816
+#: ../../mod/admin.php:734
msgid "Deny"
msgstr "Verweigern"
-#: ../../mod/admin.php:818 ../../mod/connedit.php:517
-#: ../../mod/connedit.php:720
-msgid "Block"
-msgstr "Blockieren"
-
-#: ../../mod/admin.php:819 ../../mod/connedit.php:517
-#: ../../mod/connedit.php:720
-msgid "Unblock"
-msgstr "Freigeben"
-
-#: ../../mod/admin.php:822
+#: ../../mod/admin.php:740
msgid "Register date"
msgstr "Registrierungs-Datum"
-#: ../../mod/admin.php:822
+#: ../../mod/admin.php:740
msgid "Last login"
msgstr "Letzte Anmeldung"
-#: ../../mod/admin.php:822
+#: ../../mod/admin.php:740
msgid "Expires"
msgstr "Verfällt"
-#: ../../mod/admin.php:822
+#: ../../mod/admin.php:740
msgid "Service Class"
msgstr "Service-Klasse"
-#: ../../mod/admin.php:824
+#: ../../mod/admin.php:742
msgid ""
"Selected users will be deleted!\\n\\nEverything these users had posted on "
"this site will be permanently deleted!\\n\\nAre you sure?"
msgstr "Die markierten Nutzer werden gelöscht!\\n\\nAlles, was diese Nutzer auf dieser Seite veröffentlicht haben, wird endgültig gelöscht!\\n\\nBist Du sicher?"
-#: ../../mod/admin.php:825
+#: ../../mod/admin.php:743
msgid ""
"The user {0} will be deleted!\\n\\nEverything this user has posted on this "
"site will be permanently deleted!\\n\\nAre you sure?"
msgstr "Der Nutzer {0} wird gelöscht!\\n\\nAlles, was dieser Nutzer auf dieser Seite veröffentlicht hat, wird endgültig gelöscht werden!\\n\\nBist Du sicher?"
-#: ../../mod/admin.php:859
+#: ../../mod/admin.php:776
#, php-format
msgid "%s channel censored/uncensored"
msgid_plural "%s channels censored/uncensored"
msgstr[0] "%s Kanal gesperrt/freigegeben"
msgstr[1] "%s Kanäle gesperrt/freigegeben"
-#: ../../mod/admin.php:866
+#: ../../mod/admin.php:783
#, php-format
msgid "%s channel deleted"
msgid_plural "%s channels deleted"
msgstr[0] "%s Kanal gelöscht"
msgstr[1] "%s Kanäle gelöscht"
-#: ../../mod/admin.php:886
+#: ../../mod/admin.php:802
msgid "Channel not found"
msgstr "Kanal nicht gefunden"
-#: ../../mod/admin.php:897
+#: ../../mod/admin.php:813
#, php-format
msgid "Channel '%s' deleted"
msgstr "Kanal '%s' gelöscht"
-#: ../../mod/admin.php:908
+#: ../../mod/admin.php:824
#, php-format
msgid "Channel '%s' uncensored"
msgstr "Kanal '%s' freigegeben"
-#: ../../mod/admin.php:908
+#: ../../mod/admin.php:824
#, php-format
msgid "Channel '%s' censored"
msgstr "Kanal '%s' gesperrt"
-#: ../../mod/admin.php:949
+#: ../../mod/admin.php:867
msgid "Censor"
msgstr "Sperren"
-#: ../../mod/admin.php:950
+#: ../../mod/admin.php:868
msgid "Uncensor"
msgstr "Freigeben"
-#: ../../mod/admin.php:953
+#: ../../mod/admin.php:871
msgid "UID"
msgstr "UID"
-#: ../../mod/admin.php:955
+#: ../../mod/admin.php:873
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 "Alle ausgewählten Kanäle werden gelöscht!\\n\\nAlles was von diesen Kanälen auf diesem Server geschrieben wurde, wird dauerhaft gelöscht!\\n\\nBist Du sicher?"
-#: ../../mod/admin.php:956
+#: ../../mod/admin.php:874
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 "Der Kanal {0} wird gelöscht!\\n\\nAlles was von diesem Kanal auf diesem Server geschrieben wurde, wird gelöscht!\\n\\nBist Du sicher?"
-#: ../../mod/admin.php:996
+#: ../../mod/admin.php:913
#, php-format
msgid "Plugin %s disabled."
msgstr "Plug-In %s deaktiviert."
-#: ../../mod/admin.php:1000
+#: ../../mod/admin.php:917
#, php-format
msgid "Plugin %s enabled."
msgstr "Plug-In %s aktiviert."
-#: ../../mod/admin.php:1010 ../../mod/admin.php:1208
+#: ../../mod/admin.php:927 ../../mod/admin.php:1129
msgid "Disable"
msgstr "Deaktivieren"
-#: ../../mod/admin.php:1013 ../../mod/admin.php:1210
+#: ../../mod/admin.php:929 ../../mod/admin.php:1131
msgid "Enable"
msgstr "Aktivieren"
-#: ../../mod/admin.php:1037 ../../mod/admin.php:1237
+#: ../../mod/admin.php:955 ../../mod/admin.php:1160
msgid "Toggle"
msgstr "Umschalten"
-#: ../../mod/admin.php:1045 ../../mod/admin.php:1247
+#: ../../mod/admin.php:963 ../../mod/admin.php:1170
msgid "Author: "
msgstr "Autor: "
-#: ../../mod/admin.php:1046 ../../mod/admin.php:1248
+#: ../../mod/admin.php:964 ../../mod/admin.php:1171
msgid "Maintainer: "
msgstr "Betreuer:"
-#: ../../mod/admin.php:1173
+#: ../../mod/admin.php:1093
msgid "No themes found."
msgstr "Keine Theme gefunden."
-#: ../../mod/admin.php:1229
+#: ../../mod/admin.php:1152
msgid "Screenshot"
msgstr "Bildschirmfoto"
-#: ../../mod/admin.php:1275
+#: ../../mod/admin.php:1200
msgid "[Experimental]"
msgstr "[Experimentell]"
-#: ../../mod/admin.php:1276
+#: ../../mod/admin.php:1201
msgid "[Unsupported]"
msgstr "[Nicht unterstützt]"
-#: ../../mod/admin.php:1300
+#: ../../mod/admin.php:1228
msgid "Log settings updated."
msgstr "Protokoll-Einstellungen aktualisiert."
-#: ../../mod/admin.php:1357
+#: ../../mod/admin.php:1284
msgid "Clear"
msgstr "Leeren"
-#: ../../mod/admin.php:1363
+#: ../../mod/admin.php:1290
msgid "Debugging"
msgstr "Debugging"
-#: ../../mod/admin.php:1364
+#: ../../mod/admin.php:1291
msgid "Log file"
msgstr "Protokolldatei"
-#: ../../mod/admin.php:1364
+#: ../../mod/admin.php:1291
msgid ""
"Must be writable by web server. Relative to your Red top-level directory."
msgstr "Muss für den Web-Server schreibbar sein. Relativ zum Red-Stammverzeichnis."
-#: ../../mod/admin.php:1365
+#: ../../mod/admin.php:1292
msgid "Log level"
msgstr "Protokollstufe"
-#: ../../mod/admin.php:1411
+#: ../../mod/admin.php:1339
msgid "New Profile Field"
msgstr "Neues Profilfeld"
-#: ../../mod/admin.php:1412 ../../mod/admin.php:1432
+#: ../../mod/admin.php:1340 ../../mod/admin.php:1361
msgid "Field nickname"
msgstr "Kurzname für das Feld"
-#: ../../mod/admin.php:1412 ../../mod/admin.php:1432
+#: ../../mod/admin.php:1340 ../../mod/admin.php:1361
msgid "System name of field"
msgstr "Systemname des Feldes"
-#: ../../mod/admin.php:1413 ../../mod/admin.php:1433
+#: ../../mod/admin.php:1341 ../../mod/admin.php:1362
msgid "Input type"
msgstr "Art des Inhalts"
-#: ../../mod/admin.php:1414 ../../mod/admin.php:1434
+#: ../../mod/admin.php:1342 ../../mod/admin.php:1363
msgid "Field Name"
msgstr "Feldname"
-#: ../../mod/admin.php:1414 ../../mod/admin.php:1434
+#: ../../mod/admin.php:1342 ../../mod/admin.php:1363
msgid "Label on profile pages"
msgstr "Bezeichnung auf Profilseiten"
-#: ../../mod/admin.php:1415 ../../mod/admin.php:1435
+#: ../../mod/admin.php:1343 ../../mod/admin.php:1364
msgid "Help text"
msgstr "Hilfetext"
-#: ../../mod/admin.php:1415 ../../mod/admin.php:1435
+#: ../../mod/admin.php:1343 ../../mod/admin.php:1364
msgid "Additional info (optional)"
msgstr "Zusätzliche Informationen (optional)"
-#: ../../mod/admin.php:1425
+#: ../../mod/admin.php:1354
msgid "Field definition not found"
msgstr "Feld-Definition nicht gefunden"
-#: ../../mod/admin.php:1431
+#: ../../mod/admin.php:1360
msgid "Edit Profile Field"
msgstr "Profilfeld bearbeiten"
@@ -7731,88 +7740,20 @@ msgstr "Konnte Deinen Server nicht finden."
msgid "Post successful."
msgstr "Veröffentlichung erfolgreich."
-#: ../../mod/editblock.php:112
-msgid "Edit Block"
-msgstr "Block bearbeiten"
-
-#: ../../mod/editblock.php:123
-msgid "Delete block?"
-msgstr "Block löschen?"
-
-#: ../../mod/register.php:44
-msgid "Maximum daily site registrations exceeded. Please try again tomorrow."
-msgstr "Maximale Anzahl täglicher Neuanmeldungen erreicht. Bitte versuche es morgen noch einmal."
-
-#: ../../mod/register.php:50
-msgid ""
-"Please indicate acceptance of the Terms of Service. Registration failed."
-msgstr "Bitte stimme den Nutzungsbedingungen zu. Registrierung fehlgeschlagen."
-
-#: ../../mod/register.php:84
-msgid "Passwords do not match."
-msgstr "Passwörter stimmen nicht überein."
-
-#: ../../mod/register.php:117
+#: ../../mod/post.php:229
msgid ""
-"Registration successful. Please check your email for validation "
-"instructions."
-msgstr "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an Dich gesendet."
-
-#: ../../mod/register.php:123
-msgid "Your registration is pending approval by the site owner."
-msgstr "Deine Registrierung muss noch vom Betreiber der Seite freigegeben werden."
-
-#: ../../mod/register.php:126
-msgid "Your registration can not be processed."
-msgstr "Deine Registrierung konnte nicht verarbeitet werden."
-
-#: ../../mod/register.php:163
-msgid "Registration on this site/hub is by approval only."
-msgstr "Anmeldungen auf diesem Server erfordern Zustimmung durch den Administrator"
-
-#: ../../mod/register.php:164
-msgid "<a href=\"pubsites\">Register at another affiliated site/hub</a>"
-msgstr "<a href=\"pubsites\">Registrierung auf einem anderen, angeschlossenen Server</a>"
-
-#: ../../mod/register.php:174
-msgid ""
-"This site has exceeded the number of allowed daily account registrations. "
-"Please try again tomorrow."
-msgstr "Die maximale Anzahl täglicher Registrierungen auf diesem Server wurde überschritten. Bitte versuche es morgen noch einmal."
-
-#: ../../mod/register.php:185
-msgid "Terms of Service"
-msgstr "Nutzungsbedingungen"
-
-#: ../../mod/register.php:191
-#, php-format
-msgid "I accept the %s for this website"
-msgstr "Ich akzeptiere die %s für diese Webseite"
+"Remote authentication blocked. You are logged into this site locally. Please"
+" logout and retry."
+msgstr "Fern-Authentifizierung blockiert. Du bist lokal auf diesem Server angemeldet. Bitte melde Dich ab und versuche es erneut."
-#: ../../mod/register.php:193
+#: ../../mod/post.php:261 ../../mod/openid.php:72 ../../mod/openid.php:180
#, php-format
-msgid "I am over 13 years of age and accept the %s for this website"
-msgstr "Ich bin älter als 13 Jahre und akzeptiere die %s dieser Webseite"
-
-#: ../../mod/register.php:212
-msgid "Membership on this site is by invitation only."
-msgstr "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich."
-
-#: ../../mod/register.php:213
-msgid "Please enter your invitation code"
-msgstr "Bitte trage Deinen Einladungs-Code ein"
-
-#: ../../mod/register.php:216
-msgid "Your email address"
-msgstr "Ihre E-Mail Adresse"
-
-#: ../../mod/register.php:217
-msgid "Choose a password"
-msgstr "Passwort"
+msgid "Welcome %s. Remote authentication successful."
+msgstr "Willkommen %s. Entfernte Authentifizierung erfolgreich."
-#: ../../mod/register.php:218
-msgid "Please re-enter your password"
-msgstr "Bitte gib Dein Passwort noch einmal ein"
+#: ../../mod/regmod.php:11
+msgid "Please login."
+msgstr "Bitte melde dich an."
#: ../../mod/removeaccount.php:30
msgid ""
@@ -7824,19 +7765,11 @@ msgstr "Das Löschen von Konten innerhalb 48 Stunden nachdem deren Passwort geä
msgid "Remove This Account"
msgstr "Dieses Konto löschen"
-#: ../../mod/removeaccount.php:58 ../../mod/removeme.php:58
-msgid "WARNING: "
-msgstr "WARNUNG: "
-
#: ../../mod/removeaccount.php:58
msgid ""
-"This account and all its channels will be completely removed from the "
-"network. "
-msgstr "Dieses Konto mit all seinen Kanälen wird vollständig aus dem Netzwerk gelöscht."
-
-#: ../../mod/removeaccount.php:58 ../../mod/removeme.php:58
-msgid "This action is permanent and can not be undone!"
-msgstr "Diese Schritt ist endgültig und kann nicht rückgängig gemacht werden!"
+"This will completely remove this account including all its channels from the"
+" network. Once this has been done it is not recoverable."
+msgstr "Hiermit wird dieses Nutzerkonto einschließlich all seiner Kanäle komplett aus dem Netzwerk entfernt. Dieser Vorgang kann nicht rückgängig gemacht werden."
#: ../../mod/removeaccount.php:59 ../../mod/removeme.php:59
msgid "Please enter your password for verification:"
@@ -7854,141 +7787,147 @@ msgid ""
"removed from the network"
msgstr "Standardmäßig werden nur die Kanalklone auf diesem RedMatrix-Hub aus dem Netzwerk entfernt"
-#: ../../mod/item.php:174
-msgid "Unable to locate original post."
-msgstr "Originalbeitrag nicht gefunden."
+#: ../../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
+msgid "[Embedded content - reload page to view]"
+msgstr "[Eingebettete Inhalte – lade die Seite neu, um sie anzuzeigen]"
-#: ../../mod/item.php:437
-msgid "Empty post discarded."
-msgstr "Leeren Beitrag verworfen."
+#: ../../mod/wall_upload.php:35
+msgid "Wall Photos"
+msgstr "Wall Fotos"
-#: ../../mod/item.php:479
-msgid "Executable content type not permitted to this channel."
-msgstr "Ausführbarer Content-Typ ist für diesen Kanal nicht freigegeben."
+#: ../../mod/match.php:16
+msgid "Profile Match"
+msgstr "Profil-Übereinstimmungen"
-#: ../../mod/item.php:885
-msgid "System error. Post not saved."
-msgstr "Systemfehler. Beitrag nicht gespeichert."
+#: ../../mod/match.php:24
+msgid "No keywords to match. Please add keywords to your default profile."
+msgstr "Keine Schlüsselwörter für den Abgleich gefunden. Bitte füge Schlüsselwörter zu Deinem Standardprofil hinzu."
-#: ../../mod/item.php:1103
-msgid "Unable to obtain post information from database."
-msgstr "Beitragsinformationen können nicht aus der Datenbank abgerufen werden."
+#: ../../mod/match.php:61
+msgid "is interested in:"
+msgstr "interessiert sich für:"
-#: ../../mod/item.php:1110
-#, php-format
-msgid "You have reached your limit of %1$.0f top level posts."
-msgstr "Du hast die maximale Anzahl von %1$.0f Beiträgen erreicht."
+#: ../../mod/match.php:69
+msgid "No matches"
+msgstr "Keine Übereinstimmungen"
-#: ../../mod/item.php:1117
-#, php-format
-msgid "You have reached your limit of %1$.0f webpages."
-msgstr "Du hast die maximale Anzahl von %1$.0f Webseiten erreicht."
+#: ../../mod/message.php:41
+msgid "Conversation removed."
+msgstr "Unterhaltung gelöscht."
-#: ../../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
-msgid "[Embedded content - reload page to view]"
-msgstr "[Eingebettete Inhalte – lade die Seite neu, um sie anzuzeigen]"
+#: ../../mod/message.php:56
+msgid "No messages."
+msgstr "Keine Nachrichten."
-#: ../../mod/lockview.php:37
-msgid "Remote privacy information not available."
-msgstr "Privatsphäre-Einstellungen anderer Nutzer sind nicht verfügbar."
+#: ../../mod/message.php:72 ../../mod/mail.php:336
+msgid "Delete conversation"
+msgstr "Unterhaltung löschen"
-#: ../../mod/lockview.php:58
-msgid "Visible to:"
-msgstr "Sichtbar für:"
+#: ../../mod/message.php:74
+msgid "D, d M Y - g:i A"
+msgstr "D, d. M Y - G:i"
-#: ../../mod/layouts.php:175
-msgid "Comanche page description language help"
-msgstr "Hilfe zur Comanche-Seitenbeschreibungssprache"
+#: ../../mod/mitem.php:67
+msgid "Menu element updated."
+msgstr "Menü-Element aktualisiert."
-#: ../../mod/layouts.php:179
-msgid "Layout Description"
-msgstr "Gestaltungsbeschreibung"
+#: ../../mod/mitem.php:71
+msgid "Unable to update menu element."
+msgstr "Kann Menü-Element nicht aktualisieren."
-#: ../../mod/layouts.php:184
-msgid "Download PDL file"
-msgstr "PDL-Datei herunterladen"
+#: ../../mod/mitem.php:77
+msgid "Menu element added."
+msgstr "Menü-Bestandteil hinzugefügt."
-#: ../../mod/id.php:11
-msgid "First Name"
-msgstr "Vorname"
+#: ../../mod/mitem.php:81
+msgid "Unable to add menu element."
+msgstr "Kann Menü-Bestandteil nicht hinzufügen."
-#: ../../mod/id.php:12
-msgid "Last Name"
-msgstr "Nachname"
+#: ../../mod/mitem.php:127
+msgid "Manage Menu Elements"
+msgstr "Menü-Bestandteile verwalten"
-#: ../../mod/id.php:13
-msgid "Nickname"
-msgstr "Spitzname"
+#: ../../mod/mitem.php:130
+msgid "Edit menu"
+msgstr "Menü bearbeiten"
-#: ../../mod/id.php:14
-msgid "Full Name"
-msgstr "Voller Name"
+#: ../../mod/mitem.php:133
+msgid "Edit element"
+msgstr "Bestandteil bearbeiten"
-#: ../../mod/id.php:20
-msgid "Profile Photo 16px"
-msgstr "Profilfoto 16 px"
+#: ../../mod/mitem.php:134
+msgid "Drop element"
+msgstr "Bestandteil löschen"
-#: ../../mod/id.php:21
-msgid "Profile Photo 32px"
-msgstr "Profilfoto 32 px"
+#: ../../mod/mitem.php:135
+msgid "New element"
+msgstr "Neues Bestandteil"
-#: ../../mod/id.php:22
-msgid "Profile Photo 48px"
-msgstr "Profilfoto 48 px"
+#: ../../mod/mitem.php:136
+msgid "Edit this menu container"
+msgstr "Diesen Menü-Container bearbeiten"
-#: ../../mod/id.php:23
-msgid "Profile Photo 64px"
-msgstr "Profilfoto 64 px"
+#: ../../mod/mitem.php:137
+msgid "Add menu element"
+msgstr "Menüelement hinzufügen"
-#: ../../mod/id.php:24
-msgid "Profile Photo 80px"
-msgstr "Profilfoto 80 px"
+#: ../../mod/mitem.php:138
+msgid "Delete this menu item"
+msgstr "Lösche dieses Menü-Bestandteil"
-#: ../../mod/id.php:25
-msgid "Profile Photo 128px"
-msgstr "Profilfoto 128 px"
+#: ../../mod/mitem.php:139
+msgid "Edit this menu item"
+msgstr "Bearbeite dieses Menü-Bestandteil"
-#: ../../mod/id.php:26
-msgid "Timezone"
-msgstr "Zeitzone"
+#: ../../mod/mitem.php:158
+msgid "New Menu Element"
+msgstr "Neues Menü-Bestandteil"
-#: ../../mod/id.php:27
-msgid "Homepage URL"
-msgstr "Homepage-URL"
+#: ../../mod/mitem.php:160 ../../mod/mitem.php:203
+msgid "Menu Item Permissions"
+msgstr "Zugriffsrechte des Menü-Elements"
-#: ../../mod/id.php:29
-msgid "Birth Year"
-msgstr "Geburtsjahr"
+#: ../../mod/mitem.php:163 ../../mod/mitem.php:207
+msgid "Link text"
+msgstr "Link Text"
-#: ../../mod/id.php:30
-msgid "Birth Month"
-msgstr "Geburtsmonat"
+#: ../../mod/mitem.php:164 ../../mod/mitem.php:208
+msgid "URL of link"
+msgstr "URL des Links"
-#: ../../mod/id.php:31
-msgid "Birth Day"
-msgstr "Geburtstag"
+#: ../../mod/mitem.php:165 ../../mod/mitem.php:209
+msgid "Use RedMatrix magic-auth if available"
+msgstr "Verwende die automatische RedMatrix-Authentifizierung (magic-auth), wenn verfügbar"
-#: ../../mod/id.php:32
-msgid "Birthdate"
-msgstr "Geburtsdatum"
+#: ../../mod/mitem.php:166 ../../mod/mitem.php:210
+msgid "Open link in new window"
+msgstr "Öffne Link in neuem Fenster"
-#: ../../mod/message.php:41
-msgid "Conversation removed."
-msgstr "Unterhaltung gelöscht."
+#: ../../mod/mitem.php:168 ../../mod/mitem.php:212
+msgid "Order in list"
+msgstr "Reihenfolge in der Liste"
-#: ../../mod/message.php:56
-msgid "No messages."
-msgstr "Keine Nachrichten."
+#: ../../mod/mitem.php:168 ../../mod/mitem.php:212
+msgid "Higher numbers will sink to bottom of listing"
+msgstr "Größere Nummern werden weiter unten in der Auflistung einsortiert"
-#: ../../mod/message.php:72 ../../mod/mail.php:336
-msgid "Delete conversation"
-msgstr "Unterhaltung löschen"
+#: ../../mod/mitem.php:181
+msgid "Menu item not found."
+msgstr "Menü-Bestandteil nicht gefunden."
-#: ../../mod/message.php:74
-msgid "D, d M Y - g:i A"
-msgstr "D, d. M Y - G:i"
+#: ../../mod/mitem.php:190
+msgid "Menu item deleted."
+msgstr "Menü-Bestandteil gelöscht."
+
+#: ../../mod/mitem.php:192
+msgid "Menu item could not be deleted."
+msgstr "Menü-Bestandteil kann nicht gelöscht werden."
+
+#: ../../mod/mitem.php:201
+msgid "Edit Menu Element"
+msgstr "Bearbeite Menü-Bestandteil"
#: ../../mod/mood.php:131
msgid "Set your current mood and tell your friends"
@@ -8013,8 +7952,10 @@ msgid "Remove This Channel"
msgstr "Diesen Kanal löschen"
#: ../../mod/removeme.php:58
-msgid "This channel will be completely removed from the network. "
-msgstr "Dieser Kanal wird vollständig aus dem Netzwerk gelöscht."
+msgid ""
+"This will completely remove this channel from the network. Once this has "
+"been done it is not recoverable."
+msgstr "Hiermit wird dieser Kanal komplett aus dem Netzwerk gelöscht. Einmal eingeleitet, kann dieser Prozess nicht wieder rückgängig gemacht werden."
#: ../../mod/removeme.php:60
msgid "Remove this channel and all its clones from the network"
@@ -8026,340 +7967,85 @@ msgid ""
"removed from the network"
msgstr "Standardmäßig wird der Kanal nur auf diesem Server gelöscht, seine Klone verbleiben im Netzwerk"
-#: ../../mod/connedit.php:262
-msgid "is now connected to"
-msgstr "ist jetzt verbunden mit"
-
-#: ../../mod/connedit.php:375
-msgid "Could not access address book record."
-msgstr "Konnte nicht auf den Adressbuch-Eintrag zugreifen."
-
-#: ../../mod/connedit.php:389
-msgid "Refresh failed - channel is currently unavailable."
-msgstr "Aktualisierung fehlgeschlagen – der Kanal ist im Moment nicht erreichbar."
-
-#: ../../mod/connedit.php:396
-msgid "Channel has been unblocked"
-msgstr "Kanal nicht mehr blockiert"
-
-#: ../../mod/connedit.php:397
-msgid "Channel has been blocked"
-msgstr "Kanal blockiert"
-
-#: ../../mod/connedit.php:401 ../../mod/connedit.php:413
-#: ../../mod/connedit.php:425 ../../mod/connedit.php:437
-#: ../../mod/connedit.php:453
-msgid "Unable to set address book parameters."
-msgstr "Konnte die Adressbuch-Parameter nicht setzen."
-
-#: ../../mod/connedit.php:408
-msgid "Channel has been unignored"
-msgstr "Kanal wird nicht mehr ignoriert"
-
-#: ../../mod/connedit.php:409
-msgid "Channel has been ignored"
-msgstr "Kanal wird ignoriert"
-
-#: ../../mod/connedit.php:420
-msgid "Channel has been unarchived"
-msgstr "Kanal wurde aus dem Archiv zurück geholt"
-
-#: ../../mod/connedit.php:421
-msgid "Channel has been archived"
-msgstr "Kanal wurde archiviert"
-
-#: ../../mod/connedit.php:432
-msgid "Channel has been unhidden"
-msgstr "Kanal wird nicht mehr versteckt"
-
-#: ../../mod/connedit.php:433
-msgid "Channel has been hidden"
-msgstr "Kanal wurde versteckt"
-
-#: ../../mod/connedit.php:448
-msgid "Channel has been approved"
-msgstr "Kanal wurde zugelassen"
-
-#: ../../mod/connedit.php:449
-msgid "Channel has been unapproved"
-msgstr "Zulassung des Kanals entfernt"
-
-#: ../../mod/connedit.php:477
-msgid "Connection has been removed."
-msgstr "Verbindung wurde gelöscht."
-
-#: ../../mod/connedit.php:497
-#, php-format
-msgid "View %s's profile"
-msgstr "%ss Profil ansehen"
-
-#: ../../mod/connedit.php:501
-msgid "Refresh Permissions"
-msgstr "Zugriffsrechte neu laden"
-
-#: ../../mod/connedit.php:504
-msgid "Fetch updated permissions"
-msgstr "Aktualisierte Zugriffsrechte abfragen"
-
-#: ../../mod/connedit.php:508
-msgid "Recent Activity"
-msgstr "Kürzliche Aktivitäten"
-
-#: ../../mod/connedit.php:511
-msgid "View recent posts and comments"
-msgstr "Betrachte die neuesten Beiträge und Kommentare"
-
-#: ../../mod/connedit.php:520
-msgid "Block (or Unblock) all communications with this connection"
-msgstr "Jegliche Kommunikation mit dieser Verbindung blockieren/zulassen"
+#: ../../mod/removeme.php:61
+msgid "Remove Channel"
+msgstr "Kanal löschen"
-#: ../../mod/connedit.php:524 ../../mod/connedit.php:721
-msgid "Unignore"
-msgstr "Nicht ignorieren"
+#: ../../mod/layouts.php:110
+msgid "Help with this feature"
+msgstr "Hilfe zu dieser Funktion"
-#: ../../mod/connedit.php:524 ../../mod/connedit.php:721
-#: ../../mod/notifications.php:51
-msgid "Ignore"
-msgstr "Ignorieren"
-
-#: ../../mod/connedit.php:527
-msgid "Ignore (or Unignore) all inbound communications from this connection"
-msgstr "Jegliche eingehende Kommunikation von dieser Verbindung ignorieren/zulassen"
+#: ../../mod/layouts.php:130
+msgid "Layout Name"
+msgstr "Layout-Name"
-#: ../../mod/connedit.php:530
-msgid "Unarchive"
-msgstr "Aus Archiv zurückholen"
+#: ../../mod/like.php:15
+msgid "Like/Dislike"
+msgstr "Mögen/Nicht mögen"
-#: ../../mod/connedit.php:530
-msgid "Archive"
-msgstr "Archivieren"
+#: ../../mod/like.php:20
+msgid "This action is restricted to members."
+msgstr "Diese Aktion kann nur von Mitgliedern ausgeführt werden."
-#: ../../mod/connedit.php:533
+#: ../../mod/like.php:21
msgid ""
-"Archive (or Unarchive) this connection - mark channel dead but keep content"
-msgstr "Verbindung archivieren/aus dem Archiv zurückholen (Archiv = Kanal als erloschen markieren, aber die Beiträge behalten)"
-
-#: ../../mod/connedit.php:536
-msgid "Unhide"
-msgstr "Wieder sichtbar machen"
-
-#: ../../mod/connedit.php:536
-msgid "Hide"
-msgstr "Verstecken"
+"Please <a href=\"rmagic\">login with your RedMatrix ID</a> or <a "
+"href=\"register\">register as a new RedMatrix member</a> to continue."
+msgstr "Bitte <a href=\"rmagic\">melde Dich mit Deiner RedMatrix-ID an</a> oder <a href=\"register\">registriere Dich als neues Mitglied der RedMatrix</a>, um fortzufahren."
-#: ../../mod/connedit.php:539
-msgid "Hide or Unhide this connection from your other connections"
-msgstr "Diese Verbindung vor anderen Verbindungen verstecken/zeigen"
+#: ../../mod/like.php:101 ../../mod/like.php:128 ../../mod/like.php:166
+msgid "Invalid request."
+msgstr "Ungültige Anfrage."
-#: ../../mod/connedit.php:546
-msgid "Delete this connection"
-msgstr "Verbindung löschen"
+#: ../../mod/like.php:143
+msgid "thing"
+msgstr "Sache"
-#: ../../mod/connedit.php:637 ../../mod/connedit.php:675
-msgid "Approve this connection"
-msgstr "Verbindung genehmigen"
+#: ../../mod/like.php:189
+msgid "Channel unavailable."
+msgstr "Kanal nicht vorhanden."
-#: ../../mod/connedit.php:637
-msgid "Accept connection to allow communication"
-msgstr "Akzeptiere die Verbindung, um Kommunikation zu ermöglichen"
+#: ../../mod/like.php:228
+msgid "Previous action reversed."
+msgstr "Die vorherige Aktion wurde rückgängig gemacht."
-#: ../../mod/connedit.php:653
+#: ../../mod/like.php:387
#, php-format
-msgid "Connections: settings for %s"
-msgstr "Verbindungseinstellungen für %s"
-
-#: ../../mod/connedit.php:654
-msgid "Apply these permissions automatically"
-msgstr "Diese Berechtigungen automatisch anwenden"
-
-#: ../../mod/connedit.php:658
-msgid "Apply the permissions indicated on this page to all new connections."
-msgstr "Wende die auf dieser Seite gewählten Berechtigungen auf alle neuen Verbindungen an."
-
-#: ../../mod/connedit.php:662
-msgid "Slide to adjust your degree of friendship"
-msgstr "Verschieben, um den Grad der Freundschaft zu einzustellen"
-
-#: ../../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 "Die voreingestellten Zugriffsrechte der Kategorie Deines Kanals sind hier zu sehen, wurden aber noch nicht gespeichert. Bitte sieh Dir die Zugriffsrechte auf dieser Seite an und ändere sie, wenn Du willst. Dieser Kontakt kann evtl. <em>nicht</em> mit Dir kommunizieren, bevor Du nicht auf dieser Seite auf „Senden“ geklickt hast – erst dieser Klick speichert die gewünschten Zugriffsrechte."
-
-#: ../../mod/connedit.php:674
-msgid "inherited"
-msgstr "geerbt"
-
-#: ../../mod/connedit.php:677
-msgid "Connection has no individual permissions!"
-msgstr "Diese Verbindung hat keine individuellen Zugriffsrechte!"
-
-#: ../../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 "Abhängig von Deinen <a href=\"settings\">Privatsphäre-Einstellungen</a> könnte das passen, eventuell solltest Du aber die „Zugriffsrechte für Fortgeschrittene“ überprüfen."
-
-#: ../../mod/connedit.php:680
-msgid "Profile Visibility"
-msgstr "Sichtbarkeit des Profils"
+msgid "%1$s agrees with %2$s's %3$s"
+msgstr "%1$s stimmt %2$ss %3$s zu"
-#: ../../mod/connedit.php:681
+#: ../../mod/like.php:389
#, php-format
-msgid ""
-"Please choose the profile you would like to display to %s when viewing your "
-"profile securely."
-msgstr "Bitte wähle ein Profil, das wir %s zeigen sollen, wenn Deine Profilseite über eine verifizierte Verbindung aufgerufen wird."
-
-#: ../../mod/connedit.php:682
-msgid "Contact Information / Notes"
-msgstr "Kontaktinformationen / Notizen"
-
-#: ../../mod/connedit.php:683
-msgid "Edit contact notes"
-msgstr "Kontaktnotizen bearbeiten"
-
-#: ../../mod/connedit.php:685
-msgid "Their Settings"
-msgstr "Deren Einstellungen"
-
-#: ../../mod/connedit.php:686
-msgid "My Settings"
-msgstr "Meine Einstellungen"
-
-#: ../../mod/connedit.php:688
-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 "Die voreingestellten Zugriffsrechte der Kategorie Deines Kanals sind hier zu sehen, wurden aber noch <em>nicht</em> gespeichert, und Du hast keine Voreinstellungen für die Zugriffsrechte von Verbindungen angelegt. Bitte sieht Dir die Einstellungen an, ändere sie bei Bedarf und klicke [Senden], um den Vorgang abzuschließen."
-
-#: ../../mod/connedit.php:689
-msgid "Clear/Disable Automatic Permissions"
-msgstr "Automatische Berechtigungen abschalten/entfernen"
-
-#: ../../mod/connedit.php:690
-msgid "Forum Members"
-msgstr "Forum Mitglieder"
-
-#: ../../mod/connedit.php:691
-msgid "Soapbox"
-msgstr "Marktschreier"
-
-#: ../../mod/connedit.php:692
-msgid "Full Sharing (typical social network permissions)"
-msgstr "Vollumfängliches Teilen (übliche Berechtigungen in sozialen Netzwerken)"
-
-#: ../../mod/connedit.php:693
-msgid "Cautious Sharing "
-msgstr "Vorsichtiges Teilen"
-
-#: ../../mod/connedit.php:694
-msgid "Follow Only"
-msgstr "Nur folgen"
-
-#: ../../mod/connedit.php:695
-msgid "Individual Permissions"
-msgstr "Individuelle Zugriffsrechte"
-
-#: ../../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 "Einige Berechtigungen werden von den globalen <a href=\"settings\">Sicherheits- und Privatsphäre-Einstellungen</a> dieses Kanals geerbt, die eine höhere Priorität haben als die Einstellungen bei einer Verbindung. Werden geerbte Einstellungen hier geändert, hat das keine Auswirkungen."
-
-#: ../../mod/connedit.php:697
-msgid "Advanced Permissions"
-msgstr "Zugriffsrechte für Fortgeschrittene"
-
-#: ../../mod/connedit.php:698
-msgid "Simple Permissions (select one and submit)"
-msgstr "Einfache Berechtigungs-Einstellungen (wähle eine aus und klicke auf Senden)"
+msgid "%1$s doesn't agree with %2$s's %3$s"
+msgstr "%1$s lehnt %2$ss %3$s ab"
-#: ../../mod/connedit.php:702
+#: ../../mod/like.php:391
#, php-format
-msgid "Visit %s's profile - %s"
-msgstr "%ss Profil besuchen - %s"
-
-#: ../../mod/connedit.php:703
-msgid "Block/Unblock contact"
-msgstr "Kontakt blockieren/freigeben"
-
-#: ../../mod/connedit.php:704
-msgid "Ignore contact"
-msgstr "Kontakt ignorieren"
-
-#: ../../mod/connedit.php:705
-msgid "Repair URL settings"
-msgstr "URL-Einstellungen reparieren"
-
-#: ../../mod/connedit.php:706
-msgid "View conversations"
-msgstr "Unterhaltungen anzeigen"
-
-#: ../../mod/connedit.php:708
-msgid "Delete contact"
-msgstr "Kontakt löschen"
-
-#: ../../mod/connedit.php:712
-msgid "Last update:"
-msgstr "Letzte Aktualisierung:"
-
-#: ../../mod/connedit.php:714
-msgid "Update public posts"
-msgstr "Öffentliche Beiträge aktualisieren"
-
-#: ../../mod/connedit.php:716
-msgid "Update now"
-msgstr "Jetzt aktualisieren"
-
-#: ../../mod/connedit.php:722
-msgid "Currently blocked"
-msgstr "Derzeit blockiert"
-
-#: ../../mod/connedit.php:723
-msgid "Currently ignored"
-msgstr "Derzeit ignoriert"
-
-#: ../../mod/connedit.php:724
-msgid "Currently archived"
-msgstr "Derzeit archiviert"
-
-#: ../../mod/connedit.php:725
-msgid "Currently pending"
-msgstr "Derzeit anstehend"
-
-#: ../../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 "Wir haben ein Problem mit der OpenID festgestellt, mit der Du Dich anmelden wolltest. Bitte überprüfe sie noch einmal."
+msgid "%1$s abstains from a decision on %2$s's %3$s"
+msgstr "%1$s enthält sich zu %2$ss %3$s"
-#: ../../mod/rmagic.php:40
-msgid "The error message was:"
-msgstr "Die Fehlermeldung war:"
+#: ../../mod/like.php:393
+#, php-format
+msgid "%1$s is attending %2$s's %3$s"
+msgstr "%1$s nimmt an %2$ss %3$s teil"
-#: ../../mod/rmagic.php:44
-msgid "Authentication failed."
-msgstr "Authentifizierung fehlgeschlagen."
+#: ../../mod/like.php:395
+#, php-format
+msgid "%1$s is not attending %2$s's %3$s"
+msgstr "%1$s nimmt an %2$ss %3$s nicht teil"
-#: ../../mod/rmagic.php:84
-msgid "Remote Authentication"
-msgstr "Entfernte Authentifizierung"
+#: ../../mod/like.php:397
+#, php-format
+msgid "%1$s may attend %2$s's %3$s"
+msgstr "%1$s nimmt vielleicht an %2$ss %3$s teil"
-#: ../../mod/rmagic.php:85
-msgid "Enter your channel address (e.g. channel@example.com)"
-msgstr "Deine Kanal-Adresse (z. B. channel@example.com)"
+#: ../../mod/like.php:481
+msgid "Action completed."
+msgstr "Aktion durchgeführt."
-#: ../../mod/rmagic.php:86
-msgid "Authenticate"
-msgstr "Authentifizieren"
+#: ../../mod/like.php:482
+msgid "Thank you."
+msgstr "Vielen Dank."
#: ../../mod/mail.php:33
msgid "Unable to lookup recipient."
@@ -8439,16 +8125,6 @@ msgstr "Ungültiger Anfrage-Identifikator."
msgid "Discard"
msgstr "Verwerfen"
-#: ../../mod/regmod.php:11
-msgid "Please login."
-msgstr "Bitte melde dich an."
-
-#: ../../mod/post.php:235
-msgid ""
-"Remote authentication blocked. You are logged into this site locally. Please"
-" logout and retry."
-msgstr "Fern-Authentifizierung blockiert. Du bist lokal auf diesem Server angemeldet. Bitte melde Dich ab und versuche es erneut."
-
#: ../../mod/new_channel.php:109
msgid "Add a Channel"
msgstr "Kanal hinzufügen"
@@ -8493,53 +8169,144 @@ msgstr "Kanaltyp"
msgid "Read more about roles"
msgstr "Mehr Informationen über Rollen"
-#: ../../mod/appman.php:28 ../../mod/appman.php:44
-msgid "App installed."
-msgstr "App installiert."
+#: ../../mod/openid.php:26
+msgid "OpenID protocol error. No ID returned."
+msgstr "OpenID Protokollfehler. Keine ID zurückgegeben."
-#: ../../mod/appman.php:37
-msgid "Malformed app."
-msgstr "Fehlerhafte App."
+#: ../../mod/photos.php:77
+msgid "Page owner information could not be retrieved."
+msgstr "Informationen über den Besitzer der Seite konnten nicht gefunden werden."
-#: ../../mod/appman.php:80
-msgid "Embed code"
-msgstr "Code einbetten"
+#: ../../mod/photos.php:97
+msgid "Album not found."
+msgstr "Album nicht gefunden."
-#: ../../mod/appman.php:86
-msgid "Edit App"
-msgstr "App bearbeiten"
+#: ../../mod/photos.php:119 ../../mod/photos.php:643
+msgid "Delete Album"
+msgstr "Album löschen"
-#: ../../mod/appman.php:86
-msgid "Create App"
-msgstr "App erstellen"
+#: ../../mod/photos.php:159 ../../mod/photos.php:924
+msgid "Delete Photo"
+msgstr "Foto löschen"
-#: ../../mod/appman.php:91
-msgid "Name of app"
-msgstr "Name der App"
+#: ../../mod/photos.php:440
+msgid "No photos selected"
+msgstr "Keine Fotos ausgewählt"
-#: ../../mod/appman.php:92
-msgid "Location (URL) of app"
-msgstr "Ort (URL) der App"
+#: ../../mod/photos.php:484
+msgid "Access to this item is restricted."
+msgstr "Der Zugriff auf dieses Foto ist eingeschränkt."
-#: ../../mod/appman.php:94
-msgid "Photo icon URL"
-msgstr "URL zum Icon"
+#: ../../mod/photos.php:523
+#, php-format
+msgid "%1$.2f MB of %2$.2f MB photo storage used."
+msgstr "%1$.2f MB von %2$.2f MB Foto-Speicher belegt."
-#: ../../mod/appman.php:94
-msgid "80 x 80 pixels - optional"
-msgstr "80 x 80 Pixel – optional"
+#: ../../mod/photos.php:526
+#, php-format
+msgid "%1$.2f MB photo storage used."
+msgstr "%1$.2f MB Foto-Speicher belegt."
-#: ../../mod/appman.php:95
-msgid "Version ID"
-msgstr "Versions-ID"
+#: ../../mod/photos.php:550
+msgid "Upload Photos"
+msgstr "Fotos hochladen"
-#: ../../mod/appman.php:96
-msgid "Price of app"
-msgstr "Preis der App"
+#: ../../mod/photos.php:554 ../../mod/photos.php:636 ../../mod/photos.php:909
+msgid "Enter a new album name"
+msgstr "Gib einen Namen für ein neues Album ein"
-#: ../../mod/appman.php:97
-msgid "Location (URL) to purchase app"
-msgstr "Ort (URL), um die App zu kaufen"
+#: ../../mod/photos.php:555 ../../mod/photos.php:637 ../../mod/photos.php:910
+msgid "or select an existing one (doubleclick)"
+msgstr "oder wähle ein bereits vorhandenes aus (Doppelklick)"
+
+#: ../../mod/photos.php:556
+msgid "Do not show a status post for this upload"
+msgstr "Keine Statusnachricht für diesen Upload anzeigen"
+
+#: ../../mod/photos.php:584
+msgid "Album name could not be decoded"
+msgstr "Albumname konnte nicht dekodiert werden"
+
+#: ../../mod/photos.php:625 ../../mod/photos.php:1149
+#: ../../mod/photos.php:1165
+msgid "Contact Photos"
+msgstr "Kontakt-Bilder"
+
+#: ../../mod/photos.php:649
+msgid "Show Newest First"
+msgstr "Neueste zuerst anzeigen"
+
+#: ../../mod/photos.php:651
+msgid "Show Oldest First"
+msgstr "Älteste zuerst anzeigen"
+
+#: ../../mod/photos.php:675 ../../mod/photos.php:1197
+msgid "View Photo"
+msgstr "Foto ansehen"
+
+#: ../../mod/photos.php:704
+msgid "Edit Album"
+msgstr "Album bearbeiten"
+
+#: ../../mod/photos.php:749
+msgid "Permission denied. Access to this item may be restricted."
+msgstr "Berechtigung verweigert. Der Zugriff ist wahrscheinlich eingeschränkt worden."
+
+#: ../../mod/photos.php:751
+msgid "Photo not available"
+msgstr "Foto nicht verfügbar"
+
+#: ../../mod/photos.php:809
+msgid "Use as profile photo"
+msgstr "Als Profilfoto verwenden"
+
+#: ../../mod/photos.php:816
+msgid "Private Photo"
+msgstr "Privates Foto"
+
+#: ../../mod/photos.php:831
+msgid "View Full Size"
+msgstr "In voller Größe anzeigen"
+
+#: ../../mod/photos.php:903
+msgid "Edit photo"
+msgstr "Foto bearbeiten"
+
+#: ../../mod/photos.php:905
+msgid "Rotate CW (right)"
+msgstr "Drehen im UZS (rechts)"
+
+#: ../../mod/photos.php:906
+msgid "Rotate CCW (left)"
+msgstr "Drehen gegen UZS (links)"
+
+#: ../../mod/photos.php:913
+msgid "Caption"
+msgstr "Bildunterschrift"
+
+#: ../../mod/photos.php:915
+msgid "Add a Tag"
+msgstr "Schlagwort hinzufügen"
+
+#: ../../mod/photos.php:919
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
+msgstr "Beispiele: @ben, @Karl_Prester, @lieschen@example.com"
+
+#: ../../mod/photos.php:922
+msgid "Flag as adult in album view"
+msgstr "In der Albumansicht als nicht jugendfrei markieren"
+
+#: ../../mod/photos.php:1114
+msgid "In This Photo:"
+msgstr "Auf diesem Foto:"
+
+#: ../../mod/photos.php:1203
+msgid "View Album"
+msgstr "Album ansehen"
+
+#: ../../mod/photos.php:1226
+msgid "Recent Photos"
+msgstr "Neueste Fotos"
#: ../../mod/ping.php:263
msgid "sent you a private message"
@@ -8553,38 +8320,6 @@ msgstr "hat deinen Kanal hinzugefügt"
msgid "posted an event"
msgstr "hat einen Termin veröffentlicht"
-#: ../../mod/network.php:91
-msgid "No such group"
-msgstr "Sammlung nicht gefunden"
-
-#: ../../mod/network.php:129
-msgid "No such channel"
-msgstr "Kanal nicht gefunden"
-
-#: ../../mod/network.php:143
-msgid "Search Results For:"
-msgstr "Suchergebnisse für:"
-
-#: ../../mod/network.php:198
-msgid "Collection is empty"
-msgstr "Sammlung ist leer"
-
-#: ../../mod/network.php:207
-msgid "Collection: "
-msgstr "Sammlung:"
-
-#: ../../mod/network.php:226
-msgid "Connection: "
-msgstr "Verbindung:"
-
-#: ../../mod/network.php:233
-msgid "Invalid connection."
-msgstr "Ungültige Verbindung."
-
-#: ../../mod/page.php:119
-msgid "Ipsum Lorem"
-msgstr "Ipsum Lorem"
-
#: ../../mod/bookmarks.php:38
msgid "Bookmark added"
msgstr "Lesezeichen hinzugefügt"
@@ -8597,15 +8332,110 @@ msgstr "Meine Lesezeichen"
msgid "My Connections Bookmarks"
msgstr "Lesezeichen meiner Kontakte"
-#: ../../mod/channel.php:97
+#: ../../mod/channel.php:87
msgid "Insufficient permissions. Request redirected to profile page."
msgstr "Unzureichende Zugriffsrechte. Die Anfrage wurde zur Profil-Seite umgeleitet."
-#: ../../mod/suggest.php:35
+#: ../../mod/register.php:44
+msgid "Maximum daily site registrations exceeded. Please try again tomorrow."
+msgstr "Maximale Anzahl täglicher Neuanmeldungen erreicht. Bitte versuche es morgen noch einmal."
+
+#: ../../mod/register.php:50
msgid ""
-"No suggestions available. If this is a new site, please try again in 24 "
-"hours."
-msgstr "Keine Vorschläge vorhanden. Wenn das ein neuer Server ist, versuche es in 24 Stunden noch einmal."
+"Please indicate acceptance of the Terms of Service. Registration failed."
+msgstr "Bitte stimme den Nutzungsbedingungen zu. Registrierung fehlgeschlagen."
+
+#: ../../mod/register.php:84
+msgid "Passwords do not match."
+msgstr "Passwörter stimmen nicht überein."
+
+#: ../../mod/register.php:117
+msgid ""
+"Registration successful. Please check your email for validation "
+"instructions."
+msgstr "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an Dich gesendet."
+
+#: ../../mod/register.php:123
+msgid "Your registration is pending approval by the site owner."
+msgstr "Deine Registrierung muss noch vom Betreiber der Seite freigegeben werden."
+
+#: ../../mod/register.php:126
+msgid "Your registration can not be processed."
+msgstr "Deine Registrierung konnte nicht verarbeitet werden."
+
+#: ../../mod/register.php:163
+msgid "Registration on this site/hub is by approval only."
+msgstr "Anmeldungen auf diesem Server erfordern Zustimmung durch den Administrator"
+
+#: ../../mod/register.php:164
+msgid "<a href=\"pubsites\">Register at another affiliated site/hub</a>"
+msgstr "<a href=\"pubsites\">Registrierung auf einem anderen, angeschlossenen Server</a>"
+
+#: ../../mod/register.php:174
+msgid ""
+"This site has exceeded the number of allowed daily account registrations. "
+"Please try again tomorrow."
+msgstr "Die maximale Anzahl täglicher Registrierungen auf diesem Server wurde überschritten. Bitte versuche es morgen noch einmal."
+
+#: ../../mod/register.php:185
+msgid "Terms of Service"
+msgstr "Nutzungsbedingungen"
+
+#: ../../mod/register.php:191
+#, php-format
+msgid "I accept the %s for this website"
+msgstr "Ich akzeptiere die %s für diese Webseite"
+
+#: ../../mod/register.php:193
+#, php-format
+msgid "I am over 13 years of age and accept the %s for this website"
+msgstr "Ich bin älter als 13 Jahre und akzeptiere die %s dieser Webseite"
+
+#: ../../mod/register.php:212
+msgid "Membership on this site is by invitation only."
+msgstr "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich."
+
+#: ../../mod/register.php:213
+msgid "Please enter your invitation code"
+msgstr "Bitte trage Deinen Einladungs-Code ein"
+
+#: ../../mod/register.php:216
+msgid "Your email address"
+msgstr "Ihre E-Mail Adresse"
+
+#: ../../mod/register.php:217
+msgid "Choose a password"
+msgstr "Passwort"
+
+#: ../../mod/register.php:218
+msgid "Please re-enter your password"
+msgstr "Bitte gib Dein Passwort noch einmal ein"
+
+#: ../../mod/rmagic.php:38
+msgid ""
+"We encountered a problem while logging in with the OpenID you provided. "
+"Please check the correct spelling of the ID."
+msgstr "Wir haben ein Problem mit der OpenID festgestellt, mit der Du Dich anmelden wolltest. Bitte überprüfe sie noch einmal."
+
+#: ../../mod/rmagic.php:38
+msgid "The error message was:"
+msgstr "Die Fehlermeldung war:"
+
+#: ../../mod/rmagic.php:42
+msgid "Authentication failed."
+msgstr "Authentifizierung fehlgeschlagen."
+
+#: ../../mod/rmagic.php:82
+msgid "Remote Authentication"
+msgstr "Entfernte Authentifizierung"
+
+#: ../../mod/rmagic.php:83
+msgid "Enter your channel address (e.g. channel@example.com)"
+msgstr "Deine Kanal-Adresse (z. B. channel@example.com)"
+
+#: ../../mod/rmagic.php:84
+msgid "Authenticate"
+msgstr "Authentifizieren"
#: ../../mod/poll.php:64
msgid "Poll"
@@ -8619,19 +8449,15 @@ msgstr "Ergebnisse"
msgid "No service class restrictions found."
msgstr "Keine Dienstklassenbeschränkungen gefunden."
-#: ../../mod/sharedwithme.php:94
+#: ../../mod/sharedwithme.php:99
msgid "Files: shared with me"
msgstr "Dateien, die mit mir geteilt wurden"
-#: ../../mod/sharedwithme.php:96
-msgid "NEW"
-msgstr "NEU"
-
-#: ../../mod/sharedwithme.php:99
+#: ../../mod/sharedwithme.php:103
msgid "Remove all files"
msgstr "Alle Dateien löschen"
-#: ../../mod/sharedwithme.php:100
+#: ../../mod/sharedwithme.php:104
msgid "Remove this file"
msgstr "Diese Datei löschen"
@@ -8649,94 +8475,95 @@ 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 "Theme-Einstellungen"
#: ../../view/theme/apw/php/config.php:260
+#: ../../view/theme/redbasic/php/config.php:103
msgid "Set scheme"
-msgstr "Schema festlegen"
+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 "Schriftgröße für Beiträge und Kommentare festlegen"
+msgstr "Schriftgröße für Beiträge und Kommentare"
#: ../../view/theme/apw/php/config.php:262
msgid "Set font face"
-msgstr "Schriftart festlegen"
+msgstr "Schriftart"
#: ../../view/theme/apw/php/config.php:263
msgid "Set iconset"
-msgstr "Symbolsatz festlegen"
+msgstr "Icon-Set"
#: ../../view/theme/apw/php/config.php:264
msgid "Set big shadow size, default 15px 15px 15px"
-msgstr "Ausmaß der großen Schatten festlegen (Voreinstellung 15px 15px 15px)"
+msgstr "Ausmaß der großen Schatten (Voreinstellung 15px 15px 15px)"
#: ../../view/theme/apw/php/config.php:265
msgid "Set small shadow size, default 5px 5px 5px"
-msgstr "Ausmaß der kleinen Schatten festlegen (Voreinstellung 5px 5px 5px)"
+msgstr "Ausmaß der kleinen Schatten (Voreinstellung 5px 5px 5px)"
#: ../../view/theme/apw/php/config.php:266
msgid "Set shadow color, default #000"
-msgstr "Schattenfarbe festlegen (Voreinstellung #000)"
+msgstr "Farbe der Schatten (Voreinstellung #000)"
#: ../../view/theme/apw/php/config.php:267
msgid "Set radius size, default 5px"
-msgstr "Eckenradius festlegen (Voreinstellung 5px)"
+msgstr "Ecken-Radius (Voreinstellung 5px)"
#: ../../view/theme/apw/php/config.php:268
msgid "Set line-height for posts and comments"
-msgstr "Zeilenhöhe in Beiträgen und Kommentaren festlegen"
+msgstr "Zeilenhöhe in Beiträgen und Kommentaren"
#: ../../view/theme/apw/php/config.php:269
msgid "Set background image"
-msgstr "Hintergrundbild festlegen"
+msgstr "Hintergrundbild"
#: ../../view/theme/apw/php/config.php:270
msgid "Set background attachment"
-msgstr "Hintergrunddatei festlegen"
+msgstr "Hintergrunddatei"
#: ../../view/theme/apw/php/config.php:271
msgid "Set background color"
-msgstr "Hintergrundfarbe festlegen"
+msgstr "Hintergrundfarbe"
#: ../../view/theme/apw/php/config.php:272
msgid "Set section background image"
-msgstr "Hintergrundbild für die Sektion v"
+msgstr "Hintergrundbild für die Section"
#: ../../view/theme/apw/php/config.php:273
msgid "Set section background color"
-msgstr "Hintergrundfarbe für die Sektion "
+msgstr "Hintergrundfarbe für die Section"
#: ../../view/theme/apw/php/config.php:274
msgid "Set color of items - use hex"
-msgstr "Farbe für Beiträge festlegen - Hex benutzen"
+msgstr "Farbe für Beiträge – Hex benutzen"
#: ../../view/theme/apw/php/config.php:275
msgid "Set color of links - use hex"
-msgstr "Farbe für Links festlegen - Hex benutzen"
+msgstr "Farbe für Links – Hex benutzen"
#: ../../view/theme/apw/php/config.php:276
msgid "Set max-width for items. Default 400px"
-msgstr "Maximale Breite von Beiträgen festlegen (Voreinstellung 400px)"
+msgstr "Maximale Breite von Beiträgen (Voreinstellung 400px)"
#: ../../view/theme/apw/php/config.php:277
msgid "Set min-width for items. Default 240px"
-msgstr "Minimale Breite von Beiträgen festlegen (Voreinstellung 240px)"
+msgstr "Minimale Breite von Beiträgen (Voreinstellung 240px)"
#: ../../view/theme/apw/php/config.php:278
msgid "Set the generic content wrapper width. Default 48%"
-msgstr "Breite des generischen Inhalt-Wrappers festlegen (Voreinstellung 48%)"
+msgstr "Breite des \"generic content wrapper\" (Voreinstellung 48%)"
#: ../../view/theme/apw/php/config.php:279
msgid "Set color of fonts - use hex"
-msgstr "Schriftfarbe festlegen - Hex benutzen"
+msgstr "Schriftfarbe – Hex benutzen"
#: ../../view/theme/apw/php/config.php:280
msgid "Set background-size element"
-msgstr "Größe des Hintergrundelements festlegen"
+msgstr "Größe des Hintergrund-Elements"
#: ../../view/theme/apw/php/config.php:281
msgid "Item opacity"
@@ -8760,11 +8587,11 @@ msgstr "Beitragsfluss"
#: ../../view/theme/apw/php/config.php:286
msgid "Left offset of the section element"
-msgstr "Linker Rand des Sektionelements"
+msgstr "Linker Rand des Section Elements"
#: ../../view/theme/apw/php/config.php:287
msgid "Right offset of the section element"
-msgstr "Rechter Rand des Sektionelements"
+msgstr "Rechter Rand des Section Elements"
#: ../../view/theme/apw/php/config.php:288
msgid "Section width"
@@ -8778,179 +8605,165 @@ msgstr "Linker Rand des Aside-Elements"
msgid "Right offset of the aside element"
msgstr "Rechter Rand des Aside-Elements"
-#: ../../view/theme/redbasic/php/config.php:82
+#: ../../view/theme/redbasic/php/config.php:84
msgid "Light (Red Matrix default)"
msgstr "Hell (RedMatrix-Voreinstellung)"
-#: ../../view/theme/redbasic/php/config.php:101
-msgid "Select scheme"
-msgstr "Schema wählen"
-
-#: ../../view/theme/redbasic/php/config.php:102
+#: ../../view/theme/redbasic/php/config.php:104
msgid "Narrow navbar"
msgstr "Schmale Navigationsleiste"
-#: ../../view/theme/redbasic/php/config.php:103
+#: ../../view/theme/redbasic/php/config.php:105
msgid "Navigation bar background color"
msgstr "Hintergrundfarbe der Navigationsleiste"
-#: ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:106
msgid "Navigation bar gradient top color"
msgstr "Farbverlauf der Navigationsleiste: Farbe oben"
-#: ../../view/theme/redbasic/php/config.php:105
+#: ../../view/theme/redbasic/php/config.php:107
msgid "Navigation bar gradient bottom color"
msgstr "Farbverlauf der Navigationsleiste: Farbe unten"
-#: ../../view/theme/redbasic/php/config.php:106
+#: ../../view/theme/redbasic/php/config.php:108
msgid "Navigation active button gradient top color"
msgstr "Navigations-Button aktiv: Farbe für Farbverlauf oben"
-#: ../../view/theme/redbasic/php/config.php:107
+#: ../../view/theme/redbasic/php/config.php:109
msgid "Navigation active button gradient bottom color"
msgstr "Navigations-Button aktiv: Farbe für Farbverlauf unten"
-#: ../../view/theme/redbasic/php/config.php:108
+#: ../../view/theme/redbasic/php/config.php:110
msgid "Navigation bar border color "
msgstr "Farbe für den Rand der Navigationsleiste"
-#: ../../view/theme/redbasic/php/config.php:109
+#: ../../view/theme/redbasic/php/config.php:111
msgid "Navigation bar icon color "
msgstr "Farbe für die Icons der Navigationsleiste"
-#: ../../view/theme/redbasic/php/config.php:110
+#: ../../view/theme/redbasic/php/config.php:112
msgid "Navigation bar active icon color "
msgstr "Farbe für aktive Icons der Navigationsleiste"
-#: ../../view/theme/redbasic/php/config.php:111
+#: ../../view/theme/redbasic/php/config.php:113
msgid "link color"
msgstr "Farbe für Links"
-#: ../../view/theme/redbasic/php/config.php:112
+#: ../../view/theme/redbasic/php/config.php:114
msgid "Set font-color for banner"
msgstr "Farbe der Schrift des Banners"
-#: ../../view/theme/redbasic/php/config.php:113
+#: ../../view/theme/redbasic/php/config.php:115
msgid "Set the background color"
-msgstr "Hintergrundfarbe festlegen"
+msgstr "Hintergrundfarbe"
-#: ../../view/theme/redbasic/php/config.php:114
+#: ../../view/theme/redbasic/php/config.php:116
msgid "Set the background image"
-msgstr "Hintergrundbild festlegen"
+msgstr "Hintergrundbild"
-#: ../../view/theme/redbasic/php/config.php:115
+#: ../../view/theme/redbasic/php/config.php:117
msgid "Set the background color of items"
-msgstr "Hintergrundfarbe für Beiträge festlegen"
+msgstr "Hintergrundfarbe für Beiträge"
-#: ../../view/theme/redbasic/php/config.php:116
+#: ../../view/theme/redbasic/php/config.php:118
msgid "Set the background color of comments"
-msgstr "Hintergrundfarbe für Kommentare festlegen"
+msgstr "Hintergrundfarbe für Kommentare"
-#: ../../view/theme/redbasic/php/config.php:117
+#: ../../view/theme/redbasic/php/config.php:119
msgid "Set the border color of comments"
-msgstr "Farbe des Randes von Kommentaren festlegen"
+msgstr "Farbe des Randes von Kommentaren"
-#: ../../view/theme/redbasic/php/config.php:118
+#: ../../view/theme/redbasic/php/config.php:120
msgid "Set the indent for comments"
-msgstr "Einzugsbreite für Kommentare festlegen"
+msgstr "Einzugsbreite für Kommentare"
-#: ../../view/theme/redbasic/php/config.php:119
+#: ../../view/theme/redbasic/php/config.php:121
msgid "Set the basic color for item icons"
-msgstr "Grundfarbe für Beitragssymbole festlegen"
+msgstr "Grundfarbe für Beitrags-Icons"
-#: ../../view/theme/redbasic/php/config.php:120
+#: ../../view/theme/redbasic/php/config.php:122
msgid "Set the hover color for item icons"
-msgstr "Farbe für Beitragssymbole unter dem Mauszeiger festlegen"
+msgstr "Farbe für Beitrags-Icons unter dem Mauszeiger"
-#: ../../view/theme/redbasic/php/config.php:121
+#: ../../view/theme/redbasic/php/config.php:123
msgid "Set font-size for the entire application"
-msgstr "Schriftgröße für die gesamte Anwendung festlegen"
+msgstr "Schriftgröße für die gesamte Anwendung"
-#: ../../view/theme/redbasic/php/config.php:121
-msgid "Example: 14px"
-msgstr "Beispiel: 14px"
-
-#: ../../view/theme/redbasic/php/config.php:123
+#: ../../view/theme/redbasic/php/config.php:125
msgid "Set font-color for posts and comments"
-msgstr "Schriftfarbe für Beiträge und Kommentare festlegen"
+msgstr "Schriftfarbe für Beiträge und Kommentare"
-#: ../../view/theme/redbasic/php/config.php:124
+#: ../../view/theme/redbasic/php/config.php:126
msgid "Set radius of corners"
-msgstr "Eckenradius festlegen"
+msgstr "Ecken-Radius"
-#: ../../view/theme/redbasic/php/config.php:125
+#: ../../view/theme/redbasic/php/config.php:127
msgid "Set shadow depth of photos"
-msgstr "Schattentiefe von Fotos festlegen"
-
-#: ../../view/theme/redbasic/php/config.php:126
-msgid "Set maximum width of content region in pixel"
-msgstr "Maximalbreite des Inhaltsbereichs in Pixel festlegen"
+msgstr "Schattentiefe von Fotos"
-#: ../../view/theme/redbasic/php/config.php:126
-msgid "Leave empty for default width"
-msgstr "Leer lassen für Standardbreite"
+#: ../../view/theme/redbasic/php/config.php:128
+msgid "Set maximum width of conversation regions"
+msgstr "Maximalbreite der Unterhaltungsbereiche"
-#: ../../view/theme/redbasic/php/config.php:127
-msgid "Center page content"
-msgstr "Seiteninhalt zentrieren"
+#: ../../view/theme/redbasic/php/config.php:129
+msgid "Center conversation regions"
+msgstr "Konversationsbereich zentrieren"
-#: ../../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 "Mindestdeckkraft der Navigationsleiste festlegen - zum Verstecken"
+msgstr "Mindest-Deckkraft der Navigationsleiste ( - versteckt sie)"
-#: ../../view/theme/redbasic/php/config.php:129
+#: ../../view/theme/redbasic/php/config.php:131
msgid "Set size of conversation author photo"
-msgstr "Größe der Avatare von Themenstartern festlegen"
+msgstr "Größe der Avatare von Themenstartern"
-#: ../../view/theme/redbasic/php/config.php:130
+#: ../../view/theme/redbasic/php/config.php:132
msgid "Set size of followup author photos"
-msgstr "Größe der Avatare von Kommentatoren festlegen"
+msgstr "Größe der Avatare von Kommentatoren"
+
+#: ../../view/theme/redbasic/php/config.php:133
+msgid "Sloppy photo albums"
+msgstr "Schräge Fotoalben"
+
+#: ../../view/theme/redbasic/php/config.php:133
+msgid "Are you a clean desk or a messy desk person?"
+msgstr "Bist Du jemand, der einen aufgeräumten Schreibtisch hat, oder eher einen chaotischen?"
-#: ../../boot.php:1345
+#: ../../boot.php:1357
#, php-format
msgid "Update %s failed. See error logs."
msgstr "Aktualisierung %s fehlgeschlagen. Details in den Fehlerprotokollen."
-#: ../../boot.php:1348
+#: ../../boot.php:1360
#, php-format
msgid "Update Error at %s"
msgstr "Aktualisierungsfehler auf %s"
-#: ../../boot.php:1515
+#: ../../boot.php:1527
msgid ""
"Create an account to access services and applications within the Red Matrix"
msgstr "Erstelle einen Account, um Anwendungen und Dienste innerhalb der Red-Matrix verwenden zu können."
-#: ../../boot.php:1543
+#: ../../boot.php:1555
msgid "Password"
msgstr "Kennwort"
-#: ../../boot.php:1544
+#: ../../boot.php:1556
msgid "Remember me"
msgstr "Angaben speichern"
-#: ../../boot.php:1547
+#: ../../boot.php:1559
msgid "Forgot your password?"
msgstr "Passwort vergessen?"
-#: ../../boot.php:2166
-msgid "toggle mobile"
-msgstr "auf/von mobile Ansicht wechseln"
+#: ../../boot.php:1674
+msgid "permission denied"
+msgstr "Zugriff verweigert"
-#: ../../boot.php:2301
-msgid "Website SSL certificate is not valid. Please correct."
-msgstr "Das SSL-Zertifikat der Website ist nicht gültig. Bitte beheben."
+#: ../../boot.php:1675
+msgid "Got Zot?"
+msgstr "Haste schon Zot?"
-#: ../../boot.php:2304
-#, php-format
-msgid "[red] Website SSL error for %s"
-msgstr "[red] Website-SSL-Fehler für %s"
-
-#: ../../boot.php:2341
-msgid "Cron/Scheduled tasks not running."
-msgstr "Cron-Aufgaben laufen nicht."
-
-#: ../../boot.php:2345
-#, php-format
-msgid "[red] Cron tasks not running on %s"
-msgstr "[red] Cron-Aufgaben für %s laufen nicht"
+#: ../../boot.php:2158
+msgid "toggle mobile"
+msgstr "auf/von mobile Ansicht wechseln"
diff --git a/view/de/strings.php b/view/de/strings.php
index 91305a003..2679e9eb1 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -7,58 +7,15 @@ function string_plural_select_de($n){
;
$a->strings["Cannot locate DNS info for database server '%s'"] = "Kann die DNS-Informationen für den Datenbank-Server '%s' nicht finden";
$a->strings["Profile Photos"] = "Profilfotos";
-$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."] = "Das Security-Token des Formulars war nicht korrekt. Das ist wahrscheinlich passiert, weil das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde.";
+$a->strings["Permission denied."] = "Zugang verweigert";
+$a->strings["Image exceeds website size limit of %lu bytes"] = "Bild überschreitet das Limit der Webseite von %lu bytes";
+$a->strings["Image file is empty."] = "Bilddatei ist leer.";
+$a->strings["Unable to process image"] = "Kann Bild nicht verarbeiten";
+$a->strings["Photo storage failed."] = "Foto speichern schlug fehl";
+$a->strings["Photo Albums"] = "Fotoalben";
+$a->strings["Upload New Photos"] = "Lade neue Fotos hoch";
$a->strings["created a new post"] = "Neuer Beitrag wurde erzeugt";
$a->strings["commented on %s's post"] = "hat %s's Beitrag kommentiert";
-$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."] = "Es hat früher schon einmal eine Sammlung mit diesem Namen existiert, die gelöscht wurde. Es <strong>könnten</strong> von damals noch Elemente (Beiträge, Dateien etc.) vorhanden sein, die allen jetzigen und zukünftigen Mitgliedern dieser Sammlung den Zugriff erlauben. Wenn das nicht Dein Plan war, erstelle bitte eine neue Sammlung mit einem anderen Namen.";
-$a->strings["Default privacy group for new contacts"] = "Standard-Sammlung für neue Kontakte";
-$a->strings["All Channels"] = "Alle Kanäle";
-$a->strings["edit"] = "Bearbeiten";
-$a->strings["Collections"] = "Sammlungen";
-$a->strings["Edit collection"] = "Sammlung bearbeiten";
-$a->strings["Add new collection"] = "Neue Sammlung hinzufügen";
-$a->strings["Channels not in any collection"] = "Kanäle, die nicht in einer Sammlung sind";
-$a->strings["add"] = "hinzufügen";
-$a->strings["Not a valid email address"] = "Ungültige E-Mail-Adresse";
-$a->strings["Your email domain is not among those allowed on this site"] = "Deine E-Mail-Adresse ist dieser Seite nicht erlaubt";
-$a->strings["Your email address is already registered at this site."] = "Deine E-Mail-Adresse ist auf dieser Seite bereits registriert.";
-$a->strings["An invitation is required."] = "Eine Einladung ist erforderlich.";
-$a->strings["Invitation could not be verified."] = "Die Einladung konnte nicht bestätigt werden";
-$a->strings["Please enter the required information."] = "Bitte gib die erforderlichen Informationen ein.";
-$a->strings["Failed to store account information."] = "Speichern der Account-Informationen fehlgeschlagen";
-$a->strings["Registration confirmation for %s"] = "Registrierungsbestätigung für %s";
-$a->strings["Registration request at %s"] = "Registrierungsanfrage auf %s";
-$a->strings["Administrator"] = "Administrator";
-$a->strings["your registration password"] = "Dein Registrierungspasswort";
-$a->strings["Registration details for %s"] = "Registrierungsdetails für %s";
-$a->strings["Account approved."] = "Account bestätigt.";
-$a->strings["Registration revoked for %s"] = "Registrierung für %s widerrufen";
-$a->strings["Account verified. Please login."] = "Konto geprüft. Bitte melde Dich an!";
-$a->strings["Click here to upgrade."] = "Klicke hier, um das Upgrade durchzuführen.";
-$a->strings["This action exceeds the limits set by your subscription plan."] = "Diese Aktion überschreitet die Grenzen Ihres Abonnements.";
-$a->strings["This action is not available under your subscription plan."] = "Diese Aktion ist in Ihrem Abonnement nicht verfügbar.";
-$a->strings["Miscellaneous"] = "Verschiedenes";
-$a->strings["YYYY-MM-DD or MM-DD"] = "JJJJ-MM-TT oder MM-TT";
-$a->strings["Required"] = "Erforderlich";
-$a->strings["never"] = "Nie";
-$a->strings["less than a second ago"] = "Vor weniger als einer Sekunde";
-$a->strings["year"] = "Jahr";
-$a->strings["years"] = "Jahre";
-$a->strings["month"] = "Monat";
-$a->strings["months"] = "Monate";
-$a->strings["week"] = "Woche";
-$a->strings["weeks"] = "Wochen";
-$a->strings["day"] = "Tag";
-$a->strings["days"] = "Tage";
-$a->strings["hour"] = "Stunde";
-$a->strings["hours"] = "Stunden";
-$a->strings["minute"] = "Minute";
-$a->strings["minutes"] = "Minuten";
-$a->strings["second"] = "Sekunde";
-$a->strings["seconds"] = "Sekunden";
-$a->strings["__ctx:e.g. 22 hours ago, 1 minute ago__ %1\$d %2\$s ago"] = "vor %1\$d %2\$s";
-$a->strings["%1\$s's birthday"] = "%1\$ss Geburtstag";
-$a->strings["Happy Birthday %1\$s"] = "Alles Gute zum Geburtstag, %1\$s";
$a->strings["New Page"] = "Neue Seite";
$a->strings["Edit"] = "Bearbeiten";
$a->strings["View"] = "Ansicht";
@@ -68,143 +25,6 @@ $a->strings["Page Link"] = "Seiten-Link";
$a->strings["Title"] = "Titel";
$a->strings["Created"] = "Erstellt";
$a->strings["Edited"] = "Geändert";
-$a->strings["Public Timeline"] = "Öffentliche Zeitleiste";
-$a->strings["Default"] = "Standard";
-$a->strings["Directory Options"] = "Verzeichnisoptionen";
-$a->strings["Alphabetic"] = "alphabetisch";
-$a->strings["Reverse Alphabetic"] = "Entgegengesetzt alphabetisch";
-$a->strings["Newest to Oldest"] = "Neueste zuerst";
-$a->strings["Oldest to Newest"] = "Älteste zuerst";
-$a->strings["Sort"] = "Sortieren";
-$a->strings["Safe Mode"] = "Sicherer Modus";
-$a->strings["Public Forums Only"] = "Nur öffentliche Foren";
-$a->strings["This Website Only"] = "Nur diese Website";
-$a->strings["l F d, Y \\@ g:i A"] = "l, d. F Y, H:i";
-$a->strings["Starts:"] = "Beginnt:";
-$a->strings["Finishes:"] = "Endet:";
-$a->strings["Location:"] = "Ort:";
-$a->strings["This event has been added to your calendar."] = "Dieser Termin wurde zu Deinem Kalender hinzugefügt";
-$a->strings["Delete this item?"] = "Dieses Element löschen?";
-$a->strings["Comment"] = "Kommentar";
-$a->strings["[+] show all"] = "[+] Alle anzeigen";
-$a->strings["[-] show less"] = "[-] Weniger anzeigen";
-$a->strings["[+] expand"] = "[+] aufklappen";
-$a->strings["[-] collapse"] = "[-] einklappen";
-$a->strings["Password too short"] = "Kennwort zu kurz";
-$a->strings["Passwords do not match"] = "Kennwörter stimmen nicht überein";
-$a->strings["everybody"] = "alle";
-$a->strings["Secret Passphrase"] = "geheime Passphrase";
-$a->strings["Passphrase hint"] = "Hinweis zur Passphrase";
-$a->strings["Notice: Permissions have changed but have not yet been submitted."] = "Achtung: Berechtigungen wurden verändert, aber noch nicht gespeichert.";
-$a->strings["close all"] = "Alle schließen";
-$a->strings["Nothing new here"] = "Nichts Neues hier";
-$a->strings["Rate This Channel (this is public)"] = "Diesen Kanal bewerten (öffentlich sichtbar)";
-$a->strings["Rating"] = "Bewertung";
-$a->strings["Describe (optional)"] = "Beschreibung (optional)";
-$a->strings["Submit"] = "Bestätigen";
-$a->strings["Please enter a link URL"] = "Bitte geben Sie eine Link-URL ein";
-$a->strings["Unsaved changes. Are you sure you wish to leave this page?"] = "Ungespeicherte Änderungen. Sind Sie sicher, dass Sie diese Seite verlassen möchten?";
-$a->strings["timeago.prefixAgo"] = "timeago.prefixAgo";
-$a->strings["timeago.prefixFromNow"] = " ";
-$a->strings["ago"] = "her";
-$a->strings["from now"] = "von jetzt";
-$a->strings["less than a minute"] = "weniger als eine Minute";
-$a->strings["about a minute"] = "ungefähr eine Minute";
-$a->strings["%d minutes"] = "%d Minuten";
-$a->strings["about an hour"] = "ungefähr eine Stunde";
-$a->strings["about %d hours"] = "ungefähr %d Stunden";
-$a->strings["a day"] = "ein Tag";
-$a->strings["%d days"] = "%d Tage";
-$a->strings["about a month"] = "ungefähr ein Monat";
-$a->strings["%d months"] = "%d Monate";
-$a->strings["about a year"] = "ungefähr ein Jahr";
-$a->strings["%d years"] = "%d Jahre";
-$a->strings[" "] = " ";
-$a->strings["timeago.numbers"] = "timeago.numbers";
-$a->strings["parent"] = "Übergeordnetes Verzeichnis";
-$a->strings["Collection"] = "Ordner";
-$a->strings["Principal"] = "Prinzipal";
-$a->strings["Addressbook"] = "Adressbuch";
-$a->strings["Calendar"] = "Kalender";
-$a->strings["Schedule Inbox"] = "Posteingang für überwachte Kalender";
-$a->strings["Schedule Outbox"] = "Postausgang für überwachte Kalender";
-$a->strings["Unknown"] = "Unbekannt";
-$a->strings["%1\$s used"] = "%1\$s verwendet";
-$a->strings["%1\$s used of %2\$s (%3\$s&#37;)"] = "%1\$s von %2\$s verwendet (%3\$s&#37;)";
-$a->strings["Files"] = "Dateien";
-$a->strings["Total"] = "Summe";
-$a->strings["Shared"] = "Geteilt";
-$a->strings["Create"] = "Erstelle";
-$a->strings["Upload"] = "Hochladen";
-$a->strings["Name"] = "Name";
-$a->strings["Type"] = "Typ";
-$a->strings["Size"] = "Größe";
-$a->strings["Last Modified"] = "Zuletzt geändert";
-$a->strings["Delete"] = "Löschen";
-$a->strings["Create new folder"] = "Neuen Ordner anlegen";
-$a->strings["Upload file"] = "Datei hochladen";
-$a->strings["%1\$s's bookmarks"] = "%1\$ss Lesezeichen";
-$a->strings["view full size"] = "In Vollbildansicht anschauen";
-$a->strings["General Features"] = "Allgemeine Funktionen";
-$a->strings["Content Expiration"] = "Verfall von Inhalten";
-$a->strings["Remove posts/comments and/or private messages at a future time"] = "Lösche Beiträge, Kommentare und/oder private Nachrichten automatisch zu einem zukünftigen Datum.";
-$a->strings["Multiple Profiles"] = "Mehrfachprofile";
-$a->strings["Ability to create multiple profiles"] = "Mehrfachprofile anlegen können";
-$a->strings["Advanced Profiles"] = "Erweiterte Profile";
-$a->strings["Additional profile sections and selections"] = "Stellt zusätzliche Bereiche und Felder im Profil zur Verfügung";
-$a->strings["Profile Import/Export"] = "Profil-Import/Export";
-$a->strings["Save and load profile details across sites/channels"] = "Speichere Dein Profil, um es in einen anderen Kanal zu importieren";
-$a->strings["Web Pages"] = "Webseiten";
-$a->strings["Provide managed web pages on your channel"] = "Stelle verwaltete Webseiten in Deinem Kanal zur Verfügung";
-$a->strings["Private Notes"] = "Private Notizen";
-$a->strings["Enables a tool to store notes and reminders"] = "Aktiviert ein Werkzeug zum Speichern von Notizen und Erinnerungen";
-$a->strings["Navigation Channel Select"] = "Kanal-Auswahl in der Navigationsleiste";
-$a->strings["Change channels directly from within the navigation dropdown menu"] = "Wechsle direkt über das Navigationsmenü zu anderen Kanälen";
-$a->strings["Photo Location"] = "Aufnahmeort";
-$a->strings["If location data is available on uploaded photos, link this to a map."] = "Aufnahmeort auf einer Karte verlinken, falls verfügbar.";
-$a->strings["Expert Mode"] = "Expertenmodus";
-$a->strings["Enable Expert Mode to provide advanced configuration options"] = "Aktiviere den Expertenmodus, um fortgeschrittene Konfigurationsoptionen zu aktivieren";
-$a->strings["Premium Channel"] = "Premium-Kanal";
-$a->strings["Allows you to set restrictions and terms on those that connect with your channel"] = "Ermöglicht es, Einschränkungen und Bedingungen für Verbindungen dieses Kanals festzulegen";
-$a->strings["Post Composition Features"] = "Nachbearbeitungsfunktionen";
-$a->strings["Use Markdown"] = "Markdown benutzen";
-$a->strings["Allow use of \"Markdown\" to format posts"] = "Erlaube die Verwendung von \"Markdown\"-Syntax zur Formatierung von Beiträgen";
-$a->strings["Large Photos"] = "Große Fotos";
-$a->strings["Include large (640px) photo thumbnails in posts. If not enabled, use small (320px) photo thumbnails"] = "Große Vorschaubilder (640px) in Beiträgen anzeigen. Ist das deaktiviert, werden kleine Vorschaubilder (320px) angezeigt.";
-$a->strings["Channel Sources"] = "Kanal-Quellen";
-$a->strings["Automatically import channel content from other channels or feeds"] = "Importiere automatisch Inhalte für diesen Kanal von anderen Kanälen oder Feeds";
-$a->strings["Even More Encryption"] = "Noch mehr Verschlüsselung";
-$a->strings["Allow optional encryption of content end-to-end with a shared secret key"] = "Erlaube optionale Verschlüsselung von Inhalten (Ende-zu-Ende mit geteiltem Sicherheitsschlüssel)";
-$a->strings["Enable voting tools"] = "Umfragewerkzeuge aktivieren";
-$a->strings["Provide a class of post which others can vote on"] = "Aktiviere die Umfragewerkzeuge, um anderen die Möglichkeit zu geben, Deinem Beitrag zuzustimmen, ihn abzulehnen oder sich zu enthalten. (Muss im Beitrag selbst noch aktiviert werden.)";
-$a->strings["Network and Stream Filtering"] = "Netzwerk- und Stream-Filter";
-$a->strings["Search by Date"] = "Suche nach Datum";
-$a->strings["Ability to select posts by date ranges"] = "Möglichkeit, Beiträge nach Zeiträumen auszuwählen";
-$a->strings["Collections Filter"] = "Filter für Sammlung";
-$a->strings["Enable widget to display Network posts only from selected collections"] = "Aktiviere nur Netzwerk-Beiträge von ausgewählten Sammlungen";
-$a->strings["Saved Searches"] = "Gespeicherte Suchanfragen";
-$a->strings["Save search terms for re-use"] = "Suchbegriffe zur Wiederverwendung abspeichern";
-$a->strings["Network Personal Tab"] = "Persönlicher Netzwerkreiter";
-$a->strings["Enable tab to display only Network posts that you've interacted on"] = "Aktiviere Reiter nur für die Netzwerk-Beiträge, mit denen Du interagiert hast";
-$a->strings["Network New Tab"] = "Netzwerkreiter Neu";
-$a->strings["Enable tab to display all new Network activity"] = "Aktiviere Reiter, um alle neuen Netzwerkaktivitäten zu zeigen";
-$a->strings["Affinity Tool"] = "Beziehungswerkzeug";
-$a->strings["Filter stream activity by depth of relationships"] = "Filter Aktivitätenstream nach Tiefe der Beziehung";
-$a->strings["Suggest Channels"] = "Kanäle vorschlagen";
-$a->strings["Show channel suggestions"] = "Kanalvorschläge anzeigen";
-$a->strings["Post/Comment Tools"] = "Beitrag-/Kommentarwerkzeuge";
-$a->strings["Tagging"] = "Verschlagworten";
-$a->strings["Ability to tag existing posts"] = "Möglichkeit, um existierende Beiträge zu verschlagworten";
-$a->strings["Post Categories"] = "Beitrags-Kategorien";
-$a->strings["Add categories to your posts"] = "Kategorien für Beiträge";
-$a->strings["Saved Folders"] = "Gespeicherte Ordner";
-$a->strings["Ability to file posts under folders"] = "Möglichkeit, Beiträge in Verzeichnissen zu sammeln";
-$a->strings["Dislike Posts"] = "Gefällt-mir-nicht Beiträge";
-$a->strings["Ability to dislike posts/comments"] = "„Gefällt mir nicht“ ermöglichen";
-$a->strings["Star Posts"] = "Beiträge mit Sternchen versehen";
-$a->strings["Ability to mark special posts with a star indicator"] = "Möglichkeit, spezielle Beiträge mit Sternchen-Symbol zu markieren";
-$a->strings["Tag Cloud"] = "Schlagwort-Wolke";
-$a->strings["Provide a personal tag cloud on your channel page"] = "Persönliche Schlagwort-Wolke auf Deiner Kanal-Seite anzeigen";
$a->strings["Categories"] = "Kategorien";
$a->strings["Apps"] = "Apps";
$a->strings["System"] = "System";
@@ -222,14 +42,19 @@ $a->strings["Example: bob@example.com, http://example.com/barbara"] = "Beispiel:
$a->strings["Notes"] = "Notizen";
$a->strings["Save"] = "Speichern";
$a->strings["Remove term"] = "Eintrag löschen";
+$a->strings["Saved Searches"] = "Gespeicherte Suchanfragen";
+$a->strings["add"] = "hinzufügen";
+$a->strings["Saved Folders"] = "Gespeicherte Ordner";
$a->strings["Everything"] = "Alles";
$a->strings["Archives"] = "Archive";
+$a->strings["Refresh"] = "Aktualisieren";
$a->strings["Me"] = "Ich";
-$a->strings["Family"] = "Familie";
+$a->strings["Best Friends"] = "Beste Freunde";
$a->strings["Friends"] = "Freunde";
+$a->strings["Co-workers"] = "Kollegen";
+$a->strings["Former Friends"] = "ehem. Freunde";
$a->strings["Acquaintances"] = "Bekannte";
-$a->strings["All"] = "Alle";
-$a->strings["Refresh"] = "Aktualisieren";
+$a->strings["Everybody"] = "Jeder";
$a->strings["Account settings"] = "Konto-Einstellungen";
$a->strings["Channel settings"] = "Kanal-Einstellungen";
$a->strings["Additional features"] = "Zusätzliche Funktionen";
@@ -239,6 +64,7 @@ $a->strings["Connected apps"] = "Verbundene Apps";
$a->strings["Export channel"] = "Kanal exportieren";
$a->strings["Connection Default Permissions"] = "Standardzugriffsrechte für neue Verbindungen:";
$a->strings["Premium Channel Settings"] = "Premium-Kanal-Einstellungen";
+$a->strings["Channel Sources"] = "Kanal-Quellen";
$a->strings["Settings"] = "Einstellungen";
$a->strings["Messages"] = "Nachrichten";
$a->strings["Check Mail"] = "E-Mails abrufen";
@@ -290,99 +116,6 @@ $a->strings["Name:"] = "Name:";
$a->strings["Photo:"] = "Foto:";
$a->strings["Please visit %s to approve or reject the suggestion."] = "Bitte besuche %s um den Vorschlag zu akzeptieren oder abzulehnen.";
$a->strings["[Red:Notify]"] = "[Red:Benachrichtigung]";
-$a->strings["Frequently"] = "Häufig";
-$a->strings["Hourly"] = "Stündlich";
-$a->strings["Twice daily"] = "Zwei Mal am Tag";
-$a->strings["Daily"] = "Täglich";
-$a->strings["Weekly"] = "Wöchentlich";
-$a->strings["Monthly"] = "Monatlich";
-$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."] = "Kein Empfänger angegeben";
-$a->strings["[no subject]"] = "[no subject]";
-$a->strings["Unable to determine sender."] = "Kann Absender nicht bestimmen.";
-$a->strings["Stored post could not be verified."] = "Gespeicherter Beitrag konnten nicht überprüft werden.";
-$a->strings["Channel is blocked on this site."] = "Der Kanal ist auf dieser Seite blockiert ";
-$a->strings["Channel location missing."] = "Adresse des Kanals fehlt.";
-$a->strings["Response from remote channel was incomplete."] = "Antwort des entfernten Kanals war unvollständig.";
-$a->strings["Channel was deleted and no longer exists."] = "Kanal wurde gelöscht und existiert nicht mehr.";
-$a->strings["Protocol disabled."] = "Protokoll deaktiviert.";
-$a->strings["Channel discovery failed."] = "Kanalsuche fehlgeschlagen";
-$a->strings["local account not found."] = "Lokales Konto nicht gefunden.";
-$a->strings["Cannot connect to yourself."] = "Du kannst Dich nicht mit Dir selbst verbinden.";
-$a->strings["Private Message"] = "Private Nachricht";
-$a->strings["Select"] = "Auswählen";
-$a->strings["Save to Folder"] = "In Ordner speichern";
-$a->strings["I will attend"] = "Ich werde teilnehmen";
-$a->strings["I will not attend"] = "Ich werde nicht teilnehmen";
-$a->strings["I might attend"] = "Ich werde vielleicht teilnehmen";
-$a->strings["I agree"] = "Ich stimme zu";
-$a->strings["I disagree"] = "Ich lehne ab";
-$a->strings["I abstain"] = "Ich enthalte mich";
-$a->strings["View all"] = "Alles anzeigen";
-$a->strings["__ctx:noun__ Like"] = array(
- 0 => "Gefällt mir",
- 1 => "Gefällt mir",
-);
-$a->strings["__ctx:noun__ Dislike"] = array(
- 0 => "Gefällt nicht",
- 1 => "Gefällt nicht",
-);
-$a->strings["Add Star"] = "Stern hinzufügen";
-$a->strings["Remove Star"] = "Stern entfernen";
-$a->strings["Toggle Star Status"] = "Markierungsstatus (Stern) umschalten";
-$a->strings["starred"] = "markiert";
-$a->strings["Message signature validated"] = "Signatur überprüft";
-$a->strings["Message signature incorrect"] = "Signatur nicht korrekt";
-$a->strings["Add Tag"] = "Tag hinzufügen";
-$a->strings["I like this (toggle)"] = "Mir gefällt das (Umschalter)";
-$a->strings["like"] = "mag";
-$a->strings["I don't like this (toggle)"] = "Mir gefällt das nicht (Umschalter)";
-$a->strings["dislike"] = "verurteile";
-$a->strings["Share This"] = "Teilen";
-$a->strings["share"] = "Teilen";
-$a->strings["%d comment"] = array(
- 0 => "%d Kommentar",
- 1 => "%d Kommentare",
-);
-$a->strings["View %s's profile - %s"] = "Schaue Dir %ss Profil an – %s";
-$a->strings["to"] = "an";
-$a->strings["via"] = "via";
-$a->strings["Wall-to-Wall"] = "Wall-to-Wall";
-$a->strings["via Wall-To-Wall:"] = "via Wall-To-Wall:";
-$a->strings["from %s"] = "via %s";
-$a->strings["last edited: %s"] = "zuletzt bearbeitet: %s";
-$a->strings["Expires: %s"] = "Verfällt: %s";
-$a->strings["Save Bookmarks"] = "Favoriten speichern";
-$a->strings["Add to Calendar"] = "Zum Kalender hinzufügen";
-$a->strings["Mark all seen"] = "Alle als gelesen markieren";
-$a->strings["__ctx:noun__ Likes"] = "Gefällt mir";
-$a->strings["__ctx:noun__ Dislikes"] = "Gefällt nicht";
-$a->strings["Close"] = "Schließen";
-$a->strings["Please wait"] = "Bitte warten";
-$a->strings["This is you"] = "Das bist Du";
-$a->strings["Bold"] = "Fett";
-$a->strings["Italic"] = "Kursiv";
-$a->strings["Underline"] = "Unterstrichen";
-$a->strings["Quote"] = "Zitat";
-$a->strings["Code"] = "Code";
-$a->strings["Image"] = "Bild";
-$a->strings["Insert Link"] = "Link einfügen";
-$a->strings["Video"] = "Video";
-$a->strings["Encrypt text"] = "Text verschlüsseln";
-$a->strings["New window"] = "Neues Fenster";
-$a->strings["Open the selected location in a different window or browser tab"] = "Öffne die markierte Adresse in einem neuen Browser Fenster oder Tab";
-$a->strings["User '%s' deleted"] = "Benutzer '%s' gelöscht";
-$a->strings["Attachments:"] = "Anhänge:";
-$a->strings["Redmatrix event notification:"] = "RedMatrix Termin-Benachrichtigung:";
$a->strings["prev"] = "vorherige";
$a->strings["first"] = "erste";
$a->strings["last"] = "letzte";
@@ -454,21 +187,296 @@ $a->strings["remove category"] = "Kategorie entfernen";
$a->strings["remove from file"] = "aus der Datei entfernen";
$a->strings["Click to open/close"] = "Klicke zum Öffnen/Schließen";
$a->strings["Link to Source"] = "Link zur Quelle";
+$a->strings["Select a page layout: "] = "Ein Seiten-Layout auswählen:";
$a->strings["default"] = "Standard";
-$a->strings["Page layout"] = "Seitengestaltung";
-$a->strings["You can create your own with the layouts tool"] = "Mit dem Layouts-Werkzeug kannst Du Deine eigenen Layouts erstellen";
-$a->strings["Page content type"] = "Art des Seiteninhalts";
+$a->strings["Page content type: "] = "Content-Typ der Seite:";
$a->strings["Select an alternate language"] = "Wähle eine alternative Sprache";
$a->strings["photo"] = "Foto";
$a->strings["event"] = "Termin";
$a->strings["status"] = "Status";
$a->strings["comment"] = "Kommentar";
$a->strings["activity"] = "Aktivität";
-$a->strings["Design Tools"] = "Gestaltungswerkzeuge";
+$a->strings["Design"] = "Design";
$a->strings["Blocks"] = "Blöcke";
$a->strings["Menus"] = "Menüs";
-$a->strings["Layouts"] = "Gestaltungen";
+$a->strings["Layouts"] = "Layouts";
$a->strings["Pages"] = "Seiten";
+$a->strings["Collection"] = "Ordner";
+$a->strings["Item was not found."] = "Beitrag wurde nicht gefunden.";
+$a->strings["No source file."] = "Keine Quelldatei.";
+$a->strings["Cannot locate file to replace"] = "Kann Datei zum Ersetzen nicht finden";
+$a->strings["Cannot locate file to revise/update"] = "Kann Datei zum Prüfen/Aktualisieren nicht finden";
+$a->strings["File exceeds size limit of %d"] = "Datei überschreitet das Größen-Limit von %d";
+$a->strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Die Größe Deiner Datei-Anhänge hat das Maximum von %1$.0f MByte erreicht.";
+$a->strings["File upload failed. Possible system limit or action terminated."] = "Datei-Upload fehlgeschlagen. Mögliche Systembegrenzung oder abgebrochener Prozess.";
+$a->strings["Stored file could not be verified. Upload failed."] = "Gespeichert Datei konnte nicht verifiziert werden. Upload abgebrochen.";
+$a->strings["Path not available."] = "Pfad nicht verfügbar.";
+$a->strings["Empty pathname"] = "Leere Pfadangabe";
+$a->strings["duplicate filename or path"] = "doppelter Dateiname oder Pfad";
+$a->strings["Path not found."] = "Pfad nicht gefunden.";
+$a->strings["mkdir failed."] = "mkdir fehlgeschlagen.";
+$a->strings["database storage failed."] = "Speichern in der Datenbank fehlgeschlagen.";
+$a->strings["Delete this item?"] = "Dieses Element löschen?";
+$a->strings["Comment"] = "Kommentar";
+$a->strings["[+] show all"] = "[+] Alle anzeigen";
+$a->strings["[-] show less"] = "[-] Weniger anzeigen";
+$a->strings["[+] expand"] = "[+] aufklappen";
+$a->strings["[-] collapse"] = "[-] einklappen";
+$a->strings["Password too short"] = "Kennwort zu kurz";
+$a->strings["Passwords do not match"] = "Kennwörter stimmen nicht überein";
+$a->strings["everybody"] = "alle";
+$a->strings["Secret Passphrase"] = "geheime Passphrase";
+$a->strings["Passphrase hint"] = "Hinweis zur Passphrase";
+$a->strings["Notice: Permissions have changed but have not yet been submitted."] = "Achtung: Berechtigungen wurden verändert, aber noch nicht gespeichert.";
+$a->strings["close all"] = "Alle schließen";
+$a->strings["Nothing new here"] = "Nichts Neues hier";
+$a->strings["Rate This Channel (this is public)"] = "Diesen Kanal bewerten (öffentlich sichtbar)";
+$a->strings["Rating"] = "Bewertung";
+$a->strings["Describe (optional)"] = "Beschreibung (optional)";
+$a->strings["Submit"] = "Bestätigen";
+$a->strings["timeago.prefixAgo"] = "timeago.prefixAgo";
+$a->strings["timeago.prefixFromNow"] = " ";
+$a->strings["ago"] = "her";
+$a->strings["from now"] = "von jetzt";
+$a->strings["less than a minute"] = "weniger als eine Minute";
+$a->strings["about a minute"] = "ungefähr eine Minute";
+$a->strings["%d minutes"] = "%d Minuten";
+$a->strings["about an hour"] = "ungefähr eine Stunde";
+$a->strings["about %d hours"] = "ungefähr %d Stunden";
+$a->strings["a day"] = "ein Tag";
+$a->strings["%d days"] = "%d Tage";
+$a->strings["about a month"] = "ungefähr ein Monat";
+$a->strings["%d months"] = "%d Monate";
+$a->strings["about a year"] = "ungefähr ein Jahr";
+$a->strings["%d years"] = "%d Jahre";
+$a->strings[" "] = " ";
+$a->strings["timeago.numbers"] = "timeago.numbers";
+$a->strings["parent"] = "Übergeordnetes Verzeichnis";
+$a->strings["Principal"] = "Prinzipal";
+$a->strings["Addressbook"] = "Adressbuch";
+$a->strings["Calendar"] = "Kalender";
+$a->strings["Schedule Inbox"] = "Posteingang für überwachte Kalender";
+$a->strings["Schedule Outbox"] = "Postausgang für überwachte Kalender";
+$a->strings["Unknown"] = "Unbekannt";
+$a->strings["%1\$s used"] = "%1\$s verwendet";
+$a->strings["%1\$s used of %2\$s (%3\$s&#37;)"] = "%1\$s von %2\$s verwendet (%3\$s&#37;)";
+$a->strings["Files"] = "Dateien";
+$a->strings["Total"] = "Summe";
+$a->strings["Shared"] = "Geteilt";
+$a->strings["Create"] = "Erstelle";
+$a->strings["Upload"] = "Hochladen";
+$a->strings["Name"] = "Name";
+$a->strings["Type"] = "Typ";
+$a->strings["Size"] = "Größe";
+$a->strings["Last Modified"] = "Zuletzt geändert";
+$a->strings["Delete"] = "Löschen";
+$a->strings["Create new folder"] = "Neuen Ordner anlegen";
+$a->strings["Upload file"] = "Datei hochladen";
+$a->strings["%1\$s's bookmarks"] = "%1\$ss Lesezeichen";
+$a->strings["Tags"] = "Schlagwörter";
+$a->strings["Keywords"] = "Schlüsselwörter";
+$a->strings["have"] = "habe";
+$a->strings["has"] = "hat";
+$a->strings["want"] = "will";
+$a->strings["wants"] = "will";
+$a->strings["like"] = "mag";
+$a->strings["likes"] = "gefällt";
+$a->strings["dislike"] = "verurteile";
+$a->strings["dislikes"] = "missfällt";
+$a->strings["__ctx:noun__ Like"] = array(
+ 0 => "Gefällt mir",
+ 1 => "Gefällt mir",
+);
+$a->strings["General Features"] = "Allgemeine Funktionen";
+$a->strings["Content Expiration"] = "Verfall von Inhalten";
+$a->strings["Remove posts/comments and/or private messages at a future time"] = "Lösche Beiträge, Kommentare und/oder private Nachrichten automatisch zu einem zukünftigen Datum.";
+$a->strings["Multiple Profiles"] = "Mehrfachprofile";
+$a->strings["Ability to create multiple profiles"] = "Mehrfachprofile anlegen können";
+$a->strings["Advanced Profiles"] = "Erweiterte Profile";
+$a->strings["Additional profile sections and selections"] = "Stellt zusätzliche Bereiche und Felder im Profil zur Verfügung";
+$a->strings["Profile Import/Export"] = "Profil-Import/Export";
+$a->strings["Save and load profile details across sites/channels"] = "Speichere Dein Profil, um es in einen anderen Kanal zu importieren";
+$a->strings["Web Pages"] = "Webseiten";
+$a->strings["Provide managed web pages on your channel"] = "Stelle verwaltete Webseiten in Deinem Kanal zur Verfügung";
+$a->strings["Private Notes"] = "Private Notizen";
+$a->strings["Enables a tool to store notes and reminders"] = "Werkzeug zum Speichern von Notizen und Erinnerungen aktivieren";
+$a->strings["Navigation Channel Select"] = "Kanal-Auswahl in der Navigationsleiste";
+$a->strings["Change channels directly from within the navigation dropdown menu"] = "Wechsle direkt über das Navigationsmenü zu anderen Kanälen";
+$a->strings["Extended Identity Sharing"] = "Erweitertes Teilen von Identitäten";
+$a->strings["Share your identity with all websites on the internet. When disabled, identity is only shared with sites in the matrix."] = "Teile Deine Identität mit allen Webseiten im Internet. Ist dies deaktiviert, wird Deine Identität nur mit Red-Servern geteilt.";
+$a->strings["Expert Mode"] = "Expertenmodus";
+$a->strings["Enable Expert Mode to provide advanced configuration options"] = "Aktiviere den Expertenmodus, um fortgeschrittene Konfigurationsoptionen zu aktivieren";
+$a->strings["Premium Channel"] = "Premium-Kanal";
+$a->strings["Allows you to set restrictions and terms on those that connect with your channel"] = "Ermöglicht es, Einschränkungen und Bedingungen für Verbindungen dieses Kanals festzulegen";
+$a->strings["Post Composition Features"] = "Nachbearbeitungsfunktionen";
+$a->strings["Use Markdown"] = "Markdown benutzen";
+$a->strings["Allow use of \"Markdown\" to format posts"] = "Erlaube die Verwendung von \"Markdown\"-Syntax zur Formatierung von Beiträgen";
+$a->strings["Large Photos"] = "Große Fotos";
+$a->strings["Include large (640px) photo thumbnails in posts. If not enabled, use small (320px) photo thumbnails"] = "Große Vorschaubilder (640px) in Beiträgen anzeigen. Ist das deaktiviert, werden kleine Vorschaubilder (320px) angezeigt.";
+$a->strings["Automatically import channel content from other channels or feeds"] = "Importiere automatisch Inhalte für diesen Kanal von anderen Kanälen oder Feeds";
+$a->strings["Even More Encryption"] = "Noch mehr Verschlüsselung";
+$a->strings["Allow optional encryption of content end-to-end with a shared secret key"] = "Erlaube optionale Verschlüsselung von Inhalten (Ende-zu-Ende mit geteiltem Sicherheitsschlüssel)";
+$a->strings["Enable voting tools"] = "Umfragewerkzeuge aktivieren";
+$a->strings["Provide a class of post which others can vote on"] = "Aktiviere die Umfragewerkzeuge, um anderen die Möglichkeit zu geben, Deinem Beitrag zuzustimmen, ihn abzulehnen oder sich zu enthalten. (Muss im Beitrag selbst noch aktiviert werden.)";
+$a->strings["Flag Adult Photos"] = "Nicht jugendfreie Fotos markieren";
+$a->strings["Provide photo edit option to hide adult photos from default album view"] = "Stellt eine Option zum Verstecken von Fotos mit nicht jugendfreien Inhalten in der Standard-Albumansicht bereit";
+$a->strings["Network and Stream Filtering"] = "Netzwerk- und Stream-Filter";
+$a->strings["Search by Date"] = "Suche nach Datum";
+$a->strings["Ability to select posts by date ranges"] = "Möglichkeit, Beiträge nach Zeiträumen auszuwählen";
+$a->strings["Collections Filter"] = "Filter für Sammlung";
+$a->strings["Enable widget to display Network posts only from selected collections"] = "Aktiviere nur Netzwerk-Beiträge von ausgewählten Sammlungen";
+$a->strings["Save search terms for re-use"] = "Suchbegriffe zur Wiederverwendung abspeichern";
+$a->strings["Network Personal Tab"] = "Persönlicher Netzwerkreiter";
+$a->strings["Enable tab to display only Network posts that you've interacted on"] = "Aktiviere Reiter nur für die Netzwerk-Beiträge, mit denen Du interagiert hast";
+$a->strings["Network New Tab"] = "Netzwerkreiter Neu";
+$a->strings["Enable tab to display all new Network activity"] = "Aktiviere Reiter, um alle neuen Netzwerkaktivitäten zu zeigen";
+$a->strings["Affinity Tool"] = "Beziehungs-Tool";
+$a->strings["Filter stream activity by depth of relationships"] = "Filter Aktivitätenstream nach Tiefe der Beziehung";
+$a->strings["Suggest Channels"] = "Kanäle vorschlagen";
+$a->strings["Show channel suggestions"] = "Kanalvorschläge anzeigen";
+$a->strings["Post/Comment Tools"] = "Beitrag-/Kommentar-Tools";
+$a->strings["Tagging"] = "Verschlagworten";
+$a->strings["Ability to tag existing posts"] = "Möglichkeit, um existierende Beiträge zu verschlagworten";
+$a->strings["Post Categories"] = "Beitrags-Kategorien";
+$a->strings["Add categories to your posts"] = "Kategorien für Beiträge";
+$a->strings["Ability to file posts under folders"] = "Möglichkeit, Beiträge in Verzeichnissen zu sammeln";
+$a->strings["Dislike Posts"] = "Gefällt-mir-nicht Beiträge";
+$a->strings["Ability to dislike posts/comments"] = "„Gefällt mir nicht“ ermöglichen";
+$a->strings["Star Posts"] = "Beiträge mit Sternchen versehen";
+$a->strings["Ability to mark special posts with a star indicator"] = "Möglichkeit, spezielle Beiträge mit Sternchen-Symbol zu markieren";
+$a->strings["Tag Cloud"] = "Schlagwort-Wolke";
+$a->strings["Provide a personal tag cloud on your channel page"] = "Persönliche Schlagwort-Wolke auf Deiner Kanal-Seite anzeigen";
+$a->strings["Logged out."] = "Ausgeloggt.";
+$a->strings["Failed authentication"] = "Authentifizierung fehlgeschlagen";
+$a->strings["Login failed."] = "Login fehlgeschlagen.";
+$a->strings["Frequently"] = "Häufig";
+$a->strings["Hourly"] = "Stündlich";
+$a->strings["Twice daily"] = "Zwei Mal am Tag";
+$a->strings["Daily"] = "Täglich";
+$a->strings["Weekly"] = "Wöchentlich";
+$a->strings["Monthly"] = "Monatlich";
+$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["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."] = "Es hat früher schon einmal eine Sammlung mit diesem Namen existiert, die gelöscht wurde. Es <strong>könnten</strong> von damals noch Elemente (Beiträge, Dateien etc.) vorhanden sein, die allen jetzigen und zukünftigen Mitgliedern dieser Sammlung den Zugriff erlauben. Wenn das nicht Dein Plan war, erstelle bitte eine neue Sammlung mit einem anderen Namen.";
+$a->strings["Default privacy group for new contacts"] = "Standard-Sammlung für neue Kontakte";
+$a->strings["All Channels"] = "Alle Kanäle";
+$a->strings["edit"] = "Bearbeiten";
+$a->strings["Collections"] = "Sammlungen";
+$a->strings["Edit collection"] = "Sammlung bearbeiten";
+$a->strings["Create a new collection"] = "Neue Sammlung erzeugen";
+$a->strings["Channels not in any collection"] = "Kanäle, die nicht in einer Sammlung sind";
+$a->strings["Unable to obtain identity information from database"] = "Kann keine Identitäts-Informationen aus Datenbank beziehen";
+$a->strings["Empty name"] = "Namensfeld leer";
+$a->strings["Name too long"] = "Name ist zu lang";
+$a->strings["No account identifier"] = "Keine Account-Kennung";
+$a->strings["Nickname is required."] = "Spitzname ist erforderlich.";
+$a->strings["Reserved nickname. Please choose another."] = "Reservierter Kurzname. Bitte wähle einen anderen.";
+$a->strings["Nickname has unsupported characters or is already being used on this site."] = "Der Spitzname enthält nicht-unterstütze Zeichen oder wird bereits auf dieser Seite genutzt.";
+$a->strings["Unable to retrieve created identity"] = "Kann die erstellte Identität nicht empfangen";
+$a->strings["Default Profile"] = "Standard-Profil";
+$a->strings["Requested channel is not available."] = "Angeforderte Kanal nicht verfügbar.";
+$a->strings["Requested profile is not available."] = "Erwünschte Profil ist nicht verfügbar.";
+$a->strings["Change profile photo"] = "Profilfoto ändern";
+$a->strings["Profiles"] = "Profile";
+$a->strings["Manage/edit profiles"] = "Profile verwalten/bearbeiten";
+$a->strings["Create New Profile"] = "Neues Profil erstellen";
+$a->strings["Edit Profile"] = "Profile bearbeiten";
+$a->strings["Profile Image"] = "Profilfoto:";
+$a->strings["visible to everybody"] = "sichtbar für jeden";
+$a->strings["Edit visibility"] = "Sichtbarkeit bearbeiten";
+$a->strings["Location:"] = "Ort:";
+$a->strings["Gender:"] = "Geschlecht:";
+$a->strings["Status:"] = "Status:";
+$a->strings["Homepage:"] = "Homepage:";
+$a->strings["Online Now"] = "gerade online";
+$a->strings["g A l F d"] = "l, d. F, G:i \\U\\h\\r";
+$a->strings["F d"] = "d. F";
+$a->strings["[today]"] = "[Heute]";
+$a->strings["Birthday Reminders"] = "Geburtstags Erinnerungen";
+$a->strings["Birthdays this week:"] = "Geburtstage in dieser Woche:";
+$a->strings["[No description]"] = "[Keine Beschreibung]";
+$a->strings["Event Reminders"] = "Termin-Erinnerungen";
+$a->strings["Events this week:"] = "Termine in dieser Woche:";
+$a->strings["Profile"] = "Profil";
+$a->strings["Full Name:"] = "Voller Name:";
+$a->strings["Like this channel"] = "Dieser Kanal gefällt mir";
+$a->strings["j F, Y"] = "j. F Y";
+$a->strings["j F"] = "j. F";
+$a->strings["Birthday:"] = "Geburtstag:";
+$a->strings["Age:"] = "Alter:";
+$a->strings["for %1\$d %2\$s"] = "seit %1\$d %2\$s";
+$a->strings["Sexual Preference:"] = "Sexuelle Orientierung:";
+$a->strings["Hometown:"] = "Heimatstadt:";
+$a->strings["Tags:"] = "Schlagworte:";
+$a->strings["Political Views:"] = "Politische Ansichten:";
+$a->strings["Religion:"] = "Religion:";
+$a->strings["About:"] = "Über:";
+$a->strings["Hobbies/Interests:"] = "Hobbys/Interessen:";
+$a->strings["Likes:"] = "Gefällt:";
+$a->strings["Dislikes:"] = "Gefällt nicht:";
+$a->strings["Contact information and Social Networks:"] = "Kontaktinformation und soziale Netzwerke:";
+$a->strings["My other channels:"] = "Meine anderen Kanäle:";
+$a->strings["Musical interests:"] = "Musikalische Interessen:";
+$a->strings["Books, literature:"] = "Bücher, Literatur:";
+$a->strings["Television:"] = "Fernsehen:";
+$a->strings["Film/dance/culture/entertainment:"] = "Film/Tanz/Kultur/Unterhaltung:";
+$a->strings["Love/Romance:"] = "Liebe/Romantik:";
+$a->strings["Work/employment:"] = "Arbeit/Anstellung:";
+$a->strings["School/education:"] = "Schule/Ausbildung:";
+$a->strings["Like this thing"] = "Gefällt mir";
+$a->strings["No recipient provided."] = "Kein Empfänger angegeben";
+$a->strings["[no subject]"] = "[no subject]";
+$a->strings["Unable to determine sender."] = "Kann Absender nicht bestimmen.";
+$a->strings["Stored post could not be verified."] = "Gespeicherter Beitrag konnten nicht überprüft werden.";
+$a->strings["Channel is blocked on this site."] = "Der Kanal ist auf dieser Seite blockiert ";
+$a->strings["Channel location missing."] = "Adresse des Kanals fehlt.";
+$a->strings["Response from remote channel was incomplete."] = "Antwort des entfernten Kanals war unvollständig.";
+$a->strings["Channel was deleted and no longer exists."] = "Kanal wurde gelöscht und existiert nicht mehr.";
+$a->strings["Protocol disabled."] = "Protokoll deaktiviert.";
+$a->strings["Channel discovery failed."] = "Kanalsuche fehlgeschlagen";
+$a->strings["local account not found."] = "Lokales Konto nicht gefunden.";
+$a->strings["Cannot connect to yourself."] = "Du kannst Dich nicht mit Dir selbst verbinden.";
+$a->strings["Default"] = "Standard";
+$a->strings["Miscellaneous"] = "Verschiedenes";
+$a->strings["YYYY-MM-DD or MM-DD"] = "JJJJ-MM-TT oder MM-TT";
+$a->strings["Required"] = "Benötigt";
+$a->strings["never"] = "Nie";
+$a->strings["less than a second ago"] = "Vor weniger als einer Sekunde";
+$a->strings["year"] = "Jahr";
+$a->strings["years"] = "Jahre";
+$a->strings["month"] = "Monat";
+$a->strings["months"] = "Monate";
+$a->strings["week"] = "Woche";
+$a->strings["weeks"] = "Wochen";
+$a->strings["day"] = "Tag";
+$a->strings["days"] = "Tage";
+$a->strings["hour"] = "Stunde";
+$a->strings["hours"] = "Stunden";
+$a->strings["minute"] = "Minute";
+$a->strings["minutes"] = "Minuten";
+$a->strings["second"] = "Sekunde";
+$a->strings["seconds"] = "Sekunden";
+$a->strings["%1\$d %2\$s ago"] = "vor %1\$d %2\$s";
+$a->strings["%1\$s's birthday"] = "%1\$ss Geburtstag";
+$a->strings["Happy Birthday %1\$s"] = "Alles Gute zum Geburtstag, %1\$s";
+$a->strings["Attachments:"] = "Anhänge:";
+$a->strings["l F d, Y \\@ g:i A"] = "l, d. F Y, H:i";
+$a->strings["Redmatrix event notification:"] = "RedMatrix Termin-Benachrichtigung:";
+$a->strings["Starts:"] = "Beginnt:";
+$a->strings["Finishes:"] = "Endet:";
+$a->strings["Missing room name"] = "Der Chatraum hat keinen Namen";
+$a->strings["Duplicate room name"] = "Name des Chatraums bereits vergeben";
+$a->strings["Invalid room specifier."] = "Ungültiger Raumbezeichner.";
+$a->strings["Room not found."] = "Chatraum konnte nicht gefunden werden.";
+$a->strings["Room is full"] = "Der Raum ist voll";
$a->strings["Logout"] = "Abmelden";
$a->strings["End this session"] = "Beende diese Sitzung";
$a->strings["Home"] = "Home";
@@ -477,7 +485,6 @@ $a->strings["View Profile"] = "Profil ansehen";
$a->strings["Your profile page"] = "Deine Profilseite";
$a->strings["Edit Profiles"] = "Profile bearbeiten";
$a->strings["Manage/Edit profiles"] = "Profile verwalten";
-$a->strings["Edit Profile"] = "Profile bearbeiten";
$a->strings["Edit your profile"] = "Profil bearbeiten";
$a->strings["Photos"] = "Fotos";
$a->strings["Your photos"] = "Deine Bilder";
@@ -531,28 +538,76 @@ $a->strings["Site Setup and Configuration"] = "Seiten-Einrichtung und -Konfigura
$a->strings["Loading..."] = "Lädt ...";
$a->strings["@name, #tag, content"] = "@Name, #Schlagwort, Text";
$a->strings["Please wait..."] = "Bitte warten...";
-$a->strings["Tags"] = "Schlagwörter";
-$a->strings["Keywords"] = "Schlüsselwörter";
-$a->strings["have"] = "habe";
-$a->strings["has"] = "hat";
-$a->strings["want"] = "will";
-$a->strings["wants"] = "will";
-$a->strings["likes"] = "gefällt";
-$a->strings["dislikes"] = "missfällt";
+$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."] = "Das Security-Token des Formulars war nicht korrekt. Das ist wahrscheinlich passiert, weil das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde.";
+$a->strings["Private Message"] = "Private Nachricht";
+$a->strings["Select"] = "Auswählen";
+$a->strings["Save to Folder"] = "In Ordner speichern";
+$a->strings["I will attend"] = "Ich werde teilnehmen";
+$a->strings["I will not attend"] = "Ich werde nicht teilnehmen";
+$a->strings["I might attend"] = "Ich werde vielleicht teilnehmen";
+$a->strings["I agree"] = "Ich stimme zu";
+$a->strings["I disagree"] = "Ich lehne ab";
+$a->strings["I abstain"] = "Ich enthalte mich";
+$a->strings["View all"] = "Alles anzeigen";
+$a->strings["__ctx:noun__ Dislike"] = array(
+ 0 => "Gefällt nicht",
+ 1 => "Gefällt nicht",
+);
+$a->strings["Add Star"] = "Stern hinzufügen";
+$a->strings["Remove Star"] = "Stern entfernen";
+$a->strings["Toggle Star Status"] = "Markierungsstatus (Stern) umschalten";
+$a->strings["starred"] = "markiert";
+$a->strings["Message signature validated"] = "Signatur überprüft";
+$a->strings["Message signature incorrect"] = "Signatur nicht korrekt";
+$a->strings["Add Tag"] = "Tag hinzufügen";
+$a->strings["I like this (toggle)"] = "Mir gefällt das (Umschalter)";
+$a->strings["I don't like this (toggle)"] = "Mir gefällt das nicht (Umschalter)";
+$a->strings["Share This"] = "Teilen";
+$a->strings["share"] = "Teilen";
+$a->strings["%d comment"] = array(
+ 0 => "%d Kommentar",
+ 1 => "%d Kommentare",
+);
+$a->strings["View %s's profile - %s"] = "Schaue Dir %ss Profil an – %s";
+$a->strings["to"] = "an";
+$a->strings["via"] = "via";
+$a->strings["Wall-to-Wall"] = "Wall-to-Wall";
+$a->strings["via Wall-To-Wall:"] = "via Wall-To-Wall:";
+$a->strings[" from %s"] = "von %s";
+$a->strings["last edited: %s"] = "zuletzt bearbeitet: %s";
+$a->strings["Expires: %s"] = "Verfällt: %s";
+$a->strings["Save Bookmarks"] = "Favoriten speichern";
+$a->strings["Add to Calendar"] = "Zum Kalender hinzufügen";
+$a->strings["Mark all seen"] = "Alle als gelesen markieren";
+$a->strings["__ctx:noun__ Likes"] = "Gefällt mir";
+$a->strings["__ctx:noun__ Dislikes"] = "Gefällt nicht";
+$a->strings["Close"] = "Schließen";
+$a->strings["Please wait"] = "Bitte warten";
+$a->strings["This is you"] = "Das bist Du";
+$a->strings["Bold"] = "Fett";
+$a->strings["Italic"] = "Kursiv";
+$a->strings["Underline"] = "Unterstrichen";
+$a->strings["Quote"] = "Zitat";
+$a->strings["Code"] = "Code";
+$a->strings["Image"] = "Bild";
+$a->strings["Link"] = "Link";
+$a->strings["Video"] = "Video";
+$a->strings["Encrypt text"] = "Text verschlüsseln";
$a->strings[" and "] = "und";
$a->strings["public profile"] = "öffentliches Profil";
$a->strings["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "%1\$s hat %2\$s auf &ldquo;%3\$s&rdquo; geändert";
$a->strings["Visit %1\$s's %2\$s"] = "Besuche %1\$s's %2\$s";
$a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s hat ein aktualisiertes %2\$s, %3\$s wurde verändert.";
-$a->strings["Image/photo"] = "Bild/Foto";
-$a->strings["Encrypted content"] = "Verschlüsselter Inhalt";
-$a->strings["Install design element: "] = "Gestaltungselement installieren:";
-$a->strings["QR code"] = "QR-Code";
-$a->strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s schrieb den folgenden %2\$s %3\$s";
-$a->strings["post"] = "Beitrag";
-$a->strings["Different viewers will see this text differently"] = "Verschiedene Betrachter werden diesen Text unterschiedlich sehen";
-$a->strings["$1 spoiler"] = "$1 Spoiler";
-$a->strings["$1 wrote:"] = "$1 schrieb:";
+$a->strings["Directory Options"] = "Verzeichnisoptionen";
+$a->strings["Alphabetic"] = "alphabetisch";
+$a->strings["Reverse Alphabetic"] = "Entgegengesetzt alphabetisch";
+$a->strings["Newest to Oldest"] = "Neueste zuerst";
+$a->strings["Oldest to Newest"] = "Älteste zuerst";
+$a->strings["Public Forums Only"] = "Nur öffentliche Foren";
+$a->strings["Sort"] = "Sortieren";
+$a->strings["Enable Safe Search"] = "Sichere Suche einschalten";
+$a->strings["Disable Safe Search"] = "Sichere Suche ausschalten";
+$a->strings["Safe Mode"] = "Sicherer Modus";
$a->strings["Permission denied"] = "Keine Berechtigung";
$a->strings["(Unknown)"] = "(Unbekannt)";
$a->strings["Visible to anybody on the internet."] = "Für jeden im Internet sichtbar.";
@@ -564,47 +619,144 @@ $a->strings["Visible to all connections."] = "Für alle Verbindungen sichtbar.";
$a->strings["Visible to approved connections."] = "Nur für akzeptierte Verbindungen sichtbar.";
$a->strings["Visible to specific connections."] = "Sichtbar für bestimmte Verbindungen.";
$a->strings["Item not found."] = "Element nicht gefunden.";
-$a->strings["Permission denied."] = "Zugang verweigert";
$a->strings["Collection not found."] = "Sammlung nicht gefunden";
$a->strings["Collection is empty."] = "Sammlung ist leer.";
$a->strings["Collection: %s"] = "Sammlung: %s";
$a->strings["Connection: %s"] = "Verbindung: %s";
$a->strings["Connection not found."] = "Die Verbindung wurde nicht gefunden.";
-$a->strings["Can view my normal stream and posts"] = "Kann meine normalen Beiträge sehen";
-$a->strings["Can view my default channel profile"] = "Kann mein Standardprofil sehen";
-$a->strings["Can view my photo albums"] = "Kann meine Fotoalben betrachten";
-$a->strings["Can view my connections"] = "Kann meine Verbindungen sehen";
-$a->strings["Can view my file storage"] = "Kann meine Dateiordner lesen";
-$a->strings["Can view my webpages"] = "Kann meine Webseiten sehen";
-$a->strings["Can send me their channel stream and posts"] = "Kann mir die Beiträge aus seinem/ihrem Kanal schicken";
-$a->strings["Can post on my channel page (\"wall\")"] = "Kann auf meiner Kanal-Seite (\"wall\") Beiträge veröffentlichen";
-$a->strings["Can comment on or like my posts"] = "Darf meine Beiträge kommentieren und mögen/nicht mögen";
-$a->strings["Can send me private mail messages"] = "Kann mir private Nachrichten schicken";
-$a->strings["Can post photos to my photo albums"] = "Kann Fotos in meinen Fotoalben veröffentlichen";
-$a->strings["Can like/dislike stuff"] = "Kann andere Elemente mögen/nicht mögen";
-$a->strings["Profiles and things other than posts/comments"] = "Profile und alles außer Beiträge und Kommentare";
-$a->strings["Can forward to all my channel contacts via post @mentions"] = "Kann an alle meine Kontakte via @-Erwähnung Nachrichten weiterleiten";
-$a->strings["Advanced - useful for creating group forum channels"] = "Fortgeschritten - sinnvoll, um Gruppen-Kanäle/-Foren zu erstellen";
-$a->strings["Can chat with me (when available)"] = "Kann mit mir chatten (wenn verfügbar)";
-$a->strings["Can write to my file storage"] = "Kann in meine Dateiordner schreiben";
-$a->strings["Can edit my webpages"] = "Kann meine Webseiten bearbeiten";
-$a->strings["Can source my public posts in derived channels"] = "Kann meine öffentlichen Beiträge als Quellen für Kanäle verwenden";
-$a->strings["Somewhat advanced - very useful in open communities"] = "Etwas fortgeschritten – sehr nützlich in offenen Gemeinschaften";
-$a->strings["Can administer my channel resources"] = "Kann meine Kanäle administrieren";
-$a->strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Sehr fortgeschritten. Bearbeite das nur, wenn Du genau weißt, was Du tust";
-$a->strings["Social Networking"] = "Soziales Netzwerk";
-$a->strings["Mostly Public"] = "Weitgehend öffentlich";
-$a->strings["Restricted"] = "Beschränkt";
-$a->strings["Private"] = "Privat";
-$a->strings["Community Forum"] = "Forum";
-$a->strings["Feed Republish"] = "Teilen von Feeds";
-$a->strings["Special Purpose"] = "Für besondere Zwecke";
-$a->strings["Celebrity/Soapbox"] = "Mitteilungs-Kanal (keine Kommentare)";
-$a->strings["Group Repository"] = "Gruppenarchiv";
+$a->strings["This event has been added to your calendar."] = "Dieser Termin wurde zu Deinem Kalender hinzugefügt";
+$a->strings["New window"] = "Neues Fenster";
+$a->strings["Open the selected location in a different window or browser tab"] = "Öffne die markierte Adresse in einem neuen Browser Fenster oder Tab";
+$a->strings["User '%s' deleted"] = "Benutzer '%s' gelöscht";
+$a->strings["view full size"] = "In Vollbildansicht anschauen";
+$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s gefällt %2\$ss %3\$s";
+$a->strings["Image/photo"] = "Bild/Foto";
+$a->strings["Encrypted content"] = "Verschlüsselter Inhalt";
+$a->strings["Install design element: "] = "Design-Element installieren:";
+$a->strings["QR code"] = "QR-Code";
+$a->strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s schrieb den folgenden %2\$s %3\$s";
+$a->strings["post"] = "Beitrag";
+$a->strings["Different viewers will see this text differently"] = "Verschiedene Betrachter werden diesen Text unterschiedlich sehen";
+$a->strings["$1 spoiler"] = "$1 Spoiler";
+$a->strings["$1 wrote:"] = "$1 schrieb:";
+$a->strings["%d invitation available"] = array(
+ 0 => "%d Einladung verfügbar",
+ 1 => "%d Einladungen verfügbar",
+);
+$a->strings["Advanced"] = "Fortgeschritten";
+$a->strings["Find Channels"] = "Finde Kanäle";
+$a->strings["Enter name or interest"] = "Name oder Interessen eingeben";
+$a->strings["Connect/Follow"] = "Verbinden/Folgen";
+$a->strings["Examples: Robert Morgenstein, Fishing"] = "Beispiele: Robert Morgenstein, Angeln";
+$a->strings["Find"] = "Finde";
+$a->strings["Channel Suggestions"] = "Kanal-Vorschläge";
+$a->strings["Random Profile"] = "Zufallsprofil";
+$a->strings["Invite Friends"] = "Lade Freunde ein";
+$a->strings["Advanced example: name=fred and country=iceland"] = "Fortgeschrittenes Beispiel: name=fred and country=iceland";
+$a->strings["%d connection in common"] = array(
+ 0 => "%d gemeinsame Verbindung",
+ 1 => "%d gemeinsame Verbindungen",
+);
+$a->strings["show more"] = "mehr zeigen";
+$a->strings["Visible to your default audience"] = "Standard-Sichtbarkeit";
+$a->strings["Show"] = "Anzeigen";
+$a->strings["Don't show"] = "Nicht anzeigen";
+$a->strings["Permissions"] = "Berechtigungen";
+$a->strings["Public Timeline"] = "Öffentliche Zeitleiste";
+$a->strings["Invalid data packet"] = "Ungültiges Datenpaket";
+$a->strings["Unable to verify channel signature"] = "Konnte die Signatur des Kanals nicht verifizieren";
+$a->strings["Unable to verify site signature for %s"] = "Kann die Signatur der Seite von %s nicht verifizieren";
+$a->strings["Male"] = "Männlich";
+$a->strings["Female"] = "Weiblich";
+$a->strings["Currently Male"] = "Momentan männlich";
+$a->strings["Currently Female"] = "Momentan weiblich";
+$a->strings["Mostly Male"] = "Größtenteils männlich";
+$a->strings["Mostly Female"] = "Größtenteils weiblich";
+$a->strings["Transgender"] = "Transsexuell";
+$a->strings["Intersex"] = "Zwischengeschlechtlich";
+$a->strings["Transsexual"] = "Transsexuell";
+$a->strings["Hermaphrodite"] = "Zwitter";
+$a->strings["Neuter"] = "Geschlechtslos";
+$a->strings["Non-specific"] = "unklar";
$a->strings["Other"] = "Andere";
-$a->strings["Custom/Expert Mode"] = "Benutzerdefiniert/Expertenmodus";
+$a->strings["Undecided"] = "Unentschieden";
+$a->strings["Males"] = "Männer";
+$a->strings["Females"] = "Frauen";
+$a->strings["Gay"] = "Schwul";
+$a->strings["Lesbian"] = "Lesbisch";
+$a->strings["No Preference"] = "Keine Bevorzugung";
+$a->strings["Bisexual"] = "Bisexuell";
+$a->strings["Autosexual"] = "Autosexuell";
+$a->strings["Abstinent"] = "Enthaltsam";
+$a->strings["Virgin"] = "Jungfräulich";
+$a->strings["Deviant"] = "Abweichend";
+$a->strings["Fetish"] = "Fetisch";
+$a->strings["Oodles"] = "Unmengen";
+$a->strings["Nonsexual"] = "Sexlos";
+$a->strings["Single"] = "Single";
+$a->strings["Lonely"] = "Einsam";
+$a->strings["Available"] = "Verfügbar";
+$a->strings["Unavailable"] = "Nicht verfügbar";
+$a->strings["Has crush"] = "Verguckt";
+$a->strings["Infatuated"] = "Verknallt";
+$a->strings["Dating"] = "Lerne gerade jemanden kennen";
+$a->strings["Unfaithful"] = "Treulos";
+$a->strings["Sex Addict"] = "Sexabhängig";
+$a->strings["Friends/Benefits"] = "Freunde/Begünstigte";
+$a->strings["Casual"] = "Lose";
+$a->strings["Engaged"] = "Verlobt";
+$a->strings["Married"] = "Verheiratet";
+$a->strings["Imaginarily married"] = "Gewissermaßen verheiratet";
+$a->strings["Partners"] = "Partner";
+$a->strings["Cohabiting"] = "Lebensgemeinschaft";
+$a->strings["Common law"] = "Informelle Ehe";
+$a->strings["Happy"] = "Glücklich";
+$a->strings["Not looking"] = "Nicht Ausschau haltend";
+$a->strings["Swinger"] = "Swinger";
+$a->strings["Betrayed"] = "Betrogen";
+$a->strings["Separated"] = "Getrennt";
+$a->strings["Unstable"] = "Labil";
+$a->strings["Divorced"] = "Geschieden";
+$a->strings["Imaginarily divorced"] = "Gewissermaßen geschieden";
+$a->strings["Widowed"] = "Verwitwet";
+$a->strings["Uncertain"] = "Ungewiss";
+$a->strings["It's complicated"] = "Es ist kompliziert";
+$a->strings["Don't care"] = "Interessiert mich nicht";
+$a->strings["Ask me"] = "Frag mich mal";
+$a->strings["Site Admin"] = "Hub-Administration";
+$a->strings["Address Book"] = "Adressbuch";
+$a->strings["Mood"] = "Laune";
+$a->strings["Poke"] = "Anstupsen";
+$a->strings["Probe"] = "Testen";
+$a->strings["Suggest"] = "Empfehlen";
+$a->strings["Random Channel"] = "Zufälliger Kanal";
+$a->strings["Invite"] = "Einladen";
+$a->strings["Features"] = "Funktionen";
+$a->strings["Language"] = "Sprache";
+$a->strings["Post"] = "Beitrag";
+$a->strings["Profile Photo"] = "Profilfoto";
+$a->strings["Update"] = "Aktualisieren";
+$a->strings["Install"] = "Installieren";
+$a->strings["Purchase"] = "Kaufen";
+$a->strings["Not a valid email address"] = "Ungültige E-Mail-Adresse";
+$a->strings["Your email domain is not among those allowed on this site"] = "Deine E-Mail-Adresse ist dieser Seite nicht erlaubt";
+$a->strings["Your email address is already registered at this site."] = "Deine E-Mail-Adresse ist auf dieser Seite bereits registriert.";
+$a->strings["An invitation is required."] = "Eine Einladung wird benötigt";
+$a->strings["Invitation could not be verified."] = "Die Einladung konnte nicht bestätigt werden";
+$a->strings["Please enter the required information."] = "Bitte gib die benötigten Informationen ein.";
+$a->strings["Failed to store account information."] = "Speichern der Account-Informationen fehlgeschlagen";
+$a->strings["Registration confirmation for %s"] = "Registrierungsbestätigung für %s";
+$a->strings["Registration request at %s"] = "Registrierungsanfrage auf %s";
+$a->strings["Administrator"] = "Administrator";
+$a->strings["your registration password"] = "Dein Registrierungspasswort";
+$a->strings["Registration details for %s"] = "Registrierungsdetails für %s";
+$a->strings["Account approved."] = "Account bestätigt.";
+$a->strings["Registration revoked for %s"] = "Registrierung für %s widerrufen";
+$a->strings["Account verified. Please login."] = "Konto geprüft. Bitte melde Dich an!";
+$a->strings["Click here to upgrade."] = "Klicke hier, um das Upgrade durchzuführen.";
+$a->strings["This action exceeds the limits set by your subscription plan."] = "Diese Aktion überschreitet die Grenzen Ihres Abonnements.";
+$a->strings["This action is not available under your subscription plan."] = "Diese Aktion ist in Ihrem Abonnement nicht verfügbar.";
$a->strings["channel"] = "Kanal";
-$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s gefällt %2\$ss %3\$s";
$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s gefällt %2\$ss %3\$s nicht";
$a->strings["%1\$s is now connected with %2\$s"] = "%1\$s ist jetzt mit %2\$s verbunden";
$a->strings["%1\$s poked %2\$s"] = "%1\$s stupste %2\$s an";
@@ -630,7 +782,6 @@ $a->strings["View Photos"] = "Fotos ansehen";
$a->strings["Matrix Activity"] = "Matrix-Aktivität";
$a->strings["Edit Contact"] = "Kontakt bearbeiten";
$a->strings["Send PM"] = "Sende PN";
-$a->strings["Poke"] = "Anstupsen";
$a->strings["%s likes this."] = "%s gefällt das.";
$a->strings["%s doesn't like this."] = "%s gefällt das nicht.";
$a->strings["<span %1\$s>%2\$d people</span> like this."] = array(
@@ -657,7 +808,7 @@ $a->strings["Save to Folder:"] = "Speichern in Ordner:";
$a->strings["Where are you right now?"] = "Wo bist Du jetzt grade?";
$a->strings["Expires YYYY-MM-DD HH:MM"] = "Verfällt YYYY-MM-DD HH;MM";
$a->strings["Share"] = "Teilen";
-$a->strings["Page link name"] = "Link zur Seite";
+$a->strings["Page link title"] = "Seitentitel-Link";
$a->strings["Post as"] = "Veröffentlichen als";
$a->strings["Upload photo"] = "Foto hochladen";
$a->strings["upload photo"] = "Foto hochladen";
@@ -669,8 +820,8 @@ $a->strings["Insert video link"] = "Video-Link einfügen";
$a->strings["video link"] = "Video-Link";
$a->strings["Insert audio link"] = "Audio-Link einfügen";
$a->strings["audio link"] = "Audio-Link";
-$a->strings["Set your location"] = "Legen Sie Ihren Standort fest";
-$a->strings["set location"] = "Standort festlegen";
+$a->strings["Set your location"] = "Standort";
+$a->strings["set location"] = "Standort";
$a->strings["Toggle voting"] = "Umfragewerkzeug aktivieren";
$a->strings["Clear browser location"] = "Browser-Standort löschen";
$a->strings["clear location"] = "Standort löschen";
@@ -680,7 +831,7 @@ $a->strings["Permission settings"] = "Berechtigungs-Einstellungen";
$a->strings["permissions"] = "Berechtigungen";
$a->strings["Public post"] = "Öffentlicher Beitrag";
$a->strings["Example: bob@example.com, mary@example.com"] = "Beispiel: bob@example.com, mary@example.com";
-$a->strings["Set expiration date"] = "Verfallsdatum festlegen";
+$a->strings["Set expiration date"] = "Verfallsdatum";
$a->strings["OK"] = "Ok";
$a->strings["Cancel"] = "Abbrechen";
$a->strings["Discover"] = "Entdecken";
@@ -700,7 +851,6 @@ $a->strings["Channel"] = "Kanal";
$a->strings["Status Messages and Posts"] = "Statusnachrichten und Beiträge";
$a->strings["About"] = "Über";
$a->strings["Profile Details"] = "Profil-Details";
-$a->strings["Photo Albums"] = "Fotoalben";
$a->strings["Files and Storage"] = "Dateien und Speicher";
$a->strings["Chatrooms"] = "Chaträume";
$a->strings["Saved Bookmarks"] = "Gespeicherte Lesezeichen";
@@ -729,189 +879,48 @@ $a->strings["__ctx:noun__ Abstain"] = array(
0 => "Enthaltung",
1 => "Enthaltungen",
);
-$a->strings["Image exceeds website size limit of %lu bytes"] = "Bild überschreitet das Limit der Webseite von %lu bytes";
-$a->strings["Image file is empty."] = "Bilddatei ist leer.";
-$a->strings["Unable to process image"] = "Kann Bild nicht verarbeiten";
-$a->strings["Photo storage failed."] = "Foto speichern schlug fehl";
-$a->strings["Upload New Photos"] = "Lade neue Fotos hoch";
-$a->strings["Invalid data packet"] = "Ungültiges Datenpaket";
-$a->strings["Unable to verify channel signature"] = "Konnte die Signatur des Kanals nicht verifizieren";
-$a->strings["Unable to verify site signature for %s"] = "Kann die Signatur der Seite von %s nicht verifizieren";
$a->strings["Embedded content"] = "Eingebetteter Inhalt";
$a->strings["Embedding disabled"] = "Einbetten ausgeschaltet";
-$a->strings["Logged out."] = "Ausgeloggt.";
-$a->strings["Failed authentication"] = "Authentifizierung fehlgeschlagen";
-$a->strings["Login failed."] = "Login fehlgeschlagen.";
-$a->strings["%d invitation available"] = array(
- 0 => "%d Einladung verfügbar",
- 1 => "%d Einladungen verfügbar",
-);
-$a->strings["Advanced"] = "Fortgeschritten";
-$a->strings["Find Channels"] = "Finde Kanäle";
-$a->strings["Enter name or interest"] = "Name oder Interessen eingeben";
-$a->strings["Connect/Follow"] = "Verbinden/Folgen";
-$a->strings["Examples: Robert Morgenstein, Fishing"] = "Beispiele: Robert Morgenstein, Angeln";
-$a->strings["Find"] = "Finde";
-$a->strings["Channel Suggestions"] = "Kanal-Vorschläge";
-$a->strings["Random Profile"] = "Zufallsprofil";
-$a->strings["Invite Friends"] = "Lade Freunde ein";
-$a->strings["Advanced example: name=fred and country=iceland"] = "Fortgeschrittenes Beispiel: name=fred and country=iceland";
-$a->strings["%d connection in common"] = array(
- 0 => "%d gemeinsame Verbindung",
- 1 => "%d gemeinsame Verbindungen",
-);
-$a->strings["show more"] = "mehr zeigen";
-$a->strings["Visible to your default audience"] = "Standard-Sichtbarkeit";
-$a->strings["Show"] = "Anzeigen";
-$a->strings["Don't show"] = "Nicht anzeigen";
-$a->strings["Permissions"] = "Berechtigungen";
-$a->strings["Item was not found."] = "Beitrag wurde nicht gefunden.";
-$a->strings["No source file."] = "Keine Quelldatei.";
-$a->strings["Cannot locate file to replace"] = "Kann Datei zum Ersetzen nicht finden";
-$a->strings["Cannot locate file to revise/update"] = "Kann Datei zum Prüfen/Aktualisieren nicht finden";
-$a->strings["File exceeds size limit of %d"] = "Datei überschreitet das Größen-Limit von %d";
-$a->strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Die Größe Deiner Datei-Anhänge hat das Maximum von %1$.0f MByte erreicht.";
-$a->strings["File upload failed. Possible system limit or action terminated."] = "Datei-Upload fehlgeschlagen. Mögliche Systembegrenzung oder abgebrochener Prozess.";
-$a->strings["Stored file could not be verified. Upload failed."] = "Gespeichert Datei konnte nicht verifiziert werden. Upload abgebrochen.";
-$a->strings["Path not available."] = "Pfad nicht verfügbar.";
-$a->strings["Empty pathname"] = "Leere Pfadangabe";
-$a->strings["duplicate filename or path"] = "doppelter Dateiname oder Pfad";
-$a->strings["Path not found."] = "Pfad nicht gefunden.";
-$a->strings["mkdir failed."] = "mkdir fehlgeschlagen.";
-$a->strings["database storage failed."] = "Speichern in der Datenbank fehlgeschlagen.";
-$a->strings["Unable to obtain identity information from database"] = "Kann keine Identitäts-Informationen aus Datenbank beziehen";
-$a->strings["Empty name"] = "Namensfeld leer";
-$a->strings["Name too long"] = "Name ist zu lang";
-$a->strings["No account identifier"] = "Keine Account-Kennung";
-$a->strings["Nickname is required."] = "Spitzname ist erforderlich.";
-$a->strings["Reserved nickname. Please choose another."] = "Reservierter Kurzname. Bitte wähle einen anderen.";
-$a->strings["Nickname has unsupported characters or is already being used on this site."] = "Der Spitzname enthält nicht-unterstütze Zeichen oder wird bereits auf dieser Seite genutzt.";
-$a->strings["Unable to retrieve created identity"] = "Kann die erstellte Identität nicht empfangen";
-$a->strings["Default Profile"] = "Standard-Profil";
-$a->strings["Requested channel is not available."] = "Angeforderte Kanal nicht verfügbar.";
-$a->strings["Requested profile is not available."] = "Erwünschte Profil ist nicht verfügbar.";
-$a->strings["Change profile photo"] = "Profilfoto ändern";
-$a->strings["Profiles"] = "Profile";
-$a->strings["Manage/edit profiles"] = "Profile verwalten/bearbeiten";
-$a->strings["Create New Profile"] = "Neues Profil erstellen";
-$a->strings["Profile Image"] = "Profilfoto:";
-$a->strings["visible to everybody"] = "sichtbar für jeden";
-$a->strings["Edit visibility"] = "Sichtbarkeit bearbeiten";
-$a->strings["Gender:"] = "Geschlecht:";
-$a->strings["Status:"] = "Status:";
-$a->strings["Homepage:"] = "Homepage:";
-$a->strings["Online Now"] = "gerade online";
-$a->strings["g A l F d"] = "l, j. F, G:i \\U\\h\\r";
-$a->strings["F d"] = "d. F";
-$a->strings["[today]"] = "[Heute]";
-$a->strings["Birthday Reminders"] = "Geburtstags Erinnerungen";
-$a->strings["Birthdays this week:"] = "Geburtstage in dieser Woche:";
-$a->strings["[No description]"] = "[Keine Beschreibung]";
-$a->strings["Event Reminders"] = "Termin-Erinnerungen";
-$a->strings["Events this week:"] = "Termine in dieser Woche:";
-$a->strings["Profile"] = "Profil";
-$a->strings["Full Name:"] = "Voller Name:";
-$a->strings["Like this channel"] = "Dieser Kanal gefällt mir";
-$a->strings["j F, Y"] = "j. F Y";
-$a->strings["j F"] = "j. F";
-$a->strings["Birthday:"] = "Geburtstag:";
-$a->strings["Age:"] = "Alter:";
-$a->strings["for %1\$d %2\$s"] = "seit %1\$d %2\$s";
-$a->strings["Sexual Preference:"] = "Sexuelle Orientierung:";
-$a->strings["Hometown:"] = "Heimatstadt:";
-$a->strings["Tags:"] = "Schlagworte:";
-$a->strings["Political Views:"] = "Politische Ansichten:";
-$a->strings["Religion:"] = "Religion:";
-$a->strings["About:"] = "Über:";
-$a->strings["Hobbies/Interests:"] = "Hobbys/Interessen:";
-$a->strings["Likes:"] = "Gefällt:";
-$a->strings["Dislikes:"] = "Gefällt nicht:";
-$a->strings["Contact information and Social Networks:"] = "Kontaktinformation und soziale Netzwerke:";
-$a->strings["My other channels:"] = "Meine anderen Kanäle:";
-$a->strings["Musical interests:"] = "Musikalische Interessen:";
-$a->strings["Books, literature:"] = "Bücher, Literatur:";
-$a->strings["Television:"] = "Fernsehen:";
-$a->strings["Film/dance/culture/entertainment:"] = "Film/Tanz/Kultur/Unterhaltung:";
-$a->strings["Love/Romance:"] = "Liebe/Romantik:";
-$a->strings["Work/employment:"] = "Arbeit/Anstellung:";
-$a->strings["School/education:"] = "Schule/Ausbildung:";
-$a->strings["Like this thing"] = "Gefällt mir";
-$a->strings["Male"] = "Männlich";
-$a->strings["Female"] = "Weiblich";
-$a->strings["Currently Male"] = "Momentan männlich";
-$a->strings["Currently Female"] = "Momentan weiblich";
-$a->strings["Mostly Male"] = "Größtenteils männlich";
-$a->strings["Mostly Female"] = "Größtenteils weiblich";
-$a->strings["Transgender"] = "Transsexuell";
-$a->strings["Intersex"] = "Zwischengeschlechtlich";
-$a->strings["Transsexual"] = "Transsexuell";
-$a->strings["Hermaphrodite"] = "Zwitter";
-$a->strings["Neuter"] = "Geschlechtslos";
-$a->strings["Non-specific"] = "unklar";
-$a->strings["Undecided"] = "Unentschieden";
-$a->strings["Males"] = "Männer";
-$a->strings["Females"] = "Frauen";
-$a->strings["Gay"] = "Schwul";
-$a->strings["Lesbian"] = "Lesbisch";
-$a->strings["No Preference"] = "Keine Bevorzugung";
-$a->strings["Bisexual"] = "Bisexuell";
-$a->strings["Autosexual"] = "Autosexuell";
-$a->strings["Abstinent"] = "Enthaltsam";
-$a->strings["Virgin"] = "Jungfräulich";
-$a->strings["Deviant"] = "Abweichend";
-$a->strings["Fetish"] = "Fetisch";
-$a->strings["Oodles"] = "Unmengen";
-$a->strings["Nonsexual"] = "Sexlos";
-$a->strings["Single"] = "Single";
-$a->strings["Lonely"] = "Einsam";
-$a->strings["Available"] = "Verfügbar";
-$a->strings["Unavailable"] = "Nicht verfügbar";
-$a->strings["Has crush"] = "Verguckt";
-$a->strings["Infatuated"] = "Verknallt";
-$a->strings["Dating"] = "Lerne gerade jemanden kennen";
-$a->strings["Unfaithful"] = "Treulos";
-$a->strings["Sex Addict"] = "Sexabhängig";
-$a->strings["Friends/Benefits"] = "Freunde/Begünstigte";
-$a->strings["Casual"] = "Lose";
-$a->strings["Engaged"] = "Verlobt";
-$a->strings["Married"] = "Verheiratet";
-$a->strings["Imaginarily married"] = "Gewissermaßen verheiratet";
-$a->strings["Partners"] = "Partner";
-$a->strings["Cohabiting"] = "Lebensgemeinschaft";
-$a->strings["Common law"] = "Informelle Ehe";
-$a->strings["Happy"] = "Glücklich";
-$a->strings["Not looking"] = "Nicht Ausschau haltend";
-$a->strings["Swinger"] = "Swinger";
-$a->strings["Betrayed"] = "Betrogen";
-$a->strings["Separated"] = "Getrennt";
-$a->strings["Unstable"] = "Labil";
-$a->strings["Divorced"] = "Geschieden";
-$a->strings["Imaginarily divorced"] = "Gewissermaßen geschieden";
-$a->strings["Widowed"] = "Verwitwet";
-$a->strings["Uncertain"] = "Ungewiss";
-$a->strings["It's complicated"] = "Es ist kompliziert";
-$a->strings["Don't care"] = "Interessiert mich nicht";
-$a->strings["Ask me"] = "Frag mich mal";
-$a->strings["Site Admin"] = "Hub-Administration";
-$a->strings["Address Book"] = "Adressbuch";
-$a->strings["Mood"] = "Laune";
-$a->strings["Probe"] = "Testen";
-$a->strings["Suggest"] = "Empfehlen";
-$a->strings["Random Channel"] = "Zufälliger Kanal";
-$a->strings["Invite"] = "Einladen";
-$a->strings["Features"] = "Funktionen";
-$a->strings["Language"] = "Sprache";
-$a->strings["Post"] = "Beitrag";
-$a->strings["Profile Photo"] = "Profilfoto";
-$a->strings["Update"] = "Aktualisieren";
-$a->strings["Install"] = "Installieren";
-$a->strings["Purchase"] = "Kaufen";
-$a->strings["Missing room name"] = "Der Chatraum hat keinen Namen";
-$a->strings["Duplicate room name"] = "Name des Chatraums bereits vergeben";
-$a->strings["Invalid room specifier."] = "Ungültiger Raumbezeichner.";
-$a->strings["Room not found."] = "Chatraum konnte nicht gefunden werden.";
-$a->strings["Room is full"] = "Der Raum ist voll";
+$a->strings["Can view my normal stream and posts"] = "Kann meine normalen Beiträge sehen";
+$a->strings["Can view my default channel profile"] = "Kann mein Standardprofil sehen";
+$a->strings["Can view my photo albums"] = "Kann meine Fotoalben betrachten";
+$a->strings["Can view my connections"] = "Kann meine Verbindungen sehen";
+$a->strings["Can view my file storage"] = "Kann meine Dateiordner lesen";
+$a->strings["Can view my webpages"] = "Kann meine Webseiten sehen";
+$a->strings["Can send me their channel stream and posts"] = "Kann mir die Beiträge aus seinem/ihrem Kanal schicken";
+$a->strings["Can post on my channel page (\"wall\")"] = "Kann auf meiner Kanal-Seite (\"wall\") Beiträge veröffentlichen";
+$a->strings["Can comment on or like my posts"] = "Darf meine Beiträge kommentieren und mögen/nicht mögen";
+$a->strings["Can send me private mail messages"] = "Kann mir private Nachrichten schicken";
+$a->strings["Can post photos to my photo albums"] = "Kann Fotos in meinen Fotoalben veröffentlichen";
+$a->strings["Can like/dislike stuff"] = "Kann andere Elemente mögen/nicht mögen";
+$a->strings["Profiles and things other than posts/comments"] = "Profile und alles außer Beiträge und Kommentare";
+$a->strings["Can forward to all my channel contacts via post @mentions"] = "Kann an alle meine Kontakte via @-Erwähnung Nachrichten weiterleiten";
+$a->strings["Advanced - useful for creating group forum channels"] = "Fortgeschritten - sinnvoll, um Gruppen-Kanäle/-Foren zu erstellen";
+$a->strings["Can chat with me (when available)"] = "Kann mit mir chatten (wenn verfügbar)";
+$a->strings["Can write to my file storage"] = "Kann in meine Dateiordner schreiben";
+$a->strings["Can edit my webpages"] = "Kann meine Webseiten bearbeiten";
+$a->strings["Can source my public posts in derived channels"] = "Kann meine öffentlichen Beiträge als Quellen für Kanäle verwenden";
+$a->strings["Somewhat advanced - very useful in open communities"] = "Etwas fortgeschritten – sehr nützlich in offenen Gemeinschaften";
+$a->strings["Can administer my channel resources"] = "Kann meine Kanäle administrieren";
+$a->strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Sehr fortgeschritten. Bearbeite das nur, wenn Du genau weißt, was Du tust";
+$a->strings["Social Networking"] = "Soziales Netzwerk";
+$a->strings["Mostly Public"] = "Weitgehend öffentlich";
+$a->strings["Restricted"] = "Beschränkt";
+$a->strings["Private"] = "Privat";
+$a->strings["Community Forum"] = "Forum";
+$a->strings["Feed Republish"] = "Teilen von Feeds";
+$a->strings["Special Purpose"] = "Für besondere Zwecke";
+$a->strings["Celebrity/Soapbox"] = "Mitteilungs-Kanal (keine Kommentare)";
+$a->strings["Group Repository"] = "Gruppenarchiv";
+$a->strings["Custom/Expert Mode"] = "Benutzerdefiniert/Expertenmodus";
$a->strings["Some blurb about what to do when you're new here"] = "Ein Hinweis, was man tun kann, wenn man neu hier ist";
+$a->strings["Item not found"] = "Element nicht gefunden";
+$a->strings["Edit Block"] = "Block bearbeiten";
+$a->strings["Delete block?"] = "Block löschen?";
+$a->strings["Insert YouTube video"] = "YouTube-Video einfügen";
+$a->strings["Insert Vorbis [.ogg] video"] = "Vorbis [.ogg]-Video einfügen";
+$a->strings["Insert Vorbis [.ogg] audio"] = "Vorbis [.ogg]-Audio einfügen";
+$a->strings["Delete Block"] = "Block löschen";
$a->strings["You have created %1$.0f of %2$.0f allowed channels."] = "Du hast %1$.0f von maximal %2$.0f erlaubten Kanälen eingerichtet.";
$a->strings["Create a new channel"] = "Neuen Kanal anlegen";
$a->strings["Current Channel"] = "Aktueller Kanal";
@@ -920,9 +929,176 @@ $a->strings["Default Channel"] = "Standard Kanal";
$a->strings["Make Default"] = "Zum Standard machen";
$a->strings["%d new messages"] = "%d neue Nachrichten";
$a->strings["%d new introductions"] = "%d neue Vorstellungen";
-$a->strings["Delegated Channels"] = "Delegierte Kanäle";
+$a->strings["Xchan Lookup"] = "Xchan-Suche";
+$a->strings["Lookup xchan beginning with (or webbie): "] = "Nach xchans oder Webbies (Kanal-Adressen) suchen, die wie folgt beginnen:";
+$a->strings["Not found."] = "Nicht gefunden.";
+$a->strings["Authorize application connection"] = "Zugriff für die Anwendung autorisieren";
+$a->strings["Return to your app and insert this Securty Code:"] = "Trage folgenden Sicherheitscode in der Anwendung ein:";
+$a->strings["Please login to continue."] = "Zum Weitermachen, bitte einloggen.";
+$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Möchtest Du dieser Anwendung erlauben, Deine Nachrichten und Kontakte abzurufen und/oder neue Nachrichten für Dich zu erstellen?";
+$a->strings["Yes"] = "Ja";
+$a->strings["No"] = "Nein";
+$a->strings["Block Name"] = "Block-Name";
+$a->strings["Could not access contact record."] = "Konnte nicht auf den Kontakteintrag zugreifen.";
+$a->strings["Could not locate selected profile."] = "Gewähltes Profil nicht gefunden.";
+$a->strings["Connection updated."] = "Verbindung aktualisiert.";
+$a->strings["Failed to update connection record."] = "Konnte den Verbindungseintrag nicht aktualisieren.";
+$a->strings["is now connected to"] = "ist jetzt verbunden mit";
+$a->strings["Could not access address book record."] = "Konnte nicht auf den Adressbuch-Eintrag zugreifen.";
+$a->strings["Refresh failed - channel is currently unavailable."] = "Aktualisierung fehlgeschlagen – der Kanal ist im Moment nicht erreichbar.";
+$a->strings["Channel has been unblocked"] = "Kanal nicht mehr blockiert";
+$a->strings["Channel has been blocked"] = "Kanal blockiert";
+$a->strings["Unable to set address book parameters."] = "Konnte die Adressbuch-Parameter nicht setzen.";
+$a->strings["Channel has been unignored"] = "Kanal wird nicht mehr ignoriert";
+$a->strings["Channel has been ignored"] = "Kanal wird ignoriert";
+$a->strings["Channel has been unarchived"] = "Kanal wurde aus dem Archiv zurück geholt";
+$a->strings["Channel has been archived"] = "Kanal wurde archiviert";
+$a->strings["Channel has been unhidden"] = "Kanal wird nicht mehr versteckt";
+$a->strings["Channel has been hidden"] = "Kanal wurde versteckt";
+$a->strings["Channel has been approved"] = "Kanal wurde zugelassen";
+$a->strings["Channel has been unapproved"] = "Zulassung des Kanals entfernt";
+$a->strings["Connection has been removed."] = "Verbindung wurde gelöscht.";
+$a->strings["View %s's profile"] = "%ss Profil ansehen";
+$a->strings["Refresh Permissions"] = "Zugriffsrechte neu laden";
+$a->strings["Fetch updated permissions"] = "Aktualisierte Zugriffsrechte abfragen";
+$a->strings["Recent Activity"] = "Kürzliche Aktivitäten";
+$a->strings["View recent posts and comments"] = "Betrachte die neuesten Beiträge und Kommentare";
+$a->strings["Unblock"] = "Freigeben";
+$a->strings["Block"] = "Blockieren";
+$a->strings["Block (or Unblock) all communications with this connection"] = "Jegliche Kommunikation mit dieser Verbindung blockieren/zulassen";
+$a->strings["Unignore"] = "Nicht ignorieren";
+$a->strings["Ignore"] = "Ignorieren";
+$a->strings["Ignore (or Unignore) all inbound communications from this connection"] = "Jegliche eingehende Kommunikation von dieser Verbindung ignorieren/zulassen";
+$a->strings["Unarchive"] = "Aus Archiv zurückholen";
+$a->strings["Archive"] = "Archivieren";
+$a->strings["Archive (or Unarchive) this connection - mark channel dead but keep content"] = "Verbindung archivieren/aus dem Archiv zurückholen (Archiv = Kanal als erloschen markieren, aber die Beiträge behalten)";
+$a->strings["Unhide"] = "Wieder sichtbar machen";
+$a->strings["Hide"] = "Verstecken";
+$a->strings["Hide or Unhide this connection from your other connections"] = "Diese Verbindung vor anderen Verbindungen verstecken/zeigen";
+$a->strings["Delete this connection"] = "Verbindung löschen";
+$a->strings["Approve this connection"] = "Verbindung genehmigen";
+$a->strings["Accept connection to allow communication"] = "Akzeptiere die Verbindung, um Kommunikation zu ermöglichen";
+$a->strings["Connections: settings for %s"] = "Verbindungseinstellungen für %s";
+$a->strings["Apply these permissions automatically"] = "Diese Berechtigungen automatisch anwenden";
+$a->strings["Apply the permissions indicated on this page to all new connections."] = "Wende die auf dieser Seite gewählten Berechtigungen auf alle neuen Verbindungen an.";
+$a->strings["Slide to adjust your degree of friendship"] = "Verschieben, um den Grad der Freundschaft zu einzustellen";
+$a->strings["Rating (this information is public)"] = "Bewertung (öffentlich sichtbar)";
+$a->strings["Optionally explain your rating (this information is public)"] = "Optional kannst du deine Bewertung erklären (öffentlich sichtbar)";
+$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."] = "Die voreingestellten Zugriffsrechte der Kategorie Deines Kanals sind hier zu sehen, wurden aber noch nicht gespeichert. Bitte sieh Dir die Zugriffsrechte auf dieser Seite an und ändere sie, wenn Du willst. Dieser Kontakt kann evtl. <em>nicht</em> mit Dir kommunizieren, bevor Du nicht auf dieser Seite auf „Senden“ geklickt hast – erst dieser Klick speichert die gewünschten Zugriffsrechte.";
+$a->strings["inherited"] = "geerbt";
+$a->strings["Connection has no individual permissions!"] = "Diese Verbindung hat keine individuellen Zugriffsrechte!";
+$a->strings["This may be appropriate based on your <a href=\"settings\">privacy settings</a>, though you may wish to review the \"Advanced Permissions\"."] = "Abhängig von Deinen <a href=\"settings\">Privatsphäre-Einstellungen</a> könnte das passen, eventuell solltest Du aber die „Zugriffsrechte für Fortgeschrittene“ überprüfen.";
+$a->strings["Profile Visibility"] = "Sichtbarkeit des Profils";
+$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Bitte wähle ein Profil, das wir %s zeigen sollen, wenn Deine Profilseite über eine verifizierte Verbindung aufgerufen wird.";
+$a->strings["Contact Information / Notes"] = "Kontaktinformationen / Notizen";
+$a->strings["Edit contact notes"] = "Kontaktnotizen bearbeiten";
+$a->strings["Their Settings"] = "Deren Einstellungen";
+$a->strings["My Settings"] = "Meine Einstellungen";
+$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."] = "Die voreingestellten Zugriffsrechte der Kategorie Deines Kanals sind hier zu sehen, wurden aber noch <em>nicht</em> gespeichert, und Du hast keine Voreinstellungen für die Zugriffsrechte von Verbindungen angelegt. Bitte sieht Dir die Einstellungen an, ändere sie bei Bedarf und klicke [Senden], um den Vorgang abzuschließen.";
+$a->strings["Clear/Disable Automatic Permissions"] = "Automatische Berechtigungen abschalten/entfernen";
+$a->strings["Forum Members"] = "Forum Mitglieder";
+$a->strings["Soapbox"] = "Marktschreier";
+$a->strings["Full Sharing (typical social network permissions)"] = "Vollumfängliches Teilen (übliche Berechtigungen in sozialen Netzwerken)";
+$a->strings["Cautious Sharing "] = "Vorsichtiges Teilen";
+$a->strings["Follow Only"] = "Nur folgen";
+$a->strings["Individual Permissions"] = "Individuelle Zugriffsrechte";
+$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."] = "Einige Berechtigungen werden von den globalen <a href=\"settings\">Sicherheits- und Privatsphäre-Einstellungen</a> dieses Kanals geerbt, die eine höhere Priorität haben als die Einstellungen bei einer Verbindung. Werden geerbte Einstellungen hier geändert, hat das keine Auswirkungen.";
+$a->strings["Advanced Permissions"] = "Zugriffsrechte für Fortgeschrittene";
+$a->strings["Simple Permissions (select one and submit)"] = "Einfache Berechtigungs-Einstellungen (wähle eine aus und klicke auf Senden)";
+$a->strings["Visit %s's profile - %s"] = "%ss Profil besuchen - %s";
+$a->strings["Block/Unblock contact"] = "Kontakt blockieren/freigeben";
+$a->strings["Ignore contact"] = "Kontakt ignorieren";
+$a->strings["Repair URL settings"] = "URL-Einstellungen reparieren";
+$a->strings["View conversations"] = "Unterhaltungen anzeigen";
+$a->strings["Delete contact"] = "Kontakt löschen";
+$a->strings["Last update:"] = "Letzte Aktualisierung:";
+$a->strings["Update public posts"] = "Öffentliche Beiträge aktualisieren";
+$a->strings["Update now"] = "Jetzt aktualisieren";
+$a->strings["Currently blocked"] = "Derzeit blockiert";
+$a->strings["Currently ignored"] = "Derzeit ignoriert";
+$a->strings["Currently archived"] = "Derzeit archiviert";
+$a->strings["Currently pending"] = "Derzeit anstehend";
+$a->strings["Red Matrix - &quot;The Network&quot;"] = "RedMatrix – &quot;Das Netzwerk&quot;";
+$a->strings["Welcome to %s"] = "Willkommen auf %s";
+$a->strings["Continue"] = "Fortfahren";
+$a->strings["Premium Channel Setup"] = "Premium-Kanal-Einrichtung";
+$a->strings["Enable premium channel connection restrictions"] = "Einschränkungen für einen Premium-Kanal aktivieren";
+$a->strings["Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc."] = "Bitte gib Deine Nutzungsbedingungen ein, z.B. Paypal-Quittung, Richtlinien etc.";
+$a->strings["This channel may require additional steps or acknowledgement of the following conditions prior to connecting:"] = "Unter Umständen sind weitere Schritte oder die Bestätigung der folgenden Bedingungen vor dem Verbinden mit diesem Kanal nötig.";
+$a->strings["Potential connections will then see the following text before proceeding:"] = "Potentielle Kontakte werden den folgenden Text sehen, bevor fortgefahren wird:";
+$a->strings["By continuing, I certify that I have complied with any instructions provided on this page."] = "Indem ich fortfahre, bestätige ich die Erfüllung aller Anweisungen auf dieser Seite.";
+$a->strings["(No specific instructions have been provided by the channel owner.)"] = "(Der Kanal-Besitzer hat keine speziellen Anweisungen hinterlegt.)";
+$a->strings["Restricted or Premium Channel"] = "Eingeschränkter oder Premium-Kanal";
+$a->strings["Item is not editable"] = "Element kann nicht bearbeitet werden.";
+$a->strings["Edit post"] = "Bearbeite Beitrag";
+$a->strings["Delete item?"] = "Eintrag löschen?";
+$a->strings["Item not available."] = "Element nicht verfügbar.";
+$a->strings["Fetching URL returns error: %1\$s"] = "Abrufen der URL gab einen Fehler zurück: %1\$s";
+$a->strings["RedMatrix channel"] = "RedMatrix-Kanal";
+$a->strings["Image uploaded but image cropping failed."] = "Bild hochgeladen, aber das Zurechtschneiden schlug fehl.";
+$a->strings["Image resize failed."] = "Bild-Anpassung fehlgeschlagen.";
+$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Leere den Browser Cache oder nutze Umschalten-Neu Laden, falls das neue Foto nicht sofort angezeigt wird.";
+$a->strings["Image exceeds size limit of %d"] = "Bild ist größer als das Limit von %d";
+$a->strings["Unable to process image."] = "Kann Bild nicht verarbeiten.";
+$a->strings["Photo not available."] = "Foto nicht verfügbar.";
+$a->strings["Upload File:"] = "Datei hochladen:";
+$a->strings["Select a profile:"] = "Wähle ein Profil:";
+$a->strings["Upload Profile Photo"] = "Lade neues Profilfoto hoch";
+$a->strings["or"] = "oder";
+$a->strings["skip this step"] = "diesen Schritt überspringen";
+$a->strings["select a photo from your photo albums"] = "ein Foto aus meinen Fotoalben";
+$a->strings["Crop Image"] = "Bild zuschneiden";
+$a->strings["Please adjust the image cropping for optimum viewing."] = "Bitte schneide das Bild für eine optimale Anzeige passend zu.";
+$a->strings["Done Editing"] = "Bearbeitung fertigstellen";
+$a->strings["Image uploaded successfully."] = "Bild erfolgreich hochgeladen.";
+$a->strings["Image upload failed."] = "Hochladen des Bilds fehlgeschlagen.";
+$a->strings["Image size reduction [%s] failed."] = "Reduzierung der Bildgröße [%s] fehlgeschlagen.";
+$a->strings["Invalid item."] = "Ungültiges Element.";
+$a->strings["Channel not found."] = "Kanal nicht gefunden.";
+$a->strings["Page not found."] = "Seite nicht gefunden.";
+$a->strings["No such group"] = "Sammlung nicht gefunden";
+$a->strings["Search Results For:"] = "Suchergebnisse für:";
+$a->strings["Collection is empty"] = "Sammlung ist leer";
+$a->strings["Collection: "] = "Sammlung:";
+$a->strings["Connection: "] = "Verbindung:";
+$a->strings["Invalid connection."] = "Ungültige Verbindung.";
+$a->strings["Event can not end before it has started."] = "Termin-Ende liegt vor dem Beginn.";
+$a->strings["Unable to generate preview."] = "Vorschau konnte nicht erzeugt werden.";
+$a->strings["Event title and start time are required."] = "Titel und Startzeit des Termins sind erforderlich.";
+$a->strings["Event not found."] = "Termin nicht gefunden.";
+$a->strings["l, F j"] = "l, j. F";
+$a->strings["Edit event"] = "Termin bearbeiten";
+$a->strings["Delete event"] = "Termin löschen";
+$a->strings["Create New Event"] = "Neuen Termin erstellen";
+$a->strings["Previous"] = "Voriges";
+$a->strings["Next"] = "Nächste";
+$a->strings["Export"] = "Exportieren";
+$a->strings["Event removed"] = "Termin gelöscht";
+$a->strings["Failed to remove event"] = "Termin konnte nicht gelöscht werden";
+$a->strings["Event details"] = "Termin-Details";
+$a->strings["Starting date and Title are required."] = "Startdatum und Titel sind erforderlich.";
+$a->strings["Categories (comma-separated list)"] = "Kategorien (Kommagetrennte Liste)";
+$a->strings["Event Starts:"] = "Termin beginnt:";
+$a->strings["Finish date/time is not known or not relevant"] = "Ende Datum/Zeit sind unbekannt oder unwichtig";
+$a->strings["Event Finishes:"] = "Termin endet:";
+$a->strings["Adjust for viewer timezone"] = "An die Zeitzone des Betrachters anpassen";
+$a->strings["Important for events that happen in a particular place. Not practical for global holidays."] = "Wichtig für Veranstaltungen die an bestimmten Orten stattfinden. Nicht sinnvoll für globale Feiertage / Ferien.";
+$a->strings["Description:"] = "Beschreibung:";
+$a->strings["Title:"] = "Titel:";
+$a->strings["Share this event"] = "Den Termin teilen";
+$a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s folgt nun %2\$ss %3\$s";
+$a->strings["Public Sites"] = "Öffentliche Server";
+$a->strings["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."] = "Die hier aufgeführten Server erlauben Dir, einen Account in der Red-Matrix anzulegen. Alle Server der Matrix sind miteinander verbunden, so dass die Mitgliedschaft auf einem Server eine Verbindung zu beliebigen anderen Servern der Matrix ermöglicht. Es könnte sein, dass einige dieser Server kostenpflichtig sind oder abgestufte, je nach Umfang kostenpflichtige Mitgliedschaften anbieten. Auf den jeweiligen Seiten <strong>könnten</strong> nähere Details dazu stehen.";
+$a->strings["Rate this hub"] = "Bewerte diesen Hub";
+$a->strings["Site URL"] = "Server-URL";
+$a->strings["Access Type"] = "Zugangstyp";
+$a->strings["Registration Policy"] = "Registrierungsrichtlinien";
+$a->strings["Location"] = "Ort";
+$a->strings["View hub ratings"] = "Bewertungen dieses Hubs ansehen";
+$a->strings["Rate"] = "Bewerten";
+$a->strings["View ratings"] = "Bewertungen ansehen";
$a->strings["Name is required"] = "Name ist erforderlich";
-$a->strings["Key and Secret are required"] = "Schlüssel und Geheimnis sind erforderlich";
+$a->strings["Key and Secret are required"] = "Schlüssel und Geheimnis werden benötigt";
$a->strings["Diaspora Policy Settings updated."] = "Diaspora-Einstellungen aktualisiert.";
$a->strings["Passwords do not match. Password unchanged."] = "Kennwörter stimmen nicht überein. Kennwort nicht verändert.";
$a->strings["Empty passwords are not allowed. Password unchanged."] = "Leere Kennwörter sind nicht erlaubt. Kennwort nicht verändert.";
@@ -932,8 +1108,6 @@ $a->strings["Not valid email."] = "Keine gültige E-Mail Adresse.";
$a->strings["Protected email address. Cannot change to that email."] = "Geschützte E-Mail Adresse. Diese kann nicht verändert werden.";
$a->strings["System failure storing new email. Please try again."] = "Systemfehler während des Speicherns der neuen Mail. Bitte versuche es noch einmal.";
$a->strings["Settings updated."] = "Einstellungen aktualisiert.";
-$a->strings["No"] = "Nein";
-$a->strings["Yes"] = "Ja";
$a->strings["Add application"] = "Anwendung hinzufügen";
$a->strings["Name of application"] = "Name der Anwendung";
$a->strings["Consumer Key"] = "Consumer Key";
@@ -949,18 +1123,19 @@ $a->strings["Client key starts with"] = "Client Key beginnt mit";
$a->strings["No name"] = "Kein Name";
$a->strings["Remove authorization"] = "Authorisierung aufheben";
$a->strings["No feature settings configured"] = "Keine Funktions-Einstellungen konfiguriert";
-$a->strings["Feature/Addon Settings"] = "Feature-/Addon-Einstellungen";
-$a->strings["Settings for the built-in Diaspora emulator"] = "Einstellungen für den eingebauten Diaspora-Emulator";
-$a->strings["Allow any Diaspora member to comment on your public posts"] = "Jedem Diaspora-Mitglied erlauben, Deine öffentlichen Beiträge zu kommentieren";
+$a->strings["Feature Settings"] = "Funktions-Einstellungen";
$a->strings["Diaspora Policy Settings"] = "Diaspora-Einstellungen";
-$a->strings["Prevent your hashtags from being redirected to other sites"] = "Verhindern, dass Deine hashtags zu anderen Seiten umgeleitet werden";
+$a->strings["Allow any Diaspora member to comment on your public posts."] = "Allen Diaspora-Mitgliedern erlauben, Deine öffentlichen Beiträge zu kommentieren.";
+$a->strings["Submit Diaspora Policy Settings"] = "Diaspora-Einstellungen speichern";
$a->strings["Account Settings"] = "Konto-Einstellungen";
-$a->strings["Enter New Password:"] = "Neues Passwort eingeben:";
-$a->strings["Confirm New Password:"] = "Neues Passwort bestätigen:";
+$a->strings["Password Settings"] = "Kennwort-Einstellungen";
+$a->strings["New Password:"] = "Neues Passwort:";
+$a->strings["Confirm:"] = "Bestätigen:";
$a->strings["Leave password fields blank unless changing"] = "Lasse die Passwort-Felder leer, außer Du möchtest das Passwort ändern";
$a->strings["Email Address:"] = "Email Adresse:";
$a->strings["Remove Account"] = "Konto entfernen";
-$a->strings["Remove this account including all its channels"] = "Dieses Konto inklusive all seiner Kanäle löschen";
+$a->strings["Remove this account from this server including all its channels"] = "Lösche dieses Konto einschließlich aller zugehörigen Kanäle von diesem Server";
+$a->strings["Warning: This action is permanent and cannot be reversed."] = "Achtung: Diese Aktion ist endgültig und kann nicht rückgängig gemacht werden.";
$a->strings["Off"] = "Aus";
$a->strings["On"] = "An";
$a->strings["Additional Features"] = "Zusätzliche Funktionen";
@@ -976,9 +1151,9 @@ $a->strings["Update browser every xx seconds"] = "Browser alle xx Sekunden aktua
$a->strings["Minimum of 10 seconds, no maximum"] = "Minimum 10 Sekunden, kein Maximum";
$a->strings["Maximum number of conversations to load at any time:"] = "Maximale Anzahl von Unterhaltungen, die auf einmal geladen werden sollen:";
$a->strings["Maximum of 100 items"] = "Maximum: 100 Beiträge";
-$a->strings["Show emoticons (smilies) as images"] = "Emoticons (Smilies) als Bilder anzeigen";
+$a->strings["Don't show emoticons"] = "Emoticons nicht anzeigen";
$a->strings["Link post titles to source"] = "Beitragstitel zum Originalbeitrag verlinken";
-$a->strings["System Page Layout Editor - (advanced)"] = "Systemseitengestaltungseditor - (erweitert)";
+$a->strings["System Page Layout Editor - (advanced)"] = "System-Seitenlayout-Editor (für Experten)";
$a->strings["Use blog/list mode on channel page"] = "Blog-/Listenmodus auf der Kanalseite verwenden";
$a->strings["(comments displayed separately)"] = "(Kommentare werden separat angezeigt)";
$a->strings["Use blog/list mode on matrix page"] = "Blog-/Listenmodus auf der Matrixseite verwenden";
@@ -995,7 +1170,6 @@ $a->strings["Anybody authenticated"] = "Jeder authentifizierte";
$a->strings["Anybody on the internet"] = "Jeder im Internet";
$a->strings["Publish your default profile in the network directory"] = "Standard-Profil im Netzwerk-Verzeichnis veröffentlichen";
$a->strings["Allow us to suggest you as a potential friend to new members?"] = "Dürfen wir Dich neuen Mitgliedern als potentiellen Kontakt vorschlagen?";
-$a->strings["or"] = "oder";
$a->strings["Your channel address is"] = "Deine Kanal-Adresse lautet";
$a->strings["Channel Settings"] = "Kanal-Einstellungen";
$a->strings["Basic Settings"] = "Grundeinstellungen";
@@ -1062,120 +1236,12 @@ $a->strings["Change the behaviour of this account for special situations"] = "Ä
$a->strings["Please enable expert mode (in <a href=\"settings/features\">Settings > Additional features</a>) to adjust!"] = "Aktiviere den Expertenmodus (unter <a href=\"settings/features\">Settings > Zusätzliche Funktionen</a>), um hier Einstellungen vorzunehmen!";
$a->strings["Miscellaneous Settings"] = "Sonstige Einstellungen";
$a->strings["Personal menu to display in your channel pages"] = "Eigenes Menü zur Anzeige auf den Seiten deines Kanals";
-$a->strings["Remove Channel"] = "Kanal löschen";
-$a->strings["Remove this channel."] = "Diesen Kanal löschen";
-$a->strings["Xchan Lookup"] = "Xchan-Suche";
-$a->strings["Lookup xchan beginning with (or webbie): "] = "Nach xchans oder Webbies (Kanal-Adressen) suchen, die wie folgt beginnen:";
-$a->strings["Not found."] = "Nicht gefunden.";
-$a->strings["Authorize application connection"] = "Zugriff für die Anwendung autorisieren";
-$a->strings["Return to your app and insert this Securty Code:"] = "Trage folgenden Sicherheitscode in der Anwendung ein:";
-$a->strings["Please login to continue."] = "Zum Weitermachen, bitte einloggen.";
-$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Möchtest Du dieser Anwendung erlauben, Deine Nachrichten und Kontakte abzurufen und/oder neue Nachrichten für Dich zu erstellen?";
-$a->strings["Page Title"] = "Seitentitel";
-$a->strings["Channel added."] = "Kanal hinzugefügt.";
+$a->strings["Remove this channel"] = "Diesen Kanal löschen";
+$a->strings["RedMatrix - Guests: Username: {your email address}, Password: +++"] = "RedMatrix – Gäste: Username: {Deine E-Mail-Adresse}, Passwort: +++";
$a->strings["Tag removed"] = "Schlagwort entfernt";
$a->strings["Remove Item Tag"] = "Schlagwort entfernen";
$a->strings["Select a tag to remove: "] = "Schlagwort zum Entfernen auswählen:";
$a->strings["Remove"] = "Entferne";
-$a->strings["Continue"] = "Fortfahren";
-$a->strings["Premium Channel Setup"] = "Premium-Kanal-Einrichtung";
-$a->strings["Enable premium channel connection restrictions"] = "Einschränkungen für einen Premium-Kanal aktivieren";
-$a->strings["Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc."] = "Bitte gib Deine Nutzungsbedingungen ein, z.B. Paypal-Quittung, Richtlinien etc.";
-$a->strings["This channel may require additional steps or acknowledgement of the following conditions prior to connecting:"] = "Unter Umständen sind weitere Schritte oder die Bestätigung der folgenden Bedingungen vor dem Verbinden mit diesem Kanal nötig.";
-$a->strings["Potential connections will then see the following text before proceeding:"] = "Potentielle Kontakte werden den folgenden Text sehen, bevor fortgefahren wird:";
-$a->strings["By continuing, I certify that I have complied with any instructions provided on this page."] = "Indem ich fortfahre, bestätige ich die Erfüllung aller Anweisungen auf dieser Seite.";
-$a->strings["(No specific instructions have been provided by the channel owner.)"] = "(Der Kanal-Besitzer hat keine speziellen Anweisungen hinterlegt.)";
-$a->strings["Restricted or Premium Channel"] = "Eingeschränkter oder Premium-Kanal";
-$a->strings["Thing updated"] = "Sache aktualisiert";
-$a->strings["Object store: failed"] = "Speichern des Objekts fehlgeschlagen";
-$a->strings["Thing added"] = "Sache hinzugefügt";
-$a->strings["OBJ: %1\$s %2\$s %3\$s"] = "OBJ: %1\$s %2\$s %3\$s";
-$a->strings["Show Thing"] = "Sache anzeigen";
-$a->strings["item not found."] = "Eintrag nicht gefunden";
-$a->strings["Edit Thing"] = "Sache bearbeiten";
-$a->strings["Select a profile"] = "Wähle ein Profil";
-$a->strings["Post an activity"] = "Aktivitätsnachricht senden";
-$a->strings["Only sends to viewers of the applicable profile"] = "Nur an Betrachter des ausgewählten Profils senden";
-$a->strings["Name of thing e.g. something"] = "Name der Sache, z. B. irgendwas";
-$a->strings["URL of thing (optional)"] = "URL der Sache (optional)";
-$a->strings["URL for photo of thing (optional)"] = "URL eines Fotos der Sache (optional)";
-$a->strings["Add Thing to your Profile"] = "Die Sache Deinem Profil hinzufügen";
-$a->strings["Item not available."] = "Element nicht verfügbar.";
-$a->strings["Fetching URL returns error: %1\$s"] = "Abrufen der URL gab einen Fehler zurück: %1\$s";
-$a->strings["Red Matrix - &quot;The Network&quot;"] = "RedMatrix – &quot;Das Netzwerk&quot;";
-$a->strings["Welcome to %s"] = "Willkommen auf %s";
-$a->strings["Image uploaded but image cropping failed."] = "Bild hochgeladen, aber das Zurechtschneiden schlug fehl.";
-$a->strings["Image resize failed."] = "Bild-Anpassung fehlgeschlagen.";
-$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Leere den Browser Cache oder nutze Umschalten-Neu Laden, falls das neue Foto nicht sofort angezeigt wird.";
-$a->strings["Image exceeds size limit of %d"] = "Bild ist größer als das Limit von %d";
-$a->strings["Unable to process image."] = "Kann Bild nicht verarbeiten.";
-$a->strings["Photo not available."] = "Foto nicht verfügbar.";
-$a->strings["Upload File:"] = "Datei hochladen:";
-$a->strings["Select a profile:"] = "Wähle ein Profil:";
-$a->strings["Upload Profile Photo"] = "Lade neues Profilfoto hoch";
-$a->strings["skip this step"] = "diesen Schritt überspringen";
-$a->strings["select a photo from your photo albums"] = "ein Foto aus meinen Fotoalben";
-$a->strings["Crop Image"] = "Bild zuschneiden";
-$a->strings["Please adjust the image cropping for optimum viewing."] = "Bitte schneide das Bild für eine optimale Anzeige passend zu.";
-$a->strings["Done Editing"] = "Bearbeitung fertigstellen";
-$a->strings["Image uploaded successfully."] = "Bild erfolgreich hochgeladen.";
-$a->strings["Image upload failed."] = "Hochladen des Bilds fehlgeschlagen.";
-$a->strings["Image size reduction [%s] failed."] = "Reduzierung der Bildgröße [%s] fehlgeschlagen.";
-$a->strings["Invalid item."] = "Ungültiges Element.";
-$a->strings["Channel not found."] = "Kanal nicht gefunden.";
-$a->strings["Page not found."] = "Seite nicht gefunden.";
-$a->strings["Like/Dislike"] = "Mögen/Nicht mögen";
-$a->strings["This action is restricted to members."] = "Diese Aktion kann nur von Mitgliedern ausgeführt werden.";
-$a->strings["Please <a href=\"rmagic\">login with your RedMatrix ID</a> or <a href=\"register\">register as a new RedMatrix member</a> to continue."] = "Bitte <a href=\"rmagic\">melde Dich mit Deiner RedMatrix-ID an</a> oder <a href=\"register\">registriere Dich als neues Mitglied der RedMatrix</a>, um fortzufahren.";
-$a->strings["Invalid request."] = "Ungültige Anfrage.";
-$a->strings["thing"] = "Sache";
-$a->strings["Channel unavailable."] = "Kanal nicht vorhanden.";
-$a->strings["Previous action reversed."] = "Die vorherige Aktion wurde rückgängig gemacht.";
-$a->strings["%1\$s agrees with %2\$s's %3\$s"] = "%1\$s stimmt %2\$ss %3\$s zu";
-$a->strings["%1\$s doesn't agree with %2\$s's %3\$s"] = "%1\$s lehnt %2\$ss %3\$s ab";
-$a->strings["%1\$s abstains from a decision on %2\$s's %3\$s"] = "%1\$s enthält sich zu %2\$ss %3\$s";
-$a->strings["%1\$s is attending %2\$s's %3\$s"] = "%1\$s nimmt an %2\$ss %3\$s teil";
-$a->strings["%1\$s is not attending %2\$s's %3\$s"] = "%1\$s nimmt an %2\$ss %3\$s nicht teil";
-$a->strings["%1\$s may attend %2\$s's %3\$s"] = "%1\$s nimmt vielleicht an %2\$ss %3\$s teil";
-$a->strings["Action completed."] = "Aktion durchgeführt.";
-$a->strings["Thank you."] = "Vielen Dank.";
-$a->strings["Event can not end before it has started."] = "Termin-Ende liegt vor dem Beginn.";
-$a->strings["Unable to generate preview."] = "Vorschau konnte nicht erzeugt werden.";
-$a->strings["Event title and start time are required."] = "Titel und Startzeit des Termins sind erforderlich.";
-$a->strings["Event not found."] = "Termin nicht gefunden.";
-$a->strings["l, F j"] = "l, j. F";
-$a->strings["Edit event"] = "Termin bearbeiten";
-$a->strings["Delete event"] = "Termin löschen";
-$a->strings["Create New Event"] = "Neuen Termin erstellen";
-$a->strings["Previous"] = "Voriges";
-$a->strings["Next"] = "Nächste";
-$a->strings["Export"] = "Exportieren";
-$a->strings["Event removed"] = "Termin gelöscht";
-$a->strings["Failed to remove event"] = "Termin konnte nicht gelöscht werden";
-$a->strings["Event details"] = "Termin-Details";
-$a->strings["Starting date and Title are required."] = "Startdatum und Titel sind erforderlich.";
-$a->strings["Categories (comma-separated list)"] = "Kategorien (Kommagetrennte Liste)";
-$a->strings["Event Starts:"] = "Termin beginnt:";
-$a->strings["Finish date/time is not known or not relevant"] = "Ende Datum/Zeit sind unbekannt oder unwichtig";
-$a->strings["Event Finishes:"] = "Termin endet:";
-$a->strings["Adjust for viewer timezone"] = "An die Zeitzone des Betrachters anpassen";
-$a->strings["Important for events that happen in a particular place. Not practical for global holidays."] = "Wichtig für Veranstaltungen die an bestimmten Orten stattfinden. Nicht sinnvoll für globale Feiertage / Ferien.";
-$a->strings["Description:"] = "Beschreibung:";
-$a->strings["Title:"] = "Titel:";
-$a->strings["Share this event"] = "Den Termin teilen";
-$a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s folgt nun %2\$ss %3\$s";
-$a->strings["Public Sites"] = "Öffentliche Server";
-$a->strings["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."] = "Die hier aufgeführten Server erlauben Dir, einen Account in der Red-Matrix anzulegen. Alle Server der Matrix sind miteinander verbunden, so dass die Mitgliedschaft auf einem Server eine Verbindung zu beliebigen anderen Servern der Matrix ermöglicht. Es könnte sein, dass einige dieser Server kostenpflichtig sind oder abgestufte, je nach Umfang kostenpflichtige Mitgliedschaften anbieten. Auf den jeweiligen Seiten <strong>könnten</strong> nähere Details dazu stehen.";
-$a->strings["Rate this hub"] = "Bewerte diesen Hub";
-$a->strings["Site URL"] = "Server-URL";
-$a->strings["Access Type"] = "Zugangstyp";
-$a->strings["Registration Policy"] = "Registrierungsrichtlinien";
-$a->strings["Location"] = "Ort";
-$a->strings["View hub ratings"] = "Bewertungen dieses Hubs ansehen";
-$a->strings["Rate"] = "Bewerten";
-$a->strings["View ratings"] = "Bewertungen ansehen";
-$a->strings["Edit post"] = "Bearbeite Beitrag";
-$a->strings["RedMatrix channel"] = "RedMatrix-Kanal";
$a->strings["Collection created."] = "Sammlung erstellt.";
$a->strings["Could not create collection."] = "Sammlung kann nicht erstellt werden.";
$a->strings["Collection updated."] = "Sammlung aktualisiert.";
@@ -1192,11 +1258,11 @@ $a->strings["Version %s"] = "Version %s";
$a->strings["Installed plugins/addons/apps:"] = "Installierte Plugins/Addons/Apps";
$a->strings["No installed plugins/addons/apps"] = "Keine installierten Plugins/Addons/Apps";
$a->strings["Red"] = "Red";
-$a->strings["This is a hub of redmatrix - a global cooperative network of decentralized privacy enhanced websites."] = "Dieser Hub ist Teil der RedMatrix – ein globales, kooperatives Netzwerk aus dezentralen Websites, die Rücksicht auf Deine Privatsphäre nehmen.";
+$a->strings["This is a hub of the Red Matrix - a global cooperative network of decentralized privacy enhanced websites."] = "Dieser Hub ist Teil der RedMatrix – eines globalen, kooperativen Netzwerks aus dezentralen Websites, die Rücksicht auf Deine Privatsphäre nehmen.";
$a->strings["Tag: "] = "Schlagwort: ";
$a->strings["Last background fetch: "] = "Letzter Hintergrundabruf:";
$a->strings["Running at web location"] = "Erreichbar unter der Web-Adresse";
-$a->strings["Please visit <a href=\"https://redmatrix.me\">redmatrix.me</a> to learn more about the Red Matrix."] = "Bitte besuche <a href=\"https://redmatrix.me\">RedMatrix.me</a>, um mehr über RedMatrix zu erfahren.";
+$a->strings["Please visit <a href=\"https://redmatrix.me\">RedMatrix.me</a> to learn more about the Red Matrix."] = "Bitte besuchen Sie <a href=\"https://redmatrix.me\">RedMatrix.me</a>, um mehr über RedMatrix zu erfahren.";
$a->strings["Bug reports and issues: please visit"] = "Probleme oder Fehler gefunden? Bitte besuche";
$a->strings["Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"] = "Vorschläge, Lob, usw.: E-Mail an 'redmatrix' at librelist - dot - com";
$a->strings["Site Administrators"] = "Administratoren";
@@ -1235,7 +1301,7 @@ $a->strings["PHP executable path"] = "PHP Pfad zu ausführbarer Datei";
$a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Gib den vollen Pfad zum PHP-Interpreter an. Du kannst dieses Feld frei lassen und mit der Installation fortfahren.";
$a->strings["Command line PHP"] = "PHP Befehlszeile";
$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "Bei der Kommandozeilen-Version von PHP auf Deinem System ist \"register_argc_argv\" nicht aktiviert.";
-$a->strings["This is required for message delivery to work."] = "Das ist für die funktionierende Auslieferung von Nachrichten erforderlich.";
+$a->strings["This is required for message delivery to work."] = "Das wird benötigt, damit die Auslieferung von Nachrichten funktioniert.";
$a->strings["PHP register_argc_argv"] = "PHP register_argc_argv";
$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Fehler: Die „openssl_pkey_new“-Funktion auf diesem System ist nicht in der Lage, Schlüssel für die Verschlüsselung zu erzeugen.";
$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Wenn Du Windows verwendest, findest Du unter http://www.php.net/manual/en/openssl.installation.php eine Installationsanleitung.";
@@ -1247,15 +1313,15 @@ $a->strings["mysqli or postgres PHP module"] = "mysqli oder postgres PHP-Modul";
$a->strings["mb_string PHP module"] = "mb_string-PHP-Modul";
$a->strings["mcrypt PHP module"] = "mcrypt-PHP-Modul";
$a->strings["Apache mod_rewrite module"] = "Apache-mod_rewrite-Modul";
-$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Fehler: Das Apache-Modul mod-rewrite ist erforderlich, aber nicht installiert.";
+$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Fehler: Das Apache-Modul mod-rewrite wird benötigt, ist aber nicht installiert.";
$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"] = "Fehler: proc_open ist erforderlich, aber entweder nicht installiert oder wurde in der php.ini deaktiviert";
-$a->strings["Error: libCURL PHP module required but not installed."] = "Fehler: Das PHP-Modul libCURL ist erforderlich, aber nicht installiert.";
-$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Fehler: Das PHP-Modul GD-Grafik mit JPEG-Unterstützung ist erforderlich, aber nicht installiert.";
-$a->strings["Error: openssl PHP module required but not installed."] = "Fehler: Das PHP-Modul openssl ist erforderlich, aber nicht installiert.";
+$a->strings["Error: proc_open is required but is either not installed or has been disabled in php.ini"] = "Fehler: proc_open wird benötigt, ist aber entweder nicht installiert oder wurde in der php.ini deaktiviert";
+$a->strings["Error: libCURL PHP module required but not installed."] = "Fehler: Das PHP-Modul libCURL wird benötigt, ist aber nicht installiert.";
+$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Fehler: Das PHP-Modul GD-Grafik mit JPEG-Unterstützung wird benötigt, ist aber nicht installiert.";
+$a->strings["Error: openssl PHP module required but not installed."] = "Fehler: Das PHP-Modul openssl wird benötigt, ist aber nicht installiert.";
$a->strings["Error: mysqli or postgres PHP module required but neither are installed."] = "Fehler: Das mysqli oder postgres PHP-Modul ist erforderlich, aber keines von beiden ist installiert.";
-$a->strings["Error: mb_string PHP module required but not installed."] = "Fehler: Das PHP-Modul mb_string ist erforderlich, aber nicht installiert.";
-$a->strings["Error: mcrypt PHP module required but not installed."] = "Fehler: Das PHP-Modul mcrypt ist erforderlich, aber nicht installiert.";
+$a->strings["Error: mb_string PHP module required but not installed."] = "Fehler: Das PHP-Modul mb_string wird benötigt, ist aber nicht installiert.";
+$a->strings["Error: mcrypt PHP module required but not installed."] = "Fehler: Das PHP-Modul mcrypt wird benötigt, ist aber nicht installiert.";
$a->strings["The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so."] = "Der Installations-Assistent muss in der Lage sein, die Datei \".htconfig.php\" im Stammverzeichnis des Web-Servers anzulegen, ist er aber nicht.";
$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."] = "Meist liegt das daran, dass der Nutzer, unter dem der Web-Server läuft, keine Schreibrechte in dem Verzeichnis hat – selbst wenn Du selbst das darfst.";
$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."] = "Am Schluss dieses Vorgangs wird ein Text generiert, den Du unter dem Dateinamen .htconfig.php im Stammverzeichnis Deiner Red-Installation speichern musst.";
@@ -1284,15 +1350,12 @@ $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for t
$a->strings["No channel."] = "Kein Kanal.";
$a->strings["Common connections"] = "Gemeinsame Verbindungen";
$a->strings["No connections in common."] = "Keine gemeinsamen Verbindungen.";
-$a->strings["This site is not a directory server"] = "Diese Website ist kein Verzeichnis-Server";
-$a->strings["Could not access contact record."] = "Konnte nicht auf den Kontakteintrag zugreifen.";
-$a->strings["Could not locate selected profile."] = "Gewähltes Profil nicht gefunden.";
-$a->strings["Connection updated."] = "Verbindung aktualisiert.";
-$a->strings["Failed to update connection record."] = "Konnte den Verbindungseintrag nicht aktualisieren.";
+$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Keine Vorschläge vorhanden. Wenn das ein neuer Server ist, versuche es in 24 Stunden noch einmal.";
$a->strings["Blocked"] = "Blockiert";
$a->strings["Ignored"] = "Ignoriert";
$a->strings["Hidden"] = "Versteckt";
$a->strings["Archived"] = "Archiviert";
+$a->strings["All"] = "Alle";
$a->strings["Suggest new connections"] = "Neue Verbindungen vorschlagen";
$a->strings["New Connections"] = "Neue Verbindungen";
$a->strings["Show pending (new) connections"] = "Ausstehende (neue) Verbindungsanfragen anzeigen";
@@ -1308,65 +1371,57 @@ $a->strings["%1\$s [%2\$s]"] = "%1\$s [%2\$s]";
$a->strings["Edit connection"] = "Verbindung bearbeiten";
$a->strings["Search your connections"] = "Verbindungen durchsuchen";
$a->strings["Finding: "] = "Ergebnisse:";
-$a->strings["Block Name"] = "Datenblockname";
-$a->strings["Block Title"] = "Titel des Blocks";
+$a->strings["webpage"] = "Webseite";
+$a->strings["block"] = "Block";
+$a->strings["layout"] = "Layout";
+$a->strings["%s element installed"] = "Element für %s installiert";
$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s hat %2\$ss %3\$s mit %4\$s verschlagwortet";
-$a->strings["RedMatrix - Guests: Username: {your email address}, Password: +++"] = "RedMatrix – Gäste: Username: {Deine E-Mail-Adresse}, Passwort: +++";
-$a->strings["Page owner information could not be retrieved."] = "Informationen über den Besitzer der Seite konnten nicht gefunden werden.";
-$a->strings["Album not found."] = "Album nicht gefunden.";
-$a->strings["Delete Album"] = "Album löschen";
-$a->strings["Delete Photo"] = "Foto löschen";
+$a->strings["Unable to locate original post."] = "Originalbeitrag nicht gefunden.";
+$a->strings["Empty post discarded."] = "Leeren Beitrag verworfen.";
+$a->strings["Executable content type not permitted to this channel."] = "Ausführbarer Content-Typ ist für diesen Kanal nicht freigegeben.";
+$a->strings["System error. Post not saved."] = "Systemfehler. Beitrag nicht gespeichert.";
+$a->strings["You have reached your limit of %1$.0f top level posts."] = "Du hast die maximale Anzahl von %1$.0f Beiträgen erreicht.";
+$a->strings["You have reached your limit of %1$.0f webpages."] = "Du hast die maximale Anzahl von %1$.0f Webseiten erreicht.";
$a->strings["Public access denied."] = "Öffentlicher Zugang verweigert.";
-$a->strings["No photos selected"] = "Keine Fotos ausgewählt";
-$a->strings["Access to this item is restricted."] = "Der Zugriff auf dieses Foto ist eingeschränkt.";
-$a->strings["%1$.2f MB of %2$.2f MB photo storage used."] = "%1$.2f MB von %2$.2f MB Foto-Speicher belegt.";
-$a->strings["%1$.2f MB photo storage used."] = "%1$.2f MB Foto-Speicher belegt.";
-$a->strings["Upload Photos"] = "Fotos hochladen";
-$a->strings["Enter a new album name"] = "Gib einen Namen für ein neues Album ein";
-$a->strings["or select an existing one (doubleclick)"] = "oder wähle ein bereits vorhandenes aus (Doppelklick)";
-$a->strings["Create a status post for this upload"] = "Einen Statusbeitrag für diesen Upload erzeugen";
-$a->strings["Album name could not be decoded"] = "Albumname konnte nicht dekodiert werden";
-$a->strings["Contact Photos"] = "Kontakt-Bilder";
-$a->strings["Show Newest First"] = "Neueste zuerst anzeigen";
-$a->strings["Show Oldest First"] = "Älteste zuerst anzeigen";
-$a->strings["View Photo"] = "Foto ansehen";
-$a->strings["Edit Album"] = "Album bearbeiten";
-$a->strings["Permission denied. Access to this item may be restricted."] = "Berechtigung verweigert. Der Zugriff ist wahrscheinlich eingeschränkt worden.";
-$a->strings["Photo not available"] = "Foto nicht verfügbar";
-$a->strings["Use as profile photo"] = "Als Profilfoto verwenden";
-$a->strings["Private Photo"] = "Privates Foto";
-$a->strings["View Full Size"] = "In voller Größe anzeigen";
-$a->strings["Edit photo"] = "Foto bearbeiten";
-$a->strings["Rotate CW (right)"] = "Drehen im UZS (rechts)";
-$a->strings["Rotate CCW (left)"] = "Drehen gegen UZS (links)";
-$a->strings["Caption"] = "Bildunterschrift";
-$a->strings["Add a Tag"] = "Schlagwort hinzufügen";
-$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com"] = "Beispiele: @ben, @Karl_Prester, @lieschen@example.com";
-$a->strings["Flag as adult in album view"] = "In der Albumansicht als nicht jugendfrei markieren";
-$a->strings["In This Photo:"] = "Auf diesem Foto:";
-$a->strings["Map"] = "Karte";
-$a->strings["View Album"] = "Album ansehen";
-$a->strings["Recent Photos"] = "Neueste Fotos";
-$a->strings["Profile Match"] = "Profil-Übereinstimmungen";
-$a->strings["No keywords to match. Please add keywords to your default profile."] = "Keine Schlüsselwörter für den Abgleich gefunden. Bitte füge Schlüsselwörter zu Deinem Standardprofil hinzu.";
-$a->strings["is interested in:"] = "interessiert sich für:";
-$a->strings["No matches"] = "Keine Übereinstimmungen";
+$a->strings["Thing updated"] = "Sache aktualisiert";
+$a->strings["Object store: failed"] = "Speichern des Objekts fehlgeschlagen";
+$a->strings["Thing added"] = "Sache hinzugefügt";
+$a->strings["OBJ: %1\$s %2\$s %3\$s"] = "OBJ: %1\$s %2\$s %3\$s";
+$a->strings["Show Thing"] = "Sache anzeigen";
+$a->strings["item not found."] = "Eintrag nicht gefunden";
+$a->strings["Edit Thing"] = "Sache bearbeiten";
+$a->strings["Select a profile"] = "Wähle ein Profil";
+$a->strings["Post an activity"] = "Aktivitätsnachricht senden";
+$a->strings["Only sends to viewers of the applicable profile"] = "Nur an Betrachter des ausgewählten Profils senden";
+$a->strings["Name of thing e.g. something"] = "Name der Sache, z. B. irgendwas";
+$a->strings["URL of thing (optional)"] = "URL der Sache (optional)";
+$a->strings["URL for photo of thing (optional)"] = "URL eines Fotos der Sache (optional)";
+$a->strings["Add Thing to your Profile"] = "Die Sache Deinem Profil hinzufügen";
$a->strings["Away"] = "Abwesend";
$a->strings["Online"] = "Online";
-$a->strings["Select a bookmark folder"] = "Lesezeichenordner wählen";
-$a->strings["Save Bookmark"] = "Lesezeichen speichern";
-$a->strings["URL of bookmark"] = "URL des Lesezeichens";
-$a->strings["Description"] = "Beschreibung";
-$a->strings["Or enter new bookmark folder name"] = "Oder gib einen neuen Namen für den Lesezeichenordner ein";
+$a->strings["Channel added."] = "Kanal hinzugefügt.";
$a->strings["No more system notifications."] = "Keine System-Benachrichtigungen mehr.";
$a->strings["System Notifications"] = "System-Benachrichtigungen";
$a->strings["network"] = "Netzwerk";
$a->strings["RSS"] = "RSS";
-$a->strings["Layout updated."] = "Gestaltung aktualisiert.";
+$a->strings["Layout updated."] = "Layout aktualisiert.";
$a->strings["Edit System Page Description"] = "Systemseitenbeschreibung bearbeiten";
-$a->strings["Layout not found."] = "Gestaltung nicht gefunden.";
+$a->strings["Layout not found."] = "Layout nicht gefunden.";
$a->strings["Module Name:"] = "Modulname:";
-$a->strings["Layout Help"] = "Gestaltungshilfe";
+$a->strings["Layout Help"] = "Layout-Hilfe";
+$a->strings["App installed."] = "App installiert.";
+$a->strings["Malformed app."] = "Fehlerhafte App.";
+$a->strings["Embed code"] = "Code einbetten";
+$a->strings["Edit App"] = "App bearbeiten";
+$a->strings["Create App"] = "App erstellen";
+$a->strings["Name of app"] = "Name der App";
+$a->strings["Location (URL) of app"] = "Ort (URL) der App";
+$a->strings["Description"] = "Beschreibung";
+$a->strings["Photo icon URL"] = "URL zum Icon";
+$a->strings["80 x 80 pixels - optional"] = "80 x 80 Pixel – optional";
+$a->strings["Version ID"] = "Versions-ID";
+$a->strings["Price of app"] = "Preis der App";
+$a->strings["Location (URL) to purchase app"] = "Ort (URL), um die App zu kaufen";
$a->strings["- select -"] = "– auswählen –";
$a->strings["Your service plan only allows %d channels."] = "Dein Vertrag erlaubt nur %d Kanäle.";
$a->strings["Nothing to import."] = "Nichts zu importieren.";
@@ -1388,14 +1443,9 @@ $a->strings["Your old login password"] = "Dein altes Passwort";
$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."] = "Egal, welche Option Du wählst – bitte lege fest, ob dieser Server die neue primäre Adresse dieses Kanals sein soll, oder ob der bisherige Red-Server diese Rolle weiterhin wahrnimmt. Du kannst von beiden Servern aus posten, aber nur einer kann der primäre Ort Deiner Dateien, Fotos und Medien sein.";
$a->strings["Make this hub my primary location"] = "Dieser Red-Server ist mein primärer Server.";
$a->strings["Import existing posts if possible"] = "Existierende Beiträge importieren, falls möglich";
-$a->strings["Item not found"] = "Element nicht gefunden";
-$a->strings["Edit Layout"] = "Gestaltung bearbeiten";
-$a->strings["Delete layout?"] = "Gestaltung löschen?";
-$a->strings["Insert YouTube video"] = "YouTube-Video einfügen";
-$a->strings["Insert Vorbis [.ogg] video"] = "Vorbis [.ogg]-Video einfügen";
-$a->strings["Insert Vorbis [.ogg] audio"] = "Vorbis [.ogg]-Audio einfügen";
-$a->strings["Layout Description (Optional)"] = "Gestaltungsbeschreibung (Optional)";
-$a->strings["Layout Name"] = "Gestaltungsname";
+$a->strings["Edit Layout"] = "Layout bearbeiten";
+$a->strings["Delete layout?"] = "Layout löschen?";
+$a->strings["Delete Layout"] = "Layout löschen";
$a->strings["You must be logged in to see this page."] = "Du musst angemeldet sein, um diese Seite betrachten zu können.";
$a->strings["Room not found"] = "Chatraum nicht gefunden";
$a->strings["Leave Room"] = "Raum verlassen";
@@ -1406,10 +1456,10 @@ $a->strings["Bookmark this room"] = "Lesezeichen für diesen Raum setzen";
$a->strings["New Chatroom"] = "Neuer Chatraum";
$a->strings["Chatroom Name"] = "Name des Chatraums";
$a->strings["%1\$s's Chatrooms"] = "%1\$ss Chaträume";
-$a->strings["Delete webpage?"] = "Webseite löschen?";
-$a->strings["Page link title"] = "Seitentitel-Link";
$a->strings["Edit Webpage"] = "Webseite bearbeiten";
-$a->strings["This directory server requires an access token"] = "Dieser Verzeichnis-Server benötigt ein Zugangstoken";
+$a->strings["Delete webpage?"] = "Webseite löschen?";
+$a->strings["Delete Webpage"] = "Webseite löschen";
+$a->strings["This site is not a directory server"] = "Diese Website ist kein Verzeichnis-Server";
$a->strings["No valid account found."] = "Kein gültiges Konto gefunden.";
$a->strings["Password reset request issued. Check your email."] = "Zurücksetzen des Passworts eingeleitet. Schau in Deine E-Mails.";
$a->strings["Site Member (%s)"] = "Nutzer (%s)";
@@ -1428,10 +1478,6 @@ $a->strings["Email Address"] = "E-Mail Adresse";
$a->strings["Reset"] = "Zurücksetzen";
$a->strings["Website:"] = "Webseite:";
$a->strings["Remote Channel [%s] (not yet known on this site)"] = "Kanal [%s] (auf diesem Server noch unbekannt)";
-$a->strings["Rating (this information is public)"] = "Bewertung (öffentlich sichtbar)";
-$a->strings["Optionally explain your rating (this information is public)"] = "Optional kannst du deine Bewertung erklären (öffentlich sichtbar)";
-$a->strings["Item is not editable"] = "Element kann nicht bearbeitet werden.";
-$a->strings["Delete item?"] = "Eintrag löschen?";
$a->strings["Total invitation limit exceeded."] = "Einladungslimit überschritten.";
$a->strings["%s : Not a valid email address."] = "%s : Keine gültige Email Adresse.";
$a->strings["Please join us on Red"] = "Schließe Dich uns an und werde Teil der Red-Matrix";
@@ -1473,29 +1519,29 @@ $a->strings["Edit Source"] = "Quelle bearbeiten";
$a->strings["Delete Source"] = "Quelle löschen";
$a->strings["Source removed"] = "Quelle gelöscht";
$a->strings["Unable to remove source."] = "Konnte die Quelle nicht löschen.";
+$a->strings["Menu updated."] = "Menü aktualisiert.";
$a->strings["Unable to update menu."] = "Kann Menü nicht aktualisieren.";
+$a->strings["Menu created."] = "Menü erstellt.";
$a->strings["Unable to create menu."] = "Kann Menü nicht erstellen.";
-$a->strings["Menu Name"] = "Name des Menüs";
-$a->strings["Unique name (not visible on webpage) - required"] = "Eindeutiger Name (nicht sichtbar auf der Webseite) – erforderlich";
-$a->strings["Menu Title"] = "Menütitel";
-$a->strings["Visible on webpage - leave empty for no title"] = "Sichtbar auf der Webseite – für keinen Titel leer lassen";
-$a->strings["Allow Bookmarks"] = "Lesezeichen erlauben";
-$a->strings["Menu may be used to store saved bookmarks"] = "Im Menü können gespeicherte Lesezeichen abgelegt werden";
-$a->strings["Submit and proceed"] = "Absenden und fortfahren";
+$a->strings["Manage Menus"] = "Menüs verwalten";
$a->strings["Drop"] = "Löschen";
$a->strings["Bookmarks allowed"] = "Lesezeichen erlaubt";
+$a->strings["Create a new menu"] = "Neues Menü erstellen";
$a->strings["Delete this menu"] = "Lösche dieses Menü";
$a->strings["Edit menu contents"] = "Bearbeite Menü Inhalte";
$a->strings["Edit this menu"] = "Dieses Menü bearbeiten";
-$a->strings["Menu could not be deleted."] = "Menü konnte nicht gelöscht werden.";
-$a->strings["Menu not found."] = "Menü nicht gefunden";
-$a->strings["Edit Menu"] = "Menü bearbeiten";
-$a->strings["Add or remove entries to this menu"] = "Einträge zu diesem Menü hinzufügen oder entfernen";
+$a->strings["New Menu"] = "Neues Menü";
$a->strings["Menu name"] = "Menü Name";
$a->strings["Must be unique, only seen by you"] = "Muss eindeutig sein, ist aber nur für Dich sichtbar";
$a->strings["Menu title"] = "Menü Titel";
$a->strings["Menu title as seen by others"] = "Menü Titel wie er von anderen gesehen wird";
$a->strings["Allow bookmarks"] = "Erlaube Lesezeichen";
+$a->strings["Menu may be used to store saved bookmarks"] = "Im Menü können gespeicherte Lesezeichen abgelegt werden";
+$a->strings["Menu not found."] = "Menü nicht gefunden";
+$a->strings["Menu deleted."] = "Menü gelöscht.";
+$a->strings["Menu could not be deleted."] = "Menü konnte nicht gelöscht werden.";
+$a->strings["Edit Menu"] = "Menü bearbeiten";
+$a->strings["Add or remove entries to this menu"] = "Einträge zu diesem Menü hinzufügen oder entfernen";
$a->strings["Modify"] = "Ändern";
$a->strings["Permission Denied."] = "Zugriff verweigert.";
$a->strings["File not found."] = "Datei nicht gefunden.";
@@ -1505,9 +1551,9 @@ $a->strings["Include all files and sub folders"] = "Alle Dateien und Unterverzei
$a->strings["Return to file list"] = "Zurück zur Dateiliste";
$a->strings["Copy/paste this code to attach file to a post"] = "Diesen Code kopieren und einfügen, um die Datei an einen Beitrag anzuhängen";
$a->strings["Copy/paste this URL to link file from a web page"] = "Diese URL verwenden, um von einer Webseite aus auf die Datei zu verlinken";
-$a->strings["Share this file"] = "Diese Datei freigeben";
+$a->strings["Attach this file to a new post"] = "Diese Datei an einen neuen Beitrag anhängen";
$a->strings["Show URL to this file"] = "URL zu dieser Datei anzeigen";
-$a->strings["Notify your contacts about this file"] = "Meine Kontakte über diese Datei benachrichtigen";
+$a->strings["Do not show in shared with me folder of your connections"] = "Nicht im Ordner „Dateien, die mit mir geteilt wurden“ meiner Verbindungen anzeigen";
$a->strings["Contact not found."] = "Kontakt nicht gefunden";
$a->strings["Friend suggestion sent."] = "Freundschaftsempfehlung senden.";
$a->strings["Suggest Friends"] = "Kontakte vorschlagen";
@@ -1522,17 +1568,15 @@ $a->strings["Invalid profile identifier."] = "Ungültiger Profil-Identifikator";
$a->strings["Profile Visibility Editor"] = "Profil-Sichtbarkeits-Editor";
$a->strings["Click on a contact to add or remove."] = "Klicke auf einen Kontakt, um ihn hinzuzufügen oder zu entfernen.";
$a->strings["Visible To"] = "Sichtbar für";
-$a->strings["webpage"] = "Webseite";
-$a->strings["block"] = "Block";
-$a->strings["layout"] = "Gestaltung";
-$a->strings["%s element installed"] = "Element für %s installiert";
+$a->strings["Remote privacy information not available."] = "Privatsphäre-Einstellungen anderer Nutzer sind nicht verfügbar.";
+$a->strings["Visible to:"] = "Sichtbar für:";
$a->strings["Profile not found."] = "Profil nicht gefunden.";
$a->strings["Profile deleted."] = "Profil gelöscht.";
$a->strings["Profile-"] = "Profil-";
$a->strings["New profile created."] = "Neues Profil erstellt.";
$a->strings["Profile unavailable to clone."] = "Profil kann nicht geklont werden.";
$a->strings["Profile unavailable to export."] = "Dieses Profil kann nicht exportiert werden.";
-$a->strings["Profile Name is required."] = "Profilname ist erforderlich.";
+$a->strings["Profile Name is required."] = "Profil-Name erforderlich.";
$a->strings["Marital Status"] = "Familienstand";
$a->strings["Romantic Partner"] = "Romantische Partner";
$a->strings["Likes"] = "Gefällt";
@@ -1595,36 +1639,14 @@ $a->strings["Ratings"] = "Bewertungen";
$a->strings["Rating: "] = "Bewertung: ";
$a->strings["Website: "] = "Webseite: ";
$a->strings["Description: "] = "Beschreibung: ";
-$a->strings["Source of Item"] = "Quelle des Elements";
-$a->strings["Unable to create element."] = "Element konnte nicht erstellt werden.";
-$a->strings["Unable to update menu element."] = "Kann Menü-Element nicht aktualisieren.";
-$a->strings["Unable to add menu element."] = "Kann Menü-Bestandteil nicht hinzufügen.";
-$a->strings["Menu Item Permissions"] = "Zugriffsrechte des Menü-Elements";
-$a->strings["Link Name"] = "Name des Links";
-$a->strings["Link Target"] = "Ziel des Links";
-$a->strings["Use RedMatrix magic-auth if available"] = "Verwende die automatische RedMatrix-Authentifizierung (magic-auth), wenn verfügbar";
-$a->strings["Open link in new window"] = "Öffne Link in neuem Fenster";
-$a->strings["Order in list"] = "Reihenfolge in der Liste";
-$a->strings["Higher numbers will sink to bottom of listing"] = "Größere Nummern werden weiter unten in der Auflistung einsortiert";
-$a->strings["Submit and finish"] = "Absenden und fertigstellen";
-$a->strings["Submit and continue"] = "Absenden und fortfahren";
-$a->strings["Menu:"] = "Menü:";
-$a->strings["Edit menu"] = "Menü bearbeiten";
-$a->strings["Edit element"] = "Bestandteil bearbeiten";
-$a->strings["Drop element"] = "Bestandteil löschen";
-$a->strings["New element"] = "Neues Bestandteil";
-$a->strings["Edit this menu container"] = "Diesen Menü-Container bearbeiten";
-$a->strings["Add menu element"] = "Menüelement hinzufügen";
-$a->strings["Delete this menu item"] = "Lösche dieses Menü-Bestandteil";
-$a->strings["Edit this menu item"] = "Bearbeite dieses Menü-Bestandteil";
-$a->strings["Menu item not found."] = "Menü-Bestandteil nicht gefunden.";
-$a->strings["Menu item deleted."] = "Menü-Bestandteil gelöscht.";
-$a->strings["Menu item could not be deleted."] = "Menü-Bestandteil kann nicht gelöscht werden.";
-$a->strings["Edit Menu Element"] = "Bearbeite Menü-Bestandteil";
-$a->strings["Link text"] = "Link Text";
-$a->strings["URL of link"] = "URL des Links";
-$a->strings["OpenID protocol error. No ID returned."] = "OpenID Protokollfehler. Keine ID zurückgegeben.";
-$a->strings["Welcome %s. Remote authentication successful."] = "Willkommen %s. Entfernte Authentifizierung erfolgreich.";
+$a->strings["No potential page delegates located."] = "Keine potentiellen Bevollmächtigten für die Seite gefunden.";
+$a->strings["Delegate Page Management"] = "Delegiere das Management für diese Seite";
+$a->strings["Delegates are able to manage all aspects of this account/page except for basic account settings. Please do not delegate your personal account to anybody that you do not trust completely."] = "Bevollmächtigte sind in der Lage, alle Aspekte dieses Kontos/dieser Seite zu verwalten, abgesehen von den Grundeinstellungen des Kontos. Gib niemandem eine Bevollmächtigung für Deinen privaten Account, dem Du nicht absolut vertraust!";
+$a->strings["Existing Page Managers"] = "Vorhandene Seitenmanager";
+$a->strings["Existing Page Delegates"] = "Vorhandene Bevollmächtigte für die Seite";
+$a->strings["Potential Delegates"] = "Potentielle Bevollmächtigte";
+$a->strings["Add"] = "Hinzufügen";
+$a->strings["No entries."] = "Keine Einträge.";
$a->strings["%d rating"] = array(
0 => "%d Bewertung",
1 => "%d Bewertungen",
@@ -1636,11 +1658,14 @@ $a->strings["Hometown: "] = "Wohnort:";
$a->strings["About: "] = "Über:";
$a->strings["Public Forum:"] = "Öffentliches Forum:";
$a->strings["Keywords: "] = "Schlüsselwörter:";
-$a->strings["Common connections: %s"] = "Gemeinsame Verbindungen: %s";
$a->strings["Finding:"] = "Ergebnisse:";
$a->strings["next page"] = "nächste Seite";
$a->strings["previous page"] = "vorherige Seite";
$a->strings["No entries (some entries may be hidden)."] = "Keine Einträge gefunden (einige könnten versteckt sein).";
+$a->strings["Select a bookmark folder"] = "Lesezeichenordner wählen";
+$a->strings["Save Bookmark"] = "Lesezeichen speichern";
+$a->strings["URL of bookmark"] = "URL des Lesezeichens";
+$a->strings["Or enter new bookmark folder name"] = "Oder gib einen neuen Namen für den Lesezeichenordner ein";
$a->strings["Export Channel"] = "Kanal exportieren";
$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."] = "Exportiert die grundlegenden Kanal-Informationen in eine kleine Datei. Diese stellt eine Sicherung Deiner Verbindungen, Berechtigungen, Profile und Basisdaten bereit, die für den Import auf einem anderen Hub verwendet werden kann, aber nicht die Beiträge Deines Kanals enthält.";
$a->strings["Export Content"] = "Kanal und Inhalte exportieren";
@@ -1654,28 +1679,20 @@ $a->strings["Accounts"] = "Konten";
$a->strings["Channels"] = "Kanäle";
$a->strings["Plugins"] = "Plug-Ins";
$a->strings["Themes"] = "Themes";
-$a->strings["Inspect queue"] = "Warteschlange kontrollieren";
+$a->strings["Server"] = "Server";
$a->strings["Profile Config"] = "Profilkonfiguration";
$a->strings["DB updates"] = "DB-Aktualisierungen";
$a->strings["Logs"] = "Protokolle";
$a->strings["Plugin Features"] = "Plug-In Funktionen";
$a->strings["User registrations waiting for confirmation"] = "Nutzer-Anmeldungen, die auf Bestätigung warten";
-$a->strings["# Accounts"] = "Anzahl der Konten";
-$a->strings["# blocked accounts"] = "Anzahl der blockierten Konten";
-$a->strings["# expired accounts"] = "Anzahl der abgelaufenen Konten";
-$a->strings["# expiring accounts"] = "Anzahl der ablaufenden Konten";
-$a->strings["# Channels"] = "Anzahl der Kanäle";
-$a->strings["# primary"] = "Anzahl der primären Kanäle";
-$a->strings["# clones"] = "Anzahl der Klone";
$a->strings["Message queues"] = "Nachrichten-Warteschlangen";
$a->strings["Administration"] = "Administration";
$a->strings["Summary"] = "Zusammenfassung";
-$a->strings["Registered accounts"] = "Registrierte Konten";
+$a->strings["Registered users"] = "Registrierte Benutzer";
$a->strings["Pending registrations"] = "Ausstehende Registrierungen";
-$a->strings["Registered channels"] = "Registrierte Kanäle";
-$a->strings["Active plugins"] = "Aktive Plug-Ins";
$a->strings["Version"] = "Version";
-$a->strings["Site settings updated."] = "Seiteneinstellungen aktualisiert.";
+$a->strings["Active plugins"] = "Aktive Plug-Ins";
+$a->strings["Site settings updated."] = "Site-Einstellungen aktualisiert.";
$a->strings["experimental"] = "experimentell";
$a->strings["unsupported"] = "nicht unterstützt";
$a->strings["Yes - with approval"] = "Ja - mit Zustimmung";
@@ -1733,14 +1750,11 @@ $a->strings["Poll interval"] = "Abfrageintervall";
$a->strings["Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval."] = "Verzögere Hintergrundprozesse um diese Anzahl Sekunden, um die Systemlast zu reduzieren. Bei 0 wird das Auslieferungsintervall verwendet.";
$a->strings["Maximum Load Average"] = "Maximales Load Average";
$a->strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Maximale Systemlast, bevor Verteil- und Empfangsprozesse verschoben werden – Standard 50";
-$a->strings["Expiration period in days for imported (matrix/network) content"] = "Setze den Zeitraum (in Tagen), ab wann importierte Inhalte aus der RedMatrix (dem Netzwerk) ablaufen sollen";
-$a->strings["0 for no expiration of imported content"] = "Setze 0, damit importierte Inhalte niemals ablaufen (entfernt werden)";
$a->strings["No server found"] = "Kein Server gefunden";
$a->strings["ID"] = "ID";
$a->strings["for channel"] = "für Kanal";
$a->strings["on server"] = "auf Server";
$a->strings["Status"] = "Status";
-$a->strings["Server"] = "Server";
$a->strings["Update has been marked successful"] = "Update wurde als erfolgreich markiert";
$a->strings["Executing %s failed. Check system logs."] = "Ausführen von %s fehlgeschlagen. Überprüfe die Systemprotokolle.";
$a->strings["Update %s was successfully applied."] = "Update %s wurde erfolgreich ausgeführt.";
@@ -1750,13 +1764,6 @@ $a->strings["No failed updates."] = "Keine fehlgeschlagenen Aktualisierungen.";
$a->strings["Failed Updates"] = "Fehlgeschlagene Aktualisierungen";
$a->strings["Mark success (if update was manually applied)"] = "Als erfolgreich markieren (wenn das Update manuell ausgeführt wurde)";
$a->strings["Attempt to execute this update step automatically"] = "Versuche, diesen Updateschritt automatisch auszuführen";
-$a->strings["Queue Statistics"] = "Warteschlangenstatistiken";
-$a->strings["Total Entries"] = "Einträge insgesamt";
-$a->strings["Priority"] = "Priorität";
-$a->strings["Destination URL"] = "Ziel-URL";
-$a->strings["Mark hub permanently offline"] = "Hub als permanent offline markieren";
-$a->strings["Empty queue for this hub"] = "Warteschlange für diesen Hub leeren";
-$a->strings["Last known contact"] = "Letzter bekannter Kontakt";
$a->strings["%s user blocked/unblocked"] = array(
0 => "%s Nutzer blockiert/freigegeben",
1 => "%s Nutzer blockiert/freigegeben",
@@ -1766,8 +1773,8 @@ $a->strings["%s user deleted"] = array(
1 => "%s Nutzer gelöscht",
);
$a->strings["Account not found"] = "Konto nicht gefunden";
-$a->strings["User '%s' blocked"] = "Benutzer '%s' blockiert";
$a->strings["User '%s' unblocked"] = "Benutzer '%s' freigegeben";
+$a->strings["User '%s' blocked"] = "Benutzer '%s' blockiert";
$a->strings["Users"] = "Benutzer";
$a->strings["select all"] = "Alle auswählen";
$a->strings["User registrations waiting for confirm"] = "Neuanmeldungen, die auf Deine Bestätigung warten";
@@ -1775,8 +1782,6 @@ $a->strings["Request date"] = "Antragsdatum";
$a->strings["No registrations."] = "Keine Registrierungen.";
$a->strings["Approve"] = "Genehmigen";
$a->strings["Deny"] = "Verweigern";
-$a->strings["Block"] = "Blockieren";
-$a->strings["Unblock"] = "Freigeben";
$a->strings["Register date"] = "Registrierungs-Datum";
$a->strings["Last login"] = "Letzte Anmeldung";
$a->strings["Expires"] = "Verfällt";
@@ -1829,151 +1834,76 @@ $a->strings["Field definition not found"] = "Feld-Definition nicht gefunden";
$a->strings["Edit Profile Field"] = "Profilfeld bearbeiten";
$a->strings["Unable to find your hub."] = "Konnte Deinen Server nicht finden.";
$a->strings["Post successful."] = "Veröffentlichung erfolgreich.";
-$a->strings["Edit Block"] = "Block bearbeiten";
-$a->strings["Delete block?"] = "Block löschen?";
-$a->strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = "Maximale Anzahl täglicher Neuanmeldungen erreicht. Bitte versuche es morgen noch einmal.";
-$a->strings["Please indicate acceptance of the Terms of Service. Registration failed."] = "Bitte stimme den Nutzungsbedingungen zu. Registrierung fehlgeschlagen.";
-$a->strings["Passwords do not match."] = "Passwörter stimmen nicht überein.";
-$a->strings["Registration successful. Please check your email for validation instructions."] = "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an Dich gesendet.";
-$a->strings["Your registration is pending approval by the site owner."] = "Deine Registrierung muss noch vom Betreiber der Seite freigegeben werden.";
-$a->strings["Your registration can not be processed."] = "Deine Registrierung konnte nicht verarbeitet werden.";
-$a->strings["Registration on this site/hub is by approval only."] = "Anmeldungen auf diesem Server erfordern Zustimmung durch den Administrator";
-$a->strings["<a href=\"pubsites\">Register at another affiliated site/hub</a>"] = "<a href=\"pubsites\">Registrierung auf einem anderen, angeschlossenen Server</a>";
-$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Die maximale Anzahl täglicher Registrierungen auf diesem Server wurde überschritten. Bitte versuche es morgen noch einmal.";
-$a->strings["Terms of Service"] = "Nutzungsbedingungen";
-$a->strings["I accept the %s for this website"] = "Ich akzeptiere die %s für diese Webseite";
-$a->strings["I am over 13 years of age and accept the %s for this website"] = "Ich bin älter als 13 Jahre und akzeptiere die %s dieser Webseite";
-$a->strings["Membership on this site is by invitation only."] = "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich.";
-$a->strings["Please enter your invitation code"] = "Bitte trage Deinen Einladungs-Code ein";
-$a->strings["Your email address"] = "Ihre E-Mail Adresse";
-$a->strings["Choose a password"] = "Passwort";
-$a->strings["Please re-enter your password"] = "Bitte gib Dein Passwort noch einmal ein";
+$a->strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "Fern-Authentifizierung blockiert. Du bist lokal auf diesem Server angemeldet. Bitte melde Dich ab und versuche es erneut.";
+$a->strings["Welcome %s. Remote authentication successful."] = "Willkommen %s. Entfernte Authentifizierung erfolgreich.";
+$a->strings["Please login."] = "Bitte melde dich an.";
$a->strings["Account removals are not allowed within 48 hours of changing the account password."] = "Das Löschen von Konten innerhalb 48 Stunden nachdem deren Passwort geändert wurde ist nicht erlaubt.";
$a->strings["Remove This Account"] = "Dieses Konto löschen";
-$a->strings["WARNING: "] = "WARNUNG: ";
-$a->strings["This account and all its channels will be completely removed from the network. "] = "Dieses Konto mit all seinen Kanälen wird vollständig aus dem Netzwerk gelöscht.";
-$a->strings["This action is permanent and can not be undone!"] = "Diese Schritt ist endgültig und kann nicht rückgängig gemacht werden!";
+$a->strings["This will completely remove this account including all its channels from the network. Once this has been done it is not recoverable."] = "Hiermit wird dieses Nutzerkonto einschließlich all seiner Kanäle komplett aus dem Netzwerk entfernt. Dieser Vorgang kann nicht rückgängig gemacht werden.";
$a->strings["Please enter your password for verification:"] = "Bitte gib zur Bestätigung Dein Passwort ein:";
$a->strings["Remove this account, all its channels and all its channel clones from the network"] = "Dieses Konto, all seine Kanäle sowie alle Kanal-Klone aus dem Netzwerk löschen";
$a->strings["By default only the instances of the channels located on this hub will be removed from the network"] = "Standardmäßig werden nur die Kanalklone auf diesem RedMatrix-Hub aus dem Netzwerk entfernt";
-$a->strings["Unable to locate original post."] = "Originalbeitrag nicht gefunden.";
-$a->strings["Empty post discarded."] = "Leeren Beitrag verworfen.";
-$a->strings["Executable content type not permitted to this channel."] = "Ausführbarer Content-Typ ist für diesen Kanal nicht freigegeben.";
-$a->strings["System error. Post not saved."] = "Systemfehler. Beitrag nicht gespeichert.";
-$a->strings["Unable to obtain post information from database."] = "Beitragsinformationen können nicht aus der Datenbank abgerufen werden.";
-$a->strings["You have reached your limit of %1$.0f top level posts."] = "Du hast die maximale Anzahl von %1$.0f Beiträgen erreicht.";
-$a->strings["You have reached your limit of %1$.0f webpages."] = "Du hast die maximale Anzahl von %1$.0f Webseiten erreicht.";
$a->strings["[Embedded content - reload page to view]"] = "[Eingebettete Inhalte – lade die Seite neu, um sie anzuzeigen]";
-$a->strings["Remote privacy information not available."] = "Privatsphäre-Einstellungen anderer Nutzer sind nicht verfügbar.";
-$a->strings["Visible to:"] = "Sichtbar für:";
-$a->strings["Comanche page description language help"] = "Hilfe zur Comanche-Seitenbeschreibungssprache";
-$a->strings["Layout Description"] = "Gestaltungsbeschreibung";
-$a->strings["Download PDL file"] = "PDL-Datei herunterladen";
-$a->strings["First Name"] = "Vorname";
-$a->strings["Last Name"] = "Nachname";
-$a->strings["Nickname"] = "Spitzname";
-$a->strings["Full Name"] = "Voller Name";
-$a->strings["Profile Photo 16px"] = "Profilfoto 16 px";
-$a->strings["Profile Photo 32px"] = "Profilfoto 32 px";
-$a->strings["Profile Photo 48px"] = "Profilfoto 48 px";
-$a->strings["Profile Photo 64px"] = "Profilfoto 64 px";
-$a->strings["Profile Photo 80px"] = "Profilfoto 80 px";
-$a->strings["Profile Photo 128px"] = "Profilfoto 128 px";
-$a->strings["Timezone"] = "Zeitzone";
-$a->strings["Homepage URL"] = "Homepage-URL";
-$a->strings["Birth Year"] = "Geburtsjahr";
-$a->strings["Birth Month"] = "Geburtsmonat";
-$a->strings["Birth Day"] = "Geburtstag";
-$a->strings["Birthdate"] = "Geburtsdatum";
+$a->strings["Wall Photos"] = "Wall Fotos";
+$a->strings["Profile Match"] = "Profil-Übereinstimmungen";
+$a->strings["No keywords to match. Please add keywords to your default profile."] = "Keine Schlüsselwörter für den Abgleich gefunden. Bitte füge Schlüsselwörter zu Deinem Standardprofil hinzu.";
+$a->strings["is interested in:"] = "interessiert sich für:";
+$a->strings["No matches"] = "Keine Übereinstimmungen";
$a->strings["Conversation removed."] = "Unterhaltung gelöscht.";
$a->strings["No messages."] = "Keine Nachrichten.";
$a->strings["Delete conversation"] = "Unterhaltung löschen";
$a->strings["D, d M Y - g:i A"] = "D, d. M Y - G:i";
+$a->strings["Menu element updated."] = "Menü-Element aktualisiert.";
+$a->strings["Unable to update menu element."] = "Kann Menü-Element nicht aktualisieren.";
+$a->strings["Menu element added."] = "Menü-Bestandteil hinzugefügt.";
+$a->strings["Unable to add menu element."] = "Kann Menü-Bestandteil nicht hinzufügen.";
+$a->strings["Manage Menu Elements"] = "Menü-Bestandteile verwalten";
+$a->strings["Edit menu"] = "Menü bearbeiten";
+$a->strings["Edit element"] = "Bestandteil bearbeiten";
+$a->strings["Drop element"] = "Bestandteil löschen";
+$a->strings["New element"] = "Neues Bestandteil";
+$a->strings["Edit this menu container"] = "Diesen Menü-Container bearbeiten";
+$a->strings["Add menu element"] = "Menüelement hinzufügen";
+$a->strings["Delete this menu item"] = "Lösche dieses Menü-Bestandteil";
+$a->strings["Edit this menu item"] = "Bearbeite dieses Menü-Bestandteil";
+$a->strings["New Menu Element"] = "Neues Menü-Bestandteil";
+$a->strings["Menu Item Permissions"] = "Zugriffsrechte des Menü-Elements";
+$a->strings["Link text"] = "Link Text";
+$a->strings["URL of link"] = "URL des Links";
+$a->strings["Use RedMatrix magic-auth if available"] = "Verwende die automatische RedMatrix-Authentifizierung (magic-auth), wenn verfügbar";
+$a->strings["Open link in new window"] = "Öffne Link in neuem Fenster";
+$a->strings["Order in list"] = "Reihenfolge in der Liste";
+$a->strings["Higher numbers will sink to bottom of listing"] = "Größere Nummern werden weiter unten in der Auflistung einsortiert";
+$a->strings["Menu item not found."] = "Menü-Bestandteil nicht gefunden.";
+$a->strings["Menu item deleted."] = "Menü-Bestandteil gelöscht.";
+$a->strings["Menu item could not be deleted."] = "Menü-Bestandteil kann nicht gelöscht werden.";
+$a->strings["Edit Menu Element"] = "Bearbeite Menü-Bestandteil";
$a->strings["Set your current mood and tell your friends"] = "Wähle Deine aktuelle Stimmung und teile sie mit Deinen Freunden";
$a->strings["Total votes"] = "Stimmen gesamt";
$a->strings["Average Rating"] = "Durchschnittliche Bewertung";
$a->strings["Channel removals are not allowed within 48 hours of changing the account password."] = "Innerhalb von 48 Stunden nach einer Änderung des Passworts können keine Kanäle gelöscht werden.";
$a->strings["Remove This Channel"] = "Diesen Kanal löschen";
-$a->strings["This channel will be completely removed from the network. "] = "Dieser Kanal wird vollständig aus dem Netzwerk gelöscht.";
+$a->strings["This will completely remove this channel from the network. Once this has been done it is not recoverable."] = "Hiermit wird dieser Kanal komplett aus dem Netzwerk gelöscht. Einmal eingeleitet, kann dieser Prozess nicht wieder rückgängig gemacht werden.";
$a->strings["Remove this channel and all its clones from the network"] = "Lösche diesen Kanal und all seine Klone aus dem Netzwerk";
$a->strings["By default only the instance of the channel located on this hub will be removed from the network"] = "Standardmäßig wird der Kanal nur auf diesem Server gelöscht, seine Klone verbleiben im Netzwerk";
-$a->strings["is now connected to"] = "ist jetzt verbunden mit";
-$a->strings["Could not access address book record."] = "Konnte nicht auf den Adressbuch-Eintrag zugreifen.";
-$a->strings["Refresh failed - channel is currently unavailable."] = "Aktualisierung fehlgeschlagen – der Kanal ist im Moment nicht erreichbar.";
-$a->strings["Channel has been unblocked"] = "Kanal nicht mehr blockiert";
-$a->strings["Channel has been blocked"] = "Kanal blockiert";
-$a->strings["Unable to set address book parameters."] = "Konnte die Adressbuch-Parameter nicht setzen.";
-$a->strings["Channel has been unignored"] = "Kanal wird nicht mehr ignoriert";
-$a->strings["Channel has been ignored"] = "Kanal wird ignoriert";
-$a->strings["Channel has been unarchived"] = "Kanal wurde aus dem Archiv zurück geholt";
-$a->strings["Channel has been archived"] = "Kanal wurde archiviert";
-$a->strings["Channel has been unhidden"] = "Kanal wird nicht mehr versteckt";
-$a->strings["Channel has been hidden"] = "Kanal wurde versteckt";
-$a->strings["Channel has been approved"] = "Kanal wurde zugelassen";
-$a->strings["Channel has been unapproved"] = "Zulassung des Kanals entfernt";
-$a->strings["Connection has been removed."] = "Verbindung wurde gelöscht.";
-$a->strings["View %s's profile"] = "%ss Profil ansehen";
-$a->strings["Refresh Permissions"] = "Zugriffsrechte neu laden";
-$a->strings["Fetch updated permissions"] = "Aktualisierte Zugriffsrechte abfragen";
-$a->strings["Recent Activity"] = "Kürzliche Aktivitäten";
-$a->strings["View recent posts and comments"] = "Betrachte die neuesten Beiträge und Kommentare";
-$a->strings["Block (or Unblock) all communications with this connection"] = "Jegliche Kommunikation mit dieser Verbindung blockieren/zulassen";
-$a->strings["Unignore"] = "Nicht ignorieren";
-$a->strings["Ignore"] = "Ignorieren";
-$a->strings["Ignore (or Unignore) all inbound communications from this connection"] = "Jegliche eingehende Kommunikation von dieser Verbindung ignorieren/zulassen";
-$a->strings["Unarchive"] = "Aus Archiv zurückholen";
-$a->strings["Archive"] = "Archivieren";
-$a->strings["Archive (or Unarchive) this connection - mark channel dead but keep content"] = "Verbindung archivieren/aus dem Archiv zurückholen (Archiv = Kanal als erloschen markieren, aber die Beiträge behalten)";
-$a->strings["Unhide"] = "Wieder sichtbar machen";
-$a->strings["Hide"] = "Verstecken";
-$a->strings["Hide or Unhide this connection from your other connections"] = "Diese Verbindung vor anderen Verbindungen verstecken/zeigen";
-$a->strings["Delete this connection"] = "Verbindung löschen";
-$a->strings["Approve this connection"] = "Verbindung genehmigen";
-$a->strings["Accept connection to allow communication"] = "Akzeptiere die Verbindung, um Kommunikation zu ermöglichen";
-$a->strings["Connections: settings for %s"] = "Verbindungseinstellungen für %s";
-$a->strings["Apply these permissions automatically"] = "Diese Berechtigungen automatisch anwenden";
-$a->strings["Apply the permissions indicated on this page to all new connections."] = "Wende die auf dieser Seite gewählten Berechtigungen auf alle neuen Verbindungen an.";
-$a->strings["Slide to adjust your degree of friendship"] = "Verschieben, um den Grad der Freundschaft zu einzustellen";
-$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."] = "Die voreingestellten Zugriffsrechte der Kategorie Deines Kanals sind hier zu sehen, wurden aber noch nicht gespeichert. Bitte sieh Dir die Zugriffsrechte auf dieser Seite an und ändere sie, wenn Du willst. Dieser Kontakt kann evtl. <em>nicht</em> mit Dir kommunizieren, bevor Du nicht auf dieser Seite auf „Senden“ geklickt hast – erst dieser Klick speichert die gewünschten Zugriffsrechte.";
-$a->strings["inherited"] = "geerbt";
-$a->strings["Connection has no individual permissions!"] = "Diese Verbindung hat keine individuellen Zugriffsrechte!";
-$a->strings["This may be appropriate based on your <a href=\"settings\">privacy settings</a>, though you may wish to review the \"Advanced Permissions\"."] = "Abhängig von Deinen <a href=\"settings\">Privatsphäre-Einstellungen</a> könnte das passen, eventuell solltest Du aber die „Zugriffsrechte für Fortgeschrittene“ überprüfen.";
-$a->strings["Profile Visibility"] = "Sichtbarkeit des Profils";
-$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Bitte wähle ein Profil, das wir %s zeigen sollen, wenn Deine Profilseite über eine verifizierte Verbindung aufgerufen wird.";
-$a->strings["Contact Information / Notes"] = "Kontaktinformationen / Notizen";
-$a->strings["Edit contact notes"] = "Kontaktnotizen bearbeiten";
-$a->strings["Their Settings"] = "Deren Einstellungen";
-$a->strings["My Settings"] = "Meine Einstellungen";
-$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."] = "Die voreingestellten Zugriffsrechte der Kategorie Deines Kanals sind hier zu sehen, wurden aber noch <em>nicht</em> gespeichert, und Du hast keine Voreinstellungen für die Zugriffsrechte von Verbindungen angelegt. Bitte sieht Dir die Einstellungen an, ändere sie bei Bedarf und klicke [Senden], um den Vorgang abzuschließen.";
-$a->strings["Clear/Disable Automatic Permissions"] = "Automatische Berechtigungen abschalten/entfernen";
-$a->strings["Forum Members"] = "Forum Mitglieder";
-$a->strings["Soapbox"] = "Marktschreier";
-$a->strings["Full Sharing (typical social network permissions)"] = "Vollumfängliches Teilen (übliche Berechtigungen in sozialen Netzwerken)";
-$a->strings["Cautious Sharing "] = "Vorsichtiges Teilen";
-$a->strings["Follow Only"] = "Nur folgen";
-$a->strings["Individual Permissions"] = "Individuelle Zugriffsrechte";
-$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."] = "Einige Berechtigungen werden von den globalen <a href=\"settings\">Sicherheits- und Privatsphäre-Einstellungen</a> dieses Kanals geerbt, die eine höhere Priorität haben als die Einstellungen bei einer Verbindung. Werden geerbte Einstellungen hier geändert, hat das keine Auswirkungen.";
-$a->strings["Advanced Permissions"] = "Zugriffsrechte für Fortgeschrittene";
-$a->strings["Simple Permissions (select one and submit)"] = "Einfache Berechtigungs-Einstellungen (wähle eine aus und klicke auf Senden)";
-$a->strings["Visit %s's profile - %s"] = "%ss Profil besuchen - %s";
-$a->strings["Block/Unblock contact"] = "Kontakt blockieren/freigeben";
-$a->strings["Ignore contact"] = "Kontakt ignorieren";
-$a->strings["Repair URL settings"] = "URL-Einstellungen reparieren";
-$a->strings["View conversations"] = "Unterhaltungen anzeigen";
-$a->strings["Delete contact"] = "Kontakt löschen";
-$a->strings["Last update:"] = "Letzte Aktualisierung:";
-$a->strings["Update public posts"] = "Öffentliche Beiträge aktualisieren";
-$a->strings["Update now"] = "Jetzt aktualisieren";
-$a->strings["Currently blocked"] = "Derzeit blockiert";
-$a->strings["Currently ignored"] = "Derzeit ignoriert";
-$a->strings["Currently archived"] = "Derzeit archiviert";
-$a->strings["Currently pending"] = "Derzeit anstehend";
-$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Wir haben ein Problem mit der OpenID festgestellt, mit der Du Dich anmelden wolltest. Bitte überprüfe sie noch einmal.";
-$a->strings["The error message was:"] = "Die Fehlermeldung war:";
-$a->strings["Authentication failed."] = "Authentifizierung fehlgeschlagen.";
-$a->strings["Remote Authentication"] = "Entfernte Authentifizierung";
-$a->strings["Enter your channel address (e.g. channel@example.com)"] = "Deine Kanal-Adresse (z. B. channel@example.com)";
-$a->strings["Authenticate"] = "Authentifizieren";
+$a->strings["Remove Channel"] = "Kanal löschen";
+$a->strings["Help with this feature"] = "Hilfe zu dieser Funktion";
+$a->strings["Layout Name"] = "Layout-Name";
+$a->strings["Like/Dislike"] = "Mögen/Nicht mögen";
+$a->strings["This action is restricted to members."] = "Diese Aktion kann nur von Mitgliedern ausgeführt werden.";
+$a->strings["Please <a href=\"rmagic\">login with your RedMatrix ID</a> or <a href=\"register\">register as a new RedMatrix member</a> to continue."] = "Bitte <a href=\"rmagic\">melde Dich mit Deiner RedMatrix-ID an</a> oder <a href=\"register\">registriere Dich als neues Mitglied der RedMatrix</a>, um fortzufahren.";
+$a->strings["Invalid request."] = "Ungültige Anfrage.";
+$a->strings["thing"] = "Sache";
+$a->strings["Channel unavailable."] = "Kanal nicht vorhanden.";
+$a->strings["Previous action reversed."] = "Die vorherige Aktion wurde rückgängig gemacht.";
+$a->strings["%1\$s agrees with %2\$s's %3\$s"] = "%1\$s stimmt %2\$ss %3\$s zu";
+$a->strings["%1\$s doesn't agree with %2\$s's %3\$s"] = "%1\$s lehnt %2\$ss %3\$s ab";
+$a->strings["%1\$s abstains from a decision on %2\$s's %3\$s"] = "%1\$s enthält sich zu %2\$ss %3\$s";
+$a->strings["%1\$s is attending %2\$s's %3\$s"] = "%1\$s nimmt an %2\$ss %3\$s teil";
+$a->strings["%1\$s is not attending %2\$s's %3\$s"] = "%1\$s nimmt an %2\$ss %3\$s nicht teil";
+$a->strings["%1\$s may attend %2\$s's %3\$s"] = "%1\$s nimmt vielleicht an %2\$ss %3\$s teil";
+$a->strings["Action completed."] = "Aktion durchgeführt.";
+$a->strings["Thank you."] = "Vielen Dank.";
$a->strings["Unable to lookup recipient."] = "Konnte den Empfänger nicht finden.";
$a->strings["Unable to communicate with requested channel."] = "Die Kommunikation mit dem ausgewählten Kanal ist fehlgeschlagen.";
$a->strings["Cannot verify requested channel."] = "Verifizierung des angeforderten Kanals fehlgeschlagen.";
@@ -1993,8 +1923,6 @@ $a->strings["No secure communications available. You <strong>may</strong> be abl
$a->strings["Send Reply"] = "Antwort senden";
$a->strings["Invalid request identifier."] = "Ungültiger Anfrage-Identifikator.";
$a->strings["Discard"] = "Verwerfen";
-$a->strings["Please login."] = "Bitte melde dich an.";
-$a->strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "Fern-Authentifizierung blockiert. Du bist lokal auf diesem Server angemeldet. Bitte melde Dich ab und versuche es erneut.";
$a->strings["Add a Channel"] = "Kanal hinzufügen";
$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."] = "Ein Kanal ist Deine eigene Sammlung von zusammengehörigen Webseiten. Ein Kanal kann genutzt werden, um ein Social-Network-Profil, ein Blog, eine Gesprächsgruppe oder ein Forum, Promi-Seiten und vieles mehr zu erstellen. Du kannst so viele Kanäle erstellen, wie es der Betreiber Deines Hubs zulässt.";
$a->strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "] = "Beispiele: „Horst Weidinger“, „Lisa und ihr Meerschweinchen“, „Fußball“, „Segelflieger-Forum“ ";
@@ -2004,78 +1932,112 @@ $a->strings["Or <a href=\"import\">import an existing channel</a> from another l
$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"] = "Wähle einen Kanaltyp (wie Soziales Netzwerk oder Forum) und Privatsphäre-Vorgaben, so dass wir die passenden Kanal-Zugriffsrechte für Dich setzen können";
$a->strings["Channel Type"] = "Kanaltyp";
$a->strings["Read more about roles"] = "Mehr Informationen über Rollen";
-$a->strings["App installed."] = "App installiert.";
-$a->strings["Malformed app."] = "Fehlerhafte App.";
-$a->strings["Embed code"] = "Code einbetten";
-$a->strings["Edit App"] = "App bearbeiten";
-$a->strings["Create App"] = "App erstellen";
-$a->strings["Name of app"] = "Name der App";
-$a->strings["Location (URL) of app"] = "Ort (URL) der App";
-$a->strings["Photo icon URL"] = "URL zum Icon";
-$a->strings["80 x 80 pixels - optional"] = "80 x 80 Pixel – optional";
-$a->strings["Version ID"] = "Versions-ID";
-$a->strings["Price of app"] = "Preis der App";
-$a->strings["Location (URL) to purchase app"] = "Ort (URL), um die App zu kaufen";
+$a->strings["OpenID protocol error. No ID returned."] = "OpenID Protokollfehler. Keine ID zurückgegeben.";
+$a->strings["Page owner information could not be retrieved."] = "Informationen über den Besitzer der Seite konnten nicht gefunden werden.";
+$a->strings["Album not found."] = "Album nicht gefunden.";
+$a->strings["Delete Album"] = "Album löschen";
+$a->strings["Delete Photo"] = "Foto löschen";
+$a->strings["No photos selected"] = "Keine Fotos ausgewählt";
+$a->strings["Access to this item is restricted."] = "Der Zugriff auf dieses Foto ist eingeschränkt.";
+$a->strings["%1$.2f MB of %2$.2f MB photo storage used."] = "%1$.2f MB von %2$.2f MB Foto-Speicher belegt.";
+$a->strings["%1$.2f MB photo storage used."] = "%1$.2f MB Foto-Speicher belegt.";
+$a->strings["Upload Photos"] = "Fotos hochladen";
+$a->strings["Enter a new album name"] = "Gib einen Namen für ein neues Album ein";
+$a->strings["or select an existing one (doubleclick)"] = "oder wähle ein bereits vorhandenes aus (Doppelklick)";
+$a->strings["Do not show a status post for this upload"] = "Keine Statusnachricht für diesen Upload anzeigen";
+$a->strings["Album name could not be decoded"] = "Albumname konnte nicht dekodiert werden";
+$a->strings["Contact Photos"] = "Kontakt-Bilder";
+$a->strings["Show Newest First"] = "Neueste zuerst anzeigen";
+$a->strings["Show Oldest First"] = "Älteste zuerst anzeigen";
+$a->strings["View Photo"] = "Foto ansehen";
+$a->strings["Edit Album"] = "Album bearbeiten";
+$a->strings["Permission denied. Access to this item may be restricted."] = "Berechtigung verweigert. Der Zugriff ist wahrscheinlich eingeschränkt worden.";
+$a->strings["Photo not available"] = "Foto nicht verfügbar";
+$a->strings["Use as profile photo"] = "Als Profilfoto verwenden";
+$a->strings["Private Photo"] = "Privates Foto";
+$a->strings["View Full Size"] = "In voller Größe anzeigen";
+$a->strings["Edit photo"] = "Foto bearbeiten";
+$a->strings["Rotate CW (right)"] = "Drehen im UZS (rechts)";
+$a->strings["Rotate CCW (left)"] = "Drehen gegen UZS (links)";
+$a->strings["Caption"] = "Bildunterschrift";
+$a->strings["Add a Tag"] = "Schlagwort hinzufügen";
+$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com"] = "Beispiele: @ben, @Karl_Prester, @lieschen@example.com";
+$a->strings["Flag as adult in album view"] = "In der Albumansicht als nicht jugendfrei markieren";
+$a->strings["In This Photo:"] = "Auf diesem Foto:";
+$a->strings["View Album"] = "Album ansehen";
+$a->strings["Recent Photos"] = "Neueste Fotos";
$a->strings["sent you a private message"] = "hat Dir eine private Nachricht geschickt";
$a->strings["added your channel"] = "hat deinen Kanal hinzugefügt";
$a->strings["posted an event"] = "hat einen Termin veröffentlicht";
-$a->strings["No such group"] = "Sammlung nicht gefunden";
-$a->strings["No such channel"] = "Kanal nicht gefunden";
-$a->strings["Search Results For:"] = "Suchergebnisse für:";
-$a->strings["Collection is empty"] = "Sammlung ist leer";
-$a->strings["Collection: "] = "Sammlung:";
-$a->strings["Connection: "] = "Verbindung:";
-$a->strings["Invalid connection."] = "Ungültige Verbindung.";
-$a->strings["Ipsum Lorem"] = "Ipsum Lorem";
$a->strings["Bookmark added"] = "Lesezeichen hinzugefügt";
$a->strings["My Bookmarks"] = "Meine Lesezeichen";
$a->strings["My Connections Bookmarks"] = "Lesezeichen meiner Kontakte";
$a->strings["Insufficient permissions. Request redirected to profile page."] = "Unzureichende Zugriffsrechte. Die Anfrage wurde zur Profil-Seite umgeleitet.";
-$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Keine Vorschläge vorhanden. Wenn das ein neuer Server ist, versuche es in 24 Stunden noch einmal.";
+$a->strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = "Maximale Anzahl täglicher Neuanmeldungen erreicht. Bitte versuche es morgen noch einmal.";
+$a->strings["Please indicate acceptance of the Terms of Service. Registration failed."] = "Bitte stimme den Nutzungsbedingungen zu. Registrierung fehlgeschlagen.";
+$a->strings["Passwords do not match."] = "Passwörter stimmen nicht überein.";
+$a->strings["Registration successful. Please check your email for validation instructions."] = "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an Dich gesendet.";
+$a->strings["Your registration is pending approval by the site owner."] = "Deine Registrierung muss noch vom Betreiber der Seite freigegeben werden.";
+$a->strings["Your registration can not be processed."] = "Deine Registrierung konnte nicht verarbeitet werden.";
+$a->strings["Registration on this site/hub is by approval only."] = "Anmeldungen auf diesem Server erfordern Zustimmung durch den Administrator";
+$a->strings["<a href=\"pubsites\">Register at another affiliated site/hub</a>"] = "<a href=\"pubsites\">Registrierung auf einem anderen, angeschlossenen Server</a>";
+$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Die maximale Anzahl täglicher Registrierungen auf diesem Server wurde überschritten. Bitte versuche es morgen noch einmal.";
+$a->strings["Terms of Service"] = "Nutzungsbedingungen";
+$a->strings["I accept the %s for this website"] = "Ich akzeptiere die %s für diese Webseite";
+$a->strings["I am over 13 years of age and accept the %s for this website"] = "Ich bin älter als 13 Jahre und akzeptiere die %s dieser Webseite";
+$a->strings["Membership on this site is by invitation only."] = "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich.";
+$a->strings["Please enter your invitation code"] = "Bitte trage Deinen Einladungs-Code ein";
+$a->strings["Your email address"] = "Ihre E-Mail Adresse";
+$a->strings["Choose a password"] = "Passwort";
+$a->strings["Please re-enter your password"] = "Bitte gib Dein Passwort noch einmal ein";
+$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Wir haben ein Problem mit der OpenID festgestellt, mit der Du Dich anmelden wolltest. Bitte überprüfe sie noch einmal.";
+$a->strings["The error message was:"] = "Die Fehlermeldung war:";
+$a->strings["Authentication failed."] = "Authentifizierung fehlgeschlagen.";
+$a->strings["Remote Authentication"] = "Entfernte Authentifizierung";
+$a->strings["Enter your channel address (e.g. channel@example.com)"] = "Deine Kanal-Adresse (z. B. channel@example.com)";
+$a->strings["Authenticate"] = "Authentifizieren";
$a->strings["Poll"] = "Umfrage";
$a->strings["View Results"] = "Ergebnisse";
$a->strings["No service class restrictions found."] = "Keine Dienstklassenbeschränkungen gefunden.";
$a->strings["Files: shared with me"] = "Dateien, die mit mir geteilt wurden";
-$a->strings["NEW"] = "NEU";
$a->strings["Remove all files"] = "Alle Dateien löschen";
$a->strings["Remove this file"] = "Diese Datei löschen";
$a->strings["Schema Default"] = "Standard-Schema";
$a->strings["Sans-Serif"] = "Sans-Serif";
$a->strings["Monospace"] = "Monospace";
$a->strings["Theme settings"] = "Theme-Einstellungen";
-$a->strings["Set scheme"] = "Schema festlegen";
-$a->strings["Set font-size for posts and comments"] = "Schriftgröße für Beiträge und Kommentare festlegen";
-$a->strings["Set font face"] = "Schriftart festlegen";
-$a->strings["Set iconset"] = "Symbolsatz festlegen";
-$a->strings["Set big shadow size, default 15px 15px 15px"] = "Ausmaß der großen Schatten festlegen (Voreinstellung 15px 15px 15px)";
-$a->strings["Set small shadow size, default 5px 5px 5px"] = "Ausmaß der kleinen Schatten festlegen (Voreinstellung 5px 5px 5px)";
-$a->strings["Set shadow color, default #000"] = "Schattenfarbe festlegen (Voreinstellung #000)";
-$a->strings["Set radius size, default 5px"] = "Eckenradius festlegen (Voreinstellung 5px)";
-$a->strings["Set line-height for posts and comments"] = "Zeilenhöhe in Beiträgen und Kommentaren festlegen";
-$a->strings["Set background image"] = "Hintergrundbild festlegen";
-$a->strings["Set background attachment"] = "Hintergrunddatei festlegen";
-$a->strings["Set background color"] = "Hintergrundfarbe festlegen";
-$a->strings["Set section background image"] = "Hintergrundbild für die Sektion v";
-$a->strings["Set section background color"] = "Hintergrundfarbe für die Sektion ";
-$a->strings["Set color of items - use hex"] = "Farbe für Beiträge festlegen - Hex benutzen";
-$a->strings["Set color of links - use hex"] = "Farbe für Links festlegen - Hex benutzen";
-$a->strings["Set max-width for items. Default 400px"] = "Maximale Breite von Beiträgen festlegen (Voreinstellung 400px)";
-$a->strings["Set min-width for items. Default 240px"] = "Minimale Breite von Beiträgen festlegen (Voreinstellung 240px)";
-$a->strings["Set the generic content wrapper width. Default 48%"] = "Breite des generischen Inhalt-Wrappers festlegen (Voreinstellung 48%)";
-$a->strings["Set color of fonts - use hex"] = "Schriftfarbe festlegen - Hex benutzen";
-$a->strings["Set background-size element"] = "Größe des Hintergrundelements festlegen";
+$a->strings["Set scheme"] = "Schema";
+$a->strings["Set font-size for posts and comments"] = "Schriftgröße für Beiträge und Kommentare";
+$a->strings["Set font face"] = "Schriftart";
+$a->strings["Set iconset"] = "Icon-Set";
+$a->strings["Set big shadow size, default 15px 15px 15px"] = "Ausmaß der großen Schatten (Voreinstellung 15px 15px 15px)";
+$a->strings["Set small shadow size, default 5px 5px 5px"] = "Ausmaß der kleinen Schatten (Voreinstellung 5px 5px 5px)";
+$a->strings["Set shadow color, default #000"] = "Farbe der Schatten (Voreinstellung #000)";
+$a->strings["Set radius size, default 5px"] = "Ecken-Radius (Voreinstellung 5px)";
+$a->strings["Set line-height for posts and comments"] = "Zeilenhöhe in Beiträgen und Kommentaren";
+$a->strings["Set background image"] = "Hintergrundbild";
+$a->strings["Set background attachment"] = "Hintergrunddatei";
+$a->strings["Set background color"] = "Hintergrundfarbe";
+$a->strings["Set section background image"] = "Hintergrundbild für die Section";
+$a->strings["Set section background color"] = "Hintergrundfarbe für die Section";
+$a->strings["Set color of items - use hex"] = "Farbe für Beiträge – Hex benutzen";
+$a->strings["Set color of links - use hex"] = "Farbe für Links – Hex benutzen";
+$a->strings["Set max-width for items. Default 400px"] = "Maximale Breite von Beiträgen (Voreinstellung 400px)";
+$a->strings["Set min-width for items. Default 240px"] = "Minimale Breite von Beiträgen (Voreinstellung 240px)";
+$a->strings["Set the generic content wrapper width. Default 48%"] = "Breite des \"generic content wrapper\" (Voreinstellung 48%)";
+$a->strings["Set color of fonts - use hex"] = "Schriftfarbe – Hex benutzen";
+$a->strings["Set background-size element"] = "Größe des Hintergrund-Elements";
$a->strings["Item opacity"] = "Deckkraft der Beiträge";
$a->strings["Display post previews only"] = "Nur Beitragsvorschau anzeigen";
$a->strings["Display side bar on channel page"] = "Zeige die Seitenleiste auf der Kanal-Seite";
$a->strings["Colour of the navigation bar"] = "Farbe der Navigationsleiste";
$a->strings["Item float"] = "Beitragsfluss";
-$a->strings["Left offset of the section element"] = "Linker Rand des Sektionelements";
-$a->strings["Right offset of the section element"] = "Rechter Rand des Sektionelements";
+$a->strings["Left offset of the section element"] = "Linker Rand des Section Elements";
+$a->strings["Right offset of the section element"] = "Rechter Rand des Section Elements";
$a->strings["Section width"] = "Breite der Section";
$a->strings["Left offset of the aside"] = "Linker Rand des Aside-Elements";
$a->strings["Right offset of the aside element"] = "Rechter Rand des Aside-Elements";
$a->strings["Light (Red Matrix default)"] = "Hell (RedMatrix-Voreinstellung)";
-$a->strings["Select scheme"] = "Schema wählen";
$a->strings["Narrow navbar"] = "Schmale Navigationsleiste";
$a->strings["Navigation bar background color"] = "Hintergrundfarbe der Navigationsleiste";
$a->strings["Navigation bar gradient top color"] = "Farbverlauf der Navigationsleiste: Farbe oben";
@@ -2087,33 +2049,31 @@ $a->strings["Navigation bar icon color "] = "Farbe für die Icons der Navigation
$a->strings["Navigation bar active icon color "] = "Farbe für aktive Icons der Navigationsleiste";
$a->strings["link color"] = "Farbe für Links";
$a->strings["Set font-color for banner"] = "Farbe der Schrift des Banners";
-$a->strings["Set the background color"] = "Hintergrundfarbe festlegen";
-$a->strings["Set the background image"] = "Hintergrundbild festlegen";
-$a->strings["Set the background color of items"] = "Hintergrundfarbe für Beiträge festlegen";
-$a->strings["Set the background color of comments"] = "Hintergrundfarbe für Kommentare festlegen";
-$a->strings["Set the border color of comments"] = "Farbe des Randes von Kommentaren festlegen";
-$a->strings["Set the indent for comments"] = "Einzugsbreite für Kommentare festlegen";
-$a->strings["Set the basic color for item icons"] = "Grundfarbe für Beitragssymbole festlegen";
-$a->strings["Set the hover color for item icons"] = "Farbe für Beitragssymbole unter dem Mauszeiger festlegen";
-$a->strings["Set font-size for the entire application"] = "Schriftgröße für die gesamte Anwendung festlegen";
-$a->strings["Example: 14px"] = "Beispiel: 14px";
-$a->strings["Set font-color for posts and comments"] = "Schriftfarbe für Beiträge und Kommentare festlegen";
-$a->strings["Set radius of corners"] = "Eckenradius festlegen";
-$a->strings["Set shadow depth of photos"] = "Schattentiefe von Fotos festlegen";
-$a->strings["Set maximum width of content region in pixel"] = "Maximalbreite des Inhaltsbereichs in Pixel festlegen";
-$a->strings["Leave empty for default width"] = "Leer lassen für Standardbreite";
-$a->strings["Center page content"] = "Seiteninhalt zentrieren";
-$a->strings["Set minimum opacity of nav bar - to hide it"] = "Mindestdeckkraft der Navigationsleiste festlegen - zum Verstecken";
-$a->strings["Set size of conversation author photo"] = "Größe der Avatare von Themenstartern festlegen";
-$a->strings["Set size of followup author photos"] = "Größe der Avatare von Kommentatoren festlegen";
+$a->strings["Set the background color"] = "Hintergrundfarbe";
+$a->strings["Set the background image"] = "Hintergrundbild";
+$a->strings["Set the background color of items"] = "Hintergrundfarbe für Beiträge";
+$a->strings["Set the background color of comments"] = "Hintergrundfarbe für Kommentare";
+$a->strings["Set the border color of comments"] = "Farbe des Randes von Kommentaren";
+$a->strings["Set the indent for comments"] = "Einzugsbreite für Kommentare";
+$a->strings["Set the basic color for item icons"] = "Grundfarbe für Beitrags-Icons";
+$a->strings["Set the hover color for item icons"] = "Farbe für Beitrags-Icons unter dem Mauszeiger";
+$a->strings["Set font-size for the entire application"] = "Schriftgröße für die gesamte Anwendung";
+$a->strings["Set font-color for posts and comments"] = "Schriftfarbe für Beiträge und Kommentare";
+$a->strings["Set radius of corners"] = "Ecken-Radius";
+$a->strings["Set shadow depth of photos"] = "Schattentiefe von Fotos";
+$a->strings["Set maximum width of conversation regions"] = "Maximalbreite der Unterhaltungsbereiche";
+$a->strings["Center conversation regions"] = "Konversationsbereich zentrieren";
+$a->strings["Set minimum opacity of nav bar - to hide it"] = "Mindest-Deckkraft der Navigationsleiste ( - versteckt sie)";
+$a->strings["Set size of conversation author photo"] = "Größe der Avatare von Themenstartern";
+$a->strings["Set size of followup author photos"] = "Größe der Avatare von Kommentatoren";
+$a->strings["Sloppy photo albums"] = "Schräge Fotoalben";
+$a->strings["Are you a clean desk or a messy desk person?"] = "Bist Du jemand, der einen aufgeräumten Schreibtisch hat, oder eher einen chaotischen?";
$a->strings["Update %s failed. See error logs."] = "Aktualisierung %s fehlgeschlagen. Details in den Fehlerprotokollen.";
$a->strings["Update Error at %s"] = "Aktualisierungsfehler auf %s";
$a->strings["Create an account to access services and applications within the Red Matrix"] = "Erstelle einen Account, um Anwendungen und Dienste innerhalb der Red-Matrix verwenden zu können.";
$a->strings["Password"] = "Kennwort";
$a->strings["Remember me"] = "Angaben speichern";
$a->strings["Forgot your password?"] = "Passwort vergessen?";
+$a->strings["permission denied"] = "Zugriff verweigert";
+$a->strings["Got Zot?"] = "Haste schon Zot?";
$a->strings["toggle mobile"] = "auf/von mobile Ansicht wechseln";
-$a->strings["Website SSL certificate is not valid. Please correct."] = "Das SSL-Zertifikat der Website ist nicht gültig. Bitte beheben.";
-$a->strings["[red] Website SSL error for %s"] = "[red] Website-SSL-Fehler für %s";
-$a->strings["Cron/Scheduled tasks not running."] = "Cron-Aufgaben laufen nicht.";
-$a->strings["[red] Cron tasks not running on %s"] = "[red] Cron-Aufgaben für %s laufen nicht";
diff --git a/view/en-au/htconfig.tpl b/view/en-au/htconfig.tpl
index 9377472bd..c3bef0de3 100644
--- a/view/en-au/htconfig.tpl
+++ b/view/en-au/htconfig.tpl
@@ -30,7 +30,7 @@ $default_timezone = '{{$timezone}}';
// What is your site name?
$a->config['system']['baseurl'] = '{{$siteurl}}';
-$a->config['system']['sitename'] = "Red Matrix";
+$a->config['system']['sitename'] = "Hubzilla";
$a->config['system']['location_hash'] = '{{$site_id}}';
diff --git a/view/en-au/update_fail_eml.tpl b/view/en-au/update_fail_eml.tpl
index a7df8fc2f..61f44b1e6 100644
--- a/view/en-au/update_fail_eml.tpl
+++ b/view/en-au/update_fail_eml.tpl
@@ -1,7 +1,7 @@
Hey,
I'm the web server at {{$sitename}};
-The Red Matrix 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 Red developer if you can not figure out how to
diff --git a/view/en-gb/htconfig.tpl b/view/en-gb/htconfig.tpl
index 9377472bd..c3bef0de3 100644
--- a/view/en-gb/htconfig.tpl
+++ b/view/en-gb/htconfig.tpl
@@ -30,7 +30,7 @@ $default_timezone = '{{$timezone}}';
// What is your site name?
$a->config['system']['baseurl'] = '{{$siteurl}}';
-$a->config['system']['sitename'] = "Red Matrix";
+$a->config['system']['sitename'] = "Hubzilla";
$a->config['system']['location_hash'] = '{{$site_id}}';
diff --git a/view/en-gb/strings.php b/view/en-gb/strings.php
index a95915844..1cac5673e 100644
--- a/view/en-gb/strings.php
+++ b/view/en-gb/strings.php
@@ -25,7 +25,7 @@ $a->strings["Set font-color for posts and comments"] = "Set font-colour for post
$a->strings["Authorize application connection"] = "Authorise application connection";
$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Do you want to authorise this application to access your posts and contacts, and/or create new posts for you?";
$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 recognised, members of other sites (who may themselves have valid certificates) will get a warning message on their own site complaining about security issues.";
-$a->strings["This is a hub of the Red Matrix - a global cooperative network of decentralized privacy enhanced websites."] = "This is a hub of the Red Matrix - a global cooperative network of decentralised privacy enhanced websites.";
-$a->strings["You are cordially invited to join me and some other close friends on the Red Matrix - a revolutionary new decentralized communication and information tool."] = "You are cordially invited to join me and some other close friends on the Red Matrix - a revolutionary new decentralised communication and information tool.";
+$a->strings["This is a hub of the Hubzilla - a global cooperative network of decentralized privacy enhanced websites."] = "This is a hub of the Hubzilla - a global cooperative network of decentralised privacy enhanced websites.";
+$a->strings["You are cordially invited to join me and some other close friends on the Hubzilla - a revolutionary new decentralized communication and information tool."] = "You are cordially invited to join me and some other close friends on the Hubzilla - a revolutionary new decentralised communication and information tool.";
$a->strings["l F d, Y \\@ g:i A"] = "l j F, Y \\@ G:i";
$a->strings["D, d M Y - g:i A"] = "D, d M Y - G:i";
diff --git a/view/en-gb/update_fail_eml.tpl b/view/en-gb/update_fail_eml.tpl
index a7df8fc2f..61f44b1e6 100644
--- a/view/en-gb/update_fail_eml.tpl
+++ b/view/en-gb/update_fail_eml.tpl
@@ -1,7 +1,7 @@
Hey,
I'm the web server at {{$sitename}};
-The Red Matrix 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 Red developer if you can not figure out how to
diff --git a/view/en/cert_bad_eml.tpl b/view/en/cert_bad_eml.tpl
index f4b197131..e42b9696c 100644
--- a/view/en/cert_bad_eml.tpl
+++ b/view/en/cert_bad_eml.tpl
@@ -1,11 +1,11 @@
This is the webserver at {{$sitename}};
A routine check indicates the SSL certificate for this website is
-not valid. Your website cannot fully participate in the RedMatrix
+not valid. Your website cannot fully participate in the Hubzilla
until this is resolved. Please check your certificate and with your
certificate provider or service provider to ensure it is "browser valid"
and installed correctly. Self-signed certificates are NOT SUPPORTED
-and NOT ALLOWED in the RedMatrix.
+and NOT ALLOWED in the Hubzilla.
The check is performed by fetching a URL from your website with strict
SSL checking enabled, and if this fails, checking again with SSL
diff --git a/view/en/htconfig.tpl b/view/en/htconfig.tpl
index 066ae39d8..c6357b3a7 100644
--- a/view/en/htconfig.tpl
+++ b/view/en/htconfig.tpl
@@ -31,7 +31,7 @@ $default_timezone = '{{$timezone}}';
// What is your site name?
$a->config['system']['baseurl'] = '{{$siteurl}}';
-$a->config['system']['sitename'] = "Red Matrix";
+$a->config['system']['sitename'] = "Hubzilla";
$a->config['system']['location_hash'] = '{{$site_id}}';
diff --git a/view/en/update_fail_eml.tpl b/view/en/update_fail_eml.tpl
index a7df8fc2f..61f44b1e6 100644
--- a/view/en/update_fail_eml.tpl
+++ b/view/en/update_fail_eml.tpl
@@ -1,7 +1,7 @@
Hey,
I'm the web server at {{$sitename}};
-The Red Matrix 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 Red developer if you can not figure out how to
diff --git a/view/eo/htconfig.tpl b/view/eo/htconfig.tpl
index 096143798..cc4087f96 100644
--- a/view/eo/htconfig.tpl
+++ b/view/eo/htconfig.tpl
@@ -30,7 +30,7 @@ $default_timezone = '{{$timezone}}';
// What is your site name?
$a->config['system']['baseurl'] = '{{$siteurl}}';
-$a->config['system']['sitename'] = "Red Matrix";
+$a->config['system']['sitename'] = "Hubzilla";
$a->config['system']['location_hash'] = '{{$site_id}}';
// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
diff --git a/view/eo/update_fail_eml.tpl b/view/eo/update_fail_eml.tpl
index a7df8fc2f..61f44b1e6 100644
--- a/view/eo/update_fail_eml.tpl
+++ b/view/eo/update_fail_eml.tpl
@@ -1,7 +1,7 @@
Hey,
I'm the web server at {{$sitename}};
-The Red Matrix 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 Red developer if you can not figure out how to
diff --git a/view/es/htconfig.tpl b/view/es/htconfig.tpl
index 096143798..cc4087f96 100644
--- a/view/es/htconfig.tpl
+++ b/view/es/htconfig.tpl
@@ -30,7 +30,7 @@ $default_timezone = '{{$timezone}}';
// What is your site name?
$a->config['system']['baseurl'] = '{{$siteurl}}';
-$a->config['system']['sitename'] = "Red Matrix";
+$a->config['system']['sitename'] = "Hubzilla";
$a->config['system']['location_hash'] = '{{$site_id}}';
// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
diff --git a/view/es/update_fail_eml.tpl b/view/es/update_fail_eml.tpl
index a7df8fc2f..61f44b1e6 100644
--- a/view/es/update_fail_eml.tpl
+++ b/view/es/update_fail_eml.tpl
@@ -1,7 +1,7 @@
Hey,
I'm the web server at {{$sitename}};
-The Red Matrix 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 Red developer if you can not figure out how to
diff --git a/view/fr/messages.po b/view/fr/messages.po
index dfff156a2..c54cd5f2c 100644
--- a/view/fr/messages.po
+++ b/view/fr/messages.po
@@ -1,18 +1,18 @@
-# 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:
# Olivier <olivier+transifex@migeot.org>, 2013-2014
-# Webmaster_Redmatrix.ca <webmaster@redmatrix.ca>, 2014
-# Webmaster_Redmatrix.ca <webmaster@redmatrix.ca>, 2014
+# Webmaster_Hubzilla.ca <webmaster@hubzilla.ca>, 2014
+# Webmaster_Hubzilla.ca <webmaster@hubzilla.ca>, 2014
msgid ""
msgstr ""
-"Project-Id-Version: Red Matrix\n"
+"Project-Id-Version: Hubzilla\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-08-15 00:03-0700\n"
"PO-Revision-Date: 2014-08-17 00:08+0000\n"
-"Last-Translator: Webmaster_Redmatrix.ca <webmaster@redmatrix.ca>\n"
+"Last-Translator: Webmaster_Hubzilla.ca <webmaster@hubzilla.ca>\n"
"Language-Team: French (http://www.transifex.com/projects/p/red-matrix/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -1410,11 +1410,11 @@ msgid "Safe Mode"
msgstr "Mode sûr"
#: ../../include/enotify.php:41
-msgid "Red Matrix Notification"
+msgid "Hubzilla Notification"
msgstr "Notification Matrice Rouge"
#: ../../include/enotify.php:42
-msgid "redmatrix"
+msgid "hubzilla"
msgstr "Matrice Rouge"
#: ../../include/enotify.php:44
@@ -4599,7 +4599,7 @@ msgstr "Sites publics"
#: ../../mod/pubsites.php:19
msgid ""
-"The listed sites allow public registration into the Red Matrix. All sites in"
+"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 "
@@ -4775,7 +4775,7 @@ msgid "Please login."
msgstr "Merci de vous connecter."
#: ../../mod/cloud.php:126
-msgid "Red Matrix - Guests: Username: {your email address}, Password: +++"
+msgid "Hubzilla - Guests: Username: {your email address}, Password: +++"
msgstr "Matrice Rouge - Pour les invités: Nom d'utilisateur = {votre courriel}, Mot de passe = +++"
#: ../../mod/removeme.php:29
@@ -5413,7 +5413,7 @@ msgid "This site is not a directory server"
msgstr "Ce site n'est pas un serveur d'annuaire"
#: ../../mod/home.php:81
-msgid "Red Matrix - &quot;The Network&quot;"
+msgid "Hubzilla - &quot;The Network&quot;"
msgstr "La Matrice Rouge - &quot;LE Réseau&quot;"
#: ../../mod/home.php:94
@@ -5422,7 +5422,7 @@ msgid "Welcome to %s"
msgstr "Bienvenue sur %s"
#: ../../mod/setup.php:162
-msgid "Red Matrix Server - Setup"
+msgid "Hubzilla Server - Setup"
msgstr "Serveur de la Matrice Rouge - Configuration"
#: ../../mod/setup.php:168
@@ -5471,7 +5471,7 @@ msgstr "Connexion à la base de données"
#: ../../mod/setup.php:285
msgid ""
-"In order to install Red Matrix we need to know how to connect to your "
+"In order to install Hubzilla we need to know how to connect to your "
"database."
msgstr "Pour installer la Matrice Rouge, nous avons besoin de savoir comment contacter votre base de données."
@@ -5908,7 +5908,7 @@ msgstr "Rouge"
#: ../../mod/siteinfo.php:98
msgid ""
-"This is a hub of the Red Matrix - a global cooperative network of "
+"This is a hub of the Hubzilla - a global cooperative network of "
"decentralized privacy enhanced websites."
msgstr "Ceci est un serveur de la Matrice Rouge - un réseau collaboratif de plusieurs serveurs qui assurent la protection de votre vie privée notamment par la décentralisation de votre identité."
@@ -5919,7 +5919,7 @@ msgstr "Installée sur"
#: ../../mod/siteinfo.php:102
msgid ""
"Please visit <a href=\"http://getzot.com\">GetZot.com</a> to learn more "
-"about the Red Matrix."
+"about the Hubzilla."
msgstr "Merci de visiter <a href=\"http://getzot.com\">GetZot.com</a> pour en apprendre davantage sur la Matrice Rouge."
#: ../../mod/siteinfo.php:103
@@ -5928,9 +5928,9 @@ msgstr "Pour remonter bogues et problèmes, merci de visiter"
#: ../../mod/siteinfo.php:106
msgid ""
-"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot "
+"Suggestions, praise, etc. - please email \"hubzilla\" at librelist - dot "
"com"
-msgstr "Suggestions, demandes, etc. - merci de vous adresser à \"redmatrix\" à librelist - point com"
+msgstr "Suggestions, demandes, etc. - merci de vous adresser à \"hubzilla\" à librelist - point com"
#: ../../mod/siteinfo.php:108
msgid "Site Administrators"
@@ -7114,7 +7114,7 @@ msgid "Your message:"
msgstr "Votre message&nbsp;:"
#: ../../mod/invite.php:132
-msgid "Please join my community on RedMatrix."
+msgid "Please join my community on Hubzilla."
msgstr "Veuillez me rejoindre sur la Matrice Rouge."
#: ../../mod/invite.php:134
@@ -7122,11 +7122,11 @@ msgid "You will need to supply this invitation code: "
msgstr "Vous aurez besoin de fournir le code suivant:"
#: ../../mod/invite.php:135
-msgid "1. Register at any RedMatrix location (they are all inter-connected)"
+msgid "1. Register at any Hubzilla location (they are all inter-connected)"
msgstr "1. Enregistrez-vous sur n'importe quel serveurs ( ils sont tous inter-connectés )"
#: ../../mod/invite.php:137
-msgid "2. Enter my RedMatrix network address into the site searchbar."
+msgid "2. Enter my Hubzilla network address into the site searchbar."
msgstr "2. Saisissez l'adresse de mon canal dans la barre de recherche du site."
#: ../../mod/invite.php:138
@@ -7186,8 +7186,8 @@ msgstr "Cette action est réservée aux membres."
#: ../../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."
+"Please <a href=\"rmagic\">login with your Hubzilla ID</a> or <a "
+"href=\"register\">register as a new Redmatrix.member</a> to continue."
msgstr "SVP <a href=\"rmagic\">connectez-vous</a> ou <a href=\"register\">enregistrez-vous</a> pour continuer."
#: ../../mod/like.php:77 ../../mod/like.php:104 ../../mod/like.php:142
@@ -7871,7 +7871,7 @@ msgid "Header image only on profile pages"
msgstr "Image de l'entête tel qu'elle est affichée sur la page du profil"
#: ../../view/theme/redbasic/php/config.php:84
-msgid "Light (Red Matrix default)"
+msgid "Light (Hubzilla default)"
msgstr "Blanc (valeur par défaut)"
#: ../../view/theme/redbasic/php/config.php:104
@@ -8006,7 +8006,7 @@ msgstr "Erreur de mise à jour sur %s"
#: ../../boot.php:1473
msgid ""
-"Create an account to access services and applications within the Red Matrix"
+"Create an account to access services and applications within the Hubzilla"
msgstr "Créez un compte pour pouvoir accéder aux services et applications de la Matrice Red"
#: ../../boot.php:1501
diff --git a/view/fr/strings.php b/view/fr/strings.php
index 03a6a0fee..f73230b1d 100644
--- a/view/fr/strings.php
+++ b/view/fr/strings.php
@@ -333,8 +333,8 @@ $a->strings["Newest to Oldest"] = "Anté-chronologique";
$a->strings["Enable Safe Search"] = "Activer la recherche sûre";
$a->strings["Disable Safe Search"] = "Désactiver la recherche sûre";
$a->strings["Safe Mode"] = "Mode sûr";
-$a->strings["Red Matrix Notification"] = "Notification Matrice Rouge";
-$a->strings["redmatrix"] = "Matrice Rouge";
+$a->strings["Hubzilla Notification"] = "Notification Matrice Rouge";
+$a->strings["hubzilla"] = "Matrice Rouge";
$a->strings["Thank You,"] = "Merci,";
$a->strings["%s Administrator"] = "l'administrateur de %s";
$a->strings["%s <!item_type!>"] = "%s <!item_type!>";
@@ -1090,7 +1090,7 @@ $a->strings["Click on a contact to add or remove."] = "Cliquez sur un contact po
$a->strings["Visible To"] = "Visible par";
$a->strings["All Connections"] = "Toutes les relations";
$a->strings["Public Sites"] = "Sites publics";
-$a->strings["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."] = "Les sites listés autorisent l'inscription pour tous. Tous sont liés entre eux, de manière à ce qu'un compte sur un seul d'entre eux soit valable sur l'ensemble de la matrice. Certains sites peuvent demander des frais de souscriptions, ou fournir des forfaits ajustés. Le lien \"fournisseur\" <strong>peut</strong> vous donner des détails supplémentaires.";
+$a->strings["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."] = "Les sites listés autorisent l'inscription pour tous. Tous sont liés entre eux, de manière à ce qu'un compte sur un seul d'entre eux soit valable sur l'ensemble de la matrice. Certains sites peuvent demander des frais de souscriptions, ou fournir des forfaits ajustés. Le lien \"fournisseur\" <strong>peut</strong> vous donner des détails supplémentaires.";
$a->strings["Site URL"] = "URL du site";
$a->strings["Access Type"] = "Type d'accès";
$a->strings["Registration Policy"] = "Politique d'inscription";
@@ -1131,7 +1131,7 @@ $a->strings["Please re-enter your password"] = "Confirmez-le";
$a->strings["Away"] = "Absent";
$a->strings["Online"] = "En ligne";
$a->strings["Please login."] = "Merci de vous connecter.";
-$a->strings["Red Matrix - Guests: Username: {your email address}, Password: +++"] = "Matrice Rouge - Pour les invités: Nom d'utilisateur = {votre courriel}, Mot de passe = +++";
+$a->strings["Hubzilla - Guests: Username: {your email address}, Password: +++"] = "Matrice Rouge - Pour les invités: Nom d'utilisateur = {votre courriel}, Mot de passe = +++";
$a->strings["Channel removals are not allowed within 48 hours of changing the account password."] = "Il est impossible de supprimer un canal à l'intérieur de 48 heures après avoir changé le mot de passe d'un compte.";
$a->strings["Remove This Channel"] = "Supprimer ce Canal";
$a->strings["This will completely remove this channel from the network. Once this has been done it is not recoverable."] = "Ceci effacera complètement le canal du réseau. Une fois effacé, un canal ne PEUT PAS être récupéré.";
@@ -1280,9 +1280,9 @@ $a->strings["Hometown: "] = "Ville natale&nbsp;:";
$a->strings["About: "] = "À propos&nbsp;:";
$a->strings["Keywords: "] = "Mots-clefs&nbsp;:";
$a->strings["This site is not a directory server"] = "Ce site n'est pas un serveur d'annuaire";
-$a->strings["Red Matrix - &quot;The Network&quot;"] = "La Matrice Rouge - &quot;LE Réseau&quot;";
+$a->strings["Hubzilla - &quot;The Network&quot;"] = "La Matrice Rouge - &quot;LE Réseau&quot;";
$a->strings["Welcome to %s"] = "Bienvenue sur %s";
-$a->strings["Red Matrix Server - Setup"] = "Serveur de la Matrice Rouge - Configuration";
+$a->strings["Hubzilla Server - Setup"] = "Serveur de la Matrice Rouge - Configuration";
$a->strings["Could not connect to database."] = "Impossible de se connecter à la base de données.";
$a->strings["Could not connect to specified site URL. Possible SSL certificate or DNS issue."] = "Impossible de se connecter au site par l'URL indiquée. Problème potentiel de certificat SSL/TLS ou de DNS.";
$a->strings["Could not create table."] = "Impossible de créer la table.";
@@ -1293,7 +1293,7 @@ $a->strings["System check"] = "Vérification du système";
$a->strings["Next"] = "Suivant";
$a->strings["Check again"] = "Re-vérifier";
$a->strings["Database connection"] = "Connexion à la base de données";
-$a->strings["In order to install Red Matrix we need to know how to connect to your database."] = "Pour installer la Matrice Rouge, nous avons besoin de savoir comment contacter votre base de données.";
+$a->strings["In order to install Hubzilla we need to know how to connect to your database."] = "Pour installer la Matrice Rouge, nous avons besoin de savoir comment contacter votre base de données.";
$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Merci de contacter votre prestataire d'hébergement ou votre administrateur système si vous avez des doutes à propos de ces paramètres.";
$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "La base de données que vous allez spécifier doit exister. Si ce n'est pas déjà le cas, merci de la créer avant de continuer.";
$a->strings["Database Server Name"] = "Nom du serveur de la base de données";
@@ -1385,11 +1385,11 @@ $a->strings["Version %s"] = "Version %s";
$a->strings["Installed plugins/addons/apps:"] = "Extensions/applications installées&nbsp;:";
$a->strings["No installed plugins/addons/apps"] = "Aucune extension/application installée";
$a->strings["Red"] = "Rouge";
-$a->strings["This is a hub of the Red Matrix - a global cooperative network of decentralized privacy enhanced websites."] = "Ceci est un serveur de la Matrice Rouge - un réseau collaboratif de plusieurs serveurs qui assurent la protection de votre vie privée notamment par la décentralisation de votre identité.";
+$a->strings["This is a hub of the Hubzilla - a global cooperative network of decentralized privacy enhanced websites."] = "Ceci est un serveur de la Matrice Rouge - un réseau collaboratif de plusieurs serveurs qui assurent la protection de votre vie privée notamment par la décentralisation de votre identité.";
$a->strings["Running at web location"] = "Installée sur";
-$a->strings["Please visit <a href=\"http://getzot.com\">GetZot.com</a> to learn more about the Red Matrix."] = "Merci de visiter <a href=\"http://getzot.com\">GetZot.com</a> pour en apprendre davantage sur la Matrice Rouge.";
+$a->strings["Please visit <a href=\"http://getzot.com\">GetZot.com</a> to learn more about the Hubzilla."] = "Merci de visiter <a href=\"http://getzot.com\">GetZot.com</a> pour en apprendre davantage sur la Matrice Rouge.";
$a->strings["Bug reports and issues: please visit"] = "Pour remonter bogues et problèmes, merci de visiter";
-$a->strings["Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"] = "Suggestions, demandes, etc. - merci de vous adresser à \"redmatrix\" à librelist - point com";
+$a->strings["Suggestions, praise, etc. - please email \"hubzilla\" at librelist - dot com"] = "Suggestions, demandes, etc. - merci de vous adresser à \"hubzilla\" à librelist - point com";
$a->strings["Site Administrators"] = "Administrateurs du site";
$a->strings["Page owner information could not be retrieved."] = "Impossible d'obtenir des informations sur le propriétaire de la page.";
$a->strings["Album not found."] = "Album introuvable.";
@@ -1677,10 +1677,10 @@ $a->strings["You have no more invitations available"] = "Vous ne disposez plus d
$a->strings["Send invitations"] = "Envoyer des invitations";
$a->strings["Enter email addresses, one per line:"] = "Entrez les adresses de courriel, une par ligne&nbsp;:";
$a->strings["Your message:"] = "Votre message&nbsp;:";
-$a->strings["Please join my community on RedMatrix."] = "Veuillez me rejoindre sur la Matrice Rouge.";
+$a->strings["Please join my community on Hubzilla."] = "Veuillez me rejoindre sur la Matrice Rouge.";
$a->strings["You will need to supply this invitation code: "] = "Vous aurez besoin de fournir le code suivant:";
-$a->strings["1. Register at any RedMatrix location (they are all inter-connected)"] = "1. Enregistrez-vous sur n'importe quel serveurs ( ils sont tous inter-connectés )";
-$a->strings["2. Enter my RedMatrix network address into the site searchbar."] = "2. Saisissez l'adresse de mon canal dans la barre de recherche du site.";
+$a->strings["1. Register at any Hubzilla location (they are all inter-connected)"] = "1. Enregistrez-vous sur n'importe quel serveurs ( ils sont tous inter-connectés )";
+$a->strings["2. Enter my Hubzilla network address into the site searchbar."] = "2. Saisissez l'adresse de mon canal dans la barre de recherche du site.";
$a->strings["or visit "] = "ou visitez";
$a->strings["3. Click [Connect]"] = "3. Click sur [Ajouter]";
$a->strings["Unable to locate original post."] = "Impossible de localiser la publication initiale.";
@@ -1694,7 +1694,7 @@ $a->strings["Help with this feature"] = "Aide avec cette fonctionnalité";
$a->strings["Layout Name"] = "Nom de la mise-en-page";
$a->strings["Like/Dislike"] = "J'aime/Je Déteste";
$a->strings["This action is restricted to members."] = "Cette action est réservée aux membres.";
-$a->strings["Please <a href=\"rmagic\">login with your RedMatrix ID</a> or <a href=\"register\">register as a new RedMatrix member</a> to continue."] = "SVP <a href=\"rmagic\">connectez-vous</a> ou <a href=\"register\">enregistrez-vous</a> pour continuer.";
+$a->strings["Please <a href=\"rmagic\">login with your Hubzilla ID</a> or <a href=\"register\">register as a new Redmatrix.member</a> to continue."] = "SVP <a href=\"rmagic\">connectez-vous</a> ou <a href=\"register\">enregistrez-vous</a> pour continuer.";
$a->strings["Invalid request."] = "Requête invalide.";
$a->strings["thing"] = "chose";
$a->strings["Channel unavailable."] = "Canal indisponible.";
@@ -1856,7 +1856,7 @@ $a->strings["Right offset of the aside element"] = "Décalage droit du panneau l
$a->strings["None"] = "Aucun";
$a->strings["Header image"] = "Image de l'entête";
$a->strings["Header image only on profile pages"] = "Image de l'entête tel qu'elle est affichée sur la page du profil";
-$a->strings["Light (Red Matrix default)"] = "Blanc (valeur par défaut)";
+$a->strings["Light (Hubzilla default)"] = "Blanc (valeur par défaut)";
$a->strings["Narrow navbar"] = "Barre de navigation fine";
$a->strings["Navigation bar background color"] = "Couleur de fond de la barre de navigation";
$a->strings["Navigation bar gradient top color"] = "Gradient de la barre de navigation HAUT";
@@ -1889,7 +1889,7 @@ $a->strings["Sloppy photo albums"] = "Albums photo \"en biais\"";
$a->strings["Are you a clean desk or a messy desk person?"] = "Vous êtes plutôt \"bureau bien rangé\" ou \"gros foutoir\"?";
$a->strings["Update %s failed. See error logs."] = "La mise à jour %s a échoué. Merci de consulter les journaux d'erreur.";
$a->strings["Update Error at %s"] = "Erreur de mise à jour sur %s";
-$a->strings["Create an account to access services and applications within the Red Matrix"] = "Créez un compte pour pouvoir accéder aux services et applications de la Matrice Red";
+$a->strings["Create an account to access services and applications within the Hubzilla"] = "Créez un compte pour pouvoir accéder aux services et applications de la Matrice Red";
$a->strings["Password"] = "Mot de passe";
$a->strings["Remember me"] = "Se souvenir de moi";
$a->strings["Forgot your password?"] = "Mot de passe oublié?";
diff --git a/view/it/htconfig.tpl b/view/it/htconfig.tpl
index 096143798..cc4087f96 100644
--- a/view/it/htconfig.tpl
+++ b/view/it/htconfig.tpl
@@ -30,7 +30,7 @@ $default_timezone = '{{$timezone}}';
// What is your site name?
$a->config['system']['baseurl'] = '{{$siteurl}}';
-$a->config['system']['sitename'] = "Red Matrix";
+$a->config['system']['sitename'] = "Hubzilla";
$a->config['system']['location_hash'] = '{{$site_id}}';
// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
diff --git a/view/it/messages.po b/view/it/messages.po
index c3f405c58..4a0117f9d 100644
--- a/view/it/messages.po
+++ b/view/it/messages.po
@@ -1,5 +1,5 @@
-# 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:
@@ -11,7 +11,7 @@
# tuscanhobbit <pynolo@tarine.net>, 2013-2015
msgid ""
msgstr ""
-"Project-Id-Version: Redmatrix\n"
+"Project-Id-Version: Hubzilla\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"
@@ -1113,12 +1113,12 @@ msgid "Public Hubs"
msgstr "Hub pubblici"
#: ../../include/enotify.php:58
-msgid "Red Matrix Notification"
-msgstr "Notifica di RedMatrix"
+msgid "Hubzilla Notification"
+msgstr "Notifica di Hubzilla"
#: ../../include/enotify.php:59
-msgid "redmatrix"
-msgstr "RedMatrix"
+msgid "hubzilla"
+msgstr "Hubzilla"
#: ../../include/enotify.php:61
msgid "Thank You,"
@@ -1137,7 +1137,7 @@ msgstr "%s <!item_type!>"
#: ../../include/enotify.php:100
#, php-format
msgid "[Red:Notify] New mail received at %s"
-msgstr "[RedMatrix] Nuovo messaggio su %s"
+msgstr "[Hubzilla] Nuovo messaggio su %s"
#: ../../include/enotify.php:102
#, php-format
@@ -1176,7 +1176,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 "[RedMatrix] Nuovo commento di %2$s alla conversazione #%1$d"
+msgstr "[Hubzilla] Nuovo commento di %2$s alla conversazione #%1$d"
#: ../../include/enotify.php:187
#, php-format
@@ -1193,7 +1193,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 "[RedMatrix] %s ha scritto sulla tua bacheca"
+msgstr "[Hubzilla] %s ha scritto sulla tua bacheca"
#: ../../include/enotify.php:198
#, php-format
@@ -1208,7 +1208,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 "[RedMatrix] %s ti ha taggato"
+msgstr "[Hubzilla] %s ti ha taggato"
#: ../../include/enotify.php:225
#, php-format
@@ -1223,7 +1223,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 "[RedMatrix] %1$s ti ha mandato un poke"
+msgstr "[Hubzilla] %1$s ti ha mandato un poke"
#: ../../include/enotify.php:239
#, php-format
@@ -1238,7 +1238,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"
-msgstr "[RedMatrix] %s ha taggato il tuo articolo"
+msgstr "[Hubzilla] %s ha taggato il tuo articolo"
#: ../../include/enotify.php:257
#, php-format
@@ -1252,7 +1252,7 @@ msgstr "%1$s, %2$s ha taggato [zrl=%3$s]il tuo articolo[/zrl]"
#: ../../include/enotify.php:270
msgid "[Red:Notify] Introduction received"
-msgstr "[RedMatrix] Hai una richiesta di amicizia"
+msgstr "[Hubzilla] Hai una richiesta di amicizia"
#: ../../include/enotify.php:271
#, php-format
@@ -1277,7 +1277,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 "[RedMatrix] Ti è stato suggerito un amico"
+msgstr "[Hubzilla] Ti è stato suggerito un amico"
#: ../../include/enotify.php:286
#, php-format
@@ -1306,7 +1306,7 @@ msgstr "Visita %s per approvare o rifiutare il suggerimento."
#: ../../include/enotify.php:508
msgid "[Red:Notify]"
-msgstr "[RedMatrix]"
+msgstr "[Hubzilla]"
#: ../../include/contact_selectors.php:56
msgid "Frequently"
@@ -1681,8 +1681,8 @@ msgid "Attachments:"
msgstr "Allegati:"
#: ../../include/bb2diaspora.php:453
-msgid "Redmatrix event notification:"
-msgstr "Notifica eventi RedMatrix:"
+msgid "Hubzilla event notification:"
+msgstr "Notifica eventi Hubzilla:"
#: ../../include/text.php:329
msgid "prev"
@@ -2171,7 +2171,7 @@ msgstr "Elenco pubblico canali"
#: ../../include/nav.php:180 ../../include/apps.php:133
msgid "Matrix"
-msgstr "RedMatrix"
+msgstr "Hubzilla"
#: ../../include/nav.php:180
msgid "Your matrix"
@@ -4652,8 +4652,8 @@ msgid "Fetching URL returns error: %1$s"
msgstr "La chiamata all'URL restituisce questo errore: %1$s"
#: ../../mod/home.php:53
-msgid "Red Matrix - &quot;The Network&quot;"
-msgstr "RedMatrix - &quot;La tua rete&quot;"
+msgid "Hubzilla - &quot;The Network&quot;"
+msgstr "Hubzilla - &quot;La tua rete&quot;"
#: ../../mod/home.php:124
#, php-format
@@ -4755,9 +4755,9 @@ msgstr "Questa funzionalità è riservata agli iscritti."
#: ../../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 "Per favore <a href=\"rmagic\">accedi con il tuo identificativo RedMatrix</a> o <a href=\"register\">registrati su RedMatrix</a> per continuare."
+"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."
#: ../../mod/like.php:101 ../../mod/like.php:128 ../../mod/like.php:166
msgid "Invalid request."
@@ -4922,12 +4922,12 @@ msgstr "Siti pubblici"
#: ../../mod/pubsites.php:19
msgid ""
-"The listed sites allow public registration into the Red Matrix. All sites in"
+"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 RedMatrix. 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."
+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."
#: ../../mod/pubsites.php:25
msgid "Rate this hub"
@@ -4966,8 +4966,8 @@ msgid "Edit post"
msgstr "Modifica articolo"
#: ../../mod/dav.php:121
-msgid "RedMatrix channel"
-msgstr "Canale RedMatrix"
+msgid "Hubzilla channel"
+msgstr "Canale Hubzilla"
#: ../../mod/group.php:20
msgid "Collection created."
@@ -5032,13 +5032,13 @@ msgstr "Nessuna app o componente installato"
#: ../../mod/siteinfo.php:155
msgid "Red"
-msgstr "RedMatrix"
+msgstr "Hubzilla"
#: ../../mod/siteinfo.php:156
msgid ""
-"This is a hub of redmatrix - a global cooperative network of decentralized "
+"This is a hub of hubzilla - a global cooperative network of decentralized "
"privacy enhanced websites."
-msgstr "Questo è un hub di RedMatrix - una rete cooperativa e decentralizzata di siti ad elevata privacy. "
+msgstr "Questo è un hub di Hubzilla - una rete cooperativa e decentralizzata di siti ad elevata privacy. "
#: ../../mod/siteinfo.php:158
msgid "Tag: "
@@ -5055,8 +5055,8 @@ 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 Red Matrix."
-msgstr "Visita <a href=\"https://redmatrix.me\">RedMatrix.me</a> per scoprire cosa è Red Matrix."
+" about the Hubzilla."
+msgstr "Visita <a href=\"https://redmatrix.me\">Redmatrix.me</a> per scoprire cosa è Hubzilla."
#: ../../mod/siteinfo.php:165
msgid "Bug reports and issues: please visit"
@@ -5064,9 +5064,9 @@ msgstr "Per segnalare bug e problemi: visita"
#: ../../mod/siteinfo.php:168
msgid ""
-"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot "
+"Suggestions, praise, etc. - please email \"hubzilla\" at librelist - dot "
"com"
-msgstr "Per consigli, ringraziamenti, ecc. - scrivi a \"redmatrix\" at librelist - dot com"
+msgstr "Per consigli, ringraziamenti, ecc. - scrivi a \"hubzilla\" at librelist - dot com"
#: ../../mod/siteinfo.php:170
msgid "Site Administrators"
@@ -5081,8 +5081,8 @@ msgid "Not Found"
msgstr "Non disponibile"
#: ../../mod/setup.php:166
-msgid "Red Matrix Server - Setup"
-msgstr "RedMatrix Server - Installazione"
+msgid "Hubzilla Server - Setup"
+msgstr "Hubzilla Server - Installazione"
#: ../../mod/setup.php:172
msgid "Could not connect to database."
@@ -5126,9 +5126,9 @@ msgstr "Connessione al database"
#: ../../mod/setup.php:290
msgid ""
-"In order to install Red Matrix we need to know how to connect to your "
+"In order to install Hubzilla we need to know how to connect to your "
"database."
-msgstr "Per installare RedMatrix è necessario conoscere i parametri di connessione al database."
+msgstr "Per installare Hubzilla è necessario conoscere i parametri di connessione al database."
#: ../../mod/setup.php:291
msgid ""
@@ -5327,7 +5327,7 @@ msgstr "Errore: il modulo PHP mcrypt è richiesto ma non installato."
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."
+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 ""
@@ -5339,7 +5339,7 @@ msgstr "Spesso ciò è dovuto ai permessi di accesso al disco: il web server pot
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."
+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 ""
@@ -5362,7 +5362,7 @@ msgstr "Red usa il sistema Smarty3 per costruire i suoi template grafici. Smarty
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."
+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/setup.php:526 ../../mod/setup.php:544
msgid ""
@@ -5386,7 +5386,7 @@ msgstr "%s è scrivibile"
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"
+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"
@@ -5597,8 +5597,8 @@ 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/cloud.php:120
-msgid "RedMatrix - Guests: Username: {your email address}, Password: +++"
-msgstr "Accesso a Red Matrix. {Inserisci l'email con cui sei registrato e la password.}"
+msgid "Hubzilla - Guests: Username: {your email address}, Password: +++"
+msgstr "Accesso a Hubzilla. {Inserisci l'email con cui sei registrato e la password.}"
#: ../../mod/photos.php:77
msgid "Page owner information could not be retrieved."
@@ -6118,7 +6118,7 @@ msgstr "%s: non è un indirizzo email valido."
#: ../../mod/invite.php:76
msgid "Please join us on Red"
-msgstr "Vieni con noi su RedMatrix"
+msgstr "Vieni con noi su Hubzilla"
#: ../../mod/invite.php:87
msgid "Invitation limit exceeded. Please contact your site administrator."
@@ -6153,20 +6153,20 @@ msgid "Your message:"
msgstr "Il tuo messaggio:"
#: ../../mod/invite.php:132
-msgid "Please join my community on RedMatrix."
-msgstr "Entra a far parte della mia comunità su RedMatrix."
+msgid "Please join my community on Hubzilla."
+msgstr "Entra a far parte della mia comunità su Hubzilla."
#: ../../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 RedMatrix location (they are all inter-connected)"
-msgstr "1. Registrati su un qualsiasi sito RedMatrix (sono tutti interconnessi)"
+msgid "1. Register at any Hubzilla location (they are all inter-connected)"
+msgstr "1. Registrati su un qualsiasi sito Hubzilla (sono tutti interconnessi)"
#: ../../mod/invite.php:137
-msgid "2. Enter my RedMatrix network address into the site searchbar."
-msgstr "2. Inserisci il mio indirizzo RedMatrix nella barra di ricerca che compare nella pagina."
+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."
#: ../../mod/invite.php:138
msgid "or visit "
@@ -6774,8 +6774,8 @@ msgid "Link Target"
msgstr "Destinazione link"
#: ../../mod/mitem.php:156 ../../mod/mitem.php:226
-msgid "Use RedMatrix magic-auth if available"
-msgstr "Usa l'autenticazione magica di RedMatrix, se disponibile"
+msgid "Use Hubzilla magic-auth if available"
+msgstr "Usa l'autenticazione magica di Hubzilla, se disponibile"
#: ../../mod/mitem.php:157 ../../mod/mitem.php:227
msgid "Open link in new window"
@@ -7651,7 +7651,7 @@ msgstr "File di log"
#: ../../mod/admin.php:1364
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 RedMatrix."
+msgstr "Deve essere scrivibile dal web server. La posizione è relativa alla cartella dove è installato Hubzilla."
#: ../../mod/admin.php:1365
msgid "Log level"
@@ -8461,7 +8461,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. RedMatrix 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. Hubzilla sceglierà per te i permessi più adatti."
#: ../../mod/new_channel.php:119
msgid "Channel Type"
@@ -8757,7 +8757,7 @@ msgid "Right offset of the aside element"
msgstr "Margine destro della colonna laterale"
#: ../../view/theme/redbasic/php/config.php:82
-msgid "Light (Red Matrix default)"
+msgid "Light (Hubzilla default)"
msgstr "Light (predefinito)"
#: ../../view/theme/redbasic/php/config.php:101
@@ -8896,8 +8896,8 @@ msgstr "Errore di aggiornamento su %s"
#: ../../boot.php:1515
msgid ""
-"Create an account to access services and applications within the Red Matrix"
-msgstr "Registrati per accedere ai servizi e alle applicazioni di RedMatrix"
+"Create an account to access services and applications within the Hubzilla"
+msgstr "Registrati per accedere ai servizi e alle applicazioni di Hubzilla"
#: ../../boot.php:1543
msgid "Password"
diff --git a/view/it/strings.php b/view/it/strings.php
index 047d10c39..38b8c745c 100644
--- a/view/it/strings.php
+++ b/view/it/strings.php
@@ -250,12 +250,12 @@ $a->strings["photo/image"] = "foto/immagine";
$a->strings["Rate Me"] = "Valutami";
$a->strings["View Ratings"] = "Vedi le valutazioni ricevute";
$a->strings["Public Hubs"] = "Hub pubblici";
-$a->strings["Red Matrix Notification"] = "Notifica di RedMatrix";
-$a->strings["redmatrix"] = "RedMatrix";
+$a->strings["Hubzilla Notification"] = "Notifica di Hubzilla";
+$a->strings["hubzilla"] = "Hubzilla";
$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"] = "[RedMatrix] Nuovo messaggio su %s";
+$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";
@@ -263,33 +263,33 @@ $a->strings["Please visit %s to view and/or reply to your private messages."] =
$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"] = "[RedMatrix] Nuovo commento di %2\$s alla conversazione #%1\$d";
+$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"] = "[RedMatrix] %s ha scritto sulla tua bacheca";
+$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"] = "[RedMatrix] %s ti ha taggato";
+$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"] = "[RedMatrix] %1\$s ti ha mandato un poke";
+$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"] = "[RedMatrix] %s ha taggato il tuo articolo";
+$a->strings["[Red:Notify] %s tagged your post"] = "[Hubzilla] %s ha taggato il tuo articolo";
$a->strings["%1\$s, %2\$s tagged your post at %3\$s"] = "%1\$s, %2\$s ha taggato il tuo articolo 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 articolo[/zrl]";
-$a->strings["[Red:Notify] Introduction received"] = "[RedMatrix] Hai una richiesta di amicizia";
+$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"] = "[RedMatrix] Ti è stato suggerito un amico";
+$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]"] = "[RedMatrix]";
+$a->strings["[Red:Notify]"] = "[Hubzilla]";
$a->strings["Frequently"] = "Frequentemente";
$a->strings["Hourly"] = "Ogni ora";
$a->strings["Twice daily"] = "Due volte al giorno";
@@ -382,7 +382,7 @@ $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["Attachments:"] = "Allegati:";
-$a->strings["Redmatrix event notification:"] = "Notifica eventi RedMatrix:";
+$a->strings["Hubzilla event notification:"] = "Notifica eventi Hubzilla:";
$a->strings["prev"] = "prec";
$a->strings["first"] = "inizio";
$a->strings["last"] = "fine";
@@ -502,7 +502,7 @@ $a->strings["Applications, utilities, links, games"] = "Applicazioni, utilità,
$a->strings["Search site content"] = "Cerca nel sito";
$a->strings["Directory"] = "Elenco pubblico";
$a->strings["Channel Directory"] = "Elenco pubblico canali";
-$a->strings["Matrix"] = "RedMatrix";
+$a->strings["Matrix"] = "Hubzilla";
$a->strings["Your matrix"] = "La tua rete";
$a->strings["Mark all matrix notifications seen"] = "Segna come lette le notifiche della tua rete";
$a->strings["Channel Home"] = "Bacheca del canale";
@@ -1101,7 +1101,7 @@ $a->strings["URL for photo of thing (optional)"] = "Indirizzo di un'immagine del
$a->strings["Add Thing to your Profile"] = "Aggiungi l'Oggetto al tuo profilo";
$a->strings["Item not available."] = "Elemento non disponibile.";
$a->strings["Fetching URL returns error: %1\$s"] = "La chiamata all'URL restituisce questo errore: %1\$s";
-$a->strings["Red Matrix - &quot;The Network&quot;"] = "RedMatrix - &quot;La tua rete&quot;";
+$a->strings["Hubzilla - &quot;The Network&quot;"] = "Hubzilla - &quot;La tua rete&quot;";
$a->strings["Welcome to %s"] = "%s ti dà il benvenuto";
$a->strings["Image uploaded but image cropping failed."] = "L'immagine è stata caricata, ma il non è stato possibile ritagliarla.";
$a->strings["Image resize failed."] = "Il ridimensionamento dell'immagine è fallito.";
@@ -1125,7 +1125,7 @@ $a->strings["Channel not found."] = "Canale non trovato.";
$a->strings["Page not found."] = "Pagina non trovata.";
$a->strings["Like/Dislike"] = "Mi piace/Non mi piace";
$a->strings["This action is restricted to members."] = "Questa funzionalità è riservata agli iscritti.";
-$a->strings["Please <a href=\"rmagic\">login with your RedMatrix ID</a> or <a href=\"register\">register as a new RedMatrix member</a> to continue."] = "Per favore <a href=\"rmagic\">accedi con il tuo identificativo RedMatrix</a> o <a href=\"register\">registrati su RedMatrix</a> per continuare.";
+$a->strings["Please <a href=\"rmagic\">login with your Hubzilla ID</a> or <a href=\"register\">register as a new Redmatrix.member</a> to continue."] = "Per favore <a href=\"rmagic\">accedi con il tuo identificativo Hubzilla</a> o <a href=\"register\">registrati su Hubzilla</a> per continuare.";
$a->strings["Invalid request."] = "Richiesta non valida.";
$a->strings["thing"] = "Oggetto";
$a->strings["Channel unavailable."] = "Canale non trovato.";
@@ -1164,7 +1164,7 @@ $a->strings["Title:"] = "Titolo:";
$a->strings["Share this event"] = "Condividi questo evento";
$a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s sta seguendo %3\$s di %2\$s";
$a->strings["Public Sites"] = "Siti pubblici";
-$a->strings["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."] = "Gli indirizzi elencati permettono la registrazione su RedMatrix. 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.";
+$a->strings["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."] = "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.";
$a->strings["Rate this hub"] = "Valuta questo hub";
$a->strings["Site URL"] = "URL del sito";
$a->strings["Access Type"] = "Tipo di accesso";
@@ -1174,7 +1174,7 @@ $a->strings["View hub ratings"] = "Vedi le valutazioni del hub";
$a->strings["Rate"] = "Valuta";
$a->strings["View ratings"] = "Vedi le valutazioni";
$a->strings["Edit post"] = "Modifica articolo";
-$a->strings["RedMatrix channel"] = "Canale RedMatrix";
+$a->strings["Hubzilla channel"] = "Canale Hubzilla";
$a->strings["Collection created."] = "L'insieme di canali è stato creato.";
$a->strings["Could not create collection."] = "Impossibile creare l'insieme.";
$a->strings["Collection updated."] = "Insieme aggiornato.";
@@ -1190,18 +1190,18 @@ $a->strings["Click on a channel to add or remove."] = "Clicca su un canale per a
$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";
-$a->strings["Red"] = "RedMatrix";
-$a->strings["This is a hub of redmatrix - a global cooperative network of decentralized privacy enhanced websites."] = "Questo è un hub di RedMatrix - una rete cooperativa e decentralizzata di siti ad elevata privacy. ";
+$a->strings["Red"] = "Hubzilla";
+$a->strings["This is a hub of hubzilla - a global cooperative network of decentralized privacy enhanced websites."] = "Questo è un hub di Hubzilla - una rete cooperativa e decentralizzata di siti ad elevata privacy. ";
$a->strings["Tag: "] = "Tag: ";
$a->strings["Last background fetch: "] = "Ultima acquisizione:";
$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 the Red Matrix."] = "Visita <a href=\"https://redmatrix.me\">RedMatrix.me</a> per scoprire cosa è Red Matrix.";
+$a->strings["Please visit <a href=\"https://redmatrix.me\">redmatrix.me</a> to learn more about the Hubzilla."] = "Visita <a href=\"https://redmatrix.me\">Redmatrix.me</a> per scoprire cosa è Hubzilla.";
$a->strings["Bug reports and issues: please visit"] = "Per segnalare bug e problemi: visita";
-$a->strings["Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"] = "Per consigli, ringraziamenti, ecc. - scrivi a \"redmatrix\" at librelist - dot com";
+$a->strings["Suggestions, praise, etc. - please email \"hubzilla\" at librelist - dot com"] = "Per consigli, ringraziamenti, ecc. - scrivi a \"hubzilla\" at librelist - dot com";
$a->strings["Site Administrators"] = "Amministratori del sito";
$a->strings["Help:"] = "Guida:";
$a->strings["Not Found"] = "Non disponibile";
-$a->strings["Red Matrix Server - Setup"] = "RedMatrix Server - Installazione";
+$a->strings["Hubzilla Server - Setup"] = "Hubzilla Server - Installazione";
$a->strings["Could not connect to database."] = " Impossibile connettersi al database.";
$a->strings["Could not connect to specified site URL. Possible SSL certificate or DNS issue."] = "Non è possibile raggiungere l'indirizzo del sito specificato. Potrebbe essere un problema di SSL o DNS.";
$a->strings["Could not create table."] = "Impossibile creare le tabelle.";
@@ -1211,7 +1211,7 @@ $a->strings["Please see the file \"install/INSTALL.txt\"."] = "Leggi il file 'in
$a->strings["System check"] = "Verifica del sistema";
$a->strings["Check again"] = "Verifica di nuovo";
$a->strings["Database connection"] = "Connessione al database";
-$a->strings["In order to install Red Matrix we need to know how to connect to your database."] = "Per installare RedMatrix è necessario conoscere i parametri di connessione al database.";
+$a->strings["In order to install Hubzilla we need to know how to connect to your database."] = "Per installare Hubzilla è necessario conoscere i parametri di connessione al database.";
$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";
@@ -1255,17 +1255,17 @@ $a->strings["Error: openssl PHP module required but not installed."] = "Errore:
$a->strings["Error: mysqli or postgres PHP module required but neither are installed."] = "Errore: il modulo PHP per mysqli o postgres è richiesto ma non installato";
$a->strings["Error: mb_string PHP module required but not installed."] = "Errore: il modulo PHP mb_string è richiesto ma non installato.";
$a->strings["Error: mcrypt PHP module required but not installed."] = "Errore: il modulo PHP mcrypt è richiesto ma non installato.";
-$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."] = "L'installazione web deve poter creare un file chiamato \".htconfig.php\" nella cartella di RedMatrix ma non è in grado di farlo.";
+$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."] = "L'installazione web deve poter creare un file chiamato \".htconfig.php\" nella cartella di Hubzilla ma non è in grado di farlo.";
$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."] = "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.";
-$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."] = "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.";
+$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."] = "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.";
$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"install/INSTALL.txt\" for instructions."] = "Puoi anche saltare questa procedura ed effettuare un'installazione manuale. Guarda il file 'install/INSTALL.txt' per le istruzioni.";
$a->strings[".htconfig.php is writable"] = ".htconfig.php è scrivibile";
$a->strings["Red uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Red usa il sistema Smarty3 per costruire i suoi template grafici. Smarty3 è molto veloce perché compila i template delle pagine direttamente in 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."] = "Per poter memorizzare i template compilati, il web server deve avere accesso in scrittura a %s sotto la cartella di installazione di RedMatrix.";
+$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."] = "Per poter memorizzare i template compilati, il web server deve avere accesso in scrittura a %s sotto la cartella di installazione di Hubzilla.";
$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "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).";
$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 bene: come precauzione, dovresti dare i diritti di scrittura solamente su %s e non sui file template (.tpl) che contiene.";
$a->strings["%s is writable"] = "%s è scrivibile";
-$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"] = "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";
+$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"] = "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";
$a->strings["store is writable"] = "l'archivio è scrivibile";
$a->strings["SSL certificate cannot be validated. Fix certificate or disable https access to this site."] = "Il certificato SSL non può essere validato. Correggi l'errore o disabilita l'accesso https al sito.";
$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!"] = "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!";
@@ -1312,7 +1312,7 @@ $a->strings["block"] = "riquadro";
$a->strings["layout"] = "layout";
$a->strings["%s element installed"] = "%s elemento installato";
$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s ha taggato %3\$s di %2\$s con %4\$s";
-$a->strings["RedMatrix - Guests: Username: {your email address}, Password: +++"] = "Accesso a Red Matrix. {Inserisci l'email con cui sei registrato e la password.}";
+$a->strings["Hubzilla - Guests: Username: {your email address}, Password: +++"] = "Accesso a Hubzilla. {Inserisci l'email con cui sei registrato e la password.}";
$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";
@@ -1434,7 +1434,7 @@ $a->strings["Item is not editable"] = "L'elemento non è modificabile";
$a->strings["Delete item?"] = "Eliminare questo elemento?";
$a->strings["Total invitation limit exceeded."] = "Hai superato il numero massimo di inviti.";
$a->strings["%s : Not a valid email address."] = "%s: non è un indirizzo email valido.";
-$a->strings["Please join us on Red"] = "Vieni con noi su RedMatrix";
+$a->strings["Please join us on Red"] = "Vieni con noi su Hubzilla";
$a->strings["Invitation limit exceeded. Please contact your site administrator."] = "Hai superato il numero massimo di inviti. Contatta l'amministratore se necessario.";
$a->strings["%s : Message delivery failed."] = "%s: la consegna del messaggio è fallita.";
$a->strings["%d message sent."] = array(
@@ -1445,10 +1445,10 @@ $a->strings["You have no more invitations available"] = "Non hai altri inviti di
$a->strings["Send invitations"] = "Spedisci inviti";
$a->strings["Enter email addresses, one per line:"] = "Inserisci gli indirizzi email, uno per riga:";
$a->strings["Your message:"] = "Il tuo messaggio:";
-$a->strings["Please join my community on RedMatrix."] = "Entra a far parte della mia comunità su RedMatrix.";
+$a->strings["Please join my community on Hubzilla."] = "Entra a far parte della mia comunità su Hubzilla.";
$a->strings["You will need to supply this invitation code: "] = "Dovrai fornire questo codice di invito:";
-$a->strings["1. Register at any RedMatrix location (they are all inter-connected)"] = "1. Registrati su un qualsiasi sito RedMatrix (sono tutti interconnessi)";
-$a->strings["2. Enter my RedMatrix network address into the site searchbar."] = "2. Inserisci il mio indirizzo RedMatrix nella barra di ricerca che compare nella pagina.";
+$a->strings["1. Register at any Hubzilla location (they are all inter-connected)"] = "1. Registrati su un qualsiasi sito Hubzilla (sono tutti interconnessi)";
+$a->strings["2. Enter my Hubzilla network address into the site searchbar."] = "2. Inserisci il mio indirizzo Hubzilla nella barra di ricerca che compare nella pagina.";
$a->strings["or visit "] = "oppure visita ";
$a->strings["3. Click [Connect]"] = "3. Clicca su [Aggiungi]";
$a->strings["Location not found."] = "Indirizzo non trovato.";
@@ -1599,7 +1599,7 @@ $a->strings["Unable to add menu element."] = "Impossibile aggiungere l'elemento
$a->strings["Menu Item Permissions"] = "Permessi del menu";
$a->strings["Link Name"] = "Nome link";
$a->strings["Link Target"] = "Destinazione link";
-$a->strings["Use RedMatrix magic-auth if available"] = "Usa l'autenticazione magica di RedMatrix, se disponibile";
+$a->strings["Use Hubzilla magic-auth if available"] = "Usa l'autenticazione magica di Hubzilla, se disponibile";
$a->strings["Open link in new window"] = "Apri il link in una nuova finestra";
$a->strings["Order in list"] = "Ordine dell'elenco";
$a->strings["Higher numbers will sink to bottom of listing"] = "I numeri più alti andranno in fondo all'elenco";
@@ -1812,7 +1812,7 @@ $a->strings["Log settings updated."] = "Impostazioni di log aggiornate.";
$a->strings["Clear"] = "Pulisci";
$a->strings["Debugging"] = "Debugging";
$a->strings["Log file"] = "File di log";
-$a->strings["Must be writable by web server. Relative to your Red top-level directory."] = "Deve essere scrivibile dal web server. La posizione è relativa alla cartella dove è installato RedMatrix.";
+$a->strings["Must be writable by web server. Relative to your Red top-level directory."] = "Deve essere scrivibile dal web server. La posizione è relativa alla cartella dove è installato Hubzilla.";
$a->strings["Log level"] = "Livello di log";
$a->strings["New Profile Field"] = "Nuovo campo del profilo";
$a->strings["Field nickname"] = "Nome breve del campo";
@@ -1999,7 +1999,7 @@ $a->strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"A
$a->strings["Choose a short nickname"] = "Scegli un nome breve";
$a->strings["Your nickname will be used to create an easily remembered channel address (like an email address) which you can share with others."] = "Il nome breve sarà usato per creare un indirizzo facile da ricordare per il tuo canale (simile a una email). Così potrai condividerlo e gli altri potranno trovarti.";
$a->strings["Or <a href=\"import\">import an existing channel</a> from another location"] = "Oppure <a href=\"import\">importa un tuo canale esistente</a> da un altro server/hub";
-$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"] = "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.";
+$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"] = "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.";
$a->strings["Channel Type"] = "Tipo di canale";
$a->strings["Read more about roles"] = "Maggiori informazioni sui ruoli";
$a->strings["App installed."] = "App installata";
@@ -2072,7 +2072,7 @@ $a->strings["Right offset of the section element"] = "Margine destro dell'area p
$a->strings["Section width"] = "Larghezza dell'area principale";
$a->strings["Left offset of the aside"] = "Margine sinistro della colonna laterale";
$a->strings["Right offset of the aside element"] = "Margine destro della colonna laterale";
-$a->strings["Light (Red Matrix default)"] = "Light (predefinito)";
+$a->strings["Light (Hubzilla default)"] = "Light (predefinito)";
$a->strings["Select scheme"] = "Scegli uno schema";
$a->strings["Narrow navbar"] = "Barra di navigazione ristretta";
$a->strings["Navigation bar background color"] = "Barra di navigazione: Colore di sfondo";
@@ -2106,7 +2106,7 @@ $a->strings["Set size of conversation author photo"] = "Dimensione foto dell'aut
$a->strings["Set size of followup author photos"] = "Dimensione foto dei partecipanti alla conversazione";
$a->strings["Update %s failed. See error logs."] = "%s: aggiornamento fallito. Controlla i log di errore.";
$a->strings["Update Error at %s"] = "Errore di aggiornamento su %s";
-$a->strings["Create an account to access services and applications within the Red Matrix"] = "Registrati per accedere ai servizi e alle applicazioni di RedMatrix";
+$a->strings["Create an account to access services and applications within the Hubzilla"] = "Registrati per accedere ai servizi e alle applicazioni di Hubzilla";
$a->strings["Password"] = "Password";
$a->strings["Remember me"] = "Resta connesso";
$a->strings["Forgot your password?"] = "Hai dimenticato la password?";
diff --git a/view/it/update_fail_eml.tpl b/view/it/update_fail_eml.tpl
index 08901b6fb..97ab52205 100644
--- a/view/it/update_fail_eml.tpl
+++ b/view/it/update_fail_eml.tpl
@@ -1,7 +1,7 @@
Ehilà!
Sono il tuo fedele server {{$sitename}};
-Gli sviluppatori di Red Matrix hanno rilasciato l'update {{$update}},
+Gli sviluppatori di Hubzilla hanno rilasciato l'update {{$update}},
ma quando ho cercato di installarlo c'è stato qualcosa che non è filato liscio, per usare un eufemismo.
Dovrebbe essere effettuata al più presto una correzione, ma sarà necessario l'intervento umano.
Ti consiglio di contattare uno sviluppatore di Red se non riesci a capire come risolvere
diff --git a/view/nb-no/htconfig.tpl b/view/nb-no/htconfig.tpl
index 096143798..cc4087f96 100644
--- a/view/nb-no/htconfig.tpl
+++ b/view/nb-no/htconfig.tpl
@@ -30,7 +30,7 @@ $default_timezone = '{{$timezone}}';
// What is your site name?
$a->config['system']['baseurl'] = '{{$siteurl}}';
-$a->config['system']['sitename'] = "Red Matrix";
+$a->config['system']['sitename'] = "Hubzilla";
$a->config['system']['location_hash'] = '{{$site_id}}';
// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
diff --git a/view/nb-no/messages.po b/view/nb-no/messages.po
index 1ab598252..152120b15 100644
--- a/view/nb-no/messages.po
+++ b/view/nb-no/messages.po
@@ -1,12 +1,12 @@
-# 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:
# Haakon Meland Eriksen <haakon.eriksen@far.no>, 2013-2015
msgid ""
msgstr ""
-"Project-Id-Version: Red Matrix\n"
+"Project-Id-Version: Hubzilla\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-03-20 00:03-0700\n"
"PO-Revision-Date: 2015-03-25 13:13+0000\n"
@@ -2422,8 +2422,8 @@ msgid "l F d, Y \\@ g:i A"
msgstr "l F d, Y \\@ g:i A"
#: ../../include/bb2diaspora.php:430
-msgid "Redmatrix event notification:"
-msgstr "RedMatrix hendelsesvarsling:"
+msgid "Hubzilla event notification:"
+msgstr "Hubzilla hendelsesvarsling:"
#: ../../include/bb2diaspora.php:434 ../../include/event.php:20
msgid "Starts:"
@@ -2805,12 +2805,12 @@ msgid "Login failed."
msgstr "Innlogging mislyktes."
#: ../../include/enotify.php:41
-msgid "Red Matrix Notification"
-msgstr "Red Matrix-varsling"
+msgid "Hubzilla Notification"
+msgstr "Hubzilla-varsling"
#: ../../include/enotify.php:42
-msgid "redmatrix"
-msgstr "redmatrix"
+msgid "hubzilla"
+msgstr "hubzilla"
#: ../../include/enotify.php:44
msgid "Thank You,"
@@ -4615,8 +4615,8 @@ msgid "Fetching URL returns error: %1$s"
msgstr "Henting av URL gir følgende feil: %1$s"
#: ../../mod/home.php:48
-msgid "Red Matrix - &quot;The Network&quot;"
-msgstr "Red Matrix - &quot;Nettverket&quot;"
+msgid "Hubzilla - &quot;The Network&quot;"
+msgstr "Hubzilla - &quot;Nettverket&quot;"
#: ../../mod/home.php:101
#, php-format
@@ -4718,9 +4718,9 @@ msgstr "Denne handlingen er begrenset til medlemmer."
#: ../../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 "Vennligst <a href=\"rmagic\">logg inn med din RedMatrix ID</a> eller <a href=\"register\">registrer deg som et nytt RedMatrix-medlem</a> for å fortsette"
+"Please <a href=\"rmagic\">login with your Hubzilla ID</a> or <a "
+"href=\"register\">register as a new Redmatrix.member</a> to continue."
+msgstr "Vennligst <a href=\"rmagic\">logg inn med din Hubzilla ID</a> eller <a href=\"register\">registrer deg som et nytt Redmatrix.medlem</a> for å fortsette"
#: ../../mod/like.php:101 ../../mod/like.php:128 ../../mod/like.php:166
msgid "Invalid request."
@@ -4885,12 +4885,12 @@ msgstr "Offentlige nettsteder"
#: ../../mod/pubsites.php:19
msgid ""
-"The listed sites allow public registration into the Red Matrix. All sites in"
+"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 "Nettstedene på listen tillater offentlig registrering i Red Matrix. Alle nettsteder i matrix er forbundet så medlemskap på enhver av dem formidler medlemskap i hele matrix. Noen nettsteder kan kreve abonnement eller tilby lagdelte tjenesteavtaler. Tilbyderlenkene <strong>kan</strong> gi tilleggsopplysninger."
+msgstr "Nettstedene på listen tillater offentlig registrering i Hubzilla. Alle nettsteder i matrix er forbundet så medlemskap på enhver av dem formidler medlemskap i hele matrix. Noen nettsteder kan kreve abonnement eller tilby lagdelte tjenesteavtaler. Tilbyderlenkene <strong>kan</strong> gi tilleggsopplysninger."
#: ../../mod/pubsites.php:25
msgid "Rate this hub"
@@ -5268,8 +5268,8 @@ msgid "Currently pending"
msgstr "For øyeblikket ventende"
#: ../../mod/dav.php:121
-msgid "RedMatrix channel"
-msgstr "RedMatrix-kanal"
+msgid "Hubzilla channel"
+msgstr "Hubzilla-kanal"
#: ../../mod/group.php:20
msgid "Collection created."
@@ -5338,9 +5338,9 @@ msgstr "Red"
#: ../../mod/siteinfo.php:150
msgid ""
-"This is a hub of the Red Matrix - a global cooperative network of "
+"This is a hub of the Hubzilla - a global cooperative network of "
"decentralized privacy enhanced websites."
-msgstr "Dette er en hub i Red Matrix - et globalt kooperativt nettverk av desentraliserte personvernforsterkede nettsteder."
+msgstr "Dette er en hub i Hubzilla - et globalt kooperativt nettverk av desentraliserte personvernforsterkede nettsteder."
#: ../../mod/siteinfo.php:152
msgid "Tag: "
@@ -5356,9 +5356,9 @@ msgstr "Kjører på webplasseringen"
#: ../../mod/siteinfo.php:158
msgid ""
-"Please visit <a href=\"https://redmatrix.me\">RedMatrix.me</a> to learn more"
-" about the Red Matrix."
-msgstr "Vennligst besøk <a href=\"https://redmatrix.me\">RedMatrix.me</a> for å lære mer om RedMatrix."
+"Please visit <a href=\"https://redmatrix.me\">Redmatrix.me</a> to learn more"
+" about the Hubzilla."
+msgstr "Vennligst besøk <a href=\"https://redmatrix.me\">Redmatrix.me</a> for å lære mer om Hubzilla."
#: ../../mod/siteinfo.php:159
msgid "Bug reports and issues: please visit"
@@ -5366,9 +5366,9 @@ msgstr "Feilmeldinger og feilretting: vennligst besøk"
#: ../../mod/siteinfo.php:162
msgid ""
-"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot "
+"Suggestions, praise, etc. - please email \"hubzilla\" at librelist - dot "
"com"
-msgstr "Forslag, ros og så videre - vennligst e-post \"redmatrix\" hos librelist - punktum com"
+msgstr "Forslag, ros og så videre - vennligst e-post \"hubzilla\" hos librelist - punktum com"
#: ../../mod/siteinfo.php:164
msgid "Site Administrators"
@@ -5383,8 +5383,8 @@ msgid "Not Found"
msgstr "Ikke funnet"
#: ../../mod/setup.php:166
-msgid "Red Matrix Server - Setup"
-msgstr "Red Matrix tjener - oppsett"
+msgid "Hubzilla Server - Setup"
+msgstr "Hubzilla tjener - oppsett"
#: ../../mod/setup.php:172
msgid "Could not connect to database."
@@ -5428,9 +5428,9 @@ msgstr "Databaseforbindelse"
#: ../../mod/setup.php:290
msgid ""
-"In order to install Red Matrix we need to know how to connect to your "
+"In order to install Hubzilla we need to know how to connect to your "
"database."
-msgstr "For å installere Red Matrix må du oppgi hvordan din database kan kontaktes."
+msgstr "For å installere Hubzilla må du oppgi hvordan din database kan kontaktes."
#: ../../mod/setup.php:291
msgid ""
@@ -5951,8 +5951,8 @@ msgid "%1$s tagged %2$s's %3$s with %4$s"
msgstr "%1$s merket %3$s til %2$s med %4$s"
#: ../../mod/cloud.php:120
-msgid "RedMatrix - Guests: Username: {your email address}, Password: +++"
-msgstr "RedMatrix - gjester: brukernavn: {din e-postadresse}, passord: +++"
+msgid "Hubzilla - Guests: Username: {your email address}, Password: +++"
+msgstr "Hubzilla - gjester: brukernavn: {din e-postadresse}, passord: +++"
#: ../../mod/item.php:165
msgid "Unable to locate original post."
@@ -6435,20 +6435,20 @@ msgid "Your message:"
msgstr "Din melding:"
#: ../../mod/invite.php:132
-msgid "Please join my community on RedMatrix."
-msgstr "Du er velkommen til å bli med i mitt fellesskap på RedMatrix."
+msgid "Please join my community on Hubzilla."
+msgstr "Du er velkommen til å bli med i mitt fellesskap på Hubzilla."
#: ../../mod/invite.php:134
msgid "You will need to supply this invitation code: "
msgstr "Du må oppgi denne invitasjonskoden:"
#: ../../mod/invite.php:135
-msgid "1. Register at any RedMatrix location (they are all inter-connected)"
-msgstr "1. Registrer ved enhver RedMatrix-lokasjon (de er alle forbundet med hverandre)"
+msgid "1. Register at any Hubzilla location (they are all inter-connected)"
+msgstr "1. Registrer ved enhver Hubzilla-lokasjon (de er alle forbundet med hverandre)"
#: ../../mod/invite.php:137
-msgid "2. Enter my RedMatrix network address into the site searchbar."
-msgstr "2. Skriv inn min RedMatrix-adresse i nettstedets søkefelt."
+msgid "2. Enter my Hubzilla network address into the site searchbar."
+msgstr "2. Skriv inn min Hubzilla-adresse i nettstedets søkefelt."
#: ../../mod/invite.php:138
msgid "or visit "
@@ -8215,8 +8215,8 @@ msgid "URL of link"
msgstr "URL-en til lenken"
#: ../../mod/mitem.php:165 ../../mod/mitem.php:209
-msgid "Use RedMatrix magic-auth if available"
-msgstr "Bruk RedMatrixs magiske-autentisering hvis tilgjengelig"
+msgid "Use Hubzilla magic-auth if available"
+msgstr "Bruk Hubzillas magiske-autentisering hvis tilgjengelig"
#: ../../mod/mitem.php:166 ../../mod/mitem.php:210
msgid "Open link in new window"
@@ -8716,8 +8716,8 @@ msgid "Right offset of the aside element"
msgstr "Til høyre for sidestolpen"
#: ../../view/theme/redbasic/php/config.php:82
-msgid "Light (Red Matrix default)"
-msgstr "Lys (Red Matrix standard)"
+msgid "Light (Hubzilla default)"
+msgstr "Lys (Hubzilla standard)"
#: ../../view/theme/redbasic/php/config.php:101
msgid "Select scheme"
@@ -8855,8 +8855,8 @@ msgstr "Oppdateringsfeil ved %s"
#: ../../boot.php:1527
msgid ""
-"Create an account to access services and applications within the Red Matrix"
-msgstr "Lag en konto for å få tilgang til tjenester og programmer i Red Matrix"
+"Create an account to access services and applications within the Hubzilla"
+msgstr "Lag en konto for å få tilgang til tjenester og programmer i Hubzilla"
#: ../../boot.php:1555
msgid "Password"
diff --git a/view/nb-no/strings.php b/view/nb-no/strings.php
index df6ff8bc7..02d843938 100644
--- a/view/nb-no/strings.php
+++ b/view/nb-no/strings.php
@@ -567,7 +567,7 @@ $a->strings["Open the selected location in a different window or browser tab"] =
$a->strings["User '%s' deleted"] = "Brukeren '%s' er slettet";
$a->strings["Attachments:"] = "Vedlegg:";
$a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A";
-$a->strings["Redmatrix event notification:"] = "RedMatrix hendelsesvarsling:";
+$a->strings["Hubzilla event notification:"] = "Hubzilla hendelsesvarsling:";
$a->strings["Starts:"] = "Starter:";
$a->strings["Finishes:"] = "Slutter:";
$a->strings["Logout"] = "Logg ut";
@@ -660,8 +660,8 @@ $a->strings["Unable to verify site signature for %s"] = "Ikke i stand til å bek
$a->strings["Logged out."] = "Logget ut.";
$a->strings["Failed authentication"] = "Mislykket autentisering";
$a->strings["Login failed."] = "Innlogging mislyktes.";
-$a->strings["Red Matrix Notification"] = "Red Matrix-varsling";
-$a->strings["redmatrix"] = "redmatrix";
+$a->strings["Hubzilla Notification"] = "Hubzilla-varsling";
+$a->strings["hubzilla"] = "hubzilla";
$a->strings["Thank You,"] = "Tusen takk,";
$a->strings["%s Administrator"] = "%s administrator";
$a->strings["%s <!item_type!>"] = "%s <!item_type!>";
@@ -1096,7 +1096,7 @@ $a->strings["is interested in:"] = "er interessert i:";
$a->strings["No matches"] = "Ingen treff";
$a->strings["Item not available."] = "Elementet er ikke tilgjengelig.";
$a->strings["Fetching URL returns error: %1\$s"] = "Henting av URL gir følgende feil: %1\$s";
-$a->strings["Red Matrix - &quot;The Network&quot;"] = "Red Matrix - &quot;Nettverket&quot;";
+$a->strings["Hubzilla - &quot;The Network&quot;"] = "Hubzilla - &quot;Nettverket&quot;";
$a->strings["Welcome to %s"] = "Velkommen til %s";
$a->strings["Image uploaded but image cropping failed."] = "Bildet ble lastet opp, men beskjæring av bildet mislyktes.";
$a->strings["Image resize failed."] = "Endring av bildestørrelse mislyktes.";
@@ -1120,7 +1120,7 @@ $a->strings["Channel not found."] = "Kanalen ble ikke funnet.";
$a->strings["Page not found."] = "Siden ikke funnet.";
$a->strings["Like/Dislike"] = "Liker/Liker ikke";
$a->strings["This action is restricted to members."] = "Denne handlingen er begrenset til medlemmer.";
-$a->strings["Please <a href=\"rmagic\">login with your RedMatrix ID</a> or <a href=\"register\">register as a new RedMatrix member</a> to continue."] = "Vennligst <a href=\"rmagic\">logg inn med din RedMatrix ID</a> eller <a href=\"register\">registrer deg som et nytt RedMatrix-medlem</a> for å fortsette";
+$a->strings["Please <a href=\"rmagic\">login with your Hubzilla ID</a> or <a href=\"register\">register as a new Redmatrix.member</a> to continue."] = "Vennligst <a href=\"rmagic\">logg inn med din Hubzilla ID</a> eller <a href=\"register\">registrer deg som et nytt Redmatrix.medlem</a> for å fortsette";
$a->strings["Invalid request."] = "Ugyldig forespørsel.";
$a->strings["thing"] = "ting";
$a->strings["Channel unavailable."] = "Kanalen er utilgjengelig.";
@@ -1159,7 +1159,7 @@ $a->strings["Title:"] = "Tittel:";
$a->strings["Share this event"] = "Del denne hendelsen";
$a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s følger %2\$s sin %3\$s";
$a->strings["Public Sites"] = "Offentlige nettsteder";
-$a->strings["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."] = "Nettstedene på listen tillater offentlig registrering i Red Matrix. Alle nettsteder i matrix er forbundet så medlemskap på enhver av dem formidler medlemskap i hele matrix. Noen nettsteder kan kreve abonnement eller tilby lagdelte tjenesteavtaler. Tilbyderlenkene <strong>kan</strong> gi tilleggsopplysninger.";
+$a->strings["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."] = "Nettstedene på listen tillater offentlig registrering i Hubzilla. Alle nettsteder i matrix er forbundet så medlemskap på enhver av dem formidler medlemskap i hele matrix. Noen nettsteder kan kreve abonnement eller tilby lagdelte tjenesteavtaler. Tilbyderlenkene <strong>kan</strong> gi tilleggsopplysninger.";
$a->strings["Rate this hub"] = "Vurder denne hubben";
$a->strings["Site URL"] = "Nettstedets URL";
$a->strings["Access Type"] = "Tilgangstype";
@@ -1247,7 +1247,7 @@ $a->strings["Currently blocked"] = "For øyeblikket blokkert";
$a->strings["Currently ignored"] = "For øyeblikket ignorert";
$a->strings["Currently archived"] = "For øyeblikket arkivert";
$a->strings["Currently pending"] = "For øyeblikket ventende";
-$a->strings["RedMatrix channel"] = "RedMatrix-kanal";
+$a->strings["Hubzilla channel"] = "Hubzilla-kanal";
$a->strings["Collection created."] = "Samling opprettet.";
$a->strings["Could not create collection."] = "Kunne ikke lage samling.";
$a->strings["Collection updated."] = "Samlingen er oppdatert.";
@@ -1264,17 +1264,17 @@ $a->strings["Version %s"] = "Versjon %s";
$a->strings["Installed plugins/addons/apps:"] = "Installerte tilleggsfunksjoner/tillegg/apper:";
$a->strings["No installed plugins/addons/apps"] = "Ingen installerte tilleggsfunksjoner/tillegg/apper";
$a->strings["Red"] = "Red";
-$a->strings["This is a hub of the Red Matrix - a global cooperative network of decentralized privacy enhanced websites."] = "Dette er en hub i Red Matrix - et globalt kooperativt nettverk av desentraliserte personvernforsterkede nettsteder.";
+$a->strings["This is a hub of the Hubzilla - a global cooperative network of decentralized privacy enhanced websites."] = "Dette er en hub i Hubzilla - et globalt kooperativt nettverk av desentraliserte personvernforsterkede nettsteder.";
$a->strings["Tag: "] = "Merkelapp:";
$a->strings["Last background fetch: "] = "Siste innhenting i bakgrunnen:";
$a->strings["Running at web location"] = "Kjører på webplasseringen";
-$a->strings["Please visit <a href=\"https://redmatrix.me\">RedMatrix.me</a> to learn more about the Red Matrix."] = "Vennligst besøk <a href=\"https://redmatrix.me\">RedMatrix.me</a> for å lære mer om RedMatrix.";
+$a->strings["Please visit <a href=\"https://redmatrix.me\">Redmatrix.me</a> to learn more about the Hubzilla."] = "Vennligst besøk <a href=\"https://redmatrix.me\">Redmatrix.me</a> for å lære mer om Hubzilla.";
$a->strings["Bug reports and issues: please visit"] = "Feilmeldinger og feilretting: vennligst besøk";
-$a->strings["Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"] = "Forslag, ros og så videre - vennligst e-post \"redmatrix\" hos librelist - punktum com";
+$a->strings["Suggestions, praise, etc. - please email \"hubzilla\" at librelist - dot com"] = "Forslag, ros og så videre - vennligst e-post \"hubzilla\" hos librelist - punktum com";
$a->strings["Site Administrators"] = "Nettstedsadministratorer";
$a->strings["Help:"] = "Hjelp:";
$a->strings["Not Found"] = "Ikke funnet";
-$a->strings["Red Matrix Server - Setup"] = "Red Matrix tjener - oppsett";
+$a->strings["Hubzilla Server - Setup"] = "Hubzilla tjener - oppsett";
$a->strings["Could not connect to database."] = "Fikk ikke kontakt med databasen.";
$a->strings["Could not connect to specified site URL. Possible SSL certificate or DNS issue."] = "Fikk ikke kontakt med det angitte nettstedets URL. Problemet kan muligens skyldes SSL-sertifikatet eller DNS.";
$a->strings["Could not create table."] = "Kunne ikke lage tabellen.";
@@ -1284,7 +1284,7 @@ $a->strings["Please see the file \"install/INSTALL.txt\"."] = "Vennligst les fil
$a->strings["System check"] = "Systemsjekk";
$a->strings["Check again"] = "Sjekk igjen";
$a->strings["Database connection"] = "Databaseforbindelse";
-$a->strings["In order to install Red Matrix we need to know how to connect to your database."] = "For å installere Red Matrix må du oppgi hvordan din database kan kontaktes.";
+$a->strings["In order to install Hubzilla we need to know how to connect to your database."] = "For å installere Hubzilla må du oppgi hvordan din database kan kontaktes.";
$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Vennligst kontakt din nettstedstilbyder eller nettstedsadministrator hvis du har spørsmål om disse innstillingene.";
$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "Databasen du oppgir nedenfor må finnes på forhånd. Hvis den ikke finnes, vennligst lag den før du fortsetter.";
$a->strings["Database Server Name"] = "Navn på databasetjener";
@@ -1398,7 +1398,7 @@ $a->strings["block"] = "byggekloss";
$a->strings["layout"] = "layout";
$a->strings["%s element installed"] = "%s element installert";
$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s merket %3\$s til %2\$s med %4\$s";
-$a->strings["RedMatrix - Guests: Username: {your email address}, Password: +++"] = "RedMatrix - gjester: brukernavn: {din e-postadresse}, passord: +++";
+$a->strings["Hubzilla - Guests: Username: {your email address}, Password: +++"] = "Hubzilla - gjester: brukernavn: {din e-postadresse}, passord: +++";
$a->strings["Unable to locate original post."] = "Ikke i stand til å finne opprinnelig innlegg.";
$a->strings["Empty post discarded."] = "Tomt innlegg forkastet.";
$a->strings["Executable content type not permitted to this channel."] = "Kjørbar innholdstype er ikke tillat for denne kanalen.";
@@ -1513,10 +1513,10 @@ $a->strings["You have no more invitations available"] = "Du har ikke flere invit
$a->strings["Send invitations"] = "Send invitasjoner";
$a->strings["Enter email addresses, one per line:"] = "Skriv e-postadresser, en per linje:";
$a->strings["Your message:"] = "Din melding:";
-$a->strings["Please join my community on RedMatrix."] = "Du er velkommen til å bli med i mitt fellesskap på RedMatrix.";
+$a->strings["Please join my community on Hubzilla."] = "Du er velkommen til å bli med i mitt fellesskap på Hubzilla.";
$a->strings["You will need to supply this invitation code: "] = "Du må oppgi denne invitasjonskoden:";
-$a->strings["1. Register at any RedMatrix location (they are all inter-connected)"] = "1. Registrer ved enhver RedMatrix-lokasjon (de er alle forbundet med hverandre)";
-$a->strings["2. Enter my RedMatrix network address into the site searchbar."] = "2. Skriv inn min RedMatrix-adresse i nettstedets søkefelt.";
+$a->strings["1. Register at any Hubzilla location (they are all inter-connected)"] = "1. Registrer ved enhver Hubzilla-lokasjon (de er alle forbundet med hverandre)";
+$a->strings["2. Enter my Hubzilla network address into the site searchbar."] = "2. Skriv inn min Hubzilla-adresse i nettstedets søkefelt.";
$a->strings["or visit "] = "eller besøk";
$a->strings["3. Click [Connect]"] = "3. Klikk [Forbindelse]";
$a->strings["Location not found."] = "Plassering er ikke funnet.";
@@ -1946,7 +1946,7 @@ $a->strings["New Menu Element"] = "Nytt menyelement";
$a->strings["Menu Item Permissions"] = "Menyelement Tillatelser";
$a->strings["Link text"] = "Lenketekst";
$a->strings["URL of link"] = "URL-en til lenken";
-$a->strings["Use RedMatrix magic-auth if available"] = "Bruk RedMatrixs magiske-autentisering hvis tilgjengelig";
+$a->strings["Use Hubzilla magic-auth if available"] = "Bruk Hubzillas magiske-autentisering hvis tilgjengelig";
$a->strings["Open link in new window"] = "Åpne lenke i nytt vindu";
$a->strings["Order in list"] = "Ordne i liste";
$a->strings["Higher numbers will sink to bottom of listing"] = "Høyere tall vil synke mot bunnen av listen";
@@ -2066,7 +2066,7 @@ $a->strings["Right offset of the section element"] = "Til høyre for seksjonsele
$a->strings["Section width"] = "Seksjonsbredde";
$a->strings["Left offset of the aside"] = "Til venstre for sidestolpen";
$a->strings["Right offset of the aside element"] = "Til høyre for sidestolpen";
-$a->strings["Light (Red Matrix default)"] = "Lys (Red Matrix standard)";
+$a->strings["Light (Hubzilla default)"] = "Lys (Hubzilla standard)";
$a->strings["Select scheme"] = "Velg skjema";
$a->strings["Narrow navbar"] = "Smal navigasjonslinje";
$a->strings["Navigation bar background color"] = "Navigasjonslinjens bakgrunnsfarge";
@@ -2100,7 +2100,7 @@ $a->strings["Set size of conversation author photo"] = "Angi størrelsen for sam
$a->strings["Set size of followup author photos"] = "Angi størrelsen på forfatterbilder ved oppfølging";
$a->strings["Update %s failed. See error logs."] = "Oppdatering %s mislyktes. Se feilloggen.";
$a->strings["Update Error at %s"] = "Oppdateringsfeil ved %s";
-$a->strings["Create an account to access services and applications within the Red Matrix"] = "Lag en konto for å få tilgang til tjenester og programmer i Red Matrix";
+$a->strings["Create an account to access services and applications within the Hubzilla"] = "Lag en konto for å få tilgang til tjenester og programmer i Hubzilla";
$a->strings["Password"] = "Passord";
$a->strings["Remember me"] = "Husk meg";
$a->strings["Forgot your password?"] = "Glemt passordet ditt?";
diff --git a/view/nb-no/update_fail_eml.tpl b/view/nb-no/update_fail_eml.tpl
index a7df8fc2f..61f44b1e6 100644
--- a/view/nb-no/update_fail_eml.tpl
+++ b/view/nb-no/update_fail_eml.tpl
@@ -1,7 +1,7 @@
Hey,
I'm the web server at {{$sitename}};
-The Red Matrix 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 Red developer if you can not figure out how to
diff --git a/view/nl/messages.po b/view/nl/messages.po
index e04503dbc..1c8420890 100644
--- a/view/nl/messages.po
+++ b/view/nl/messages.po
@@ -96,6 +96,7 @@ 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"
@@ -260,8 +261,8 @@ 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:61
-#: ../../mod/settings.php:649 ../../mod/webpages.php:180
+#: ../../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
@@ -271,24 +272,24 @@ msgstr "Nieuwe pagina"
msgid "Edit"
msgstr "Bewerken"
-#: ../../include/page_widgets.php:39 ../../mod/webpages.php:186
+#: ../../include/page_widgets.php:39 ../../mod/webpages.php:185
#: ../../mod/blocks.php:158 ../../mod/layouts.php:187
msgid "View"
msgstr "Weergeven"
#: ../../include/page_widgets.php:40 ../../include/ItemObject.php:677
-#: ../../include/conversation.php:1155 ../../mod/webpages.php:187
+#: ../../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
msgid "Preview"
msgstr "Voorvertoning"
-#: ../../include/page_widgets.php:41 ../../mod/webpages.php:188
+#: ../../include/page_widgets.php:41 ../../mod/webpages.php:187
msgid "Actions"
msgstr "Acties"
-#: ../../include/page_widgets.php:42 ../../mod/webpages.php:189
+#: ../../include/page_widgets.php:42 ../../mod/webpages.php:188
msgid "Page Link"
msgstr "Paginalink"
@@ -296,12 +297,12 @@ msgstr "Paginalink"
msgid "Title"
msgstr "Titel"
-#: ../../include/page_widgets.php:44 ../../mod/webpages.php:191
+#: ../../include/page_widgets.php:44 ../../mod/webpages.php:190
#: ../../mod/blocks.php:149 ../../mod/layouts.php:180
msgid "Created"
msgstr "Aangemaakt"
-#: ../../include/page_widgets.php:45 ../../mod/webpages.php:192
+#: ../../include/page_widgets.php:45 ../../mod/webpages.php:191
#: ../../mod/blocks.php:150 ../../mod/layouts.php:181
msgid "Edited"
msgstr "Bewerkt"
@@ -443,10 +444,10 @@ msgid "Describe (optional)"
msgstr "Omschrijving (optioneel)"
#: ../../include/js_strings.php:22 ../../include/ItemObject.php:668
-#: ../../mod/settings.php:587 ../../mod/settings.php:689
-#: ../../mod/settings.php:715 ../../mod/settings.php:743
-#: ../../mod/settings.php:766 ../../mod/settings.php:848
-#: ../../mod/settings.php:1044 ../../mod/xchan.php:11 ../../mod/connect.php:93
+#: ../../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
@@ -455,9 +456,9 @@ msgstr "Omschrijving (optioneel)"
#: ../../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/admin.php:446
-#: ../../mod/admin.php:810 ../../mod/admin.php:946 ../../mod/admin.php:1077
-#: ../../mod/admin.php:1271 ../../mod/admin.php:1356 ../../mod/mitem.php:237
+#: ../../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
@@ -606,7 +607,7 @@ msgid "Shared"
msgstr "Gedeeld"
#: ../../include/RedDAV/RedBrowser.php:256
-#: ../../include/RedDAV/RedBrowser.php:306 ../../mod/webpages.php:179
+#: ../../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
msgid "Create"
@@ -618,8 +619,8 @@ msgstr "Aanmaken"
msgid "Upload"
msgstr "Uploaden"
-#: ../../include/RedDAV/RedBrowser.php:264 ../../mod/settings.php:589
-#: ../../mod/settings.php:615 ../../mod/admin.php:953
+#: ../../include/RedDAV/RedBrowser.php:264 ../../mod/settings.php:584
+#: ../../mod/settings.php:610 ../../mod/admin.php:953
#: ../../mod/sharedwithme.php:95
msgid "Name"
msgstr "Naam"
@@ -638,7 +639,7 @@ msgstr "Laatst gewijzigd"
#: ../../include/RedDAV/RedBrowser.php:270 ../../include/ItemObject.php:120
#: ../../include/conversation.php:660 ../../include/apps.php:255
-#: ../../mod/settings.php:650 ../../mod/webpages.php:182
+#: ../../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
@@ -660,7 +661,7 @@ msgstr "Bestand uploaden"
msgid "%1$s's bookmarks"
msgstr "Bladwijzers van %1$s"
-#: ../../include/network.php:635
+#: ../../include/network.php:632
msgid "view full size"
msgstr "volledige grootte tonen"
@@ -1006,9 +1007,9 @@ msgstr "Familie"
#: ../../include/widgets.php:429 ../../include/identity.php:394
#: ../../include/identity.php:395 ../../include/identity.php:402
-#: ../../include/profile_selectors.php:80 ../../mod/settings.php:344
-#: ../../mod/settings.php:348 ../../mod/settings.php:349
-#: ../../mod/settings.php:352 ../../mod/settings.php:363
+#: ../../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
msgid "Friends"
msgstr "Vrienden"
@@ -1110,13 +1111,12 @@ msgid "Public Hubs"
msgstr "Openbare hubs"
#: ../../include/enotify.php:58
-msgid "$Projectname Notification"
-msgstr "$Projectname-notificatie"
+msgid "Red Matrix Notification"
+msgstr "RedMatrix-notificatie"
-#: ../../include/enotify.php:59 ../../include/diaspora.php:2461
-#: ../../mod/p.php:46
-msgid "$projectname"
-msgstr "$projectname"
+#: ../../include/enotify.php:59
+msgid "redmatrix"
+msgstr "RedMatrix"
#: ../../include/enotify.php:61
msgid "Thank You,"
@@ -1679,8 +1679,8 @@ msgid "Attachments:"
msgstr "Bijlagen:"
#: ../../include/bb2diaspora.php:453
-msgid "$Projectname event notification:"
-msgstr "Notificatie -gebeurtenis:"
+msgid "Redmatrix event notification:"
+msgstr "Notificatie RedMatrix-gebeurtenis:"
#: ../../include/text.php:329
msgid "prev"
@@ -2100,7 +2100,7 @@ msgid "Your bookmarks"
msgstr "Jouw bladwijzers"
#: ../../include/nav.php:113 ../../include/conversation.php:1645
-#: ../../include/apps.php:136 ../../mod/webpages.php:177
+#: ../../include/apps.php:136 ../../mod/webpages.php:176
msgid "Webpages"
msgstr "Webpagina's"
@@ -2340,6 +2340,49 @@ 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
@@ -2398,7 +2441,7 @@ msgstr "Item niet gevonden."
#: ../../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:569 ../../mod/api.php:26 ../../mod/api.php:31
+#: ../../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
@@ -2416,17 +2459,17 @@ msgstr "Item niet gevonden."
#: ../../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/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/mitem.php:115 ../../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:82 ../../mod/bookmarks.php:46 ../../mod/channel.php:100
+#: ../../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
@@ -2648,7 +2691,7 @@ msgstr "oneens"
#: ../../include/conversation.php:573 ../../mod/photos.php:985
msgctxt "title"
msgid "Abstain"
-msgstr "onthouding"
+msgstr "onthoudingen"
#: ../../include/conversation.php:574 ../../mod/photos.php:986
msgctxt "title"
@@ -2801,7 +2844,7 @@ msgstr "Waar bevind je je op dit moment?"
msgid "Expires YYYY-MM-DD HH:MM"
msgstr "Verloopt op DD-MM-YYYY om HH:MM"
-#: ../../include/conversation.php:1174 ../../mod/webpages.php:181
+#: ../../include/conversation.php:1174 ../../mod/webpages.php:180
#: ../../mod/blocks.php:153 ../../mod/photos.php:949 ../../mod/layouts.php:183
msgid "Share"
msgstr "Delen"
@@ -2928,8 +2971,8 @@ msgstr "Verloopdatum instellen"
msgid "OK"
msgstr "OK"
-#: ../../include/conversation.php:1239 ../../mod/settings.php:588
-#: ../../mod/settings.php:614 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134
+#: ../../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
msgid "Cancel"
@@ -3066,49 +3109,6 @@ msgid_plural "Abstains"
msgstr[0] "onthouding"
msgstr[1] "onthoudingen"
-#: ../../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/photos.php:94
#, php-format
msgid "Image exceeds website size limit of %lu bytes"
@@ -3433,7 +3433,7 @@ msgstr "Gebeurtenissen deze week:"
msgid "Profile"
msgstr "Profiel"
-#: ../../include/identity.php:1115 ../../mod/settings.php:1050
+#: ../../include/identity.php:1115 ../../mod/settings.php:1045
msgid "Full Name:"
msgstr "Volledige naam:"
@@ -3820,7 +3820,7 @@ msgid "Profile Photo"
msgstr "Profielfoto"
#: ../../include/apps.php:247 ../../mod/settings.php:84
-#: ../../mod/settings.php:613
+#: ../../mod/settings.php:608
msgid "Update"
msgstr "Bijwerken"
@@ -3852,26 +3852,6 @@ msgstr "Chatkanaal niet gevonden"
msgid "Room is full"
msgstr "Chatkanaal is vol"
-#: ../../include/diaspora.php:2433
-msgid "Please choose"
-msgstr "Maak een keuze"
-
-#: ../../include/diaspora.php:2435
-msgid "Agree"
-msgstr "Eens"
-
-#: ../../include/diaspora.php:2437
-msgid "Disagree"
-msgstr "Oneens"
-
-#: ../../include/diaspora.php:2439
-msgid "Abstain"
-msgstr "onthouding"
-
-#: ../../include/diaspora.php:2472
-msgid "projectname"
-msgstr "projectname"
-
#: ../../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."
@@ -3923,43 +3903,43 @@ msgstr "Naam is vereist"
msgid "Key and Secret are required"
msgstr "Key en secret zijn vereist"
-#: ../../mod/settings.php:129
+#: ../../mod/settings.php:124
msgid "Diaspora Policy Settings updated."
msgstr "Beleidsinstellingen Diaspora bijgewerkt."
-#: ../../mod/settings.php:237
+#: ../../mod/settings.php:232
msgid "Passwords do not match. Password unchanged."
msgstr "Wachtwoorden komen niet overeen. Wachtwoord onveranderd."
-#: ../../mod/settings.php:241
+#: ../../mod/settings.php:236
msgid "Empty passwords are not allowed. Password unchanged."
msgstr "Lege wachtwoorden zijn niet toegestaan. Wachtwoord onveranderd."
-#: ../../mod/settings.php:255
+#: ../../mod/settings.php:250
msgid "Password changed."
msgstr "Wachtwoord veranderd."
-#: ../../mod/settings.php:257
+#: ../../mod/settings.php:252
msgid "Password update failed. Please try again."
msgstr "Bijwerken wachtwoord mislukt. Probeer opnieuw."
-#: ../../mod/settings.php:271
+#: ../../mod/settings.php:266
msgid "Not valid email."
msgstr "Geen geldig e-mailadres."
-#: ../../mod/settings.php:274
+#: ../../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:283
+#: ../../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:522
+#: ../../mod/settings.php:517
msgid "Settings updated."
msgstr "Instellingen bijgewerkt."
-#: ../../mod/settings.php:578 ../../mod/api.php:106 ../../mod/photos.php:556
+#: ../../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
@@ -3967,7 +3947,7 @@ msgstr "Instellingen bijgewerkt."
msgid "No"
msgstr "Nee"
-#: ../../mod/settings.php:578 ../../mod/api.php:105 ../../mod/photos.php:556
+#: ../../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
@@ -3975,537 +3955,537 @@ msgstr "Nee"
msgid "Yes"
msgstr "Ja"
-#: ../../mod/settings.php:586 ../../mod/settings.php:612
-#: ../../mod/settings.php:648
+#: ../../mod/settings.php:581 ../../mod/settings.php:607
+#: ../../mod/settings.php:643
msgid "Add application"
msgstr "Applicatie toevoegen"
-#: ../../mod/settings.php:589
+#: ../../mod/settings.php:584
msgid "Name of application"
msgstr "Naam van applicatie"
-#: ../../mod/settings.php:590 ../../mod/settings.php:616
+#: ../../mod/settings.php:585 ../../mod/settings.php:611
msgid "Consumer Key"
msgstr "Consumer key"
-#: ../../mod/settings.php:590 ../../mod/settings.php:591
+#: ../../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:591 ../../mod/settings.php:617
+#: ../../mod/settings.php:586 ../../mod/settings.php:612
msgid "Consumer Secret"
msgstr "Consumer secret"
-#: ../../mod/settings.php:592 ../../mod/settings.php:618
+#: ../../mod/settings.php:587 ../../mod/settings.php:613
msgid "Redirect"
msgstr "Redirect/doorverwijzing"
-#: ../../mod/settings.php:592
+#: ../../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:593 ../../mod/settings.php:619
+#: ../../mod/settings.php:588 ../../mod/settings.php:614
msgid "Icon url"
msgstr "URL van pictogram"
-#: ../../mod/settings.php:593
+#: ../../mod/settings.php:588
msgid "Optional"
msgstr "Optioneel"
-#: ../../mod/settings.php:604
+#: ../../mod/settings.php:599
msgid "You can't edit this application."
msgstr "Je kan deze applicatie niet bewerken"
-#: ../../mod/settings.php:647
+#: ../../mod/settings.php:642
msgid "Connected Apps"
msgstr "Verbonden applicaties"
-#: ../../mod/settings.php:651
+#: ../../mod/settings.php:646
msgid "Client key starts with"
msgstr "Client key begint met"
-#: ../../mod/settings.php:652
+#: ../../mod/settings.php:647
msgid "No name"
msgstr "Geen naam"
-#: ../../mod/settings.php:653
+#: ../../mod/settings.php:648
msgid "Remove authorization"
msgstr "Autorisatie verwijderen"
-#: ../../mod/settings.php:667
+#: ../../mod/settings.php:662
msgid "No feature settings configured"
msgstr "Geen extra functie- of plugin-instellingen"
-#: ../../mod/settings.php:683
+#: ../../mod/settings.php:678
msgid "Feature/Addon Settings"
msgstr "Extra functie- en plugin-instellingen"
-#: ../../mod/settings.php:685
+#: ../../mod/settings.php:680
msgid "Settings for the built-in Diaspora emulator"
msgstr "Instellingen voor de ingebouwde Diaspora-emulator"
-#: ../../mod/settings.php:686
+#: ../../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:687
+#: ../../mod/settings.php:682
msgid "Diaspora Policy Settings"
msgstr "Beleidsinstellingen Diaspora"
-#: ../../mod/settings.php:688
+#: ../../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:712
+#: ../../mod/settings.php:707
msgid "Account Settings"
msgstr "Account-instellingen"
-#: ../../mod/settings.php:713
+#: ../../mod/settings.php:708
msgid "Enter New Password:"
msgstr "Nieuw wachtwoord invoeren:"
-#: ../../mod/settings.php:714
+#: ../../mod/settings.php:709
msgid "Confirm New Password:"
msgstr "Nieuw wachtwoord bevestigen:"
-#: ../../mod/settings.php:714
+#: ../../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:716 ../../mod/settings.php:1051
+#: ../../mod/settings.php:711 ../../mod/settings.php:1046
msgid "Email Address:"
msgstr "E-mailadres:"
-#: ../../mod/settings.php:717 ../../mod/removeaccount.php:61
+#: ../../mod/settings.php:712 ../../mod/removeaccount.php:61
msgid "Remove Account"
msgstr "Account verwijderen"
-#: ../../mod/settings.php:718
+#: ../../mod/settings.php:713
msgid "Remove this account including all its channels"
msgstr "Dit account en al zijn kanalen verwijderen"
-#: ../../mod/settings.php:734
+#: ../../mod/settings.php:729
msgid "Off"
msgstr "Uit"
-#: ../../mod/settings.php:734
+#: ../../mod/settings.php:729
msgid "On"
msgstr "Aan"
-#: ../../mod/settings.php:741
+#: ../../mod/settings.php:736
msgid "Additional Features"
msgstr "Extra functies"
-#: ../../mod/settings.php:765
+#: ../../mod/settings.php:760
msgid "Connector Settings"
msgstr "Instellingen externe koppelingen"
-#: ../../mod/settings.php:804
+#: ../../mod/settings.php:799
msgid "No special theme for mobile devices"
msgstr "Geen speciaal thema voor mobiele apparaten"
-#: ../../mod/settings.php:807
+#: ../../mod/settings.php:802
#, php-format
msgid "%s - (Experimental)"
msgstr "%s - (experimenteel)"
-#: ../../mod/settings.php:810 ../../mod/admin.php:396
+#: ../../mod/settings.php:805 ../../mod/admin.php:396
msgid "mobile"
msgstr "mobiel"
-#: ../../mod/settings.php:846
+#: ../../mod/settings.php:841
msgid "Display Settings"
msgstr "Weergave-instellingen"
-#: ../../mod/settings.php:852
+#: ../../mod/settings.php:847
msgid "Display Theme:"
msgstr "Gebruik thema:"
-#: ../../mod/settings.php:853
+#: ../../mod/settings.php:848
msgid "Mobile Theme:"
msgstr "Mobiel thema:"
-#: ../../mod/settings.php:854
+#: ../../mod/settings.php:849
msgid "Enable user zoom on mobile devices"
msgstr "Inzoomen op smartphones en tablets toestaan"
-#: ../../mod/settings.php:855
+#: ../../mod/settings.php:850
msgid "Update browser every xx seconds"
msgstr "Ververs de webbrowser om de zoveel seconde"
-#: ../../mod/settings.php:855
+#: ../../mod/settings.php:850
msgid "Minimum of 10 seconds, no maximum"
msgstr "Minimaal 10 seconde, geen maximum"
-#: ../../mod/settings.php:856
+#: ../../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:856
+#: ../../mod/settings.php:851
msgid "Maximum of 100 items"
msgstr "Maximaal 100 conversaties"
-#: ../../mod/settings.php:857
+#: ../../mod/settings.php:852
msgid "Show emoticons (smilies) as images"
msgstr "Toon emoticons (smilies) als afbeeldingen"
-#: ../../mod/settings.php:858
+#: ../../mod/settings.php:853
msgid "Link post titles to source"
msgstr "Berichtkoppen naar originele locatie linken"
-#: ../../mod/settings.php:859
+#: ../../mod/settings.php:854
msgid "System Page Layout Editor - (advanced)"
msgstr "Lay-out bewerken van systeempagina's (geavanceerd)"
-#: ../../mod/settings.php:862
+#: ../../mod/settings.php:857
msgid "Use blog/list mode on channel page"
msgstr "Gebruik blog/lijst-modus op kanaalpagina"
-#: ../../mod/settings.php:862 ../../mod/settings.php:863
+#: ../../mod/settings.php:857 ../../mod/settings.php:858
msgid "(comments displayed separately)"
msgstr "(reacties worden afzonderlijk weergeven)"
-#: ../../mod/settings.php:863
+#: ../../mod/settings.php:858
msgid "Use blog/list mode on matrix page"
msgstr "Gebruik blog/lijst-modus op matrixpagina"
-#: ../../mod/settings.php:864
+#: ../../mod/settings.php:859
msgid "Channel page max height of content (in pixels)"
msgstr "Maximale hoogte berichtinhoud op kanaalpagina (in pixels)"
-#: ../../mod/settings.php:864 ../../mod/settings.php:865
+#: ../../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:865
+#: ../../mod/settings.php:860
msgid "Matrix page max height of content (in pixels)"
msgstr "Maximale hoogte berichtinhoud op matrixpagina (in pixels)"
-#: ../../mod/settings.php:899
+#: ../../mod/settings.php:894
msgid "Nobody except yourself"
msgstr "Niemand, behalve jezelf"
-#: ../../mod/settings.php:900
+#: ../../mod/settings.php:895
msgid "Only those you specifically allow"
msgstr "Alleen connecties met uitdrukkelijke toestemming"
-#: ../../mod/settings.php:901
+#: ../../mod/settings.php:896
msgid "Approved connections"
msgstr "Geaccepteerde connecties"
-#: ../../mod/settings.php:902
+#: ../../mod/settings.php:897
msgid "Any connections"
msgstr "Alle connecties"
-#: ../../mod/settings.php:903
+#: ../../mod/settings.php:898
msgid "Anybody on this website"
msgstr "Iedereen op deze hub"
-#: ../../mod/settings.php:904
+#: ../../mod/settings.php:899
msgid "Anybody in this network"
msgstr "Iedereen in dit netwerk"
-#: ../../mod/settings.php:905
+#: ../../mod/settings.php:900
msgid "Anybody authenticated"
msgstr "Geauthenticeerd"
-#: ../../mod/settings.php:906
+#: ../../mod/settings.php:901
msgid "Anybody on the internet"
msgstr "Iedereen op het internet"
-#: ../../mod/settings.php:980
+#: ../../mod/settings.php:975
msgid "Publish your default profile in the network directory"
msgstr "Publiceer je standaardprofiel in de kanalengids"
-#: ../../mod/settings.php:985
+#: ../../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:989 ../../mod/profile_photo.php:366
+#: ../../mod/settings.php:984 ../../mod/profile_photo.php:366
msgid "or"
msgstr "of"
-#: ../../mod/settings.php:994
+#: ../../mod/settings.php:989
msgid "Your channel address is"
msgstr "Jouw kanaaladres is"
-#: ../../mod/settings.php:1042
+#: ../../mod/settings.php:1037
msgid "Channel Settings"
msgstr "Kanaal-instellingen"
-#: ../../mod/settings.php:1049
+#: ../../mod/settings.php:1044
msgid "Basic Settings"
msgstr "Basis-instellingen"
-#: ../../mod/settings.php:1052
+#: ../../mod/settings.php:1047
msgid "Your Timezone:"
msgstr "Jouw tijdzone:"
-#: ../../mod/settings.php:1053
+#: ../../mod/settings.php:1048
msgid "Default Post Location:"
msgstr "Standaardlocatie bericht:"
-#: ../../mod/settings.php:1053
+#: ../../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:1054
+#: ../../mod/settings.php:1049
msgid "Use Browser Location:"
msgstr "Locatie van webbrowser gebruiken:"
-#: ../../mod/settings.php:1056
+#: ../../mod/settings.php:1051
msgid "Adult Content"
msgstr "Inhoud voor volwassenen"
-#: ../../mod/settings.php:1056
+#: ../../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:1058
+#: ../../mod/settings.php:1053
msgid "Security and Privacy Settings"
msgstr "Veiligheids- en privacy-instellingen"
-#: ../../mod/settings.php:1060
+#: ../../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:1062
+#: ../../mod/settings.php:1057
msgid "Hide my online presence"
msgstr "Verberg mijn aanwezigheid"
-#: ../../mod/settings.php:1062
+#: ../../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:1064
+#: ../../mod/settings.php:1059
msgid "Simple Privacy Settings:"
msgstr "Eenvoudige privacy-instellingen:"
-#: ../../mod/settings.php:1065
+#: ../../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:1066
+#: ../../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:1067
+#: ../../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:1068
+#: ../../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:1070
+#: ../../mod/settings.php:1065
msgid "Allow others to tag your posts"
msgstr "Anderen toestaan om je berichten te taggen"
-#: ../../mod/settings.php:1070
+#: ../../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:1072
+#: ../../mod/settings.php:1067
msgid "Advanced Privacy Settings"
msgstr "Geavanceerde privacy-instellingen"
-#: ../../mod/settings.php:1074
+#: ../../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:1074
+#: ../../mod/settings.php:1069
msgid "0 or blank prevents expiration"
msgstr "0 of leeg voorkomt het verlopen"
-#: ../../mod/settings.php:1075
+#: ../../mod/settings.php:1070
msgid "Maximum Friend Requests/Day:"
msgstr "Maximum aantal connectieverzoeken per dag:"
-#: ../../mod/settings.php:1075
+#: ../../mod/settings.php:1070
msgid "May reduce spam activity"
msgstr "Kan eventuele spam verminderen"
-#: ../../mod/settings.php:1076
+#: ../../mod/settings.php:1071
msgid "Default Post Permissions"
msgstr "Standaard permissies voor nieuwe berichten"
-#: ../../mod/settings.php:1077 ../../mod/mitem.php:159 ../../mod/mitem.php:229
+#: ../../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:1081
+#: ../../mod/settings.php:1076
msgid "Channel permissions category:"
msgstr "Kanaaltype en -permissies:"
-#: ../../mod/settings.php:1087
+#: ../../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:1087
+#: ../../mod/settings.php:1082
msgid "Useful to reduce spamming"
msgstr "Kan eventuele spam verminderen"
-#: ../../mod/settings.php:1090
+#: ../../mod/settings.php:1085
msgid "Notification Settings"
msgstr "Notificatie-instellingen"
-#: ../../mod/settings.php:1091
+#: ../../mod/settings.php:1086
msgid "By default post a status message when:"
msgstr "Plaats automatisch een statusbericht wanneer:"
-#: ../../mod/settings.php:1092
+#: ../../mod/settings.php:1087
msgid "accepting a friend request"
msgstr "Een connectieverzoek wordt geaccepteerd"
-#: ../../mod/settings.php:1093
+#: ../../mod/settings.php:1088
msgid "joining a forum/community"
msgstr "Je lid wordt van een forum/groep"
-#: ../../mod/settings.php:1094
+#: ../../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:1095
+#: ../../mod/settings.php:1090
msgid "Send a notification email when:"
msgstr "Verzend een notificatie per e-mail wanneer:"
-#: ../../mod/settings.php:1096
+#: ../../mod/settings.php:1091
msgid "You receive a connection request"
msgstr "Je een connectieverzoek ontvangt"
-#: ../../mod/settings.php:1097
+#: ../../mod/settings.php:1092
msgid "Your connections are confirmed"
msgstr "Jouw connecties zijn bevestigd"
-#: ../../mod/settings.php:1098
+#: ../../mod/settings.php:1093
msgid "Someone writes on your profile wall"
msgstr "Iemand iets op jouw kanaal heeft geschreven"
-#: ../../mod/settings.php:1099
+#: ../../mod/settings.php:1094
msgid "Someone writes a followup comment"
msgstr "Iemand een reactie schrijft"
-#: ../../mod/settings.php:1100
+#: ../../mod/settings.php:1095
msgid "You receive a private message"
msgstr "Je een privé-bericht ontvangt"
-#: ../../mod/settings.php:1101
+#: ../../mod/settings.php:1096
msgid "You receive a friend suggestion"
msgstr "Je een kanaalvoorstel ontvangt"
-#: ../../mod/settings.php:1102
+#: ../../mod/settings.php:1097
msgid "You are tagged in a post"
msgstr "Je expliciet in een bericht bent genoemd"
-#: ../../mod/settings.php:1103
+#: ../../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:1106
+#: ../../mod/settings.php:1101
msgid "Show visual notifications including:"
msgstr "Toon de volgende zichtbare notificaties:"
-#: ../../mod/settings.php:1108
+#: ../../mod/settings.php:1103
msgid "Unseen matrix activity"
msgstr "Niet bekeken matrix-activiteit"
-#: ../../mod/settings.php:1109
+#: ../../mod/settings.php:1104
msgid "Unseen channel activity"
msgstr "Niet bekeken kanaal-activiteit"
-#: ../../mod/settings.php:1110
+#: ../../mod/settings.php:1105
msgid "Unseen private messages"
msgstr "Niet bekeken privéberichten"
-#: ../../mod/settings.php:1110 ../../mod/settings.php:1115
-#: ../../mod/settings.php:1116 ../../mod/settings.php:1117
+#: ../../mod/settings.php:1105 ../../mod/settings.php:1110
+#: ../../mod/settings.php:1111 ../../mod/settings.php:1112
msgid "Recommended"
msgstr "Aanbevolen"
-#: ../../mod/settings.php:1111
+#: ../../mod/settings.php:1106
msgid "Upcoming events"
msgstr "Aankomende gebeurtenissen"
-#: ../../mod/settings.php:1112
+#: ../../mod/settings.php:1107
msgid "Events today"
msgstr "Gebeurtissen van vandaag"
-#: ../../mod/settings.php:1113
+#: ../../mod/settings.php:1108
msgid "Upcoming birthdays"
msgstr "Aankomende verjaardagen"
-#: ../../mod/settings.php:1113
+#: ../../mod/settings.php:1108
msgid "Not available in all themes"
msgstr "Niet in alle thema's beschikbaar"
-#: ../../mod/settings.php:1114
+#: ../../mod/settings.php:1109
msgid "System (personal) notifications"
msgstr "(Persoonlijke) systeemnotificaties"
-#: ../../mod/settings.php:1115
+#: ../../mod/settings.php:1110
msgid "System info messages"
msgstr "Systeemmededelingen"
-#: ../../mod/settings.php:1116
+#: ../../mod/settings.php:1111
msgid "System critical alerts"
msgstr "Kritische systeemwaarschuwingen"
-#: ../../mod/settings.php:1117
+#: ../../mod/settings.php:1112
msgid "New connections"
msgstr "Nieuwe connecties"
-#: ../../mod/settings.php:1118
+#: ../../mod/settings.php:1113
msgid "System Registrations"
msgstr "Nieuwe accountregistraties op deze hub"
-#: ../../mod/settings.php:1119
+#: ../../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/settings.php:1121
+#: ../../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/settings.php:1121
+#: ../../mod/settings.php:1116
msgid "Must be greater than 0"
msgstr "Moet hoger dan 0 zijn"
-#: ../../mod/settings.php:1123
+#: ../../mod/settings.php:1118
msgid "Advanced Account/Page Type Settings"
msgstr "Instellingen geavanceerd account/paginatype"
-#: ../../mod/settings.php:1124
+#: ../../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/settings.php:1127
+#: ../../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/settings.php:1128
+#: ../../mod/settings.php:1123
msgid "Miscellaneous Settings"
msgstr "Diverse instellingen"
-#: ../../mod/settings.php:1130
+#: ../../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/settings.php:1131 ../../mod/removeme.php:61
+#: ../../mod/settings.php:1126 ../../mod/removeme.php:61
msgid "Remove Channel"
msgstr "Kanaal verwijderen"
-#: ../../mod/settings.php:1132
+#: ../../mod/settings.php:1127
msgid "Remove this channel."
msgstr "Verwijder dit kanaal."
@@ -4539,7 +4519,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:190
+#: ../../mod/webpages.php:189
msgid "Page Title"
msgstr "Paginatitel"
@@ -4667,14 +4647,14 @@ msgstr "Ding aan je profiel toevoegen"
msgid "Item not available."
msgstr "Item is niet aanwezig."
-#: ../../mod/probe.php:24 ../../mod/probe.php:30
+#: ../../mod/probe.php:23 ../../mod/probe.php:29
#, php-format
msgid "Fetching URL returns error: %1$s"
msgstr "Ophalen URL gaf een foutmelding terug: %1$s"
-#: ../../mod/home.php:53 ../../mod/siteinfo.php:155
-msgid "$Projectname"
-msgstr "$Projectname"
+#: ../../mod/home.php:53
+msgid "Red Matrix - &quot;The Network&quot;"
+msgstr "RedMatrix - &quot;The Network&quot;"
#: ../../mod/home.php:124
#, php-format
@@ -4757,12 +4737,12 @@ msgstr "Verkleinen [%s] van afbeelding mislukt."
msgid "Invalid item."
msgstr "Ongeldig item."
-#: ../../mod/block.php:39 ../../mod/wall_upload.php:29 ../../mod/page.php:49
+#: ../../mod/block.php:39 ../../mod/wall_upload.php:29 ../../mod/page.php:45
msgid "Channel not found."
msgstr "Kanaal niet gevonden."
#: ../../mod/block.php:75 ../../mod/help.php:79 ../../mod/display.php:106
-#: ../../mod/page.php:85 ../../index.php:241
+#: ../../mod/page.php:82 ../../index.php:241
msgid "Page not found."
msgstr "Pagina niet gevonden."
@@ -4776,9 +4756,9 @@ msgstr "Deze actie kan alleen door $Projectname-leden worden uitgevoerd."
#: ../../mod/like.php:21
msgid ""
-"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."
+"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."
#: ../../mod/like.php:101 ../../mod/like.php:128 ../../mod/like.php:166
msgid "Invalid request."
@@ -4943,12 +4923,12 @@ 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."
+"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."
#: ../../mod/pubsites.php:25
msgid "Rate this hub"
@@ -4987,8 +4967,8 @@ msgid "Edit post"
msgstr "Bericht bewerken"
#: ../../mod/dav.php:121
-msgid "$Projectname channel"
-msgstr "$Projectname-kanaal"
+msgid "RedMatrix channel"
+msgstr "RedMatrix-kanaal"
#: ../../mod/group.php:20
msgid "Collection created."
@@ -5051,11 +5031,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:156
msgid ""
-"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."
+"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."
#: ../../mod/siteinfo.php:158
msgid "Tag: "
@@ -5072,8 +5056,8 @@ msgstr "Draaiend op weblocatie"
#: ../../mod/siteinfo.php:164
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."
+" about the Red Matrix."
+msgstr "Bezoek <a href=\"https://redmatrix.me\">RedMatrix.me</a> om meer over de RedMatrix te leren."
#: ../../mod/siteinfo.php:165
msgid "Bug reports and issues: please visit"
@@ -5083,7 +5067,7 @@ msgstr "Bugrapporten en andere kwesties: bezoek"
msgid ""
"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot "
"com"
-msgstr "Voorstellen, lofbetuigingen, enz. - e-mail \"redmatrix\" at librelist - punt - com"
+msgstr "Voorstellen, lofbetuigingen, enz. - e-mail \"redmatrix\" at librelist - dot com"
#: ../../mod/siteinfo.php:170
msgid "Site Administrators"
@@ -5098,8 +5082,8 @@ msgid "Not Found"
msgstr "Niet gevonden"
#: ../../mod/setup.php:166
-msgid "$Projectname Server - Setup"
-msgstr "$Projectname Server - Setup"
+msgid "Red Matrix Server - Setup"
+msgstr "RedMatrix Server - Setup"
#: ../../mod/setup.php:172
msgid "Could not connect to database."
@@ -5143,9 +5127,9 @@ msgstr "Database connection"
#: ../../mod/setup.php:290
msgid ""
-"In order to install $Projectname we need to know how to connect to your "
+"In order to install Red Matrix 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."
+msgstr "In order to install RedMatrix we need to know how to connect to your database."
#: ../../mod/setup.php:291
msgid ""
@@ -5605,8 +5589,8 @@ 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/cloud.php:120
-msgid "$Projectname - Guests: Username: {your email address}, Password: +++"
-msgstr "$Projectname - gasttoegang: Accountnaam: {jouw e-mailadres}, wachtwoord: +++"
+msgid "RedMatrix - Guests: Username: {your email address}, Password: +++"
+msgstr "RedMatrix - gasttoegang: Toegangsnaam: {jouw e-mailadres}, wachtwoord: +++"
#: ../../mod/photos.php:77
msgid "Page owner information could not be retrieved."
@@ -6166,21 +6150,20 @@ msgid "Your message:"
msgstr "Jouw bericht:"
#: ../../mod/invite.php:132
-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."
+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."
#: ../../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 $Projectname location (they are all inter-connected)"
-msgstr "1. Registreer je op een willekeurige $Projectname-hub (ze zijn allemaal onderling met elkaar verbonden):"
+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):"
#: ../../mod/invite.php:137
-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:"
+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:"
#: ../../mod/invite.php:138
msgid "or visit "
@@ -6776,6 +6759,114 @@ 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/mitem.php:74
+msgid "Unable to update menu element."
+msgstr "Menu-onderdeel kan niet worden geüpdatet."
+
+#: ../../mod/mitem.php:89
+msgid "Unable to add menu element."
+msgstr "Menu-onderdeel kan niet worden toegevoegd."
+
+#: ../../mod/mitem.php:151 ../../mod/mitem.php:220
+msgid "Menu Item Permissions"
+msgstr "Permissies menu-item"
+
+#: ../../mod/mitem.php:154 ../../mod/mitem.php:168
+msgid "Link Name"
+msgstr "Linknaam"
+
+#: ../../mod/mitem.php:155 ../../mod/mitem.php:169
+msgid "Link Target"
+msgstr "Linkdoel"
+
+#: ../../mod/mitem.php:156 ../../mod/mitem.php:226
+msgid "Use RedMatrix magic-auth if available"
+msgstr "Gebruik RedMatrix' magic-auth wanneer beschikbaar"
+
+#: ../../mod/mitem.php:157 ../../mod/mitem.php:227
+msgid "Open link in new window"
+msgstr "Open link in nieuw venster"
+
+#: ../../mod/mitem.php:158 ../../mod/mitem.php:228
+msgid "Order in list"
+msgstr "Volgorde in lijst"
+
+#: ../../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/mitem.php:159
+msgid "Submit and finish"
+msgstr "Opslaan en afsluiten"
+
+#: ../../mod/mitem.php:160
+msgid "Submit and continue"
+msgstr "Opslaan en doorgaan"
+
+#: ../../mod/mitem.php:166
+msgid "Menu:"
+msgstr "Menu:"
+
+#: ../../mod/mitem.php:172
+msgid "Edit menu"
+msgstr "Menu bewerken"
+
+#: ../../mod/mitem.php:175
+msgid "Edit element"
+msgstr "Onderdeel bewerken"
+
+#: ../../mod/mitem.php:176
+msgid "Drop element"
+msgstr "Onderdeel verwijderen"
+
+#: ../../mod/mitem.php:177
+msgid "New element"
+msgstr "Nieuw element"
+
+#: ../../mod/mitem.php:178
+msgid "Edit this menu container"
+msgstr "Deze menu-container bewerken"
+
+#: ../../mod/mitem.php:179
+msgid "Add menu element"
+msgstr "Menu-element toevoegen"
+
+#: ../../mod/mitem.php:180
+msgid "Delete this menu item"
+msgstr "Dit menu-item verwijderen"
+
+#: ../../mod/mitem.php:181
+msgid "Edit this menu item"
+msgstr "Dit menu-item bewerken"
+
+#: ../../mod/mitem.php:198
+msgid "Menu item not found."
+msgstr "Menu-item niet gevonden."
+
+#: ../../mod/mitem.php:209
+msgid "Menu item deleted."
+msgstr "Menu-item verwijderd."
+
+#: ../../mod/mitem.php:211
+msgid "Menu item could not be deleted."
+msgstr "Menu-item kon niet worden verwijderd."
+
+#: ../../mod/mitem.php:218
+msgid "Edit Menu Element"
+msgstr "Menu-element bewerken"
+
+#: ../../mod/mitem.php:224
+msgid "Link text"
+msgstr "Linktekst"
+
+#: ../../mod/mitem.php:225
+msgid "URL of link"
+msgstr "URL of link"
+
#: ../../mod/openid.php:26
msgid "OpenID protocol error. No ID returned."
msgstr "OpenID-protocolfout. Geen ID terugontvangen."
@@ -7883,118 +7974,6 @@ msgstr "Verwijder conversatie"
msgid "D, d M Y - g:i A"
msgstr "D, j M Y - G:i"
-#: ../../mod/mitem.php:51
-msgid "Unable to create element."
-msgstr "Niet in staat om onderdeel aan te maken."
-
-#: ../../mod/mitem.php:74
-msgid "Unable to update menu element."
-msgstr "Menu-onderdeel kan niet worden geüpdatet."
-
-#: ../../mod/mitem.php:89
-msgid "Unable to add menu element."
-msgstr "Menu-onderdeel kan niet worden toegevoegd."
-
-#: ../../mod/mitem.php:158 ../../mod/mitem.php:228
-msgid "Menu Item Permissions"
-msgstr "Permissies menu-item"
-
-#: ../../mod/mitem.php:161 ../../mod/mitem.php:176
-msgid "Link Name"
-msgstr "Linknaam"
-
-#: ../../mod/mitem.php:162 ../../mod/mitem.php:233
-msgid "Link or Submenu Target"
-msgstr "Linkdoel of submenu-doel"
-
-#: ../../mod/mitem.php:162
-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:163 ../../mod/mitem.php:234
-msgid "Use magic-auth if available"
-msgstr "Gebruik magic-auth wanneer beschikbaar"
-
-#: ../../mod/mitem.php:164 ../../mod/mitem.php:235
-msgid "Open link in new window"
-msgstr "Open link in nieuw venster"
-
-#: ../../mod/mitem.php:165 ../../mod/mitem.php:236
-msgid "Order in list"
-msgstr "Volgorde in lijst"
-
-#: ../../mod/mitem.php:165 ../../mod/mitem.php:236
-msgid "Higher numbers will sink to bottom of listing"
-msgstr "Hogere nummers komen onderaan de lijst terecht"
-
-#: ../../mod/mitem.php:166
-msgid "Submit and finish"
-msgstr "Opslaan en afsluiten"
-
-#: ../../mod/mitem.php:167
-msgid "Submit and continue"
-msgstr "Opslaan en doorgaan"
-
-#: ../../mod/mitem.php:174
-msgid "Menu:"
-msgstr "Menu:"
-
-#: ../../mod/mitem.php:177
-msgid "Link Target"
-msgstr "Linkdoel"
-
-#: ../../mod/mitem.php:180
-msgid "Edit menu"
-msgstr "Menu bewerken"
-
-#: ../../mod/mitem.php:183
-msgid "Edit element"
-msgstr "Onderdeel bewerken"
-
-#: ../../mod/mitem.php:184
-msgid "Drop element"
-msgstr "Onderdeel verwijderen"
-
-#: ../../mod/mitem.php:185
-msgid "New element"
-msgstr "Nieuw element"
-
-#: ../../mod/mitem.php:186
-msgid "Edit this menu container"
-msgstr "Deze menu-container bewerken"
-
-#: ../../mod/mitem.php:187
-msgid "Add menu element"
-msgstr "Menu-element toevoegen"
-
-#: ../../mod/mitem.php:188
-msgid "Delete this menu item"
-msgstr "Dit menu-item verwijderen"
-
-#: ../../mod/mitem.php:189
-msgid "Edit this menu item"
-msgstr "Dit menu-item bewerken"
-
-#: ../../mod/mitem.php:206
-msgid "Menu item not found."
-msgstr "Menu-item niet gevonden."
-
-#: ../../mod/mitem.php:217
-msgid "Menu item deleted."
-msgstr "Menu-item verwijderd."
-
-#: ../../mod/mitem.php:219
-msgid "Menu item could not be deleted."
-msgstr "Menu-item kon niet worden verwijderd."
-
-#: ../../mod/mitem.php:226
-msgid "Edit Menu Element"
-msgstr "Menu-element bewerken"
-
-#: ../../mod/mitem.php:232
-msgid "Link text"
-msgstr "Linktekst"
-
#: ../../mod/mood.php:131
msgid "Set your current mood and tell your friends"
msgstr "Noteer je huidige stemming en toon het aan je connecties"
@@ -8586,7 +8565,7 @@ msgstr "Connectie: "
msgid "Invalid connection."
msgstr "Ongeldige connectie."
-#: ../../mod/page.php:122
+#: ../../mod/page.php:119
msgid "Ipsum Lorem"
msgstr "Lorem ipsum"
diff --git a/view/nl/strings.php b/view/nl/strings.php
index e081f4667..ce98c8a3d 100644
--- a/view/nl/strings.php
+++ b/view/nl/strings.php
@@ -544,6 +544,15 @@ $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.";
@@ -604,7 +613,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"] = "onthouding";
+$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";
@@ -720,15 +729,6 @@ $a->strings["__ctx:noun__ Abstain"] = array(
0 => "onthouding",
1 => "onthoudingen",
);
-$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["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";
@@ -1600,6 +1600,33 @@ $a->strings["Rating: "] = "Waardering: ";
$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["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(
@@ -1866,34 +1893,6 @@ $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["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 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["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";
diff --git a/view/pt-br/htconfig.tpl b/view/pt-br/htconfig.tpl
index 096143798..cc4087f96 100644
--- a/view/pt-br/htconfig.tpl
+++ b/view/pt-br/htconfig.tpl
@@ -30,7 +30,7 @@ $default_timezone = '{{$timezone}}';
// What is your site name?
$a->config['system']['baseurl'] = '{{$siteurl}}';
-$a->config['system']['sitename'] = "Red Matrix";
+$a->config['system']['sitename'] = "Hubzilla";
$a->config['system']['location_hash'] = '{{$site_id}}';
// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
diff --git a/view/pt-br/messages.po b/view/pt-br/messages.po
index 0d0fec778..029642f9b 100644
--- a/view/pt-br/messages.po
+++ b/view/pt-br/messages.po
@@ -1,24 +1,24 @@
-# 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:
# Frederico Gonçalves Guimarães <frederico@teia.bio.br>, 2011
# Frederico Gonçalves Guimarães <frederico@teia.bio.br>, 2011
-# gabrielfedel <fedel@fedel.net.br>, 2015
# Frederico Gonçalves Guimarães <frederico@teia.bio.br>, 2011,2013
# Frederico Gonçalves Guimarães <frederico@teia.bio.br>, 2013-2014
# Frederico Gonçalves Guimarães <frederico@teia.bio.br>, 2011
# FULL NAME <EMAIL@ADDRESS>, 2011
-# Iske Solstag <solstag@member.fsf.org>, 2014-2015
-# Sérgio Lima <oigreslima@gmail.com>, 2014-2015
+# Iske Solstag <solstag@member.fsf.org>, 2014
+# Sérgio Lima <oigreslima@gmail.com>, 2014
# tony baldwin <tonybaldwin@gmx.com>, 2014
msgid ""
msgstr ""
-"Project-Id-Version: Redmatrix\n"
+"Project-Id-Version: Hubzilla\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-05-22 00:03-0700\n"
"PO-Revision-Date: 2015-05-28 18:53+0000\n"
+
"Last-Translator: Iske Solstag <solstag@member.fsf.org>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/red-matrix/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
@@ -27,14 +27,15 @@ msgstr ""
"Language: pt_BR\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: ../../include/dba/dba_driver.php:141
+#: ../../include/dba/dba_driver.php:50
#, php-format
msgid "Cannot locate DNS info for database server '%s'"
msgstr "Não foi possível localizar a informação de DNS para o servidor de banco de dados '%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
+#: ../../include/photo/photo_driver.php:653 ../../include/photos.php:51
+#: ../../mod/photos.php:91 ../../mod/photos.php:660 ../../mod/photos.php:682
+#: ../../mod/profile_photo.php:142 ../../mod/profile_photo.php:301
+#: ../../mod/profile_photo.php:423
msgid "Profile Photos"
msgstr "Fotos do perfil"
@@ -2091,72 +2092,70 @@ msgstr "Notificação de evento em $Projectname:"
msgid "Logout"
msgstr "Sair"
-#: ../../include/nav.php:87 ../../include/nav.php:120
-msgid "End this session"
-msgstr "Encerrar essa sessão"
+#: ../../include/reddav.php:1346
+msgid "Upload file"
+msgstr "Enviar arquivo"
-#: ../../include/nav.php:90 ../../include/nav.php:151
-msgid "Home"
-msgstr "Ver canal"
+#: ../../include/reddav.php:1347 ../../mod/photos.php:1241
+#: ../../mod/profile_photo.php:361
+msgid "Upload"
+msgstr "Enviar"
-#: ../../include/nav.php:90
-msgid "Your posts and conversations"
-msgstr "Suas publicações e conversas"
+#: ../../include/chat.php:10
+msgid "Missing room name"
+msgstr "Nome da sala vazio"
-#: ../../include/nav.php:91 ../../include/conversation.php:942
-#: ../../mod/connedit.php:494 ../../mod/connedit.php:660
-msgid "View Profile"
-msgstr "Ver perfil"
+#: ../../include/chat.php:19
+msgid "Duplicate room name"
+msgstr "Nome da sala duplicado"
-#: ../../include/nav.php:91
-msgid "Your profile page"
-msgstr "A página do seu perfil"
+#: ../../include/chat.php:68 ../../include/chat.php:76
+msgid "Invalid room specifier."
+msgstr "Especificador de sala inválido."
-#: ../../include/nav.php:93
-msgid "Edit Profiles"
-msgstr "Editar perfis"
+#: ../../include/chat.php:105
+msgid "Room not found."
+msgstr "A sala não foi encontrada."
-#: ../../include/nav.php:93
-msgid "Manage/Edit profiles"
-msgstr "Administrar/Editar perfis"
+#: ../../include/chat.php:126
+msgid "Room is full"
+msgstr "A sala está cheia"
-#: ../../include/nav.php:95 ../../include/identity.php:846
-msgid "Edit Profile"
-msgstr "Editar perfil"
+#: ../../include/features.php:23
+msgid "General Features"
+msgstr "Recursos gerais"
-#: ../../include/nav.php:95
-msgid "Edit your profile"
-msgstr "Editar seu perfil"
+#: ../../include/features.php:25
+msgid "Content Expiration"
+msgstr "Expiração de conteúdo"
-#: ../../include/nav.php:97 ../../include/conversation.php:1600
-#: ../../include/apps.php:139 ../../mod/fbrowser.php:25
-msgid "Photos"
-msgstr "Fotos"
+#: ../../include/features.php:25
+msgid "Remove posts/comments and/or private messages at a future time"
+msgstr "Remover publicações/comentários e/ou mensagens privadas num momento futuro."
-#: ../../include/nav.php:97
-msgid "Your photos"
-msgstr "Suas fotos"
+#: ../../include/features.php:26
+msgid "Multiple Profiles"
+msgstr "Múltiplos perfis"
-#: ../../include/nav.php:98
-msgid "Your files"
-msgstr "Seus arquivos"
+#: ../../include/features.php:26
+msgid "Ability to create multiple profiles"
+msgstr "Possibilidade de criar múltiplos perfis"
-#: ../../include/nav.php:103 ../../include/apps.php:146
-msgid "Chat"
-msgstr "Bate-papo"
+#: ../../include/features.php:27
+msgid "Advanced Profiles"
+msgstr "Perfis avançados"
-#: ../../include/nav.php:103
-msgid "Your chatrooms"
-msgstr "Suas salas de bate-papo"
+#: ../../include/features.php:27
+msgid "Additional profile sections and selections"
+msgstr "Seções e seleções adicionais no perfil"
-#: ../../include/nav.php:109 ../../include/conversation.php:1635
-#: ../../include/apps.php:129
-msgid "Bookmarks"
-msgstr "Marcadores"
+#: ../../include/features.php:28
+msgid "Profile Import/Export"
+msgstr "Importar/exportar perfis"
-#: ../../include/nav.php:109
-msgid "Your bookmarks"
-msgstr "Seus links guardados"
+#: ../../include/features.php:28
+msgid "Save and load profile details across sites/channels"
+msgstr "Salvar e carregar detalhes de perfis entre sites/canais"
#: ../../include/nav.php:113 ../../include/conversation.php:1645
#: ../../include/apps.php:136 ../../mod/webpages.php:177
@@ -2171,237 +2170,238 @@ msgstr "Suas páginas web"
msgid "Login"
msgstr "Entrar"
-#: ../../include/nav.php:117
-msgid "Sign in"
-msgstr "Entrar"
+#: ../../include/features.php:30
+msgid "Private Notes"
+msgstr "Notas privadas"
-#: ../../include/nav.php:134
-#, php-format
-msgid "%s - click to logout"
-msgstr "%s - clique para sair"
+#: ../../include/features.php:30
+msgid "Enables a tool to store notes and reminders"
+msgstr "Habilita uma ferramenta para guardar notas e lembretes"
-#: ../../include/nav.php:137
-msgid "Remote authentication"
-msgstr "Autenticação remota"
+#: ../../include/features.php:34
+msgid "Navigation Channel Select"
+msgstr "Seletor de canais na navegação"
-#: ../../include/nav.php:137
-msgid "Click to authenticate to your home hub"
-msgstr "Clique para se autenticar com seu hub de origem"
+#: ../../include/features.php:34
+msgid "Change channels directly from within the navigation dropdown menu"
+msgstr "Trocar canais diretamente a partir do menu expansível na navegação"
-#: ../../include/nav.php:151
-msgid "Home Page"
-msgstr "Página inicial"
+#: ../../include/features.php:38
+msgid "Extended Identity Sharing"
+msgstr "Compartilhamento estendido de identidade"
#: ../../include/nav.php:155 ../../mod/register.php:224 ../../boot.php:1526
msgid "Register"
msgstr "Registrar"
-#: ../../include/nav.php:155
-msgid "Create an account"
-msgstr "Criar uma conta"
+#: ../../include/features.php:39
+msgid "Expert Mode"
+msgstr "Modo Expert"
#: ../../include/nav.php:160 ../../include/apps.php:142 ../../mod/help.php:67
#: ../../mod/help.php:72 ../../mod/layouts.php:176
msgid "Help"
msgstr "Ajuda"
-#: ../../include/nav.php:160
-msgid "Help and documentation"
-msgstr "Ajuda e documentação"
+#: ../../include/features.php:40
+msgid "Premium Channel"
+msgstr "Canal premium"
-#: ../../include/nav.php:163
-msgid "Applications, utilities, links, games"
-msgstr "Aplicações, utilitários, links, jogos"
+#: ../../include/features.php:40
+msgid ""
+"Allows you to set restrictions and terms on those that connect with your "
+"channel"
+msgstr "Permite definir restrições e termos para aqueles que se conectarem ao seu canal"
-#: ../../include/nav.php:165
-msgid "Search site content"
-msgstr "Pesquisar o conteúdo do site"
+#: ../../include/features.php:45
+msgid "Post Composition Features"
+msgstr "Recursos de composição de publicações"
-#: ../../include/nav.php:168 ../../include/apps.php:141
-#: ../../mod/directory.php:366
-msgid "Directory"
-msgstr "Diretório"
+#: ../../include/features.php:47
+msgid "Use Markdown"
+msgstr "Usar Markdown"
-#: ../../include/nav.php:168
-msgid "Channel Directory"
-msgstr "Diretório de canais"
+#: ../../include/features.php:47
+msgid "Allow use of \"Markdown\" to format posts"
+msgstr "Permitir o uso de \"Markdown\" para formatar publicações"
-#: ../../include/nav.php:180 ../../include/apps.php:133
-msgid "Matrix"
-msgstr "Matrix"
+#: ../../include/features.php:48
+msgid "Post Preview"
+msgstr "Pré-visualizar a publicação"
-#: ../../include/nav.php:180
-msgid "Your matrix"
-msgstr "Sua matriz"
+#: ../../include/features.php:48
+msgid "Allow previewing posts and comments before publishing them"
+msgstr "Permite visualizar publicações e comentários antes de publicá-los"
-#: ../../include/nav.php:181
-msgid "Mark all matrix notifications seen"
-msgstr "Marcar todas as notificações da matriz como vistas"
+#: ../../include/features.php:49 ../../include/widgets.php:510
+#: ../../mod/sources.php:88
+msgid "Channel Sources"
+msgstr "Fontes do canal"
-#: ../../include/nav.php:183 ../../include/apps.php:137
-msgid "Channel Home"
-msgstr "Página inicial do canal"
+#: ../../include/features.php:49
+msgid "Automatically import channel content from other channels or feeds"
+msgstr "Importar automaticamente conteúdo de outros canais ou fontes"
-#: ../../include/nav.php:183
-msgid "Channel home"
-msgstr "Página inicial do canal"
+#: ../../include/features.php:50
+msgid "Even More Encryption"
+msgstr "Mais encriptação ainda"
-#: ../../include/nav.php:184
-msgid "Mark all channel notifications seen"
-msgstr "Marcar todas as notificações de canais como vistas"
+#: ../../include/features.php:50
+msgid ""
+"Allow optional encryption of content end-to-end with a shared secret key"
+msgstr "Permitir encriptação opcional de conteúdo, ponta-a-ponta com uma chave secreta compartilhada"
-#: ../../include/nav.php:187 ../../mod/connections.php:407
-msgid "Connections"
-msgstr "Conexões"
+#: ../../include/features.php:55
+msgid "Network and Stream Filtering"
+msgstr "Filtragem de rede e fluxo"
-#: ../../include/nav.php:190
-msgid "Notices"
-msgstr "Notificações"
+#: ../../include/features.php:56
+msgid "Search by Date"
+msgstr "Pesquisar por data"
-#: ../../include/nav.php:190
-msgid "Notifications"
-msgstr "Notificações"
+#: ../../include/features.php:56
+msgid "Ability to select posts by date ranges"
+msgstr "capacidade de selecionar publicações por intervalos de datas"
-#: ../../include/nav.php:191
-msgid "See all notifications"
-msgstr "Ver todas as notificações"
+#: ../../include/features.php:57
+msgid "Collections Filter"
+msgstr "Filtros de coleções"
-#: ../../include/nav.php:192 ../../mod/notifications.php:99
-msgid "Mark all system notifications seen"
-msgstr "Marcar todas as notificações de sistema como vistas"
+#: ../../include/features.php:57
+msgid "Enable widget to display Network posts only from selected collections"
+msgstr "Habilita widget para exibir publicações da rede apenas para determinadas coleções"
-#: ../../include/nav.php:194 ../../include/apps.php:143
-msgid "Mail"
-msgstr "Mensagens"
+#: ../../include/features.php:58 ../../include/widgets.php:272
+msgid "Saved Searches"
+msgstr "Pesquisas salvas"
-#: ../../include/nav.php:194
-msgid "Private mail"
-msgstr "Mensagens privadas"
+#: ../../include/features.php:58
+msgid "Save search terms for re-use"
+msgstr "Termos de pesquisa salvos para reutilização"
-#: ../../include/nav.php:195
-msgid "See all private messages"
-msgstr "Ver todas as mensagens privadas"
+#: ../../include/features.php:59
+msgid "Network Personal Tab"
+msgstr "Aba de interações na rede"
-#: ../../include/nav.php:196
-msgid "Mark all private messages seen"
-msgstr "Marcar todas as mensagens privadas como vistas"
+#: ../../include/features.php:59
+msgid "Enable tab to display only Network posts that you've interacted on"
+msgstr "Habilita uma aba para exibir apenas publicações da rede com as quais você interagiu"
-#: ../../include/nav.php:197
-msgid "Inbox"
-msgstr "Recebidas"
+#: ../../include/features.php:60
+msgid "Network New Tab"
+msgstr "Aba de novidades da rede"
-#: ../../include/nav.php:198
-msgid "Outbox"
-msgstr "Enviadas"
+#: ../../include/features.php:60
+msgid "Enable tab to display all new Network activity"
+msgstr "Habilita uma aba para exibir todas as novas atividades da rede"
-#: ../../include/nav.php:202 ../../include/apps.php:140
-#: ../../mod/events.php:472
-msgid "Events"
-msgstr "Eventos"
+#: ../../include/features.php:61
+msgid "Affinity Tool"
+msgstr "Ferramenta de afinidade"
-#: ../../include/nav.php:202
-msgid "Event Calendar"
-msgstr "Agenda de eventos"
+#: ../../include/features.php:61
+msgid "Filter stream activity by depth of relationships"
+msgstr "Filtra o fluxo de atividades de acordo com o nível do relacionamento"
-#: ../../include/nav.php:203
-msgid "See all events"
-msgstr "Ver todos os eventos"
+#: ../../include/features.php:62
+msgid "Suggest Channels"
+msgstr "Sugerir canais"
-#: ../../include/nav.php:204
-msgid "Mark all events seen"
-msgstr "Marcar todos os eventos como vistos"
+#: ../../include/features.php:62
+msgid "Show channel suggestions"
+msgstr "Exibir sugestões de canais"
-#: ../../include/nav.php:206 ../../include/apps.php:132
-#: ../../mod/manage.php:166
-msgid "Channel Manager"
-msgstr "Gerenciador de canais"
+#: ../../include/features.php:67
+msgid "Post/Comment Tools"
+msgstr "Ferramentas de publicação/comentário"
-#: ../../include/nav.php:206
-msgid "Manage Your Channels"
-msgstr "Gerencie os seus canais"
+#: ../../include/features.php:69
+msgid "Edit Sent Posts"
+msgstr "Editar publicações enviadas"
-#: ../../include/nav.php:208
-msgid "Account/Channel Settings"
-msgstr "Configurações da conta/canal"
+#: ../../include/features.php:69
+msgid "Edit and correct posts and comments after sending"
+msgstr "Edita e corrige publicações e comentários após terem sido enviados"
-#: ../../include/nav.php:216 ../../mod/admin.php:120
-msgid "Admin"
-msgstr "Admin"
+#: ../../include/features.php:70
+msgid "Tagging"
+msgstr "Etiquetagem"
-#: ../../include/nav.php:216
-msgid "Site Setup and Configuration"
-msgstr "Configuração do site"
+#: ../../include/features.php:70
+msgid "Ability to tag existing posts"
+msgstr "Possibilidade de colocar etiquetas em publicações existentes"
-#: ../../include/nav.php:247 ../../include/conversation.php:850
-msgid "Loading..."
-msgstr "Carregando..."
+#: ../../include/features.php:71
+msgid "Post Categories"
+msgstr "Categorizar publicações"
-#: ../../include/nav.php:252
-msgid "@name, #tag, content"
-msgstr "@nome, #etiqueta, conteúdo"
+#: ../../include/features.php:71
+msgid "Add categories to your posts"
+msgstr "Adiciona categorias às suas publicações"
-#: ../../include/nav.php:253
-msgid "Please wait..."
-msgstr "Por favor, aguarde..."
+#: ../../include/features.php:72
+msgid "Ability to file posts under folders"
+msgstr "Possibilidade de arquivar publicações em pastas"
-#: ../../include/taxonomy.php:222 ../../include/taxonomy.php:243
-msgid "Tags"
-msgstr "Etiquetas"
+#: ../../include/features.php:73
+msgid "Dislike Posts"
+msgstr "Desgostar de publicações"
-#: ../../include/taxonomy.php:287
-msgid "Keywords"
-msgstr "Palavras-chave"
+#: ../../include/features.php:73
+msgid "Ability to dislike posts/comments"
+msgstr "Possibilidade de desgostar de publicações/comentários"
-#: ../../include/taxonomy.php:308
-msgid "have"
-msgstr "tenho"
+#: ../../include/features.php:74
+msgid "Star Posts"
+msgstr "Destacar publicações"
-#: ../../include/taxonomy.php:308
-msgid "has"
-msgstr "tem"
+#: ../../include/features.php:74
+msgid "Ability to mark special posts with a star indicator"
+msgstr "Possibilidade de marcar publicações em destaque com uma estrela indicadora"
-#: ../../include/taxonomy.php:309
-msgid "want"
-msgstr "quero"
+#: ../../include/features.php:75
+msgid "Tag Cloud"
+msgstr "Nuvem de etiquetas"
-#: ../../include/taxonomy.php:309
-msgid "wants"
-msgstr "quer"
+#: ../../include/features.php:75
+msgid "Provide a personal tag cloud on your channel page"
+msgstr "Fornece uma nuvem de etiquetas pessoais à página do seu canal"
-#: ../../include/taxonomy.php:310
-msgid "likes"
-msgstr "gosta"
+#: ../../include/follow.php:26
+msgid "Channel is blocked on this site."
+msgstr "O canal está bloqueado neste site."
-#: ../../include/taxonomy.php:311
-msgid "dislikes"
-msgstr "desgosta"
+#: ../../include/follow.php:31
+msgid "Channel location missing."
+msgstr "A localização do canal foi perdida"
-#: ../../include/activities.php:39
-msgid " and "
-msgstr " e "
+#: ../../include/follow.php:80
+msgid "Response from remote channel was incomplete."
+msgstr "A resposta do canal remoto está incompleta."
-#: ../../include/activities.php:47
-msgid "public profile"
-msgstr "perfil público"
+#: ../../include/follow.php:97
+msgid "Channel was deleted and no longer exists."
+msgstr "O canal foi deletado e não existe mais."
-#: ../../include/activities.php:56
-#, php-format
-msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
-msgstr "%1$s mudou %2$s para &ldquo;%3$s&rdquo;"
+#: ../../include/follow.php:133 ../../include/follow.php:202
+msgid "Protocol disabled."
+msgstr "Protocolo desabilitado."
-#: ../../include/activities.php:57
-#, php-format
-msgid "Visit %1$s's %2$s"
-msgstr "Visite o %2$s de %1$s"
+#: ../../include/follow.php:176
+msgid "Channel discovery failed."
+msgstr "A descoberta de canais falhou."
-#: ../../include/activities.php:60
-#, php-format
-msgid "%1$s has an updated %2$s, changing %3$s."
-msgstr "%1$s atualizou %2$s, alterando %3$s."
+#: ../../include/follow.php:192
+msgid "local account not found."
+msgstr "a conta local não foi encontrada."
-#: ../../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
+#: ../../include/follow.php:219
+msgid "Cannot connect to yourself."
+msgstr "Não é possível conectar-se consigo mesmo."
+
+#: ../../include/items.php:375 ../../mod/profperm.php:23
+#: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/like.php:242
+#: ../../index.php:364
msgid "Permission denied"
msgstr "Permissão negada"
@@ -2411,7 +2411,7 @@ msgstr "(Desconhecido)"
#: ../../include/items.php:1234
msgid "Visible to anybody on the internet."
-msgstr "Visível para todos na internet."
+msgstr "Visívil para todos na internet."
#: ../../include/items.php:1236
msgid "Visible to you only."
@@ -2432,7 +2432,7 @@ msgstr "Visível para todos em %s."
#: ../../include/items.php:1244
msgid "Visible to all connections."
-msgstr "Visível para todas as conexões."
+msgstr "Visível para quaisquer conexões."
#: ../../include/items.php:1246
msgid "Visible to approved connections."
@@ -2593,22 +2593,21 @@ msgstr "Pode escrever em meu armazenamento de arquivos"
msgid "Can edit my webpages"
msgstr "Pode editar minhas páginas web"
-#: ../../include/permissions.php:46
-msgid "Can source my public posts in derived channels"
-msgstr "Pode usar minhas publicações públicas como fonte para canais derivados"
+#: ../../include/group.php:234
+msgid "Default privacy group for new contacts"
+msgstr "Grupo de privacidade padrão para novos contatos"
-#: ../../include/permissions.php:46
-msgid "Somewhat advanced - very useful in open communities"
-msgstr "Avançado - muito útil em comunidades abertas"
+#: ../../include/group.php:253 ../../mod/admin.php:737
+msgid "All Channels"
+msgstr "Todos os canais"
-#: ../../include/permissions.php:48
-msgid "Can administer my channel resources"
-msgstr "Pode administrar os recursos do meu canal"
+#: ../../include/group.php:275
+msgid "edit"
+msgstr "editar"
-#: ../../include/permissions.php:48
-msgid ""
-"Extremely advanced. Leave this alone unless you know what you are doing"
-msgstr "Extremamente avançado. Não mexa nisso a não ser que saiba o que está fazendo"
+#: ../../include/group.php:297
+msgid "Collections"
+msgstr "Coleções"
#: ../../include/permissions.php:893
msgid "Social Networking"
@@ -2659,61 +2658,52 @@ msgstr "Outro"
msgid "Custom/Expert Mode"
msgstr "Personalizado/Modo expert"
-#: ../../include/conversation.php:126 ../../mod/like.php:113
-msgid "channel"
-msgstr "canal"
+#: ../../include/identity.php:31 ../../mod/item.php:1312
+msgid "Unable to obtain identity information from database"
+msgstr "Não foi possível obter a informação da identidade a partir do banco de dados"
-#: ../../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 gosta de %3$s de %2$s"
+#: ../../include/identity.php:66
+msgid "Empty name"
+msgstr "O nome está em branco"
-#: ../../include/conversation.php:167 ../../mod/like.php:396
-#, php-format
-msgid "%1$s doesn't like %2$s's %3$s"
-msgstr "%1$s não gosta de %3$s de %2$s"
+#: ../../include/identity.php:68
+msgid "Name too long"
+msgstr "O nome é muito grande"
-#: ../../include/conversation.php:204
-#, php-format
-msgid "%1$s is now connected with %2$s"
-msgstr "%1$s agora está conectado com %2$s"
+#: ../../include/identity.php:169
+msgid "No account identifier"
+msgstr "Sem identificador de conta"
-#: ../../include/conversation.php:239
-#, php-format
-msgid "%1$s poked %2$s"
-msgstr "%1$s cutucou %2$s"
+#: ../../include/identity.php:181
+msgid "Nickname is required."
+msgstr "É necessário informar o apelido."
-#: ../../include/conversation.php:260 ../../mod/mood.php:63
-#, php-format
-msgctxt "mood"
-msgid "%1$s is %2$s"
-msgstr "%1$s está %2$s"
+#: ../../include/identity.php:195
+msgid "Reserved nickname. Please choose another."
+msgstr "Apelido reservado. Por favor escolha outro."
-#: ../../include/conversation.php:572 ../../mod/photos.php:984
-msgctxt "title"
-msgid "Likes"
-msgstr "Curtidas"
+#: ../../include/identity.php:200
+msgid ""
+"Nickname has unsupported characters or is already being used on this site."
+msgstr "O apelido possui caracteres não suportados ou já está sendo usado nesse site."
-#: ../../include/conversation.php:572 ../../mod/photos.php:984
-msgctxt "title"
-msgid "Dislikes"
-msgstr "Descurtidas"
+#: ../../include/identity.php:281
+msgid "Unable to retrieve created identity"
+msgstr "Não foi possível recuperar a identidade criada"
-#: ../../include/conversation.php:573 ../../mod/photos.php:985
-msgctxt "title"
-msgid "Agree"
-msgstr "Concordo"
+#: ../../include/identity.php:340
+msgid "Default Profile"
+msgstr "Perfil padrão"
-#: ../../include/conversation.php:573 ../../mod/photos.php:985
-msgctxt "title"
-msgid "Disagree"
-msgstr "Não concordo"
+#: ../../include/identity.php:379 ../../include/identity.php:380
+#: ../../include/identity.php:387 ../../include/widgets.php:407
+#: ../../include/profile_selectors.php:80 ../../mod/connedit.php:495
+msgid "Friends"
+msgstr "Amigos"
-#: ../../include/conversation.php:573 ../../mod/photos.php:985
-msgctxt "title"
-msgid "Abstain"
-msgstr "Abstenções"
+#: ../../include/identity.php:633
+msgid "Requested channel is not available."
+msgstr "Canal solicitado não está disponível."
#: ../../include/conversation.php:574 ../../mod/photos.php:986
msgctxt "title"
@@ -2730,224 +2720,205 @@ msgctxt "title"
msgid "Might attend"
msgstr "Talvez compareçam"
-#: ../../include/conversation.php:692
-#, php-format
-msgid "View %s's profile @ %s"
-msgstr "Ver o perfil de %s's @ %s"
+#: ../../include/identity.php:850
+msgid "Manage/edit profiles"
+msgstr "Administrar/editar perfis"
-#: ../../include/conversation.php:707
-msgid "Categories:"
-msgstr "Categorias:"
+#: ../../include/identity.php:851 ../../mod/profiles.php:751
+msgid "Create New Profile"
+msgstr "Criar um novo perfil"
-#: ../../include/conversation.php:708
-msgid "Filed under:"
-msgstr "Armazenado sob:"
+#: ../../include/identity.php:854 ../../include/nav.php:102
+msgid "Edit Profile"
+msgstr "Editar perfil"
-#: ../../include/conversation.php:735
-msgid "View in context"
-msgstr "Ver no contexto"
+#: ../../include/identity.php:865 ../../mod/profiles.php:762
+msgid "Profile Image"
+msgstr "Imagem do perfil"
-#: ../../include/conversation.php:846
-msgid "remove"
-msgstr "remover"
+#: ../../include/identity.php:868
+msgid "visible to everybody"
+msgstr "visível para todos"
-#: ../../include/conversation.php:851
-msgid "Delete Selected Items"
-msgstr "Excluir os itens selecionados"
+#: ../../include/identity.php:869 ../../mod/profiles.php:645
+#: ../../mod/profiles.php:766
+msgid "Edit visibility"
+msgstr "Editar a visibilidade"
-#: ../../include/conversation.php:939
-msgid "View Source"
-msgstr "Ver a fonte"
+#: ../../include/identity.php:883 ../../include/identity.php:1120
+#: ../../mod/directory.php:158
+msgid "Gender:"
+msgstr "Gênero:"
-#: ../../include/conversation.php:940
-msgid "Follow Thread"
-msgstr "Acompanhar a discussão"
+#: ../../include/identity.php:884 ../../include/identity.php:1164
+#: ../../mod/directory.php:160
+msgid "Status:"
+msgstr "Situação:"
-#: ../../include/conversation.php:941
-msgid "View Status"
-msgstr "Ver status"
+#: ../../include/identity.php:885 ../../include/identity.php:1175
+#: ../../mod/directory.php:162
+msgid "Homepage:"
+msgstr "Página web:"
-#: ../../include/conversation.php:943
-msgid "View Photos"
-msgstr "Ver fotos"
+#: ../../include/identity.php:886 ../../mod/dirprofile.php:151
+msgid "Online Now"
+msgstr "Online agora"
-#: ../../include/conversation.php:944
-msgid "Matrix Activity"
-msgstr "Atividade na matriz"
+#: ../../include/identity.php:964 ../../include/identity.php:1044
+#: ../../mod/ping.php:298
+msgid "g A l F d"
+msgstr "G l d F"
-#: ../../include/conversation.php:946
-msgid "Edit Contact"
-msgstr "Editar contato"
+#: ../../include/identity.php:965 ../../include/identity.php:1045
+msgid "F d"
+msgstr "F d"
-#: ../../include/conversation.php:947
-msgid "Send PM"
-msgstr "Enviar MP"
+#: ../../include/identity.php:1010 ../../include/identity.php:1085
+#: ../../mod/ping.php:320
+msgid "[today]"
+msgstr "[hoje]"
-#: ../../include/conversation.php:948 ../../include/apps.php:145
-msgid "Poke"
-msgstr "Cutucar"
+#: ../../include/identity.php:1022
+msgid "Birthday Reminders"
+msgstr "Lembres de aniversário"
-#: ../../include/conversation.php:1062
-#, php-format
-msgid "%s likes this."
-msgstr "%s gostou disso."
+#: ../../include/identity.php:1023
+msgid "Birthdays this week:"
+msgstr "Aniversários nesta semana:"
-#: ../../include/conversation.php:1062
-#, php-format
-msgid "%s doesn't like this."
-msgstr "%s não gostou disso."
+#: ../../include/identity.php:1078
+msgid "[No description]"
+msgstr "[Sem descrição]"
-#: ../../include/conversation.php:1066
-#, 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] "<span %1$s>%2$d pessoas</span> gostaram disso."
+#: ../../include/identity.php:1096
+msgid "Event Reminders"
+msgstr "Lembretes de eventos"
-#: ../../include/conversation.php:1068
-#, 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] "<span %1$s>%2$d pessoas</span> não gostaram disso."
+#: ../../include/identity.php:1097
+msgid "Events this week:"
+msgstr "Eventos nesta semana:"
-#: ../../include/conversation.php:1074
-msgid "and"
-msgstr "e"
+#: ../../include/identity.php:1118 ../../mod/settings.php:953
+msgid "Full Name:"
+msgstr "Nome completo:"
-#: ../../include/conversation.php:1077
-#, php-format
-msgid ", and %d other people"
-msgid_plural ", and %d other people"
-msgstr[0] ""
-msgstr[1] ", e mais %d outras pessoas"
+#: ../../include/identity.php:1125
+msgid "Like this channel"
+msgstr "Gostar deste canal"
-#: ../../include/conversation.php:1078
-#, php-format
-msgid "%s like this."
-msgstr "%s gostou disso."
+#: ../../include/identity.php:1149
+msgid "j F, Y"
+msgstr "j \\d\\e F, Y"
-#: ../../include/conversation.php:1078
-#, php-format
-msgid "%s don't like this."
-msgstr "%s não gostou disso."
+#: ../../include/identity.php:1150
+msgid "j F"
+msgstr "j \\d\\e F"
-#: ../../include/conversation.php:1140
-msgid "Visible to <strong>everybody</strong>"
-msgstr "Visível para <strong>todos</strong>"
+#: ../../include/identity.php:1157
+msgid "Birthday:"
+msgstr "Aniversário:"
-#: ../../include/conversation.php:1141 ../../mod/mail.php:174
-#: ../../mod/mail.php:289
-msgid "Please enter a link URL:"
-msgstr "Por favor, digite uma URL:"
+#: ../../include/identity.php:1161
+msgid "Age:"
+msgstr "Idade:"
-#: ../../include/conversation.php:1142
-msgid "Please enter a video link/URL:"
-msgstr "Por favor, digite o link/URL do vídeo:"
+#: ../../include/identity.php:1170
+#, php-format
+msgid "for %1$d %2$s"
+msgstr "para %1$d %2$s"
-#: ../../include/conversation.php:1143
-msgid "Please enter an audio link/URL:"
-msgstr "Por favor, digite o link/URL do áudio:"
+#: ../../include/identity.php:1173 ../../mod/profiles.php:667
+msgid "Sexual Preference:"
+msgstr "Preferência sexual:"
-#: ../../include/conversation.php:1144
-msgid "Tag term:"
-msgstr "Etiqueta:"
+#: ../../include/identity.php:1177 ../../mod/profiles.php:669
+msgid "Hometown:"
+msgstr "Cidade natal:"
-#: ../../include/conversation.php:1145 ../../mod/filer.php:49
-msgid "Save to Folder:"
-msgstr "Salvar para a pasta:"
+#: ../../include/identity.php:1179
+msgid "Tags:"
+msgstr "Etiquetas:"
-#: ../../include/conversation.php:1146
-msgid "Where are you right now?"
-msgstr "Onde você está agora?"
+#: ../../include/identity.php:1181 ../../mod/profiles.php:670
+msgid "Political Views:"
+msgstr "Posição política:"
-#: ../../include/conversation.php:1147 ../../mod/editpost.php:52
-#: ../../mod/mail.php:175 ../../mod/mail.php:290
-msgid "Expires YYYY-MM-DD HH:MM"
-msgstr "Expira YYYY-MM-DD HH:MM"
+#: ../../include/identity.php:1183
+msgid "Religion:"
+msgstr "Religião:"
#: ../../include/conversation.php:1174 ../../mod/webpages.php:181
#: ../../mod/blocks.php:154 ../../mod/photos.php:949 ../../mod/layouts.php:184
msgid "Share"
msgstr "Compartilhar"
-#: ../../include/conversation.php:1176
-msgid "Page link name"
-msgstr "Nome do Link da Página"
-
-#: ../../include/conversation.php:1179
-msgid "Post as"
-msgstr "Publicar como"
-
-#: ../../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
-msgid "Upload photo"
-msgstr "Enviar foto"
-
-#: ../../include/conversation.php:1187
-msgid "upload photo"
-msgstr "enviar foto"
-
-#: ../../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
-msgid "Attach file"
-msgstr "Anexar arquivo"
-
-#: ../../include/conversation.php:1189
-msgid "attach file"
-msgstr "anexar arquivo"
-
-#: ../../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
-msgid "Insert web link"
-msgstr "Inserir link web"
-
-#: ../../include/conversation.php:1191
-msgid "web link"
-msgstr "link web"
-
-#: ../../include/conversation.php:1192
-msgid "Insert video link"
-msgstr "Inserir link de vídeo"
-
-#: ../../include/conversation.php:1193
-msgid "video link"
-msgstr "link de vídeo"
-
-#: ../../include/conversation.php:1194
-msgid "Insert audio link"
-msgstr "Inserir link de áudio"
-
-#: ../../include/conversation.php:1195
-msgid "audio link"
-msgstr "link de áudio"
-
-#: ../../include/conversation.php:1196 ../../mod/editlayout.php:151
-#: ../../mod/editwebpage.php:190 ../../mod/editpost.php:125
-#: ../../mod/editblock.php:153
-msgid "Set your location"
-msgstr "Definir sua localização"
+#: ../../include/identity.php:1187
+msgid "Hobbies/Interests:"
+msgstr "Hobbies/Interesses:"
+
+#: ../../include/identity.php:1189 ../../mod/profiles.php:673
+msgid "Likes:"
+msgstr "Gosta de:"
+
+#: ../../include/identity.php:1191 ../../mod/profiles.php:674
+msgid "Dislikes:"
+msgstr "Não gosta de:"
+
+#: ../../include/identity.php:1194
+msgid "Contact information and Social Networks:"
+msgstr "Informações de contato e redes sociais:"
+
+#: ../../include/identity.php:1196
+msgid "My other channels:"
+msgstr "Meus outros canais:"
+
+#: ../../include/identity.php:1198
+msgid "Musical interests:"
+msgstr "Interesses musicais:"
+
+#: ../../include/identity.php:1200
+msgid "Books, literature:"
+msgstr "Livros, literatura:"
+
+#: ../../include/identity.php:1202
+msgid "Television:"
+msgstr "Televisão:"
+
+#: ../../include/identity.php:1204
+msgid "Film/dance/culture/entertainment:"
+msgstr "Filmes/dança/cultura/entretenimento:"
+
+#: ../../include/identity.php:1206
+msgid "Love/Romance:"
+msgstr "Amor/romance:"
+
+#: ../../include/identity.php:1208
+msgid "Work/employment:"
+msgstr "Trabalho/emprego:"
+
+#: ../../include/identity.php:1210
+msgid "School/education:"
+msgstr "Escola/educação:"
-#: ../../include/conversation.php:1197
-msgid "set location"
-msgstr "definir localização"
+#: ../../include/identity.php:1230
+msgid "Like this thing"
+msgstr "Gostar desta coisa"
-#: ../../include/conversation.php:1198 ../../mod/editpost.php:127
-msgid "Toggle voting"
-msgstr "Alternar votação"
+#: ../../include/nav.php:94 ../../include/nav.php:126 ../../boot.php:1494
+msgid "Logout"
+msgstr "Sair"
-#: ../../include/conversation.php:1201 ../../mod/editlayout.php:152
-#: ../../mod/editwebpage.php:191 ../../mod/editpost.php:126
-#: ../../mod/editblock.php:154
-msgid "Clear browser location"
-msgstr "Limpar a localização do navegador"
+#: ../../include/nav.php:94 ../../include/nav.php:126
+msgid "End this session"
+msgstr "Encerrar essa sessão"
-#: ../../include/conversation.php:1202
-msgid "clear location"
-msgstr "limpar a localização"
+#: ../../include/nav.php:97 ../../include/nav.php:160
+msgid "Home"
+msgstr "Ver canal"
+
+#: ../../include/nav.php:97
+msgid "Your posts and conversations"
+msgstr "Suas publicações e conversas"
#: ../../include/conversation.php:1204 ../../mod/editwebpage.php:207
#: ../../mod/editpost.php:142 ../../mod/editblock.php:167
@@ -2960,15 +2931,13 @@ msgstr "Título (opcional)"
msgid "Categories (optional, comma-separated list)"
msgstr "categorias (opcional, lista separada por vírgulas)"
-#: ../../include/conversation.php:1210 ../../mod/editlayout.php:154
-#: ../../mod/editwebpage.php:193 ../../mod/editpost.php:131
-#: ../../mod/editblock.php:156
-msgid "Permission settings"
-msgstr "Configurações de permissão"
+#: ../../include/nav.php:100
+msgid "Manage/Edit profiles"
+msgstr "Administrar/Editar perfis"
-#: ../../include/conversation.php:1211
-msgid "permissions"
-msgstr "permissões"
+#: ../../include/nav.php:102
+msgid "Edit your profile"
+msgstr "Editar seu perfil"
#: ../../include/conversation.php:1219 ../../mod/editlayout.php:161
#: ../../mod/editwebpage.php:202 ../../mod/editpost.php:139
@@ -3000,129 +2969,115 @@ msgstr "Ok"
msgid "Cancel"
msgstr "Cancelar"
-#: ../../include/conversation.php:1481
-msgid "Discover"
-msgstr "Descubra"
+#: ../../include/nav.php:124
+msgid "Sign in"
+msgstr "Entrar"
-#: ../../include/conversation.php:1484
-msgid "Imported public streams"
-msgstr "Fluxos públicos importados"
+#: ../../include/nav.php:141
+#, php-format
+msgid "%s - click to logout"
+msgstr "%s - clique para sair"
-#: ../../include/conversation.php:1489
-msgid "Commented Order"
-msgstr "Recentes e comentados"
+#: ../../include/nav.php:146
+msgid "Click to authenticate to your home hub"
+msgstr "Clique para se autenticar com seu hub de origem"
-#: ../../include/conversation.php:1492
-msgid "Sort by Comment Date"
-msgstr "Ordenar pela data do último comentário"
+#: ../../include/nav.php:160
+msgid "Home Page"
+msgstr "Página inicial"
-#: ../../include/conversation.php:1496
-msgid "Posted Order"
-msgstr "Recentemente publicados"
+#: ../../include/nav.php:164 ../../mod/register.php:220 ../../boot.php:1471
+msgid "Register"
+msgstr "Registrar"
-#: ../../include/conversation.php:1499
-msgid "Sort by Post Date"
-msgstr "Ordenar pela data da publicação"
+#: ../../include/nav.php:164
+msgid "Create an account"
+msgstr "Criar uma conta"
-#: ../../include/conversation.php:1507
-msgid "Posts that mention or involve you"
-msgstr "Publicações que mencionam ou envolvem você"
+#: ../../include/nav.php:169
+msgid "Help and documentation"
+msgstr "Ajuda e documentação"
-#: ../../include/conversation.php:1513 ../../mod/connections.php:212
-#: ../../mod/connections.php:225 ../../mod/menu.php:102
-msgid "New"
-msgstr "Novo"
+#: ../../include/nav.php:172 ../../include/widgets.php:86
+#: ../../mod/apps.php:33
+msgid "Apps"
+msgstr "Aplicações"
-#: ../../include/conversation.php:1516
-msgid "Activity Stream - by date"
-msgstr "Fluxo de atividades - por data"
+#: ../../include/nav.php:172
+msgid "Applications, utilities, links, games"
+msgstr "Aplicações, utilitários, links, jogos"
-#: ../../include/conversation.php:1522
-msgid "Starred"
-msgstr "Estrelados"
+#: ../../include/nav.php:174
+msgid "Search site content"
+msgstr "Pesquisar o conteúdo do site"
-#: ../../include/conversation.php:1525
-msgid "Favourite Posts"
-msgstr "Publicações favoritas"
+#: ../../include/nav.php:177
+msgid "Channel Locator"
+msgstr "Localizador de canais"
-#: ../../include/conversation.php:1532
-msgid "Spam"
-msgstr "Spam"
+#: ../../include/nav.php:188
+msgid "Your matrix"
+msgstr "Sua matriz"
-#: ../../include/conversation.php:1535
-msgid "Posts flagged as SPAM"
-msgstr "Publicações marcadas como SPAM"
+#: ../../include/nav.php:189
+msgid "Mark all matrix notifications seen"
+msgstr "Marcar todas as notificações da matriz como vistas"
-#: ../../include/conversation.php:1579 ../../mod/admin.php:952
-msgid "Channel"
-msgstr "Canal"
+#: ../../include/nav.php:191
+msgid "Channel home"
+msgstr "Página inicial do canal"
-#: ../../include/conversation.php:1582
-msgid "Status Messages and Posts"
-msgstr "Mensagens de status e publicações"
+#: ../../include/nav.php:192
+msgid "Mark all channel notifications seen"
+msgstr "Marcar todas as notificações de canais como vistas"
-#: ../../include/conversation.php:1591
-msgid "About"
-msgstr "Sobre"
+#: ../../include/nav.php:195 ../../mod/connections.php:406
+msgid "Connections"
+msgstr "Conexões"
-#: ../../include/conversation.php:1594
-msgid "Profile Details"
-msgstr "Detalhes do perfil"
+#: ../../include/nav.php:198
+msgid "Notices"
+msgstr "Notificações"
-#: ../../include/conversation.php:1603 ../../include/photos.php:359
-msgid "Photo Albums"
-msgstr "Álbuns de fotos"
+#: ../../include/nav.php:198
+msgid "Notifications"
+msgstr "Notificações"
-#: ../../include/conversation.php:1612
-msgid "Files and Storage"
-msgstr "Arquivos e armazenamento"
+#: ../../include/nav.php:199
+msgid "See all notifications"
+msgstr "Ver todas as notificações"
-#: ../../include/conversation.php:1622 ../../include/conversation.php:1625
-msgid "Chatrooms"
-msgstr "Salas de bate-papo"
+#: ../../include/nav.php:200 ../../mod/notifications.php:99
+msgid "Mark all system notifications seen"
+msgstr "Marcar todas as notificações de sistema como vistas"
-#: ../../include/conversation.php:1638
-msgid "Saved Bookmarks"
-msgstr "Links guardados"
+#: ../../include/nav.php:202
+msgid "Private mail"
+msgstr "Mensagens privadas"
-#: ../../include/conversation.php:1648
-msgid "Manage Webpages"
-msgstr "Administrar páginas web"
+#: ../../include/nav.php:203
+msgid "See all private messages"
+msgstr "Ver todas as mensagens privadas"
-#: ../../include/conversation.php:1707
-msgctxt "noun"
-msgid "Attending"
-msgid_plural "Attending"
-msgstr[0] "Comparecerá"
-msgstr[1] "Comparecerão"
+#: ../../include/nav.php:204
+msgid "Mark all private messages seen"
+msgstr "Marcar todas as mensagens privadas como vistas"
-#: ../../include/conversation.php:1710
-msgctxt "noun"
-msgid "Not Attending"
-msgid_plural "Not Attending"
-msgstr[0] "Não comparecerá"
-msgstr[1] "Não comparecerão"
+#: ../../include/nav.php:205
+msgid "Inbox"
+msgstr "Recebidas"
-#: ../../include/conversation.php:1713
-msgctxt "noun"
-msgid "Undecided"
-msgid_plural "Undecided"
-msgstr[0] "Indeciso"
-msgstr[1] "Indecisos"
+#: ../../include/nav.php:206
+msgid "Outbox"
+msgstr "Enviadas"
-#: ../../include/conversation.php:1716
-msgctxt "noun"
-msgid "Agree"
-msgid_plural "Agrees"
-msgstr[0] "Concorda"
-msgstr[1] "Concordam"
+#: ../../include/nav.php:207 ../../include/widgets.php:543
+msgid "New Message"
+msgstr "Nova mensagem"
-#: ../../include/conversation.php:1719
-msgctxt "noun"
-msgid "Disagree"
-msgid_plural "Disagrees"
-msgstr[0] "Discordo"
-msgstr[1] "Discordo"
+#: ../../include/nav.php:210
+msgid "Event Calendar"
+msgstr "Agenda de eventos"
#: ../../include/conversation.php:1722
msgctxt "noun"
@@ -3136,132 +3091,122 @@ msgstr[1] "Abstenções"
msgid "Image exceeds website size limit of %lu bytes"
msgstr "A imagem excede o limite de tamanho do site, que é de %"
-#: ../../include/photos.php:101
-msgid "Image file is empty."
-msgstr "O arquivo de imagem está vazio."
+#: ../../include/message.php:200
+msgid "Stored post could not be verified."
+msgstr "Não foi possível verificar a publicação armazenada."
+
+#: ../../include/widgets.php:87
+msgid "System"
+msgstr "Sistema"
-#: ../../include/photos.php:128 ../../mod/profile_photo.php:217
-msgid "Unable to process image"
-msgstr "Não foi possível processar a imagem"
+#: ../../include/widgets.php:90
+msgid "Create Personal App"
+msgstr "Crie aplicações pessoais"
-#: ../../include/photos.php:199
-msgid "Photo storage failed."
-msgstr "Não foi possível armazenar a foto."
+#: ../../include/widgets.php:91
+msgid "Edit Personal App"
+msgstr "Edite aplicações pessoais"
-#: ../../include/photos.php:363
-msgid "Upload New Photos"
-msgstr "Enviar novas fotos"
+#: ../../include/widgets.php:137 ../../mod/suggest.php:53
+msgid "Ignore/Hide"
+msgstr "Ignorar/Ocultar"
-#: ../../include/zot.php:666
-msgid "Invalid data packet"
-msgstr "Pacote de dados inválido"
+#: ../../include/widgets.php:143 ../../mod/connections.php:267
+msgid "Suggestions"
+msgstr "Sugestões"
-#: ../../include/zot.php:682
-msgid "Unable to verify channel signature"
-msgstr "Não foi possível verificar a assinatura do canal"
+#: ../../include/widgets.php:144
+msgid "See more..."
+msgstr "Veja mais..."
-#: ../../include/zot.php:2108
+#: ../../include/widgets.php:166
#, php-format
-msgid "Unable to verify site signature for %s"
-msgstr "Não foi possível verificar a assinatura do site para %s"
-
-#: ../../include/oembed.php:183
-msgid "Embedded content"
-msgstr "Conteúdo incorporado"
+msgid "You have %1$.0f of %2$.0f allowed connections."
+msgstr "Você tem %1$.0f de %2$.0f conexões permitidas."
-#: ../../include/oembed.php:192
-msgid "Embedding disabled"
-msgstr "A incorporação está desabilitada"
+#: ../../include/widgets.php:172
+msgid "Add New Connection"
+msgstr "Adicionar nova conexão"
-#: ../../include/auth.php:131
-msgid "Logged out."
-msgstr "Você saiu."
+#: ../../include/widgets.php:173
+msgid "Enter the channel address"
+msgstr "Digite o endereço do canal"
-#: ../../include/auth.php:272
-msgid "Failed authentication"
-msgstr "Não foi possível autenticar"
+#: ../../include/widgets.php:174
+msgid "Example: bob@example.com, http://example.com/barbara"
+msgstr "Por exemplo: joao@exemplo.com, http://exemplo.com/maria"
-#: ../../include/auth.php:286 ../../mod/openid.php:190
-msgid "Login failed."
-msgstr "Não foi possível entrar."
+#: ../../include/widgets.php:191
+msgid "Notes"
+msgstr "Notas"
-#: ../../include/contact_widgets.php:14
-#, php-format
-msgid "%d invitation available"
-msgid_plural "%d invitations available"
-msgstr[0] "%d convite disponível"
-msgstr[1] "%d convites disponíveis"
+#: ../../include/widgets.php:263
+msgid "Remove term"
+msgstr "Remover termo"
-#: ../../include/contact_widgets.php:19 ../../mod/admin.php:450
-msgid "Advanced"
-msgstr "Avançado"
+#: ../../include/widgets.php:342
+msgid "Archives"
+msgstr "Arquivos"
-#: ../../include/contact_widgets.php:22
-msgid "Find Channels"
-msgstr "Pesquisar canais"
+#: ../../include/widgets.php:404
+msgid "Refresh"
+msgstr "Atualizar"
-#: ../../include/contact_widgets.php:23
-msgid "Enter name or interest"
-msgstr "Digite um nome ou interesse"
+#: ../../include/widgets.php:405 ../../mod/connedit.php:492
+msgid "Me"
+msgstr "Eu"
-#: ../../include/contact_widgets.php:24
-msgid "Connect/Follow"
-msgstr "Conectar/Acompanhar"
+#: ../../include/widgets.php:406 ../../mod/connedit.php:494
+msgid "Best Friends"
+msgstr "Melhores amigos"
-#: ../../include/contact_widgets.php:25
-msgid "Examples: Robert Morgenstein, Fishing"
-msgstr "Por exemplo: José da Silva, Pescaria"
+#: ../../include/widgets.php:408
+msgid "Co-workers"
+msgstr "Colegas de trabalho"
-#: ../../include/contact_widgets.php:26 ../../mod/connections.php:413
-#: ../../mod/directory.php:362 ../../mod/directory.php:367
-msgid "Find"
-msgstr "Pesquisar"
+#: ../../include/widgets.php:409 ../../mod/connedit.php:496
+msgid "Former Friends"
+msgstr "Amigos afastados"
-#: ../../include/contact_widgets.php:27 ../../mod/directory.php:366
-#: ../../mod/suggest.php:60
-msgid "Channel Suggestions"
-msgstr "Sugestões de canais"
+#: ../../include/widgets.php:410 ../../mod/connedit.php:497
+msgid "Acquaintances"
+msgstr "Conhecidos"
-#: ../../include/contact_widgets.php:29
-msgid "Random Profile"
-msgstr "Perfil aleatório"
+#: ../../include/widgets.php:411
+msgid "Everybody"
+msgstr "Todos"
-#: ../../include/contact_widgets.php:30
-msgid "Invite Friends"
-msgstr "Convidar amigos"
+#: ../../include/widgets.php:443
+msgid "Account settings"
+msgstr "Configurações da conta"
-#: ../../include/contact_widgets.php:32
-msgid "Advanced example: name=fred and country=iceland"
-msgstr "Exemplo avançado: name=raoni and country=peru"
+#: ../../include/widgets.php:449
+msgid "Channel settings"
+msgstr "Configurações do canal"
-#: ../../include/contact_widgets.php:125
-#, php-format
-msgid "%d connection in common"
-msgid_plural "%d connections in common"
-msgstr[0] "%d conexão em comum"
-msgstr[1] "%d conexões em comum"
+#: ../../include/widgets.php:455
+msgid "Additional features"
+msgstr "Recursos adicionais"
-#: ../../include/contact_widgets.php:130
-msgid "show more"
-msgstr "exibir mais"
+#: ../../include/widgets.php:461
+msgid "Feature settings"
+msgstr "Configurações dos recursos"
-#: ../../include/acl_selectors.php:240
-msgid "Visible to your default audience"
-msgstr "Visível para seu público padrão"
+#: ../../include/widgets.php:467
+msgid "Display settings"
+msgstr "Configurações de exibição"
-#: ../../include/acl_selectors.php:241
-msgid "Show"
-msgstr "Exibir"
+#: ../../include/widgets.php:473
+msgid "Connected apps"
+msgstr "Aplicações conectadas"
-#: ../../include/acl_selectors.php:242
-msgid "Don't show"
-msgstr "Não exibir"
+#: ../../include/widgets.php:479
+msgid "Export channel"
+msgstr "Exportar o canal"
-#: ../../include/acl_selectors.php:248 ../../mod/events.php:654
-#: ../../mod/photos.php:559 ../../mod/photos.php:922 ../../mod/chat.php:209
-#: ../../mod/filestorage.php:147
-msgid "Permissions"
-msgstr "Permissões"
+#: ../../include/widgets.php:485
+msgid "Export content"
+msgstr "Exportar conteúdo"
#: ../../include/attach.php:242 ../../include/attach.php:300
msgid "Item was not found."
@@ -3321,252 +3266,278 @@ msgstr "mkdir falhou."
msgid "database storage failed."
msgstr "armazenamento de banco de dados falhou."
-#: ../../include/identity.php:33
-msgid "Unable to obtain identity information from database"
-msgstr "Não foi possível obter a informação da identidade a partir do banco de dados"
+#: ../../include/ItemObject.php:220 ../../mod/photos.php:1008
+msgid "I like this (toggle)"
+msgstr "Eu gostei disso (alterna)"
-#: ../../include/identity.php:67
-msgid "Empty name"
-msgstr "O nome está em branco"
+#: ../../include/ItemObject.php:221 ../../mod/photos.php:1009
+msgid "I don't like this (toggle)"
+msgstr "Eu não gostei disso (alterna)"
-#: ../../include/identity.php:70
-msgid "Name too long"
-msgstr "O nome é muito grande"
+#: ../../include/ItemObject.php:225
+msgid "Share This"
+msgstr "Compartilhe isso"
-#: ../../include/identity.php:186
-msgid "No account identifier"
-msgstr "Sem identificador de conta"
+#: ../../include/ItemObject.php:225
+msgid "share"
+msgstr "compartilhar"
-#: ../../include/identity.php:198
-msgid "Nickname is required."
-msgstr "É necessário informar o apelido."
+#: ../../include/ItemObject.php:248 ../../include/ItemObject.php:249
+#, php-format
+msgid "View %s's profile - %s"
+msgstr "Ver o perfil de %s - %s"
-#: ../../include/identity.php:212
-msgid "Reserved nickname. Please choose another."
-msgstr "Apelido reservado. Por favor escolha outro."
+#: ../../include/ItemObject.php:250
+msgid "to"
+msgstr "para"
-#: ../../include/identity.php:217 ../../include/dimport.php:34
-msgid ""
-"Nickname has unsupported characters or is already being used on this site."
-msgstr "O apelido possui caracteres não suportados ou já está sendo usado nesse site."
+#: ../../include/ItemObject.php:251
+msgid "via"
+msgstr "via"
-#: ../../include/identity.php:292
-msgid "Unable to retrieve created identity"
-msgstr "Não foi possível recuperar a identidade criada"
+#: ../../include/ItemObject.php:252
+msgid "Wall-to-Wall"
+msgstr "Mural-para-mural"
-#: ../../include/identity.php:350
-msgid "Default Profile"
-msgstr "Perfil padrão"
+#: ../../include/ItemObject.php:253
+msgid "via Wall-To-Wall:"
+msgstr "via Mural-para-mural"
-#: ../../include/identity.php:630
-msgid "Requested channel is not available."
-msgstr "Canal solicitado não está disponível."
+#: ../../include/ItemObject.php:288
+msgid "Save Bookmarks"
+msgstr "Salve Favoritos"
-#: ../../include/identity.php:677 ../../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/layouts.php:29
-msgid "Requested profile is not available."
-msgstr "O perfil solicitado não está disponível."
+#: ../../include/ItemObject.php:289
+msgid "Add to Calendar"
+msgstr "Adicione ao calendário"
-#: ../../include/identity.php:836 ../../mod/profiles.php:774
-msgid "Change profile photo"
-msgstr "Mudar a foto do perfil"
+#: ../../include/ItemObject.php:297
+msgctxt "noun"
+msgid "Likes"
+msgstr "Gostaram"
-#: ../../include/identity.php:842
-msgid "Profiles"
-msgstr "Perfis"
+#: ../../include/ItemObject.php:298
+msgctxt "noun"
+msgid "Dislikes"
+msgstr "Desgostaram"
-#: ../../include/identity.php:842
-msgid "Manage/edit profiles"
-msgstr "Administrar/editar perfis"
+#: ../../include/ItemObject.php:329
+#, php-format
+msgid "%d comment"
+msgid_plural "%d comments"
+msgstr[0] "%d comentário"
+msgstr[1] "%d comentários"
-#: ../../include/identity.php:843 ../../mod/profiles.php:775
-msgid "Create New Profile"
-msgstr "Criar um novo perfil"
+#: ../../include/ItemObject.php:330 ../../include/js_strings.php:7
+msgid "[+] show all"
+msgstr "[+] mostrar todos"
-#: ../../include/identity.php:858 ../../mod/profiles.php:786
-msgid "Profile Image"
-msgstr "Imagem do perfil"
+#: ../../include/ItemObject.php:594 ../../mod/photos.php:1027
+#: ../../mod/photos.php:1114
+msgid "This is you"
+msgstr "Este(a) é você"
-#: ../../include/identity.php:861
-msgid "visible to everybody"
-msgstr "visível para todos"
+#: ../../include/ItemObject.php:596 ../../include/js_strings.php:6
+#: ../../mod/photos.php:1029 ../../mod/photos.php:1116
+msgid "Comment"
+msgstr "Comentar"
-#: ../../include/identity.php:862 ../../mod/profiles.php:669
-#: ../../mod/profiles.php:790
-msgid "Edit visibility"
-msgstr "Editar a visibilidade"
+#: ../../include/ItemObject.php:597 ../../mod/mood.php:135
+#: ../../mod/settings.php:519 ../../mod/settings.php:631
+#: ../../mod/settings.php:660 ../../mod/settings.php:684
+#: ../../mod/settings.php:760 ../../mod/settings.php:945
+#: ../../mod/poke.php:166 ../../mod/profiles.php:643 ../../mod/chat.php:177
+#: ../../mod/chat.php:211 ../../mod/connect.php:92 ../../mod/connedit.php:540
+#: ../../mod/setup.php:307 ../../mod/setup.php:350 ../../mod/pdledit.php:58
+#: ../../mod/photos.php:563 ../../mod/photos.php:675 ../../mod/photos.php:990
+#: ../../mod/photos.php:1030 ../../mod/photos.php:1117
+#: ../../mod/sources.php:104 ../../mod/sources.php:138
+#: ../../mod/events.php:586 ../../mod/filestorage.php:137
+#: ../../mod/fsuggest.php:108 ../../mod/group.php:81 ../../mod/admin.php:414
+#: ../../mod/admin.php:725 ../../mod/admin.php:861 ../../mod/admin.php:994
+#: ../../mod/admin.php:1193 ../../mod/admin.php:1280 ../../mod/thing.php:284
+#: ../../mod/thing.php:327 ../../mod/import.php:475 ../../mod/invite.php:142
+#: ../../mod/mail.php:345 ../../mod/appman.php:99 ../../mod/poll.php:68
+#: ../../view/theme/apw/php/config.php:256
+#: ../../view/theme/blogga/php/config.php:67
+#: ../../view/theme/blogga/view/theme/blog/config.php:67
+#: ../../view/theme/redbasic/php/config.php:99
+msgid "Submit"
+msgstr "Enviar"
-#: ../../include/identity.php:878 ../../include/identity.php:1117
-msgid "Gender:"
-msgstr "Gênero:"
+#: ../../include/ItemObject.php:598
+msgid "Bold"
+msgstr "Negrito"
-#: ../../include/identity.php:879 ../../include/identity.php:1161
-msgid "Status:"
-msgstr "Situação:"
+#: ../../include/ItemObject.php:599
+msgid "Italic"
+msgstr "Itálico"
-#: ../../include/identity.php:880 ../../include/identity.php:1172
-msgid "Homepage:"
-msgstr "Página web:"
+#: ../../include/ItemObject.php:600
+msgid "Underline"
+msgstr "Sublinhado"
-#: ../../include/identity.php:881
-msgid "Online Now"
-msgstr "Online agora"
+#: ../../include/ItemObject.php:601
+msgid "Quote"
+msgstr "Citação"
-#: ../../include/identity.php:964 ../../include/identity.php:1042
-#: ../../mod/ping.php:324
-msgid "g A l F d"
-msgstr "G l d F"
+#: ../../include/ItemObject.php:602
+msgid "Code"
+msgstr "Código"
-#: ../../include/identity.php:965 ../../include/identity.php:1043
-msgid "F d"
-msgstr "F d"
+#: ../../include/ItemObject.php:603
+msgid "Image"
+msgstr "Imagem"
-#: ../../include/identity.php:1010 ../../include/identity.php:1082
-#: ../../mod/ping.php:346
-msgid "[today]"
-msgstr "[hoje]"
+#: ../../include/ItemObject.php:604
+msgid "Link"
+msgstr "Link"
-#: ../../include/identity.php:1021
-msgid "Birthday Reminders"
-msgstr "Lembres de aniversário"
+#: ../../include/ItemObject.php:605
+msgid "Video"
+msgstr "Vídeo"
-#: ../../include/identity.php:1022
-msgid "Birthdays this week:"
-msgstr "Aniversários nesta semana:"
+#: ../../include/js_strings.php:5
+msgid "Delete this item?"
+msgstr "Excluir este item?"
-#: ../../include/identity.php:1075
-msgid "[No description]"
-msgstr "[Sem descrição]"
+#: ../../include/js_strings.php:8
+msgid "[-] show less"
+msgstr "[-] mostra menos"
-#: ../../include/identity.php:1093
-msgid "Event Reminders"
-msgstr "Lembretes de eventos"
+#: ../../include/js_strings.php:9
+msgid "[+] expand"
+msgstr "[+] expandir"
-#: ../../include/identity.php:1094
-msgid "Events this week:"
-msgstr "Eventos nesta semana:"
+#: ../../include/js_strings.php:10
+msgid "[-] collapse"
+msgstr "[-] colapsar"
-#: ../../include/identity.php:1107 ../../include/identity.php:1224
-#: ../../include/apps.php:138 ../../mod/profperm.php:112
-msgid "Profile"
-msgstr "Perfil"
+#: ../../include/js_strings.php:11
+msgid "Password too short"
+msgstr "A senha é muito curta"
#: ../../include/identity.php:1115 ../../mod/settings.php:1050
msgid "Full Name:"
msgstr "Nome completo:"
-#: ../../include/identity.php:1122
-msgid "Like this channel"
-msgstr "Gostar deste canal"
+#: ../../include/js_strings.php:13 ../../mod/photos.php:39
+msgid "everybody"
+msgstr "todos"
-#: ../../include/identity.php:1146
-msgid "j F, Y"
-msgstr "j \\d\\e F, Y"
+#: ../../include/js_strings.php:14
+msgid "Secret Passphrase"
+msgstr "Frase secreta"
-#: ../../include/identity.php:1147
-msgid "j F"
-msgstr "j \\d\\e F"
+#: ../../include/js_strings.php:15
+msgid "Passphrase hint"
+msgstr "Dica da frase secreta"
-#: ../../include/identity.php:1154
-msgid "Birthday:"
-msgstr "Aniversário:"
+#: ../../include/js_strings.php:16
+msgid "Notice: Permissions have changed but have not yet been submitted."
+msgstr "Atenção: permissões foram modificadas mas ainda não foram enviadas."
-#: ../../include/identity.php:1158
-msgid "Age:"
-msgstr "Idade:"
+#: ../../include/js_strings.php:17
+msgid "close all"
+msgstr "fechar tudo"
-#: ../../include/identity.php:1167
-#, php-format
-msgid "for %1$d %2$s"
-msgstr "para %1$d %2$s"
+#: ../../include/js_strings.php:18
+msgid "Nothing new here"
+msgstr "Nada de novo aqui"
-#: ../../include/identity.php:1170 ../../mod/profiles.php:691
-msgid "Sexual Preference:"
-msgstr "Preferência sexual:"
+#: ../../include/js_strings.php:20
+msgid "timeago.prefixAgo"
+msgstr "timeago.prefixAgo"
-#: ../../include/identity.php:1174 ../../mod/profiles.php:693
-msgid "Hometown:"
-msgstr "Cidade natal:"
+#: ../../include/js_strings.php:21
+msgid "timeago.prefixFromNow"
+msgstr "timeago.prefixFromNow"
-#: ../../include/identity.php:1176
-msgid "Tags:"
-msgstr "Etiquetas:"
+#: ../../include/js_strings.php:22
+msgid "ago"
+msgstr "atrás"
-#: ../../include/identity.php:1178 ../../mod/profiles.php:694
-msgid "Political Views:"
-msgstr "Posição política:"
+#: ../../include/js_strings.php:23
+msgid "from now"
+msgstr "de agora"
-#: ../../include/identity.php:1180
-msgid "Religion:"
-msgstr "Religião:"
+#: ../../include/js_strings.php:24
+msgid "less than a minute"
+msgstr "menos de um minuto"
-#: ../../include/identity.php:1182
-msgid "About:"
-msgstr "Sobre:"
+#: ../../include/js_strings.php:25
+msgid "about a minute"
+msgstr "aproximadamente um minuto"
-#: ../../include/identity.php:1184
-msgid "Hobbies/Interests:"
-msgstr "Hobbies/Interesses:"
+#: ../../include/js_strings.php:26
+#, php-format
+msgid "%d minutes"
+msgstr "%d minutos"
-#: ../../include/identity.php:1186 ../../mod/profiles.php:697
-msgid "Likes:"
-msgstr "Gosta de:"
+#: ../../include/js_strings.php:27
+msgid "about an hour"
+msgstr "aproximadamente uma hora"
-#: ../../include/identity.php:1188 ../../mod/profiles.php:698
-msgid "Dislikes:"
-msgstr "Não gosta de:"
+#: ../../include/js_strings.php:28
+#, php-format
+msgid "about %d hours"
+msgstr "aproximadamente %d horas"
-#: ../../include/identity.php:1190
-msgid "Contact information and Social Networks:"
-msgstr "Informações de contato e redes sociais:"
+#: ../../include/js_strings.php:29
+msgid "a day"
+msgstr "um dia"
-#: ../../include/identity.php:1192
-msgid "My other channels:"
-msgstr "Meus outros canais:"
+#: ../../include/js_strings.php:30
+#, php-format
+msgid "%d days"
+msgstr "%d dias"
-#: ../../include/identity.php:1194
-msgid "Musical interests:"
-msgstr "Interesses musicais:"
+#: ../../include/js_strings.php:31
+msgid "about a month"
+msgstr "aproximadamente um mês"
-#: ../../include/identity.php:1196
-msgid "Books, literature:"
-msgstr "Livros, literatura:"
+#: ../../include/js_strings.php:32
+#, php-format
+msgid "%d months"
+msgstr "%d meses"
-#: ../../include/identity.php:1198
-msgid "Television:"
-msgstr "Televisão:"
+#: ../../include/js_strings.php:33
+msgid "about a year"
+msgstr "aproximadamente um ano"
-#: ../../include/identity.php:1200
-msgid "Film/dance/culture/entertainment:"
-msgstr "Filmes/dança/cultura/entretenimento:"
+#: ../../include/js_strings.php:34
+#, php-format
+msgid "%d years"
+msgstr "%d anos"
-#: ../../include/identity.php:1202
-msgid "Love/Romance:"
-msgstr "Amor/romance:"
+#: ../../include/js_strings.php:35
+msgid " "
+msgstr " "
-#: ../../include/identity.php:1204
-msgid "Work/employment:"
-msgstr "Trabalho/emprego:"
+#: ../../include/js_strings.php:36
+msgid "timeago.numbers"
+msgstr "timeago.numbers"
-#: ../../include/identity.php:1206
-msgid "School/education:"
-msgstr "Escola/educação:"
+#: ../../include/Contact.php:123
+msgid "New window"
+msgstr "Nova janela"
-#: ../../include/identity.php:1226
-msgid "Like this thing"
-msgstr "Gostar desta coisa"
+#: ../../include/Contact.php:124
+msgid "Open the selected location in a different window or browser tab"
+msgstr "Abre a localização selecionada em outra aba ou janela"
+
+#: ../../include/Contact.php:211 ../../mod/admin.php:649
+#, php-format
+msgid "User '%s' deleted"
+msgstr "O usuário/a '%s' foi deletado/a"
#: ../../include/profile_selectors.php:6
-#: ../../include/profile_selectors.php:23 ../../mod/id.php:103
+#: ../../include/profile_selectors.php:23
msgid "Male"
msgstr "Masculino"
#: ../../include/profile_selectors.php:6
-#: ../../include/profile_selectors.php:23 ../../mod/id.php:105
+#: ../../include/profile_selectors.php:23
msgid "Female"
msgstr "Feminino"
@@ -3611,6 +3582,13 @@ msgid "Non-specific"
msgstr "Não específico"
#: ../../include/profile_selectors.php:6
+#: ../../include/profile_selectors.php:23
+#: ../../include/profile_selectors.php:61
+#: ../../include/profile_selectors.php:97 ../../include/permissions.php:746
+msgid "Other"
+msgstr "Outro"
+
+#: ../../include/profile_selectors.php:6
msgid "Undecided"
msgstr "Indeciso"
@@ -3796,148 +3774,288 @@ msgstr "Não importa"
msgid "Ask me"
msgstr "Pergunte-me"
-#: ../../include/apps.php:128
-msgid "Site Admin"
-msgstr "Administração do site"
+#: ../../include/auth.php:103
+msgid "Logged out."
+msgstr "Você saiu."
-#: ../../include/apps.php:130
-msgid "Address Book"
-msgstr "Livro de Endereços"
+#: ../../include/auth.php:249
+msgid "Failed authentication"
+msgstr "Não foi possível autenticar"
-#: ../../include/apps.php:144 ../../mod/mood.php:130
-msgid "Mood"
-msgstr "Humor"
+#: ../../include/auth.php:264 ../../mod/openid.php:188
+msgid "Login failed."
+msgstr "Não foi possível entrar."
-#: ../../include/apps.php:148
-msgid "Probe"
-msgstr "Sonda"
+#: ../../include/permissions.php:13
+msgid "Can view my normal stream and posts"
+msgstr "Pode ver meus fluxo e publicações normais"
-#: ../../include/apps.php:149
-msgid "Suggest"
-msgstr "Sugerir"
+#: ../../include/permissions.php:14
+msgid "Can view my default channel profile"
+msgstr "Pode ver o perfil padrão do meu canal"
-#: ../../include/apps.php:150
-msgid "Random Channel"
-msgstr "Canal aleatório"
+#: ../../include/permissions.php:15
+msgid "Can view my photo albums"
+msgstr "Pode ver meus álbuns de fotos"
-#: ../../include/apps.php:151
-msgid "Invite"
-msgstr "Convidar"
+#: ../../include/permissions.php:16
+msgid "Can view my connections"
+msgstr "Pode ver minhas conexões"
-#: ../../include/apps.php:152
-msgid "Features"
-msgstr "Recursos"
+#: ../../include/permissions.php:17
+msgid "Can view my file storage"
+msgstr "Pode ver meu armazenamento de arquivos"
-#: ../../include/apps.php:153 ../../mod/id.php:28
-msgid "Language"
-msgstr "Idioma"
+#: ../../include/permissions.php:18
+msgid "Can view my webpages"
+msgstr "Pode ver minhas páginas web"
-#: ../../include/apps.php:154
-msgid "Post"
-msgstr "Publicação"
+#: ../../include/permissions.php:21
+msgid "Can send me their channel stream and posts"
+msgstr "Pode me enviar seu fluxo e publicações"
-#: ../../include/apps.php:155 ../../mod/id.php:17 ../../mod/id.php:18
-#: ../../mod/id.php:19
-msgid "Profile Photo"
-msgstr "Foto do perfil"
+#: ../../include/permissions.php:22
+msgid "Can post on my channel page (\"wall\")"
+msgstr "Pode publicar na página do meu canal (\"mural\")"
#: ../../include/apps.php:247 ../../mod/settings.php:84
#: ../../mod/settings.php:613
msgid "Update"
msgstr "Atualizar"
-#: ../../include/apps.php:247
-msgid "Install"
-msgstr "Instalar"
+#: ../../include/permissions.php:24
+msgid "Can send me private mail messages"
+msgstr "Pode me enviar mensagens privadas"
-#: ../../include/apps.php:252
-msgid "Purchase"
-msgstr "Compras"
+#: ../../include/permissions.php:25
+msgid "Can post photos to my photo albums"
+msgstr "Pode publicar fotos nos meus álbuns de fotos"
-#: ../../include/chat.php:23
-msgid "Missing room name"
-msgstr "Nome da sala vazio"
+#: ../../include/permissions.php:26
+msgid "Can like/dislike stuff"
+msgstr "Pode gostar/desgostar de coisas"
-#: ../../include/chat.php:32
-msgid "Duplicate room name"
-msgstr "Nome da sala duplicado"
+#: ../../include/permissions.php:26
+msgid "Profiles and things other than posts/comments"
+msgstr "Perfis e coisas que não publicações/comentários"
-#: ../../include/chat.php:82 ../../include/chat.php:90
-msgid "Invalid room specifier."
-msgstr "Especificador de sala inválido."
+#: ../../include/permissions.php:28
+msgid "Can forward to all my channel contacts via post @mentions"
+msgstr "Pode encaminhar para todos os contatos do meu canal via @menções na publicação"
-#: ../../include/chat.php:120
-msgid "Room not found."
-msgstr "A sala não foi encontrada."
+#: ../../include/permissions.php:28
+msgid "Advanced - useful for creating group forum channels"
+msgstr "Avançado - útil para criar canais de fóruns de grupos"
-#: ../../include/chat.php:141
-msgid "Room is full"
-msgstr "A sala está cheia"
+#: ../../include/permissions.php:29
+msgid "Can chat with me (when available)"
+msgstr "Pode conversar comigo (quando disponívei)"
-#: ../../include/diaspora.php:2433
-msgid "Please choose"
-msgstr "Por favor, escolha"
+#: ../../include/permissions.php:30
+msgid "Can write to my file storage"
+msgstr "Pode escrever em meu armazenamento de arquivos"
-#: ../../include/diaspora.php:2435
-msgid "Agree"
-msgstr "Concordo"
+#: ../../include/permissions.php:31
+msgid "Can edit my webpages"
+msgstr "Pode editar minhas páginas web"
-#: ../../include/diaspora.php:2437
-msgid "Disagree"
-msgstr "Discordo"
+#: ../../include/permissions.php:33
+msgid "Can source my public posts in derived channels"
+msgstr "Pode usar minhas publicações públicas como fonte para canais derivados"
-#: ../../include/diaspora.php:2439
-msgid "Abstain"
-msgstr "Abstenho"
+#: ../../include/permissions.php:33
+msgid "Somewhat advanced - very useful in open communities"
+msgstr "Avançado - muito útil em comunidades abertas"
-#: ../../mod/achievements.php:34
-msgid "Some blurb about what to do when you're new here"
-msgstr "Alguma coisa sobre o que fazer quando se é novo aqui"
+#: ../../include/permissions.php:35
+msgid "Can administer my channel resources"
+msgstr "Pode administrar os recursos do meu canal"
-#: ../../mod/manage.php:136
-#, php-format
-msgid "You have created %1$.0f of %2$.0f allowed channels."
-msgstr "Você criou %1$.0f de %2$.0f canais permitidos."
+#: ../../include/permissions.php:35
+msgid ""
+"Extremely advanced. Leave this alone unless you know what you are doing"
+msgstr "Extremamente avançado. Não mexa nisso a não ser que saiba o que está fazendo"
-#: ../../mod/manage.php:144
-msgid "Create a new channel"
-msgstr "Criar um novo canal"
+#: ../../include/permissions.php:738
+msgid "Social Networking"
+msgstr "Rede social"
-#: ../../mod/manage.php:167
-msgid "Current Channel"
-msgstr "Canal atual"
+#: ../../include/permissions.php:739 ../../include/permissions.php:741
+#: ../../include/permissions.php:743 ../../include/permissions.php:745
+msgid "Mostly Public"
+msgstr "Padrão público"
-#: ../../mod/manage.php:169
-msgid "Switch to one of your channels by selecting it."
-msgstr "Troque para um de seus canais selecionando-o."
+#: ../../include/permissions.php:739 ../../include/permissions.php:741
+#: ../../include/permissions.php:743
+msgid "Restricted"
+msgstr "Restrito"
-#: ../../mod/manage.php:170
-msgid "Default Channel"
-msgstr "Canal padrão"
+#: ../../include/permissions.php:739 ../../include/permissions.php:741
+msgid "Private"
+msgstr "Privado"
-#: ../../mod/manage.php:171
-msgid "Make Default"
-msgstr "Tornar padrão"
+#: ../../include/permissions.php:740
+msgid "Community Forum"
+msgstr "Fórum de comunidade"
-#: ../../mod/manage.php:174
-#, php-format
-msgid "%d new messages"
-msgstr "%d novas mensagens"
+#: ../../include/permissions.php:742
+msgid "Feed Republish"
+msgstr "Republicação de feed"
-#: ../../mod/manage.php:175
-#, php-format
-msgid "%d new introductions"
-msgstr "%d novas apresentações"
+#: ../../include/permissions.php:744
+msgid "Celebrity/Soapbox"
+msgstr "Personalidade/Palanque"
+
+#: ../../include/permissions.php:747
+msgid "Custom/Expert Mode"
+msgstr "Personalizado/Modo expert"
+
+#: ../../mod/mood.php:132
+msgid "Set your current mood and tell your friends"
+msgstr "Marque seu humor atual e compartilhe com seus amigos"
+
+#: ../../mod/mitem.php:14 ../../mod/menu.php:92
+msgid "Menu not found."
+msgstr "O menu não foi encontrado."
+
+#: ../../mod/mitem.php:47
+msgid "Menu element updated."
+msgstr "O elemento de menu foi atualizado."
+
+#: ../../mod/mitem.php:51
+msgid "Unable to update menu element."
+msgstr "Não foi possível atualizar o elemento de menu."
+
+#: ../../mod/mitem.php:57
+msgid "Menu element added."
+msgstr "O elemento de menu foi adicionado."
+
+#: ../../mod/mitem.php:61
+msgid "Unable to add menu element."
+msgstr "Não foi possível adicionar o elemento de menu."
+
+#: ../../mod/mitem.php:78 ../../mod/dirprofile.php:175 ../../mod/menu.php:120
+#: ../../mod/xchan.php:38
+msgid "Not found."
+msgstr "Não encontrado."
+
+#: ../../mod/mitem.php:96
+msgid "Manage Menu Elements"
+msgstr "Administrar elementos de menu"
+
+#: ../../mod/mitem.php:99
+msgid "Edit menu"
+msgstr "Editar menu"
+
+#: ../../mod/mitem.php:102
+msgid "Edit element"
+msgstr "Editar elemento"
+
+#: ../../mod/mitem.php:103
+msgid "Drop element"
+msgstr "Descartar elemento"
+
+#: ../../mod/mitem.php:104
+msgid "New element"
+msgstr "Novo elemento"
+
+#: ../../mod/mitem.php:105
+msgid "Edit this menu container"
+msgstr "Editar esta caixa de menu"
+
+#: ../../mod/mitem.php:106
+msgid "Add menu element"
+msgstr "Adicionar um elemento de menu"
+
+#: ../../mod/mitem.php:107
+msgid "Delete this menu item"
+msgstr "Deleter este item de menu"
+
+#: ../../mod/mitem.php:108
+msgid "Edit this menu item"
+msgstr "Editar este item de menu"
+
+#: ../../mod/mitem.php:131
+msgid "New Menu Element"
+msgstr "Novo elemento de menu"
+
+#: ../../mod/mitem.php:133 ../../mod/mitem.php:176
+msgid "Menu Item Permissions"
+msgstr "Permissões do item do menu"
+
+#: ../../mod/mitem.php:134 ../../mod/mitem.php:177 ../../mod/settings.php:980
+msgid "(click to open/close)"
+msgstr "(clique para abrir/fechar)"
-#: ../../mod/manage.php:177
-msgid "Delegated Channels"
-msgstr "Canais delegados"
+#: ../../mod/mitem.php:136 ../../mod/mitem.php:180
+msgid "Link text"
+msgstr "Texto do link"
+
+#: ../../mod/mitem.php:137 ../../mod/mitem.php:181
+msgid "URL of link"
+msgstr "URL do link"
+
+#: ../../mod/mitem.php:138 ../../mod/mitem.php:182
+msgid "Use Red magic-auth if available"
+msgstr "Usar <em>Red magic-auth</em> se disponível"
+
+#: ../../mod/mitem.php:139 ../../mod/mitem.php:183
+msgid "Open link in new window"
+msgstr "Abrir link em uma nova janela"
+
+#: ../../mod/mitem.php:141 ../../mod/mitem.php:185
+msgid "Order in list"
+msgstr "Ordem na lista"
+
+#: ../../mod/mitem.php:141 ../../mod/mitem.php:185
+msgid "Higher numbers will sink to bottom of listing"
+msgstr "Números mais altos descem para o fim da lista"
+
+#: ../../mod/mitem.php:154
+msgid "Menu item not found."
+msgstr "O item de menu não foi encontrado."
+
+#: ../../mod/mitem.php:163
+msgid "Menu item deleted."
+msgstr "O item de menu foi deletado."
+
+#: ../../mod/mitem.php:165
+msgid "Menu item could not be deleted."
+msgstr "Não foi possível deletar o item de menu."
+
+#: ../../mod/mitem.php:174
+msgid "Edit Menu Element"
+msgstr "Editar elemento de menu"
+
+#: ../../mod/mitem.php:186 ../../mod/menu.php:114
+msgid "Modify"
+msgstr "Modificar"
-#: ../../mod/settings.php:76
+#: ../../mod/achievements.php:34
+msgid "Some blurb about what to do when you're new here"
+msgstr "Alguma coisa sobre o que fazer quando se é novo aqui"
+
+#: ../../mod/ping.php:237
+msgid "sent you a private message"
+msgstr "lhe enviou uma mensagem privada"
+
+#: ../../mod/ping.php:288
+msgid "added your channel"
+msgstr "adicionou seu canal"
+
+#: ../../mod/ping.php:329
+msgid "posted an event"
+msgstr "publicou um evento"
+
+#: ../../mod/acl.php:244
+msgid "network"
+msgstr "+ rede"
+
+#: ../../mod/settings.php:71
msgid "Name is required"
msgstr "É necessário informar o nome"
-#: ../../mod/settings.php:80
+#: ../../mod/settings.php:75
msgid "Key and Secret are required"
msgstr "A chave e o segredo são obrigatórios"
@@ -4703,75 +4821,87 @@ msgstr "Bem-vindo(a) a %s"
msgid "Image uploaded but image cropping failed."
msgstr "A imagem foi enviada, mas não foi possível cortá-la."
-#: ../../mod/profile_photo.php:162
-msgid "Image resize failed."
-msgstr "Falha ao modificar o tamanho da imagem."
+#: ../../mod/settings.php:1011
+msgid "Change the behaviour of this account for special situations"
+msgstr "Mudar o comportamento dessa conta em situações especiais"
-#: ../../mod/profile_photo.php:206
+#: ../../mod/settings.php:1014
msgid ""
-"Shift-reload the page or clear browser cache if the new photo does not "
-"display immediately."
-msgstr "Se a nova foto não aparecer imediatamente, recarregue a página segurando a tecla \"shift\" ou limpe o cache do navegador, "
+"Please enable expert mode (in <a href=\"settings/features\">Settings > "
+"Additional features</a>) to adjust!"
+msgstr "Por favor, habilite o modo expert (em <a href=\"settings/features\">Configurações > Recursos adicionais</a>) para ajustar!"
-#: ../../mod/profile_photo.php:233
-#, php-format
-msgid "Image exceeds size limit of %d"
-msgstr "A imagem excede o limite de tamanho de %d"
+#: ../../mod/settings.php:1015
+msgid "Miscellaneous Settings"
+msgstr "Configurações miscelâneas"
-#: ../../mod/profile_photo.php:242
-msgid "Unable to process image."
-msgstr "Não foi possível processar a imagem."
+#: ../../mod/settings.php:1017
+msgid "Personal menu to display in your channel pages"
+msgstr "Menu pessoal para exibir nas páginas dos seus canais"
-#: ../../mod/profile_photo.php:291 ../../mod/profile_photo.php:340
-msgid "Photo not available."
-msgstr "A foto não está disponível."
+#: ../../mod/settings.php:1018
+msgid "Remove this channel"
+msgstr "Remover este canal"
-#: ../../mod/profile_photo.php:359
-msgid "Upload File:"
-msgstr "Enviar arquivo:"
+#: ../../mod/poke.php:159
+msgid "Poke/Prod"
+msgstr "Cutucar/Espetar"
-#: ../../mod/profile_photo.php:360
-msgid "Select a profile:"
-msgstr "Selecione um perfil:"
+#: ../../mod/poke.php:160
+msgid "poke, prod or do other things to somebody"
+msgstr "Cutucar, espetar ou fazer outras coisas a alguém"
-#: ../../mod/profile_photo.php:361
-msgid "Upload Profile Photo"
-msgstr "Enviar foto do perfil"
+#: ../../mod/poke.php:161
+msgid "Recipient"
+msgstr "Destinatário"
-#: ../../mod/profile_photo.php:366
-msgid "skip this step"
-msgstr "pule esta etapa"
+#: ../../mod/poke.php:162
+msgid "Choose what you wish to do to recipient"
+msgstr "Escolha o que você deseja fazer com seu alvo"
-#: ../../mod/profile_photo.php:366
-msgid "select a photo from your photo albums"
-msgstr "selecione uma foto do seu álbum de fotos"
+#: ../../mod/poke.php:165
+msgid "Make this post private"
+msgstr "Torne esta publicação privada"
-#: ../../mod/profile_photo.php:382
-msgid "Crop Image"
-msgstr "Cortar a imagem"
+#: ../../mod/api.php:76 ../../mod/api.php:102
+msgid "Authorize application connection"
+msgstr "Autorizar a conexão com a aplicação"
-#: ../../mod/profile_photo.php:383
-msgid "Please adjust the image cropping for optimum viewing."
-msgstr "Por favor, ajuste o corte da imagem para a melhor visualização."
+#: ../../mod/api.php:77
+msgid "Return to your app and insert this Securty Code:"
+msgstr "Volte para a sua aplicação e digite este código de segurança:"
-#: ../../mod/profile_photo.php:385
-msgid "Done Editing"
-msgstr "Encerrar a edição"
+#: ../../mod/api.php:89
+msgid "Please login to continue."
+msgstr "Por favor, autentique-se para continuar."
-#: ../../mod/profile_photo.php:428
-msgid "Image uploaded successfully."
-msgstr "A imagem foi enviada com sucesso."
+#: ../../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 "Deseja autorizar esta aplicação a acessar suas publicações e contatos e/ou criar novas publicações para você?"
-#: ../../mod/profile_photo.php:430
-msgid "Image upload failed."
-msgstr "Não foi possível enviar a imagem."
+#: ../../mod/post.php:229
+msgid ""
+"Remote authentication blocked. You are logged into this site locally. Please"
+" logout and retry."
+msgstr "Autenticação remota bloqueada. Você está autenticado neste site localmente. Por favor, saia e tente novamente."
-#: ../../mod/profile_photo.php:439
+#: ../../mod/post.php:261 ../../mod/openid.php:72 ../../mod/openid.php:178
#, php-format
-msgid "Image size reduction [%s] failed."
-msgstr "Não foi possível reduzir o tamanho da imagem [%s]."
+msgid "Welcome %s. Remote authentication successful."
+msgstr "Bem vindo %s. Autenticação remota realizada com sucesso."
-#: ../../mod/block.php:27 ../../mod/page.php:33
+#: ../../mod/attach.php:9
+msgid "Item not available."
+msgstr "O item não está disponível."
+
+#: ../../mod/probe.php:23 ../../mod/probe.php:29
+#, php-format
+msgid "Fetching URL returns error: %1$s"
+msgstr "Carregar o URL retorna o erro: %1$s"
+
+#: ../../mod/block.php:27 ../../mod/page.php:35
msgid "Invalid item."
msgstr "Item inválido."
@@ -4784,13 +4914,14 @@ msgstr "O canal não foi encontrado."
msgid "Page not found."
msgstr "Página não encontrada."
-#: ../../mod/like.php:15
-msgid "Like/Dislike"
-msgstr "Gostar/Desgostar"
+#: ../../mod/siteinfo.php:126
+#, php-format
+msgid "Version %s"
+msgstr "Versão %s"
-#: ../../mod/like.php:20
-msgid "This action is restricted to members."
-msgstr "Esta ação é restrita a membros."
+#: ../../mod/siteinfo.php:145
+msgid "Installed plugins/addons/apps:"
+msgstr "Plugins/complementos/aplicações instalados:"
#: ../../mod/like.php:21
msgid ""
@@ -4798,36 +4929,39 @@ msgid ""
"href=\"register\">register as a new $Projectname member</a> to continue."
msgstr "Por favor <a href=\"rmagic\">entre com sua $Projectname ID</a> ou <a href=\"register\">registre-se como novo membro da $Projectname</a> para continuar."
-#: ../../mod/like.php:101 ../../mod/like.php:128 ../../mod/like.php:166
-msgid "Invalid request."
-msgstr "Solicitação inválida."
+#: ../../mod/siteinfo.php:166
+msgid "Red"
+msgstr "Red"
-#: ../../mod/like.php:143
-msgid "thing"
-msgstr "coisa"
+#: ../../mod/siteinfo.php:167
+msgid ""
+"This is a hub of the Hubzilla - a global cooperative network of "
+"decentralized privacy enhanced websites."
+msgstr "Este é um hub da Hubzilla - uma rede global cooperativa de websites descentralizados com privacidade aprimorada."
-#: ../../mod/like.php:189
-msgid "Channel unavailable."
-msgstr "Canal não disponível."
+#: ../../mod/siteinfo.php:170
+msgid "Running at web location"
+msgstr "Sendo executado no endereço web"
-#: ../../mod/like.php:228
-msgid "Previous action reversed."
-msgstr "Ação anterior revertida."
+#: ../../mod/siteinfo.php:171
+msgid ""
+"Please visit <a href=\"http://getzot.com\">GetZot.com</a> to learn more "
+"about the Hubzilla."
+msgstr "Para aprender mais sobre a Hubzilla, visite <a href=\"http://getzot.com\">GetZot.com</a>."
-#: ../../mod/like.php:398
-#, php-format
-msgid "%1$s agrees with %2$s's %3$s"
-msgstr "%1$s concordam com %2$s %3$s"
+#: ../../mod/siteinfo.php:172
+msgid "Bug reports and issues: please visit"
+msgstr "Relatos e acompanhamentos de erros podem ser encontrados em"
-#: ../../mod/like.php:400
-#, php-format
-msgid "%1$s doesn't agree with %2$s's %3$s"
-msgstr "%1$s não concordam com %2$s %3$s"
+#: ../../mod/siteinfo.php:175
+msgid ""
+"Suggestions, praise, etc. - please email \"hubzilla\" at librelist - dot "
+"com"
+msgstr "Sugestões, elogios, etc - mande um e-mail para \"hubzilla\" arrôba librelist ponto com"
-#: ../../mod/like.php:402
-#, php-format
-msgid "%1$s abstains from a decision on %2$s's %3$s"
-msgstr "%1$s se abstém da decisão sobre %2$s %3$s"
+#: ../../mod/siteinfo.php:177
+msgid "Site Administrators"
+msgstr "Administradores do site"
#: ../../mod/like.php:404
#, php-format
@@ -4844,93 +4978,93 @@ msgstr "%1$s não comparecerá em %3$s de %2$s"
msgid "%1$s may attend %2$s's %3$s"
msgstr "%1$s talvez compareça em %3$s de %2$s"
-#: ../../mod/like.php:492
-msgid "Action completed."
-msgstr "Ação completada."
+#: ../../mod/profiles.php:56 ../../mod/profiles.php:92
+msgid "Profile-"
+msgstr "Perfil-"
-#: ../../mod/like.php:493
-msgid "Thank you."
-msgstr "Obrigado."
+#: ../../mod/profiles.php:77 ../../mod/profiles.php:120
+msgid "New profile created."
+msgstr "O novo perfil foi criado."
#: ../../mod/events.php:87
msgid "Event can not end before it has started."
msgstr "Um evento não pode terminar antes de seu início."
-#: ../../mod/events.php:89 ../../mod/events.php:98 ../../mod/events.php:116
-msgid "Unable to generate preview."
-msgstr "Não pode gerar pré-visualização."
+#: ../../mod/profiles.php:136
+msgid "Profile unavailable to export."
+msgstr "Perfil indisponível para exportar."
-#: ../../mod/events.php:96
-msgid "Event title and start time are required."
-msgstr "O título do evento e a hora de início são obrigatórios."
+#: ../../mod/profiles.php:232
+msgid "Profile Name is required."
+msgstr "É obrigatório informar o nome do perfil."
-#: ../../mod/events.php:114
-msgid "Event not found."
-msgstr "Evento não encontrado."
+#: ../../mod/profiles.php:390
+msgid "Marital Status"
+msgstr "Estado civil"
-#: ../../mod/events.php:396
-msgid "l, F j"
-msgstr "l, F j"
+#: ../../mod/profiles.php:394
+msgid "Romantic Partner"
+msgstr "Parceiro/a romântico/a"
-#: ../../mod/events.php:418
-msgid "Edit event"
-msgstr "Editar o evento"
+#: ../../mod/profiles.php:398
+msgid "Likes"
+msgstr "Gosta de"
-#: ../../mod/events.php:419
-msgid "Delete event"
-msgstr "Excluir evento"
+#: ../../mod/profiles.php:402
+msgid "Dislikes"
+msgstr "Não gosta de"
-#: ../../mod/events.php:473
-msgid "Create New Event"
-msgstr "Criar um novo evento"
+#: ../../mod/profiles.php:406
+msgid "Work/Employment"
+msgstr "Trabalho/Emprego"
-#: ../../mod/events.php:474 ../../mod/photos.php:827
-msgid "Previous"
-msgstr "Anterior"
+#: ../../mod/profiles.php:409
+msgid "Religion"
+msgstr "Religião"
-#: ../../mod/events.php:475 ../../mod/setup.php:265 ../../mod/photos.php:836
-msgid "Next"
-msgstr "Próximo"
+#: ../../mod/profiles.php:413
+msgid "Political Views"
+msgstr "Posição política"
-#: ../../mod/events.php:476
-msgid "Export"
-msgstr "Exportar"
+#: ../../mod/profiles.php:417
+msgid "Gender"
+msgstr "Gênero"
-#: ../../mod/events.php:504
-msgid "Event removed"
-msgstr "Evento removido"
+#: ../../mod/profiles.php:421
+msgid "Sexual Preference"
+msgstr "Preferência sexual"
-#: ../../mod/events.php:507
-msgid "Failed to remove event"
-msgstr "Falha ao excluir evento"
+#: ../../mod/profiles.php:425
+msgid "Homepage"
+msgstr "Página web"
-#: ../../mod/events.php:627
-msgid "Event details"
-msgstr "Detalhes do evento"
+#: ../../mod/profiles.php:429
+msgid "Interests"
+msgstr "Interesses"
-#: ../../mod/events.php:628
-msgid "Starting date and Title are required."
-msgstr "Data de início e título são obrigatórios."
+#: ../../mod/profiles.php:433 ../../mod/admin.php:868
+msgid "Address"
+msgstr "Endereço"
-#: ../../mod/events.php:630
-msgid "Categories (comma-separated list)"
-msgstr "Categorias (lista separada por vírgulas)"
+#: ../../mod/profiles.php:440 ../../mod/pubsites.php:25
+msgid "Location"
+msgstr "Localização"
-#: ../../mod/events.php:632
-msgid "Event Starts:"
-msgstr "Início do evento:"
+#: ../../mod/profiles.php:523
+msgid "Profile updated."
+msgstr "O perfil foi atualizado."
-#: ../../mod/events.php:639
-msgid "Finish date/time is not known or not relevant"
-msgstr "A data/hora de término não é conhecida ou não é relevante"
+#: ../../mod/profiles.php:600
+msgid "Hide your contact/friend list from viewers of this profile?"
+msgstr "Esconder sua lista de contatos/amigos dos visitantes no seu perfil?"
-#: ../../mod/events.php:641
-msgid "Event Finishes:"
-msgstr "Término do evento:"
+#: ../../mod/profiles.php:642
+msgid "Edit Profile Details"
+msgstr "Editar os detalhes do perfil"
-#: ../../mod/events.php:643 ../../mod/events.php:644
-msgid "Adjust for viewer timezone"
-msgstr "Ajustar para o fuso horário do visualizador"
+#: ../../mod/profiles.php:644
+msgid "View this profile"
+msgstr "Ver este perfil"
#: ../../mod/events.php:643
msgid ""
@@ -4938,26 +5072,25 @@ msgid ""
"global holidays."
msgstr "Importante para eventos que ocorrem em um lugar específico. Não prático para feriados globais."
-#: ../../mod/events.php:645
-msgid "Description:"
-msgstr "Descrição:"
+#: ../../mod/profiles.php:647
+msgid "Create a new profile using these settings"
+msgstr "Criar um novo perfil usando estas configurações"
-#: ../../mod/events.php:649
-msgid "Title:"
-msgstr "Título:"
+#: ../../mod/profiles.php:648
+msgid "Clone this profile"
+msgstr "Clonar este perfil"
-#: ../../mod/events.php:651
-msgid "Share this event"
-msgstr "Compartilhar este evento"
+#: ../../mod/profiles.php:649
+msgid "Delete this profile"
+msgstr "Excluir este perfil"
-#: ../../mod/subthread.php:103
-#, php-format
-msgid "%1$s is following %2$s's %3$s"
-msgstr "%1$s está acompanhando %3$s de %2$s"
+#: ../../mod/profiles.php:651
+msgid "Import profile from file"
+msgstr "Importar perfil dum arquivo"
-#: ../../mod/pubsites.php:16
-msgid "Public Sites"
-msgstr "Sites públicos"
+#: ../../mod/profiles.php:652
+msgid "Export profile to file"
+msgstr "Exportar perfil para arquivo"
#: ../../mod/pubsites.php:19
msgid ""
@@ -4968,106 +5101,106 @@ msgid ""
"provide additional details."
msgstr "Os sites listados permitem ao público geral registrar contas na $Projectname. Todos os sites na matrix são interligados, portanto ser membro em qualquer um deles te torna membro na matrix como um todo. Alguns sites podem solicitar uma assinatura ou prover planos em níveis. Os links para cada provedor <strong>podem</strong> fornecer mais detalhes."
-#: ../../mod/pubsites.php:25
-msgid "Rate this hub"
-msgstr "Avalie esse hub."
+#: ../../mod/profiles.php:654
+msgid "Your Full Name:"
+msgstr "Seu nome completo:"
-#: ../../mod/pubsites.php:26
-msgid "Site URL"
-msgstr "URL do site"
+#: ../../mod/profiles.php:655
+msgid "Title/Description:"
+msgstr "Título/Descrição:"
-#: ../../mod/pubsites.php:26
-msgid "Access Type"
-msgstr "Tipo de acesso"
+#: ../../mod/profiles.php:656
+msgid "Your Gender:"
+msgstr "Seu gênero:"
-#: ../../mod/pubsites.php:26
-msgid "Registration Policy"
-msgstr "Política de registro"
+#: ../../mod/profiles.php:657
+#, php-format
+msgid "Birthday (%s):"
+msgstr "Aniversário (%s):"
-#: ../../mod/pubsites.php:26 ../../mod/profiles.php:454
-msgid "Location"
-msgstr "Localização"
+#: ../../mod/profiles.php:658
+msgid "Street Address:"
+msgstr "Endereço:"
-#: ../../mod/pubsites.php:26
-msgid "View hub ratings"
-msgstr "Ver avaliações do hub"
+#: ../../mod/profiles.php:659
+msgid "Locality/City:"
+msgstr "Localidade/Cidade:"
-#: ../../mod/pubsites.php:30
-msgid "Rate"
-msgstr "Avalie"
+#: ../../mod/profiles.php:660
+msgid "Postal/Zip Code:"
+msgstr "CEP:"
-#: ../../mod/pubsites.php:31
-msgid "View ratings"
-msgstr "Veja avaliações"
+#: ../../mod/profiles.php:661
+msgid "Country:"
+msgstr "País:"
-#: ../../mod/rpost.php:131 ../../mod/editpost.php:42
-msgid "Edit post"
-msgstr "Editar a publicação"
+#: ../../mod/profiles.php:662
+msgid "Region/State:"
+msgstr "Região/Estado:"
#: ../../mod/dav.php:121
msgid "$Projectname channel"
msgstr "Canal na $Projectname"
-#: ../../mod/group.php:20
-msgid "Collection created."
-msgstr "A coleção foi criada."
+#: ../../mod/profiles.php:664
+msgid "Who: (if applicable)"
+msgstr "Quem: (se aplicável)"
-#: ../../mod/group.php:26
-msgid "Could not create collection."
-msgstr "Não foi possível criar a coleção."
+#: ../../mod/profiles.php:665
+msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
+msgstr "Exemplos: fulano123, Fulano de Tal, fulano@exemplo.com"
-#: ../../mod/group.php:54
-msgid "Collection updated."
-msgstr "Coleção atualizada"
+#: ../../mod/profiles.php:666
+msgid "Since [date]:"
+msgstr "Desde [data]:"
-#: ../../mod/group.php:86
-msgid "Create a collection of channels."
-msgstr "Criar uma coleção de canais."
+#: ../../mod/profiles.php:668
+msgid "Homepage URL:"
+msgstr "Endereço do website:"
-#: ../../mod/group.php:87 ../../mod/group.php:183
-msgid "Collection Name: "
-msgstr "Nome da coleção:"
+#: ../../mod/profiles.php:671
+msgid "Religious Views:"
+msgstr "Orientação religiosa:"
-#: ../../mod/group.php:89 ../../mod/group.php:186
-msgid "Members are visible to other channels"
-msgstr "Membros são visíveis para outros canais"
+#: ../../mod/profiles.php:672
+msgid "Keywords:"
+msgstr "Palavras-chave:"
-#: ../../mod/group.php:107
-msgid "Collection removed."
-msgstr "Coleção removida."
+#: ../../mod/profiles.php:675
+msgid "Example: fishing photography software"
+msgstr "Exemplo: pesca fotografia software"
-#: ../../mod/group.php:109
-msgid "Unable to remove collection."
-msgstr "Não foi possível remover a coleção."
+#: ../../mod/profiles.php:676
+msgid "Used in directory listings"
+msgstr "Usado em listas de diretório"
-#: ../../mod/group.php:182
-msgid "Collection Editor"
-msgstr "Editor de coleção"
+#: ../../mod/profiles.php:677
+msgid "Tell us about yourself..."
+msgstr "Fale um pouco sobre você..."
-#: ../../mod/group.php:196 ../../mod/bulksetclose.php:89
-msgid "Members"
-msgstr "Membros"
+#: ../../mod/profiles.php:678
+msgid "Hobbies/Interests"
+msgstr "Hobbies/Interesses"
-#: ../../mod/group.php:198 ../../mod/bulksetclose.php:91
-msgid "All Connected Channels"
-msgstr "Todas os canais conectados"
+#: ../../mod/profiles.php:679
+msgid "Contact information and Social Networks"
+msgstr "Informações de contato e redes sociais"
-#: ../../mod/group.php:233 ../../mod/bulksetclose.php:126
-msgid "Click on a channel to add or remove."
-msgstr "Clique em um canal para adicionar ou remover."
+#: ../../mod/profiles.php:680
+msgid "My other channels"
+msgstr "Meus outros canais"
-#: ../../mod/siteinfo.php:112
-#, php-format
-msgid "Version %s"
-msgstr "Versão %s"
+#: ../../mod/profiles.php:681
+msgid "Musical interests"
+msgstr "Interesses musicais"
-#: ../../mod/siteinfo.php:133
-msgid "Installed plugins/addons/apps:"
-msgstr "Plugins/complementos/aplicações instalados:"
+#: ../../mod/profiles.php:682
+msgid "Books, literature"
+msgstr "Livros, literatura"
-#: ../../mod/siteinfo.php:146
-msgid "No installed plugins/addons/apps"
-msgstr "Nenhum plugin/complemento/aplicação instalado"
+#: ../../mod/profiles.php:683
+msgid "Television"
+msgstr "Televisão"
#: ../../mod/siteinfo.php:156
msgid ""
@@ -5075,17 +5208,17 @@ msgid ""
"decentralized privacy enhanced websites."
msgstr "Este é um hub da $Projectname - uma rede global cooperativa de websites descentralizados com privacidade aprimorada."
-#: ../../mod/siteinfo.php:158
-msgid "Tag: "
-msgstr "Etiqueta:"
+#: ../../mod/profiles.php:686
+msgid "Work/employment"
+msgstr "Trabalho/emprego"
-#: ../../mod/siteinfo.php:160
-msgid "Last background fetch: "
-msgstr "Buscar último fundo:"
+#: ../../mod/profiles.php:687
+msgid "School/education"
+msgstr "Escola/educação"
-#: ../../mod/siteinfo.php:163
-msgid "Running at web location"
-msgstr "Sendo executado no endereço web"
+#: ../../mod/profiles.php:693
+msgid "This is your default profile."
+msgstr "Este é seu perfil padrão."
#: ../../mod/siteinfo.php:164
msgid ""
@@ -5093,71 +5226,70 @@ msgid ""
" about $Projectname."
msgstr "Por favor visite <a href=\"https://redmatrix.me\">redmatrix.me</a> para aprender mais sobre a $Projectname."
-#: ../../mod/siteinfo.php:165
-msgid "Bug reports and issues: please visit"
-msgstr "Relatos e acompanhamentos de erros podem ser encontrados em"
+#: ../../mod/profiles.php:747
+msgid "Edit/Manage Profiles"
+msgstr "Editar/Administrar perfis"
-#: ../../mod/siteinfo.php:168
-msgid ""
-"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot "
-"com"
-msgstr "Sugestões, elogios, etc - mande um e-mail para \"redmatrix\" arrôba librelist ponto com"
+#: ../../mod/profiles.php:748
+msgid "Add profile things"
+msgstr "Adicionar coisas ao perfil"
-#: ../../mod/siteinfo.php:170
-msgid "Site Administrators"
-msgstr "Administradores do site"
+#: ../../mod/profiles.php:749
+msgid "Include desirable objects in your profile"
+msgstr "Inclua objetos desejáveis no seu perfil"
-#: ../../mod/help.php:49 ../../mod/help.php:55 ../../mod/help.php:61
-msgid "Help:"
-msgstr "Ajuda:"
+#: ../../mod/bookmarks.php:38
+msgid "Bookmark added"
+msgstr "O link foi guardado"
-#: ../../mod/help.php:76 ../../index.php:238
-msgid "Not Found"
-msgstr "Não encontrada"
+#: ../../mod/bookmarks.php:58
+msgid "My Bookmarks"
+msgstr "Meus links guardados"
#: ../../mod/setup.php:166
msgid "$Projectname Server - Setup"
msgstr "Servidor $Projectname - Configuração"
-#: ../../mod/setup.php:172
-msgid "Could not connect to database."
-msgstr "Não foi possível conectar ao banco de dados."
+#: ../../mod/profperm.php:29 ../../mod/profperm.php:58
+msgid "Invalid profile identifier."
+msgstr "Identificador de perfil inválido."
-#: ../../mod/setup.php:176
-msgid ""
-"Could not connect to specified site URL. Possible SSL certificate or DNS "
-"issue."
-msgstr "Não foi possível conectar à URL especificada para o site. Provavlmente um problema de DNS ou com o certificado SSL."
+#: ../../mod/profperm.php:110
+msgid "Profile Visibility Editor"
+msgstr "Editor de visibilidade do perfil"
-#: ../../mod/setup.php:183
-msgid "Could not create table."
-msgstr "Não foi possível criar a tabela."
+#: ../../mod/profperm.php:114
+msgid "Click on a contact to add or remove."
+msgstr "Clique em um contato para adicionar ou remover."
-#: ../../mod/setup.php:189
-msgid "Your site database has been installed."
-msgstr "O banco de dados do seu site foi instalado."
+#: ../../mod/profperm.php:123
+msgid "Visible To"
+msgstr "Visível para"
-#: ../../mod/setup.php:194
-msgid ""
-"You may need to import the file \"install/schema_xxx.sql\" manually using a "
-"database client."
-msgstr "Você pode precisar importar o arquivo \"install/schema_xxx.sql\" manualmente usando um cliente do banco de dados."
+#: ../../mod/profperm.php:139 ../../mod/connections.php:279
+msgid "All Connections"
+msgstr "Todas as conexões"
-#: ../../mod/setup.php:195 ../../mod/setup.php:264 ../../mod/setup.php:662
-msgid "Please see the file \"install/INSTALL.txt\"."
-msgstr "Por favor, veja o arquivo \"install/INSTALL.txt\"."
+#: ../../mod/pubsites.php:16
+msgid "Public Sites"
+msgstr "Sites públicos"
-#: ../../mod/setup.php:261
-msgid "System check"
-msgstr "Checagem do sistema"
+#: ../../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 "Os sites listados permitem ao público geral registrar contas na Hubzilla. Todos os sites na matrix são interligados, portanto ser membro em qualquer um deles te torna membro na matrix como um todo. Alguns sites podem solicitar uma assinatura ou prover planos em níveis. Os links para cada provedor <strong>podem</strong> fornecer mais detalhes."
-#: ../../mod/setup.php:266
-msgid "Check again"
-msgstr "Cheque novamente"
+#: ../../mod/pubsites.php:25
+msgid "Site URL"
+msgstr "URL do site"
-#: ../../mod/setup.php:289
-msgid "Database connection"
-msgstr "Conexão ao banco de dados"
+#: ../../mod/pubsites.php:25
+msgid "Access Type"
+msgstr "Tipo de acesso"
#: ../../mod/setup.php:290
msgid ""
@@ -5165,447 +5297,395 @@ msgid ""
"database."
msgstr "Para instalar a $Projectname é necessário saber como se conectar ao seu banco de dados."
-#: ../../mod/setup.php:291
-msgid ""
-"Please contact your hosting provider or site administrator if you have "
-"questions about these settings."
-msgstr "Por favor, entre em contato com a sua hospedagem ou com o administrador do site caso você tenha alguma dúvida em relação a isso."
+#: ../../mod/channel.php:25 ../../mod/chat.php:19
+msgid "You must be logged in to see this page."
+msgstr "Você precisa estar autenticado para ver esta página."
-#: ../../mod/setup.php:292
-msgid ""
-"The database you specify below should already exist. If it does not, please "
-"create it before continuing."
-msgstr "O banco de dados que você especificar abaixo já deve existir. Caso contrário, crie-o antes de prosseguir."
+#: ../../mod/channel.php:86
+msgid "Insufficient permissions. Request redirected to profile page."
+msgstr "Permissões insuficientes. Requisição redirecionada para a página de perfil."
-#: ../../mod/setup.php:296
-msgid "Database Server Name"
-msgstr "Nome do servidor de banco de dados"
+#: ../../mod/rbmark.php:88
+msgid "Select a bookmark folder"
+msgstr "Escolha uma pasta de links onde guardar"
-#: ../../mod/setup.php:296
-msgid "Default is localhost"
-msgstr "O default é localhost"
+#: ../../mod/rbmark.php:93
+msgid "Save Bookmark"
+msgstr "Guardar link"
-#: ../../mod/setup.php:297
-msgid "Database Port"
-msgstr "Porta do banco de dados"
+#: ../../mod/rbmark.php:94
+msgid "URL of bookmark"
+msgstr "URL do link guardado"
-#: ../../mod/setup.php:297
-msgid "Communication port number - use 0 for default"
-msgstr "Número da porta de comunicação - use 0 para o default"
+#: ../../mod/rbmark.php:95 ../../mod/appman.php:93
+msgid "Description"
+msgstr "Descrição"
-#: ../../mod/setup.php:298
-msgid "Database Login Name"
-msgstr "Nome do usuário do banco de dados"
+#: ../../mod/rbmark.php:99
+msgid "Or enter new bookmark folder name"
+msgstr "Ou digite o nome para uma nova pasta de links"
-#: ../../mod/setup.php:299
-msgid "Database Login Password"
-msgstr "Senha do usuário do banco de dados"
+#: ../../mod/chat.php:167
+msgid "Room not found"
+msgstr "Sala não encontrada"
-#: ../../mod/setup.php:300
-msgid "Database Name"
-msgstr "Nome do banco de dados"
+#: ../../mod/chat.php:178
+msgid "Leave Room"
+msgstr "Sair da sala"
-#: ../../mod/setup.php:301
-msgid "Database Type"
-msgstr "Tipo do banco de dados"
+#: ../../mod/chat.php:179
+msgid "Delete This Room"
+msgstr "Deletar esta sala"
-#: ../../mod/setup.php:303 ../../mod/setup.php:347
-msgid "Site administrator email address"
-msgstr "Endereço de email do administrador do site"
+#: ../../mod/chat.php:180
+msgid "I am away right now"
+msgstr "Eu estou ausente no momento"
-#: ../../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 "O endereço de email da sua conta deve ser igual a este para que você possa utilizar o painel de administração web."
+#: ../../mod/chat.php:181
+msgid "I am online"
+msgstr "Eu estou online"
-#: ../../mod/setup.php:304 ../../mod/setup.php:349
-msgid "Website URL"
-msgstr "URL do website"
+#: ../../mod/chat.php:183
+msgid "Bookmark this room"
+msgstr "Guarde esta sala"
-#: ../../mod/setup.php:304 ../../mod/setup.php:349
-msgid "Please use SSL (https) URL if available."
-msgstr "Por favor, use uma URL SSL (https) se disponível."
+#: ../../mod/chat.php:207 ../../mod/chat.php:229
+msgid "New Chatroom"
+msgstr "Nova sala de bate-papo"
-#: ../../mod/setup.php:307 ../../mod/setup.php:352
-msgid "Please select a default timezone for your website"
-msgstr "Por favor, selecione o fuso horário padrão para o seu site"
+#: ../../mod/chat.php:208
+msgid "Chatroom Name"
+msgstr "Nome da sala de bate-papo"
-#: ../../mod/setup.php:335
-msgid "Site settings"
-msgstr "Configurações do site"
+#: ../../mod/chat.php:225
+#, php-format
+msgid "%1$s's Chatrooms"
+msgstr "Salas de bate-papo de %1$s"
-#: ../../mod/setup.php:395
-msgid "Could not find a command line version of PHP in the web server PATH."
-msgstr "Não foi possível encontrar uma versão de linha de comando do PHP nos caminhos do seu servidor web."
+#: ../../mod/register.php:42
+msgid "Maximum daily site registrations exceeded. Please try again tomorrow."
+msgstr "Número máximo de novos registros neste site excedido por hoje. Por favor, tente novamente amanhã."
-#: ../../mod/setup.php:396
+#: ../../mod/register.php:48
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 "Caso você não tenha uma versão de linha de comando do PHP instalada no seu servidor, você não será capaz de executar coletas em segundo plano pelo cron."
+"Please indicate acceptance of the Terms of Service. Registration failed."
+msgstr "Por favor, indique a aceitação dos Termos de Serviço. Falha ao registrar."
-#: ../../mod/setup.php:400
-msgid "PHP executable path"
-msgstr "Caminho para o executável do PHP"
+#: ../../mod/register.php:82
+msgid "Passwords do not match."
+msgstr "Senhas não conferem."
-#: ../../mod/setup.php:400
+#: ../../mod/register.php:115
msgid ""
-"Enter full path to php executable. You can leave this blank to continue the "
-"installation."
-msgstr "Digite o caminho completo do executável PHP. Você pode deixar isso em branco para continuar com a instalação."
+"Registration successful. Please check your email for validation "
+"instructions."
+msgstr "O registro foi bem sucedido. Por favor, verifique seu e-mail para confirmar o registro."
-#: ../../mod/setup.php:405
-msgid "Command line PHP"
-msgstr "PHP em linha de comando"
+#: ../../mod/register.php:121
+msgid "Your registration is pending approval by the site owner."
+msgstr "A aprovação do seu registro está pendente junto ao administrador do site."
-#: ../../mod/setup.php:414
-msgid ""
-"The command line version of PHP on your system does not have "
-"\"register_argc_argv\" enabled."
-msgstr "\"register_argc_argv\" não está habilitado na versão de linha de comando do PHP no seu sistema."
+#: ../../mod/register.php:124
+msgid "Your registration can not be processed."
+msgstr "Não foi possível processar o seu registro."
-#: ../../mod/setup.php:415
-msgid "This is required for message delivery to work."
-msgstr "Isto é necessário para o funcionamento do envio de mensagens."
+#: ../../mod/register.php:161
+msgid "Registration on this site/hub is by approval only."
+msgstr "O registro neste site/hub requer aprovação."
-#: ../../mod/setup.php:417
-msgid "PHP register_argc_argv"
-msgstr "PHP register_argc_argv"
+#: ../../mod/register.php:162
+msgid "<a href=\"pubsites\">Register at another affiliated site/hub</a>"
+msgstr "<a href=\"pubsites\">Registre em um outro site/hub afiliado</a>"
-#: ../../mod/setup.php:438
+#: ../../mod/register.php:170
msgid ""
-"Error: the \"openssl_pkey_new\" function on this system is not able to "
-"generate encryption keys"
-msgstr "Erro: a função \"openssl_pkey_new\" no seu sistema não é capaz de gerar as chaves de criptografia"
+"This site has exceeded the number of allowed daily account registrations. "
+"Please try again tomorrow."
+msgstr "Este site excedeu o número máximo de registros de novas contas. Por favor, tente novamente amanhã."
-#: ../../mod/setup.php:439
-msgid ""
-"If running under Windows, please see "
-"\"http://www.php.net/manual/en/openssl.installation.php\"."
-msgstr "Se estiver usando o Windows, por favor dê uma olhada em \"http://www.php.net/manual/en/openssl.installation.php\"."
+#: ../../mod/register.php:181
+msgid "Terms of Service"
+msgstr "Termos de Serviço"
-#: ../../mod/setup.php:441
-msgid "Generate encryption keys"
-msgstr "Gerar chaves de criptografia"
+#: ../../mod/register.php:187
+#, php-format
+msgid "I accept the %s for this website"
+msgstr "Eu aceito os %s deste website."
-#: ../../mod/setup.php:448
-msgid "libCurl PHP module"
-msgstr "Módulo PHP libCurl"
+#: ../../mod/register.php:189
+#, php-format
+msgid "I am over 13 years of age and accept the %s for this website"
+msgstr "Eu sou maior de 13 anos e aceito os %s deste website"
-#: ../../mod/setup.php:449
-msgid "GD graphics PHP module"
-msgstr "Módulo PHP GD graphics"
+#: ../../mod/register.php:203 ../../mod/admin.php:415
+msgid "Registration"
+msgstr "Registro"
-#: ../../mod/setup.php:450
-msgid "OpenSSL PHP module"
-msgstr "Módulo PHP OpenSSL"
+#: ../../mod/register.php:208
+msgid "Membership on this site is by invitation only."
+msgstr "Novas contas neste site se dão apenas por convite."
-#: ../../mod/setup.php:451
-msgid "mysqli or postgres PHP module"
-msgstr "módulo 'mysqli' ou 'postgres' do PHP"
+#: ../../mod/register.php:209
+msgid "Please enter your invitation code"
+msgstr "Por favor, digite o código do seu convite"
-#: ../../mod/setup.php:452
-msgid "mb_string PHP module"
-msgstr "Módulo PHP mb_string "
+#: ../../mod/register.php:212
+msgid "Your email address"
+msgstr "Seu endereço de e-mail"
-#: ../../mod/setup.php:453
-msgid "mcrypt PHP module"
-msgstr "Módulo PHP mcrypt"
+#: ../../mod/register.php:213
+msgid "Choose a password"
+msgstr "Escolha uma senha"
-#: ../../mod/setup.php:458 ../../mod/setup.php:460
-msgid "Apache mod_rewrite module"
-msgstr "Módulo mod_rewrite do Apache"
+#: ../../mod/register.php:214
+msgid "Please re-enter your password"
+msgstr "Por favor, digite sua senha novamente"
-#: ../../mod/setup.php:458
-msgid ""
-"Error: Apache webserver mod-rewrite module is required but not installed."
-msgstr "Erro: o módulo mod-rewrite do Apache é necessário, mas não está instalado."
+#: ../../mod/chatsvc.php:111
+msgid "Away"
+msgstr "Ausente"
-#: ../../mod/setup.php:464 ../../mod/setup.php:467
-msgid "proc_open"
-msgstr "proc_open"
+#: ../../mod/chatsvc.php:115
+msgid "Online"
+msgstr "Online"
-#: ../../mod/setup.php:464
-msgid ""
-"Error: proc_open is required but is either not installed or has been "
-"disabled in php.ini"
-msgstr "Erro: proc_open é necessário, mas não está instalado ou foi desabilitado no php.ini"
+#: ../../mod/regmod.php:11
+msgid "Please login."
+msgstr "Por favor, autentique-se."
-#: ../../mod/setup.php:472
-msgid "Error: libCURL PHP module required but not installed."
-msgstr "Erro: o módulo libCURL do PHP é necessário, mas não está instalado."
+#: ../../mod/cloud.php:126
+msgid "Hubzilla - Guests: Username: {your email address}, Password: +++"
+msgstr "Hubzilla - Visitantes: Usuário: {seu endereço de e-mail}, Senha: +++"
-#: ../../mod/setup.php:476
+#: ../../mod/removeme.php:29
msgid ""
-"Error: GD graphics PHP module with JPEG support required but not installed."
-msgstr "Erro: o módulo gráfico GD, com suporte a JPEG, do PHP é necessário, mas não está instalado."
+"Channel removals are not allowed within 48 hours of changing the account "
+"password."
+msgstr "A remoção da canais fica desabilitada por 48 horas após uma troca de senha da conta."
-#: ../../mod/setup.php:480
-msgid "Error: openssl PHP module required but not installed."
-msgstr "Erro: o módulo openssl do PHP é necessário, mas não está instalado."
+#: ../../mod/removeme.php:57
+msgid "Remove This Channel"
+msgstr "Remover este canal"
-#: ../../mod/setup.php:484
+#: ../../mod/removeme.php:58
msgid ""
-"Error: mysqli or postgres PHP module required but neither are installed."
-msgstr "Erro: módulo 'mysqli' ou 'postgres' do PHP é necessário mas nenhum deles está instalado."
+"This will completely remove this channel from the network. Once this has "
+"been done it is not recoverable."
+msgstr "Isso irá remover completamente este canal da rede. Uma vez que seja feito não será possível recuperá-lo."
-#: ../../mod/setup.php:488
-msgid "Error: mb_string PHP module required but not installed."
-msgstr "Erro: o módulo mb_string do PHP é necessário, mas não está instalado."
-
-#: ../../mod/setup.php:492
-msgid "Error: mcrypt PHP module required but not installed."
-msgstr "Erro: o módulo mcrypt do PHP é necessário, mas não está instalado."
+#: ../../mod/removeme.php:59 ../../mod/removeaccount.php:59
+msgid "Please enter your password for verification:"
+msgstr "Por favor, digite a sua senha para verificação:"
-#: ../../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 "O instalador web precisa criar um arquivo chamado \".htconfig.php\" na pasta raiz da instalação e não está conseguindo."
+#: ../../mod/removeme.php:60
+msgid "Remove this channel and all its clones from the network"
+msgstr "Remover este canal e todos os seus clones da rede"
-#: ../../mod/setup.php:509
+#: ../../mod/removeme.php:60
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 "Geralmente isso está relacionado às definições de permissão, uma vez que o servidor web pode não estar conseguindo escrever os arquivos nesta pasta."
+"By default only the instance of the channel located on this hub will be "
+"removed from the network"
+msgstr "Por padrão, apenas a instância do canal localizada neste hub será removida da rede"
-#: ../../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 "Ao final desse procedimento, será fornecido um texto que deverá ser salvo em um arquivo de nome .htconfig.php, na pasta raiz do seu Red."
+#: ../../mod/removeme.php:61
+msgid "Remove Channel"
+msgstr "Remover canal"
-#: ../../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 "Você também pode pular esse procedimento e executar uma instalação manual. Por favor, dê uma olhada no arquivo \"install/INSTALL.TXT\" para instruções."
+#: ../../mod/common.php:10
+msgid "No channel."
+msgstr "Nenhum canal."
-#: ../../mod/setup.php:514
-msgid ".htconfig.php is writable"
-msgstr ".htconfig.php tem permissão de escrita"
+#: ../../mod/common.php:39
+msgid "Common connections"
+msgstr "Conexões em comum"
-#: ../../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 o engine de template Smarty3 para renderizar suas telas. Smarty3 compila templates para PHP para acelerar a renderização."
+#: ../../mod/common.php:44
+msgid "No connections in common."
+msgstr "Nenhuma conexão em comum."
-#: ../../mod/setup.php:525
-#, php-format
+#: ../../mod/rmagic.php:38
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 guardar os templates compilados, o servidor web necessita de permissão de escrita no diretório %s no diretório raiz da Red."
+"We encountered a problem while logging in with the OpenID you provided. "
+"Please check the correct spelling of the ID."
+msgstr "Encontramos um problema ao entrar com a OpenID fornecida. Por favor, verifique se digitou corretamente a ID."
-#: ../../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 "Por favor, certifique-se de que o usuário sob o qual o servidor web roda (ex: www-data) tenha permissão de escrita nesse diretório."
+#: ../../mod/rmagic.php:38
+msgid "The error message was:"
+msgstr "A mensagem de erro foi:"
-#: ../../mod/setup.php:527
-#, 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 uma medida de segurança, você deve fornecer ao servidor web permissão de escrita somente em %s e não aos arquivos de template (.tpl) que ele contém."
+#: ../../mod/rmagic.php:42
+msgid "Authentication failed."
+msgstr "A autenticação falhou."
-#: ../../mod/setup.php:530
-#, php-format
-msgid "%s is writable"
-msgstr "%s tem permissão de escrita"
+#: ../../mod/rmagic.php:82
+msgid "Remote Authentication"
+msgstr "Autenticação remota"
-#: ../../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 "A Red usa o diretório store para salvar arquivos carregados. O servidor web necessita de permissão de escrita no diretório store dentro do diretório raiz da Red"
+#: ../../mod/rmagic.php:83
+msgid "Enter your channel address (e.g. channel@example.com)"
+msgstr "Entre o endereço do seu canal (e.g. canal@exemplo.com)"
-#: ../../mod/setup.php:547
-msgid "store is writable"
-msgstr "store tem permissão de escrita"
+#: ../../mod/rmagic.php:84
+msgid "Authenticate"
+msgstr "Autenticar"
-#: ../../mod/setup.php:577
-msgid ""
-"SSL certificate cannot be validated. Fix certificate or disable https access"
-" to this site."
-msgstr "Não foi possível validar o certificado SSL. Corrija o certificado ou desabilite o acesso via https ao site."
+#: ../../mod/connect.php:55 ../../mod/connect.php:103
+msgid "Continue"
+msgstr "Continuar"
-#: ../../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 você oferece acesso https ao seu website ou permite conexões na porta TCP 443 (a porta https:), você DEVE usar um certificado reconhecido pelos navegadores. Você NÃO DEVE usar certificados assinados por você mesmo!"
+#: ../../mod/connect.php:84
+msgid "Premium Channel Setup"
+msgstr "Configuração de canal premium"
-#: ../../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 "Essa restrição é incorporada porque publicações públicas suas podem, por exemplo, conter referências a imagens no seu próprio hub."
+#: ../../mod/connect.php:86
+msgid "Enable premium channel connection restrictions"
+msgstr "Habilitar restrições de canal premium para conexão"
-#: ../../mod/setup.php:580
+#: ../../mod/connect.php:87
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 seu certificado não for reconhecido, membros de outros sites (que podem ter certificados válidos) receberão uma mensagem de aviso nos seus próprios sites reclamando de problemas de segurança."
+"Please enter your restrictions or conditions, such as paypal receipt, usage "
+"guidelines, etc."
+msgstr "Por favor, insira suas restrições ou condições, como um recibo de depósito, normas de conduta, etc."
-#: ../../mod/setup.php:581
+#: ../../mod/connect.php:89 ../../mod/connect.php:109
msgid ""
-"This can cause usability issues elsewhere (not just on your own site) so we "
-"must insist on this requirement."
-msgstr "Isso pode causar problemas de usabilidade (não só no seu site) então nós precisamos insistir nesse requisito."
+"This channel may require additional steps or acknowledgement of the "
+"following conditions prior to connecting:"
+msgstr "Este canal pode exigir passos adicionais ou compreensão das seguintes condições antes de conectar:"
-#: ../../mod/setup.php:582
+#: ../../mod/connect.php:90
msgid ""
-"Providers are available that issue free certificates which are browser-"
-"valid."
-msgstr "Existem provedores que disponibilizam gratuitamente certificados reconhecidos por navegadores."
-
-#: ../../mod/setup.php:584
-msgid "SSL certificate validation"
-msgstr "Validação do certificado SSL"
+"Potential connections will then see the following text before proceeding:"
+msgstr "Tentativas de conexões verão então o seguinte texto antes de prosseguir:"
-#: ../../mod/setup.php:590
+#: ../../mod/connect.php:91 ../../mod/connect.php:112
msgid ""
-"Url rewrite in .htaccess is not working. Check your server "
-"configuration.Test: "
-msgstr "A reescrita de URLs não está funcionando no .htaccess. Verifique as configurações do servidor. Teste:"
-
-#: ../../mod/setup.php:592
-msgid "Url rewrite is working"
-msgstr "A reescrita de URLs está funcionando"
+"By continuing, I certify that I have complied with any instructions provided"
+" on this page."
+msgstr "Ao prosseguir, eu certifico que cumpri todas as instruções exibidas nesta página."
-#: ../../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 "Não foi possível gravar o arquivo de configuração \".htconfig.php\". Por favor, use o texto incluso para criar um arquivo de configuração na raiz da instalação do Friendika em seu servidor web."
+#: ../../mod/connect.php:100
+msgid "(No specific instructions have been provided by the channel owner.)"
+msgstr "(Nenhuma instrução foi especificada pelo dono do canal.)"
-#: ../../mod/setup.php:625
-msgid "Errors encountered creating database tables."
-msgstr "Foram encontrados erros durante a criação das tabelas do banco de dados."
+#: ../../mod/connect.php:108
+msgid "Restricted or Premium Channel"
+msgstr "Canal restrito ou premium"
-#: ../../mod/setup.php:660
-msgid "<h1>What next</h1>"
-msgstr "<h1>Próximos passos</h1>"
+#: ../../mod/network.php:79
+msgid "No such group"
+msgstr "Este grupo não existe"
-#: ../../mod/setup.php:661
-msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the "
-"poller."
-msgstr "IMPORTANTE: Você deve configurar [manualmente] uma tarefa agendada para o coletor."
+#: ../../mod/network.php:118
+msgid "Search Results For:"
+msgstr "Resultados da busca por:"
-#: ../../mod/common.php:10
-msgid "No channel."
-msgstr "Nenhum canal."
+#: ../../mod/network.php:172
+msgid "Collection is empty"
+msgstr "A coleção está vazia"
-#: ../../mod/common.php:39
-msgid "Common connections"
-msgstr "Conexões em comum"
+#: ../../mod/network.php:180
+msgid "Collection: "
+msgstr "Coleção:"
-#: ../../mod/common.php:44
-msgid "No connections in common."
-msgstr "Nenhuma conexão em comum."
+#: ../../mod/network.php:193
+msgid "Connection: "
+msgstr "Conexão:"
-#: ../../mod/regdir.php:45 ../../mod/dirsearch.php:21
-msgid "This site is not a directory server"
-msgstr "Este site não é um servidor de diretório"
+#: ../../mod/network.php:196
+msgid "Invalid connection."
+msgstr "Conexão inválida."
-#: ../../mod/connections.php:37 ../../mod/connedit.php:75
+#: ../../mod/connections.php:37 ../../mod/connedit.php:64
msgid "Could not access contact record."
msgstr "Não foi possível acessar o registro do contato."
-#: ../../mod/connections.php:51 ../../mod/connedit.php:99
+#: ../../mod/connections.php:51 ../../mod/connedit.php:78
msgid "Could not locate selected profile."
msgstr "Não foi possível localizar o perfil selecionado."
-#: ../../mod/connections.php:94 ../../mod/connedit.php:214
+#: ../../mod/connections.php:94 ../../mod/connedit.php:132
msgid "Connection updated."
msgstr "A conexão foi atualizada."
-#: ../../mod/connections.php:96 ../../mod/connedit.php:216
+#: ../../mod/connections.php:96 ../../mod/connedit.php:134
msgid "Failed to update connection record."
msgstr "Não foi possível atualizar o registro da conexão."
-#: ../../mod/connections.php:192 ../../mod/connections.php:293
+#: ../../mod/connections.php:191 ../../mod/connections.php:292
msgid "Blocked"
msgstr "Bloqueado"
-#: ../../mod/connections.php:197 ../../mod/connections.php:300
+#: ../../mod/connections.php:196 ../../mod/connections.php:299
msgid "Ignored"
msgstr "Ignorado"
-#: ../../mod/connections.php:202 ../../mod/connections.php:314
+#: ../../mod/connections.php:201 ../../mod/connections.php:313
msgid "Hidden"
msgstr "Oculto"
-#: ../../mod/connections.php:207 ../../mod/connections.php:307
+#: ../../mod/connections.php:206 ../../mod/connections.php:306
msgid "Archived"
msgstr "Arquivado"
-#: ../../mod/connections.php:271
+#: ../../mod/connections.php:230 ../../mod/connections.php:245
+msgid "All"
+msgstr "Todos"
+
+#: ../../mod/connections.php:270
msgid "Suggest new connections"
msgstr "Sugerir novas conexões"
-#: ../../mod/connections.php:274
+#: ../../mod/connections.php:273
msgid "New Connections"
msgstr "Novas conexões"
-#: ../../mod/connections.php:277
+#: ../../mod/connections.php:276
msgid "Show pending (new) connections"
msgstr "Exibir conexões pendentes (novas)"
-#: ../../mod/connections.php:280 ../../mod/profperm.php:139
-msgid "All Connections"
-msgstr "Todas as conexões"
-
-#: ../../mod/connections.php:283
+#: ../../mod/connections.php:282
msgid "Show all connections"
msgstr "Exibir todas as conexões"
-#: ../../mod/connections.php:286
+#: ../../mod/connections.php:285
msgid "Unblocked"
msgstr "Não bloqueado"
-#: ../../mod/connections.php:289
+#: ../../mod/connections.php:288
msgid "Only show unblocked connections"
msgstr "Exibir apenas conexões não bloqueadas"
-#: ../../mod/connections.php:296
+#: ../../mod/connections.php:295
msgid "Only show blocked connections"
msgstr "Exibir apenas conexões bloqueadas"
-#: ../../mod/connections.php:303
+#: ../../mod/connections.php:302
msgid "Only show ignored connections"
msgstr "Exibir apenas conexões ignoradas"
-#: ../../mod/connections.php:310
+#: ../../mod/connections.php:309
msgid "Only show archived connections"
msgstr "Exibir apenas conexões arquivadas"
-#: ../../mod/connections.php:317
+#: ../../mod/connections.php:316
msgid "Only show hidden connections"
msgstr "Exibir apenas conexões ocultas"
-#: ../../mod/connections.php:372
+#: ../../mod/connections.php:371
#, php-format
msgid "%1$s [%2$s]"
msgstr "%1$s [%2$s]"
-#: ../../mod/connections.php:373
+#: ../../mod/connections.php:372
msgid "Edit connection"
msgstr "Editar conexão"
-#: ../../mod/connections.php:411
+#: ../../mod/connections.php:410
msgid "Search your connections"
msgstr "Pesquisar em suas conexões"
-#: ../../mod/connections.php:412
+#: ../../mod/connections.php:411
msgid "Finding: "
msgstr "Pesquisando: "
@@ -5751,750 +5831,852 @@ msgstr "Adicionar uma etiqueta"
msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
msgstr "Exemplo: @beto, @Barbara_Almeida, @julia@exemplo.com"
-#: ../../mod/photos.php:928
-msgid "Flag as adult in album view"
-msgstr "Sinalizar como adulto na apresentação de álbuns"
+#: ../../mod/connedit.php:181
+msgid "is now connected to"
+msgstr "está agora conectado a"
-#: ../../mod/photos.php:1120
-msgid "In This Photo:"
-msgstr "Nesta foto:"
+#: ../../mod/connedit.php:296
+msgid "Could not access address book record."
+msgstr "Não foi possível acessar o registro do contato."
-#: ../../mod/photos.php:1125
-msgid "Map"
-msgstr "Mapa"
+#: ../../mod/connedit.php:310
+msgid "Refresh failed - channel is currently unavailable."
+msgstr "A atualização falhou - o canal está indisponível no momento."
-#: ../../mod/photos.php:1211
-msgid "View Album"
-msgstr "Ver álbum"
+#: ../../mod/connedit.php:317
+msgid "Channel has been unblocked"
+msgstr "O canal foi desbloqueado"
-#: ../../mod/photos.php:1234
-msgid "Recent Photos"
-msgstr "Fotos recentes"
+#: ../../mod/connedit.php:318
+msgid "Channel has been blocked"
+msgstr "O canal foi bloqueado"
-#: ../../mod/match.php:22
-msgid "Profile Match"
-msgstr "Correspondência de perfil"
+#: ../../mod/connedit.php:322 ../../mod/connedit.php:334
+#: ../../mod/connedit.php:346 ../../mod/connedit.php:358
+#: ../../mod/connedit.php:374
+msgid "Unable to set address book parameters."
+msgstr "Não foi possível definir os parâmetros do contato."
-#: ../../mod/match.php:31
-msgid "No keywords to match. Please add keywords to your default profile."
-msgstr "Nenhuma palavra-chave para combinar. Por favor, adicione palavras-chave ao seu perfil padrão."
+#: ../../mod/connedit.php:329
+msgid "Channel has been unignored"
+msgstr "O canal não está mais ignorado"
-#: ../../mod/match.php:63
-msgid "is interested in:"
-msgstr "se interessa por:"
+#: ../../mod/connedit.php:330
+msgid "Channel has been ignored"
+msgstr "O canal passou a estar ignorado"
-#: ../../mod/match.php:70
-msgid "No matches"
-msgstr "Nenhuma correspondência"
+#: ../../mod/connedit.php:341
+msgid "Channel has been unarchived"
+msgstr "O canal deixou o arquivo"
-#: ../../mod/chatsvc.php:111
-msgid "Away"
-msgstr "Ausente"
+#: ../../mod/connedit.php:342
+msgid "Channel has been archived"
+msgstr "O canal foi colocado no arquivo"
-#: ../../mod/chatsvc.php:115
-msgid "Online"
-msgstr "Online"
+#: ../../mod/connedit.php:353
+msgid "Channel has been unhidden"
+msgstr "O canal não está mais oculto"
-#: ../../mod/rbmark.php:88
-msgid "Select a bookmark folder"
-msgstr "Escolha uma pasta de links onde guardar"
+#: ../../mod/connedit.php:354
+msgid "Channel has been hidden"
+msgstr "O canal passou a estar oculto"
-#: ../../mod/rbmark.php:93
-msgid "Save Bookmark"
-msgstr "Guardar link"
+#: ../../mod/connedit.php:369
+msgid "Channel has been approved"
+msgstr "O canal foi aprovado"
-#: ../../mod/rbmark.php:94
-msgid "URL of bookmark"
-msgstr "URL do link guardado"
+#: ../../mod/connedit.php:370
+msgid "Channel has been unapproved"
+msgstr "O canal deixou de estar aprovado"
-#: ../../mod/rbmark.php:95 ../../mod/appman.php:93
-msgid "Description"
-msgstr "Descrição"
+#: ../../mod/connedit.php:398
+msgid "Connection has been removed."
+msgstr "A conexão foi removida."
-#: ../../mod/rbmark.php:99
-msgid "Or enter new bookmark folder name"
-msgstr "Ou digite o nome para uma nova pasta de links"
+#: ../../mod/connedit.php:418
+#, php-format
+msgid "View %s's profile"
+msgstr "Ver o perfil de %s"
-#: ../../mod/notify.php:53 ../../mod/notifications.php:94
-msgid "No more system notifications."
-msgstr "Sem novas notificações do sistema."
+#: ../../mod/connedit.php:422
+msgid "Refresh Permissions"
+msgstr "Atualizar permissões"
-#: ../../mod/notify.php:57 ../../mod/notifications.php:98
-msgid "System Notifications"
-msgstr "Notificações do sistema"
+#: ../../mod/connedit.php:425
+msgid "Fetch updated permissions"
+msgstr "Buscar as permissões atualizadas"
-#: ../../mod/acl.php:231
-msgid "network"
-msgstr "+ rede"
+#: ../../mod/connedit.php:429
+msgid "Recent Activity"
+msgstr "Atividades recentes"
-#: ../../mod/acl.php:241
-msgid "RSS"
-msgstr "RSS"
+#: ../../mod/connedit.php:432
+msgid "View recent posts and comments"
+msgstr "Exibir publicações e comentários recentes"
-#: ../../mod/pdledit.php:13
-msgid "Layout updated."
-msgstr "Layout atualizado."
+#: ../../mod/connedit.php:436 ../../mod/connedit.php:579
+#: ../../mod/admin.php:734
+msgid "Unblock"
+msgstr "Desbloquear"
-#: ../../mod/pdledit.php:28 ../../mod/pdledit.php:53
-msgid "Edit System Page Description"
-msgstr "Editar descrição de página do sistema"
+#: ../../mod/connedit.php:436 ../../mod/connedit.php:579
+#: ../../mod/admin.php:733
+msgid "Block"
+msgstr "Bloquear"
-#: ../../mod/pdledit.php:48
-msgid "Layout not found."
-msgstr "Layout não encontrado."
+#: ../../mod/connedit.php:439
+msgid "Block or Unblock this connection"
+msgstr "Bloquear ou desbloquear esta conexão"
-#: ../../mod/pdledit.php:54
-msgid "Module Name:"
-msgstr "Nome do módulo:"
+#: ../../mod/connedit.php:443 ../../mod/connedit.php:580
+msgid "Unignore"
+msgstr "Não ignorar"
-#: ../../mod/pdledit.php:55
-msgid "Layout Help"
-msgstr "Ajuda de layout"
+#: ../../mod/connedit.php:443 ../../mod/connedit.php:580
+#: ../../mod/notifications.php:51
+msgid "Ignore"
+msgstr "Ignorar"
-#: ../../mod/filer.php:49
-msgid "- select -"
-msgstr "- selecionar -"
+#: ../../mod/connedit.php:446
+msgid "Ignore or Unignore this connection"
+msgstr "Ignorar ou deixar de ignorar esta conexão"
-#: ../../mod/import.php:25
-#, php-format
-msgid "Your service plan only allows %d channels."
-msgstr "Seu plano de serviço permite apenas %d canais."
+#: ../../mod/connedit.php:449
+msgid "Unarchive"
+msgstr "Não arquivar"
-#: ../../mod/import.php:51
-msgid "Nothing to import."
-msgstr "Nada a importar."
+#: ../../mod/connedit.php:449
+msgid "Archive"
+msgstr "Arquivar"
-#: ../../mod/import.php:75
-msgid "Unable to download data from old server"
-msgstr "Não foi possível descarregar os dados do servidor antigo"
+#: ../../mod/connedit.php:452
+msgid "Archive or Unarchive this connection"
+msgstr "Colocar ou retirar do arquivo esta conexão"
-#: ../../mod/import.php:81
-msgid "Imported file is empty."
-msgstr "O arquivo importado está vazio."
+#: ../../mod/connedit.php:455
+msgid "Unhide"
+msgstr "Não ocultar"
-#: ../../mod/import.php:106
-msgid ""
-"Cannot create a duplicate channel identifier on this system. Import failed."
-msgstr "Não foi possível criar um identificador de canal duplicado neste sistema. A importação falhou."
+#: ../../mod/connedit.php:455
+msgid "Hide"
+msgstr "Ocultar"
-#: ../../mod/import.php:127
-msgid "Unable to create a unique channel address. Import failed."
-msgstr "Não foi possível criar um endereço de canal único. Importação falhou."
+#: ../../mod/connedit.php:458
+msgid "Hide or Unhide this connection"
+msgstr "Ocultar ou deixar de ocultar esta conexão"
-#: ../../mod/import.php:147
-msgid "Channel clone failed. Import failed."
-msgstr "Clonagem do canal falhou. A importação falhou."
+#: ../../mod/connedit.php:465
+msgid "Delete this connection"
+msgstr "Deletar esta conexão"
-#: ../../mod/import.php:157
-msgid "Cloned channel not found. Import failed."
-msgstr "Canal a clonar não encontrado. A importação falhou."
+#: ../../mod/connedit.php:508 ../../mod/connedit.php:537
+msgid "Approve this connection"
+msgstr "Aprovar esta conexão"
-#: ../../mod/import.php:475
-msgid "Import completed."
-msgstr "A importação foi completada."
+#: ../../mod/connedit.php:508
+msgid "Accept connection to allow communication"
+msgstr "Aceite a conexão para permitir comunicação"
-#: ../../mod/import.php:487
-msgid "You must be logged in to use this feature."
-msgstr "Você precisa estar autenticado para usar este recurso."
+#: ../../mod/connedit.php:524
+msgid "Automatic Permissions Settings"
+msgstr "Configurações de permissão automáticas"
-#: ../../mod/import.php:492
-msgid "Import Channel"
-msgstr "Importar canal"
+#: ../../mod/connedit.php:524
+#, php-format
+msgid "Connections: settings for %s"
+msgstr "Conexões: configurações para %s"
-#: ../../mod/import.php:493
+#: ../../mod/connedit.php:528
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 "Use este formulário para importar um canal existente de um servidor/hub diferente. Você pode obter a identidade do canal do servidor/hub antigo pela rede, ou fornecer um arquivo de exportação. Somente a identidade e as conexões/relacionamentos serão importados. Importação de conteúdos ainda não está disponível."
+"When receiving a channel introduction, any permissions provided here will be"
+" applied to the new connection automatically and the introduction approved. "
+"Leave this page if you do not wish to use this feature."
+msgstr "Ao receber uma apresentação de um canal, quaisquer permissões definidas aqui serão automaticamente aplicadas à nova conexão e a apresentação aprovada. Deixe esta página se você não quer usar este recurso."
-#: ../../mod/import.php:494
-msgid "File to Upload"
-msgstr "Arquivo a carregar"
+#: ../../mod/connedit.php:530
+msgid "Slide to adjust your degree of friendship"
+msgstr "Deslize para ajustar seu grau de amizade"
-#: ../../mod/import.php:495
-msgid "Or provide the old server/hub details"
-msgstr "Ou forneça os detalhes do antigo servidor/hub"
+#: ../../mod/connedit.php:536
+msgid "inherited"
+msgstr "herdado"
-#: ../../mod/import.php:496
-msgid "Your old identity address (xyz@example.com)"
-msgstr "O endereço da sua velha identidade (xyz@exemplo.com)"
+#: ../../mod/connedit.php:538
+msgid "Connection has no individual permissions!"
+msgstr "A conexão não tem permissões individuais!"
-#: ../../mod/import.php:497
-msgid "Your old login email address"
-msgstr "O endereço de e-mail da sua antiga conta"
+#: ../../mod/connedit.php:539
+msgid ""
+"This may be appropriate based on your <a href=\"settings\">privacy "
+"settings</a>, though you may wish to review the \"Advanced Permissions\"."
+msgstr "Isso pode ser adequado baseado nas suas <a href=\"settings\">configurações de privacidade</a>, mas talvez você queira rever suas \"Permissões Avançadas\"."
-#: ../../mod/import.php:498
-msgid "Your old login password"
-msgstr "A senha dua sua antiga conta"
+#: ../../mod/connedit.php:541
+msgid "Profile Visibility"
+msgstr "Visibilidade do perfil"
-#: ../../mod/import.php:499
+#: ../../mod/connedit.php:542
+#, php-format
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 qualquer das opções, por favor escolha se deseja fazer deste hub seu novo endereço primário, ou se o velho local deve continuar com esse papel. Você será capaz de publicar a partir de ambos os locais, mas somente um pode estar designado como local primário para arquivos, fotos e mídia."
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
+msgstr "Por favor, selecione o perfil que você gostaria de exibir para %s quando estiver visualizando seu perfil de modo seguro."
-#: ../../mod/import.php:500
-msgid "Make this hub my primary location"
-msgstr "Faça deste hub meu local primário"
+#: ../../mod/connedit.php:543
+msgid "Contact Information / Notes"
+msgstr "Informações de contato / Notas"
-#: ../../mod/import.php:501
-msgid "Import existing posts if possible"
-msgstr "Importar publicações existentes se possível"
+#: ../../mod/connedit.php:544
+msgid "Edit contact notes"
+msgstr "Editar anotações sobre o contato"
-#: ../../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 "O item não foi encontrado"
+#: ../../mod/connedit.php:546
+msgid "Their Settings"
+msgstr "Configurações dele/a"
-#: ../../mod/editlayout.php:106
-msgid "Edit Layout"
-msgstr "Editar layout"
+#: ../../mod/connedit.php:547
+msgid "My Settings"
+msgstr "Minhas configurações"
-#: ../../mod/editlayout.php:117
-msgid "Delete layout?"
-msgstr "Deletar layout?"
+#: ../../mod/connedit.php:549
+msgid "Clear/Disable Automatic Permissions"
+msgstr "Limpa/Desabilita permissões automáticas"
-#: ../../mod/editlayout.php:148 ../../mod/editwebpage.php:187
-#: ../../mod/editpost.php:122 ../../mod/editblock.php:150
-msgid "Insert YouTube video"
-msgstr "Inserir vídeo do YouTube"
+#: ../../mod/connedit.php:550
+msgid "Forum Members"
+msgstr "Membros de fórum"
-#: ../../mod/editlayout.php:149 ../../mod/editwebpage.php:188
-#: ../../mod/editpost.php:123 ../../mod/editblock.php:151
-msgid "Insert Vorbis [.ogg] video"
-msgstr "Inserir vídeo Vorbis (.ogg)"
+#: ../../mod/connedit.php:551
+msgid "Soapbox"
+msgstr "Caixa de sabão"
-#: ../../mod/editlayout.php:150 ../../mod/editwebpage.php:189
-#: ../../mod/editpost.php:124 ../../mod/editblock.php:152
-msgid "Insert Vorbis [.ogg] audio"
-msgstr "Inserir áudio Vorbis (.ogg)"
+#: ../../mod/connedit.php:552
+msgid "Full Sharing (typical social network permissions)"
+msgstr "Compartilhamento completo (permissões típicas de redes sociais)"
-#: ../../mod/editlayout.php:164 ../../mod/layouts.php:124
-msgid "Layout Description (Optional)"
-msgstr "Descrição do Layout. (Opcional)"
+#: ../../mod/connedit.php:553
+msgid "Cautious Sharing "
+msgstr "Compartilhamento cauteloso"
#: ../../mod/editlayout.php:166 ../../mod/layouts.php:121
#: ../../mod/layouts.php:179
msgid "Layout Name"
msgstr "Nome do layout"
-#: ../../mod/chat.php:19 ../../mod/channel.php:25
-msgid "You must be logged in to see this page."
-msgstr "Você precisa estar autenticado para ver esta página."
+#: ../../mod/connedit.php:555
+msgid "Individual Permissions"
+msgstr "Permissões individuais"
-#: ../../mod/chat.php:167
-msgid "Room not found"
-msgstr "Sala não encontrada"
+#: ../../mod/connedit.php:556
+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 "Algumas permissões serão herdadas das <a href=\"settings\">configurações de privacidade</a> do seu canal, e terão prioridade sobre as configurações individuais. Modificar nesta página tais configurações herdadas não surtirá efeito algum."
-#: ../../mod/chat.php:178
-msgid "Leave Room"
-msgstr "Sair da sala"
+#: ../../mod/connedit.php:557
+msgid "Advanced Permissions"
+msgstr "Permissões avançadas"
-#: ../../mod/chat.php:179
-msgid "Delete This Room"
-msgstr "Deletar esta sala"
+#: ../../mod/connedit.php:558
+msgid "Simple Permissions (select one and submit)"
+msgstr "Permissões simples (slecione uma e submeta)"
-#: ../../mod/chat.php:180
-msgid "I am away right now"
-msgstr "Eu estou ausente no momento"
+#: ../../mod/connedit.php:562
+#, php-format
+msgid "Visit %s's profile - %s"
+msgstr "Ver o perfil de %s - %s"
-#: ../../mod/chat.php:181
-msgid "I am online"
-msgstr "Eu estou online"
+#: ../../mod/connedit.php:563
+msgid "Block/Unblock contact"
+msgstr "Bloquear/desbloquear o contato"
-#: ../../mod/chat.php:183
-msgid "Bookmark this room"
-msgstr "Guarde esta sala"
+#: ../../mod/connedit.php:564
+msgid "Ignore contact"
+msgstr "Ignorar o contato"
-#: ../../mod/chat.php:207 ../../mod/chat.php:229
-msgid "New Chatroom"
-msgstr "Nova sala de bate-papo"
+#: ../../mod/connedit.php:565
+msgid "Repair URL settings"
+msgstr "Reparar configurações de URL"
-#: ../../mod/chat.php:208
-msgid "Chatroom Name"
-msgstr "Nome da sala de bate-papo"
+#: ../../mod/connedit.php:566
+msgid "View conversations"
+msgstr "Ver as conversas"
-#: ../../mod/chat.php:225
-#, php-format
-msgid "%1$s's Chatrooms"
-msgstr "Salas de bate-papo de %1$s"
+#: ../../mod/connedit.php:568
+msgid "Delete contact"
+msgstr "Excluir o contato"
-#: ../../mod/editwebpage.php:152
-msgid "Delete webpage?"
-msgstr "Deletar página web?"
+#: ../../mod/connedit.php:571
+msgid "Last update:"
+msgstr "Última atualização:"
-#: ../../mod/editwebpage.php:173
-msgid "Page link title"
-msgstr "Título do link da página"
+#: ../../mod/connedit.php:573
+msgid "Update public posts"
+msgstr "Atualizar publicações públicas"
-#: ../../mod/editwebpage.php:224
-msgid "Edit Webpage"
-msgstr "Editar página web"
+#: ../../mod/connedit.php:575
+msgid "Update now"
+msgstr "Atualizar agora"
+
+#: ../../mod/connedit.php:581
+msgid "Currently blocked"
+msgstr "Atualmente bloqueado"
-#: ../../mod/dirsearch.php:29
-msgid "This directory server requires an access token"
-msgstr "O servidor deste diretório requer um token de acesso"
+#: ../../mod/connedit.php:582
+msgid "Currently ignored"
+msgstr "Atualmente ignorado"
-#: ../../mod/lostpass.php:15
-msgid "No valid account found."
-msgstr "Não foi encontrada uma conta válida."
+#: ../../mod/connedit.php:583
+msgid "Currently archived"
+msgstr "Atualmente arquivado"
-#: ../../mod/lostpass.php:29
-msgid "Password reset request issued. Check your email."
-msgstr "A solicitação de restauração de senha foi encaminhada. Verifique seu e-mail."
+#: ../../mod/connedit.php:584
+msgid "Currently pending"
+msgstr "Atualmente pendente"
-#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:102
-#, php-format
-msgid "Site Member (%s)"
-msgstr "Membro do site (%s)"
+#: ../../mod/connedit.php:585
+msgid "Hide this contact from others"
+msgstr "Esconda este contato dos demais"
-#: ../../mod/lostpass.php:40
-#, php-format
-msgid "Password reset requested at %s"
-msgstr "Foi feita uma solicitação de restauração de senha em %s"
+#: ../../mod/connedit.php:585
+msgid ""
+"Replies/likes to your public posts <strong>may</strong> still be visible"
+msgstr "Respostas/reações às suas publicações públicas <strong>podem</strong> continuar visíveis."
-#: ../../mod/lostpass.php:63
+#: ../../mod/delegate.php:95
+msgid "No potential page delegates located."
+msgstr "Nenhum potencial delegado para páginas localizado."
+
+#: ../../mod/delegate.php:121
+msgid "Delegate Page Management"
+msgstr "Delegar administração de página"
+
+#: ../../mod/delegate.php:123
msgid ""
-"Request could not be verified. (You may have previously submitted it.) "
-"Password reset failed."
-msgstr "Não foi possível verificar a solicitação (você pode tê-la submetido anteriormente). A senha não foi restaurada."
+"Delegates are able to manage all aspects of this account/page except for "
+"basic account settings. Please do not delegate your personal account to "
+"anybody that you do not trust completely."
+msgstr "Delegados podem administrar todos os aspectos desta conta/página exceto pelas configurações básicas da conta. Por favor, não delegue sua conta pessoal para alguém que você não confie completamente."
#: ../../mod/lostpass.php:85 ../../boot.php:1558
msgid "Password Reset"
msgstr "Reiniciar a senha"
-#: ../../mod/lostpass.php:86
-msgid "Your password has been reset as requested."
-msgstr "Sua senha foi restaurada, conforme solicitado."
+#: ../../mod/delegate.php:126
+msgid "Existing Page Delegates"
+msgstr "Atuais delegados da página"
-#: ../../mod/lostpass.php:87
-msgid "Your new password is"
-msgstr "Sua nova senha é"
+#: ../../mod/delegate.php:128
+msgid "Potential Delegates"
+msgstr "Potenciais delegados"
-#: ../../mod/lostpass.php:88
-msgid "Save or copy your new password - and then"
-msgstr "Salve ou copie a sua nova senha e, então"
+#: ../../mod/delegate.php:130 ../../mod/photos.php:940 ../../mod/tagrm.php:93
+msgid "Remove"
+msgstr "Remover"
-#: ../../mod/lostpass.php:89
-msgid "click here to login"
-msgstr "clique aqui para entrar"
+#: ../../mod/delegate.php:131
+msgid "Add"
+msgstr "Adicionar"
-#: ../../mod/lostpass.php:90
-msgid ""
-"Your password may be changed from the <em>Settings</em> page after "
-"successful login."
-msgstr "Sua senha pode ser alterada na página de <em>Configurações</em> após você entrar em sua conta."
+#: ../../mod/delegate.php:132
+msgid "No entries."
+msgstr "Sem entradas."
-#: ../../mod/lostpass.php:107
-#, php-format
-msgid "Your password has changed at %s"
-msgstr "Sua senha foi modificada em %s"
+#: ../../mod/search.php:13 ../../mod/directory.php:15
+#: ../../mod/dirprofile.php:9 ../../mod/display.php:9 ../../mod/photos.php:443
+#: ../../mod/viewconnections.php:17
+msgid "Public access denied."
+msgstr "Acesso público negado."
-#: ../../mod/lostpass.php:122
-msgid "Forgot your Password?"
-msgstr "Esqueceu a sua senha?"
+#: ../../mod/directory.php:146 ../../mod/dirprofile.php:95
+msgid "Gender: "
+msgstr "Gênero: "
-#: ../../mod/lostpass.php:123
-msgid ""
-"Enter your email address and submit to have your password reset. Then check "
-"your email for further instructions."
-msgstr "Digite o seu endereço de e-mail e clique em 'Restaurar' para prosseguir com a restauração da sua senha. Após isso, verifique seu e-mail para mais instruções."
+#: ../../mod/directory.php:223
+msgid "Finding:"
+msgstr "Pesquisando:"
-#: ../../mod/lostpass.php:124
-msgid "Email Address"
-msgstr "Endereço de e-mail"
+#: ../../mod/directory.php:228
+msgid "next page"
+msgstr "próxima página"
-#: ../../mod/lostpass.php:125
-msgid "Reset"
-msgstr "Restaurar"
+#: ../../mod/directory.php:228
+msgid "previous page"
+msgstr "página anterior"
-#: ../../mod/rate.php:157
-msgid "Website:"
-msgstr "Sítio web:"
+#: ../../mod/directory.php:245
+msgid "No entries (some entries may be hidden)."
+msgstr "Nenhuma entrada (algumas entradas podem estar escondidas)."
-#: ../../mod/rate.php:160
-#, php-format
-msgid "Remote Channel [%s] (not yet known on this site)"
-msgstr "Canal Remoto [%s] (ainda não conhecido neste sítio)"
+#: ../../mod/dirprofile.php:108
+msgid "Status: "
+msgstr "Status:"
-#: ../../mod/rate.php:161 ../../mod/connedit.php:663
-msgid "Rating (this information is public)"
-msgstr "Avaliações (essa informação é pública)"
+#: ../../mod/dirprofile.php:109
+msgid "Sexual Preference: "
+msgstr "Preferência sexual:"
-#: ../../mod/rate.php:162 ../../mod/connedit.php:664
-msgid "Optionally explain your rating (this information is public)"
-msgstr "Opcionalmente justifique sua avaliação (essa informação é pública)"
+#: ../../mod/dirprofile.php:111
+msgid "Homepage: "
+msgstr "Website:"
-#: ../../mod/editpost.php:31
-msgid "Item is not editable"
-msgstr "O item não está editável"
+#: ../../mod/dirprofile.php:112
+msgid "Hometown: "
+msgstr "Cidade natal:"
-#: ../../mod/editpost.php:53
-msgid "Delete item?"
-msgstr "Deletar item?"
+#: ../../mod/dirprofile.php:114
+msgid "About: "
+msgstr "Sobre:"
-#: ../../mod/invite.php:25
-msgid "Total invitation limit exceeded."
-msgstr "Foi excedido o número total de convites."
+#: ../../mod/dirprofile.php:162
+msgid "Keywords: "
+msgstr "Palavras-chave:"
-#: ../../mod/invite.php:49
-#, php-format
-msgid "%s : Not a valid email address."
-msgstr "%s : Não é um endereço de e-mail válido."
+#: ../../mod/dirsearch.php:21
+msgid "This site is not a directory server"
+msgstr "Este site não é um servidor de diretório"
-#: ../../mod/invite.php:76
-msgid "Please join us on Red"
-msgstr "Por favor, una-se a nós na Red"
+#: ../../mod/setup.php:162
+msgid "Hubzilla Server - Setup"
+msgstr "Servidor Hubzilla - Configuração"
-#: ../../mod/invite.php:87
-msgid "Invitation limit exceeded. Please contact your site administrator."
-msgstr "Você excedeu o limite de convites. Por favor, entre em contato com o administrador do site."
+#: ../../mod/setup.php:168
+msgid "Could not connect to database."
+msgstr "Não foi possível conectar ao banco de dados."
-#: ../../mod/invite.php:92
-#, php-format
-msgid "%s : Message delivery failed."
-msgstr "%s : Não foi possível enviar a mensagem."
+#: ../../mod/setup.php:172
+msgid ""
+"Could not connect to specified site URL. Possible SSL certificate or DNS "
+"issue."
+msgstr "Não foi possível conectar à URL especificada para o site. Provavlmente um problema de DNS ou com o certificado SSL."
-#: ../../mod/invite.php:96
-#, php-format
-msgid "%d message sent."
-msgid_plural "%d messages sent."
-msgstr[0] "%d mensagem enviada."
-msgstr[1] "%d mensagens enviadas."
+#: ../../mod/setup.php:179
+msgid "Could not create table."
+msgstr "Não foi possível criar a tabela."
-#: ../../mod/invite.php:115
-msgid "You have no more invitations available"
-msgstr "Você não possui mais convites disponíveis"
+#: ../../mod/setup.php:185
+msgid "Your site database has been installed."
+msgstr "O banco de dados do seu site foi instalado."
-#: ../../mod/invite.php:129
-msgid "Send invitations"
-msgstr "Enviar convites."
+#: ../../mod/setup.php:190
+msgid ""
+"You may need to import the file \"install/database.sql\" manually using "
+"phpmyadmin or mysql."
+msgstr "Pode ser que você precise importar o arquivo \"install/database.sql\" manualmente, usando o phpmyadmin or mysql."
-#: ../../mod/invite.php:130
-msgid "Enter email addresses, one per line:"
-msgstr "Digite os endereços de e-mail, um por linha:"
+#: ../../mod/setup.php:191 ../../mod/setup.php:260 ../../mod/setup.php:655
+msgid "Please see the file \"install/INSTALL.txt\"."
+msgstr "Por favor, veja o arquivo \"install/INSTALL.txt\"."
-#: ../../mod/invite.php:131 ../../mod/mail.php:235 ../../mod/mail.php:348
-msgid "Your message:"
-msgstr "Sua mensagem:"
+#: ../../mod/setup.php:257
+msgid "System check"
+msgstr "Checagem do sistema"
#: ../../mod/invite.php:132
-msgid "Please join my community on $Projectname."
-msgstr "Por favor junte-se à minha comunidade na $Projectname."
+msgid "Please join my community on \$Projectname."
+msgstr "Por favor junte-se à minha comunidade na \$Projectname."
-#: ../../mod/invite.php:134
-msgid "You will need to supply this invitation code: "
-msgstr "Você precisará fornecer este código de convite:"
+#: ../../mod/setup.php:262
+msgid "Check again"
+msgstr "Cheque novamente"
#: ../../mod/invite.php:135
msgid ""
-"1. Register at any $Projectname location (they are all inter-connected)"
-msgstr "1. Registre-se em qualquer site da $Projectname (eles são todos interconectados)"
+"1. Register at any \$Projectname location (they are all inter-connected)"
+msgstr "1. Registre-se em qualquer site da \$Projectname (eles são todos interconectados)"
#: ../../mod/invite.php:137
-msgid "2. Enter my $Projectname network address into the site searchbar."
-msgstr "2. Entre com meu endereço da $Projectname na barra de busca do site."
+msgid "2. Enter my \$Projectname network address into the site searchbar."
+msgstr "2. Entre com meu endereço da \$Projectname na barra de busca do site."
-#: ../../mod/invite.php:138
-msgid "or visit "
-msgstr "ou visite"
-#: ../../mod/invite.php:140
-msgid "3. Click [Connect]"
-msgstr "3. Clique [Conectar]"
+#: ../../mod/setup.php:286
+msgid ""
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
+msgstr "Por favor, entre em contato com a sua hospedagem ou com o administrador do site caso você tenha alguma dúvida em relação a isso."
-#: ../../mod/locs.php:21 ../../mod/locs.php:52
-msgid "Location not found."
-msgstr "A localização não foi encontrada."
+#: ../../mod/setup.php:287
+msgid ""
+"The database you specify below should already exist. If it does not, please "
+"create it before continuing."
+msgstr "O banco de dados que você especificar abaixo já deve existir. Caso contrário, crie-o antes de prosseguir."
+
+#: ../../mod/setup.php:291
+msgid "Database Server Name"
+msgstr "Nome do servidor de banco de dados"
-#: ../../mod/locs.php:56
-msgid "Primary location cannot be removed."
-msgstr "A localização primária não pode ser removida."
+#: ../../mod/setup.php:291
+msgid "Default is localhost"
+msgstr "O default é localhost"
+
+#: ../../mod/setup.php:292
+msgid "Database Port"
+msgstr "Porta do banco de dados"
-#: ../../mod/locs.php:88
-msgid "No locations found."
-msgstr "Nenhuma localização encontrada."
+#: ../../mod/setup.php:292
+msgid "Communication port number - use 0 for default"
+msgstr "Número da porta de comunicação - use 0 para o default"
-#: ../../mod/locs.php:101
-msgid "Manage Channel Locations"
-msgstr "Gerenciar localizações do canal"
+#: ../../mod/setup.php:293
+msgid "Database Login Name"
+msgstr "Nome do usuário do banco de dados"
-#: ../../mod/locs.php:102
-msgid "Location (address)"
-msgstr "Localização (endereço)"
+#: ../../mod/setup.php:294
+msgid "Database Login Password"
+msgstr "Senha do usuário do banco de dados"
-#: ../../mod/locs.php:103
-msgid "Primary Location"
-msgstr "Localização primária"
+#: ../../mod/setup.php:295
+msgid "Database Name"
+msgstr "Nome do banco de dados"
-#: ../../mod/locs.php:104
-msgid "Drop location"
-msgstr "Descartar localização"
+#: ../../mod/setup.php:297 ../../mod/setup.php:339
+msgid "Site administrator email address"
+msgstr "Endereço de email do administrador do site"
-#: ../../mod/sources.php:32
-msgid "Failed to create source. No channel selected."
-msgstr "Falha ao criar a fonte. Nenhum canal selecionado."
+#: ../../mod/setup.php:297 ../../mod/setup.php:339
+msgid ""
+"Your account email address must match this in order to use the web admin "
+"panel."
+msgstr "O endereço de email da sua conta deve ser igual a este para que você possa utilizar o painel de administração web."
-#: ../../mod/sources.php:45
-msgid "Source created."
-msgstr "A fonte foi criada."
+#: ../../mod/setup.php:298 ../../mod/setup.php:341
+msgid "Website URL"
+msgstr "URL do website"
-#: ../../mod/sources.php:57
-msgid "Source updated."
-msgstr "A fonte foi atualizada."
+#: ../../mod/setup.php:298 ../../mod/setup.php:341
+msgid "Please use SSL (https) URL if available."
+msgstr "Por favor, use uma URL SSL (https) se disponível."
-#: ../../mod/sources.php:82
-msgid "*"
-msgstr "*"
+#: ../../mod/setup.php:301 ../../mod/setup.php:344
+msgid "Please select a default timezone for your website"
+msgstr "Por favor, selecione o fuso horário padrão para o seu site"
-#: ../../mod/sources.php:89
-msgid "Manage remote sources of content for your channel."
-msgstr "Administrar as fontes remotas de conteúdo para o seu canal."
+#: ../../mod/setup.php:328
+msgid "Site settings"
+msgstr "Configurações do site"
-#: ../../mod/sources.php:90 ../../mod/sources.php:100
-msgid "New Source"
-msgstr "Nova fonte"
+#: ../../mod/setup.php:387
+msgid "Could not find a command line version of PHP in the web server PATH."
+msgstr "Não foi possível encontrar uma versão de linha de comando do PHP nos caminhos do seu servidor web."
-#: ../../mod/sources.php:101 ../../mod/sources.php:133
+#: ../../mod/setup.php:388
msgid ""
-"Import all or selected content from the following channel into this channel "
-"and distribute it according to your channel settings."
-msgstr "Importar todo ou uma seleção do conteúdo do seguinte canal para este canal, e distribuí-lo de acordo com as configurações do seu canal."
+"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 "Caso você não tenha uma versão de linha de comando do PHP instalada no seu servidor, você não será capaz de executar coletas em segundo plano pelo cron."
-#: ../../mod/sources.php:102 ../../mod/sources.php:134
-msgid "Only import content with these words (one per line)"
-msgstr "Importar apenas conteúd com estas palavras (uma por linha)"
+#: ../../mod/setup.php:392
+msgid "PHP executable path"
+msgstr "Caminho para o executável do PHP"
-#: ../../mod/sources.php:102 ../../mod/sources.php:134
-msgid "Leave blank to import all public content"
-msgstr "Deixe em branco para importar todo o conteúdo público"
+#: ../../mod/setup.php:392
+msgid ""
+"Enter full path to php executable. You can leave this blank to continue the "
+"installation."
+msgstr "Digite o caminho completo do executável PHP. Você pode deixar isso em branco para continuar com a instalação."
-#: ../../mod/sources.php:103 ../../mod/sources.php:137
-#: ../../mod/new_channel.php:112
-msgid "Channel Name"
-msgstr "Nome do canal"
+#: ../../mod/setup.php:397
+msgid "Command line PHP"
+msgstr "PHP em linha de comando"
-#: ../../mod/sources.php:123 ../../mod/sources.php:150
-msgid "Source not found."
-msgstr "A fonte não foi encontrada."
+#: ../../mod/setup.php:406
+msgid ""
+"The command line version of PHP on your system does not have "
+"\"register_argc_argv\" enabled."
+msgstr "\"register_argc_argv\" não está habilitado na versão de linha de comando do PHP no seu sistema."
-#: ../../mod/sources.php:130
-msgid "Edit Source"
-msgstr "Editar fonte"
+#: ../../mod/setup.php:407
+msgid "This is required for message delivery to work."
+msgstr "Isto é necessário para o funcionamento do envio de mensagens."
-#: ../../mod/sources.php:131
-msgid "Delete Source"
-msgstr "Deletar fonte"
+#: ../../mod/setup.php:409
+msgid "PHP register_argc_argv"
+msgstr "PHP register_argc_argv"
-#: ../../mod/sources.php:158
-msgid "Source removed"
-msgstr "A fonte foi removida."
+#: ../../mod/setup.php:430
+msgid ""
+"Error: the \"openssl_pkey_new\" function on this system is not able to "
+"generate encryption keys"
+msgstr "Erro: a função \"openssl_pkey_new\" no seu sistema não é capaz de gerar as chaves de criptografia"
-#: ../../mod/sources.php:160
-msgid "Unable to remove source."
-msgstr "Não foi possível remover a fonte."
+#: ../../mod/setup.php:431
+msgid ""
+"If running under Windows, please see "
+"\"http://www.php.net/manual/en/openssl.installation.php\"."
+msgstr "Se estiver usando o Windows, por favor dê uma olhada em \"http://www.php.net/manual/en/openssl.installation.php\"."
-#: ../../mod/menu.php:44
-msgid "Unable to update menu."
-msgstr "Não foi possível atualizar o menu."
+#: ../../mod/setup.php:433
+msgid "Generate encryption keys"
+msgstr "Gerar chaves de criptografia"
-#: ../../mod/menu.php:53
-msgid "Unable to create menu."
-msgstr "Não foi possível criar o menu."
+#: ../../mod/setup.php:440
+msgid "libCurl PHP module"
+msgstr "Módulo PHP libCurl"
-#: ../../mod/menu.php:86 ../../mod/menu.php:98
-msgid "Menu Name"
-msgstr "Nome do Menu"
+#: ../../mod/setup.php:441
+msgid "GD graphics PHP module"
+msgstr "Módulo PHP GD graphics"
-#: ../../mod/menu.php:86
-msgid "Unique name (not visible on webpage) - required"
-msgstr "Nome único (não visível na página web) - necessário"
+#: ../../mod/setup.php:442
+msgid "OpenSSL PHP module"
+msgstr "Módulo PHP OpenSSL"
-#: ../../mod/menu.php:87 ../../mod/menu.php:99
-msgid "Menu Title"
-msgstr "Título do Menu"
+#: ../../mod/setup.php:443
+msgid "mysqli PHP module"
+msgstr "Módulo PHP mysqli"
-#: ../../mod/menu.php:87
-msgid "Visible on webpage - leave empty for no title"
-msgstr "Visível na Página web - Deixe vazio para nenhum título"
+#: ../../mod/setup.php:444
+msgid "mb_string PHP module"
+msgstr "Módulo PHP mb_string "
-#: ../../mod/menu.php:88
-msgid "Allow Bookmarks"
-msgstr "Permite Favoritos"
+#: ../../mod/setup.php:445
+msgid "mcrypt PHP module"
+msgstr "Módulo PHP mcrypt"
-#: ../../mod/menu.php:88 ../../mod/menu.php:140
-msgid "Menu may be used to store saved bookmarks"
-msgstr "O menu pode ser utilizado para armazenar links guardados"
+#: ../../mod/setup.php:450 ../../mod/setup.php:452
+msgid "Apache mod_rewrite module"
+msgstr "Módulo mod_rewrite do Apache"
-#: ../../mod/menu.php:89
-msgid "Submit and proceed"
-msgstr "Envie e Prossiga"
+#: ../../mod/setup.php:450
+msgid ""
+"Error: Apache webserver mod-rewrite module is required but not installed."
+msgstr "Erro: o módulo mod-rewrite do Apache é necessário, mas não está instalado."
-#: ../../mod/menu.php:101
-msgid "Drop"
-msgstr "Descartar"
+#: ../../mod/setup.php:456 ../../mod/setup.php:459
+msgid "proc_open"
+msgstr "proc_open"
-#: ../../mod/menu.php:103
-msgid "Bookmarks allowed"
-msgstr "Permitindo guardar links"
+#: ../../mod/setup.php:456
+msgid ""
+"Error: proc_open is required but is either not installed or has been "
+"disabled in php.ini"
+msgstr "Erro: proc_open é necessário, mas não está instalado ou foi desabilitado no php.ini"
-#: ../../mod/menu.php:105
-msgid "Delete this menu"
-msgstr "Deletar este menu"
+#: ../../mod/setup.php:464
+msgid "Error: libCURL PHP module required but not installed."
+msgstr "Erro: o módulo libCURL do PHP é necessário, mas não está instalado."
-#: ../../mod/menu.php:106 ../../mod/menu.php:137
-msgid "Edit menu contents"
-msgstr "Editar os conteúdos do menu"
+#: ../../mod/setup.php:468
+msgid ""
+"Error: GD graphics PHP module with JPEG support required but not installed."
+msgstr "Erro: o módulo gráfico GD, com suporte a JPEG, do PHP é necessário, mas não está instalado."
-#: ../../mod/menu.php:107
-msgid "Edit this menu"
-msgstr "Editar este menu"
+#: ../../mod/setup.php:472
+msgid "Error: openssl PHP module required but not installed."
+msgstr "Erro: o módulo openssl do PHP é necessário, mas não está instalado."
-#: ../../mod/menu.php:121
-msgid "Menu could not be deleted."
-msgstr "Não foi possível deletar o menu."
+#: ../../mod/setup.php:476
+msgid "Error: mysqli PHP module required but not installed."
+msgstr "Erro: o módulo mysqli do PHP é necessário, mas não está instalado."
-#: ../../mod/menu.php:129 ../../mod/mitem.php:24
-msgid "Menu not found."
-msgstr "O menu não foi encontrado."
+#: ../../mod/setup.php:480
+msgid "Error: mb_string PHP module required but not installed."
+msgstr "Erro: o módulo mb_string do PHP é necessário, mas não está instalado."
-#: ../../mod/menu.php:134
-msgid "Edit Menu"
-msgstr "Editar menu"
+#: ../../mod/setup.php:484
+msgid "Error: mcrypt PHP module required but not installed."
+msgstr "Erro: o módulo mcrypt do PHP é necessário, mas não está instalado."
-#: ../../mod/menu.php:136
-msgid "Add or remove entries to this menu"
-msgstr "Adicionar ou remover entradas deste menu"
+#: ../../mod/setup.php:500
+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 "O instalador web precisa criar um arquivo chamado \".htconfig.php\" na pasta raiz da instalação e não está conseguindo."
-#: ../../mod/menu.php:138
-msgid "Menu name"
-msgstr "Nome do menu"
+#: ../../mod/setup.php:501
+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 "Geralmente isso está relacionado às definições de permissão, uma vez que o servidor web pode não estar conseguindo escrever os arquivos nesta pasta."
-#: ../../mod/menu.php:138
-msgid "Must be unique, only seen by you"
-msgstr "Deve ser único, exibido somente para você"
+#: ../../mod/setup.php:502
+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 "Ao final desse procedimento, será fornecido um texto que deverá ser salvo em um arquivo de nome .htconfig.php, na pasta raiz do seu Red."
-#: ../../mod/menu.php:139
-msgid "Menu title"
-msgstr "Título do menu"
+#: ../../mod/setup.php:503
+msgid ""
+"You can alternatively skip this procedure and perform a manual installation."
+" Please see the file \"install/INSTALL.txt\" for instructions."
+msgstr "Você também pode pular esse procedimento e executar uma instalação manual. Por favor, dê uma olhada no arquivo \"install/INSTALL.TXT\" para instruções."
-#: ../../mod/menu.php:139
-msgid "Menu title as seen by others"
-msgstr "Título do menu quando visto por outros"
+#: ../../mod/setup.php:506
+msgid ".htconfig.php is writable"
+msgstr ".htconfig.php tem permissão de escrita"
-#: ../../mod/menu.php:140
-msgid "Allow bookmarks"
-msgstr "Habilitar links guardados"
+#: ../../mod/setup.php:516
+msgid ""
+"Red uses the Smarty3 template engine to render its web views. Smarty3 "
+"compiles templates to PHP to speed up rendering."
+msgstr "Red usa o engine de template Smarty3 para renderizar suas telas. Smarty3 compila templates para PHP para acelerar a renderização."
-#: ../../mod/menu.php:142
-msgid "Modify"
-msgstr "Modificar"
+#: ../../mod/setup.php:517
+#, 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 guardar os templates compilados, o servidor web necessita de permissão de escrita no diretório %s no diretório raiz da Red."
-#: ../../mod/filestorage.php:82
-msgid "Permission Denied."
-msgstr "Permissão negada."
+#: ../../mod/setup.php:518 ../../mod/setup.php:536
+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, certifique-se de que o usuário sob o qual o servidor web roda (ex: www-data) tenha permissão de escrita nesse diretório."
-#: ../../mod/filestorage.php:98
-msgid "File not found."
-msgstr "O arquivo não foi encontrado."
+#: ../../mod/setup.php:519
+#, 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 uma medida de segurança, você deve fornecer ao servidor web permissão de escrita somente em %s e não aos arquivos de template (.tpl) que ele contém."
-#: ../../mod/filestorage.php:141
-msgid "Edit file permissions"
-msgstr "Editar permissões do arquivo"
+#: ../../mod/setup.php:522
+#, php-format
+msgid "%s is writable"
+msgstr "%s tem permissão de escrita"
-#: ../../mod/filestorage.php:150
-msgid "Set/edit permissions"
-msgstr "Definir/editar permissões"
+#: ../../mod/setup.php:535
+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 "A Red usa o diretório store para salvar arquivos carregados. O servidor web necessita de permissão de escrita no diretório store dentro do diretório raiz da Red"
-#: ../../mod/filestorage.php:151
-msgid "Include all files and sub folders"
-msgstr "Incluir todos os arquivos e subpastas"
+#: ../../mod/setup.php:539
+msgid "store is writable"
+msgstr "store tem permissão de escrita"
-#: ../../mod/filestorage.php:152
-msgid "Return to file list"
-msgstr "Retornar à lista de arquivos"
+#: ../../mod/setup.php:569
+msgid ""
+"SSL certificate cannot be validated. Fix certificate or disable https access"
+" to this site."
+msgstr "Não foi possível validar o certificado SSL. Corrija o certificado ou desabilite o acesso via https ao site."
-#: ../../mod/filestorage.php:154
-msgid "Copy/paste this code to attach file to a post"
-msgstr "Copiar/colar este código para anexar um arquivo a uma publicação"
+#: ../../mod/setup.php:570
+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 você oferece acesso https ao seu website ou permite conexões na porta TCP 443 (a porta https:), você DEVE usar um certificado reconhecido pelos navegadores. Você NÃO DEVE usar certificados assinados por você mesmo!"
-#: ../../mod/filestorage.php:155
-msgid "Copy/paste this URL to link file from a web page"
-msgstr "Copiar/colar este URL para linkar para o arquivo em uma página web"
+#: ../../mod/setup.php:571
+msgid ""
+"This restriction is incorporated because public posts from you may for "
+"example contain references to images on your own hub."
+msgstr "Essa restrição é incorporada porque publicações públicas suas podem, por exemplo, conter referências a imagens no seu próprio hub."
-#: ../../mod/filestorage.php:157
-msgid "Share this file"
-msgstr "Compartilhe esse arquivo"
+#: ../../mod/setup.php:572
+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 seu certificado não for reconhecido, membros de outros sites (que podem ter certificados válidos) receberão uma mensagem de aviso nos seus próprios sites reclamando de problemas de segurança."
-#: ../../mod/filestorage.php:158
-msgid "Show URL to this file"
-msgstr "Mostre URL para esse arquivo"
+#: ../../mod/setup.php:573
+msgid ""
+"This can cause usability issues elsewhere (not just on your own site) so we "
+"must insist on this requirement."
+msgstr "Isso pode causar problemas de usabilidade (não só no seu site) então nós precisamos insistir nesse requisito."
-#: ../../mod/filestorage.php:159
-msgid "Notify your contacts about this file"
-msgstr "Notifique seus contatos sobre esse arquivo"
+#: ../../mod/setup.php:574
+msgid ""
+"Providers are available that issue free certificates which are browser-"
+"valid."
+msgstr "Existem provedores que disponibilizam gratuitamente certificados reconhecidos por navegadores."
-#: ../../mod/fsuggest.php:20 ../../mod/fsuggest.php:92
-msgid "Contact not found."
-msgstr "O contato não foi encontrado."
+#: ../../mod/setup.php:576
+msgid "SSL certificate validation"
+msgstr "Validação do certificado SSL"
-#: ../../mod/fsuggest.php:63
-msgid "Friend suggestion sent."
-msgstr "Sugestão de amizade enviada."
+#: ../../mod/setup.php:582
+msgid ""
+"Url rewrite in .htaccess is not working. Check your server configuration."
+msgstr "A reescrita de URLs não está funcionando no .htaccess. Verifique as configurações do servidor."
-#: ../../mod/fsuggest.php:97
-msgid "Suggest Friends"
-msgstr "Sugerir amigos"
+#: ../../mod/setup.php:584
+msgid "Url rewrite is working"
+msgstr "A reescrita de URLs está funcionando"
-#: ../../mod/fsuggest.php:99
-#, php-format
-msgid "Suggest a friend for %s"
-msgstr "Sugerir um amigo para %s"
+#: ../../mod/setup.php:594
+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 "Não foi possível gravar o arquivo de configuração \".htconfig.php\". Por favor, use o texto incluso para criar um arquivo de configuração na raiz da instalação do Friendika em seu servidor web."
-#: ../../mod/magic.php:69
-msgid "Hub not found."
-msgstr "O hub não foi encontrado."
+#: ../../mod/setup.php:618
+msgid "Errors encountered creating database tables."
+msgstr "Foram encontrados erros durante a criação das tabelas do banco de dados."
-#: ../../mod/poke.php:159
-msgid "Poke/Prod"
-msgstr "Cutucar/Espetar"
+#: ../../mod/setup.php:653
+msgid "<h1>What next</h1>"
+msgstr "<h1>Próximos passos</h1>"
-#: ../../mod/poke.php:160
-msgid "poke, prod or do other things to somebody"
-msgstr "Cutucar, espetar ou fazer outras coisas a alguém"
+#: ../../mod/setup.php:654
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the "
+"poller."
+msgstr "IMPORTANTE: Você deve configurar [manualmente] uma tarefa agendada para o coletor."
-#: ../../mod/poke.php:161
-msgid "Recipient"
-msgstr "Destinatário"
+#: ../../mod/editblock.php:8 ../../mod/editblock.php:27
+#: ../../mod/editblock.php:53 ../../mod/editlayout.php:36
+#: ../../mod/editpost.php:20 ../../mod/editwebpage.php:32
+msgid "Item not found"
+msgstr "O item não foi encontrado"
-#: ../../mod/poke.php:162
-msgid "Choose what you wish to do to recipient"
-msgstr "Escolha o que você deseja fazer com seu alvo"
+#: ../../mod/editblock.php:77
+msgid "Edit Block"
+msgstr "Editar bloco"
-#: ../../mod/poke.php:165
-msgid "Make this post private"
-msgstr "Torne esta publicação privada"
+#: ../../mod/editblock.php:87
+msgid "Delete block?"
+msgstr "Deletar bloco?"
-#: ../../mod/profperm.php:29 ../../mod/profperm.php:58
-msgid "Invalid profile identifier."
-msgstr "Identificador de perfil inválido."
+#: ../../mod/editblock.php:115 ../../mod/editlayout.php:110
+#: ../../mod/editpost.php:116 ../../mod/editwebpage.php:147
+msgid "Insert YouTube video"
+msgstr "Inserir vídeo do YouTube"
-#: ../../mod/profperm.php:110
-msgid "Profile Visibility Editor"
-msgstr "Editor de visibilidade do perfil"
+#: ../../mod/editblock.php:116 ../../mod/editlayout.php:111
+#: ../../mod/editpost.php:117 ../../mod/editwebpage.php:148
+msgid "Insert Vorbis [.ogg] video"
+msgstr "Inserir vídeo Vorbis (.ogg)"
-#: ../../mod/profperm.php:114
-msgid "Click on a contact to add or remove."
-msgstr "Clique em um contato para adicionar ou remover."
+#: ../../mod/editblock.php:117 ../../mod/editlayout.php:112
+#: ../../mod/editpost.php:118 ../../mod/editwebpage.php:149
+msgid "Insert Vorbis [.ogg] audio"
+msgstr "Inserir áudio Vorbis (.ogg)"
-#: ../../mod/profperm.php:123
-msgid "Visible To"
-msgstr "Visível para"
+#: ../../mod/editblock.php:153
+msgid "Delete Block"
+msgstr "Deletar bloco"
+
+#: ../../mod/pdledit.php:13
+msgid "Layout updated."
+msgstr "Layout atualizado."
+
+#: ../../mod/pdledit.php:28 ../../mod/pdledit.php:53
+msgid "Edit System Page Description"
+msgstr "Editar descrição de página do sistema"
+
+#: ../../mod/pdledit.php:48
+msgid "Layout not found."
+msgstr "Layout não encontrado."
+
+#: ../../mod/pdledit.php:54
+msgid "Module Name:"
+msgstr "Nome do módulo:"
+
+#: ../../mod/pdledit.php:55 ../../mod/layouts.php:59
+msgid "Layout Help"
+msgstr "Ajuda de layout"
+
+#: ../../mod/editlayout.php:72
+msgid "Edit Layout"
+msgstr "Editar layout"
#: ../../mod/impel.php:121
#, php-format
@@ -6506,1124 +6688,1030 @@ msgstr "Elemento %s instalado"
msgid "%s element installation failed"
msgstr "Instalação de elemento %s falhou"
-#: ../../mod/profiles.php:18 ../../mod/profiles.php:174
-#: ../../mod/profiles.php:231 ../../mod/profiles.php:600
-msgid "Profile not found."
-msgstr "O perfil não foi encontrado."
+#: ../../mod/editwebpage.php:106
+msgid "Edit Webpage"
+msgstr "Editar página web"
-#: ../../mod/profiles.php:38
-msgid "Profile deleted."
-msgstr "O perfil foi excluído."
+#: ../../mod/editwebpage.php:116
+msgid "Delete webpage?"
+msgstr "Deletar página web?"
-#: ../../mod/profiles.php:56 ../../mod/profiles.php:92
-msgid "Profile-"
-msgstr "Perfil-"
+#: ../../mod/editwebpage.php:186
+msgid "Delete Webpage"
+msgstr "Deletar página web"
-#: ../../mod/profiles.php:77 ../../mod/profiles.php:120
-msgid "New profile created."
-msgstr "O novo perfil foi criado."
+#: ../../mod/photos.php:77
+msgid "Page owner information could not be retrieved."
+msgstr "As informações do dono da pagina não puderam ser obtidas."
-#: ../../mod/profiles.php:98
-msgid "Profile unavailable to clone."
-msgstr "O perfil não está disponível para clonagem."
+#: ../../mod/photos.php:97
+msgid "Album not found."
+msgstr "O álbum não foi encontrado."
-#: ../../mod/profiles.php:136
-msgid "Profile unavailable to export."
-msgstr "Perfil indisponível para exportar."
+#: ../../mod/photos.php:119 ../../mod/photos.php:676
+msgid "Delete Album"
+msgstr "Excluir o álbum"
-#: ../../mod/profiles.php:241
-msgid "Profile Name is required."
-msgstr "É obrigatório informar o nome do perfil."
+#: ../../mod/photos.php:159 ../../mod/photos.php:991
+msgid "Delete Photo"
+msgstr "Excluir a foto"
-#: ../../mod/profiles.php:404
-msgid "Marital Status"
-msgstr "Estado civil"
+#: ../../mod/photos.php:453
+msgid "No photos selected"
+msgstr "Não foi selecionada nenhuma foto"
-#: ../../mod/profiles.php:408
-msgid "Romantic Partner"
-msgstr "Parceiro/a romântico/a"
+#: ../../mod/photos.php:500
+msgid "Access to this item is restricted."
+msgstr "O acesso a este item está restrito."
-#: ../../mod/profiles.php:412
-msgid "Likes"
-msgstr "Gosta de"
+#: ../../mod/photos.php:574
+#, php-format
+msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
+msgstr "Você usou %1$.2f Mbytes de %2$.2f Mbytes de armazenamento de fotos."
-#: ../../mod/profiles.php:416
-msgid "Dislikes"
-msgstr "Não gosta de"
+#: ../../mod/photos.php:577
+#, php-format
+msgid "You have used %1$.2f Mbytes of photo storage."
+msgstr "Você usou %1$.2f Mbytes de armazenamento de fotos."
-#: ../../mod/profiles.php:420
-msgid "Work/Employment"
-msgstr "Trabalho/Emprego"
+#: ../../mod/photos.php:596
+msgid "Upload Photos"
+msgstr "Enviar fotos"
-#: ../../mod/profiles.php:423
-msgid "Religion"
-msgstr "Religião"
+#: ../../mod/photos.php:600 ../../mod/photos.php:671
+msgid "New album name: "
+msgstr "Novo nome de álbum: "
-#: ../../mod/profiles.php:427
-msgid "Political Views"
-msgstr "Posição política"
+#: ../../mod/photos.php:601
+msgid "or existing album name: "
+msgstr "ou nome de um álbum já existente: "
-#: ../../mod/profiles.php:431 ../../mod/id.php:33
-msgid "Gender"
-msgstr "Gênero"
+#: ../../mod/photos.php:602
+msgid "Do not show a status post for this upload"
+msgstr "Não exibir uma publicação de status para este carregamento"
-#: ../../mod/profiles.php:435
-msgid "Sexual Preference"
-msgstr "Preferência sexual"
+#: ../../mod/photos.php:622
+msgid "Album name could not be decoded"
+msgstr "Não foi possível decodificar o nome do álbum"
-#: ../../mod/profiles.php:439
-msgid "Homepage"
-msgstr "Página web"
+#: ../../mod/photos.php:660 ../../mod/photos.php:682 ../../mod/photos.php:1163
+#: ../../mod/photos.php:1178
+msgid "Contact Photos"
+msgstr "Fotos dos contatos"
-#: ../../mod/profiles.php:443
-msgid "Interests"
-msgstr "Interesses"
+#: ../../mod/photos.php:684
+msgid "Edit Album"
+msgstr "Editar o álbum"
-#: ../../mod/profiles.php:447 ../../mod/admin.php:953
-msgid "Address"
-msgstr "Endereço"
+#: ../../mod/photos.php:690
+msgid "Show Newest First"
+msgstr "Exibir primeiro os mais recentes"
-#: ../../mod/profiles.php:537
-msgid "Profile updated."
-msgstr "O perfil foi atualizado."
+#: ../../mod/photos.php:692
+msgid "Show Oldest First"
+msgstr "Exibir primeiro os mais antigos"
-#: ../../mod/profiles.php:626
-msgid "Hide your contact/friend list from viewers of this profile?"
-msgstr "Esconder sua lista de contatos/amigos dos visitantes no seu perfil?"
+#: ../../mod/photos.php:745 ../../mod/photos.php:1210
+msgid "View Photo"
+msgstr "Ver a foto"
-#: ../../mod/profiles.php:666
-msgid "Edit Profile Details"
-msgstr "Editar os detalhes do perfil"
+#: ../../mod/photos.php:810
+msgid "Permission denied. Access to this item may be restricted."
+msgstr "Permissão negada. Acesso a este item pode estar restrito."
-#: ../../mod/profiles.php:668
-msgid "View this profile"
-msgstr "Ver este perfil"
+#: ../../mod/photos.php:812
+msgid "Photo not available"
+msgstr "A foto não está disponível"
-#: ../../mod/profiles.php:670
-msgid "Change Profile Photo"
-msgstr "Mudar a foto do perfil"
+#: ../../mod/photos.php:872
+msgid "Use as profile photo"
+msgstr "Usar como uma foto de perfil"
-#: ../../mod/profiles.php:671
-msgid "Create a new profile using these settings"
-msgstr "Criar um novo perfil usando estas configurações"
+#: ../../mod/photos.php:896
+msgid "View Full Size"
+msgstr "Ver no tamanho real"
-#: ../../mod/profiles.php:672
-msgid "Clone this profile"
-msgstr "Clonar este perfil"
+#: ../../mod/photos.php:974
+msgid "Edit photo"
+msgstr "Editar a foto"
-#: ../../mod/profiles.php:673
-msgid "Delete this profile"
-msgstr "Excluir este perfil"
+#: ../../mod/photos.php:976
+msgid "Rotate CW (right)"
+msgstr "Rotacionar H (horário)"
-#: ../../mod/profiles.php:675
-msgid "Import profile from file"
-msgstr "Importar perfil dum arquivo"
+#: ../../mod/photos.php:977
+msgid "Rotate CCW (left)"
+msgstr "Rotacionar AH (anti-horário)"
-#: ../../mod/profiles.php:676
-msgid "Export profile to file"
-msgstr "Exportar perfil para arquivo"
+#: ../../mod/photos.php:980
+msgid "New album name"
+msgstr "Novo nome para o álbum"
-#: ../../mod/profiles.php:677
-msgid "Profile Name:"
-msgstr "Nome do perfil:"
+#: ../../mod/photos.php:983
+msgid "Caption"
+msgstr "Legenda"
-#: ../../mod/profiles.php:678
-msgid "Your Full Name:"
-msgstr "Seu nome completo:"
+#: ../../mod/photos.php:985
+msgid "Add a Tag"
+msgstr "Adicionar uma etiqueta"
-#: ../../mod/profiles.php:679
-msgid "Title/Description:"
-msgstr "Título/Descrição:"
+#: ../../mod/photos.php:988
+msgid ""
+"Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
+msgstr "Por exemplo: @joao, @Joao_da_Silva, @joao@exemplo.com, #Minas_Gerais, #acampamento"
-#: ../../mod/profiles.php:680
-msgid "Your Gender:"
-msgstr "Seu gênero:"
+#: ../../mod/photos.php:1141
+msgid "In This Photo:"
+msgstr "Nesta foto:"
-#: ../../mod/profiles.php:681
-msgid "Birthday :"
-msgstr "Data de nascimento :"
+#: ../../mod/photos.php:1216
+msgid "View Album"
+msgstr "Ver álbum"
-#: ../../mod/profiles.php:682
-msgid "Street Address:"
-msgstr "Endereço:"
+#: ../../mod/photos.php:1239
+msgid "Recent Photos"
+msgstr "Fotos recentes"
-#: ../../mod/profiles.php:683
-msgid "Locality/City:"
-msgstr "Localidade/Cidade:"
+#: ../../mod/profile_photo.php:108
+msgid "Image uploaded but image cropping failed."
+msgstr "A imagem foi enviada, mas não foi possível cortá-la."
-#: ../../mod/profiles.php:684
-msgid "Postal/Zip Code:"
-msgstr "CEP:"
+#: ../../mod/profile_photo.php:161
+msgid "Image resize failed."
+msgstr "Falha ao modificar o tamanho da imagem."
-#: ../../mod/profiles.php:685
-msgid "Country:"
-msgstr "País:"
+#: ../../mod/profile_photo.php:205
+msgid ""
+"Shift-reload the page or clear browser cache if the new photo does not "
+"display immediately."
+msgstr "Se a nova foto não aparecer imediatamente, recarregue a página segurando a tecla \"shift\" ou limpe o cache do navegador, "
-#: ../../mod/profiles.php:686
-msgid "Region/State:"
-msgstr "Região/Estado:"
+#: ../../mod/profile_photo.php:232
+#, php-format
+msgid "Image exceeds size limit of %d"
+msgstr "A imagem excede o limite de tamanho de %d"
-#: ../../mod/profiles.php:687
-msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
-msgstr "Estado civil <span class=\"heart\">&hearts;</span>:"
+#: ../../mod/profile_photo.php:241
+msgid "Unable to process image."
+msgstr "Não foi possível processar a imagem."
-#: ../../mod/profiles.php:688
-msgid "Who: (if applicable)"
-msgstr "Quem: (se aplicável)"
+#: ../../mod/profile_photo.php:290 ../../mod/profile_photo.php:339
+msgid "Photo not available."
+msgstr "A foto não está disponível."
-#: ../../mod/profiles.php:689
-msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
-msgstr "Exemplos: fulano123, Fulano de Tal, fulano@exemplo.com"
+#: ../../mod/profile_photo.php:358
+msgid "Upload File:"
+msgstr "Enviar arquivo:"
-#: ../../mod/profiles.php:690
-msgid "Since [date]:"
-msgstr "Desde [data]:"
+#: ../../mod/profile_photo.php:359
+msgid "Select a profile:"
+msgstr "Selecione um perfil:"
-#: ../../mod/profiles.php:692
-msgid "Homepage URL:"
-msgstr "Endereço do website:"
+#: ../../mod/profile_photo.php:360
+msgid "Upload Profile Photo"
+msgstr "Enviar foto do perfil"
-#: ../../mod/profiles.php:695
-msgid "Religious Views:"
-msgstr "Orientação religiosa:"
+#: ../../mod/profile_photo.php:365
+msgid "skip this step"
+msgstr "pule esta etapa"
-#: ../../mod/profiles.php:696
-msgid "Keywords:"
-msgstr "Palavras-chave:"
+#: ../../mod/profile_photo.php:365
+msgid "select a photo from your photo albums"
+msgstr "selecione uma foto do seu álbum de fotos"
-#: ../../mod/profiles.php:699
-msgid "Example: fishing photography software"
-msgstr "Exemplo: pesca fotografia software"
+#: ../../mod/profile_photo.php:381
+msgid "Crop Image"
+msgstr "Cortar a imagem"
-#: ../../mod/profiles.php:700
-msgid "Used in directory listings"
-msgstr "Usado em listas de diretório"
+#: ../../mod/profile_photo.php:382
+msgid "Please adjust the image cropping for optimum viewing."
+msgstr "Por favor, ajuste o corte da imagem para a melhor visualização."
-#: ../../mod/profiles.php:701
-msgid "Tell us about yourself..."
-msgstr "Fale um pouco sobre você..."
+#: ../../mod/profile_photo.php:384
+msgid "Done Editing"
+msgstr "Encerrar a edição"
-#: ../../mod/profiles.php:702
-msgid "Hobbies/Interests"
-msgstr "Hobbies/Interesses"
+#: ../../mod/profile_photo.php:427
+msgid "Image uploaded successfully."
+msgstr "A imagem foi enviada com sucesso."
-#: ../../mod/profiles.php:703
-msgid "Contact information and Social Networks"
-msgstr "Informações de contato e redes sociais"
+#: ../../mod/profile_photo.php:429
+msgid "Image upload failed."
+msgstr "Não foi possível enviar a imagem."
-#: ../../mod/profiles.php:704
-msgid "My other channels"
-msgstr "Meus outros canais"
+#: ../../mod/profile_photo.php:438
+#, php-format
+msgid "Image size reduction [%s] failed."
+msgstr "Não foi possível reduzir o tamanho da imagem [%s]."
-#: ../../mod/profiles.php:705
-msgid "Musical interests"
-msgstr "Interesses musicais"
+#: ../../mod/sources.php:32
+msgid "Failed to create source. No channel selected."
+msgstr "Falha ao criar a fonte. Nenhum canal selecionado."
-#: ../../mod/profiles.php:706
-msgid "Books, literature"
-msgstr "Livros, literatura"
+#: ../../mod/sources.php:45
+msgid "Source created."
+msgstr "A fonte foi criada."
-#: ../../mod/profiles.php:707
-msgid "Television"
-msgstr "Televisão"
+#: ../../mod/sources.php:57
+msgid "Source updated."
+msgstr "A fonte foi atualizada."
-#: ../../mod/profiles.php:708
-msgid "Film/dance/culture/entertainment"
-msgstr "Filme/dança/cultura/entretenimento"
+#: ../../mod/sources.php:82
+msgid "*"
+msgstr "*"
-#: ../../mod/profiles.php:709
-msgid "Love/romance"
-msgstr "Amor/romance"
+#: ../../mod/sources.php:89
+msgid "Manage remote sources of content for your channel."
+msgstr "Administrar as fontes remotas de conteúdo para o seu canal."
-#: ../../mod/profiles.php:710
-msgid "Work/employment"
-msgstr "Trabalho/emprego"
+#: ../../mod/sources.php:90 ../../mod/sources.php:100
+msgid "New Source"
+msgstr "Nova fonte"
-#: ../../mod/profiles.php:711
-msgid "School/education"
-msgstr "Escola/educação"
+#: ../../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 ou uma seleção do conteúdo do seguinte canal para este canal, e distribuí-lo de acordo com as configurações do seu canal."
-#: ../../mod/profiles.php:717
-msgid "This is your default profile."
-msgstr "Este é seu perfil padrão."
+#: ../../mod/sources.php:102 ../../mod/sources.php:134
+msgid "Only import content with these words (one per line)"
+msgstr "Importar apenas conteúd com estas palavras (uma por linha)"
-#: ../../mod/profiles.php:728 ../../mod/directory.php:218
-msgid "Age: "
-msgstr "Idade: "
+#: ../../mod/sources.php:102 ../../mod/sources.php:134
+msgid "Leave blank to import all public content"
+msgstr "Deixe em branco para importar todo o conteúdo público"
-#: ../../mod/profiles.php:771
-msgid "Edit/Manage Profiles"
-msgstr "Editar/Administrar perfis"
+#: ../../mod/sources.php:103 ../../mod/sources.php:137
+#: ../../mod/new_channel.php:112
+msgid "Channel Name"
+msgstr "Nome do canal"
-#: ../../mod/profiles.php:772
-msgid "Add profile things"
-msgstr "Adicionar coisas ao perfil"
+#: ../../mod/sources.php:123 ../../mod/sources.php:150
+msgid "Source not found."
+msgstr "A fonte não foi encontrada."
-#: ../../mod/profiles.php:773
-msgid "Include desirable objects in your profile"
-msgstr "Inclua objetos desejáveis no seu perfil"
+#: ../../mod/sources.php:130
+msgid "Edit Source"
+msgstr "Editar fonte"
+
+#: ../../mod/sources.php:131
+msgid "Delete Source"
+msgstr "Deletar fonte"
-#: ../../mod/ratings.php:69
-msgid "No ratings"
-msgstr "Sem avaliações"
+#: ../../mod/sources.php:158
+msgid "Source removed"
+msgstr "A fonte foi removida."
-#: ../../mod/ratings.php:99
-msgid "Ratings"
-msgstr "Avaliações"
+#: ../../mod/sources.php:160
+msgid "Unable to remove source."
+msgstr "Não foi possível remover a fonte."
-#: ../../mod/ratings.php:100
-msgid "Rating: "
-msgstr "Avaliações"
+#: ../../mod/filer.php:49
+msgid "- select -"
+msgstr "- selecionar -"
-#: ../../mod/ratings.php:101
-msgid "Website: "
-msgstr "Website:"
+#: ../../mod/events.php:91
+msgid "Event title and start time are required."
+msgstr "O título do evento e a hora de início são obrigatórios."
-#: ../../mod/ratings.php:103
-msgid "Description: "
-msgstr "Descrição:"
+#: ../../mod/events.php:105
+msgid "Event not found."
+msgstr "Evento não encontrado."
-#: ../../mod/viewsrc.php:38
-msgid "Source of Item"
-msgstr "Fonte do Item"
+#: ../../mod/events.php:369
+msgid "l, F j"
+msgstr "l, F j"
#: ../../mod/openid.php:26
msgid "OpenID protocol error. No ID returned."
msgstr "Erro do protocolo OpenID. Nenhuma ID retornada."
-#: ../../mod/openid.php:72 ../../mod/openid.php:180 ../../mod/post.php:286
-#, php-format
-msgid "Welcome %s. Remote authentication successful."
-msgstr "Bem vindo %s. Autenticação remota realizada com sucesso."
-
-#: ../../mod/directory.php:224
+#: ../../mod/fsuggest.php:99
#, php-format
-msgid "%d rating"
-msgid_plural "%d ratings"
-msgstr[0] "%d avaliação"
-msgstr[1] "%d avaliações"
+msgid "Suggest a friend for %s"
+msgstr "Sugerir um amigo para %s"
-#: ../../mod/directory.php:236
-msgid "Gender: "
-msgstr "Gênero: "
+#: ../../mod/suggest.php:35
+msgid ""
+"No suggestions available. If this is a new site, please try again in 24 "
+"hours."
+msgstr "Nenhuma sugestão disponível. Se este site é novo, por favor tente novamente em 24 horas."
-#: ../../mod/directory.php:238
-msgid "Status: "
-msgstr "Status:"
+#: ../../mod/group.php:20
+msgid "Collection created."
+msgstr "A coleção foi criada."
-#: ../../mod/directory.php:240
-msgid "Homepage: "
-msgstr "Website:"
+#: ../../mod/group.php:26
+msgid "Could not create collection."
+msgstr "Não foi possível criar a coleção."
-#: ../../mod/directory.php:243
-msgid "Hometown: "
-msgstr "Cidade natal:"
+#: ../../mod/group.php:54
+msgid "Collection updated."
+msgstr "Coleção atualizada"
-#: ../../mod/directory.php:245
-msgid "About: "
-msgstr "Sobre:"
+#: ../../mod/group.php:86
+msgid "Create a collection of channels."
+msgstr "Criar uma coleção de canais."
-#: ../../mod/directory.php:303
-msgid "Public Forum:"
-msgstr "Fórum público:"
+#: ../../mod/group.php:87 ../../mod/group.php:183
+msgid "Collection Name: "
+msgstr "Nome da coleção:"
-#: ../../mod/directory.php:306
-msgid "Keywords: "
-msgstr "Palavras-chave:"
+#: ../../mod/group.php:89 ../../mod/group.php:186
+msgid "Members are visible to other channels"
+msgstr "Membros são visíveis para outros canais"
-#: ../../mod/directory.php:311
-#, php-format
-msgid "Common connections: %s"
-msgstr "Conexões em Comum: %s"
+#: ../../mod/group.php:107
+msgid "Collection removed."
+msgstr "Coleção removida."
-#: ../../mod/directory.php:363
-msgid "Finding:"
-msgstr "Pesquisando:"
+#: ../../mod/group.php:109
+msgid "Unable to remove collection."
+msgstr "Não foi possível remover a coleção."
-#: ../../mod/directory.php:368
-msgid "next page"
-msgstr "próxima página"
+#: ../../mod/group.php:182
+msgid "Collection Editor"
+msgstr "Editor de coleção"
-#: ../../mod/directory.php:368
-msgid "previous page"
-msgstr "página anterior"
+#: ../../mod/group.php:196
+msgid "Members"
+msgstr "Membros"
-#: ../../mod/directory.php:385
-msgid "No entries (some entries may be hidden)."
-msgstr "Nenhuma entrada (algumas entradas podem estar escondidas)."
+#: ../../mod/group.php:198
+msgid "All Connected Channels"
+msgstr "Todas os canais conectados"
-#: ../../mod/uexport.php:33 ../../mod/uexport.php:34
-msgid "Export Channel"
-msgstr "Exportar o canal"
+#: ../../mod/group.php:233
+msgid "Click on a channel to add or remove."
+msgstr "Clique em um canal para adicionar ou remover."
-#: ../../mod/uexport.php:35
-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 suas informações básicas do canal para um arquivo pequeno. Isso funciona como um backup das suas ligações, permissões, perfis e dados básicos, que podem ser usados para importar os dados para um novo hub, não mas não contém seu conteúdo."
+#: ../../mod/tagger.php:98
+#, php-format
+msgid "%1$s tagged %2$s's %3$s with %4$s"
+msgstr "%1$s marcou %3$s de %2$s com %4$s"
-#: ../../mod/uexport.php:36
-msgid "Export Content"
-msgstr "Exportar conteúdo"
+#: ../../mod/help.php:43 ../../mod/help.php:49 ../../mod/help.php:55
+msgid "Help:"
+msgstr "Ajuda:"
-#: ../../mod/uexport.php:37
-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 as informações do seu canal e todo conteúdo para um backup JSON. Este backup irá conter todas suas conexões, permissões, dados de perfil e todo seu conteúdo, mas geralmente não é adequado para importar um canal para um novo hub, pois esse arquivo pode ser MUITO grande. Por favor seja paciente - pode demorar muitos minutos para este download começar."
+#: ../../mod/help.php:69 ../../index.php:237
+msgid "Not Found"
+msgstr "Não encontrada"
-#: ../../mod/viewconnections.php:62
-msgid "No connections."
-msgstr "Nenhuma conexão."
+#: ../../mod/tagrm.php:41
+msgid "Tag removed"
+msgstr "A etiqueta foi removida"
-#: ../../mod/viewconnections.php:75
-#, php-format
-msgid "Visit %s's profile [%s]"
-msgstr "Ver o perfil de %s [%s]"
+#: ../../mod/tagrm.php:79
+msgid "Remove Item Tag"
+msgstr "Remover a etiqueta de item"
-#: ../../mod/zfinger.php:23
-msgid "invalid target signature"
-msgstr "assinatura do destino inválida"
+#: ../../mod/tagrm.php:81
+msgid "Select a tag to remove: "
+msgstr "Selecione uma etiqueta para remover: "
#: ../../mod/admin.php:52
msgid "Theme settings updated."
msgstr "As configurações de tema foram atualizadas."
-#: ../../mod/admin.php:93 ../../mod/admin.php:445
+#: ../../mod/admin.php:97 ../../mod/admin.php:413
msgid "Site"
msgstr "Site"
-#: ../../mod/admin.php:94
+#: ../../mod/admin.php:98
msgid "Accounts"
msgstr "Contas"
-#: ../../mod/admin.php:95 ../../mod/admin.php:945
+#: ../../mod/admin.php:99 ../../mod/admin.php:860
msgid "Channels"
msgstr "Canais"
-#: ../../mod/admin.php:96 ../../mod/admin.php:1036 ../../mod/admin.php:1076
+#: ../../mod/admin.php:100 ../../mod/admin.php:951 ../../mod/admin.php:993
msgid "Plugins"
msgstr "Plugins"
-#: ../../mod/admin.php:97 ../../mod/admin.php:1236 ../../mod/admin.php:1270
+#: ../../mod/admin.php:101 ../../mod/admin.php:1156 ../../mod/admin.php:1192
msgid "Themes"
msgstr "Temas"
-#: ../../mod/admin.php:98
-msgid "Inspect queue"
-msgstr "Inspecione fila"
+#: ../../mod/admin.php:102 ../../mod/admin.php:515
+msgid "Server"
+msgstr "Servidor"
-#: ../../mod/admin.php:100
+#: ../../mod/admin.php:103
msgid "Profile Config"
msgstr "Configuração de perfis"
-#: ../../mod/admin.php:101
+#: ../../mod/admin.php:104
msgid "DB updates"
msgstr "Atualizações do Banco de Dados"
-#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1355
+#: ../../mod/admin.php:118 ../../mod/admin.php:125 ../../mod/admin.php:1279
msgid "Logs"
msgstr "Logs"
-#: ../../mod/admin.php:121
+#: ../../mod/admin.php:124
msgid "Plugin Features"
msgstr "Recursos dos plugins"
-#: ../../mod/admin.php:123
+#: ../../mod/admin.php:126
msgid "User registrations waiting for confirmation"
msgstr "Registros de usuário aguardando confirmação"
-#: ../../mod/admin.php:200
-msgid "# Accounts"
-msgstr "# Contas"
-
-#: ../../mod/admin.php:201
-msgid "# blocked accounts"
-msgstr "# Contas bloqueadas"
-
-#: ../../mod/admin.php:202
-msgid "# expired accounts"
-msgstr "# Contas expiradas"
-
-#: ../../mod/admin.php:203
-msgid "# expiring accounts"
-msgstr "#contas expirando"
-
-#: ../../mod/admin.php:216
-msgid "# Channels"
-msgstr "# Canais"
-
-#: ../../mod/admin.php:217
-msgid "# primary"
-msgstr "# Primário"
-
-#: ../../mod/admin.php:218
-msgid "# clones"
-msgstr "# clones"
-
-#: ../../mod/admin.php:224
+#: ../../mod/admin.php:206
msgid "Message queues"
msgstr "Filas de mensagem"
-#: ../../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:211 ../../mod/admin.php:412 ../../mod/admin.php:514
+#: ../../mod/admin.php:723 ../../mod/admin.php:859 ../../mod/admin.php:950
+#: ../../mod/admin.php:992 ../../mod/admin.php:1155 ../../mod/admin.php:1191
+#: ../../mod/admin.php:1278
msgid "Administration"
msgstr "Administração"
-#: ../../mod/admin.php:241
+#: ../../mod/admin.php:212
msgid "Summary"
msgstr "Resumo"
-#: ../../mod/admin.php:244
-msgid "Registered accounts"
-msgstr "Contas Registradas"
+#: ../../mod/admin.php:214
+msgid "Registered users"
+msgstr "Usuários registrados"
-#: ../../mod/admin.php:245 ../../mod/admin.php:543
+#: ../../mod/admin.php:216 ../../mod/admin.php:518
msgid "Pending registrations"
msgstr "Registros pendentes"
-#: ../../mod/admin.php:246
-msgid "Registered channels"
-msgstr "Canais Registrados"
+#: ../../mod/admin.php:217
+msgid "Version"
+msgstr "Versão"
-#: ../../mod/admin.php:247 ../../mod/admin.php:544
+#: ../../mod/admin.php:219 ../../mod/admin.php:519
msgid "Active plugins"
msgstr "Plugins ativos"
-#: ../../mod/admin.php:248
-msgid "Version"
-msgstr "Versão"
-
-#: ../../mod/admin.php:359
+#: ../../mod/admin.php:333
msgid "Site settings updated."
msgstr "As configurações de site foram atualizadas."
-#: ../../mod/admin.php:398
-msgid "experimental"
-msgstr "experimental"
-
-#: ../../mod/admin.php:400
-msgid "unsupported"
-msgstr "não suportado"
+#: ../../mod/admin.php:364
+msgid "No special theme for accessibility"
+msgstr "Sem tema especial para acessibilidade"
-#: ../../mod/admin.php:425
+#: ../../mod/admin.php:393
msgid "Yes - with approval"
msgstr "Sim - pendente aprovação"
-#: ../../mod/admin.php:431
+#: ../../mod/admin.php:399
msgid "My site is not a public server"
msgstr "Meu site não é um servidor público"
-#: ../../mod/admin.php:432
+#: ../../mod/admin.php:400
msgid "My site has paid access only"
msgstr "Meu site oferece somente acesso pago"
-#: ../../mod/admin.php:433
+#: ../../mod/admin.php:401
msgid "My site has free access only"
msgstr "Meu site oferece somente acesso gratuito"
-#: ../../mod/admin.php:434
+#: ../../mod/admin.php:402
msgid "My site offers free accounts with optional paid upgrades"
msgstr "Meu site oferece contas gratuitas com recursos adicionais pagos"
-#: ../../mod/admin.php:447 ../../mod/register.php:207
-msgid "Registration"
-msgstr "Registro"
-
-#: ../../mod/admin.php:448
+#: ../../mod/admin.php:416
msgid "File upload"
msgstr "Carregamento de arquivos"
-#: ../../mod/admin.php:449
+#: ../../mod/admin.php:417
msgid "Policies"
msgstr "Políticas"
-#: ../../mod/admin.php:454
+#: ../../mod/admin.php:422
msgid "Site name"
msgstr "Nome do site"
-#: ../../mod/admin.php:455
+#: ../../mod/admin.php:423
msgid "Banner/Logo"
msgstr "Cartaz/Logo"
-#: ../../mod/admin.php:456
+#: ../../mod/admin.php:424
msgid "Administrator Information"
msgstr "Informações do Administrador"
-#: ../../mod/admin.php:456
+#: ../../mod/admin.php:424
msgid ""
"Contact information for site administrators. Displayed on siteinfo page. "
"BBCode can be used here"
msgstr "Informações de contato com administradores do site. Exibida na página siteinfo. BBCode pode ser usado aqui."
-#: ../../mod/admin.php:457
+#: ../../mod/admin.php:425
msgid "System language"
msgstr "Idioma do sistema"
-#: ../../mod/admin.php:458
+#: ../../mod/admin.php:426
msgid "System theme"
msgstr "Tema do sistema"
-#: ../../mod/admin.php:458
+#: ../../mod/admin.php:426
msgid ""
"Default system theme - may be over-ridden by user profiles - <a href='#' "
"id='cnftheme'>change theme settings</a>"
msgstr "Tema padrão do sistema - pode ser sobrescrito por perfis de usuário - <a href='#' id='cnftheme'>mudar configurações do tema</a>"
-#: ../../mod/admin.php:459
+#: ../../mod/admin.php:427
msgid "Mobile system theme"
msgstr "Tema do sistema móvel"
-#: ../../mod/admin.php:459
+#: ../../mod/admin.php:427
msgid "Theme for mobile devices"
msgstr "Tema para dispositivos móveis"
-#: ../../mod/admin.php:461
+#: ../../mod/admin.php:428
+msgid "Accessibility system theme"
+msgstr "Tema do sistema acessível"
+
+#: ../../mod/admin.php:428
+msgid "Accessibility theme"
+msgstr "Tema acessível"
+
+#: ../../mod/admin.php:430
msgid "Enable Diaspora Protocol"
msgstr "Habilitar protocolo Diaspora"
-#: ../../mod/admin.php:461
+#: ../../mod/admin.php:430
msgid "Communicate with Diaspora and Friendica - experimental"
msgstr "Comunicar com Diaspora e Friendica - experimental"
-#: ../../mod/admin.php:462
+#: ../../mod/admin.php:431
msgid "Allow Feeds as Connections"
msgstr "Permitir Feeds como conexões"
-#: ../../mod/admin.php:462
+#: ../../mod/admin.php:431
msgid "(Heavy system resource usage)"
msgstr "(Alto uso de recursos do sistema)"
-#: ../../mod/admin.php:463
+#: ../../mod/admin.php:432
msgid "Maximum image size"
msgstr "Tamanho máximo de imagens"
-#: ../../mod/admin.php:463
+#: ../../mod/admin.php:432
msgid ""
"Maximum size in bytes of uploaded images. Default is 0, which means no "
"limits."
msgstr "Tamanho máximo em bytes de imagens carregadas. O padrão é 0, significando sem limites."
-#: ../../mod/admin.php:464
+#: ../../mod/admin.php:433
msgid "Does this site allow new member registration?"
msgstr "Este site permite o registro de novos membros?"
-#: ../../mod/admin.php:465
+#: ../../mod/admin.php:434
msgid "Which best describes the types of account offered by this hub?"
msgstr "Qual descreve melhor os tipos de conta oferecidas por este hub?"
-#: ../../mod/admin.php:466
+#: ../../mod/admin.php:435
msgid "Register text"
msgstr "Texto de registro"
-#: ../../mod/admin.php:466
+#: ../../mod/admin.php:435
msgid "Will be displayed prominently on the registration page."
msgstr "Será exibido proeminentemente na página de registro."
-#: ../../mod/admin.php:467
+#: ../../mod/admin.php:436
msgid "Accounts abandoned after x days"
msgstr "Contas abandonadas após x dias"
-#: ../../mod/admin.php:467
+#: ../../mod/admin.php:436
msgid ""
"Will not waste system resources polling external sites for abandonded "
"accounts. Enter 0 for no time limit."
msgstr "Não gastará recursos do sistema coletando de sites externos para contas abandonadas. Use 0 para sem limite de tempo."
-#: ../../mod/admin.php:468
+#: ../../mod/admin.php:437
msgid "Allowed friend domains"
msgstr "Domínios permitidos para amigos"
-#: ../../mod/admin.php:468
+#: ../../mod/admin.php:437
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 vírgulas, de domínios permitidos para estabelecer amizades com este site. <em>Wildcards</em> são aceitas. Vazio para permitir qualquer domínio"
-#: ../../mod/admin.php:469
+#: ../../mod/admin.php:438
msgid "Allowed email domains"
msgstr "Domínios permitidos de e-mail"
-#: ../../mod/admin.php:469
+#: ../../mod/admin.php:438
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 vírgulas, de domínios permitidos em endereços de e-mail para registros nesse site. <em>Wildcards</em> são aceitas. Vazio para permitir qualquer domínio"
-#: ../../mod/admin.php:470
-msgid "Not allowed email domains"
-msgstr "Não permitido domínios de e-mail"
-
-#: ../../mod/admin.php:470
-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 de domínios separadas por vírgulas, que não são permitidos em endereços de e-mail para inscrições para este sítio. Curingas são aceitos. Deixe vazio para permitir quaisquer domínios, a menos que domínios permitidos tenham sido definidos."
-
-#: ../../mod/admin.php:471
+#: ../../mod/admin.php:439
msgid "Block public"
msgstr "Bloquear público"
-#: ../../mod/admin.php:471
+#: ../../mod/admin.php:439
msgid ""
"Check to block public access to all otherwise public personal pages on this "
"site unless you are currently logged in."
msgstr "Marque para bloquear o acesso público a todas as páginas pessoais que seriam públicas, a não ser que se esteja autenticado."
-#: ../../mod/admin.php:472
+#: ../../mod/admin.php:440
msgid "Verify Email Addresses"
msgstr "Verificar endereços de email"
-#: ../../mod/admin.php:472
+#: ../../mod/admin.php:440
msgid ""
"Check to verify email addresses used in account registration (recommended)."
msgstr "Clique para verificar endereços de email usados no registro de contas (recomendado)."
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:441
msgid "Force publish"
msgstr "Forçar publicação"
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:441
msgid ""
"Check to force all profiles on this site to be listed in the site directory."
msgstr "Marque para forçar todos os perfis neste site a aparecerem listados no diretório do site."
-#: ../../mod/admin.php:474
+#: ../../mod/admin.php:442
msgid "Disable discovery tab"
msgstr "Desabilitar a aba \"Descubra\""
-#: ../../mod/admin.php:474
+#: ../../mod/admin.php:442
msgid ""
"Remove the tab in the network view with public content pulled from sources "
"chosen for this site."
msgstr "Remove da visualização de rede a aba com conteúdos públicos obtidos de fontes escolhidas para esse site."
-#: ../../mod/admin.php:475
+#: ../../mod/admin.php:443
msgid "No login on Homepage"
msgstr "Sem formulário de autenticação na página inicial"
-#: ../../mod/admin.php:475
+#: ../../mod/admin.php:443
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 "Marque para esconder o formulário de autenticação da página inicial do seu site quando visitantes chegarem sem estar autenticados (e.g. quando você inclui os conteúdos da página inicial através do canal do site)."
-#: ../../mod/admin.php:477
+#: ../../mod/admin.php:445
msgid "Proxy user"
msgstr "Usuário do proxy"
-#: ../../mod/admin.php:478
+#: ../../mod/admin.php:446
msgid "Proxy URL"
msgstr "URL do proxy"
-#: ../../mod/admin.php:479
+#: ../../mod/admin.php:447
msgid "Network timeout"
msgstr "Timeout da rede"
-#: ../../mod/admin.php:479
+#: ../../mod/admin.php:447
msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
msgstr "Valor em segundos. Use 0 para ilimitado (não recomendado)."
-#: ../../mod/admin.php:480
+#: ../../mod/admin.php:448
msgid "Delivery interval"
msgstr "Intervalo de entrega"
-#: ../../mod/admin.php:480
+#: ../../mod/admin.php:448
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 "Atrase os processos de entrega em segundo plano por este número de segundos para reduzir a carga do sistema. Recomendado: 4-5 para hosts compartilhados, 2-3 para servidores virtuais privados. 0-1 para grandes servidores dedicados."
-#: ../../mod/admin.php:481
+#: ../../mod/admin.php:449
msgid "Poll interval"
msgstr "Intervalo de coleta"
-#: ../../mod/admin.php:481
+#: ../../mod/admin.php:449
msgid ""
"Delay background polling processes by this many seconds to reduce system "
"load. If 0, use delivery interval."
msgstr "Atrase os processos de coleta em segundo plano por este número de segundos para reduzir a carga do sistema. Se 0, use o intervalo de entrega."
-#: ../../mod/admin.php:482
+#: ../../mod/admin.php:450
msgid "Maximum Load Average"
msgstr "Carga média máxima"
-#: ../../mod/admin.php:482
+#: ../../mod/admin.php:450
msgid ""
"Maximum system load before delivery and poll processes are deferred - "
"default 50."
msgstr "Carga máxima do sistema antes de adiar processos de entrega e coleta - padrão 50."
-#: ../../mod/admin.php:483
-msgid "Expiration period in days for imported (matrix/network) content"
-msgstr "Período de expiração em dias para importação de conteúdo (rede/matriz)"
-
-#: ../../mod/admin.php:483
-msgid "0 for no expiration of imported content"
-msgstr "0 para nunca expirar o conteúdo importado"
-
-#: ../../mod/admin.php:531
+#: ../../mod/admin.php:506
msgid "No server found"
msgstr "Nenhum servidor foi encontrado"
-#: ../../mod/admin.php:538 ../../mod/admin.php:822
+#: ../../mod/admin.php:513 ../../mod/admin.php:737
msgid "ID"
msgstr "ID"
-#: ../../mod/admin.php:538
+#: ../../mod/admin.php:513
msgid "for channel"
msgstr "para o canal"
-#: ../../mod/admin.php:538
+#: ../../mod/admin.php:513
msgid "on server"
msgstr "no servidor"
-#: ../../mod/admin.php:538
+#: ../../mod/admin.php:513
msgid "Status"
msgstr "Status"
-#: ../../mod/admin.php:540
-msgid "Server"
-msgstr "Servidor"
-
-#: ../../mod/admin.php:557
+#: ../../mod/admin.php:534
msgid "Update has been marked successful"
msgstr "A atualização foi designada bem sucedida"
-#: ../../mod/admin.php:567
+#: ../../mod/admin.php:544
#, php-format
msgid "Executing %s failed. Check system logs."
msgstr "Execução de %s falhou. Verifique os logs do sistema."
-#: ../../mod/admin.php:570
+#: ../../mod/admin.php:547
#, php-format
msgid "Update %s was successfully applied."
msgstr "A atualização %s foi aplicada com sucesso."
-#: ../../mod/admin.php:574
+#: ../../mod/admin.php:551
#, php-format
msgid "Update %s did not return a status. Unknown if it succeeded."
msgstr "A atualização %s não retornou um status. Situação incerta quando ao seu sucesso."
-#: ../../mod/admin.php:577
+#: ../../mod/admin.php:554
#, php-format
msgid "Update function %s could not be found."
msgstr "A função de atualização %s não foi encontrada."
-#: ../../mod/admin.php:593
+#: ../../mod/admin.php:569
msgid "No failed updates."
msgstr "Nenhuma falha nas atualizações."
-#: ../../mod/admin.php:597
+#: ../../mod/admin.php:573
msgid "Failed Updates"
msgstr "Falha nas atualizações"
-#: ../../mod/admin.php:599
+#: ../../mod/admin.php:575
msgid "Mark success (if update was manually applied)"
msgstr "Marque sucesso (se a atualização foi aplicada manualmente)"
-#: ../../mod/admin.php:600
+#: ../../mod/admin.php:576
msgid "Attempt to execute this update step automatically"
msgstr "Tente executar este passo da atualização automaticamente"
-#: ../../mod/admin.php:632
-msgid "Queue Statistics"
-msgstr "Filas de Estatísticas"
-
-#: ../../mod/admin.php:633
-msgid "Total Entries"
-msgstr "Total de Entradas"
-
-#: ../../mod/admin.php:634
-msgid "Priority"
-msgstr "Prioridade"
-
-#: ../../mod/admin.php:635
-msgid "Destination URL"
-msgstr "URL de destino"
-
-#: ../../mod/admin.php:636
-msgid "Mark hub permanently offline"
-msgstr "Marque o Hub como permanentemente fora do ar"
-
-#: ../../mod/admin.php:637
-msgid "Empty queue for this hub"
-msgstr "Fila vazia para esse hub"
-
-#: ../../mod/admin.php:638
-msgid "Last known contact"
-msgstr "Último contato conhecido"
-
-#: ../../mod/admin.php:674
+#: ../../mod/admin.php:602
#, php-format
msgid "%s user blocked/unblocked"
msgid_plural "%s users blocked/unblocked"
msgstr[0] "%s usuário foi bloqueado/desbloqueado"
msgstr[1] "%s usuários foram bloqueados/desbloqueados"
-#: ../../mod/admin.php:682
+#: ../../mod/admin.php:609
#, php-format
msgid "%s user deleted"
msgid_plural "%s users deleted"
msgstr[0] "%s usuário foi deletado"
msgstr[1] "%s usuários foram deletados"
-#: ../../mod/admin.php:718
+#: ../../mod/admin.php:638
msgid "Account not found"
msgstr "A conta não foi encontrada"
-#: ../../mod/admin.php:738
-#, php-format
-msgid "User '%s' blocked"
-msgstr "O usuário/a '%s' foi bloqueado/a"
-
-#: ../../mod/admin.php:746
+#: ../../mod/admin.php:658
#, php-format
msgid "User '%s' unblocked"
msgstr "O usuário/a '%s' foi desbloqueado/a"
-#: ../../mod/admin.php:809 ../../mod/admin.php:821
+#: ../../mod/admin.php:658
+#, php-format
+msgid "User '%s' blocked"
+msgstr "O usuário/a '%s' foi bloqueado/a"
+
+#: ../../mod/admin.php:724 ../../mod/admin.php:736
msgid "Users"
msgstr "Usuários"
-#: ../../mod/admin.php:811 ../../mod/admin.php:947
+#: ../../mod/admin.php:726 ../../mod/admin.php:862
msgid "select all"
msgstr "selecionar tudo"
-#: ../../mod/admin.php:812
+#: ../../mod/admin.php:727
msgid "User registrations waiting for confirm"
msgstr "Registros de usuário aguardando confirmação"
-#: ../../mod/admin.php:813
+#: ../../mod/admin.php:728
msgid "Request date"
msgstr "Data de requisição"
-#: ../../mod/admin.php:814
+#: ../../mod/admin.php:729
msgid "No registrations."
msgstr "Nenhum registro."
-#: ../../mod/admin.php:815
+#: ../../mod/admin.php:730
msgid "Approve"
msgstr "Aprovar"
-#: ../../mod/admin.php:816
+#: ../../mod/admin.php:731
msgid "Deny"
msgstr "Negar"
-#: ../../mod/admin.php:818 ../../mod/connedit.php:517
-#: ../../mod/connedit.php:720
-msgid "Block"
-msgstr "Bloquear"
-
-#: ../../mod/admin.php:819 ../../mod/connedit.php:517
-#: ../../mod/connedit.php:720
-msgid "Unblock"
-msgstr "Desbloquear"
-
-#: ../../mod/admin.php:822
+#: ../../mod/admin.php:737
msgid "Register date"
msgstr "Data de registro"
-#: ../../mod/admin.php:822
+#: ../../mod/admin.php:737
msgid "Last login"
msgstr "Última autenticação"
-#: ../../mod/admin.php:822
+#: ../../mod/admin.php:737
msgid "Expires"
msgstr "Expira"
-#: ../../mod/admin.php:822
+#: ../../mod/admin.php:737
msgid "Service Class"
msgstr "Classe de serviço"
-#: ../../mod/admin.php:824
+#: ../../mod/admin.php:739
msgid ""
"Selected users will be deleted!\\n\\nEverything these users had posted on "
"this site will be permanently deleted!\\n\\nAre you sure?"
msgstr "Os usuários selecionados serão deletados!\\n\\nTudo o que esses usuários postaram neste site será permanentemente deletado!\\n\\nTem certeza?"
-#: ../../mod/admin.php:825
+#: ../../mod/admin.php:740
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 "O/A usuário/a {0} será deletado/a!\\n\\nTudo o que esse/a usuário/a postou neste site será permanentemente deletado!\\n\\nTem certeza?"
-#: ../../mod/admin.php:859
+#: ../../mod/admin.php:773
#, php-format
msgid "%s channel censored/uncensored"
msgid_plural "%s channels censored/uncensored"
msgstr[0] "%s canal censurado/descensurado"
msgstr[1] "%s canais censurados/descensurados"
-#: ../../mod/admin.php:866
+#: ../../mod/admin.php:780
#, php-format
msgid "%s channel deleted"
msgid_plural "%s channels deleted"
msgstr[0] "%s canal deletado"
msgstr[1] "%s canais deletados"
-#: ../../mod/admin.php:886
+#: ../../mod/admin.php:799
msgid "Channel not found"
msgstr "Canal não encontrado"
-#: ../../mod/admin.php:897
+#: ../../mod/admin.php:810
#, php-format
msgid "Channel '%s' deleted"
msgstr "Canal '%s' deletado"
-#: ../../mod/admin.php:908
+#: ../../mod/admin.php:821
#, php-format
msgid "Channel '%s' uncensored"
msgstr "Canal '%s' não censurado"
-#: ../../mod/admin.php:908
+#: ../../mod/admin.php:821
#, php-format
msgid "Channel '%s' censored"
msgstr "Canal '%s' censurado"
-#: ../../mod/admin.php:949
+#: ../../mod/admin.php:864
msgid "Censor"
msgstr "Censurar"
-#: ../../mod/admin.php:950
+#: ../../mod/admin.php:865
msgid "Uncensor"
msgstr "Não censurar"
-#: ../../mod/admin.php:953
+#: ../../mod/admin.php:868
msgid "UID"
msgstr "UID"
-#: ../../mod/admin.php:955
+#: ../../mod/admin.php:870
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 "Os canais selecionados serão deletados!\\n\\nTudo que foi postado nesses canais nesse site será permanentemente deletado!\\n\\nVocê tem certeza?"
-#: ../../mod/admin.php:956
+#: ../../mod/admin.php:871
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 "O canal {0} será deletado!\\n\\nTudo o que foi postado nesse canal nesse site será permanentemente deletado!\\n\\nVocê tem certeza?"
-#: ../../mod/admin.php:996
+#: ../../mod/admin.php:910
#, php-format
msgid "Plugin %s disabled."
msgstr "Plugin %s desabilitado."
-#: ../../mod/admin.php:1000
+#: ../../mod/admin.php:914
#, php-format
msgid "Plugin %s enabled."
msgstr "Plugin %s habilitado."
-#: ../../mod/admin.php:1010 ../../mod/admin.php:1208
+#: ../../mod/admin.php:924 ../../mod/admin.php:1126
msgid "Disable"
msgstr "Desabilitar"
-#: ../../mod/admin.php:1013 ../../mod/admin.php:1210
+#: ../../mod/admin.php:926 ../../mod/admin.php:1128
msgid "Enable"
msgstr "Habilitar"
-#: ../../mod/admin.php:1037 ../../mod/admin.php:1237
+#: ../../mod/admin.php:952 ../../mod/admin.php:1157
msgid "Toggle"
msgstr "Alternar"
-#: ../../mod/admin.php:1045 ../../mod/admin.php:1247
+#: ../../mod/admin.php:960 ../../mod/admin.php:1167
msgid "Author: "
msgstr "Autor:"
-#: ../../mod/admin.php:1046 ../../mod/admin.php:1248
+#: ../../mod/admin.php:961 ../../mod/admin.php:1168
msgid "Maintainer: "
msgstr "Mantenedor:"
-#: ../../mod/admin.php:1173
+#: ../../mod/admin.php:1090
msgid "No themes found."
msgstr "Nenhum tema foi encontrado."
-#: ../../mod/admin.php:1229
+#: ../../mod/admin.php:1149
msgid "Screenshot"
msgstr "Captura de tela"
-#: ../../mod/admin.php:1275
+#: ../../mod/admin.php:1197
msgid "[Experimental]"
msgstr "[Experimental]"
-#: ../../mod/admin.php:1276
+#: ../../mod/admin.php:1198
msgid "[Unsupported]"
msgstr "[Desassistido]"
-#: ../../mod/admin.php:1300
+#: ../../mod/admin.php:1225
msgid "Log settings updated."
msgstr "As configurações de log foram atualizadas."
-#: ../../mod/admin.php:1357
+#: ../../mod/admin.php:1281
msgid "Clear"
msgstr "Limpar"
-#: ../../mod/admin.php:1363
+#: ../../mod/admin.php:1287
msgid "Debugging"
msgstr "Depuração"
-#: ../../mod/admin.php:1364
+#: ../../mod/admin.php:1288
msgid "Log file"
msgstr "Arquivo de log"
-#: ../../mod/admin.php:1364
+#: ../../mod/admin.php:1288
msgid ""
"Must be writable by web server. Relative to your Red top-level directory."
msgstr "É necessário que o servidor web possa escrever neste arquivo. Relativo ao diretório raiz da Red."
-#: ../../mod/admin.php:1365
+#: ../../mod/admin.php:1289
msgid "Log level"
msgstr "Nível do log"
-#: ../../mod/admin.php:1411
+#: ../../mod/admin.php:1336
msgid "New Profile Field"
msgstr "Novo campo de perfil"
-#: ../../mod/admin.php:1412 ../../mod/admin.php:1432
+#: ../../mod/admin.php:1337 ../../mod/admin.php:1358
msgid "Field nickname"
msgstr "Nome de apresentação do campo"
-#: ../../mod/admin.php:1412 ../../mod/admin.php:1432
+#: ../../mod/admin.php:1337 ../../mod/admin.php:1358
msgid "System name of field"
msgstr "Nome de sistema do campo"
-#: ../../mod/admin.php:1413 ../../mod/admin.php:1433
+#: ../../mod/admin.php:1338 ../../mod/admin.php:1359
msgid "Input type"
msgstr "Tipo de entrada"
-#: ../../mod/admin.php:1414 ../../mod/admin.php:1434
+#: ../../mod/admin.php:1339 ../../mod/admin.php:1360
msgid "Field Name"
msgstr "Nome do campo"
-#: ../../mod/admin.php:1414 ../../mod/admin.php:1434
+#: ../../mod/admin.php:1339 ../../mod/admin.php:1360
msgid "Label on profile pages"
msgstr "Rótulo nas páginas de perfil"
-#: ../../mod/admin.php:1415 ../../mod/admin.php:1435
+#: ../../mod/admin.php:1340 ../../mod/admin.php:1361
msgid "Help text"
msgstr "Texto de ajuda"
-#: ../../mod/admin.php:1415 ../../mod/admin.php:1435
+#: ../../mod/admin.php:1340 ../../mod/admin.php:1361
msgid "Additional info (optional)"
msgstr "Informações adicionais (opcional)"
-#: ../../mod/admin.php:1425
+#: ../../mod/admin.php:1351
msgid "Field definition not found"
msgstr "A dfinição de campo não foi encontrada"
-#: ../../mod/admin.php:1431
+#: ../../mod/admin.php:1357
msgid "Edit Profile Field"
msgstr "Editar campo de perfil"
@@ -7890,9 +7978,9 @@ msgstr "Nenhuma mensagem."
msgid "Delete conversation"
msgstr "Excluir conversa"
-#: ../../mod/message.php:74
-msgid "D, d M Y - g:i A"
-msgstr "D, d M Y - g:i A"
+#: ../../mod/thing.php:232
+msgid "Show Thing"
+msgstr "Exibir coisa"
#: ../../mod/mitem.php:51
msgid "Unable to create element."
@@ -8010,372 +8098,375 @@ msgstr "Texto do link"
msgid "Set your current mood and tell your friends"
msgstr "Marque seu humor atual e compartilhe com seus amigos"
-#: ../../mod/vote.php:97
-msgid "Total votes"
-msgstr "Votos totais"
-
-#: ../../mod/vote.php:98
-msgid "Average Rating"
-msgstr "Avaliação média"
+#: ../../mod/thing.php:270
+msgid "Edit Thing"
+msgstr "Editar coisa"
-#: ../../mod/removeme.php:29
-msgid ""
-"Channel removals are not allowed within 48 hours of changing the account "
-"password."
-msgstr "A remoção da canais fica desabilitada por 48 horas após uma troca de senha da conta."
+#: ../../mod/thing.php:272 ../../mod/thing.php:319
+msgid "Select a profile"
+msgstr "Selecione um perfil"
-#: ../../mod/removeme.php:57
-msgid "Remove This Channel"
-msgstr "Remover este canal"
+#: ../../mod/thing.php:276 ../../mod/thing.php:322
+msgid "Post an activity"
+msgstr "Publique uma atividade"
-#: ../../mod/removeme.php:58
-msgid "This channel will be completely removed from the network. "
-msgstr "Este canal será completamente excluído da rede."
+#: ../../mod/thing.php:276 ../../mod/thing.php:322
+msgid "Only sends to viewers of the applicable profile"
+msgstr "Envia apenas para a audiência do perfil aplicável"
-#: ../../mod/removeme.php:60
-msgid "Remove this channel and all its clones from the network"
-msgstr "Remover este canal e todos os seus clones da rede"
+#: ../../mod/thing.php:278 ../../mod/thing.php:324
+msgid "Name of thing e.g. something"
+msgstr "Nome da coisa e.g. coisinha"
-#: ../../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 padrão, apenas a instância do canal localizada neste hub será removida da rede"
+#: ../../mod/thing.php:280 ../../mod/thing.php:325
+msgid "URL of thing (optional)"
+msgstr "URL da coisa (opcional)"
-#: ../../mod/connedit.php:262
-msgid "is now connected to"
-msgstr "está agora conectado a"
+#: ../../mod/thing.php:282 ../../mod/thing.php:326
+msgid "URL for photo of thing (optional)"
+msgstr "URL para foto da coisa (opcional)"
-#: ../../mod/connedit.php:375
-msgid "Could not access address book record."
-msgstr "Não foi possível acessar o registro do contato."
+#: ../../mod/thing.php:317
+msgid "Add Thing to your Profile"
+msgstr "Adicionar a coisa ao seu perfil"
-#: ../../mod/connedit.php:389
-msgid "Refresh failed - channel is currently unavailable."
-msgstr "A atualização falhou - o canal está indisponível no momento."
+#: ../../mod/import.php:25
+#, php-format
+msgid "Your service plan only allows %d channels."
+msgstr "Seu plano de serviço permite apenas %d canais."
-#: ../../mod/connedit.php:396
-msgid "Channel has been unblocked"
-msgstr "O canal foi desbloqueado"
+#: ../../mod/import.php:51
+msgid "Nothing to import."
+msgstr "Nada a importar."
-#: ../../mod/connedit.php:397
-msgid "Channel has been blocked"
-msgstr "O canal foi bloqueado"
+#: ../../mod/import.php:75
+msgid "Unable to download data from old server"
+msgstr "Não foi possível descarregar os dados do servidor antigo"
-#: ../../mod/connedit.php:401 ../../mod/connedit.php:413
-#: ../../mod/connedit.php:425 ../../mod/connedit.php:437
-#: ../../mod/connedit.php:453
-msgid "Unable to set address book parameters."
-msgstr "Não foi possível definir os parâmetros do contato."
+#: ../../mod/import.php:81
+msgid "Imported file is empty."
+msgstr "O arquivo importado está vazio."
-#: ../../mod/connedit.php:408
-msgid "Channel has been unignored"
-msgstr "O canal não está mais ignorado"
+#: ../../mod/import.php:105
+msgid ""
+"Cannot create a duplicate channel identifier on this system. Import failed."
+msgstr "Não foi possível criar um identificador de canal duplicado neste sistema. A importação falhou."
-#: ../../mod/connedit.php:409
-msgid "Channel has been ignored"
-msgstr "O canal passou a estar ignorado"
+#: ../../mod/import.php:123
+msgid "Channel clone failed. Import failed."
+msgstr "Clonagem do canal falhou. A importação falhou."
-#: ../../mod/connedit.php:420
-msgid "Channel has been unarchived"
-msgstr "O canal deixou o arquivo"
+#: ../../mod/import.php:133
+msgid "Cloned channel not found. Import failed."
+msgstr "Canal a clonar não encontrado. A importação falhou."
-#: ../../mod/connedit.php:421
-msgid "Channel has been archived"
-msgstr "O canal foi colocado no arquivo"
+#: ../../mod/import.php:446
+msgid "Import completed."
+msgstr "A importação foi completada."
-#: ../../mod/connedit.php:432
-msgid "Channel has been unhidden"
-msgstr "O canal não está mais oculto"
+#: ../../mod/import.php:458
+msgid "You must be logged in to use this feature."
+msgstr "Você precisa estar autenticado para usar este recurso."
-#: ../../mod/connedit.php:433
-msgid "Channel has been hidden"
-msgstr "O canal passou a estar oculto"
+#: ../../mod/import.php:463
+msgid "Import Channel"
+msgstr "Importar canal"
-#: ../../mod/connedit.php:448
-msgid "Channel has been approved"
-msgstr "O canal foi aprovado"
+#: ../../mod/import.php:464
+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 "Use este formulário para importar um canal existente de um servidor/hub diferente. Você pode obter a identidade do canal do servidor/hub antigo pela rede, ou fornecer um arquivo de exportação. Somente a identidade e as conexões/relacionamentos serão importados. Importação de conteúdos ainda não está disponível."
-#: ../../mod/connedit.php:449
-msgid "Channel has been unapproved"
-msgstr "O canal deixou de estar aprovado"
+#: ../../mod/import.php:465
+msgid "File to Upload"
+msgstr "Arquivo a carregar"
-#: ../../mod/connedit.php:477
-msgid "Connection has been removed."
-msgstr "A conexão foi removida."
+#: ../../mod/import.php:466
+msgid "Or provide the old server/hub details"
+msgstr "Ou forneça os detalhes do antigo servidor/hub"
-#: ../../mod/connedit.php:497
-#, php-format
-msgid "View %s's profile"
-msgstr "Ver o perfil de %s"
+#: ../../mod/import.php:467
+msgid "Your old identity address (xyz@example.com)"
+msgstr "O endereço da sua velha identidade (xyz@exemplo.com)"
-#: ../../mod/connedit.php:501
-msgid "Refresh Permissions"
-msgstr "Atualizar permissões"
+#: ../../mod/import.php:468
+msgid "Your old login email address"
+msgstr "O endereço de e-mail da sua antiga conta"
-#: ../../mod/connedit.php:504
-msgid "Fetch updated permissions"
-msgstr "Buscar as permissões atualizadas"
+#: ../../mod/import.php:469
+msgid "Your old login password"
+msgstr "A senha dua sua antiga conta"
-#: ../../mod/connedit.php:508
-msgid "Recent Activity"
-msgstr "Atividades recentes"
+#: ../../mod/import.php:470
+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 qualquer das opções, por favor escolha se deseja fazer deste hub seu novo endereço primário, ou se o velho local deve continuar com esse papel. Você será capaz de publicar a partir de ambos os locais, mas somente um pode estar designado como local primário para arquivos, fotos e mídia."
-#: ../../mod/connedit.php:511
-msgid "View recent posts and comments"
-msgstr "Exibir publicações e comentários recentes"
+#: ../../mod/import.php:471
+msgid "Make this hub my primary location"
+msgstr "Faça deste hub meu local primário"
-#: ../../mod/connedit.php:520
-msgid "Block (or Unblock) all communications with this connection"
-msgstr "Bloquear (desbloquear) todas as comunicações com essa conexão"
+#: ../../mod/import.php:472
+msgid "Import existing posts if possible"
+msgstr "Importar publicações existentes se possível"
-#: ../../mod/connedit.php:524 ../../mod/connedit.php:721
-msgid "Unignore"
-msgstr "Não ignorar"
+#: ../../mod/invite.php:25
+msgid "Total invitation limit exceeded."
+msgstr "Foi excedido o número total de convites."
-#: ../../mod/connedit.php:524 ../../mod/connedit.php:721
-#: ../../mod/notifications.php:51
-msgid "Ignore"
-msgstr "Ignorar"
+#: ../../mod/invite.php:49
+#, php-format
+msgid "%s : Not a valid email address."
+msgstr "%s : Não é um endereço de e-mail válido."
-#: ../../mod/connedit.php:527
-msgid "Ignore (or Unignore) all inbound communications from this connection"
-msgstr "Ignorar (desfazer) todas as entradas de comunicação desta conexão"
+#: ../../mod/invite.php:76
+msgid "Please join us on Red"
+msgstr "Por favor, una-se a nós na Red"
-#: ../../mod/connedit.php:530
-msgid "Unarchive"
-msgstr "Não arquivar"
+#: ../../mod/invite.php:87
+msgid "Invitation limit exceeded. Please contact your site administrator."
+msgstr "Você excedeu o limite de convites. Por favor, entre em contato com o administrador do site."
-#: ../../mod/connedit.php:530
-msgid "Archive"
-msgstr "Arquivar"
+#: ../../mod/invite.php:92
+#, php-format
+msgid "%s : Message delivery failed."
+msgstr "%s : Não foi possível enviar a mensagem."
-#: ../../mod/connedit.php:533
-msgid ""
-"Archive (or Unarchive) this connection - mark channel dead but keep content"
-msgstr "Arquivar (desarquivar) essa conexão - marcar o canal como morto mas manter o conteúdo"
+#: ../../mod/invite.php:96
+#, php-format
+msgid "%d message sent."
+msgid_plural "%d messages sent."
+msgstr[0] "%d mensagem enviada."
+msgstr[1] "%d mensagens enviadas."
-#: ../../mod/connedit.php:536
-msgid "Unhide"
-msgstr "Não ocultar"
+#: ../../mod/invite.php:115
+msgid "You have no more invitations available"
+msgstr "Você não possui mais convites disponíveis"
-#: ../../mod/connedit.php:536
-msgid "Hide"
-msgstr "Ocultar"
+#: ../../mod/invite.php:129
+msgid "Send invitations"
+msgstr "Enviar convites."
-#: ../../mod/connedit.php:539
-msgid "Hide or Unhide this connection from your other connections"
-msgstr "Esconder (mostrar) essa conexão de suas outras conexões"
+#: ../../mod/invite.php:130
+msgid "Enter email addresses, one per line:"
+msgstr "Digite os endereços de e-mail, um por linha:"
-#: ../../mod/connedit.php:546
-msgid "Delete this connection"
-msgstr "Deletar esta conexão"
+#: ../../mod/invite.php:131 ../../mod/mail.php:225 ../../mod/mail.php:338
+msgid "Your message:"
+msgstr "Sua mensagem:"
-#: ../../mod/connedit.php:637 ../../mod/connedit.php:675
-msgid "Approve this connection"
-msgstr "Aprovar esta conexão"
+#: ../../mod/invite.php:132
+msgid "Please join my community on Hubzilla."
+msgstr "Por favor junte-se à minha comunidade na Hubzilla"
-#: ../../mod/connedit.php:637
-msgid "Accept connection to allow communication"
-msgstr "Aceite a conexão para permitir comunicação"
+#: ../../mod/invite.php:134
+msgid "You will need to supply this invitation code: "
+msgstr "Você precisará fornecer este código de convite:"
-#: ../../mod/connedit.php:653
-#, php-format
-msgid "Connections: settings for %s"
-msgstr "Conexões: configurações para %s"
+#: ../../mod/invite.php:135
+msgid "1. Register at any Hubzilla location (they are all inter-connected)"
+msgstr "1. Registre-se em qualquer site da Hubzilla (eles são todos interconectados)"
-#: ../../mod/connedit.php:654
-msgid "Apply these permissions automatically"
-msgstr "Aplicar essas permissões automaticamente"
+#: ../../mod/invite.php:137
+msgid "2. Enter my Hubzilla network address into the site searchbar."
+msgstr "2. Entre meu endereço da rede Hubzilla na barra de busca do site."
-#: ../../mod/connedit.php:658
-msgid "Apply the permissions indicated on this page to all new connections."
-msgstr "Aplicar as permissões indicadas nesta página para todas as novas conexões."
+#: ../../mod/invite.php:138
+msgid "or visit "
+msgstr "ou visite"
-#: ../../mod/connedit.php:662
-msgid "Slide to adjust your degree of friendship"
-msgstr "Deslize para ajustar seu grau de amizade"
+#: ../../mod/invite.php:140
+msgid "3. Click [Connect]"
+msgstr "3. Clique [Conectar]"
-#: ../../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 "Permissões padrões para seu tipo de canal foram (apenas) aplicadas. Elas ainda não foram enviadas. Por favor, revise as permissões nesta página e faça as alterações desejadas neste momento. Esta nova ligação poderá <em> não </ em> ser capaz de se comunicar com você até que você envie os dados desta página, que instalará e aplicará as permissões selecionadas."
+#: ../../mod/item.php:146
+msgid "Unable to locate original post."
+msgstr "Não foi possível localizar a publicação original."
-#: ../../mod/connedit.php:674
-msgid "inherited"
-msgstr "herdado"
+#: ../../mod/item.php:379
+msgid "Empty post discarded."
+msgstr "A publicação em branco foi descartada."
-#: ../../mod/connedit.php:677
-msgid "Connection has no individual permissions!"
-msgstr "A conexão não tem permissões individuais!"
+#: ../../mod/item.php:421
+msgid "Executable content type not permitted to this channel."
+msgstr "Conteúdo de tipo executável não permitido para este canal."
-#: ../../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 "Isso pode ser adequado baseado nas suas <a href=\"settings\">configurações de privacidade</a>, mas talvez você queira rever suas \"Permissões Avançadas\"."
+#: ../../mod/item.php:849
+msgid "System error. Post not saved."
+msgstr "Erro no sistema. A publicação não foi salva."
-#: ../../mod/connedit.php:680
-msgid "Profile Visibility"
-msgstr "Visibilidade do perfil"
+#: ../../mod/item.php:1317
+#, php-format
+msgid "You have reached your limit of %1$.0f top level posts."
+msgstr "Você atingiu o seu limite de %1$.0f publicações de novos tópicos."
-#: ../../mod/connedit.php:681
+#: ../../mod/item.php:1323
#, php-format
-msgid ""
-"Please choose the profile you would like to display to %s when viewing your "
-"profile securely."
-msgstr "Por favor, selecione o perfil que você gostaria de exibir para %s quando estiver visualizando seu perfil de modo seguro."
+msgid "You have reached your limit of %1$.0f webpages."
+msgstr "Você atingiu o seu limite de %1$.0f páginas web."
-#: ../../mod/connedit.php:682
-msgid "Contact Information / Notes"
-msgstr "Informações de contato / Notas"
+#: ../../mod/update_channel.php:43 ../../mod/update_display.php:25
+#: ../../mod/update_network.php:23 ../../mod/update_search.php:46
+msgid "[Embedded content - reload page to view]"
+msgstr "[Conteúdo incorporado - recarregue a página para ver]"
-#: ../../mod/connedit.php:683
-msgid "Edit contact notes"
-msgstr "Editar anotações sobre o contato"
+#: ../../mod/layouts.php:62
+msgid "Help with this feature"
+msgstr "Ajuda com este recurso"
-#: ../../mod/connedit.php:685
-msgid "Their Settings"
-msgstr "Configurações dele/a"
+#: ../../mod/layouts.php:85
+msgid "Layout Name"
+msgstr "Nome do layout"
-#: ../../mod/connedit.php:686
-msgid "My Settings"
-msgstr "Minhas configurações"
+#: ../../mod/like.php:15
+msgid "Like/Dislike"
+msgstr "Gostar/Desgostar"
-#: ../../mod/connedit.php:688
-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 "Permissões padrões para este tipo de canal foram (apenas) aplicadas. Elas <em> não </ em> foram salvas e não existem no momento permissões padrões armazenadas. Por favor, reveja / edite as configurações aplicadas e clique em [Enviar] para finalizar."
+#: ../../mod/like.php:20
+msgid "This action is restricted to members."
+msgstr "Esta ação é restrita a membros."
-#: ../../mod/connedit.php:689
-msgid "Clear/Disable Automatic Permissions"
-msgstr "Limpa/Desabilita permissões automáticas"
+#: ../../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 "Por favor <a href=\"rmagic\">entre com sua ID da Hubzilla</a> ou <a href=\"register\">registre-se como um novo membro da Hubzilla</a> para continuar."
-#: ../../mod/connedit.php:690
-msgid "Forum Members"
-msgstr "Membros de fórum"
+#: ../../mod/like.php:77 ../../mod/like.php:104 ../../mod/like.php:142
+msgid "Invalid request."
+msgstr "Solicitação inválida."
-#: ../../mod/connedit.php:691
-msgid "Soapbox"
-msgstr "Caixa de sabão"
+#: ../../mod/like.php:119
+msgid "thing"
+msgstr "coisa"
-#: ../../mod/connedit.php:692
-msgid "Full Sharing (typical social network permissions)"
-msgstr "Compartilhamento completo (permissões típicas de redes sociais)"
+#: ../../mod/like.php:165
+msgid "Channel unavailable."
+msgstr "Canal não disponível."
-#: ../../mod/connedit.php:693
-msgid "Cautious Sharing "
-msgstr "Compartilhamento cauteloso"
+#: ../../mod/like.php:204
+msgid "Previous action reversed."
+msgstr "Ação anterior revertida."
-#: ../../mod/connedit.php:694
-msgid "Follow Only"
-msgstr "Apenas seguir"
+#: ../../mod/like.php:417
+msgid "Action completed."
+msgstr "Ação completada."
-#: ../../mod/connedit.php:695
-msgid "Individual Permissions"
-msgstr "Permissões individuais"
+#: ../../mod/like.php:418
+msgid "Thank you."
+msgstr "Obrigado."
-#: ../../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 "Algumas permissões serão herdadas das <a href=\"settings\">configurações de privacidade</a> do seu canal, e terão prioridade sobre as configurações individuais. Modificar nesta página tais configurações herdadas não surtirá efeito algum."
+#: ../../mod/lockview.php:31
+msgid "Remote privacy information not available."
+msgstr "Não existe informação disponível sobre a privacidade remota."
-#: ../../mod/connedit.php:697
-msgid "Advanced Permissions"
-msgstr "Permissões avançadas"
+#: ../../mod/lockview.php:52
+msgid "Visible to:"
+msgstr "Visível para:"
-#: ../../mod/connedit.php:698
-msgid "Simple Permissions (select one and submit)"
-msgstr "Permissões simples (slecione uma e submeta)"
+#: ../../mod/viewconnections.php:58
+msgid "No connections."
+msgstr "Nenhuma conexão."
-#: ../../mod/connedit.php:702
+#: ../../mod/viewconnections.php:71
#, php-format
-msgid "Visit %s's profile - %s"
-msgstr "Ver o perfil de %s - %s"
+msgid "Visit %s's profile [%s]"
+msgstr "Ver o perfil de %s [%s]"
-#: ../../mod/connedit.php:703
-msgid "Block/Unblock contact"
-msgstr "Bloquear/desbloquear o contato"
+#: ../../mod/viewconnections.php:86
+msgid "View Connnections"
+msgstr "Ver conexões"
-#: ../../mod/connedit.php:704
-msgid "Ignore contact"
-msgstr "Ignorar o contato"
+#: ../../mod/lostpass.php:15
+msgid "No valid account found."
+msgstr "Não foi encontrada uma conta válida."
-#: ../../mod/connedit.php:705
-msgid "Repair URL settings"
-msgstr "Reparar configurações de URL"
+#: ../../mod/lostpass.php:29
+msgid "Password reset request issued. Check your email."
+msgstr "A solicitação de restauração de senha foi encaminhada. Verifique seu e-mail."
-#: ../../mod/connedit.php:706
-msgid "View conversations"
-msgstr "Ver as conversas"
+#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:102
+#, php-format
+msgid "Site Member (%s)"
+msgstr "Membro do site (%s)"
-#: ../../mod/connedit.php:708
-msgid "Delete contact"
-msgstr "Excluir o contato"
+#: ../../mod/lostpass.php:40
+#, php-format
+msgid "Password reset requested at %s"
+msgstr "Foi feita uma solicitação de restauração de senha em %s"
-#: ../../mod/connedit.php:712
-msgid "Last update:"
-msgstr "Última atualização:"
+#: ../../mod/lostpass.php:63
+msgid ""
+"Request could not be verified. (You may have previously submitted it.) "
+"Password reset failed."
+msgstr "Não foi possível verificar a solicitação (você pode tê-la submetido anteriormente). A senha não foi restaurada."
-#: ../../mod/connedit.php:714
-msgid "Update public posts"
-msgstr "Atualizar publicações públicas"
+#: ../../mod/lostpass.php:85 ../../boot.php:1505
+msgid "Password Reset"
+msgstr "Reiniciar a senha"
-#: ../../mod/connedit.php:716
-msgid "Update now"
-msgstr "Atualizar agora"
+#: ../../mod/lostpass.php:86
+msgid "Your password has been reset as requested."
+msgstr "Sua senha foi restaurada, conforme solicitado."
-#: ../../mod/connedit.php:722
-msgid "Currently blocked"
-msgstr "Atualmente bloqueado"
+#: ../../mod/lostpass.php:87
+msgid "Your new password is"
+msgstr "Sua nova senha é"
-#: ../../mod/connedit.php:723
-msgid "Currently ignored"
-msgstr "Atualmente ignorado"
+#: ../../mod/lostpass.php:88
+msgid "Save or copy your new password - and then"
+msgstr "Salve ou copie a sua nova senha e, então"
-#: ../../mod/connedit.php:724
-msgid "Currently archived"
-msgstr "Atualmente arquivado"
+#: ../../mod/lostpass.php:89
+msgid "click here to login"
+msgstr "clique aqui para entrar"
-#: ../../mod/connedit.php:725
-msgid "Currently pending"
-msgstr "Atualmente pendente"
+#: ../../mod/lostpass.php:90
+msgid ""
+"Your password may be changed from the <em>Settings</em> page after "
+"successful login."
+msgstr "Sua senha pode ser alterada na página de <em>Configurações</em> após você entrar em sua conta."
+
+#: ../../mod/lostpass.php:107
+#, php-format
+msgid "Your password has changed at %s"
+msgstr "Sua senha foi modificada em %s"
+
+#: ../../mod/lostpass.php:122
+msgid "Forgot your Password?"
+msgstr "Esqueceu a sua senha?"
-#: ../../mod/rmagic.php:40
+#: ../../mod/lostpass.php:123
msgid ""
-"We encountered a problem while logging in with the OpenID you provided. "
-"Please check the correct spelling of the ID."
-msgstr "Encontramos um problema ao entrar com a OpenID fornecida. Por favor, verifique se digitou corretamente a ID."
+"Enter your email address and submit to have your password reset. Then check "
+"your email for further instructions."
+msgstr "Digite o seu endereço de e-mail e clique em 'Restaurar' para prosseguir com a restauração da sua senha. Após isso, verifique seu e-mail para mais instruções."
-#: ../../mod/rmagic.php:40
-msgid "The error message was:"
-msgstr "A mensagem de erro foi:"
+#: ../../mod/lostpass.php:124
+msgid "Email Address"
+msgstr "Endereço de e-mail"
-#: ../../mod/rmagic.php:44
-msgid "Authentication failed."
-msgstr "A autenticação falhou."
+#: ../../mod/lostpass.php:125
+msgid "Reset"
+msgstr "Restaurar"
-#: ../../mod/rmagic.php:84
-msgid "Remote Authentication"
-msgstr "Autenticação remota"
+#: ../../mod/magic.php:70
+msgid "Hub not found."
+msgstr "O hub não foi encontrado."
-#: ../../mod/rmagic.php:85
-msgid "Enter your channel address (e.g. channel@example.com)"
-msgstr "Entre o endereço do seu canal (e.g. canal@exemplo.com)"
+#: ../../mod/vote.php:97
+msgid "Total votes"
+msgstr "Votos totais"
-#: ../../mod/rmagic.php:86
-msgid "Authenticate"
-msgstr "Autenticar"
+#: ../../mod/vote.php:98
+msgid "Average Rating"
+msgstr "Média das avaliações"
#: ../../mod/mail.php:33
msgid "Unable to lookup recipient."
@@ -8393,77 +8484,208 @@ msgstr "Não foi possível verificar o canal requisitado."
msgid "Selected channel has private message restrictions. Send failed."
msgstr "O canal solicitado tem restrições a mensagens privadas. Falha no envio."
-#: ../../mod/mail.php:139
+#: ../../mod/mail.php:121 ../../mod/message.php:31
+msgid "Messages"
+msgstr "Mensagens"
+
+#: ../../mod/mail.php:132
msgid "Message deleted."
msgstr "A mensagem foi excluída."
-#: ../../mod/mail.php:156
+#: ../../mod/mail.php:149
msgid "Message recalled."
msgstr "Mensagem retirada."
-#: ../../mod/mail.php:225
+#: ../../mod/mail.php:215
msgid "Send Private Message"
msgstr "Enviar mensagem privada"
-#: ../../mod/mail.php:226 ../../mod/mail.php:343
+#: ../../mod/mail.php:216 ../../mod/mail.php:333
msgid "To:"
msgstr "Para:"
-#: ../../mod/mail.php:231 ../../mod/mail.php:345
+#: ../../mod/mail.php:221 ../../mod/mail.php:335
msgid "Subject:"
msgstr "Assunto:"
-#: ../../mod/mail.php:242
+#: ../../mod/mail.php:232
msgid "Send"
msgstr "Enviar"
-#: ../../mod/mail.php:269
+#: ../../mod/mail.php:259
msgid "Message not found."
msgstr "Mensagem não encontrada."
-#: ../../mod/mail.php:312
+#: ../../mod/mail.php:302 ../../mod/message.php:72
msgid "Delete message"
msgstr "Excluir a mensagem"
-#: ../../mod/mail.php:313
+#: ../../mod/mail.php:303
msgid "Recall message"
msgstr "Retirar mensagem"
-#: ../../mod/mail.php:315
+#: ../../mod/mail.php:305
msgid "Message has been recalled."
msgstr "A mensagem foi retirada."
-#: ../../mod/mail.php:332
+#: ../../mod/mail.php:322
msgid "Private Conversation"
msgstr "Conversa privada"
-#: ../../mod/mail.php:338
+#: ../../mod/mail.php:326
+msgid "Delete conversation"
+msgstr "Excluir conversa"
+
+#: ../../mod/mail.php:328
msgid ""
"No secure communications available. You <strong>may</strong> be able to "
"respond from the sender's profile page."
msgstr "Comunicação segura indisponível. Você <strong>talvez</strong> consiga responder pela página de perfil do remetente."
-#: ../../mod/mail.php:342
+#: ../../mod/mail.php:332
msgid "Send Reply"
msgstr "Enviar resposta"
-#: ../../mod/notifications.php:26
-msgid "Invalid request identifier."
-msgstr "Identificador de solicitação inválido"
+#: ../../mod/manage.php:136
+#, php-format
+msgid "You have created %1$.0f of %2$.0f allowed channels."
+msgstr "Você criou %1$.0f de %2$.0f canais permitidos."
-#: ../../mod/notifications.php:35
-msgid "Discard"
+#: ../../mod/manage.php:144
+msgid "Create a new channel"
+msgstr "Criar um novo canal"
+
+#: ../../mod/manage.php:149
+msgid "Current Channel"
+msgstr "Canal atual"
+
+#: ../../mod/manage.php:151
+msgid "Attach to one of your channels by selecting it."
+msgstr "Selecione um dos seus canais para utilizá-lo."
+
+#: ../../mod/manage.php:152
+msgid "Default Channel"
+msgstr "Canal padrão"
+
+#: ../../mod/manage.php:153
+msgid "Make Default"
+msgstr "Tornar padrão"
+
+#: ../../mod/wall_upload.php:34
+msgid "Wall Photos"
+msgstr "Fotos do mural"
+
+#: ../../mod/match.php:16
+msgid "Profile Match"
+msgstr "Correspondência de perfil"
+
+#: ../../mod/match.php:24
+msgid "No keywords to match. Please add keywords to your default profile."
+msgstr "Nenhuma palavra-chave para combinar. Por favor, adicione palavras-chave ao seu perfil padrão."
+
+#: ../../mod/match.php:61
+msgid "is interested in:"
+msgstr "se interessa por:"
+
+#: ../../mod/match.php:69
+msgid "No matches"
+msgstr "Nenhuma correspondência"
+
+#: ../../mod/menu.php:21
+msgid "Menu updated."
+msgstr "Menu atualizado."
+
+#: ../../mod/menu.php:25
+msgid "Unable to update menu."
+msgstr "Não foi possível atualizar o menu."
+
+#: ../../mod/menu.php:30
+msgid "Menu created."
+msgstr "O menu foi criado."
+
+#: ../../mod/menu.php:34
+msgid "Unable to create menu."
+msgstr "Não foi possível criar o menu."
+
+#: ../../mod/menu.php:57
+msgid "Manage Menus"
+msgstr "Administrar menus"
+
+#: ../../mod/menu.php:60
+msgid "Drop"
msgstr "Descartar"
-#: ../../mod/regmod.php:11
-msgid "Please login."
-msgstr "Por favor, autentique-se."
+#: ../../mod/menu.php:62
+msgid "Create a new menu"
+msgstr "Criar um novo menu"
-#: ../../mod/post.php:235
-msgid ""
-"Remote authentication blocked. You are logged into this site locally. Please"
-" logout and retry."
-msgstr "Autenticação remota bloqueada. Você está autenticado neste site localmente. Por favor, saia e tente novamente."
+#: ../../mod/menu.php:63
+msgid "Delete this menu"
+msgstr "Deletar este menu"
+
+#: ../../mod/menu.php:64 ../../mod/menu.php:109
+msgid "Edit menu contents"
+msgstr "Editar os conteúdos do menu"
+
+#: ../../mod/menu.php:65
+msgid "Edit this menu"
+msgstr "Editar este menu"
+
+#: ../../mod/menu.php:80
+msgid "New Menu"
+msgstr "Novo menu"
+
+#: ../../mod/menu.php:81 ../../mod/menu.php:110
+msgid "Menu name"
+msgstr "Nome do menu"
+
+#: ../../mod/menu.php:81 ../../mod/menu.php:110
+msgid "Must be unique, only seen by you"
+msgstr "Deve ser único, exibido somente para você"
+
+#: ../../mod/menu.php:82 ../../mod/menu.php:111
+msgid "Menu title"
+msgstr "Título do menu"
+
+#: ../../mod/menu.php:82 ../../mod/menu.php:111
+msgid "Menu title as seen by others"
+msgstr "Título do menu quando visto por outros"
+
+#: ../../mod/menu.php:83 ../../mod/menu.php:112
+msgid "Allow bookmarks"
+msgstr "Habilitar links guardados"
+
+#: ../../mod/menu.php:83 ../../mod/menu.php:112
+msgid "Menu may be used to store saved bookmarks"
+msgstr "O menu pode ser utilizado para armazenar links guardados"
+
+#: ../../mod/menu.php:98
+msgid "Menu deleted."
+msgstr "Menu deletado."
+
+#: ../../mod/menu.php:100
+msgid "Menu could not be deleted."
+msgstr "Não foi possível deletar o menu."
+
+#: ../../mod/menu.php:106
+msgid "Edit Menu"
+msgstr "Editar menu"
+
+#: ../../mod/menu.php:108
+msgid "Add or remove entries to this menu"
+msgstr "Adicionar ou remover entradas deste menu"
+
+#: ../../mod/message.php:41
+msgid "Conversation removed."
+msgstr "A conversa foi removida."
+
+#: ../../mod/message.php:56
+msgid "No messages."
+msgstr "Nenhuma mensagem."
+
+#: ../../mod/message.php:74
+msgid "D, d M Y - g:i A"
+msgstr "D, d M Y - g:i A"
#: ../../mod/new_channel.php:109
msgid "Add a Channel"
@@ -8496,18 +8718,55 @@ msgid "Or <a href=\"import\">import an existing channel</a> from another locatio
msgstr "Ou <a href=\"import\">importe um canal existente</a> de outro local"
#: ../../mod/new_channel.php:118
+msgid "Channel Type"
+msgstr "Tipo de canal"
+
+#: ../../mod/new_channel.php:119
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 "Por favor, escolha um tipo de canal (por exemplo rede social ou fórum de comunidade) e requisito de privacidade, para que possamos configurar as melhores permissões para você"
-#: ../../mod/new_channel.php:119
-msgid "Channel Type"
-msgstr "Tipo de canal"
+#: ../../mod/home.php:46
+msgid "Hubzilla - &quot;The Network&quot;"
+msgstr "Hubzilla - &quot;A Rede&quot;"
-#: ../../mod/new_channel.php:119
-msgid "Read more about roles"
-msgstr "Leia mais sobre as regras"
+#: ../../mod/home.php:101
+#, php-format
+msgid "Welcome to %s"
+msgstr "Bem-vindo(a) a %s"
+
+#: ../../mod/notifications.php:26
+msgid "Invalid request identifier."
+msgstr "Identificador de solicitação inválido"
+
+#: ../../mod/notifications.php:35
+msgid "Discard"
+msgstr "Descartar"
+
+#: ../../mod/notifications.php:94 ../../mod/notify.php:53
+msgid "No more system notifications."
+msgstr "Sem novas notificações do sistema."
+
+#: ../../mod/notifications.php:98 ../../mod/notify.php:57
+msgid "System Notifications"
+msgstr "Notificações do sistema"
+
+#: ../../mod/oexchange.php:23
+msgid "Unable to find your hub."
+msgstr "Não foi possível localizar seu hub."
+
+#: ../../mod/oexchange.php:37
+msgid "Post successful."
+msgstr "Publicado com sucesso."
+
+#: ../../mod/zfinger.php:23
+msgid "invalid target signature"
+msgstr "assinatura do destino inválida"
+
+#: ../../mod/openid.php:26
+msgid "OpenID protocol error. No ID returned."
+msgstr "Erro do protocolo OpenID. Nenhuma ID retornada."
#: ../../mod/appman.php:28 ../../mod/appman.php:44
msgid "App installed."
@@ -8625,31 +8884,43 @@ msgstr "Nenhuma sugestão disponível. Se este site é novo, por favor tente nov
#: ../../mod/poll.php:64
msgid "Poll"
-msgstr "Enquete"
+msgstr "Votação"
#: ../../mod/poll.php:69
msgid "View Results"
msgstr "Ver resultados"
-#: ../../mod/service_limits.php:19
-msgid "No service class restrictions found."
-msgstr "Não foram encontradas restrições de classe de serviço."
+#: ../../mod/removeaccount.php:30
+msgid ""
+"Account removals are not allowed within 48 hours of changing the account "
+"password."
+msgstr "A remoção da conta fica desabilitada por 48 horas após uma troca de senha da conta."
-#: ../../mod/sharedwithme.php:94
-msgid "Files: shared with me"
-msgstr "Arquivos: compartilhados comigo"
+#: ../../mod/removeaccount.php:57
+msgid "Remove This Account"
+msgstr "Remover esta conta"
-#: ../../mod/sharedwithme.php:96
-msgid "NEW"
-msgstr "NOVO"
+#: ../../mod/removeaccount.php:58
+msgid ""
+"This will completely remove this account including all its channels from the"
+" network. Once this has been done it is not recoverable."
+msgstr "Isso irá remover completamente esta conta, incluindo todos os canais da rede. Uma vez feito isso eles não poderão ser recuperados."
-#: ../../mod/sharedwithme.php:99
-msgid "Remove all files"
-msgstr "Remover todos arquivos"
+#: ../../mod/removeaccount.php:60
+msgid ""
+"Remove this account, all its channels and all its channel clones from the "
+"network"
+msgstr "Remove esta conta, todos os seus canais e todos os clones desses canais da rede."
-#: ../../mod/sharedwithme.php:100
-msgid "Remove this file"
-msgstr "Remover este arquivo"
+#: ../../mod/removeaccount.php:60
+msgid ""
+"By default only the instances of the channels located on this hub will be "
+"removed from the network"
+msgstr "Por padrão, apenas as instâncias dos canais localizadas neste hub serão removidas da rede"
+
+#: ../../mod/service_limits.php:19
+msgid "No service class restrictions found."
+msgstr "Não foram encontradas restrições de classe de serviço."
#: ../../view/theme/apw/php/config.php:202
#: ../../view/theme/apw/php/config.php:236
@@ -8665,16 +8936,19 @@ msgid "Monospace"
msgstr "Monospace"
#: ../../view/theme/apw/php/config.php:259
-#: ../../view/theme/redbasic/php/config.php:100
+#: ../../view/theme/blogga/php/config.php:69
+#: ../../view/theme/blogga/view/theme/blog/config.php:69
+#: ../../view/theme/redbasic/php/config.php:102
msgid "Theme settings"
msgstr "Configurações de tema"
#: ../../view/theme/apw/php/config.php:260
+#: ../../view/theme/redbasic/php/config.php:103
msgid "Set scheme"
msgstr "Definir esquema"
#: ../../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 "Definir o tamanho da fonte para publicações e comentários"
@@ -8794,131 +9068,134 @@ msgstr "Deslocamento esquerdo do aparte"
msgid "Right offset of the aside element"
msgstr "Deslocamento direito do aparte"
-#: ../../view/theme/redbasic/php/config.php:82
-msgid "Light (Red Matrix default)"
-msgstr "Leve (padrão da Red Matrix)"
+#: ../../view/theme/blogga/php/config.php:47
+#: ../../view/theme/blogga/view/theme/blog/config.php:47
+msgid "None"
+msgstr "Nenhum"
-#: ../../view/theme/redbasic/php/config.php:101
-msgid "Select scheme"
-msgstr "Selecione esquema"
+#: ../../view/theme/blogga/php/config.php:70
+#: ../../view/theme/blogga/view/theme/blog/config.php:70
+msgid "Header image"
+msgstr "Imagem de cabeçalho"
-#: ../../view/theme/redbasic/php/config.php:102
+#: ../../view/theme/blogga/php/config.php:71
+#: ../../view/theme/blogga/view/theme/blog/config.php:71
+msgid "Header image only on profile pages"
+msgstr "Imagem de cabeçalho apenas em páginas de perfil"
+
+#: ../../view/theme/redbasic/php/config.php:84
+msgid "Light (Hubzilla default)"
+msgstr "Leve (padrão da Hubzilla)"
+
+#: ../../view/theme/redbasic/php/config.php:104
msgid "Narrow navbar"
msgstr "Barra de navegação estreita"
-#: ../../view/theme/redbasic/php/config.php:103
+#: ../../view/theme/redbasic/php/config.php:105
msgid "Navigation bar background color"
msgstr "Cor de fundo da barra de navegação"
-#: ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:106
msgid "Navigation bar gradient top color"
msgstr "Cor no topo de gradiente da barra de navegação"
-#: ../../view/theme/redbasic/php/config.php:105
+#: ../../view/theme/redbasic/php/config.php:107
msgid "Navigation bar gradient bottom color"
msgstr "Cor na base de gradiente da barra de navegação"
-#: ../../view/theme/redbasic/php/config.php:106
+#: ../../view/theme/redbasic/php/config.php:108
msgid "Navigation active button gradient top color"
msgstr "Cor no topo de gradiente de botão ativo de navegação"
-#: ../../view/theme/redbasic/php/config.php:107
+#: ../../view/theme/redbasic/php/config.php:109
msgid "Navigation active button gradient bottom color"
msgstr "Cor na base de gradiente de botão ativo de navegação"
-#: ../../view/theme/redbasic/php/config.php:108
+#: ../../view/theme/redbasic/php/config.php:110
msgid "Navigation bar border color "
msgstr "Cor de borda da barra de navegação"
-#: ../../view/theme/redbasic/php/config.php:109
+#: ../../view/theme/redbasic/php/config.php:111
msgid "Navigation bar icon color "
msgstr "Cor de ícone da barra de navegação"
-#: ../../view/theme/redbasic/php/config.php:110
+#: ../../view/theme/redbasic/php/config.php:112
msgid "Navigation bar active icon color "
msgstr "Cor de ícone ativo da barra de navegação"
-#: ../../view/theme/redbasic/php/config.php:111
+#: ../../view/theme/redbasic/php/config.php:113
msgid "link color"
msgstr "cor dos links"
-#: ../../view/theme/redbasic/php/config.php:112
+#: ../../view/theme/redbasic/php/config.php:114
msgid "Set font-color for banner"
msgstr "Definir a cor da fonte para o cartaz"
-#: ../../view/theme/redbasic/php/config.php:113
+#: ../../view/theme/redbasic/php/config.php:115
msgid "Set the background color"
msgstr "Definir a cor do pano de fundo"
-#: ../../view/theme/redbasic/php/config.php:114
+#: ../../view/theme/redbasic/php/config.php:116
msgid "Set the background image"
msgstr "Definir a imagem do pano de fundo"
-#: ../../view/theme/redbasic/php/config.php:115
+#: ../../view/theme/redbasic/php/config.php:117
msgid "Set the background color of items"
msgstr "Definir a cor de fundo dos items"
-#: ../../view/theme/redbasic/php/config.php:116
+#: ../../view/theme/redbasic/php/config.php:118
msgid "Set the background color of comments"
msgstr "Definir a cor de fundo dos comentários"
-#: ../../view/theme/redbasic/php/config.php:117
+#: ../../view/theme/redbasic/php/config.php:119
msgid "Set the border color of comments"
msgstr "Definir a cor da borda dos comentários"
-#: ../../view/theme/redbasic/php/config.php:118
+#: ../../view/theme/redbasic/php/config.php:120
msgid "Set the indent for comments"
msgstr "Definir a indentação de comentários"
-#: ../../view/theme/redbasic/php/config.php:119
+#: ../../view/theme/redbasic/php/config.php:121
msgid "Set the basic color for item icons"
msgstr "Definir a cor básica para ícones de itens"
-#: ../../view/theme/redbasic/php/config.php:120
+#: ../../view/theme/redbasic/php/config.php:122
msgid "Set the hover color for item icons"
msgstr "Definir a cor para ícones de itens quando que o mouse está sobre eles"
-#: ../../view/theme/redbasic/php/config.php:121
+#: ../../view/theme/redbasic/php/config.php:123
msgid "Set font-size for the entire application"
msgstr "Definir o tamanho da fonte para a aplicação como um todo"
-#: ../../view/theme/redbasic/php/config.php:121
-msgid "Example: 14px"
-msgstr "Exemplo: 14px"
-
-#: ../../view/theme/redbasic/php/config.php:123
+#: ../../view/theme/redbasic/php/config.php:125
msgid "Set font-color for posts and comments"
msgstr "Definir a cor da fonte para publicações e comentários"
-#: ../../view/theme/redbasic/php/config.php:124
+#: ../../view/theme/redbasic/php/config.php:126
msgid "Set radius of corners"
msgstr "Definir o raio de curvatura dos cantos"
-#: ../../view/theme/redbasic/php/config.php:125
+#: ../../view/theme/redbasic/php/config.php:127
msgid "Set shadow depth of photos"
msgstr "Definir a profundidade de sombra das fotos"
-#: ../../view/theme/redbasic/php/config.php:126
-msgid "Set maximum width of content region in pixel"
-msgstr "Escolha a largura máxima da região de conteúdo em pixel"
-
-#: ../../view/theme/redbasic/php/config.php:126
-msgid "Leave empty for default width"
-msgstr "Deixe vazio para a largura padrão"
+#: ../../view/theme/redbasic/php/config.php:128
+msgid "Set maximum width of conversation regions"
+msgstr "Definir a largura máxima da área de conversas"
-#: ../../view/theme/redbasic/php/config.php:127
-msgid "Center page content"
-msgstr "Conteúdo centralizado na página"
+#: ../../view/theme/redbasic/php/config.php:129
+msgid "Center conversation regions"
+msgstr "Centralizar regiões de conversação"
-#: ../../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 "Definir opacidade mínima para a barra de navegação - para escondê-la"
-#: ../../view/theme/redbasic/php/config.php:129
+#: ../../view/theme/redbasic/php/config.php:131
msgid "Set size of conversation author photo"
msgstr "Definir o tamanho da foto do autor da conversa"
-#: ../../view/theme/redbasic/php/config.php:130
+#: ../../view/theme/redbasic/php/config.php:132
msgid "Set size of followup author photos"
msgstr "Definir o tamanho da foto dos autores de comentários"
@@ -8934,8 +9211,8 @@ msgstr "Erro de atualização em %s"
#: ../../boot.php:1525
msgid ""
-"Create an account to access services and applications within the Red Matrix"
-msgstr "Crie uma conta para acessar serviços e aplicações na Red Matrix"
+"Create an account to access services and applications within the Hubzilla"
+msgstr "Crie uma conta para acessar serviços e aplicações na Hubzilla"
#: ../../boot.php:1553
msgid "Password"
@@ -8970,3 +9247,4 @@ msgstr "Agendamento de tarefas não está rodando."
#, php-format
msgid "[red] Cron tasks not running on %s"
msgstr "[red] Agendador de tarefas não está rodando em %s"
+
diff --git a/view/pt-br/strings.php b/view/pt-br/strings.php
index ace6e1679..871e78cb2 100644
--- a/view/pt-br/strings.php
+++ b/view/pt-br/strings.php
@@ -109,57 +109,41 @@ $a->strings["$1 spoiler"] = "$1 spoiler";
$a->strings["$1 wrote:"] = "$1 escreveu:";
$a->strings["created a new post"] = "criou uma nova publicação";
$a->strings["commented on %s's post"] = "comentou a publicação de %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."] = "Um grupo com esse nome, anteriormente excluído, foi reativado. Permissões de itens já existentes <strong>poderão</strong> ser aplicadas a esse grupo e qualquer futuros membros. Se não é essa a sua intenção, favor criar outro grupo com um nome diferente.";
-$a->strings["Default privacy group for new contacts"] = "Grupo de privacidade padrão para novos contatos";
-$a->strings["All Channels"] = "Todos os canais";
-$a->strings["edit"] = "editar";
-$a->strings["Collections"] = "Coleções";
-$a->strings["Edit collection"] = "Editar coleção";
-$a->strings["Add new collection"] = "Adicionar nova coleção";
-$a->strings["Channels not in any collection"] = "Canais que não estão em nenhuma coleção";
-$a->strings["add"] = "adicionar";
-$a->strings["Not a valid email address"] = "Não é um endereço de e-mail válido";
-$a->strings["Your email domain is not among those allowed on this site"] = "O domínio do seu e-mail não está entre os permitidos neste site";
-$a->strings["Your email address is already registered at this site."] = "O seu endereço de e-mail já está registrado neste site.";
-$a->strings["An invitation is required."] = "É necessário um convite.";
-$a->strings["Invitation could not be verified."] = "Não foi possível verificar o convite.";
-$a->strings["Please enter the required information."] = "Por favor, forneça a informação solicitada.";
-$a->strings["Failed to store account information."] = "Não foi possível armazenar a informação da conta.";
-$a->strings["Registration confirmation for %s"] = "Confirmação de registro para %s";
-$a->strings["Registration request at %s"] = "Solicitação de registro em %s";
-$a->strings["Administrator"] = "Administrador";
-$a->strings["your registration password"] = "sua senha de registro";
-$a->strings["Registration details for %s"] = "Detalhes do registro de %s";
-$a->strings["Account approved."] = "A conta foi aprovada.";
-$a->strings["Registration revoked for %s"] = "O registro de %s foi revogado";
-$a->strings["Account verified. Please login."] = "Conta verificada. Por favor faça o login.";
-$a->strings["Click here to upgrade."] = "Clique aqui para atualizar.";
-$a->strings["This action exceeds the limits set by your subscription plan."] = "Essa ação excede o limite definido para o seu plano de assinatura.";
-$a->strings["This action is not available under your subscription plan."] = "Essa ação não está disponível para o seu plano de assinatura.";
-$a->strings["Miscellaneous"] = "Miscelânea";
-$a->strings["YYYY-MM-DD or MM-DD"] = "YYYY-MM-DD ou MM-DD";
-$a->strings["Required"] = "Obrigatório";
-$a->strings["never"] = "nunca";
-$a->strings["less than a second ago"] = "menos de um segundo atrás";
-$a->strings["year"] = "ano";
-$a->strings["years"] = "anos";
-$a->strings["month"] = "mês";
-$a->strings["months"] = "meses";
-$a->strings["week"] = "semana";
-$a->strings["weeks"] = "semanas";
-$a->strings["day"] = "dia";
-$a->strings["days"] = "dias";
-$a->strings["hour"] = "hora";
-$a->strings["hours"] = "horas";
-$a->strings["minute"] = "minuto";
-$a->strings["minutes"] = "minutos";
-$a->strings["second"] = "segundo";
-$a->strings["seconds"] = "segundos";
-$a->strings["__ctx:e.g. 22 hours ago, 1 minute ago__ %1\$d %2\$s ago"] = "%1\$d %2\$s atrás";
-$a->strings["%1\$s's birthday"] = "Aniversário de %1\$s ";
-$a->strings["Happy Birthday %1\$s"] = "Feliz Aniversário %1\$s";
-$a->strings["New Page"] = "Nova página";
+$a->strings["Site Admin"] = "Administração do site";
+$a->strings["Bookmarks"] = "Links guardados";
+$a->strings["Address Book"] = "Livro de Endereços";
+$a->strings["Login"] = "Entrar";
+$a->strings["Channel Manager"] = "Seus canais";
+$a->strings["Matrix"] = "Matriz";
+$a->strings["Settings"] = "Configurações";
+$a->strings["Files"] = "Arquivos";
+$a->strings["Webpages"] = "Páginas web";
+$a->strings["Channel Home"] = "Página inicial do canal";
+$a->strings["Profile"] = "Perfil";
+$a->strings["Photos"] = "Fotos";
+$a->strings["Events"] = "Eventos";
+$a->strings["Directory"] = "Diretório";
+$a->strings["Help"] = "Ajuda";
+$a->strings["Mail"] = "Mensagens";
+$a->strings["Mood"] = "Humor";
+$a->strings["Poke"] = "Cutucar";
+$a->strings["Chat"] = "Bate-papo";
+$a->strings["Search"] = "Pesquisar";
+$a->strings["Probe"] = "Sonda";
+$a->strings["Suggest"] = "Sugerir";
+$a->strings["Random Channel"] = "Canal aleatório";
+$a->strings["Invite"] = "Convidar";
+$a->strings["Features"] = "Recursos";
+$a->strings["Language"] = "Idioma";
+$a->strings["Post"] = "Publicações";
+$a->strings["Profile Photo"] = "Foto do perfil";
+$a->strings["Update"] = "Atualizar";
+$a->strings["Install"] = "Instalar";
+$a->strings["Purchase"] = "Compras";
$a->strings["Edit"] = "Editar";
+$a->strings["Delete"] = "Excluir";
+$a->strings["Unknown"] = "Desconhecidos";
+$a->strings["New Page"] = "Nova página";
$a->strings["View"] = "Ver";
$a->strings["Preview"] = "Pré-visualizar";
$a->strings["Actions"] = "Ações";
@@ -167,6 +151,27 @@ $a->strings["Page Link"] = "Link da página";
$a->strings["Title"] = "Título";
$a->strings["Created"] = "Criado";
$a->strings["Edited"] = "Editado";
+$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."] = "O token de segurança do formulário não estava correto. Isso provavelmente aconteceu porque o formulário ficou aberto por muito tempo (>3 horas) antes da sua submissão.";
+$a->strings["Invalid data packet"] = "Pacote de dados inválido";
+$a->strings["Unable to verify channel signature"] = "Não foi possível verificar a assinatura do canal";
+$a->strings["Unable to verify site signature for %s"] = "Não foi possível verificar a assinatura do site para %s";
+$a->strings["Permission denied."] = "Permissão negada.";
+$a->strings["Image exceeds website size limit of %lu bytes"] = "A imagem excede o limite de tamanho do site, que é de %";
+$a->strings["Image file is empty."] = "O arquivo de imagem está vazio.";
+$a->strings["Unable to process image"] = "Não foi possível processar a imagem";
+$a->strings["Photo storage failed."] = "Não foi possível armazenar a foto.";
+$a->strings["Photo Albums"] = "Álbuns de fotos";
+$a->strings["Upload New Photos"] = "Enviar novas fotos";
+$a->strings["Visible to your default audience"] = "Visível para seu público padrão";
+$a->strings["Show"] = "Exibir";
+$a->strings["Don't show"] = "Não exibir";
+$a->strings["Permissions"] = "Permissões";
+$a->strings["Close"] = "Fechar";
+$a->strings[" and "] = " e ";
+$a->strings["public profile"] = "perfil público";
+$a->strings["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "%1\$s mudou %2\$s para &ldquo;%3\$s&rdquo;";
+$a->strings["Visit %1\$s's %2\$s"] = "Visite o %2\$s de %1\$s";
+$a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s atualizou %2\$s, alterando %3\$s.";
$a->strings["Public Timeline"] = "Linha do tempo pública";
$a->strings["Default"] = "Default";
$a->strings["Directory Options"] = "Opções do Diretório";
@@ -458,22 +463,69 @@ $a->strings["via Wall-To-Wall:"] = "via Mural-para-mural";
$a->strings["from %s"] = "de %s";
$a->strings["last edited: %s"] = "última edição: %s";
$a->strings["Expires: %s"] = "Expira: %s";
-$a->strings["Save Bookmarks"] = "Salve Favoritos";
-$a->strings["Add to Calendar"] = "Adicione ao calendário";
-$a->strings["Mark all seen"] = "Marcar todos como visto";
-$a->strings["__ctx:noun__ Likes"] = "Gostaram";
-$a->strings["__ctx:noun__ Dislikes"] = "Desgostaram";
-$a->strings["Close"] = "Fechar";
+$a->strings["View in context"] = "Ver no contexto";
$a->strings["Please wait"] = "Por favor, espere";
-$a->strings["This is you"] = "Este(a) é você";
-$a->strings["Bold"] = "Negrito";
-$a->strings["Italic"] = "Itálico";
-$a->strings["Underline"] = "Sublinhado";
-$a->strings["Quote"] = "Citação";
-$a->strings["Code"] = "Código";
-$a->strings["Image"] = "Imagem";
-$a->strings["Insert Link"] = "Inserir link";
-$a->strings["Video"] = "Vídeo";
+$a->strings["remove"] = "remover";
+$a->strings["Loading..."] = "Carregando...";
+$a->strings["Delete Selected Items"] = "Excluir os itens selecionados";
+$a->strings["View Source"] = "Ver a fonte";
+$a->strings["Follow Thread"] = "Acompanhar a discussão";
+$a->strings["View Status"] = "Ver status";
+$a->strings["View Profile"] = "Ver perfil";
+$a->strings["View Photos"] = "Ver fotos";
+$a->strings["Matrix Activity"] = "Atividade na matriz";
+$a->strings["Connect"] = "Conectar";
+$a->strings["Edit Contact"] = "Editar contato";
+$a->strings["Send PM"] = "Enviar MP";
+$a->strings["%s likes this."] = "%s gostou disso.";
+$a->strings["%s doesn't like this."] = "%s não gostou disso.";
+$a->strings["<span %1\$s>%2\$d people</span> like this."] = array(
+ 0 => "",
+ 1 => "<span %1\$s>%2\$d pessoas</span> gostaram disso.",
+);
+$a->strings["<span %1\$s>%2\$d people</span> don't like this."] = array(
+ 0 => "",
+ 1 => "<span %1\$s>%2\$d pessoas</span> não gostaram disso.",
+);
+$a->strings["and"] = "e";
+$a->strings[", and %d other people"] = array(
+ 0 => "",
+ 1 => ", e mais %d outras pessoas",
+);
+$a->strings["%s like this."] = "%s gostou disso.";
+$a->strings["%s don't like this."] = "%s não gostou disso.";
+$a->strings["Visible to <strong>everybody</strong>"] = "Visível para <strong>todos</strong>";
+$a->strings["Please enter a link URL:"] = "Por favor, digite uma URL:";
+$a->strings["Please enter a video link/URL:"] = "Por favor, digite o link/URL do vídeo:";
+$a->strings["Please enter an audio link/URL:"] = "Por favor, digite o link/URL do áudio:";
+$a->strings["Tag term:"] = "Etiqueta:";
+$a->strings["Save to Folder:"] = "Salvar para a pasta:";
+$a->strings["Where are you right now?"] = "Onde você está agora?";
+$a->strings["Expires YYYY-MM-DD HH:MM"] = "Expira YYYY-MM-DD HH:MM";
+$a->strings["Share"] = "Compartilhar";
+$a->strings["Page link title"] = "Título do link da página";
+$a->strings["Post as"] = "Publicar como";
+$a->strings["Upload photo"] = "Enviar foto";
+$a->strings["upload photo"] = "enviar foto";
+$a->strings["Attach file"] = "Anexar arquivo";
+$a->strings["attach file"] = "anexar arquivo";
+$a->strings["Insert web link"] = "Inserir link web";
+$a->strings["web link"] = "link web";
+$a->strings["Insert video link"] = "Inserir link de vídeo";
+$a->strings["video link"] = "link de vídeo";
+$a->strings["Insert audio link"] = "Inserir link de áudio";
+$a->strings["audio link"] = "link de áudio";
+$a->strings["Set your location"] = "Definir sua localização";
+$a->strings["set location"] = "definir localização";
+$a->strings["Clear browser location"] = "Limpar a localização do navegador";
+$a->strings["clear location"] = "limpar a localização";
+$a->strings["Set title"] = "Definir o título";
+$a->strings["Categories (comma-separated list)"] = "Categorias (lista separada por vírgulas)";
+$a->strings["Permission settings"] = "Configurações de permissão";
+$a->strings["permissions"] = "permissões";
+$a->strings["Public post"] = "Publicação pública";
+$a->strings["Example: bob@example.com, mary@example.com"] = "Por exemplo: joao@exemplo.com, maria@exemplo.com";
+$a->strings["Set expiration date"] = "Definir data de expiração";
$a->strings["Encrypt text"] = "Encriptar texto";
$a->strings["New window"] = "Nova janela";
$a->strings["Open the selected location in a different window or browser tab"] = "Abre a localização selecionada em outra aba ou janela";
@@ -548,7 +600,9 @@ $a->strings["have"] = "tenho";
$a->strings["has"] = "tem";
$a->strings["want"] = "quero";
$a->strings["wants"] = "quer";
+$a->strings["like"] = "gostei";
$a->strings["likes"] = "gosta";
+$a->strings["dislike"] = "não gostei";
$a->strings["dislikes"] = "desgosta";
$a->strings[" and "] = " e ";
$a->strings["public profile"] = "perfil público";
@@ -724,13 +778,44 @@ $a->strings["__ctx:noun__ Agree"] = array(
0 => "Concorda",
1 => "Concordam",
);
-$a->strings["__ctx:noun__ Disagree"] = array(
- 0 => "Discordo",
- 1 => "Discordo",
+$a->strings["Default"] = "Default";
+$a->strings["Frequently"] = "Frequentemente";
+$a->strings["Hourly"] = "De hora em hora";
+$a->strings["Twice daily"] = "Duas vezes ao dia";
+$a->strings["Daily"] = "Diariamente";
+$a->strings["Weekly"] = "Semanalmente";
+$a->strings["Monthly"] = "Mensalmente";
+$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/MI";
+$a->strings["MySpace"] = "MySpace";
+$a->strings["%d invitation available"] = array(
+ 0 => "%d convite disponível",
+ 1 => "%d convites disponíveis",
);
-$a->strings["__ctx:noun__ Abstain"] = array(
- 0 => "Abstenção",
- 1 => "Abstenções",
+$a->strings["Advanced"] = "Avançado";
+$a->strings["Find Channels"] = "Pesquisar canais";
+$a->strings["Enter name or interest"] = "Digite um nome ou interesse";
+$a->strings["Connect/Follow"] = "Conectar/Acompanhar";
+$a->strings["Examples: Robert Morgenstein, Fishing"] = "Por exemplo: José da Silva, Pescaria";
+$a->strings["Find"] = "Pesquisar";
+$a->strings["Channel Suggestions"] = "Sugestões de canais";
+$a->strings["Random Profile"] = "Perfil aleatório";
+$a->strings["Invite Friends"] = "Convidar amigos";
+$a->strings["Exammple: name=fred and country=iceland"] = "Exemplo: name=raoni and country=peru";
+$a->strings["Advanced Find"] = "Busca avançada";
+$a->strings["Saved Folders"] = "Pastas salvas";
+$a->strings["Everything"] = "Tudo";
+$a->strings["Categories"] = "Categorias";
+$a->strings["%d connection in common"] = array(
+ 0 => "%d conexão em comum",
+ 1 => "%d conexões em comum",
);
$a->strings["Image exceeds website size limit of %lu bytes"] = "A imagem excede o limite de tamanho do site, que é de %";
$a->strings["Image file is empty."] = "O arquivo de imagem está vazio.";
@@ -791,12 +876,14 @@ $a->strings["Reserved nickname. Please choose another."] = "Apelido reservado. P
$a->strings["Nickname has unsupported characters or is already being used on this site."] = "O apelido possui caracteres não suportados ou já está sendo usado nesse site.";
$a->strings["Unable to retrieve created identity"] = "Não foi possível recuperar a identidade criada";
$a->strings["Default Profile"] = "Perfil padrão";
+$a->strings["Friends"] = "Amigos";
$a->strings["Requested channel is not available."] = "Canal solicitado não está disponível.";
$a->strings["Requested profile is not available."] = "O perfil solicitado não está disponível.";
$a->strings["Change profile photo"] = "Mudar a foto do perfil";
$a->strings["Profiles"] = "Perfis";
$a->strings["Manage/edit profiles"] = "Administrar/editar perfis";
$a->strings["Create New Profile"] = "Criar um novo perfil";
+$a->strings["Edit Profile"] = "Editar perfil";
$a->strings["Profile Image"] = "Imagem do perfil";
$a->strings["visible to everybody"] = "visível para todos";
$a->strings["Edit visibility"] = "Editar a visibilidade";
@@ -812,7 +899,6 @@ $a->strings["Birthdays this week:"] = "Aniversários nesta semana:";
$a->strings["[No description]"] = "[Sem descrição]";
$a->strings["Event Reminders"] = "Lembretes de eventos";
$a->strings["Events this week:"] = "Eventos nesta semana:";
-$a->strings["Profile"] = "Perfil";
$a->strings["Full Name:"] = "Nome completo:";
$a->strings["Like this channel"] = "Gostar deste canal";
$a->strings["j F, Y"] = "j \\d\\e F, Y";
@@ -839,6 +925,163 @@ $a->strings["Love/Romance:"] = "Amor/romance:";
$a->strings["Work/employment:"] = "Trabalho/emprego:";
$a->strings["School/education:"] = "Escola/educação:";
$a->strings["Like this thing"] = "Gostar desta coisa";
+$a->strings["Logout"] = "Sair";
+$a->strings["End this session"] = "Encerrar essa sessão";
+$a->strings["Home"] = "Ver canal";
+$a->strings["Your posts and conversations"] = "Suas publicações e conversas";
+$a->strings["Your profile page"] = "A página do seu perfil";
+$a->strings["Edit Profiles"] = "Editar perfis";
+$a->strings["Manage/Edit profiles"] = "Administrar/Editar perfis";
+$a->strings["Edit your profile"] = "Editar seu perfil";
+$a->strings["Your photos"] = "Suas fotos";
+$a->strings["Your files"] = "Seus arquivos";
+$a->strings["Your chatrooms"] = "Suas salas de bate-papo";
+$a->strings["Your bookmarks"] = "Seus links guardados";
+$a->strings["Your webpages"] = "Suas páginas web";
+$a->strings["Sign in"] = "Entrar";
+$a->strings["%s - click to logout"] = "%s - clique para sair";
+$a->strings["Click to authenticate to your home hub"] = "Clique para se autenticar com seu hub de origem";
+$a->strings["Home Page"] = "Página inicial";
+$a->strings["Register"] = "Registrar";
+$a->strings["Create an account"] = "Criar uma conta";
+$a->strings["Help and documentation"] = "Ajuda e documentação";
+$a->strings["Apps"] = "Aplicações";
+$a->strings["Applications, utilities, links, games"] = "Aplicações, utilitários, links, jogos";
+$a->strings["Search site content"] = "Pesquisar o conteúdo do site";
+$a->strings["Channel Locator"] = "Localizador de canais";
+$a->strings["Your matrix"] = "Sua matriz";
+$a->strings["Mark all matrix notifications seen"] = "Marcar todas as notificações da matriz como vistas";
+$a->strings["Channel home"] = "Página inicial do canal";
+$a->strings["Mark all channel notifications seen"] = "Marcar todas as notificações de canais como vistas";
+$a->strings["Connections"] = "Conexões";
+$a->strings["Notices"] = "Notificações";
+$a->strings["Notifications"] = "Notificações";
+$a->strings["See all notifications"] = "Ver todas as notificações";
+$a->strings["Mark all system notifications seen"] = "Marcar todas as notificações de sistema como vistas";
+$a->strings["Private mail"] = "Mensagens privadas";
+$a->strings["See all private messages"] = "Ver todas as mensagens privadas";
+$a->strings["Mark all private messages seen"] = "Marcar todas as mensagens privadas como vistas";
+$a->strings["Inbox"] = "Recebidas";
+$a->strings["Outbox"] = "Enviadas";
+$a->strings["New Message"] = "Nova mensagem";
+$a->strings["Event Calendar"] = "Agenda de eventos";
+$a->strings["See all events"] = "Ver todos os eventos";
+$a->strings["Mark all events seen"] = "Marcar todos os eventos como vistos";
+$a->strings["Manage Your Channels"] = "Gerencie os seus canais";
+$a->strings["Account/Channel Settings"] = "Configurações da conta/canal";
+$a->strings["Admin"] = "Admin";
+$a->strings["Site Setup and Configuration"] = "Configuração do site";
+$a->strings["Please wait..."] = "Por favor, aguarde...";
+$a->strings["No recipient provided."] = "Falta o destinatário.";
+$a->strings["[no subject]"] = "[sem assunto]";
+$a->strings["Unable to determine sender."] = "Não foi possível determinar o remetente.";
+$a->strings["Stored post could not be verified."] = "Não foi possível verificar a publicação armazenada.";
+$a->strings["System"] = "Sistema";
+$a->strings["Create Personal App"] = "Crie aplicações pessoais";
+$a->strings["Edit Personal App"] = "Edite aplicações pessoais";
+$a->strings["Ignore/Hide"] = "Ignorar/Ocultar";
+$a->strings["Suggestions"] = "Sugestões";
+$a->strings["See more..."] = "Veja mais...";
+$a->strings["You have %1$.0f of %2$.0f allowed connections."] = "Você tem %1$.0f de %2$.0f conexões permitidas.";
+$a->strings["Add New Connection"] = "Adicionar nova conexão";
+$a->strings["Enter the channel address"] = "Digite o endereço do canal";
+$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Por exemplo: joao@exemplo.com, http://exemplo.com/maria";
+$a->strings["Notes"] = "Notas";
+$a->strings["Remove term"] = "Remover termo";
+$a->strings["Archives"] = "Arquivos";
+$a->strings["Refresh"] = "Atualizar";
+$a->strings["Me"] = "Eu";
+$a->strings["Best Friends"] = "Melhores amigos";
+$a->strings["Co-workers"] = "Colegas de trabalho";
+$a->strings["Former Friends"] = "Amigos afastados";
+$a->strings["Acquaintances"] = "Conhecidos";
+$a->strings["Everybody"] = "Todos";
+$a->strings["Account settings"] = "Configurações da conta";
+$a->strings["Channel settings"] = "Configurações do canal";
+$a->strings["Additional features"] = "Recursos adicionais";
+$a->strings["Feature settings"] = "Configurações dos recursos";
+$a->strings["Display settings"] = "Configurações de exibição";
+$a->strings["Connected apps"] = "Aplicações conectadas";
+$a->strings["Export channel"] = "Exportar o canal";
+$a->strings["Export content"] = "Exportar conteúdo";
+$a->strings["Automatic Permissions (Advanced)"] = "Permissões automáticas (avançado)";
+$a->strings["Premium Channel Settings"] = "Configurações de canal premium";
+$a->strings["Check Mail"] = "Checar mensagens";
+$a->strings["Chat Rooms"] = "Salas de bate-papo";
+$a->strings["Bookmarked Chatrooms"] = "Salas de bate-papo guardadas";
+$a->strings["Suggested Chatrooms"] = "Salas de bate-papo sugeridas";
+$a->strings["Save to Folder"] = "Salvar para pasta";
+$a->strings["View all"] = "Ver tudo";
+$a->strings["__ctx:noun__ Dislike"] = array(
+ 0 => "desgostou",
+ 1 => "desgostaram",
+);
+$a->strings["Add Star"] = "Adicione estrela";
+$a->strings["Remove Star"] = "Remove estrela";
+$a->strings["Toggle Star Status"] = "Alterna status da estrela";
+$a->strings["starred"] = "destacado";
+$a->strings["Add Tag"] = "Adiciona etiqueta";
+$a->strings["I like this (toggle)"] = "Eu gostei disso (alterna)";
+$a->strings["I don't like this (toggle)"] = "Eu não gostei disso (alterna)";
+$a->strings["Share This"] = "Compartilhe isso";
+$a->strings["share"] = "compartilhar";
+$a->strings["View %s's profile - %s"] = "Ver o perfil de %s - %s";
+$a->strings["to"] = "para";
+$a->strings["via"] = "via";
+$a->strings["Wall-to-Wall"] = "Mural-para-mural";
+$a->strings["via Wall-To-Wall:"] = "via Mural-para-mural";
+$a->strings["Save Bookmarks"] = "Salve Favoritos";
+$a->strings["Add to Calendar"] = "Adicione ao calendário";
+$a->strings["__ctx:noun__ Likes"] = "Gostaram";
+$a->strings["__ctx:noun__ Dislikes"] = "Desgostaram";
+$a->strings["%d comment"] = array(
+ 0 => "%d comentário",
+ 1 => "%d comentários",
+);
+$a->strings["[+] show all"] = "[+] mostrar todos";
+$a->strings["This is you"] = "Este(a) é você";
+$a->strings["Comment"] = "Comentar";
+$a->strings["Submit"] = "Enviar";
+$a->strings["Bold"] = "Negrito";
+$a->strings["Italic"] = "Itálico";
+$a->strings["Underline"] = "Sublinhado";
+$a->strings["Quote"] = "Citação";
+$a->strings["Code"] = "Código";
+$a->strings["Image"] = "Imagem";
+$a->strings["Link"] = "Link";
+$a->strings["Video"] = "Vídeo";
+$a->strings["Delete this item?"] = "Excluir este item?";
+$a->strings["[-] show less"] = "[-] mostra menos";
+$a->strings["[+] expand"] = "[+] expandir";
+$a->strings["[-] collapse"] = "[-] colapsar";
+$a->strings["Password too short"] = "A senha é muito curta";
+$a->strings["Passwords do not match"] = "As senhas não correspondem";
+$a->strings["everybody"] = "todos";
+$a->strings["Secret Passphrase"] = "Frase secreta";
+$a->strings["Passphrase hint"] = "Dica da frase secreta";
+$a->strings["Notice: Permissions have changed but have not yet been submitted."] = "Atenção: permissões foram modificadas mas ainda não foram enviadas.";
+$a->strings["close all"] = "fechar tudo";
+$a->strings["Nothing new here"] = "Nada de novo aqui";
+$a->strings["timeago.prefixAgo"] = "timeago.prefixAgo";
+$a->strings["timeago.prefixFromNow"] = "timeago.prefixFromNow";
+$a->strings["ago"] = "atrás";
+$a->strings["from now"] = "de agora";
+$a->strings["less than a minute"] = "menos de um minuto";
+$a->strings["about a minute"] = "aproximadamente um minuto";
+$a->strings["%d minutes"] = "%d minutos";
+$a->strings["about an hour"] = "aproximadamente uma hora";
+$a->strings["about %d hours"] = "aproximadamente %d horas";
+$a->strings["a day"] = "um dia";
+$a->strings["%d days"] = "%d dias";
+$a->strings["about a month"] = "aproximadamente um mês";
+$a->strings["%d months"] = "%d meses";
+$a->strings["about a year"] = "aproximadamente um ano";
+$a->strings["%d years"] = "%d anos";
+$a->strings[" "] = " ";
+$a->strings["timeago.numbers"] = "timeago.numbers";
+$a->strings["New window"] = "Nova janela";
+$a->strings["Open the selected location in a different window or browser tab"] = "Abre a localização selecionada em outra aba ou janela";
+$a->strings["User '%s' deleted"] = "O usuário/a '%s' foi deletado/a";
$a->strings["Male"] = "Masculino";
$a->strings["Female"] = "Feminino";
$a->strings["Currently Male"] = "Atualmente masculino";
@@ -851,6 +1094,7 @@ $a->strings["Transsexual"] = "Transexual";
$a->strings["Hermaphrodite"] = "Hermafrodita";
$a->strings["Neuter"] = "Neutro";
$a->strings["Non-specific"] = "Não específico";
+$a->strings["Other"] = "Outro";
$a->strings["Undecided"] = "Indeciso";
$a->strings["Males"] = "Homens";
$a->strings["Females"] = "Mulheres";
@@ -895,42 +1139,76 @@ $a->strings["Uncertain"] = "Incerto(a)";
$a->strings["It's complicated"] = "É complicado";
$a->strings["Don't care"] = "Não importa";
$a->strings["Ask me"] = "Pergunte-me";
-$a->strings["Site Admin"] = "Administração do site";
-$a->strings["Address Book"] = "Livro de Endereços";
-$a->strings["Mood"] = "Humor";
-$a->strings["Probe"] = "Sonda";
-$a->strings["Suggest"] = "Sugerir";
-$a->strings["Random Channel"] = "Canal aleatório";
-$a->strings["Invite"] = "Convidar";
-$a->strings["Features"] = "Recursos";
-$a->strings["Language"] = "Idioma";
-$a->strings["Post"] = "Publicação";
-$a->strings["Profile Photo"] = "Foto do perfil";
-$a->strings["Update"] = "Atualizar";
-$a->strings["Install"] = "Instalar";
-$a->strings["Purchase"] = "Compras";
-$a->strings["Missing room name"] = "Nome da sala vazio";
-$a->strings["Duplicate room name"] = "Nome da sala duplicado";
-$a->strings["Invalid room specifier."] = "Especificador de sala inválido.";
-$a->strings["Room not found."] = "A sala não foi encontrada.";
-$a->strings["Room is full"] = "A sala está cheia";
-$a->strings["Please choose"] = "Por favor, escolha";
-$a->strings["Agree"] = "Concordo";
-$a->strings["Disagree"] = "Discordo";
-$a->strings["Abstain"] = "Abstenho";
+$a->strings["Logged out."] = "Você saiu.";
+$a->strings["Failed authentication"] = "Não foi possível autenticar";
+$a->strings["Login failed."] = "Não foi possível entrar.";
+$a->strings["Can view my normal stream and posts"] = "Pode ver meus fluxo e publicações normais";
+$a->strings["Can view my default channel profile"] = "Pode ver o perfil padrão do meu canal";
+$a->strings["Can view my photo albums"] = "Pode ver meus álbuns de fotos";
+$a->strings["Can view my connections"] = "Pode ver minhas conexões";
+$a->strings["Can view my file storage"] = "Pode ver meu armazenamento de arquivos";
+$a->strings["Can view my webpages"] = "Pode ver minhas páginas web";
+$a->strings["Can send me their channel stream and posts"] = "Pode me enviar seu fluxo e publicações";
+$a->strings["Can post on my channel page (\"wall\")"] = "Pode publicar na página do meu canal (\"mural\")";
+$a->strings["Can comment on or like my posts"] = "Pode comentar em ou gostar de minhas publicações";
+$a->strings["Can send me private mail messages"] = "Pode me enviar mensagens privadas";
+$a->strings["Can post photos to my photo albums"] = "Pode publicar fotos nos meus álbuns de fotos";
+$a->strings["Can like/dislike stuff"] = "Pode gostar/desgostar de coisas";
+$a->strings["Profiles and things other than posts/comments"] = "Perfis e coisas que não publicações/comentários";
+$a->strings["Can forward to all my channel contacts via post @mentions"] = "Pode encaminhar para todos os contatos do meu canal via @menções na publicação";
+$a->strings["Advanced - useful for creating group forum channels"] = "Avançado - útil para criar canais de fóruns de grupos";
+$a->strings["Can chat with me (when available)"] = "Pode conversar comigo (quando disponívei)";
+$a->strings["Can write to my file storage"] = "Pode escrever em meu armazenamento de arquivos";
+$a->strings["Can edit my webpages"] = "Pode editar minhas páginas web";
+$a->strings["Can source my public posts in derived channels"] = "Pode usar minhas publicações públicas como fonte para canais derivados";
+$a->strings["Somewhat advanced - very useful in open communities"] = "Avançado - muito útil em comunidades abertas";
+$a->strings["Can administer my channel resources"] = "Pode administrar os recursos do meu canal";
+$a->strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Extremamente avançado. Não mexa nisso a não ser que saiba o que está fazendo";
+$a->strings["Social Networking"] = "Rede social";
+$a->strings["Mostly Public"] = "Padrão público";
+$a->strings["Restricted"] = "Restrito";
+$a->strings["Private"] = "Privado";
+$a->strings["Community Forum"] = "Fórum de comunidade";
+$a->strings["Feed Republish"] = "Republicação de feed";
+$a->strings["Celebrity/Soapbox"] = "Personalidade/Palanque";
+$a->strings["Custom/Expert Mode"] = "Personalizado/Modo expert";
+$a->strings["Set your current mood and tell your friends"] = "Marque seu humor atual e compartilhe com seus amigos";
+$a->strings["Menu not found."] = "O menu não foi encontrado.";
+$a->strings["Menu element updated."] = "O elemento de menu foi atualizado.";
+$a->strings["Unable to update menu element."] = "Não foi possível atualizar o elemento de menu.";
+$a->strings["Menu element added."] = "O elemento de menu foi adicionado.";
+$a->strings["Unable to add menu element."] = "Não foi possível adicionar o elemento de menu.";
+$a->strings["Not found."] = "Não encontrado.";
+$a->strings["Manage Menu Elements"] = "Administrar elementos de menu";
+$a->strings["Edit menu"] = "Editar menu";
+$a->strings["Edit element"] = "Editar elemento";
+$a->strings["Drop element"] = "Descartar elemento";
+$a->strings["New element"] = "Novo elemento";
+$a->strings["Edit this menu container"] = "Editar esta caixa de menu";
+$a->strings["Add menu element"] = "Adicionar um elemento de menu";
+$a->strings["Delete this menu item"] = "Deleter este item de menu";
+$a->strings["Edit this menu item"] = "Editar este item de menu";
+$a->strings["New Menu Element"] = "Novo elemento de menu";
+$a->strings["Menu Item Permissions"] = "Permissões do item do menu";
+$a->strings["(click to open/close)"] = "(clique para abrir/fechar)";
+$a->strings["Link text"] = "Texto do link";
+$a->strings["URL of link"] = "URL do link";
+$a->strings["Use Red magic-auth if available"] = "Usar <em>Red magic-auth</em> se disponível";
+$a->strings["Open link in new window"] = "Abrir link em uma nova janela";
+$a->strings["Order in list"] = "Ordem na lista";
+$a->strings["Higher numbers will sink to bottom of listing"] = "Números mais altos descem para o fim da lista";
+$a->strings["Menu item not found."] = "O item de menu não foi encontrado.";
+$a->strings["Menu item deleted."] = "O item de menu foi deletado.";
+$a->strings["Menu item could not be deleted."] = "Não foi possível deletar o item de menu.";
+$a->strings["Edit Menu Element"] = "Editar elemento de menu";
+$a->strings["Modify"] = "Modificar";
$a->strings["Some blurb about what to do when you're new here"] = "Alguma coisa sobre o que fazer quando se é novo aqui";
-$a->strings["You have created %1$.0f of %2$.0f allowed channels."] = "Você criou %1$.0f de %2$.0f canais permitidos.";
-$a->strings["Create a new channel"] = "Criar um novo canal";
-$a->strings["Current Channel"] = "Canal atual";
-$a->strings["Switch to one of your channels by selecting it."] = "Troque para um de seus canais selecionando-o.";
-$a->strings["Default Channel"] = "Canal padrão";
-$a->strings["Make Default"] = "Tornar padrão";
-$a->strings["%d new messages"] = "%d novas mensagens";
-$a->strings["%d new introductions"] = "%d novas apresentações";
-$a->strings["Delegated Channels"] = "Canais delegados";
+$a->strings["sent you a private message"] = "lhe enviou uma mensagem privada";
+$a->strings["added your channel"] = "adicionou seu canal";
+$a->strings["posted an event"] = "publicou um evento";
+$a->strings["network"] = "+ rede";
$a->strings["Name is required"] = "É necessário informar o nome";
$a->strings["Key and Secret are required"] = "A chave e o segredo são obrigatórios";
-$a->strings["Diaspora Policy Settings updated."] = "Configurações da política do Diáspora atualizadas.";
$a->strings["Passwords do not match. Password unchanged."] = "As senhas não correspondem. A senha não foi modificada.";
$a->strings["Empty passwords are not allowed. Password unchanged."] = "Não é permitido uma senha em branco. A senha não foi modificada.";
$a->strings["Password changed."] = "A senha foi modificada.";
@@ -939,8 +1217,6 @@ $a->strings["Not valid email."] = "Não é um e-mail válido";
$a->strings["Protected email address. Cannot change to that email."] = "Endereço de e-mail protegido. Não é possível mudar para esse e-mail.";
$a->strings["System failure storing new email. Please try again."] = "Falha do sistema ao armazenar novo e-mail. Por favor, tente novamente.";
$a->strings["Settings updated."] = "As configurações foram atualizadas.";
-$a->strings["No"] = "Não";
-$a->strings["Yes"] = "Sim";
$a->strings["Add application"] = "Adicionar aplicação";
$a->strings["Name of application"] = "Nome da aplicação";
$a->strings["Consumer Key"] = "Chave de consumidor";
@@ -956,25 +1232,22 @@ $a->strings["Client key starts with"] = "Chave do cliente começa com";
$a->strings["No name"] = "Sem nome";
$a->strings["Remove authorization"] = "Remover autorização";
$a->strings["No feature settings configured"] = "Não foi definida nenhuma configuração do recurso";
-$a->strings["Feature/Addon Settings"] = "Configuração de Característica/Plugins";
-$a->strings["Settings for the built-in Diaspora emulator"] = "Configurações para construir um emulador de Diáspora";
-$a->strings["Allow any Diaspora member to comment on your public posts"] = "Permitir que qualquer membro do Diaspora comente em suas postagens públicas";
-$a->strings["Diaspora Policy Settings"] = "Configurações de Política do Diáspora";
-$a->strings["Prevent your hashtags from being redirected to other sites"] = "Previne que suas hashtags sejam redirecionadas para outros sítios";
+$a->strings["Feature Settings"] = "Configurações do recurso";
$a->strings["Account Settings"] = "Configurações da conta";
-$a->strings["Enter New Password:"] = "Digite a Nova Senha:";
-$a->strings["Confirm New Password:"] = "Confirme a Nova Senha:";
+$a->strings["Password Settings"] = "Configurações da senha";
+$a->strings["New Password:"] = "Nova senha:";
+$a->strings["Confirm:"] = "Confirme:";
$a->strings["Leave password fields blank unless changing"] = "Deixe os campos de senha em branco, a não ser que você queira alterá-la";
$a->strings["Email Address:"] = "Endereço de e-mail:";
$a->strings["Remove Account"] = "Remover conta";
-$a->strings["Remove this account including all its channels"] = "Exclua esta conta, incluindo todos seus canais";
+$a->strings["Remove this account from this server including all its channels"] = "Remove esta conta deste servidor incluindo todos os seus canais.";
+$a->strings["Warning: This action is permanent and cannot be reversed."] = "Atenção: Esta ação é permanente e não pode ser revertida.";
$a->strings["Off"] = "Desligado";
$a->strings["On"] = "Ligado";
$a->strings["Additional Features"] = "Recursos adicionais";
$a->strings["Connector Settings"] = "Configurações do conector";
$a->strings["No special theme for mobile devices"] = "Sem tema especial para aparelhos móveis";
$a->strings["%s - (Experimental)"] = "%s - (Experimental)";
-$a->strings["mobile"] = "móvel";
$a->strings["Display Settings"] = "Configurações de exibição";
$a->strings["Display Theme:"] = "Tema do perfil:";
$a->strings["Mobile Theme:"] = "Tema móvel:";
@@ -983,15 +1256,9 @@ $a->strings["Update browser every xx seconds"] = "Atualizar navegador a cada xx
$a->strings["Minimum of 10 seconds, no maximum"] = "Mínimo de 10 segundos, sem máximo";
$a->strings["Maximum number of conversations to load at any time:"] = "Número máximo permitido de conversas carregadas:";
$a->strings["Maximum of 100 items"] = "Máximo de 100 itens";
-$a->strings["Show emoticons (smilies) as images"] = "Mostrar emoticons (smilies) como imagens";
+$a->strings["Don't show emoticons"] = "Não exibir emoticons";
$a->strings["Link post titles to source"] = "Ligar o título dos posts à fonte";
$a->strings["System Page Layout Editor - (advanced)"] = "Editor de layout de página do sistema - (avançado)";
-$a->strings["Use blog/list mode on channel page"] = "Usar modo blog/lista na página do canal";
-$a->strings["(comments displayed separately)"] = "(comentários mostrados separadamente)";
-$a->strings["Use blog/list mode on matrix page"] = "Use modo de blogue/lista na página da matriz";
-$a->strings["Channel page max height of content (in pixels)"] = "Altura máxima do conteúdo na página (em pixels)";
-$a->strings["click to expand content exceeding this height"] = "clique para expandir o conteúdo que excede essa altura";
-$a->strings["Matrix page max height of content (in pixels)"] = "Máxima altura de conteúdo na página Matriz (in pixesl)";
$a->strings["Nobody except yourself"] = "Ninguém exceto você mesmo";
$a->strings["Only those you specifically allow"] = "Apenas quem você der permissão";
$a->strings["Approved connections"] = "Conexões aprovadas";
@@ -1001,6 +1268,8 @@ $a->strings["Anybody in this network"] = "Qualquer um nesta rede";
$a->strings["Anybody authenticated"] = "Qualquer um autenticado";
$a->strings["Anybody on the internet"] = "Qualquer um na internet";
$a->strings["Publish your default profile in the network directory"] = "Publicar seu perfil padrão no diretório da rede?";
+$a->strings["No"] = "Não";
+$a->strings["Yes"] = "Sim";
$a->strings["Allow us to suggest you as a potential friend to new members?"] = "Permitir sugerir você como amigo potencial para outros membros?";
$a->strings["or"] = "ou";
$a->strings["Your channel address is"] = "O endereço do seu canal é";
@@ -1029,8 +1298,6 @@ $a->strings["0 or blank prevents expiration"] = "0 ou em branco previne expiraç
$a->strings["Maximum Friend Requests/Day:"] = "Número máximo de requisições de amizade por dia:";
$a->strings["May reduce spam activity"] = "Pode reduzir a frequência de spam";
$a->strings["Default Post Permissions"] = "Permissões padrão de publicação";
-$a->strings["(click to open/close)"] = "(clique para abrir/fechar)";
-$a->strings["Channel permissions category:"] = "Categoria de permissões do canal:";
$a->strings["Maximum private messages per day from unknown people:"] = "Máximo número de mensagens privadas por dia de pessoas desconhecidas:";
$a->strings["Useful to reduce spamming"] = "Útil para reduzir a frequência de spam";
$a->strings["Notification Settings"] = "Configurações de notificação";
@@ -1047,66 +1314,23 @@ $a->strings["You receive a private message"] = "Você recebeu uma mensagem priva
$a->strings["You receive a friend suggestion"] = "Você recebe uma sugestão de amizade";
$a->strings["You are tagged in a post"] = "Você é mencionado num post";
$a->strings["You are poked/prodded/etc. in a post"] = "Você foi cutucado/espetado/etc. numa publicação";
-$a->strings["Show visual notifications including:"] = "Exibir notificações visuais incluindo:";
-$a->strings["Unseen matrix activity"] = "Atividade não vista na matriz";
-$a->strings["Unseen channel activity"] = "Atividade não vista no canal";
-$a->strings["Unseen private messages"] = "Mensagens privadas não vistas";
-$a->strings["Recommended"] = "Recomendado";
-$a->strings["Upcoming events"] = "Eventos próximos";
-$a->strings["Events today"] = "Eventos hoje";
-$a->strings["Upcoming birthdays"] = "Aniversários próximos";
-$a->strings["Not available in all themes"] = "Não disponível em todos os temas";
-$a->strings["System (personal) notifications"] = "Notificações de sistema (pessoais)";
-$a->strings["System info messages"] = "Mensagens de informação do sistema";
-$a->strings["System critical alerts"] = "Alertas críticos do sistema";
-$a->strings["New connections"] = "Novas conexões";
-$a->strings["System Registrations"] = "Registros no sistema";
-$a->strings["Also show new wall posts, private messages and connections under Notices"] = "Também mostra novos textos, mensagens privadas e conexões nos Avisos";
-$a->strings["Notify me of events this many days in advance"] = "Notifique-me de eventos adiante esse número de dias";
-$a->strings["Must be greater than 0"] = "Deve ser maior que 0";
$a->strings["Advanced Account/Page Type Settings"] = "Configurações avançadas de conta/tipo de página";
$a->strings["Change the behaviour of this account for special situations"] = "Mudar o comportamento dessa conta em situações especiais";
$a->strings["Please enable expert mode (in <a href=\"settings/features\">Settings > Additional features</a>) to adjust!"] = "Por favor, habilite o modo expert (em <a href=\"settings/features\">Configurações > Recursos adicionais</a>) para ajustar!";
$a->strings["Miscellaneous Settings"] = "Configurações miscelâneas";
$a->strings["Personal menu to display in your channel pages"] = "Menu pessoal para exibir nas páginas dos seus canais";
-$a->strings["Remove Channel"] = "Remover canal";
-$a->strings["Remove this channel."] = "Remover este canal";
-$a->strings["Xchan Lookup"] = "Encontrar Xchan";
-$a->strings["Lookup xchan beginning with (or webbie): "] = "Encontrar xchan iniciado por (ou webbie):";
-$a->strings["Not found."] = "Não encontrado.";
+$a->strings["Remove this channel"] = "Remover este canal";
+$a->strings["Poke/Prod"] = "Cutucar/Espetar";
+$a->strings["poke, prod or do other things to somebody"] = "Cutucar, espetar ou fazer outras coisas a alguém";
+$a->strings["Recipient"] = "Destinatário";
+$a->strings["Choose what you wish to do to recipient"] = "Escolha o que você deseja fazer com seu alvo";
+$a->strings["Make this post private"] = "Torne esta publicação privada";
$a->strings["Authorize application connection"] = "Autorizar a conexão com a aplicação";
$a->strings["Return to your app and insert this Securty Code:"] = "Volte para a sua aplicação e digite este código de segurança:";
$a->strings["Please login to continue."] = "Por favor, autentique-se para continuar.";
$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Deseja autorizar esta aplicação a acessar suas publicações e contatos e/ou criar novas publicações para você?";
-$a->strings["Page Title"] = "Título da Página";
-$a->strings["Channel added."] = "Canal adicionado.";
-$a->strings["Tag removed"] = "A etiqueta foi removida";
-$a->strings["Remove Item Tag"] = "Remover a etiqueta de item";
-$a->strings["Select a tag to remove: "] = "Selecione uma etiqueta para remover: ";
-$a->strings["Remove"] = "Remover";
-$a->strings["Continue"] = "Continuar";
-$a->strings["Premium Channel Setup"] = "Configuração de canal premium";
-$a->strings["Enable premium channel connection restrictions"] = "Habilitar restrições de canal premium para conexão";
-$a->strings["Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc."] = "Por favor, insira suas restrições ou condições, como um recibo de depósito, normas de conduta, etc.";
-$a->strings["This channel may require additional steps or acknowledgement of the following conditions prior to connecting:"] = "Este canal pode exigir passos adicionais ou compreensão das seguintes condições antes de conectar:";
-$a->strings["Potential connections will then see the following text before proceeding:"] = "Tentativas de conexões verão então o seguinte texto antes de prosseguir:";
-$a->strings["By continuing, I certify that I have complied with any instructions provided on this page."] = "Ao prosseguir, eu certifico que cumpri todas as instruções exibidas nesta página.";
-$a->strings["(No specific instructions have been provided by the channel owner.)"] = "(Nenhuma instrução foi especificada pelo dono do canal.)";
-$a->strings["Restricted or Premium Channel"] = "Canal restrito ou premium";
-$a->strings["Thing updated"] = "A coisa foi atualizada";
-$a->strings["Object store: failed"] = "Armazenamento do objeto: falhou";
-$a->strings["Thing added"] = "A coisa foi adicionada";
-$a->strings["OBJ: %1\$s %2\$s %3\$s"] = "OBJ: %1\$s %2\$s %3\$s";
-$a->strings["Show Thing"] = "Exibir coisa";
-$a->strings["item not found."] = "o item não foi encontrado";
-$a->strings["Edit Thing"] = "Editar coisa";
-$a->strings["Select a profile"] = "Selecione um perfil";
-$a->strings["Post an activity"] = "Publique uma atividade";
-$a->strings["Only sends to viewers of the applicable profile"] = "Envia apenas para a audiência do perfil aplicável";
-$a->strings["Name of thing e.g. something"] = "Nome da coisa e.g. coisinha";
-$a->strings["URL of thing (optional)"] = "URL da coisa (opcional)";
-$a->strings["URL for photo of thing (optional)"] = "URL para foto da coisa (opcional)";
-$a->strings["Add Thing to your Profile"] = "Adicionar a coisa ao seu perfil";
+$a->strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "Autenticação remota bloqueada. Você está autenticado neste site localmente. Por favor, saia e tente novamente.";
+$a->strings["Welcome %s. Remote authentication successful."] = "Bem vindo %s. Autenticação remota realizada com sucesso.";
$a->strings["Item not available."] = "O item não está disponível.";
$a->strings["Fetching URL returns error: %1\$s"] = "Carregar o URL retorna o erro: %1\$s";
$a->strings["\$Projectname"] = "\$Projectname";
@@ -1177,10 +1401,98 @@ $a->strings["Rate this hub"] = "Avalie esse hub.";
$a->strings["Site URL"] = "URL do site";
$a->strings["Access Type"] = "Tipo de acesso";
$a->strings["Registration Policy"] = "Política de registro";
-$a->strings["Location"] = "Localização";
-$a->strings["View hub ratings"] = "Ver avaliações do hub";
-$a->strings["Rate"] = "Avalie";
-$a->strings["View ratings"] = "Veja avaliações";
+$a->strings["You must be logged in to see this page."] = "Você precisa estar autenticado para ver esta página.";
+$a->strings["Insufficient permissions. Request redirected to profile page."] = "Permissões insuficientes. Requisição redirecionada para a página de perfil.";
+$a->strings["Select a bookmark folder"] = "Escolha uma pasta de links onde guardar";
+$a->strings["Save Bookmark"] = "Guardar link";
+$a->strings["URL of bookmark"] = "URL do link guardado";
+$a->strings["Description"] = "Descrição";
+$a->strings["Or enter new bookmark folder name"] = "Ou digite o nome para uma nova pasta de links";
+$a->strings["Room not found"] = "Sala não encontrada";
+$a->strings["Leave Room"] = "Sair da sala";
+$a->strings["Delete This Room"] = "Deletar esta sala";
+$a->strings["I am away right now"] = "Eu estou ausente no momento";
+$a->strings["I am online"] = "Eu estou online";
+$a->strings["Bookmark this room"] = "Guarde esta sala";
+$a->strings["New Chatroom"] = "Nova sala de bate-papo";
+$a->strings["Chatroom Name"] = "Nome da sala de bate-papo";
+$a->strings["%1\$s's Chatrooms"] = "Salas de bate-papo de %1\$s";
+$a->strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = "Número máximo de novos registros neste site excedido por hoje. Por favor, tente novamente amanhã.";
+$a->strings["Please indicate acceptance of the Terms of Service. Registration failed."] = "Por favor, indique a aceitação dos Termos de Serviço. Falha ao registrar.";
+$a->strings["Passwords do not match."] = "Senhas não conferem.";
+$a->strings["Registration successful. Please check your email for validation instructions."] = "O registro foi bem sucedido. Por favor, verifique seu e-mail para confirmar o registro.";
+$a->strings["Your registration is pending approval by the site owner."] = "A aprovação do seu registro está pendente junto ao administrador do site.";
+$a->strings["Your registration can not be processed."] = "Não foi possível processar o seu registro.";
+$a->strings["Registration on this site/hub is by approval only."] = "O registro neste site/hub requer aprovação.";
+$a->strings["<a href=\"pubsites\">Register at another affiliated site/hub</a>"] = "<a href=\"pubsites\">Registre em um outro site/hub afiliado</a>";
+$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Este site excedeu o número máximo de registros de novas contas. Por favor, tente novamente amanhã.";
+$a->strings["Terms of Service"] = "Termos de Serviço";
+$a->strings["I accept the %s for this website"] = "Eu aceito os %s deste website.";
+$a->strings["I am over 13 years of age and accept the %s for this website"] = "Eu sou maior de 13 anos e aceito os %s deste website";
+$a->strings["Registration"] = "Registro";
+$a->strings["Membership on this site is by invitation only."] = "Novas contas neste site se dão apenas por convite.";
+$a->strings["Please enter your invitation code"] = "Por favor, digite o código do seu convite";
+$a->strings["Your email address"] = "Seu endereço de e-mail";
+$a->strings["Choose a password"] = "Escolha uma senha";
+$a->strings["Please re-enter your password"] = "Por favor, digite sua senha novamente";
+$a->strings["Away"] = "Ausente";
+$a->strings["Online"] = "Online";
+$a->strings["Please login."] = "Por favor, autentique-se.";
+$a->strings["Hubzilla - Guests: Username: {your email address}, Password: +++"] = "Hubzilla - Visitantes: Usuário: {seu endereço de e-mail}, Senha: +++";
+$a->strings["Channel removals are not allowed within 48 hours of changing the account password."] = "A remoção da canais fica desabilitada por 48 horas após uma troca de senha da conta.";
+$a->strings["Remove This Channel"] = "Remover este canal";
+$a->strings["This will completely remove this channel from the network. Once this has been done it is not recoverable."] = "Isso irá remover completamente este canal da rede. Uma vez que seja feito não será possível recuperá-lo.";
+$a->strings["Please enter your password for verification:"] = "Por favor, digite a sua senha para verificação:";
+$a->strings["Remove this channel and all its clones from the network"] = "Remover este canal e todos os seus clones da rede";
+$a->strings["By default only the instance of the channel located on this hub will be removed from the network"] = "Por padrão, apenas a instância do canal localizada neste hub será removida da rede";
+$a->strings["Remove Channel"] = "Remover canal";
+$a->strings["No channel."] = "Nenhum canal.";
+$a->strings["Common connections"] = "Conexões em comum";
+$a->strings["No connections in common."] = "Nenhuma conexão em comum.";
+$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Encontramos um problema ao entrar com a OpenID fornecida. Por favor, verifique se digitou corretamente a ID.";
+$a->strings["The error message was:"] = "A mensagem de erro foi:";
+$a->strings["Authentication failed."] = "A autenticação falhou.";
+$a->strings["Remote Authentication"] = "Autenticação remota";
+$a->strings["Enter your channel address (e.g. channel@example.com)"] = "Entre o endereço do seu canal (e.g. canal@exemplo.com)";
+$a->strings["Authenticate"] = "Autenticar";
+$a->strings["Continue"] = "Continuar";
+$a->strings["Premium Channel Setup"] = "Configuração de canal premium";
+$a->strings["Enable premium channel connection restrictions"] = "Habilitar restrições de canal premium para conexão";
+$a->strings["Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc."] = "Por favor, insira suas restrições ou condições, como um recibo de depósito, normas de conduta, etc.";
+$a->strings["This channel may require additional steps or acknowledgement of the following conditions prior to connecting:"] = "Este canal pode exigir passos adicionais ou compreensão das seguintes condições antes de conectar:";
+$a->strings["Potential connections will then see the following text before proceeding:"] = "Tentativas de conexões verão então o seguinte texto antes de prosseguir:";
+$a->strings["By continuing, I certify that I have complied with any instructions provided on this page."] = "Ao prosseguir, eu certifico que cumpri todas as instruções exibidas nesta página.";
+$a->strings["(No specific instructions have been provided by the channel owner.)"] = "(Nenhuma instrução foi especificada pelo dono do canal.)";
+$a->strings["Restricted or Premium Channel"] = "Canal restrito ou premium";
+$a->strings["No such group"] = "Este grupo não existe";
+$a->strings["Search Results For:"] = "Resultados da busca por:";
+$a->strings["Collection is empty"] = "A coleção está vazia";
+$a->strings["Collection: "] = "Coleção:";
+$a->strings["Connection: "] = "Conexão:";
+$a->strings["Invalid connection."] = "Conexão inválida.";
+$a->strings["Could not access contact record."] = "Não foi possível acessar o registro do contato.";
+$a->strings["Could not locate selected profile."] = "Não foi possível localizar o perfil selecionado.";
+$a->strings["Connection updated."] = "A conexão foi atualizada.";
+$a->strings["Failed to update connection record."] = "Não foi possível atualizar o registro da conexão.";
+$a->strings["Blocked"] = "Bloqueado";
+$a->strings["Ignored"] = "Ignorado";
+$a->strings["Hidden"] = "Oculto";
+$a->strings["Archived"] = "Arquivado";
+$a->strings["All"] = "Todos";
+$a->strings["Suggest new connections"] = "Sugerir novas conexões";
+$a->strings["New Connections"] = "Novas conexões";
+$a->strings["Show pending (new) connections"] = "Exibir conexões pendentes (novas)";
+$a->strings["Show all connections"] = "Exibir todas as conexões";
+$a->strings["Unblocked"] = "Não bloqueado";
+$a->strings["Only show unblocked connections"] = "Exibir apenas conexões não bloqueadas";
+$a->strings["Only show blocked connections"] = "Exibir apenas conexões bloqueadas";
+$a->strings["Only show ignored connections"] = "Exibir apenas conexões ignoradas";
+$a->strings["Only show archived connections"] = "Exibir apenas conexões arquivadas";
+$a->strings["Only show hidden connections"] = "Exibir apenas conexões ocultas";
+$a->strings["%1\$s [%2\$s]"] = "%1\$s [%2\$s]";
+$a->strings["Edit connection"] = "Editar conexão";
+$a->strings["Search your connections"] = "Pesquisar em suas conexões";
+$a->strings["Finding: "] = "Pesquisando: ";
$a->strings["Edit post"] = "Editar a publicação";
$a->strings["\$Projectname channel"] = "Canal na \$Projectname";
$a->strings["Collection created."] = "A coleção foi criada.";
@@ -1213,9 +1525,10 @@ $a->strings["Could not connect to database."] = "Não foi possível conectar ao
$a->strings["Could not connect to specified site URL. Possible SSL certificate or DNS issue."] = "Não foi possível conectar à URL especificada para o site. Provavlmente um problema de DNS ou com o certificado SSL.";
$a->strings["Could not create table."] = "Não foi possível criar a tabela.";
$a->strings["Your site database has been installed."] = "O banco de dados do seu site foi instalado.";
-$a->strings["You may need to import the file \"install/schema_xxx.sql\" manually using a database client."] = "Você pode precisar importar o arquivo \"install/schema_xxx.sql\" manualmente usando um cliente do banco de dados.";
+$a->strings["You may need to import the file \"install/database.sql\" manually using phpmyadmin or mysql."] = "Pode ser que você precise importar o arquivo \"install/database.sql\" manualmente, usando o phpmyadmin or mysql.";
$a->strings["Please see the file \"install/INSTALL.txt\"."] = "Por favor, veja o arquivo \"install/INSTALL.txt\".";
$a->strings["System check"] = "Checagem do sistema";
+$a->strings["Next"] = "Próximo";
$a->strings["Check again"] = "Cheque novamente";
$a->strings["Database connection"] = "Conexão ao banco de dados";
$a->strings["In order to install \$Projectname we need to know how to connect to your database."] = "Para instalar a \$Projectname é necessário saber como se conectar ao seu banco de dados.";
@@ -1228,7 +1541,6 @@ $a->strings["Communication port number - use 0 for default"] = "Número da porta
$a->strings["Database Login Name"] = "Nome do usuário do banco de dados";
$a->strings["Database Login Password"] = "Senha do usuário do banco de dados";
$a->strings["Database Name"] = "Nome do banco de dados";
-$a->strings["Database Type"] = "Tipo do banco de dados";
$a->strings["Site administrator email address"] = "Endereço de email do administrador do site";
$a->strings["Your account email address must match this in order to use the web admin panel."] = "O endereço de email da sua conta deve ser igual a este para que você possa utilizar o painel de administração web.";
$a->strings["Website URL"] = "URL do website";
@@ -1249,7 +1561,7 @@ $a->strings["Generate encryption keys"] = "Gerar chaves de criptografia";
$a->strings["libCurl PHP module"] = "Módulo PHP libCurl";
$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 'mysqli' ou 'postgres' do PHP";
+$a->strings["mysqli PHP module"] = "Módulo PHP mysqli";
$a->strings["mb_string PHP module"] = "Módulo PHP mb_string ";
$a->strings["mcrypt PHP module"] = "Módulo PHP mcrypt";
$a->strings["Apache mod_rewrite module"] = "Módulo mod_rewrite do Apache";
@@ -1259,10 +1571,10 @@ $a->strings["Error: proc_open is required but is either not installed or has bee
$a->strings["Error: libCURL PHP module required but not installed."] = "Erro: o módulo libCURL do PHP é necessário, mas não está instalado.";
$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Erro: o módulo gráfico GD, com suporte a JPEG, do PHP é necessário, mas não está instalado.";
$a->strings["Error: openssl PHP module required but not installed."] = "Erro: o módulo openssl do PHP é necessário, mas não está instalado.";
-$a->strings["Error: mysqli or postgres PHP module required but neither are installed."] = "Erro: módulo 'mysqli' ou 'postgres' do PHP é necessário mas nenhum deles está instalado.";
+$a->strings["Error: mysqli PHP module required but not installed."] = "Erro: o módulo mysqli do PHP é necessário, mas não está instalado.";
$a->strings["Error: mb_string PHP module required but not installed."] = "Erro: o módulo mb_string do PHP é necessário, mas não está instalado.";
$a->strings["Error: mcrypt PHP module required but not installed."] = "Erro: o módulo mcrypt do PHP é necessário, mas não 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."] = "O instalador web precisa criar um arquivo chamado \".htconfig.php\" na pasta raiz da instalação e não está conseguindo.";
+$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."] = "O instalador web precisa criar um arquivo chamado \".htconfig.php\" na pasta raiz da instalação e não está conseguindo.";
$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."] = "Geralmente isso está relacionado às definições de permissão, uma vez que o servidor web pode não estar conseguindo escrever os arquivos nesta pasta.";
$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."] = "Ao final desse procedimento, será fornecido um texto que deverá ser salvo em um arquivo de nome .htconfig.php, na pasta raiz do seu Red.";
$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"install/INSTALL.txt\" for instructions."] = "Você também pode pular esse procedimento e executar uma instalação manual. Por favor, dê uma olhada no arquivo \"install/INSTALL.TXT\" para instruções.";
@@ -1281,7 +1593,7 @@ $a->strings["If your certificate is not recognized, members of other sites (who
$a->strings["This can cause usability issues elsewhere (not just on your own site) so we must insist on this requirement."] = "Isso pode causar problemas de usabilidade (não só no seu site) então nós precisamos insistir nesse requisito.";
$a->strings["Providers are available that issue free certificates which are browser-valid."] = "Existem provedores que disponibilizam gratuitamente certificados reconhecidos por navegadores.";
$a->strings["SSL certificate validation"] = "Validação do certificado SSL";
-$a->strings["Url rewrite in .htaccess is not working. Check your server configuration.Test: "] = "A reescrita de URLs não está funcionando no .htaccess. Verifique as configurações do servidor. Teste:";
+$a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = "A reescrita de URLs não está funcionando no .htaccess. Verifique as configurações do servidor.";
$a->strings["Url rewrite is working"] = "A reescrita de URLs está funcionando";
$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."] = "Não foi possível gravar o arquivo de configuração \".htconfig.php\". Por favor, use o texto incluso para criar um arquivo de configuração na raiz da instalação do Friendika em seu servidor web.";
$a->strings["Errors encountered creating database tables."] = "Foram encontrados erros durante a criação das tabelas do banco de dados.";
@@ -1373,69 +1685,9 @@ $a->strings["Edit System Page Description"] = "Editar descrição de página do
$a->strings["Layout not found."] = "Layout não encontrado.";
$a->strings["Module Name:"] = "Nome do módulo:";
$a->strings["Layout Help"] = "Ajuda de layout";
-$a->strings["- select -"] = "- selecionar -";
-$a->strings["Your service plan only allows %d channels."] = "Seu plano de serviço permite apenas %d canais.";
-$a->strings["Nothing to import."] = "Nada a importar.";
-$a->strings["Unable to download data from old server"] = "Não foi possível descarregar os dados do servidor antigo";
-$a->strings["Imported file is empty."] = "O arquivo importado está vazio.";
-$a->strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "Não foi possível criar um identificador de canal duplicado neste sistema. A importação falhou.";
-$a->strings["Unable to create a unique channel address. Import failed."] = "Não foi possível criar um endereço de canal único. Importação falhou.";
-$a->strings["Channel clone failed. Import failed."] = "Clonagem do canal falhou. A importação falhou.";
-$a->strings["Cloned channel not found. Import failed."] = "Canal a clonar não encontrado. A importação falhou.";
-$a->strings["Import completed."] = "A importação foi completada.";
-$a->strings["You must be logged in to use this feature."] = "Você precisa estar autenticado para usar este recurso.";
-$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. Only identity and connections/relationships will be imported. Importation of content is not yet available."] = "Use este formulário para importar um canal existente de um servidor/hub diferente. Você pode obter a identidade do canal do servidor/hub antigo pela rede, ou fornecer um arquivo de exportação. Somente a identidade e as conexões/relacionamentos serão importados. Importação de conteúdos ainda não está disponível.";
-$a->strings["File to Upload"] = "Arquivo a carregar";
-$a->strings["Or provide the old server/hub details"] = "Ou forneça os detalhes do antigo servidor/hub";
-$a->strings["Your old identity address (xyz@example.com)"] = "O endereço da sua velha identidade (xyz@exemplo.com)";
-$a->strings["Your old login email address"] = "O endereço de e-mail da sua antiga conta";
-$a->strings["Your old login password"] = "A senha dua sua antiga conta";
-$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 qualquer das opções, por favor escolha se deseja fazer deste hub seu novo endereço primário, ou se o velho local deve continuar com esse papel. Você será capaz de publicar a partir de ambos os locais, mas somente um pode estar designado como local primário para arquivos, fotos e mídia.";
-$a->strings["Make this hub my primary location"] = "Faça deste hub meu local primário";
-$a->strings["Import existing posts if possible"] = "Importar publicações existentes se possível";
-$a->strings["Item not found"] = "O item não foi encontrado";
$a->strings["Edit Layout"] = "Editar layout";
$a->strings["Delete layout?"] = "Deletar layout?";
-$a->strings["Insert YouTube video"] = "Inserir vídeo do YouTube";
-$a->strings["Insert Vorbis [.ogg] video"] = "Inserir vídeo Vorbis (.ogg)";
-$a->strings["Insert Vorbis [.ogg] audio"] = "Inserir áudio Vorbis (.ogg)";
-$a->strings["Layout Description (Optional)"] = "Descrição do Layout. (Opcional)";
-$a->strings["Layout Name"] = "Nome do layout";
-$a->strings["You must be logged in to see this page."] = "Você precisa estar autenticado para ver esta página.";
-$a->strings["Room not found"] = "Sala não encontrada";
-$a->strings["Leave Room"] = "Sair da sala";
-$a->strings["Delete This Room"] = "Deletar esta sala";
-$a->strings["I am away right now"] = "Eu estou ausente no momento";
-$a->strings["I am online"] = "Eu estou online";
-$a->strings["Bookmark this room"] = "Guarde esta sala";
-$a->strings["New Chatroom"] = "Nova sala de bate-papo";
-$a->strings["Chatroom Name"] = "Nome da sala de bate-papo";
-$a->strings["%1\$s's Chatrooms"] = "Salas de bate-papo de %1\$s";
-$a->strings["Delete webpage?"] = "Deletar página web?";
-$a->strings["Page link title"] = "Título do link da página";
-$a->strings["Edit Webpage"] = "Editar página web";
-$a->strings["This directory server requires an access token"] = "O servidor deste diretório requer um token de acesso";
-$a->strings["No valid account found."] = "Não foi encontrada uma conta válida.";
-$a->strings["Password reset request issued. Check your email."] = "A solicitação de restauração de senha foi encaminhada. Verifique seu e-mail.";
-$a->strings["Site Member (%s)"] = "Membro do site (%s)";
-$a->strings["Password reset requested at %s"] = "Foi feita uma solicitação de restauração de senha em %s";
-$a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "Não foi possível verificar a solicitação (você pode tê-la submetido anteriormente). A senha não foi restaurada.";
-$a->strings["Password Reset"] = "Reiniciar a senha";
-$a->strings["Your password has been reset as requested."] = "Sua senha foi restaurada, conforme solicitado.";
-$a->strings["Your new password is"] = "Sua nova senha é";
-$a->strings["Save or copy your new password - and then"] = "Salve ou copie a sua nova senha e, então";
-$a->strings["click here to login"] = "clique aqui para entrar";
-$a->strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "Sua senha pode ser alterada na página de <em>Configurações</em> após você entrar em sua conta.";
-$a->strings["Your password has changed at %s"] = "Sua senha foi modificada em %s";
-$a->strings["Forgot your Password?"] = "Esqueceu a sua senha?";
-$a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Digite o seu endereço de e-mail e clique em 'Restaurar' para prosseguir com a restauração da sua senha. Após isso, verifique seu e-mail para mais instruções.";
-$a->strings["Email Address"] = "Endereço de e-mail";
-$a->strings["Reset"] = "Restaurar";
-$a->strings["Website:"] = "Sítio web:";
-$a->strings["Remote Channel [%s] (not yet known on this site)"] = "Canal Remoto [%s] (ainda não conhecido neste sítio)";
-$a->strings["Rating (this information is public)"] = "Avaliações (essa informação é pública)";
-$a->strings["Optionally explain your rating (this information is public)"] = "Opcionalmente justifique sua avaliação (essa informação é pública)";
+$a->strings["Delete Layout"] = "Deletar layout";
$a->strings["Item is not editable"] = "O item não está editável";
$a->strings["Delete item?"] = "Deletar item?";
$a->strings["Total invitation limit exceeded."] = "Foi excedido o número total de convites.";
@@ -1479,30 +1731,25 @@ $a->strings["Edit Source"] = "Editar fonte";
$a->strings["Delete Source"] = "Deletar fonte";
$a->strings["Source removed"] = "A fonte foi removida.";
$a->strings["Unable to remove source."] = "Não foi possível remover a fonte.";
-$a->strings["Unable to update menu."] = "Não foi possível atualizar o menu.";
-$a->strings["Unable to create menu."] = "Não foi possível criar o menu.";
-$a->strings["Menu Name"] = "Nome do Menu";
-$a->strings["Unique name (not visible on webpage) - required"] = "Nome único (não visível na página web) - necessário";
-$a->strings["Menu Title"] = "Título do Menu";
-$a->strings["Visible on webpage - leave empty for no title"] = "Visível na Página web - Deixe vazio para nenhum título";
-$a->strings["Allow Bookmarks"] = "Permite Favoritos";
-$a->strings["Menu may be used to store saved bookmarks"] = "O menu pode ser utilizado para armazenar links guardados";
-$a->strings["Submit and proceed"] = "Envie e Prossiga";
-$a->strings["Drop"] = "Descartar";
-$a->strings["Bookmarks allowed"] = "Permitindo guardar links";
-$a->strings["Delete this menu"] = "Deletar este menu";
-$a->strings["Edit menu contents"] = "Editar os conteúdos do menu";
-$a->strings["Edit this menu"] = "Editar este menu";
-$a->strings["Menu could not be deleted."] = "Não foi possível deletar o menu.";
-$a->strings["Menu not found."] = "O menu não foi encontrado.";
-$a->strings["Edit Menu"] = "Editar menu";
-$a->strings["Add or remove entries to this menu"] = "Adicionar ou remover entradas deste menu";
-$a->strings["Menu name"] = "Nome do menu";
-$a->strings["Must be unique, only seen by you"] = "Deve ser único, exibido somente para você";
-$a->strings["Menu title"] = "Título do menu";
-$a->strings["Menu title as seen by others"] = "Título do menu quando visto por outros";
-$a->strings["Allow bookmarks"] = "Habilitar links guardados";
-$a->strings["Modify"] = "Modificar";
+$a->strings["- select -"] = "- selecionar -";
+$a->strings["Event title and start time are required."] = "O título do evento e a hora de início são obrigatórios.";
+$a->strings["Event not found."] = "Evento não encontrado.";
+$a->strings["l, F j"] = "l, F j";
+$a->strings["Edit event"] = "Editar o evento";
+$a->strings["Create New Event"] = "Criar um novo evento";
+$a->strings["Previous"] = "Anterior";
+$a->strings["hour:minute"] = "hora:minuto";
+$a->strings["Event details"] = "Detalhes do evento";
+$a->strings["Format is %s %s."] = "O formato é %s %s.";
+$a->strings["Starting date and Title are required."] = "Data de início e título são obrigatórios.";
+$a->strings["Event Starts:"] = "Início do evento:";
+$a->strings["Required"] = "Obrigatório";
+$a->strings["Finish date/time is not known or not relevant"] = "A data/hora de término não é conhecida ou não é relevante";
+$a->strings["Event Finishes:"] = "Término do evento:";
+$a->strings["Adjust for viewer timezone"] = "Ajustar para o fuso horário do visualizador";
+$a->strings["Description:"] = "Descrição:";
+$a->strings["Title:"] = "Título:";
+$a->strings["Share this event"] = "Compartilhar este evento";
$a->strings["Permission Denied."] = "Permissão negada.";
$a->strings["File not found."] = "O arquivo não foi encontrado.";
$a->strings["Edit file permissions"] = "Editar permissões do arquivo";
@@ -1511,9 +1758,8 @@ $a->strings["Include all files and sub folders"] = "Incluir todos os arquivos e
$a->strings["Return to file list"] = "Retornar à lista de arquivos";
$a->strings["Copy/paste this code to attach file to a post"] = "Copiar/colar este código para anexar um arquivo a uma publicação";
$a->strings["Copy/paste this URL to link file from a web page"] = "Copiar/colar este URL para linkar para o arquivo em uma página web";
-$a->strings["Share this file"] = "Compartilhe esse arquivo";
-$a->strings["Show URL to this file"] = "Mostre URL para esse arquivo";
-$a->strings["Notify your contacts about this file"] = "Notifique seus contatos sobre esse arquivo";
+$a->strings["Channel added."] = "Canal adicionado.";
+$a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s está acompanhando %3\$s de %2\$s";
$a->strings["Contact not found."] = "O contato não foi encontrado.";
$a->strings["Friend suggestion sent."] = "Sugestão de amizade enviada.";
$a->strings["Suggest Friends"] = "Sugerir amigos";
@@ -1631,36 +1877,26 @@ $a->strings["Accounts"] = "Contas";
$a->strings["Channels"] = "Canais";
$a->strings["Plugins"] = "Plugins";
$a->strings["Themes"] = "Temas";
-$a->strings["Inspect queue"] = "Inspecione fila";
+$a->strings["Server"] = "Servidor";
$a->strings["Profile Config"] = "Configuração de perfis";
$a->strings["DB updates"] = "Atualizações do Banco de Dados";
$a->strings["Logs"] = "Logs";
$a->strings["Plugin Features"] = "Recursos dos plugins";
$a->strings["User registrations waiting for confirmation"] = "Registros de usuário aguardando confirmação";
-$a->strings["# Accounts"] = "# Contas";
-$a->strings["# blocked accounts"] = "# Contas bloqueadas";
-$a->strings["# expired accounts"] = "# Contas expiradas";
-$a->strings["# expiring accounts"] = "#contas expirando";
-$a->strings["# Channels"] = "# Canais";
-$a->strings["# primary"] = "# Primário";
-$a->strings["# clones"] = "# clones";
$a->strings["Message queues"] = "Filas de mensagem";
$a->strings["Administration"] = "Administração";
$a->strings["Summary"] = "Resumo";
-$a->strings["Registered accounts"] = "Contas Registradas";
+$a->strings["Registered users"] = "Usuários registrados";
$a->strings["Pending registrations"] = "Registros pendentes";
-$a->strings["Registered channels"] = "Canais Registrados";
-$a->strings["Active plugins"] = "Plugins ativos";
$a->strings["Version"] = "Versão";
+$a->strings["Active plugins"] = "Plugins ativos";
$a->strings["Site settings updated."] = "As configurações de site foram atualizadas.";
-$a->strings["experimental"] = "experimental";
-$a->strings["unsupported"] = "não suportado";
+$a->strings["No special theme for accessibility"] = "Sem tema especial para acessibilidade";
$a->strings["Yes - with approval"] = "Sim - pendente aprovação";
$a->strings["My site is not a public server"] = "Meu site não é um servidor público";
$a->strings["My site has paid access only"] = "Meu site oferece somente acesso pago";
$a->strings["My site has free access only"] = "Meu site oferece somente acesso gratuito";
$a->strings["My site offers free accounts with optional paid upgrades"] = "Meu site oferece contas gratuitas com recursos adicionais pagos";
-$a->strings["Registration"] = "Registro";
$a->strings["File upload"] = "Carregamento de arquivos";
$a->strings["Policies"] = "Políticas";
$a->strings["Site name"] = "Nome do site";
@@ -1672,6 +1908,8 @@ $a->strings["System theme"] = "Tema do sistema";
$a->strings["Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"] = "Tema padrão do sistema - pode ser sobrescrito por perfis de usuário - <a href='#' id='cnftheme'>mudar configurações do tema</a>";
$a->strings["Mobile system theme"] = "Tema do sistema móvel";
$a->strings["Theme for mobile devices"] = "Tema para dispositivos móveis";
+$a->strings["Accessibility system theme"] = "Tema do sistema acessível";
+$a->strings["Accessibility theme"] = "Tema acessível";
$a->strings["Enable Diaspora Protocol"] = "Habilitar protocolo Diaspora";
$a->strings["Communicate with Diaspora and Friendica - experimental"] = "Comunicar com Diaspora e Friendica - experimental";
$a->strings["Allow Feeds as Connections"] = "Permitir Feeds como conexões";
@@ -1688,8 +1926,6 @@ $a->strings["Allowed friend domains"] = "Domínios permitidos para amigos";
$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 vírgulas, de domínios permitidos para estabelecer amizades com este site. <em>Wildcards</em> são aceitas. Vazio para permitir qualquer domínio";
$a->strings["Allowed email domains"] = "Domínios permitidos de e-mail";
$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 vírgulas, de domínios permitidos em endereços de e-mail para registros nesse site. <em>Wildcards</em> são aceitas. Vazio para permitir qualquer domínio";
-$a->strings["Not allowed email domains"] = "Não permitido domínios de e-mail";
-$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 de domínios separadas por vírgulas, que não são permitidos em endereços de e-mail para inscrições para este sítio. Curingas são aceitos. Deixe vazio para permitir quaisquer domínios, a menos que domínios permitidos tenham sido definidos.";
$a->strings["Block public"] = "Bloquear público";
$a->strings["Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."] = "Marque para bloquear o acesso público a todas as páginas pessoais que seriam públicas, a não ser que se esteja autenticado.";
$a->strings["Verify Email Addresses"] = "Verificar endereços de email";
@@ -1710,14 +1946,11 @@ $a->strings["Poll interval"] = "Intervalo de coleta";
$a->strings["Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval."] = "Atrase os processos de coleta em segundo plano por este número de segundos para reduzir a carga do sistema. Se 0, use o intervalo de entrega.";
$a->strings["Maximum Load Average"] = "Carga média máxima";
$a->strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Carga máxima do sistema antes de adiar processos de entrega e coleta - padrão 50.";
-$a->strings["Expiration period in days for imported (matrix/network) content"] = "Período de expiração em dias para importação de conteúdo (rede/matriz)";
-$a->strings["0 for no expiration of imported content"] = "0 para nunca expirar o conteúdo importado";
$a->strings["No server found"] = "Nenhum servidor foi encontrado";
$a->strings["ID"] = "ID";
$a->strings["for channel"] = "para o canal";
$a->strings["on server"] = "no servidor";
$a->strings["Status"] = "Status";
-$a->strings["Server"] = "Servidor";
$a->strings["Update has been marked successful"] = "A atualização foi designada bem sucedida";
$a->strings["Executing %s failed. Check system logs."] = "Execução de %s falhou. Verifique os logs do sistema.";
$a->strings["Update %s was successfully applied."] = "A atualização %s foi aplicada com sucesso.";
@@ -1727,13 +1960,6 @@ $a->strings["No failed updates."] = "Nenhuma falha nas atualizações.";
$a->strings["Failed Updates"] = "Falha nas atualizações";
$a->strings["Mark success (if update was manually applied)"] = "Marque sucesso (se a atualização foi aplicada manualmente)";
$a->strings["Attempt to execute this update step automatically"] = "Tente executar este passo da atualização automaticamente";
-$a->strings["Queue Statistics"] = "Filas de Estatísticas";
-$a->strings["Total Entries"] = "Total de Entradas";
-$a->strings["Priority"] = "Prioridade";
-$a->strings["Destination URL"] = "URL de destino";
-$a->strings["Mark hub permanently offline"] = "Marque o Hub como permanentemente fora do ar";
-$a->strings["Empty queue for this hub"] = "Fila vazia para esse hub";
-$a->strings["Last known contact"] = "Último contato conhecido";
$a->strings["%s user blocked/unblocked"] = array(
0 => "%s usuário foi bloqueado/desbloqueado",
1 => "%s usuários foram bloqueados/desbloqueados",
@@ -1743,8 +1969,8 @@ $a->strings["%s user deleted"] = array(
1 => "%s usuários foram deletados",
);
$a->strings["Account not found"] = "A conta não foi encontrada";
-$a->strings["User '%s' blocked"] = "O usuário/a '%s' foi bloqueado/a";
$a->strings["User '%s' unblocked"] = "O usuário/a '%s' foi desbloqueado/a";
+$a->strings["User '%s' blocked"] = "O usuário/a '%s' foi bloqueado/a";
$a->strings["Users"] = "Usuários";
$a->strings["select all"] = "selecionar tudo";
$a->strings["User registrations waiting for confirm"] = "Registros de usuário aguardando confirmação";
@@ -1752,8 +1978,6 @@ $a->strings["Request date"] = "Data de requisição";
$a->strings["No registrations."] = "Nenhum registro.";
$a->strings["Approve"] = "Aprovar";
$a->strings["Deny"] = "Negar";
-$a->strings["Block"] = "Bloquear";
-$a->strings["Unblock"] = "Desbloquear";
$a->strings["Register date"] = "Data de registro";
$a->strings["Last login"] = "Última autenticação";
$a->strings["Expires"] = "Expira";
@@ -1804,43 +2028,76 @@ $a->strings["Help text"] = "Texto de ajuda";
$a->strings["Additional info (optional)"] = "Informações adicionais (opcional)";
$a->strings["Field definition not found"] = "A dfinição de campo não foi encontrada";
$a->strings["Edit Profile Field"] = "Editar campo de perfil";
-$a->strings["Unable to find your hub."] = "Não foi possível localizar seu hub.";
-$a->strings["Post successful."] = "Publicado com sucesso.";
-$a->strings["Edit Block"] = "Editar bloco";
-$a->strings["Delete block?"] = "Deletar bloco?";
-$a->strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = "Número máximo de novos registros neste site excedido por hoje. Por favor, tente novamente amanhã.";
-$a->strings["Please indicate acceptance of the Terms of Service. Registration failed."] = "Por favor, indique a aceitação dos Termos de Serviço. Falha ao registrar.";
-$a->strings["Passwords do not match."] = "Senhas não conferem.";
-$a->strings["Registration successful. Please check your email for validation instructions."] = "O registro foi bem sucedido. Por favor, verifique seu e-mail para confirmar o registro.";
-$a->strings["Your registration is pending approval by the site owner."] = "A aprovação do seu registro está pendente junto ao administrador do site.";
-$a->strings["Your registration can not be processed."] = "Não foi possível processar o seu registro.";
-$a->strings["Registration on this site/hub is by approval only."] = "O registro neste site/hub requer aprovação.";
-$a->strings["<a href=\"pubsites\">Register at another affiliated site/hub</a>"] = "<a href=\"pubsites\">Registre em um outro site/hub afiliado</a>";
-$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Este site excedeu o número máximo de registros de novas contas. Por favor, tente novamente amanhã.";
-$a->strings["Terms of Service"] = "Termos de Serviço";
-$a->strings["I accept the %s for this website"] = "Eu aceito os %s deste website.";
-$a->strings["I am over 13 years of age and accept the %s for this website"] = "Eu sou maior de 13 anos e aceito os %s deste website";
-$a->strings["Membership on this site is by invitation only."] = "Novas contas neste site se dão apenas por convite.";
-$a->strings["Please enter your invitation code"] = "Por favor, digite o código do seu convite";
-$a->strings["Your email address"] = "Seu endereço de e-mail";
-$a->strings["Choose a password"] = "Escolha uma senha";
-$a->strings["Please re-enter your password"] = "Por favor, digite sua senha novamente";
-$a->strings["Account removals are not allowed within 48 hours of changing the account password."] = "A remoção da conta fica desabilitada por 48 horas após uma troca de senha da conta.";
-$a->strings["Remove This Account"] = "Remover esta conta";
-$a->strings["WARNING: "] = "AVISO:";
-$a->strings["This account and all its channels will be completely removed from the network. "] = "Esta conta e todos seus canais será completamente excluída da rede.";
-$a->strings["This action is permanent and can not be undone!"] = "Esta ação é permanente e não pode ser desfeita!";
-$a->strings["Please enter your password for verification:"] = "Por favor, digite a sua senha para verificação:";
-$a->strings["Remove this account, all its channels and all its channel clones from the network"] = "Remove esta conta, todos os seus canais e todos os clones desses canais da rede.";
-$a->strings["By default only the instances of the channels located on this hub will be removed from the network"] = "Por padrão, apenas as instâncias dos canais localizadas neste hub serão removidas da rede";
+$a->strings["Thing updated"] = "A coisa foi atualizada";
+$a->strings["Object store: failed"] = "Armazenamento do objeto: falhou";
+$a->strings["Thing added"] = "A coisa foi adicionada";
+$a->strings["OBJ: %1\$s %2\$s %3\$s"] = "OBJ: %1\$s %2\$s %3\$s";
+$a->strings["Show Thing"] = "Exibir coisa";
+$a->strings["item not found."] = "o item não foi encontrado";
+$a->strings["Edit Thing"] = "Editar coisa";
+$a->strings["Select a profile"] = "Selecione um perfil";
+$a->strings["Post an activity"] = "Publique uma atividade";
+$a->strings["Only sends to viewers of the applicable profile"] = "Envia apenas para a audiência do perfil aplicável";
+$a->strings["Name of thing e.g. something"] = "Nome da coisa e.g. coisinha";
+$a->strings["URL of thing (optional)"] = "URL da coisa (opcional)";
+$a->strings["URL for photo of thing (optional)"] = "URL para foto da coisa (opcional)";
+$a->strings["Add Thing to your Profile"] = "Adicionar a coisa ao seu perfil";
+$a->strings["Your service plan only allows %d channels."] = "Seu plano de serviço permite apenas %d canais.";
+$a->strings["Nothing to import."] = "Nada a importar.";
+$a->strings["Unable to download data from old server"] = "Não foi possível descarregar os dados do servidor antigo";
+$a->strings["Imported file is empty."] = "O arquivo importado está vazio.";
+$a->strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "Não foi possível criar um identificador de canal duplicado neste sistema. A importação falhou.";
+$a->strings["Channel clone failed. Import failed."] = "Clonagem do canal falhou. A importação falhou.";
+$a->strings["Cloned channel not found. Import failed."] = "Canal a clonar não encontrado. A importação falhou.";
+$a->strings["Import completed."] = "A importação foi completada.";
+$a->strings["You must be logged in to use this feature."] = "Você precisa estar autenticado para usar este recurso.";
+$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. Only identity and connections/relationships will be imported. Importation of content is not yet available."] = "Use este formulário para importar um canal existente de um servidor/hub diferente. Você pode obter a identidade do canal do servidor/hub antigo pela rede, ou fornecer um arquivo de exportação. Somente a identidade e as conexões/relacionamentos serão importados. Importação de conteúdos ainda não está disponível.";
+$a->strings["File to Upload"] = "Arquivo a carregar";
+$a->strings["Or provide the old server/hub details"] = "Ou forneça os detalhes do antigo servidor/hub";
+$a->strings["Your old identity address (xyz@example.com)"] = "O endereço da sua velha identidade (xyz@exemplo.com)";
+$a->strings["Your old login email address"] = "O endereço de e-mail da sua antiga conta";
+$a->strings["Your old login password"] = "A senha dua sua antiga conta";
+$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 qualquer das opções, por favor escolha se deseja fazer deste hub seu novo endereço primário, ou se o velho local deve continuar com esse papel. Você será capaz de publicar a partir de ambos os locais, mas somente um pode estar designado como local primário para arquivos, fotos e mídia.";
+$a->strings["Make this hub my primary location"] = "Faça deste hub meu local primário";
+$a->strings["Import existing posts if possible"] = "Importar publicações existentes se possível";
+$a->strings["Total invitation limit exceeded."] = "Foi excedido o número total de convites.";
+$a->strings["%s : Not a valid email address."] = "%s : Não é um endereço de e-mail válido.";
+$a->strings["Please join us on Red"] = "Por favor, una-se a nós na Red";
+$a->strings["Invitation limit exceeded. Please contact your site administrator."] = "Você excedeu o limite de convites. Por favor, entre em contato com o administrador do site.";
+$a->strings["%s : Message delivery failed."] = "%s : Não foi possível enviar a mensagem.";
+$a->strings["%d message sent."] = array(
+ 0 => "%d mensagem enviada.",
+ 1 => "%d mensagens enviadas.",
+);
+$a->strings["You have no more invitations available"] = "Você não possui mais convites disponíveis";
+$a->strings["Send invitations"] = "Enviar convites.";
+$a->strings["Enter email addresses, one per line:"] = "Digite os endereços de e-mail, um por linha:";
+$a->strings["Your message:"] = "Sua mensagem:";
+$a->strings["Please join my community on Hubzilla."] = "Por favor junte-se à minha comunidade na Hubzilla";
+$a->strings["You will need to supply this invitation code: "] = "Você precisará fornecer este código de convite:";
+$a->strings["1. Register at any Hubzilla location (they are all inter-connected)"] = "1. Registre-se em qualquer site da Hubzilla (eles são todos interconectados)";
+$a->strings["2. Enter my Hubzilla network address into the site searchbar."] = "2. Entre meu endereço da rede Hubzilla na barra de busca do site.";
+$a->strings["or visit "] = "ou visite";
+$a->strings["3. Click [Connect]"] = "3. Clique [Conectar]";
$a->strings["Unable to locate original post."] = "Não foi possível localizar a publicação original.";
$a->strings["Empty post discarded."] = "A publicação em branco foi descartada.";
$a->strings["Executable content type not permitted to this channel."] = "Conteúdo de tipo executável não permitido para este canal.";
$a->strings["System error. Post not saved."] = "Erro no sistema. A publicação não foi salva.";
-$a->strings["Unable to obtain post information from database."] = "Impossível obter informação do texto no banco de dados";
$a->strings["You have reached your limit of %1$.0f top level posts."] = "Você atingiu o seu limite de %1$.0f publicações de novos tópicos.";
$a->strings["You have reached your limit of %1$.0f webpages."] = "Você atingiu o seu limite de %1$.0f páginas web.";
$a->strings["[Embedded content - reload page to view]"] = "[Conteúdo incorporado - recarregue a página para ver]";
+$a->strings["Help with this feature"] = "Ajuda com este recurso";
+$a->strings["Layout Name"] = "Nome do layout";
+$a->strings["Like/Dislike"] = "Gostar/Desgostar";
+$a->strings["This action is restricted to members."] = "Esta ação é restrita a membros.";
+$a->strings["Please <a href=\"rmagic\">login with your Hubzilla ID</a> or <a href=\"register\">register as a new Redmatrix.member</a> to continue."] = "Por favor <a href=\"rmagic\">entre com sua ID da Hubzilla</a> ou <a href=\"register\">registre-se como um novo membro da Hubzilla</a> para continuar.";
+$a->strings["Invalid request."] = "Solicitação inválida.";
+$a->strings["thing"] = "coisa";
+$a->strings["Channel unavailable."] = "Canal não disponível.";
+$a->strings["Previous action reversed."] = "Ação anterior revertida.";
+$a->strings["Action completed."] = "Ação completada.";
+$a->strings["Thank you."] = "Obrigado.";
$a->strings["Remote privacy information not available."] = "Não existe informação disponível sobre a privacidade remota.";
$a->strings["Visible to:"] = "Visível para:";
$a->strings["Comanche page description language help"] = "Página de Ajuda da descrição da Linguagem Comanche ";
@@ -1896,93 +2153,12 @@ $a->strings["Edit Menu Element"] = "Editar elemento de menu";
$a->strings["Link text"] = "Texto do link";
$a->strings["Set your current mood and tell your friends"] = "Marque seu humor atual e compartilhe com seus amigos";
$a->strings["Total votes"] = "Votos totais";
-$a->strings["Average Rating"] = "Avaliação média";
-$a->strings["Channel removals are not allowed within 48 hours of changing the account password."] = "A remoção da canais fica desabilitada por 48 horas após uma troca de senha da conta.";
-$a->strings["Remove This Channel"] = "Remover este canal";
-$a->strings["This channel will be completely removed from the network. "] = "Este canal será completamente excluído da rede.";
-$a->strings["Remove this channel and all its clones from the network"] = "Remover este canal e todos os seus clones da rede";
-$a->strings["By default only the instance of the channel located on this hub will be removed from the network"] = "Por padrão, apenas a instância do canal localizada neste hub será removida da rede";
-$a->strings["is now connected to"] = "está agora conectado a";
-$a->strings["Could not access address book record."] = "Não foi possível acessar o registro do contato.";
-$a->strings["Refresh failed - channel is currently unavailable."] = "A atualização falhou - o canal está indisponível no momento.";
-$a->strings["Channel has been unblocked"] = "O canal foi desbloqueado";
-$a->strings["Channel has been blocked"] = "O canal foi bloqueado";
-$a->strings["Unable to set address book parameters."] = "Não foi possível definir os parâmetros do contato.";
-$a->strings["Channel has been unignored"] = "O canal não está mais ignorado";
-$a->strings["Channel has been ignored"] = "O canal passou a estar ignorado";
-$a->strings["Channel has been unarchived"] = "O canal deixou o arquivo";
-$a->strings["Channel has been archived"] = "O canal foi colocado no arquivo";
-$a->strings["Channel has been unhidden"] = "O canal não está mais oculto";
-$a->strings["Channel has been hidden"] = "O canal passou a estar oculto";
-$a->strings["Channel has been approved"] = "O canal foi aprovado";
-$a->strings["Channel has been unapproved"] = "O canal deixou de estar aprovado";
-$a->strings["Connection has been removed."] = "A conexão foi removida.";
-$a->strings["View %s's profile"] = "Ver o perfil de %s";
-$a->strings["Refresh Permissions"] = "Atualizar permissões";
-$a->strings["Fetch updated permissions"] = "Buscar as permissões atualizadas";
-$a->strings["Recent Activity"] = "Atividades recentes";
-$a->strings["View recent posts and comments"] = "Exibir publicações e comentários recentes";
-$a->strings["Block (or Unblock) all communications with this connection"] = "Bloquear (desbloquear) todas as comunicações com essa conexão";
-$a->strings["Unignore"] = "Não ignorar";
-$a->strings["Ignore"] = "Ignorar";
-$a->strings["Ignore (or Unignore) all inbound communications from this connection"] = "Ignorar (desfazer) todas as entradas de comunicação desta conexão";
-$a->strings["Unarchive"] = "Não arquivar";
-$a->strings["Archive"] = "Arquivar";
-$a->strings["Archive (or Unarchive) this connection - mark channel dead but keep content"] = "Arquivar (desarquivar) essa conexão - marcar o canal como morto mas manter o conteúdo";
-$a->strings["Unhide"] = "Não ocultar";
-$a->strings["Hide"] = "Ocultar";
-$a->strings["Hide or Unhide this connection from your other connections"] = "Esconder (mostrar) essa conexão de suas outras conexões";
-$a->strings["Delete this connection"] = "Deletar esta conexão";
-$a->strings["Approve this connection"] = "Aprovar esta conexão";
-$a->strings["Accept connection to allow communication"] = "Aceite a conexão para permitir comunicação";
-$a->strings["Connections: settings for %s"] = "Conexões: configurações para %s";
-$a->strings["Apply these permissions automatically"] = "Aplicar essas permissões automaticamente";
-$a->strings["Apply the permissions indicated on this page to all new connections."] = "Aplicar as permissões indicadas nesta página para todas as novas conexões.";
-$a->strings["Slide to adjust your degree of friendship"] = "Deslize para ajustar seu grau de amizade";
-$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."] = "Permissões padrões para seu tipo de canal foram (apenas) aplicadas. Elas ainda não foram enviadas. Por favor, revise as permissões nesta página e faça as alterações desejadas neste momento. Esta nova ligação poderá <em> não </ em> ser capaz de se comunicar com você até que você envie os dados desta página, que instalará e aplicará as permissões selecionadas.";
-$a->strings["inherited"] = "herdado";
-$a->strings["Connection has no individual permissions!"] = "A conexão não tem permissões individuais!";
-$a->strings["This may be appropriate based on your <a href=\"settings\">privacy settings</a>, though you may wish to review the \"Advanced Permissions\"."] = "Isso pode ser adequado baseado nas suas <a href=\"settings\">configurações de privacidade</a>, mas talvez você queira rever suas \"Permissões Avançadas\".";
-$a->strings["Profile Visibility"] = "Visibilidade do perfil";
-$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Por favor, selecione o perfil que você gostaria de exibir para %s quando estiver visualizando seu perfil de modo seguro.";
-$a->strings["Contact Information / Notes"] = "Informações de contato / Notas";
-$a->strings["Edit contact notes"] = "Editar anotações sobre o contato";
-$a->strings["Their Settings"] = "Configurações dele/a";
-$a->strings["My Settings"] = "Minhas configurações";
-$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."] = "Permissões padrões para este tipo de canal foram (apenas) aplicadas. Elas <em> não </ em> foram salvas e não existem no momento permissões padrões armazenadas. Por favor, reveja / edite as configurações aplicadas e clique em [Enviar] para finalizar.";
-$a->strings["Clear/Disable Automatic Permissions"] = "Limpa/Desabilita permissões automáticas";
-$a->strings["Forum Members"] = "Membros de fórum";
-$a->strings["Soapbox"] = "Caixa de sabão";
-$a->strings["Full Sharing (typical social network permissions)"] = "Compartilhamento completo (permissões típicas de redes sociais)";
-$a->strings["Cautious Sharing "] = "Compartilhamento cauteloso";
-$a->strings["Follow Only"] = "Apenas seguir";
-$a->strings["Individual Permissions"] = "Permissões individuais";
-$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."] = "Algumas permissões serão herdadas das <a href=\"settings\">configurações de privacidade</a> do seu canal, e terão prioridade sobre as configurações individuais. Modificar nesta página tais configurações herdadas não surtirá efeito algum.";
-$a->strings["Advanced Permissions"] = "Permissões avançadas";
-$a->strings["Simple Permissions (select one and submit)"] = "Permissões simples (slecione uma e submeta)";
-$a->strings["Visit %s's profile - %s"] = "Ver o perfil de %s - %s";
-$a->strings["Block/Unblock contact"] = "Bloquear/desbloquear o contato";
-$a->strings["Ignore contact"] = "Ignorar o contato";
-$a->strings["Repair URL settings"] = "Reparar configurações de URL";
-$a->strings["View conversations"] = "Ver as conversas";
-$a->strings["Delete contact"] = "Excluir o contato";
-$a->strings["Last update:"] = "Última atualização:";
-$a->strings["Update public posts"] = "Atualizar publicações públicas";
-$a->strings["Update now"] = "Atualizar agora";
-$a->strings["Currently blocked"] = "Atualmente bloqueado";
-$a->strings["Currently ignored"] = "Atualmente ignorado";
-$a->strings["Currently archived"] = "Atualmente arquivado";
-$a->strings["Currently pending"] = "Atualmente pendente";
-$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Encontramos um problema ao entrar com a OpenID fornecida. Por favor, verifique se digitou corretamente a ID.";
-$a->strings["The error message was:"] = "A mensagem de erro foi:";
-$a->strings["Authentication failed."] = "A autenticação falhou.";
-$a->strings["Remote Authentication"] = "Autenticação remota";
-$a->strings["Enter your channel address (e.g. channel@example.com)"] = "Entre o endereço do seu canal (e.g. canal@exemplo.com)";
-$a->strings["Authenticate"] = "Autenticar";
+$a->strings["Average Rating"] = "Média das avaliações";
$a->strings["Unable to lookup recipient."] = "Não foi possível encontrar o destinatário.";
$a->strings["Unable to communicate with requested channel."] = "Não foi possível comunicar com o canal solicitado.";
$a->strings["Cannot verify requested channel."] = "Não foi possível verificar o canal requisitado.";
$a->strings["Selected channel has private message restrictions. Send failed."] = "O canal solicitado tem restrições a mensagens privadas. Falha no envio.";
+$a->strings["Messages"] = "Mensagens";
$a->strings["Message deleted."] = "A mensagem foi excluída.";
$a->strings["Message recalled."] = "Mensagem retirada.";
$a->strings["Send Private Message"] = "Enviar mensagem privada";
@@ -1994,21 +2170,62 @@ $a->strings["Delete message"] = "Excluir a mensagem";
$a->strings["Recall message"] = "Retirar mensagem";
$a->strings["Message has been recalled."] = "A mensagem foi retirada.";
$a->strings["Private Conversation"] = "Conversa privada";
+$a->strings["Delete conversation"] = "Excluir conversa";
$a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Comunicação segura indisponível. Você <strong>talvez</strong> consiga responder pela página de perfil do remetente.";
$a->strings["Send Reply"] = "Enviar resposta";
-$a->strings["Invalid request identifier."] = "Identificador de solicitação inválido";
-$a->strings["Discard"] = "Descartar";
-$a->strings["Please login."] = "Por favor, autentique-se.";
-$a->strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "Autenticação remota bloqueada. Você está autenticado neste site localmente. Por favor, saia e tente novamente.";
+$a->strings["You have created %1$.0f of %2$.0f allowed channels."] = "Você criou %1$.0f de %2$.0f canais permitidos.";
+$a->strings["Create a new channel"] = "Criar um novo canal";
+$a->strings["Current Channel"] = "Canal atual";
+$a->strings["Attach to one of your channels by selecting it."] = "Selecione um dos seus canais para utilizá-lo.";
+$a->strings["Default Channel"] = "Canal padrão";
+$a->strings["Make Default"] = "Tornar padrão";
+$a->strings["Wall Photos"] = "Fotos do mural";
+$a->strings["Profile Match"] = "Correspondência de perfil";
+$a->strings["No keywords to match. Please add keywords to your default profile."] = "Nenhuma palavra-chave para combinar. Por favor, adicione palavras-chave ao seu perfil padrão.";
+$a->strings["is interested in:"] = "se interessa por:";
+$a->strings["No matches"] = "Nenhuma correspondência";
+$a->strings["Menu updated."] = "Menu atualizado.";
+$a->strings["Unable to update menu."] = "Não foi possível atualizar o menu.";
+$a->strings["Menu created."] = "O menu foi criado.";
+$a->strings["Unable to create menu."] = "Não foi possível criar o menu.";
+$a->strings["Manage Menus"] = "Administrar menus";
+$a->strings["Drop"] = "Descartar";
+$a->strings["Create a new menu"] = "Criar um novo menu";
+$a->strings["Delete this menu"] = "Deletar este menu";
+$a->strings["Edit menu contents"] = "Editar os conteúdos do menu";
+$a->strings["Edit this menu"] = "Editar este menu";
+$a->strings["New Menu"] = "Novo menu";
+$a->strings["Menu name"] = "Nome do menu";
+$a->strings["Must be unique, only seen by you"] = "Deve ser único, exibido somente para você";
+$a->strings["Menu title"] = "Título do menu";
+$a->strings["Menu title as seen by others"] = "Título do menu quando visto por outros";
+$a->strings["Allow bookmarks"] = "Habilitar links guardados";
+$a->strings["Menu may be used to store saved bookmarks"] = "O menu pode ser utilizado para armazenar links guardados";
+$a->strings["Menu deleted."] = "Menu deletado.";
+$a->strings["Menu could not be deleted."] = "Não foi possível deletar o menu.";
+$a->strings["Edit Menu"] = "Editar menu";
+$a->strings["Add or remove entries to this menu"] = "Adicionar ou remover entradas deste menu";
+$a->strings["Conversation removed."] = "A conversa foi removida.";
+$a->strings["No messages."] = "Nenhuma mensagem.";
+$a->strings["D, d M Y - g:i A"] = "D, d M Y - g:i A";
$a->strings["Add a Channel"] = "Adicionar um 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."] = "Um canal é uma coleção sua de páginas relacionadas. Um canal pode ser usado para um perfil de rede social, um blog, grupos de conversação e fóruns temáticos, páginas de personalidades, e muito mais. Você pode criar tantos canais quanto o provedor de serviço permita.";
$a->strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "] = "Exemplos: \"Maria Caiouá\", \"Roberto Salinas\", \"Elis e sua banda\", \"Futebol de salão\", \"Fanáticos por aeromodelismo\"";
$a->strings["Choose a short nickname"] = "Escolha um apelido curto";
$a->strings["Your nickname will be used to create an easily remembered channel address (like an email address) which you can share with others."] = "Seu apelido será usado para criar um endereço para o canal de fácil memorização (como um endereço de email), que você poderá compartilhar com outros.";
$a->strings["Or <a href=\"import\">import an existing channel</a> from another location"] = "Ou <a href=\"import\">importe um canal existente</a> de outro local";
-$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"] = "Por favor, escolha um tipo de canal (por exemplo rede social ou fórum de comunidade) e requisito de privacidade, para que possamos configurar as melhores permissões para você";
$a->strings["Channel Type"] = "Tipo de canal";
-$a->strings["Read more about roles"] = "Leia mais sobre as regras";
+$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"] = "Por favor, escolha um tipo de canal (por exemplo rede social ou fórum de comunidade) e requisito de privacidade, para que possamos configurar as melhores permissões para você";
+$a->strings["Hubzilla - &quot;The Network&quot;"] = "Hubzilla - &quot;A Rede&quot;";
+$a->strings["Welcome to %s"] = "Bem-vindo(a) a %s";
+$a->strings["Invalid request identifier."] = "Identificador de solicitação inválido";
+$a->strings["Discard"] = "Descartar";
+$a->strings["No more system notifications."] = "Sem novas notificações do sistema.";
+$a->strings["System Notifications"] = "Notificações do sistema";
+$a->strings["Unable to find your hub."] = "Não foi possível localizar seu hub.";
+$a->strings["Post successful."] = "Publicado com sucesso.";
+$a->strings["invalid target signature"] = "assinatura do destino inválida";
+$a->strings["OpenID protocol error. No ID returned."] = "Erro do protocolo OpenID. Nenhuma ID retornada.";
$a->strings["App installed."] = "Aplicativo instalado";
$a->strings["Malformed app."] = "Aplicativo malformado.";
$a->strings["Embed code"] = "Embarcar código";
@@ -2021,29 +2238,14 @@ $a->strings["80 x 80 pixels - optional"] = "80 x 80 pixels - opcional";
$a->strings["Version ID"] = "ID da versão";
$a->strings["Price of app"] = "Preço do aplicativo";
$a->strings["Location (URL) to purchase app"] = "Endereço (URL) para comprar o aplicativo";
-$a->strings["sent you a private message"] = "lhe enviou uma mensagem privada";
-$a->strings["added your channel"] = "adicionou seu canal";
-$a->strings["posted an event"] = "publicou um evento";
-$a->strings["No such group"] = "Este grupo não existe";
-$a->strings["No such channel"] = "Nenhum canal";
-$a->strings["Search Results For:"] = "Resultados da busca por:";
-$a->strings["Collection is empty"] = "A coleção está vazia";
-$a->strings["Collection: "] = "Coleção:";
-$a->strings["Connection: "] = "Conexão:";
-$a->strings["Invalid connection."] = "Conexão inválida.";
-$a->strings["Ipsum Lorem"] = "Ipsum Lorem";
-$a->strings["Bookmark added"] = "O link foi guardado";
-$a->strings["My Bookmarks"] = "Meus links guardados";
-$a->strings["My Connections Bookmarks"] = "Links guardados das minhas conexões";
-$a->strings["Insufficient permissions. Request redirected to profile page."] = "Permissões insuficientes. Requisição redirecionada para a página de perfil.";
-$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Nenhuma sugestão disponível. Se este site é novo, por favor tente novamente em 24 horas.";
-$a->strings["Poll"] = "Enquete";
+$a->strings["Poll"] = "Votação";
$a->strings["View Results"] = "Ver resultados";
+$a->strings["Account removals are not allowed within 48 hours of changing the account password."] = "A remoção da conta fica desabilitada por 48 horas após uma troca de senha da conta.";
+$a->strings["Remove This Account"] = "Remover esta conta";
+$a->strings["This will completely remove this account including all its channels from the network. Once this has been done it is not recoverable."] = "Isso irá remover completamente esta conta, incluindo todos os canais da rede. Uma vez feito isso eles não poderão ser recuperados.";
+$a->strings["Remove this account, all its channels and all its channel clones from the network"] = "Remove esta conta, todos os seus canais e todos os clones desses canais da rede.";
+$a->strings["By default only the instances of the channels located on this hub will be removed from the network"] = "Por padrão, apenas as instâncias dos canais localizadas neste hub serão removidas da rede";
$a->strings["No service class restrictions found."] = "Não foram encontradas restrições de classe de serviço.";
-$a->strings["Files: shared with me"] = "Arquivos: compartilhados comigo";
-$a->strings["NEW"] = "NOVO";
-$a->strings["Remove all files"] = "Remover todos arquivos";
-$a->strings["Remove this file"] = "Remover este arquivo";
$a->strings["Schema Default"] = "Padrão do esquema";
$a->strings["Sans-Serif"] = "Sans-Serif";
$a->strings["Monospace"] = "Monospace";
@@ -2079,8 +2281,10 @@ $a->strings["Right offset of the section element"] = "Deslocamento direito do el
$a->strings["Section width"] = "largura de seção";
$a->strings["Left offset of the aside"] = "Deslocamento esquerdo do aparte";
$a->strings["Right offset of the aside element"] = "Deslocamento direito do aparte";
-$a->strings["Light (Red Matrix default)"] = "Leve (padrão da Red Matrix)";
-$a->strings["Select scheme"] = "Selecione esquema";
+$a->strings["None"] = "Nenhum";
+$a->strings["Header image"] = "Imagem de cabeçalho";
+$a->strings["Header image only on profile pages"] = "Imagem de cabeçalho apenas em páginas de perfil";
+$a->strings["Light (Hubzilla default)"] = "Leve (padrão da Hubzilla)";
$a->strings["Narrow navbar"] = "Barra de navegação estreita";
$a->strings["Navigation bar background color"] = "Cor de fundo da barra de navegação";
$a->strings["Navigation bar gradient top color"] = "Cor no topo de gradiente da barra de navegação";
@@ -2101,24 +2305,22 @@ $a->strings["Set the indent for comments"] = "Definir a indentação de comentá
$a->strings["Set the basic color for item icons"] = "Definir a cor básica para ícones de itens";
$a->strings["Set the hover color for item icons"] = "Definir a cor para ícones de itens quando que o mouse está sobre eles";
$a->strings["Set font-size for the entire application"] = "Definir o tamanho da fonte para a aplicação como um todo";
-$a->strings["Example: 14px"] = "Exemplo: 14px";
$a->strings["Set font-color for posts and comments"] = "Definir a cor da fonte para publicações e comentários";
$a->strings["Set radius of corners"] = "Definir o raio de curvatura dos cantos";
$a->strings["Set shadow depth of photos"] = "Definir a profundidade de sombra das fotos";
-$a->strings["Set maximum width of content region in pixel"] = "Escolha a largura máxima da região de conteúdo em pixel";
-$a->strings["Leave empty for default width"] = "Deixe vazio para a largura padrão";
-$a->strings["Center page content"] = "Conteúdo centralizado na página";
+$a->strings["Set maximum width of conversation regions"] = "Definir a largura máxima da área de conversas";
+$a->strings["Center conversation regions"] = "Centralizar regiões de conversação";
$a->strings["Set minimum opacity of nav bar - to hide it"] = "Definir opacidade mínima para a barra de navegação - para escondê-la";
$a->strings["Set size of conversation author photo"] = "Definir o tamanho da foto do autor da conversa";
$a->strings["Set size of followup author photos"] = "Definir o tamanho da foto dos autores de comentários";
+$a->strings["Sloppy photo albums"] = "Álbuns de fotos desleixados";
+$a->strings["Are you a clean desk or a messy desk person?"] = "Sua mesa é do tipo limpinha ou bagunçada?";
$a->strings["Update %s failed. See error logs."] = "A atualização %s falhou. Veja os logs de erro.";
$a->strings["Update Error at %s"] = "Erro de atualização em %s";
-$a->strings["Create an account to access services and applications within the Red Matrix"] = "Crie uma conta para acessar serviços e aplicações na Red Matrix";
+$a->strings["Create an account to access services and applications within the Hubzilla"] = "Crie uma conta para acessar serviços e aplicações na Hubzilla";
$a->strings["Password"] = "Senha";
$a->strings["Remember me"] = "Lembrar de mim";
$a->strings["Forgot your password?"] = "Esqueceu a sua senha?";
+$a->strings["permission denied"] = "permissão negada";
+$a->strings["Got Zot?"] = "Já tem Zot?";
$a->strings["toggle mobile"] = "alternar para interface móvel";
-$a->strings["Website SSL certificate is not valid. Please correct."] = "Certificado SSL do Website não é válido. Por favor corrija-o.";
-$a->strings["[red] Website SSL error for %s"] = "[red] erro SSL da página para %s";
-$a->strings["Cron/Scheduled tasks not running."] = "Agendamento de tarefas não está rodando.";
-$a->strings["[red] Cron tasks not running on %s"] = "[red] Agendador de tarefas não está rodando em %s";
diff --git a/view/pt-br/update_fail_eml.tpl b/view/pt-br/update_fail_eml.tpl
index a7df8fc2f..61f44b1e6 100644
--- a/view/pt-br/update_fail_eml.tpl
+++ b/view/pt-br/update_fail_eml.tpl
@@ -1,7 +1,7 @@
Hey,
I'm the web server at {{$sitename}};
-The Red Matrix 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 Red developer if you can not figure out how to
diff --git a/view/ru/htconfig.tpl b/view/ru/htconfig.tpl
index 096143798..cc4087f96 100644
--- a/view/ru/htconfig.tpl
+++ b/view/ru/htconfig.tpl
@@ -30,7 +30,7 @@ $default_timezone = '{{$timezone}}';
// What is your site name?
$a->config['system']['baseurl'] = '{{$siteurl}}';
-$a->config['system']['sitename'] = "Red Matrix";
+$a->config['system']['sitename'] = "Hubzilla";
$a->config['system']['location_hash'] = '{{$site_id}}';
// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
diff --git a/view/ru/messages.po b/view/ru/messages.po
index d3cc218ea..0ff952e8d 100644
--- a/view/ru/messages.po
+++ b/view/ru/messages.po
@@ -1,5 +1,5 @@
-# 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:
@@ -8,7 +8,7 @@
# puser, 2014
msgid ""
msgstr ""
-"Project-Id-Version: Red Matrix\n"
+"Project-Id-Version: Hubzilla\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-06-27 00:02-0700\n"
"PO-Revision-Date: 2014-06-30 12:10+0000\n"
@@ -1479,12 +1479,12 @@ msgid "Safe Mode"
msgstr "Безопасный режим"
#: ../../include/enotify.php:41
-msgid "Red Matrix Notification"
+msgid "Hubzilla Notification"
msgstr "Оповещения Red матрицы"
#: ../../include/enotify.php:42
-msgid "redmatrix"
-msgstr "redmatrix"
+msgid "hubzilla"
+msgstr "hubzilla"
#: ../../include/enotify.php:44
msgid "Thank You,"
@@ -4480,7 +4480,7 @@ msgstr "Публичные сайты"
#: ../../mod/pubsites.php:19
msgid ""
-"The listed sites allow public registration into the Red Matrix. All sites in"
+"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 "
@@ -4656,7 +4656,7 @@ msgid "Please login."
msgstr "Войдите пожалуйста."
#: ../../mod/cloud.php:113
-msgid "Red Matrix - Guests: Username: {your email address}, Password: +++"
+msgid "Hubzilla - Guests: Username: {your email address}, Password: +++"
msgstr ""
#: ../../mod/removeme.php:49
@@ -5300,7 +5300,7 @@ msgid "This site is not a directory server"
msgstr "Этот сайт не является сервером каталога"
#: ../../mod/home.php:81
-msgid "Red Matrix - &quot;The Network&quot;"
+msgid "Hubzilla - &quot;The Network&quot;"
msgstr ""
#: ../../mod/home.php:94
@@ -5309,8 +5309,8 @@ msgid "Welcome to %s"
msgstr "Добро пожаловать в %s"
#: ../../mod/setup.php:162
-msgid "Red Matrix Server - Setup"
-msgstr "Red Matrix Сервер - Установка"
+msgid "Hubzilla Server - Setup"
+msgstr "Hubzilla Сервер - Установка"
#: ../../mod/setup.php:168
msgid "Could not connect to database."
@@ -5358,7 +5358,7 @@ msgstr "Подключение к базе данных"
#: ../../mod/setup.php:285
msgid ""
-"In order to install Red Matrix we need to know how to connect to your "
+"In order to install Hubzilla we need to know how to connect to your "
"database."
msgstr ""
@@ -5793,7 +5793,7 @@ msgstr "Red"
#: ../../mod/siteinfo.php:98
msgid ""
-"This is a hub of the Red Matrix - a global cooperative network of "
+"This is a hub of the Hubzilla - a global cooperative network of "
"decentralised privacy enhanced websites."
msgstr ""
@@ -5804,8 +5804,8 @@ msgstr ""
#: ../../mod/siteinfo.php:102
msgid ""
"Please visit <a href=\"http://getzot.com\">GetZot.com</a> to learn more "
-"about the Red Matrix."
-msgstr "Пожалуйста посетите <a href=\"http://getzot.com\">GetZot.com</a> чтобы узнать больше о Red Matrix."
+"about the Hubzilla."
+msgstr "Пожалуйста посетите <a href=\"http://getzot.com\">GetZot.com</a> чтобы узнать больше о Hubzilla."
#: ../../mod/siteinfo.php:103
msgid "Bug reports and issues: please visit"
@@ -5813,7 +5813,7 @@ msgstr ""
#: ../../mod/siteinfo.php:106
msgid ""
-"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot "
+"Suggestions, praise, etc. - please email \"hubzilla\" at librelist - dot "
"com"
msgstr ""
@@ -7008,8 +7008,8 @@ msgstr "Пожалуйста, посетите мой канал на"
#: ../../mod/invite.php:151
msgid ""
-"Once you have registered (on ANY Red Matrix site - they are all inter-"
-"connected), please connect with my Red Matrix channel address:"
+"Once you have registered (on ANY Hubzilla site - they are all inter-"
+"connected), please connect with my Hubzilla channel address:"
msgstr ""
#: ../../mod/invite.php:153
@@ -7018,10 +7018,10 @@ msgstr ""
#: ../../mod/invite.php:155
msgid ""
-"For more information about the Red Matrix Project and why it has the "
+"For more information about the Hubzilla Project and why it has the "
"potential to change the internet as we know it, please visit "
"http://getzot.com"
-msgstr "Чтобы узнать больше о проекте Red Matrix, и чтобы узнать почему он имеет потенциал для изменения привычного нам Интернета, пожалуйста, посетите http://getzot.com"
+msgstr "Чтобы узнать больше о проекте Hubzilla, и чтобы узнать почему он имеет потенциал для изменения привычного нам Интернета, пожалуйста, посетите http://getzot.com"
#: ../../mod/item.php:147
msgid "Unable to locate original post."
@@ -7814,7 +7814,7 @@ msgstr "Ошибка обновления на %s"
#: ../../boot.php:1440
msgid ""
-"Create an account to access services and applications within the Red Matrix"
+"Create an account to access services and applications within the Hubzilla"
msgstr ""
#: ../../boot.php:1468
diff --git a/view/ru/strings.php b/view/ru/strings.php
index 3a8d9920c..c9d569cbb 100644
--- a/view/ru/strings.php
+++ b/view/ru/strings.php
@@ -347,8 +347,8 @@ $a->strings["Newest to Oldest"] = "От новых к старым";
$a->strings["Enable Safe Search"] = "";
$a->strings["Disable Safe Search"] = "";
$a->strings["Safe Mode"] = "Безопасный режим";
-$a->strings["Red Matrix Notification"] = "Оповещения Red матрицы";
-$a->strings["redmatrix"] = "redmatrix";
+$a->strings["Hubzilla Notification"] = "Оповещения Red матрицы";
+$a->strings["hubzilla"] = "hubzilla";
$a->strings["Thank You,"] = "Спасибо,";
$a->strings["%s Administrator"] = "%s администратор";
$a->strings["%s <!item_type!>"] = "%s <!item_type!>";
@@ -1070,7 +1070,7 @@ $a->strings["Click on a contact to add or remove."] = "Нажмите на ка
$a->strings["Visible To"] = "Видно";
$a->strings["All Connections"] = "Все контакты";
$a->strings["Public Sites"] = "Публичные сайты";
-$a->strings["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."] = "";
+$a->strings["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."] = "";
$a->strings["Site URL"] = "URL веб-сайта";
$a->strings["Access Type"] = "Тип доступа";
$a->strings["Registration Policy"] = "Правила регистрации";
@@ -1111,7 +1111,7 @@ $a->strings["Please re-enter your password"] = "Пожалуйста, введи
$a->strings["Away"] = "Нет на месте";
$a->strings["Online"] = "Сейчас в сети";
$a->strings["Please login."] = "Войдите пожалуйста.";
-$a->strings["Red Matrix - Guests: Username: {your email address}, Password: +++"] = "";
+$a->strings["Hubzilla - Guests: Username: {your email address}, Password: +++"] = "";
$a->strings["Remove This Channel"] = "Удалить этот канал";
$a->strings["This will completely remove this channel from the network. Once this has been done it is not recoverable."] = "";
$a->strings["Please enter your password for verification:"] = "Пожалуйста, введите пароль для проверки:";
@@ -1262,9 +1262,9 @@ $a->strings["Hometown: "] = "Город проживания:";
$a->strings["About: "] = "О себе:";
$a->strings["Keywords: "] = "Ключевые слова:";
$a->strings["This site is not a directory server"] = "Этот сайт не является сервером каталога";
-$a->strings["Red Matrix - &quot;The Network&quot;"] = "";
+$a->strings["Hubzilla - &quot;The Network&quot;"] = "";
$a->strings["Welcome to %s"] = "Добро пожаловать в %s";
-$a->strings["Red Matrix Server - Setup"] = "Red Matrix Сервер - Установка";
+$a->strings["Hubzilla Server - Setup"] = "Hubzilla Сервер - Установка";
$a->strings["Could not connect to database."] = "Не удалось подключиться к серверу баз данных.";
$a->strings["Could not connect to specified site URL. Possible SSL certificate or DNS issue."] = "";
$a->strings["Could not create table."] = "Не удалось создать таблицу.";
@@ -1275,7 +1275,7 @@ $a->strings["System check"] = "Проверка системы";
$a->strings["Next"] = "Следующая";
$a->strings["Check again"] = "Проверить снова";
$a->strings["Database connection"] = "Подключение к базе данных";
-$a->strings["In order to install Red Matrix we need to know how to connect to your database."] = "";
+$a->strings["In order to install Hubzilla 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."] = "";
$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "";
$a->strings["Database Server Name"] = "Имя сервера базы данных";
@@ -1367,11 +1367,11 @@ $a->strings["Version %s"] = "Версия %s";
$a->strings["Installed plugins/addons/apps:"] = "";
$a->strings["No installed plugins/addons/apps"] = "";
$a->strings["Red"] = "Red";
-$a->strings["This is a hub of the Red Matrix - a global cooperative network of decentralised privacy enhanced websites."] = "";
+$a->strings["This is a hub of the Hubzilla - a global cooperative network of decentralised privacy enhanced websites."] = "";
$a->strings["Running at web location"] = "";
-$a->strings["Please visit <a href=\"http://getzot.com\">GetZot.com</a> to learn more about the Red Matrix."] = "Пожалуйста посетите <a href=\"http://getzot.com\">GetZot.com</a> чтобы узнать больше о Red Matrix.";
+$a->strings["Please visit <a href=\"http://getzot.com\">GetZot.com</a> to learn more about the Hubzilla."] = "Пожалуйста посетите <a href=\"http://getzot.com\">GetZot.com</a> чтобы узнать больше о Hubzilla.";
$a->strings["Bug reports and issues: please visit"] = "";
-$a->strings["Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"] = "";
+$a->strings["Suggestions, praise, etc. - please email \"hubzilla\" at librelist - dot com"] = "";
$a->strings["Site Administrators"] = "Администратор сайта";
$a->strings["Page owner information could not be retrieved."] = "";
$a->strings["Album not found."] = "Альбом не найден.";
@@ -1661,12 +1661,12 @@ $a->strings["You have no more invitations available"] = "У вас больше
$a->strings["Send invitations"] = "Послать приглашения";
$a->strings["Enter email addresses, one per line:"] = "Введите адреса электронной почты, по одному на строку:";
$a->strings["Your message:"] = "Сообщение:";
-$a->strings["You are cordially invited to join me and some other close friends on the Red Matrix - a revolutionary new decentralised communication and information tool."] = "";
+$a->strings["You are cordially invited to join me and some other close friends on the Hubzilla - a revolutionary new decentralised communication and information tool."] = "";
$a->strings["You will need to supply this invitation code: \$invite_code"] = "";
$a->strings["Please visit my channel at"] = "Пожалуйста, посетите мой канал на";
-$a->strings["Once you have registered (on ANY Red Matrix site - they are all inter-connected), please connect with my Red Matrix channel address:"] = "";
+$a->strings["Once you have registered (on ANY Hubzilla site - they are all inter-connected), please connect with my Hubzilla channel address:"] = "";
$a->strings["Click the [Register] link on the following page to join."] = "";
-$a->strings["For more information about the Red Matrix Project and why it has the potential to change the internet as we know it, please visit http://getzot.com"] = "Чтобы узнать больше о проекте Red Matrix, и чтобы узнать почему он имеет потенциал для изменения привычного нам Интернета, пожалуйста, посетите http://getzot.com";
+$a->strings["For more information about the Hubzilla Project and why it has the potential to change the internet as we know it, please visit http://getzot.com"] = "Чтобы узнать больше о проекте Hubzilla, и чтобы узнать почему он имеет потенциал для изменения привычного нам Интернета, пожалуйста, посетите http://getzot.com";
$a->strings["Unable to locate original post."] = "Не удалось найти оригинал.";
$a->strings["Empty post discarded."] = "Отказаться от пустой почты.";
$a->strings["Executable content type not permitted to this channel."] = "";
@@ -1856,7 +1856,7 @@ $a->strings["Are you sure you want to delete this item?"] = "Вы уверены
$a->strings["Total"] = "Всего";
$a->strings["Update %s failed. See error logs."] = "";
$a->strings["Update Error at %s"] = "Ошибка обновления на %s";
-$a->strings["Create an account to access services and applications within the Red Matrix"] = "";
+$a->strings["Create an account to access services and applications within the Hubzilla"] = "";
$a->strings["Password"] = "Пароль";
$a->strings["Remember me"] = "Запомнить";
$a->strings["Forgot your password?"] = "Забыли пароль или логин?";
diff --git a/view/ru/update_fail_eml.tpl b/view/ru/update_fail_eml.tpl
index a7df8fc2f..61f44b1e6 100644
--- a/view/ru/update_fail_eml.tpl
+++ b/view/ru/update_fail_eml.tpl
@@ -1,7 +1,7 @@
Hey,
I'm the web server at {{$sitename}};
-The Red Matrix 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 Red developer if you can not figure out how to
diff --git a/view/sv/htconfig.tpl b/view/sv/htconfig.tpl
index 096143798..cc4087f96 100644
--- a/view/sv/htconfig.tpl
+++ b/view/sv/htconfig.tpl
@@ -30,7 +30,7 @@ $default_timezone = '{{$timezone}}';
// What is your site name?
$a->config['system']['baseurl'] = '{{$siteurl}}';
-$a->config['system']['sitename'] = "Red Matrix";
+$a->config['system']['sitename'] = "Hubzilla";
$a->config['system']['location_hash'] = '{{$site_id}}';
// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
diff --git a/view/sv/messages.po b/view/sv/messages.po
index 4c591ea84..4486a8630 100644
--- a/view/sv/messages.po
+++ b/view/sv/messages.po
@@ -1,5 +1,5 @@
-# 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:
@@ -7,7 +7,7 @@
# pafcu <pafcu@iki.fi>, 2014
msgid ""
msgstr ""
-"Project-Id-Version: Red Matrix\n"
+"Project-Id-Version: Hubzilla\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-02-06 00:04-0800\n"
"PO-Revision-Date: 2015-02-07 12:46+0000\n"
@@ -966,8 +966,8 @@ msgid "l F d, Y \\@ g:i A"
msgstr "l j F Y \\k\\l. H.i"
#: ../../include/bb2diaspora.php:447
-msgid "Redmatrix event notification:"
-msgstr "Händelsenotifiering från Redmatrix:"
+msgid "Hubzilla event notification:"
+msgstr "Händelsenotifiering från Hubzilla:"
#: ../../include/bb2diaspora.php:451 ../../include/event.php:20
msgid "Starts:"
@@ -2250,12 +2250,12 @@ msgid "database storage failed."
msgstr "databaslagring misslyckades."
#: ../../include/enotify.php:41
-msgid "Red Matrix Notification"
-msgstr "Red Matrix-meddelande"
+msgid "Hubzilla Notification"
+msgstr "Hubzilla-meddelande"
#: ../../include/enotify.php:42
-msgid "redmatrix"
-msgstr "redmatrix"
+msgid "hubzilla"
+msgstr "hubzilla"
#: ../../include/enotify.php:44
msgid "Thank You,"
@@ -3712,8 +3712,8 @@ msgid "Unable to verify site signature for %s"
msgstr "Kunde inte bekräfta signatur för servern %s"
#: ../../mod/setup.php:166
-msgid "Red Matrix Server - Setup"
-msgstr "Red Matrix-server - inställningar"
+msgid "Hubzilla Server - Setup"
+msgstr "Hubzilla-server - inställningar"
#: ../../mod/setup.php:172
msgid "Could not connect to database."
@@ -3761,9 +3761,9 @@ msgstr "Databasanslutning"
#: ../../mod/setup.php:290
msgid ""
-"In order to install Red Matrix we need to know how to connect to your "
+"In order to install Hubzilla we need to know how to connect to your "
"database."
-msgstr "För att kunna installera Red Matrix behöver vi veta hur databasen ska anslutas."
+msgstr "För att kunna installera Hubzilla behöver vi veta hur databasen ska anslutas."
#: ../../mod/setup.php:291
msgid ""
@@ -4208,8 +4208,8 @@ msgid "Some blurb about what to do when you're new here"
msgstr "Lite text om vad man kan göra som ny här"
#: ../../mod/home.php:48
-msgid "Red Matrix - &quot;The Network&quot;"
-msgstr "Red Matrix - &quot;Nätverket&quot;"
+msgid "Hubzilla - &quot;The Network&quot;"
+msgstr "Hubzilla - &quot;Nätverket&quot;"
#: ../../mod/home.php:101
#, php-format
@@ -4465,8 +4465,8 @@ msgid "URL of link"
msgstr "Länkens URL"
#: ../../mod/mitem.php:165 ../../mod/mitem.php:209
-msgid "Use RedMatrix magic-auth if available"
-msgstr "Använd RedMatrix magic-auth om tillgängligt"
+msgid "Use Hubzilla magic-auth if available"
+msgstr "Använd Hubzilla magic-auth om tillgängligt"
#: ../../mod/mitem.php:166 ../../mod/mitem.php:210
msgid "Open link in new window"
@@ -4574,12 +4574,12 @@ msgstr "Offentliga servrar"
#: ../../mod/pubsites.php:19
msgid ""
-"The listed sites allow public registration into the Red Matrix. All sites in"
+"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 "De listade servrarna tillåter offentlig registrering i Red Matrix. Alla servrar i matrisen är sammankopplade, så medlemskap i en av dem medför medlemskap i matrisen som helhet. Vissa servrar kan kräva abonnemang eller erbjuda uppdelade tjänstenivåer. Leverantörslänkarna <strong>kan</strong> ge ytterligare detaljer."
+msgstr "De listade servrarna tillåter offentlig registrering i Hubzilla. Alla servrar i matrisen är sammankopplade, så medlemskap i en av dem medför medlemskap i matrisen som helhet. Vissa servrar kan kräva abonnemang eller erbjuda uppdelade tjänstenivåer. Leverantörslänkarna <strong>kan</strong> ge ytterligare detaljer."
#: ../../mod/pubsites.php:25
msgid "Site URL"
@@ -4606,8 +4606,8 @@ msgid "Insufficient permissions. Request redirected to profile page."
msgstr "Otillräckliga behörigheter. Förfrågan omdirigerad till profilsidan."
#: ../../mod/cloud.php:120
-msgid "RedMatrix - Guests: Username: {your email address}, Password: +++"
-msgstr "RedMatrix - Gäster: Användarnamn {din e-postadress}, Lösenord: +++"
+msgid "Hubzilla - Guests: Username: {your email address}, Password: +++"
+msgstr "Hubzilla - Gäster: Användarnamn {din e-postadress}, Lösenord: +++"
#: ../../mod/regmod.php:11
msgid "Please login."
@@ -5546,9 +5546,9 @@ msgstr "Red"
#: ../../mod/siteinfo.php:137
msgid ""
-"This is a hub of the Red Matrix - a global cooperative network of "
+"This is a hub of the Hubzilla - a global cooperative network of "
"decentralized privacy enhanced websites."
-msgstr "Det här är en hubb som ingår i Red Matrix - ett globalt samverkande nätverk av decentraliserade webbplatser med bättre integritetskydd."
+msgstr "Det här är en hubb som ingår i Hubzilla - ett globalt samverkande nätverk av decentraliserade webbplatser med bättre integritetskydd."
#: ../../mod/siteinfo.php:139
msgid "Tag: "
@@ -5564,9 +5564,9 @@ msgstr "Kör på webbutrymmet"
#: ../../mod/siteinfo.php:145
msgid ""
-"Please visit <a href=\"https://redmatrix.me\">RedMatrix.me</a> to learn more"
-" about the Red Matrix."
-msgstr "Besök <a href=\"https://redmatrix.me\">RedMatrix.me</a> för att lära dig mer om Red Matrix."
+"Please visit <a href=\"https://redmatrix.me\">Redmatrix.me</a> to learn more"
+" about the Hubzilla."
+msgstr "Besök <a href=\"https://redmatrix.me\">Redmatrix.me</a> för att lära dig mer om Hubzilla."
#: ../../mod/siteinfo.php:146
msgid "Bug reports and issues: please visit"
@@ -5574,9 +5574,9 @@ msgstr "Buggrapporter och problem: besök"
#: ../../mod/siteinfo.php:149
msgid ""
-"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot "
+"Suggestions, praise, etc. - please email \"hubzilla\" at librelist - dot "
"com"
-msgstr "Förslag, uppskattning, etc. - maila \"redmatrix\" at librelist - dot com"
+msgstr "Förslag, uppskattning, etc. - maila \"hubzilla\" at librelist - dot com"
#: ../../mod/siteinfo.php:151
msgid "Site Administrators"
@@ -6099,9 +6099,9 @@ msgstr "Den här åtgärden fungerar bara för medlemmar."
#: ../../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 "<a href=\"rmagic\">Logga in med ditt RedMatrix-ID</a> eller <a href=\"register\">registrera dig som ny RedMatrix medlem</a> för att fortsätta."
+"Please <a href=\"rmagic\">login with your Hubzilla ID</a> or <a "
+"href=\"register\">register as a new Redmatrix.member</a> to continue."
+msgstr "<a href=\"rmagic\">Logga in med ditt Hubzilla-ID</a> eller <a href=\"register\">registrera dig som ny Redmatrix.medlem</a> för att fortsätta."
#: ../../mod/like.php:89 ../../mod/like.php:116 ../../mod/like.php:154
msgid "Invalid request."
@@ -6188,20 +6188,20 @@ msgid "Your message:"
msgstr "Ditt meddelande:"
#: ../../mod/invite.php:132
-msgid "Please join my community on RedMatrix."
-msgstr "Gå med mig i gemenskapen på RedMatrix."
+msgid "Please join my community on Hubzilla."
+msgstr "Gå med mig i gemenskapen på Hubzilla."
#: ../../mod/invite.php:134
msgid "You will need to supply this invitation code: "
msgstr "Du kommer att behöva den här inbjudningskoden: "
#: ../../mod/invite.php:135
-msgid "1. Register at any RedMatrix location (they are all inter-connected)"
-msgstr "1. Skapa konto på en RedMatrix-server (alla är ihopkopplade)"
+msgid "1. Register at any Hubzilla location (they are all inter-connected)"
+msgstr "1. Skapa konto på en Hubzilla-server (alla är ihopkopplade)"
#: ../../mod/invite.php:137
-msgid "2. Enter my RedMatrix network address into the site searchbar."
-msgstr "2. Ange min RedMatrix-adress i webbplatsens sökruta."
+msgid "2. Enter my Hubzilla network address into the site searchbar."
+msgstr "2. Ange min Hubzilla-adress i webbplatsens sökruta."
#: ../../mod/invite.php:138
msgid "or visit "
@@ -6256,8 +6256,8 @@ msgid "Do not show in shared with me folder of your connections"
msgstr "Visa inte i dina kontakters mapp med delat material"
#: ../../mod/dav.php:121
-msgid "RedMatrix channel"
-msgstr "RedMatrix-kanal"
+msgid "Hubzilla channel"
+msgstr "Hubzilla-kanal"
#: ../../mod/lockview.php:31
msgid "Remote privacy information not available."
@@ -8387,8 +8387,8 @@ msgid "Right offset of the aside element"
msgstr "Höger offset för sidoelement"
#: ../../view/theme/redbasic/php/config.php:84
-msgid "Light (Red Matrix default)"
-msgstr "Light (standard för Red Matrix)"
+msgid "Light (Hubzilla default)"
+msgstr "Light (standard för Hubzilla)"
#: ../../view/theme/redbasic/php/config.php:104
msgid "Narrow navbar"
@@ -8522,8 +8522,8 @@ msgstr "Uppdateringsfel på %s"
#: ../../boot.php:1525
msgid ""
-"Create an account to access services and applications within the Red Matrix"
-msgstr "Skapa ett konto för att komma åt tjänster och applikationer inom Red Matrix"
+"Create an account to access services and applications within the Hubzilla"
+msgstr "Skapa ett konto för att komma åt tjänster och applikationer inom Hubzilla"
#: ../../boot.php:1553
msgid "Password"
diff --git a/view/sv/strings.php b/view/sv/strings.php
index fd819e1d3..3a09830c5 100644
--- a/view/sv/strings.php
+++ b/view/sv/strings.php
@@ -222,7 +222,7 @@ $a->strings["Upload New Photos"] = "Ladda upp nya foton";
$a->strings["Public Timeline"] = "Offentlig tidslinje";
$a->strings["Attachments:"] = "Bilagor:";
$a->strings["l F d, Y \\@ g:i A"] = "l j F Y \\k\\l. H.i";
-$a->strings["Redmatrix event notification:"] = "Händelsenotifiering från Redmatrix:";
+$a->strings["Hubzilla event notification:"] = "Händelsenotifiering från Hubzilla:";
$a->strings["Starts:"] = "Börjar:";
$a->strings["Finishes:"] = "Slutar:";
$a->strings["Location:"] = "Plats:";
@@ -523,8 +523,8 @@ $a->strings["duplicate filename or path"] = "filnamn eller sökväg finns redan"
$a->strings["Path not found."] = "Sökväg hittas inte.";
$a->strings["mkdir failed."] = "mkdir misslyckades.";
$a->strings["database storage failed."] = "databaslagring misslyckades.";
-$a->strings["Red Matrix Notification"] = "Red Matrix-meddelande";
-$a->strings["redmatrix"] = "redmatrix";
+$a->strings["Hubzilla Notification"] = "Hubzilla-meddelande";
+$a->strings["hubzilla"] = "hubzilla";
$a->strings["Thank You,"] = "Tack,";
$a->strings["%s Administrator"] = "Administratören för %s";
$a->strings["%s <!item_type!>"] = "%s <!item_type!>";
@@ -871,7 +871,7 @@ $a->strings["Ask me"] = "Fråga mig";
$a->strings["Invalid data packet"] = "Ogiltigt datapaket";
$a->strings["Unable to verify channel signature"] = "Kunde inte bekräfta kanalsignatur";
$a->strings["Unable to verify site signature for %s"] = "Kunde inte bekräfta signatur för servern %s";
-$a->strings["Red Matrix Server - Setup"] = "Red Matrix-server - inställningar";
+$a->strings["Hubzilla Server - Setup"] = "Hubzilla-server - inställningar";
$a->strings["Could not connect to database."] = "Kunde inte ansluta till databasen.";
$a->strings["Could not connect to specified site URL. Possible SSL certificate or DNS issue."] = "Kunde inte ansluta till den angivna server-URL:en. Möjligt problem med SSL-certifikat eller DNS.";
$a->strings["Could not create table."] = "Kunde inte skapa tabell.";
@@ -882,7 +882,7 @@ $a->strings["System check"] = "Systemkontroll";
$a->strings["Next"] = "Nästa";
$a->strings["Check again"] = "Kontrollera igen";
$a->strings["Database connection"] = "Databasanslutning";
-$a->strings["In order to install Red Matrix we need to know how to connect to your database."] = "För att kunna installera Red Matrix behöver vi veta hur databasen ska anslutas.";
+$a->strings["In order to install Hubzilla we need to know how to connect to your database."] = "För att kunna installera Hubzilla behöver vi veta hur databasen ska anslutas.";
$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Kontakta din servervärd eller administratör om du har frågor om de här inställningarna.";
$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "Databasen du anger nedan måste finnas. Om den inte gör det, skapa den innan du fortsätter.";
$a->strings["Database Server Name"] = "Databasserver";
@@ -976,7 +976,7 @@ $a->strings["Collection: "] = "Krets: ";
$a->strings["Connection: "] = "Kontakt:";
$a->strings["Invalid connection."] = "Ogiltig kontakt.";
$a->strings["Some blurb about what to do when you're new here"] = "Lite text om vad man kan göra som ny här";
-$a->strings["Red Matrix - &quot;The Network&quot;"] = "Red Matrix - &quot;Nätverket&quot;";
+$a->strings["Hubzilla - &quot;The Network&quot;"] = "Hubzilla - &quot;Nätverket&quot;";
$a->strings["Welcome to %s"] = "Välkommen till %s";
$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Inga förslag tillgängliga. Om det här är en ny server, försök igen om 24 timmar.";
$a->strings["Export Channel"] = "Exportera kanal";
@@ -1035,7 +1035,7 @@ $a->strings["Menu Item Permissions"] = "Behörighet för menyval";
$a->strings["(click to open/close)"] = "(klicka för att öppna/stänga)";
$a->strings["Link text"] = "Länktext";
$a->strings["URL of link"] = "Länkens URL";
-$a->strings["Use RedMatrix magic-auth if available"] = "Använd RedMatrix magic-auth om tillgängligt";
+$a->strings["Use Hubzilla magic-auth if available"] = "Använd Hubzilla magic-auth om tillgängligt";
$a->strings["Open link in new window"] = "Öppna länk i nytt fönster";
$a->strings["Order in list"] = "Ordningstal i listan";
$a->strings["Higher numbers will sink to bottom of listing"] = "Större tal sjunker till botten av listan";
@@ -1061,14 +1061,14 @@ $a->strings["URL of bookmark"] = "Bokmärkets URL";
$a->strings["Description"] = "Beskrivning";
$a->strings["Or enter new bookmark folder name"] = "Eller ange nytt namn på bokmärkeskatalog";
$a->strings["Public Sites"] = "Offentliga servrar";
-$a->strings["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."] = "De listade servrarna tillåter offentlig registrering i Red Matrix. Alla servrar i matrisen är sammankopplade, så medlemskap i en av dem medför medlemskap i matrisen som helhet. Vissa servrar kan kräva abonnemang eller erbjuda uppdelade tjänstenivåer. Leverantörslänkarna <strong>kan</strong> ge ytterligare detaljer.";
+$a->strings["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."] = "De listade servrarna tillåter offentlig registrering i Hubzilla. Alla servrar i matrisen är sammankopplade, så medlemskap i en av dem medför medlemskap i matrisen som helhet. Vissa servrar kan kräva abonnemang eller erbjuda uppdelade tjänstenivåer. Leverantörslänkarna <strong>kan</strong> ge ytterligare detaljer.";
$a->strings["Site URL"] = "Server-URL";
$a->strings["Access Type"] = "Åtkomsttyp";
$a->strings["Registration Policy"] = "Registreringspolicy";
$a->strings["Location"] = "Plats";
$a->strings["You must be logged in to see this page."] = "Du måste vara inloggad för att se den här sidan.";
$a->strings["Insufficient permissions. Request redirected to profile page."] = "Otillräckliga behörigheter. Förfrågan omdirigerad till profilsidan.";
-$a->strings["RedMatrix - Guests: Username: {your email address}, Password: +++"] = "RedMatrix - Gäster: Användarnamn {din e-postadress}, Lösenord: +++";
+$a->strings["Hubzilla - Guests: Username: {your email address}, Password: +++"] = "Hubzilla - Gäster: Användarnamn {din e-postadress}, Lösenord: +++";
$a->strings["Please login."] = "Logga in.";
$a->strings["Room not found"] = "Rum hittas inte";
$a->strings["Leave Room"] = "Lämna rummet";
@@ -1292,13 +1292,13 @@ $a->strings["Version %s"] = "Version %s";
$a->strings["Installed plugins/addons/apps:"] = "Installerade tillägg/moduler/appar:";
$a->strings["No installed plugins/addons/apps"] = "Inga installerade tillägg/moduler/appar";
$a->strings["Red"] = "Red";
-$a->strings["This is a hub of the Red Matrix - a global cooperative network of decentralized privacy enhanced websites."] = "Det här är en hubb som ingår i Red Matrix - ett globalt samverkande nätverk av decentraliserade webbplatser med bättre integritetskydd.";
+$a->strings["This is a hub of the Hubzilla - a global cooperative network of decentralized privacy enhanced websites."] = "Det här är en hubb som ingår i Hubzilla - ett globalt samverkande nätverk av decentraliserade webbplatser med bättre integritetskydd.";
$a->strings["Tag: "] = "Tagg: ";
$a->strings["Last background fetch: "] = "Senaste bakgrundshämtning: ";
$a->strings["Running at web location"] = "Kör på webbutrymmet";
-$a->strings["Please visit <a href=\"https://redmatrix.me\">RedMatrix.me</a> to learn more about the Red Matrix."] = "Besök <a href=\"https://redmatrix.me\">RedMatrix.me</a> för att lära dig mer om Red Matrix.";
+$a->strings["Please visit <a href=\"https://redmatrix.me\">Redmatrix.me</a> to learn more about the Hubzilla."] = "Besök <a href=\"https://redmatrix.me\">Redmatrix.me</a> för att lära dig mer om Hubzilla.";
$a->strings["Bug reports and issues: please visit"] = "Buggrapporter och problem: besök";
-$a->strings["Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"] = "Förslag, uppskattning, etc. - maila \"redmatrix\" at librelist - dot com";
+$a->strings["Suggestions, praise, etc. - please email \"hubzilla\" at librelist - dot com"] = "Förslag, uppskattning, etc. - maila \"hubzilla\" at librelist - dot com";
$a->strings["Site Administrators"] = "Serveradministratörer";
$a->strings["Page owner information could not be retrieved."] = "Information om sidans ägare kunde inte hittas.";
$a->strings["Album not found."] = "Albumet hittades inte.";
@@ -1425,7 +1425,7 @@ $a->strings["Help:"] = "Hjälp:";
$a->strings["Not Found"] = "Hittas inte";
$a->strings["Like/Dislike"] = "Gilla/ogilla";
$a->strings["This action is restricted to members."] = "Den här åtgärden fungerar bara för medlemmar.";
-$a->strings["Please <a href=\"rmagic\">login with your RedMatrix ID</a> or <a href=\"register\">register as a new RedMatrix member</a> to continue."] = "<a href=\"rmagic\">Logga in med ditt RedMatrix-ID</a> eller <a href=\"register\">registrera dig som ny RedMatrix medlem</a> för att fortsätta.";
+$a->strings["Please <a href=\"rmagic\">login with your Hubzilla ID</a> or <a href=\"register\">register as a new Redmatrix.member</a> to continue."] = "<a href=\"rmagic\">Logga in med ditt Hubzilla-ID</a> eller <a href=\"register\">registrera dig som ny Redmatrix.medlem</a> för att fortsätta.";
$a->strings["Invalid request."] = "Ogiltig begäran.";
$a->strings["thing"] = "sak";
$a->strings["Channel unavailable."] = "Kanalen kan ej nås.";
@@ -1448,10 +1448,10 @@ $a->strings["You have no more invitations available"] = "Du har inga fler inbjud
$a->strings["Send invitations"] = "Skicka inbjudan";
$a->strings["Enter email addresses, one per line:"] = "Ange e-postadresser, en per rad:";
$a->strings["Your message:"] = "Ditt meddelande:";
-$a->strings["Please join my community on RedMatrix."] = "Gå med mig i gemenskapen på RedMatrix.";
+$a->strings["Please join my community on Hubzilla."] = "Gå med mig i gemenskapen på Hubzilla.";
$a->strings["You will need to supply this invitation code: "] = "Du kommer att behöva den här inbjudningskoden: ";
-$a->strings["1. Register at any RedMatrix location (they are all inter-connected)"] = "1. Skapa konto på en RedMatrix-server (alla är ihopkopplade)";
-$a->strings["2. Enter my RedMatrix network address into the site searchbar."] = "2. Ange min RedMatrix-adress i webbplatsens sökruta.";
+$a->strings["1. Register at any Hubzilla location (they are all inter-connected)"] = "1. Skapa konto på en Hubzilla-server (alla är ihopkopplade)";
+$a->strings["2. Enter my Hubzilla network address into the site searchbar."] = "2. Ange min Hubzilla-adress i webbplatsens sökruta.";
$a->strings["or visit "] = "eller besök ";
$a->strings["3. Click [Connect]"] = "3. Klicka [Ta kontakt]";
$a->strings["Permission Denied."] = "Behörighet saknas.";
@@ -1465,7 +1465,7 @@ $a->strings["Copy/paste this URL to link file from a web page"] = "Kopiera/klist
$a->strings["Attach this file to a new post"] = "Bifoga den här filen till ett nytt inlägg";
$a->strings["Show URL to this file"] = "Visa URL till den här filen";
$a->strings["Do not show in shared with me folder of your connections"] = "Visa inte i dina kontakters mapp med delat material";
-$a->strings["RedMatrix channel"] = "RedMatrix-kanal";
+$a->strings["Hubzilla channel"] = "Hubzilla-kanal";
$a->strings["Remote privacy information not available."] = "Icke-lokal integritetsinformation är inte tillgänglig";
$a->strings["Visible to:"] = "Kan ses av:";
$a->strings["Your service plan only allows %d channels."] = "Din tjänstenivå tillåter bara %d kanaler.";
@@ -1977,7 +1977,7 @@ $a->strings["Right offset of the section element"] = "Höger offset för avsnitt
$a->strings["Section width"] = "Avsnittsbredd";
$a->strings["Left offset of the aside"] = "Vänster offset för sidoelement";
$a->strings["Right offset of the aside element"] = "Höger offset för sidoelement";
-$a->strings["Light (Red Matrix default)"] = "Light (standard för Red Matrix)";
+$a->strings["Light (Hubzilla default)"] = "Light (standard för Hubzilla)";
$a->strings["Narrow navbar"] = "Smal navigeringslist";
$a->strings["Navigation bar background color"] = "Navigeringslistens bakgrundsfärg";
$a->strings["Navigation bar gradient top color"] = "Övre gradientfärg i navigeringslisten";
@@ -2010,7 +2010,7 @@ $a->strings["Sloppy photo albums"] = "Oordnade fotoalbum";
$a->strings["Are you a clean desk or a messy desk person?"] = "Föredrar du ett tomt eller stökigt skrivbord?";
$a->strings["Update %s failed. See error logs."] = "Uppdatering %s misslyckades. Se felloggar.";
$a->strings["Update Error at %s"] = "Uppdateringsfel på %s";
-$a->strings["Create an account to access services and applications within the Red Matrix"] = "Skapa ett konto för att komma åt tjänster och applikationer inom Red Matrix";
+$a->strings["Create an account to access services and applications within the Hubzilla"] = "Skapa ett konto för att komma åt tjänster och applikationer inom Hubzilla";
$a->strings["Password"] = "Lösenord";
$a->strings["Remember me"] = "Kom ihåg mig";
$a->strings["Forgot your password?"] = "Glömt lösenordet?";
diff --git a/view/sv/update_fail_eml.tpl b/view/sv/update_fail_eml.tpl
index 0abbf2cfa..f6be52976 100644
--- a/view/sv/update_fail_eml.tpl
+++ b/view/sv/update_fail_eml.tpl
@@ -1,7 +1,7 @@
Hej,
Jag är webbservern på {{$sitename}};
-Red Matrix-utvecklarna släppte nyligen uppdateringen {{$update}},
+Hubzilla-utvecklarna släppte nyligen uppdateringen {{$update}},
men när jag försökte installera den gick något fruktansvärt fel.
Detta behöver fixas snart och kräver en människas ingripande.
Kontakta en Red-utvecklare om du inte kan lösa problemet själv.
diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php
index 8ab31efc0..2603fb267 100644
--- a/view/theme/redbasic/php/config.php
+++ b/view/theme/redbasic/php/config.php
@@ -79,7 +79,7 @@ function theme_post(&$a) {
function redbasic_form(&$a, $arr) {
$scheme_choices = array();
- $scheme_choices["---"] = t("Light (Red Matrix default)");
+ $scheme_choices["---"] = t("Light (Hubzilla default)");
$files = glob('view/theme/redbasic/schema/*.php');
if($files) {
foreach($files as $file) {
diff --git a/view/theme/redbasic/php/theme.php b/view/theme/redbasic/php/theme.php
index e68533bb4..f0679a532 100644
--- a/view/theme/redbasic/php/theme.php
+++ b/view/theme/redbasic/php/theme.php
@@ -2,7 +2,7 @@
/**
* * Name: Redbasic
- * * Description: RedMatrix standard theme
+ * * Description: Hubzilla standard theme
* * Version: 1.0
* * Author: Fabrixxm
* * Maintainer: Mike Macgirvin
diff --git a/view/tpl/email_notify_html.tpl b/view/tpl/email_notify_html.tpl
index cf149341e..ae3e8c012 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:#c60032; 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/rm-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:#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 style="padding-top:22px;" colspan="2">{{$preamble}}</td></tr>
diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl
index dc334deef..8a007232e 100755
--- a/view/tpl/head.tpl
+++ b/view/tpl/head.tpl
@@ -17,7 +17,7 @@
<link rel="search"
href="{{$baseurl}}/opensearch"
type="application/opensearchdescription+xml"
- title="Search in the Red Matrix" />
+ title="Search in the Hubzilla" />
<script>
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 4241c0a92..3d6809c22 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -189,7 +189,7 @@
{{if $nav.help}}
<li class="{{$sel.help}}">
- <a class="{{$nav.help.2}}" target="redmatrix-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="{{$nav.help.4}}"><i class="icon-question"></i></a>
+ <a class="{{$nav.help.2}}" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="{{$nav.help.4}}"><i class="icon-question"></i></a>
</li>
{{/if}}
</ul>
diff --git a/view/tpl/opensearch.tpl b/view/tpl/opensearch.tpl
index ea260c6ae..8885c12bc 100755
--- a/view/tpl/opensearch.tpl
+++ b/view/tpl/opensearch.tpl
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
- <ShortName>Red Matrix@{{$nodename}}</ShortName>
- <Description>Search in The Red Matrix@{{$nodename}}</Description>
+ <ShortName>Hubzilla@{{$nodename}}</ShortName>
+ <Description>Search in The Hubzilla@{{$nodename}}</Description>
<Contact>http://github.com/friendica/red/</Contact>
<Image height="16" width="16" type="image/png">{{$baseurl}}/images/rm-16.png</Image>
<Image height="64" width="64" type="image/png">{{$baseurl}}/images/rm-64.png</Image>
diff --git a/view/tpl/pdledit.tpl b/view/tpl/pdledit.tpl
index ef8ff8dce..9df93e4c6 100644
--- a/view/tpl/pdledit.tpl
+++ b/view/tpl/pdledit.tpl
@@ -3,7 +3,7 @@
<h2>{{$mname}} {{$module}}</h2>
<br />
-<a href="help/Comanche" target="redmatrix-help">{{$help}}</a>
+<a href="help/Comanche" target="hubzilla-help">{{$help}}</a>
<br />
<br />