Skip to content

Refactoring: Remove "Jamulus" from translated texts #2609

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ann0see merged 1 commit into from
May 15, 2022
Merged

Refactoring: Remove "Jamulus" from translated texts #2609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions src/serverdlg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,14 +175,16 @@ CServerDlg::CServerDlg ( CServer* pNServP, CServerSettings* pNSetP, const bool b
pbtRecordingDir->setWhatsThis ( "<b>" + tr ( "Main Recording Directory" ) + ":</b> " +
tr ( "Click the button to open the dialog that allows the main recording directory to be selected. "
"The chosen value must exist and be writeable (allow creation of sub-directories "
"by the user Jamulus is running as)." ) );
"by the user %1 is running as)." )
.arg ( APP_NAME ) );

edtRecordingDir->setAccessibleName ( tr ( "Main recording directory text box (read-only)" ) );
edtRecordingDir->setWhatsThis ( "<b>" + tr ( "Main Recording Directory" ) + ":</b> " +
tr ( "The current value of the main recording directory. "
"The chosen value must exist and be writeable (allow creation of sub-directories "
"by the user Jamulus is running as). "
"Click the button to open the dialog that allows the main recording directory to be selected." ) );
"by the user %1 is running as). "
"Click the button to open the dialog that allows the main recording directory to be selected." )
.arg ( APP_NAME ) );

tbtClearRecordingDir->setAccessibleName ( tr ( "Clear the recording directory button" ) );
tbtClearRecordingDir->setWhatsThis ( "<b>" + tr ( "Clear Recording Directory" ) + ":</b> " +
Expand All @@ -202,17 +204,19 @@ CServerDlg::CServerDlg ( CServer* pNServP, CServerSettings* pNSetP, const bool b
pbtServerListPersistence->setAccessibleName ( tr ( "Server List Filename dialog push button" ) );
pbtServerListPersistence->setWhatsThis ( "<b>" + tr ( "Server List Filename" ) + ":</b> " +
tr ( "Click the button to open the dialog that allows the "
"server list persistence file name to be set. The user Jamulus is running as "
"server list persistence file name to be set. The user %1 is running as "
"needs to be able to create the file name specified "
"although it may already exist (it will get overwritten on save)." ) );
"although it may already exist (it will get overwritten on save)." )
.arg ( APP_NAME ) );

edtServerListPersistence->setAccessibleName ( tr ( "Server List Filename text box (read-only)" ) );
edtServerListPersistence->setWhatsThis ( "<b>" + tr ( "Server List Filename" ) + ":</b> " +
tr ( "The current value of server list persistence file name. The user Jamulus is running as "
tr ( "The current value of server list persistence file name. The user %1 is running as "
"needs to be able to create the file name specified "
"although it may already exist (it will get overwritten on save). "
"Click the button to open the dialog that allows the "
"server list persistence file name to be set." ) );
"server list persistence file name to be set." )
.arg ( APP_NAME ) );

tbtClearServerListPersistence->setAccessibleName ( tr ( "Clear the server list file name button" ) );
tbtClearServerListPersistence->setWhatsThis ( "<b>" + tr ( "Clear Server List Filename" ) + ":</b> " +
Expand Down
5 changes: 3 additions & 2 deletions src/serverlist.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -688,8 +688,9 @@ bool CServerListManager::Load()
if ( !file.open ( QIODevice::ReadWrite | QIODevice::Text ) )
{
qWarning() << qUtf8Printable (
QString ( "Could not open '%1' for read/write. Please check that Jamulus has permission (and that there is free space)." )
.arg ( ServerListFileName ) );
QString ( "Could not open '%1' for read/write. Please check that %2 has permission (and that there is free space)." )
.arg ( ServerListFileName )
.arg ( APP_NAME ) );
ServerListFileName.clear();
return false;
}
Expand Down