Commit 83ab4ec2 authored by Dan Williams's avatar Dan Williams

settings: system-settings -> settings

parent 1ec6b671
......@@ -518,7 +518,7 @@ src/ppp-manager/Makefile
src/dnsmasq-manager/Makefile
src/modem-manager/Makefile
src/bluez-manager/Makefile
src/system-settings/Makefile
src/settings/Makefile
src/backends/Makefile
libnm-util/libnm-util.pc
libnm-util/Makefile
......
......@@ -18,7 +18,7 @@ src/dhcp-manager/nm-dhcp-dhclient.c
src/dhcp-manager/nm-dhcp-manager.c
src/logging/nm-logging.c
src/dns-manager/nm-dns-manager.c
src/system-settings/nm-default-wired-connection.c
src/settings/nm-default-wired-connection.c
system-settings/plugins/ifcfg-rh/reader.c
system-settings/plugins/ifnet/connection_parser.c
......@@ -1598,7 +1598,7 @@ msgstr "মন কৰিব: libc resolver ৰ দ্বাৰা ৩ তকৈ
msgid "The nameservers listed below may not be recognized."
msgstr "নিম্নলিখিত নাম-সেৱকসমূহ চিনাক্ত ন'হ'বও পাৰে ।"
#: ../src/system-settings/nm-default-wired-connection.c:157
#: ../src/settings/nm-default-wired-connection.c:157
#, c-format
msgid "Auto %s"
msgstr "স্বয়ংক্ৰিয় %s"
......
......@@ -1877,7 +1877,7 @@ msgstr "ЗАБЕЛЕЖКА: libc може да не поддържа повеч
msgid "The nameservers listed below may not be recognized."
msgstr "Долните сървъри за имена може да не бъдат разпознати."
#: ../src/system-settings/nm-default-wired-connection.c:157
#: ../src/settings/nm-default-wired-connection.c:157
#, c-format
msgid "Auto %s"
msgstr "Автоматично %s"
......
......@@ -1597,7 +1597,7 @@ msgstr ""
msgid "The nameservers listed below may not be recognized."
msgstr "নিম্নলিখিত নেম-সার্ভারগুলি সনাক্ত না হওয়ার সম্ভাবনা রয়েছে।"
#: ../src/system-settings/nm-default-wired-connection.c:157
#: ../src/settings/nm-default-wired-connection.c:157
#, c-format
msgid "Auto %s"
msgstr "স্বয়ংক্রিয় %s"
......
......@@ -1344,7 +1344,7 @@ msgstr ""
msgid "The nameservers listed below may not be recognized."
msgstr "Jmenné servery uvedené v následujícím seznamu nelze rozpoznat."
#: ../src/system-settings/nm-default-wired-connection.c:157
#: ../src/settings/nm-default-wired-connection.c:157
#, c-format
msgid "Auto %s"
msgstr "%s (automaticky)"
......
......@@ -1809,7 +1809,7 @@ msgstr ""
msgid "The nameservers listed below may not be recognized."
msgstr "Die nachfolgend gelisteten Nameserver werden eventuell nicht erkannt."
#: ../src/system-settings/nm-default-wired-connection.c:157
#: ../src/settings/nm-default-wired-connection.c:157
#, c-format
msgid "Auto %s"
msgstr "Auto %s"
......
......@@ -1773,7 +1773,7 @@ msgstr ""
msgid "The nameservers listed below may not be recognized."
msgstr "Οι κάτωθι εξυπηρετητές ονομάτων ίσως να μην αναγνωρίζονται."
#: ../src/system-settings/nm-default-wired-connection.c:157
#: ../src/settings/nm-default-wired-connection.c:157
#, c-format
msgid "Auto %s"
msgstr "Αυτόματο %s"
......
......@@ -326,7 +326,7 @@ msgstr "NOTE: the libc resolver may not support more than 3 nameservers."
msgid "The nameservers listed below may not be recognized."
msgstr "The nameservers listed below may not be recognised."
#: ../src/system-settings/nm-default-wired-connection.c:194
#: ../src/settings/nm-default-wired-connection.c:194
#, c-format
msgid "Auto %s"
msgstr "Auto %s"
......
......@@ -1768,7 +1768,7 @@ msgstr ""
msgid "The nameservers listed below may not be recognized."
msgstr "Puede que los servidores de nombres listados abajo no se reconozcan."
#: ../src/system-settings/nm-default-wired-connection.c:157
#: ../src/settings/nm-default-wired-connection.c:157
#, c-format
msgid "Auto %s"
msgstr "Auto %s"
......
......@@ -1308,7 +1308,7 @@ msgstr "OHARRA: libc-en ebaztaileak ez du 3 izen-zerbitzari baino gehiago onartz
msgid "The nameservers listed below may not be recognized."
msgstr "Azpian zerrendatutako izen-zenbitzariak ez dira ezagutuko."
#: ../src/system-settings/nm-default-wired-connection.c:157
#: ../src/settings/nm-default-wired-connection.c:157
#, c-format
msgid "Auto %s"
msgstr "Auto %s"
......
......@@ -1621,7 +1621,7 @@ msgstr ""
msgid "The nameservers listed below may not be recognized."
msgstr "Les serveurs de noms listés ci-dessous peuvent ne pas être reconnus."
#: ../src/system-settings/nm-default-wired-connection.c:157
#: ../src/settings/nm-default-wired-connection.c:157
#, c-format
msgid "Auto %s"
msgstr "Auto %s"
......
......@@ -1732,7 +1732,7 @@ msgstr "NOTE: o importador libc non permite máis de 3 nomes de servidores."
msgid "The nameservers listed below may not be recognized."
msgstr "Os nomes de servidores listados a seguir poden non ser recoñecidos"
#: ../src/system-settings/nm-default-wired-connection.c:157
#: ../src/settings/nm-default-wired-connection.c:157
#, c-format
msgid "Auto %s"
msgstr "Auto %s"
......
......@@ -1596,7 +1596,7 @@ msgstr "નોંધ: libc સુધારનાર એ ૩ નામ સર્
msgid "The nameservers listed below may not be recognized."
msgstr "નીચે યાદી થયેલ નામસર્વરો એ ઓળખી શકાતા નથી."
#: ../src/system-settings/nm-default-wired-connection.c:157
#: ../src/settings/nm-default-wired-connection.c:157
#, c-format
msgid "Auto %s"
msgstr "%s સ્વયં કરો"
......
......@@ -1691,7 +1691,7 @@ msgstr "नोट: libc समाधानकर्ता 3 नेमसर्
msgid "The nameservers listed below may not be recognized."
msgstr "नीचे सूची में दिया गया नेमसर्वर पहचाना नहीं जा सकता है."
#: ../src/system-settings/nm-default-wired-connection.c:157
#: ../src/settings/nm-default-wired-connection.c:157
#, c-format
msgid "Auto %s"
msgstr "स्वतः %s"
......
......@@ -1780,7 +1780,7 @@ msgstr "MEGJEGYZÉS: a libc feloldó nem támogat háromnál több névkiszolgá
msgid "The nameservers listed below may not be recognized."
msgstr "Az alább felsorolt névkiszolgálók lehet, hogy nem kerülnek felismerésre."
#: ../src/system-settings/nm-default-wired-connection.c:157
#: ../src/settings/nm-default-wired-connection.c:157
#, c-format
msgid "Auto %s"
msgstr "Automatikus %s"
......
......@@ -1706,7 +1706,7 @@ msgstr "CATATAN: resolver libc mungkin tak mendukung lebih dari 3 nameserver."
msgid "The nameservers listed below may not be recognized."
msgstr "Nameserver yang terdaftar di bawah mungkin tak dikenali."
#: ../src/system-settings/nm-default-wired-connection.c:157
#: ../src/settings/nm-default-wired-connection.c:157
#, c-format
msgid "Auto %s"
msgstr "Otomatis %s"
......
......@@ -1610,7 +1610,7 @@ msgstr "NOTA: il risolutore libc non supporta più di 3 server di nomi."
msgid "The nameservers listed below may not be recognized."
msgstr "I server di nomi elencati sotto non possono essere riconosciuti."
#: ../src/system-settings/nm-default-wired-connection.c:157
#: ../src/settings/nm-default-wired-connection.c:157
#, c-format
msgid "Auto %s"
msgstr "%s (automatica)"
......
......@@ -1598,7 +1598,7 @@ msgstr "注記: libc リゾルバは 3つ以上のネームサーバーをサ
msgid "The nameservers listed below may not be recognized."
msgstr "以下の一覧にあるネームサーバーは認識されないかも知れません。"
#: ../src/system-settings/nm-default-wired-connection.c:157
#: ../src/settings/nm-default-wired-connection.c:157
#, c-format
msgid "Auto %s"
msgstr "自動 %s"
......
......@@ -1700,7 +1700,7 @@ msgstr ""
msgid "The nameservers listed below may not be recognized."
msgstr "ಈ ಕೆಳಗೆ ಸೂಚಿಸಲಾದ ನಾಮಪರಿಚಾರಕಗಳನ್ನು ಗುರುತಿಸಲಾಗಿಲ್ಲ."
#: ../src/system-settings/nm-default-wired-connection.c:157
#: ../src/settings/nm-default-wired-connection.c:157
#, c-format
msgid "Auto %s"
msgstr "ಸ್ವಯಂ %s"
......
......@@ -1598,7 +1598,7 @@ msgstr "주의: libc 주소 검색은 3개를 초과하는 네임서버를 지
msgid "The nameservers listed below may not be recognized."
msgstr "아래 열거된 네임서버를 인식하지 못할 수 있습니다."
#: ../src/system-settings/nm-default-wired-connection.c:157
#: ../src/settings/nm-default-wired-connection.c:157
#, c-format
msgid "Auto %s"
msgstr "자동 %s"
......
......@@ -1696,7 +1696,7 @@ msgstr ""
msgid "The nameservers listed below may not be recognized."
msgstr "Žemiau pateikti vardų serveriai gali būti neatpažinti."
#: ../src/system-settings/nm-default-wired-connection.c:157
#: ../src/settings/nm-default-wired-connection.c:157
#, c-format
msgid "Auto %s"
msgstr "Automatinis %s"
......
......@@ -1594,7 +1594,7 @@ msgstr "കുറിപ്പു്: libc റിസോള്‍വര്‍ 3
msgid "The nameservers listed below may not be recognized."
msgstr "താഴെ പറഞ്ഞിരിക്കുന്ന നെയിംസര്‍വറുകള്‍ തിരിച്ചറിയപ്പെടുന്നവയല്ല."
#: ../src/system-settings/nm-default-wired-connection.c:157
#: ../src/settings/nm-default-wired-connection.c:157
#, c-format
msgid "Auto %s"
msgstr "ഓട്ടോ %s"
......
......@@ -1680,7 +1680,7 @@ msgstr "NOTE: libc रिजॉलव्हर 3 पेक्षा जास्
msgid "The nameservers listed below may not be recognized."
msgstr "खालिल यादीतील नेमसर्व्हर्स् अनोळखी राहतील."
#: ../src/system-settings/nm-default-wired-connection.c:157
#: ../src/settings/nm-default-wired-connection.c:157
#, c-format
msgid "Auto %s"
msgstr "स्वयं %s"
......
......@@ -1696,7 +1696,7 @@ msgstr "ଟିପ୍ପଣୀ: libc resolver 3 ରୁ ଅଧିକ nameserverଗ
msgid "The nameservers listed below may not be recognized."
msgstr "ନିମ୍ନରେ ତାଲିକାଭୁକ୍ତ nameserverଗୁଡ଼ିକୁ ଚିହ୍ନି ହୋଇନପାରେ."
#: ../src/system-settings/nm-default-wired-connection.c:157
#: ../src/settings/nm-default-wired-connection.c:157
#, c-format
msgid "Auto %s"
msgstr "ସ୍ୱୟଂ %s"
......
......@@ -1755,7 +1755,7 @@ msgstr "ਨੋਟ: libc ਰਿਜ਼ੋਲਵਰ ੩ ਤੋਂ ਵੱਧ ਨੇ
msgid "The nameservers listed below may not be recognized."
msgstr "ਹੇਠਾਂ ਦਿੱਤੇ ਨੇਮ-ਸਰਵਰ ਪਛਾਣੇ ਨਹੀਂ ਜਾ ਸਕਦੇ।"
#: ../src/system-settings/nm-default-wired-connection.c:157
#: ../src/settings/nm-default-wired-connection.c:157
#, c-format
msgid "Auto %s"
msgstr "ਆਟੋ %s"
......
......@@ -1780,7 +1780,7 @@ msgstr "UWAGA: obsługa nazw libc nie obsługuje więcej niż 3 serwery nazw."
msgid "The nameservers listed below may not be recognized."
msgstr "Poniższe serwery nazw nie mogą nie zostać rozpoznane."
#: ../src/system-settings/nm-default-wired-connection.c:157
#: ../src/settings/nm-default-wired-connection.c:157
#, c-format
msgid "Auto %s"
msgstr "Automatyczne %s"
......
......@@ -1321,7 +1321,7 @@ msgstr ""
msgid "The nameservers listed below may not be recognized."
msgstr "Os servidores de nomes listados abaixo podem não ser reconhecidos."
#: ../src/system-settings/nm-default-wired-connection.c:157
#: ../src/settings/nm-default-wired-connection.c:157
#, c-format
msgid "Auto %s"
msgstr "Auto %s"
......
......@@ -1604,7 +1604,7 @@ msgstr ""
msgid "The nameservers listed below may not be recognized."
msgstr "Нижеперечисленные сервера могут быть пропущены."
#: ../src/system-settings/nm-default-wired-connection.c:157
#: ../src/settings/nm-default-wired-connection.c:157
#, c-format
msgid "Auto %s"
msgstr "Авто %s"
......
......@@ -1839,7 +1839,7 @@ msgstr "OPOMBA: razreševalnik libc morda ne podpira več kot 3 imenskih strežn
msgid "The nameservers listed below may not be recognized."
msgstr "Navedeni imenski strežniki morda ne bodo prepoznani."
#: ../src/system-settings/nm-default-wired-connection.c:157
#: ../src/settings/nm-default-wired-connection.c:157
#, c-format
msgid "Auto %s"
msgstr "Samodejno %s"
......
......@@ -1857,7 +1857,7 @@ msgstr "OBSERVERA: uppslag via glibc kanske inte har stöd för fler än 3 namns
msgid "The nameservers listed below may not be recognized."
msgstr "Namnservrarna listade nedan kanske inte kommer att kännas igen."
#: ../src/system-settings/nm-default-wired-connection.c:157
#: ../src/settings/nm-default-wired-connection.c:157
#, c-format
msgid "Auto %s"
msgstr "Automatisk %s"
......
......@@ -1602,7 +1602,7 @@ msgstr "குறிப்பு: இந்த libc மறுதீர்வா
msgid "The nameservers listed below may not be recognized."
msgstr "கீழே பட்டியலிட்டப்படுள்ள பெயர்சேவையகங்கள் கண்டுபிடிக்கப்படவில்லை."
#: ../src/system-settings/nm-default-wired-connection.c:157
#: ../src/settings/nm-default-wired-connection.c:157
#, c-format
msgid "Auto %s"
msgstr "தானியக்கி %s"
......
......@@ -1689,7 +1689,7 @@ msgstr "గమనిక: libc రిజాల్వర్ 3 నామపు స
msgid "The nameservers listed below may not be recognized."
msgstr "క్రిందన జాబితాచేసివున్న నామపుసేవికలు గుర్తించబడక పోవచ్చును."
#: ../src/system-settings/nm-default-wired-connection.c:157
#: ../src/settings/nm-default-wired-connection.c:157
#, c-format
msgid "Auto %s"
msgstr "స్వయంచాలక %s"
......
......@@ -1690,7 +1690,7 @@ msgstr "注意:libc 解析器可能不支持超过三个名字服务器。"
msgid "The nameservers listed below may not be recognized."
msgstr "以下列出的名字服务器可能无法被识别。"
#: ../src/system-settings/nm-default-wired-connection.c:157
#: ../src/settings/nm-default-wired-connection.c:157
#, c-format
msgid "Auto %s"
msgstr "自动 %s"
......
......@@ -1599,7 +1599,7 @@ msgstr "注意:libc 解析器不支援 3 個以上的名稱伺服器。"
msgid "The nameservers listed below may not be recognized."
msgstr "下面列出的名稱伺服器可能不會被辨識。"
#: ../src/system-settings/nm-default-wired-connection.c:157
#: ../src/settings/nm-default-wired-connection.c:157
#, c-format
msgid "Auto %s"
msgstr "自動 %s"
......
......@@ -10,7 +10,7 @@ SUBDIRS= \
dnsmasq-manager \
modem-manager \
bluez-manager \
system-settings \
settings \
. \
tests
......@@ -26,7 +26,7 @@ INCLUDES = -I${top_srcdir} \
-I${top_srcdir}/src/dnsmasq-manager \
-I${top_srcdir}/src/modem-manager \
-I$(top_srcdir)/src/bluez-manager \
-I$(top_srcdir)/src/system-settings \
-I$(top_srcdir)/src/settings \
-I${top_srcdir}/libnm-util \
-I${top_srcdir}/libnm-glib \
-I${top_srcdir}/callouts
......@@ -239,7 +239,7 @@ NetworkManager_LDADD = \
./ppp-manager/libppp-manager.la \
./modem-manager/libmodem-manager.la \
./bluez-manager/libbluez-manager.la \
./system-settings/libsystem-settings.la \
./settings/libsettings.la \
./backends/libnmbackend.la \
$(top_builddir)/libnm-util/libnm-util.la \
$(DBUS_LIBS) \
......
......@@ -330,7 +330,7 @@ update_system_hostname (NMPolicy *policy, NMDevice *best4, NMDevice *best6)
/* Hostname precedence order:
*
* 1) a configured hostname (from system-settings)
* 1) a configured hostname (from settings)
* 2) automatic hostname from the default device's config (DHCP, VPN, etc)
* 3) the original hostname when NM started
* 4) reverse-DNS of the best device's IPv4 address
......
......@@ -6,13 +6,13 @@ INCLUDES = -I${top_srcdir} \
-I${top_srcdir}/src \
-I${top_builddir}/marshallers
noinst_LTLIBRARIES = libsystem-settings.la
noinst_LTLIBRARIES = libsettings.la
BUILT_SOURCES = \
nm-settings-glue.h \
nm-sysconfig-connection-glue.h
libsystem_settings_la_SOURCES = \
libsettings_la_SOURCES = \
nm-settings.c \
nm-settings.h \
nm-inotify-helper.c \
......@@ -27,7 +27,7 @@ libsystem_settings_la_SOURCES = \
nm-default-wired-connection.c \
nm-default-wired-connection.h
libsystem_settings_la_CPPFLAGS = \
libsettings_la_CPPFLAGS = \
$(DBUS_CFLAGS) \
$(GLIB_CFLAGS) \
$(GMODULE_CFLAGS) \
......@@ -42,7 +42,7 @@ libsystem_settings_la_CPPFLAGS = \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
-DPLUGINDIR=\"$(pkglibdir)\"
libsystem_settings_la_LIBADD = \
libsettings_la_LIBADD = \
$(top_builddir)/libnm-util/libnm-util.la \
$(top_builddir)/libnm-glib/libnm-glib.la \
$(top_builddir)/marshallers/libmarshallers.la \
......@@ -52,7 +52,7 @@ libsystem_settings_la_LIBADD = \
$(GMODULE_LIBS) \
$(POLKIT_LIBS)
libsystem_settings_la_LDFLAGS = -rdynamic
libsettings_la_LDFLAGS = -rdynamic
nm-settings-glue.h: $(top_srcdir)/introspection/nm-settings.xml
......
......@@ -23,7 +23,7 @@ libifcfg_rh_io_la_SOURCES = \
utils.h
INCLUDES = \
-I$(top_srcdir)/src/system-settings \
-I$(top_srcdir)/src/settings \
-I$(top_srcdir)/include \
-I$(top_srcdir)/libnm-glib \
-I$(top_srcdir)/libnm-util \
......
......@@ -10,7 +10,7 @@ libnm_settings_plugin_ifcfg_suse_la_CPPFLAGS = \
$(GMODULE_CFLAGS) \
$(DBUS_CFLAGS) \
-DG_DISABLE_DEPRECATED \
-I${top_srcdir}/src/system-settings \
-I${top_srcdir}/src/settings \
-I$(top_srcdir)/include \
-I$(top_srcdir)/libnm-util \
-I$(top_srcdir)/libnm-glib \
......
SUBDIRS = . tests
INCLUDES = \
-I$(top_srcdir)/src/system-settings \
-I$(top_srcdir)/src/settings \
-I$(top_srcdir)/include \
-I$(top_srcdir)/libnm-glib \
-I$(top_srcdir)/libnm-util
......
......@@ -2,7 +2,7 @@ INCLUDES=-I$(top_srcdir)/system-settings/plugins/ifnet\
-I$(top_srcdir)/libnm-glib \
-I$(top_srcdir)/libnm-util \
-I$(top_srcdir)/include \
-I$(top_srcdir)/src/system-settings
-I$(top_srcdir)/src/settings
TESTS = check_ifnet
check_PROGRAMS = check_ifnet
check_ifnet_SOURCES = test_all.c
......
SUBDIRS=. tests
INCLUDES = \
-I$(top_srcdir)/src/system-settings \
-I$(top_srcdir)/src/settings \
-I$(top_srcdir)/include \
-I$(top_srcdir)/libnm-glib \
-I$(top_srcdir)/libnm-util
......
SUBDIRS=. tests
INCLUDES = \
-I$(top_srcdir)/src/system-settings \
-I$(top_srcdir)/src/settings \
-I$(top_srcdir)/include \
-I$(top_srcdir)/libnm-util \
-I$(top_srcdir)/libnm-glib
......
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