Brian Federle 7b011e7ef4 Merge branch 'master' into ui-vm-affinity ...

Conflicts:
	client/WEB-INF/classes/resources/messages.properties
	ui/scripts/cloudStack.js
	ui/scripts/instanceWizard.js

2013-04-22 13:45:29 -07:00

..

messages_fr_FR.properties

Improvements for French translation for Admin Web UI (for better display or better meaning). Add some missing translations.

2013-04-22 18:16:04 +00:00

messages_ja.properties

CLOUDSTACK-1184 Localization - Add Korean label to all locales

2013-02-07 14:05:36 +05:30

messages_ko_KR.properties

CLOUDSTACK-1184 Localization - Add Korean label to all locales

2013-02-07 14:05:36 +05:30

messages_pt_BR.properties

CLOUDSTACK-1184 Localization - Add Korean label to all locales

2013-02-07 14:05:36 +05:30

messages_ru_RU.properties

CLOUDSTACK-1184 Localization - Add Korean label to all locales

2013-02-07 14:05:36 +05:30

messages_zh_CN.properties

CLOUDSTACK-1184 Localization - Add Korean label to all locales

2013-02-07 14:05:36 +05:30

messages.properties

Merge branch 'master' into ui-vm-affinity

2013-04-22 13:45:29 -07:00