Skip to content

Merge 4.5 to master #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
karuturi wants to merge 8 commits into from
Closed

Merge 4.5 to master #42

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2d3b337
Revert "CLOUDSTACK-7821: Fix OSX cannot connect to VPN due to wrongly…
Nov 14, 2014
425a6b0
CLOUDSTACK-7918:
Nov 14, 2014
303fc90
Update L10N resource files on master branch (with 4.5 translation str…
milamberspace Nov 15, 2014
25e5d00
Add 4.5.x messages.properties to Transifex config tool
milamberspace Nov 15, 2014
19781e0
CLOUDSTACK-7913 : Added reconnect functionality to Host class in base.py
pckreddy Nov 14, 2014
5f99917
CLOUDSTACK-7912: Remove hardcoded netscaler info and read it from con…
Nov 14, 2014
635abaf
CLOUDSTACK-7927: UI > Infrastructure > Primary Storage > detailView >…
Nov 17, 2014
aa5cb08
Merge branch '4.5'
karuturi Nov 18, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add 4.5.x messages.properties to Transifex config tool
  • Loading branch information
@milamberspace
milamberspace committed Nov 15, 2014
commit 25e5d00f6016b31fc178da97c7125c2f37a8c40d
20 changes: 20 additions & 0 deletions tools/transifex/.tx/config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,23 @@ file_filter = translations/CloudStack_UI.44xmessagesproperties/<lang>.properties
source_lang = en
type = UNICODEPROPERTIES

[CloudStack_UI.45xmessagesproperties]
file_filter = translations/CloudStack_UI.45xmessagesproperties/<lang>.properties
source_file = work-dir/messages.properties
source_lang = en
trans.ar = work-dir/messages_ar.properties
trans.ca = work-dir/messages_ca.properties
trans.de_DE = work-dir/messages_de_DE.properties
trans.es = work-dir/messages_es.properties
trans.fr_FR = work-dir/messages_fr_FR.properties
trans.it_IT = work-dir/messages_it_IT.properties
trans.ja_JP = work-dir/messages_ja_JP.properties
trans.ko_KR = work-dir/messages_ko_KR.properties
trans.nb_NO = work-dir/messages_nb_NO.properties
trans.nl_NL = work-dir/messages_nl_NL.properties
trans.pl = work-dir/messages_pl.properties
trans.pt_BR = work-dir/messages_pt_BR.properties
trans.ru_RU = work-dir/messages_ru_RU.properties
trans.zh_CN = work-dir/messages_zh_CN.properties
type = UNICODEPROPERTIES