Routine merge

1 files changed, 25 insertions, 15 deletions

diff --git a/po/pa.po b/po/pa.po
index e5ec7c2e..dd02aa44 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -60,7 +60,8 @@ msgstr "802.1Q VLAN ਪੈਰਾਮੀਟਰ ਨਿਰਧਾਰਿਤ ਨਹੀ�
 #: /etc/sysconfig/network-scripts/ifup:96
 #: /etc/sysconfig/network-scripts/ifup-eth:75
 #: /etc/sysconfig/network-scripts/ifup-eth.rpmsave:76
-msgid "$alias device ${DEVICE} does not seem to be present, delaying initialization."
+msgid ""
+"$alias device ${DEVICE} does not seem to be present, delaying initialization."
 msgstr "$alias ਜੰਤਰ ${DEVICE} ਮੌਜੂਦ ਨਹੀਂ ਲੱਗ ਰਿਹਾ ਹੈ, ਸ਼ੁਰੂਆਤ ਵਿੱਚ ਦੇਰੀ ਹੈ।"
 
 #: /etc/rc.d/init.d/amd:92 /etc/rc.d/init.d/bgpd:59 /etc/rc.d/init.d/btseed:68
@@ -901,8 +902,7 @@ msgid ""
 "$BASENAME error importing databases, check ${CONFIGDIRECTORY}/rpm/db_import."
 "log"
 msgstr ""
-"$BASENAME ਗਲਤੀ ਡਾਟਾਬੇਸ ਆਯਾਤ ਕਰਨ ਦੌਰਾਨ, ਲਾਗ ${CONFIGDIRECTORY}/rpm/db_import."
-"ਵੇਖ"
+"$BASENAME ਗਲਤੀ ਡਾਟਾਬੇਸ ਆਯਾਤ ਕਰਨ ਦੌਰਾਨ, ਲਾਗ ${CONFIGDIRECTORY}/rpm/db_import.ਵੇਖ"
 
 #: /etc/rc.d/init.d/avahi-daemon:39 /etc/rc.d/init.d/avahi-daemon:41
 #: /etc/rc.d/init.d/avahi-dnsconfd:34 /etc/rc.d/init.d/avahi-dnsconfd:36
@@ -1113,8 +1113,10 @@ msgid "Shutting down kernel logger: "
 msgstr "ਕਰਨਲ ਲਾਗਕਰਤਾ ਬੰਦ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ: "
 
 #: /etc/rc.d/init.d/puppet:84
-msgid "Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|once}"
-msgstr "ਵਰਤੋਂ: $0 {start|stop|status|restart|reload|force-reload|condrestart|once}"
+msgid ""
+"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|once}"
+msgstr ""
+"ਵਰਤੋਂ: $0 {start|stop|status|restart|reload|force-reload|condrestart|once}"
 
 #: /etc/rc.d/init.d/ups:48
 msgid "Starting UPS monitor (master): "
@@ -1177,7 +1179,8 @@ msgid "Missing parameter 'local IPv4 address' (arg 2)"
 msgstr "'local IPv4 address' (ਆਰਗੂ 2) ਮੁੱਲ ਗੁੰਮ ਹੈ"
 
 #: /etc/sysconfig/network-scripts/ifup-ipv6:287
-msgid "Using 6to4 and RADVD IPv6 forwarding usually should be enabled, but it isn't"
+msgid ""
+"Using 6to4 and RADVD IPv6 forwarding usually should be enabled, but it isn't"
 msgstr "6to4 and RADVD IPv6 ਫਾਰਵਿਡਿੰਗ ਵਰਤੋਂ ਆਮ ਤੌਰ ਤੇ ਯੋਗ ਚਾਹੀਦੀ ਹੈ, ਪਰ ਹੈ ਨਹੀਂ"
 
 #: /etc/rc.d/init.d/thttpd:57
@@ -1407,8 +1410,10 @@ msgid "Usage: $0 {start|stop|restart|status}"
 msgstr "ਵਰਤੋਂ: $0 {start|stop|restart|status}"
 
 #: /etc/sysconfig/network-scripts/ifup-ppp:80
-msgid "/etc/sysconfig/network-scripts/chat-${DEVNAME} does not exist for ${DEVICE}"
-msgstr "${DEVICE} ਜੰਤਰ ਲਈ /etc/sysconfig/network-scripts/chat-${DEVNAME} ਮੌਜੂਦ ਨਹੀਂ"
+msgid ""
+"/etc/sysconfig/network-scripts/chat-${DEVNAME} does not exist for ${DEVICE}"
+msgstr ""
+"${DEVICE} ਜੰਤਰ ਲਈ /etc/sysconfig/network-scripts/chat-${DEVNAME} ਮੌਜੂਦ ਨਹੀਂ"
 
 #: /etc/rc.d/init.d/radiusd:37
 msgid "Starting RADIUS server: "
@@ -1544,7 +1549,8 @@ msgstr "ਨਾ-ਸਹਾਇਕ ਕਾਰਜ-ਵਿਧੀ '$mechanism' radvd ਨ�
 msgid ""
 "Usage: $0 {start|stop|status|restart|condrestart|condstop|reload|force-"
 "reload}"
-msgstr "ਵਰਤੋਂ: $0 {start|stop|status|restart|condrestart|condstop|reload|force-reload}"
+msgstr ""
+"ਵਰਤੋਂ: $0 {start|stop|status|restart|condrestart|condstop|reload|force-reload}"
 
 #: /etc/sysconfig/network-scripts/ifup-sl:47
 msgid "/etc/sysconfig/network-scripts/dip-$DEVICE does not exist for $DEVICE"
@@ -2085,8 +2091,10 @@ msgid "Clearing all current rules and user defined chains:"
 msgstr "ਸਭ ਮੌਜੂਦਾ ਨਿਯਮ ਤੇ ਉਪਭੋਗਤਾ ਪ੍ਰਭਾਸ਼ਿਤ ਲੜੀਆਂ ਨੂੰ ਸਾਫ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ:"
 
 #: /etc/rc.d/init.d/postfix:115
-msgid "Usage: $0 {start|stop|restart|reload|abort|flush|check|status|condrestart}"
-msgstr "ਵਰਤੋਂ: $0 {start|stop|restart|reload|abort|flush|check|status|condrestart}"
+msgid ""
+"Usage: $0 {start|stop|restart|reload|abort|flush|check|status|condrestart}"
+msgstr ""
+"ਵਰਤੋਂ: $0 {start|stop|restart|reload|abort|flush|check|status|condrestart}"
 
 #: /etc/sysconfig/network-scripts/network-functions-ipv6:1118
 msgid "Tunnel device '$device' bringing up didn't work"
@@ -2598,7 +2606,8 @@ msgid "Stopping $type $name: "
 msgstr "$type $name ਰੋਕਿਆ ਜਾਂਦਾ ਹੈ: "
 
 #: /etc/rc.d/init.d/postgresql:162
-msgid "See $SYSDOCDIR/postgresql-$PGVERSION/README.rpm-dist for more information."
+msgid ""
+"See $SYSDOCDIR/postgresql-$PGVERSION/README.rpm-dist for more information."
 msgstr "ਵਧੇਰੇ ਜਾਣਕਾਰੀ ਲਈ $SYSDOCDIR/postgresql-$PGVERSION/README.rpm-dist ਨੂੰ ਵੇਖੋ।"
 
 #: /etc/rc.d/rc.sysinit:287 /etc/rc.d/rc.sysinit.rpmsave:287
@@ -2910,7 +2919,8 @@ msgid "WARNING: vconfig not able to disable REORDER_HDR on ${DEVICE}"
 msgstr "ਚੇਤਵਾਨੀ: vconfig REORDER_HDR ਨੂੰ ${DEVICE} ਤੇ ਅਯੋਗ ਕਰਨ ਦੇ ਸਮਰੱਥ ਨਹੀਂ ਹੈ"
 
 #: /etc/sysconfig/network-scripts/ifup-ipv6:151
-msgid "Cannot enable IPv6 privacy method '$IPV6_PRIVACY', not supported by kernel"
+msgid ""
+"Cannot enable IPv6 privacy method '$IPV6_PRIVACY', not supported by kernel"
 msgstr "'$IPV6_PRIVACY' ਲਈ IPv6 ਰਹੱਸ ਯੋਗ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ, ਕਰਨਲ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।"
 
 #: /etc/rc.d/init.d/nfslock:88
@@ -3079,7 +3089,8 @@ msgstr "ਵਰਤੋਂ: $0 {start|stop|restart|reload|status}"
 
 #: /etc/sysconfig/network-scripts/network-functions-ipv6:767
 msgid "Part $c of given IPv4 address '$testipv4addr_valid' is out of range"
-msgstr "ਭਾਗ $c ਉਪਲੱਬਧ ਕਰਵਾਏ IPv4 ਸਿਰਨਾਵੇਂ '$testipv4addr_valid'  ਸੀਮਾ-ਖੇਤਰ ਤੋਂ ਬਾਹਰ ਹਨ"
+msgstr ""
+"ਭਾਗ $c ਉਪਲੱਬਧ ਕਰਵਾਏ IPv4 ਸਿਰਨਾਵੇਂ '$testipv4addr_valid'  ਸੀਮਾ-ਖੇਤਰ ਤੋਂ ਬਾਹਰ ਹਨ"
 
 #: /etc/rc.d/init.d/autofs:100 /etc/rc.d/init.d/autofs:106
 msgid "$prog not running"
@@ -3231,4 +3242,3 @@ msgstr "ਮੁੱਲ 1 ਖਾਲੀ ਹੈ, ਪਰ ਇਸ ਵਿੱਚ ਇੰਟ
 #: /sbin/service:64
 msgid "${SERVICE}: unrecognized service"
 msgstr "${SERVICE}: ਅਣਜਾਣ ਸੇਵਾ"
-