Merge branch 'master' of https://github.com/redmatrix/hubzilla

.homeinstall/README.md

@@ -2,7 +2,10 @@
 
 Run hubzilla-setup.sh for an unattended installation of hubzilla.
 
-The script is known to work with Debian stable (Jessie).
+The script is known to work with Debian 8.3 stable (Jessie)
+
++ Home-PC (Debian-8.3.0-amd64)
++ DigitalOcean droplet (Debian 8.3 x64 / 512 MB Memory / 20 GB Disk / NYC3)
 
 # Step-by-Step Overwiew
 
@@ -19,13 +22,20 @@ Software
 + Fresh installation of Debian on your mini-pc
 + Router with open ports 80 and 443 for your Debian
 
-## The basic steps
+## The basic steps (quick overview)
 
 + Register your own domain (for example at selfHOST) or a free subdomain (for example at freeDNS)
-+ Clone hubzilla to /var/www/html
-+ Copy hubzilla-config.txt and hubzilla-setup.sh to your Debian (future hub)
-+ Edit hubzilla-config.txt. Enter your values there: db pass, domain, values for dyn DNS
-+ Run hubzilla-setup.sh as root ... wait, wait, wait until the script is finised
++ Log on to your new debian (server)
+  - apt-get install git
+  - mkdir -p /var/www/html
+  - cd /var/www/html
+  - git clone https://github.com/redmatrix/hubzilla.git .
+  - cp .homeinstall/hubzilla-config.txt.template .homeinstall/hubzilla-config.txt
+  - nano .homeinstall/hubzilla-config.txt
+    - Enter your values there: db pass, domain, values for dyn DNS
+  - hubzilla-setup.sh as root
+    - ... wait, wait, wait until the script is finised
+  - reboot
 + Open your domain with a browser and step throught the initial configuration of hubzilla.
 
 # Step-by-Step in Detail
@@ -76,6 +86,8 @@ There are two way to get a domain
 
 ### Method 1: Get yourself an own Domain (recommended)
 
+...for example at selfHOST.de
+
 ### Method 2 Register a (free) Subdomain
 
 Register a free subdomain for example at
@@ -118,8 +130,12 @@ Clone hubzilla from git ("git pull" will update it later)
 Change to the install script
 
     cd html/.homeinstall/
+    
+Copy the template file
+    
+    cp hubzilla-config.txt.template hubzilla-config.txt
 
-Change the file "hubzilla-config.txt". Enter your values there.
+Change the file "hubzilla-config.txt". Read the instructions there and enter your values.
 
     nano hubzilla-config.txt
 
@@ -146,10 +162,3 @@ Leave db type "MySQL" untouched.
 
 Follow the instructions in the next pages.
 
-# The Script explained
-
-This chapter shows you
-
-- What the script does exactly
-- Explanations on technical details. May be this will encourage you to play with bash scripts?
-

.openshift/action_hooks/deploy

@@ -181,6 +181,7 @@ echo "chmod done, permissions set to 777 on poller script."
 # to make Hubzilla on OpenShift a more pleasant experience 
 echo "Changing default configuration to conserve space and autocreate a social private channel upon account registration"
 cd ${OPENSHIFT_REPO_DIR}
+util/config system auto_channel_create
 util/config system default_permissions_role social_private
 util/config system workflow_channel_next channel
 util/config system expire_delivery_reports 3

doc/DerivedTheme1.md

@@ -63,7 +63,6 @@ In it, put the following:
 
 That's it. This tells the software to read the PCSS information for the redbasic theme first, and then read our CSS file which will just consist of changes we want to make from our parent theme (redbasic). 
 
-
 Now create the actual CSS file for your theme.  Put it in view/theme/mytheme/css/style.css (where we just told the software to look for it). For our example, we'll just change the body background color so you can see that it works. You can use any CSS you'd like. 
 
 
@@ -74,4 +73,29 @@ Now create the actual CSS file for your theme.  Put it in view/theme/mytheme/css
 
 You've just successfully created a derived theme. This needs to be enabled in the admin "themes" panel, and then anybody on the site can use it by selecting it in Settings->Display Settings as their default theme.  
 
+**Lesson 2**
+
+If you want to use the redbasic schemas for your derived theme, you have to do a bit more.
+
+Do everything as above, but don't create view/theme/mytheme/php/style.php, but copy instead  view/theme/redbasic/php/style.php to view/theme/mytheme/php/style.php. Modify that file and remove (or comment out) these two lines:
+
+	if($a->channel['channel_theme'] != 'redbasic')
+	set_pconfig(local_channel(), 'redbasic', 'schema', '---');
+	
+Also add this line at the bottom:
+
+	echo @file_get_contents('view/theme/mytheme/css/style.css');
+
+To show the schema selector you have to copy view/theme/redbasic/tpl/theme_settings.tpl to  view/theme/mytheme/tpl/theme_settings.tpl. Modify that file and replace the lines:
+
+	{{if $theme == redbasic}}
+	{{include file="field_select.tpl" field=$schema}}
+	{{/if}}
+
+with:
+
+	{{include file="field_select.tpl" field=$schema}}
+	
+
+
 #include doc/macros/main_footer.bb;

doc/cloud.bb

@@ -10,7 +10,7 @@ On many public servers there may be limits on disk usage.
 
 The quickest and easiest way to share files is through file attachments. In the row of icons below the status post editor is a tool to upload attachments. Click the tool, select a file and submit. After the file is uploaded, you will see an attachment code placed inside the text region. Do not edit this line or it may break the ability for your friends to see the attachment. You can use the post permissions dialogue box or privacy hashtags to restrict the visibility of the file - which will be set to match the permissions of the post your are sending.
 
-To delete attachments or change the permissions on the stored files, visit [observer.baseurl]/filestorage/{{username}}" replacing {{username}} with the nickname you provided during channel creation.
+To delete attachments or change the permissions on the stored files, visit [observer.baseurl]/cloud/{{username}}" replacing {{username}} with the nickname you provided during channel creation.
 
 [b]Web Access[/b]
 

doc/git_for_non_developers.bb

@@ -14,7 +14,7 @@ Once you've done that, cd into the directory, and add an upstream.
 
 [code]
 cd red
-git remote add upstream https://github.com/redmatrix/redmatrix
+git remote add upstream https://github.com/redmatrix/hubzilla
 [/code]
 
 From now on, you can pull upstream changes with the command

view/en/lostpass_eml.tpl

@@ -29,4 +29,7 @@ Login Name:	{{$email}}
 Sincerely,
 	{{$sitename}} Administrator
 
+--
+Terms Of Service:
+{{$siteurl}}/help/TermsOfService
  

view/en/passchanged_eml.tpl

@@ -18,3 +18,8 @@ Sincerely,
 	{{$sitename}} Administrator
 
  
+
+--
+Terms Of Service:
+{{$siteurl}}/help/TermsOfService
+

view/en/register_verify_member.tpl

@@ -23,3 +23,8 @@ To deny the request and remove the account, please visit:
 
 Thank you.
 
+
+--
+Terms Of Service:
+{{$siteurl}}/help/TermsOfService
+

view/es

@@ -1 +1 @@
-es-es
+es-es/

view/es-es/hstrings.php

@@ -65,11 +65,11 @@ $a->strings["Don't show"] = "No mostrar";
 $a->strings["Other networks and post services"] = "Otras redes y servicios de publicación";
 $a->strings["Permissions"] = "Permisos";
 $a->strings["Close"] = "Cerrar";
-$a->strings[" and "] = "y";
-$a->strings["public profile"] = "perfil público";
+$a->strings[" and "] = "  y ";
+$a->strings["public profile"] = "el perfil público";
 $a->strings["%1\$s changed %2\$s to “%3\$s”"] = "%1\$s ha cambiado %2\$s a “%3\$s”";
 $a->strings["Visit %1\$s's %2\$s"] = "Visitar %2\$s de %1\$s";
-$a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s ha actualizado %2\$s cambiando %3\$s.";
+$a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s ha actualizado %2\$s, cambiando %3\$s.";
 $a->strings["Public Timeline"] = "Cronología pública";
 $a->strings["Site Admin"] = "Administrador del sitio";
 $a->strings["Bookmarks"] = "Marcadores";
@@ -101,21 +101,6 @@ $a->strings["Profile Photo"] = "Foto del perfil";
 $a->strings["Update"] = "Actualizar";
 $a->strings["Install"] = "Instalar";
 $a->strings["Purchase"] = "Comprar";
-$a->strings["Item was not found."] = "Elemento no encontrado.";
-$a->strings["No source file."] = "Ningún fichero de origen";
-$a->strings["Cannot locate file to replace"] = "No se puede localizar el fichero que va a ser sustituido.";
-$a->strings["Cannot locate file to revise/update"] = "No se puede localizar el fichero para revisar/actualizar";
-$a->strings["File exceeds size limit of %d"] = "El fichero supera el limite de tamaño de %d";
-$a->strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Ha alcanzado su límite de %1$.0f Mbytes de almacenamiento de adjuntos.";
-$a->strings["File upload failed. Possible system limit or action terminated."] = "Error de carga, posiblemente por limite del sistema o porque la acción ha finalizado.";
-$a->strings["Stored file could not be verified. Upload failed."] = "El fichero almacenado no ha podido ser verificado. El envío ha fallado.";
-$a->strings["Path not available."] = "Ruta no disponible.";
-$a->strings["Empty pathname"] = "Ruta vacía";
-$a->strings["duplicate filename or path"] = "Nombre duplicado de ruta o fichero";
-$a->strings["Path not found."] = "Ruta no encontrada";
-$a->strings["mkdir failed."] = "mkdir ha fallado.";
-$a->strings["database storage failed."] = "el almacenamiento en la base de datos ha fallado.";
-$a->strings["Empty path"] = "Ruta vacía";
 $a->strings["Logged out."] = "Desconectado/a.";
 $a->strings["Failed authentication"] = "Autenticación fallida.";
 $a->strings["Login failed."] = "El acceso ha fallado.";
@@ -125,19 +110,6 @@ $a->strings["\$Projectname event notification:"] = "Notificación de eventos de
 $a->strings["Starts:"] = "Comienza:";
 $a->strings["Finishes:"] = "Finaliza:";
 $a->strings["Location:"] = "Ubicación:";
-$a->strings["Image/photo"] = "Imagen/foto";
-$a->strings["Encrypted content"] = "Contenido cifrado";
-$a->strings["Install %s element: "] = "Instalar el elemento %s:";
-$a->strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Esta entrada contiene el elemento instalable %s, sin embargo le faltan permisos para instalarlo en este sitio.";
-$a->strings["webpage"] = "página web";
-$a->strings["layout"] = "disposición";
-$a->strings["block"] = "bloque";
-$a->strings["menu"] = "menú";
-$a->strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s escribió %2\$s siguiente %3\$s";
-$a->strings["post"] = "la entrada";
-$a->strings["Different viewers will see this text differently"] = "Visitantes diferentes verán este texto de forma distinta";
-$a->strings["$1 spoiler"] = "$1 spoiler";
-$a->strings["$1 wrote:"] = "$1 escribió:";
 $a->strings["%1\$s's bookmarks"] = "Marcadores de %1\$s";
 $a->strings["Missing room name"] = "Sala de chat sin nombre";
 $a->strings["Duplicate room name"] = "Nombre de sala duplicado.";
@@ -340,6 +312,19 @@ $a->strings["Title"] = "Título";
 $a->strings["Created"] = "Creado";
 $a->strings["Edited"] = "Editado";
 $a->strings["Profile Photos"] = "Fotos del perfil";
+$a->strings["Image/photo"] = "Imagen/foto";
+$a->strings["Encrypted content"] = "Contenido cifrado";
+$a->strings["Install %s element: "] = "Instalar el elemento %s:";
+$a->strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Esta entrada contiene el elemento instalable %s, sin embargo le faltan permisos para instalarlo en este sitio.";
+$a->strings["webpage"] = "página web";
+$a->strings["layout"] = "disposición";
+$a->strings["block"] = "bloque";
+$a->strings["menu"] = "menú";
+$a->strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s escribió %2\$s siguiente %3\$s";
+$a->strings["post"] = "la entrada";
+$a->strings["Different viewers will see this text differently"] = "Visitantes diferentes verán este texto de forma distinta";
+$a->strings["$1 spoiler"] = "$1 spoiler";
+$a->strings["$1 wrote:"] = "$1 escribió:";
 $a->strings["Male"] = "Hombre";
 $a->strings["Female"] = "Mujer";
 $a->strings["Currently Male"] = "Actualmente hombre";
@@ -453,6 +438,21 @@ $a->strings["Invalid data packet"] = "Paquete de datos no válido";
 $a->strings["Unable to verify channel signature"] = "No ha sido posible de verificar la firma del canal";
 $a->strings["Unable to verify site signature for %s"] = "No ha sido posible de verificar la firma del sitio para %s";
 $a->strings["invalid target signature"] = "La firma recibida no es válida";
+$a->strings["Item was not found."] = "Elemento no encontrado.";
+$a->strings["No source file."] = "Ningún fichero de origen";
+$a->strings["Cannot locate file to replace"] = "No se puede localizar el fichero que va a ser sustituido.";
+$a->strings["Cannot locate file to revise/update"] = "No se puede localizar el fichero para revisar/actualizar";
+$a->strings["File exceeds size limit of %d"] = "El fichero supera el limite de tamaño de %d";
+$a->strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Ha alcanzado su límite de %1$.0f Mbytes de almacenamiento de adjuntos.";
+$a->strings["File upload failed. Possible system limit or action terminated."] = "Error de carga, posiblemente por limite del sistema o porque la acción ha finalizado.";
+$a->strings["Stored file could not be verified. Upload failed."] = "El fichero almacenado no ha podido ser verificado. El envío ha fallado.";
+$a->strings["Path not available."] = "Ruta no disponible.";
+$a->strings["Empty pathname"] = "Ruta vacía";
+$a->strings["duplicate filename or path"] = "Nombre duplicado de ruta o fichero";
+$a->strings["Path not found."] = "Ruta no encontrada";
+$a->strings["mkdir failed."] = "mkdir ha fallado.";
+$a->strings["database storage failed."] = "el almacenamiento en la base de datos ha fallado.";
+$a->strings["Empty path"] = "Ruta vacía";
 $a->strings["Frequently"] = "Frecuentemente";
 $a->strings["Hourly"] = "Cada hora";
 $a->strings["Twice daily"] = "Dos veces al día";
@@ -502,13 +502,13 @@ $a->strings["Navigation Channel Select"] = "Navegación por el selector de canal
 $a->strings["Change channels directly from within the navigation dropdown menu"] = "Cambiar de canales directamente desde el menú de navegación desplegable";
 $a->strings["Photo Location"] = "Ubicación de las fotos";
 $a->strings["If location data is available on uploaded photos, link this to a map."] = "Si los datos de ubicación están disponibles en las fotos subidas, enlazar estas a un mapa.";
+$a->strings["Smart Birthdays"] = "Cumpleaños inteligentes";
+$a->strings["Make birthday events timezone aware in case your friends are scattered across the planet."] = "Enlazar los eventos de cumpleaños con la zona horaria en el caso de que sus amigos estén dispersos por el mundo.";
 $a->strings["Expert Mode"] = "Modo de experto";
 $a->strings["Enable Expert Mode to provide advanced configuration options"] = "Habilitar el modo de experto para acceder a opciones avanzadas de configuración";
 $a->strings["Premium Channel"] = "Canal premium";
 $a->strings["Allows you to set restrictions and terms on those that connect with your channel"] = "Le permite configurar restricciones y normas de uso a aquellos que conectan con su canal";
 $a->strings["Post Composition Features"] = "Opciones para la redacción de entradas";
-$a->strings["Use Markdown"] = "Usar Markdown";
-$a->strings["Allow use of \"Markdown\" to format posts"] = "Permitir el uso de \"Markdown\" para formatear publicaciones";
 $a->strings["Large Photos"] = "Fotos de gran tamaño";
 $a->strings["Include large (1024px) photo thumbnails in posts. If not enabled, use small (640px) photo thumbnails"] = "Incluir miniaturas de fotos grandes (1024px) en publicaciones. Si no está habilitado, usar miniaturas pequeñas (640px)";
 $a->strings["Channel Sources"] = "Orígenes de los contenidos del canal";
@@ -618,7 +618,7 @@ $a->strings["Security"] = "Seguridad";
 $a->strings["Plugins"] = "Extensiones";
 $a->strings["Themes"] = "Temas";
 $a->strings["Inspect queue"] = "Examinar la cola";
-$a->strings["Profile Config"] = "Ajustes del perfil";
+$a->strings["Profile Fields"] = "Campos del perfil";
 $a->strings["DB updates"] = "Actualizaciones de la base de datos";
 $a->strings["Logs"] = "Informes";
 $a->strings["Plugin Features"] = "Extensiones";
@@ -742,11 +742,9 @@ $a->strings["Default Profile"] = "Perfil principal";
 $a->strings["Requested channel is not available."] = "El canal solicitado no está disponible.";
 $a->strings["Requested profile is not available."] = "El perfil solicitado no está disponible.";
 $a->strings["Change profile photo"] = "Cambiar la foto del perfil";
-$a->strings["Profiles"] = "Perfiles";
-$a->strings["Manage/edit profiles"] = "Administrar/editar perfiles";
 $a->strings["Create New Profile"] = "Crear un nuevo perfil";
 $a->strings["Profile Image"] = "Imagen del perfil";
-$a->strings["visible to everybody"] = "visible para cualquiera";
+$a->strings["Visible to everybody"] = "Visible para todos";
 $a->strings["Edit visibility"] = "Editar visibilidad";
 $a->strings["Gender:"] = "Género:";
 $a->strings["Status:"] = "Estado:";
@@ -1756,6 +1754,12 @@ $a->strings["Help text"] = "Texto de ayuda";
 $a->strings["Additional info (optional)"] = "Información adicional (opcional)";
 $a->strings["Field definition not found"] = "Definición del campo no encontrada";
 $a->strings["Edit Profile Field"] = "Modificar el campo del perfil";
+$a->strings["Basic Profile Fields"] = "Campos básicos del perfil";
+$a->strings["Advanced Profile Fields"] = "Campos avanzados del perfil";
+$a->strings["(In addition to basic fields)"] = "(Además de los campos básicos)";
+$a->strings["All available fields"] = "Todos los campos disponibles";
+$a->strings["Custom Fields"] = "Campos personalizados";
+$a->strings["Create Custom Field"] = "Crear un campo personalizado";
 $a->strings["Poke somebody"] = "Dar un toque a alguien";
 $a->strings["Poke/Prod"] = "Toque/Incitación";
 $a->strings["Poke, prod or do other things to somebody"] = "Dar un toque, incitar o hacer otras cosas a alguien";
@@ -1938,7 +1942,7 @@ $a->strings["Account Settings"] = "Configuración de la cuenta";
 $a->strings["Current Password"] = "Contraseña actual";
 $a->strings["Enter New Password"] = "Escribir una nueva contraseña";
 $a->strings["Confirm New Password"] = "Confirmar la nueva contraseña";
-$a->strings["Leave password fields blank unless changing"] = "Dejar en blanco los campos de contraseña a menos que cambie";
+$a->strings["Leave password fields blank unless changing"] = "Dejar en blanco la contraseña a menos que desee cambiarla.";
 $a->strings["Email Address:"] = "Dirección de correo electrónico:";
 $a->strings["Remove this account including all its channels"] = "Eliminar esta cuenta incluyendo todos sus canales";
 $a->strings["Additional Features"] = "Funcionalidades";

view/nl/hstrings.php

@@ -101,21 +101,6 @@ $a->strings["Profile Photo"] = "Profielfoto";
 $a->strings["Update"] = "Bijwerken";
 $a->strings["Install"] = "Installeren";
 $a->strings["Purchase"] = "Aanschaffen";
-$a->strings["Item was not found."] = "Item niet gevonden";
-$a->strings["No source file."] = "Geen bronbestand.";
-$a->strings["Cannot locate file to replace"] = "Kan het te vervangen bestand niet vinden";
-$a->strings["Cannot locate file to revise/update"] = "Kan het bestand wat aangepast moet worden niet vinden";
-$a->strings["File exceeds size limit of %d"] = "Bestand is groter dan de toegelaten %d";
-$a->strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Je hebt jouw limiet van %1$.0f MB opslagruimte voor bijlagen bereikt.";
-$a->strings["File upload failed. Possible system limit or action terminated."] = "Uploaden van bestand mislukt. Mogelijk systeemlimiet bereikt of actie afgebroken.";
-$a->strings["Stored file could not be verified. Upload failed."] = "Opgeslagen bestand kon niet worden geverifieerd. Uploaden mislukt.";
-$a->strings["Path not available."] = "Pad niet beschikbaar.";
-$a->strings["Empty pathname"] = "Padnaam leeg";
-$a->strings["duplicate filename or path"] = "dubbele bestandsnaam of pad";
-$a->strings["Path not found."] = "Pad niet gevonden";
-$a->strings["mkdir failed."] = "directory aanmaken (mkdir) mislukt.";
-$a->strings["database storage failed."] = "opslag in database mislukt.";
-$a->strings["Empty path"] = "Ontbrekend bestandspad";
 $a->strings["Logged out."] = "Uitgelogd.";
 $a->strings["Failed authentication"] = "Mislukte authenticatie";
 $a->strings["Login failed."] = "Inloggen mislukt.";
@@ -125,19 +110,6 @@ $a->strings["\$Projectname event notification:"] = "Notificatie \$Projectname-ge
 $a->strings["Starts:"] = "Start:";
 $a->strings["Finishes:"] = "Einde:";
 $a->strings["Location:"] = "Plaats:";
-$a->strings["Image/photo"] = "Afbeelding/foto";
-$a->strings["Encrypted content"] = "Versleutelde inhoud";
-$a->strings["Install %s element: "] = "Installeer %s-element: ";
-$a->strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Dit bericht heeft een te installeren %s-element, maar je hebt geen permissies om het op deze hub te installeren.";
-$a->strings["webpage"] = "Webpagina";
-$a->strings["layout"] = "lay-out";
-$a->strings["block"] = "blok";
-$a->strings["menu"] = "menu";
-$a->strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s schreef het volgende %2\$s %3\$s";
-$a->strings["post"] = "bericht";
-$a->strings["Different viewers will see this text differently"] = "Deze tekst wordt per persoon anders weergeven.";
-$a->strings["$1 spoiler"] = "$1 spoiler";
-$a->strings["$1 wrote:"] = "$1 schreef:";
 $a->strings["%1\$s's bookmarks"] = "Bladwijzers van %1\$s";
 $a->strings["Missing room name"] = "Naam chatkanaal ontbreekt";
 $a->strings["Duplicate room name"] = "Naam chatkanaal bestaat al";
@@ -340,6 +312,19 @@ $a->strings["Title"] = "Titel";
 $a->strings["Created"] = "Aangemaakt";
 $a->strings["Edited"] = "Bewerkt";
 $a->strings["Profile Photos"] = "Profielfoto's";
+$a->strings["Image/photo"] = "Afbeelding/foto";
+$a->strings["Encrypted content"] = "Versleutelde inhoud";
+$a->strings["Install %s element: "] = "Installeer %s-element: ";
+$a->strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Dit bericht heeft een te installeren %s-element, maar je hebt geen permissies om het op deze hub te installeren.";
+$a->strings["webpage"] = "Webpagina";
+$a->strings["layout"] = "lay-out";
+$a->strings["block"] = "blok";
+$a->strings["menu"] = "menu";
+$a->strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s schreef het volgende %2\$s %3\$s";
+$a->strings["post"] = "bericht";
+$a->strings["Different viewers will see this text differently"] = "Deze tekst wordt per persoon anders weergeven.";
+$a->strings["$1 spoiler"] = "$1 spoiler";
+$a->strings["$1 wrote:"] = "$1 schreef:";
 $a->strings["Male"] = "Man";
 $a->strings["Female"] = "Vrouw";
 $a->strings["Currently Male"] = "Momenteel man";
@@ -453,6 +438,21 @@ $a->strings["Invalid data packet"] = "Datapakket ongeldig";
 $a->strings["Unable to verify channel signature"] = "Kanaalkenmerk kon niet worden geverifieerd.  ";
 $a->strings["Unable to verify site signature for %s"] = "Hubkenmerk voor %s kon niet worden geverifieerd";
 $a->strings["invalid target signature"] = "ongeldig doelkenmerk";
+$a->strings["Item was not found."] = "Item niet gevonden";
+$a->strings["No source file."] = "Geen bronbestand.";
+$a->strings["Cannot locate file to replace"] = "Kan het te vervangen bestand niet vinden";
+$a->strings["Cannot locate file to revise/update"] = "Kan het bestand wat aangepast moet worden niet vinden";
+$a->strings["File exceeds size limit of %d"] = "Bestand is groter dan de toegelaten %d";
+$a->strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Je hebt jouw limiet van %1$.0f MB opslagruimte voor bijlagen bereikt.";
+$a->strings["File upload failed. Possible system limit or action terminated."] = "Uploaden van bestand mislukt. Mogelijk systeemlimiet bereikt of actie afgebroken.";
+$a->strings["Stored file could not be verified. Upload failed."] = "Opgeslagen bestand kon niet worden geverifieerd. Uploaden mislukt.";
+$a->strings["Path not available."] = "Pad niet beschikbaar.";
+$a->strings["Empty pathname"] = "Padnaam leeg";
+$a->strings["duplicate filename or path"] = "dubbele bestandsnaam of pad";
+$a->strings["Path not found."] = "Pad niet gevonden";
+$a->strings["mkdir failed."] = "directory aanmaken (mkdir) mislukt.";
+$a->strings["database storage failed."] = "opslag in database mislukt.";
+$a->strings["Empty path"] = "Ontbrekend bestandspad";
 $a->strings["Frequently"] = "Regelmatig";
 $a->strings["Hourly"] = "Elk uur";
 $a->strings["Twice daily"] = "Twee keer per dag";
@@ -502,13 +502,13 @@ $a->strings["Navigation Channel Select"] = "Kanaal kiezen in navigatiemenu";
 $a->strings["Change channels directly from within the navigation dropdown menu"] = "Kies een ander kanaal direct vanuit het dropdown-menu op de navigatiebalk";
 $a->strings["Photo Location"] = "Fotolocatie";
 $a->strings["If location data is available on uploaded photos, link this to a map."] = "Wanneer in de geüploade foto's locatiegegevens aanwezig zijn, link dit dan aan een kaart.";
+$a->strings["Smart Birthdays"] = "Slimme verjaardagen";
+$a->strings["Make birthday events timezone aware in case your friends are scattered across the planet."] = "Maak verjaardagen bewust van tijdzones. Voor het geval dat jouw vrienden over de hele wereld verspreid zijn.";
 $a->strings["Expert Mode"] = "Expertmodus";
 $a->strings["Enable Expert Mode to provide advanced configuration options"] = "Schakel de expertmodus in voor geavanceerde instellingen";
 $a->strings["Premium Channel"] = "Premiumkanaal";
 $a->strings["Allows you to set restrictions and terms on those that connect with your channel"] = "Stelt je in staat om beperkingen en voorwaarden in te stellen voor jouw kanaal";
 $a->strings["Post Composition Features"] = "Functies voor het opstellen van berichten";
-$a->strings["Use Markdown"] = "Markdown gebruiken";
-$a->strings["Allow use of \"Markdown\" to format posts"] = "Sta het gebruik van \"markdown\" toe om berichten mee op te maken.";
 $a->strings["Large Photos"] = "Grote foto's";
 $a->strings["Include large (1024px) photo thumbnails in posts. If not enabled, use small (640px) photo thumbnails"] = "Gebruik grotere foto's (1024px) in berichten. Wanneer dit is uitgeschakeld worden er kleinere foto's (640px) gebruikt.";
 $a->strings["Channel Sources"] = "Kanaalbronnen";
@@ -618,7 +618,7 @@ $a->strings["Security"] = "Beveiliging";
 $a->strings["Plugins"] = "Plugins";
 $a->strings["Themes"] = "Thema's";
 $a->strings["Inspect queue"] = "Inspecteer berichtenwachtrij";
-$a->strings["Profile Config"] = "Profielconfiguratie";
+$a->strings["Profile Fields"] = "Profielvelden";
 $a->strings["DB updates"] = "Database-updates";
 $a->strings["Logs"] = "Logboeken";
 $a->strings["Plugin Features"] = "Plugin-opties";
@@ -742,11 +742,9 @@ $a->strings["Default Profile"] = "Standaardprofiel";
 $a->strings["Requested channel is not available."] = "Opgevraagd kanaal is niet beschikbaar.";
 $a->strings["Requested profile is not available."] = "Opgevraagd profiel is niet beschikbaar";
 $a->strings["Change profile photo"] = "Profielfoto veranderen";
-$a->strings["Profiles"] = "Profielen";
-$a->strings["Manage/edit profiles"] = "Profielen beheren/bewerken";
 $a->strings["Create New Profile"] = "Nieuw profiel aanmaken";
 $a->strings["Profile Image"] = "Profielfoto";
-$a->strings["visible to everybody"] = "Voor iedereen zichtbaar";
+$a->strings["Visible to everybody"] = "Voor iedereen zichtbaar";
 $a->strings["Edit visibility"] = "Zichtbaarheid bewerken";
 $a->strings["Gender:"] = "Geslacht:";
 $a->strings["Status:"] = "Status:";
@@ -1756,6 +1754,12 @@ $a->strings["Help text"] = "Helptekst";
 $a->strings["Additional info (optional)"] = "Extra informatie (optioneel)";
 $a->strings["Field definition not found"] = "Velddefinitie niet gevonden";
 $a->strings["Edit Profile Field"] = "Profielveld bewerken";
+$a->strings["Basic Profile Fields"] = "Standaard profielvelden";
+$a->strings["Advanced Profile Fields"] = "Geavanceerde profielvelden";
+$a->strings["(In addition to basic fields)"] = "(als toevoeging op de standaard velden)";
+$a->strings["All available fields"] = "Alle beschikbare velden";
+$a->strings["Custom Fields"] = "Extra (handmatig toegevoegde) velden";
+$a->strings["Create Custom Field"] = "Extra velden aanmaken";
 $a->strings["Poke somebody"] = "Iemand aanstoten";
 $a->strings["Poke/Prod"] = "Aanstoten/porren";
 $a->strings["Poke, prod or do other things to somebody"] = "Iemand bijvoorbeeld aanstoten of poren";

view/theme/redbasic/php/config.php

@@ -98,6 +98,7 @@ if(feature_enabled(local_channel(),'expert'))
 	  $o .= replace_macros($t, array(
 		'$submit' => t('Submit'),
 		'$baseurl' => $a->get_baseurl(),
+		'$theme' => $a->channel['channel_theme'],
 		'$expert' => $expert,
 		'$title' => t("Theme settings"),
 		'$schema' => array('redbasic_schema', t('Select scheme'), $arr['schema'], '', $scheme_choices),

view/theme/redbasic/php/style.php

@@ -215,3 +215,8 @@ if($align_left && file_exists('view/theme/redbasic/css/align_left.css')) {
 if($schemecss) {
 	echo $schemecss;
 }
+
+// Set the schema to the default schema in derived themes. See the documentation for creating derived themes how to override this. 
+
+if($a->channel['channel_theme'] != 'redbasic')
+	set_pconfig(local_channel(), 'redbasic', 'schema', '---');

view/theme/redbasic/tpl/theme_settings.tpl

@@ -1,4 +1,6 @@
+{{if $theme == redbasic}}
 {{include file="field_select.tpl" field=$schema}}
+{{/if}}
 {{include file="field_checkbox.tpl" field=$align_left}}
 {{include file="field_checkbox.tpl" field=$narrow_navbar}}
 {{include file="field_input.tpl" field=$converse_width}}