Skip to content

Update Chinese (Simplified) translations #2454

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.

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

Merged
merged 1 commit into from
Nov 30, 2020

Conversation

yfdyh000
Copy link
Contributor

No description provided.

@justinclift
Copy link
Member

Thanks @yfdyh000, that looks very helpful. 😄

@bssthu @mercury233 Do either of you have time to look this over quickly?

@mercury233
Copy link
Contributor

nice work, but some texts translated by me seem not be used as base (我对此倒是没有意见,只是觉得奇怪), @justinclift the translation files in the master branch didn't get updated with the v3.12.x branch?

@justinclift
Copy link
Member

@mercury233 Oops, you're right. The PR from #2421 was only merged into the v3.12.x branch... and not merged into master.

Hmmm, I guess the best approach here will be to merge that translations from #2421 into master first, then see what needs applying from this PR here (#2454) to it.

Does that sound reasonable?

@mgrojo
Copy link
Member

mgrojo commented Nov 28, 2020

I cherry-picked recently some of the missing translations in the master branch, but it seems I missed this one (unintentionally). We could solve it ourselves by merging first #2421 and then this PR, resolving the conflicts blindly in favour of the first translation. But ideally, it should be done by a Chinese speaker, so the best regarded translation can be chosen for each conflict.

@mercury233
Copy link
Contributor

@yfdyh000 is an expert in translation so I prefer his choice

@mgrojo
Copy link
Member

mgrojo commented Nov 30, 2020

Perfect, then let's not delay it more. I'll merge it now. Could someone confirm with tomorrow's nightly build that shortcuts are working fine? A user reported problems when the shortcut was translated (even in this case, where the text are equal) and we are a bit suspicious since then.

@mgrojo mgrojo merged commit 4a47575 into sqlitebrowser:master Nov 30, 2020
@yfdyh000
Copy link
Contributor Author

yfdyh000 commented Dec 5, 2020

Perfect, then let's not delay it more. I'll merge it now. Could someone confirm with tomorrow's nightly build that shortcuts are working fine? A user reported problems when the shortcut was translated (even in this case, where the text are equal) and we are a bit suspicious since then.

Check the https://nightlies.sqlitebrowser.org/latest/ page, no windows builds were updated.

In addition, I have tried repeatedly but failed to building this software on Windows or https://ci.appveyor.com/. This may needs updated build instructions, clearer processing steps, and CI for Windows os.

@chrisjlocke
Copy link
Member

chrisjlocke commented Dec 5, 2020

nudges @justinclift - Are the Windows nightlies OK? (last built 27 Nov).

@yfdyh000 - " I have tried repeatedly but failed to building this software on Windows" - what error are you getting and at what stage? There are numerous steps, and knowing what point you're at would help us assist. :)

@justinclift
Copy link
Member

justinclift commented Dec 6, 2020

nudges @justinclift - Are the Windows nightlies OK? (last built 27 Nov).

Looking now. Ugh. The build server ran out of space, so suspended the windows VM. I've been putting off upgrading it's storage to something bigger, but I'd better get it done. That build server only has a ~250GB SSD which everything is running off, and the macOS VM grows over time without reclaiming disk space.

I'll clear off some space now, get the VMs running again, and order a bigger SSD for it. 😉 It'll probably take a few hours until the VMs are running again, as they need to be copied to external storage then moved back (slow). 😉

@justinclift
Copy link
Member

Have now ordered a new SSD (~500GB) for the build server, which will turn up in the next few days. The VMs themselves are still copying around... 😉

@chrisjlocke
Copy link
Member

What's the OS? Plain Windows, or server version? I'd recommend Macrium Reflect to clone it - there is a free version. I don't know what toy's you've got in a box, but these are damn useful for doing stuff like this: https://www.amazon.co.uk/USB-SATA-Adapter-Cable-Drives-en-GB-SATA-USB-3-0-converter/dp/B01N2JIQR7 - can simply image the drive while Windows is ticking along.

@justinclift
Copy link
Member

justinclift commented Dec 6, 2020

What's the OS?

macOS. Cloning to a new drive on macOS is pretty straight forward. Have done it a few times before over the years. 😄

@chrisjlocke
Copy link
Member

Oooooh. Well, there is CloneZilla then, but you'd need a storage area for the image (network, etc). 😃

@justinclift
Copy link
Member

justinclift commented Dec 6, 2020

Network storage area for the image isn't a problem. I have a NAS. 😄

@justinclift
Copy link
Member

Btw, new Win32 and Win64 "latest nightly" builds are now online. They're using SQLite 3.34.0, which was released a few days ago. Hopefully they work ok.

Next step, copy the macOS VM image back onto the build server...

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

Successfully merging this pull request may close these issues.

6 participants