diff options
175 files changed, 1252 insertions, 1220 deletions
@@ -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 @@ -1,15 +1,35 @@ - -Note: please update your repository pointers to https://github.com/redmatrix/redmatrix . +Hubzilla - Hub Deployment Platform +================================== -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? + -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 are Hubs?** -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). +Hubs are independant 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. -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. +**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. -The Red Matrix is free and open source distributed under the MIT license. +Hubzilla hubs are -For a list of public hubs see [redmatrix.me/pubsites](https://redmatrix.me/pubsites). For installation instructions see [install/INSTALL.txt](install/INSTALL.txt) +* 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. 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 - "The Network"</strong></div> +<div style="margin-bottom: 15px; color: #808080; font-size: 1.8em;"><strong>Hubzilla - "The Network"</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éal pour toutes les communautés en passant par les particuliers et les familles tout en incluant les forums, sites-web d'affaires ainsi que les organisations. C'est une solution de remplacement, non négligeable, aux réseaux sociaux actuels rendue accessible à tous ceux qui sont soucieux de leur vie privée et qui souhaitent conserver le contrôle de leur présence sur internet.<br /> </div> <br /> -<div style="margin-bottom: 15px; color: #808080; font-size: 1.8em;"><strong>RedMatrix - "The Network"</strong></div> +<div style="margin-bottom: 15px; color: #808080; font-size: 1.8em;"><strong>Hubzilla - "The Network"</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ö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ö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 - "The Network"</strong></div> +<div style="margin-bottom: 15px; color: #808080; font-size: 1.8em;"><strong>Hubzilla - "The Network"</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å nätet har al </div> <br /> <div class="tr" style="font-size: 1.4em; color: #666; margin-left: 75px; margin-right: 75px;"> -RedMatrix är ett nätverk sammansatt av ett stort antal mindre, oberoende och självständiga webbplatser, sammankopplade till en samverkande publicerings- och kommunikationsplattform. Mjukvaran består av en webbapplikation släppt som öppen källkod, som tillhandahåller ett <strong>decentraliserat</strong> fleranvändarsystem för kommunikation, publicering och delning, och när den körs utgör en nod i nätverket. Varje nod erbjuder såväl kommunikationsverktyg (privata meddelanden, chatt, blogg, forum och traditionellt socialt nätverkande) som filhantering (foton, kalenderhändelser, filer, webbsidor, delbara tilläggsprogram) för alla medlemmar; alltihop i en sammanhållen plattform. Dessa noder tar automatiskt kontakt med varandra och resten av nätverket. Sekretess och innehållsstyrning är alltid under din direkta personliga kontroll, och behörighet till inlägg eller filer kan ges eller nekas vem som helst i nätverket. +Hubzilla är ett nätverk sammansatt av ett stort antal mindre, oberoende och självständiga webbplatser, sammankopplade till en samverkande publicerings- och kommunikationsplattform. Mjukvaran består av en webbapplikation släppt som öppen källkod, som tillhandahåller ett <strong>decentraliserat</strong> fleranvändarsystem för kommunikation, publicering och delning, och när den körs utgör en nod i nätverket. Varje nod erbjuder såväl kommunikationsverktyg (privata meddelanden, chatt, blogg, forum och traditionellt socialt nätverkande) som filhantering (foton, kalenderhändelser, filer, webbsidor, delbara tilläggsprogram) för alla medlemmar; alltihop i en sammanhållen plattform. Dessa noder tar automatiskt kontakt med varandra och resten av nätverket. Sekretess och innehållsstyrning är alltid under din direkta personliga kontroll, och behörighet till inlägg eller filer kan ges eller nekas vem som helst i nätverket. </div> <br /> <div class="tr" style="font-size: 1.4em; color: #666; margin-left: 75px; margin-right: 75px;"> -Det som gör RedMatrix unikt är vad vi kallar "magisk fjärrinloggning" som är baserad på vårt banbrytande arbete med en decentraliserad identitetshantering. Ingen annan plattform vi känner till erbjuder i dagsläget något liknande. Inom nätverket är gränserna mellan de olika noderna utsuddade eller till synes icke-existerande. En identitet i nätverket kan vara övergående och potentiellt nomadisk. "Vem du är" har inget att göra med "vilken dator du ansluter till inom nätverket" och webbsidornas innehåll kan skapas så att det anpassar sig utifrån vem som tittar på det. Du har möjlighet att "klona" din identitet till andra noder, vilket låter dig fortsätta att kommunicera med dina vänner utan avbrott om din primära nod skulle bli otillgänglig (tillfälligt eller permanent). +Det som gör Hubzilla unikt är vad vi kallar "magisk fjärrinloggning" som är baserad på vårt banbrytande arbete med en decentraliserad identitetshantering. Ingen annan plattform vi känner till erbjuder i dagsläget något liknande. Inom nätverket är gränserna mellan de olika noderna utsuddade eller till synes icke-existerande. En identitet i nätverket kan vara övergående och potentiellt nomadisk. "Vem du är" har inget att göra med "vilken dator du ansluter till inom nätverket" och webbsidornas innehåll kan skapas så att det anpassar sig utifrån vem som tittar på det. Du har möjlighet att "klona" din identitet till andra noder, vilket låter dig fortsätta att kommunicera med dina vänner utan avbrott om din primära nod skulle bli otillgänglig (tillfälligt eller permanent). </div> <br /> <div class="tr" style="font-size: 1.4em; color: #666; margin-left: 75px; margin-right: 75px;"> -RedMatrix passar för grupper av alla storlekar - alltifrån privatpersoner och familjer till nätforum, företagswebbplatser och organisationer. Det kan användas av alla som har innehåll de önskar dela med sig av och samtidigt ha full kontroll över vem de delar det med. +Hubzilla passar för grupper av alla storlekar - alltifrån privatpersoner och familjer till nätforum, företagswebbplatser och organisationer. Det kan användas av alla som har innehåll de önskar dela med sig av och samtidigt ha full kontroll över vem de delar det med. </div> <br /> -<div style="margin-bottom: 15px; color: #808080; font-size: 1.8em;"><strong>RedMatrix - "Nätverket"</strong></div> +<div style="margin-bottom: 15px; color: #808080; font-size: 1.8em;"><strong>Hubzilla - "Nä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;*/ @@ -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 ( 'RED_PLATFORM', 'redmatrix' ); +define ( 'RED_PLATFORM', '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' ); @@ -1512,7 +1512,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') ); @@ -2179,7 +2179,7 @@ function construct_page(&$a) { } /** - * @brief Returns RedMatrix's root directory. + * @brief Returns Hubzilla's root directory. * * @return string */ @@ -2287,7 +2287,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/DerivedTheme1.md b/doc/DerivedTheme1.md index d4a7ee148..7544c4948 100644 --- a/doc/DerivedTheme1.md +++ b/doc/DerivedTheme1.md @@ -10,7 +10,7 @@ To create a derived theme, first choose a name. For our example we'll call our t **Directory Structure** -First you need to create a theme directory structure. We'll keep it simple. We need a php directory and a css directory. Here are the Unix/Linux commands to do this. Assume that 'mywebsite' is your top level Red Matrix folder. +First you need to create a theme directory structure. We'll keep it simple. We need a php directory and a css directory. Here are the Unix/Linux commands to do this. Assume that 'mywebsite' is your top level Hubzilla folder. cd mywebsite diff --git a/doc/Developers.md b/doc/Developers.md index 7f12ef206..2e7faf397 100644 --- a/doc/Developers.md +++ b/doc/Developers.md @@ -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 @@ -18,7 +18,7 @@ to notify us to merge your work. **Translations** -Our translations are managed through Transifex. If you wish to help out translating the Red Matrix to another language, sign up on transifex.com, visit [https://www.transifex.com/projects/p/red-matrix/](https://www.transifex.com/projects/p/red-matrix/) and request to join one of the existing language teams or create a new one. Notify one of the core developers when you have a translation update which requires merging, or ask about merging it yourself if you're comfortable with git and PHP. We have a string file called 'messages.po' which is gettext compliant and a handful of email templates, and from there we automatically generate the application's language files. +Our translations are managed through Transifex. If you wish to help out translating the Hubzilla to another language, sign up on transifex.com, visit [https://www.transifex.com/projects/p/red-matrix/](https://www.transifex.com/projects/p/red-matrix/) and request to join one of the existing language teams or create a new one. Notify one of the core developers when you have a translation update which requires merging, or ask about merging it yourself if you're comfortable with git and PHP. We have a string file called 'messages.po' which is gettext compliant and a handful of email templates, and from there we automatically generate the application's language files. [Translations - More Info](help/Translations) diff --git a/doc/Features.md b/doc/Features.md index 78c77c9bd..6358b6946 100644 --- a/doc/Features.md +++ b/doc/Features.md @@ -1,7 +1,7 @@ Extra Features ============== -The default interface of the Red Matrix was designed to be uncluttered. There are a huge number of extra features (some of which are extremely useful) which you can turn on and get the most of the application. These are found under the [Extra Features](settings/features) link of your [Settings](settings) page. +The default interface of the Hubzilla was designed to be uncluttered. There are a huge number of extra features (some of which are extremely useful) which you can turn on and get the most of the application. These are found under the [Extra Features](settings/features) link of your [Settings](settings) page. **Content Expiration** diff --git a/doc/Plugins.md b/doc/Plugins.md index e3e4688d9..9fdbac502 100644 --- a/doc/Plugins.md +++ b/doc/Plugins.md @@ -1,11 +1,11 @@ -Creating Plugins/Addons for the Red Matrix +Creating Plugins/Addons for the Hubzilla ========================================== -So you want to make the Red Matrix do something it doesn't already do. There are lots of ways. But let's learn how to write a plugin or addon. +So you want to make the Hubzilla do something it doesn't already do. There are lots of ways. But let's learn how to write a plugin or addon. -In your Red Matrix folder/directory, you will probably see a sub-directory called 'addon'. If you don't have one already, go ahead and create it. +In your Hubzilla 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 @@ -28,7 +28,7 @@ Then we're going to create a comment block to describe the plugin. There's a spe /** * * Name: Random Place (here you can use better descriptions than you could in the filename) - * Description: Sample Red Matrix plugin, Sets a random place when posting. + * Description: Sample Hubzilla plugin, Sets a random place when posting. * Version: 1.0 * Author: Mike Macgirvin <mike@zothub.com> * @@ -47,9 +47,9 @@ In our case, we'll call them randplace_load() and randplace_unload(), as that is * pluginname_uninstall() -Next we'll talk about **hooks**. Hooks are places in the Red Matrix code where we allow plugins to do stuff. There are a [lot of these](help/Hooks), and they each have a name. What we normally do is use the pluginname_load() function to register a "handler function" for any hooks you are interested in. Then when any of these hooks are triggered, your code will be called. +Next we'll talk about **hooks**. Hooks are places in the Hubzilla code where we allow plugins to do stuff. There are a [lot of these](help/Hooks), and they each have a name. What we normally do is use the pluginname_load() function to register a "handler function" for any hooks you are interested in. Then when any of these hooks are triggered, your code will be called. -We register hook handlers with the 'register_hook()' function. It takes 3 arguments. The first is the hook we wish to catch, the second is the filename of the file to find our handler function (relative to the base of your Red Matrix installation), and the third is the function name of your handler function. So let's create our randplace_load() function right now. +We register hook handlers with the 'register_hook()' function. It takes 3 arguments. The first is the hook we wish to catch, the second is the filename of the file to find our handler function (relative to the base of your Hubzilla installation), and the third is the function name of your handler function. So let's create our randplace_load() function right now. function randplace_load() { @@ -244,18 +244,18 @@ we will create an argc/argv list for use by your module functions ***Porting Friendica Plugins*** -The Red Matrix uses a similar plugin architecture to the Friendica project. The authentication, identity, and permissions systems are completely different. Many Friendica can be ported reasonably easily by renaming a few functions - and then ensuring that the permissions model is adhered to. The functions which need to be renamed are: +The Hubzilla uses a similar plugin architecture to the Friendica project. The authentication, identity, and permissions systems are completely different. Many Friendica can be ported reasonably easily by renaming a few functions - and then ensuring that the permissions model is adhered to. The functions which need to be renamed are: * Friendica's pluginname_install() is pluginname_load() * Friendica's pluginname_uninstall() is pluginname_unload() -The Red Matrix has _install and _uninstall functions but these are used differently. +The Hubzilla has _install and _uninstall functions but these are used differently. * Friendica's "plugin_settings" hook is called "feature_settings" * Friendica's "plugin_settings_post" hook is called "feature_settings_post" -Changing these will often allow your plugin to function, but please double check all your permission and identity code because the concepts behind it are completely different in the Red Matrix. Many structured data names (especially DB schema columns) are also quite different. +Changing these will often allow your plugin to function, but please double check all your permission and identity code because the concepts behind it are completely different in the Hubzilla. Many structured data names (especially DB schema columns) are also quite different. #include doc/macros/main_footer.bb; diff --git a/doc/Privacy.md b/doc/Privacy.md index 2709f47aa..92e5f7702 100644 --- a/doc/Privacy.md +++ b/doc/Privacy.md @@ -4,22 +4,22 @@ Q: Who can see my content? -A: By default ANYBODY on the internet, UNLESS you restrict it. The RedMatrix allows you to choose the privacy level you desire. Restricted content will NOT be visible to spy networks and their advertisers. It will be protected against eavesdropping by outsiders - to the best of our ability. Hub administrators with sufficient skills and patience MAY be able to eavesdrop on some private communications but they must expend effort to do so. Privacy modes exist within the RedMatrix which are even resistant to eavesdropping by skilled and determined hub administrators. +A: By default ANYBODY on the internet, UNLESS you restrict it. The Hubzilla allows you to choose the privacy level you desire. Restricted content will NOT be visible to spy networks and their advertisers. It will be protected against eavesdropping by outsiders - to the best of our ability. Hub administrators with sufficient skills and patience MAY be able to eavesdrop on some private communications but they must expend effort to do so. Privacy modes exist within the Hubzilla which are even resistant to eavesdropping by skilled and determined hub administrators. Q: Can my content be censored? -A: The RedMatrix (the network) CANNOT censor your content. Server and hub administrators are subject to local laws and MAY remove objectionable content from their site/hub. Anybody MAY become a hub administrator, including you; and therefore publish content which might otherwise be censored. You still MAY be subject to local laws. +A: The Hubzilla (the network) CANNOT censor your content. Server and hub administrators are subject to local laws and MAY remove objectionable content from their site/hub. Anybody MAY become a hub administrator, including you; and therefore publish content which might otherwise be censored. You still MAY be subject to local laws. ##Definitions -**RedMatrix** +**Hubzilla** -Otherwise referred to as "the network", the RedMatrix is a collection of individual computers/servers (aka **hubs**) which connect together to form a larger cooperative network. +Otherwise referred to as "the network", the Hubzilla is a collection of individual computers/servers (aka **hubs**) which connect together to form a larger cooperative network. **hub** -An individual computer or server connected to the RedMatrix. These are provided by a **hub administrator** and may be public or private, paid or free. +An individual computer or server connected to the Hubzilla. These are provided by a **hub administrator** and may be public or private, paid or free. **hub administrator** @@ -29,17 +29,17 @@ The system operator of an individual hub. **Public Information** -Any information or anything posted by you within the RedMatrix MAY be public or visible to anybody on the internet. To the extent possible, the RedMatrix allows you to protect content and restrict who can view it. +Any information or anything posted by you within the Hubzilla MAY be public or visible to anybody on the internet. To the extent possible, the Hubzilla allows you to protect content and restrict who can view it. Your profile photo, your channel name, and the location (URL or network address) of your channel are visible to anybody on the internet and privacy controls will not affect the display of these items. -You MAY additionally provide other profile information. Any information which you provide in your "default" or **public profile** MAY be transmitted to other hubs in the RedMatrix and additionally MAY be displayed in the channel directory. You can restrict the viewing of this profile information. It may be restricted only to members of your hub, or only connections (friends), or other limited sets of viewers as you desire. If you wish for your profile to be restricted, you must set the appropriate privacy setting, or simply DO NOT provide additional information. +You MAY additionally provide other profile information. Any information which you provide in your "default" or **public profile** MAY be transmitted to other hubs in the Hubzilla and additionally MAY be displayed in the channel directory. You can restrict the viewing of this profile information. It may be restricted only to members of your hub, or only connections (friends), or other limited sets of viewers as you desire. If you wish for your profile to be restricted, you must set the appropriate privacy setting, or simply DO NOT provide additional information. **Content** -Content you provide (status posts, photos, files, etc.) belongs to you. The RedMatrix default is to publish content openly and visible to anybody on the internet (PUBLIC). You MAY control this in your channel settings and restrict the default permissions or you MAY restrict the visibility of any single published item separately (PRIVATE). The RedMatrix developers will ensure that restricted content is ONLY visible to those in the restriction list - to the best of their ability. +Content you provide (status posts, photos, files, etc.) belongs to you. The Hubzilla default is to publish content openly and visible to anybody on the internet (PUBLIC). You MAY control this in your channel settings and restrict the default permissions or you MAY restrict the visibility of any single published item separately (PRIVATE). The Hubzilla developers will ensure that restricted content is ONLY visible to those in the restriction list - to the best of their ability. -Content (especially status posts) that you share with other networks or that you have made visible to anybody on the internet (PUBLIC) cannot easily be taken back once it has been published. It MAY be shared with other networks and made available through RSS/Atom feeds. It may also be syndicated on other RedMatrix sites. It MAY appear on spy networks and internet searches. If you do not wish this default behaviour please adjust your channel settings and restrict who can see your content. +Content (especially status posts) that you share with other networks or that you have made visible to anybody on the internet (PUBLIC) cannot easily be taken back once it has been published. It MAY be shared with other networks and made available through RSS/Atom feeds. It may also be syndicated on other Hubzilla sites. It MAY appear on spy networks and internet searches. If you do not wish this default behaviour please adjust your channel settings and restrict who can see your content. **Comments and Forum posts** @@ -48,25 +48,25 @@ Comments to posts that were created by others and posts which are designated as **Private Information** -RedMatrix developers will ensure that any content you provide which is designated as PRIVATE will be protected against eavesdropping - to the best of their ability. Private content is generally hidden or obscured even from hub administrators. It is also stripped from email notifications. It is difficult but NOT impossible for this content to be seen by a hub administrator. This is a side effect of the physical laws of the universe. Unfortunately, if a database needs to decrypt a post at display time, it must have the means to decrypt the post! End to end encryption is also provided and this CANNOT be seen, even by a determined administrator. +Hubzilla developers will ensure that any content you provide which is designated as PRIVATE will be protected against eavesdropping - to the best of their ability. Private content is generally hidden or obscured even from hub administrators. It is also stripped from email notifications. It is difficult but NOT impossible for this content to be seen by a hub administrator. This is a side effect of the physical laws of the universe. Unfortunately, if a database needs to decrypt a post at display time, it must have the means to decrypt the post! End to end encryption is also provided and this CANNOT be seen, even by a determined administrator. ##Identity Privacy -Privacy for your identity is another aspect. Because you have a decentralized identity in the Red Matrix, your privacy extends beyond your home hub. If you want to have complete control of your privacy and security you should run your own hub on a dedicated server. For many people, this is complicated and may stretch their technical abilities. So let's list a few precautions you can make to assure your privacy as much as possible. +Privacy for your identity is another aspect. Because you have a decentralized identity in the Hubzilla, your privacy extends beyond your home hub. If you want to have complete control of your privacy and security you should run your own hub on a dedicated server. For many people, this is complicated and may stretch their technical abilities. So let's list a few precautions you can make to assure your privacy as much as possible. -A decentralized identity has a lot of advantages and gives you al lot of interesting features, but you should be aware of the fact that your identity is known by other hubs in the Red Matrix network. One of those advantages is that other channels can serve you customized content and allow you to see private things (such as private photos which others wish to share with you). Because of this those channels need to know who you are. But we understand that sometimes those other channels know more from you than you might desire. For instance the plug-in Visage that can tell a channel owner the last time you visit their profile. You can easily OPT-OUT of this low level and we think, harmless tracking. +A decentralized identity has a lot of advantages and gives you al lot of interesting features, but you should be aware of the fact that your identity is known by other hubs in the Hubzilla network. One of those advantages is that other channels can serve you customized content and allow you to see private things (such as private photos which others wish to share with you). Because of this those channels need to know who you are. But we understand that sometimes those other channels know more from you than you might desire. For instance the plug-in Visage that can tell a channel owner the last time you visit their profile. You can easily OPT-OUT of this low level and we think, harmless tracking. -* You can enable [Do Not Track (DNT)](http://donottrack.us/) in your web browser. We respect this new privacy policy proposal. All modern browsers support DNT. You will find it in the privacy settings of your browsers or else you can consult the web browser's manual. This will not affect the functionality of the Red Matrix. This setting is probably enough for most people. +* You can enable [Do Not Track (DNT)](http://donottrack.us/) in your web browser. We respect this new privacy policy proposal. All modern browsers support DNT. You will find it in the privacy settings of your browsers or else you can consult the web browser's manual. This will not affect the functionality of the Hubzilla. This setting is probably enough for most people. *You can [disable publication](settings) of your channel in our channel directory. If you want people to find your channel, you should give your channel address directly to them. We think this is a good indication that you prefer extra privacy and automatically enable "Do Not Track" if this is the case. * You can have a blocked hub. That means that all channels and content on that hub is not public, and not visible to the outside world. This is something only your hub administrator can do. We also respect this and automatically enable "Do Not Track" if it is set. ###Censorship -The RedMatrix is a global network which is inclusive of all religions and cultures. This does not imply that every member of the network feels the same way you do on contentious issues, and some people may be STRONGLY opposed to the content you post. In general, if you wish to post something that you know may nor be universally acceptable, the best approach is to restrict the audience using privacy controls to a small circle of friends. +The Hubzilla is a global network which is inclusive of all religions and cultures. This does not imply that every member of the network feels the same way you do on contentious issues, and some people may be STRONGLY opposed to the content you post. In general, if you wish to post something that you know may nor be universally acceptable, the best approach is to restrict the audience using privacy controls to a small circle of friends. -The RedMatrix as a network provider is unable to censor content. However, hub administrators MAY censor any content which appears on their hub to comply with local laws or even personal judgement. Their decision is final. If you have issues with any hub administrator, you may move your account and postings to another site which is more in line with your expectations. Please check (periodically) the [Terms of Service](help/TermsOfService) of your hub to learn about any rules or guidelines. If your content consists of material which is illegal or may cause issues, you are STRONGLY encouraged to host your own (become a hub administrator). You may still find that your content is blocked on some hubs, but the RedMatrix as a network cannot block it from being posted. +The Hubzilla as a network provider is unable to censor content. However, hub administrators MAY censor any content which appears on their hub to comply with local laws or even personal judgement. Their decision is final. If you have issues with any hub administrator, you may move your account and postings to another site which is more in line with your expectations. Please check (periodically) the [Terms of Service](help/TermsOfService) of your hub to learn about any rules or guidelines. If your content consists of material which is illegal or may cause issues, you are STRONGLY encouraged to host your own (become a hub administrator). You may still find that your content is blocked on some hubs, but the Hubzilla as a network cannot block it from being posted. -The RedMatrix RECOMMENDS that hub administrators provide a grace period of 1-2 days between warning an account holder of content that needs to be removed and physically removing or disabling the account. This will give the content owner an opportunity to export their channel meta-data and import it to another site. In rare cases the content may be of such a nature to justify the immediate termination of the account. This is a hub decision, not a RedMatrix decision. +The Hubzilla RECOMMENDS that hub administrators provide a grace period of 1-2 days between warning an account holder of content that needs to be removed and physically removing or disabling the account. This will give the content owner an opportunity to export their channel meta-data and import it to another site. In rare cases the content may be of such a nature to justify the immediate termination of the account. This is a hub decision, not a Hubzilla decision. If you typically and regularly post content of an adult or offensive nature, you are STRONGLY encouraged to mark your account "NSFW" (Not Safe For Work). This will prevent the display of your profile photo in the directory except to viewers that have chosen to disable "safe mode". If your profile photo is found by directory administrators to be adult or offensive, the directory administrator MAY flag your profile photo as NSFW. There is currently no official mechanism to contest or reverse this decision, which is why you SHOULD mark your own account NSFW if it is likely to be inappropriate for general audiences. diff --git a/doc/README.md b/doc/README.md index 845fedbd9..9ff0ea81a 100644 --- a/doc/README.md +++ b/doc/README.md @@ -1,11 +1,35 @@ - -The RedMatrix (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 - Hub Deployment Platform +================================== -What makes the RedMatrix unique is what we call "magic authentication" - which is based on our groundbreaking work in decentralised identity services. This ties all RedMatrix 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. + -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*". +**What are Hubs?** -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 RedMatrix 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 Red Matrix is free and open source distributed under the MIT license. +Hubs are independant 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. diff --git a/doc/Remove-Account.md b/doc/Remove-Account.md index dc39a8cbd..93998bca8 100644 --- a/doc/Remove-Account.md +++ b/doc/Remove-Account.md @@ -13,7 +13,7 @@ Visit the URL https://yoursite/removeme -(replace 'yoursite' with the domain name of your Red Matrix site). +(replace 'yoursite' with the domain name of your Hubzilla 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/Translations.md b/doc/Translations.md index 7435a28bf..a63bfa86d 100644 --- a/doc/Translations.md +++ b/doc/Translations.md @@ -1,4 +1,4 @@ -Translating the Red Matrix +Translating the Hubzilla ========================== Translation Process diff --git a/doc/about.bb b/doc/about.bb index bd91970f6..83f1fb0c6 100644 --- a/doc/about.bb +++ b/doc/about.bb @@ -1,8 +1,8 @@ [b]About[/b]
-The Red Matrix is a decentralized communication network, which aims to provide communication that is censorship-resistant, privacy-respecting, and thus free from the oppressive claws of contemporary corporate communication giants. These giants function primarily as spy networks for paying clients of all sorts and types, in addition to monopolizing and centralizing the Internet; a feature that was not part of the original and revolutionary goals that produced the World Wide Web.
+The Hubzilla is a decentralized communication network, which aims to provide communication that is censorship-resistant, privacy-respecting, and thus free from the oppressive claws of contemporary corporate communication giants. These giants function primarily as spy networks for paying clients of all sorts and types, in addition to monopolizing and centralizing the Internet; a feature that was not part of the original and revolutionary goals that produced the World Wide Web.
-The Red Matrix is free and open source. It is designed to scale from a $35 Raspberry Pi, to top of the line AMD and Intel Xeon-powered multi-core enterprise servers. It can be used to support communication between a few individuals, or scale to many thousands and more.
+The Hubzilla is free and open source. It is designed to scale from a $35 Raspberry Pi, to top of the line AMD and Intel Xeon-powered multi-core enterprise servers. It can be used to support communication between a few individuals, or scale to many thousands and more.
Red aims to be skill and resource agnostic. It is easy to use by everyday computer users, as well as by systems administrators and developers.
@@ -10,13 +10,13 @@ How you use it depends on how you want to use it. It is written in the PHP scripting language, thus making it trivial to install on any hosting platform in use today. This includes self-hosting at home, at hosting providers such as [url=http://mediatemple.com/]Media Temple[/url] and [url=http://www.dreamhost.com/]Dreamhost[/url], or on virtual and dedicated servers, offered by the likes of [url=https://www.linode.com]Linode[/url], [url=http://greenqloud.com]GreenQloud[/url] or [url=https://aws.amazon.com]Amazon AWS[/url].
-In other words, the Red Matrix can run on any computing platform that comes with a web server, a MySQL-compatible database, and the PHP scripting language.
+In other words, the Hubzilla can run on any computing platform that comes with a web server, a MySQL-compatible database, and the PHP scripting language.
Along the way, Red offers a number of unique goodies:
-[b]Single-click user identification:[/b] meaning you can access sites on the Red Matrix simply by clicking on links to remote sites. Authentication just happens automagically behind the scenes. Forget about remembering multiple user names with multiple passwords when accessing different sites online.
+[b]Single-click user identification:[/b] meaning you can access sites on the Hubzilla simply by clicking on links to remote sites. Authentication just happens automagically behind the scenes. Forget about remembering multiple user names with multiple passwords when accessing different sites online.
-[b]Cloning:[/b] of online identities. Your online presence no longer has to be tied to a single server, domain name or IP address. You can clone and import your identity (or channel as we call it) to another server (or, a hub as servers are known in the Red Matrix). Now, should your primary hub go down, no worries, your contacts, posts[i]*[/i], and messages[i]*[/i] will automagically continue to be available and accessible under your cloned channel. [i](*: only posts and messages as from the moment you cloned your channel)[/i]
+[b]Cloning:[/b] of online identities. Your online presence no longer has to be tied to a single server, domain name or IP address. You can clone and import your identity (or channel as we call it) to another server (or, a hub as servers are known in the Hubzilla). Now, should your primary hub go down, no worries, your contacts, posts[i]*[/i], and messages[i]*[/i] will automagically continue to be available and accessible under your cloned channel. [i](*: only posts and messages as from the moment you cloned your channel)[/i]
[b]Privacy:[/b] Red identities (Zot IDs) can be deleted, backed up/downloaded, and cloned. The user is in full control of their data. Should you decide to delete all your content and erase your Zot ID, all you have to do is click on a link and it's immediately deleted from the hub. No questions, no fuss.
diff --git a/doc/account_basics.bb b/doc/account_basics.bb index 0a55d2f03..327709459 100644 --- a/doc/account_basics.bb +++ b/doc/account_basics.bb @@ -2,7 +2,7 @@ [b]Registration[/b]
-Not all Red Matrix sites allow open registration. If registration is allowed, you will see a "Register" link immediately below the login prompts on the site home page. Following this link will take you to the site Registration page. On some sites it may redirect you to another site which allow registrations. As all Red Matrix sites are linked, it does not matter where your account resides.
+Not all Hubzilla sites allow open registration. If registration is allowed, you will see a "Register" link immediately below the login prompts on the site home page. Following this link will take you to the site Registration page. On some sites it may redirect you to another site which allow registrations. As all Hubzilla sites are linked, it does not matter where your account resides.
[b]Your Email Address[/b]
@@ -10,7 +10,7 @@ Please provide a valid email address. Your email address is never published. Thi [b]Password[/b]
-Enter a password of your choice, and repeat it in the second box to ensure it was typed correctly. As the Red Matrix offers a decentralised identity, your account can log you in to many other websites.
+Enter a password of your choice, and repeat it in the second box to ensure it was typed correctly. As the Hubzilla offers a decentralised identity, your account can log you in to many other websites.
[b]Terms Of Service[/b]
diff --git a/doc/accounts_profiles_channels_basics.bb b/doc/accounts_profiles_channels_basics.bb index f8abd3c3b..c20b247bd 100644 --- a/doc/accounts_profiles_channels_basics.bb +++ b/doc/accounts_profiles_channels_basics.bb @@ -4,11 +4,11 @@ Once you have registered an [i]account[/i] at the matrix you have also created a [b]Account[/b] You have [i]one[/i] account. This consists of your email account and your password. With your account you access your profile and your channel. -[i]Think of your account as the way you authenticate at one Red Matrix site. It lets you do things, such as creating profiles and channels with which you can connect to other people.[/i] +[i]Think of your account as the way you authenticate at one Hubzilla site. It lets you do things, such as creating profiles and channels with which you can connect to other people.[/i] [b]Profile[/b] You have surely registered with some other internet services, such as forums or online communities. For all of them you provided some information about yourself, such as date of birth, country, age and the likes. [observer=1]If you like you can see your profile here: [baseurl]/profile/[observer.webname] and edit it by clicking on the pencil icon next to your avatar image. [/observer] -Unlike other services Red Matrix offers you the advantage of creating [i]many more profiles[/i]. That way you are able to distinguish between profiles targeted specially at everyone (your public profile), your work mates, your family and your partner. +Unlike other services Hubzilla offers you the advantage of creating [i]many more profiles[/i]. That way you are able to distinguish between profiles targeted specially at everyone (your public profile), your work mates, your family and your partner. [i]Think of your profile as the basic information about yourself you tell other people.[/i] [b]Channel[/b] diff --git a/doc/addons.bb b/doc/addons.bb index cad662308..56ec08086 100644 --- a/doc/addons.bb +++ b/doc/addons.bb @@ -42,7 +42,7 @@ [*] qrator - generate QR code images [*] rainbowtag - display your tag and category clouds in colours [*] randpost - post/reply bot based on and requires fortunate -[*] redred - Crosspost to another Redmatrix channel +[*] redred - Crosspost to another Hubzilla channel [*] rtof - Crosspost to Friendica [*] smiley_pack - extend the built-in smilie (emoticon) support [*] smileybutton - provides a smiley selector on the post window @@ -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 61c8f92c1..bdb023c8e 100644 --- a/doc/addons_gnusocial.bb +++ b/doc/addons_gnusocial.bb @@ -8,17 +8,17 @@ https://yourgnusocialinstance.org/settings/oauthapps Next, click the link to Register a new application. That brings up the new application form. Here's what to do on each field. -Icon. I uploaded the RedMatrix icon located at this link, after saving it to my computer: +Icon. I uploaded the Hubzilla 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 RedMatrix to GNUsocial. +Description. Use this field to describe the purpose of the application. I put something to the effect of use for crossposting from Hubzilla 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 RedMatrix is unorganized, I put that. If you use your installation for a group or business, that might be a good option. +Organization. Since Hubzilla is unorganized, I put that. If you use your installation for a group or business, that might be a good option. Homepage. If your group is using a subdomain, you probably want to put your main domain URI here. Since I'm on a hosted site, I put redmatrix.me. @@ -32,13 +32,13 @@ All fields except the callback URL must be filled in. Click on the save button. -Then click on the icon or the name of the application for the information you'll need to insert over on RedMatrix. +Then click on the icon or the name of the application for the information you'll need to insert over on Hubzilla. ***** -Now open up a new tab or window and go to your RedMatrix account, to Settings > Feature settings. Find the StatusNet Posting Settings. +Now open up a new tab or window and go to your Hubzilla account, to Settings > Feature settings. Find the StatusNet Posting Settings. -Insert the strings of numbers given on the GNUsocial site into the RedMatrix fields for Consumer Key and Consumer Secret. +Insert the strings of numbers given on the GNUsocial site into the Hubzilla fields for Consumer Key and Consumer Secret. The Base API Path (remember the trailing /) will be your instance domain, plus the /api/ following. It will probably look like this: @@ -50,15 +50,15 @@ StatusNet application name: Insert the name you gave to the application over on Click Submit. -A button will appear for you to "Sign in to StatusNet." Click it and that will open a tab or window on the GNUsocial site for you to click "Allow." Once clicked and successfully authorized, a security code number will appear. Copy it and go back to the RedMatrix app you just left and insert it in the field: "Copy the security code from StatusNet here." Click Submit. +A button will appear for you to "Sign in to StatusNet." Click it and that will open a tab or window on the GNUsocial site for you to click "Allow." Once clicked and successfully authorized, a security code number will appear. Copy it and go back to the Hubzilla app you just left and insert it in the field: "Copy the security code from StatusNet here." Click Submit. -If successful, your information from the GNUsocial instance should appear in the RedMatrix app. +If successful, your information from the GNUsocial instance should appear in the Hubzilla app. -You now have several options to choose, if you desire, and those will need to be confirmed by clicking "Submit" also. The most interesting is "Send public postings to StatusNet by default." This option automatically sends any post of yours made in your RedMatrix account to your GNUsocial instance. +You now have several options to choose, if you desire, and those will need to be confirmed by clicking "Submit" also. The most interesting is "Send public postings to StatusNet by default." This option automatically sends any post of yours made in your Hubzilla account to your GNUsocial instance. If you don't choose this option, you will have an option to send a post to your GNUsocial instance by first opening the post (by clicking in the post text area) and clicking on the lock icon next to the Share button. Select the GNUsocial icon made up of three colored dialog baloons. Close that window, then make your post. -If all goes well, you have just cross-posted your RedMatrix post to your account on a GNUsocial instance. +If all goes well, you have just cross-posted your Hubzilla post to your account on a GNUsocial instance. #include doc/macros/addons_footer.bb; diff --git a/doc/bbcode.html b/doc/bbcode.html index f75b1c90b..2b552f0b1 100644 --- a/doc/bbcode.html +++ b/doc/bbcode.html @@ -7,7 +7,7 @@ <li>[u]underlined[/u] - <u>underlined</u><br /> <li>[s]strike[/s] - <strike>strike</strike><br /> <li>[color=red]red[/color] - <span style="color: red;">red</span><br /> -<li>[url=https://redmatrix.me]Red Matrix[/url] <a href="https://redmatrix.me">Red Matrix</a><br /> +<li>[url=https://redmatrix.me]Hubzilla[/url] <a href="https://redmatrix.me">Hubzilla</a><br /> <li>[img]https://redmatrix.me/images/default_profile_photos/rainbow_man/48.jpg[/img] <img src="https://redmatrix.me/images/default_profile_photos/rainbow_man/48.jpg" alt="Image/photo" /><br /> <li>[img float=left]https://redmatrix.me/images/default_profile_photos/rainbow_man/48.jpg[/img] <img src="https://redmatrix.me/images/default_profile_photos/rainbow_man/48.jpg" style="float:left;" alt="Image/photo" /><br /> <div style="clear:both;"></div> @@ -47,7 +47,7 @@ </ul><br /> <br />Tables? Yes!<br /><br />[table border=1]<br /> [tr]<br /> [th]Tables now[/th]<br /> [/tr]<br /> [tr]<br /> [td]Have headers[/td]<br /> [/tr]<br />[/table]<br /><br /><table border="1" ><tr><th>Tables now</th></tr><tr><td>Have headers</td></tr></table><br />All sizes, <br />From the [size=xx-small] - <span style="font-size: xx-small;">xx-small</span>.<br />To the [size=xx-large] - <span style="font-size: xx-large;">xx-large</span>.<br />To fit exactly <span style="font-size: 20px;">20px</span> use [size=20].<br /><br /> -<p>Red Matrix specific codes</p> +<p>Hubzilla specific codes</p> <ul class="listbullet" style="list-style-type: circle;"> <li>[&copy;] © This works for many HTML entities</li> <li>[zrl]https://redmatrix.me[/zrl] Magic-auth version of [url] tag</li> diff --git a/doc/campaign.bb b/doc/campaign.bb index c65c1b080..9abfea129 100644 --- a/doc/campaign.bb +++ b/doc/campaign.bb @@ -4,7 +4,7 @@ [b][color= grey][size=18]Single-click sign on, nomadic identity, censorship-resistance, privacy, self-hosting[/size][/color][/b]
-We started the Red Matrix project by asking ourselves a few questions:
+We started the Hubzilla project by asking ourselves a few questions:
- Imagine if it was possible to just access the content of different web sites, without the need to enter usernames and passwords for every site. Such a feature would permit Single-Click user identification: the ability to access sites simply by clicking on links to remote sites.
Authentication just happens automagically behind the scenes. Forget about remembering multiple user names with multiple passwords when accessing different sites online.
@@ -52,7 +52,7 @@ Think of it this way: the internet is nothing, but a bunch of permissions and a [b][color= grey][size=20]The Matrix is Born![/size][/color][/b]
-After asking and striving to answer a number of such questions, we realized that we were imagining a general purpose communication network with a number of unique, and potentially game-changing, features. We called it the Red Matrix and started thinking of it as an over-lay on top of the internet as it exists today; an operating system re-invented as a communication network, with its own permissions, access control lists, protocol, connectors to others services, and open-ended possibilities via its API. The sum of the matrix is greater than it's parts. We're not building website, but a way for websites to link together and grow into something that is unique and ever-changing, with autonomy and privacy.
+After asking and striving to answer a number of such questions, we realized that we were imagining a general purpose communication network with a number of unique, and potentially game-changing, features. We called it the Hubzilla and started thinking of it as an over-lay on top of the internet as it exists today; an operating system re-invented as a communication network, with its own permissions, access control lists, protocol, connectors to others services, and open-ended possibilities via its API. The sum of the matrix is greater than it's parts. We're not building website, but a way for websites to link together and grow into something that is unique and ever-changing, with autonomy and privacy.
It's a lot of work, for anyone. So far, we've got a team of a handful of volunteers, code geeks, brave early adopters, system administrators and other good people, willing to give the project a shot. We're motivated by our commitment to a free web, where privacy is built-in, and corporations don't have a stranglehold on our daily communication.
@@ -60,7 +60,7 @@ We need your help to finish it and release it to the world! [b][color= grey][size=20]What have we written so far[/size][/color][/b]
-As of the today, the Red Matrix is in developer preview (alpha) state. It is not ready for everyday use, but some of the initial set of core features are implemented (again, in alpha state). These include:
+As of the today, the Hubzilla is in developer preview (alpha) state. It is not ready for everyday use, but some of the initial set of core features are implemented (again, in alpha state). These include:
- Zot, the protocol powering the matrix
- Single-signon logins.
@@ -71,7 +71,7 @@ As of the today, the Red Matrix is in developer preview (alpha) state. It is no [b][color= grey][size=20]Our TO-DO List[/size][/color][/b]
-However, in addition to finishing and polishing the above, there are a number of features that have to implemented to make the Red Matrix ready for daily use. If we meet our fundraising goal, we hope to dive into the following road map, by order of priority:
+However, in addition to finishing and polishing the above, there are a number of features that have to implemented to make the Hubzilla ready for daily use. If we meet our fundraising goal, we hope to dive into the following road map, by order of priority:
- A professionally designed user interface (UI), interface that is adaptive to any user level, from end users who want to use the Matrix as a social network, to tinkerers who will put together a customized blog using Comanche, to hackers who will develop and extend the matrix using a built-in code editor, that hooks to the API and the git.
@@ -97,7 +97,7 @@ If we raise our targeted amount of funds, we plan to use it as follows: [b][color= grey][size=20]Deadlines[/size][/color][/b]
-[b]March, 2014: Red Matrix Beta with the following features[/b]
+[b]March, 2014: Hubzilla Beta with the following features[/b]
- {LIST FEATURES}
@@ -127,7 +127,7 @@ We'll list your name on our initial supporters list, a Hall of Fame of the matri [b]$16: [/b]
-You get one of your Red Matrix t-shirts, as well as our undying gratitude.
+You get one of your Hubzilla t-shirts, as well as our undying gratitude.
[b]$32: [/b]
@@ -143,9 +143,9 @@ You get one of your Red Matrix t-shirts, as well as our undying gratitude. [b]$2048[/b]
-Each contributor at this level gets their own Red Matrix virtual private server, installed, hosted and supported by us for a period of 1 year.
+Each contributor at this level gets their own Hubzilla virtual private server, installed, hosted and supported by us for a period of 1 year.
-[b][color= grey][size=20]Why are we so excited about the Red Matrix?[/size][/color][/b]
+[b][color= grey][size=20]Why are we so excited about the Hubzilla?[/size][/color][/b]
{SOMETHING ABOUT THE POTENTIAL IMPACT OF RED, ITS INNOVATIONS, ETC>
@@ -153,7 +153,7 @@ Each contributor at this level gets their own Red Matrix virtual private server, 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.
@@ -167,7 +167,7 @@ Perhaps you're good at writing and documenting stuff. Grab an account at one of [b]1. Is Red a social network?[/b]
-The Red Matrix is not a social network. We're thinking of it as a general purpose communication network, with sharing, and public/private communications built into the matrix.
+The Hubzilla is not a social network. We're thinking of it as a general purpose communication network, with sharing, and public/private communications built into the matrix.
[b]2. What is the difference between Red and Friendica?[/b]
@@ -177,7 +177,7 @@ Friendica is really, really good at sending postcards. It can do all sorts of th What Friendica can't do, is wave a postcard at somebody and expect them to believe that holding this postcard prove you are who you say you are. Sure, if you've been sending somebody postcards, they might accept that it is you in the picture, but somebody who has never heard of you will not accept ownership of a postcard as proof of identity.
-The Red Matrix offers a passport.
+The Hubzilla offers a passport.
You can still use it to send postcards. At the same time, when you wave your passport at somebody, they do accept it as proof of identity. No longer do you need to register at every single site you use. You already have an account - it's just not necessarily at our site - so we'll ask to see your passport instead.
@@ -194,7 +194,7 @@ We use MySQL as our database (this include any forks such as, MariaDB or Percona [b]5. How is the Affinity Slider different from Mozilla's Persona?[/b]
{COMPLETE}
-[b]6. Does the Red Matrix use encryption? Details please![/b]
+[b]6. Does the Hubzilla use encryption? Details please![/b]
Yes, we do our best to use free and open source encryption libraries to help achieve privacy from general, mass surveillance.
@@ -207,7 +207,7 @@ For more info on our initial implementation of encrypted communication, check ou [b]7. What do you mean by decentralization? [/b]
-[b]8. Can I build my own website with in the Red Matrix?[/b]
+[b]8. Can I build my own website with in the Hubzilla?[/b]
Yes. The short explanation: We've got this spiffy idea we're calling "Comanche", which will allow non-programmers to build complete custom websites, and any such website will be able to connect to any other website or channel in the matrix. The goal of Comanche is to hide the technical complexities of communicating in the matrix, while encouraging people to use their creativity and put together their own unique presence on the matrix.
diff --git a/doc/classRedmatrix_1_1Import_1_1Import-members.html b/doc/classRedmatrix_1_1Import_1_1Import-members.html index 736a303d8..d5e2f9277 100644 --- a/doc/classRedmatrix_1_1Import_1_1Import-members.html +++ b/doc/classRedmatrix_1_1Import_1_1Import-members.html @@ -4,7 +4,7 @@ <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 Red Matrix: Member List</title> +<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> @@ -30,7 +30,7 @@ <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 Red Matrix + <div id="projectname">The Hubzilla </div> </td> </tr> @@ -87,7 +87,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); </div> </div> <script type="text/javascript"> -$(document).ready(function(){initNavTree('classRedMatrix_1_1Import_1_1Import.html','');}); +$(document).ready(function(){initNavTree('classHubzilla_1_1Import_1_1Import.html','');}); </script> <div id="doc-content"> <!-- window showing the filter options --> @@ -106,26 +106,26 @@ $(document).ready(function(){initNavTree('classRedMatrix_1_1Import_1_1Import.htm <div class="header"> <div class="headertitle"> -<div class="title">RedMatrix\Import\Import Member List</div> </div> +<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="classRedMatrix_1_1Import_1_1Import.html">RedMatrix\Import\Import</a>, including all inherited members.</p> +<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="classRedMatrix_1_1Import_1_1Import.html#a864aac9fadb4846f5d9f840e8e0f440f">$credentials</a></td><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html">RedMatrix\Import\Import</a></td><td class="entry"><span class="mlabel">private</span></td></tr> - <tr><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#ad0d2bdc3b388220479063915b4f5c2fc">$itemlist</a></td><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html">RedMatrix\Import\Import</a></td><td class="entry"><span class="mlabel">protected</span></td></tr> - <tr class="even"><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a0a05dac405ccc5b617b7b7b3c8ed783c">$items</a></td><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html">RedMatrix\Import\Import</a></td><td class="entry"><span class="mlabel">protected</span></td></tr> - <tr><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a88c2eeba8d0cba3e7c12a2c45ba0fbc6">$src_items</a></td><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html">RedMatrix\Import\Import</a></td><td class="entry"><span class="mlabel">protected</span></td></tr> - <tr class="even"><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a5434325afb2c633c52540127d717800a">convert_child</a>($child)</td><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html">RedMatrix\Import\Import</a></td><td class="entry"></td></tr> - <tr><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a107703a43a1b0ceb2af7ae470cb3f218">convert_item</a>($item_ident)</td><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html">RedMatrix\Import\Import</a></td><td class="entry"></td></tr> - <tr class="even"><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#addf6e53dacd971eaab49be4b17a767d6">convert_taxonomy</a>($item_ident)</td><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html">RedMatrix\Import\Import</a></td><td class="entry"></td></tr> - <tr><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a57561904b0f127e0d9a3e2c33688daf8">get_children</a>($item_ident)</td><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html">RedMatrix\Import\Import</a></td><td class="entry"></td></tr> - <tr class="even"><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a24134929d9a8a682da2036a0bf326367">get_credentials</a>()</td><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html">RedMatrix\Import\Import</a></td><td class="entry"></td></tr> - <tr><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a27987a41cb703a796f1821baeb4774a2">get_item</a>($item_ident)</td><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html">RedMatrix\Import\Import</a></td><td class="entry"></td></tr> - <tr class="even"><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a772c28edf36aaf8e66007a95004c4059">get_item_ident</a>($item)</td><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html">RedMatrix\Import\Import</a></td><td class="entry"></td></tr> - <tr><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a855cd5a79b95d269ae8737fae774e3bc">get_itemlist</a>()</td><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html">RedMatrix\Import\Import</a></td><td class="entry"></td></tr> - <tr class="even"><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#ae3c6472bea1a44025bc2e152604eb20c">get_taxonomy</a>($item_ident)</td><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html">RedMatrix\Import\Import</a></td><td class="entry"></td></tr> - <tr><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a8d138a9a7d4f79b81d3446ca216a602c">run</a>()</td><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html">RedMatrix\Import\Import</a></td><td class="entry"></td></tr> - <tr class="even"><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a33ed595de044c0ec1cd84cca719e31dc">store</a>($item, $update=false)</td><td class="entry"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html">RedMatrix\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#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 index 0ee9373f2..9a7128d65 100644 --- a/doc/classRedmatrix_1_1Import_1_1Import.html +++ b/doc/classRedmatrix_1_1Import_1_1Import.html @@ -4,7 +4,7 @@ <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 Red Matrix: RedMatrix\Import\Import Class Reference</title> +<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> @@ -30,7 +30,7 @@ <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 Red Matrix + <div id="projectname">The Hubzilla </div> </td> </tr> @@ -87,7 +87,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); </div> </div> <script type="text/javascript"> -$(document).ready(function(){initNavTree('classRedMatrix_1_1Import_1_1Import.html','');}); +$(document).ready(function(){initNavTree('classHubzilla_1_1Import_1_1Import.html','');}); </script> <div id="doc-content"> <!-- window showing the filter options --> @@ -109,49 +109,49 @@ $(document).ready(function(){initNavTree('classRedMatrix_1_1Import_1_1Import.htm <a href="#pub-methods">Public Member Functions</a> | <a href="#pro-attribs">Protected Attributes</a> | <a href="#pri-attribs">Private Attributes</a> | -<a href="classRedMatrix_1_1Import_1_1Import-members.html">List of all members</a> </div> +<a href="classHubzilla_1_1Import_1_1Import-members.html">List of all members</a> </div> <div class="headertitle"> -<div class="title">RedMatrix\Import\Import Class Reference</div> </div> +<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"> </td><td class="memItemRight" valign="bottom"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a24134929d9a8a682da2036a0bf326367">get_credentials</a> ()</td></tr> +<tr class="memitem:a24134929d9a8a682da2036a0bf326367"><td class="memItemLeft" align="right" valign="top"> </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"> </td></tr> -<tr class="memitem:a855cd5a79b95d269ae8737fae774e3bc"><td class="memItemLeft" align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a855cd5a79b95d269ae8737fae774e3bc">get_itemlist</a> ()</td></tr> +<tr class="memitem:a855cd5a79b95d269ae8737fae774e3bc"><td class="memItemLeft" align="right" valign="top"> </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"> </td></tr> -<tr class="memitem:a772c28edf36aaf8e66007a95004c4059"><td class="memItemLeft" align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a772c28edf36aaf8e66007a95004c4059">get_item_ident</a> ($item)</td></tr> +<tr class="memitem:a772c28edf36aaf8e66007a95004c4059"><td class="memItemLeft" align="right" valign="top"> </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"> </td></tr> -<tr class="memitem:a27987a41cb703a796f1821baeb4774a2"><td class="memItemLeft" align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a27987a41cb703a796f1821baeb4774a2">get_item</a> ($item_ident)</td></tr> +<tr class="memitem:a27987a41cb703a796f1821baeb4774a2"><td class="memItemLeft" align="right" valign="top"> </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"> </td></tr> -<tr class="memitem:ae3c6472bea1a44025bc2e152604eb20c"><td class="memItemLeft" align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#ae3c6472bea1a44025bc2e152604eb20c">get_taxonomy</a> ($item_ident)</td></tr> +<tr class="memitem:ae3c6472bea1a44025bc2e152604eb20c"><td class="memItemLeft" align="right" valign="top"> </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"> </td></tr> -<tr class="memitem:a57561904b0f127e0d9a3e2c33688daf8"><td class="memItemLeft" align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a57561904b0f127e0d9a3e2c33688daf8">get_children</a> ($item_ident)</td></tr> +<tr class="memitem:a57561904b0f127e0d9a3e2c33688daf8"><td class="memItemLeft" align="right" valign="top"> </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"> </td></tr> -<tr class="memitem:a107703a43a1b0ceb2af7ae470cb3f218"><td class="memItemLeft" align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a107703a43a1b0ceb2af7ae470cb3f218">convert_item</a> ($item_ident)</td></tr> +<tr class="memitem:a107703a43a1b0ceb2af7ae470cb3f218"><td class="memItemLeft" align="right" valign="top"> </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"> </td></tr> -<tr class="memitem:addf6e53dacd971eaab49be4b17a767d6"><td class="memItemLeft" align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#addf6e53dacd971eaab49be4b17a767d6">convert_taxonomy</a> ($item_ident)</td></tr> +<tr class="memitem:addf6e53dacd971eaab49be4b17a767d6"><td class="memItemLeft" align="right" valign="top"> </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"> </td></tr> -<tr class="memitem:a5434325afb2c633c52540127d717800a"><td class="memItemLeft" align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a5434325afb2c633c52540127d717800a">convert_child</a> ($child)</td></tr> +<tr class="memitem:a5434325afb2c633c52540127d717800a"><td class="memItemLeft" align="right" valign="top"> </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"> </td></tr> -<tr class="memitem:a33ed595de044c0ec1cd84cca719e31dc"><td class="memItemLeft" align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a33ed595de044c0ec1cd84cca719e31dc">store</a> ($item, $update=false)</td></tr> +<tr class="memitem:a33ed595de044c0ec1cd84cca719e31dc"><td class="memItemLeft" align="right" valign="top"> </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"> </td></tr> -<tr class="memitem:a8d138a9a7d4f79b81d3446ca216a602c"><td class="memItemLeft" align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a8d138a9a7d4f79b81d3446ca216a602c">run</a> ()</td></tr> +<tr class="memitem:a8d138a9a7d4f79b81d3446ca216a602c"><td class="memItemLeft" align="right" valign="top"> </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"> </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"> </td><td class="memItemRight" valign="bottom"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#ad0d2bdc3b388220479063915b4f5c2fc">$itemlist</a> = null</td></tr> +<tr class="memitem:ad0d2bdc3b388220479063915b4f5c2fc"><td class="memItemLeft" align="right" valign="top"> </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"> </td></tr> -<tr class="memitem:a88c2eeba8d0cba3e7c12a2c45ba0fbc6"><td class="memItemLeft" align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a88c2eeba8d0cba3e7c12a2c45ba0fbc6">$src_items</a> = null</td></tr> +<tr class="memitem:a88c2eeba8d0cba3e7c12a2c45ba0fbc6"><td class="memItemLeft" align="right" valign="top"> </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"> </td></tr> -<tr class="memitem:a0a05dac405ccc5b617b7b7b3c8ed783c"><td class="memItemLeft" align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a0a05dac405ccc5b617b7b7b3c8ed783c">$items</a> = null</td></tr> +<tr class="memitem:a0a05dac405ccc5b617b7b7b3c8ed783c"><td class="memItemLeft" align="right" valign="top"> </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"> </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"> </td><td class="memItemRight" valign="bottom"><a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a864aac9fadb4846f5d9f840e8e0f440f">$credentials</a> = null</td></tr> +<tr class="memitem:a864aac9fadb4846f5d9f840e8e0f440f"><td class="memItemLeft" align="right" valign="top"> </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"> </td></tr> </table> <h2 class="groupheader">Member Function Documentation</h2> @@ -160,7 +160,7 @@ Private Attributes</h2></td></tr> <div class="memproto"> <table class="memname"> <tr> - <td class="memname">RedMatrix\Import\Import::convert_child </td> + <td class="memname">Hubzilla\Import\Import::convert_child </td> <td>(</td> <td class="paramtype"> </td> <td class="paramname"><em>$child</em></td><td>)</td> @@ -169,7 +169,7 @@ Private Attributes</h2></td></tr> </table> </div><div class="memdoc"> -<p>Referenced by <a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a8d138a9a7d4f79b81d3446ca216a602c">RedMatrix\Import\Import\run()</a>.</p> +<p>Referenced by <a class="el" href="classHubzilla_1_1Import_1_1Import.html#a8d138a9a7d4f79b81d3446ca216a602c">Hubzilla\Import\Import\run()</a>.</p> </div> </div> @@ -178,7 +178,7 @@ Private Attributes</h2></td></tr> <div class="memproto"> <table class="memname"> <tr> - <td class="memname">RedMatrix\Import\Import::convert_item </td> + <td class="memname">Hubzilla\Import\Import::convert_item </td> <td>(</td> <td class="paramtype"> </td> <td class="paramname"><em>$item_ident</em></td><td>)</td> @@ -187,7 +187,7 @@ Private Attributes</h2></td></tr> </table> </div><div class="memdoc"> -<p>Referenced by <a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a8d138a9a7d4f79b81d3446ca216a602c">RedMatrix\Import\Import\run()</a>.</p> +<p>Referenced by <a class="el" href="classHubzilla_1_1Import_1_1Import.html#a8d138a9a7d4f79b81d3446ca216a602c">Hubzilla\Import\Import\run()</a>.</p> </div> </div> @@ -196,7 +196,7 @@ Private Attributes</h2></td></tr> <div class="memproto"> <table class="memname"> <tr> - <td class="memname">RedMatrix\Import\Import::convert_taxonomy </td> + <td class="memname">Hubzilla\Import\Import::convert_taxonomy </td> <td>(</td> <td class="paramtype"> </td> <td class="paramname"><em>$item_ident</em></td><td>)</td> @@ -205,7 +205,7 @@ Private Attributes</h2></td></tr> </table> </div><div class="memdoc"> -<p>Referenced by <a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a8d138a9a7d4f79b81d3446ca216a602c">RedMatrix\Import\Import\run()</a>.</p> +<p>Referenced by <a class="el" href="classHubzilla_1_1Import_1_1Import.html#a8d138a9a7d4f79b81d3446ca216a602c">Hubzilla\Import\Import\run()</a>.</p> </div> </div> @@ -214,7 +214,7 @@ Private Attributes</h2></td></tr> <div class="memproto"> <table class="memname"> <tr> - <td class="memname">RedMatrix\Import\Import::get_children </td> + <td class="memname">Hubzilla\Import\Import::get_children </td> <td>(</td> <td class="paramtype"> </td> <td class="paramname"><em>$item_ident</em></td><td>)</td> @@ -223,7 +223,7 @@ Private Attributes</h2></td></tr> </table> </div><div class="memdoc"> -<p>Referenced by <a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a8d138a9a7d4f79b81d3446ca216a602c">RedMatrix\Import\Import\run()</a>.</p> +<p>Referenced by <a class="el" href="classHubzilla_1_1Import_1_1Import.html#a8d138a9a7d4f79b81d3446ca216a602c">Hubzilla\Import\Import\run()</a>.</p> </div> </div> @@ -232,7 +232,7 @@ Private Attributes</h2></td></tr> <div class="memproto"> <table class="memname"> <tr> - <td class="memname">RedMatrix\Import\Import::get_credentials </td> + <td class="memname">Hubzilla\Import\Import::get_credentials </td> <td>(</td> <td class="paramname"></td><td>)</td> <td></td> @@ -240,7 +240,7 @@ Private Attributes</h2></td></tr> </table> </div><div class="memdoc"> -<p>Referenced by <a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a8d138a9a7d4f79b81d3446ca216a602c">RedMatrix\Import\Import\run()</a>.</p> +<p>Referenced by <a class="el" href="classHubzilla_1_1Import_1_1Import.html#a8d138a9a7d4f79b81d3446ca216a602c">Hubzilla\Import\Import\run()</a>.</p> </div> </div> @@ -249,7 +249,7 @@ Private Attributes</h2></td></tr> <div class="memproto"> <table class="memname"> <tr> - <td class="memname">RedMatrix\Import\Import::get_item </td> + <td class="memname">Hubzilla\Import\Import::get_item </td> <td>(</td> <td class="paramtype"> </td> <td class="paramname"><em>$item_ident</em></td><td>)</td> @@ -258,7 +258,7 @@ Private Attributes</h2></td></tr> </table> </div><div class="memdoc"> -<p>Referenced by <a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a8d138a9a7d4f79b81d3446ca216a602c">RedMatrix\Import\Import\run()</a>.</p> +<p>Referenced by <a class="el" href="classHubzilla_1_1Import_1_1Import.html#a8d138a9a7d4f79b81d3446ca216a602c">Hubzilla\Import\Import\run()</a>.</p> </div> </div> @@ -267,7 +267,7 @@ Private Attributes</h2></td></tr> <div class="memproto"> <table class="memname"> <tr> - <td class="memname">RedMatrix\Import\Import::get_item_ident </td> + <td class="memname">Hubzilla\Import\Import::get_item_ident </td> <td>(</td> <td class="paramtype"> </td> <td class="paramname"><em>$item</em></td><td>)</td> @@ -283,7 +283,7 @@ Private Attributes</h2></td></tr> <div class="memproto"> <table class="memname"> <tr> - <td class="memname">RedMatrix\Import\Import::get_itemlist </td> + <td class="memname">Hubzilla\Import\Import::get_itemlist </td> <td>(</td> <td class="paramname"></td><td>)</td> <td></td> @@ -291,7 +291,7 @@ Private Attributes</h2></td></tr> </table> </div><div class="memdoc"> -<p>Referenced by <a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a8d138a9a7d4f79b81d3446ca216a602c">RedMatrix\Import\Import\run()</a>.</p> +<p>Referenced by <a class="el" href="classHubzilla_1_1Import_1_1Import.html#a8d138a9a7d4f79b81d3446ca216a602c">Hubzilla\Import\Import\run()</a>.</p> </div> </div> @@ -300,7 +300,7 @@ Private Attributes</h2></td></tr> <div class="memproto"> <table class="memname"> <tr> - <td class="memname">RedMatrix\Import\Import::get_taxonomy </td> + <td class="memname">Hubzilla\Import\Import::get_taxonomy </td> <td>(</td> <td class="paramtype"> </td> <td class="paramname"><em>$item_ident</em></td><td>)</td> @@ -309,7 +309,7 @@ Private Attributes</h2></td></tr> </table> </div><div class="memdoc"> -<p>Referenced by <a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a8d138a9a7d4f79b81d3446ca216a602c">RedMatrix\Import\Import\run()</a>.</p> +<p>Referenced by <a class="el" href="classHubzilla_1_1Import_1_1Import.html#a8d138a9a7d4f79b81d3446ca216a602c">Hubzilla\Import\Import\run()</a>.</p> </div> </div> @@ -318,7 +318,7 @@ Private Attributes</h2></td></tr> <div class="memproto"> <table class="memname"> <tr> - <td class="memname">RedMatrix\Import\Import::run </td> + <td class="memname">Hubzilla\Import\Import::run </td> <td>(</td> <td class="paramname"></td><td>)</td> <td></td> @@ -333,7 +333,7 @@ Private Attributes</h2></td></tr> <div class="memproto"> <table class="memname"> <tr> - <td class="memname">RedMatrix\Import\Import::store </td> + <td class="memname">Hubzilla\Import\Import::store </td> <td>(</td> <td class="paramtype"> </td> <td class="paramname"><em>$item</em>, </td> @@ -363,7 +363,7 @@ Private Attributes</h2></td></tr> <td class="mlabels-left"> <table class="memname"> <tr> - <td class="memname">RedMatrix\Import\Import::$credentials = null</td> + <td class="memname">Hubzilla\Import\Import::$credentials = null</td> </tr> </table> </td> @@ -373,7 +373,7 @@ Private Attributes</h2></td></tr> </table> </div><div class="memdoc"> -<p>Referenced by <a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a24134929d9a8a682da2036a0bf326367">RedMatrix\Import\Import\get_credentials()</a>.</p> +<p>Referenced by <a class="el" href="classHubzilla_1_1Import_1_1Import.html#a24134929d9a8a682da2036a0bf326367">Hubzilla\Import\Import\get_credentials()</a>.</p> </div> </div> @@ -385,7 +385,7 @@ Private Attributes</h2></td></tr> <td class="mlabels-left"> <table class="memname"> <tr> - <td class="memname">RedMatrix\Import\Import::$itemlist = null</td> + <td class="memname">Hubzilla\Import\Import::$itemlist = null</td> </tr> </table> </td> @@ -395,7 +395,7 @@ Private Attributes</h2></td></tr> </table> </div><div class="memdoc"> -<p>Referenced by <a class="el" href="classRedMatrix_1_1Import_1_1Import.html#a855cd5a79b95d269ae8737fae774e3bc">RedMatrix\Import\Import\get_itemlist()</a>.</p> +<p>Referenced by <a class="el" href="classHubzilla_1_1Import_1_1Import.html#a855cd5a79b95d269ae8737fae774e3bc">Hubzilla\Import\Import\get_itemlist()</a>.</p> </div> </div> @@ -407,7 +407,7 @@ Private Attributes</h2></td></tr> <td class="mlabels-left"> <table class="memname"> <tr> - <td class="memname">RedMatrix\Import\Import::$items = null</td> + <td class="memname">Hubzilla\Import\Import::$items = null</td> </tr> </table> </td> @@ -427,7 +427,7 @@ Private Attributes</h2></td></tr> <td class="mlabels-left"> <table class="memname"> <tr> - <td class="memname">RedMatrix\Import\Import::$src_items = null</td> + <td class="memname">Hubzilla\Import\Import::$src_items = null</td> </tr> </table> </td> diff --git a/doc/cloud.bb b/doc/cloud.bb index 92b97a21c..d3a2d6af9 100644 --- a/doc/cloud.bb +++ b/doc/cloud.bb @@ -1,6 +1,6 @@ [b]Personal Cloud Storage[/b]
-The Red Matrix provides an ability to store privately and/or share arbitrary files with friends.
+The Hubzilla provides an ability to store privately and/or share arbitrary files with friends.
You may either upload files from your computer into your storage area, or copy them directly from the operating system using the WebDAV protocol.
diff --git a/doc/connecting_to_channels.bb b/doc/connecting_to_channels.bb index 901565ad3..58981b506 100644 --- a/doc/connecting_to_channels.bb +++ b/doc/connecting_to_channels.bb @@ -1,12 +1,12 @@ [b]Connecting To Channels[/b]
-Connections in the Red Matrix can take on a great many different meanings. But let's keep it simple, you want to be friends with somebody like you are familiar with from social networking. How do you do it?
+Connections in the Hubzilla can take on a great many different meanings. But let's keep it simple, you want to be friends with somebody like you are familiar with from social networking. How do you do it?
First, you need to find some channels to connect to. There are two primary ways of doing this. Firstly, setting the "Can send me their channel stream and posts" permission to "Anybody in this network" will bring posts from complete strangers to your matrix. This will give you a lot of public content and should hopefully help you find interesting, entertaing people, forums, and channels.
-The next thing you can do is look at the Directory. The directory is available on every Red Matrix website which means searching from your own site will bring in results from the entire network. You can search by name, interest, location and keyword. This is incomplete, so we'll improve this paragraph later.
+The next thing you can do is look at the Directory. The directory is available on every Hubzilla website which means searching from your own site will bring in results from the entire network. You can search by name, interest, location and keyword. This is incomplete, so we'll improve this paragraph later.
-To connect with other Red Matrix channels:
+To connect with other Hubzilla channels:
Visit their profile by clicking their photograph in the directory, matrix, or comments, and it will open their channel home page in the channel viewer. At the left hand side of the screen, you will usually see a link called "connect". Click it, and you're done. Depending on the settings of the channel you are connecting to, you may need to wait for them to approve your connection, but no further action is needed on your part. Once you've initiated the connection, you will be taken to the connection editor. This allows you to assign specific permissions for this channel. If you don't allow any permissions, communication will be very limited. There are some quick links which you can use to avoid setting individual permissions. To provide a social network environment, "Full Sharing" is recommended. You may review the settings that are applied with the quick links to ensure they are suitable for the channel you are connecting with and adjust if necessary. Then scroll to the bottom of the page and click "Submit".
diff --git a/doc/connecting_to_channels.md b/doc/connecting_to_channels.md index 1e0d4d3fc..2257f75ba 100644 --- a/doc/connecting_to_channels.md +++ b/doc/connecting_to_channels.md @@ -1,12 +1,12 @@ # Connecting To Channels # -Connections in the Red Matrix can take on a great many different meanings. But let's keep it simple, you want to be friends with somebody like you are familiar with from social networking. How do you do it? +Connections in the Hubzilla can take on a great many different meanings. But let's keep it simple, you want to be friends with somebody like you are familiar with from social networking. How do you do it? First, you need to find some channels to connect to. There are two primary ways of doing this. Firstly, setting the "Can send me their channel stream and posts" permission to "Anybody in this network" will bring posts from complete strangers to your matrix. This will give you a lot of public content and should hopefully help you find interesting, entertaing people, forums, and channels. -The next thing you can do is look at the Directory. The directory is available on every Red Matrix website which means searching from your own site will bring in results from the entire network. You can search by name, interest, location and keyword. This is incomplete, so we'll improve this paragraph later. +The next thing you can do is look at the Directory. The directory is available on every Hubzilla website which means searching from your own site will bring in results from the entire network. You can search by name, interest, location and keyword. This is incomplete, so we'll improve this paragraph later. -To connect with other Red Matrix channels: +To connect with other Hubzilla channels: Visit their profile by clicking their photograph in the directory, matrix, or comments, and it will open their channel home page in the channel viewer. At the left hand side of the screen, you will usually see a link called "connect". Click it, and you're done. Depending on the settings of the channel you are connecting to, you may need to wait for them to approve your connection, but no further action is needed on your part. Once you've initiated the connection, you will be taken to the connection editor. This allows you to assign specific permissions for this channel. If you don't allow any permissions, communication will be very limited. There are some quick links which you can use to avoid setting individual permissions. To provide a social network environment, "Full Sharing" is recommended. You may review the settings that are applied with the quick links to ensure they are suitable for the channel you are connecting with and adjust if necessary. Then scroll to the bottom of the page and click "Submit". diff --git a/doc/credits.bb b/doc/credits.bb index 79055bc29..c94dada96 100644 --- a/doc/credits.bb +++ b/doc/credits.bb @@ -63,7 +63,7 @@ tonnerkiller Antoine G Christian Drechsler Ludovic Grossard -RedMatrixCanada +HubzillaCanada Stanislav Lechev [0xAF] aweiher bufalo1973 diff --git a/doc/de/channels.bb b/doc/de/channels.bb index 19146cf9b..7500d9256 100644 --- a/doc/de/channels.bb +++ b/doc/de/channels.bb @@ -19,7 +19,7 @@ Nachdem Du Deinen Kanal erstellt hast, wirst Du zu den Einstellungen weitergelei Nachdem Du auch das getan hast, kannst Du Deinen Kanal verwenden. Unter der Addresse https://example.com/channel/spitzname [observer=1]( [observer.url] )[/observer] findest Du Deinen Kanal. Hier werden Deine letzten Aktivitäten gezeigt, die neuesten oben. Wenn Du etwas in die Textbox schreibst, in der „Teilen“ steht, wird der neue Eintrag ganz oben in Deinem Kanal auftauchen. Du findest hier auch Links zu den anderen Kommunikationsbereichen Deines Kanals. Der „Über“-Reiter enthält Dein Profil, der „Fotos“-Reiter Deine Fotoalben, und der Veranstaltungskalender enthält Termine und Veranstaltungen, die Du und Deine Kontakte geteilt haben. -Die „Matrix“-Seite enthält alle neuen Beiträge aus der gesamten Red Matrix, wieder die neuesten oben. Was genau zu sehen ist ist abhängig von den Zugriffsrechten. Falls die Zugriffsrechte Deines Kanals so eingestellt sind, dass jeder Beiträge in Deinen Stream stellen kann, wirst du auch Beiträge von Dir völlig unbekannten Personen hier sehen. Am anderen Ende der Skala kannst Du die Berechtigungen aber auch so einstellen, dass du nur die Beiträge deiner Freunde oder gar nur Deine eigenen siehst. +Die „Matrix“-Seite enthält alle neuen Beiträge aus der gesamten Hubzilla, wieder die neuesten oben. Was genau zu sehen ist ist abhängig von den Zugriffsrechten. Falls die Zugriffsrechte Deines Kanals so eingestellt sind, dass jeder Beiträge in Deinen Stream stellen kann, wirst du auch Beiträge von Dir völlig unbekannten Personen hier sehen. Am anderen Ende der Skala kannst Du die Berechtigungen aber auch so einstellen, dass du nur die Beiträge deiner Freunde oder gar nur Deine eigenen siehst. Wie zu Anfang erwähnt sind viele Arten von Kanälen möglich, diese unterscheiden sich hauptsächlich durch die Berechtigungen. Das Anlegen dieser Kanäle unterscheidet sich dagegen nicht. Beispiel: Um einen Kanal zum Austausch von Dokumenten zu erstellen, wirst du vermutlich die Berechtigung „Kann in meinen öffentlichen Dateiordner schreiben“ freizügiger einstellen. Für weitere Informationen sieh bitte in der Hilfe unter Zugriffsrechte nach. diff --git a/doc/de/features.bb b/doc/de/features.bb index 766c28612..7ec753e4b 100644 --- a/doc/de/features.bb +++ b/doc/de/features.bb @@ -1,6 +1,6 @@ -[size=large][b]Features der Redmatrix[/b][/size] +[size=large][b]Features der Hubzilla[/b][/size] -Die Redmatrix ist ein Allzweck-Kommunikationsnetzwerk mit einigen einzigartigen Features. Sie wurde für eine große Bandbreite von Nutzern entwickelt, von Nutzern sozialer Netzwerke über technisch nicht interessierte Blogger bis hin zu PHP-Experten und erfahrenen Systemadministratoren. +Die Hubzilla ist ein Allzweck-Kommunikationsnetzwerk mit einigen einzigartigen Features. Sie wurde für eine große Bandbreite von Nutzern entwickelt, von Nutzern sozialer Netzwerke über technisch nicht interessierte Blogger bis hin zu PHP-Experten und erfahrenen Systemadministratoren. Diese Seite listet einige der Kern-Features von Red auf, die in der offiziellen Distribution enthalten sind. Wie immer bei freier Open-Source-Software sind den Möglichkeiten keine Grenzen gesetzt. Beliebige Erweiterungen, Addons, Themes und Konfigurationen sind möglich. @@ -10,7 +10,7 @@ Eines der Design-Ziele von Red ist einfache Kommunikations über das Web, ohne d [b]Beziehungs-Tool[/b] -Wenn Du in der Redmatrix 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. +Wenn Du in der Hubzilla 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] @@ -28,15 +28,15 @@ Diese Nachricht kann dann nur vom Absender und den eingestellten Empfängern bet Solche Zugriffsrechte gibt es bei Beiträgen, Fotos, Terminen, Webseiten, Chat-Räumen und Dateien. -[b]Ein Passwort für alle Redmatrix-Server (Single Sign-on)[/b] +[b]Ein Passwort für alle Hubzilla-Server (Single Sign-on)[/b] -Zugriffsrechte funktionieren in der gesamten Redmatrix mit allen Kanälen. Die meisten Links, die innerhalb der Redmatrix verlinken, enthalten deine Identität (zid), so dass der Zielserver Dich direkt anmelden kann. Du kannst Dich aber auch so auf jedem Redmatrix-Server mit Deinem Redmatrix-Identität anmelden und erhältst dann Zugriff auf die Inhalte, die für Dich freigegeben sind. +Zugriffsrechte funktionieren in der gesamten Hubzilla mit allen Kanälen. Die meisten Links, die innerhalb der Hubzilla verlinken, enthalten deine Identität (zid), so dass der Zielserver Dich direkt anmelden kann. Du kannst Dich aber auch so auf jedem Hubzilla-Server mit Deinem Hubzilla-Identität anmelden und erhältst dann Zugriff auf die Inhalte, die für Dich freigegeben sind. -Du loggst Dich nur einmal auf Deinem Heimatserver ein. Ab dann funktioniert die Authentifizierung gegenüber anderen Redmatrix-Servern „magisch“ von selbst. +Du loggst Dich nur einmal auf Deinem Heimatserver ein. Ab dann funktioniert die Authentifizierung gegenüber anderen Hubzilla-Servern „magisch“ von selbst. [b]Dateiablage (Cloud) mit WebDAV-Zugriff[/b] -Du kannst in Deinem persönlichen Speicherbereich Dateien hochladen und ihn sogar als Verzeichnis von Deinem lokalen Betriebssystem anzeigen lassen (via WebDAV). Die Dateien können über Zugriffsrechte bestimmten Redmatrix-Mitgliedern (und den Mitgliedern mancher anderer Netze) zugänglich gemacht oder auch komplett öffentlich zur Verfügung gestellt werden. +Du kannst in Deinem persönlichen Speicherbereich Dateien hochladen und ihn sogar als Verzeichnis von Deinem lokalen Betriebssystem anzeigen lassen (via WebDAV). Die Dateien können über Zugriffsrechte bestimmten Hubzilla-Mitgliedern (und den Mitgliedern mancher anderer Netze) zugänglich gemacht oder auch komplett öffentlich zur Verfügung gestellt werden. [b]Fotoalben[/b] @@ -48,19 +48,19 @@ Im eingebauten Terminkalender kannst Du Termine erstellen und verwalten. Auch hi [b]Chat-Räume[/b] -Du kannst Chaträume erstellen und über die Zugriffsrechte nur bestimmten Nutzern öffnen. Die Nachrichten sind sicherer verschlüsselt als es normalerweise bei Jabber/XMPP, IRC und anderen Instant Messengern üblich ist. Über Plugins ist es aber auch möglich, andere IM-Dienste aus der Redmatrix heraus zu nutzen. +Du kannst Chaträume erstellen und über die Zugriffsrechte nur bestimmten Nutzern öffnen. Die Nachrichten sind sicherer verschlüsselt als es normalerweise bei Jabber/XMPP, IRC und anderen Instant Messengern üblich ist. Über Plugins ist es aber auch möglich, andere IM-Dienste aus der Hubzilla heraus zu nutzen. [b]Erstellen von Webseiten[/b] -In der Redmatrix gibt es Werkzeuge für „Content Management“, mit denen Du einfache Webseiten erstellen kannst, aber auch komplexe Layouts, Menüs, Blöcke und Widgets. Auch hier greifen die Zugriffsrechte, so dass die entstandenen Seiten nur von denen betrachtet werden können, denen Du das Recht dazu eingeräumt hast. +In der Hubzilla gibt es Werkzeuge für „Content Management“, mit denen Du einfache Webseiten erstellen kannst, aber auch komplexe Layouts, Menüs, Blöcke und Widgets. Auch hier greifen die Zugriffsrechte, so dass die entstandenen Seiten nur von denen betrachtet werden können, denen Du das Recht dazu eingeräumt hast. [b]Apps[/b] -Redmatrix-Mitglieder könnnen Apps erstellen und verteilen. Anders als bei anderen Systemen, bei denen man an den System-Anbieter gebunden ist, werden diese Apps komplett vom App-Anbieter kontrolliert, der auf Wunsch seine eigene Zugriffskontrolle und ein Bezahlsystem einbauen kann. Die meisten Apps in der Redmatrix sind kostenlos. Sie sind sehr einfach und ohne große Programmierkenntnisse zu erstellen. +Hubzilla-Mitglieder könnnen Apps erstellen und verteilen. Anders als bei anderen Systemen, bei denen man an den System-Anbieter gebunden ist, werden diese Apps komplett vom App-Anbieter kontrolliert, der auf Wunsch seine eigene Zugriffskontrolle und ein Bezahlsystem einbauen kann. Die meisten Apps in der Hubzilla sind kostenlos. Sie sind sehr einfach und ohne große Programmierkenntnisse zu erstellen. [b]Layout[/b] -Das Seiten-Layout basiert auf eine Beschreibungssprache namens Comanche. Die Redmatrix ist selbst in Comanche-Layouts verfasst, die man verändern kann. Dadurch ist eine sehr starke Anpassung an die eigenen Bedürfnisse möglich, wie man sie so in Multi-User-Umgebungen normalerweise nicht findet. +Das Seiten-Layout basiert auf eine Beschreibungssprache namens Comanche. Die Hubzilla ist selbst in Comanche-Layouts verfasst, die man verändern kann. Dadurch ist eine sehr starke Anpassung an die eigenen Bedürfnisse möglich, wie man sie so in Multi-User-Umgebungen normalerweise nicht findet. [b]Lesezeichen[/b] @@ -72,7 +72,7 @@ Nachrichten mit eingeschränktem Empfängerkreis werden mit einem symmetrischen Jeder Red-Kanal hat seinen eigenes 4096-bit-RSA-Schlüsselpaar, das erzeugt wird, wenn der Kanal erstellt wird. -Zusätzlich können Nachrichten mit Ende-zu-Ende-Verschlüsselung versehen werden, so dass weder Redmatrix-Server-Administratoren noch ISPs irgendetwas mitlesen können, solange sie nicht über das Passwort verfügen. +Zusätzlich können Nachrichten mit Ende-zu-Ende-Verschlüsselung versehen werden, so dass weder Hubzilla-Server-Administratoren noch ISPs irgendetwas mitlesen können, solange sie nicht über das Passwort verfügen. Komplett öffentliche Nachrichten werden weder in der Datenbank noch bei der Übertragung verschlüsselt (abgesehen ggfs. von SSL). @@ -82,7 +82,7 @@ Alle Nachrichten können mit einem „Verfallsdatum“ versehen werden. Zu diese [b]Verbindung zu anderen Diensten[/b] -Neben Plugins, die das „crossposten“ zu diversen anderen Netzwerk erlauben, wird der Import von RSS/Atom-Feeds nativ unterstützt, auch, um mit diesen Inhalten spezielle Kanäle zu erstellen. Außerdem kann über das Diaspora-Protokoll mit Kontakten in den Netzwerken Friendica und Diaspora kommuniziert werden. Diese Unterstützung ist als experimentell eingestuft, da diese Netzwerke nicht die gleichen Möglichkeiten wie die Redmatrix in Sachen Privatsphäre und Verschlüsselung bieten, so dass Kommunikation mit ihnen zu Privatsphäreproblemen führen könnte. +Neben Plugins, die das „crossposten“ zu diversen anderen Netzwerk erlauben, wird der Import von RSS/Atom-Feeds nativ unterstützt, auch, um mit diesen Inhalten spezielle Kanäle zu erstellen. Außerdem kann über das Diaspora-Protokoll mit Kontakten in den Netzwerken Friendica und Diaspora kommuniziert werden. Diese Unterstützung ist als experimentell eingestuft, da diese Netzwerke nicht die gleichen Möglichkeiten wie die Hubzilla in Sachen Privatsphäre und Verschlüsselung bieten, so dass Kommunikation mit ihnen zu Privatsphäreproblemen führen könnte. Weiterhin wird OpenID auf experimenteller Ebene unterstützt und kann bei den Zugriffsrechten genutzt werden, um Inhalte für per OpenID authentifizierte Nutzer freizugeben. An dieser Funktion wird noch gearbeitet. @@ -94,7 +94,7 @@ Die Inhalte von Kanälen können als Quellen für andere Kanäle dienen (wenn de [b]Verzeichnisdienste[/b] -Wir stellen einfachen Zugriff auf ein Mitgliederverzeichnis zur Verfügung, samt einer dezentralen Möglichkeit, sich neue Kontakte basierend auf den eigenen vorschlagen zu lassen. Die Verzeichnis-Server sind normale Redmatrix-Server, bei denen der Administrator sich entschieden hat, sie auch als Verzeichnis agieren zu lassen. Das benötigt mehr Ressourcen als eine normale Redmatrix-Installation, deshalb ist das nicht voreingestellt. Die Verzeichnis-Server synchronisieren sich miteinander, so dass (abgesehen von einer gewissen Verzögerung bis zur nächsten Synchronisation) all Verzeichnis-Server aktuelle Informationen über das gesamte Netzwerk bereitstellen können. +Wir stellen einfachen Zugriff auf ein Mitgliederverzeichnis zur Verfügung, samt einer dezentralen Möglichkeit, sich neue Kontakte basierend auf den eigenen vorschlagen zu lassen. Die Verzeichnis-Server sind normale Hubzilla-Server, bei denen der Administrator sich entschieden hat, sie auch als Verzeichnis agieren zu lassen. Das benötigt mehr Ressourcen als eine normale Hubzilla-Installation, deshalb ist das nicht voreingestellt. Die Verzeichnis-Server synchronisieren sich miteinander, so dass (abgesehen von einer gewissen Verzögerung bis zur nächsten Synchronisation) all Verzeichnis-Server aktuelle Informationen über das gesamte Netzwerk bereitstellen können. [b]TLS/SSL[/b] @@ -124,7 +124,7 @@ Foren sind Kanäle, in denen mehrere Nutzer als Autoren fungieren können; eine [b]Klone[/b] -Konten in der Redmatrix werden auch als [i]nomadische Identitäten[/i] bezeichnet (eine ausführliche Erklärung dazu gibt es unter [url=[baseurl]/help/what_is_zot]What is Zot?[/url]). Nomadisch, weil bei anderen Diensten die Identität eines Nutzers an den Server oder die Plattform gebunden ist, auf der er ursprünglich erstellt wurde. Ein Facebook- oder Gmail-Konto ist and diese Dienste gekettet. Er funktioniert nicht ohne Facebook.com bzw. Gmail.com. +Konten in der Hubzilla werden auch als [i]nomadische Identitäten[/i] bezeichnet (eine ausführliche Erklärung dazu gibt es unter [url=[baseurl]/help/what_is_zot]What is Zot?[/url]). Nomadisch, weil bei anderen Diensten die Identität eines Nutzers an den Server oder die Plattform gebunden ist, auf der er ursprünglich erstellt wurde. Ein Facebook- oder Gmail-Konto ist and diese Dienste gekettet. Er funktioniert nicht ohne Facebook.com bzw. Gmail.com. Bei Red ist das anders. Sagen wir, Du hast eine Red-Indentität namens tina@redhub.com. Die kannst Du auf einen anderen Server klonen, mit dem gleichen oder einem anderen Namen, zum Beispiel lebtEwig@matrixserver.info. @@ -134,7 +134,7 @@ Das ist ein ziemlich revolutionäres Feature, wenn man sich einige Szenarien daz [ul][*]Was passiert, wenn ein Server, auf dem sich Deine Identität befindet, plötzlich offline ist? Ohne Klone ist der Nutzer nicht in der Lage zu kommunzieren, bis der Server wieder online ist. Mit Klonen loggst Du Dich einfach bei Deinem geklonten Kanal ein und lebst glücklich bis an Dein Ende. [*]Der Administrator Deines Red-Servers kann es sich nicht länger leisten, seinen für alle kostenlosen Server zu bezahlen. Er gibt bekannt, dass der Server in zwei Wochen vom Netz gehen wird. Zeit genug, um Deine Red-Kanäle auf andere Server zu klonen und somit Verbindungen und Freunde zu behalten. -[*]Was, wenn Dein Kanal staatlicher Zensur unterliegt? Dein Server-Admin wird gezwungen, Dein Konto und alle damit verbundenen Kanäle und Daten zu löschen. Durch Klone bietet die Redmatrix Zensur-Resistenz. Wenn Du willst, kannst Du hunderte von Klonen haben, alle mit unterschiedlichen Namen und auf unterschiedlichen Servern überall im Internet.[/ul] +[*]Was, wenn Dein Kanal staatlicher Zensur unterliegt? Dein Server-Admin wird gezwungen, Dein Konto und alle damit verbundenen Kanäle und Daten zu löschen. Durch Klone bietet die Hubzilla Zensur-Resistenz. Wenn Du willst, kannst Du hunderte von Klonen haben, alle mit unterschiedlichen Namen und auf unterschiedlichen Servern überall im Internet.[/ul] Red bietet interessante, neue Möglichkeiten in Bezug auf die Privatsphäre. Mehr dazu unter „Tipps und Tricks zur privaten Kommunikation“. @@ -158,13 +158,13 @@ Konten und Kanäle können sofort gelöscht werden, indem Du einfach auf einen L [b]Beiträge schreiben[/b] -Red unterstützt diverse verschiedene Wege, um Inhalte mit Auszeichnung (z.B. fett, kursiv, farbig etc.) zu erstellen. Voreinstellung ist die Redmatrix-Variante von BBCode (wie in vielen Web-Foren) mit einigen Ergänzungen, die nur hier funktionieren. Du kannst auch Markdown benutzen, wenn Dir das leichter fällt. Bis vor kurzem konnte auch ein grafischer Editor eingesetzt werden, der jedoch große Probleme aufwies und deshalb entfernt wurde. Wir suchen gerade nach einer Alternative. +Red unterstützt diverse verschiedene Wege, um Inhalte mit Auszeichnung (z.B. fett, kursiv, farbig etc.) zu erstellen. Voreinstellung ist die Hubzilla-Variante von BBCode (wie in vielen Web-Foren) mit einigen Ergänzungen, die nur hier funktionieren. Du kannst auch Markdown benutzen, wenn Dir das leichter fällt. Bis vor kurzem konnte auch ein grafischer Editor eingesetzt werden, der jedoch große Probleme aufwies und deshalb entfernt wurde. Wir suchen gerade nach einer Alternative. Webseiten können neben BBCode und Markdown auch in HTML und Plain Text erstellt werden. [b]Inhalte löschen[/b] -Alle Inhalte in der Redmatrix bleiben unter der Kontrolle des Mitglieds (bzw. Kanals), der sie ursprünglich erstellt hat. Alle Beiträge können jederzeit gelöscht werden, egal, ob sie auf dem Heimat-Server des Nutzers oder auf einem anderen Server erstellt wurden, an dem der Nutzer via Zot angemeldet war. +Alle Inhalte in der Hubzilla bleiben unter der Kontrolle des Mitglieds (bzw. Kanals), der sie ursprünglich erstellt hat. Alle Beiträge können jederzeit gelöscht werden, egal, ob sie auf dem Heimat-Server des Nutzers oder auf einem anderen Server erstellt wurden, an dem der Nutzer via Zot angemeldet war. [b]Medien[/b] @@ -174,12 +174,12 @@ Genau wie jedes andere Blog-System, soziale Netzwerk oder Mikro-Blogging-Dienst Vor dem Absenden kann eine Vorschau von Beiträgen betrachtet werden. Außerdem können Beiträge auch nach dem Absenden noch verändert werden. -[b]Redmatrix erweitern[/b] +[b]Hubzilla erweitern[/b] -Die Redmatrix kann auf vielerlei Art erweitert werden: Durch Server-Anpassung, persönliche Anpassung, setzen von Optionen, Themes und Addons/Plugins. +Die Hubzilla kann auf vielerlei Art erweitert werden: Durch Server-Anpassung, persönliche Anpassung, setzen von Optionen, Themes und Addons/Plugins. [b]API[/b] -Es existiert eine API, die von beliebigen Programmen/Apps und Diensten genutzt werden kann. Sie basiert auf der ursprünglichen Twitter-API (für die es hunderte von Tools und Apps gibt). Sie wird aktuell erweitert, um Zugriff auf Möglichkeiten zu gewähren, die es nur in der Redmatrix gibt. Authentifikation erfolgt über Login/Passwort oder OAuth. Eine Client-Registrierung für OAuth-Applikationen ist möglich. +Es existiert eine API, die von beliebigen Programmen/Apps und Diensten genutzt werden kann. Sie basiert auf der ursprünglichen Twitter-API (für die es hunderte von Tools und Apps gibt). Sie wird aktuell erweitert, um Zugriff auf Möglichkeiten zu gewähren, die es nur in der Hubzilla gibt. Authentifikation erfolgt über Login/Passwort oder OAuth. Eine Client-Registrierung für OAuth-Applikationen ist möglich. #include doc/macros/main_footer.bb; diff --git a/doc/de/main.bb b/doc/de/main.bb index 2d9ebdb70..2dee14ff8 100644 --- a/doc/de/main.bb +++ b/doc/de/main.bb @@ -25,7 +25,7 @@ Zot ist das großartige neue Kommunikationsprotokoll, das extra für die Red-Mat [zrl=[baseurl]/help/cloud]Cloud-Speicher[/zrl] [zrl=[baseurl]/help/remove_account]Einen Kanal oder das ganze Konto löschen[/zrl] -[size=large][b]Hilfe für RedMatrix-Mitglieder[/b][/size] +[size=large][b]Hilfe für Hubzilla-Mitglieder[/b][/size] [zrl=[baseurl]/help/tags_and_mentions]Tags und Erwähnungen[/zrl] [zrl=[baseurl]/help/webpages]Webseiten[/zrl] [zrl=[baseurl]/help/bbcode]BBcode-Referenz für Posts und Kommentare[/zrl] @@ -45,7 +45,7 @@ Zot ist das großartige neue Kommunikationsprotokoll, das extra für die Red-Mat [zrl=[baseurl]/help/faq_admins]FAQ für Admins[/zrl] [size=large][b]Technische Dokumentation[/b][/size] -[zrl=[baseurl]/help/history]Die Geschichte der RedMatrix[/zrl] +[zrl=[baseurl]/help/history]Die Geschichte der Hubzilla[/zrl] [zrl=[baseurl]/help/Zot---A-High-Level-Overview]Zot – ein grober Überblick[/zrl] [zrl=[baseurl]/help/zot]Eine Einführung ins Zot-Protokoll[/zrl] [zrl=[baseurl]/help/zot_structures]Zot-Strukturen[/zrl] @@ -81,7 +81,7 @@ Zot ist das großartige neue Kommunikationsprotokoll, das extra für die Red-Mat [url=https://federated.social/channel/postgres]Postgres-spezifischer Admin-Support-Kanal[/url] -[url=[baseurl]/help/credits]RedMatrix Credits[/url] +[url=[baseurl]/help/credits]Hubzilla Credits[/url] [size=large][b]Über diesen Red-Server[/b][/size] [zrl=[baseurl]/help/TermsOfService]Nutzungsbedingungen dieses Red-Servers[/zrl] diff --git a/doc/de/registration.bb b/doc/de/registration.bb index c7aaac55e..0dbd876f7 100644 --- a/doc/de/registration.bb +++ b/doc/de/registration.bb @@ -27,7 +27,7 @@ Der Kanal-Name ist der Titel oder eine kurze Beschreibung des Kanals. Der „Spi Wenn Dein Kanal angelegt ist, geht es direkt weiter zu den Einstellungen. Dort kannst Du Zugriffsrechte setzen, Funktionen zu- oder abschalten und so weiter. Diese Punkte werden auf den entsprechenden Hilfeseiten erklärt. Siehe auch -[zrl=[baseurl]/help/accounts_profiles_channels_basics]Grundlagen zu Identitäten in der RedMatrix[/zrl] +[zrl=[baseurl]/help/accounts_profiles_channels_basics]Grundlagen zu Identitäten in der Hubzilla[/zrl] [zrl=[baseurl]/help/accounts]Konten[/zrl] [zrl=[baseurl]/help/profiles]Profile[/zrl] [zrl=[baseurl]/help/permissions]Zugriffsrechte[/zrl] 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 8f526d963..ce2f978a5 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
@@ -19,7 +19,7 @@ to notify us to merge your work. [b]Translations[/b]
-Our translations are managed through Transifex. If you wish to help out translating the Red Matrix to another language, sign up on transifex.com, visit [url=https://www.transifex.com/projects/p/red-matrix/]https://www.transifex.com/projects/p/red-matrix/[/url] and request to join one of the existing language teams or create a new one. Notify one of the core developers when you have a translation update which requires merging, or ask about merging it yourself if you're comfortable with git and PHP. We have a string file called 'messages.po' which is gettext compliant and a handful of email templates, and from there we automatically generate the application's language files.
+Our translations are managed through Transifex. If you wish to help out translating the Hubzilla to another language, sign up on transifex.com, visit [url=https://www.transifex.com/projects/p/red-matrix/]https://www.transifex.com/projects/p/red-matrix/[/url] and request to join one of the existing language teams or create a new one. Notify one of the core developers when you have a translation update which requires merging, or ask about merging it yourself if you're comfortable with git and PHP. We have a string file called 'messages.po' which is gettext compliant and a handful of email templates, and from there we automatically generate the application's language files.
[zrl=[baseurl]/help/Translations]Translations - More Info[/zrl]
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 427c5f96b..2413eda01 100644 --- a/doc/encryption.bb +++ b/doc/encryption.bb @@ -1,6 +1,6 @@ [size=large]Builtin Automatic Encryption[/size] -Full disclosure: The encryption Red Matrix 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. +Full disclosure: The encryption Hubzilla 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: @@ -11,6 +11,6 @@ To explain this in more detail: So what is the scope of security? Full disclosure: This might be great, but it is not perfect. - every non-public post is automatically encrypted but persons who have access to the site's database and files [i]may[/i] be able to decrypt everything by using these keys which obviously need to be stored on the server. To be clear: The encrypion keys are different for every channel and it is [i]quite an effort[/i] to do this. And again: Other services store your messages in plain text unencrypted. So this [i]is[/i] quite a significant win for your privacy. -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 Red Matrix. +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 Hubzilla. 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 62cbbc33d..fcd27c77a 100644 --- a/doc/external-resource-links.bb +++ b/doc/external-resource-links.bb @@ -5,8 +5,8 @@ [*][url=https://github.com/omigeot/redstrap3]Redstrap[/url]
[*][url=https://bitbucket.org/tobiasd/red-clean]Clean[/url]
-[*][url=https://github.com/tonybaldwin/redmatrixthemes/]nubasic[/url]
-[*][url=https://github.com/deadsuperhero/redmatrix-themes]Sean Tilley's Redmatrix themes[/url]
+[*][url=https://github.com/tonybaldwin/hubzillathemes/]nubasic[/url]
+[*][url=https://github.com/deadsuperhero/hubzilla-themes]Sean Tilley's Hubzilla themes[/url]
[b]Third-Party Addons[/b]
[*][url=https://abcentric.net/git/abcjsplugin.git]ABCjs integration - display scores in posts (WIP)[/url]
@@ -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/extra_features.bb b/doc/extra_features.bb index be14fdb5b..3a2d77ec5 100644 --- a/doc/extra_features.bb +++ b/doc/extra_features.bb @@ -1,7 +1,7 @@ // multiple of these have been enabled by default. should we note this here somewhere, move it or remove them from this file?
[b]Features[/b]
-The default interface of the Red Matrix was designed to be uncluttered. There are a huge number of extra features (some of which are extremely useful) which you can turn on and get the most of the application. These are found under the Extra Features link of your Settings page.
+The default interface of the Hubzilla was designed to be uncluttered. There are a huge number of extra features (some of which are extremely useful) which you can turn on and get the most of the application. These are found under the Extra Features link of your Settings page.
[b]Content Expiration[/b]
diff --git a/doc/faq_admins.bb b/doc/faq_admins.bb index fed66a8dd..63c007bce 100644 --- a/doc/faq_admins.bb +++ b/doc/faq_admins.bb @@ -1,4 +1,4 @@ -[size=large][b]The Red Matrix FAQ[/b][/size] +[size=large][b]The Hubzilla FAQ[/b][/size] [toc] diff --git a/doc/faq_developers.bb b/doc/faq_developers.bb index 010ef9b8a..55d90621b 100644 --- a/doc/faq_developers.bb +++ b/doc/faq_developers.bb @@ -4,7 +4,7 @@ [h3]What does $a mean?[/h3] -$a is a class defined in boot.php and passed all around Red Matrix as a global reference variable. It defines everything necessary for the Red Matrix application: Server variables, URL arguments, page structures, layouts, content, installed plugins, output device info, theme info, identity of the observer and (potential) page owner ... +$a is a class defined in boot.php and passed all around Hubzilla as a global reference variable. It defines everything necessary for the Hubzilla 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/faq_members.bb b/doc/faq_members.bb index cdc7883f9..3cc4f7189 100644 --- a/doc/faq_members.bb +++ b/doc/faq_members.bb @@ -1,11 +1,11 @@ -[size=large][b]The Red Matrix FAQ[/b][/size] +[size=large][b]The Hubzilla FAQ[/b][/size] [toc] [h3]I am able to edit a post's text after I saved it, but is there a way to change the permissions?[/h3] -Short anser: No, there isn't. There are reasons. You are able to change permissons to your files, photos and the likes, but not to posts after you have saved them. The main reason is: Once you have saved a post it is being distributed either to the public channel and from there to other Red Matrix servers or to those you intended it to go. Just like you cannot reclaim something you gave to another person, you cannot change permissions to Red Matrix posts. We would need to track everywhere your posting goes, keep track of everyone you allowed to see it and then keep track of from whom to delete it. -If a posting is public this is even harder, as the Red Matrix is a global network and there is no way to follow a post, let alone reclaim it reliably. Other networks that may receive your post have no reliable way to delete or reclaim the post. +Short anser: No, there isn't. There are reasons. You are able to change permissons to your files, photos and the likes, but not to posts after you have saved them. The main reason is: Once you have saved a post it is being distributed either to the public channel and from there to other Hubzilla servers or to those you intended it to go. Just like you cannot reclaim something you gave to another person, you cannot change permissions to Hubzilla posts. We would need to track everywhere your posting goes, keep track of everyone you allowed to see it and then keep track of from whom to delete it. +If a posting is public this is even harder, as the Hubzilla is a global network and there is no way to follow a post, let alone reclaim it reliably. Other networks that may receive your post have no reliable way to delete or reclaim the post. [h3]I downloaded my channel and imported it (cloned my identity) to another site but there is no content, no posts, no photos. What is wrong???[/h3] To be honest: Nothing. That's the way it is right now. Technically it is surely possible to take at least your own posts and maybe even files with you, but this has simply put not implemented yet. When creating this feature we thought that keeping all your contacts was more important. Your friends have already seen your old content. Once we find someone willing to implement this, it will be done. :) diff --git a/doc/features.bb b/doc/features.bb index e2ca648bd..77b6ae1d0 100644 --- a/doc/features.bb +++ b/doc/features.bb @@ -1,35 +1,35 @@ [b][size=20]Features[/size][/b]
-[b][size=24]Redmatrix in a Nutshell[/size][/b]
+[b][size=24]Hubzilla in a Nutshell[/size][/b]
TL;DR
-Redmatrix provides distributed web publishing and social communications with [b]decentralised permissions[/b].
+Hubzilla provides distributed web publishing and social communications with [b]decentralised permissions[/b].
So what exactly are "decentralised permissions"? They give me the ability to share something on my website (photos, media, files, webpages, etc.) with specific people on completely different websites - but not necessarily [i]everybody[/i] on those websites; and they do not need a password on my website and do not need to login to my website to view the things I've shared with them. They have one password on their own website and "magic authentication" between affiliated websites in the network. Also, as it is decentralised, there is no third party which has the ability to bypass permissions and see everything in the network.
-Redmatrix combines many features of traditional blogs, social networking and media, content management systems, and personal cloud storage into an easy to use framework. Each node in the matrix can operate standalone or link with other nodes to create a super-network; leaving privacy under the control of the original publisher.
+Hubzilla combines many features of traditional blogs, social networking and media, content management systems, and personal cloud storage into an easy to use framework. Each node in the matrix can operate standalone or link with other nodes to create a super-network; leaving privacy under the control of the original publisher.
-Redmatrix is an open source webserver application written originally in PHP/MySQL and is easily installable by those with basic website administration skills. It is also easily extended via plugins and themes and other third-party tools.
+Hubzilla is an open source webserver application written originally in PHP/MySQL and is easily installable by those with basic website administration skills. It is also easily extended via plugins and themes and other third-party tools.
-[b][size=24]Redmatrix Features[/size][/b]
+[b][size=24]Hubzilla Features[/size][/b]
-The Redmatrix is a general-purpose web publishing and communication network, with several unique features. It is designed to be used by the widest range of people on the web, from non-technical bloggers, to expert PHP programmers and seasoned systems administrators.
+The Hubzilla is a general-purpose web publishing and communication network, with several unique features. It is designed to be used by the widest range of people on the web, from non-technical bloggers, to expert PHP programmers and seasoned systems administrators.
-This page lists some of the core features of Redmatrix that are bundled with the official release. As with most free and open source software, there may be many other extensions, additions, plugins, themes and configurations that are limited only by the needs and imagination of the members.
+This page lists some of the core features of Hubzilla that are bundled with the official release. As with most free and open source software, there may be many other extensions, additions, plugins, themes and configurations that are limited only by the needs and imagination of the members.
[b][size=20]Built for Privacy and Freedom[/size][/b]
-One of the design goals of Redmatrix is to enable easy communication on the web, while preserving privacy, if so desired by members. To achieve this goal, Redmatrix includes a number of features allowing arbitrary levels of privacy:
+One of the design goals of Hubzilla is to enable easy communication on the web, while preserving privacy, if so desired by members. To achieve this goal, Hubzilla includes a number of features allowing arbitrary levels of privacy:
[b]Affinity Slider[/b]
-When adding connnections in Redmatrix, members have the option of assigning "affinity" levels (how close your friendship is) to the new connection. For example, when adding someone who happens to be a person whose blog you follow, you could assign their channel an affinity level of "Acquaintances".
+When adding connnections in Hubzilla, members have the option of assigning "affinity" levels (how close your friendship is) to the new connection. For example, when adding someone who happens to be a person whose blog you follow, you could assign their channel an affinity level of "Acquaintances".
On the other hand, when adding a friend's channel, they could be placed under the affinity level of "Friends".
-At this point, the Redmatrix [i]Affinity Slider[/i] tool, which usually appears at the top of your "Matrix" page, adjusts the content on the page to include those within the desired affinity range. Channels outside that range will not be displayed, unless you adjust the slider to include them.
+At this point, the Hubzilla [i]Affinity Slider[/i] tool, which usually appears at the top of your "Matrix" page, adjusts the content on the page to include those within the desired affinity range. Channels outside that range will not be displayed, unless you adjust the slider to include them.
The Affinity Slider allows instantaneous filtering of large amounts of content, grouped by levels of closeness.
@@ -43,12 +43,12 @@ Access Control Lists may be applied to content and posts, photos, events, webpag [b]Single Sign-on[/b]
-Access Control Lists work for all channels in the matrix due to our unique single sign-on technology. Most internal links provide an identity token which can be verified on other Redmatrix sites and used to control access to private resources. You login once to your home hub. After that, authentication to all Redmatrix resources is "magic".
+Access Control Lists work for all channels in the matrix due to our unique single sign-on technology. Most internal links provide an identity token which can be verified on other Hubzilla sites and used to control access to private resources. You login once to your home hub. After that, authentication to all Hubzilla resources is "magic".
[b]WebDAV enabled File Storage[/b]
-Files may be uploaded to your personal storage area using your operating system utilities (drag and drop in most cases). You may protect these files with Access Control Lists to any combination of Redmatrix members (including some third party network members) or make them public.
+Files may be uploaded to your personal storage area using your operating system utilities (drag and drop in most cases). You may protect these files with Access Control Lists to any combination of Redmatrix.members (including some third party network members) or make them public.
[b]Photo Albums[/b]
@@ -64,15 +64,15 @@ You may create any number of personal chatrooms and allow access via Access Cont [b]Webpage Building[/b]
-Redmatrix has many "Content Management" creation tools for building webpages, including layout editing, menus, blocks, widgets, and page/content regions. All of these may be access controlled so that the resulting pages are private to their intended audience.
+Hubzilla has many "Content Management" creation tools for building webpages, including layout editing, menus, blocks, widgets, and page/content regions. All of these may be access controlled so that the resulting pages are private to their intended audience.
[b]Apps[/b]
-Apps may be built and distributed by members. These are different from traditional "vendor lockin" apps because they are controlled completely by the author - who can provide access control on the destination app pages and charge accordingly for this access. Most apps in Redmatrix are free and can be created easily by those with no programming skills.
+Apps may be built and distributed by members. These are different from traditional "vendor lockin" apps because they are controlled completely by the author - who can provide access control on the destination app pages and charge accordingly for this access. Most apps in Hubzilla are free and can be created easily by those with no programming skills.
[b]Layout[/b]
-Page layout is based on a description language called Comanche. Redmatrix is itself written in Comanche layouts which you can change. This allows a level of customisation you won't typically find in so-called "multi-user environments".
+Page layout is based on a description language called Comanche. Hubzilla is itself written in Comanche layouts which you can change. This allows a level of customisation you won't typically find in so-called "multi-user environments".
[b]Bookmarks[/b]
@@ -87,7 +87,7 @@ These private messages are also stored in an encrypted form on remote systems. Each Red channel has it's own unique set of private and associated public RSA 4096-bit keys, generated when the channels is first created.
-Additionally, messages may be created utilising "end-to-end encryption" which cannot be read by Redmatrix operators or ISPs or anybody who does not know the passcode.
+Additionally, messages may be created utilising "end-to-end encryption" which cannot be read by Hubzilla operators or ISPs or anybody who does not know the passcode.
Public messages are generally not encrypted in transit or in storage.
@@ -98,9 +98,9 @@ Posts and messages may be created with an expiration date, at which time they wi [b]Service Federation[/b]
-In addition to addon "cross-post connectors" to a variety of alternate networks, there is native support for importation of content from RSS/Atom feeds and using this to create special channels. Also, an experimental but working implementation of the Diaspora protocol allows communication with people on the Friendica and Diaspora decentralised social networks. This is currently marked experimental because these networks do not have the same level of privacy and encryption features and abilities as Redmatrix and may present privacy risks.
+In addition to addon "cross-post connectors" to a variety of alternate networks, there is native support for importation of content from RSS/Atom feeds and using this to create special channels. Also, an experimental but working implementation of the Diaspora protocol allows communication with people on the Friendica and Diaspora decentralised social networks. This is currently marked experimental because these networks do not have the same level of privacy and encryption features and abilities as Hubzilla and may present privacy risks.
-There is also experimental support for OpenID authentication which may be used in Access Control Lists. This is a work in progress. Your Redmatrix hub may be used as an OpenID provider to authenticate you to external services which use this technology.
+There is also experimental support for OpenID authentication which may be used in Access Control Lists. This is a work in progress. Your Hubzilla hub may be used as an OpenID provider to authenticate you to external services which use this technology.
Channels may have permissions to become "derivative channels" where two or more existing channels combine to create a new topical channel.
@@ -111,12 +111,12 @@ Channels may have permissions to become "derivative channels" where two or more [b]Directory Services[/b]
-We provide easy access to a directory of members and provide decentralised tools capable of providing friend "suggestions". The directories are normal Redmatrix sites which have chosen to accept the directory server role. This requires more resources than most typical sites so is not the default. Directories are synchronised and mirrored so that they all contain up-to-date information on the entire network (subject to normal propagation delays).
+We provide easy access to a directory of members and provide decentralised tools capable of providing friend "suggestions". The directories are normal Hubzilla sites which have chosen to accept the directory server role. This requires more resources than most typical sites so is not the default. Directories are synchronised and mirrored so that they all contain up-to-date information on the entire network (subject to normal propagation delays).
[b]TLS/SSL[/b]
-For Redmatrix hubs that use TLS/SSL, client to server communications are encrypted via TLS/SSL. Given recent disclosures in the media regarding widespread, global surveillance and encryption circumvention by the NSA and GCHQ, it is reasonable to assume that HTTPS-protected communications may be compromised in various ways. Private communications are consequently encrypted at a higher level before sending offsite.
+For Hubzilla hubs that use TLS/SSL, client to server communications are encrypted via TLS/SSL. Given recent disclosures in the media regarding widespread, global surveillance and encryption circumvention by the NSA and GCHQ, it is reasonable to assume that HTTPS-protected communications may be compromised in various ways. Private communications are consequently encrypted at a higher level before sending offsite.
[b]Channel Settings[/b]
@@ -142,9 +142,9 @@ Forums are typically channels which may be open to participation from multiple a [b]Account Cloning[/b]
-Accounts in the Red Matrix are referred to as [i]nomadic identities[/i], because a member's identity is not bound to the hub where the identity was originally created. For example, when you create a Facebook or Gmail account, it is tied to those services. They cannot function without Facebook.com or Gmail.com.
+Accounts in the Hubzilla are referred to as [i]nomadic identities[/i], because a member's identity is not bound to the hub where the identity was originally created. For example, when you create a Facebook or Gmail account, it is tied to those services. They cannot function without Facebook.com or Gmail.com.
-By contrast, say you've created a Red identity called [b]tina@redhub.com[/b]. You can clone it to another Red hub by choosing the same, or a different name: [b]liveForever@SomeRedMatrixHub.info[/b]
+By contrast, say you've created a Red identity called [b]tina@redhub.com[/b]. You can clone it to another Red hub by choosing the same, or a different name: [b]liveForever@SomeHubzillaHub.info[/b]
Both channels are now synchronized, which means all your contacts and preferences will be duplicated on your clone. It doesn't matter whether you send a post from your original hub, or the new hub. Posts will be mirrored on both accounts.
@@ -152,9 +152,9 @@ This is a rather revolutionary feature, if we consider some scenarios: - What happens if the hub where an identity is based suddenly goes offline? Without cloning, a member will not be able to communicate until that hub comes back online (no doubt many of you have seen and cursed the Twitter "Fail Whale"). With cloning, you just log into your cloned account, and life goes on happily ever after.
- - The administrator of your hub can no longer afford to pay for his free and public Red Matrix hub. He announces that the hub will be shutting down in two weeks. This gives you ample time to clone your identity(ies) and preserve your Red relationships, friends and content.
+ - The administrator of your hub can no longer afford to pay for his free and public Hubzilla hub. He announces that the hub will be shutting down in two weeks. This gives you ample time to clone your identity(ies) and preserve your Red relationships, friends and content.
- - What if your identity is subject to government censorship? Your hub provider may be compelled to delete your account, along with any identities and associated data. With cloning, the Red Matrix offers [b]censorship resistance[/b]. You can have hundreds of clones, if you wanted to, all named different, and existing on many different hubs, strewn around the internet.
+ - What if your identity is subject to government censorship? Your hub provider may be compelled to delete your account, along with any identities and associated data. With cloning, the Hubzilla offers [b]censorship resistance[/b]. You can have hundreds of clones, if you wanted to, all named different, and existing on many different hubs, strewn around the internet.
Red offers interesting new possibilities for privacy. You can read more at the <<Private Communications Best Practices>> page.
@@ -178,12 +178,12 @@ Accounts can be immediately deleted by clicking on a link. That's it. All assoc [b]Writing Posts[/b]
-Red supports a number of different ways of adding rich-text content. The default is a custom variant of BBcode, tailored for use in Redmatrix. You may also enable the use of Markdown if you find that easier to work with. A visual editor may also be used. The traditional visual editor for Redmatrix had some serious issues and has since been removed. We are currently looking for a replacement.
+Red supports a number of different ways of adding rich-text content. The default is a custom variant of BBcode, tailored for use in Hubzilla. You may also enable the use of Markdown if you find that easier to work with. A visual editor may also be used. The traditional visual editor for Hubzilla had some serious issues and has since been removed. We are currently looking for a replacement.
When creating "Websites", content may be entered in HTML, Markdown, BBcode, and/or plain text.
[b]Deletion of content[/b]
-Any content created in the Red Matrix remains under the control of the member (or channel) that originally created it. At any time, a member can delete a message, or a range of messages. The deletion process ensures that the content is deleted, regardless of whether it was posted on a channel's primary (home) hub, or on another hub, where the channel was remotely authenticated via Zot (the Redmatrix communication and authentication protocol).
+Any content created in the Hubzilla remains under the control of the member (or channel) that originally created it. At any time, a member can delete a message, or a range of messages. The deletion process ensures that the content is deleted, regardless of whether it was posted on a channel's primary (home) hub, or on another hub, where the channel was remotely authenticated via Zot (the Hubzilla communication and authentication protocol).
[b]Media[/b]
Similar to any other modern blogging system, social network, or a micro-blogging service, Red supports the uploading of files, embedding of videos, linking web pages.
@@ -195,13 +195,13 @@ Post can be previewed prior to sending and edited after sending. Posts can be turned into "concensus" items which allows readers to offer feedback, which is collated into "agree", "disagree", and "abstain" counters. This lets you gauge interest for ideas and create informal surveys.
-[b]Extending Redmatrix[/b]
+[b]Extending Hubzilla[/b]
-Redmatrix can be extended in a number of ways, through site customisation, personal customisation, option setting, themes, and addons/plugins.
+Hubzilla can be extended in a number of ways, through site customisation, personal customisation, option setting, themes, and addons/plugins.
[b]API[/b]
-An API is available for use by third-party services. This is based originally on the early Twitter API (for which hundreds of third-party tools exist). It is currently being extended to provide access to facilities and abilities which are specific to Redmatrix. Access may be provided by login/password or OAuth and client registration of OAuth applications is provided.
+An API is available for use by third-party services. This is based originally on the early Twitter API (for which hundreds of third-party tools exist). It is currently being extended to provide access to facilities and abilities which are specific to Hubzilla. Access may be provided by login/password or OAuth and client registration of OAuth applications is provided.
diff --git a/doc/hidden_configs.bb b/doc/hidden_configs.bb index b992c5487..525f93b2c 100644 --- a/doc/hidden_configs.bb +++ b/doc/hidden_configs.bb @@ -1,6 +1,6 @@ [b]Advanced Configurations for Administrators[/b] -RedMatrix contains many configuration options hidden from the main admin panel. +Hubzilla 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 f567ff2f0..d190ac446 100644 --- a/doc/history.md +++ b/doc/history.md @@ -1,7 +1,7 @@ -RedMatrix History +Hubzilla History ================= -RedMatrix is a collaborative effort by the RedMatrix 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). +Hubzilla is a collaborative effort by the Hubzilla 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). ##Mike Macgirvin -- Biography @@ -10,9 +10,9 @@ Mike Macgirvin is an American software engineer now living in Australia. He spen During a layoff round, Mike was let go from America Online in August 2001 and purchased a music store in Mountain View, California later to be known as "Sonica Music Company". Opening a retail store for non-essential goods at the beginning of a prolonged economic downturn was in retrospect probably not the wisest career move. Sonica eventually folded; in late 2006. Mike returned to working on software and systems support full-time and was employed briefly at Symantec before moving to Australia in early 2007. He currently lives on a farm "out in the middle of nowhere" and is employed as a Computer Systems Officer at the University of Wollongong. -##RedMatrix - The Early Years +##Hubzilla - The Early Years -The software which went into creating RedMatrix has been through three distinct historical phases. It began in 2003 when Mike Macgirvin was looking for a content management system to power the website for his music store and found the available solutions to be lacking in various respects. The project was born as the "PurpleHaze weblog" under the nom de plume "Nerdware Communications". It was a multi-user PHP/MySQL CMS which provided blogs, forums, photo albums, events and more. Initially it provided the basis for a social community and shopping for customers of the store, but was also linked to Mike's personal weblog running on another domain. The distinguishing characteristic of this software was the ability for so-called "normal users" to re-assemble the components and choose different content feeds - and in essence create their own personal "multi-user CMS" as a view. Their custom view was able to communicate with anybody else that used the system, but could be partitioned so that adult sites and motorcycle enthusiast sites would not be visible to each other and not clash (or in this case Mike's personal website and the music store website). This software was developed primarily from 2003 until 2008. +The software which went into creating Hubzilla has been through three distinct historical phases. It began in 2003 when Mike Macgirvin was looking for a content management system to power the website for his music store and found the available solutions to be lacking in various respects. The project was born as the "PurpleHaze weblog" under the nom de plume "Nerdware Communications". It was a multi-user PHP/MySQL CMS which provided blogs, forums, photo albums, events and more. Initially it provided the basis for a social community and shopping for customers of the store, but was also linked to Mike's personal weblog running on another domain. The distinguishing characteristic of this software was the ability for so-called "normal users" to re-assemble the components and choose different content feeds - and in essence create their own personal "multi-user CMS" as a view. Their custom view was able to communicate with anybody else that used the system, but could be partitioned so that adult sites and motorcycle enthusiast sites would not be visible to each other and not clash (or in this case Mike's personal website and the music store website). This software was developed primarily from 2003 until 2008. In 2006 this software was used as the prototype for Symantec's "safeweb" reputation and community site. It was developed and enhanced until about 2008. A rewrite took place in 2008 named "Reflection" but work stagnated as the community dwindled. The need for content management systems and communications software dropped dramatically during this time as humans flocked to the new social aggregrators - Facebook and Twitter. @@ -32,17 +32,17 @@ Mike realised he did not want to be held hostage to the decisions that other pro Mike had been working on this project for some time and there were a number of things which needed re-writing, including the base communication protocol which Friendica used (DFRN or the "Distributed Friends and Relations Network" protocol). These ideas were starting to emerge as a different method of communication he called "zot". Zot began as a way to create a common language for federated websites, but there was no interest in this ability and as mentioned, the federated web was crumbling. The first version was soon scrapped and zot was re-designed and re-ignited as a streamlined communication protocol which was location-independent; e.g. not tied to any website. This would allow people to carry on unaffected if their website operator shut down temporarily or permanently. They wouldn't have to make friends all over again, and permissions of everything on the system wouldn't have to be changed to allow bob@site1 to see something that was private to him, even though he was now bob@site2. This was a serious problem with decentralisation. People moved and their online identities were lost and had to be re-created from scratch and existing relationships destroyed and had to be created all over again. -##RedMatrix +##Hubzilla In July 2012, Mike left the Friendica project and began development of "zot" and a new base project called "red" in his somewhat elusive *spare time*. Red is Spanish for "network". It wasn't really a "social network" and especially not a "federated social network". It was just Red (technically "la red"), or "the network". Work began by removing all the "federation" components and going back to basics - communication and remote authentication. It was a major re-write and took roughly six months before even basic communication was re-established. It was also no longer compatible with Friendica - which had been given to the "Friendica community" and by this time (December 2012) was developing separately on its own track. It became clear during this time that the single most compelling feature of the project wasn't the social network at all, but the authentication layer and decentralised access control mechanisms. Combined with zot's location independence it created a new model for software which had never existed previously - decentralised identity-aware web publishing and single sign-on to any compatible provider across the web. These weren't *evolutionary*, they were **revolutionary**. One of the biggest flaws of the modern web is the reliance on different passwords for every service you use, or reliance on a single provider if you were to tie them to - say your Facebook login. Facebook can remove your account at any time. Gone. If you rely on their authentication for all your websites, your entire online identity - now gone. This is also what was missing from Friendica - a compelling software feature which could stand on its own, without requiring a social network and especially without requiring a federated social network with all the mentioned external dependencies. -An early visitor to the project noted that he had some difficulty finding the project on Google because of the choice of name - "red". Yes, this was a poor decision in retrospect. We were buried on page 23,712 of the search results. The concept that was emerging around this identity-aware publishing was that of "a matrix of inter-connected thought streams", since we didn't have a concept of "people" and "friends". All were just connected "channels" with different ways to connect. So "Red Matrix" was chosen to give it a searchable name. It had nothing to do with the Matrix film and red and blue pills, though that is frequently cited (erronously); and in fact isn't a bad analogy. +An early visitor to the project noted that he had some difficulty finding the project on Google because of the choice of name - "red". Yes, this was a poor decision in retrospect. We were buried on page 23,712 of the search results. The concept that was emerging around this identity-aware publishing was that of "a matrix of inter-connected thought streams", since we didn't have a concept of "people" and "friends". All were just connected "channels" with different ways to connect. So "Hubzilla" was chosen to give it a searchable name. It had nothing to do with the Matrix film and red and blue pills, though that is frequently cited (erronously); and in fact isn't a bad analogy. The concept of identity-aware content was alien to anything that existed previously on the web, so to make it useful we had to provide the ability to use it for content. It needed content publishing tools. This brought back concepts from the old "Content Management System" on which the software was originally based. To get it up and running quickly we created a markup language for webpages called "Comanche" which let you describe a page in high-level terms based on bbcode tags. We also added WebDAV so you could put decentralised access control on files and drag/drop from your operating system. So now you could have private photos, webpages, files, events, conversations, chatrooms - and they are visible to those you choose - no matter what site they use. All they need is zot. And your viewers could move to another site or just pop up at a different site any time they want and we don't care. And it **also** had a built-in social network; with lots of additional privacy and encryption features which were added even before the Snowden revelations gave them added urgency. -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 RedMatrix 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. +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 Hubzilla 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. diff --git a/doc/html/index.php b/doc/html/index.php index 10b363818..1796685a2 100644 --- a/doc/html/index.php +++ b/doc/html/index.php @@ -1,10 +1,10 @@ <!DOCTYPE html> <html> <head> - <title>RedMatrix Doxygen API Documentation</title> + <title>Hubzilla Doxygen API Documentation</title> </head> <body> -<h1>RedMatrix Doxygen API Documentation not rendered</h1> +<h1>Hubzilla Doxygen API Documentation not rendered</h1> 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 bb1de0e67..0c5844993 100644 --- a/doc/main.bb +++ b/doc/main.bb @@ -1,22 +1,22 @@ [img][baseurl]/assets/hashlogo.png[/img]
-[size=large][b]RedMatrix Documentation[/b][/size]
+[size=large][b]Hubzilla Documentation[/b][/size]
-[zrl=[baseurl]/help/about][b]What is the RedMatrix?[/b][/zrl]
-RedMatrix is a decentralized communication and publishing platform that enables you to keep in control of your communication needs by automatic encryption and finely grained access control. It's you, and only you who decides who is allowed to see your stuff.
+[zrl=[baseurl]/help/about][b]What is the Hubzilla?[/b][/zrl]
+Hubzilla is a decentralized communication and publishing platform that enables you to keep in control of your communication needs by automatic encryption and finely grained access control. It's you, and only you who decides who is allowed to see your stuff.
-[zrl=[baseurl]/help/features][b]RedMatrix Features[/b][/zrl]
+[zrl=[baseurl]/help/features][b]Hubzilla Features[/b][/zrl]
-The RedMatrix is already running as a global distributed network and proves its versatility and scalability from standalone to huge sites on a daily basis.
-Think of standalone family communication platforms, distributed online communities, support forums, blogs and homepages. Or professional content providers with commercial premium channels and targeted content acces. Whatever you want, the RedMatrix is there to cater to your creativity.
+The Hubzilla is already running as a global distributed network and proves its versatility and scalability from standalone to huge sites on a daily basis.
+Think of standalone family communication platforms, distributed online communities, support forums, blogs and homepages. Or professional content providers with commercial premium channels and targeted content acces. Whatever you want, the Hubzilla is there to cater to your creativity.
[zrl=[baseurl]/help/what_is_zot][b]Got Zot? Well, you should.[/b][/zrl]
-Zot is the great new communicaton protocol invented especially for the RedMatrix. As a member you are no longer bound to a single site or hub thanks to "Nomadic Identities". Migrate easily to another server and keep your contacts intact, or clone it and run the same channel on several servers. Just in case one of them might shut down, you don't lose out. Plus once you are inside the RedMatrix there is no need for you to authenticate twice, even when accessing another RedMatrix site. Zot is what sets the RedMatrix apart.
+Zot is the great new communicaton protocol invented especially for the Hubzilla. As a member you are no longer bound to a single site or hub thanks to "Nomadic Identities". Migrate easily to another server and keep your contacts intact, or clone it and run the same channel on several servers. Just in case one of them might shut down, you don't lose out. Plus once you are inside the Hubzilla there is no need for you to authenticate twice, even when accessing another Hubzilla site. Zot is what sets the Hubzilla apart.
[size=large][b]Getting Started[/b][/size]
[zrl=[baseurl]/help/Privacy]Privacy Policy[/zrl]
[zrl=[baseurl]/help/registration]Account Registration[/zrl]
-[zrl=[baseurl]/help/accounts_profiles_channels_basics]You at the RedMatrix: accounts, profiles and channels in short[/zrl]
+[zrl=[baseurl]/help/accounts_profiles_channels_basics]You at the Hubzilla: accounts, profiles and channels in short[/zrl]
[zrl=[baseurl]/help/profiles]Profiles[/zrl]
[zrl=[baseurl]/help/channels]Channels[/zrl]
[zrl=[baseurl]/help/roles]Permission roles and Channel types[/zrl]
@@ -42,11 +42,11 @@ Zot is the great new communicaton protocol invented especially for the RedMatrix [zrl=[baseurl]/help/debian_install]Easy Install on Debian via script[/zrl]
[zrl=[baseurl]/help/red2pi]Installing Red on the Raspberry Pi[/zrl]
[zrl=[baseurl]/help/troubleshooting]Troubleshooting Tips[/zrl]
-[zrl=[baseurl]/help/hidden_configs]Tweaking RedMatrix's Hidden Configurations[/zrl]
+[zrl=[baseurl]/help/hidden_configs]Tweaking Hubzilla's Hidden Configurations[/zrl]
[zrl=[baseurl]/help/faq_admins]FAQ For Admins[/zrl]
[size=large][b]Technical Documentation[/b][/size]
-[zrl=[baseurl]/help/history]RedMatrix history[/zrl]
+[zrl=[baseurl]/help/history]Hubzilla history[/zrl]
[zrl=[baseurl]/help/Zot---A-High-Level-Overview]A high level overview of Zot[/zrl]
[zrl=[baseurl]/help/zot]An introduction to Zot[/zrl]
[zrl=[baseurl]/help/zot_structures]Zot Stuctures[/zrl]
@@ -76,14 +76,14 @@ Zot is the great new communicaton protocol invented especially for the RedMatrix [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 RedMatrix Admin Support Channel[/url]
+[url=https://federated.social/channel/postgres]Postgres-specific Hubzilla Admin Support Channel[/url]
-[url=[baseurl]/help/credits]RedMatrix Credits[/url]
+[url=[baseurl]/help/credits]Hubzilla Credits[/url]
-[size=large][b]About This RedMatrix Hub[/b][/size]
+[size=large][b]About This Hubzilla Hub[/b][/size]
[zrl=[baseurl]/help/TermsOfService]Terms of Service For This Hub[/zrl]
[zrl=[baseurl]/siteinfo]Hub Information (/siteinfo)[/zrl]
[zrl=[baseurl]/siteinfo/json]Detailed Technical Hub Information in JSON format(/siteinfo/json)[/zrl]
diff --git a/doc/permissions.bb b/doc/permissions.bb index b4facde39..6bc8e566b 100644 --- a/doc/permissions.bb +++ b/doc/permissions.bb @@ -1,6 +1,6 @@ [b]Permissions[/b]
-Permissions in the Red Matrix are more complete than you may be used to. This allows us to define more fine graded relationships than the black and white "this person is my friend, so they can do everything" or "this person is not my friend, so they can't do anything" permissions you may find elsewhere.
+Permissions in the Hubzilla are more complete than you may be used to. This allows us to define more fine graded relationships than the black and white "this person is my friend, so they can do everything" or "this person is not my friend, so they can't do anything" permissions you may find elsewhere.
[b]Default Permissions[/b]
@@ -24,7 +24,7 @@ The scopes of permissions are: [li]Anybody On This Hub. Anybody using the same hub as you will have permission approved. Anybody who registered at a different hub will have this permission denied.[/li]
-[li]Anybody in this network. Anybody in the Red Matrix will have this permission approved. Even complete strangers. However, anybody not logged in/authenticated will have this permission denied.[/li]
+[li]Anybody in this network. Anybody in the Hubzilla will have this permission approved. Even complete strangers. However, anybody not logged in/authenticated will have this permission denied.[/li]
[li]Anybody authenticated. This is similar to "anybody in this network" except that it can include anybody who can authenticate by any means - and therefore may include visitors from other networks.[/li]
diff --git a/doc/plugins.bb b/doc/plugins.bb index 7f1684117..ada29cf62 100644 --- a/doc/plugins.bb +++ b/doc/plugins.bb @@ -1,9 +1,9 @@ [b]Plugins[/b]
-So you want to make the Red Matrix do something it doesn't already do. There are lots of ways. But let's learn how to write a plugin or addon.
+So you want to make the Hubzilla do something it doesn't already do. There are lots of ways. But let's learn how to write a plugin or addon.
-In your Red Matrix folder/directory, you will probably see a sub-directory called 'addon'. If you don't have one already, go ahead and create it.
+In your Hubzilla folder/directory, you will probably see a sub-directory called 'addon'. If you don't have one already, go ahead and create it.
[code]
mkdir addon
[/code]
@@ -26,7 +26,7 @@ Then we're going to create a comment block to describe the plugin. There's a spe /**
*
* Name: Random Place (here you can use better descriptions than you could in the filename)
- * Description: Sample Red Matrix plugin, Sets a random place when posting.
+ * Description: Sample Hubzilla plugin, Sets a random place when posting.
* Version: 1.0
* Author: Mike Macgirvin <mike@zothub.com>
*
@@ -45,9 +45,9 @@ In our case, we'll call them randplace_load() and randplace_unload(), as that is pluginname_uninstall()
[/code]
-Next we'll talk about **hooks**. Hooks are places in the Red Matrix code where we allow plugins to do stuff. There are a [lot of these](help/Hooks), and they each have a name. What we normally do is use the pluginname_load() function to register a "handler function" for any hooks you are interested in. Then when any of these hooks are triggered, your code will be called.
+Next we'll talk about **hooks**. Hooks are places in the Hubzilla code where we allow plugins to do stuff. There are a [lot of these](help/Hooks), and they each have a name. What we normally do is use the pluginname_load() function to register a "handler function" for any hooks you are interested in. Then when any of these hooks are triggered, your code will be called.
-We register hook handlers with the 'register_hook()' function. It takes 3 arguments. The first is the hook we wish to catch, the second is the filename of the file to find our handler function (relative to the base of your Red Matrix installation), and the third is the function name of your handler function. So let's create our randplace_load() function right now.
+We register hook handlers with the 'register_hook()' function. It takes 3 arguments. The first is the hook we wish to catch, the second is the filename of the file to find our handler function (relative to the base of your Hubzilla installation), and the third is the function name of your handler function. So let's create our randplace_load() function right now.
[code]
function randplace_load() {
@@ -247,18 +247,18 @@ If you want to keep your plugin hidden from the siteinfo page, simply create a f ***Porting Friendica Plugins***
-The Red Matrix uses a similar plugin architecture to the Friendica project. The authentication, identity, and permissions systems are completely different. Many Friendica can be ported reasonably easily by renaming a few functions - and then ensuring that the permissions model is adhered to. The functions which need to be renamed are:
+The Hubzilla uses a similar plugin architecture to the Friendica project. The authentication, identity, and permissions systems are completely different. Many Friendica can be ported reasonably easily by renaming a few functions - and then ensuring that the permissions model is adhered to. The functions which need to be renamed are:
[li] Friendica's pluginname_install() is pluginname_load()[/li]
[li] Friendica's pluginname_uninstall() is pluginname_unload()[/li]
-The Red Matrix has _install and _uninstall functions but these are used differently.
+The Hubzilla has _install and _uninstall functions but these are used differently.
[li] Friendica's "plugin_settings" hook is called "feature_settings"[/li]
[li] Friendica's "plugin_settings_post" hook is called "feature_settings_post"[/li]
-Changing these will often allow your plugin to function, but please double check all your permission and identity code because the concepts behind it are completely different in the Red Matrix. Many structured data names (especially DB schema columns) are also quite different.
+Changing these will often allow your plugin to function, but please double check all your permission and identity code because the concepts behind it are completely different in the Hubzilla. Many structured data names (especially DB schema columns) are also quite different.
#include doc/macros/main_footer.bb;
diff --git a/doc/problems-following-an-update.bb b/doc/problems-following-an-update.bb index a8a764cf1..750f5e6f0 100644 --- a/doc/problems-following-an-update.bb +++ b/doc/problems-following-an-update.bb @@ -28,7 +28,7 @@ We use the Smarty3 template engine to generate pages. These templates are compi [b]Theme Issues[/b]
-There are many themes for The Red Matrix. Only Redbasic is officialy supported by the core developers. This applies [i]even if a core developer happens to support an additional theme[/i]. This means new features are only guaranteed to work in Redbasic.
+There are many themes for The Hubzilla. Only Redbasic is officialy supported by the core developers. This applies [i]even if a core developer happens to support an additional theme[/i]. This means new features are only guaranteed to work in Redbasic.
Redbasic uses a few javascript libraries that are done differently, or entirely absent in other themes. This means new features may only work properly in Redbasic. Before reporting an issue, therefore, you should switch to Redbasic to see if it exists there. If the issue goes away, this is not a bug - it's a theme that isn't up to date.
diff --git a/doc/profiles.bb b/doc/profiles.bb index 1bf37b13b..208f84f75 100644 --- a/doc/profiles.bb +++ b/doc/profiles.bb @@ -14,7 +14,7 @@ In addition, if you'd like to meet people that share some general interests with To create an alternate profile, first go to [zrl=[baseurl]/settings/features]Settings > Additional Features[/zrl] and enable "Multiple Profiles" there, otherwise you won't have the ability to use more than just your default profile.
-Then select "Edit Profiles" from the menu of your Red Matrix site. You may edit an existing profile, change the profile photo, add things to a profile or create a new profile. You may also create a "clone" of an existing profile if you only wish to change a few items but don't wish to enter all the information again. To do that, click on the profile you want to clone and choose "Clone this profile" there.
+Then select "Edit Profiles" from the menu of your Hubzilla site. You may edit an existing profile, change the profile photo, add things to a profile or create a new profile. You may also create a "clone" of an existing profile if you only wish to change a few items but don't wish to enter all the information again. To do that, click on the profile you want to clone and choose "Clone this profile" there.
In the list of your profiles, you can also choose the contacts who can see a specific profile. Just click on "Edit visibility" next to the profile in question (only available for the profiles that are not your default profile) and then click on user images to add them to or remove them from the group of people who can see this profile.
diff --git a/doc/red2pi.bb b/doc/red2pi.bb index 6d15d3afe..5e2b77755 100644 --- a/doc/red2pi.bb +++ b/doc/red2pi.bb @@ -1,4 +1,4 @@ -[b]How to install the Red Matrix on a Raspberry Pi[/b]
+[b]How to install the Hubzilla on a Raspberry Pi[/b]
You just bought a Raspberry Pi and want to run the RED Matrix with your own domain name?
@@ -8,7 +8,7 @@ Then this page is for you! You will: [*] Install Apache Web Server, PHP, MaySQL, phpMyAdmin
[*] Register a free domain (dynamic DNS) and use it for your RED hub
[*] Install the RED Matrix
-[*] Keep your Raspberry Pi and your Redmatrix up-to-date
+[*] Keep your Raspberry Pi and your Hubzilla up-to-date
[*] TODO Setting up SSL
[*] TODO Running Friendica with SSL
[*] TODO Make the webserver less vulnarable to attacks
@@ -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 RED 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 red directory (including subdirectories and files)
(TODO: This step has to be proofed by the next installation.)
@@ -319,7 +319,7 @@ php util/config system block_public_search 1 -[size=large]5. Keep your Raspberry Pi and your Redmatrix up-to-date[/size]
+[size=large]5. Keep your Raspberry Pi and your Hubzilla up-to-date[/size]
Git update of RED every day at 4 am and addons at 5 am every day
Try if the command is working
diff --git a/doc/registration.bb b/doc/registration.bb index 072e82bf2..249d38bd1 100644 --- a/doc/registration.bb +++ b/doc/registration.bb @@ -1,6 +1,6 @@ [size=large][b]Registration[/b][/size]
-Not all Red Matrix sites allow open registration. If registration is allowed, you will see a "Register" link immediately below the login prompts on the site home page. Following this link will take you to the site Registration page. On some sites it may redirect you to another site which allow registrations. As all Red Matrix sites are linked, it does not matter where your account resides.
+Not all Hubzilla sites allow open registration. If registration is allowed, you will see a "Register" link immediately below the login prompts on the site home page. Following this link will take you to the site Registration page. On some sites it may redirect you to another site which allow registrations. As all Hubzilla sites are linked, it does not matter where your account resides.
[b]Your Email Address[/b]
@@ -8,7 +8,7 @@ Please provide a valid email address. Your email address is never published. Thi [b]Password[/b]
-Enter a password of your choice, and repeat it in the second box to ensure it was typed correctly. As the Red Matrix offers a decentralised identity, your account can log you in to many other websites.
+Enter a password of your choice, and repeat it in the second box to ensure it was typed correctly. As the Hubzilla offers a decentralised identity, your account can log you in to many other websites.
[b]Terms Of Service[/b]
@@ -25,7 +25,7 @@ Next, you will be presented with the "Add a channel" screen. Normally, When your channel is created you will be taken straight to your settings page where you can define permissions, enable features, etc. All these things are covered in the appropriate section of the helpfiles.
See Also
-[zrl=[baseurl]/help/accounts_profiles_channels_basics]The Basics about Identities within the Red Matrix[/zrl]
+[zrl=[baseurl]/help/accounts_profiles_channels_basics]The Basics about Identities within the Hubzilla[/zrl]
[zrl=[baseurl]/help/accounts]Accounts[/zrl]
[zrl=[baseurl]/help/profiles]Profiles[/zrl]
[zrl=[baseurl]/help/permissions]Permissions[/zrl]
diff --git a/doc/roadmap.bb b/doc/roadmap.bb index 0244bfcf4..40d8490f5 100644 --- a/doc/roadmap.bb +++ b/doc/roadmap.bb @@ -1,6 +1,6 @@ -Roadmap for Redmatrix V3 +Roadmap for Hubzilla V3 Crypto Convert E2EE to dynamic loading (on demand) using jQuery.getScript() [or other methods] to only load encryption libs when you require them. This should also support multiple encryption libraries (e.g. SJCL, others) triggered from the choice of algorithm and remain pluggable. @@ -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/sv/main.bb b/doc/sv/main.bb index 691f198f5..ad0768536 100644 --- a/doc/sv/main.bb +++ b/doc/sv/main.bb @@ -1,21 +1,21 @@ [img][baseurl]/assets/hashlogo.png[/img]
-[size=large][b]RedMatrix dokumentation[/b][/size]
+[size=large][b]Hubzilla dokumentation[/b][/size]
-[zrl=[baseurl]/help/about][b]Vad är RedMatrix?[/b][/zrl]
-RedMatrix är en decentraliserad publicerings- och kommunikationsplattform som möjliggör att du behåller kontrollen över dina kommunikationer med hjälp av automatisk kryptering och fininställbar behörighetskontroll. Det är du, och bara du, som beslutar vem som är behörig att ta del av ditt innehåll.
+[zrl=[baseurl]/help/about][b]Vad är Hubzilla?[/b][/zrl]
+Hubzilla är en decentraliserad publicerings- och kommunikationsplattform som möjliggör att du behåller kontrollen över dina kommunikationer med hjälp av automatisk kryptering och fininställbar behörighetskontroll. Det är du, och bara du, som beslutar vem som är behörig att ta del av ditt innehåll.
-[zrl=[baseurl]/help/features][b]RedMatrix funktioner[/b][/zrl]
-RedMatrix används redan och bildar ett globalt distribuerad närverk och bevisar* dagligen sin skalbarhet och diversitet i allt från installationer med en kanal till installationer med många användare och många kanaler med en stor mängd innehåll.
-Föreställ dig isolerade familjekommunikationsplatformer, distribuerade nätforum med fildelning, hjälpforum, bloggar och hemsidor. Eller proffesionellt anpassade innehållsleverantörer med kommersiella premium* kanaler och målriktat innehållsstyrning. Vad du än önskar så finns RedMatrix för att stödja dig i förverkligande av din kreativitet.
+[zrl=[baseurl]/help/features][b]Hubzilla funktioner[/b][/zrl]
+Hubzilla används redan och bildar ett globalt distribuerad närverk och bevisar* dagligen sin skalbarhet och diversitet i allt från installationer med en kanal till installationer med många användare och många kanaler med en stor mängd innehåll.
+Föreställ dig isolerade familjekommunikationsplatformer, distribuerade nätforum med fildelning, hjälpforum, bloggar och hemsidor. Eller proffesionellt anpassade innehållsleverantörer med kommersiella premium* kanaler och målriktat innehållsstyrning. Vad du än önskar så finns Hubzilla för att stödja dig i förverkligande av din kreativitet.
[zrl=[baseurl]/help/what_is_zot][b]Har du Zot? Skaffa det, direkt.[/b][/zrl]
-Zot är en fantastisk ny kommunikationsprotokoll uppfunnit speciellt för RedMatrix. Som medlem är du inte längre bunden till en enskild sida eller hub tack vara "nomadiska identiteter". Flytt lätt till en annan server och håll dina kontakter och förbindelser intakta eller klona och kör den samma kanal på flera servrar simultant. I tillfälle av att en av dem stänger ner så går du inte miste om något. Plus när du är loggat in i RedMatrix så är det inga flera inloggningar även när du kontakter andra hubbar i nätverket. Zot är det som gör RedMatrix till något särskilt värdefullt/som urskiljer RedMatrix från mängden.
+Zot är en fantastisk ny kommunikationsprotokoll uppfunnit speciellt för Hubzilla. Som medlem är du inte längre bunden till en enskild sida eller hub tack vara "nomadiska identiteter". Flytt lätt till en annan server och håll dina kontakter och förbindelser intakta eller klona och kör den samma kanal på flera servrar simultant. I tillfälle av att en av dem stänger ner så går du inte miste om något. Plus när du är loggat in i Hubzilla så är det inga flera inloggningar även när du kontakter andra hubbar i nätverket. Zot är det som gör Hubzilla till något särskilt värdefullt/som urskiljer Hubzilla från mängden.
[size=large][b]Kom igång[/b][/size]
[zrl=[baseurl]/help/Privacy]Privacy Policy[/zrl]
[zrl=[baseurl]/help/registration]Account Registration[/zrl]
-[zrl=[baseurl]/help/accounts_profiles_channels_basics]You at the RedMatrix: accounts, profiles and channels in short[/zrl]
+[zrl=[baseurl]/help/accounts_profiles_channels_basics]You at the Hubzilla: accounts, profiles and channels in short[/zrl]
[zrl=[baseurl]/help/profiles]Profiles[/zrl]
[zrl=[baseurl]/help/channels]Channels[/zrl]
[zrl=[baseurl]/help/sv/roles]Behörighetsförval för kanaler[/zrl]
@@ -41,11 +41,11 @@ Zot är en fantastisk ny kommunikationsprotokoll uppfunnit speciellt för RedMat [zrl=[baseurl]/help/debian_install]Easy Install on Debian via script[/zrl]
[zrl=[baseurl]/help/red2pi]Installing Red on the Raspberry Pi[/zrl]
[zrl=[baseurl]/help/troubleshooting]Troubleshooting Tips[/zrl]
-[zrl=[baseurl]/help/hidden_configs]Tweaking RedMatrix's Hidden Configurations[/zrl]
+[zrl=[baseurl]/help/hidden_configs]Tweaking Hubzilla's Hidden Configurations[/zrl]
[zrl=[baseurl]/help/faq_admins]FAQ For Admins[/zrl]
[size=large][b]Teknisk dokumentation[/b][/size]
-[zrl=[baseurl]/help/history]RedMatrix history[/zrl]
+[zrl=[baseurl]/help/history]Hubzilla history[/zrl]
[zrl=[baseurl]/help/Zot---A-High-Level-Overview]A high level overview of Zot[/zrl]
[zrl=[baseurl]/help/zot]An introduction to Zot[/zrl]
[zrl=[baseurl]/help/zot_structures]Zot Stuctures[/zrl]
@@ -78,9 +78,9 @@ Zot är en fantastisk ny kommunikationsprotokoll uppfunnit speciellt för RedMat [url=https://github.com/friendica/red-addons]Addon Website[/url]
[url=https://zothub.com/channel/one]Development Channel[/url]
-[url=[baseurl]/help/credits]RedMatrix Credits[/url]
+[url=[baseurl]/help/credits]Hubzilla Credits[/url]
-[size=large][b]About This RedMatrix Hub[/b][/size]
+[size=large][b]About This Hubzilla Hub[/b][/size]
[zrl=[baseurl]/help/TermsOfService]Terms of Service For This Hub[/zrl]
[zrl=[baseurl]/siteinfo]Hub Information (/siteinfo)[/zrl]
[zrl=[baseurl]/siteinfo_json]Detailed Technical Hub Information (/siteinfo_json)[/zrl]
diff --git a/doc/to_do_code.bb b/doc/to_do_code.bb index fd3923d40..0322272f8 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 "open site" 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 5dce2cb6f..374cf598d 100644 --- a/doc/what_is_zot.bb +++ b/doc/what_is_zot.bb @@ -1,6 +1,6 @@ [b]What is Zot?[/b]
-Zot is the protocol that powers the Red Matrix, providing three core capabilities: Communications, Identity, and Access Control.
+Zot is the protocol that powers the Hubzilla, providing three core capabilities: Communications, Identity, and Access Control.
The functionality it provides can also be described as follows:
@@ -39,7 +39,7 @@ You cannot be silenced. You cannot be removed from the matrix, unless you yourse [b][size=20]Access Control[/size][/b]
-Zot's identity layer allows you to provide fine-grained permissions to any content you wish to publish - and these permissions extend across the Red Matrix. This is like having one super huge website made up of an army of small individual websites - and where each channel in the matrix can completely control their privacy and sharing preferences for any web resources they create.
+Zot's identity layer allows you to provide fine-grained permissions to any content you wish to publish - and these permissions extend across the Hubzilla. This is like having one super huge website made up of an army of small individual websites - and where each channel in the matrix can completely control their privacy and sharing preferences for any web resources they create.
Currently, the matrix supports communications, photo albums, events, and files. This will be extended in the future to provide content management services (web pages) and cloud storage facilities, such as WebDAV and multi-media libraries. Every object and how it is shared and with whom is completely under your control.
@@ -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/doc/zot.md b/doc/zot.md index 54af44161..8cc1c8764 100644 --- a/doc/zot.md +++ b/doc/zot.md @@ -57,7 +57,7 @@ In order to implement high performance communications, the data transfer format Bi-directional encryption is based on RSA 4096-bit keys expressed in DER/ASN.1 format using the PKCS#8 encoding variant, with AES-256-CBC used for block encryption of variable length or large items. -Some aspects of well known "federation protocols" (webfinger, salmon, activitystreams, portablecontacts, etc.) may be used in zot, but we are not tied to them and will not be bound by them. The Red Matrix project is attempting some rather novel developments in decentralised communications and if there is any need to diverge from such "standard protocols" we will do so without question or hesitation. +Some aspects of well known "federation protocols" (webfinger, salmon, activitystreams, portablecontacts, etc.) may be used in zot, but we are not tied to them and will not be bound by them. The Hubzilla project is attempting some rather novel developments in decentralised communications and if there is any need to diverge from such "standard protocols" we will do so without question or hesitation. In order to create a globally unique ID, we will base it on a whirlpool hash of the identity URL of the origination node and a psuedo-random number, which should provide us with a 256 bit ID with an extremely low probability of collision (256 bits represents approximately 115 quattuorviginitillion or 1.16 X 10^77 unique numbers). This will be represented in communications as a base64url-encoded string. We will not depend on probabilities however and the ID must also be attached to a public key with public key cryptography used to provide an assurance of identity which has not been copied or somehow collided in whirlpool hash space. diff --git a/images/ghash-32.png b/images/ghash-32.png Binary files differnew file mode 100644 index 000000000..6b4913b82 --- /dev/null +++ b/images/ghash-32.png 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/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..b95411c81 100644 --- a/include/Import/refimport.php +++ b/include/Import/refimport.php @@ -88,7 +88,8 @@ 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_flags'] = ITEM_ORIGIN|ITEM_THREAD_TOP; + $arr['item_wall'] = 1; $arr['verb'] = ACTIVITY_POST; // this is an assumption @@ -205,7 +206,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 +257,8 @@ 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; + $arr['item_flags'] = ITEM_ORIGIN; + $arr['item_wall'] = 1; $arr['verb'] = ACTIVITY_POST; $arr['comment_policy'] = 'contacts'; 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..7d007e05b 100644 --- a/include/activities.php +++ b/include/activities.php @@ -21,7 +21,8 @@ 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_flags'] = ITEM_ORIGIN|ITEM_THREAD_TOP; + $arr['item_wall'] = 1; $arr['verb'] = ACTIVITY_UPDATE; $arr['obj_type'] = ACTIVITY_OBJ_PROFILE; diff --git a/include/api.php b/include/api.php index b9c4c45a4..7fea00d81 100644 --- a/include/api.php +++ b/include/api.php @@ -344,10 +344,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']; } @@ -1936,7 +1935,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( 'RED_PLATFORM' => RED_PLATFORM, 'RED_VERSION' => RED_VERSION, 'ZOT_REVISION' => ZOT_REVISION, diff --git a/include/attach.php b/include/attach.php index e6d6e5f24..cd51f8153 100644 --- a/include/attach.php +++ b/include/attach.php @@ -1031,7 +1031,7 @@ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid, $objtype = ACTIVITY_OBJ_FILE; - $item_flags = ITEM_WALL|ITEM_ORIGIN; + $item_flags = ITEM_ORIGIN; $private = (($arr_allow_cid[0] || $arr_allow_gid[0] || $arr_deny_cid[0] || $arr_deny_gid[0]) ? 1 : 0); @@ -1078,6 +1078,7 @@ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid, $arr['parent_mid'] = $u_mid; $arr['item_flags'] = $item_flags; $arr['item_unseen'] = 1; + $arr['item_wall'] = 1; $arr['author_xchan'] = $poster['xchan_hash']; $arr['owner_xchan'] = $poster['xchan_hash']; $arr['title'] = ''; diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index 118e78639..3750fe3fd 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -450,7 +450,7 @@ function format_event_diaspora($ev) { $bd_format = t('l F d, Y \@ g:i A') ; // Friday January 18, 2011 @ 8 AM - $o = t('Redmatrix event notification:') . "\n"; + $o = t('Hubzilla event notification:') . "\n"; $o .= '**' . (($ev['summary']) ? bb2diaspora($ev['summary']) : bb2diaspora($ev['desc'])) . '**' . "\n"; diff --git a/include/bbcode.php b/include/bbcode.php index 4ff6f842e..49dd4752d 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -381,10 +381,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(); @@ -420,7 +459,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(); @@ -437,7 +477,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/conversation.php b/include/conversation.php index fb012667e..e76101cbe 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -356,15 +356,6 @@ 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 diff --git a/include/diaspora.php b/include/diaspora.php index 4aa525838..acdddd0ef 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -329,7 +329,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) { @@ -706,8 +706,8 @@ function diaspora_request($importer,$xml) { $cnv = random_string(); $mid = random_string(); - $msg = t('You have started sharing with a Redmatrix premium channel.'); - $msg .= t('Redmatrix premium channels are not available for sharing with Diaspora members. This sharing request has been blocked.') . "\r"; + $msg = t('You have started sharing with a Hubzilla premium channel.'); + $msg .= t('Hubzilla 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'); @@ -1523,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); } @@ -2137,7 +2137,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); @@ -2458,7 +2458,7 @@ function diaspora_send_status($item,$owner,$contact,$public_batch = false) { '$handle' => xmlify($myaddr), '$public' => $public, '$created' => $created, - '$provider' => (($item['app']) ? $item['app'] : 'redmatrix') + '$provider' => (($item['app']) ? $item['app'] : 'hubzilla') )); } else { $tpl = get_markup_template('diaspora_post.tpl'); @@ -2469,7 +2469,7 @@ function diaspora_send_status($item,$owner,$contact,$public_batch = false) { '$handle' => xmlify($myaddr), '$public' => $public, '$created' => $created, - '$provider' => (($item['app']) ? $item['app'] : 'redmatrix') + '$provider' => (($item['app']) ? $item['app'] : 'hubzilla') )); } diff --git a/include/enotify.php b/include/enotify.php index e801c3100..3f54c6915 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -55,8 +55,8 @@ function notification($params) { push_lang($recip['account_language']); // should probably have a channel language - $banner = t('Red Matrix Notification'); - $product = t('redmatrix'); // RED_PLATFORM; + $banner = t('Hubzilla Notification'); + $product = t('hubzilla'); // RED_PLATFORM; $siteurl = $a->get_baseurl(true); $thanks = t('Thank You,'); $sitename = get_config('system','sitename'); @@ -171,7 +171,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]', diff --git a/include/event.php b/include/event.php index 5926b50f7..485379673 100644 --- a/include/event.php +++ b/include/event.php @@ -479,7 +479,7 @@ function event_store_item($arr, $event) { $item_flags = ITEM_THREAD_TOP; if($wall) { - $item_flags |= ITEM_WALL; + $item_arr['item_wall'] = 1; $item_flags |= ITEM_ORIGIN; } $item_arr['item_flags'] = $item_flags; diff --git a/include/externals.php b/include/externals.php index b0f853dc6..779d060e7 100644 --- a/include/externals.php +++ b/include/externals.php @@ -99,14 +99,14 @@ function externals_run($argv, $argc){ // ); $z = null; if($z) { - $flag_bits = ITEM_WALL|ITEM_ORIGIN|ITEM_UPLINK; + $flag_bits = 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' + $r = q("update item set item_flags = ( item_flags | %d ), item_wall = 1, owner_xchan = '%s' where id = %d", intval($flag_bits), dbesc($sys['xchan_hash']), diff --git a/include/identity.php b/include/identity.php index 7884c04d2..0b614a00e 100644 --- a/include/identity.php +++ b/include/identity.php @@ -583,8 +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), + $r = q("select * from item where item_wall = 1 and (item_restrict & %d) = 0 and uid = %d", intval(ITEM_DELETED), intval($channel_id) ); @@ -1371,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 @@ -1382,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 4e85bef37..88f110959 100755 --- a/include/items.php +++ b/include/items.php @@ -385,8 +385,10 @@ function post_activity_item($arr) { if(! x($arr,'item_flags')) { if($is_comment) $arr['item_flags'] = ITEM_ORIGIN; - else - $arr['item_flags'] = ITEM_ORIGIN | ITEM_WALL | ITEM_THREAD_TOP; + else { + $arr['item_wall'] = 1; + $arr['item_flags'] = ITEM_ORIGIN | ITEM_THREAD_TOP; + } } $channel = get_app()->get_channel(); @@ -417,14 +419,6 @@ function post_activity_item($arr) { $arr['item_flags'] = $arr['item_flags'] | ITEM_VERIFIED; } } - - 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()); @@ -851,7 +845,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']); @@ -900,21 +894,6 @@ function get_item_elements($x) { 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 @@ -1178,9 +1157,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; @@ -2033,6 +2018,7 @@ 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. @@ -2063,14 +2049,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'])) { @@ -2203,8 +2181,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. @@ -2460,14 +2438,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'])) { @@ -2640,11 +2610,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) ); @@ -2999,7 +2968,7 @@ 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) + if((intval($item['item_wall'])) || ($item['item_flags'] & ITEM_ORIGIN) || (!($item['item_flags'] & ITEM_THREAD_TOP)) || ($item['id'] != $item['parent'])) { @@ -3139,7 +3108,8 @@ function start_delivery_chain($channel, $item, $item_id, $parent) { if((! $private) && $new_public_policy) $private = 1; - $flag_bits = $item['item_flags'] | ITEM_WALL; + + $flag_bits = $item['item_flags']; // 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 @@ -3173,17 +3143,7 @@ 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; @@ -3195,7 +3155,7 @@ function start_delivery_chain($channel, $item, $item_id, $parent) { } $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", + deny_cid = '%s', deny_gid = '%s', item_private = %d, public_policy = '%s', comment_policy = '%s', title = '%s', body = '%s', item_wall = 1 where id = %d", intval($flag_bits), dbesc($channel['channel_hash']), dbesc($channel['channel_allow_cid']), @@ -3952,7 +3912,7 @@ function item_expire($uid,$days) { if(! intval($expire_limit)) $expire_limit = 5000; - $sql_extra = ((intval($expire_network_only)) ? " AND (item_flags & " . intval(ITEM_WALL) . ") = 0 " : ""); + $sql_extra = ((intval($expire_network_only)) ? " AND item_wall = 0 " : ""); $r = q("SELECT * FROM `item` WHERE `uid` = %d @@ -4113,7 +4073,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']); @@ -4221,7 +4181,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 @@ -4429,19 +4389,17 @@ function zot_feed($uid,$observer_xchan,$arr) { $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 + AND item_wall = 1 $sql_extra GROUP BY parent ORDER BY created ASC $limit", - intval($uid), - intval(ITEM_WALL) + 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) ); } @@ -4508,7 +4466,7 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C $sql_options .= " and (item_flags & " . intval(ITEM_STARRED) . ")>0 "; if($arr['wall']) - $sql_options .= " and (item_flags & " . intval(ITEM_WALL) . ")>0 "; + $sql_options .= " and item_wall = 1 "; $sql_extra = " AND item.parent IN ( SELECT parent FROM item WHERE (item_flags & " . intval(ITEM_THREAD_TOP) . ")>0 $sql_options ) "; diff --git a/include/notifier.php b/include/notifier.php index b82fb41cc..7bda433a9 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -228,10 +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 + $items = q("SELECT * FROM item WHERE uid = %d AND item_wall = 1 AND ( item_restrict & %d )>0 AND `changed` > %s - INTERVAL %s", intval($item_id), - intval(ITEM_WALL), intval(ITEM_DELETED), db_utcnow(), db_quoteinterval('10 MINUTE') ); @@ -457,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(($target_item['item_restrict'] & ITEM_DELETED) && (! intval($target_item['item_wall']))) { logger('notifier: ignoring delete notification for non-wall item'); return; } diff --git a/include/photos.php b/include/photos.php index 1672e310a..e12637882 100644 --- a/include/photos.php +++ b/include/photos.php @@ -219,7 +219,7 @@ function photo_upload($channel, $observer, $args) { } } - $item_flags = ITEM_WALL|ITEM_ORIGIN|ITEM_THREAD_TOP; + $item_flags = ITEM_ORIGIN|ITEM_THREAD_TOP; $item_restrict = (($visible) ? ITEM_VISIBLE : ITEM_HIDDEN); $title = ''; $mid = item_message_id(); @@ -234,6 +234,7 @@ function photo_upload($channel, $observer, $args) { $arr['mid'] = $mid; $arr['parent_mid'] = $mid; $arr['item_flags'] = $item_flags; + $arr['item_wall'] = 1; $arr['item_restrict'] = $item_restrict; $arr['resource_type'] = 'photo'; $arr['resource_id'] = $photo_hash; @@ -488,7 +489,7 @@ function photos_create_item($channel, $creator_hash, $photo, $visible = false) { // Create item container - $item_flags = ITEM_WALL|ITEM_ORIGIN|ITEM_THREAD_TOP; + $item_flags = ITEM_ORIGIN|ITEM_THREAD_TOP; $item_restrict = (($visible) ? ITEM_VISIBLE : ITEM_HIDDEN); $mid = item_message_id(); @@ -500,6 +501,7 @@ function photos_create_item($channel, $creator_hash, $photo, $visible = false) { $arr['mid'] = $mid; $arr['parent_mid'] = $mid; $arr['item_flags'] = $item_flags; + $arr['item_wall'] = 1; $arr['item_restrict'] = $item_restrict; $arr['resource_type'] = 'photo'; $arr['resource_id'] = $photo['resource_id']; 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/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..95b6ae1af 100644 --- a/include/taxonomy.php +++ b/include/taxonomy.php @@ -111,8 +111,12 @@ 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 == ITEM_WALL) + $sql_options .= " and item_wall = 1 "; + else + $sql_options .= " and ((item_flags & " . intval($flags) . ") = " . intval($flags) . ") "; + } if($authors) { if(! is_array($authors)) diff --git a/include/text.php b/include/text.php index deb5a4c90..c7b662879 100644 --- a/include/text.php +++ b/include/text.php @@ -513,9 +513,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. * @@ -681,7 +681,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'); @@ -1379,15 +1379,15 @@ function generate_named_map($location) { function prepare_body(&$item,$attach = false) { - if(get_config('system','item_cache') && $item['html']) - return $item['html']; + if($item['html']) + return bb_observer($item['html']); call_hooks('prepare_body_init', $item); unobscure($item); - $s = prepare_text($item['body'],$item['mimetype']); + $s = prepare_text($item['body'],$item['mimetype'], true); $prep_arr = array('item' => $item, 'html' => $s); call_hooks('prepare_body', $prep_arr); @@ -1452,11 +1452,11 @@ function prepare_body(&$item,$attach = false) { $prep_arr = array('item' => $item, 'html' => $s); call_hooks('prepare_body_final', $prep_arr); - if(get_config('system','item_cache')) - q("update item set html = '%s' where id = %d", - dbesc($prep_arr['html']), - intval($item['id']) - ); + + q("update item set html = '%s' where id = %d", + dbesc($prep_arr['html']), + intval($item['id']) + ); return $prep_arr['html']; } @@ -1468,7 +1468,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': @@ -1506,9 +1506,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; } diff --git a/include/zot.php b/include/zot.php index 3c7413b5c..15d724026 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 @@ -1559,12 +1559,12 @@ 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); + if(intval($arr['item_wall'])) { + $arr['item_wall'] = 0; } } @@ -2,7 +2,7 @@ /** * - * Red Matrix + * Hubzilla * */ diff --git a/install/INSTALL.txt b/install/INSTALL.txt index a00c3bca3..871b19de5 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. @@ -85,7 +85,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 @@ -96,7 +96,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 @@ -124,10 +124,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. @@ -184,7 +184,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) @@ -231,7 +231,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 @@ -281,7 +281,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. ##################################################################### @@ -291,26 +291,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 c2cefd07d..3ba3da11e 100644 --- a/install/schema_mysql.sql +++ b/install/schema_mysql.sql @@ -662,6 +662,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', @@ -692,6 +693,7 @@ CREATE TABLE IF NOT EXISTS `item` ( `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_wall` smallint(1) NOT NULL DEFAULT '0', PRIMARY KEY (`id`), KEY `uid` (`uid`), KEY `parent` (`parent`), @@ -722,6 +724,7 @@ CREATE TABLE IF NOT EXISTS `item` ( KEY `comments_closed` (`comments_closed`), KEY `changed` (`changed`), KEY `item_unseen` (`item_unseen`), + KEY `item_wall` (`item_wall`), FULLTEXT KEY `title` (`title`), FULLTEXT KEY `body` (`body`), FULLTEXT KEY `allow_cid` (`allow_cid`), diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql index 438b29d49..c572bb086 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/admin.php b/mod/admin.php index fd2ba510b..c74e5ad2c 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. */ @@ -230,7 +230,7 @@ function admin_page_summary(&$a) { $alertmsg = ''; // annoy admin about upcoming unsupported PHP version if (version_compare(PHP_VERSION, '5.4', '<')) { - $alertmsg = 'Your PHP version ' . PHP_VERSION . ' will not be supported with the next major release of RedMatrix. You are strongly urged to upgrade to a current version.' + $alertmsg = 'Your PHP version ' . PHP_VERSION . ' will not be supported with the next major release of Hubzilla. You are strongly urged to upgrade to a current version.' . '<br>PHP 5.3 has reached its <a href="http://php.net/eol.php" class="alert-link">End of Life (EOL)</a> in August 2014.' . ' A list about current PHP versions can be found <a href="http://php.net/supported-versions.php" class="alert-link">here</a>.'; } diff --git a/mod/channel.php b/mod/channel.php index 022def2a8..f33ba8072 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 $simple_update $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 $simple_update 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,12 +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_flags & %d)>0 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) ); @@ -339,8 +335,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), + AND item_wall = 1 AND uid = %d $update_unseen", intval(local_channel()) ); } diff --git a/mod/cloud.php b/mod/cloud.php index b36e6c482..a87d36ea1 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'); @@ -117,7 +117,7 @@ function cloud_init(&$a) { if ((! $auth->observer) && (! $isapublic_file) && (! $davguest)) { try { - $auth->Authenticate($server, t('RedMatrix - Guests: Username: {your email address}, Password: +++')); + $auth->Authenticate($server, t('Hubzilla - Guests: Username: {your email address}, Password: +++')); } catch (Exception $e) { logger('mod_cloud: auth exception' . $e->getMessage()); @@ -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/connedit.php b/mod/connedit.php index 8ae1707ae..b346f3de0 100644 --- a/mod/connedit.php +++ b/mod/connedit.php @@ -240,7 +240,8 @@ 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_flags'] = ITEM_ORIGIN|ITEM_THREAD_TOP; + $xarr['item_wall'] = 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 f7f89b6da..d49dd7359 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'); @@ -118,7 +118,7 @@ function dav_init(&$a) { if ((! $auth->observer) && (! $isapublic_file) && (! $davguest)) { try { - $auth->Authenticate($server, t('RedMatrix channel')); + $auth->Authenticate($server, t('Hubzilla channel')); } catch (Exception $e) { logger('mod_cloud: auth exception' . $e->getMessage()); @@ -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/events.php b/mod/events.php index 289ddfb15..ba7ef6b7d 100755 --- a/mod/events.php +++ b/mod/events.php @@ -415,7 +415,7 @@ function events_content(&$a) { $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')); diff --git a/mod/home.php b/mod/home.php index 7bb138d2e..85c89a623 100644 --- a/mod/home.php +++ b/mod/home.php @@ -50,7 +50,7 @@ function home_content(&$a, $update = 0, $load = false) { if(get_config('system','projecthome')) { $o .= file_get_contents('assets/home.html'); $a->page['template'] = 'full'; - $a->page['title'] = t('Red Matrix - "The Network"'); + $a->page['title'] = t('Hubzilla - "The Network"'); return $o; } @@ -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/invite.php b/mod/invite.php index e197278d1..81e10bcd8 100644 --- a/mod/invite.php +++ b/mod/invite.php @@ -129,12 +129,12 @@ function invite_content(&$a) { '$invite' => t('Send invitations'), '$addr_text' => t('Enter email addresses, one per line:'), '$msg_text' => t('Your message:'), - '$default_message' => t('Please join my community on RedMatrix.') . "\r\n" . "\r\n" + '$default_message' => t('Please join my community on Hubzilla.') . "\r\n" . "\r\n" . $linktxt . (($invonly) ? "\r\n" . "\r\n" . t('You will need to supply this invitation code: ') . $invite_code . "\r\n" . "\r\n" : '') - . t('1. Register at any RedMatrix location (they are all inter-connected)') + . t('1. Register at any Hubzilla location (they are all inter-connected)') . "\r\n" . "\r\n" . z_root() . '/register' - . "\r\n" . "\r\n" . t('2. Enter my RedMatrix network address into the site searchbar.') + . "\r\n" . "\r\n" . t('2. Enter my Hubzilla network address into the site searchbar.') . "\r\n" . "\r\n" . $ob['xchan_addr'] . ' (' . t('or visit ') . z_root() . '/channel/' . $channel['channel_address'] . ')' . "\r\n" . "\r\n" . t('3. Click [Connect]') diff --git a/mod/item.php b/mod/item.php index a732a9f81..4777dd5c0 100644 --- a/mod/item.php +++ b/mod/item.php @@ -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_flags'] & ITEM_ORIGIN) && intval($parent_item['item_wall'])) { $walltowall_comment = true; $walltowall = true; } @@ -658,9 +658,10 @@ function item_post(&$a) { } $item_unseen = 1; - + $item_wall = 0; + if($post_type === 'wall' || $post_type === 'wall-comment') - $item_flags = $item_flags | ITEM_WALL; + $item_wall = 1; if($origin) $item_flags = $item_flags | ITEM_ORIGIN; @@ -731,6 +732,7 @@ 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; @@ -790,14 +792,6 @@ function item_post(&$a) { $datarray['item_flags'] = $datarray['item_flags'] | ITEM_VERIFIED; } } - - 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) { @@ -831,7 +825,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'], @@ -1093,8 +1087,7 @@ function item_check_service_class($channel_id,$iswebpage) { ); } 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 2e45362ba..70a09b134 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(); diff --git a/mod/like.php b/mod/like.php index d3b6f3ecf..54039f2cf 100755 --- a/mod/like.php +++ b/mod/like.php @@ -18,7 +18,7 @@ function like_content(&$a) { if(! $observer) { $_SESSION['return_url'] = $a->query_string; $o .= t('This action is restricted to members.') . EOL; - $o .= t('Please <a href="rmagic">login with your RedMatrix ID</a> or <a href="register">register as a new RedMatrix member</a> to continue.') . EOL; + $o .= t('Please <a href="rmagic">login with your Hubzilla ID</a> or <a href="register">register as a new Redmatrix.member</a> to continue.') . EOL; return $o; } } @@ -337,10 +337,11 @@ function like_content(&$a) { } $mid = item_message_id(); + $item_wall = 0; if($extended_like) { - $item_flags = ITEM_THREAD_TOP|ITEM_ORIGIN|ITEM_WALL; - + $item_flags = ITEM_THREAD_TOP|ITEM_ORIGIN; + $item_wall = 1; } else { $post_type = (($item['resource_type'] === 'photo') ? t('photo') : t('status')); @@ -376,8 +377,8 @@ function like_content(&$a) { $post_type = 'comment'; $item_flags = ITEM_ORIGIN | ITEM_NOTSHOWN; - if($item['item_flags'] & ITEM_WALL) - $item_flags |= ITEM_WALL; + if(intval($item['item_wall'])) + $item_wall = 1; // if this was a linked photo and was hidden, unhide it. @@ -437,6 +438,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/manage.php b/mod/manage.php index 3712be6f1..de5f9c8ad 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_flags, 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'] ++; diff --git a/mod/mitem.php b/mod/mitem.php index 06c66a323..6235987a6 100644 --- a/mod/mitem.php +++ b/mod/mitem.php @@ -153,7 +153,7 @@ function mitem_content(&$a) { '$aclselect' => populate_acl($perm_defaults,false), '$mitem_desc' => array('mitem_desc', t('Link Name'), '', 'Visible name of the link','*'), '$mitem_link' => array('mitem_link', t('Link Target'), '', 'URL of the link', '*'), - '$usezid' => array('usezid', t('Use RedMatrix magic-auth if available'), true, ''), + '$usezid' => array('usezid', t('Use Hubzilla magic-auth if available'), true, ''), '$newwin' => array('newwin', t('Open link in new window'), false,''), '$mitem_order' => array('mitem_order', t('Order in list'),'0',t('Higher numbers will sink to bottom of listing')), '$submit' => t('Submit and finish'), @@ -223,7 +223,7 @@ function mitem_content(&$a) { '$mitem_id' => intval(argv(2)), '$mitem_desc' => array('mitem_desc', t('Link text'), $mitem['mitem_desc'], '','*'), '$mitem_link' => array('mitem_link', t('URL of link'), $mitem['mitem_link'], '', '*'), - '$usezid' => array('usezid', t('Use RedMatrix magic-auth if available'), (($mitem['mitem_flags'] & MENU_ITEM_ZID) ? 1 : 0), ''), + '$usezid' => array('usezid', t('Use Hubzilla magic-auth if available'), (($mitem['mitem_flags'] & MENU_ITEM_ZID) ? 1 : 0), ''), '$newwin' => array('newwin', t('Open link in new window'), (($mitem['mitem_flags'] & MENU_ITEM_NEWWIN) ? 1 : 0),''), '$mitem_order' => array('mitem_order', t('Order in list'),$mitem['mitem_order'],t('Higher numbers will sink to bottom of listing')), '$submit' => t('Submit'), diff --git a/mod/mood.php b/mod/mood.php index 7663b2632..4bb291182 100755 --- a/mod/mood.php +++ b/mod/mood.php @@ -61,7 +61,7 @@ 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; + $item_flags = ITEM_ORIGIN; if(! $parent_mid) $item_flags |= ITEM_THREAD_TOP; @@ -72,6 +72,7 @@ function mood_init(&$a) { $arr['mid'] = $mid; $arr['parent_mid'] = (($parent_mid) ? $parent_mid : $mid); $arr['item_flags'] = $item_flags; + $arr['item_wall'] = 1; $arr['author_xchan'] = $poster['xchan_hash']; $arr['owner_xchan'] = (($parent_mid) ? $r[0]['owner_xchan'] : $poster['xchan_hash']); $arr['title'] = ''; @@ -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) ); @@ -43,7 +42,7 @@ function p_init(&$a) { '$handle' => xmlify($myaddr), '$public' => 'true', '$created' => $created, - '$provider' => (($item['app']) ? $item['app'] : 'redmatrix') + '$provider' => (($item['app']) ? $item['app'] : 'hubzilla') )); header('Content-type: text/xml'); diff --git a/mod/ping.php b/mod/ping.php index b676726fe..181e4f80a 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); } @@ -390,7 +389,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'] ++; diff --git a/mod/poke.php b/mod/poke.php index 6257a2821..517387453 100755 --- a/mod/poke.php +++ b/mod/poke.php @@ -87,10 +87,11 @@ function poke_init(&$a) { $arr = array(); - $arr['item_flags'] = ITEM_WALL | ITEM_ORIGIN; + $arr['item_flags'] = 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'] = ''; diff --git a/mod/pubsites.php b/mod/pubsites.php index ff3854492..ccddff2d8 100644 --- a/mod/pubsites.php +++ b/mod/pubsites.php @@ -16,7 +16,7 @@ function pubsites_content(&$a) { $o .= '<h1>' . t('Public Sites') . '</h1>'; $o .= '<div class="descriptive-text">' . - t('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.') . '</div>' . EOL; + t('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.') . '</div>' . EOL; $ret = z_fetch_url($url); if($ret['success']) { diff --git a/mod/setup.php b/mod/setup.php index b885388be..0a560e6df 100755 --- a/mod/setup.php +++ b/mod/setup.php @@ -163,7 +163,7 @@ function setup_content(&$a) { global $install_wizard_pass, $db; $o = ''; $wizard_status = ""; - $install_title = t('Red Matrix Server - Setup'); + $install_title = t('Hubzilla Server - Setup'); @@ -287,7 +287,7 @@ function setup_content(&$a) { $o .= replace_macros($tpl, array( '$title' => $install_title, '$pass' => t('Database connection'), - '$info_01' => t('In order to install Red Matrix we need to know how to connect to your database.'), + '$info_01' => t('In order to install Hubzilla we need to know how to connect to your database.'), '$info_02' => t('Please contact your hosting provider or site administrator if you have questions about these settings.'), '$info_03' => t('The database you specify below should already exist. If it does not, please create it before continuing.'), diff --git a/mod/siteinfo.php b/mod/siteinfo.php index 856909a27..1c39e8ecf 100644 --- a/mod/siteinfo.php +++ b/mod/siteinfo.php @@ -153,7 +153,7 @@ function siteinfo_content(&$a) { $o = replace_macros(get_markup_template('siteinfo.tpl'), array( '$title' => t('Red'), - '$description' => t('This is a hub of redmatrix - a global cooperative network of decentralized privacy enhanced websites.'), + '$description' => t('This is a hub of hubzilla - a global cooperative network of decentralized privacy enhanced websites.'), '$version' => $version, '$tag_txt' => t('Tag: '), '$tag' => $tag, @@ -161,11 +161,11 @@ function siteinfo_content(&$a) { '$lastpoll' => get_poller_runtime(), '$commit' => $commit, '$web_location' => t('Running at web location') . ' ' . z_root(), - '$visit' => t('Please visit <a href="https://redmatrix.me">redmatrix.me</a> to learn more about the Red Matrix.'), + '$visit' => t('Please visit <a href="https://redmatrix.me">redmatrix.me</a> to learn more about the Hubzilla.'), '$bug_text' => t('Bug reports and issues: please visit'), - '$bug_link_url' => 'https://github.com/redmatrix/redmatrix/issues', - '$bug_link_text' => 'redmatrix issues', - '$contact' => t('Suggestions, praise, etc. - please email "redmatrix" at librelist - dot com'), + '$bug_link_url' => 'https://github.com/redmatrix/hubzilla/issues', + '$bug_link_text' => 'hubzilla issues', + '$contact' => t('Suggestions, praise, etc. - please email "hubzilla" at librelist - dot com'), '$donate' => $donate, '$adminlabel' => t('Site Administrators'), '$admininfo' => $admininfo, diff --git a/mod/subthread.php b/mod/subthread.php index eeb8f131d..bdb582a57 100755 --- a/mod/subthread.php +++ b/mod/subthread.php @@ -103,9 +103,6 @@ function subthread_content(&$a) { $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(); @@ -113,6 +110,7 @@ function subthread_content(&$a) { $arr['aid'] = $owner_aid; $arr['uid'] = $owner_uid; $arr['item_flags'] = $item_flags; + $arr['item_wall'] = $item['item_wall']; $arr['parent'] = $item['id']; $arr['parent_mid'] = $item['mid']; $arr['thr_parent'] = $item['mid']; diff --git a/mod/tagger.php b/mod/tagger.php index aafad58cf..c32b55548 100644 --- a/mod/tagger.php +++ b/mod/tagger.php @@ -109,8 +109,7 @@ function tagger_content(&$a) { $arr['item_flags'] = ITEM_ORIGIN; - if($item['item_flags'] & ITEM_WALL) - $arr['item_flags'] |= ITEM_WALL; + $arr['item_wall'] = $item['item_wall']; $ulink = '[zrl=' . $channel['xchan_url'] . ']' . $channel['channel_name'] . '[/zrl]'; $alink = '[zrl=' . $item['xchan_url'] . ']' . $item['xchan_name'] . '[/zrl]'; diff --git a/mod/thing.php b/mod/thing.php index c6b70fbb4..92fc82e53 100644 --- a/mod/thing.php +++ b/mod/thing.php @@ -177,7 +177,8 @@ 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_flags'] = ITEM_ORIGIN|ITEM_THREAD_TOP; + $arr['item_wall'] = 1; $ulink = '[zrl=' . $channel['xchan_url'] . ']' . $channel['channel_name'] . '[/zrl]'; $plink = '[zrl=' . $term['url'] . ']' . $term['term'] . '[/zrl]'; 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 533e240ef..9a3a96adf 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 # @@ -1108,11 +1108,11 @@ msgid "Public Hubs" msgstr "" #: ../../include/enotify.php:58 -msgid "Red Matrix Notification" +msgid "Hubzilla Notification" msgstr "" #: ../../include/enotify.php:59 -msgid "redmatrix" +msgid "hubzilla" msgstr "" #: ../../include/enotify.php:61 @@ -1675,7 +1675,7 @@ msgid "Attachments:" msgstr "" #: ../../include/bb2diaspora.php:453 -msgid "Redmatrix event notification:" +msgid "Hubzilla event notification:" msgstr "" #: ../../include/text.php:329 @@ -4647,7 +4647,7 @@ msgid "Fetching URL returns error: %1$s" msgstr "" #: ../../mod/home.php:53 -msgid "Red Matrix - "The Network"" +msgid "Hubzilla - "The Network"" msgstr "" #: ../../mod/home.php:124 @@ -4750,8 +4750,8 @@ msgstr "" #: ../../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 "" #: ../../mod/like.php:101 ../../mod/like.php:128 ../../mod/like.php:166 @@ -4917,7 +4917,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 " @@ -4961,7 +4961,7 @@ msgid "Edit post" msgstr "" #: ../../mod/dav.php:121 -msgid "RedMatrix channel" +msgid "Hubzilla channel" msgstr "" #: ../../mod/group.php:20 @@ -5031,7 +5031,7 @@ msgstr "" #: ../../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 "" @@ -5050,7 +5050,7 @@ msgstr "" #: ../../mod/siteinfo.php:164 msgid "" "Please visit <a href=\"https://redmatrix.me\">redmatrix.me</a> to learn more " -"about the Red Matrix." +"about the Hubzilla." msgstr "" #: ../../mod/siteinfo.php:165 @@ -5059,7 +5059,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 @@ -5075,7 +5075,7 @@ msgid "Not Found" msgstr "" #: ../../mod/setup.php:166 -msgid "Red Matrix Server - Setup" +msgid "Hubzilla Server - Setup" msgstr "" #: ../../mod/setup.php:172 @@ -5120,7 +5120,7 @@ msgstr "" #: ../../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 "" @@ -5580,7 +5580,7 @@ msgid "%1$s tagged %2$s's %3$s with %4$s" msgstr "" #: ../../mod/cloud.php:120 -msgid "RedMatrix - Guests: Username: {your email address}, Password: +++" +msgid "Hubzilla - Guests: Username: {your email address}, Password: +++" msgstr "" #: ../../mod/photos.php:77 @@ -6141,7 +6141,7 @@ msgid "Your message:" msgstr "" #: ../../mod/invite.php:132 -msgid "Please join my community on RedMatrix." +msgid "Please join my community on Hubzilla." msgstr "" #: ../../mod/invite.php:134 @@ -6149,11 +6149,11 @@ msgid "You will need to supply this invitation code: " msgstr "" #: ../../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 "" #: ../../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 "" #: ../../mod/invite.php:138 @@ -6775,7 +6775,7 @@ msgid "Link Target" msgstr "" #: ../../mod/mitem.php:156 ../../mod/mitem.php:226 -msgid "Use RedMatrix magic-auth if available" +msgid "Use Hubzilla magic-auth if available" msgstr "" #: ../../mod/mitem.php:157 ../../mod/mitem.php:227 @@ -8754,7 +8754,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 @@ -8893,7 +8893,7 @@ msgstr "" #: ../../boot.php:1515 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:1543 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 9828124c7..c119132cd 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..98ae2508b 100644 --- a/util/strings.php +++ b/util/strings.php @@ -307,8 +307,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"] = ""; -$a->strings["redmatrix"] = ""; +$a->strings["Hubzilla Notification"] = ""; +$a->strings["hubzilla"] = ""; $a->strings["Thank You,"] = ""; $a->strings["%s Administrator"] = ""; $a->strings["%s <!item_type!>"] = ""; @@ -1067,7 +1067,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"] = ""; $a->strings["Access Type"] = ""; $a->strings["Registration Policy"] = ""; @@ -1108,7 +1108,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["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."] = ""; @@ -1259,9 +1259,9 @@ $a->strings["Hometown: "] = ""; $a->strings["About: "] = ""; $a->strings["Keywords: "] = ""; $a->strings["This site is not a directory server"] = ""; -$a->strings["Red Matrix - "The Network""] = ""; +$a->strings["Hubzilla - "The Network""] = ""; $a->strings["Welcome to %s"] = ""; -$a->strings["Red Matrix Server - Setup"] = ""; +$a->strings["Hubzilla 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."] = ""; @@ -1272,7 +1272,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"] = ""; @@ -1364,11 +1364,11 @@ $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["This is a hub of the Hubzilla - 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["Please visit <a href=\"http://getzot.com\">GetZot.com</a> to learn more about the 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."] = ""; @@ -1654,12 +1654,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 decentralized communication and information tool."] = ""; +$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."] = ""; $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"] = ""; +$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"] = ""; $a->strings["Unable to locate original post."] = ""; $a->strings["Empty post discarded."] = ""; $a->strings["Executable content type not permitted to this channel."] = ""; @@ -1671,7 +1671,7 @@ $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["Please <a href=\"rmagic\">login with your Hubzilla 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."] = ""; @@ -1822,7 +1822,7 @@ $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["Narrow navbar"] = ""; $a->strings["Navigation bar background color"] = ""; $a->strings["Navigation bar gradient top color"] = ""; @@ -1855,7 +1855,7 @@ $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?"] = ""; 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/de/htconfig.tpl b/view/de/htconfig.tpl index 550b018fe..928694769 100644 --- a/view/de/htconfig.tpl +++ b/view/de/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/de/messages.po b/view/de/messages.po index ef27fd162..506a6a4fa 100644 --- a/view/de/messages.po +++ b/view/de/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: @@ -24,7 +24,7 @@ # sasiflo <transiflex@sasiflo.de>, 2014 msgid "" msgstr "" -"Project-Id-Version: Red Matrix\n" +"Project-Id-Version: Hubzilla\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-02-20 00:04-0800\n" "PO-Revision-Date: 2015-02-27 09:55+0000\n" @@ -394,12 +394,12 @@ msgid "Public Hubs" msgstr "Öffentliche Hubs" #: ../../include/enotify.php:41 -msgid "Red Matrix Notification" -msgstr "Red Matrix Benachrichtigung" +msgid "Hubzilla Notification" +msgstr "Hubzilla Benachrichtigung" #: ../../include/enotify.php:42 -msgid "redmatrix" -msgstr "redmatrix" +msgid "hubzilla" +msgstr "hubzilla" #: ../../include/enotify.php:44 msgid "Thank You," @@ -2069,8 +2069,8 @@ msgid "l F d, Y \\@ g:i A" msgstr "l, d. F Y, H:i" #: ../../include/bb2diaspora.php:430 -msgid "Redmatrix event notification:" -msgstr "RedMatrix Termin-Benachrichtigung:" +msgid "Hubzilla event notification:" +msgstr "Hubzilla Termin-Benachrichtigung:" #: ../../include/bb2diaspora.php:434 ../../include/event.php:20 msgid "Starts:" @@ -2656,7 +2656,7 @@ msgstr "Nur für Dich sichtbar." #: ../../include/items.php:1185 msgid "Visible to anybody in this network." -msgstr "Für jedes Mitglied der RedMatrix sichtbar." +msgstr "Für jedes Mitglied der Hubzilla sichtbar." #: ../../include/items.php:1187 msgid "Visible to anybody authenticated." @@ -4313,8 +4313,8 @@ msgid "Currently pending" msgstr "Derzeit anstehend" #: ../../mod/home.php:48 -msgid "Red Matrix - "The Network"" -msgstr "RedMatrix – "Das Netzwerk"" +msgid "Hubzilla - "The Network"" +msgstr "Hubzilla – "Das Netzwerk"" #: ../../mod/home.php:101 #, php-format @@ -4386,8 +4386,8 @@ msgid "Fetching URL returns error: %1$s" msgstr "Abrufen der URL gab einen Fehler zurück: %1$s" #: ../../mod/dav.php:121 -msgid "RedMatrix channel" -msgstr "RedMatrix-Kanal" +msgid "Hubzilla channel" +msgstr "Hubzilla-Kanal" #: ../../mod/profile_photo.php:108 msgid "Image uploaded but image cropping failed." @@ -4611,7 +4611,7 @@ msgstr "Öffentliche Server" #: ../../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 " @@ -5225,8 +5225,8 @@ msgid "Remove this channel" msgstr "Diesen Kanal löschen" #: ../../mod/cloud.php:120 -msgid "RedMatrix - Guests: Username: {your email address}, Password: +++" -msgstr "RedMatrix – Gäste: Username: {Deine E-Mail-Adresse}, Passwort: +++" +msgid "Hubzilla - Guests: Username: {your email address}, Password: +++" +msgstr "Hubzilla – Gäste: Username: {Deine E-Mail-Adresse}, Passwort: +++" #: ../../mod/tagrm.php:44 ../../mod/tagrm.php:94 msgid "Tag removed" @@ -5311,9 +5311,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 "Dieser Hub ist Teil der RedMatrix – eines globalen, kooperativen Netzwerks aus dezentralen Websites, die Rücksicht auf Deine Privatsphäre nehmen." +msgstr "Dieser Hub ist Teil der Hubzilla – eines globalen, kooperativen Netzwerks aus dezentralen Websites, die Rücksicht auf Deine Privatsphäre nehmen." #: ../../mod/siteinfo.php:139 msgid "Tag: " @@ -5329,9 +5329,9 @@ msgstr "Erreichbar unter der Web-Adresse" #: ../../mod/siteinfo.php:145 msgid "" -"Please visit <a href=\"https://redmatrix.me\">RedMatrix.me</a> to learn more" -" about the Red Matrix." -msgstr "Bitte besuchen Sie <a href=\"https://redmatrix.me\">RedMatrix.me</a>, um mehr über RedMatrix zu erfahren." +"Please visit <a href=\"https://redmatrix.me\">Redmatrix.me</a> to learn more" +" about the Hubzilla." +msgstr "Bitte besuchen Sie <a href=\"https://redmatrix.me\">Redmatrix.me</a>, um mehr über Hubzilla zu erfahren." #: ../../mod/siteinfo.php:146 msgid "Bug reports and issues: please visit" @@ -5339,9 +5339,9 @@ msgstr "Probleme oder Fehler gefunden? Bitte besuche" #: ../../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 "Vorschläge, Lob, usw.: E-Mail an 'redmatrix' at librelist - dot - com" +msgstr "Vorschläge, Lob, usw.: E-Mail an 'hubzilla' at librelist - dot - com" #: ../../mod/siteinfo.php:151 msgid "Site Administrators" @@ -5356,8 +5356,8 @@ msgid "Not Found" msgstr "Nicht gefunden" #: ../../mod/setup.php:166 -msgid "Red Matrix Server - Setup" -msgstr "Red Matrix Server - Installation" +msgid "Hubzilla Server - Setup" +msgstr "Hubzilla Server - Installation" #: ../../mod/setup.php:172 msgid "Could not connect to database." @@ -5401,7 +5401,7 @@ msgstr "Datenbank Verbindung" #: ../../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 "Um die Red-Matrix installieren zu können, müssen wir wissen, wie wir eine Verbindung zu Deiner Datenbank aufbauen können." @@ -6341,20 +6341,20 @@ msgid "Your message:" msgstr "Deine Nachricht:" #: ../../mod/invite.php:132 -msgid "Please join my community on RedMatrix." -msgstr "Schließe Dich uns in der RedMatrix an!" +msgid "Please join my community on Hubzilla." +msgstr "Schließe Dich uns in der Hubzilla an!" #: ../../mod/invite.php:134 msgid "You will need to supply this invitation code: " msgstr "Gib folgenden Einladungs-Code ein:" #: ../../mod/invite.php:135 -msgid "1. Register at any RedMatrix location (they are all inter-connected)" -msgstr "1. Registriere Dich auf irgendeinem RedMatrix-Server (sie sind alle miteinander verbunden)" +msgid "1. Register at any Hubzilla location (they are all inter-connected)" +msgstr "1. Registriere Dich auf irgendeinem Hubzilla-Server (sie sind alle miteinander verbunden)" #: ../../mod/invite.php:137 -msgid "2. Enter my RedMatrix network address into the site searchbar." -msgstr "2. Gib meine RedMatrix-Adresse im Suchfeld ein." +msgid "2. Enter my Hubzilla network address into the site searchbar." +msgstr "2. Gib meine Hubzilla-Adresse im Suchfeld ein." #: ../../mod/invite.php:138 msgid "or visit " @@ -7360,7 +7360,7 @@ msgstr "Den „Entdecken“-Reiter ausblenden" 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." +msgstr "Entferne den „Entdecken“-Reiter aus der Matrix-Seite, in dem öffentliche Inhalte angezeigt werden, die von anderen Hubzilla-Hubs geholt wurden." #: ../../mod/admin.php:445 msgid "No login on Homepage" @@ -7785,7 +7785,7 @@ msgstr "Dieses Konto, all seine Kanäle sowie alle Kanal-Klone aus dem Netzwerk msgid "" "By default only the instances of the channels located on this hub will be " "removed from the network" -msgstr "Standardmäßig werden nur die Kanalklone auf diesem RedMatrix-Hub aus dem Netzwerk entfernt" +msgstr "Standardmäßig werden nur die Kanalklone auf diesem Hubzilla-Hub aus dem Netzwerk entfernt" #: ../../mod/update_channel.php:43 ../../mod/update_display.php:25 #: ../../mod/update_network.php:23 ../../mod/update_search.php:46 @@ -7898,8 +7898,8 @@ msgid "URL of link" msgstr "URL des Links" #: ../../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" +msgid "Use Hubzilla magic-auth if available" +msgstr "Verwende die automatische Hubzilla-Authentifizierung (magic-auth), wenn verfügbar" #: ../../mod/mitem.php:166 ../../mod/mitem.php:210 msgid "Open link in new window" @@ -7989,9 +7989,9 @@ 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." +"Please <a href=\"rmagic\">login with your Hubzilla ID</a> or <a " +"href=\"register\">register as a new Redmatrix.member</a> to continue." +msgstr "Bitte <a href=\"rmagic\">melde Dich mit Deiner Hubzilla-ID an</a> oder <a href=\"register\">registriere Dich als neues Mitglied der Hubzilla</a>, um fortzufahren." #: ../../mod/like.php:101 ../../mod/like.php:128 ../../mod/like.php:166 msgid "Invalid request." @@ -8606,8 +8606,8 @@ msgid "Right offset of the aside element" msgstr "Rechter Rand des Aside-Elements" #: ../../view/theme/redbasic/php/config.php:84 -msgid "Light (Red Matrix default)" -msgstr "Hell (RedMatrix-Voreinstellung)" +msgid "Light (Hubzilla default)" +msgstr "Hell (Hubzilla-Voreinstellung)" #: ../../view/theme/redbasic/php/config.php:104 msgid "Narrow navbar" @@ -8741,7 +8741,7 @@ msgstr "Aktualisierungsfehler auf %s" #: ../../boot.php:1527 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 "Erstelle einen Account, um Anwendungen und Dienste innerhalb der Red-Matrix verwenden zu können." #: ../../boot.php:1555 diff --git a/view/de/strings.php b/view/de/strings.php index 2679e9eb1..e90419ec8 100644 --- a/view/de/strings.php +++ b/view/de/strings.php @@ -76,8 +76,8 @@ $a->strings["photo/image"] = "Foto/Bild"; $a->strings["Rate Me"] = "Bewerte mich"; $a->strings["View Ratings"] = "Bewertungen ansehen"; $a->strings["Public Hubs"] = "Öffentliche Hubs"; -$a->strings["Red Matrix Notification"] = "Red Matrix Benachrichtigung"; -$a->strings["redmatrix"] = "redmatrix"; +$a->strings["Hubzilla Notification"] = "Hubzilla Benachrichtigung"; +$a->strings["hubzilla"] = "hubzilla"; $a->strings["Thank You,"] = "Danke."; $a->strings["%s Administrator"] = "der Administrator von %s"; $a->strings["%s <!item_type!>"] = "%s <!item_type!>"; @@ -469,7 +469,7 @@ $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["Hubzilla event notification:"] = "Hubzilla Termin-Benachrichtigung:"; $a->strings["Starts:"] = "Beginnt:"; $a->strings["Finishes:"] = "Endet:"; $a->strings["Missing room name"] = "Der Chatraum hat keinen Namen"; @@ -612,7 +612,7 @@ $a->strings["Permission denied"] = "Keine Berechtigung"; $a->strings["(Unknown)"] = "(Unbekannt)"; $a->strings["Visible to anybody on the internet."] = "Für jeden im Internet sichtbar."; $a->strings["Visible to you only."] = "Nur für Dich sichtbar."; -$a->strings["Visible to anybody in this network."] = "Für jedes Mitglied der RedMatrix sichtbar."; +$a->strings["Visible to anybody in this network."] = "Für jedes Mitglied der Hubzilla sichtbar."; $a->strings["Visible to anybody authenticated."] = "Für jeden sichtbar, der angemeldet ist."; $a->strings["Visible to anybody on %s."] = "Für jeden auf %s sichtbar."; $a->strings["Visible to all connections."] = "Für alle Verbindungen sichtbar."; @@ -1018,7 +1018,7 @@ $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 - "The Network""] = "RedMatrix – "Das Netzwerk""; +$a->strings["Hubzilla - "The Network""] = "Hubzilla – "Das Netzwerk""; $a->strings["Welcome to %s"] = "Willkommen auf %s"; $a->strings["Continue"] = "Fortfahren"; $a->strings["Premium Channel Setup"] = "Premium-Kanal-Einrichtung"; @@ -1034,7 +1034,7 @@ $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["Hubzilla channel"] = "Hubzilla-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."; @@ -1088,7 +1088,7 @@ $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["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."] = "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"; @@ -1237,7 +1237,7 @@ $a->strings["Please enable expert mode (in <a href=\"settings/features\">Setting $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 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["Hubzilla - Guests: Username: {your email address}, Password: +++"] = "Hubzilla – 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:"; @@ -1258,17 +1258,17 @@ $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 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["This is a hub of the Hubzilla - a global cooperative network of decentralized privacy enhanced websites."] = "Dieser Hub ist Teil der Hubzilla – 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 besuchen Sie <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 Hubzilla."] = "Bitte besuchen Sie <a href=\"https://redmatrix.me\">Redmatrix.me</a>, um mehr über Hubzilla 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["Suggestions, praise, etc. - please email \"hubzilla\" at librelist - dot com"] = "Vorschläge, Lob, usw.: E-Mail an 'hubzilla' at librelist - dot - com"; $a->strings["Site Administrators"] = "Administratoren"; $a->strings["Help:"] = "Hilfe:"; $a->strings["Not Found"] = "Nicht gefunden"; -$a->strings["Red Matrix Server - Setup"] = "Red Matrix Server - Installation"; +$a->strings["Hubzilla Server - Setup"] = "Hubzilla Server - Installation"; $a->strings["Could not connect to database."] = "Kann nicht mit der Datenbank verbinden."; $a->strings["Could not connect to specified site URL. Possible SSL certificate or DNS issue."] = "Konnte die angegebene Webseiten-URL nicht erreichen. Möglicherweise ein Problem mit dem SSL-Zertifikat oder dem DNS."; $a->strings["Could not create table."] = "Kann Tabelle nicht erstellen."; @@ -1278,7 +1278,7 @@ $a->strings["Please see the file \"install/INSTALL.txt\"."] = "Lies die Datei \" $a->strings["System check"] = "Systemprüfung"; $a->strings["Check again"] = "Bitte nochmal prüfen"; $a->strings["Database connection"] = "Datenbank Verbindung"; -$a->strings["In order to install Red Matrix we need to know how to connect to your database."] = "Um die Red-Matrix installieren zu können, müssen wir wissen, wie wir eine Verbindung zu Deiner Datenbank aufbauen können."; +$a->strings["In order to install Hubzilla we need to know how to connect to your database."] = "Um die Red-Matrix installieren zu können, müssen wir wissen, wie wir eine Verbindung zu Deiner Datenbank aufbauen können."; $a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Bitte kontaktiere Deinen Hosting-Provider oder Administrator, falls Du Fragen zu diesen Einstellungen hast."; $a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "Die Datenbank, die Du weiter unten angibst, sollte bereits existieren. Sollte das noch nicht der Fall sein, erzeuge sie bitte bevor Du fortfährst."; $a->strings["Database Server Name"] = "Datenbank-Servername"; @@ -1491,10 +1491,10 @@ $a->strings["You have no more invitations available"] = "Du hast keine weiteren $a->strings["Send invitations"] = "Einladungen senden"; $a->strings["Enter email addresses, one per line:"] = "Email-Adressen eintragen, eine pro Zeile:"; $a->strings["Your message:"] = "Deine Nachricht:"; -$a->strings["Please join my community on RedMatrix."] = "Schließe Dich uns in der RedMatrix an!"; +$a->strings["Please join my community on Hubzilla."] = "Schließe Dich uns in der Hubzilla an!"; $a->strings["You will need to supply this invitation code: "] = "Gib folgenden Einladungs-Code ein:"; -$a->strings["1. Register at any RedMatrix location (they are all inter-connected)"] = "1. Registriere Dich auf irgendeinem RedMatrix-Server (sie sind alle miteinander verbunden)"; -$a->strings["2. Enter my RedMatrix network address into the site searchbar."] = "2. Gib meine RedMatrix-Adresse im Suchfeld ein."; +$a->strings["1. Register at any Hubzilla location (they are all inter-connected)"] = "1. Registriere Dich auf irgendeinem Hubzilla-Server (sie sind alle miteinander verbunden)"; +$a->strings["2. Enter my Hubzilla network address into the site searchbar."] = "2. Gib meine Hubzilla-Adresse im Suchfeld ein."; $a->strings["or visit "] = "oder besuche"; $a->strings["3. Click [Connect]"] = "3. Klicke auf [Verbinden]"; $a->strings["Location not found."] = "Klon nicht gefunden."; @@ -1737,7 +1737,7 @@ $a->strings["Check to verify email addresses used in account registration (recom $a->strings["Force publish"] = "Veröffentlichung erzwingen"; $a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Die Veröffentlichung aller Profile dieses Servers im Verzeichnis erzwingen."; $a->strings["Disable discovery tab"] = "Den „Entdecken“-Reiter ausblenden"; -$a->strings["Remove the tab in the network view with public content pulled from sources chosen for this site."] = "Entferne den „Entdecken“-Reiter aus der Matrix-Seite, in dem öffentliche Inhalte angezeigt werden, die von anderen RedMatrix-Hubs geholt wurden."; +$a->strings["Remove the tab in the network view with public content pulled from sources chosen for this site."] = "Entferne den „Entdecken“-Reiter aus der Matrix-Seite, in dem öffentliche Inhalte angezeigt werden, die von anderen Hubzilla-Hubs geholt wurden."; $a->strings["No login on Homepage"] = "Kein Login auf der Homepage"; $a->strings["Check to hide the login form from your sites homepage when visitors arrive who are not logged in (e.g. when you put the content of the homepage in via the site channel)."] = "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)."; $a->strings["Proxy user"] = "Proxy Benutzer"; @@ -1842,7 +1842,7 @@ $a->strings["Remove This Account"] = "Dieses Konto löschen"; $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["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 Hubzilla-Hub aus dem Netzwerk entfernt"; $a->strings["[Embedded content - reload page to view]"] = "[Eingebettete Inhalte – lade die Seite neu, um sie anzuzeigen]"; $a->strings["Wall Photos"] = "Wall Fotos"; $a->strings["Profile Match"] = "Profil-Übereinstimmungen"; @@ -1870,7 +1870,7 @@ $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["Use Hubzilla magic-auth if available"] = "Verwende die automatische Hubzilla-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"; @@ -1891,7 +1891,7 @@ $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["Please <a href=\"rmagic\">login with your Hubzilla ID</a> or <a href=\"register\">register as a new Redmatrix.member</a> to continue."] = "Bitte <a href=\"rmagic\">melde Dich mit Deiner Hubzilla-ID an</a> oder <a href=\"register\">registriere Dich als neues Mitglied der Hubzilla</a>, um fortzufahren."; $a->strings["Invalid request."] = "Ungültige Anfrage."; $a->strings["thing"] = "Sache"; $a->strings["Channel unavailable."] = "Kanal nicht vorhanden."; @@ -2037,7 +2037,7 @@ $a->strings["Right offset of the section element"] = "Rechter Rand des Section E $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["Light (Hubzilla default)"] = "Hell (Hubzilla-Voreinstellung)"; $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"; @@ -2070,7 +2070,7 @@ $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["Create an account to access services and applications within the Hubzilla"] = "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?"; diff --git a/view/de/update_fail_eml.tpl b/view/de/update_fail_eml.tpl index ca1a4985d..e0319ca53 100644 --- a/view/de/update_fail_eml.tpl +++ b/view/de/update_fail_eml.tpl @@ -1,7 +1,7 @@ Hallo,
ich bin der Webserver für {{$sitename}};
-Die RedMatrix-Entwickler haben kürzlich das Update {{$update}} veröffentlicht,
+Die Hubzilla-Entwickler haben kürzlich das Update {{$update}} veröffentlicht,
aber als ich versuchte, es zu installieren, ging irgendwas furchtbar schief.
Das muss so bald als möglich gelöst werden und erfordert einen manuellen Eingriff.
Bitte kontaktiere einen Red-Entwickler, wenn Du nicht weißt, wie Du das Problem
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 - "The Network"" +msgid "Hubzilla - "The Network"" msgstr "La Matrice Rouge - "LE Réseau"" #: ../../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 :" #: ../../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 :"; $a->strings["About: "] = "À propos :"; $a->strings["Keywords: "] = "Mots-clefs :"; $a->strings["This site is not a directory server"] = "Ce site n'est pas un serveur d'annuaire"; -$a->strings["Red Matrix - "The Network""] = "La Matrice Rouge - "LE Réseau""; +$a->strings["Hubzilla - "The Network""] = "La Matrice Rouge - "LE Réseau""; $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 :"; $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 :"; $a->strings["Your message:"] = "Votre message :"; -$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 - "The Network"" -msgstr "RedMatrix - "La tua rete"" +msgid "Hubzilla - "The Network"" +msgstr "Hubzilla - "La tua rete"" #: ../../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 - "The Network""] = "RedMatrix - "La tua rete""; +$a->strings["Hubzilla - "The Network""] = "Hubzilla - "La tua rete""; $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 - "The Network"" -msgstr "Red Matrix - "Nettverket"" +msgid "Hubzilla - "The Network"" +msgstr "Hubzilla - "Nettverket"" #: ../../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 - "The Network""] = "Red Matrix - "Nettverket""; +$a->strings["Hubzilla - "The Network""] = "Hubzilla - "Nettverket""; $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 cbea8f3e8..13bca342f 100644 --- a/view/nl/messages.po +++ b/view/nl/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 @@ # jeroenpraat <jeroenpraat@xs4all.nl>, 2014-2015 msgid "" msgstr "" -"Project-Id-Version: Redmatrix\n" +"Project-Id-Version: Hubzilla\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-05-01 00:03-0700\n" "PO-Revision-Date: 2015-05-07 12:20+0000\n" @@ -90,11 +90,11 @@ msgstr "Geen geldig e-mailadres" #: ../../include/account.php:29 msgid "Your email domain is not among those allowed on this site" -msgstr "Jouw e-maildomein is op deze RedMatrix-hub niet toegestaan" +msgstr "Jouw e-maildomein is op deze Hubzilla-hub niet toegestaan" #: ../../include/account.php:35 msgid "Your email address is already registered at this site." -msgstr "Jouw e-mailadres is al op deze RedMatrix-hub geregistreerd." +msgstr "Jouw e-mailadres is al op deze Hubzilla-hub geregistreerd." #: ../../include/account.php:67 msgid "An invitation is required." @@ -1110,12 +1110,12 @@ msgid "Public Hubs" msgstr "Openbare hubs" #: ../../include/enotify.php:58 -msgid "Red Matrix Notification" -msgstr "RedMatrix-notificatie" +msgid "Hubzilla Notification" +msgstr "Hubzilla-notificatie" #: ../../include/enotify.php:59 -msgid "redmatrix" -msgstr "RedMatrix" +msgid "hubzilla" +msgstr "Hubzilla" #: ../../include/enotify.php:61 msgid "Thank You," @@ -1678,8 +1678,8 @@ msgid "Attachments:" msgstr "Bijlagen:" #: ../../include/bb2diaspora.php:453 -msgid "Redmatrix event notification:" -msgstr "Notificatie RedMatrix-gebeurtenis:" +msgid "Hubzilla event notification:" +msgstr "Notificatie Hubzilla-gebeurtenis:" #: ../../include/text.php:329 msgid "prev" @@ -2126,7 +2126,7 @@ msgstr "Authenticatie op afstand" #: ../../include/nav.php:137 msgid "Click to authenticate to your home hub" -msgstr "Authenticeer jezelf via (bijvoorbeeld) jouw RedMatrix-hub" +msgstr "Authenticeer jezelf via (bijvoorbeeld) jouw Hubzilla-hub" #: ../../include/nav.php:151 msgid "Home Page" @@ -2155,7 +2155,7 @@ msgstr "Apps" #: ../../include/nav.php:165 msgid "Search site content" -msgstr "Inhoud van deze RedMatrix-hub doorzoeken" +msgstr "Inhoud van deze Hubzilla-hub doorzoeken" #: ../../include/nav.php:168 ../../include/apps.php:141 #: ../../mod/directory.php:366 @@ -2750,7 +2750,7 @@ msgstr "Foto's weergeven" #: ../../include/conversation.php:944 msgid "Matrix Activity" -msgstr "Activiteit in de RedMatrix" +msgstr "Activiteit in de Hubzilla" #: ../../include/conversation.php:946 msgid "Edit Contact" @@ -3853,7 +3853,7 @@ msgstr "Chatkanaal is vol" #: ../../mod/achievements.php:34 msgid "Some blurb about what to do when you're new here" -msgstr "Welkom op de RedMatrix. Klik op de tab ontdekken of klik rechtsboven op de <a href=\"directory\">kanalengids</a>, om kanalen te vinden. Rechtsboven vind je ook onze <a href=\"directory\">apps</a>, waar je vrijwel alles van de RedMatrix kan vinden. Voor <a href=\"directory\">hulp</a> met de RedMatrix klik je op het vraagteken of als je meer vragen hebt stel je die in het <a href=\"https://zothost.me/channel/support\">supportkanaal</a> (liefst in het Engels)." +msgstr "Welkom op de Hubzilla. Klik op de tab ontdekken of klik rechtsboven op de <a href=\"directory\">kanalengids</a>, om kanalen te vinden. Rechtsboven vind je ook onze <a href=\"directory\">apps</a>, waar je vrijwel alles van de Hubzilla kan vinden. Voor <a href=\"directory\">hulp</a> met de Hubzilla klik je op het vraagteken of als je meer vragen hebt stel je die in het <a href=\"https://zothost.me/channel/support\">supportkanaal</a> (liefst in het Engels)." #: ../../mod/manage.php:136 #, php-format @@ -4258,7 +4258,7 @@ msgstr "Verberg mijn aanwezigheid" #: ../../mod/settings.php:1057 msgid "Prevents displaying in your profile that you are online" -msgstr "Voorkomt dat op je kanaal te zien valt dat je momenteel op de RedMatrix aanwezig bent" +msgstr "Voorkomt dat op je kanaal te zien valt dat je momenteel op de Hubzilla aanwezig bent" #: ../../mod/settings.php:1059 msgid "Simple Privacy Settings:" @@ -4652,8 +4652,8 @@ msgid "Fetching URL returns error: %1$s" msgstr "Ophalen URL gaf een foutmelding terug: %1$s" #: ../../mod/home.php:53 -msgid "Red Matrix - "The Network"" -msgstr "RedMatrix - "The Network"" +msgid "Hubzilla - "The Network"" +msgstr "Hubzilla - "The Network"" #: ../../mod/home.php:124 #, php-format @@ -4751,13 +4751,13 @@ msgstr "Leuk/niet leuk" #: ../../mod/like.php:20 msgid "This action is restricted to members." -msgstr "Deze actie kan alleen door mensen met een RedMatrix-account worden uitgevoerd." +msgstr "Deze actie kan alleen door mensen met een Hubzilla-account worden uitgevoerd." #: ../../mod/like.php:21 msgid "" -"Please <a href=\"rmagic\">login with your RedMatrix ID</a> or <a " -"href=\"register\">register as a new RedMatrix member</a> to continue." -msgstr "Je dient <a href=\"rmagic\">in te loggen met je RedMatrix-account</a> of <a href=\"register\">een nieuw RedMatrix-account te registreren</a> om verder te kunnen gaan." +"Please <a href=\"rmagic\">login with your Hubzilla 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 Hubzilla-account</a> of <a href=\"register\">een nieuw Hubzilla-account te registreren</a> om verder te kunnen gaan." #: ../../mod/like.php:101 ../../mod/like.php:128 ../../mod/like.php:166 msgid "Invalid request." @@ -4922,12 +4922,12 @@ msgstr "Openbare hubs" #: ../../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 "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." +msgstr "Op de hier weergegeven hubs kan iedereen zich voor de Hubzilla 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" @@ -4966,8 +4966,8 @@ msgid "Edit post" msgstr "Bericht bewerken" #: ../../mod/dav.php:121 -msgid "RedMatrix channel" -msgstr "RedMatrix-kanaal" +msgid "Hubzilla channel" +msgstr "Hubzilla-kanaal" #: ../../mod/group.php:20 msgid "Collection created." @@ -5036,9 +5036,9 @@ msgstr "Red" #: ../../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 "Dit is een hub van de RedMatrix - een wereldwijd coöperatief netwerk van gedecentraliseerde websites met verbeterde privacy." +msgstr "Dit is een hub van de Hubzilla - een wereldwijd coöperatief netwerk van gedecentraliseerde websites met verbeterde privacy." #: ../../mod/siteinfo.php:158 msgid "Tag: " @@ -5055,8 +5055,8 @@ msgstr "Draaiend op weblocatie" #: ../../mod/siteinfo.php:164 msgid "" "Please visit <a href=\"https://redmatrix.me\">redmatrix.me</a> to learn more" -" about the Red Matrix." -msgstr "Bezoek <a href=\"https://redmatrix.me\">RedMatrix.me</a> om meer over de RedMatrix te leren." +" about the Hubzilla." +msgstr "Bezoek <a href=\"https://redmatrix.me\">Redmatrix.me</a> om meer over de Hubzilla te leren." #: ../../mod/siteinfo.php:165 msgid "Bug reports and issues: please visit" @@ -5064,9 +5064,9 @@ msgstr "Bugrapporten en andere kwesties: bezoek" #: ../../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 "Voorstellen, lofbetuigingen, enz. - e-mail \"redmatrix\" at librelist - dot com" +msgstr "Voorstellen, lofbetuigingen, enz. - e-mail \"hubzilla\" at librelist - dot com" #: ../../mod/siteinfo.php:170 msgid "Site Administrators" @@ -5081,8 +5081,8 @@ msgid "Not Found" msgstr "Niet gevonden" #: ../../mod/setup.php:166 -msgid "Red Matrix Server - Setup" -msgstr "RedMatrix Server - Setup" +msgid "Hubzilla Server - Setup" +msgstr "Hubzilla Server - Setup" #: ../../mod/setup.php:172 msgid "Could not connect to database." @@ -5126,9 +5126,9 @@ msgstr "Database connection" #: ../../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 "In order to install RedMatrix we need to know how to connect to your database." +msgstr "In order to install Hubzilla we need to know how to connect to your database." #: ../../mod/setup.php:291 msgid "" @@ -5588,8 +5588,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 "RedMatrix - Guests: Username: {your email address}, Password: +++" -msgstr "RedMatrix - gasttoegang: Toegangsnaam: {jouw e-mailadres}, wachtwoord: +++" +msgid "Hubzilla - Guests: Username: {your email address}, Password: +++" +msgstr "Hubzilla - gasttoegang: Toegangsnaam: {jouw e-mailadres}, wachtwoord: +++" #: ../../mod/photos.php:77 msgid "Page owner information could not be retrieved." @@ -6114,7 +6114,7 @@ msgstr "%s : Geen geldig e-mailadres." #: ../../mod/invite.php:76 msgid "Please join us on Red" -msgstr "Uitnodiging voor de RedMatrix" +msgstr "Uitnodiging voor de Hubzilla" #: ../../mod/invite.php:87 msgid "Invitation limit exceeded. Please contact your site administrator." @@ -6149,19 +6149,19 @@ msgid "Your message:" msgstr "Jouw bericht:" #: ../../mod/invite.php:132 -msgid "Please join my community on RedMatrix." -msgstr "Hierbij nodig ik je uit om mij, en andere vrienden en kennissen, op de RedMatrix te vergezellen. Lees meer over de RedMatrix op https://redmatrix.me." +msgid "Please join my community on Hubzilla." +msgstr "Hierbij nodig ik je uit om mij, en andere vrienden en kennissen, op de Hubzilla te vergezellen. Lees meer over de Hubzilla op https://redmatrix.me." #: ../../mod/invite.php:134 msgid "You will need to supply this invitation code: " msgstr "Je moet deze uitnodigingscode opgeven:" #: ../../mod/invite.php:135 -msgid "1. Register at any RedMatrix location (they are all inter-connected)" -msgstr "1. Registreer je op een willekeurige RedMatrix-hub (ze zijn allemaal onderling met elkaar verbonden):" +msgid "1. Register at any Hubzilla location (they are all inter-connected)" +msgstr "1. Registreer je op een willekeurige Hubzilla-hub (ze zijn allemaal onderling met elkaar verbonden):" #: ../../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. Nadat je bent ingelogd en een kanaal hebt aangemaakt kan je mijn kanaaladres in het zoekveld invullen:" #: ../../mod/invite.php:138 @@ -6783,8 +6783,8 @@ 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" +msgid "Use Hubzilla magic-auth if available" +msgstr "Gebruik Hubzilla' magic-auth wanneer beschikbaar" #: ../../mod/mitem.php:157 ../../mod/mitem.php:227 msgid "Open link in new window" @@ -7098,19 +7098,19 @@ msgstr "Ja - met goedkeuring" #: ../../mod/admin.php:431 msgid "My site is not a public server" -msgstr "Mijn RedMatrix-hub is niet openbaar" +msgstr "Mijn Hubzilla-hub is niet openbaar" #: ../../mod/admin.php:432 msgid "My site has paid access only" -msgstr "Mijn RedMatrix-hub kent alleen betaalde toegang" +msgstr "Mijn Hubzilla-hub kent alleen betaalde toegang" #: ../../mod/admin.php:433 msgid "My site has free access only" -msgstr "Mijn RedMatrix-hub kent alleen gratis toegang" +msgstr "Mijn Hubzilla-hub kent alleen gratis toegang" #: ../../mod/admin.php:434 msgid "My site offers free accounts with optional paid upgrades" -msgstr "Mijn RedMatrix-hub biedt gratis accounts aan met betaalde uitbreidingen als optie" +msgstr "Mijn Hubzilla-hub biedt gratis accounts aan met betaalde uitbreidingen als optie" #: ../../mod/admin.php:447 ../../mod/register.php:207 msgid "Registration" @@ -7126,7 +7126,7 @@ msgstr "Beleid" #: ../../mod/admin.php:454 msgid "Site name" -msgstr "Naam van deze RedMatrix-hub" +msgstr "Naam van deze Hubzilla-hub" #: ../../mod/admin.php:455 msgid "Banner/Logo" @@ -7154,7 +7154,7 @@ msgstr "Standaardthema" msgid "" "Default system theme - may be over-ridden by user profiles - <a href='#' " "id='cnftheme'>change theme settings</a>" -msgstr "Standaardthema voor RedMatrix-hub (kan door lid veranderd worden) - <a href='#' id='cnftheme'>verander thema-instellingen</a>" +msgstr "Standaardthema voor Hubzilla-hub (kan door lid veranderd worden) - <a href='#' id='cnftheme'>verander thema-instellingen</a>" #: ../../mod/admin.php:459 msgid "Mobile system theme" @@ -7196,7 +7196,7 @@ msgstr "Staat deze hub nieuwe accounts toe?" #: ../../mod/admin.php:465 msgid "Which best describes the types of account offered by this hub?" -msgstr "Wat voor soort accounts biedt deze RedMatrix-hub aan? Kies wat het meest in de buurt komt." +msgstr "Wat voor soort accounts biedt deze Hubzilla-hub aan? Kies wat het meest in de buurt komt." #: ../../mod/admin.php:466 msgid "Register text" @@ -7224,7 +7224,7 @@ msgstr "Toegestane domeinen" msgid "" "Comma separated list of domains which are allowed to establish friendships " "with this site. Wildcards are accepted. Empty to allow any domains" -msgstr "Komma-gescheiden lijst van domeinen waarvan kanalen connecties kunnen aangaan met kanalen op deze RedMatrix-hub. Wildcards zijn toegestaan.\nLaat leeg om alle domeinen toe te laten." +msgstr "Komma-gescheiden lijst van domeinen waarvan kanalen connecties kunnen aangaan met kanalen op deze Hubzilla-hub. Wildcards zijn toegestaan.\nLaat leeg om alle domeinen toe te laten." #: ../../mod/admin.php:469 msgid "Allowed email domains" @@ -7295,7 +7295,7 @@ msgid "" "Check to hide the login form from your sites homepage when visitors arrive " "who are not logged in (e.g. when you put the content of the homepage in via " "the site channel)." -msgstr "Vink dit aan om het inlogformulier op de homepage van deze hub, die niet-ingelogde bezoekers te zien krijgen, te verbergen. (bijvoorbeeld wanneer je een kanaal op deze RedMatrix-hub als homepage gebruikt)" +msgstr "Vink dit aan om het inlogformulier op de homepage van deze hub, die niet-ingelogde bezoekers te zien krijgen, te verbergen. (bijvoorbeeld wanneer je een kanaal op deze Hubzilla-hub als homepage gebruikt)" #: ../../mod/admin.php:477 msgid "Proxy user" @@ -7660,7 +7660,7 @@ msgstr "Logbestand" #: ../../mod/admin.php:1364 msgid "" "Must be writable by web server. Relative to your Red top-level directory." -msgstr "Moet door de webserver beschrijfbaar zijn. Relatief ten opzichte van de bovenste map van je RedMatrix-installatie." +msgstr "Moet door de webserver beschrijfbaar zijn. Relatief ten opzichte van de bovenste map van je Hubzilla-installatie." #: ../../mod/admin.php:1365 msgid "Log level" @@ -7724,7 +7724,7 @@ msgstr "Blok verwijderen" #: ../../mod/register.php:44 msgid "Maximum daily site registrations exceeded. Please try again tomorrow." -msgstr "Maximum toegestane dagelijkse registraties op deze RedMatrix-hub bereikt. Probeer het morgen (UTC) nogmaals." +msgstr "Maximum toegestane dagelijkse registraties op deze Hubzilla-hub bereikt. Probeer het morgen (UTC) nogmaals." #: ../../mod/register.php:50 msgid "" @@ -7743,7 +7743,7 @@ msgstr "Registratie geslaagd. Controleer je e-mail voor instructies." #: ../../mod/register.php:123 msgid "Your registration is pending approval by the site owner." -msgstr "Jouw accountregistratie wacht op goedkeuring van de beheerder van deze RedMatrix-hub." +msgstr "Jouw accountregistratie wacht op goedkeuring van de beheerder van deze Hubzilla-hub." #: ../../mod/register.php:126 msgid "Your registration can not be processed." @@ -7751,17 +7751,17 @@ msgstr "Jouw registratie kan niet verwerkt worden." #: ../../mod/register.php:163 msgid "Registration on this site/hub is by approval only." -msgstr "Registraties op deze RedMatrix-hub moeten eerst worden goedgekeurd." +msgstr "Registraties op deze Hubzilla-hub moeten eerst worden goedgekeurd." #: ../../mod/register.php:164 msgid "<a href=\"pubsites\">Register at another affiliated site/hub</a>" -msgstr "<a href=\"pubsites\">Registreer op een andere RedMatrix-hub</a>" +msgstr "<a href=\"pubsites\">Registreer op een andere Hubzilla-hub</a>" #: ../../mod/register.php:174 msgid "" "This site has exceeded the number of allowed daily account registrations. " "Please try again tomorrow." -msgstr "Deze RedMatrix-hub heeft het maximum aantal dagelijks toegestane registraties bereikt. Probeer het morgen (UTC) nogmaals." +msgstr "Deze Hubzilla-hub heeft het maximum aantal dagelijks toegestane registraties bereikt. Probeer het morgen (UTC) nogmaals." #: ../../mod/register.php:185 msgid "Terms of Service" @@ -7770,16 +7770,16 @@ msgstr "Gebruiksvoorwaarden" #: ../../mod/register.php:191 #, php-format msgid "I accept the %s for this website" -msgstr "Ik accepteer de %s van deze RedMatrix-hub" +msgstr "Ik accepteer de %s van deze Hubzilla-hub" #: ../../mod/register.php:193 #, php-format msgid "I am over 13 years of age and accept the %s for this website" -msgstr "Ik accepteer de %s van deze RedMatrix-hub" +msgstr "Ik accepteer de %s van deze Hubzilla-hub" #: ../../mod/register.php:212 msgid "Membership on this site is by invitation only." -msgstr "Registreren op deze RedMatrix-hub kan alleen op uitnodiging." +msgstr "Registreren op deze Hubzilla-hub kan alleen op uitnodiging." #: ../../mod/register.php:213 msgid "Please enter your invitation code" @@ -7815,7 +7815,7 @@ msgstr "WAARSCHUWING: " msgid "" "This account and all its channels will be completely removed from the " "network. " -msgstr "Dit account en al zijn kanalen worden volledig uit het RedMatrix-netwerk verwijderd." +msgstr "Dit account en al zijn kanalen worden volledig uit het Hubzilla-netwerk verwijderd." #: ../../mod/removeaccount.php:58 ../../mod/removeme.php:58 msgid "This action is permanent and can not be undone!" @@ -7829,13 +7829,13 @@ msgstr "Vul je wachtwoord in ter verificatie:" msgid "" "Remove this account, all its channels and all its channel clones from the " "network" -msgstr "Dit account, al zijn kanalen en alle klonen van zijn kanalen uit het RedMatrix-netwerk verwijderen" +msgstr "Dit account, al zijn kanalen en alle klonen van zijn kanalen uit het Hubzilla-netwerk verwijderen" #: ../../mod/removeaccount.php:60 msgid "" "By default only the instances of the channels located on this hub will be " "removed from the network" -msgstr "Standaard worden alleen de kanalen die zich op deze hub bevinden uit het RedMatrix-netwerk verwijderd." +msgstr "Standaard worden alleen de kanalen die zich op deze hub bevinden uit het Hubzilla-netwerk verwijderd." #: ../../mod/item.php:174 msgid "Unable to locate original post." @@ -7997,17 +7997,17 @@ msgstr "Verwijder dit kanaal" #: ../../mod/removeme.php:58 msgid "This channel will be completely removed from the network. " -msgstr "Dit kanaal wordt volledig uit het RedMatrix-netwerk verwijderd." +msgstr "Dit kanaal wordt volledig uit het Hubzilla-netwerk verwijderd." #: ../../mod/removeme.php:60 msgid "Remove this channel and all its clones from the network" -msgstr "Dit kanaal en alle klonen hiervan uit het RedMatrix-netwerk verwijderen" +msgstr "Dit kanaal en alle klonen hiervan uit het Hubzilla-netwerk verwijderen" #: ../../mod/removeme.php:60 msgid "" "By default only the instance of the channel located on this hub will be " "removed from the network" -msgstr "Standaard wordt alleen het kanaal dat zich op deze hub bevindt uit het RedMatrix-netwerk verwijderd." +msgstr "Standaard wordt alleen het kanaal dat zich op deze hub bevindt uit het Hubzilla-netwerk verwijderd." #: ../../mod/connedit.php:262 msgid "is now connected to" @@ -8762,8 +8762,8 @@ msgid "Right offset of the aside element" msgstr "Rechter offset van het aside-element" #: ../../view/theme/redbasic/php/config.php:82 -msgid "Light (Red Matrix default)" -msgstr "Light (RedMatrix-standaard)" +msgid "Light (Hubzilla default)" +msgstr "Light (Hubzilla-standaard)" #: ../../view/theme/redbasic/php/config.php:101 msgid "Select scheme" @@ -8901,8 +8901,8 @@ msgstr "Update-fout op %s" #: ../../boot.php:1515 msgid "" -"Create an account to access services and applications within the Red Matrix" -msgstr "Maak een account aan om toegang te krijgen tot diensten en toepassingen van de RedMatrix" +"Create an account to access services and applications within the Hubzilla" +msgstr "Maak een account aan om toegang te krijgen tot diensten en toepassingen van de Hubzilla" #: ../../boot.php:1543 msgid "Password" diff --git a/view/nl/strings.php b/view/nl/strings.php index 8dba1d207..613268b8e 100644 --- a/view/nl/strings.php +++ b/view/nl/strings.php @@ -20,8 +20,8 @@ $a->strings["Add new collection"] = "Nieuwe collectie toevoegen"; $a->strings["Channels not in any collection"] = "Kanalen die zich in geen enkele collectie bevinden"; $a->strings["add"] = "toevoegen"; $a->strings["Not a valid email address"] = "Geen geldig e-mailadres"; -$a->strings["Your email domain is not among those allowed on this site"] = "Jouw e-maildomein is op deze RedMatrix-hub niet toegestaan"; -$a->strings["Your email address is already registered at this site."] = "Jouw e-mailadres is al op deze RedMatrix-hub geregistreerd."; +$a->strings["Your email domain is not among those allowed on this site"] = "Jouw e-maildomein is op deze Hubzilla-hub niet toegestaan"; +$a->strings["Your email address is already registered at this site."] = "Jouw e-mailadres is al op deze Hubzilla-hub geregistreerd."; $a->strings["An invitation is required."] = "Een uitnodiging is vereist"; $a->strings["Invitation could not be verified."] = "Uitnodiging kon niet geverifieerd worden"; $a->strings["Please enter the required information."] = "Vul de vereiste informatie in."; @@ -250,8 +250,8 @@ $a->strings["photo/image"] = "foto/afbeelding"; $a->strings["Rate Me"] = "Beoordeel mij"; $a->strings["View Ratings"] = "Bekijk beoordelingen"; $a->strings["Public Hubs"] = "Openbare hubs"; -$a->strings["Red Matrix Notification"] = "RedMatrix-notificatie"; -$a->strings["redmatrix"] = "RedMatrix"; +$a->strings["Hubzilla Notification"] = "Hubzilla-notificatie"; +$a->strings["hubzilla"] = "Hubzilla"; $a->strings["Thank You,"] = "Bedankt,"; $a->strings["%s Administrator"] = "Beheerder %s"; $a->strings["%s <!item_type!>"] = "%s <!item_type!>"; @@ -382,7 +382,7 @@ $a->strings["New window"] = "Nieuw venster"; $a->strings["Open the selected location in a different window or browser tab"] = "Open de geselecteerde locatie in een ander venster of tab"; $a->strings["User '%s' deleted"] = "Account '%s' verwijderd"; $a->strings["Attachments:"] = "Bijlagen:"; -$a->strings["Redmatrix event notification:"] = "Notificatie RedMatrix-gebeurtenis:"; +$a->strings["Hubzilla event notification:"] = "Notificatie Hubzilla-gebeurtenis:"; $a->strings["prev"] = "vorige"; $a->strings["first"] = "eerste"; $a->strings["last"] = "laatste"; @@ -492,14 +492,14 @@ $a->strings["Login"] = "Inloggen"; $a->strings["Sign in"] = "Inloggen"; $a->strings["%s - click to logout"] = "%s - klik om uit te loggen"; $a->strings["Remote authentication"] = "Authenticatie op afstand"; -$a->strings["Click to authenticate to your home hub"] = "Authenticeer jezelf via (bijvoorbeeld) jouw RedMatrix-hub"; +$a->strings["Click to authenticate to your home hub"] = "Authenticeer jezelf via (bijvoorbeeld) jouw Hubzilla-hub"; $a->strings["Home Page"] = "Homepage"; $a->strings["Register"] = "Registreren"; $a->strings["Create an account"] = "Maak een account aan"; $a->strings["Help"] = "Hulp"; $a->strings["Help and documentation"] = "Hulp en documentatie"; $a->strings["Applications, utilities, links, games"] = "Apps"; -$a->strings["Search site content"] = "Inhoud van deze RedMatrix-hub doorzoeken"; +$a->strings["Search site content"] = "Inhoud van deze Hubzilla-hub doorzoeken"; $a->strings["Directory"] = "Kanalengids"; $a->strings["Channel Directory"] = "Kanalengids"; $a->strings["Matrix"] = "Matrix"; @@ -627,7 +627,7 @@ $a->strings["View Source"] = "Bron weergeven"; $a->strings["Follow Thread"] = "Conversatie volgen"; $a->strings["View Status"] = "Status weergeven"; $a->strings["View Photos"] = "Foto's weergeven"; -$a->strings["Matrix Activity"] = "Activiteit in de RedMatrix"; +$a->strings["Matrix Activity"] = "Activiteit in de Hubzilla"; $a->strings["Edit Contact"] = "Contact bewerken"; $a->strings["Send PM"] = "Privébericht verzenden"; $a->strings["Poke"] = "Aanstoten"; @@ -911,7 +911,7 @@ $a->strings["Duplicate room name"] = "Naam chatkanaal bestaat al"; $a->strings["Invalid room specifier."] = "Ongeldige omschrijving chatkanaal"; $a->strings["Room not found."] = "Chatkanaal niet gevonden"; $a->strings["Room is full"] = "Chatkanaal is vol"; -$a->strings["Some blurb about what to do when you're new here"] = "Welkom op de RedMatrix. Klik op de tab ontdekken of klik rechtsboven op de <a href=\"directory\">kanalengids</a>, om kanalen te vinden. Rechtsboven vind je ook onze <a href=\"directory\">apps</a>, waar je vrijwel alles van de RedMatrix kan vinden. Voor <a href=\"directory\">hulp</a> met de RedMatrix klik je op het vraagteken of als je meer vragen hebt stel je die in het <a href=\"https://zothost.me/channel/support\">supportkanaal</a> (liefst in het Engels)."; +$a->strings["Some blurb about what to do when you're new here"] = "Welkom op de Hubzilla. Klik op de tab ontdekken of klik rechtsboven op de <a href=\"directory\">kanalengids</a>, om kanalen te vinden. Rechtsboven vind je ook onze <a href=\"directory\">apps</a>, waar je vrijwel alles van de Hubzilla kan vinden. Voor <a href=\"directory\">hulp</a> met de Hubzilla klik je op het vraagteken of als je meer vragen hebt stel je die in het <a href=\"https://zothost.me/channel/support\">supportkanaal</a> (liefst in het Engels)."; $a->strings["You have created %1$.0f of %2$.0f allowed channels."] = "Je hebt %1$.0f van totaal %2$.0f toegestane kanalen aangemaakt."; $a->strings["Create a new channel"] = "Nieuw kanaal aanmaken"; $a->strings["Current Channel"] = "Huidig kanaal"; @@ -1008,7 +1008,7 @@ $a->strings["This channel frequently or regularly publishes adult content. (Plea $a->strings["Security and Privacy Settings"] = "Veiligheids- en privacy-instellingen"; $a->strings["Your permissions are already configured. Click to view/adjust"] = "Jouw permissies zijn al ingesteld. Klik om ze te bekijken of aan te passen."; $a->strings["Hide my online presence"] = "Verberg mijn aanwezigheid"; -$a->strings["Prevents displaying in your profile that you are online"] = "Voorkomt dat op je kanaal te zien valt dat je momenteel op de RedMatrix aanwezig bent"; +$a->strings["Prevents displaying in your profile that you are online"] = "Voorkomt dat op je kanaal te zien valt dat je momenteel op de Hubzilla aanwezig bent"; $a->strings["Simple Privacy Settings:"] = "Eenvoudige privacy-instellingen:"; $a->strings["Very Public - <em>extremely permissive (should be used with caution)</em>"] = "Zeer openbaar <em>(kanaal staat volledig open - moet met grote zorgvuldigheid gebruikt worden)</em>"; $a->strings["Typical - <em>default public, privacy when desired (similar to social network permissions but with improved privacy)</em>"] = "Normaal <em>(standaard openbaar, maar privacy wanneer noodzakelijk - vergelijkbaar met die van sociale netwerken, maar met verbeterde privacy)</em>"; @@ -1102,7 +1102,7 @@ $a->strings["URL for photo of thing (optional)"] = "URL van foto van ding (optio $a->strings["Add Thing to your Profile"] = "Ding aan je profiel toevoegen"; $a->strings["Item not available."] = "Item is niet aanwezig."; $a->strings["Fetching URL returns error: %1\$s"] = "Ophalen URL gaf een foutmelding terug: %1\$s"; -$a->strings["Red Matrix - "The Network""] = "RedMatrix - "The Network""; +$a->strings["Hubzilla - "The Network""] = "Hubzilla - "The Network""; $a->strings["Welcome to %s"] = "Welkom op %s"; $a->strings["Image uploaded but image cropping failed."] = "Afbeelding geüpload, maar afbeelding kon niet worden bijgesneden. "; $a->strings["Image resize failed."] = "Afbeelding kon niet van grootte veranderd worden."; @@ -1125,8 +1125,8 @@ $a->strings["Invalid item."] = "Ongeldig item."; $a->strings["Channel not found."] = "Kanaal niet gevonden."; $a->strings["Page not found."] = "Pagina niet gevonden."; $a->strings["Like/Dislike"] = "Leuk/niet leuk"; -$a->strings["This action is restricted to members."] = "Deze actie kan alleen door mensen met een RedMatrix-account worden uitgevoerd."; -$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."] = "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."; +$a->strings["This action is restricted to members."] = "Deze actie kan alleen door mensen met een Hubzilla-account worden uitgevoerd."; +$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."] = "Je dient <a href=\"rmagic\">in te loggen met je Hubzilla-account</a> of <a href=\"register\">een nieuw Hubzilla-account te registreren</a> om verder te kunnen gaan."; $a->strings["Invalid request."] = "Ongeldig verzoek"; $a->strings["thing"] = "ding"; $a->strings["Channel unavailable."] = "Kanaal niet beschikbaar."; @@ -1165,7 +1165,7 @@ $a->strings["Title:"] = "Titel:"; $a->strings["Share this event"] = "Deel deze gebeurtenis"; $a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s volgt het %3\$s van %2\$s"; $a->strings["Public Sites"] = "Openbare hubs"; -$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."] = "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."; +$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."] = "Op de hier weergegeven hubs kan iedereen zich voor de Hubzilla 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."; $a->strings["Rate this hub"] = "Beoordeel deze hub"; $a->strings["Site URL"] = "URL hub"; $a->strings["Access Type"] = "Toegangstype"; @@ -1175,7 +1175,7 @@ $a->strings["View hub ratings"] = "Bekijk hubbeoordelingen"; $a->strings["Rate"] = "Beoordeel"; $a->strings["View ratings"] = "Bekijk beoordelingen"; $a->strings["Edit post"] = "Bericht bewerken"; -$a->strings["RedMatrix channel"] = "RedMatrix-kanaal"; +$a->strings["Hubzilla channel"] = "Hubzilla-kanaal"; $a->strings["Collection created."] = "Collectie aangemaakt"; $a->strings["Could not create collection."] = "Collectie kon niet aangemaakt worden"; $a->strings["Collection updated."] = "Collectie bijgewerkt."; @@ -1192,17 +1192,17 @@ $a->strings["Version %s"] = "Versie %s"; $a->strings["Installed plugins/addons/apps:"] = "Ingeschakelde plug-ins/add-ons/apps:"; $a->strings["No installed plugins/addons/apps"] = "Geen ingeschakelde plug-ins/add-ons/apps"; $a->strings["Red"] = "Red"; -$a->strings["This is a hub of redmatrix - a global cooperative network of decentralized privacy enhanced websites."] = "Dit is een hub van de RedMatrix - een wereldwijd coöperatief netwerk van gedecentraliseerde websites met verbeterde privacy."; +$a->strings["This is a hub of hubzilla - a global cooperative network of decentralized privacy enhanced websites."] = "Dit is een hub van de Hubzilla - een wereldwijd coöperatief netwerk van gedecentraliseerde websites met verbeterde privacy."; $a->strings["Tag: "] = "Tag: "; $a->strings["Last background fetch: "] = "Meest recente achtergrond-fetch:"; $a->strings["Running at web location"] = "Draaiend op weblocatie"; -$a->strings["Please visit <a href=\"https://redmatrix.me\">redmatrix.me</a> to learn more about the Red Matrix."] = "Bezoek <a href=\"https://redmatrix.me\">RedMatrix.me</a> om meer over de RedMatrix te leren."; +$a->strings["Please visit <a href=\"https://redmatrix.me\">redmatrix.me</a> to learn more about the Hubzilla."] = "Bezoek <a href=\"https://redmatrix.me\">Redmatrix.me</a> om meer over de Hubzilla te leren."; $a->strings["Bug reports and issues: please visit"] = "Bugrapporten en andere kwesties: bezoek"; -$a->strings["Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"] = "Voorstellen, lofbetuigingen, enz. - e-mail \"redmatrix\" at librelist - dot com"; +$a->strings["Suggestions, praise, etc. - please email \"hubzilla\" at librelist - dot com"] = "Voorstellen, lofbetuigingen, enz. - e-mail \"hubzilla\" at librelist - dot com"; $a->strings["Site Administrators"] = "Hubbeheerders: "; $a->strings["Help:"] = "Hulp:"; $a->strings["Not Found"] = "Niet gevonden"; -$a->strings["Red Matrix Server - Setup"] = "RedMatrix Server - Setup"; +$a->strings["Hubzilla Server - Setup"] = "Hubzilla Server - Setup"; $a->strings["Could not connect to database."] = "Could not connect to database."; $a->strings["Could not connect to specified site URL. Possible SSL certificate or DNS issue."] = "Could not connect to specified hub URL. Possible SSL certificate or DNS issue."; $a->strings["Could not create table."] = "Could not create table."; @@ -1212,7 +1212,7 @@ $a->strings["Please see the file \"install/INSTALL.txt\"."] = "Please see the fi $a->strings["System check"] = "System check"; $a->strings["Check again"] = "Check again"; $a->strings["Database connection"] = "Database connection"; -$a->strings["In order to install Red Matrix we need to know how to connect to your database."] = "In order to install RedMatrix 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."] = "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."] = "Please contact your hosting provider or site administrator if you have questions about these settings."; $a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "The database you specify below should already exist. If it does not, please create it before continuing."; $a->strings["Database Server Name"] = "Database Server Name"; @@ -1311,7 +1311,7 @@ $a->strings["Finding: "] = "Zoeken naar: "; $a->strings["Block Name"] = "Bloknaam"; $a->strings["Block Title"] = "Bloktitel"; $a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s heeft het %3\$s van %2\$s getagd met %4\$s"; -$a->strings["RedMatrix - Guests: Username: {your email address}, Password: +++"] = "RedMatrix - gasttoegang: Toegangsnaam: {jouw e-mailadres}, wachtwoord: +++"; +$a->strings["Hubzilla - Guests: Username: {your email address}, Password: +++"] = "Hubzilla - gasttoegang: Toegangsnaam: {jouw e-mailadres}, wachtwoord: +++"; $a->strings["Page owner information could not be retrieved."] = "Informatie over de pagina-eigenaar werd niet ontvangen."; $a->strings["Album not found."] = "Album niet gevonden."; $a->strings["Delete Album"] = "Verwijder album"; @@ -1434,7 +1434,7 @@ $a->strings["Item is not editable"] = "Item is niet te bewerken"; $a->strings["Delete item?"] = "Item verwijderen?"; $a->strings["Total invitation limit exceeded."] = "Limiet voor aantal uitnodigingen overschreden."; $a->strings["%s : Not a valid email address."] = "%s : Geen geldig e-mailadres."; -$a->strings["Please join us on Red"] = "Uitnodiging voor de RedMatrix"; +$a->strings["Please join us on Red"] = "Uitnodiging voor de Hubzilla"; $a->strings["Invitation limit exceeded. Please contact your site administrator."] = "Limiet voor aantal uitnodigingen overschreden. Neem contact op met je hub-beheerder."; $a->strings["%s : Message delivery failed."] = "%s: Aflevering bericht mislukt."; $a->strings["%d message sent."] = array( @@ -1445,10 +1445,10 @@ $a->strings["You have no more invitations available"] = "Je hebt geen uitnodigin $a->strings["Send invitations"] = "Uitnodigingen verzenden"; $a->strings["Enter email addresses, one per line:"] = "Voer e-mailadressen in, één per regel:"; $a->strings["Your message:"] = "Jouw bericht:"; -$a->strings["Please join my community on RedMatrix."] = "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."; +$a->strings["Please join my community on Hubzilla."] = "Hierbij nodig ik je uit om mij, en andere vrienden en kennissen, op de Hubzilla te vergezellen. Lees meer over de Hubzilla op https://redmatrix.me."; $a->strings["You will need to supply this invitation code: "] = "Je moet deze uitnodigingscode opgeven:"; -$a->strings["1. Register at any RedMatrix location (they are all inter-connected)"] = "1. Registreer je op een willekeurige RedMatrix-hub (ze zijn allemaal onderling met elkaar verbonden):"; -$a->strings["2. Enter my RedMatrix network address into the site searchbar."] = "2. Nadat je bent ingelogd en een kanaal hebt aangemaakt kan je mijn kanaaladres in het zoekveld invullen:"; +$a->strings["1. Register at any Hubzilla location (they are all inter-connected)"] = "1. Registreer je op een willekeurige Hubzilla-hub (ze zijn allemaal onderling met elkaar verbonden):"; +$a->strings["2. Enter my Hubzilla network address into the site searchbar."] = "2. Nadat je bent ingelogd en een kanaal hebt aangemaakt kan je mijn kanaaladres in het zoekveld invullen:"; $a->strings["or visit "] = "of bezoek "; $a->strings["3. Click [Connect]"] = "3. Klik op [+ Verbinden]"; $a->strings["Location not found."] = "Locatie niet gevonden."; @@ -1602,7 +1602,7 @@ $a->strings["Unable to add menu element."] = "Menu-onderdeel kan niet worden toe $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["Use Hubzilla magic-auth if available"] = "Gebruik Hubzilla' 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"; @@ -1679,20 +1679,20 @@ $a->strings["Site settings updated."] = "Hub-instellingen bijgewerkt."; $a->strings["experimental"] = "experimenteel"; $a->strings["unsupported"] = "Niet ondersteund"; $a->strings["Yes - with approval"] = "Ja - met goedkeuring"; -$a->strings["My site is not a public server"] = "Mijn RedMatrix-hub is niet openbaar"; -$a->strings["My site has paid access only"] = "Mijn RedMatrix-hub kent alleen betaalde toegang"; -$a->strings["My site has free access only"] = "Mijn RedMatrix-hub kent alleen gratis toegang"; -$a->strings["My site offers free accounts with optional paid upgrades"] = "Mijn RedMatrix-hub biedt gratis accounts aan met betaalde uitbreidingen als optie"; +$a->strings["My site is not a public server"] = "Mijn Hubzilla-hub is niet openbaar"; +$a->strings["My site has paid access only"] = "Mijn Hubzilla-hub kent alleen betaalde toegang"; +$a->strings["My site has free access only"] = "Mijn Hubzilla-hub kent alleen gratis toegang"; +$a->strings["My site offers free accounts with optional paid upgrades"] = "Mijn Hubzilla-hub biedt gratis accounts aan met betaalde uitbreidingen als optie"; $a->strings["Registration"] = "Registratie"; $a->strings["File upload"] = "Bestand uploaden"; $a->strings["Policies"] = "Beleid"; -$a->strings["Site name"] = "Naam van deze RedMatrix-hub"; +$a->strings["Site name"] = "Naam van deze Hubzilla-hub"; $a->strings["Banner/Logo"] = "Banner/logo"; $a->strings["Administrator Information"] = "Informatie over de beheerder van deze hub"; $a->strings["Contact information for site administrators. Displayed on siteinfo page. BBCode can be used here"] = "Contactinformatie voor hub-beheerders. Getoond op pagina met hub-informatie. Er kan hier bbcode gebruikt worden."; $a->strings["System language"] = "Standaardtaal"; $a->strings["System theme"] = "Standaardthema"; -$a->strings["Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"] = "Standaardthema voor RedMatrix-hub (kan door lid veranderd worden) - <a href='#' id='cnftheme'>verander thema-instellingen</a>"; +$a->strings["Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"] = "Standaardthema voor Hubzilla-hub (kan door lid veranderd worden) - <a href='#' id='cnftheme'>verander thema-instellingen</a>"; $a->strings["Mobile system theme"] = "Standaardthema voor mobiel"; $a->strings["Theme for mobile devices"] = "Thema voor mobiele apparaten"; $a->strings["Enable Diaspora Protocol"] = "Diaspora-protocol inschakelen"; @@ -1702,13 +1702,13 @@ $a->strings["(Heavy system resource usage)"] = "(sterk negatieve invloed op syst $a->strings["Maximum image size"] = "Maximale grootte van afbeeldingen"; $a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "Maximale grootte in bytes voor afbeeldingen die worden geüpload. Standaard is 0, wat geen limiet betekend."; $a->strings["Does this site allow new member registration?"] = "Staat deze hub nieuwe accounts toe?"; -$a->strings["Which best describes the types of account offered by this hub?"] = "Wat voor soort accounts biedt deze RedMatrix-hub aan? Kies wat het meest in de buurt komt."; +$a->strings["Which best describes the types of account offered by this hub?"] = "Wat voor soort accounts biedt deze Hubzilla-hub aan? Kies wat het meest in de buurt komt."; $a->strings["Register text"] = "Tekst tijdens registratie"; $a->strings["Will be displayed prominently on the registration page."] = "Tekst dat op de pagina voor het registreren van nieuwe accounts wordt getoond."; $a->strings["Accounts abandoned after x days"] = "Accounts als verlaten beschouwen na zoveel aantal dagen:"; $a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Zal geen systeembronnen verspillen door polling van externe hubs voor verlaten accounts. Vul 0 in voor geen tijdslimiet."; $a->strings["Allowed friend domains"] = "Toegestane domeinen"; -$a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Komma-gescheiden lijst van domeinen waarvan kanalen connecties kunnen aangaan met kanalen op deze RedMatrix-hub. Wildcards zijn toegestaan.\nLaat leeg om alle domeinen toe te laten."; +$a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Komma-gescheiden lijst van domeinen waarvan kanalen connecties kunnen aangaan met kanalen op deze Hubzilla-hub. Wildcards zijn toegestaan.\nLaat leeg om alle domeinen toe te laten."; $a->strings["Allowed email domains"] = "Toegestane e-maildomeinen"; $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"] = "Door komma's gescheiden lijst met e-maildomeinen waarvan e-mailadressen op deze hub mogen registeren. Wildcards zijn toegestaan. Laat leeg om alle domeinen toe te laten."; $a->strings["Not allowed email domains"] = "Niet toegestane e-maildomeinen"; @@ -1722,7 +1722,7 @@ $a->strings["Check to force all profiles on this site to be listed in the site d $a->strings["Disable discovery tab"] = "Ontdekkingstab"; $a->strings["Remove the tab in the network view with public content pulled from sources chosen for this site."] = "Verwijder de tab in de matrix-weergave waarin zich een selectie aan openbare berichten bevindt, die automatisch voor deze hub zijn uitgekozen."; $a->strings["No login on Homepage"] = "Geen inlogformulier op de homepage"; -$a->strings["Check to hide the login form from your sites homepage when visitors arrive who are not logged in (e.g. when you put the content of the homepage in via the site channel)."] = "Vink dit aan om het inlogformulier op de homepage van deze hub, die niet-ingelogde bezoekers te zien krijgen, te verbergen. (bijvoorbeeld wanneer je een kanaal op deze RedMatrix-hub als homepage gebruikt)"; +$a->strings["Check to hide the login form from your sites homepage when visitors arrive who are not logged in (e.g. when you put the content of the homepage in via the site channel)."] = "Vink dit aan om het inlogformulier op de homepage van deze hub, die niet-ingelogde bezoekers te zien krijgen, te verbergen. (bijvoorbeeld wanneer je een kanaal op deze Hubzilla-hub als homepage gebruikt)"; $a->strings["Proxy user"] = "Gebruikersnaam proxy"; $a->strings["Proxy URL"] = "URL proxy"; $a->strings["Network timeout"] = "Netwerktimeout"; @@ -1815,7 +1815,7 @@ $a->strings["Log settings updated."] = "Logboek-instellingen bijgewerkt."; $a->strings["Clear"] = "Leegmaken"; $a->strings["Debugging"] = "Debuggen"; $a->strings["Log file"] = "Logbestand"; -$a->strings["Must be writable by web server. Relative to your Red top-level directory."] = "Moet door de webserver beschrijfbaar zijn. Relatief ten opzichte van de bovenste map van je RedMatrix-installatie."; +$a->strings["Must be writable by web server. Relative to your Red top-level directory."] = "Moet door de webserver beschrijfbaar zijn. Relatief ten opzichte van de bovenste map van je Hubzilla-installatie."; $a->strings["Log level"] = "Logniveau"; $a->strings["New Profile Field"] = "Nieuw profielveld"; $a->strings["Field nickname"] = "Bijnaam voor veld"; @@ -1831,19 +1831,19 @@ $a->strings["Unable to find your hub."] = "Niet in staat om je hub te vinden"; $a->strings["Post successful."] = "Verzenden bericht geslaagd."; $a->strings["Edit Block"] = "Blok bewerken"; $a->strings["Delete block?"] = "Blok verwijderen"; -$a->strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = "Maximum toegestane dagelijkse registraties op deze RedMatrix-hub bereikt. Probeer het morgen (UTC) nogmaals."; +$a->strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = "Maximum toegestane dagelijkse registraties op deze Hubzilla-hub bereikt. Probeer het morgen (UTC) nogmaals."; $a->strings["Please indicate acceptance of the Terms of Service. Registration failed."] = "Registratie mislukt. De gebruiksvoorwaarden dienen wel geaccepteerd te worden."; $a->strings["Passwords do not match."] = "Wachtwoorden komen niet met elkaar overeen."; $a->strings["Registration successful. Please check your email for validation instructions."] = "Registratie geslaagd. Controleer je e-mail voor instructies."; -$a->strings["Your registration is pending approval by the site owner."] = "Jouw accountregistratie wacht op goedkeuring van de beheerder van deze RedMatrix-hub."; +$a->strings["Your registration is pending approval by the site owner."] = "Jouw accountregistratie wacht op goedkeuring van de beheerder van deze Hubzilla-hub."; $a->strings["Your registration can not be processed."] = "Jouw registratie kan niet verwerkt worden."; -$a->strings["Registration on this site/hub is by approval only."] = "Registraties op deze RedMatrix-hub moeten eerst worden goedgekeurd."; -$a->strings["<a href=\"pubsites\">Register at another affiliated site/hub</a>"] = "<a href=\"pubsites\">Registreer op een andere RedMatrix-hub</a>"; -$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Deze RedMatrix-hub heeft het maximum aantal dagelijks toegestane registraties bereikt. Probeer het morgen (UTC) nogmaals."; +$a->strings["Registration on this site/hub is by approval only."] = "Registraties op deze Hubzilla-hub moeten eerst worden goedgekeurd."; +$a->strings["<a href=\"pubsites\">Register at another affiliated site/hub</a>"] = "<a href=\"pubsites\">Registreer op een andere Hubzilla-hub</a>"; +$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Deze Hubzilla-hub heeft het maximum aantal dagelijks toegestane registraties bereikt. Probeer het morgen (UTC) nogmaals."; $a->strings["Terms of Service"] = "Gebruiksvoorwaarden"; -$a->strings["I accept the %s for this website"] = "Ik accepteer de %s van deze RedMatrix-hub"; -$a->strings["I am over 13 years of age and accept the %s for this website"] = "Ik accepteer de %s van deze RedMatrix-hub"; -$a->strings["Membership on this site is by invitation only."] = "Registreren op deze RedMatrix-hub kan alleen op uitnodiging."; +$a->strings["I accept the %s for this website"] = "Ik accepteer de %s van deze Hubzilla-hub"; +$a->strings["I am over 13 years of age and accept the %s for this website"] = "Ik accepteer de %s van deze Hubzilla-hub"; +$a->strings["Membership on this site is by invitation only."] = "Registreren op deze Hubzilla-hub kan alleen op uitnodiging."; $a->strings["Please enter your invitation code"] = "Vul jouw uitnodigingscode in"; $a->strings["Your email address"] = "Jouw e-mailadres"; $a->strings["Choose a password"] = "Geef een wachtwoord op"; @@ -1851,11 +1851,11 @@ $a->strings["Please re-enter your password"] = "Geef het wachtwoord opnieuw op"; $a->strings["Account removals are not allowed within 48 hours of changing the account password."] = "Het verwijderen van een account is niet toegestaan binnen 48 uur nadat het wachtwoord is veranderd."; $a->strings["Remove This Account"] = "Verwijder dit account"; $a->strings["WARNING: "] = "WAARSCHUWING: "; -$a->strings["This account and all its channels will be completely removed from the network. "] = "Dit account en al zijn kanalen worden volledig uit het RedMatrix-netwerk verwijderd."; +$a->strings["This account and all its channels will be completely removed from the network. "] = "Dit account en al zijn kanalen worden volledig uit het Hubzilla-netwerk verwijderd."; $a->strings["This action is permanent and can not be undone!"] = "Deze handeling is van permanente aard en kan niet meer worden teruggedraaid!"; $a->strings["Please enter your password for verification:"] = "Vul je wachtwoord in ter verificatie:"; -$a->strings["Remove this account, all its channels and all its channel clones from the network"] = "Dit account, al zijn kanalen en alle klonen van zijn kanalen uit het RedMatrix-netwerk verwijderen"; -$a->strings["By default only the instances of the channels located on this hub will be removed from the network"] = "Standaard worden alleen de kanalen die zich op deze hub bevinden uit het RedMatrix-netwerk verwijderd."; +$a->strings["Remove this account, all its channels and all its channel clones from the network"] = "Dit account, al zijn kanalen en alle klonen van zijn kanalen uit het Hubzilla-netwerk verwijderen"; +$a->strings["By default only the instances of the channels located on this hub will be removed from the network"] = "Standaard worden alleen de kanalen die zich op deze hub bevinden uit het Hubzilla-netwerk verwijderd."; $a->strings["Unable to locate original post."] = "Niet in staat om de originele locatie van het bericht te vinden. "; $a->strings["Empty post discarded."] = "Leeg bericht geannuleerd"; $a->strings["Executable content type not permitted to this channel."] = "Uitvoerbare bestanden zijn niet toegestaan op dit kanaal."; @@ -1894,9 +1894,9 @@ $a->strings["Total votes"] = "Totaal aantal stemmen"; $a->strings["Average Rating"] = "Gemiddelde waardering"; $a->strings["Channel removals are not allowed within 48 hours of changing the account password."] = "Het verwijderen van een kanaal is niet toegestaan binnen 48 uur nadat het wachtwoord van het account is veranderd."; $a->strings["Remove This Channel"] = "Verwijder dit kanaal"; -$a->strings["This channel will be completely removed from the network. "] = "Dit kanaal wordt volledig uit het RedMatrix-netwerk verwijderd."; -$a->strings["Remove this channel and all its clones from the network"] = "Dit kanaal en alle klonen hiervan uit het RedMatrix-netwerk verwijderen"; -$a->strings["By default only the instance of the channel located on this hub will be removed from the network"] = "Standaard wordt alleen het kanaal dat zich op deze hub bevindt uit het RedMatrix-netwerk verwijderd."; +$a->strings["This channel will be completely removed from the network. "] = "Dit kanaal wordt volledig uit het Hubzilla-netwerk verwijderd."; +$a->strings["Remove this channel and all its clones from the network"] = "Dit kanaal en alle klonen hiervan uit het Hubzilla-netwerk verwijderen"; +$a->strings["By default only the instance of the channel located on this hub will be removed from the network"] = "Standaard wordt alleen het kanaal dat zich op deze hub bevindt uit het Hubzilla-netwerk verwijderd."; $a->strings["is now connected to"] = "is nu verbonden met"; $a->strings["Could not access address book record."] = "Kon geen toegang krijgen tot de record van de connectie."; $a->strings["Refresh failed - channel is currently unavailable."] = "Vernieuwen mislukt - kanaal is momenteel niet beschikbaar"; @@ -2074,7 +2074,7 @@ $a->strings["Right offset of the section element"] = "Rechter offset van het sec $a->strings["Section width"] = "Breedte van sectie"; $a->strings["Left offset of the aside"] = "Rechter offset van aside (zijbalk)"; $a->strings["Right offset of the aside element"] = "Rechter offset van het aside-element"; -$a->strings["Light (Red Matrix default)"] = "Light (RedMatrix-standaard)"; +$a->strings["Light (Hubzilla default)"] = "Light (Hubzilla-standaard)"; $a->strings["Select scheme"] = "Kies schema van thema"; $a->strings["Narrow navbar"] = "Smalle navigatiebalk"; $a->strings["Navigation bar background color"] = "Achtergrondkleur navigatiebalk"; @@ -2108,7 +2108,7 @@ $a->strings["Set size of conversation author photo"] = "Grootte profielfoto's va $a->strings["Set size of followup author photos"] = "Grootte profielfoto's van reacties instellen"; $a->strings["Update %s failed. See error logs."] = "Update %s mislukt. Zie foutenlogboek."; $a->strings["Update Error at %s"] = "Update-fout op %s"; -$a->strings["Create an account to access services and applications within the Red Matrix"] = "Maak een account aan om toegang te krijgen tot diensten en toepassingen van de RedMatrix"; +$a->strings["Create an account to access services and applications within the Hubzilla"] = "Maak een account aan om toegang te krijgen tot diensten en toepassingen van de Hubzilla"; $a->strings["Password"] = "Wachtwoord"; $a->strings["Remember me"] = "Aangemeld blijven"; $a->strings["Forgot your password?"] = "Wachtwoord vergeten?"; diff --git a/view/nl/update_fail_eml.tpl b/view/nl/update_fail_eml.tpl index d903a8a9f..08da63331 100644 --- a/view/nl/update_fail_eml.tpl +++ b/view/nl/update_fail_eml.tpl @@ -1,10 +1,10 @@ Hey,
-I'm the RedMatrix hub at {{$sitename}};
+I'm the Hubzilla hub at {{$sitename}};
The Red atrix developers released update {{$update}} recently,
but when I tried to install it, something went terribly wrong.
This needs to be fixed soon and it requires human intervention.
-Please contact a RedMatrix developer if you can not figure out how to
+Please contact a Hubzilla developer if you can not figure out how to
fix it on your own. My database might be invalid.
The error message is '{{$error}}'.
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 9de225062..624aae4b1 100644 --- a/view/pt-br/messages.po +++ b/view/pt-br/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: @@ -14,7 +14,7 @@ # tony baldwin <tonybaldwin@gmx.com>, 2014 msgid "" msgstr "" -"Project-Id-Version: Red Matrix\n" +"Project-Id-Version: Hubzilla\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-10-03 00:04-0700\n" "PO-Revision-Date: 2014-10-07 15:36+0000\n" @@ -1647,12 +1647,12 @@ msgid "Attachments:" msgstr "Anexos:" #: ../../include/enotify.php:41 -msgid "Red Matrix Notification" -msgstr "Notificação da Red Matrix" +msgid "Hubzilla Notification" +msgstr "Notificação da Hubzilla" #: ../../include/enotify.php:42 -msgid "redmatrix" -msgstr "redmatrix" +msgid "hubzilla" +msgstr "hubzilla" #: ../../include/enotify.php:44 msgid "Thank You," @@ -4324,9 +4324,9 @@ msgstr "Red" #: ../../mod/siteinfo.php:167 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 "Este é um hub da Red Matrix - uma rede global cooperativa de websites descentralizados com privacidade aprimorada." +msgstr "Este é um hub da Hubzilla - uma rede global cooperativa de websites descentralizados com privacidade aprimorada." #: ../../mod/siteinfo.php:170 msgid "Running at web location" @@ -4335,8 +4335,8 @@ msgstr "Sendo executado no endereço web" #: ../../mod/siteinfo.php:171 msgid "" "Please visit <a href=\"http://getzot.com\">GetZot.com</a> to learn more " -"about the Red Matrix." -msgstr "Para aprender mais sobre a Red Matrix, visite <a href=\"http://getzot.com\">GetZot.com</a>." +"about the Hubzilla." +msgstr "Para aprender mais sobre a Hubzilla, visite <a href=\"http://getzot.com\">GetZot.com</a>." #: ../../mod/siteinfo.php:172 msgid "Bug reports and issues: please visit" @@ -4344,9 +4344,9 @@ msgstr "Relatos e acompanhamentos de erros podem ser encontrados em" #: ../../mod/siteinfo.php:175 msgid "" -"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot " +"Suggestions, praise, etc. - please email \"hubzilla\" at librelist - dot " "com" -msgstr "Sugestões, elogios, etc - mande um e-mail para \"redmatrix\" arrôba librelist ponto com" +msgstr "Sugestões, elogios, etc - mande um e-mail para \"hubzilla\" arrôba librelist ponto com" #: ../../mod/siteinfo.php:177 msgid "Site Administrators" @@ -4657,12 +4657,12 @@ msgstr "Sites públicos" #: ../../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 "Os sites listados permitem ao público geral registrar contas na Red Matrix. 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." +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/pubsites.php:25 msgid "Site URL" @@ -4833,8 +4833,8 @@ msgid "Please login." msgstr "Por favor, autentique-se." #: ../../mod/cloud.php:126 -msgid "Red Matrix - Guests: Username: {your email address}, Password: +++" -msgstr "Red Matrix - Visitantes: Usuário: {seu endereço de e-mail}, Senha: +++" +msgid "Hubzilla - Guests: Username: {your email address}, Password: +++" +msgstr "Hubzilla - Visitantes: Usuário: {seu endereço de e-mail}, Senha: +++" #: ../../mod/removeme.php:29 msgid "" @@ -5479,8 +5479,8 @@ msgid "This site is not a directory server" msgstr "Este site não é um servidor de diretório" #: ../../mod/setup.php:162 -msgid "Red Matrix Server - Setup" -msgstr "Servidor Red Matrix - Configuração" +msgid "Hubzilla Server - Setup" +msgstr "Servidor Hubzilla - Configuração" #: ../../mod/setup.php:168 msgid "Could not connect to database." @@ -5528,9 +5528,9 @@ msgstr "Conexão ao banco de dados" #: ../../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 "Para instalar a Red Matrix é necessário saber como se conectar ao seu banco de dados." +msgstr "Para instalar a Hubzilla é necessário saber como se conectar ao seu banco de dados." #: ../../mod/setup.php:286 msgid "" @@ -7261,20 +7261,20 @@ msgid "Your message:" msgstr "Sua mensagem:" #: ../../mod/invite.php:132 -msgid "Please join my community on RedMatrix." -msgstr "Por favor junte-se à minha comunidade na RedMatrix" +msgid "Please join my community on Hubzilla." +msgstr "Por favor junte-se à minha comunidade na Hubzilla" #: ../../mod/invite.php:134 msgid "You will need to supply this invitation code: " msgstr "Você precisará fornecer este código de convite:" #: ../../mod/invite.php:135 -msgid "1. Register at any RedMatrix location (they are all inter-connected)" -msgstr "1. Registre-se em qualquer site da RedMatrix (eles são todos interconectados)" +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/invite.php:137 -msgid "2. Enter my RedMatrix network address into the site searchbar." -msgstr "2. Entre meu endereço da rede RedMatrix na barra de busca do site." +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/invite.php:138 msgid "or visit " @@ -7333,9 +7333,9 @@ msgstr "Esta ação é restrita a membros." #: ../../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 "Por favor <a href=\"rmagic\">entre com sua ID da RedMatrix</a> ou <a href=\"register\">registre-se como um novo membro da RedMatrix</a> para continuar." +"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/like.php:77 ../../mod/like.php:104 ../../mod/like.php:142 msgid "Invalid request." @@ -7727,8 +7727,8 @@ msgid "" 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/home.php:46 -msgid "Red Matrix - "The Network"" -msgstr "Red Matrix - "A Rede"" +msgid "Hubzilla - "The Network"" +msgstr "Hubzilla - "A Rede"" #: ../../mod/home.php:101 #, php-format @@ -8017,8 +8017,8 @@ 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 (Red Matrix default)" -msgstr "Leve (padrão da Red Matrix)" +msgid "Light (Hubzilla default)" +msgstr "Leve (padrão da Hubzilla)" #: ../../view/theme/redbasic/php/config.php:104 msgid "Narrow navbar" @@ -8152,8 +8152,8 @@ msgstr "Erro de atualização em %s" #: ../../boot.php:1470 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:1498 msgid "Password" diff --git a/view/pt-br/strings.php b/view/pt-br/strings.php index eaeb012ab..a1c36adb6 100644 --- a/view/pt-br/strings.php +++ b/view/pt-br/strings.php @@ -384,8 +384,8 @@ $a->strings["Enable Safe Search"] = "Habilitar busca tranquila"; $a->strings["Disable Safe Search"] = "Desabilitar busca tranquila"; $a->strings["Safe Mode"] = "Modo tranquilo"; $a->strings["Attachments:"] = "Anexos:"; -$a->strings["Red Matrix Notification"] = "Notificação da Red Matrix"; -$a->strings["redmatrix"] = "redmatrix"; +$a->strings["Hubzilla Notification"] = "Notificação da Hubzilla"; +$a->strings["hubzilla"] = "hubzilla"; $a->strings["Thank You,"] = "Obrigado(a),"; $a->strings["%s Administrator"] = "Administrador de %s"; $a->strings["%s <!item_type!>"] = "%s <!item_type!>"; @@ -1019,11 +1019,11 @@ $a->strings["Version %s"] = "Versão %s"; $a->strings["Installed plugins/addons/apps:"] = "Plugins/complementos/aplicações instalados:"; $a->strings["No installed plugins/addons/apps"] = "Nenhum plugin/complemento/aplicação instalado"; $a->strings["Red"] = "Red"; -$a->strings["This is a hub of the Red Matrix - a global cooperative network of decentralized privacy enhanced websites."] = "Este é um hub da Red Matrix - uma rede global cooperativa de websites descentralizados com privacidade aprimorada."; +$a->strings["This is a hub of the Hubzilla - a global cooperative network of decentralized privacy enhanced websites."] = "Este é um hub da Hubzilla - uma rede global cooperativa de websites descentralizados com privacidade aprimorada."; $a->strings["Running at web location"] = "Sendo executado no endereço web"; -$a->strings["Please visit <a href=\"http://getzot.com\">GetZot.com</a> to learn more about the Red Matrix."] = "Para aprender mais sobre a Red Matrix, visite <a href=\"http://getzot.com\">GetZot.com</a>."; +$a->strings["Please visit <a href=\"http://getzot.com\">GetZot.com</a> to learn more about the Hubzilla."] = "Para aprender mais sobre a Hubzilla, visite <a href=\"http://getzot.com\">GetZot.com</a>."; $a->strings["Bug reports and issues: please visit"] = "Relatos e acompanhamentos de erros podem ser encontrados em"; -$a->strings["Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"] = "Sugestões, elogios, etc - mande um e-mail para \"redmatrix\" arrôba librelist ponto com"; +$a->strings["Suggestions, praise, etc. - please email \"hubzilla\" at librelist - dot com"] = "Sugestões, elogios, etc - mande um e-mail para \"hubzilla\" arrôba librelist ponto com"; $a->strings["Site Administrators"] = "Administradores do site"; $a->strings["Block Name"] = "Nome do bloco"; $a->strings["Profile not found."] = "O perfil não foi encontrado."; @@ -1100,7 +1100,7 @@ $a->strings["Click on a contact to add or remove."] = "Clique em um contato para $a->strings["Visible To"] = "Visível para"; $a->strings["All Connections"] = "Todas as conexões"; $a->strings["Public Sites"] = "Sites públicos"; -$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."] = "Os sites listados permitem ao público geral registrar contas na Red Matrix. 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."; +$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."] = "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."; $a->strings["Site URL"] = "URL do site"; $a->strings["Access Type"] = "Tipo de acesso"; $a->strings["Registration Policy"] = "Política de registro"; @@ -1141,7 +1141,7 @@ $a->strings["Please re-enter your password"] = "Por favor, digite sua senha nova $a->strings["Away"] = "Ausente"; $a->strings["Online"] = "Online"; $a->strings["Please login."] = "Por favor, autentique-se."; -$a->strings["Red Matrix - Guests: Username: {your email address}, Password: +++"] = "Red Matrix - Visitantes: Usuário: {seu endereço de e-mail}, Senha: +++"; +$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."; @@ -1292,7 +1292,7 @@ $a->strings["Hometown: "] = "Cidade natal:"; $a->strings["About: "] = "Sobre:"; $a->strings["Keywords: "] = "Palavras-chave:"; $a->strings["This site is not a directory server"] = "Este site não é um servidor de diretório"; -$a->strings["Red Matrix Server - Setup"] = "Servidor Red Matrix - Configuração"; +$a->strings["Hubzilla Server - Setup"] = "Servidor Hubzilla - Configuração"; $a->strings["Could not connect to database."] = "Não foi possível conectar ao banco de dados."; $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."; @@ -1303,7 +1303,7 @@ $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 Red Matrix we need to know how to connect to your database."] = "Para instalar a Red Matrix é necessário saber como se conectar ao seu banco de dados."; +$a->strings["In order to install Hubzilla we need to know how to connect to your database."] = "Para instalar a Hubzilla é necessário saber como se conectar ao seu banco de dados."; $a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "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."; $a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "O banco de dados que você especificar abaixo já deve existir. Caso contrário, crie-o antes de prosseguir."; $a->strings["Database Server Name"] = "Nome do servidor de banco de dados"; @@ -1710,10 +1710,10 @@ $a->strings["You have no more invitations available"] = "Você não possui mais $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 RedMatrix."] = "Por favor junte-se à minha comunidade na RedMatrix"; +$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 RedMatrix location (they are all inter-connected)"] = "1. Registre-se em qualquer site da RedMatrix (eles são todos interconectados)"; -$a->strings["2. Enter my RedMatrix network address into the site searchbar."] = "2. Entre meu endereço da rede RedMatrix na barra de busca do site."; +$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."; @@ -1727,7 +1727,7 @@ $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 RedMatrix 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 RedMatrix</a> ou <a href=\"register\">registre-se como um novo membro da RedMatrix</a> para continuar."; +$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."; @@ -1820,7 +1820,7 @@ $a->strings["Your nickname will be used to create an easily remembered channel a $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["Channel Type"] = "Tipo de canal"; $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["Red Matrix - "The Network""] = "Red Matrix - "A Rede""; +$a->strings["Hubzilla - "The Network""] = "Hubzilla - "A Rede""; $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"; @@ -1888,7 +1888,7 @@ $a->strings["Right offset of the aside element"] = "Deslocamento direito do apar $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 (Red Matrix default)"] = "Leve (padrão da Red Matrix)"; +$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"; @@ -1921,7 +1921,7 @@ $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?"; 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 - "The Network"" +msgid "Hubzilla - "The Network"" 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 - "The Network""] = ""; +$a->strings["Hubzilla - "The Network""] = ""; $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 - "The Network"" -msgstr "Red Matrix - "Nätverket"" +msgid "Hubzilla - "The Network"" +msgstr "Hubzilla - "Nätverket"" #: ../../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 - "The Network""] = "Red Matrix - "Nätverket""; +$a->strings["Hubzilla - "The Network""] = "Hubzilla - "Nätverket""; $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 /> |
