Skip to content
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

Jump to bottom

L10n update master 20160127 #1376

Merged
merged 1 commit into from
May 13, 2016
Merged

L10n update master 20160127 #1376

merged 1 commit into from
May 13, 2016

Conversation

milamberspace
Copy link
Contributor

@milamberspace milamberspace mentioned this pull request Jan 27, 2016
Closed
@koushik-das
Copy link
Contributor

The changes are only limited to UI, so there is no need to run smoke/integration tests.
Cursory look at the changes looks fine.
@swill I think these should be merged unless some language expert want to comment.

@swill
Copy link
Contributor

swill commented Apr 19, 2016

Thanks koushik. I tend to agree with you on this one. I will add it to my merge list. Thanks...

@swill swill mentioned this pull request Apr 19, 2016
Closed
@milamberspace
Copy link
Contributor Author

@swill I've just rebase from master, update the L10N files and push --force this PR.
cc @koushik-das

@swill
Copy link
Contributor

swill commented Apr 20, 2016

Jenkins failed with a timeout (not related to your code). Can you squash your commits and do a force push again? Sorry for the runaround..

@milamberspace
Copy link
Contributor Author

@swill squash & force push done.

@swill
Copy link
Contributor

swill commented Apr 20, 2016

@DaanHoogland do you know why jenkins is failing here?

@DaanHoogland
Copy link
Contributor

@swill, @milamberspace sorry, the build is gone, I didn't react quick enough

@swill
Copy link
Contributor

swill commented Apr 21, 2016

That is fine. @milamberspace would you mind just doing a force push again to kick off jenkins. I have seen other jenkins runs passing so I think jenkins is just not happy when it has a lot of load.

swill
swill reviewed Apr 21, 2016
View reviewed changes
tools/transifex/.tx/config
@@ -89,3 +89,41 @@ 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

[CloudStack_UI.48xmessagesproperties]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this change be targeted against the 4.8 branch? Seems strange that we would be merging it into 4.9 and it applies to 4.8 but is not in the 4.8 source code. Thoughts?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@swill this changes will be done by the PR #1375

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If it will be added in #1375, I think we should be removing it from this PR? Once we get #1375 in, you will have to rebase and fix conflicts. When the changes are added to 4.8, they will then be forward merged into master (4.9), so we will want to get #1375 in first and then rebase this PR against master after that PR has been merged into master. Thanks...

@milamberspace
Copy link
Contributor Author

@swill Re-push-force is done.

@rohityadavcloud
Copy link
Member

LGTM

tag:easypr

This was referenced May 2, 2016
Closed
Merged
@swill
Copy link
Contributor

swill commented May 4, 2016

This PR currently has merge conflicts, but #1515 is next in line, so you may want to wait till it is merged before you fix these conflicts.

@swill
Copy link
Contributor

swill commented May 11, 2016

#1515 has now been merged (sorry for the delay). Once you have a chance to fix the merge conflicts, I can get this merged. Thx...

@milamberspace
Copy link
Contributor Author

@swill conflicts are fixed. Ready to merge. Thanks.

@rohityadavcloud
Copy link
Member

@swill @milamberspace weird, we've lost our Travis integration with PRs here. https://travis-ci.org/apache/cloudstack/ says "The repository at apache/cloudstack was not found"

@swill swill mentioned this pull request May 11, 2016
Merged
@swill
Copy link
Contributor

swill commented May 12, 2016

@milamberspace can you do a force push again. I have pushed fixes to Jenkins and Travis this morning, so with a new push we should be able to get this green. Thx...

@milamberspace
Update L10N resource files with 4.9 strings from Transifex (20160511)
9b93989 
Force "translator" mode with the transifex client.
Update Transifex client config file (regenerated by Tx client)
@milamberspace
Copy link
Contributor Author

@swill Done. Jenkins and Travis are green now. Ready to merge.

@rohityadavcloud
Copy link
Member

LGTM

tag:mergeready

@asfgit asfgit merged commit 9b93989 into apache:master May 13, 2016
asfgit pushed a commit that referenced this pull request May 13, 2016
@swill
Merge pull request #1376 from milamberspace/L10N-update-Master-20160127
3343f12 
L10n update master 20160127cc @remibergsma @bhaisaab @DaanHoogland

* pr/1376:
  Update L10N resource files with 4.9 strings from Transifex (20160511) Force "translator" mode with the transifex client. Update Transifex client config file (regenerated by Tx client)

Signed-off-by: Will Stevens <[email protected]>
@bvbharatk
Copy link
Contributor

ACS CI BVT Run

Sumarry:
Build Number 56
Hypervisor xenserver
NetworkType Advanced
Passed=72
Failed=1
Skipped=3

Link to logs Folder (search by build_no): https://www.dropbox.com/sh/yj3wnzbceo9uef2/AAB6u-Iap-xztdm6jHX9SjPja?dl=0

Failed tests:

  • test_vpc_vpn.py
    • test_01_redundant_vpc_site2site_vpn Failed

Skipped tests:
test_vm_nic_adapter_vmxnet3
test_static_role_account_acls
test_deploy_vgpu_enabled_vm

Passed test suits:
test_deploy_vm_with_userdata.py
test_affinity_groups_projects.py
test_portable_publicip.py
test_over_provisioning.py
test_global_settings.py
test_scale_vm.py
test_service_offerings.py
test_routers_iptables_default_policy.py
test_routers.py
test_reset_vm_on_reboot.py
test_snapshots.py
test_deploy_vms_with_varied_deploymentplanners.py
test_deploy_vm_iso.py
test_list_ids_parameter.py
test_public_ip_range.py
test_multipleips_per_nic.py
test_regions.py
test_affinity_groups.py
test_network_acl.py
test_pvlan.py
test_volumes.py
test_nic.py
test_deploy_vm_root_resize.py
test_resource_detail.py
test_secondary_storage.py
test_vm_life_cycle.py
test_disk_offerings.py

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@milamberspace @koushik-das @swill @DaanHoogland @rohityadavcloud @bvbharatk @asfgit