Created attachment 1256 [details]
i18n-fr : update the "kdesu" dialog box

I do not create a new bug for each translation problem, so I post my patches here :-)

This patch updates the "kdesu" dialog box in French, because we have remove the "ignore" button. (bug #985)

Created attachment 1257 [details]
i18n-fr : add the "open terminal here" translation

Created attachment 1258 [details]
i18n-fr : missing translations for TDE 3.5.13 (part 1)

Created attachment 1259 [details]
i18n-fr : missing translations for TDE 3.5.13 (part 2, updates for 3.5.13.2)

Created attachment 1260 [details]
i18n-fr : missing translations for TDE 3.5.13 (part 2, updates for 3.5.13.2) (2)

Oops, some typos... fixed !

Created attachment 1261 [details]
tdebase 3.5.13.2 : add translation for "kcmdisplayconfig"

Comment on attachment 1261 [details]
tdebase 3.5.13.2 : add translation for "kcmdisplayconfig"

Pushed to GIT in commit cbc0ec1, together with the Italian translation.

Comment on attachment 1257 [details]
i18n-fr : add the "open terminal here" translation

Massaged and pushed in commit d9f985f.

Comment on attachment 1256 [details]
i18n-fr : update the "kdesu" dialog box

Francois, I checked this patch and with the right massaging I can even apply that to GIT.
Nevertheless the patched English text does not correspond to the code in tdebase/tdesu/tdesu/sudlg.cpp any more. The original text (without the patch) is correct.

I think this specific patch should not be applied. Can you confirm please?

(In reply to Michele Calgaro from comment #9)
> Francois, I checked this patch and with the right massaging I can even apply\
> that to GIT.
> Nevertheless the patched English text does not correspond to the code in 
> tdebase/tdesu/tdesu/sudlg.cpp any more. The original text (without the patch) 
> is correct.

I see, I hit the "save changes" too quickly :) Actually the .po file is not updated and those lines in the patch should be added to the .po file, since the "else" clause was added in sudlg.cpp at lines 47-56.
I push the modified patch later on.

Comment on attachment 1256 [details]
i18n-fr : update the "kdesu" dialog box

I updated the whole sudlg.cpp messages for the French translation, using the French from this patch (commit 8bc6c04).

Francois, if you could translate the message at sudlg.cpp:59, then the translation would be complete for sudlg.cpp. At the moment I just copied the same text from English.

Comment on attachment 1258 [details]
i18n-fr : missing translations for TDE 3.5.13 (part 1)

Massaged and pushed in commit c5498e2.

Comment on attachment 1260 [details]
i18n-fr : missing translations for TDE 3.5.13 (part 2, updates for 3.5.13.2) (2)

Massaged and pushed in commit 1b93628.

Created attachment 2072 [details]
tdebase: add iccconfig french translation

Sorry I had almost forgotten these patches ...
They were intended for 3.5.13.2 as said in the bug report, I have other patches for R14 that I did not post yet.

Created attachment 2073 [details]
tde-i18n 14.0.0: updated french translations

This single patch superseeds commit c5498e22 and 1b936289 . This is almost the same patch but for R14 with additional translations (stuff that were not in 3.5.13.2)

BTW these commits are introducing some invalid "tdelibs.po.orig" and "tdelibs.po.rej" files; Please revert them and apply attached patch.

Created attachment 2074 [details]
tde-i18n 14.0.0: updated french translations (2)

Sorry wrong patch, here is the correct one.

(In reply to Francois Andriot from comment #16)
> Created attachment 2074 [details]
> tde-i18n 14.0.0: updated french translations (2)
> 
> Sorry wrong patch, here is the correct one.

I think that there are a few errors: 

The patch changes the English texts Trinity Control Center and Trinity Info Center to TDE Control Center and TDE Info Center. But in English is really Trinity, not TDE. This translations would no longer work.

In tde-i18n-fr/messages/tdebase/kcmsmserver.po are added texts for smserverconfigdlg.ui, for example:

msgid "KWin (KDE default)"
msgstr "TWin (par défaut)"

But in smserverconfigdlg.ui such are not to be found.

Note: These are the only changes that have taken me by accident - the other added texts I did not check.

About TDE/Trinity translation: it's the contrary, my patch does replace "TDE" with "Trinity" in english strings.

Also, there may be some strings that are contained in patches that are not upstream, but that I use in my build. See bug #1499 (note: the R14 patches there probably do not apply correctly today, but I have updated patches on my computer) .

I admit there may be some invalid/obsolete strings, because at a time, there was massive KDE/TDE/Trinity renaming in main code, and I may have missed some.

(In reply to Francois Andriot from comment #18)
> About TDE/Trinity translation: it's the contrary, my patch does replace
> "TDE" with "Trinity" in english strings.
> 
> Also, there may be some strings that are contained in patches that are not
> upstream, but that I use in my build. See bug #1499 (note: the R14 patches
> there probably do not apply correctly today, but I have updated patches on
> my computer) .
> 
> I admit there may be some invalid/obsolete strings, because at a time, there
> was massive KDE/TDE/Trinity renaming in main code, and I may have missed
> some.

Aha, I see where the problem is - I followed your instructions - I reverted c5498e22 and 1b936289 and subsequently applied your new patch. But it would revert some desired changes. For example: 

 #: main.cpp:105
-msgid "The Trinity Control Center"
-msgstr "Le Centre de configuration de Trinity"
+msgid "The TDE Control Center"
+msgstr "Le Centre de configuration de TDE"

It seems that it is not desirable simply reversing the aforementioned commits, since the new patch not contains some of the desired changes made ​​therein.

Created attachment 2075 [details]
tde-i18n 14.0.0: updated french translations (3)

OK so I've made the diff between the commited patches and mine.
Here are the the new updates.
I've removed (for now) the translations that are related to non-upstream features.

Also I've noticed that, in the tdebase/kcontrol source code, that there are occurences of both "Trinity Control Center" and "TDE Control Center". But we only translate "Trinity Control Center" here, so there will be missing translations. I think we should update tdebase so that all occurences are the same.

Created attachment 2076 [details]
tde-i18n 14.0.0: updated french translations (4)

Forgot one translation... this time should be OK.

> BTW these commits are introducing some invalid "tdelibs.po.orig" and 
> "tdelibs.po.rej" files; Please revert them and apply attached patch.
The .rej and .orig files were my mistake: I forgot --dry-run once when checking the patch and didn't notice the files when committing (it was 1 am in the morning....)

> Also I've noticed that, in the tdebase/kcontrol source code, that there are 
> occurences of both "Trinity Control Center" and "TDE Control Center". But we
> only translate "Trinity Control Center" here, so there will be missing 
> translations. I think we should update tdebase so that all occurences are the 
> same.
That sounds as a good idea.
More in general, after v14.0.0 is released we should make a point into updating all .pot files and make them available, so that users can use them to update existing translations.

> there are occurences of both "Trinity Control Center" and
> "TDE Control Center". 

Slavek, François,
there is indeed a mix in the source code, with both versions used in several places. Given that the name of the control center is "Trinity Control Center", I will proceed as follow:
1) revert commits 3652352, 1b93628 and c5498e2. This removes François's old patches
2) rebrand "TDE Control Center" to "Trinity Control Center" across the whole repo
3) apply François's new patches, eventually removing the sections where "TDE Control Center" was renamed "Trinity Control Center", since those would no longer be necessary.

I may not be able to do everything today, so worst case it will be completed by tomorrow.

My latest patch applies WITHOUT reverting those that you already pushed. If you revert anything, it won't apply at all.

> My latest patch applies WITHOUT reverting those that you already pushed.
> If you revert anything, it won't apply at all.

Ah ah! From comment 15 I understood we needed to revert that. Thanks for letting me know.
I already reverted those commits, but no problem. I will re-push those changes and apply your latest patches.
Is there anything else I should know before I do that?

By the way, I have started the "TDE Control Center" --> "Trinity Control Center" conversion. Between today and tomorrow I hope I can finish all.

Comment on attachment 2076 [details]
tde-i18n 14.0.0: updated french translations (4)

Ok, I re-pushed the previous patches and then applied the patch as provided.
Pushed in commit 9dfa7a6.

Comment on attachment 2072 [details]
tdebase: add iccconfig french translation

Pushed in commit fbaafc9, together with the Italian messages.

François, I have applied the patches and pushed.
Is there any other change that you would like to make? If not, can we re-close this bug?

On a side note, the "TDE Control Center" --> "Trinity Control Center" conversion is almost completed. Only tde-i18n remains and I will do that tomorrow.

François, one more thing (sorry for so many messages...)
I noticed in the tde-packaging/redhat folder, the string "TDE Control Center" is used in several files. 
Do you prefer to do the "TDE Control Center" --> "Trinity Control Center" conversion yourself (being the maintener) or should I just do that tomorrow?

I have no more translations for tdebase/tde-i18n, so if everything is pushed, you can close the bug.

Also, please do NOT touch the files from the "tde-packaging" repository, I will update/remove the patches as needed.

> Also, please do NOT touch the files from the "tde-packaging" repository, I 
> will update/remove the patches as needed.
Sounds good to me. It is also my preferred way :)