Skip to content

Commit

Permalink
Merge pull request pencilblue#692 from pencilblue/trademark-logo
Browse files Browse the repository at this point in the history
TM logo and changed 'pencilblue' to 'PencilBlue'
  • Loading branch information
brianhyder committed Jul 19, 2015

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
2 parents b4de91c + 95f0be8 commit bfab3f3
Showing 8 changed files with 42 additions and 34 deletions.
Binary file modified public/img/logo_menu.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/img/pb_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
56 changes: 32 additions & 24 deletions public/img/pb_logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions public/localization/de-DE.js
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@
module.exports = {
generic: {
LOCALE_DISPLAY: 'Deutsch (Deutschland)',
PENCILBLUE: 'pencilblue',
PENCILBLUE: 'PencilBlue',
ALL_RIGHTS: 'All rights reserved',
NONE: 'keine',
LEFT: 'linksbündig',
@@ -205,7 +205,7 @@ module.exports = {
ADMIN_LOGIN: 'Autoren, Redakteure und Administratoren Anmeldung.',
USERNAME_OR_EMAIL: 'Benutzername oder E-Mail Adresse.',
INVALID_LOGIN: 'Diese Kombination von Benutzername und Passwort ist ungültig.',
READY_TO_USE: 'Ihre pencilblue Installation kann nun benutzt werden.',
READY_TO_USE: 'Ihre PencilBlue Installation kann nun benutzt werden.',
ACCOUNT_CREATED: 'Ihr Konto wurde erfolgreich angelegt; Sie können sich nun anmelden.',
FORGOT_PASSWORD: 'Ich habe mein Passwort vergessen'
},
4 changes: 2 additions & 2 deletions public/localization/en-US.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module.exports = {
generic: {
LOCALE_DISPLAY: 'English (United States)',
PENCILBLUE: 'pencilblue',
PENCILBLUE: 'PencilBlue',
ALL_RIGHTS: 'All rights reserved',
NONE: 'None',
LEFT: 'Left',
@@ -195,7 +195,7 @@ module.exports = {
ADMIN_LOGIN: 'Writer, editor, and administrator login',
USERNAME_OR_EMAIL: 'Username or email address',
INVALID_LOGIN: 'Invalid username and password combination',
READY_TO_USE: 'Your pencilblue installation is ready to use',
READY_TO_USE: 'Your PencilBlue installation is ready to use',
ACCOUNT_CREATED: 'Your account was successfully created, you may now login',
FORGOT_PASSWORD: 'I forgot my password'
},
4 changes: 2 additions & 2 deletions public/localization/es-ES.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module.exports = {
generic: {
LOCALE_DISPLAY: 'Español (España)',
PENCILBLUE: 'pencilblue',
PENCILBLUE: 'PencilBlue',
ALL_RIGHTS: 'Todos los derechos reservados',
NONE: 'Ninguno',
LEFT: 'Izquierda',
@@ -195,7 +195,7 @@ module.exports = {
ADMIN_LOGIN: 'Login de escritor, editor, administrador',
USERNAME_OR_EMAIL: 'Nombre de usuario o dirección de correo',
INVALID_LOGIN: 'Combinación nombre de usuario y contraseña incorrecta',
READY_TO_USE: 'La instalación de pencilblue está lista para ser usada',
READY_TO_USE: 'La instalación de PencilBlue está lista para ser usada',
ACCOUNT_CREATED: 'Se ha creado tu cuenta exitosamente, ya puedes ingresar'
},
admin: {
4 changes: 2 additions & 2 deletions public/localization/pl-PL.js
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@
module.exports = {
generic: {
LOCALE_DISPLAY: 'Polski (Polska)',
PENCILBLUE: 'pencilblue',
PENCILBLUE: 'PencilBlue',
ALL_RIGHTS: 'Wszystkie prawa zastrzeżone',
NONE: 'Nic',
LEFT: 'Lewo',
@@ -199,7 +199,7 @@ module.exports = {
ADMIN_LOGIN: 'Logowanie: pisarz, redaktor, administrator',
USERNAME_OR_EMAIL: 'Nazwa użytkownika lub adres email',
INVALID_LOGIN: 'Nieprawidłowa kombinacja loginu i hasła',
READY_TO_USE: 'Zainstalowany pencilblue jest gotowy do użycia',
READY_TO_USE: 'Zainstalowany PencilBlue jest gotowy do użycia',
ACCOUNT_CREATED: 'Twoje konto zostało pomyślenie utworzone. Możesz się teraz zalogować'
},
admin: {
4 changes: 2 additions & 2 deletions public/localization/ro-RO.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module.exports = {
generic: {
LOCALE_DISPLAY: 'Român (România)',
PENCILBLUE: 'pencilblue',
PENCILBLUE: 'PencilBlue',
ALL_RIGHTS: 'Toate drepturile rezervate',
NONE: 'Niciunul',
LEFT: 'Stanga',
@@ -190,7 +190,7 @@ module.exports = {
ADMIN_LOGIN: 'Login scriitor, editor si administrator',
USERNAME_OR_EMAIL: 'Nume utilizator si adresa de email',
INVALID_LOGIN: 'Combinatie nume de utilizator si parola gresita',
READY_TO_USE: 'Aplicatia ta pencilblue este gata pentru a fi folosita',
READY_TO_USE: 'Aplicatia ta PencilBlue este gata pentru a fi folosita',
ACCOUNT_CREATED: 'Contul tau a fost creat cu succes, acum te poti loga'
},
admin: {

0 comments on commit bfab3f3

Please sign in to comment.