Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit d9a78d47 authored by Yuri Chornoivan's avatar Yuri Chornoivan

Fix i18n, minor typos and EBN issues

parent 0a875220
......@@ -402,7 +402,7 @@ void Notification::onActiveConnectionStateChanged(NetworkManager::ActiveConnecti
});
if (foundConnection != m_activeConnectionsBeforeSleep.constEnd()) {
qCDebug(PLASMA_NM) << "Not emitting conection activated notification as the connection was active prior to suspend";
qCDebug(PLASMA_NM) << "Not emitting connection activated notification as the connection was active prior to suspend";
return;
}
......
......@@ -353,7 +353,7 @@ void ConnectionIcon::setIcons()
/* Fallback: If we still don't have an active connection with default route or the default route goes through a connection
of generic type (some type of VPNs) we need to go through all other active connections and pick the one with
hightest probability of being the main one (order is: vpn, wired, wireless, gsm, cdma, bluetooth) */
highest probability of being the main one (order is: vpn, wired, wireless, gsm, cdma, bluetooth) */
#if NM_CHECK_VERSION(1, 2, 0)
if ((!connection && !NetworkManager::activeConnections().isEmpty()) || (connection && connection->type() == NetworkManager::ConnectionSettings::Generic)
|| (connection && connection->type() == NetworkManager::ConnectionSettings::Tun)) {
......
......@@ -54,7 +54,7 @@ Q_SIGNALS:
// proper initialization with secrets
void validityChanged(bool valid);
// Emited when user changed configuration
// Emitted when user changed configuration
void settingChanged();
private Q_SLOTS:
......
......@@ -74,7 +74,7 @@ QValidator::State SimpleIpListValidator::validate(QString &address, int &pos) co
QString addr = rawAddr.trimmed();
// If we are starting a new address and all the previous addressess
// If we are starting a new address and all the previous addresses
// are not Acceptable then the previous addresses need to be completed
// before a new one is started
if (result != QValidator::Acceptable)
......
......@@ -532,7 +532,7 @@ void MobileConnectionWizard::slotEnablePlanEditBox(const QString & text)
} else {
if (mProvidersList->currentItem() != nullptr) {
int i = mPlanComboBox->currentIndex();
if (i>0) i=i-1; // Skiping the separator (i==1)
if (i>0) i=i-1; // Skipping the separator (i==1)
QStringList mApns = mProviders->getApns(mProvidersList->currentItem()->text());
userApn->setText(mApns.at(i));
}
......
......@@ -461,7 +461,7 @@ void Handler::replyFinished(QDBusPendingCallWatcher * watcher)
notification->setTitle(i18n("Failed to remove %1", watcher->property("connection").toString()));
break;
case Handler::RequestScan:
/* INFO: Disabled for now as wifi scanning is now automatical
/* INFO: Disabled for now as wifi scanning is now automatic
notification = new KNotification("FailedToRequestScan", KNotification::CloseOnTimeout, this);
notification->setTitle(i18n("Failed to request scan"));
*/
......
/*
* Copyright 2017-2018 Martin Kacej <m.kacej@atlas.sk>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as
* published by the Free Software Foundation; either version 2 or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Library General Public License for more details
*
* You should have received a copy of the GNU Library General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
import QtQuick 2.6
import QtQuick.Layouts 1.2
import QtQuick.Controls 2.2 as Controls
......
/*
* Copyright 2017-2018 Martin Kacej <m.kacej@atlas.sk>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as
* published by the Free Software Foundation; either version 2 or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Library General Public License for more details
*
* You should have received a copy of the GNU Library General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
import QtQuick 2.6
import QtQuick.Layouts 1.3
import QtQuick.Controls 2.2 as Controls
......@@ -165,7 +184,7 @@ Kirigami.ScrollablePage {
function checkTethering() {
devicePath = kcm.getAccessPointDevice();
if (devicePath === "") {
hotSpotStatus.text = i18n('Not possible to start Acces point.')
hotSpotStatus.text = i18n("Not possible to start Access point.")
hotSpotStatusIcon.source = "dialog-close"
hotSpotSwitch.enabled = false
return
......@@ -174,21 +193,21 @@ Kirigami.ScrollablePage {
var map = kcm.getActiveConnectionInfo(connectPath);
if (map["address"]) { // means AP connection is active
hotSpotSwitch.checked = true
hotSpotStatus.text = i18n('Access point running: ') + name
hotSpotStatus.text = i18n("Access point running: %1", name)
}
}
function initTethering() {
connectPath = kcm.getAccessPointConnection()
if (connectPath === "") {
hotSpotStatus.text = i18n('No suitable configuration found.')
hotSpotStatus.text = i18n("No suitable configuration found.")
hotSpotStatusIcon.source = "error"
hotSpotSwitch.checked = false
return
}
loadSettings()
handler.activateConnection(connectPath,devicePath,"")
hotSpotStatus.text = i18n('Access point running: ') + name
hotSpotStatus.text = i18n("Access point running: %1", name)
hotSpotStatusIcon.source = "network-wireless-symbolic"
}
......@@ -229,6 +248,6 @@ Kirigami.ScrollablePage {
if (map["key-mgmt"]) {
hotSpotConfigSecurity.checked = true
}
hotSpotStatus.text = i18n('Access point avialable: ') + name
hotSpotStatus.text = i18n("Access point available: %1", name)
}
}
......@@ -18,11 +18,11 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* (C) Copyright 2008 Red Hat, Inc.
* (C) Copyright 2015 Lubomir Rintel
* (C) Copyright 2015 Lubomir Rintel <lkundrak@v3.sk>
*/
#ifndef __NM_SERVICE_DEFINES_H__
#define __NM_SERVICE_DEFINES_H__
#ifndef __NM_FORTISSLVPN_SERVICE_H__
#define __NM_FORTISSLVPN_SERVICE_H__
/* For the NM <-> VPN plugin service */
#define NM_DBUS_SERVICE_FORTISSLVPN "org.freedesktop.NetworkManager.fortisslvpn"
......@@ -37,4 +37,4 @@
#define NM_FORTISSLVPN_KEY_KEY "key"
#define NM_FORTISSLVPN_KEY_TRUSTED_CERT "trusted-cert"
#endif /* __NM_SERVICE_DEFINES_H__ */
#endif /* __NM_FORTISSLVPN_SERVICE_H__ */
......@@ -215,7 +215,7 @@ QVariantMap PptpSettingWidget::setting() const
// Advanced dialog settings
// Authenfication options
// Authentication options
QListWidgetItem * item = nullptr;
item = d->advUi.listWidget->item(0); // PAP
const QString yesString = QLatin1String("yes");
......
......@@ -19,7 +19,7 @@
*/
#include "wireguardadvancedwidget.h"
#include <QtWidgets/QPushButton>
#include <QPushButton>
#include <KColorScheme>
#include "ui_wireguardadvanced.h"
#include "nm-wireguard-service.h"
......
......@@ -18,8 +18,8 @@
License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef PLASMA_NM_OPENVPN_ADVANCED_WIDGET_H
#define PLASMA_NM_OPENVPN_ADVANCED_WIDGET_H
#ifndef PLASMA_NM_WIREGUARD_ADVANCED_WIDGET_H
#define PLASMA_NM_WIREGUARD_ADVANCED_WIDGET_H
#include "passwordfield.h"
......@@ -55,4 +55,4 @@ private:
Private *const d;
};
#endif // PLASMA_NM_OPENVPN_ADVANCED_WIDGET_H
#endif // PLASMA_NM_WIREGUARD_ADVANCED_WIDGET_H
......@@ -24,7 +24,7 @@ WireGuardKeyValidator::WireGuardKeyValidator(QObject *parent)
: QValidator(parent)
{
m_validator = new QRegularExpressionValidator(this);
// A WireGuard key is Base64 encoded and in human readable form consistes
// A WireGuard key is Base64 encoded and in human readable form consists
// of 43 Alpha-numeric or '+' or '/' with a 44th character of an equal sign.
m_validator->setRegularExpression(QRegularExpression(QLatin1String("[0-9a-zA-Z\\+/]{43,43}=")));
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment