diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-08-20 17:28:18 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2014-08-20 17:28:18 -0700 |
| commit | d76e3920c56d37c942092b7dca20fcaded81c0a5 (patch) | |
| tree | 80a55c7b59c38377216daaada4e8bc47b69ceb9a /platform/platform-resources-en/src/messages/RefactoringBundle.properties | |
| parent | 3b37877a2561bf9fbe072253a18688807d523505 (diff) | |
| parent | 1aa2e09bdbd413eacb677e9fa4b50630530d0656 (diff) | |
| download | idea-d76e3920c56d37c942092b7dca20fcaded81c0a5.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
.idea/modules.xml
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesXmlLoader.java
Change-Id: Id899dae9a1e1c79272f8a70e14a7dcef4f760d7f
Diffstat (limited to 'platform/platform-resources-en/src/messages/RefactoringBundle.properties')
| -rw-r--r-- | platform/platform-resources-en/src/messages/RefactoringBundle.properties | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/platform/platform-resources-en/src/messages/RefactoringBundle.properties b/platform/platform-resources-en/src/messages/RefactoringBundle.properties index 080dce748805..48d0e63d60c0 100644 --- a/platform/platform-resources-en/src/messages/RefactoringBundle.properties +++ b/platform/platform-resources-en/src/messages/RefactoringBundle.properties @@ -438,6 +438,7 @@ inline.command=Inline {0} inline.local.variable.prompt=Inline local variable ''{0}''? inline.local.variable.definition.prompt=Inline local variable ''{0}'' definition? occurences.string=({0,choice,1#1 occurrence|2#{0,number} occurrences}) +occurrences.string=({0,choice,1#1 occurrence|2#{0,number} occurrences}) inline.method.title=Inline Method inline.method.method.label=Method {0} inline.method.border.title=Inline |