diff options
author | Tor Norbye <tnorbye@google.com> | 2014-08-19 22:27:03 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-19 21:25:05 +0000 |
commit | 4ca751c002784c4bfd349cc5240b045b62277c80 (patch) | |
tree | dfc17b31990e2429535609b85f6d080c4fa0d9fe /platform/platform-resources-en/src/messages/VcsBundle.properties | |
parent | 890d9a2952301682ffecaed4495f5f65c84c3642 (diff) | |
parent | 060e58b3afea3ea39f5ba1cb5a443ca3ebda28c8 (diff) | |
download | idea-4ca751c002784c4bfd349cc5240b045b62277c80.tar.gz |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'platform/platform-resources-en/src/messages/VcsBundle.properties')
-rw-r--r-- | platform/platform-resources-en/src/messages/VcsBundle.properties | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/platform-resources-en/src/messages/VcsBundle.properties b/platform/platform-resources-en/src/messages/VcsBundle.properties index 3d34252c9c7a..573cff8e6261 100644 --- a/platform/platform-resources-en/src/messages/VcsBundle.properties +++ b/platform/platform-resources-en/src/messages/VcsBundle.properties @@ -308,7 +308,7 @@ changes.action.rollback.custom.title={0} Changes changes.action.rollback.nothing=Nothing to {0} changes.dialog.editchangelist.error.already.exists=A changelist named ''{0}'' already exists error.adding.files.prompt=The following problems have occurred when adding the files: -error.adding.files.title=Error adding files +error.adding.files.title=Error Adding Files column.name.revision.list.committer=User column.name.revision.list.number=Number column.name.revision.list.description=Description |