From 45aaf18b75d5b84ca78d3ebbcab06b5ad5a53071 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Fri, 29 Jun 2012 15:59:43 -0400
Subject: Fix clashing definitions.

---
 po/zh_CN.po | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'po/zh_CN.po')

diff --git a/po/zh_CN.po b/po/zh_CN.po
index e4cc9230..93dcf042 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1110,10 +1110,6 @@ msgstr "用法： $0 {start|stop|restart|try-restart|force-reload|status|panic|s
 msgid "CTDB is already running"
 msgstr "CTDB 已在运行。"
 
-#: /etc/ppp/ip-up.ipv6to4:186
-msgid "Error occurred while calculating the IPv6to4 prefix"
-msgstr "IPv6to4 前缀计算出错"
-
 #: /etc/rc.d/init.d/fetch-crl-boot:57
 msgid "fetch-crl-boot lockfile present"
 msgstr "fetch-crl-boot lockfile 存在"
@@ -1215,7 +1211,7 @@ msgid ""
 "reload|condrestart|once|genconfig}"
 msgstr "用法：$0 {start|stop|status|restart|reload|force-reload|condrestart|once|genconfig}"
 
-#: /etc/sysconfig/network-scripts/ifup-ipv6:296
+#: /etc/sysconfig/network-scripts/ifup-ipv6:296 /etc/ppp/ip-up.ipv6to4:186
 msgid "Error occurred while calculating the IPv6to4 prefix"
 msgstr "IPv6to4 前缀计算出错"
 
-- 
cgit v1.2.1

09.0'>distro/mdv2009.0</option>
<option value='distro/mdv2009.1'>distro/mdv2009.1</option>
<option value='distro/mdv2010.0'>distro/mdv2010.0</option>
<option value='distro/mes5'>distro/mes5</option>
<option value='distro/mes5-2.6.33'>distro/mes5-2.6.33</option>
<option value='distro/mes6'>distro/mes6</option>
<option value='distro/mga1'>distro/mga1</option>
<option value='distro/mga2'>distro/mga2</option>
<option value='distro/mga3'>distro/mga3</option>
<option value='distro/mga4'>distro/mga4</option>
<option value='distro/mga5'>distro/mga5</option>
<option value='distro/mga6'>distro/mga6</option>
<option value='distro/mga7'>distro/mga7</option>
<option value='distro/mga8'>distro/mga8</option>
<option value='distro/mga9'>distro/mga9</option>
<option value='master' selected='selected'>master</option>
<option value='topic/Corpo_2_1'>topic/Corpo_2_1</option>
<option value='topic/KA9_0'>topic/KA9_0</option>
<option value='topic/MDK-10-update'>topic/MDK-10-update</option>
<option value='topic/MDK-10_1-update'>topic/MDK-10_1-update</option>
<option value='topic/MDK-10_2-update'>topic/MDK-10_2-update</option>
<option value='topic/MDK-2006_0-update'>topic/MDK-2006_0-update</option>
<option value='topic/MDK92-branch'>topic/MDK92-branch</option>
<option value='topic/MDKC_1_0'>topic/MDKC_1_0</option>
<option value='topic/PCMCIA_CS_DISTRO'>topic/PCMCIA_CS_DISTRO</option>
<option value='topic/R9_0-64bit-branch'>topic/R9_0-64bit-branch</option>
<option value='topic/R9_1_HP-branch'>topic/R9_1_HP-branch</option>
<option value='topic/a'>topic/a</option>
<option value='topic/before_matchbox_wm'>topic/before_matchbox_wm</option>
<option value='topic/bug-13680'>topic/bug-13680</option>
<option value='topic/dietlibc'>topic/dietlibc</option>
<option value='topic/efi'>topic/efi</option>
<option value='topic/extlinux'>topic/extlinux</option>
<option value='topic/firewall'>topic/firewall</option>
<option value='topic/gdk-pixbuf-0-branch'>topic/gdk-pixbuf-0-branch</option>
<option value='topic/gi-ppc'>topic/gi-ppc</option>
<option value='topic/ia64-8_1'>topic/ia64-8_1</option>
<option value='topic/mandrakesoft'>topic/mandrakesoft</option>
<option value='topic/mlcd4'>topic/mlcd4</option>
<option value='topic/ppp'>topic/ppp</option>
<option value='topic/rp-pppoe'>topic/rp-pppoe</option>
<option value='topic/switching_to_dnf'>topic/switching_to_dnf</option>
<option value='topic/switching_to_urpmi'>topic/switching_to_urpmi</option>
<option value='topic/unlabeled-1.1.1'>topic/unlabeled-1.1.1</option>
<option value='topic/v_webmin_0_87'>topic/v_webmin_0_87</option>
<option value='topic/x86_64-branch'>topic/x86_64-branch</option>
<option value='user/animtim/designWork'>user/animtim/designWork</option>
<option value='user/colin/rescue-systemd'>user/colin/rescue-systemd</option>
<option value='user/ennael/mga6'>user/ennael/mga6</option>
<option value='user/erwan/bug-13680'>user/erwan/bug-13680</option>
<option value='user/jibz/aarch64'>user/jibz/aarch64</option>
<option value='user/martinw/mga6'>user/martinw/mga6</option>
<option value='user/pterjan/arm64'>user/pterjan/arm64</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>Mageia Installer and base platform for many utilities</td><td class='sub right'>Thierry Vignaud [tv]</td></tr></table>
<table class='tabs'><tr><td>
<a href='/software/drakx/'>summary</a><a href='/software/drakx/refs/?id=d7732c308e70369d7788a28b5452320443cf4374'>refs</a><a href='/software/drakx/log/tools/simplify-drakx-modules'>log</a><a class='active' href='/software/drakx/tree/tools/simplify-drakx-modules?id=d7732c308e70369d7788a28b5452320443cf4374'>tree</a><a href='/software/drakx/commit/tools/simplify-drakx-modules?id=d7732c308e70369d7788a28b5452320443cf4374'>commit</a><a href='/software/drakx/diff/tools/simplify-drakx-modules?id=d7732c308e70369d7788a28b5452320443cf4374'>diff</a><a href='/software/drakx/stats/tools/simplify-drakx-modules'>stats</a></td><td class='form'><form class='right' method='get' action='/software/drakx/log/tools/simplify-drakx-modules'>
<input type='hidden' name='id' value='d7732c308e70369d7788a28b5452320443cf4374'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/software/drakx/tree/?id=d7732c308e70369d7788a28b5452320443cf4374'>root</a>/<a href='/software/drakx/tree/tools?id=d7732c308e70369d7788a28b5452320443cf4374'>tools</a>/<a href='/software/drakx/tree/tools/simplify-drakx-modules?id=d7732c308e70369d7788a28b5452320443cf4374'>simplify-drakx-modules</a></div><div class='content'>blob: ec8df1e764c89c5f77470c5553e2d4a9ad98ea5d (<a href='/software/drakx/plain/tools/simplify-drakx-modules?id=d7732c308e70369d7788a28b5452320443cf4374'>plain</a>)
<table summary='blob content' class='blob'>
<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a>
<a id='n2' href='#n2'>2</a>
<a id='n3' href='#n3'>3</a>
<a id='n4' href='#n4'>4</a>
<a id='n5' href='#n5'>5</a>
</pre></td>
<td class='lines'><pre><code>#!/usr/bin/perl -pi

s/^\s*use\s+(diagnostics|strict|vars|warnings).*//g;

/^__END__/ and $_ = &apos;&apos;, close ARGV;
</code></pre></td></tr></table>
</div> <!-- class=content -->
<div class='footer'>generated by <a href='https://git.zx2c4.com/cgit/about/'>cgit v1.2.1</a> (<a href='https://git-scm.com/'>git 2.21.0</a>) at 2024-06-27 12:49:05 +0000</div>
</div> <!-- id=cgit -->
</body>
</html>