Russian translation update, for 2.4.x

[ValdikSS]

OlesyaGerasimenko's squashed update from #852 + my changes. The same as #895, accidental repo deletion.

For 2.4.x.

[zdohnal]

@ValdikSS I saw the update brings some duplicates into cups_ru.po - I found duplicated entries of the following strings:

Unable to create PPD file:
Unable to query printer: 
Unable to resolve:
-P filename.ppd
Unable to establish a secure connection to host (%d).
Unable to establish a secure connection to host (certificate chain invalid).
Unable to establish a secure connection to host (certificate not yet valid).
Unable to establish a secure connection to host (expired certificate).
Unable to establish a secure connection to host (host name mismatch).
Unable to establish a secure connection to host (peer dropped connection before responding)
Unable to establish a secure connection to host (self-signed certificate).
Unable to establish a secure connection to host (untrusted certificate).
Unable to establish a secure connection to host.
Unknown directive \"%s\" on line %d of \"%s\" ignored.
ippeveprinter: Unable to open \"%s\": %s on line %d.
ippfind: Unable to browse or resolve: %s
ippfind: Unable to use Bonjour: %s

Can you remove those duplicated entries?

Thank you in advance!

[ValdikSS]

@ValdikSS I saw the update brings some duplicates into cups_ru.po - I found duplicated entries of the following strings:
Can you remove those duplicated entries?

Thank you in advance!

Done

[ValdikSS]

Any comments, updates?

[mikhailnov]

+1, looks good.
But: например с двух сторон выделяется запятыми по идее.

[alexpevzner]

@michaelrsweet,

This PR is pending for more tha 4 months now. Can we somehow proceed with it?

I've reviewed this patch, it looks OK for me. And it significantly improves quality of Russian translation.

As a lot of time has passed since the PR was created, it has file conflicts now. @ValdikSS, could you please update your changes to resolve these conflicts?

Thanks in advance!

[zdohnal]

@alexpevzner I'm sorry for that - the changes in one file are too big for Github to show, so I had to copy the ValdikSS file and compare them locally. And once ValdikSS squashed the commits after the last review (which is my problem - I should told him to squash commits once we are done...), I got scared from reviewing the whole file again...
I always try to review the changes to the best of my ability, especially after xz issue...

I'll try to get to it today.

[zdohnal]

@ValdikSS once you get to resolving conflict, please add it as a separate commit - to make distinction about the change (the same in PR for master branch). Thank you in advance!

[zdohnal]

@ValdikSS btw is there a reason for replacing tab characters ('\t') and names in upper case letters with names in lower case letters?
I maybe missing something, but it looks harmless, but it creates many differences which have to be checked, instead of focusing on the real changes which brings new Russian translations...

If there is no reason for them to be like this - other .po files have it in upper case and tabs - would you mind letting them as it is? It would help a lot during review.

[zdohnal]

Except for conflict, it looks fine - please look into the conflict (do a separate commit) and I can at least merge 2.4.x and then look into PR for master branch.

[zdohnal]

In the end, changes like "-P FILENAME.ppd" -> "-P filename.ppd" in msgids are incorrect - those strings have to match with the strings in the actual code.

I see this for "filename", "username", "printer", "job-id", "mime/type", "copies", "title", "name", "value".

EDIT: Looks like the lower case msgids are commented out by #~, so please put the uppercase ones back and comment out the lowercase ones.

[ValdikSS]

@ValdikSS btw is there a reason for replacing tab characters ('\t') and names in upper case letters with names in lower case letters?
In the end, changes like "-P FILENAME.ppd" -> "-P filename.ppd" in msgids are incorrect - those strings have to match with the strings in the actual code.

These are from OlesyaGerasimenko, I hardly touched .po file myself, only fixed it.
I'll be able to work on this merge only in 2 weeks.

[ValdikSS]

In the end, changes like "-P FILENAME.ppd" -> "-P filename.ppd" in msgids are incorrect - those strings have to match with the strings in the actual code.

Where do you see it? Which commit, which line?
I don't see any uppercase FILENAME.ppd version in either RU or EN translation .po file. And not in this set of changes.

UPD: sorry I'm dumb, I got it.

[ValdikSS]

It doesn't seem to be possible to fix merge conflict without rebasing.
How should I proceed without squashing, but not introducing conflicts? If I rebase the commits first, it would change the hash, if that's what you care about.