Skip to content

Commit d7fb014

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents 317fc78 + 0caa1fe commit d7fb014

File tree

13 files changed

+641
-62
lines changed

13 files changed

+641
-62
lines changed

assets/locales/de.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -177,11 +177,11 @@
177177
"Your browser does not support Javascript": "Ihr Browser unterst\u00fctzt kein JavaScript",
178178
"Email reply header": "Am {0} schrieb {1} ({2}):",
179179
"My files": "Meine Dateien",
180-
"Read the installation guide": "Die Installationsanweisung lesen",
180+
"Read the installation guide": "lesen Sie die Installationsanleitung",
181181
"Installation language": "Sprache f\u00fcr die Installation",
182182
"Requirements": "Voraussetzungen",
183183
"License": "Lizenz",
184-
"Database settings": "Database settings",
184+
"Database settings": "Datenbankeinstellungen",
185185
"Config settings": "Konfiguration",
186186
"Show Overview": "\u00dcbersicht anzeigen",
187187
"Install": "Installieren",
@@ -243,9 +243,9 @@
243243
"Could not import terms": "Could not import terms",
244244
"Definition": "Definition",
245245
"Install step 1": "Install step 1",
246-
"Step 1 - Installation Language": "Step 1 - Installation Language",
246+
"Step 1 - Installation Language": "Schritt 1 - Installationssprache",
247247
"Next": "Weiter",
248-
"Please select installation language": "Please select installation language",
248+
"Please select installation language": "Bitte w\u00e4hlen Sie die Installationssprache",
249249
"Server requirements": "Voraussetzungen des Servers",
250250
"Server requirements information": "Server requirements information",
251251
"PHP version ": "PHP version ",
@@ -263,15 +263,15 @@
263263
"Previous": "Zur\u00fcck",
264264
"Upgrade Chamilo LMS version": "Chamilo LMS-Version aktualisieren",
265265
"For more details {0}": "For more details {0}",
266-
"Step 2 - Requirements": "Step 2 - Requirements",
267-
"read the installation guide": "read the installation guide",
266+
"Step 2 - Requirements": "Schritt 2 - Anforderungen",
267+
"read the installation guide": "lesen Sie die Installationsanleitung",
268268
"Warning!": "Warning!",
269269
"Contact information": "Kontakt-Informationen",
270270
"Select one": "Eins ausw\u00e4hlen",
271271
"Send information": "senden",
272272
"You must accept the licence": "Sie m\u00fcssen die Lizenz akzeptieren",
273273
"Contact information has been sent": "Kontakt-Informationen wurden versendet",
274-
"Step 3 - License": "Step 3 - License",
274+
"Step 3 - License": "Schritt 3 - Lizenz",
275275
"Printable version": "Druckversion",
276276
"I accept": "Ich akzeptiere",
277277
"CC website": "CC website",
@@ -285,8 +285,8 @@
285285
"Preferred contact language": "Bevorzugte Kontakt-Sprache",
286286
"Do you have the power to take financial decisions on behalf of your company?": "K\u00f6nnen Sie finanzielle Entscheidungen innerhalb Ihrer Firma / Organisation f\u00e4llen?",
287287
"Check database connection": "Verbindung zur Datenbank pr\u00fcfen",
288-
"Step 4 - Database settings": "Step 4 - Database settings",
289-
"Database host": "Database host",
288+
"Step 4 - Database settings": "Schritt 4 - Datenbankeinstellungen",
289+
"Database host": "Datenbankhost",
290290
"Port": "Port",
291291
"Database login": "Database login",
292292
"Database password": "Database password",
@@ -324,7 +324,7 @@
324324
"Here are the values you entered": "Hier sind die Werte, die eingetragen wurden",
325325
"Main language": "Haupt-Sprache",
326326
"Database": "Datenbank",
327-
"Database Host": "Datenbank-Server",
327+
"Database Host": "Datenbankhost",
328328
"Database Login": "DB Username",
329329
"Database Password": "DB Passwort",
330330
"Step 7 - Installation process execution": "Step 7 - Installation process execution",
@@ -557,7 +557,7 @@
557557
"A database with the same name <b>already exists</b>.": "Eine Datenbank mit dem gleichen Namen <b>existiert bereits</b>!",
558558
"To protect your site, make the whole %s directory read-only (chmod -R 0555 on Linux) and delete the %s directory.": "Um Ihre Installation zu sch\u00fctzen, setzen Sie das Verzeichnis {0} auf nur-lesen (oder chmod 0555 auf Linux-basierenden Systemen). Anschlie\u00dfend bitte das Verzeichnis {1} l\u00f6schen.",
559559
"Cannot find your language in the list? Contact us at info@chamilo.org to contribute as a translator.": "Ihre Sprache nicht in der Liste gefunden? Bewerben Sie sich unter info@chamilo.org als \u00dcbersetzer.",
560-
"Please read the following requirements thoroughly.": "Bitte sorgf\u00e4ltig lesen",
560+
"Please read the following requirements thoroughly.": "Please read the following requirements thoroughly.",
561561
"Recommended settings for your server configuration. These settings are set in the php.ini configuration file on your server.": "Empfohlene Einstellungen f\u00fcr die Konfiguration Ihres Servers. Diese Einstellungen werden in der php.ini Datei auf Ihrem Server vorgenommen.",
562562
"Some directories and the files they include must be writable by the web server in order for Chamilo to run (user uploaded files, homepage html files, ...). This might imply a manual change on your server (outside of this interface)": "Some directories and the files they include must be writable by the web server in order for Chamilo to run (user uploaded files, homepage html files, ...). This might imply a manual change on your server (outside of this interface)",
563563
"Chamilo is free software distributed under the GNU General Public licence (GPL).": "Chamilo ist freie Software, die unter der GNU General Public Licence angeboten wird.",

assets/locales/el.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -531,6 +531,7 @@
531531
"A database with the same name <b>already exists</b>.": "A database with the same name <b>already exists</b>.",
532532
"To protect your site, make the whole %s directory read-only (chmod -R 0555 on Linux) and delete the %s directory.": "To protect your site, make the whole {0} directory read-only (chmod 0555 on Linux) and delete the {1} directory.",
533533
"Cannot find your language in the list? Contact us at info@chamilo.org to contribute as a translator.": "\u0394\u03b5\u03bd \u03bc\u03c0\u03bf\u03c1\u03b5\u03af\u03c4\u03b5 \u03bd\u03b1 \u03b2\u03c1\u03b5\u03af\u03c4\u03b5 \u03c4\u03b7 \u03b3\u03bb\u03ce\u03c3\u03c3\u03b1 \u03c3\u03b1\u03c2 \u03c3\u03c4\u03b7 \u03bb\u03af\u03c3\u03c4\u03b1; \u0395\u03c0\u03b9\u03ba\u03bf\u03b9\u03bd\u03c9\u03bd\u03ae\u03c3\u03c4\u03b5 \u03bc\u03b1\u03b6\u03af \u03bc\u03b1\u03c2 \u03c3\u03c4\u03bf info@chamilo.org \u03b3\u03b9\u03b1 \u03bd\u03b1 \u03c3\u03c5\u03bc\u03b2\u03ac\u03bb\u03bb\u03bf\u03c5\u03bc\u03b5 \u03c9\u03c2 \u03bc\u03b5\u03c4\u03b1\u03c6\u03c1\u03b1\u03c3\u03c4\u03ad\u03c2.",
534+
"Please read the following requirements thoroughly.": "Please read the following requirements thoroughly.",
534535
"Recommended settings for your server configuration. These settings are set in the php.ini configuration file on your server.": "Recommended settings for your server configuration. These settings are set in the php.ini configuration file on your server.",
535536
"Some directories and the files they include must be writable by the web server in order for Chamilo to run (user uploaded files, homepage html files, ...). This might imply a manual change on your server (outside of this interface)": "Some directories and the files they include must be writable by the web server in order for Chamilo to run (user uploaded files, homepage html files, ...). This might imply a manual change on your server (outside of this interface)",
536537
"Chamilo is free software distributed under the GNU General Public licence (GPL).": "Chamilo is free software distributed under the GNU General Public licence (GPL).",

assets/locales/en.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -557,7 +557,7 @@
557557
"A database with the same name <b>already exists<\/b>.": "A database with the same name <b>already exists<\/b>.",
558558
"To protect your site, make the whole %s directory read-only (chmod -R 0555 on Linux) and delete the %s directory.": "To protect your site, make the whole {0} directory read-only (chmod -R 0555 on Linux) and delete the {1} directory.",
559559
"Cannot find your language in the list? Contact us at info@chamilo.org to contribute as a translator.": "Cannot find your language in the list? Contact us at info@chamilo.org to contribute as a translator.",
560-
"Please read the following requirements thoroughly.": "",
560+
"Please read the following requirements thoroughly.": "Please read the following requirements thoroughly.",
561561
"Recommended settings for your server configuration. These settings are set in the php.ini configuration file on your server.": "Recommended settings for your server configuration. These settings are set in the php.ini configuration file on your server.",
562562
"Some directories and the files they include must be writable by the web server in order for Chamilo to run (user uploaded files, homepage html files, ...). This might imply a manual change on your server (outside of this interface)": "Some directories and the files they include must be writable by the web server in order for Chamilo to run (user uploaded files, homepage html files, ...). This might imply a manual change on your server (outside of this interface)",
563563
"Chamilo is free software distributed under the GNU General Public licence (GPL).": "Chamilo is free software distributed under the GNU General Public licence (GPL).",

assets/locales/es.json

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"Survey": "Encuesta",
1818
"Surveys": "Encuestas",
1919
"Tracking": "Tracking",
20-
"Course maintenance": "Course maintenance",
20+
"Course maintenance": "Mantenimiento del curso",
2121
"Course setting": "Course setting",
2222
"Sign in": "Ingresar",
2323
"My courses": "Mis cursos",
@@ -177,11 +177,11 @@
177177
"Your browser does not support Javascript": "Su navegador no soporta el JavaScript",
178178
"Email reply header": "El {0}, {1} ({2}) escribi\u00f3:",
179179
"My files": "Mis archivos",
180-
"Read the installation guide": "Leer la gu\u00eda de instalaci\u00f3n",
180+
"Read the installation guide": "consulte la gu\u00eda de instalaci\u00f3n",
181181
"Installation language": "Idioma de instalaci\u00f3n",
182182
"Requirements": "Requerido",
183183
"License": "Licencia",
184-
"Database settings": "Database settings",
184+
"Database settings": "Configuraci\u00f3n de la base de datos",
185185
"Config settings": "Par\u00e1metros de configuraci\u00f3n",
186186
"Show Overview": "Sumario de la instalaci\u00f3n",
187187
"Install": "Instalar",
@@ -243,9 +243,9 @@
243243
"Could not import terms": "Could not import terms",
244244
"Definition": "Definition",
245245
"Install step 1": "Install step 1",
246-
"Step 1 - Installation Language": "Step 1 - Installation Language",
246+
"Step 1 - Installation Language": "Paso 1 - Idioma de instalaci\u00f3n",
247247
"Next": "Siguiente",
248-
"Please select installation language": "Please select installation language",
248+
"Please select installation language": "Por favor, seleccione el idioma de instalaci\u00f3n",
249249
"Server requirements": "Requisitos del servidor",
250250
"Server requirements information": "Server requirements information",
251251
"PHP version ": "PHP version ",
@@ -263,15 +263,15 @@
263263
"Previous": "Anterior",
264264
"Upgrade Chamilo LMS version": "Actualizar la versi\u00f3n de Chamilo LMS",
265265
"For more details {0}": "For more details {0}",
266-
"Step 2 - Requirements": "Step 2 - Requirements",
267-
"read the installation guide": "read the installation guide",
266+
"Step 2 - Requirements": "Paso 2 - Requisitos",
267+
"read the installation guide": "consulte la gu\u00eda de instalaci\u00f3n",
268268
"Warning!": "Warning!",
269269
"Contact information": "Informaci\u00f3n del contacto",
270270
"Select one": "Seleccione uno",
271271
"Send information": "Enviar la informaci\u00f3n",
272272
"You must accept the licence": "Debe aceptar la licencia para poder usar este software",
273273
"Contact information has been sent": "Informaci\u00f3n de contacto enviada",
274-
"Step 3 - License": "Step 3 - License",
274+
"Step 3 - License": "Paso 3 - Licencia",
275275
"Printable version": "Versi\u00f3n para imprimir",
276276
"I accept": "Acepto",
277277
"CC website": "CC website",
@@ -285,8 +285,8 @@
285285
"Preferred contact language": "\u00bfQu\u00e9 idioma de contacto prefiere?",
286286
"Do you have the power to take financial decisions on behalf of your company?": "\u00bfTiene la capacidad de tomar decisiones financieras?",
287287
"Check database connection": "Comprobar la conexi\u00f3n con la base de datos",
288-
"Step 4 - Database settings": "Step 4 - Database settings",
289-
"Database host": "Database host",
288+
"Step 4 - Database settings": "Paso 4 - Configuraci\u00f3n de la base de datos",
289+
"Database host": "Host de la base de datos",
290290
"Port": "Puerto",
291291
"Database login": "Database login",
292292
"Database password": "Database password",
@@ -314,7 +314,7 @@
314314
"Your company short name": "Acr\u00f3nimo de la organizaci\u00f3n",
315315
"URL of this company": "URL de la organizaci\u00f3n",
316316
"Encryption method": "M\u00e9todo de encriptaci\u00f3n",
317-
"None": "None",
317+
"None": "Ninguno/a",
318318
"Allow self-registration": "Permitir que los propios usuarios puedan registrarse",
319319
"After approval": "Despu\u00e9s de ser aprobado",
320320
"Allow self-registration as a trainer": "Permitir que los propios usuarios puedan registrarse como creadores de cursos",
@@ -324,7 +324,7 @@
324324
"Here are the values you entered": "\u00c9stos son los valores que ha introducido",
325325
"Main language": "Idioma principal",
326326
"Database": "Base de datos",
327-
"Database Host": "Servidor de base de datos",
327+
"Database Host": "Host de la base de datos",
328328
"Database Login": "Nombre de usuario de la base de datos",
329329
"Database Password": "Contrase\u00f1a de la base de datos",
330330
"Step 7 - Installation process execution": "Step 7 - Installation process execution",
@@ -402,21 +402,21 @@
402402
"Pick success color": "Pick success color",
403403
"Pick success color gradient": "Pick success color gradient",
404404
"Pick danger color": "Pick danger color",
405-
"You can see examples of how chamilo will look here": "You can see examples of how chamilo will look here",
406-
"Buttons": "Buttons",
405+
"You can see examples of how chamilo will look here": "Puede ver ejemplos de c\u00f3mo se ver\u00e1 Chamilo aqu\u00ed",
406+
"Buttons": "Botones",
407407
"Button": "Button",
408408
"Disabled": "Desactivado",
409409
"Secondary": "Segundo",
410-
"Tertiary": "Tertiary",
410+
"Tertiary": "Terciario",
411411
"Success": "Calificaci\u00f3n",
412-
"Danger": "Danger",
412+
"Danger": "Peligro",
413413
"Menu on button pressed": "Menu on button pressed",
414-
"Checkbox and radio buttons": "Checkbox and radio buttons",
414+
"Checkbox and radio buttons": "Casilla de verificaci\u00f3n y botones de opci\u00f3n",
415415
"Checkbox 1": "Checkbox 1",
416416
"Checkbox 2": "Checkbox 2",
417417
"This is a text example": "This is a text example",
418-
"Show dialog": "Show dialog",
419-
"Dialog example": "Dialog example",
418+
"Show dialog": "Mostrar di\u00e1logo",
419+
"Dialog example": "Ejemplo de di\u00e1logo",
420420
"Item 1": "Item 1",
421421
"Item 2": "Item 2",
422422
"Item 3": "Item 3",
@@ -449,9 +449,9 @@
449449
"Are you sure you want to delete this event?": "Are you sure you want to delete this event?",
450450
"Edit introduction": "Edit introduction",
451451
"Show all": "Mostrar todos",
452-
"Hide all": "Hide all",
453-
"Sort": "Sort",
454-
"Customize": "Customize",
452+
"Hide all": "Ocultar todo",
453+
"Sort": "Ordenar",
454+
"Customize": "Personalizar",
455455
"Updated": "\u00daltima modificaci\u00f3n",
456456
"Create certificate": "Crear certificado",
457457
"New drawing": "New drawing",
@@ -549,15 +549,15 @@
549549
"Business card": "Tarjeta personal",
550550
"Teacher profile picture": "Teacher profile picture",
551551
"Picture": "Foto",
552-
"Sender profile picture": "Sender profile picture",
553-
"Receiver profile picture": "Receiver profile picture",
554-
"Carbon copy receiver profile picture": "Carbon copy receiver profile picture",
552+
"Sender profile picture": "Foto de perfil del remitente",
553+
"Receiver profile picture": "Foto de perfil del destinatario",
554+
"Carbon copy receiver profile picture": "Perfil del destinatario de copia carbonc\u00edlica",
555555
"Explore more courses": "Explorar m\u00e1s cursos",
556556
"In order to enable the automatic version checking you have to register your portal on chamilo.org. The information obtained by clicking this button is only for internal use and only aggregated data will be publicly available (total number of portals, total number of Chamilo course, total number of Chamilo users, ...) (see {0}). When registering you will also appear on the worldwide list ({1}). If you do not want to appear in this list you have to check the checkbox below. The registration is as easy as it can be: you only have to click this button:": "In order to enable the automatic version checking you have to register your portal on chamilo.org. The information obtained by clicking this button is only for internal use and only aggregated data will be publicly available (total number of portals, total number of Chamilo course, total number of Chamilo users, ...) (see {0}). When registering you will also appear on the worldwide list ({1}). If you do not want to appear in this list you have to check the checkbox below. The registration is as easy as it can be: you only have to click this button:",
557557
"A database with the same name <b>already exists</b>.": "Una base de datos con el mismo nombre <b>ya existe</b>. El contenido de la base de datos se perder\u00e1.",
558558
"To protect your site, make the whole %s directory read-only (chmod -R 0555 on Linux) and delete the %s directory.": "Para proteger su instalaci\u00f3n, ponga la carpeta {0} en solo lectura (chmod -R 0555 bajo Linux) y borre completamente la carpeta {1}.",
559559
"Cannot find your language in the list? Contact us at info@chamilo.org to contribute as a translator.": "\u00bfAlgun idioma no se encuentra en la lista? Aceptamos contribuciones de nuevas traducciones! Contactar info@chamilo.org",
560-
"Please read the following requirements thoroughly.": "Lea con atenci\u00f3n",
560+
"Please read the following requirements thoroughly.": "Please read the following requirements thoroughly.",
561561
"Recommended settings for your server configuration. These settings are set in the php.ini configuration file on your server.": "Par\u00e1metros recomendados para la configuraci\u00f3n de su servidor. Estos par\u00e1metros deben establecerse en el fichero de configuraci\u00f3n php.ini de su servidor.",
562562
"Some directories and the files they include must be writable by the web server in order for Chamilo to run (user uploaded files, homepage html files, ...). This might imply a manual change on your server (outside of this interface)": "Some directories and the files they include must be writable by the web server in order for Chamilo to run (user uploaded files, homepage html files, ...). This might imply a manual change on your server (outside of this interface)",
563563
"Chamilo is free software distributed under the GNU General Public licence (GPL).": "Chamilo es software libre distribuido bajo GNU General Public licence (GPL)",

0 commit comments

Comments
 (0)