diff --git a/plugins/gradle/plugin-resources/META-INF/plugin.xml b/plugins/gradle/plugin-resources/META-INF/plugin.xml
index 4d905191bf50..eb768743ab4a 100644
--- a/plugins/gradle/plugin-resources/META-INF/plugin.xml
+++ b/plugins/gradle/plugin-resources/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin url="https://www.jetbrains.com/help/idea/gradle.html" xmlns:xi="http://www.w3.org/2001/XInclude">
+<idea-plugin url="https://www.jetbrains.com/help/idea/gradle.html">
   <name>Gradle</name>
   <id>com.intellij.gradle</id>
   <vendor>JetBrains</vendor>
@@ -23,7 +23,7 @@
   <depends>com.intellij.modules.lang</depends>
   <depends>com.intellij.modules.externalSystem</depends>
 
-  <resource-bundle>i18n.GradleBundle</resource-bundle>
+  <resource-bundle>messages.GradleBundle</resource-bundle>
 
   <application-components>
     <component>
@@ -76,7 +76,7 @@
     <internalFileTemplate name="Gradle Build Script with wrapper"/>
     <projectConfigurable groupId="build.tools" groupWeight="110" id="reference.settingsdialog.project.gradle"
                          instance="org.jetbrains.plugins.gradle.service.settings.GradleConfigurable"
-                         key="gradle.name" bundle="i18n.GradleBundle">
+                         key="gradle.name" bundle="messages.GradleBundle">
     </projectConfigurable>
     <editorTabTitleProvider implementation="org.jetbrains.plugins.gradle.util.GradleEditorTabTitleProvider"/>
     <configurationType implementation="org.jetbrains.plugins.gradle.service.execution.GradleExternalTaskConfigurationType"/>
@@ -141,14 +141,12 @@
       <add-to-group group-id="GenerateGroup" anchor="first"/>
     </group>
 
-    <action id="Gradle.ExecuteTask" class="org.jetbrains.plugins.gradle.action.GradleExecuteTaskAction" text="Execute Gradle Task"
+    <action id="Gradle.ExecuteTask" class="org.jetbrains.plugins.gradle.action.GradleExecuteTaskAction"
             icon="GradleIcons.Gradle">
     </action>
     <action id="Gradle.ToggleOfflineAction" class="org.jetbrains.plugins.gradle.action.ToggleOfflineAction"
-            text="Toggle Offline Mode" description="Toggle offline mode for Gradle builds"
             icon="AllIcons.Actions.OfflineMode"/>
-    <action id="Gradle.OpenProjectCompositeConfiguration" class="org.jetbrains.plugins.gradle.action.GradleOpenProjectCompositeConfigurationAction"
-            text="Composite Build Configuration"/>
+    <action id="Gradle.OpenProjectCompositeConfiguration" class="org.jetbrains.plugins.gradle.action.GradleOpenProjectCompositeConfigurationAction"/>
 
     <action id="Gradle.RefreshDependencies" class="org.jetbrains.plugins.gradle.action.GradleRefreshProjectDependenciesAction"/>
 
@@ -177,10 +175,7 @@
 
     <action id="Gradle.ShowDaemons" class="org.jetbrains.plugins.gradle.internal.daemon.ShowGradleDaemonsAction"/>
 
-
-    <action id="Gradle.ImportExternalProject" class="org.jetbrains.plugins.gradle.action.ImportProjectFromScriptAction"
-            text="Import Gradle Project" description="Import Gradle project described by this file"
-            icon="GradleIcons.Gradle">
+    <action id="Gradle.ImportExternalProject" class="org.jetbrains.plugins.gradle.action.ImportProjectFromScriptAction" icon="GradleIcons.Gradle">
       <add-to-group group-id="ProjectViewPopupMenuSettingsGroup" anchor="last"/>
       <add-to-group group-id="EditorPopupMenu" anchor="last"/>
     </action>
diff --git a/plugins/gradle/resources/i18n/GradleBundle.properties b/plugins/gradle/resources/messages/GradleBundle.properties
similarity index 92%
rename from plugins/gradle/resources/i18n/GradleBundle.properties
rename to plugins/gradle/resources/messages/GradleBundle.properties
index 77db021345a9..c083caecf3ae 100644
--- a/plugins/gradle/resources/i18n/GradleBundle.properties
+++ b/plugins/gradle/resources/messages/GradleBundle.properties
@@ -94,4 +94,11 @@ gradle.tests.tasks.choosing.popup.hint=Select several tasks to run them at once
 gradle.tests.tasks.choosing.warning.text=No tasks available
 gradle.tests.pattern.producer.configuration.name={0} and {1} more
 
-gradle.structure.wizard.name.and.artifact.id.is.different.error={0} name and artifactId must be equal
\ No newline at end of file
+gradle.structure.wizard.name.and.artifact.id.is.different.error={0} name and artifactId must be equal
+
+action.Gradle.ImportExternalProject.text=Import Gradle Project
+action.Gradle.ImportExternalProject.description=Import Gradle project described by this file
+action.Gradle.OpenProjectCompositeConfiguration.text=Composite Build Configuration
+action.Gradle.ToggleOfflineAction.text=Toggle Offline Mode
+action.Gradle.ToggleOfflineAction.description=Toggle offline mode for Gradle builds
+action.Gradle.ExecuteTask.text=Execute Gradle Task
\ No newline at end of file
diff --git a/plugins/gradle/resources/i18n/GradleDocumentationBundle.properties b/plugins/gradle/resources/messages/GradleDocumentationBundle.properties
similarity index 100%
rename from plugins/gradle/resources/i18n/GradleDocumentationBundle.properties
rename to plugins/gradle/resources/messages/GradleDocumentationBundle.properties
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleBundle.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleBundle.java
index 845d130c3993..17812fc0f32c 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleBundle.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleBundle.java
@@ -16,6 +16,7 @@
 package org.jetbrains.plugins.gradle.util;
 
 import com.intellij.DynamicBundle;
+import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
@@ -23,14 +24,13 @@ import org.jetbrains.annotations.PropertyKey;
  * @author Denis Zhdanov
  */
 public class GradleBundle extends DynamicBundle {
+  @NonNls public static final String PATH_TO_BUNDLE = "messages.GradleBundle";
+  private static final GradleBundle BUNDLE = new GradleBundle();
 
   public static String message(@NotNull @PropertyKey(resourceBundle = PATH_TO_BUNDLE) String key, @NotNull Object... params) {
     return BUNDLE.getMessage(key, params);
   }
 
-  public static final String PATH_TO_BUNDLE = "i18n.GradleBundle";
-  private static final GradleBundle BUNDLE = new GradleBundle();
-
   public GradleBundle() {
     super(PATH_TO_BUNDLE);
   }
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleDocumentationBundle.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleDocumentationBundle.java
index e688d6f1f773..8c736c4f7ba3 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleDocumentationBundle.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleDocumentationBundle.java
@@ -16,11 +16,12 @@
 package org.jetbrains.plugins.gradle.util;
 
 import com.intellij.DynamicBundle;
+import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
 public class GradleDocumentationBundle extends DynamicBundle {
-  private static final String BUNDLE = "i18n.GradleDocumentationBundle";
+  @NonNls private static final String BUNDLE = "messages.GradleDocumentationBundle";
 
   public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, @NotNull Object... params) {
     return INSTANCE.getMessage(key, params);