Merge pull request #124 from KingCrunch/merge-menus

lsmith77 · lsmith77 · commit 8885f7b2630a · 2013-08-21T06:26:28.000-07:00
Merge admin-menu entries into a single 'CMF'-menu
diff --git a/Resources/config/admin.xml b/Resources/config/admin.xml
@@ -17,7 +17,7 @@
             <tag
                 name="sonata.admin"
                 manager_type="doctrine_phpcr"
-                group="dashboard.group_menu"
+                group="dashboard.cmf"
                 label_catalogue="CmfMenuBundle"
                 label="dashboard.label_menu"
                 label_translator_strategy="sonata.admin.label.strategy.underscore"
@@ -49,7 +49,7 @@
             <tag
                 name="sonata.admin"
                 manager_type="doctrine_phpcr"
-                group="dashboard.group_menu"
+                group="dashboard.cmf"
                 label_catalogue="CmfMenuBundle"
                 label="dashboard.label_menu_node"
                 label_translator_strategy="sonata.admin.label.strategy.underscore"
diff --git a/Resources/translations/CmfMenuBundle.de.xliff b/Resources/translations/CmfMenuBundle.de.xliff
@@ -2,9 +2,9 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
   <file source-language="en" target-language="de" datatype="plaintext" original="CmfMenuBundle.en.xliff">
     <body>
-      <trans-unit id="dashboard.group_menu">
-        <source>dashboard.group_menu</source>
-        <target>Menü</target>
+      <trans-unit id="dashboard.cmf">
+        <source>dashboard.cmf</source>
+        <target>Symfony CMF</target>
       </trans-unit>
       <trans-unit id="dashboard.label_menu">
         <source>dashboard.label_menu</source>
diff --git a/Resources/translations/CmfMenuBundle.en.xliff b/Resources/translations/CmfMenuBundle.en.xliff
@@ -2,9 +2,9 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
   <file source-language="en" target-language="en" datatype="plaintext" original="CmfMenuBundle.en.xliff">
     <body>
-      <trans-unit id="dashboard.group_menu">
-        <source>dashboard.group_menu</source>
-        <target>Menu</target>
+      <trans-unit id="dashboard.cmf">
+        <source>dashboard.cmf</source>
+        <target>Symfony CMF</target>
       </trans-unit>
       <trans-unit id="dashboard.label_menu">
         <source>dashboard.label_menu</source>
diff --git a/Resources/translations/CmfMenuBundle.fr.xliff b/Resources/translations/CmfMenuBundle.fr.xliff
@@ -2,9 +2,9 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
   <file source-language="en" target-language="fr" datatype="plaintext" original="CmfMenuBundle.en.xliff">
     <body>
-      <trans-unit id="dashboard.group_menu">
-        <source>dashboard.group_menu</source>
-        <target>Menu</target>
+      <trans-unit id="dashboard.cmf">
+        <source>dashboard.cmf</source>
+        <target>Symfony CMF</target>
       </trans-unit>
       <trans-unit id="dashboard.label_menu">
         <source>dashboard.label_menu</source>
