| Summary: | [i18n] TDEBase, TDELibs translation to Russian and Ukrainian update | ||
|---|---|---|---|
| Product: | TDE | Reporter: | Roman Savochenko <rom_as> |
| Component: | other (any) | Assignee: | Michele Calgaro <michele.calgaro> |
| Status: | RESOLVED FIXED | ||
| Severity: | enhancement | CC: | bugwatch, darrella, kb9vqf, michele.calgaro, mutantturkey, rom_as |
| Priority: | P5 | ||
| Version: | 3.5.13 [Trinity] | ||
| Hardware: | Other | ||
| OS: | All | ||
| Compiler Version: | TDE Version String: | ||
| Application Version: | Application Name: | ||
| Bug Depends on: | |||
| Bug Blocks: | 2014 | ||
| Attachments: |
kde-i18n-ru
kde-i18n-uk Attempted patch against GIT Patch for RU-translation to TDE-3.5.13.1 Patch for UK-translation to TDE-3.5.13.1 Patch for RU-translation to TDE-3.5.13.2 Patch for UK-translation to TDE-3.5.13.2 Patch for full RU-translation to TDE-3.5.13.2 Patch for full UK-translation to TDE-3.5.13.2 *.desktop and some other translation fix for Russian and Ukrainian |
||
|
Description
Roman Savochenko
2012-03-31 04:38:29 CDT
Created attachment 515 [details]
kde-i18n-uk
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? (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 (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. :( (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. (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. 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. Created attachment 650 [details]
Attempted patch against GIT
For reference, I have attached what I attempted to apply to GIT.
(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? (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! (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. (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. Created attachment 928 [details]
Patch for RU-translation to TDE-3.5.13.1
Created attachment 929 [details]
Patch for UK-translation to TDE-3.5.13.1
Translation patches to RU and UK update for tdelibs and tdebase for TDE-3.5.13.1 included. Created attachment 1345 [details]
Patch for RU-translation to TDE-3.5.13.2
Created attachment 1346 [details]
Patch for UK-translation to TDE-3.5.13.2
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
Created attachment 1445 [details]
*.desktop and some other translation fix for Russian and Ukrainian
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 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 on attachment 1445 [details]
*.desktop and some other translation fix for Russian and Ukrainian
Massaged and pushed in commit e5f5e70.
> 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.
(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. Thanks :) (In reply to Michele Calgaro from comment #26) > Thanks :) Any progress on this report Michele? > 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.
Heavily massaged and pushed to GIT over 34 commits. |