diff --git a/.gitignore b/.gitignore
index b976e51694..dd60794371 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@
/bin/
/composer.phar
/jackrabbit
+/app/Resources/config/phpcr.yml
# IDEs
.idea/*
@@ -18,3 +19,12 @@
# System files
.DS_Store
+
+
+# webspaces
+/app/Resources/webspaces/*
+!/app/Resources/webspaces/*.dist
+
+# templates
+/app/Resources/templates/*
+!/app/Resources/templates/*.dist
diff --git a/.travis.yml b/.travis.yml
index 6f1293e8d7..97992f63bb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,8 @@ language: php
php:
- 5.4
+ - 5.5
+ - hhvm
env:
global:
@@ -9,12 +11,18 @@ env:
- secure: "UmFds85SDbGAGgayw75iXegyElb68BVjT+rwwaUDtokreSgUytnj6+puFcomYtE5SiHmhZbcDZs2f4jBh0GlmDCULBIsj2i3B+qUdt0S3k6yNUhqEM6FoEmrFeiD0hK3PUW267LJEhZjgQfjkAhRGoF6RpLQFrvZFi9ldbS207c="
- SAUCE_CONNECT_READY_FILE=/tmp/sauce-connect-ready
- LOGS_DIR=/tmp/sulu/logs
+ - DB=mysql
before_script:
- mkdir -p $LOGS_DIR
+ - cp app/Resources/config/phpcr_doctrine_dbal.yml.dist app/Resources/config/phpcr.yml
+ - cp app/Resources/templates/default.xml.dist app/Resources/templates/default.xml
+ - cp app/Resources/templates/overview.xml.dist app/Resources/templates/overview.xml
+ - cp app/Resources/webspaces/sulu.io.xml.dist app/Resources/webspaces/sulu.io.xml
- ./tests/sauce/connect_setup.sh
- composer self-update
- - composer install --prefer-dist --no-interaction
+ - composer update --prefer-dist --no-interaction
+ - cp app/Resources/webspaces/sulu.io.xml.dist app/Resources/webspaces/sulu.io.xml
- php app/console doctrine:database:create
- php app/console doctrine:schema:create
- php app/console doctrine:fixtures:load --no-interaction
@@ -24,5 +32,12 @@ before_script:
script: bin/paratest -p 2 -f
+notifications:
+ irc: "irc.freenode.org#sulu-cmf"
+
+matrix:
+ allow_failures:
+ - php: hhvm
+
after_script:
- ./tests/travis_print_logs.sh
diff --git a/README.md b/README.md
index 01e2c12962..bcb595eb04 100644
--- a/README.md
+++ b/README.md
@@ -49,6 +49,9 @@ cd sulu-standard
git checkout develop
```
+##### Setup PHPCR Session
+Copy the one of the files app/Resources/config/{phpcr_doctrine_dbal.yml.dist} or {phpcr_jackrabbit.yml.dist} to app/Resources/config/phpcr.yml. The config is based on [symfony-cmf sandbox](https://github.com/symfony-cmf/cmf-sandbox). Adjustments to the file contents are optionally.
+
#### Install all the dependencies with composer
```
@@ -99,6 +102,26 @@ wget http://archive.apache.org/dist/jackrabbit/2.6.3/jackrabbit-standalone-2.6.3
java -jar jackrabbit-standalone-2.6.3.jar
```
+#### Create required configuration files
+Before you go on with the initialization of the content repository, you have to make sure that all required configuration files exist.
+
+##### Webspaces
+Webspaces are configured in the `app/Resources/webspaces`-folder. Copying the existing example should be enough for a local installation:
+```
+cp app/Resources/webspaces/sulu.io.xml.dist app/Resources/webspaces/sulu.io.xml
+```
+On an online installation you have to adjust the URLs in this file.
+
+##### Templates
+Templates are configured in the `app/Resources/templates`-folder. Copying the existing default template should be enough for a simple page containing a title, a link and a texteditor:
+
+```
+cp app/Resources/templates/default.xml.dist app/Resources/templates/default.xml
+cp app/Resources/templates/overview.xml.dist app/Resources/templates/overview.xml
+cp app/Resources/templates/complex.xml.dist app/Resources/templates/complex.xml
+```
+You can add more templates by simply adding more files in this folder. Use the `default.xml.dist`-file as an example.
+
#### Init Content Repository
```
@@ -118,6 +141,7 @@ app/console sulu:security:user:create
```
Follow the instruction to create a new user
+
## What's inside?
- [admin-bundle](https://github.com/sulu-cmf/SuluAdminBundle)
diff --git a/app/Resources/config/parameters.yml.dist b/app/Resources/config/parameters.yml.dist
index 8f5c2c4442..2e78e75c17 100644
--- a/app/Resources/config/parameters.yml.dist
+++ b/app/Resources/config/parameters.yml.dist
@@ -6,10 +6,6 @@ parameters:
database_user: root
database_password: ~
- phpcr_url: http://localhost:8080/server
- phpcr_username: admin
- phpcr_password: admin
-
mailer_transport: smtp
mailer_host: 127.0.0.1
mailer_user: ~
@@ -17,4 +13,7 @@ parameters:
locale: en
secret: ThisTokenIsNotSoSecretChangeIt
- sulu_admin.name: SULU 2.0
+ sulu_admin.name: SULU 2
+
+ content_fallback_intervall: 5000
+ content_preview_port: 9876
diff --git a/app/Resources/config/phpcr_doctrine_dbal.yml.dist b/app/Resources/config/phpcr_doctrine_dbal.yml.dist
new file mode 100644
index 0000000000..a87b4d30e8
--- /dev/null
+++ b/app/Resources/config/phpcr_doctrine_dbal.yml.dist
@@ -0,0 +1,6 @@
+parameters:
+ phpcr_backend:
+ type: doctrinedbal
+ phpcr_workspace: default
+ phpcr_user: admin
+ phpcr_pass: admin
diff --git a/app/Resources/config/phpcr_jackrabbit.yml.dist b/app/Resources/config/phpcr_jackrabbit.yml.dist
new file mode 100644
index 0000000000..1f40783bb8
--- /dev/null
+++ b/app/Resources/config/phpcr_jackrabbit.yml.dist
@@ -0,0 +1,7 @@
+parameters:
+ phpcr_backend:
+ type: jackrabbit
+ url: http://localhost:8080/server/
+ phpcr_workspace: default
+ phpcr_user: admin
+ phpcr_pass: admin
diff --git a/app/Resources/public/js/translations/sulu.de.json b/app/Resources/public/js/translations/sulu.de.json
index ada7ae70c8..8ab557bcda 100644
--- a/app/Resources/public/js/translations/sulu.de.json
+++ b/app/Resources/public/js/translations/sulu.de.json
@@ -1 +1 @@
-{"public.name":"Name","public.edit":"Editieren","header.add":"Hinzuf\u00fcgen","header.save":"Speichern","header.saved":"Gespeichert","header.delete":"L\u00f6schen","navigation.list":"Zur\u00fcck zur Liste","translate.package.title":"Paket","translate.package.catalogues":"Sprachen Kataloge","translate.package.settings.locale":"Region","translate.package.settings.addCatalogue":"Region hinzuf\u00fcgen","translate.package.details.key":"Code","translate.package.details.translation":"\u00dcbersetzung","translate.package.details.suggestion":"Vorschlag","translate.package.details.maxLength":"Maximale L\u00e4nge","translate.package.details.length":"L\u00e4nge","translate.package.details.frontend":"Frontend","translate.package.details.backend":"Backend","translate.package.details.addElement":"Element Hinzuf\u00fcgen","public.delete":"L\u00f6schen","translate.package.settings.title":"Titel","contact.contacts.title":"Kontakt","contact.contacts.contactTitle":"Titel","contact.contacts.firstName":"Vorname","contact.contacts.lastName":"Nachname","contact.contacts.position":"Position","contact.contacts.company":"Unternehmen","contact.form.addEmail":"E-Mail hinzuf\u00fcgen","contact.form.addPhone":"Telefon hinzuf\u00fcgen","contact.form.addAddress":"Addresse hinzuf\u00fcgen","contact.address.street":"Stra\u00dfe","contact.address.number":"Nummer","contact.address.additional":"Haus, Stock, etc.","contact.address.zip":"Postleitzahl","contact.address.city":"Stadt","contact.address.state":"Region","contact.address.country":"Land","public.email":"E-Mail","public.phone":"Telefon","public.address":"Adresse","email.home":"Privat","email.work":"Gesch\u00e4ftlich","phone.home":"Privat","phone.work":"Gesch\u00e4ftlich","address.home":"Privat","address.work":"Gesch\u00e4ftlich","country.austria":"\u00d6sterreich","country.germany":"Deutschland","contact.accounts.title":"Organisation","contact.accounts.name":"Name","contact.accounts.website":"Internetseite","contact.accounts.company":"\u00dcbergeordnetes Unternehmen","security.roles.title":"Rollen & Berechtigungen","security.roles.name":"Titel","security.roles.system":"System","security.roles.godMode":"Gott Modus","security.roles.godModeDescription":"Das ist der Gott Modus","security.roles.section":"Sektion","security.roles.permissions":"Berechtigungen","security.roles.all":"Alle","security.roles.none":"Keine","security.permission.title":"Benutzername & Passwort","security.permission.username":"Benutzername","security.permission.password":"Passwort","security.permission.passwordRepeat":"Passwort wiederholen","security.permission.email":"Prim\u00e4re E-Mail-Adresse","security.permission.titlePermissions":"Sulu Berechtigungen","security.permission.role.title":"Titel","security.permission.role.language":"Sprache","security.permission.role.permissions":"Berechtigungen","security.permission.role.chooseLanguage":"Sprache ausw\u00e4hlen","security.permission.role.allLanguages":"Alle ausgew\u00e4hlt","sulu.edit-toolbar.delete":"L\u00f6schen","sulu.list-toolbar.import":"Importieren","sulu.list-toolbar.export":"Exportieren","content.contents.title":"Inhalte","navigation.tools":"Werkzeuge","navigation.settings":"Einstellungen","navigation.settings.roles":"Rollen & Berechtigungen","navigation.settings.translate":"\u00dcbersetzungen","navigation.contacts":"Kontakte","navigation.contacts.people":"Kontakt","navigation.contacts.companies":"Organisation","navigation.webspaces":"Web-Spaces","navigation.webspaces.pages":"Seiten","content-navigation.security.permissions":"Berechtigungen","content-navigation.security.details":"Details","content-navigation.contacts.details":"Details","content-navigation.contents.details":"Details","public.search":"Suchen ...","navigation.hide":"Verstecken","navigation.show":"Anzeigen","security.permission.locale":"Sprache","pagination.page":"Seite","pagination.of":"von","pagination.showAll":"Alle anzeigen","pagination.elements":"Elemente","navigation.settings.tags":"Tags","sulu.edit-toolbar.new-window":"Vorschau in neuem Fenster","public.id":"ID","list-toolbar.column-options":"Spalten Optionen","tags.name":"Bezeichnung","tags.author":"Author","tags.changed":"Zuletzt ge\u00e4ndert","sulu.edit-toolbar.split-screen":"Geteilte Ansicht","public.changed":"Zuletzt ge\u00e4ndert","public.created":"Erstellt am","contact.contacts.birthday":"Geburtstag","contact.contacts.middleName":"Zwischenname","public.title":"Titel","smart-content.nocontent-found":"Keinen Inhalt gefunden","smart-content.nocontent-selected":"Nichts ausgew\u00e4hlt","smart-content.visible":"sichtbar","smart-content.of":"von","smart-content.configure-smart-content":"Smart-content konfigurieren","smart-content.data-source":"Datenquelle","smart-content.include-sub-folders":"Unterordner inkludieren","smart-content.filter-by-category":"Nach Kategorie filtern","smart-content.filter-by-tags":"Nach Tags filtern","smart-content.sort-by":"Sortieren nach","smart-content.no-sorting":"Keine Sortierung","smart-content.ascending":"Aufsteigend","smart-content.descending":"Absteigend","smart-content.present-as":"Darstellen als","smart-content.limit-result-to":"Ergebnis limitieren auf","smart-content.no-category":"Keine Kategorie","smart-content.choose-present-as":"ausw\u00e4hlen..","smart-content.choose-data-source":"ausw\u00e4hlen..","smart-content.from":"Von","smart-content.sub-folders-inclusive":"inkl. Unterordner","smart-content.view-all":"alle ansehen","smart-content.view-less":"weniger ansehen","tag.tags.title":"Tags","edit-toolbar.state-publish":"Ver\u00f6ffentlichen","edit-toolbar.state-unpublish":"Verstecken","edit-toolbar.state-test":"Test","template.default":"Standard","template.simple":"Einfach","template.overview":"\u00dcberblick","content.template.dialog.titile":"Template \u00e4ndern","content.template.dialog.content":"Es gibt ver\u00e4nderte Daten.Die Seite trotzdem verlassen?","content.template.dialog.submit-button":"Ja","content.template.dialog.cancel-button":"Abbrechen","public.published":"Ver\u00f6ffentlicht","labels.state-changed.success-desc":"Status ge\u00e4ndert","labels.state-changed.success":"Erfolg","labels.state-changed.error-desc":"Status konnte nicht ge\u00e4ndert werden","labels.state-changed.error":"Fehler","content.delete.dialog.title":"Knoten l\u00f6schen","content.delete.dialog.content":"Soll der ausgew\u00e4hlte Knoten wirklich gel\u00f6scht werden?","content.delete.dialog.cancel":"Lieber nicht","content.delete.dialog.submit":"Passt"}
\ No newline at end of file
+{"public.name":"Name","public.edit":"Editieren","header.add":"Hinzuf\u00fcgen","header.save":"Speichern","header.saved":"Gespeichert","header.delete":"L\u00f6schen","navigation.list":"Zur\u00fcck zur Liste","translate.package.title":"Paket","translate.package.catalogues":"Sprachen Kataloge","translate.package.settings.locale":"Region","translate.package.settings.addCatalogue":"Region hinzuf\u00fcgen","translate.package.details.key":"Code","translate.package.details.translation":"\u00dcbersetzung","translate.package.details.suggestion":"Vorschlag","translate.package.details.maxLength":"Maximale L\u00e4nge","translate.package.details.length":"L\u00e4nge","translate.package.details.frontend":"Frontend","translate.package.details.backend":"Backend","translate.package.details.addElement":"Element Hinzuf\u00fcgen","public.delete":"L\u00f6schen","translate.package.settings.title":"Titel","contact.contacts.title":"Kontakt","contact.contacts.contactTitle":"Titel","contact.contacts.firstName":"Vorname","contact.contacts.lastName":"Nachname","contact.contacts.position":"Position","contact.contacts.company":"Unternehmen","contact.form.addEmail":"E-Mail hinzuf\u00fcgen","contact.form.addPhone":"Telefon hinzuf\u00fcgen","contact.form.addAddress":"Addresse hinzuf\u00fcgen","contact.address.street":"Stra\u00dfe","contact.address.number":"Nummer","contact.address.additional":"Haus, Stock, etc.","contact.address.zip":"Postleitzahl","contact.address.city":"Stadt","contact.address.state":"Region","contact.address.country":"Land","public.email":"E-Mail","public.phone":"Telefon","public.address":"Adresse","email.home":"Privat","email.work":"Gesch\u00e4ftlich","phone.home":"Privat","phone.work":"Gesch\u00e4ftlich","phone.fax":"Fax","address.home":"Privat","address.work":"Gesch\u00e4ftlich","country.austria":"\u00d6sterreich","country.germany":"Deutschland","contact.accounts.title":"Organisation","contact.accounts.name":"Name","contact.accounts.website":"Internetseite","contact.accounts.company":"\u00dcbergeordnetes Unternehmen","security.roles.title":"Berechtigungen","security.roles.name":"Rollen Titel","security.roles.system":"System","security.roles.godMode":"Gott Modus","security.roles.godModeDescription":"Das ist der Gott Modus","security.roles.section":"Sektion","security.roles.permissions":"Berechtigungen","security.roles.all":"Alle ausw\u00e4hlen","security.roles.none":"Keine ausw\u00e4hlen","security.permission.title":"Benutzername & Passwort","security.permission.username":"Benutzername","security.permission.password":"Passwort","security.permission.passwordRepeat":"Passwort wiederholen","security.permission.email":"Prim\u00e4re email","security.permission.titlePermissions":"Berechtigungen","security.permission.role.title":"Titel","security.permission.role.language":"Sprache","security.permission.role.permissions":"Berechtigungen","security.permission.role.chooseLanguage":"Sprache ausw\u00e4hlen","security.permission.role.allLanguages":"Alle ausgew\u00e4hlt","sulu.edit-toolbar.delete":"L\u00f6schen","sulu.list-toolbar.import":"Importieren","sulu.list-toolbar.export":"Exportieren","content.contents.title":"Inhalte","navigation.tools":"Werkzeuge","navigation.settings":"Einstellungen","navigation.settings.roles":"Berechtigungen","navigation.settings.translate":"\u00dcbersetzungen","navigation.contacts":"Kontakte","navigation.contacts.people":"Kontakte","navigation.contacts.companies":"Organisationen","navigation.webspaces":"Web-Spaces","navigation.webspaces.pages":"Seiten","navigation.version-history":"Versionsverlauf","navigation.user":"Benutzer","content-navigation.security.permissions":"Berechtigungen","content-navigation.security.details":"Details","content-navigation.contacts.details":"Details","content-navigation.contents.content":"Inhalte","content-navigation.contents.settings":"Einstellungen","public.search":"Suchen ...","navigation.hide":"Verstecken","navigation.show":"Anzeigen","security.permission.locale":"Systemsprache","pagination.page":"Seite","pagination.of":"von","pagination.elements":"Elemente","pagination.show":"Zeige","pagination.elements-of":"Elemente von","pagination.elements-per-page":"Elemente pro Seite","pagination.show-all-elements":"Alle Elemente anzeigen","navigation.settings.tags":"Tags","sulu.edit-toolbar.new-window":"Vorschau in neuem Fenster","public.id":"ID","list-toolbar.column-options":"Spalten Optionen","tags.name":"Bezeichnung","tags.author":"Author","tags.changed":"Zuletzt ge\u00e4ndert","sulu.edit-toolbar.split-screen":"Geteilte Ansicht","public.changed":"Zuletzt ge\u00e4ndert","public.created":"Erstellt am","contact.contacts.birthday":"Geburtstag","contact.contacts.middleName":"Zwischenname","public.title":"Titel","smart-content.nocontent-found":"Keinen Inhalt gefunden","smart-content.nocontent-selected":"Nichts ausgew\u00e4hlt","smart-content.visible":"sichtbar","smart-content.of":"von","smart-content.configure-smart-content":"Smart-content konfigurieren","smart-content.data-source":"Datenquelle","smart-content.include-sub-folders":"Unterordner inkludieren","smart-content.filter-by-category":"Nach Kategorie filtern","smart-content.filter-by-tags":"Nach Tags filtern","smart-content.sort-by":"Sortieren nach","smart-content.no-sorting":"Keine Sortierung","smart-content.ascending":"Aufsteigend","smart-content.descending":"Absteigend","smart-content.present-as":"Darstellen als","smart-content.limit-result-to":"Ergebnis limitieren auf","smart-content.no-category":"Keine Kategorie","smart-content.choose-present-as":"ausw\u00e4hlen..","smart-content.choose-data-source":"ausw\u00e4hlen..","smart-content.from":"Von","smart-content.sub-folders-inclusive":"inkl. Unterordner","smart-content.view-all":"alle ansehen","smart-content.view-less":"weniger ansehen","tag.tags.title":"Tags","edit-toolbar.state-publish":"Ver\u00f6ffentlichen","edit-toolbar.state-unpublish":"Verstecken","edit-toolbar.state-test":"Test","template.default":"Standard","template.simple":"Einfach","template.overview":"\u00dcberblick","template.complex":"Komplex","content.template.dialog.titile":"Template \u00e4ndern","content.template.dialog.content":"Es gibt ver\u00e4nderte Daten.Die Seite trotzdem verlassen?","content.template.dialog.submit-button":"Ja","content.template.dialog.cancel-button":"Abbrechen","public.published":"Ver\u00f6ffentlicht","labels.state-changed.success-desc":"Status ge\u00e4ndert","labels.state-changed.success":"Erfolg","labels.state-changed.error-desc":"Status konnte nicht ge\u00e4ndert werden","labels.state-changed.error":"Fehler","sulu.matcher.unmatched-column":"Nicht zugeordnete Spalte","sulu.matcher.matched-column":"Zugeordnete Spalte","sulu.matcher.edit":"Bearbeiten","sulu.matcher.skip":"\u00dcberspringen","sulu.matcher.skipped":"\u00dcbersprungen","sulu.matcher.column":"Spalte","sulu.matcher.please-choose":"Bitte w\u00e4hlen..","navigation.pim":"PIM","navigation.pim.products":"Produkte","pim.products.title":"Produkte","products.key":"Schl\u00fcssel","products.contractual-article":"Vertraglicher Artikel","products.name":"Name","products.article-number":"Artikelnummer","products.manufacturer":"Hersteller","products.categories":"Kategorien","products.last-imported":"Zuletzt importiert","sulu.products.import":"Import","sulu.products.map-header":"Header zuordnen","sulu.products.map-header-desc":"Bitte Spalten der existierenden Datenstruktur zuordnen.","sulu.products.unmatched-columns":"Nicht zugeordnete Spalten","public.deactivate":"Deaktivieren","contact.account.type.basic":"Kontakt","contact.account.type.lead":"Interessent","contact.account.type.customer":"Kunde","contact.account.type.supplier":"Lieferant","contact.account.add-basic":"Neuen Account erstellen","contact.account.add-lead":"Neuen Interessenten erstellen","contact.account.add-customer":"Neuen Kunden erstellen","contact.account.add-supplier":"Neuen Lieferanten erstellen","contact.account.type":"Typ","content.delete.dialog.title":"Knoten l\u00f6schen","content.delete.dialog.content":"Soll der ausgew\u00e4hlte Knoten wirklich gel\u00f6scht werden?","content.delete.dialog.cancel":"Lieber nicht","content.delete.dialog.submit":"Passt","public.add-fields":"Neue Felder hinzuf\u00fcgen","public.edit-fields":"Felder editieren","public.fax":"Fax","public.url":"Website","public.note":"Notiz","public.all":"Alle","public.comments":"Kommentare","contact.add.address":"Adresse hinzuf\u00fcgen","dropdown.please-choose":"Bitte w\u00e4hlen..","navigation.webspaces.content":"Inhalte","navigation.webspaces.index-page":"Startseite","content.contents.show-ghost-pages":"Ghost- und Shadow- Seiten anzeigen","content.preview.resolutions":"Bildschirmauf\u00f6sungen","url.home":"Privat"}
\ No newline at end of file
diff --git a/app/Resources/public/js/translations/sulu.de.xlf b/app/Resources/public/js/translations/sulu.de.xlf
index 3dcbb8c61c..5683b77342 100644
--- a/app/Resources/public/js/translations/sulu.de.xlf
+++ b/app/Resources/public/js/translations/sulu.de.xlf
@@ -178,6 +178,10 @@
phone.work
Geschäftlich
+
+ phone.fax
+ Fax
+
address.home
Privat
@@ -212,11 +216,11 @@
security.roles.title
- Rollen & Berechtigungen
+ Berechtigungen
security.roles.name
- Titel
+ Rollen Titel
security.roles.system
@@ -240,11 +244,11 @@
security.roles.all
- Alle
+ Alle auswählen
security.roles.none
- Keine
+ Keine auswählen
security.permission.title
@@ -264,11 +268,11 @@
security.permission.email
- Primäre E-Mail-Adresse
+ Primäre email
security.permission.titlePermissions
- Sulu Berechtigungen
+ Berechtigungen
security.permission.role.title
@@ -316,7 +320,7 @@
navigation.settings.roles
- Rollen & Berechtigungen
+ Berechtigungen
navigation.settings.translate
@@ -328,11 +332,11 @@
navigation.contacts.people
- Kontakt
+ Kontakte
navigation.contacts.companies
- Organisation
+ Organisationen
navigation.webspaces
@@ -342,6 +346,14 @@
navigation.webspaces.pages
Seiten
+
+ navigation.version-history
+ Versionsverlauf
+
+
+ navigation.user
+ Benutzer
+
content-navigation.security.permissions
Berechtigungen
@@ -354,9 +366,13 @@
content-navigation.contacts.details
Details
-
- content-navigation.contents.details
- Details
+
+ content-navigation.contents.content
+ Inhalte
+
+
+ content-navigation.contents.settings
+ Einstellungen
public.search
@@ -372,7 +388,7 @@
security.permission.locale
- Sprache
+ Systemsprache
pagination.page
@@ -382,14 +398,26 @@
pagination.of
von
-
- pagination.showAll
- Alle anzeigen
-
pagination.elements
Elemente
+
+ pagination.show
+ Zeige
+
+
+ pagination.elements-of
+ Elemente von
+
+
+ pagination.elements-per-page
+ Elemente pro Seite
+
+
+ pagination.show-all-elements
+ Alle Elemente anzeigen
+
navigation.settings.tags
Tags
@@ -558,6 +586,10 @@
template.overview
Überblick
+
+ template.complex
+ Komplex
+
content.template.dialog.titile
Template ändern
@@ -594,6 +626,130 @@
labels.state-changed.error
Fehler
+
+ sulu.matcher.unmatched-column
+ Nicht zugeordnete Spalte
+
+
+ sulu.matcher.matched-column
+ Zugeordnete Spalte
+
+
+ sulu.matcher.edit
+ Bearbeiten
+
+
+ sulu.matcher.skip
+ Überspringen
+
+
+ sulu.matcher.skipped
+ Übersprungen
+
+
+ sulu.matcher.column
+ Spalte
+
+
+ sulu.matcher.please-choose
+ Bitte wählen..
+
+
+ navigation.pim
+ PIM
+
+
+ navigation.pim.products
+ Produkte
+
+
+ pim.products.title
+ Produkte
+
+
+ products.key
+ Schlüssel
+
+
+ products.contractual-article
+ Vertraglicher Artikel
+
+
+ products.name
+ Name
+
+
+ products.article-number
+ Artikelnummer
+
+
+ products.manufacturer
+ Hersteller
+
+
+ products.categories
+ Kategorien
+
+
+ products.last-imported
+ Zuletzt importiert
+
+
+ sulu.products.import
+ Import
+
+
+ sulu.products.map-header
+ Header zuordnen
+
+
+ sulu.products.map-header-desc
+ Bitte Spalten der existierenden Datenstruktur zuordnen.
+
+
+ sulu.products.unmatched-columns
+ Nicht zugeordnete Spalten
+
+
+ public.deactivate
+ Deaktivieren
+
+
+ contact.account.type.basic
+ Kontakt
+
+
+ contact.account.type.lead
+ Interessent
+
+
+ contact.account.type.customer
+ Kunde
+
+
+ contact.account.type.supplier
+ Lieferant
+
+
+ contact.account.add-basic
+ Neuen Account erstellen
+
+
+ contact.account.add-lead
+ Neuen Interessenten erstellen
+
+
+ contact.account.add-customer
+ Neuen Kunden erstellen
+
+
+ contact.account.add-supplier
+ Neuen Lieferanten erstellen
+
+
+ contact.account.type
+ Typ
+
content.delete.dialog.title
Knoten löschen
@@ -610,6 +766,62 @@
content.delete.dialog.submit
Passt
+
+ public.add-fields
+ Neue Felder hinzufügen
+
+
+ public.edit-fields
+ Felder editieren
+
+
+ public.fax
+ Fax
+
+
+ public.url
+ Website
+
+
+ public.notes
+ Notiz
+
+
+ public.all
+ Alle
+
+
+ public.comments
+ Kommentare
+
+
+ contact.add.address
+ Adresse hinzufügen
+
+
+ dropdown.please-choose
+ Bitte wählen..
+
+
+ navigation.webspaces.content
+ Inhalte
+
+
+ navigation.webspaces.index-page
+ Startseite
+
+
+ content.contents.show-ghost-pages
+ Ghost- und Shadow- Seiten anzeigen
+
+
+ content.preview.resolutions
+ Bildschirmaufösungen
+
+
+ url.home
+ Privat
+
diff --git a/app/Resources/public/js/translations/sulu.en.json b/app/Resources/public/js/translations/sulu.en.json
index c599675cc9..d3058905cf 100644
--- a/app/Resources/public/js/translations/sulu.en.json
+++ b/app/Resources/public/js/translations/sulu.en.json
@@ -1 +1 @@
-{"public.name":"Name","public.edit":"Edit","header.add":"Add","header.save":"Save","header.saved":"Saved","header.delete":"Delete","navigation.list":"Back to list","translate.package.title":"Package","translate.package.catalogues":"Language Catalogues","translate.package.settings.locale":"Locale","translate.package.settings.addCatalogue":"Add Catalogue","translate.package.details.key":"Key","translate.package.details.translation":"Translation","translate.package.details.suggestion":"Suggestion","translate.package.details.maxLength":"Maximum length","translate.package.details.length":"Length","translate.package.details.frontend":"Frontend","translate.package.details.backend":"Backend","translate.package.details.addElement":"Add element","public.delete":"Delete","translate.package.settings.title":"Title","contact.contacts.title":"Contact","contact.contacts.contactTitle":"Title","contact.contacts.firstName":"First Name","contact.contacts.lastName":"Last Name","contact.contacts.position":"Position","contact.contacts.company":"Company","contact.form.addEmail":"Add E-Mail","contact.form.addPhone":"Add Phone","contact.form.addAddress":"Add Address","contact.address.street":"Street","contact.address.number":"Number","contact.address.additional":"Additional","contact.address.zip":"Postal Code","contact.address.city":"City","contact.address.state":"Region","contact.address.country":"Country","public.email":"E-Mail","public.phone":"Phone","public.address":"Address","email.home":"Home","email.work":"Business","phone.home":"Home","phone.work":"Business","address.home":"Home","address.work":"Business","country.austria":"Austria","country.germany":"Germany","contact.accounts.title":"Account","contact.accounts.name":"Name","contact.accounts.website":"Website","contact.accounts.company":"Company","security.roles.title":"Roles and permissions","security.roles.name":"Title","security.roles.system":"System","security.roles.godMode":"God Mode","security.roles.godModeDescription":"Thats the god mode","security.roles.section":"Section","security.roles.permissions":"Permissions","security.roles.all":"All","security.roles.none":"None","security.permission.title":"Username and Password","security.permission.username":"Username","security.permission.password":"Password","security.permission.passwordRepeat":"Repeat password","security.permission.email":"Default E-Mail address","security.permission.titlePermissions":"Sulu permissions","security.permission.role.title":"Title","security.permission.role.language":"Language","security.permission.role.permissions":"Permissions","security.permission.role.chooseLanguage":"Choose language","security.permission.role.allLanguages":"all selected","sulu.edit-toolbar.delete":"Delete","sulu.list-toolbar.import":"Import","sulu.list-toolbar.export":"Export","content.contents.title":"Content","navigation.tools":"Tools","navigation.settings":"Settings","navigation.settings.roles":"Roles & Permissions","navigation.settings.translate":"Translate","navigation.contacts":"Contact","navigation.contacts.people":"Contact","navigation.contacts.companies":"Account","navigation.webspaces":"Web-Spaces","navigation.webspaces.pages":"Pages","content-navigation.security.permissions":"Permissions","content-navigation.security.details":"Details","content-navigation.contacts.details":"Details","content-navigation.contents.details":"Details","public.search":"Search ...","navigation.hide":"HIDE","navigation.show":"SHOW","security.permission.locale":"Language","pagination.page":"Page","pagination.of":"of","pagination.showAll":"show all","pagination.elements":"Elements","navigation.settings.tags":"Tags","sulu.edit-toolbar.new-window":"Preview in new window","public.id":"ID","list-toolbar.column-options":"Column options","tags.name":"Title","tags.author":"Author","tags.changed":"Last changed","sulu.edit-toolbar.split-screen":"Split view","public.changed":"Last changed","public.created":"Created on","contact.contacts.birthday":"Birthday","contact.contacts.middleName":"Middle Name","public.title":"Title","smart-content.nocontent-found":"No content found","smart-content.nocontent-selected":"No content selected","smart-content.visible":"visible","smart-content.of":"of","smart-content.configure-smart-content":"Configure smart content","smart-content.data-source":"Data source","smart-content.include-sub-folders":"Include Sub folders","smart-content.filter-by-category":"Filter by category","smart-content.filter-by-tags":"Filter by tags","smart-content.sort-by":"Sort by","smart-content.no-sorting":"No sorting","smart-content.ascending":"Ascending","smart-content.descending":"Descending","smart-content.present-as":"Present as","smart-content.limit-result-to":"Limit result to","smart-content.no-category":"No category","smart-content.choose-present-as":"Choose..","smart-content.choose-data-source":"Choose..","smart-content.from":"From","smart-content.sub-folders-inclusive":"incl. sub folders","smart-content.view-all":"view all","smart-content.view-less":"view less","tag.tags.title":"Tags","edit-toolbar.state-publish":"Publish","edit-toolbar.state-unpublish":"Unpublish","edit-toolbar.state-test":"Test","template.default":"Default","template.simple":"Simple","template.overview":"Overview","content.template.dialog.titile":"Change Template","content.template.dialog.content":"You have unchanged Data.