Skip to content

Commit

Permalink
Convert isolated '...' strings to '…'
Browse files Browse the repository at this point in the history 
Ideally we'd replace ALL ... instances to …, but need to
first work out how to avoid the translation burden of this
change
  • Loading branch information
@nyalldawson
nyalldawson committed Jun 4, 2017
1 parent 65b0ba8 commit f69d1c2
Show file tree
Hide file tree
Showing 91 changed files with 400 additions and 400 deletions.
2 changes: 1 addition & 1 deletion python/plugins/db_manager/ui/DlgExportVector.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
<item row="1" column="2">
<widget class="QToolButton" name="btnChooseOutputFile">
<property name="text">
<string>...</string>
<string>…</string>
</property>
</widget>
</item>
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/db_manager/ui/DlgImportVector.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<item row="0" column="3">
<widget class="QToolButton" name="btnChooseInputFile">
<property name="text">
<string>...</string>
<string>…</string>
</property>
</widget>
</item>
Expand Down
4 changes: 2 additions & 2 deletions src/app/qgsmaptoollabel.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ QString QgsMapToolLabel::currentLabelText( int trunc )
if ( trunc > 0 && labelText.length() > trunc )
{
labelText.truncate( trunc );
labelText += QLatin1String( "..." );
labelText += QLatin1String( "…" );
}
return labelText;
}
Expand All @@ -168,7 +168,7 @@ QString QgsMapToolLabel::currentLabelText( int trunc )
if ( trunc > 0 && labelText.length() > trunc )
{
labelText.truncate( trunc );
labelText += QLatin1String( "..." );
labelText += QLatin1String( "…" );
}
return labelText;
}
Expand Down
4 changes: 2 additions & 2 deletions src/auth/pkipaths/qgsauthpkipathsedit.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<item row="0" column="1">
<widget class="QToolButton" name="btnPkiPathsCert">
<property name="text">
<string>...</string>
<string>…</string>
</property>
<property name="popupMode">
<enum>QToolButton::InstantPopup</enum>
Expand Down Expand Up @@ -83,7 +83,7 @@
<item>
<widget class="QToolButton" name="btnPkiPathsKey">
<property name="text">
<string>...</string>
<string>…</string>
</property>
<property name="popupMode">
<enum>QToolButton::InstantPopup</enum>
Expand Down
2 changes: 1 addition & 1 deletion src/auth/pkipkcs12/qgsauthpkcs12edit.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
<item row="0" column="1">
<widget class="QToolButton" name="btnPkcs12Bundle">
<property name="text">
<string>...</string>
<string>…</string>
</property>
<property name="popupMode">
<enum>QToolButton::InstantPopup</enum>
Expand Down
2 changes: 1 addition & 1 deletion src/core/expression/qgsexpression.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -551,7 +551,7 @@ QString QgsExpression::helpText( QString name )

if ( v.mVariableLenArguments )
{
helpContents += QLatin1String( "..." );
helpContents += QLatin1String( "…" );
}

helpContents += ')';
Expand Down
2 changes: 1 addition & 1 deletion src/gui/qgsfilewidget.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ QgsFileWidget::QgsFileWidget( QWidget *parent )
layout->addWidget( mLineEdit, 1, 0 );

mFileWidgetButton = new QToolButton( this );
mFileWidgetButton->setText( QStringLiteral( "..." ) );
mFileWidgetButton->setText( QStringLiteral( "…" ) );
connect( mFileWidgetButton, &QAbstractButton::clicked, this, &QgsFileWidget::openFileDialog );
layout->addWidget( mFileWidgetButton, 0, 1, 2, 1 );

Expand Down
4 changes: 2 additions & 2 deletions src/gui/qgspropertyoverridebutton.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ void QgsPropertyOverrideButton::aboutToShowMenu()
if ( expString.length() > 35 )
{
expString.truncate( 35 );
expString.append( "..." );
expString.append( "…" );
}

expString.prepend( tr( "Current: " ) );
Expand Down Expand Up @@ -680,7 +680,7 @@ void QgsPropertyOverrideButton::updateGui()
if ( deftip.length() > 75 )
{
deftip.truncate( 75 );
deftip.append( "..." );
deftip.append( "…" );
}

mFullDescription += tr( "<b>Current definition %1:</b><br>%2" ).arg( deftype, deftip );
Expand Down
2 changes: 1 addition & 1 deletion src/gui/qgssqlcomposerdialog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ void QgsSQLComposerDialog::addTableNames( const QList<PairNameTitle> &listNameTi
if ( pair.second.size() < 40 )
entryText += " (" + pair.second + ")";
else
entryText += " (" + pair.second.mid( 0, 20 ) + "..." + pair.second.mid( pair.second.size() - 20 ) + ")";
entryText += " (" + pair.second.mid( 0, 20 ) + "…" + pair.second.mid( pair.second.size() - 20 ) + ")";
}
listCombo << entryText;
mapTableEntryTextToName[entryText] = pair.first;
Expand Down
6 changes: 3 additions & 3 deletions src/plugins/georeferencer/qgstransformsettingsdialogbase.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
<item>
<widget class="QToolButton" name="tbnOutputRaster">
<property name="text">
<string>...</string>
<string>…</string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -287,7 +287,7 @@
<item>
<widget class="QToolButton" name="tbnMapFile">
<property name="text">
<string>...</string>
<string>…</string>
</property>
</widget>
</item>
Expand All @@ -311,7 +311,7 @@
<item>
<widget class="QToolButton" name="tbnReportFile">
<property name="text">
<string>...</string>
<string>…</string>
</property>
</widget>
</item>
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/grass/qgsgrassmoduleparam.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1476,7 +1476,7 @@ QgsGrassModuleFile::QgsGrassModuleFile(

QHBoxLayout *l = new QHBoxLayout( this );
mLineEdit = new QLineEdit();
mBrowseButton = new QPushButton( QStringLiteral( "..." ) );
mBrowseButton = new QPushButton( QStringLiteral( "…" ) );
l->addWidget( mLineEdit );
l->addWidget( mBrowseButton );

Expand Down
2 changes: 1 addition & 1 deletion src/plugins/grass/qgsgrasstoolsbase.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<item>
<widget class="QToolButton" name="mViewModeButton">
<property name="text">
<string>...</string>
<string>…</string>
</property>
<property name="icon">
<iconset resource="../../../images/images.qrc">
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/grass/qtermwidget/SearchBar.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<item>
<widget class="QToolButton" name="optionsButton">
<property name="text">
<string>...</string>
<string>…</string>
</property>
<property name="icon">
<iconset>
Expand Down
2 changes: 1 addition & 1 deletion src/providers/delimitedtext/qgsdelimitedtextsourceselect.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ void QgsDelimitedTextSourceSelect::updateFieldLists()
for ( int i = 0; i < tblSample->columnCount(); i++ )
{
QString value = i < nv ? values[i] : QLatin1String( "" );
if ( value.length() > MAX_SAMPLE_LENGTH ) value = value.mid( 0, MAX_SAMPLE_LENGTH ) + "...";
if ( value.length() > MAX_SAMPLE_LENGTH ) value = value.mid( 0, MAX_SAMPLE_LENGTH ) + "…";
QTableWidgetItem *item = new QTableWidgetItem( value );
tblSample->setItem( counter - 1, i, item );
if ( ! value.isEmpty() )
Expand Down
2 changes: 1 addition & 1 deletion src/providers/virtual/qgsvirtuallayersourceselectbase.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ In particular, saving a virtual layer with embedded layers to a QLR file can be
<item>
<widget class="QToolButton" name="mBrowseCRSBtn">
<property name="text">
<string>...</string>
<string>…</string>
</property>
</widget>
</item>
Expand Down
2 changes: 1 addition & 1 deletion src/python/qgspythonutilsimpl.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ bool QgsPythonUtilsImpl::runStringUnsafe( const QString &command, bool single )
PyGILState_STATE gstate;
gstate = PyGILState_Ensure();

// TODO: convert special characters from unicode strings u"..." to \uXXXX
// TODO: convert special characters from unicode strings u"…" to \uXXXX
// so that they're not mangled to utf-8
// (non-unicode strings can be mangled)
PyObject *obj = PyRun_String( command.toUtf8().data(), single ? Py_single_input : Py_file_input, mMainDict, mMainDict );
Expand Down
6 changes: 3 additions & 3 deletions src/ui/auth/qgsauthauthoritieseditor.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
<item>
<widget class="QToolButton" name="btnCaFile">
<property name="text">
<string>...</string>
<string>…</string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -165,7 +165,7 @@
<string>Group by organization</string>
</property>
<property name="text">
<string>...</string>
<string>…</string>
</property>
<property name="icon">
<iconset resource="../../../images/images.qrc">
Expand Down Expand Up @@ -196,7 +196,7 @@
<item>
<widget class="QToolButton" name="btnUtilities">
<property name="text">
<string>...</string>
<string>…</string>
</property>
<property name="icon">
<iconset resource="../../../images/images.qrc">
Expand Down
2 changes: 1 addition & 1 deletion src/ui/auth/qgsauthconfigidedit.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Unlock to edit the ID&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;7-character alphanumeric only&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; color:#a80b0a;&quot;&gt;Editing may break things!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>...</string>
<string>…</string>
</property>
<property name="icon">
<iconset resource="../../../images/images.qrc">
Expand Down
2 changes: 1 addition & 1 deletion src/ui/auth/qgsauthidentitieseditor.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
<string>Group by organization</string>
</property>
<property name="text">
<string>...</string>
<string>…</string>
</property>
<property name="icon">
<iconset resource="../../../images/images.qrc">
Expand Down
2 changes: 1 addition & 1 deletion src/ui/auth/qgsauthimportcertdialog.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
<item>
<widget class="QToolButton" name="btnImportFile">
<property name="text">
<string>...</string>
<string>…</string>
</property>
</widget>
</item>
Expand Down
6 changes: 3 additions & 3 deletions src/ui/auth/qgsauthimportidentitydialog.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
<item>
<widget class="QToolButton" name="btnPkiPathsKey">
<property name="text">
<string>...</string>
<string>…</string>
</property>
<property name="popupMode">
<enum>QToolButton::InstantPopup</enum>
Expand Down Expand Up @@ -170,7 +170,7 @@
<item row="0" column="1">
<widget class="QToolButton" name="btnPkiPathsCert">
<property name="text">
<string>...</string>
<string>…</string>
</property>
<property name="popupMode">
<enum>QToolButton::InstantPopup</enum>
Expand Down Expand Up @@ -230,7 +230,7 @@
<item row="0" column="1">
<widget class="QToolButton" name="btnPkiPkcs12Bundle">
<property name="text">
<string>...</string>
<string>…</string>
</property>
<property name="popupMode">
<enum>QToolButton::InstantPopup</enum>
Expand Down
2 changes: 1 addition & 1 deletion src/ui/auth/qgsauthserverseditor.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
<string>Group by organization</string>
</property>
<property name="text">
<string>...</string>
<string>…</string>
</property>
<property name="icon">
<iconset resource="../../../images/images.qrc">
Expand Down
2 changes: 1 addition & 1 deletion src/ui/auth/qgsauthsslimportdialog.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@
<item>
<widget class="QToolButton" name="btnCertPath">
<property name="text">
<string>...</string>
<string>…</string>
</property>
<property name="popupMode">
<enum>QToolButton::InstantPopup</enum>
Expand Down
4 changes: 2 additions & 2 deletions src/ui/auth/qgsauthtrustedcasdialog.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<item>
<widget class="QToolButton" name="btnInfoCa">
<property name="text">
<string>...</string>
<string>…</string>
</property>
<property name="icon">
<iconset resource="../../../images/images.qrc">
Expand All @@ -60,7 +60,7 @@