Reviewing merge request #440: Update of localization files included in Czech translation of Qt

Update of localization files included in Czech translation of Qt: Qt Designer, Qt Assistant, Qt, Qt Help.

Commits that would be merged:

Version 1
  • Version 1
  • d6af21c
  • 33ac705
  • Added latest .ts files provided by Pavel.

  • b1c67e3
  • Modified .pro and .pri files to integrate Czech .ts files.

  • 8abe4a3
  • Updated .ts files from sources strings.

  • e139c61
  • Added remaining translations from Pavel.

Showing d6af21c-33ac705

Comments

→ State changed from New to Revise and resubmit

i have no idea what this MR is supposed to be … the source indicates that it is a 4.6 branch (which would be good), but then, why am i supposed to merge it into master? and why was there a second MR also against master? i'm thoroughly confused …

I have to explain it:
first I updated about 5 months old merge request – you asked to remove it, because it was unfortunate and not wise,
so then I deleted it completely (I think – there is button allowing to do it, so I pushed it),
also I created this merge request newly – I looked for and found old description how to do it, and repeated the steps (it probably hasn’t sense – the files were already merged),
then I created new merge request for the files, that were submitted these days (if this is correct word) thanks to your commands, that were sent to me (I don’t know nothing about Git, I just transcribe commands given by other persons – and the machine does something or does nothing).
I copied completed localization files to folder with localization before this submit, of course – the files were sent by you via e-mail and I completed them (I made steps described by you with exception of updating .ts files – I haven’t compiled Qt from source, so it didn’t work – if I understood right the problem.
The reason why I choosed source and target branches as I did is simply in fact, that I didn’t see another option, so I choosed, what offered.
I would be more lucky, if the files would have been uploaded to “czech-translation” branche and I could choose it as source branche, but this didn’t happen. I really didn’t know, where the files would be submitted, when pressing enter after typing these commands. Tomorrow I’ll go to relax for some following days.

→ State changed from Revise and resubmit to Merged

ahh, so this is already the recreated MR 440. i’ll see what i can do with it.

the gitorious guys changed the id, so now everything is in place again. :)

in fact, something went terribly wrong … this is the totally wrong commit

gitorious guys fixed it. :–)

Add a new comment:

Login or create an account to post a comment

How to apply this merge request to your repository