Skip to content
This repository has been archived by the owner on Sep 6, 2021. It is now read-only.

Merge #5331 with master #5461

Merged
merged 2 commits into from
Oct 9, 2013
Merged

Merge #5331 with master #5461

merged 2 commits into from
Oct 9, 2013

Conversation

njx
Copy link

@njx njx commented Oct 9, 2013

Merged #5331 (Czech language update) with master, resolved conflicts and fixed the erroneously changed <a> tags. Also took @martinstarman's advice to retain the previous translations for LIVE_DEV_STATUS_TIP_OUT_OF_SYNC and LIVE_DEV_STATUS_TIP_SYNC_ERROR.

/cc @kvarel

@njx njx mentioned this pull request Oct 9, 2013
njx pushed a commit that referenced this pull request Oct 9, 2013
@njx njx merged commit 87696f7 into master Oct 9, 2013
@njx njx deleted the njx/merge-5331 branch October 9, 2013 23:31
@martinstarman
Copy link
Contributor

Looks good!

@njx
Copy link
Author

njx commented Oct 10, 2013

Thanks @martinstarman!

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants