L10n update 4.8 20160422 #1515
L10n update 4.8 20160422 #1515
Conversation
|
Can you squash the commits for me? I will get this merged and then forward merged to master and then we can rebase the other ones to to make sure we don't have merge conflicts. Thanks... |
milamberspace
force-pushed
the
L10N-update-4.8-20160422
branch
from
819a5b4
to
cb3f29f
Compare
|
@swill It's done. |
|
@milamberspace sorry to do this to you again. :( Can you force push again so we can try to get travis green. Thanks... |
milamberspace
force-pushed
the
L10N-update-4.8-20160422
branch
from
cb3f29f
to
99e9297
Compare
|
@swill re-push force done. |
|
@milamberspace and again. :P sorry... |
milamberspace
force-pushed
the
L10N-update-4.8-20160422
branch
from
99e9297
to
cc3dee5
Compare
|
@swill re-done. |
|
Well Jenkins just does not like us today. Can you review the error and see if it is a valid error and try again? |
|
I see another PR with the same error, so I doubt it is your PR. |
milamberspace
force-pushed
the
L10N-update-4.8-20160422
branch
from
cc3dee5
to
989f735
Compare
|
@swill Now the Jenkins build works, but the Travis failed with: |
milamberspace
force-pushed
the
L10N-update-4.8-20160422
branch
from
989f735
to
289169a
Compare
|
@swill after a new push to start a new Travis build, Travis and Jenkins are now green! You can merge the PR! :-) |
|
awesome, thank you sir. i will get this merged today... |
|
LGTM tag:mergeready |
milamberspace
force-pushed
the
L10N-update-4.8-20160422
branch
2 times, most recently
from
e785620
to
f30bb54
Compare
|
@swill conflicts fixed. Push with force done, ready to merge. |
milamberspace
force-pushed
the
L10N-update-4.8-20160422
branch
3 times, most recently
from
0a9c051
to
1d9b6d5
Compare
Force "translator" mode with the transifex client. Update Transifex client config file for 4.8 resources/L10N ref. (generated by Tx client)
milamberspace
force-pushed
the
L10N-update-4.8-20160422
branch
from
1d9b6d5
to
e81a6b2
Compare
L10n update 4.8 20160422@swill the good PR for 4.8 branch. * pr/1515: Update L10N resource files with 4.8 strings from Transifex (20160504) Force "translator" mode with the transifex client. Update Transifex client config file for 4.8 resources/L10N ref. (generated by Tx client) Signed-off-by: Will Stevens <[email protected]>
@swill the good PR for 4.8 branch.