Add and correct some French translation #2065
Conversation
| labelText += "<p><b>" + tr("Description") + ":</b> " + QString::fromUtf8(descriptor.description) + "</p>"; | ||
| labelText += "<p><b>" + tr("Author") + ":</b> " + QString::fromUtf8(descriptor.author) + "</p>"; | ||
| labelText += "<p><b>" + tr("Description") + ":</b> " + qApp->translate( "pluginBrowser", descriptor.description ) + "</p>"; | ||
| labelText += "<p><b>" + tr("Author") + ":</b> " + QString::fromUtf8(descriptor.author) + "</p>"; |
There was a problem hiding this comment.
I think we have some whitespace formatting issues here...
There was a problem hiding this comment.
Hi Tres,
You are right.
It is somewhat difficult to follow the formatting in LMMS since some
sources uses tabs, some don't.
Looks like this one does not :-\
midi-pascal
On 15-05-21 01:23 PM, Tres Finocchiaro wrote:
In src/gui/EffectSelectDialog.cpp
#2065 (comment):@@ -206,8 +206,8 @@ void EffectSelectDialog::rowChanged( const QModelIndex & _idx,
{
QLabel *label = new QLabel(m_descriptionWidget);
QString labelText = "" + tr("Name") + ": " + QString::fromUtf8(descriptor.displayName) + "
";
labelText += "<p><b>" + tr("Description") + ":</b> " + QString::fromUtf8(descriptor.description) + "</p>";labelText += "<p><b>" + tr("Author") + ":</b> " + QString::fromUtf8(descriptor.author) + "</p>";labelText += "<p><b>" + tr("Description") + ":</b> " + qApp->translate( "pluginBrowser", descriptor.description ) + "</p>";labelText += "<p><b>" + tr("Author") + ":</b> " + QString::fromUtf8(descriptor.author) + "</p>";I think we have some whitespace formatting issues here...
—
Reply to this email directly or view it on GitHub
https://github.com/LMMS/lmms/pull/2065/files#r30824701.
|
Everything looks fine to me. Should probably fix any other languages that have translations for Oddly enough, |
|
For the E&xport Midi item, I am not confident enough in other languages than English and French to alter the translations files. In addition, the translation files (*.ts) for other languages are outdated. They are not in sync with the master branch so they do not have this menu item. |
|
Added some more French translations but some plugins give me headache because the translation does not show up (Dual Filter for example)... |
Agreed. Your help is greatly appreciated. |
|
Completely translated Monstro to French :-) |
|
Nice! Good troubleshooting with the macros there. |
|
Thanks! This was not the most easy trap to find :-) |
|
I think this PR is now fairly complete and could be pulled in the master branch. |
|
Hey @midi-pascal. I took a look through the commits you've added, and all the code looks reasonable. I'm currently waiting for it to build & then I'll play around with the changes and make sure nothing major is broken. Given the large number of commits, I wouldn't be surprised if the LMMS maintainers ask you to squash them down to just one or two before merging. |
|
Oddly enough, after compiling with GCC on Linux (no errors), installing it locally and attempting to load a recent project, a few things happen: I get error messages saying that LMMS can't find the built-in EQ plugin. Not sure what to think of this. It's possible that there are some remnants from an old build messing things up, even though I did a Edit: After totally wiping the build tree and applying the MOCFILES fix outlined further in this thread, I've been using LMMS in this branch for about an hour and a half with no more errors like this. Seems stable! |
|
The malloc error seems intermittent. I thought maybe I just didn't have much free ram, but it's happened twice now at the 62% mark when loading my project and The EQ error, by the way, is The path listed is a valid path to libeq.so. I'm guessing it may have been the addition of the Q_OBJECT macro into the EqControlsDialog class. I completely wiped the install directory and re-ran |
|
Interestingly, removing the |
|
Running The "U" symbol means "Undefined". So it looks like the declaration for the EqControlsDialog constructor is present but for whatever reason the definition never got linked in? On the other hand, this same command but without the Q_OBJECT macro provides: |
|
@Wallacoloo is there a chance you added that macro? I'm looking at master and I'm not sure it is there, although I just glanced quickly. |
|
Eerily similar to this: #1443 (comment) Also, Travis-CI Windows is pissed off... :) |
|
@tresf Good thinking, but that was an addition made in @midi-pascal 's branch for this PR - it's not yet on LMMS master. Just view https://github.com/LMMS/lmms/pull/2065/files and scroll down to the plugins/Eq/EqControlsDialog.h file. |
|
Ah yes... Well, the macros aren't something I entirely understand.... Here's what @curlymorphic said about them a while back...
Sorry I cannot help more. |
|
@tresf thanks for digging up that other thread. I tried building in clang to see if it would provide some relevant warnings, but it doesn't, and it behaves precisely as the gcc build does. Very strange. |
|
Found a fix for the EQ issue. The only thing missing is that (The modified CMakeLists.txt looks like this:) Looks like DelayControlsDialog (the other class that gained a Q_OBJECT declaration here) is already taken care of. |
|
👍 Thanks for the work (on a translation!) |
|
@Wallacoloo nice catch :) |
|
@Wallacoloo Thanks a lot for all |
|
@tresf The problem with the macros vs translation is that lupdate (the Qt program that extract the literals from the code) does not expand the macros before processing the sources. |
|
Travis shows the Windows builds still failing, and we should squash those 13 commits via: # 13 is the number of previous commits to squash into one
git rebase -i HEAD~13Give a proper name to the first item and put The second dialog, comment out everything except the relevant comment. Next, force it to your branch. # force is required when rewriting history :)
git push --force |
|
@tresf I think the Windows build fails because I did not yet add the fix from @Wallacoloo in my branch. |
|
Yes, lets proceed with that. |
|
Done :-) |
|
I see the Travis build fails on Windows but the EQ plugin passed! |
I believe this to still be related, no? |
|
@tresf interestingly, Using Github's search feature, it looks to me as if this function was at some point moved into EqFader.h and the old declaration in EqControlsDialog was never deleted. So I think all that needs to happen is for the following code in The reason this error didn't show up until now is because nobody was attempting to ever call updateVuMeters(). But with it being defined as a slot, the moc inserts conditional calls to it in its signal receiving function. It is interesting that it still links ok on Linux though - I would not have expected it to. |
|
@Wallacoloo You are perfectly right: updateVuMeters() is declared as a private slot in EqControlsDialog.h but not implemented in EqControlsDialog.cpp and not anywhere else. |
|
@midi-pascal Give it a try & see if it fixes the Travis error. |
|
@Wallacoloo Ok, I will give it a try :-) |
|
@Wallacoloo Done! Let's see if it works... |
|
@Wallacoloo Looks like it works :-) Thank you so much for your guidance! |
|
Terrific. Let's get those commits squashed now via: # 15 is the number of previous commits to squash into one
git rebase -i HEAD~15# force is required when rewriting history :)
git push --force |
|
@tresf Who your previous message is it for? error: The requested URL returned error: 403 while accessing https://github.com/LMMS/lmms.git/info/refs |
You. :)
I'm not sure why you are receiving that. Perhaps my syntax is wrong? |
The translation of the instrument plugins description does not work in Instruments pluginBrowser Translation of the effect plugins description not showing in effects selector Replace tabs with spaces in the fix indentation (as Tres request) More French translations added Remove the call to tr() inside the macro makeknob (DualFilterControlDialog.cpp) and tr() the strings before calling makeknob Fix DualFilter description (was labeled as "A native amplifier plugin") (DualFilter.cpp) Add French translation for the Dual filter knobs. Move tr() out of macro's so lupdate find them for translation (extract litterals in "ts" file). Full French translation of Monstro :-) Make NES translatable (some tr() missing) Remove tr() from macros (litterals not extracted by lupdate Translate NES to French Translate Watsyn Synth as others Missing Q_OBJECT in DelayControlsDialog definition prevents its translation Translate Delay plugin to French Make EqControlsDialog translatable Fix selected-note volume bug Closes LMMS#2070 Fix a typo in French translation. Add EqControlsDialog.h to the MOCFILES list in Eq CMakeLists.txt Remove definition of slot updateVuMeters() in EqControlsDialog.h which is not implemented
|
@tresf I found the problem: git push --force with no parameter tries to push to the main master. |
|
👍 |
Add and correct some French translation
|
Big thanks to you @midi-pascal and @Wallacoloo. Merged. |
Add and correct some French translation
Match the highlighted character with its shortcut for option "Export Midi..." in the File menu.
Fix tr() not working for plugin description in Instrument plugins browser
Fix tr() not working for plugin description in Add Effect window