Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package cinnamon-control-center for
openSUSE:Factory checked in at 2021-06-22 20:44:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cinnamon-control-center (Old)
and /work/SRC/openSUSE:Factory/.cinnamon-control-center.new.2625 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cinnamon-control-center"
Tue Jun 22 20:44:57 2021 rev:23 rq:901349 version:5.0.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/cinnamon-control-center/cinnamon-control-center.changes
2020-12-13 17:30:47.644413702 +0100
+++
/work/SRC/openSUSE:Factory/.cinnamon-control-center.new.2625/cinnamon-control-center.changes
2021-06-22 20:45:04.810832420 +0200
@@ -1,0 +2,13 @@
+Sun May 30 17:28:19 UTC 2021 - andy great <[email protected]>
+
+- Update to version 5.0.0.
+ * Add ifdefs to prevent undefined reference to modem functions in
+ network panel
+ * network: Add support for displaying DNS6 parameters
+ * l10n: Update POT
+ * l10n: Generate files
+- Update for version 4.8.2.
+ * Network: Don't prevent hotspot capability unless NM specifically
+ rules it out
+
+-------------------------------------------------------------------
Old:
----
cinnamon-control-center-4.8.1.tar.gz
New:
----
cinnamon-control-center-5.0.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cinnamon-control-center.spec ++++++
--- /var/tmp/diff_new_pack.7MpVwQ/_old 2021-06-22 20:45:05.394833064 +0200
+++ /var/tmp/diff_new_pack.7MpVwQ/_new 2021-06-22 20:45:05.394833064 +0200
@@ -1,7 +1,7 @@
#
# spec file for package cinnamon-control-center
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
%define soname libcinnamon-control-center
%define sover 1
Name: cinnamon-control-center
-Version: 4.8.1
+Version: 5.0.0
Release: 0
Summary: Utilities to configure the Cinnamon desktop
License: GPL-2.0-only AND GPL-3.0-or-later AND MIT
++++++ cinnamon-control-center-4.8.1.tar.gz ->
cinnamon-control-center-5.0.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-control-center-4.8.1/cinnamon-control-center.pot
new/cinnamon-control-center-5.0.0/cinnamon-control-center.pot
--- old/cinnamon-control-center-4.8.1/cinnamon-control-center.pot
2020-12-08 11:22:54.000000000 +0100
+++ new/cinnamon-control-center-5.0.0/cinnamon-control-center.pot
2021-05-27 16:33:09.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 13:10+0100\n"
+"POT-Creation-Date: 2021-05-27 15:31+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -306,28 +306,28 @@
msgid "Unspecified"
msgstr ""
-#: panels/display/cc-display-panel.c:599 panels/display/cc-display-panel.c:1208
-#: panels/display/cc-display-panel.c:1215
+#: panels/display/cc-display-panel.c:620 panels/display/cc-display-panel.c:1229
+#: panels/display/cc-display-panel.c:1236
#, c-format
msgid "%d%%"
msgstr ""
-#: panels/display/cc-display-panel.c:666
+#: panels/display/cc-display-panel.c:687
msgctxt "display panel, rotation"
msgid "Normal"
msgstr ""
-#: panels/display/cc-display-panel.c:667
+#: panels/display/cc-display-panel.c:688
msgctxt "display panel, rotation"
msgid "Counterclockwise"
msgstr ""
-#: panels/display/cc-display-panel.c:668
+#: panels/display/cc-display-panel.c:689
msgctxt "display panel, rotation"
msgid "Clockwise"
msgstr ""
-#: panels/display/cc-display-panel.c:669
+#: panels/display/cc-display-panel.c:690
msgctxt "display panel, rotation"
msgid "180 Degrees"
msgstr ""
@@ -343,84 +343,84 @@
#. * Here, "Mirrored" is being used as an adjective. For example,
#. * the Spanish translation could be "Pantallas en Espejo".
#.
-#: panels/display/cc-display-panel.c:814 panels/display/cc-rr-labeler.c:404
+#: panels/display/cc-display-panel.c:835 panels/display/cc-rr-labeler.c:404
msgid "Mirrored Displays"
msgstr ""
-#: panels/display/cc-display-panel.c:838
+#: panels/display/cc-display-panel.c:859
msgid "Monitor"
msgstr ""
-#: panels/display/cc-display-panel.c:942
+#: panels/display/cc-display-panel.c:963
#, c-format
msgid "%d x %d%s (%s)"
msgstr ""
-#: panels/display/cc-display-panel.c:944
+#: panels/display/cc-display-panel.c:965
#, c-format
msgid "%d x %d%s"
msgstr ""
-#: panels/display/cc-display-panel.c:959
+#: panels/display/cc-display-panel.c:980
#, c-format
msgid "%.2lf Hz"
msgstr ""
-#: panels/display/cc-display-panel.c:1238
+#: panels/display/cc-display-panel.c:1259
msgid "Normal"
msgstr ""
-#: panels/display/cc-display-panel.c:1240
+#: panels/display/cc-display-panel.c:1261
msgid "Double (Hi-DPI)"
msgstr ""
-#: panels/display/cc-display-panel.c:1280
+#: panels/display/cc-display-panel.c:1301
#, c-format
msgid "Automatic (%ux)"
msgstr ""
-#: panels/display/cc-display-panel.c:2444
+#: panels/display/cc-display-panel.c:2482
msgid ""
"Select a monitor to change its properties; drag it to rearrange its "
"placement."
msgstr ""
-#: panels/display/cc-display-panel.c:2890
+#: panels/display/cc-display-panel.c:2931
msgid "DoubleScan"
msgstr ""
-#: panels/display/cc-display-panel.c:2928
+#: panels/display/cc-display-panel.c:2969
msgid "VSync"
msgstr ""
-#: panels/display/cc-display-panel.c:2966
-#: panels/display/cc-display-panel.c:2994
+#: panels/display/cc-display-panel.c:3007
+#: panels/display/cc-display-panel.c:3035
msgid "Recommended"
msgstr ""
-#: panels/display/cc-display-panel.c:3029
+#: panels/display/cc-display-panel.c:3070
#, c-format
msgid "<b>scaled resolution: %d x %d</b>"
msgstr ""
-#: panels/display/cc-display-panel.c:3218
-#: panels/display/cc-display-panel.c:3270
+#: panels/display/cc-display-panel.c:3259
+#: panels/display/cc-display-panel.c:3311
msgid "Failed to apply configuration"
msgstr ""
-#: panels/display/cc-display-panel.c:3298
+#: panels/display/cc-display-panel.c:3339
msgid "Could not save the monitor configuration"
msgstr ""
-#: panels/display/cc-display-panel.c:3358
+#: panels/display/cc-display-panel.c:3399
msgid "Could not detect displays"
msgstr ""
-#: panels/display/cc-display-panel.c:3554
+#: panels/display/cc-display-panel.c:3641
msgid "Could not get screen information"
msgstr ""
-#: panels/network/cc-network-panel.c:895
+#: panels/network/cc-network-panel.c:910
msgid "Network proxy"
msgstr ""
@@ -428,17 +428,17 @@
#. * window for vpn connections, it is also used to display
#. * vpn connections in the device list.
#.
-#: panels/network/cc-network-panel.c:1074 panels/network/net-vpn.c:287
+#: panels/network/cc-network-panel.c:1089 panels/network/net-vpn.c:287
#: panels/network/net-vpn.c:444
#, c-format
msgid "%s VPN"
msgstr ""
-#: panels/network/cc-network-panel.c:1141
+#: panels/network/cc-network-panel.c:1156
msgid "Oops, something has gone wrong. Please contact your software vendor."
msgstr ""
-#: panels/network/cc-network-panel.c:1147
+#: panels/network/cc-network-panel.c:1162
msgid "NetworkManager needs to be running."
msgstr ""
@@ -471,48 +471,61 @@
msgstr[0] ""
msgstr[1] ""
-#: panels/network/net-device-ethernet.c:153 panels/network/panel-common.c:644
+#: panels/network/net-device-ethernet.c:155 panels/network/panel-common.c:666
#: panels/network/network-simple.ui.h:3 panels/network/network-wifi.ui.h:7
#: panels/network/connection-editor/details-page.ui.h:4
msgid "IPv4 Address"
msgstr ""
-#: panels/network/net-device-ethernet.c:154
-#: panels/network/net-device-ethernet.c:158 panels/network/panel-common.c:645
+#: panels/network/net-device-ethernet.c:156 panels/network/panel-common.c:667
#: panels/network/network-mobile.ui.h:4 panels/network/network-simple.ui.h:4
#: panels/network/network-wifi.ui.h:8
#: panels/network/connection-editor/details-page.ui.h:5
msgid "IPv6 Address"
msgstr ""
-#: panels/network/net-device-ethernet.c:156 panels/network/panel-common.c:647
-#: panels/network/panel-common.c:649 panels/network/network-mobile.ui.h:3
+#: panels/network/net-device-ethernet.c:158
+#: panels/network/net-device-ethernet.c:160 panels/network/panel-common.c:669
+#: panels/network/panel-common.c:671 panels/network/network-mobile.ui.h:3
msgid "IP Address"
msgstr ""
-#: panels/network/net-device-ethernet.c:161
+#: panels/network/net-device-ethernet.c:163
#: panels/network/network-simple.ui.h:2 panels/network/network-wifi.ui.h:9
#: panels/network/connection-editor/details-page.ui.h:6
msgid "Hardware Address"
msgstr ""
-#: panels/network/net-device-ethernet.c:165
+#: panels/network/net-device-ethernet.c:167
#: panels/network/network-mobile.ui.h:5 panels/network/network-simple.ui.h:5
#: panels/network/network-wifi.ui.h:10
#: panels/network/connection-editor/details-page.ui.h:7
msgid "Default Route"
msgstr ""
-#: panels/network/net-device-ethernet.c:167
+#: panels/network/net-device-ethernet.c:170 panels/network/panel-common.c:675
#: panels/network/network-mobile.ui.h:6 panels/network/network-simple.ui.h:6
#: panels/network/network-wifi.ui.h:11
#: panels/network/connection-editor/details-page.ui.h:8
+msgid "DNS4"
+msgstr ""
+
+#: panels/network/net-device-ethernet.c:171 panels/network/panel-common.c:676
+#: panels/network/network-mobile.ui.h:7 panels/network/network-simple.ui.h:7
+#: panels/network/network-wifi.ui.h:12
+#: panels/network/connection-editor/details-page.ui.h:9
+msgid "DNS6"
+msgstr ""
+
+#: panels/network/net-device-ethernet.c:173
+#: panels/network/net-device-ethernet.c:175 panels/network/panel-common.c:678
+#: panels/network/panel-common.c:680
#: panels/network/connection-editor/ip4-page.ui.h:3
#: panels/network/connection-editor/ip6-page.ui.h:3
msgid "DNS"
msgstr ""
-#: panels/network/net-device-ethernet.c:172 panels/network/network-wifi.ui.h:12
+#: panels/network/net-device-ethernet.c:181 panels/network/network-wifi.ui.h:13
msgid "Last used"
msgstr ""
@@ -521,14 +534,14 @@
#. * profile. It is also used to display ethernet in the
#. * device list.
#.
-#: panels/network/net-device-ethernet.c:280
+#: panels/network/net-device-ethernet.c:290
#: panels/network/network-ethernet.ui.h:1 panels/network/network-simple.ui.h:1
msgid "Wired"
msgstr ""
-#: panels/network/net-device-ethernet.c:348
-#: panels/network/net-device-wifi.c:1750 panels/network/network-ethernet.ui.h:3
-#: panels/network/network-mobile.ui.h:8 panels/network/network-simple.ui.h:8
+#: panels/network/net-device-ethernet.c:358
+#: panels/network/net-device-wifi.c:1751 panels/network/network-ethernet.ui.h:3
+#: panels/network/network-mobile.ui.h:9 panels/network/network-simple.ui.h:9
#: panels/network/network-vpn.ui.h:7
msgid "Options???"
msgstr ""
@@ -544,7 +557,7 @@
#. TRANSLATORS: this WPA WiFi security
#: panels/network/net-device-wifi.c:219 panels/network/net-device-wifi.c:398
-#: panels/network/network-wifi.ui.h:19
+#: panels/network/network-wifi.ui.h:20
msgid "WPA"
msgstr ""
@@ -609,7 +622,7 @@
msgid "Stop hotspot and disconnect any users?"
msgstr ""
-#: panels/network/net-device-wifi.c:1352 panels/network/net-device-wifi.c:1591
+#: panels/network/net-device-wifi.c:1352 panels/network/net-device-wifi.c:1592
#: panels/common/language-chooser.ui.h:2 panels/network/network-wifi.ui.h:1
#: panels/network/connection-editor/connection-editor.ui.h:1
msgid "_Cancel"
@@ -619,35 +632,35 @@
msgid "_Stop Hotspot"
msgstr ""
-#: panels/network/net-device-wifi.c:1453
+#: panels/network/net-device-wifi.c:1454
msgid "System policy prohibits use as a Hotspot"
msgstr ""
-#: panels/network/net-device-wifi.c:1456
+#: panels/network/net-device-wifi.c:1457
msgid "Wireless device does not support Hotspot mode"
msgstr ""
-#: panels/network/net-device-wifi.c:1588
+#: panels/network/net-device-wifi.c:1589
msgid ""
"Network details for the selected networks, including passwords and any "
"custom configuration will be lost."
msgstr ""
-#: panels/network/net-device-wifi.c:1592 panels/network/network-wifi.ui.h:42
+#: panels/network/net-device-wifi.c:1593 panels/network/network-wifi.ui.h:43
#: panels/network/connection-editor/reset-page.ui.h:2
msgid "_Forget"
msgstr ""
-#: panels/network/net-device-wifi.c:1898
+#: panels/network/net-device-wifi.c:1899
msgid "History"
msgstr ""
-#: panels/network/net-device-wifi.c:1902
+#: panels/network/net-device-wifi.c:1903
msgid "_Close"
msgstr ""
#. translators: This is the label for the "Forget wireless network"
functionality
-#: panels/network/net-device-wifi.c:1910
+#: panels/network/net-device-wifi.c:1911
msgctxt "Wi-Fi Network"
msgid "_Forget"
msgstr ""
@@ -980,11 +993,11 @@
msgid "<b>%s</b> removed"
msgstr ""
-#: panels/region/cinnamon-region-panel-xkblt.c:210
+#: panels/region/cinnamon-region-panel-xkblt.c:208
msgid "Layout"
msgstr ""
-#: panels/region/cinnamon-region-panel-xkbot.c:229
+#: panels/region/cinnamon-region-panel-xkbot.c:227
msgid "Default"
msgstr ""
@@ -1408,6 +1421,11 @@
msgid "_Detect Displays"
msgstr ""
+#: panels/display/display-capplet.ui.h:13
+#: panels/region/cinnamon-region-panel.ui.h:18
+msgid "Reset to De_faults"
+msgstr ""
+
#: panels/network/network-ethernet.ui.h:2
msgid "_Add Profile???"
msgstr ""
@@ -1420,7 +1438,7 @@
msgid "Provider"
msgstr ""
-#: panels/network/network-mobile.ui.h:7 generate_additional_files.py:71
+#: panels/network/network-mobile.ui.h:8 generate_additional_files.py:71
msgid "Network"
msgstr ""
@@ -1483,7 +1501,7 @@
msgid "Socks proxy port"
msgstr ""
-#: panels/network/network-simple.ui.h:7
+#: panels/network/network-simple.ui.h:8
msgid "Turn device off"
msgstr ""
@@ -1543,26 +1561,26 @@
msgid "Security"
msgstr ""
-#: panels/network/network-wifi.ui.h:13
+#: panels/network/network-wifi.ui.h:14
msgid "details"
msgstr ""
-#: panels/network/network-wifi.ui.h:14
+#: panels/network/network-wifi.ui.h:15
#: panels/network/connection-editor/wifi-page.ui.h:1
msgid "_SSID"
msgstr ""
-#: panels/network/network-wifi.ui.h:15
+#: panels/network/network-wifi.ui.h:16
#: panels/network/connection-editor/wifi-page.ui.h:2
msgid "_BSSID"
msgstr ""
-#: panels/network/network-wifi.ui.h:16
+#: panels/network/network-wifi.ui.h:17
#: panels/network/connection-editor/security-page.ui.h:1
msgid "S_ecurity"
msgstr ""
-#: panels/network/network-wifi.ui.h:17
+#: panels/network/network-wifi.ui.h:18
#: panels/network/wireless-security/eap-method-leap.ui.h:2
#: panels/network/wireless-security/eap-method-simple.ui.h:2
#: panels/network/wireless-security/ws-leap.ui.h:2
@@ -1570,196 +1588,196 @@
msgid "_Password"
msgstr ""
-#: panels/network/network-wifi.ui.h:18
+#: panels/network/network-wifi.ui.h:19
#: panels/network/connection-editor/wifi-page.ui.h:3
msgid "My Home Network"
msgstr ""
-#: panels/network/network-wifi.ui.h:20
+#: panels/network/network-wifi.ui.h:21
msgid "None"
msgstr ""
-#: panels/network/network-wifi.ui.h:21
+#: panels/network/network-wifi.ui.h:22
msgid "Show P_assword"
msgstr ""
-#: panels/network/network-wifi.ui.h:22
+#: panels/network/network-wifi.ui.h:23
msgid "Make available to other users"
msgstr ""
-#: panels/network/network-wifi.ui.h:23
+#: panels/network/network-wifi.ui.h:24
msgid "identity"
msgstr ""
-#: panels/network/network-wifi.ui.h:24
+#: panels/network/network-wifi.ui.h:25
#: panels/network/connection-editor/ip4-page.ui.h:1
msgid "IPv_4"
msgstr ""
-#: panels/network/network-wifi.ui.h:25
+#: panels/network/network-wifi.ui.h:26
#: panels/network/connection-editor/ip4-page.ui.h:2
#: panels/network/connection-editor/ip6-page.ui.h:2
msgid "_Addresses"
msgstr ""
-#: panels/network/network-wifi.ui.h:26
+#: panels/network/network-wifi.ui.h:27
msgid "Manual"
msgstr ""
-#: panels/network/network-wifi.ui.h:27
+#: panels/network/network-wifi.ui.h:28
msgid "Automatic (DHCP)"
msgstr ""
-#: panels/network/network-wifi.ui.h:28
+#: panels/network/network-wifi.ui.h:29
msgid "Automatic (DHCP) addresses only"
msgstr ""
-#: panels/network/network-wifi.ui.h:29
+#: panels/network/network-wifi.ui.h:30
msgid "Link-local only"
msgstr ""
-#: panels/network/network-wifi.ui.h:30
+#: panels/network/network-wifi.ui.h:31
msgid "Shared with other computers"
msgstr ""
-#: panels/network/network-wifi.ui.h:31
+#: panels/network/network-wifi.ui.h:32
msgid "Disabled"
msgstr ""
-#: panels/network/network-wifi.ui.h:32
+#: panels/network/network-wifi.ui.h:33
#: panels/network/connection-editor/ip4-page.ui.h:6
#: panels/network/connection-editor/ip6-page.ui.h:6
msgid "Routes"
msgstr ""
-#: panels/network/network-wifi.ui.h:33
+#: panels/network/network-wifi.ui.h:34
msgid "_Ignore automatically obtained routes"
msgstr ""
-#: panels/network/network-wifi.ui.h:34
+#: panels/network/network-wifi.ui.h:35
#: panels/network/connection-editor/ip4-page.ui.h:8
#: panels/network/connection-editor/ip6-page.ui.h:8
msgid "Use this connection _only for resources on its network"
msgstr ""
-#: panels/network/network-wifi.ui.h:35
+#: panels/network/network-wifi.ui.h:36
msgid "ipv4"
msgstr ""
-#: panels/network/network-wifi.ui.h:36
+#: panels/network/network-wifi.ui.h:37
#: panels/network/connection-editor/ip6-page.ui.h:1
msgid "IPv_6"
msgstr ""
-#: panels/network/network-wifi.ui.h:37
+#: panels/network/network-wifi.ui.h:38
msgid "ipv6"
msgstr ""
-#: panels/network/network-wifi.ui.h:38
+#: panels/network/network-wifi.ui.h:39
#: panels/network/connection-editor/ethernet-page.ui.h:11
#: panels/network/connection-editor/wifi-page.ui.h:4
msgid "_MAC Address"
msgstr ""
-#: panels/network/network-wifi.ui.h:39
+#: panels/network/network-wifi.ui.h:40
msgid "_Cloned MAC Address"
msgstr ""
-#: panels/network/network-wifi.ui.h:40
+#: panels/network/network-wifi.ui.h:41
msgid "hardware"
msgstr ""
-#: panels/network/network-wifi.ui.h:41
+#: panels/network/network-wifi.ui.h:42
#: panels/network/connection-editor/reset-page.ui.h:1
msgid "_Reset"
msgstr ""
-#: panels/network/network-wifi.ui.h:43
+#: panels/network/network-wifi.ui.h:44
msgid ""
"Reset the settings for this connection to their defaults, but remember as a "
"preferred connection."
msgstr ""
-#: panels/network/network-wifi.ui.h:44
+#: panels/network/network-wifi.ui.h:45
msgid ""
"Remove all details relating to this network and do not try to automatically "
"connect to it."
msgstr ""
-#: panels/network/network-wifi.ui.h:45
+#: panels/network/network-wifi.ui.h:46
msgid "reset"
msgstr ""
-#: panels/network/network-wifi.ui.h:46
+#: panels/network/network-wifi.ui.h:47
msgid "Details"
msgstr ""
-#: panels/network/network-wifi.ui.h:47
+#: panels/network/network-wifi.ui.h:48
msgid "Identity"
msgstr ""
-#: panels/network/network-wifi.ui.h:48
+#: panels/network/network-wifi.ui.h:49
msgid "IPv4"
msgstr ""
-#: panels/network/network-wifi.ui.h:49
+#: panels/network/network-wifi.ui.h:50
msgid "IPv6"
msgstr ""
-#: panels/network/network-wifi.ui.h:50
+#: panels/network/network-wifi.ui.h:51
msgid "Hardware"
msgstr ""
-#: panels/network/network-wifi.ui.h:51
+#: panels/network/network-wifi.ui.h:52
msgctxt "tab"
msgid "Reset"
msgstr ""
-#: panels/network/network-wifi.ui.h:52
+#: panels/network/network-wifi.ui.h:53
msgid "Wi-Fi Hotspot"
msgstr ""
-#: panels/network/network-wifi.ui.h:53
+#: panels/network/network-wifi.ui.h:54
msgid "_Turn On"
msgstr ""
-#: panels/network/network-wifi.ui.h:54
+#: panels/network/network-wifi.ui.h:55
msgid "Wi-Fi"
msgstr ""
-#: panels/network/network-wifi.ui.h:55
+#: panels/network/network-wifi.ui.h:56
msgid "Turn Wi-Fi off"
msgstr ""
-#: panels/network/network-wifi.ui.h:56
+#: panels/network/network-wifi.ui.h:57
msgid "_Use as Hotspot???"
msgstr ""
-#: panels/network/network-wifi.ui.h:57
+#: panels/network/network-wifi.ui.h:58
msgid "_Connect to Hidden Network???"
msgstr ""
-#: panels/network/network-wifi.ui.h:58
+#: panels/network/network-wifi.ui.h:59
msgid "_History"
msgstr ""
-#: panels/network/network-wifi.ui.h:59
+#: panels/network/network-wifi.ui.h:60
msgid "Switch off to connect to a Wi-Fi network"
msgstr ""
-#: panels/network/network-wifi.ui.h:60
+#: panels/network/network-wifi.ui.h:61
msgid "Network Name"
msgstr ""
-#: panels/network/network-wifi.ui.h:61
+#: panels/network/network-wifi.ui.h:62
msgid "Connected Devices"
msgstr ""
-#: panels/network/network-wifi.ui.h:62
+#: panels/network/network-wifi.ui.h:63
msgid "Security type"
msgstr ""
-#: panels/network/network-wifi.ui.h:63
+#: panels/network/network-wifi.ui.h:64
msgid "Password"
msgstr ""
@@ -1865,10 +1883,6 @@
msgid "View and edit keyboard layout options"
msgstr ""
-#: panels/region/cinnamon-region-panel.ui.h:18
-msgid "Reset to De_faults"
-msgstr ""
-
#: panels/region/cinnamon-region-panel.ui.h:19
msgid ""
"Replace the current keyboard layout settings with the\n"
@@ -2037,7 +2051,7 @@
msgid "page 2"
msgstr ""
-#: panels/network/connection-editor/details-page.ui.h:9
+#: panels/network/connection-editor/details-page.ui.h:10
msgid "Last Used"
msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-control-center-4.8.1/debian/changelog
new/cinnamon-control-center-5.0.0/debian/changelog
--- old/cinnamon-control-center-4.8.1/debian/changelog 2020-12-08
11:22:54.000000000 +0100
+++ new/cinnamon-control-center-5.0.0/debian/changelog 2021-05-27
16:33:09.000000000 +0200
@@ -1,3 +1,23 @@
+cinnamon-control-center (5.0.0) uma; urgency=medium
+
+ [ F??lix Pi??dallu ]
+ * Add ifdefs to prevent undefined reference to modem functions in network
panel
+
+ [ treysis ]
+ * network: Add support for displaying DNS6 parameters
+
+ [ Clement Lefebvre ]
+ * l10n: Update POT
+ * l10n: Generate files
+
+ -- Clement Lefebvre <[email protected]> Thu, 27 May 2021 15:32:39 +0100
+
+cinnamon-control-center (4.8.2) ulyssa; urgency=medium
+
+ * Network: Don't prevent hotspot capability unless NM specifically rules it
out
+
+ -- Clement Lefebvre <[email protected]> Sat, 02 Jan 2021 18:26:37 +0000
+
cinnamon-control-center (4.8.1) ulyssa; urgency=medium
[ Michael Webster ]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-control-center-4.8.1/meson.build
new/cinnamon-control-center-5.0.0/meson.build
--- old/cinnamon-control-center-4.8.1/meson.build 2020-12-08
11:22:54.000000000 +0100
+++ new/cinnamon-control-center-5.0.0/meson.build 2021-05-27
16:33:09.000000000 +0200
@@ -1,5 +1,5 @@
project('cinnamon-control-center', 'c',
- version: '4.8.1',
+ version: '5.0.0',
meson_version: '>=0.49.0',
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-control-center-4.8.1/panels/color/cinnamon-color-panel.desktop.in.in
new/cinnamon-control-center-5.0.0/panels/color/cinnamon-color-panel.desktop.in.in
---
old/cinnamon-control-center-4.8.1/panels/color/cinnamon-color-panel.desktop.in.in
2020-12-08 11:22:54.000000000 +0100
+++
new/cinnamon-control-center-5.0.0/panels/color/cinnamon-color-panel.desktop.in.in
2021-05-27 16:33:09.000000000 +0200
@@ -34,6 +34,7 @@
Name[gd]=Dath
Name[gl]=Cor
Name[he]=??????
+Name[hi]=?????????
Name[hr]=Boja
Name[hu]=Sz??n
Name[id]=Warna
@@ -96,7 +97,7 @@
Comment[en_CA]=Colour management settings
Comment[en_GB]=Colour management settings
Comment[eo]=??an??i administrad-agordojn
-Comment[es]=Configuraci??n de la gesti??n del color
+Comment[es]=Configuraci??n de la gesti??n de color
Comment[et]=V??rvihalduse seaded
Comment[eu]=Kolore-kudeaketaren ezarpenak
Comment[fi]=V??rien hallinta
@@ -105,13 +106,14 @@
Comment[gd]=Roghainnean sti??ireadh nan dathan
Comment[gl]=Axustes da xesti??n da cor
Comment[he]=???????????? ?????????? ??????
+Comment[hi]=????????? ????????????????????? ????????????????????????
Comment[hr]=Postavke upravljanja bojom
Comment[hu]=Sz??nkezel??si be??ll??t??sok
Comment[ia]=Configurationes del gestion del color
Comment[id]=Pengaturan manajemen warna
Comment[is]=Stillingar litast??ringar
Comment[it]=Impostazioni di gestione del colore
-Comment[ja]=???????????????????????????????????????
+Comment[ja]=??????????????????
Comment[kab]=I??ewwaren usefrek n yiniten
Comment[kk]=???????????? ?????????????? ????????????????????
Comment[ko]=??? ?????? ??????
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-control-center-4.8.1/panels/display/cinnamon-display-panel.desktop.in.in
new/cinnamon-control-center-5.0.0/panels/display/cinnamon-display-panel.desktop.in.in
---
old/cinnamon-control-center-4.8.1/panels/display/cinnamon-display-panel.desktop.in.in
2020-12-08 11:22:54.000000000 +0100
+++
new/cinnamon-control-center-5.0.0/panels/display/cinnamon-display-panel.desktop.in.in
2021-05-27 16:33:09.000000000 +0200
@@ -83,7 +83,7 @@
Comment[ca]=Canvieu la resoluci?? i la posici?? dels monitors i projectors
Comment[ca@valencia]=Canvieu la resoluci?? i la posici?? dels monitors i
projectors
Comment[cs]=Zm??nit rozli??en?? a polohu monitor?? a projektor??
-Comment[cy]=Newwid cydraniad a safle dangosyddion a thaflynyddion
+Comment[cy]=Newid cydraniad a safle dangosyddion a thaflynyddion
Comment[da]=??ndr opl??sning og placering af sk??rme og projektorer
Comment[de]=Aufl??sung und Anordnung der Bildschirme und Projektoren ??ndern
Comment[el]=???????????? ?????? ???????????????? ?????? ?????? ??????????
?????? ???????????? ?????? ?????? ??????????????????????
@@ -97,13 +97,14 @@
Comment[gd]=Atharraich d??mhlachd-bhreacaidh agus ionad nam monatairean agus
nam proiseactaran
Comment[gl]=Cambiar a resoluci??n e a posici??n dos monitores e proxectores
Comment[he]=?????????? ?????????????????? ?????????????? ???? ??????????
????????????????
+Comment[hi]=?????????????????? ????????? ??????????????????????????????
???????????? ???????????????????????? ??? ?????????????????? ???????????????
Comment[hr]=Promijenite razlu??ivost i polo??aj zaslona i projektora
Comment[hu]=Kijelz??k ??s projektorok felbont??s??nak ??s elhelyez??s??nek
m??dos??t??sa
Comment[ia]=Cambiar le resolution e le position de monitores e projectores
Comment[id]=Ubah resolusi dan posisi monitor dan projektor
Comment[is]=Breyttu upplausn og st????u skj??a og myndvarpa
Comment[it]=Cambia la risoluzione e la posizione dei monitor e dei proiettori
-Comment[ja]=??????????????????????????????????????????????????????????????????
+Comment[ja]=???????????????????????????????????????????????????????????????????????????
Comment[kab]=Beddel tabadut d wadeg n iferdisen n yimagaren
Comment[kk]=???????????????????? ?????????????????????? ??????????
???????????????? ???????? ???????????????????? ??????????????
Comment[ko]=????????? ??? ??????????????? ???????????? ????????? ????????????
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-control-center-4.8.1/panels/network/cc-network-panel.c
new/cinnamon-control-center-5.0.0/panels/network/cc-network-panel.c
--- old/cinnamon-control-center-4.8.1/panels/network/cc-network-panel.c
2020-12-08 11:22:54.000000000 +0100
+++ new/cinnamon-control-center-5.0.0/panels/network/cc-network-panel.c
2021-05-27 16:33:09.000000000 +0200
@@ -29,7 +29,9 @@
#include <NetworkManager.h>
#include "net-device.h"
+#ifdef BUILD_MODEM
#include "net-device-mobile.h"
+#endif
#include "net-device-wifi.h"
#include "net-device-ethernet.h"
#include "net-object.h"
@@ -651,9 +653,11 @@
case NM_DEVICE_TYPE_ETHERNET:
device_g_type = NET_TYPE_DEVICE_ETHERNET;
break;
+ #ifdef BUILD_MODEM
case NM_DEVICE_TYPE_MODEM:
device_g_type = NET_TYPE_DEVICE_MOBILE;
break;
+ #endif
case NM_DEVICE_TYPE_WIFI:
device_g_type = NET_TYPE_DEVICE_WIFI;
break;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-control-center-4.8.1/panels/network/cinnamon-network-panel.desktop.in.in
new/cinnamon-control-center-5.0.0/panels/network/cinnamon-network-panel.desktop.in.in
---
old/cinnamon-control-center-4.8.1/panels/network/cinnamon-network-panel.desktop.in.in
2020-12-08 11:22:54.000000000 +0100
+++
new/cinnamon-control-center-5.0.0/panels/network/cinnamon-network-panel.desktop.in.in
2021-05-27 16:33:09.000000000 +0200
@@ -35,6 +35,7 @@
Name[gd]=L??onra
Name[gl]=Rede
Name[he]=??????
+Name[hi]=?????????????????????
Name[hr]=Mre??a
Name[hu]=H??l??zat
Name[ia]=Rete
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-control-center-4.8.1/panels/network/connection-editor/details-page.ui
new/cinnamon-control-center-5.0.0/panels/network/connection-editor/details-page.ui
---
old/cinnamon-control-center-4.8.1/panels/network/connection-editor/details-page.ui
2020-12-08 11:22:54.000000000 +0100
+++
new/cinnamon-control-center-5.0.0/panels/network/connection-editor/details-page.ui
2021-05-27 16:33:09.000000000 +0200
@@ -172,13 +172,13 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="heading_dns">
+ <object class="GtkLabel" id="heading_dns4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes">DNS</property>
- <property name="mnemonic_widget">label_dns</property>
+ <property name="label" translatable="yes">DNS4</property>
+ <property name="mnemonic_widget">label_dns4</property>
<style>
<class name="dim-label"/>
</style>
@@ -191,6 +191,25 @@
</packing>
</child>
<child>
+ <object class="GtkLabel" id="heading_dns6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">1</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes">DNS6</property>
+ <property name="mnemonic_widget">label_dns6</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">8</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkLabel" id="heading_last_used">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -284,7 +303,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label_dns">
+ <object class="GtkLabel" id="label_dns4">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">0</property>
@@ -299,6 +318,23 @@
<property name="width">1</property>
<property name="height">1</property>
</packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_dns6">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label">::1</property>
+ <property name="wrap">True</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">8</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
</child>
<child>
<object class="GtkLabel" id="label_last_used">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-control-center-4.8.1/panels/network/connection-editor/ip4-page.ui
new/cinnamon-control-center-5.0.0/panels/network/connection-editor/ip4-page.ui
---
old/cinnamon-control-center-4.8.1/panels/network/connection-editor/ip4-page.ui
2020-12-08 11:22:54.000000000 +0100
+++
new/cinnamon-control-center-5.0.0/panels/network/connection-editor/ip4-page.ui
2021-05-27 16:33:09.000000000 +0200
@@ -132,7 +132,7 @@
<property name="margin_bottom">6</property>
<property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="heading_dns">
+ <object class="GtkLabel" id="heading_dns4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-control-center-4.8.1/panels/network/connection-editor/ip6-page.ui
new/cinnamon-control-center-5.0.0/panels/network/connection-editor/ip6-page.ui
---
old/cinnamon-control-center-4.8.1/panels/network/connection-editor/ip6-page.ui
2020-12-08 11:22:54.000000000 +0100
+++
new/cinnamon-control-center-5.0.0/panels/network/connection-editor/ip6-page.ui
2021-05-27 16:33:09.000000000 +0200
@@ -132,7 +132,7 @@
<property name="margin_bottom">6</property>
<property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="heading_dns">
+ <object class="GtkLabel" id="heading_dns6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-control-center-4.8.1/panels/network/net-device-ethernet.c
new/cinnamon-control-center-5.0.0/panels/network/net-device-ethernet.c
--- old/cinnamon-control-center-4.8.1/panels/network/net-device-ethernet.c
2020-12-08 11:22:54.000000000 +0100
+++ new/cinnamon-control-center-5.0.0/panels/network/net-device-ethernet.c
2021-05-27 16:33:09.000000000 +0200
@@ -136,17 +136,19 @@
gchar *ip4_route = NULL;
gchar *ip4_dns = NULL;
gchar *ip6_address = NULL;
+ gchar *ip6_dns = NULL;
gint i = 0;
ip4_config = nm_device_get_ip4_config (device);
if (ip4_config) {
ip4_address = panel_get_ip4_address_as_string (ip4_config,
"address");
ip4_route = panel_get_ip4_address_as_string (ip4_config,
"gateway");
- ip4_dns = panel_get_ip4_dns_as_string (ip4_config);
+ ip4_dns = panel_get_dns_as_string (ip4_config);
}
ip6_config = nm_device_get_ip6_config (device);
if (ip6_config) {
ip6_address = panel_get_ip6_address_as_string (ip6_config);
+ ip6_dns = panel_get_dns_as_string (ip6_config);
}
if (ip4_address && ip6_address) {
@@ -155,7 +157,7 @@
} else if (ip4_address) {
add_details_row (details, i++, _("IP Address"), ip4_address);
} else if (ip6_address) {
- add_details_row (details, i++, _("IPv6 Address"), ip6_address);
+ add_details_row (details, i++, _("IP Address"), ip6_address);
}
add_details_row (details, i++, _("Hardware Address"),
@@ -163,8 +165,15 @@
if (ip4_route)
add_details_row (details, i++, _("Default Route"), ip4_route);
- if (ip4_dns)
+
+ if (ip4_dns && ip6_dns) {
+ add_details_row (details, i++, _("DNS4"), ip4_dns);
+ add_details_row (details, i++, _("DNS6"), ip6_dns);
+ } else if (ip4_dns) {
add_details_row (details, i++, _("DNS"), ip4_dns);
+ } else if (ip6_dns) {
+ add_details_row (details, i++, _("DNS"), ip6_dns);
+ }
if (nm_device_get_state (device) != NM_DEVICE_STATE_ACTIVATED) {
gchar *last_used;
@@ -177,6 +186,7 @@
g_free (ip4_route);
g_free (ip4_dns);
g_free (ip6_address);
+ g_free (ip6_dns);
}
static void populate_ui (NetDeviceEthernet *device);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-control-center-4.8.1/panels/network/net-device-wifi.c
new/cinnamon-control-center-5.0.0/panels/network/net-device-wifi.c
--- old/cinnamon-control-center-4.8.1/panels/network/net-device-wifi.c
2020-12-08 11:22:54.000000000 +0100
+++ new/cinnamon-control-center-5.0.0/panels/network/net-device-wifi.c
2021-05-27 16:33:09.000000000 +0200
@@ -1449,7 +1449,8 @@
perm = nm_client_get_permission_result (client,
NM_CLIENT_PERMISSION_WIFI_SHARE_OPEN);
caps = nm_device_wifi_get_capabilities (NM_DEVICE_WIFI (nm_device));
if (perm != NM_CLIENT_PERMISSION_RESULT_YES &&
- perm != NM_CLIENT_PERMISSION_RESULT_AUTH) {
+ perm != NM_CLIENT_PERMISSION_RESULT_AUTH &&
+ perm != NM_CLIENT_PERMISSION_RESULT_UNKNOWN) {
gtk_widget_set_tooltip_text (widget, _("System policy
prohibits use as a Hotspot"));
gtk_widget_set_sensitive (widget, FALSE);
} else if (!(caps & (NM_WIFI_DEVICE_CAP_AP |
NM_WIFI_DEVICE_CAP_ADHOC))) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-control-center-4.8.1/panels/network/network-mobile.ui
new/cinnamon-control-center-5.0.0/panels/network/network-mobile.ui
--- old/cinnamon-control-center-4.8.1/panels/network/network-mobile.ui
2020-12-08 11:22:54.000000000 +0100
+++ new/cinnamon-control-center-5.0.0/panels/network/network-mobile.ui
2021-05-27 16:33:09.000000000 +0200
@@ -131,7 +131,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label_dns">
+ <object class="GtkLabel" id="label_dns4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
@@ -147,6 +147,22 @@
</packing>
</child>
<child>
+ <object class="GtkLabel" id="label_dns6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="wrap">True</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">8</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkAlignment" id="alignment_switch">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -215,12 +231,12 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="heading_dns">
+ <object class="GtkLabel" id="heading_dns4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes">DNS</property>
+ <property name="label" translatable="yes">DNS4</property>
<style>
<class name="dim-label"/>
</style>
@@ -231,6 +247,24 @@
<property name="width">1</property>
<property name="height">1</property>
</packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="heading_dns6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">1</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes">DNS6</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">8</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
</child>
<child>
<object class="GtkLabel" id="heading_network">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-control-center-4.8.1/panels/network/network-simple.ui
new/cinnamon-control-center-5.0.0/panels/network/network-simple.ui
--- old/cinnamon-control-center-4.8.1/panels/network/network-simple.ui
2020-12-08 11:22:54.000000000 +0100
+++ new/cinnamon-control-center-5.0.0/panels/network/network-simple.ui
2021-05-27 16:33:09.000000000 +0200
@@ -160,13 +160,13 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="heading_dns">
+ <object class="GtkLabel" id="heading_dns4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes">DNS</property>
- <property name="mnemonic_widget">label_dns</property>
+ <property name="label" translatable="yes">DNS4</property>
+ <property name="mnemonic_widget">label_dns4</property>
<style>
<class name="dim-label"/>
</style>
@@ -179,6 +179,25 @@
</packing>
</child>
<child>
+ <object class="GtkLabel" id="heading_dns6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">1</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes">DNS6</property>
+ <property name="mnemonic_widget">label_dns6</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkLabel" id="label_mac">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -239,7 +258,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label_dns">
+ <object class="GtkLabel" id="label_dns4">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">0</property>
@@ -254,6 +273,23 @@
<property name="width">1</property>
<property name="height">1</property>
</packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_dns6">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label">::1</property>
+ <property name="wrap">True</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">5</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
</child>
</object>
<packing>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-control-center-4.8.1/panels/network/network-wifi.ui
new/cinnamon-control-center-5.0.0/panels/network/network-wifi.ui
--- old/cinnamon-control-center-4.8.1/panels/network/network-wifi.ui
2020-12-08 11:22:54.000000000 +0100
+++ new/cinnamon-control-center-5.0.0/panels/network/network-wifi.ui
2021-05-27 16:33:09.000000000 +0200
@@ -317,12 +317,12 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="heading_dns">
+ <object class="GtkLabel" id="heading_dns4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="yalign">0</property>
- <property name="label"
translatable="yes">DNS</property>
+ <property name="label"
translatable="yes">DNS4</property>
<style>
<class name="dim-label"/>
</style>
@@ -335,6 +335,24 @@
</packing>
</child>
<child>
+ <object class="GtkLabel" id="heading_dns6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">1</property>
+ <property name="yalign">0</property>
+ <property name="label"
translatable="yes">DNS6</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">8</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkLabel" id="heading_last_used">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -346,7 +364,7 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">8</property>
+ <property name="top_attach">9</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
@@ -427,7 +445,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label_dns">
+ <object class="GtkLabel" id="label_dns4">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">0</property>
@@ -444,6 +462,23 @@
</packing>
</child>
<child>
+ <object class="GtkLabel" id="label_dns6">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label">::1</property>
+ <property name="wrap">True</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">8</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkLabel" id="label_last_used">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -453,7 +488,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">8</property>
+ <property name="top_attach">9</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
@@ -829,7 +864,7 @@
<property name="margin_top">24</property>
<property name="margin_bottom">6</property>
<property name="xalign">0</property>
- <property name="label"
translatable="yes">DNS</property>
+ <property name="label"
translatable="yes">DNS4</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -849,10 +884,7 @@
<object class="GtkLabel" id="label11">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label">DNS
-section
-goes
-here</property>
+ <property name="label">DNS section goes
here</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1106,7 +1138,7 @@
<property name="margin_top">24</property>
<property name="margin_bottom">6</property>
<property name="xalign">0</property>
- <property name="label"
translatable="yes">DNS</property>
+ <property name="label"
translatable="yes">DNS6</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -1126,10 +1158,7 @@
<object class="GtkLabel" id="label14">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label">DNS
-section
-goes
-here</property>
+ <property name="label">DNS section goes
here</property>
</object>
<packing>
<property name="expand">False</property>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-control-center-4.8.1/panels/network/panel-common.c
new/cinnamon-control-center-5.0.0/panels/network/panel-common.c
--- old/cinnamon-control-center-4.8.1/panels/network/panel-common.c
2020-12-08 11:22:54.000000000 +0100
+++ new/cinnamon-control-center-5.0.0/panels/network/panel-common.c
2021-05-27 16:33:09.000000000 +0200
@@ -556,10 +556,15 @@
}
gchar *
-panel_get_ip4_dns_as_string (NMIPConfig *ip4_config)
+panel_get_dns_as_string (NMIPConfig *ip_config)
{
- return g_strjoinv (" ",
- (char **) nm_ip_config_get_nameservers
(ip4_config));
+ const char *const *arrc;
+
+ arrc = nm_ip_config_get_nameservers (ip_config);
+ if (*arrc != NULL)
+ return g_strjoinv (" ", (char **) arrc);
+
+ return NULL;
}
gchar *
@@ -582,6 +587,8 @@
NMIPConfig *ip6_config = NULL;
gboolean has_ip4;
gboolean has_ip6;
+ gchar *ip4_dns = NULL;
+ gchar *ip6_dns = NULL;
gchar *str_tmp;
/* get IPv4 parameters */
@@ -597,11 +604,10 @@
g_free (str_tmp);
/* IPv4 DNS */
- str_tmp = panel_get_ip4_dns_as_string (ip4_config);
+ ip4_dns = panel_get_dns_as_string (ip4_config);
panel_set_device_widget_details (builder,
- "dns",
- str_tmp);
- g_free (str_tmp);
+ "dns4",
+ ip4_dns);
/* IPv4 route */
str_tmp = panel_get_ip4_address_as_string (ip4_config,
"gateway");
@@ -619,7 +625,7 @@
/* IPv4 DNS */
panel_set_device_widget_details (builder,
- "dns",
+ "dns4",
NULL);
/* IPv4 route */
@@ -632,12 +638,28 @@
ip6_config = nm_device_get_ip6_config (device);
if (ip6_config != NULL) {
str_tmp = panel_get_ip6_address_as_string (ip6_config);
- panel_set_device_widget_details (builder, "ipv6", str_tmp);
+ panel_set_device_widget_details (builder,
+ "ipv6",
+ str_tmp);
has_ip6 = str_tmp != NULL;
g_free (str_tmp);
+
+ /* IPv6 DNS */
+ ip6_dns = panel_get_dns_as_string (ip6_config);
+ panel_set_device_widget_details (builder,
+ "dns6",
+ ip6_dns);
+
} else {
- panel_set_device_widget_details (builder, "ipv6", NULL);
+ panel_set_device_widget_details (builder,
+ "ipv6",
+ NULL);
has_ip6 = FALSE;
+
+ /* IPv6 DNS */
+ panel_set_device_widget_details (builder,
+ "dns6",
+ NULL);
}
if (has_ip4 && has_ip6) {
@@ -648,6 +670,18 @@
} else if (has_ip6) {
panel_set_device_widget_header (builder, "ipv6", _("IP
Address"));
}
+
+ if (ip4_dns && ip6_dns) {
+ panel_set_device_widget_header (builder, "dns4", _("DNS4"));
+ panel_set_device_widget_header (builder, "dns6", _("DNS6"));
+ } else if (ip4_dns) {
+ panel_set_device_widget_header (builder, "dns4", _("DNS"));
+ } else if (ip6_dns) {
+ panel_set_device_widget_header (builder, "dns6", _("DNS"));
+ }
+
+ g_free (ip4_dns);
+ g_free (ip6_dns);
}
void
@@ -655,6 +689,7 @@
{
panel_set_device_widget_details (builder, "ipv4", NULL);
panel_set_device_widget_details (builder, "ipv6", NULL);
- panel_set_device_widget_details (builder, "dns", NULL);
+ panel_set_device_widget_details (builder, "dns4", NULL);
+ panel_set_device_widget_details (builder, "dns6", NULL);
panel_set_device_widget_details (builder, "route", NULL);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-control-center-4.8.1/panels/network/panel-common.h
new/cinnamon-control-center-5.0.0/panels/network/panel-common.h
--- old/cinnamon-control-center-4.8.1/panels/network/panel-common.h
2020-12-08 11:22:54.000000000 +0100
+++ new/cinnamon-control-center-5.0.0/panels/network/panel-common.h
2021-05-27 16:33:09.000000000 +0200
@@ -47,7 +47,7 @@
NMDevice
*device);
void panel_unset_device_widgets (GtkBuilder
*builder);
gchar *panel_get_ip4_address_as_string (NMIPConfig
*config, const gchar *what);
-gchar *panel_get_ip4_dns_as_string (NMIPConfig
*config);
+gchar *panel_get_dns_as_string (NMIPConfig
*config);
gchar *panel_get_ip6_address_as_string (NMIPConfig
*config);
G_END_DECLS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-control-center-4.8.1/panels/region/cinnamon-region-panel.desktop.in.in
new/cinnamon-control-center-5.0.0/panels/region/cinnamon-region-panel.desktop.in.in
---
old/cinnamon-control-center-4.8.1/panels/region/cinnamon-region-panel.desktop.in.in
2020-12-08 11:22:54.000000000 +0100
+++
new/cinnamon-control-center-5.0.0/panels/region/cinnamon-region-panel.desktop.in.in
2021-05-27 16:33:09.000000000 +0200
@@ -36,6 +36,7 @@
Name[gd]=D??thaich ??? c??nan
Name[gl]=Rexi??n e idioma
Name[he]=???????? ????????
+Name[hi]=????????????????????? ??? ????????????
Name[hr]=Regija i Jezik
Name[hu]=Ter??leti ??s nyelvi be??ll??t??sok
Name[ia]=Region & Lingua
@@ -106,6 +107,7 @@
Comment[gd]=Atharraich roghainnean do dh??thcha 's do ch??nain
Comment[gl]=Cambiar os axustes de rexi??n e idioma
Comment[he]=?????????? ?????????????? ?????????? ???????? ????????????
+Comment[hi]=????????????????????? ??? ??????????????? ????????????????????????
???????????????
Comment[hr]=Promijenite va??u regiju i jezi??ne postavke
Comment[hu]=Ter??leti ??s nyelvi be??ll??t??sok m??dos??t??sa
Comment[ia]=Cambiar tu preferentias de region e lingua
@@ -113,7 +115,7 @@
Comment[ie]=Cambiar vor parametres de lingue e region
Comment[is]=Stilltu landsv????i?? ??itt og tungum??lastillingar
Comment[it]=Cambia le impostazioni della tua regione e della lingua
-Comment[ja]=??????????????????????????????????????????
+Comment[ja]=??????????????????????????????????????????
Comment[kab]=Beddel i??ewwaren n tmenna???-ik(m) d tutlayt-ik(m)
Comment[kk]=?????????? ???????? ?????? ?????????????????????? ??????????????
Comment[ko]=?????? ??? ?????? ????????? ????????????
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-control-center-4.8.1/panels/wacom/cinnamon-wacom-panel.desktop.in.in
new/cinnamon-control-center-5.0.0/panels/wacom/cinnamon-wacom-panel.desktop.in.in
---
old/cinnamon-control-center-4.8.1/panels/wacom/cinnamon-wacom-panel.desktop.in.in
2020-12-08 11:22:54.000000000 +0100
+++
new/cinnamon-control-center-5.0.0/panels/wacom/cinnamon-wacom-panel.desktop.in.in
2021-05-27 16:33:09.000000000 +0200
@@ -34,6 +34,8 @@
Name[fr_CA]=Tablette graphique
Name[gd]=Tablaid grafaigeachd
Name[gl]=Tableta gr??fica
+Name[he]=???????? ?????? ????????
+Name[hi]=??????????????????????????? ??????????????????
Name[hr]=Grafi??ki tablet
Name[hu]=Digitaliz??l?? t??bla
Name[ia]=Tabletta graphic
@@ -41,7 +43,7 @@
Name[ie]=Grafical tabulette
Name[is]=Teiknitafla
Name[it]=Tavoletta grafica
-Name[ja]=????????????????????????????????????
+Name[ja]=?????????????????????????????????
Name[kab]=Tafelwit tudlift
Name[kk]=???????????????????? ??????????????
Name[ko]=????????? ?????????
@@ -96,13 +98,15 @@
Comment[fr_CA]=Associer les boutons et ajuster la sensibilit?? du stylet des
tablettes graphiques
Comment[gd]=Suidhich mapadh nam putanan is cuir air gleus mothalachd an
staidhleis airson tablaidean grafaigeachd
Comment[gl]=Estabeleza a asignaci??n de bot??ns e axuste a sensibilidade do
seu lapis dixital nas tabletas gr??ficas
+Comment[he]=?????????? ?????????? ???????????? ???????????? ????????????
?????? ???????????? ?????? ????????????
+Comment[hi]=??????????????????????????? ?????????????????? ????????????
????????? ??????????????? ????????? ??? ?????????????????????
????????????????????????????????? ???????????????????????? ????????????
Comment[hr]=Postavi tipke mapiranja i prilagodi osjetljivost igle grafi??kih
tableta
Comment[hu]=Rajzt??bl??k gomblek??pez??seinek be??ll??t??sa ??s a stylus
??rz??kenys??g??nek m??dos??t??sa
Comment[ia]=Configurar le mappas del buttones e adjustar le sensitivitate del
stilo pro le tablettas graphic
Comment[id]=Tata pemetaan tombol dan atur kepekaan stylus bagi tablet grafis
Comment[is]=Stilltu hnappav??rpun og a??laga??u n??mni snertipenna fyrir
teiknibor??
Comment[it]=Imposta la mappatura dei pulsanti e regola la sensibilit?? del
pennino per tavolette grafiche
-Comment[ja]=???????????????????????????????????????????????????????????????????????????????????????????????????
+Comment[ja]=??????????????????????????????????????????????????????????????????????????????????????????????????????
Comment[kab]=Sireg tiqfalin u sgaddi a???ulfu n imru di tfelwin tudlifin
Comment[kk]=???????????????????? ???????????????????? ????????
???????????????????? ???????????????????????????? ???????? ????????????
?????????????????????????????? ????????????
Comment[ko]=????????? ???????????? ????????? ?????? ?????? ??????????????????
????????? ???????????????.