summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitmodules3
-rw-r--r--CMakeL10n.txt3
-rw-r--r--CMakeLists.txt3
m---------admin0
m---------cmake0
-rw-r--r--knetworkmanager-0.8/po/it.po21
-rw-r--r--knetworkmanager-0.8/po/knetworkmanager.pot29
-rw-r--r--knetworkmanager-0.8/src/connection_editor.ui8
-rw-r--r--knetworkmanager-0.8/src/connection_setting_wireless.ui10
-rw-r--r--knetworkmanager-0.8/src/connection_setting_wireless_security_eap.ui2
-rw-r--r--knetworkmanager-0.8/src/connection_settings.ui9
-rw-r--r--knetworkmanager-0.8/src/vpnauthentication.ui7
-rw-r--r--knetworkmanager-0.8/vpn-plugins/openvpn/src/openvpnauth.ui3
-rw-r--r--knetworkmanager-0.8/vpn-plugins/openvpn/src/openvpnprop.ui2
-rw-r--r--knetworkmanager-0.8/vpn-plugins/pptp/src/pptpauth.ui4
-rw-r--r--knetworkmanager-0.8/vpn-plugins/pptp/src/pptpprop.ui5
-rw-r--r--knetworkmanager-0.8/vpn-plugins/strongswan/src/strongswanprop.ui8
-rw-r--r--knetworkmanager-0.8/vpn-plugins/vpnc/src/vpncauth.ui4
-rw-r--r--knetworkmanager-0.8/vpn-plugins/vpnc/src/vpncprop.ui2
19 files changed, 36 insertions, 87 deletions
diff --git a/.gitmodules b/.gitmodules
index bdec8fc..934def7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
[submodule "admin"]
path = admin
url = https://system@scm.trinitydesktop.org/scm/git/tde-common-admin
-[submodule "cmake"]
- path = cmake
- url = https://system@scm.trinitydesktop.org/scm/git/tde-common-cmake
diff --git a/CMakeL10n.txt b/CMakeL10n.txt
index a525b71..a91bd2a 100644
--- a/CMakeL10n.txt
+++ b/CMakeL10n.txt
@@ -9,12 +9,11 @@
#
#################################################
-cmake_minimum_required( VERSION 2.8 )
+cmake_minimum_required( VERSION 3.1 )
##### include our cmake modules #################
-set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
include( TDEL10n )
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2627c8e..5bd974a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@
#
#################################################
-cmake_minimum_required( VERSION 2.8.12 )
+cmake_minimum_required( VERSION 3.1 )
##### general package setup #####################
@@ -26,7 +26,6 @@ include( FindPkgConfig )
##### include our cmake modules #################
-set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
include( TDEMacros )
diff --git a/admin b/admin
-Subproject 709ea75c2c6bc299ad0469b9f5e0fb27dd300f8
+Subproject a9e0c7eb508ebea59f1fc26d4a6858c4b6feea3
diff --git a/cmake b/cmake
deleted file mode 160000
-Subproject 356a15955cd717c20e4f8de29f7c36a6f38883e
diff --git a/knetworkmanager-0.8/po/it.po b/knetworkmanager-0.8/po/it.po
index 5f27ca3..a227615 100644
--- a/knetworkmanager-0.8/po/it.po
+++ b/knetworkmanager-0.8/po/it.po
@@ -1,12 +1,13 @@
# translation of knetworkmanager.po to Italiano
# Andrea Florio <andrea@opensuse.org>, 2008.
+# Michele Calgaro <michele.calgaro@yahoo.it>, 2021.
msgid ""
msgstr ""
"Project-Id-Version: knetworkmanager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-11 04:22+0200\n"
-"PO-Revision-Date: 2019-05-31 13:15+0000\n"
-"Last-Translator: stefano <ifx@lazytux.it>\n"
+"POT-Creation-Date: 2021-07-07 18:32+0000\n"
+"PO-Revision-Date: 2021-10-16 01:32+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
"projects/applications/knetworkmanager8/it/>\n"
"Language: it\n"
@@ -14,23 +15,19 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 3.6.1\n"
+"X-Generator: Weblate 4.8.1\n"
#. Instead of a literal translation, add your name to the end of the list (separated by a comma).
msgid ""
"_: NAME OF TRANSLATORS\n"
"Your names"
-msgstr ""
-"_: NOMI DEI TRADUTTORI\n"
-"Nomi"
+msgstr "Michele Calgaro"
#. Instead of a literal translation, add your email to the end of the list (separated by a comma).
msgid ""
"_: EMAIL OF TRANSLATORS\n"
"Your emails"
-msgstr ""
-"_: E-MAIL DEI TRADUTTORI\n"
-"Indirizzi e-mail"
+msgstr "michele.calgaro@yahoo.it"
#: devicetraycomponent.cpp:47 knetworkmanager-device_tray.cpp:74
msgid "Unknown"
@@ -117,7 +114,7 @@ msgstr "Chiave Condivisa"
#: knetworkmanager-connection_setting_wireless_security_widget.cpp:75
msgid "WEP 40/128-bit ASCII"
-msgstr "WEP 40/128 bit ASCII"
+msgstr "WEP 40/128 bit ASCII"
#: knetworkmanager-connection_setting_wireless_security_widget.cpp:76
msgid "WEP 40/128-bit Hexadecimal"
@@ -359,7 +356,7 @@ msgstr "KNetworkmanager"
#: main.cpp:50 main.cpp:51
msgid "Maintainer"
-msgstr "Maintainer"
+msgstr "Responsabile"
#: main.cpp:52 main.cpp:53
msgid "Additional code"
diff --git a/knetworkmanager-0.8/po/knetworkmanager.pot b/knetworkmanager-0.8/po/knetworkmanager.pot
index b4f4b39..8351a39 100644
--- a/knetworkmanager-0.8/po/knetworkmanager.pot
+++ b/knetworkmanager-0.8/po/knetworkmanager.pot
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-05-11 13:15+0200\n"
+"POT-Creation-Date: 2021-07-07 22:33+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -93,8 +93,7 @@ msgstr ""
msgid "Wired"
msgstr ""
-#: connection_setting_vpn.ui:16
-#: knetworkmanager-connection_editor.cpp:114
+#: connection_setting_vpn.ui:16 knetworkmanager-connection_editor.cpp:114
#, no-c-format
msgid "VPN"
msgstr ""
@@ -392,10 +391,8 @@ msgstr ""
msgid "Edit Connection"
msgstr ""
-#: connection_setting_cdma.ui:16
-#: connection_setting_gsm.ui:16
-#: connection_setting_info.ui:16
-#: connection_setting_wireless_security.ui:16
+#: connection_setting_cdma.ui:16 connection_setting_gsm.ui:16
+#: connection_setting_info.ui:16 connection_setting_wireless_security.ui:16
#: connection_setting_wireless_security_auth.ui:16
#: connection_setting_wireless_security_wep.ui:16
#: connection_setting_wireless_security_wepencryption.ui:16
@@ -404,26 +401,22 @@ msgstr ""
msgid "Form1"
msgstr ""
-#: connection_setting_cdma.ui:38
-#: connection_setting_gsm.ui:71
+#: connection_setting_cdma.ui:38 connection_setting_gsm.ui:71
#, no-c-format
msgid "Password needed to access the service"
msgstr ""
-#: connection_setting_cdma.ui:46
-#: connection_setting_gsm.ui:60
+#: connection_setting_cdma.ui:46 connection_setting_gsm.ui:60
#, no-c-format
msgid "&Number:"
msgstr ""
-#: connection_setting_cdma.ui:57
-#: connection_setting_gsm.ui:212
+#: connection_setting_cdma.ui:57 connection_setting_gsm.ui:212
#, no-c-format
msgid "Username needed to access the service"
msgstr ""
-#: connection_setting_cdma.ui:65
-#: connection_setting_gsm.ui:126
+#: connection_setting_cdma.ui:65 connection_setting_gsm.ui:126
#, no-c-format
msgid "&Username:"
msgstr ""
@@ -589,8 +582,7 @@ msgstr ""
msgid "Gateway:"
msgstr ""
-#: connection_setting_ppp.ui:16
-#: connection_setting_serial.ui:16
+#: connection_setting_ppp.ui:16 connection_setting_serial.ui:16
#: connection_setting_wireless_security_eap.ui:16
#: connection_setting_wireless_security_wpapsk.ui:16
#, no-c-format
@@ -612,8 +604,7 @@ msgstr ""
msgid "LCP Echo Failure"
msgstr ""
-#: connection_setting_ppp.ui:122
-#: connection_setting_serial.ui:131
+#: connection_setting_ppp.ui:122 connection_setting_serial.ui:131
#, no-c-format
msgid "Baud rate"
msgstr ""
diff --git a/knetworkmanager-0.8/src/connection_editor.ui b/knetworkmanager-0.8/src/connection_editor.ui
index 291829a..e6e1717 100644
--- a/knetworkmanager-0.8/src/connection_editor.ui
+++ b/knetworkmanager-0.8/src/connection_editor.ui
@@ -112,12 +112,4 @@
</grid>
</widget>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
-
-
-
-
-
-
-</includehints>
</UI>
diff --git a/knetworkmanager-0.8/src/connection_setting_wireless.ui b/knetworkmanager-0.8/src/connection_setting_wireless.ui
index 3b35de1..3a29035 100644
--- a/knetworkmanager-0.8/src/connection_setting_wireless.ui
+++ b/knetworkmanager-0.8/src/connection_setting_wireless.ui
@@ -132,9 +132,9 @@
</grid>
</widget>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>klineedit.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>tdelistview.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">klineedit.h</include>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
+ <include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
</UI>
diff --git a/knetworkmanager-0.8/src/connection_setting_wireless_security_eap.ui b/knetworkmanager-0.8/src/connection_setting_wireless_security_eap.ui
index a851a93..9de9a47 100644
--- a/knetworkmanager-0.8/src/connection_setting_wireless_security_eap.ui
+++ b/knetworkmanager-0.8/src/connection_setting_wireless_security_eap.ui
@@ -158,6 +158,4 @@
</grid>
</widget>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
-</includehints>
</UI>
diff --git a/knetworkmanager-0.8/src/connection_settings.ui b/knetworkmanager-0.8/src/connection_settings.ui
index c7994de..8225ee7 100644
--- a/knetworkmanager-0.8/src/connection_settings.ui
+++ b/knetworkmanager-0.8/src/connection_settings.ui
@@ -128,10 +128,7 @@
</grid>
</widget>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kpushbutton.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
</UI>
diff --git a/knetworkmanager-0.8/src/vpnauthentication.ui b/knetworkmanager-0.8/src/vpnauthentication.ui
index 124fa55..eb34891 100644
--- a/knetworkmanager-0.8/src/vpnauthentication.ui
+++ b/knetworkmanager-0.8/src/vpnauthentication.ui
@@ -142,8 +142,7 @@
<slot access="protected">cancel()</slot>
</Q_SLOTS>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kpushbutton.h</includehint>
- <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
</UI>
diff --git a/knetworkmanager-0.8/vpn-plugins/openvpn/src/openvpnauth.ui b/knetworkmanager-0.8/vpn-plugins/openvpn/src/openvpnauth.ui
index 3bea9b4..7943294 100644
--- a/knetworkmanager-0.8/vpn-plugins/openvpn/src/openvpnauth.ui
+++ b/knetworkmanager-0.8/vpn-plugins/openvpn/src/openvpnauth.ui
@@ -74,7 +74,4 @@
<customwidgets>
</customwidgets>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
-
-</includehints>
</UI>
diff --git a/knetworkmanager-0.8/vpn-plugins/openvpn/src/openvpnprop.ui b/knetworkmanager-0.8/vpn-plugins/openvpn/src/openvpnprop.ui
index a1dbd99..521e21f 100644
--- a/knetworkmanager-0.8/vpn-plugins/openvpn/src/openvpnprop.ui
+++ b/knetworkmanager-0.8/vpn-plugins/openvpn/src/openvpnprop.ui
@@ -614,6 +614,4 @@
<tabstop>editUsername</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
-</includehints>
</UI>
diff --git a/knetworkmanager-0.8/vpn-plugins/pptp/src/pptpauth.ui b/knetworkmanager-0.8/vpn-plugins/pptp/src/pptpauth.ui
index 4078684..1f527b4 100644
--- a/knetworkmanager-0.8/vpn-plugins/pptp/src/pptpauth.ui
+++ b/knetworkmanager-0.8/vpn-plugins/pptp/src/pptpauth.ui
@@ -88,8 +88,4 @@
<customwidgets>
</customwidgets>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
-
-
-</includehints>
</UI>
diff --git a/knetworkmanager-0.8/vpn-plugins/pptp/src/pptpprop.ui b/knetworkmanager-0.8/vpn-plugins/pptp/src/pptpprop.ui
index c966535..b1d5ac1 100644
--- a/knetworkmanager-0.8/vpn-plugins/pptp/src/pptpprop.ui
+++ b/knetworkmanager-0.8/vpn-plugins/pptp/src/pptpprop.ui
@@ -236,9 +236,4 @@
<customwidgets>
</customwidgets>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
-
-
-
-</includehints>
</UI>
diff --git a/knetworkmanager-0.8/vpn-plugins/strongswan/src/strongswanprop.ui b/knetworkmanager-0.8/vpn-plugins/strongswan/src/strongswanprop.ui
index a728a1d..4bf361d 100644
--- a/knetworkmanager-0.8/vpn-plugins/strongswan/src/strongswanprop.ui
+++ b/knetworkmanager-0.8/vpn-plugins/strongswan/src/strongswanprop.ui
@@ -229,8 +229,8 @@
<customwidgets>
</customwidgets>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>klineedit.h</includehint>
- <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+ <include location="global" impldecl="in implementation">klineedit.h</include>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
</UI>
diff --git a/knetworkmanager-0.8/vpn-plugins/vpnc/src/vpncauth.ui b/knetworkmanager-0.8/vpn-plugins/vpnc/src/vpncauth.ui
index 4fdf2f1..8ff418c 100644
--- a/knetworkmanager-0.8/vpn-plugins/vpnc/src/vpncauth.ui
+++ b/knetworkmanager-0.8/vpn-plugins/vpnc/src/vpncauth.ui
@@ -61,8 +61,4 @@
<customwidgets>
</customwidgets>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
-
-
-</includehints>
</UI>
diff --git a/knetworkmanager-0.8/vpn-plugins/vpnc/src/vpncprop.ui b/knetworkmanager-0.8/vpn-plugins/vpnc/src/vpncprop.ui
index c9fbd43..a7fed54 100644
--- a/knetworkmanager-0.8/vpn-plugins/vpnc/src/vpncprop.ui
+++ b/knetworkmanager-0.8/vpn-plugins/vpnc/src/vpncprop.ui
@@ -274,6 +274,4 @@
</grid>
</widget>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
-</includehints>
</UI>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 07:09:42 +0000