27 files changed, 243 insertions, 238 deletions
diff --git a/features/org.gastro-feature/feature.properties b/features/org.gastro-feature/feature.properties
index 6fa7f1dc79..468591ca45 100644
--- a/features/org.gastro-feature/feature.properties
+++ b/features/org.gastro-feature/feature.properties
@@ -1,8 +1,8 @@
-# Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-
-featureName = CDO Gastro Example
-description = Contains the CDO Gastro RCP plugins, models and sources.
+# Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+
+featureName = CDO Electronic Restaurant Example
+description = Contains the CDO Gastro RCP plugins, models and sources.
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer.master/config/cdo-server.xml b/plugins/org.eclipse.emf.cdo.examples.installer.master/config/cdo-server.xml
index a04f2c0338..1b15811f82 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer.master/config/cdo-server.xml
+++ b/plugins/org.eclipse.emf.cdo.examples.installer.master/config/cdo-server.xml
@@ -22,8 +22,8 @@
     <property name="allowInterruptRunningQueries" value="true"/>
     <property name="idGenerationLocation" value="STORE"/> <!-- Possible values: STORE | CLIENT -->
 
-    <!-- Example http://bugs.eclipse.org/380629
 			<securityManager type="default" realmPath="/security"/>
+    <!-- Example http://bugs.eclipse.org/380629
 			<securityManager type="annotation" realmPath="/security"/>
     -->
 
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/META-INF/MANIFEST.MF
index eb38f7c061..5e21426a2b 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/META-INF/MANIFEST.MF
@@ -8,4 +8,9 @@ Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.common.ui;bundle-version="[2.5.0,3.0.0)"
+ org.eclipse.emf.common.ui;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.nebula.widgets.gallery;bundle-version="[0.0.1,1.0.0)",
+ org.eclipse.nebula.widgets.pshelf;bundle-version="[1.0.0,2.0.0)"
+Import-Package: javax.servlet;version="[2.3.0,3.0.0)",
+ javax.servlet.http;version="[2.3.0,3.0.0)",
+ org.apache.commons.lang;version="[2.3.0,3.0.0)"
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/gastro.business.edit/plugin.properties b/plugins/org.eclipse.emf.cdo.examples.installer/examples/gastro.business.edit/plugin.properties
index 32ccbf58e1..acb20380a4 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/gastro.business.edit/plugin.properties
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/gastro.business.edit/plugin.properties
@@ -7,7 +7,7 @@
 # Contributors:
 #    Eike Stepper - initial API and implementation
 
-pluginName = CDO Gastro Example BusinessDay Edit Support
+pluginName = CDO Electronic Restaurant Example BusinessDay Edit Support
 providerName = Eclipse Modeling Project
 
 _UI_CreateChild_text = {0}
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/gastro.business/plugin.properties b/plugins/org.eclipse.emf.cdo.examples.installer/examples/gastro.business/plugin.properties
index 9feacf1007..ce3c3abd43 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/gastro.business/plugin.properties
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/gastro.business/plugin.properties
@@ -7,5 +7,5 @@
 # Contributors:
 #    Eike Stepper - initial API and implementation
 
-pluginName = CDO Gastro Example BusinessDay Model
+pluginName = CDO Electronic Restaurant Example BusinessDay Model
 providerName = Eclipse Modeling Project
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/gastro.inventory.edit/plugin.properties b/plugins/org.eclipse.emf.cdo.examples.installer/examples/gastro.inventory.edit/plugin.properties
index a7c5778dbc..6a1b83c800 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/gastro.inventory.edit/plugin.properties
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/gastro.inventory.edit/plugin.properties
@@ -7,7 +7,7 @@
 # Contributors:
 #    Eike Stepper - initial API and implementation
 
-pluginName = CDO Gastro Example Inventory Edit Support
+pluginName = CDO Electronic Restaurant Example Inventory Edit Support
 providerName = Eclipse Modeling Project
 
 _UI_CreateChild_text = {0}
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/gastro.inventory/plugin.properties b/plugins/org.eclipse.emf.cdo.examples.installer/examples/gastro.inventory/plugin.properties
index 4b9adaecf7..c528981ecb 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/gastro.inventory/plugin.properties
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/gastro.inventory/plugin.properties
@@ -7,5 +7,5 @@
 # Contributors:
 #    Eike Stepper - initial API and implementation
 
-pluginName = CDO Gastro Example Inventory Model
+pluginName = CDO Electronic Restaurant Example Inventory Model
 providerName = Eclipse Modeling Project
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/gastro.rcp.department/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/examples/gastro.rcp.department/META-INF/MANIFEST.MF
index 3e0f8d95b0..29942b64ec 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/gastro.rcp.department/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/gastro.rcp.department/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: CDO Gastro Example RCP Department
+Bundle-Name: CDO Electronic Restaurant Example RCP Department
 Bundle-SymbolicName: org.gastro.rcp.department; singleton:=true
 Bundle-Version: 4.0.100.qualifier
 Bundle-Activator: org.gastro.rcp.internal.department.Activator
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/gastro.rcp.table/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/examples/gastro.rcp.table/META-INF/MANIFEST.MF
index 93375f7788..e402686961 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/gastro.rcp.table/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/gastro.rcp.table/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: CDO Gastro Example RCP Table
+Bundle-Name: CDO Electronic Restaurant Example RCP Table
 Bundle-SymbolicName: org.gastro.rcp.table; singleton:=true
 Bundle-Version: 4.0.100.qualifier
 Bundle-Activator: org.gastro.rcp.internal.table.Activator
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/gastro.rcp/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/examples/gastro.rcp/META-INF/MANIFEST.MF
index 73c13770b5..ef9997f712 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/gastro.rcp/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/gastro.rcp/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: CDO Gastro Example RCP
+Bundle-Name: CDO Electronic Restaurant Example RCP
 Bundle-SymbolicName: org.gastro.rcp; singleton:=true
 Bundle-Version: 4.1.0.qualifier
 Bundle-Activator: org.gastro.internal.rcp.Activator
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/gastro.rcp/about.properties b/plugins/org.eclipse.emf.cdo.examples.installer/examples/gastro.rcp/about.properties
index 5719fafaa5..6afc608e4d 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/gastro.rcp/about.properties
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/gastro.rcp/about.properties
@@ -16,8 +16,8 @@
 # append it to the end of the file, and change the code to use the new name.
 # ==============================================================================
 
-featureName = CDO Gastro Example RCP
-featureText = CDO Gastro Example RCP\n\
+featureName = CDO Electronic Restaurant Example RCP
+featureText = CDO Electronic Restaurant Example RCP\n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
 \n\
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/gastro.server.web/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/examples/gastro.server.web/META-INF/MANIFEST.MF
index 3fc2f4d9f8..6512d4039b 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/gastro.server.web/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/gastro.server.web/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: CDO Gastro Example Server Web Support
+Bundle-Name: CDO Electronic Restaurant Example Server Web Support
 Bundle-SymbolicName: org.gastro.server.web;singleton:=true
 Bundle-Version: 4.1.0.qualifier
 Bundle-Activator: org.gastro.server.internal.web.OM$Activator
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/gastro.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/examples/gastro.server/META-INF/MANIFEST.MF
index 92c1321283..a7d5330df8 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/gastro.server/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/gastro.server/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: CDO Gastro Example Server
+Bundle-Name: CDO Electronic Restaurant Example Server
 Bundle-SymbolicName: org.gastro.server;singleton:=true
 Bundle-Version: 4.0.100.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/gastro.testclient/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/examples/gastro.testclient/META-INF/MANIFEST.MF
index adb256fe08..99c1982629 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/gastro.testclient/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/gastro.testclient/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: CDO Gastro Example Test Client
+Bundle-Name: CDO Electronic Restaurant Example Test Client
 Bundle-SymbolicName: org.gastro.testclient
 Bundle-Version: 4.0.100.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/master/config/cdo-server.xml b/plugins/org.eclipse.emf.cdo.examples.installer/examples/master/config/cdo-server.xml
index a04f2c0338..1b15811f82 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/master/config/cdo-server.xml
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/master/config/cdo-server.xml
@@ -22,8 +22,8 @@
     <property name="allowInterruptRunningQueries" value="true"/>
     <property name="idGenerationLocation" value="STORE"/> <!-- Possible values: STORE | CLIENT -->
 
-    <!-- Example http://bugs.eclipse.org/380629
 			<securityManager type="default" realmPath="/security"/>
+    <!-- Example http://bugs.eclipse.org/380629
 			<securityManager type="annotation" realmPath="/security"/>
     -->
 
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/plugin.properties b/plugins/org.eclipse.emf.cdo.examples.installer/plugin.properties
index cb248b1a87..2b1fa7cf13 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/plugin.properties
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/plugin.properties
@@ -31,10 +31,10 @@ ExampleEditProject_desc = This project contains the item providers generated to
 
 ExampleGastroWizard_name = CDO Electronic Restaurant Example
 ExampleGastroWizard_desc = Create plug-in projects for a complete distributed application system to support a restaurant with touchscreens at the tables.
-ExampleProject_gastro.inventory_desc = This project contains the Gastro Inventory model and the implementation generated from it.
-ExampleProject_gastro.inventory.edit_desc = This project contains the item providers generated to support viewing and editing instances of the Gastro Inventory model.
-ExampleProject_gastro.business_desc = This project contains the Gastro Business model and the implementation generated from it.
-ExampleProject_gastro.business.edit_desc = This project contains the item providers generated to support viewing and editing instances of the Gastro Business model.
+ExampleProject_gastro.inventory_desc = This project contains the Inventory model and the implementation generated from it.
+ExampleProject_gastro.inventory.edit_desc = This project contains the item providers generated to support viewing and editing instances of the Inventory model.
+ExampleProject_gastro.business_desc = This project contains the Gastro Business Day model and the implementation generated from it.
+ExampleProject_gastro.business.edit_desc = This project contains the item providers generated to support viewing and editing instances of the Business Day model.
 ExampleProject_gastro.rcp_desc = This project contains the base framework for the various RCP applications in thes example.
 ExampleProject_gastro.rcp.department_desc = This project contains the Department RCP application (used for kitchens and bars).
 ExampleProject_gastro.rcp.table_desc = This project contains the Table RCP application (used for the touch screens at the restaurant tables).
diff --git a/plugins/org.gastro.business.edit/plugin.properties b/plugins/org.gastro.business.edit/plugin.properties
index 3242472502..acb20380a4 100644
--- a/plugins/org.gastro.business.edit/plugin.properties
+++ b/plugins/org.gastro.business.edit/plugin.properties
@@ -1,55 +1,55 @@
-# Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#    Eike Stepper - initial API and implementation
-
-pluginName = CDO Gastro Example BusinessDay Edit Support
-providerName = Eclipse Modeling Project
-
-_UI_CreateChild_text = {0}
-_UI_CreateChild_text2 = {1} {0}
-_UI_CreateChild_text3 = {1}
-_UI_CreateChild_tooltip = Create New {0} Under {1} Feature
-_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.
-_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.
-
-_UI_PropertyDescriptor_description = The {0} of the {1}
-
-_UI_BusinessDay_type = Gesch�ftstag
-_UI_Order_type = Bewirtung
-_UI_OrderDetail_type = Bestellung
-_UI_Waiter_type = Kellner
-_UI_Unknown_type = Objekt
-
-_UI_Unknown_datatype= Wert
-
-_UI_BusinessDay_date_feature = Datum
-_UI_BusinessDay_menuCard_feature = Men�karte
-_UI_BusinessDay_orders_feature = Bewirtungen
-_UI_BusinessDay_waiters_feature = Kellner
-_UI_Order_businessDay_feature = Gesch�ftstag
-_UI_Order_table_feature = Tisch
-_UI_Order_orderDetails_feature = Betsellungen
-_UI_Order_number_feature = Nummer
-_UI_OrderDetail_order_feature = Bewirtung
-_UI_OrderDetail_offering_feature = Angebot
-_UI_OrderDetail_quantity_feature = Menge
-_UI_Waiter_businessDay_feature = Gesch�ftstag
-_UI_Waiter_tables_feature = Tische
-_UI_Waiter_employee_feature = Mitarbeiter
-_UI_Waiter_from_feature = Von
-_UI_Waiter_until_feature = Bis
-_UI_Unknown_feature = Unbekannt
-
-_UI_OrderDetail_state_feature = Bearbeitungszustand
-_UI_OrderState_Ordered_literal = Bestellt
-_UI_OrderState_Acknowledged_literal = In Zubereitung
-_UI_OrderState_Prepared_literal = Zubereitet
-_UI_OrderState_Served_literal = Serviert
-_UI_OrderState_Paid_literal = Bezahlt
-_UI_BusinessDay_closed_feature = Abgeschlossen
-_UI_OrderDetail_price_feature = Preis
+# Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#    Eike Stepper - initial API and implementation
+
+pluginName = CDO Electronic Restaurant Example BusinessDay Edit Support
+providerName = Eclipse Modeling Project
+
+_UI_CreateChild_text = {0}
+_UI_CreateChild_text2 = {1} {0}
+_UI_CreateChild_text3 = {1}
+_UI_CreateChild_tooltip = Create New {0} Under {1} Feature
+_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.
+_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.
+
+_UI_PropertyDescriptor_description = The {0} of the {1}
+
+_UI_BusinessDay_type = Gesch�ftstag
+_UI_Order_type = Bewirtung
+_UI_OrderDetail_type = Bestellung
+_UI_Waiter_type = Kellner
+_UI_Unknown_type = Objekt
+
+_UI_Unknown_datatype= Wert
+
+_UI_BusinessDay_date_feature = Datum
+_UI_BusinessDay_menuCard_feature = Men�karte
+_UI_BusinessDay_orders_feature = Bewirtungen
+_UI_BusinessDay_waiters_feature = Kellner
+_UI_Order_businessDay_feature = Gesch�ftstag
+_UI_Order_table_feature = Tisch
+_UI_Order_orderDetails_feature = Betsellungen
+_UI_Order_number_feature = Nummer
+_UI_OrderDetail_order_feature = Bewirtung
+_UI_OrderDetail_offering_feature = Angebot
+_UI_OrderDetail_quantity_feature = Menge
+_UI_Waiter_businessDay_feature = Gesch�ftstag
+_UI_Waiter_tables_feature = Tische
+_UI_Waiter_employee_feature = Mitarbeiter
+_UI_Waiter_from_feature = Von
+_UI_Waiter_until_feature = Bis
+_UI_Unknown_feature = Unbekannt
+
+_UI_OrderDetail_state_feature = Bearbeitungszustand
+_UI_OrderState_Ordered_literal = Bestellt
+_UI_OrderState_Acknowledged_literal = In Zubereitung
+_UI_OrderState_Prepared_literal = Zubereitet
+_UI_OrderState_Served_literal = Serviert
+_UI_OrderState_Paid_literal = Bezahlt
+_UI_BusinessDay_closed_feature = Abgeschlossen
+_UI_OrderDetail_price_feature = Preis
diff --git a/plugins/org.gastro.business/plugin.properties b/plugins/org.gastro.business/plugin.properties
index b718f571d0..ce3c3abd43 100644
--- a/plugins/org.gastro.business/plugin.properties
+++ b/plugins/org.gastro.business/plugin.properties
@@ -1,11 +1,11 @@
-# Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#    Eike Stepper - initial API and implementation
-
-pluginName = CDO Gastro Example BusinessDay Model
-providerName = Eclipse Modeling Project
+# Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#    Eike Stepper - initial API and implementation
+
+pluginName = CDO Electronic Restaurant Example BusinessDay Model
+providerName = Eclipse Modeling Project
diff --git a/plugins/org.gastro.inventory.edit/plugin.properties b/plugins/org.gastro.inventory.edit/plugin.properties
index ed2a6f3dc6..6a1b83c800 100644
--- a/plugins/org.gastro.inventory.edit/plugin.properties
+++ b/plugins/org.gastro.inventory.edit/plugin.properties
@@ -1,84 +1,84 @@
-# Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#    Eike Stepper - initial API and implementation
-
-pluginName = CDO Gastro Example Inventory Edit Support
-providerName = Eclipse Modeling Project
-
-_UI_CreateChild_text = {0}
-_UI_CreateChild_text2 = {1} {0}
-_UI_CreateChild_text3 = {1}
-_UI_CreateChild_tooltip = Create New {0} Under {1} Feature
-_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.
-_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.
-
-_UI_PropertyDescriptor_description = The {0} of the {1}
-
-_UI_Stock_type = Lager
-_UI_Product_type = Produkt
-_UI_StockProduct_type = Lagerprodukt
-_UI_Recipe_type = Rezept
-_UI_Ingredient_type = Zutat
-_UI_MenuCard_type = Men�karte
-_UI_Restaurant_type = Restaurant
-_UI_Department_type = Abteilung
-_UI_Offering_type = Angebot
-_UI_Table_type = Tisch
-_UI_Unknown_type = Objekt
-
-_UI_Unknown_datatype= Wert
-
-_UI_Stock_products_feature = Produkte
-_UI_Stock_name_feature = Name
-_UI_Stock_restaurant_feature = Restaurant
-_UI_Product_name_feature = Name
-_UI_StockProduct_stock_feature = Lager
-_UI_StockProduct_cost_feature = Kosten
-_UI_StockProduct_available_feature = Verf�gbar
-_UI_StockProduct_orderLimit_feature = Bestellgrenze
-_UI_Recipe_ingredients_feature = Zutaten
-_UI_Recipe_department_feature = Abteilung
-_UI_Ingredient_recipe_feature = Rezept
-_UI_Ingredient_product_feature = Produkt
-_UI_Ingredient_quantity_feature = Menge
-_UI_MenuCard_title_feature = Titel
-_UI_MenuCard_offerings_feature = Angebote
-_UI_MenuCard_restaurant_feature = Restaurant
-_UI_Restaurant_name_feature = Name
-_UI_Restaurant_stocks_feature = L�ger
-_UI_Restaurant_departments_feature = Abteilungen
-_UI_Restaurant_menuCards_feature = Men�karten
-_UI_Restaurant_tables_feature = Tische
-_UI_Department_recipes_feature = Rezepte
-_UI_Department_restaurant_feature = Restaurant
-_UI_Offering_product_feature = Produkt
-_UI_Offering_menuCard_feature = Men�karte
-_UI_Offering_description_feature = Beschreibung
-_UI_Offering_price_feature = Preis
-_UI_Table_seats_feature = Pl�tze
-_UI_Table_restaurant_feature = Restaurant
-_UI_Unknown_feature = Unbekannt
-
-_UI_Employee_type = Mitarbeiter
-_UI_Stock_department_feature = Abteilung
-_UI_Department_employees_feature = Mitarbeiter
-_UI_Department_stocks_feature = L�ger
-_UI_Employee_department_feature = Abteilung
-_UI_Station_type = Station
-_UI_Recipe_cost_feature = Kosten
-_UI_Restaurant_stations_feature = Stationen
-_UI_Employee_name_feature = Name
-_UI_Station_stationID_feature = Stations-ID
-_UI_Section_type = Abschnitt
-_UI_MenuCard_sections_feature = Abschnitte
-_UI_Offering_section_feature = Abschnitt
-_UI_Section_menuCard_feature = Men�karte
-_UI_Section_offerings_feature = Angebote
-_UI_Section_title_feature = Titel
-_UI_Offering_name_feature = Name
-_UI_Section_text_feature = Text
+# Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#    Eike Stepper - initial API and implementation
+
+pluginName = CDO Electronic Restaurant Example Inventory Edit Support
+providerName = Eclipse Modeling Project
+
+_UI_CreateChild_text = {0}
+_UI_CreateChild_text2 = {1} {0}
+_UI_CreateChild_text3 = {1}
+_UI_CreateChild_tooltip = Create New {0} Under {1} Feature
+_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.
+_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.
+
+_UI_PropertyDescriptor_description = The {0} of the {1}
+
+_UI_Stock_type = Lager
+_UI_Product_type = Produkt
+_UI_StockProduct_type = Lagerprodukt
+_UI_Recipe_type = Rezept
+_UI_Ingredient_type = Zutat
+_UI_MenuCard_type = Men�karte
+_UI_Restaurant_type = Restaurant
+_UI_Department_type = Abteilung
+_UI_Offering_type = Angebot
+_UI_Table_type = Tisch
+_UI_Unknown_type = Objekt
+
+_UI_Unknown_datatype= Wert
+
+_UI_Stock_products_feature = Produkte
+_UI_Stock_name_feature = Name
+_UI_Stock_restaurant_feature = Restaurant
+_UI_Product_name_feature = Name
+_UI_StockProduct_stock_feature = Lager
+_UI_StockProduct_cost_feature = Kosten
+_UI_StockProduct_available_feature = Verf�gbar
+_UI_StockProduct_orderLimit_feature = Bestellgrenze
+_UI_Recipe_ingredients_feature = Zutaten
+_UI_Recipe_department_feature = Abteilung
+_UI_Ingredient_recipe_feature = Rezept
+_UI_Ingredient_product_feature = Produkt
+_UI_Ingredient_quantity_feature = Menge
+_UI_MenuCard_title_feature = Titel
+_UI_MenuCard_offerings_feature = Angebote
+_UI_MenuCard_restaurant_feature = Restaurant
+_UI_Restaurant_name_feature = Name
+_UI_Restaurant_stocks_feature = L�ger
+_UI_Restaurant_departments_feature = Abteilungen
+_UI_Restaurant_menuCards_feature = Men�karten
+_UI_Restaurant_tables_feature = Tische
+_UI_Department_recipes_feature = Rezepte
+_UI_Department_restaurant_feature = Restaurant
+_UI_Offering_product_feature = Produkt
+_UI_Offering_menuCard_feature = Men�karte
+_UI_Offering_description_feature = Beschreibung
+_UI_Offering_price_feature = Preis
+_UI_Table_seats_feature = Pl�tze
+_UI_Table_restaurant_feature = Restaurant
+_UI_Unknown_feature = Unbekannt
+
+_UI_Employee_type = Mitarbeiter
+_UI_Stock_department_feature = Abteilung
+_UI_Department_employees_feature = Mitarbeiter
+_UI_Department_stocks_feature = L�ger
+_UI_Employee_department_feature = Abteilung
+_UI_Station_type = Station
+_UI_Recipe_cost_feature = Kosten
+_UI_Restaurant_stations_feature = Stationen
+_UI_Employee_name_feature = Name
+_UI_Station_stationID_feature = Stations-ID
+_UI_Section_type = Abschnitt
+_UI_MenuCard_sections_feature = Abschnitte
+_UI_Offering_section_feature = Abschnitt
+_UI_Section_menuCard_feature = Men�karte
+_UI_Section_offerings_feature = Angebote
+_UI_Section_title_feature = Titel
+_UI_Offering_name_feature = Name
+_UI_Section_text_feature = Text
diff --git a/plugins/org.gastro.inventory/plugin.properties b/plugins/org.gastro.inventory/plugin.properties
index 289d9f64cd..c528981ecb 100644
--- a/plugins/org.gastro.inventory/plugin.properties
+++ b/plugins/org.gastro.inventory/plugin.properties
@@ -1,11 +1,11 @@
-# Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#    Eike Stepper - initial API and implementation
-
-pluginName = CDO Gastro Example Inventory Model
-providerName = Eclipse Modeling Project
+# Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#    Eike Stepper - initial API and implementation
+
+pluginName = CDO Electronic Restaurant Example Inventory Model
+providerName = Eclipse Modeling Project
diff --git a/plugins/org.gastro.rcp.department/META-INF/MANIFEST.MF b/plugins/org.gastro.rcp.department/META-INF/MANIFEST.MF
index 3e0f8d95b0..29942b64ec 100644
--- a/plugins/org.gastro.rcp.department/META-INF/MANIFEST.MF
+++ b/plugins/org.gastro.rcp.department/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: CDO Gastro Example RCP Department
+Bundle-Name: CDO Electronic Restaurant Example RCP Department
 Bundle-SymbolicName: org.gastro.rcp.department; singleton:=true
 Bundle-Version: 4.0.100.qualifier
 Bundle-Activator: org.gastro.rcp.internal.department.Activator
diff --git a/plugins/org.gastro.rcp.table/META-INF/MANIFEST.MF b/plugins/org.gastro.rcp.table/META-INF/MANIFEST.MF
index 93375f7788..e402686961 100644
--- a/plugins/org.gastro.rcp.table/META-INF/MANIFEST.MF
+++ b/plugins/org.gastro.rcp.table/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: CDO Gastro Example RCP Table
+Bundle-Name: CDO Electronic Restaurant Example RCP Table
 Bundle-SymbolicName: org.gastro.rcp.table; singleton:=true
 Bundle-Version: 4.0.100.qualifier
 Bundle-Activator: org.gastro.rcp.internal.table.Activator
diff --git a/plugins/org.gastro.rcp/META-INF/MANIFEST.MF b/plugins/org.gastro.rcp/META-INF/MANIFEST.MF
index 73c13770b5..ef9997f712 100644
--- a/plugins/org.gastro.rcp/META-INF/MANIFEST.MF
+++ b/plugins/org.gastro.rcp/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: CDO Gastro Example RCP
+Bundle-Name: CDO Electronic Restaurant Example RCP
 Bundle-SymbolicName: org.gastro.rcp; singleton:=true
 Bundle-Version: 4.1.0.qualifier
 Bundle-Activator: org.gastro.internal.rcp.Activator
diff --git a/plugins/org.gastro.rcp/about.properties b/plugins/org.gastro.rcp/about.properties
index c6dea35e2c..6afc608e4d 100644
--- a/plugins/org.gastro.rcp/about.properties
+++ b/plugins/org.gastro.rcp/about.properties
@@ -1,31 +1,31 @@
-# Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#    Martin Fluegge - initial API and implementation
-
-# NLS_MESSAGEFORMAT_VAR
-
-# ==============================================================================
-# Do not change the properties between this line and the last line containing:
-# %%% END OF TRANSLATED PROPERTIES %%%
-# Instead, either redefine an existing property, or create a new property,
-# append it to the end of the file, and change the code to use the new name.
-# ==============================================================================
-
-featureName = CDO Gastro Example RCP
-featureText = CDO Gastro Example RCP\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. All rights reserved.\n\
-\n\
-Visit http://www.eclipse.org/cdo
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
+# Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#    Martin Fluegge - initial API and implementation
+
+# NLS_MESSAGEFORMAT_VAR
+
+# ==============================================================================
+# Do not change the properties between this line and the last line containing:
+# %%% END OF TRANSLATED PROPERTIES %%%
+# Instead, either redefine an existing property, or create a new property,
+# append it to the end of the file, and change the code to use the new name.
+# ==============================================================================
+
+featureName = CDO Electronic Restaurant Example RCP
+featureText = CDO Electronic Restaurant Example RCP\n\
+Version: {featureVersion}\n\
+Build id: {0}\n\
+\n\
+Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. All rights reserved.\n\
+\n\
+Visit http://www.eclipse.org/cdo
+
+# ==============================================================================
+# %%% END OF TRANSLATED PROPERTIES %%%
+# The above properties have been shipped for translation.
+# ==============================================================================
diff --git a/plugins/org.gastro.server.web/META-INF/MANIFEST.MF b/plugins/org.gastro.server.web/META-INF/MANIFEST.MF
index 3fc2f4d9f8..6512d4039b 100644
--- a/plugins/org.gastro.server.web/META-INF/MANIFEST.MF
+++ b/plugins/org.gastro.server.web/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: CDO Gastro Example Server Web Support
+Bundle-Name: CDO Electronic Restaurant Example Server Web Support
 Bundle-SymbolicName: org.gastro.server.web;singleton:=true
 Bundle-Version: 4.1.0.qualifier
 Bundle-Activator: org.gastro.server.internal.web.OM$Activator
diff --git a/plugins/org.gastro.server/META-INF/MANIFEST.MF b/plugins/org.gastro.server/META-INF/MANIFEST.MF
index 92c1321283..a7d5330df8 100644
--- a/plugins/org.gastro.server/META-INF/MANIFEST.MF
+++ b/plugins/org.gastro.server/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: CDO Gastro Example Server
+Bundle-Name: CDO Electronic Restaurant Example Server
 Bundle-SymbolicName: org.gastro.server;singleton:=true
 Bundle-Version: 4.0.100.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.gastro.testclient/META-INF/MANIFEST.MF b/plugins/org.gastro.testclient/META-INF/MANIFEST.MF
index 5b018ec2a7..99c1982629 100644
--- a/plugins/org.gastro.testclient/META-INF/MANIFEST.MF
+++ b/plugins/org.gastro.testclient/META-INF/MANIFEST.MF
@@ -1,14 +1,14 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: CDO Gastro Example Test Client
-Bundle-SymbolicName: org.gastro.testclient
-Bundle-Version: 4.0.100.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.net4j.tcp;bundle-version="[2.0.0,5.0.0)",
- org.eclipse.emf.cdo.net4j;bundle-version="[4.0.0,5.0.0)";resolution:=optional,
- org.eclipse.emf.cdo.ui;bundle-version="[4.0.0,5.0.0)",
- org.gastro.business;bundle-version="[4.0.0,5.0.0)",
- org.gastro.business.edit;bundle-version="[4.0.0,5.0.0)",
- org.gastro.inventory;bundle-version="[4.0.0,5.0.0)",
- org.gastro.inventory.edit;bundle-version="[4.0.0,5.0.0)"
-Bundle-Vendor: Eclipse Modeling Project
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: CDO Electronic Restaurant Example Test Client
+Bundle-SymbolicName: org.gastro.testclient
+Bundle-Version: 4.0.100.qualifier
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: org.eclipse.net4j.tcp;bundle-version="[2.0.0,5.0.0)",
+ org.eclipse.emf.cdo.net4j;bundle-version="[4.0.0,5.0.0)";resolution:=optional,
+ org.eclipse.emf.cdo.ui;bundle-version="[4.0.0,5.0.0)",
+ org.gastro.business;bundle-version="[4.0.0,5.0.0)",
+ org.gastro.business.edit;bundle-version="[4.0.0,5.0.0)",
+ org.gastro.inventory;bundle-version="[4.0.0,5.0.0)",
+ org.gastro.inventory.edit;bundle-version="[4.0.0,5.0.0)"
+Bundle-Vendor: Eclipse Modeling Project