By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.
Bug 952 - [i18n] TDEBase, TDELibs translation to Russian and Ukrainian update
Summary: [i18n] TDEBase, TDELibs translation to Russian and Ukrainian update
Status: RESOLVED FIXED
Alias: None
Product: TDE
Classification: Unclassified
Component: other (any) (show other bugs)
Version: 3.5.13 [Trinity]
Hardware: Other All
: P5 enhancement
Assignee: Michele Calgaro
URL:
Depends on:
Blocks: 2014
  Show dependency tree / graph
 
Reported: 2012-03-31 04:38 CDT by Roman Savochenko
Modified: 2014-07-27 21:35 CDT (History)
6 users (show)

See Also:
Compiler Version:
TDE Version String:
Application Version:
Application Name:

Attachments
kde-i18n-ru (668.14 KB, application/x-compressed-tar)
2012-03-31 04:38 CDT, Roman Savochenko 		Details
kde-i18n-uk (675.41 KB, application/x-compressed-tar)
2012-03-31 04:39 CDT, Roman Savochenko 		Details
Attempted patch against GIT (1.86 MB, application/octet-stream)
2012-06-09 16:13 CDT, Timothy Pearson 		Details
Patch for RU-translation to TDE-3.5.13.1 (936.74 KB, application/x-gzip)
2012-10-23 13:10 CDT, Roman Savochenko 		Details
Patch for UK-translation to TDE-3.5.13.1 (945.96 KB, application/x-gzip)
2012-10-23 13:11 CDT, Roman Savochenko 		Details
Patch for RU-translation to TDE-3.5.13.2 (943.50 KB, application/x-gzip)
2013-07-15 07:34 CDT, Roman Savochenko 		Details
Patch for UK-translation to TDE-3.5.13.2 (952.68 KB, application/x-gzip)
2013-07-15 07:35 CDT, Roman Savochenko 		Details
Patch for full RU-translation to TDE-3.5.13.2 (949.97 KB, text/plain)
2013-08-05 07:48 CDT, Roman Savochenko 		Details
Patch for full UK-translation to TDE-3.5.13.2 (958.91 KB, text/plain)
2013-08-05 07:49 CDT, Roman Savochenko 		Details
*.desktop and some other translation fix for Russian and Ukrainian (2.07 KB, patch)
2013-08-05 07:53 CDT, Roman Savochenko 		Details | Diff
Show Obsolete (10) View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Roman Savochenko 2012-03-31 04:38:29 CDT 
Created attachment 514 [details]
kde-i18n-ru

Translation for Russian and Ukrainian languages is updated for TDEBase, TDELibs.

For addons see to error renaming "tq" into source messages like:
For tdelibs:
- part/katedocument.cpp:2592 "... tqunicode character ..."
- part/katedialogs.cpp:709 "... tqalignment applied ..."
- cups/kpimagepage.cpp:192 "... image tqalignment on paper ..."


For tdebase:
- htmlopts.cpp:112 "... the tqshape of the cursor ..."
- configdialog.cpp:233 "... (see http://doc.trolltech.com/tqregexp.html#details)"
- about/konq_aboutpage.cc:298 "... 16bit tqunicode support"

Please apply the translations to kde-i18n-ru-3.5.13 and kde-i18n-uk-3.5.13
Comment 1 Roman Savochenko 2012-03-31 04:39:07 CDT 
Created attachment 515 [details]
kde-i18n-uk
Comment 2 Darrell 2012-04-01 20:19:20 CDT 
The tqshape|tqunicode|tqalignment errors were fixed quite a while ago in GIT.

Are these updates based upon 3.5.13 sources or GIT sources?
Comment 3 Roman Savochenko 2012-04-01 23:59:15 CDT 
(In reply to comment #2)
> The tqshape|tqunicode|tqalignment errors were fixed quite a while ago in GIT.
OK.

> Are these updates based upon 3.5.13 sources or GIT sources?
The updates based on 3.5.13 release packages, which taken from here http://www.trinitydesktop.org/releases/3.5.13
Comment 4 Darrell 2012-04-02 01:13:32 CDT 
(In reply to comment #3)
> > Are these updates based upon 3.5.13 sources or GIT sources?
> The updates based on 3.5.13 release packages, which taken from here
> http://www.trinitydesktop.org/releases/3.5.13

Ok. That means the patches have to be massaged to merge to GIT. :(
Comment 5 Roman Savochenko 2012-04-02 03:09:00 CDT 
(In reply to comment #4)
> Ok. That means the patches have to be massaged to merge to GIT. :(
Why? My packages is not patches and it is changed *.po archive.
You simple place it to local git tree and commit.
In any case, comparing to original 3.5.10 translation, new is mostly fresh and full.
Comment 6 Timothy Pearson 2012-06-09 15:39:58 CDT 
(In reply to comment #5)
> (In reply to comment #4)
> > Ok. That means the patches have to be massaged to merge to GIT. :(
> Why? My packages is not patches and it is changed *.po archive.
> You simple place it to local git tree and commit.
> In any case, comparing to original 3.5.10 translation, new is mostly fresh and
> full.

It is usually best to run a 'diff -urN <original_i18n_directory> <fixed_i18n_directory> > patch.diff' command and then upload the patch to a bug report instead of uploading a tarball of new files.  This is because we have to generate a patch file with that method before application to GIT, otherwise we risk overwriting any changes that were made to the translation files between 3.5.13 and the current GIT HEAD.
Comment 7 Timothy Pearson 2012-06-09 16:09:30 CDT 
This patch will not apply against the GIT sources.  I hate to say this, but the translations will need to be re-done against the current GIT HEAD in order to apply to TDE.
Comment 8 Timothy Pearson 2012-06-09 16:13:14 CDT 
Created attachment 650 [details]
Attempted patch against GIT

For reference, I have attached what I attempted to apply to GIT.
Comment 9 Roman Savochenko 2012-06-15 08:19:34 CDT 
(In reply to comment #6)
> It is usually best to run a 'diff -urN <original_i18n_directory>
> <fixed_i18n_directory> > patch.diff' command and then upload the patch to a bug
> report instead of uploading a tarball of new files.  
It is best if *.po files central updated and need only translation place. But it is not best by reason full regeneration *.po files with gettext like that:
/usr/lib/kde3/bin/xgettext -C -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 *.cpp -o src.pot
rm -f rez.po; /usr/lib/kde3/bin/msgmerge *.po src.pot > rez.po

And this make individualy and manualy by "thanks" for migration to cmake and miss all rules with gettext.

> This is because we have to
> generate a patch file with that method before application to GIT, otherwise we
> risk overwriting any changes that were made to the translation files between
> 3.5.13 and the current GIT HEAD.
Do you more updates to the translations seen after migration to cmake?
Comment 10 Roman Savochenko 2012-06-15 08:31:50 CDT 
(In reply to comment #8)
> Created attachment 650 [details]
> Attempted patch against GIT
> 
> For reference, I have attached what I attempted to apply to GIT.
Simple place the files, renaming for needs TDE renaming, to local GIT tree and commit this, please see previous my justification!
Comment 11 Timothy Pearson 2012-06-15 08:44:56 CDT 
(In reply to comment #9)
> (In reply to comment #6)
> > It is usually best to run a 'diff -urN <original_i18n_directory>
> > <fixed_i18n_directory> > patch.diff' command and then upload the patch to a bug
> > report instead of uploading a tarball of new files.  
> It is best if *.po files central updated and need only translation place. But
> it is not best by reason full regeneration *.po files with gettext like that:
> /usr/lib/kde3/bin/xgettext -C -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 *.cpp
> -o src.pot
> rm -f rez.po; /usr/lib/kde3/bin/msgmerge *.po src.pot > rez.po
> 
> And this make individualy and manualy by "thanks" for migration to cmake and
> miss all rules with gettext.
> 
> > This is because we have to
> > generate a patch file with that method before application to GIT, otherwise we
> > risk overwriting any changes that were made to the translation files between
> > 3.5.13 and the current GIT HEAD.
> Do you more updates to the translations seen after migration to cmake?

Yes, or to be more specific there were updates to translatable strings in the source code.  I imagine this is why the updates are not applying cleanly to GIT, however I am not very skilled with the translation system and may simply be going about this the wrong way! :-)  All I know right now is that I can't just dump the provided tarballs into GIT without breaking translation support for ru and uk.

I wonder if I can use the msgmerge program to cleanly overlay your new translations into the existing files in GIT.
Comment 12 Roman Savochenko 2012-06-21 01:59:08 CDT 
(In reply to comment #11)
> Yes, or to be more specific there were updates to translatable strings in the
> source code. 
Where can I see this updates?

> I imagine this is why the updates are not applying cleanly to
> GIT, however I am not very skilled with the translation system and may simply
> be going about this the wrong way! :-)  
May be need for you try some translation self update, for understand other translators? Elsewhere TDE left with original KDE 3.5.10 translations.

> All I know right now is that I can't
> just dump the provided tarballs into GIT without breaking translation support
> for ru and uk.
I do not see any changes after original 3.5.10 translation for "ru" and "uk" and what breaking translation can be?
 
> I wonder if I can use the msgmerge program to cleanly overlay your new
> translations into the existing files in GIT.
For normal developming process the translation must be updated before release, by call some like:
/usr/lib/kde3/bin/xgettext -C -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 *.cpp
-o src.pot
rm -f rez.po; /usr/lib/kde3/bin/msgmerge *.po src.pot > rez.po

That calls, specified for program's part context, present and allowed by autotools call "make messages", but into cmake rulles this miss. Do you make position for TDE as no translated to other languages program environment?

After that, translators take *.po files and simple correct and append notranslated messages.
Comment 13 Roman Savochenko 2012-10-23 13:10:48 CDT 
Created attachment 928 [details]
Patch for RU-translation to TDE-3.5.13.1
Comment 14 Roman Savochenko 2012-10-23 13:11:50 CDT 
Created attachment 929 [details]
Patch for UK-translation to TDE-3.5.13.1
Comment 15 Roman Savochenko 2012-10-23 13:14:52 CDT 
Translation patches to RU and UK update for tdelibs and tdebase for TDE-3.5.13.1 included.
Comment 16 Roman Savochenko 2013-07-15 07:34:39 CDT 
Created attachment 1345 [details]
Patch for RU-translation to TDE-3.5.13.2
Comment 17 Roman Savochenko 2013-07-15 07:35:25 CDT 
Created attachment 1346 [details]
Patch for UK-translation to TDE-3.5.13.2
Comment 18 Roman Savochenko 2013-08-05 07:48:41 CDT 
Created attachment 1443 [details]
Patch for full RU-translation to TDE-3.5.13.2
Comment 19 Roman Savochenko 2013-08-05 07:49:39 CDT 
Created attachment 1444 [details]
Patch for full UK-translation to TDE-3.5.13.2
Comment 20 Roman Savochenko 2013-08-05 07:53:58 CDT 
Created attachment 1445 [details]
*.desktop and some other translation fix for Russian and Ukrainian
Comment 21 Michele Calgaro 2014-05-29 10:41:16 CDT 
I will see if I can get the patches to merge, even though from a preliminary check it seems a lot of "massaging" is required.
Comment 22 Michele Calgaro 2014-05-29 10:41:52 CDT 
Comment on attachment 650 [details]
Attempted patch against GIT

Marked obsolete, since the new patches from Roman (against 3.5.13.2) are one year newer.
Comment 23 Michele Calgaro 2014-05-29 11:09:53 CDT 
Comment on attachment 1445 [details]
*.desktop and some other translation fix for Russian and Ukrainian

Massaged and pushed in commit e5f5e70.
Comment 24 Michele Calgaro 2014-05-30 11:10:03 CDT 
> Created attachment 1443 [details]
> Patch for full RU-translation to TDE-3.5.13.2
> Created attachment 1444 [details]
> Patch for full UK-translation to TDE-3.5.13.2

Roman,
would you be able to upload your translated files "as they are", i.e. without creating any patch at all? Just zip the files and upload that.
It would help me in the process of merging the changes.
The patch files do not merge nicely, so I have to split them and manually try to make the different sections patch.
For same parts it is ok, but for some very big hunks (like 5000 lines or so) it is not that simple, so a file comparison would help.

Thanks.
Comment 25 Roman Savochenko 2014-05-30 13:57:54 CDT 
(In reply to Michele Calgaro from comment #24)
> would you be able to upload your translated files "as they are", i.e.
> without creating any patch at all? Just zip the files and upload that.
Yes I can.
Please download here: ftp://ftp.oscada.org/Misc/kde-i18n-ru-3.5.13.2.tgz and ftp://ftp.oscada.org/Misc/kde-i18n-uk-3.5.13.2.tgz

But really you can clone SRU branch and apply the patches.
Comment 26 Michele Calgaro 2014-05-31 00:06:48 CDT 
Thanks :)
Comment 27 Timothy Pearson 2014-07-11 12:04:22 CDT 
(In reply to Michele Calgaro from comment #26)
> Thanks :)

Any progress on this report Michele?
Comment 28 Michele Calgaro 2014-07-11 23:06:21 CDT 
> Any progress on this report Michele?
I have done some work locally, but I am still far away from finishing it. Some parts of the patches require major rework, while the majority of them requires renames and checking only, or just minor adjustment. Some parts are not required at all since they refer to 3.5.13.2 folder names only.
Comment 29 Michele Calgaro 2014-07-27 21:34:40 CDT 
Heavily massaged and pushed to GIT over 34 commits.