diff --git a/src/main/java/org/olat/admin/layout/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/admin/layout/_i18n/LocalStrings_en.properties
index 0dd9e4a6f22f97ae159bd418407c4fba89a40a99..05df1d896093db57356f6b0492578ce46fdd31f0 100644
--- a/src/main/java/org/olat/admin/layout/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/admin/layout/_i18n/LocalStrings_en.properties
@@ -1,16 +1,19 @@
-#Tue Dec 16 09:08:01 CET 2014
+#Thu Dec 18 11:08:49 CET 2014
 CustomizingAdminController.menu.title=Layout-Customizing
 CustomizingAdminController.menu.title.alt=Customize your OLAT-instance
 LayoutAdminControllerWithPersist.menu.title=Layout
 LayoutAdminControllerWithPersist.menu.title.alt=Choose a layout-theme
 customizing.logo=Company or institution logo
 customizing.logo.link.custom=Custom
+customizing.logo.link.landingpage=Landing page
+customizing.logo.link.type=Logo target URL (optional)
 customizing.settings=Footer line
 customizing.settings.desc=If your footer line contains email or webaddresses, it can be in conflict with the target URL of the footer.
 customizing.title=Detailconfiguration for layout
 delete.logo=Remove existing logo
 footerLine.default=frentix GmbH, info@frentix.com, http\://www.frentix.com
 footerLine.description=Text in the footer line (email- and webadresses get replaced automatically.)
+footerUrl.default=http\://www.frentix.com
 footerUrl.description=Specify target URL for the footer (optional).
 form.theme=System layout
 invitee=invitee
diff --git a/src/main/java/org/olat/admin/site/ui/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/admin/site/ui/_i18n/LocalStrings_en.properties
index a8cbb898ceee244348b1769816ca8b2a57fb24e0..6f97266385e35e877b974ab010afb9b1b2c3a9c1 100644
--- a/src/main/java/org/olat/admin/site/ui/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/admin/site/ui/_i18n/LocalStrings_en.properties
@@ -1,48 +1,48 @@
-#Thu May 26 14:17:00 CEST 2011
-admin.menu.title=Sites
-admin.menu.title.alt=Sites configuration
-sites.order=Order
-site.courseSite1=Info page n°1
-site.courseSite2=Info page n°2
-site.title=Description
-site.type=Typ
-site.defaultOrder=Def. order
-site.security=Access
-site.enabled=Enabled
-site.alternative=Alternative
-site.alternative.none=No alt.
-up=Up
-down=Down
-MyCoursesSiteDef=My courses (including catalog)
-GroupsSiteDef=Groups
-PortalSiteDef=Portal
+#Thu Dec 18 11:10:25 CET 2014
+AdminSiteDef=System administration
+CatalogAdminSiteDef=Catalog administration 
 CatalogSiteDef=Catalog
-CourseSiteDef=Infopage n°1
-CourseSiteDef2=Infopage n°2
-EPSiteDef=E-portfolio tool
 CoachSiteDef=Coaching tool
-RepositorySiteDef=Authoring environment
-CatalogAdminSiteDef=Catalog administration 
-QuestionPoolSiteDef=Question pool
-UserAdminSiteDef=User management
-AdminSiteDef=System administration
+CourseSiteDef=Infopage n\u00B01
+CourseSiteDef2=Infopage n\u00B02
+EPSiteDef=E-portfolio tool
 GUIDemoSiteDef=GUI Demo
+GroupsSiteDef=Groups
 LibrarySiteDef=Library
 MembersSiteDef=Members
-
-courseSiteForbiddenAlt=Forbidden ctrl.
-
+MyCoursesSiteDef=My courses (including catalog)
+PortalSiteDef=Portal
+QuestionPoolSiteDef=Question pool
+RepositorySiteDef=Authoring environment
+UserAdminSiteDef=User management
+admin.menu.title=Sites
+admin.menu.title.alt=Sites configuration
 adminSiteSecurityCallback=Admins only
+authorAndPoolPrivateMembersSiteSecurityCallback=Authors, question bank admins and members
 catalogManagerSiteSecurityCallback=Catalog manager and learning resource managers
+courseSiteForbiddenAlt=Forbidden ctrl.
 defaultSiteSecurityCallback=All, including guests and invitee
 disabledSiteSecurityCallback=Disabled
+down=Down
 managersSiteSecurityCallback=Managers
-registredSiteSecurityCallback=Registered users without guests/invitee
+poolPrivateMembersSiteSecurityCallback=Question bank admins and members
 registredOrGuestSiteSecurityCallback=Resgistered users and guests without invitee
-restrictToGuestSiteSecurityCallback=Only guests without registered users
+registredSiteSecurityCallback=Registered users without guests/invitee
 restrictToAuthorSiteSecurityCallback=Authors only
+restrictToGroupManagerSiteSecurityCallback=Group managers
+restrictToGuestSiteSecurityCallback=Only guests without registered users
 restrictToInstResourceManagerSiteSecurityCallback=Learning resource managers only
 restrictToInstResourceManagersAndAuthorsSiteSecurityCallback=Learning resource managers and authors only
-restrictToUserManagerSiteSecurityCallback=User managers
-restrictToGroupManagerSiteSecurityCallback=Group managers
 restrictToPoolAdminSiteSecurityCallback=Pool admins only
+restrictToUserManagerSiteSecurityCallback=User managers
+site.alternative=Alternative
+site.alternative.none=No alt.
+site.courseSite1=Info page n\u00B01
+site.courseSite2=Info page n\u00B02
+site.defaultOrder=Def. order
+site.enabled=Enabled
+site.security=Access
+site.title=Description
+site.type=Typ
+sites.order=Order
+up=Up
diff --git a/src/main/java/org/olat/admin/user/tools/ui/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/admin/user/tools/ui/_i18n/LocalStrings_en.properties
index 10878307271a99a06120dbfa2bde524360961626..d9a647f953427b0938e6f7838175d68bc9804140 100644
--- a/src/main/java/org/olat/admin/user/tools/ui/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/admin/user/tools/ui/_i18n/LocalStrings_en.properties
@@ -1,6 +1,7 @@
-#Mon Aug 25 15:03:21 CEST 2014
+#Thu Dec 18 11:19:06 CET 2014
 available.tools=Available tools
 chelp.admin-usertools.title=User tools settings
+help.hover.adminusertools=Help regarding the configuration of user tools
 preset.tools=Preset
 usertools=User tools
 usertools.description=Users tools explanation
diff --git a/src/main/java/org/olat/commons/calendar/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/commons/calendar/_i18n/LocalStrings_en.properties
index b3729609b4e4d9de3a7d7c13112a570a7a759bca..a0f7d567324e3ed33045148037fa0d46c74d20bb 100644
--- a/src/main/java/org/olat/commons/calendar/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/commons/calendar/_i18n/LocalStrings_en.properties
@@ -1,4 +1,4 @@
-#Tue Dec 16 09:28:13 CET 2014
+#Thu Dec 18 11:19:14 CET 2014
 cal.add.event=Add event
 cal.add.readonly=(Read only)
 cal.color.choose=Choose color
@@ -206,6 +206,7 @@ help.hover.groupcal=Help on how to use group calendars
 help.hover.personalcal=Help on how to use personal calendars
 help.hover.personalcal.date=Help to create events in personal calendars
 menu.admin.calendar=Calendar
+menu.admin.calendar.alt=Calendar
 month.long.apr=$org.olat.core.gui.components.form.flexible.impl.elements\:month.long.apr
 month.long.aug=$org.olat.core.gui.components.form.flexible.impl.elements\:month.long.aug
 month.long.dec=$org.olat.core.gui.components.form.flexible.impl.elements\:month.long.dec
diff --git a/src/main/java/org/olat/course/certificate/ui/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/course/certificate/ui/_i18n/LocalStrings_en.properties
index 36ee92ba7132a586d770e7cca11168b2ae58ad34..0d6590a45fd544602b7ad391f9184b0377ae6bcb 100644
--- a/src/main/java/org/olat/course/certificate/ui/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/course/certificate/ui/_i18n/LocalStrings_en.properties
@@ -1,4 +1,4 @@
-#Wed Dec 17 17:00:05 CET 2014
+#Thu Dec 18 09:21:04 CET 2014
 admin.certificates.description=Upload PDF forms as templates for the course certificates.
 admin.certificates.title=Certificates
 admin.menu.title=Certificates
@@ -14,6 +14,7 @@ certification.email.subject=You have received an OpenOLAT certification
 chelp.admin-certificates.title=Certificate configuration
 choose.title=Select template
 confirm.certificate.deleted=The certificate from {0} was deleted.
+confirm.certificate.template.deleted=The template {0} has been deleted.
 confirm.certificate.text=A certificate has already been issued and the re-certification period has not yet expired. Do you wish to create a new certificate anyway?
 confirm.certificate.title=Create certificate
 confirm.delete.certificate.text=Do you really wish to delete the certificate?
@@ -32,6 +33,7 @@ msg.certificate.pending=The certificate will be created within the next few seco
 no.certificate=No certificate available
 notifications.desc={0} received a new certificate.
 notifications.header=New certificates for the course "{0}".
+notifications.title=New Certificates in course "{0}".
 options.certificates.title=Evidence of achievement configuration
 orientation=Orientation
 pdf.certificates=Generate PDF certificate
diff --git a/src/main/java/org/olat/login/oauth/ui/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/login/oauth/ui/_i18n/LocalStrings_en.properties
index 83308c8ce9ebd82ecf629fefe1f4e9793c528e9d..4f833bf62d90736c3a301f47742c78d02a873695 100644
--- a/src/main/java/org/olat/login/oauth/ui/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/login/oauth/ui/_i18n/LocalStrings_en.properties
@@ -1,4 +1,4 @@
-#Wed Dec 17 17:34:51 CET 2014
+#Thu Dec 18 09:27:32 CET 2014
 adfs.admin.title=Active directory federation system
 adfs.admin.title.alt=Active directory federation system
 adfs.api.id=Client ID
@@ -15,6 +15,7 @@ error.access.denied=Access denied.
 error.account.creation=You currently have no OpenOLAT account.
 error.generic=An unexpected error occurred.
 error.invalid.grant=You are not allowed to access OpenOLAT.
+error.no.id=We were not able to identify you.
 error.token.rejected=Token rejected.
 facebook.admin.title=Facebook Konfiguration
 facebook.api.id=App key
@@ -39,5 +40,6 @@ twitter.admin.title=Twitter configuration
 twitter.api.id=Consumer key (App key)
 twitter.api.secret=Consumer secret (App secret)
 twitter.enabled=Twitter
+user.creation.enabled=Allow registration
 user.language=Language
 user.login=Username
diff --git a/src/main/java/org/olat/repository/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/repository/_i18n/LocalStrings_en.properties
index 1223a8da265e7a1b21b278b3b709be16defff571..0b0f5bce22a4ac7484eb333ba0cc85cadf4f0ceb 100644
--- a/src/main/java/org/olat/repository/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/repository/_i18n/LocalStrings_en.properties
@@ -1,4 +1,4 @@
-#Wed Dec 17 09:51:55 CET 2014
+#Thu Dec 18 11:06:36 CET 2014
 CourseModule=Course
 EPStructuredMapTemplate=Portfolio template
 Failed=The transmission of this file failed.
@@ -58,6 +58,7 @@ allcourses=All courses
 assessment=$org.olat.group.ui.main\:assessment
 book=book
 book.with.type=book {0}
+bulk.update.nothing.selected=You need to select at least one learning ressource.
 cap.launch=Loading learning resource. Please wait...
 catalog.path=Path
 chelp.admin01=Help regarding administration learning resources
@@ -207,6 +208,8 @@ cif.error.corrupted=The learning resource is corrupted and can not be displayed.
 cif.error.description.empty=Please fill in the field "Description".
 cif.error.displayname.empty=Please fill in the field "Title of learning resource".
 cif.error.idnotint=This identification number does not exist.
+cif.error.image=The image could not be saved.
+cif.error.movie=The teaser movie could not be saved.
 cif.error.resourcename.empty=Please fill in the field "Reference".
 cif.expenditureOfWork=Expenditure of work
 cif.externalid=External ID
@@ -278,8 +281,14 @@ details.chprop=Modify settings
 details.close=Close info page
 details.close.ressoure=Close
 details.copy=Copy
+details.copy.confirm=Would you like to copy this learning resource? {0}
+details.copy.confirm.warning=<div class\="o_warning">There are learning resources you are not allowed to copy.</div><p>Would you like to duplicate the following learning resources? {0}</p>
+details.copy.success={0} learning resources were duplicated.
 details.delete=Delete
 details.delete.acknowledge=Confirmation
+details.delete.acknowledge.error=Please confirm.
+details.delete.acknowledge.msg=All files will be permanently removed and cannot be recovered.
+details.delete.entries=Learning resources
 details.delete.error.editor=This learning resource cannot be deleted. This learning resource is currently used by another user in the editor.
 details.delete.error.references=This learning resource cannot be deleted. There are active references to this resource within OpenOLAT.<br /><br /><font color\="red">{0}</font>
 details.description=Description of learning resource
@@ -311,6 +320,7 @@ details.referenceinfo=References
 details.referenceinfoheader=Information on usage
 details.summaryprop=Summary of settings
 details.typeinfoheader=Type-specific information
+dialog.confirm.delete.notAllDeleteable=You don't have the permission to delete all learning resources
 dialog.modal.bg.leave.text=$org.olat.group.ui.main\:dialog.modal.bg.leave.text
 dialog.modal.bg.send.mail=$org.olat.group.ui.main\:dialog.modal.bg.send.mail
 disabledexportreason=This learning resource must not be exported.
@@ -377,6 +387,7 @@ lifecycle.validTo=$\:cif.date.end
 mail.member=$org.olat.group.ui.main\:mail.member
 managed.resource=External management
 managed.resource.intro=This course has been created by an external tool. Therefore some settings and modules can not be modified and used within OpenOLAT. The following elements are blocked within OpenOLAT\:
+menu.repository.admin=Repository
 menu.repository.admin.alt=$\:menu.repository.admin
 message.entry.selected=Learning resource "{0}" with type "{1}" allocated successfully.
 msg.warnusers=(There are {0} users currently using this resource)
diff --git a/src/main/java/org/olat/repository/ui/catalog/CatalogEntryRowModel.java b/src/main/java/org/olat/repository/ui/catalog/CatalogEntryRowModel.java
index e87019a4822689b41c7ab615110d154a63469dac..0116a78ab4e5eb6f93e6d927352a0f10788fa15d 100644
--- a/src/main/java/org/olat/repository/ui/catalog/CatalogEntryRowModel.java
+++ b/src/main/java/org/olat/repository/ui/catalog/CatalogEntryRowModel.java
@@ -1,3 +1,22 @@
+/**
+ * <a href="http://www.openolat.org">
+ * OpenOLAT - Online Learning and Training</a><br>
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); <br>
+ * you may not use this file except in compliance with the License.<br>
+ * You may obtain a copy of the License at the
+ * <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache homepage</a>
+ * <p>
+ * Unless required by applicable law or agreed to in writing,<br>
+ * software distributed under the License is distributed on an "AS IS" BASIS, <br>
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
+ * See the License for the specific language governing permissions and <br>
+ * limitations under the License.
+ * <p>
+ * Initial code contributed and copyrighted by<br>
+ * frentix GmbH, http://www.frentix.com
+ * <p>
+ */
 package org.olat.repository.ui.catalog;
 
 import org.olat.core.gui.components.form.flexible.impl.elements.table.DefaultFlexiTableDataModel;
diff --git a/src/main/java/org/olat/repository/ui/catalog/CatalogManagerController.java b/src/main/java/org/olat/repository/ui/catalog/CatalogManagerController.java
index 48474ba08ef2eb9c7d6b9f9590dcf5c0baaeb88a..25fbf8993302d984692aff9872b4478086e726dd 100644
--- a/src/main/java/org/olat/repository/ui/catalog/CatalogManagerController.java
+++ b/src/main/java/org/olat/repository/ui/catalog/CatalogManagerController.java
@@ -1,3 +1,22 @@
+/**
+ * <a href="http://www.openolat.org">
+ * OpenOLAT - Online Learning and Training</a><br>
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); <br>
+ * you may not use this file except in compliance with the License.<br>
+ * You may obtain a copy of the License at the
+ * <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache homepage</a>
+ * <p>
+ * Unless required by applicable law or agreed to in writing,<br>
+ * software distributed under the License is distributed on an "AS IS" BASIS, <br>
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
+ * See the License for the specific language governing permissions and <br>
+ * limitations under the License.
+ * <p>
+ * Initial code contributed and copyrighted by<br>
+ * frentix GmbH, http://www.frentix.com
+ * <p>
+ */
 package org.olat.repository.ui.catalog;
 
 import java.util.ArrayList;
diff --git a/src/main/java/org/olat/repository/ui/catalog/CatalogNodeManagerController.java b/src/main/java/org/olat/repository/ui/catalog/CatalogNodeManagerController.java
index 54faee7731030a3fed2804dd18b5a91ace957125..2b71a73914226a574b052cf849c5a2353bf2139e 100644
--- a/src/main/java/org/olat/repository/ui/catalog/CatalogNodeManagerController.java
+++ b/src/main/java/org/olat/repository/ui/catalog/CatalogNodeManagerController.java
@@ -1,3 +1,22 @@
+/**
+ * <a href="http://www.openolat.org">
+ * OpenOLAT - Online Learning and Training</a><br>
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); <br>
+ * you may not use this file except in compliance with the License.<br>
+ * You may obtain a copy of the License at the
+ * <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache homepage</a>
+ * <p>
+ * Unless required by applicable law or agreed to in writing,<br>
+ * software distributed under the License is distributed on an "AS IS" BASIS, <br>
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
+ * See the License for the specific language governing permissions and <br>
+ * limitations under the License.
+ * <p>
+ * Initial code contributed and copyrighted by<br>
+ * frentix GmbH, http://www.frentix.com
+ * <p>
+ */
 package org.olat.repository.ui.catalog;
 
 import java.util.ArrayList;
diff --git a/src/main/java/org/olat/repository/ui/catalog/CatalogStateEntry.java b/src/main/java/org/olat/repository/ui/catalog/CatalogStateEntry.java
index 655b84e3302602084c394719b972d2e6b4068534..60e61f892c89f91abc4ac24e19d8dea0e23645ec 100644
--- a/src/main/java/org/olat/repository/ui/catalog/CatalogStateEntry.java
+++ b/src/main/java/org/olat/repository/ui/catalog/CatalogStateEntry.java
@@ -1,3 +1,22 @@
+/**
+ * <a href="http://www.openolat.org">
+ * OpenOLAT - Online Learning and Training</a><br>
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); <br>
+ * you may not use this file except in compliance with the License.<br>
+ * You may obtain a copy of the License at the
+ * <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache homepage</a>
+ * <p>
+ * Unless required by applicable law or agreed to in writing,<br>
+ * software distributed under the License is distributed on an "AS IS" BASIS, <br>
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
+ * See the License for the specific language governing permissions and <br>
+ * limitations under the License.
+ * <p>
+ * Initial code contributed and copyrighted by<br>
+ * frentix GmbH, http://www.frentix.com
+ * <p>
+ */
 package org.olat.repository.ui.catalog;
 
 import org.olat.core.id.context.StateEntry;