930 changes: 513 additions & 417 deletions i18n/qgis_de.ts
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/app/qgsvectorlayerproperties.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -951,7 +951,7 @@ void QgsVectorLayerProperties::on_pbnLoadStyle_clicked()
QSettings myQSettings; // where we keep last used filter in persistent state
QString myLastUsedDir = myQSettings.value( "style/lastStyleDir", "." ).toString();
QString myFileName = QFileDialog::getOpenFileName( this, tr( "Load layer properties from style file" ), myLastUsedDir,
tr( "QGIS Layer Style File (*.qml)" ) + ";;" + tr( "SLD File (*.sld)" ) );
tr( "QGIS Layer Style File" ) + " (*.qml);;" + tr( "SLD File" ) + " (*.sld)" );
if ( myFileName.isNull() )
{
return;
Expand Down Expand Up @@ -991,7 +991,7 @@ void QgsVectorLayerProperties::on_pbnSaveStyleAs_clicked()
QSettings myQSettings; // where we keep last used filter in persistent state
QString myLastUsedDir = myQSettings.value( "style/lastStyleDir", "." ).toString();
QString myOutputFileName = QFileDialog::getSaveFileName( this, tr( "Save layer properties as style file" ), myLastUsedDir,
tr( "QGIS Layer Style File (*.qml)" ) + ";;" + tr( "SLD File (*.sld)" ) );
tr( "QGIS Layer Style File" ) + " (*.qml);;" + tr( "SLD File" ) + " (*.sld)" );
if ( myOutputFileName.isNull() ) //dialog canceled
{
return;
Expand Down
31 changes: 16 additions & 15 deletions src/gui/qgsexpressionbuilderwidget.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ QString QgsExpressionBuilderWidget::loadFunctionHelp( QgsExpressionItem* functio
* saying it isn't available in "your" language. Some systems
* may be installed without the LANG environment being set.
*/
if ( lang.length() == 0 || lang == "C" )
if ( lang.length() == 0 || lang == "C" || lang.startsWith( "en_" ) )
{
lang = "en_US";
}
Expand All @@ -412,27 +412,28 @@ QString QgsExpressionBuilderWidget::loadFunctionHelp( QgsExpressionItem* functio
// get the help content and title from the localized file
QString helpContents;
QFile file( fullHelpPath );
// check to see if the localized version exists

QString missingError = tr( "<h3>Oops! QGIS can't find help for this function.</h3>"
"The help file for %1 was not found for your language<br>"
"If you would like to create it, contact the QGIS development team"
).arg( name );
if ( !file.exists() )
{
// change the file name to the en_US version (default)
fullHelpPath = helpFilesPath + functionName->text() + "-en_US";
file.setFileName( fullHelpPath );
"The help file for %1 was not found.<br>"
).arg( Qt::escape( name ) );

// Check for some sort of english locale and if not found, include
// translate this for us message
if ( !lang.contains( "en_" ) )
if ( !lang.startsWith( "en_" ) )
{
// try en_US version if localized version is unavailable
if ( !file.exists() )
{
helpContents = missingError;
}
helpContents = tr( "(Showing English version as there was no help available in your language (%1). If you would like to create it, contact the QGIS translation team).<br>" ).arg( lang );

missingError += tr( "It was neither available in your language (%1) nor English." ).arg( lang );

// try en_US next
fullHelpPath = helpFilesPath + functionName->text() + "-en_US";
file.setFileName( fullHelpPath );
}
}

missingError += tr( "<br>If you would like to create it, contact the QGIS development team." );

if ( !file.open( QIODevice::ReadOnly | QIODevice::Text ) )
{
helpContents = missingError;
Expand Down