r18208 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r18207‎ | r18208 | r18209 >
Date:21:08, 6 December 2006
Author:mark
Status:old
Tags:
Comment:
squid (2.6.5-1wm6) edgy; urgency=low

* Build against Google's tcmalloc to solve memory fragmentation issues
* Actually pass CFLAGS on to ./configure so they get used
Modified paths:
  • /trunk/debs/squid/debian/changelog (modified) (history)
  • /trunk/debs/squid/debian/po/ca.po (modified) (history)
  • /trunk/debs/squid/debian/po/cs.po (modified) (history)
  • /trunk/debs/squid/debian/po/de.po (modified) (history)
  • /trunk/debs/squid/debian/po/es.po (modified) (history)
  • /trunk/debs/squid/debian/po/fr.po (modified) (history)
  • /trunk/debs/squid/debian/po/it.po (modified) (history)
  • /trunk/debs/squid/debian/po/ja.po (modified) (history)
  • /trunk/debs/squid/debian/po/nl.po (modified) (history)
  • /trunk/debs/squid/debian/po/pt_BR.po (modified) (history)
  • /trunk/debs/squid/debian/po/ru.po (modified) (history)
  • /trunk/debs/squid/debian/po/sv.po (modified) (history)
  • /trunk/debs/squid/debian/po/templates.pot (modified) (history)
  • /trunk/debs/squid/debian/po/vi.po (modified) (history)
  • /trunk/debs/squid/debian/rules (modified) (history)

Diff [purge]

Index: trunk/debs/squid/debian/po/templates.pot
——@@ -7,8 +7,8 @@
88 msgid ""
99 msgstr ""
1010 "Project-Id-Version: PACKAGE VERSION\n"
11 -"Report-Msgid-Bugs-To: luigi@debian.org\n"
12 -"POT-Creation-Date: 2006-09-21 16:13+0000\n"
 11+"Report-Msgid-Bugs-To: mark@wikimedia.org\n"
 12+"POT-Creation-Date: 2006-12-06 20:56+0000\n"
1313 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1414 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1515 "Language-Team: LANGUAGE <LL@li.org>\n"
——@@ -18,7 +18,7 @@
1919
2020 #. Type: note
2121 #. Description
22 -#: ../templates:3
 22+#: ../templates:1001
2323 msgid ""
2424 "The http_anonymizer directive has been replaced with header_replace and "
2525 "header_access."
——@@ -26,7 +26,7 @@
2727
2828 #. Type: note
2929 #. Description
30 -#: ../templates:3
 30+#: ../templates:1001
3131 msgid ""
3232 "The http_anonymizer directive that was present in squid 2.1 and 2.2 doesn't "
3333 "exist anymore in squid 2.3 and up. It has been replaced with header_replace "
——@@ -39,7 +39,7 @@
4040
4141 #. Type: note
4242 #. Description
43 -#: ../templates:14
 43+#: ../templates:2001
4444 msgid ""
4545 "The anonymize_headers and fake_user_agent directives have been replaced with "
4646 "header_access and header_replace."
——@@ -47,7 +47,7 @@
4848
4949 #. Type: note
5050 #. Description
51 -#: ../templates:14
 51+#: ../templates:2001
5252 msgid ""
5353 "The anonymize_headers and fake_user_agent directives that were present in "
5454 "squid 2.3 and 2.4 don't exist anymore in squid 2.5 and up. They have been "
——@@ -60,19 +60,19 @@
6161
6262 #. Type: boolean
6363 #. Description
64 -#: ../templates:25
 64+#: ../templates:3001
6565 msgid "There is no automatic upgrade path to squid 2.5."
6666 msgstr ""
6767
6868 #. Type: boolean
6969 #. Description
70 -#: ../templates:25
 70+#: ../templates:3001
7171 msgid " SQUID 2.5 INSTALLATION WARNING"
7272 msgstr ""
7373
7474 #. Type: boolean
7575 #. Description
76 -#: ../templates:25
 76+#: ../templates:3001
7777 msgid ""
7878 "You are upgrading squid from an 1.x version to the 2.5 version. The 1.x and "
7979 "2.5 versions are NOT compatible. The structure of the cache directory is "
——@@ -82,7 +82,7 @@
8383
8484 #. Type: boolean
8585 #. Description
86 -#: ../templates:25
 86+#: ../templates:3001
8787 msgid ""
8888 "If you have an old cache directory, please quit NOW and remove the old cache "
8989 "by hand (in /var/spool/squid). Then re-install this squid version."
——@@ -90,7 +90,7 @@
9191
9292 #. Type: boolean
9393 #. Description
94 -#: ../templates:25
 94+#: ../templates:3001
9595 msgid ""
9696 "Also, please accept the new configuration file. After upgrading your old "
9797 "configuration file can be found in \"/etc/squid.conf.dpkg-old\". Then you "
——@@ -100,19 +100,19 @@
101101
102102 #. Type: boolean
103103 #. Description
104 -#: ../templates:25
 104+#: ../templates:3001
105105 msgid "Do you want to quit now?"
106106 msgstr ""
107107
108108 #. Type: note
109109 #. Description
110 -#: ../templates:45
 110+#: ../templates:4001
111111 msgid "squid-cgi now uses config file for target ACL"
112112 msgstr ""
113113
114114 #. Type: note
115115 #. Description
116 -#: ../templates:45
 116+#: ../templates:4001
117117 msgid ""
118118 "squid-cgi now checks a configuration file before connecting to the target "
119119 "host. Only allowed target will be contacted. Please add hosts you want to "
——@@ -121,19 +121,19 @@
122122
123123 #. Type: note
124124 #. Description
125 -#: ../templates:45
 125+#: ../templates:4001
126126 msgid " hostname:port"
127127 msgstr ""
128128
129129 #. Type: boolean
130130 #. Description
131 -#: ../templates:55
 131+#: ../templates:5001
132132 msgid "Upgrade squid.conf automatically?"
133133 msgstr ""
134134
135135 #. Type: boolean
136136 #. Description
137 -#: ../templates:55
 137+#: ../templates:5001
138138 msgid ""
139139 "Incompatible settings have been found in the existing squid.conf file; they "
140140 "will prevent squid from starting or working correctly. However, this setup "
——@@ -142,13 +142,13 @@
143143
144144 #. Type: note
145145 #. Description
146 -#: ../templates:63
 146+#: ../templates:6001
147147 msgid "The authenticate_program directive has been replaced with auth_param."
148148 msgstr ""
149149
150150 #. Type: note
151151 #. Description
152 -#: ../templates:63
 152+#: ../templates:6001
153153 msgid ""
154154 "The authenticate_program directive that was present in squid <= 2.4 doesn't "
155155 "exist anymore in squid 2.5 and up. All authentication directives have been "
——@@ -160,13 +160,13 @@
161161
162162 #. Type: note
163163 #. Description
164 -#: ../templates:73
 164+#: ../templates:7001
165165 msgid "Warning: squid may crash when logfiles size is bigger than 2GB."
166166 msgstr ""
167167
168168 #. Type: note
169169 #. Description
170 -#: ../templates:73
 170+#: ../templates:7001
171171 msgid ""
172172 "Squid may crash if any of the logfiles grows bigger than 2GB. Please "
173173 "configure /etc/logrotate.d/squid accordingly to your site's traffic."
——@@ -174,13 +174,13 @@
175175
176176 #. Type: boolean
177177 #. Description
178 -#: ../templates:80
 178+#: ../templates:8001
179179 msgid "Fix permissions of cache_dir?"
180180 msgstr ""
181181
182182 #. Type: boolean
183183 #. Description
184 -#: ../templates:80
 184+#: ../templates:8001
185185 msgid ""
186186 "Values for cache_effective_user and/or cache_effective_group in config file "
187187 "are incompatible with owner/group of cache directories. Do you want to "
——@@ -189,7 +189,7 @@
190190
191191 #. Type: boolean
192192 #. Description
193 -#: ../templates:80
 193+#: ../templates:8001
194194 msgid ""
195195 "WARNING: If you specified a cache directory different from /var/spool/squid "
196196 "and selected some other directory used by other programs (e.g. /tmp), this "
Index: trunk/debs/squid/debian/po/ca.po
——@@ -14,8 +14,8 @@
1515 msgid ""
1616 msgstr ""
1717 "Project-Id-Version: ca\n"
18 -"Report-Msgid-Bugs-To: luigi@debian.org\n"
19 -"POT-Creation-Date: 2006-09-21 16:13+0000\n"
 18+"Report-Msgid-Bugs-To: mark@wikimedia.org\n"
 19+"POT-Creation-Date: 2006-12-06 20:56+0000\n"
2020 "PO-Revision-Date: 2006-04-29 22:39+0200\n"
2121 "Last-Translator: Miguel Gea Milvaques <debian@miguelgea.com>\n"
2222 "Language-Team: catalan <debian-l10n-catalan@lists.debian.org>\n"
——@@ -26,7 +26,7 @@
2727
2828 #. Type: note
2929 #. Description
30 -#: ../templates:3
 30+#: ../templates:1001
3131 msgid ""
3232 "The http_anonymizer directive has been replaced with header_replace and "
3333 "header_access."
——@@ -36,7 +36,7 @@
3737
3838 #. Type: note
3939 #. Description
40 -#: ../templates:3
 40+#: ../templates:1001
4141 msgid ""
4242 "The http_anonymizer directive that was present in squid 2.1 and 2.2 doesn't "
4343 "exist anymore in squid 2.3 and up. It has been replaced with header_replace "
——@@ -56,7 +56,7 @@
5757
5858 #. Type: note
5959 #. Description
60 -#: ../templates:14
 60+#: ../templates:2001
6161 msgid ""
6262 "The anonymize_headers and fake_user_agent directives have been replaced with "
6363 "header_access and header_replace."
——@@ -66,7 +66,7 @@
6767
6868 #. Type: note
6969 #. Description
70 -#: ../templates:14
 70+#: ../templates:2001
7171 msgid ""
7272 "The anonymize_headers and fake_user_agent directives that were present in "
7373 "squid 2.3 and 2.4 don't exist anymore in squid 2.5 and up. They have been "
——@@ -86,19 +86,19 @@
8787
8888 #. Type: boolean
8989 #. Description
90 -#: ../templates:25
 90+#: ../templates:3001
9191 msgid "There is no automatic upgrade path to squid 2.5."
9292 msgstr "No hi ha cap forma forma automàtica per actualitzar el squid 2.5."
9393
9494 #. Type: boolean
9595 #. Description
96 -#: ../templates:25
 96+#: ../templates:3001
9797 msgid " SQUID 2.5 INSTALLATION WARNING"
9898 msgstr " AVÍS D'INSTAL·LACIÓ DEL SQUID 2.5"
9999
100100 #. Type: boolean
101101 #. Description
102 -#: ../templates:25
 102+#: ../templates:3001
103103 msgid ""
104104 "You are upgrading squid from an 1.x version to the 2.5 version. The 1.x and "
105105 "2.5 versions are NOT compatible. The structure of the cache directory is "
——@@ -112,7 +112,7 @@
113113
114114 #. Type: boolean
115115 #. Description
116 -#: ../templates:25
 116+#: ../templates:3001
117117 msgid ""
118118 "If you have an old cache directory, please quit NOW and remove the old cache "
119119 "by hand (in /var/spool/squid). Then re-install this squid version."
——@@ -123,7 +123,7 @@
124124
125125 #. Type: boolean
126126 #. Description
127 -#: ../templates:25
 127+#: ../templates:3001
128128 msgid ""
129129 "Also, please accept the new configuration file. After upgrading your old "
130130 "configuration file can be found in \"/etc/squid.conf.dpkg-old\". Then you "
——@@ -137,20 +137,20 @@
138138
139139 #. Type: boolean
140140 #. Description
141 -#: ../templates:25
 141+#: ../templates:3001
142142 msgid "Do you want to quit now?"
143143 msgstr "Voleu sortir ara?"
144144
145145 #. Type: note
146146 #. Description
147 -#: ../templates:45
 147+#: ../templates:4001
148148 msgid "squid-cgi now uses config file for target ACL"
149149 msgstr ""
150150 "El squid-cgi utilitza ara el fitxer de configuració per les ACL objectiu"
151151
152152 #. Type: note
153153 #. Description
154 -#: ../templates:45
 154+#: ../templates:4001
155155 msgid ""
156156 "squid-cgi now checks a configuration file before connecting to the target "
157157 "host. Only allowed target will be contacted. Please add hosts you want to "
——@@ -163,19 +163,19 @@
164164
165165 #. Type: note
166166 #. Description
167 -#: ../templates:45
 167+#: ../templates:4001
168168 msgid " hostname:port"
169169 msgstr " nommaquina:port"
170170
171171 #. Type: boolean
172172 #. Description
173 -#: ../templates:55
 173+#: ../templates:5001
174174 msgid "Upgrade squid.conf automatically?"
175175 msgstr "Voleu actualitzar el squid.conf automàticament?"
176176
177177 #. Type: boolean
178178 #. Description
179 -#: ../templates:55
 179+#: ../templates:5001
180180 msgid ""
181181 "Incompatible settings have been found in the existing squid.conf file; they "
182182 "will prevent squid from starting or working correctly. However, this setup "
——@@ -188,13 +188,13 @@
189189
190190 #. Type: note
191191 #. Description
192 -#: ../templates:63
 192+#: ../templates:6001
193193 msgid "The authenticate_program directive has been replaced with auth_param."
194194 msgstr "La directiva authenticate_program s'ha reemplaçat per auth_param."
195195
196196 #. Type: note
197197 #. Description
198 -#: ../templates:63
 198+#: ../templates:6001
199199 msgid ""
200200 "The authenticate_program directive that was present in squid <= 2.4 doesn't "
201201 "exist anymore in squid 2.5 and up. All authentication directives have been "
——@@ -212,14 +212,14 @@
213213
214214 #. Type: note
215215 #. Description
216 -#: ../templates:73
 216+#: ../templates:7001
217217 msgid "Warning: squid may crash when logfiles size is bigger than 2GB."
218218 msgstr ""
219219 "Avís: el squid pot fallar si els fitxers de registre son més grans de 2GB."
220220
221221 #. Type: note
222222 #. Description
223 -#: ../templates:73
 223+#: ../templates:7001
224224 msgid ""
225225 "Squid may crash if any of the logfiles grows bigger than 2GB. Please "
226226 "configure /etc/logrotate.d/squid accordingly to your site's traffic."
——@@ -230,13 +230,13 @@
231231
232232 #. Type: boolean
233233 #. Description
234 -#: ../templates:80
 234+#: ../templates:8001
235235 msgid "Fix permissions of cache_dir?"
236236 msgstr "Voleu establir els permissos de cache_dir?"
237237
238238 #. Type: boolean
239239 #. Description
240 -#: ../templates:80
 240+#: ../templates:8001
241241 msgid ""
242242 "Values for cache_effective_user and/or cache_effective_group in config file "
243243 "are incompatible with owner/group of cache directories. Do you want to "
——@@ -249,7 +249,7 @@
250250
251251 #. Type: boolean
252252 #. Description
253 -#: ../templates:80
 253+#: ../templates:8001
254254 msgid ""
255255 "WARNING: If you specified a cache directory different from /var/spool/squid "
256256 "and selected some other directory used by other programs (e.g. /tmp), this "
Index: trunk/debs/squid/debian/po/cs.po
——@@ -14,8 +14,8 @@
1515 msgid ""
1616 msgstr ""
1717 "Project-Id-Version: squid\n"
18 -"Report-Msgid-Bugs-To: luigi@debian.org\n"
19 -"POT-Creation-Date: 2006-09-21 16:13+0000\n"
 18+"Report-Msgid-Bugs-To: mark@wikimedia.org\n"
 19+"POT-Creation-Date: 2006-12-06 20:56+0000\n"
2020 "PO-Revision-Date: 2005-07-28 22:45+0200\n"
2121 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
2222 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
——@@ -25,7 +25,7 @@
2626
2727 #. Type: note
2828 #. Description
29 -#: ../templates:3
 29+#: ../templates:1001
3030 msgid ""
3131 "The http_anonymizer directive has been replaced with header_replace and "
3232 "header_access."
——@@ -35,7 +35,7 @@
3636
3737 #. Type: note
3838 #. Description
39 -#: ../templates:3
 39+#: ../templates:1001
4040 msgid ""
4141 "The http_anonymizer directive that was present in squid 2.1 and 2.2 doesn't "
4242 "exist anymore in squid 2.3 and up. It has been replaced with header_replace "
——@@ -54,7 +54,7 @@
5555
5656 #. Type: note
5757 #. Description
58 -#: ../templates:14
 58+#: ../templates:2001
5959 msgid ""
6060 "The anonymize_headers and fake_user_agent directives have been replaced with "
6161 "header_access and header_replace."
——@@ -64,7 +64,7 @@
6565
6666 #. Type: note
6767 #. Description
68 -#: ../templates:14
 68+#: ../templates:2001
6969 msgid ""
7070 "The anonymize_headers and fake_user_agent directives that were present in "
7171 "squid 2.3 and 2.4 don't exist anymore in squid 2.5 and up. They have been "
——@@ -84,19 +84,19 @@
8585
8686 #. Type: boolean
8787 #. Description
88 -#: ../templates:25
 88+#: ../templates:3001
8989 msgid "There is no automatic upgrade path to squid 2.5."
9090 msgstr "Přechod na squid 2.5 se bohužel nedá zautomatizovat."
9191
9292 #. Type: boolean
9393 #. Description
94 -#: ../templates:25
 94+#: ../templates:3001
9595 msgid " SQUID 2.5 INSTALLATION WARNING"
9696 msgstr " VAROVÁNÍ INSTALACE SQUIDu 2.5"
9797
9898 #. Type: boolean
9999 #. Description
100 -#: ../templates:25
 100+#: ../templates:3001
101101 msgid ""
102102 "You are upgrading squid from an 1.x version to the 2.5 version. The 1.x and "
103103 "2.5 versions are NOT compatible. The structure of the cache directory is "
——@@ -109,7 +109,7 @@
110110
111111 #. Type: boolean
112112 #. Description
113 -#: ../templates:25
 113+#: ../templates:3001
114114 msgid ""
115115 "If you have an old cache directory, please quit NOW and remove the old cache "
116116 "by hand (in /var/spool/squid). Then re-install this squid version."
——@@ -120,7 +120,7 @@
121121
122122 #. Type: boolean
123123 #. Description
124 -#: ../templates:25
 124+#: ../templates:3001
125125 msgid ""
126126 "Also, please accept the new configuration file. After upgrading your old "
127127 "configuration file can be found in \"/etc/squid.conf.dpkg-old\". Then you "
——@@ -134,19 +134,19 @@
135135
136136 #. Type: boolean
137137 #. Description
138 -#: ../templates:25
 138+#: ../templates:3001
139139 msgid "Do you want to quit now?"
140140 msgstr "Chcete nyní skončit?"
141141
142142 #. Type: note
143143 #. Description
144 -#: ../templates:45
 144+#: ../templates:4001
145145 msgid "squid-cgi now uses config file for target ACL"
146146 msgstr "squid-cgi nyní používá pro cílová ACL konfigurační soubor"
147147
148148 #. Type: note
149149 #. Description
150 -#: ../templates:45
 150+#: ../templates:4001
151151 msgid ""
152152 "squid-cgi now checks a configuration file before connecting to the target "
153153 "host. Only allowed target will be contacted. Please add hosts you want to "
——@@ -159,19 +159,19 @@
160160
161161 #. Type: note
162162 #. Description
163 -#: ../templates:45
 163+#: ../templates:4001
164164 msgid " hostname:port"
165165 msgstr " pocitac:port"
166166
167167 #. Type: boolean
168168 #. Description
169 -#: ../templates:55
 169+#: ../templates:5001
170170 msgid "Upgrade squid.conf automatically?"
171171 msgstr "Aktualizovat squid.conf automaticky?"
172172
173173 #. Type: boolean
174174 #. Description
175 -#: ../templates:55
 175+#: ../templates:5001
176176 msgid ""
177177 "Incompatible settings have been found in the existing squid.conf file; they "
178178 "will prevent squid from starting or working correctly. However, this setup "
——@@ -184,13 +184,13 @@
185185
186186 #. Type: note
187187 #. Description
188 -#: ../templates:63
 188+#: ../templates:6001
189189 msgid "The authenticate_program directive has been replaced with auth_param."
190190 msgstr "Direktiva authenticate_program byla nahrazena direktivou auth_param."
191191
192192 #. Type: note
193193 #. Description
194 -#: ../templates:63
 194+#: ../templates:6001
195195 msgid ""
196196 "The authenticate_program directive that was present in squid <= 2.4 doesn't "
197197 "exist anymore in squid 2.5 and up. All authentication directives have been "
——@@ -207,7 +207,7 @@
208208
209209 #. Type: note
210210 #. Description
211 -#: ../templates:73
 211+#: ../templates:7001
212212 msgid "Warning: squid may crash when logfiles size is bigger than 2GB."
213213 msgstr ""
214214 "Varování: pokud velikost logovacího souboru přesáhne 2GB, squid může "
——@@ -215,7 +215,7 @@
216216
217217 #. Type: note
218218 #. Description
219 -#: ../templates:73
 219+#: ../templates:7001
220220 msgid ""
221221 "Squid may crash if any of the logfiles grows bigger than 2GB. Please "
222222 "configure /etc/logrotate.d/squid accordingly to your site's traffic."
——@@ -226,13 +226,13 @@
227227
228228 #. Type: boolean
229229 #. Description
230 -#: ../templates:80
 230+#: ../templates:8001
231231 msgid "Fix permissions of cache_dir?"
232232 msgstr "Opravit práva cache_dir?"
233233
234234 #. Type: boolean
235235 #. Description
236 -#: ../templates:80
 236+#: ../templates:8001
237237 msgid ""
238238 "Values for cache_effective_user and/or cache_effective_group in config file "
239239 "are incompatible with owner/group of cache directories. Do you want to "
——@@ -244,7 +244,7 @@
245245
246246 #. Type: boolean
247247 #. Description
248 -#: ../templates:80
 248+#: ../templates:8001
249249 msgid ""
250250 "WARNING: If you specified a cache directory different from /var/spool/squid "
251251 "and selected some other directory used by other programs (e.g. /tmp), this "
Index: trunk/debs/squid/debian/po/pt_BR.po
——@@ -14,8 +14,8 @@
1515 msgid ""
1616 msgstr ""
1717 "Project-Id-Version: squid\n"
18 -"Report-Msgid-Bugs-To: luigi@debian.org\n"
19 -"POT-Creation-Date: 2006-09-21 16:13+0000\n"
 18+"Report-Msgid-Bugs-To: mark@wikimedia.org\n"
 19+"POT-Creation-Date: 2006-12-06 20:56+0000\n"
2020 "PO-Revision-Date: 2004-08-20 21:55-0300\n"
2121 "Last-Translator: Andr� Lu�s Lopes <andrelop@debian.org>\n"
2222 "Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
——@@ -25,7 +25,7 @@
2626
2727 #. Type: note
2828 #. Description
29 -#: ../templates:3
 29+#: ../templates:1001
3030 #, fuzzy
3131 msgid ""
3232 "The http_anonymizer directive has been replaced with header_replace and "
——@@ -34,7 +34,7 @@
3535
3636 #. Type: note
3737 #. Description
38 -#: ../templates:3
 38+#: ../templates:1001
3939 msgid ""
4040 "The http_anonymizer directive that was present in squid 2.1 and 2.2 doesn't "
4141 "exist anymore in squid 2.3 and up. It has been replaced with header_replace "
——@@ -55,7 +55,7 @@
5656
5757 #. Type: note
5858 #. Description
59 -#: ../templates:14
 59+#: ../templates:2001
6060 #, fuzzy
6161 msgid ""
6262 "The anonymize_headers and fake_user_agent directives have been replaced with "
——@@ -66,7 +66,7 @@
6767
6868 #. Type: note
6969 #. Description
70 -#: ../templates:14
 70+#: ../templates:2001
7171 #, fuzzy
7272 msgid ""
7373 "The anonymize_headers and fake_user_agent directives that were present in "
——@@ -88,20 +88,20 @@
8989
9090 #. Type: boolean
9191 #. Description
92 -#: ../templates:25
 92+#: ../templates:3001
9393 #, fuzzy
9494 msgid "There is no automatic upgrade path to squid 2.5."
9595 msgstr "N�o existe um caminho de atualiza��o autom�tico para o squid 2.5"
9696
9797 #. Type: boolean
9898 #. Description
99 -#: ../templates:25
 99+#: ../templates:3001
100100 msgid " SQUID 2.5 INSTALLATION WARNING"
101101 msgstr " AVISO DE INSTALA��O DO SQUID 2.5"
102102
103103 #. Type: boolean
104104 #. Description
105 -#: ../templates:25
 105+#: ../templates:3001
106106 msgid ""
107107 "You are upgrading squid from an 1.x version to the 2.5 version. The 1.x and "
108108 "2.5 versions are NOT compatible. The structure of the cache directory is "
——@@ -115,7 +115,7 @@
116116
117117 #. Type: boolean
118118 #. Description
119 -#: ../templates:25
 119+#: ../templates:3001
120120 msgid ""
121121 "If you have an old cache directory, please quit NOW and remove the old cache "
122122 "by hand (in /var/spool/squid). Then re-install this squid version."
——@@ -126,7 +126,7 @@
127127
128128 #. Type: boolean
129129 #. Description
130 -#: ../templates:25
 130+#: ../templates:3001
131131 msgid ""
132132 "Also, please accept the new configuration file. After upgrading your old "
133133 "configuration file can be found in \"/etc/squid.conf.dpkg-old\". Then you "
——@@ -140,19 +140,19 @@
141141
142142 #. Type: boolean
143143 #. Description
144 -#: ../templates:25
 144+#: ../templates:3001
145145 msgid "Do you want to quit now?"
146146 msgstr "Voc� deseja abortar agora ?"
147147
148148 #. Type: note
149149 #. Description
150 -#: ../templates:45
 150+#: ../templates:4001
151151 msgid "squid-cgi now uses config file for target ACL"
152152 msgstr ""
153153
154154 #. Type: note
155155 #. Description
156 -#: ../templates:45
 156+#: ../templates:4001
157157 msgid ""
158158 "squid-cgi now checks a configuration file before connecting to the target "
159159 "host. Only allowed target will be contacted. Please add hosts you want to "
——@@ -161,19 +161,19 @@
162162
163163 #. Type: note
164164 #. Description
165 -#: ../templates:45
 165+#: ../templates:4001
166166 msgid " hostname:port"
167167 msgstr ""
168168
169169 #. Type: boolean
170170 #. Description
171 -#: ../templates:55
 171+#: ../templates:5001
172172 msgid "Upgrade squid.conf automatically?"
173173 msgstr "Atualizar arquivo squid.conf automaticamente ?"
174174
175175 #. Type: boolean
176176 #. Description
177 -#: ../templates:55
 177+#: ../templates:5001
178178 msgid ""
179179 "Incompatible settings have been found in the existing squid.conf file; they "
180180 "will prevent squid from starting or working correctly. However, this setup "
——@@ -187,14 +187,14 @@
188188
189189 #. Type: note
190190 #. Description
191 -#: ../templates:63
 191+#: ../templates:6001
192192 #, fuzzy
193193 msgid "The authenticate_program directive has been replaced with auth_param."
194194 msgstr "A diretiva autenticate_program foi substitu�da por auth_param"
195195
196196 #. Type: note
197197 #. Description
198 -#: ../templates:63
 198+#: ../templates:6001
199199 msgid ""
200200 "The authenticate_program directive that was present in squid <= 2.4 doesn't "
201201 "exist anymore in squid 2.5 and up. All authentication directives have been "
——@@ -213,7 +213,7 @@
214214
215215 #. Type: note
216216 #. Description
217 -#: ../templates:73
 217+#: ../templates:7001
218218 #, fuzzy
219219 msgid "Warning: squid may crash when logfiles size is bigger than 2GB."
220220 msgstr ""
——@@ -222,7 +222,7 @@
223223
224224 #. Type: note
225225 #. Description
226 -#: ../templates:73
 226+#: ../templates:7001
227227 msgid ""
228228 "Squid may crash if any of the logfiles grows bigger than 2GB. Please "
229229 "configure /etc/logrotate.d/squid accordingly to your site's traffic."
——@@ -233,13 +233,13 @@
234234
235235 #. Type: boolean
236236 #. Description
237 -#: ../templates:80
 237+#: ../templates:8001
238238 msgid "Fix permissions of cache_dir?"
239239 msgstr "Corrigir permiss�es de cache_dir ?"
240240
241241 #. Type: boolean
242242 #. Description
243 -#: ../templates:80
 243+#: ../templates:8001
244244 msgid ""
245245 "Values for cache_effective_user and/or cache_effective_group in config file "
246246 "are incompatible with owner/group of cache directories. Do you want to "
——@@ -251,7 +251,7 @@
252252
253253 #. Type: boolean
254254 #. Description
255 -#: ../templates:80
 255+#: ../templates:8001
256256 msgid ""
257257 "WARNING: If you specified a cache directory different from /var/spool/squid "
258258 "and selected some other directory used by other programs (e.g. /tmp), this "
Index: trunk/debs/squid/debian/po/ru.po
——@@ -5,8 +5,8 @@
66 msgid ""
77 msgstr ""
88 "Project-Id-Version: squid_2.5.9-9_ru\n"
9 -"Report-Msgid-Bugs-To: luigi@debian.org\n"
10 -"POT-Creation-Date: 2006-09-21 16:13+0000\n"
 9+"Report-Msgid-Bugs-To: mark@wikimedia.org\n"
 10+"POT-Creation-Date: 2006-12-06 20:56+0000\n"
1111 "PO-Revision-Date: 2005-05-21 17:50+1000\n"
1212 "Last-Translator: Yuriy Talakan' <yt@amur.elektra.ru>\n"
1313 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
——@@ -17,7 +17,7 @@
1818
1919 #. Type: note
2020 #. Description
21 -#: ../templates:3
 21+#: ../templates:1001
2222 msgid ""
2323 "The http_anonymizer directive has been replaced with header_replace and "
2424 "header_access."
——@@ -26,7 +26,7 @@
2727
2828 #. Type: note
2929 #. Description
30 -#: ../templates:3
 30+#: ../templates:1001
3131 msgid ""
3232 "The http_anonymizer directive that was present in squid 2.1 and 2.2 doesn't "
3333 "exist anymore in squid 2.3 and up. It has been replaced with header_replace "
——@@ -46,7 +46,7 @@
4747
4848 #. Type: note
4949 #. Description
50 -#: ../templates:14
 50+#: ../templates:2001
5151 msgid ""
5252 "The anonymize_headers and fake_user_agent directives have been replaced with "
5353 "header_access and header_replace."
——@@ -56,7 +56,7 @@
5757
5858 #. Type: note
5959 #. Description
60 -#: ../templates:14
 60+#: ../templates:2001
6161 msgid ""
6262 "The anonymize_headers and fake_user_agent directives that were present in "
6363 "squid 2.3 and 2.4 don't exist anymore in squid 2.5 and up. They have been "
——@@ -76,19 +76,19 @@
7777
7878 #. Type: boolean
7979 #. Description
80 -#: ../templates:25
 80+#: ../templates:3001
8181 msgid "There is no automatic upgrade path to squid 2.5."
8282 msgstr "Не существует автоматического способа обновления до squid 2.5."
8383
8484 #. Type: boolean
8585 #. Description
86 -#: ../templates:25
 86+#: ../templates:3001
8787 msgid " SQUID 2.5 INSTALLATION WARNING"
8888 msgstr " ПРЕДУПРЕЖДЕНИЕ ПРИ УСТАНОВКЕ SQUID 2.5"
8989
9090 #. Type: boolean
9191 #. Description
92 -#: ../templates:25
 92+#: ../templates:3001
9393 msgid ""
9494 "You are upgrading squid from an 1.x version to the 2.5 version. The 1.x and "
9595 "2.5 versions are NOT compatible. The structure of the cache directory is "
——@@ -101,7 +101,7 @@
102102
103103 #. Type: boolean
104104 #. Description
105 -#: ../templates:25
 105+#: ../templates:3001
106106 msgid ""
107107 "If you have an old cache directory, please quit NOW and remove the old cache "
108108 "by hand (in /var/spool/squid). Then re-install this squid version."
——@@ -111,7 +111,7 @@
112112
113113 #. Type: boolean
114114 #. Description
115 -#: ../templates:25
 115+#: ../templates:3001
116116 msgid ""
117117 "Also, please accept the new configuration file. After upgrading your old "
118118 "configuration file can be found in \"/etc/squid.conf.dpkg-old\". Then you "
——@@ -124,19 +124,19 @@
125125
126126 #. Type: boolean
127127 #. Description
128 -#: ../templates:25
 128+#: ../templates:3001
129129 msgid "Do you want to quit now?"
130130 msgstr "Желаете выйти сейчас?"
131131
132132 #. Type: note
133133 #. Description
134 -#: ../templates:45
 134+#: ../templates:4001
135135 msgid "squid-cgi now uses config file for target ACL"
136136 msgstr "squid-cgi теперь использует файл настроек для контроля целей"
137137
138138 #. Type: note
139139 #. Description
140 -#: ../templates:45
 140+#: ../templates:4001
141141 msgid ""
142142 "squid-cgi now checks a configuration file before connecting to the target "
143143 "host. Only allowed target will be contacted. Please add hosts you want to "
——@@ -149,19 +149,19 @@
150150
151151 #. Type: note
152152 #. Description
153 -#: ../templates:45
 153+#: ../templates:4001
154154 msgid " hostname:port"
155155 msgstr " хост:порт"
156156
157157 #. Type: boolean
158158 #. Description
159 -#: ../templates:55
 159+#: ../templates:5001
160160 msgid "Upgrade squid.conf automatically?"
161161 msgstr "Обновить squid.conf автоматически?"
162162
163163 #. Type: boolean
164164 #. Description
165 -#: ../templates:55
 165+#: ../templates:5001
166166 msgid ""
167167 "Incompatible settings have been found in the existing squid.conf file; they "
168168 "will prevent squid from starting or working correctly. However, this setup "
——@@ -173,13 +173,13 @@
174174
175175 #. Type: note
176176 #. Description
177 -#: ../templates:63
 177+#: ../templates:6001
178178 msgid "The authenticate_program directive has been replaced with auth_param."
179179 msgstr "Директива authenticate_program была заменена на auth_param."
180180
181181 #. Type: note
182182 #. Description
183 -#: ../templates:63
 183+#: ../templates:6001
184184 msgid ""
185185 "The authenticate_program directive that was present in squid <= 2.4 doesn't "
186186 "exist anymore in squid 2.5 and up. All authentication directives have been "
——@@ -197,13 +197,13 @@
198198
199199 #. Type: note
200200 #. Description
201 -#: ../templates:73
 201+#: ../templates:7001
202202 msgid "Warning: squid may crash when logfiles size is bigger than 2GB."
203203 msgstr "Предупреждение: squid может упасть, когда размер log-файла более 2GB."
204204
205205 #. Type: note
206206 #. Description
207 -#: ../templates:73
 207+#: ../templates:7001
208208 msgid ""
209209 "Squid may crash if any of the logfiles grows bigger than 2GB. Please "
210210 "configure /etc/logrotate.d/squid accordingly to your site's traffic."
——@@ -213,13 +213,13 @@
214214
215215 #. Type: boolean
216216 #. Description
217 -#: ../templates:80
 217+#: ../templates:8001
218218 msgid "Fix permissions of cache_dir?"
219219 msgstr "Исправить права доступа на cache_dir?"
220220
221221 #. Type: boolean
222222 #. Description
223 -#: ../templates:80
 223+#: ../templates:8001
224224 msgid ""
225225 "Values for cache_effective_user and/or cache_effective_group in config file "
226226 "are incompatible with owner/group of cache directories. Do you want to "
——@@ -231,7 +231,7 @@
232232
233233 #. Type: boolean
234234 #. Description
235 -#: ../templates:80
 235+#: ../templates:8001
236236 msgid ""
237237 "WARNING: If you specified a cache directory different from /var/spool/squid "
238238 "and selected some other directory used by other programs (e.g. /tmp), this "
Index: trunk/debs/squid/debian/po/es.po
——@@ -27,8 +27,8 @@
2828 msgid ""
2929 msgstr ""
3030 "Project-Id-Version: squid 2.5.4-3\n"
31 -"Report-Msgid-Bugs-To: luigi@debian.org\n"
32 -"POT-Creation-Date: 2006-09-21 16:13+0000\n"
 31+"Report-Msgid-Bugs-To: mark@wikimedia.org\n"
 32+"POT-Creation-Date: 2006-12-06 20:56+0000\n"
3333 "PO-Revision-Date: 2004-3-6 21:35+100\n"
3434 "Last-Translator: Javi Castelo\n"
3535 "Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
——@@ -38,7 +38,7 @@
3939
4040 #. Type: note
4141 #. Description
42 -#: ../templates:3
 42+#: ../templates:1001
4343 #, fuzzy
4444 msgid ""
4545 "The http_anonymizer directive has been replaced with header_replace and "
——@@ -47,7 +47,7 @@
4848
4949 #. Type: note
5050 #. Description
51 -#: ../templates:3
 51+#: ../templates:1001
5252 msgid ""
5353 "The http_anonymizer directive that was present in squid 2.1 and 2.2 doesn't "
5454 "exist anymore in squid 2.3 and up. It has been replaced with header_replace "
——@@ -68,7 +68,7 @@
6969
7070 #. Type: note
7171 #. Description
72 -#: ../templates:14
 72+#: ../templates:2001
7373 #, fuzzy
7474 msgid ""
7575 "The anonymize_headers and fake_user_agent directives have been replaced with "
——@@ -79,7 +79,7 @@
8080
8181 #. Type: note
8282 #. Description
83 -#: ../templates:14
 83+#: ../templates:2001
8484 #, fuzzy
8585 msgid ""
8686 "The anonymize_headers and fake_user_agent directives that were present in "
——@@ -101,20 +101,20 @@
102102
103103 #. Type: boolean
104104 #. Description
105 -#: ../templates:25
 105+#: ../templates:3001
106106 #, fuzzy
107107 msgid "There is no automatic upgrade path to squid 2.5."
108108 msgstr "No hay ruta para la actualizaci�n autom�tica a squid 2.5"
109109
110110 #. Type: boolean
111111 #. Description
112 -#: ../templates:25
 112+#: ../templates:3001
113113 msgid " SQUID 2.5 INSTALLATION WARNING"
114114 msgstr " ADVERTENCIA SOBRE LA INSTALACION DE SQUID 2.5"
115115
116116 #. Type: boolean
117117 #. Description
118 -#: ../templates:25
 118+#: ../templates:3001
119119 msgid ""
120120 "You are upgrading squid from an 1.x version to the 2.5 version. The 1.x and "
121121 "2.5 versions are NOT compatible. The structure of the cache directory is "
——@@ -128,7 +128,7 @@
129129
130130 #. Type: boolean
131131 #. Description
132 -#: ../templates:25
 132+#: ../templates:3001
133133 msgid ""
134134 "If you have an old cache directory, please quit NOW and remove the old cache "
135135 "by hand (in /var/spool/squid). Then re-install this squid version."
——@@ -139,7 +139,7 @@
140140
141141 #. Type: boolean
142142 #. Description
143 -#: ../templates:25
 143+#: ../templates:3001
144144 msgid ""
145145 "Also, please accept the new configuration file. After upgrading your old "
146146 "configuration file can be found in \"/etc/squid.conf.dpkg-old\". Then you "
——@@ -153,19 +153,19 @@
154154
155155 #. Type: boolean
156156 #. Description
157 -#: ../templates:25
 157+#: ../templates:3001
158158 msgid "Do you want to quit now?"
159159 msgstr "�Desea salir ahora?"
160160
161161 #. Type: note
162162 #. Description
163 -#: ../templates:45
 163+#: ../templates:4001
164164 msgid "squid-cgi now uses config file for target ACL"
165165 msgstr ""
166166
167167 #. Type: note
168168 #. Description
169 -#: ../templates:45
 169+#: ../templates:4001
170170 msgid ""
171171 "squid-cgi now checks a configuration file before connecting to the target "
172172 "host. Only allowed target will be contacted. Please add hosts you want to "
——@@ -174,19 +174,19 @@
175175
176176 #. Type: note
177177 #. Description
178 -#: ../templates:45
 178+#: ../templates:4001
179179 msgid " hostname:port"
180180 msgstr ""
181181
182182 #. Type: boolean
183183 #. Description
184 -#: ../templates:55
 184+#: ../templates:5001
185185 msgid "Upgrade squid.conf automatically?"
186186 msgstr "�Actualizar �squid.conf� autom�ticamente?"
187187
188188 #. Type: boolean
189189 #. Description
190 -#: ../templates:55
 190+#: ../templates:5001
191191 msgid ""
192192 "Incompatible settings have been found in the existing squid.conf file; they "
193193 "will prevent squid from starting or working correctly. However, this setup "
——@@ -199,14 +199,14 @@
200200
201201 #. Type: note
202202 #. Description
203 -#: ../templates:63
 203+#: ../templates:6001
204204 #, fuzzy
205205 msgid "The authenticate_program directive has been replaced with auth_param."
206206 msgstr "La directiva �authenticate_program� se ha reemplazado por �auth_param�"
207207
208208 #. Type: note
209209 #. Description
210 -#: ../templates:63
 210+#: ../templates:6001
211211 msgid ""
212212 "The authenticate_program directive that was present in squid <= 2.4 doesn't "
213213 "exist anymore in squid 2.5 and up. All authentication directives have been "
——@@ -225,7 +225,7 @@
226226
227227 #. Type: note
228228 #. Description
229 -#: ../templates:73
 229+#: ../templates:7001
230230 #, fuzzy
231231 msgid "Warning: squid may crash when logfiles size is bigger than 2GB."
232232 msgstr ""
——@@ -233,7 +233,7 @@
234234
235235 #. Type: note
236236 #. Description
237 -#: ../templates:73
 237+#: ../templates:7001
238238 msgid ""
239239 "Squid may crash if any of the logfiles grows bigger than 2GB. Please "
240240 "configure /etc/logrotate.d/squid accordingly to your site's traffic."
——@@ -244,13 +244,13 @@
245245
246246 #. Type: boolean
247247 #. Description
248 -#: ../templates:80
 248+#: ../templates:8001
249249 msgid "Fix permissions of cache_dir?"
250250 msgstr ""
251251
252252 #. Type: boolean
253253 #. Description
254 -#: ../templates:80
 254+#: ../templates:8001
255255 msgid ""
256256 "Values for cache_effective_user and/or cache_effective_group in config file "
257257 "are incompatible with owner/group of cache directories. Do you want to "
——@@ -259,7 +259,7 @@
260260
261261 #. Type: boolean
262262 #. Description
263 -#: ../templates:80
 263+#: ../templates:8001
264264 msgid ""
265265 "WARNING: If you specified a cache directory different from /var/spool/squid "
266266 "and selected some other directory used by other programs (e.g. /tmp), this "
Index: trunk/debs/squid/debian/po/fr.po
——@@ -12,8 +12,8 @@
1313 msgid ""
1414 msgstr ""
1515 "Project-Id-Version: squid_2.5.10-7\n"
16 -"Report-Msgid-Bugs-To: luigi@debian.org\n"
17 -"POT-Creation-Date: 2006-09-21 16:13+0000\n"
 16+"Report-Msgid-Bugs-To: mark@wikimedia.org\n"
 17+"POT-Creation-Date: 2006-12-06 20:56+0000\n"
1818 "PO-Revision-Date: 2005-10-30 09:39+0100\n"
1919 "Last-Translator: Michel Grentzinger <mic.grentz@online.fr>\n"
2020 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
——@@ -23,7 +23,7 @@
2424
2525 #. Type: note
2626 #. Description
27 -#: ../templates:3
 27+#: ../templates:1001
2828 msgid ""
2929 "The http_anonymizer directive has been replaced with header_replace and "
3030 "header_access."
——@@ -32,7 +32,7 @@
3333
3434 #. Type: note
3535 #. Description
36 -#: ../templates:3
 36+#: ../templates:1001
3737 msgid ""
3838 "The http_anonymizer directive that was present in squid 2.1 and 2.2 doesn't "
3939 "exist anymore in squid 2.3 and up. It has been replaced with header_replace "
——@@ -53,7 +53,7 @@
5454
5555 #. Type: note
5656 #. Description
57 -#: ../templates:14
 57+#: ../templates:2001
5858 msgid ""
5959 "The anonymize_headers and fake_user_agent directives have been replaced with "
6060 "header_access and header_replace."
——@@ -63,7 +63,7 @@
6464
6565 #. Type: note
6666 #. Description
67 -#: ../templates:14
 67+#: ../templates:2001
6868 msgid ""
6969 "The anonymize_headers and fake_user_agent directives that were present in "
7070 "squid 2.3 and 2.4 don't exist anymore in squid 2.5 and up. They have been "
——@@ -84,19 +84,19 @@
8585
8686 #. Type: boolean
8787 #. Description
88 -#: ../templates:25
 88+#: ../templates:3001
8989 msgid "There is no automatic upgrade path to squid 2.5."
9090 msgstr "La mise � jour de squid pour la version 2.5 n'est pas automatique"
9191
9292 #. Type: boolean
9393 #. Description
94 -#: ../templates:25
 94+#: ../templates:3001
9595 msgid " SQUID 2.5 INSTALLATION WARNING"
9696 msgstr "Avertissement concernant l'installation de squid 2.5"
9797
9898 #. Type: boolean
9999 #. Description
100 -#: ../templates:25
 100+#: ../templates:3001
101101 msgid ""
102102 "You are upgrading squid from an 1.x version to the 2.5 version. The 1.x and "
103103 "2.5 versions are NOT compatible. The structure of the cache directory is "
——@@ -110,7 +110,7 @@
111111
112112 #. Type: boolean
113113 #. Description
114 -#: ../templates:25
 114+#: ../templates:3001
115115 msgid ""
116116 "If you have an old cache directory, please quit NOW and remove the old cache "
117117 "by hand (in /var/spool/squid). Then re-install this squid version."
——@@ -121,7 +121,7 @@
122122
123123 #. Type: boolean
124124 #. Description
125 -#: ../templates:25
 125+#: ../templates:3001
126126 msgid ""
127127 "Also, please accept the new configuration file. After upgrading your old "
128128 "configuration file can be found in \"/etc/squid.conf.dpkg-old\". Then you "
——@@ -135,20 +135,20 @@
136136
137137 #. Type: boolean
138138 #. Description
139 -#: ../templates:25
 139+#: ../templates:3001
140140 msgid "Do you want to quit now?"
141141 msgstr "Souhaitez-vous quitter maintenant�?"
142142
143143 #. Type: note
144144 #. Description
145 -#: ../templates:45
 145+#: ../templates:4001
146146 msgid "squid-cgi now uses config file for target ACL"
147147 msgstr ""
148148 "squid-cgi utilise d�sormais un fichier de configuration pour les cibles ACL "
149149
150150 #. Type: note
151151 #. Description
152 -#: ../templates:45
 152+#: ../templates:4001
153153 msgid ""
154154 "squid-cgi now checks a configuration file before connecting to the target "
155155 "host. Only allowed target will be contacted. Please add hosts you want to "
——@@ -161,19 +161,19 @@
162162
163163 #. Type: note
164164 #. Description
165 -#: ../templates:45
 165+#: ../templates:4001
166166 msgid " hostname:port"
167167 msgstr " nom d'h�te: port"
168168
169169 #. Type: boolean
170170 #. Description
171 -#: ../templates:55
 171+#: ../templates:5001
172172 msgid "Upgrade squid.conf automatically?"
173173 msgstr "Faut-il automatiquement mettre � jour squid.conf�?"
174174
175175 #. Type: boolean
176176 #. Description
177 -#: ../templates:55
 177+#: ../templates:5001
178178 msgid ""
179179 "Incompatible settings have been found in the existing squid.conf file; they "
180180 "will prevent squid from starting or working correctly. However, this setup "
——@@ -186,13 +186,13 @@
187187
188188 #. Type: note
189189 #. Description
190 -#: ../templates:63
 190+#: ../templates:6001
191191 msgid "The authenticate_program directive has been replaced with auth_param."
192192 msgstr "��authenticate_program�� remplac� par ��auth_param��"
193193
194194 #. Type: note
195195 #. Description
196 -#: ../templates:63
 196+#: ../templates:6001
197197 msgid ""
198198 "The authenticate_program directive that was present in squid <= 2.4 doesn't "
199199 "exist anymore in squid 2.5 and up. All authentication directives have been "
——@@ -211,13 +211,13 @@
212212
213213 #. Type: note
214214 #. Description
215 -#: ../templates:73
 215+#: ../templates:7001
216216 msgid "Warning: squid may crash when logfiles size is bigger than 2GB."
217217 msgstr "Blocage possible avec des fichiers journaux sup�rieurs � 2�Go"
218218
219219 #. Type: note
220220 #. Description
221 -#: ../templates:73
 221+#: ../templates:7001
222222 msgid ""
223223 "Squid may crash if any of the logfiles grows bigger than 2GB. Please "
224224 "configure /etc/logrotate.d/squid accordingly to your site's traffic."
——@@ -228,13 +228,13 @@
229229
230230 #. Type: boolean
231231 #. Description
232 -#: ../templates:80
 232+#: ../templates:8001
233233 msgid "Fix permissions of cache_dir?"
234234 msgstr "Faut-il corriger les droits de cache_dir�?"
235235
236236 #. Type: boolean
237237 #. Description
238 -#: ../templates:80
 238+#: ../templates:8001
239239 msgid ""
240240 "Values for cache_effective_user and/or cache_effective_group in config file "
241241 "are incompatible with owner/group of cache directories. Do you want to "
——@@ -247,7 +247,7 @@
248248
249249 #. Type: boolean
250250 #. Description
251 -#: ../templates:80
 251+#: ../templates:8001
252252 msgid ""
253253 "WARNING: If you specified a cache directory different from /var/spool/squid "
254254 "and selected some other directory used by other programs (e.g. /tmp), this "
Index: trunk/debs/squid/debian/po/de.po
——@@ -17,8 +17,8 @@
1818 msgid ""
1919 msgstr ""
2020 "Project-Id-Version: de\n"
21 -"Report-Msgid-Bugs-To: luigi@debian.org\n"
22 -"POT-Creation-Date: 2006-09-21 16:13+0000\n"
 21+"Report-Msgid-Bugs-To: mark@wikimedia.org\n"
 22+"POT-Creation-Date: 2006-12-06 20:56+0000\n"
2323 "PO-Revision-Date: 2004-12-01 21:01+0100\n"
2424 "Last-Translator: Jens Nachtigall <nachtigall@web.de>\n"
2525 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
——@@ -30,7 +30,7 @@
3131
3232 #. Type: note
3333 #. Description
34 -#: ../templates:3
 34+#: ../templates:1001
3535 msgid ""
3636 "The http_anonymizer directive has been replaced with header_replace and "
3737 "header_access."
——@@ -40,7 +40,7 @@
4141
4242 #. Type: note
4343 #. Description
44 -#: ../templates:3
 44+#: ../templates:1001
4545 msgid ""
4646 "The http_anonymizer directive that was present in squid 2.1 and 2.2 doesn't "
4747 "exist anymore in squid 2.3 and up. It has been replaced with header_replace "
——@@ -60,7 +60,7 @@
6161
6262 #. Type: note
6363 #. Description
64 -#: ../templates:14
 64+#: ../templates:2001
6565 msgid ""
6666 "The anonymize_headers and fake_user_agent directives have been replaced with "
6767 "header_access and header_replace."
——@@ -70,7 +70,7 @@
7171
7272 #. Type: note
7373 #. Description
74 -#: ../templates:14
 74+#: ../templates:2001
7575 msgid ""
7676 "The anonymize_headers and fake_user_agent directives that were present in "
7777 "squid 2.3 and 2.4 don't exist anymore in squid 2.5 and up. They have been "
——@@ -91,19 +91,19 @@
9292
9393 #. Type: boolean
9494 #. Description
95 -#: ../templates:25
 95+#: ../templates:3001
9696 msgid "There is no automatic upgrade path to squid 2.5."
9797 msgstr "Eine automatische Aktualisierung auf Squid 2.5 ist unmöglich."
9898
9999 #. Type: boolean
100100 #. Description
101 -#: ../templates:25
 101+#: ../templates:3001
102102 msgid " SQUID 2.5 INSTALLATION WARNING"
103103 msgstr " SQUID 2.5 INSTALLATIONS-WARNUNG"
104104
105105 #. Type: boolean
106106 #. Description
107 -#: ../templates:25
 107+#: ../templates:3001
108108 msgid ""
109109 "You are upgrading squid from an 1.x version to the 2.5 version. The 1.x and "
110110 "2.5 versions are NOT compatible. The structure of the cache directory is "
——@@ -117,7 +117,7 @@
118118
119119 #. Type: boolean
120120 #. Description
121 -#: ../templates:25
 121+#: ../templates:3001
122122 msgid ""
123123 "If you have an old cache directory, please quit NOW and remove the old cache "
124124 "by hand (in /var/spool/squid). Then re-install this squid version."
——@@ -128,7 +128,7 @@
129129
130130 #. Type: boolean
131131 #. Description
132 -#: ../templates:25
 132+#: ../templates:3001
133133 msgid ""
134134 "Also, please accept the new configuration file. After upgrading your old "
135135 "configuration file can be found in \"/etc/squid.conf.dpkg-old\". Then you "
——@@ -142,13 +142,13 @@
143143
144144 #. Type: boolean
145145 #. Description
146 -#: ../templates:25
 146+#: ../templates:3001
147147 msgid "Do you want to quit now?"
148148 msgstr "Installation beenden?"
149149
150150 #. Type: note
151151 #. Description
152 -#: ../templates:45
 152+#: ../templates:4001
153153 msgid "squid-cgi now uses config file for target ACL"
154154 msgstr ""
155155 "squid-cgi benutzt nun eine Konfigurationsdatei als Zugangskontrollliste "
——@@ -156,7 +156,7 @@
157157
158158 #. Type: note
159159 #. Description
160 -#: ../templates:45
 160+#: ../templates:4001
161161 msgid ""
162162 "squid-cgi now checks a configuration file before connecting to the target "
163163 "host. Only allowed target will be contacted. Please add hosts you want to "
——@@ -170,19 +170,19 @@
171171
172172 #. Type: note
173173 #. Description
174 -#: ../templates:45
 174+#: ../templates:4001
175175 msgid " hostname:port"
176176 msgstr " hostname:port"
177177
178178 #. Type: boolean
179179 #. Description
180 -#: ../templates:55
 180+#: ../templates:5001
181181 msgid "Upgrade squid.conf automatically?"
182182 msgstr "squid.conf automatisch aktualisieren?"
183183
184184 #. Type: boolean
185185 #. Description
186 -#: ../templates:55
 186+#: ../templates:5001
187187 msgid ""
188188 "Incompatible settings have been found in the existing squid.conf file; they "
189189 "will prevent squid from starting or working correctly. However, this setup "
——@@ -196,13 +196,13 @@
197197
198198 #. Type: note
199199 #. Description
200 -#: ../templates:63
 200+#: ../templates:6001
201201 msgid "The authenticate_program directive has been replaced with auth_param."
202202 msgstr "Die Direktive authenticate_program wurde durch auth_param ersetzt."
203203
204204 #. Type: note
205205 #. Description
206 -#: ../templates:63
 206+#: ../templates:6001
207207 msgid ""
208208 "The authenticate_program directive that was present in squid <= 2.4 doesn't "
209209 "exist anymore in squid 2.5 and up. All authentication directives have been "
——@@ -220,13 +220,13 @@
221221
222222 #. Type: note
223223 #. Description
224 -#: ../templates:73
 224+#: ../templates:7001
225225 msgid "Warning: squid may crash when logfiles size is bigger than 2GB."
226226 msgstr "Warnung: squid kann abstürzen, wenn Log-Dateien größer als 2GB sind."
227227
228228 #. Type: note
229229 #. Description
230 -#: ../templates:73
 230+#: ../templates:7001
231231 msgid ""
232232 "Squid may crash if any of the logfiles grows bigger than 2GB. Please "
233233 "configure /etc/logrotate.d/squid accordingly to your site's traffic."
——@@ -237,13 +237,13 @@
238238
239239 #. Type: boolean
240240 #. Description
241 -#: ../templates:80
 241+#: ../templates:8001
242242 msgid "Fix permissions of cache_dir?"
243243 msgstr "Berechtigungen für cache_dir beheben?"
244244
245245 #. Type: boolean
246246 #. Description
247 -#: ../templates:80
 247+#: ../templates:8001
248248 msgid ""
249249 "Values for cache_effective_user and/or cache_effective_group in config file "
250250 "are incompatible with owner/group of cache directories. Do you want to "
——@@ -256,7 +256,7 @@
257257
258258 #. Type: boolean
259259 #. Description
260 -#: ../templates:80
 260+#: ../templates:8001
261261 msgid ""
262262 "WARNING: If you specified a cache directory different from /var/spool/squid "
263263 "and selected some other directory used by other programs (e.g. /tmp), this "
Index: trunk/debs/squid/debian/po/sv.po
——@@ -13,8 +13,8 @@
1414 msgid ""
1515 msgstr ""
1616 "Project-Id-Version: squid 2.5.10-6\n"
17 -"Report-Msgid-Bugs-To: luigi@debian.org\n"
18 -"POT-Creation-Date: 2006-09-21 16:13+0000\n"
 17+"Report-Msgid-Bugs-To: mark@wikimedia.org\n"
 18+"POT-Creation-Date: 2006-12-06 20:56+0000\n"
1919 "PO-Revision-Date: 2005-09-27 07:37-0700\n"
2020 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
2121 "Language-Team: Swedish <sv@li.org>\n"
——@@ -24,7 +24,7 @@
2525
2626 #. Type: note
2727 #. Description
28 -#: ../templates:3
 28+#: ../templates:1001
2929 msgid ""
3030 "The http_anonymizer directive has been replaced with header_replace and "
3131 "header_access."
——@@ -33,7 +33,7 @@
3434
3535 #. Type: note
3636 #. Description
37 -#: ../templates:3
 37+#: ../templates:1001
3838 msgid ""
3939 "The http_anonymizer directive that was present in squid 2.1 and 2.2 doesn't "
4040 "exist anymore in squid 2.3 and up. It has been replaced with header_replace "
——@@ -52,7 +52,7 @@
5353
5454 #. Type: note
5555 #. Description
56 -#: ../templates:14
 56+#: ../templates:2001
5757 msgid ""
5858 "The anonymize_headers and fake_user_agent directives have been replaced with "
5959 "header_access and header_replace."
——@@ -62,7 +62,7 @@
6363
6464 #. Type: note
6565 #. Description
66 -#: ../templates:14
 66+#: ../templates:2001
6767 msgid ""
6868 "The anonymize_headers and fake_user_agent directives that were present in "
6969 "squid 2.3 and 2.4 don't exist anymore in squid 2.5 and up. They have been "
——@@ -82,19 +82,19 @@
8383
8484 #. Type: boolean
8585 #. Description
86 -#: ../templates:25
 86+#: ../templates:3001
8787 msgid "There is no automatic upgrade path to squid 2.5."
8888 msgstr "Det finns ingen automatisk uppgradering till squid 2.5."
8989
9090 #. Type: boolean
9191 #. Description
92 -#: ../templates:25
 92+#: ../templates:3001
9393 msgid " SQUID 2.5 INSTALLATION WARNING"
9494 msgstr " SQUID 2.5 INSTALLATIONSVARNING"
9595
9696 #. Type: boolean
9797 #. Description
98 -#: ../templates:25
 98+#: ../templates:3001
9999 msgid ""
100100 "You are upgrading squid from an 1.x version to the 2.5 version. The 1.x and "
101101 "2.5 versions are NOT compatible. The structure of the cache directory is "
——@@ -107,7 +107,7 @@
108108
109109 #. Type: boolean
110110 #. Description
111 -#: ../templates:25
 111+#: ../templates:3001
112112 msgid ""
113113 "If you have an old cache directory, please quit NOW and remove the old cache "
114114 "by hand (in /var/spool/squid). Then re-install this squid version."
——@@ -118,7 +118,7 @@
119119
120120 #. Type: boolean
121121 #. Description
122 -#: ../templates:25
 122+#: ../templates:3001
123123 msgid ""
124124 "Also, please accept the new configuration file. After upgrading your old "
125125 "configuration file can be found in \"/etc/squid.conf.dpkg-old\". Then you "
——@@ -131,19 +131,19 @@
132132
133133 #. Type: boolean
134134 #. Description
135 -#: ../templates:25
 135+#: ../templates:3001
136136 msgid "Do you want to quit now?"
137137 msgstr "Vill du verkligen avsluta nu?"
138138
139139 #. Type: note
140140 #. Description
141 -#: ../templates:45
 141+#: ../templates:4001
142142 msgid "squid-cgi now uses config file for target ACL"
143143 msgstr "squid-cgi anv�nder nu konfigurationsfilen f�r target ACL"
144144
145145 #. Type: note
146146 #. Description
147 -#: ../templates:45
 147+#: ../templates:4001
148148 msgid ""
149149 "squid-cgi now checks a configuration file before connecting to the target "
150150 "host. Only allowed target will be contacted. Please add hosts you want to "
——@@ -155,19 +155,19 @@
156156
157157 #. Type: note
158158 #. Description
159 -#: ../templates:45
 159+#: ../templates:4001
160160 msgid " hostname:port"
161161 msgstr " v�rdnamn:port"
162162
163163 #. Type: boolean
164164 #. Description
165 -#: ../templates:55
 165+#: ../templates:5001
166166 msgid "Upgrade squid.conf automatically?"
167167 msgstr "Uppgradera squid.conf automatiskt?"
168168
169169 #. Type: boolean
170170 #. Description
171 -#: ../templates:55
 171+#: ../templates:5001
172172 msgid ""
173173 "Incompatible settings have been found in the existing squid.conf file; they "
174174 "will prevent squid from starting or working correctly. However, this setup "
——@@ -179,13 +179,13 @@
180180
181181 #. Type: note
182182 #. Description
183 -#: ../templates:63
 183+#: ../templates:6001
184184 msgid "The authenticate_program directive has been replaced with auth_param."
185185 msgstr "authenticate_program har blivit utbytt mot auth_param."
186186
187187 #. Type: note
188188 #. Description
189 -#: ../templates:63
 189+#: ../templates:6001
190190 msgid ""
191191 "The authenticate_program directive that was present in squid <= 2.4 doesn't "
192192 "exist anymore in squid 2.5 and up. All authentication directives have been "
——@@ -202,14 +202,14 @@
203203
204204 #. Type: note
205205 #. Description
206 -#: ../templates:73
 206+#: ../templates:7001
207207 msgid "Warning: squid may crash when logfiles size is bigger than 2GB."
208208 msgstr ""
209209 "Varning: squid kan krascha n�r storleken p� logfilen blir st�rre �n 2GB."
210210
211211 #. Type: note
212212 #. Description
213 -#: ../templates:73
 213+#: ../templates:7001
214214 msgid ""
215215 "Squid may crash if any of the logfiles grows bigger than 2GB. Please "
216216 "configure /etc/logrotate.d/squid accordingly to your site's traffic."
——@@ -219,13 +219,13 @@
220220
221221 #. Type: boolean
222222 #. Description
223 -#: ../templates:80
 223+#: ../templates:8001
224224 msgid "Fix permissions of cache_dir?"
225225 msgstr "Fixa r�ttigheter p� cache_dir?"
226226
227227 #. Type: boolean
228228 #. Description
229 -#: ../templates:80
 229+#: ../templates:8001
230230 msgid ""
231231 "Values for cache_effective_user and/or cache_effective_group in config file "
232232 "are incompatible with owner/group of cache directories. Do you want to "
——@@ -237,7 +237,7 @@
238238
239239 #. Type: boolean
240240 #. Description
241 -#: ../templates:80
 241+#: ../templates:8001
242242 msgid ""
243243 "WARNING: If you specified a cache directory different from /var/spool/squid "
244244 "and selected some other directory used by other programs (e.g. /tmp), this "
Index: trunk/debs/squid/debian/po/nl.po
——@@ -14,8 +14,8 @@
1515 msgid ""
1616 msgstr ""
1717 "Project-Id-Version: squid 2.5.7-2\n"
18 -"Report-Msgid-Bugs-To: luigi@debian.org\n"
19 -"POT-Creation-Date: 2006-09-21 16:13+0000\n"
 18+"Report-Msgid-Bugs-To: mark@wikimedia.org\n"
 19+"POT-Creation-Date: 2006-12-06 20:56+0000\n"
2020 "PO-Revision-Date: 2004-11-16 18:38+0100\n"
2121 "Last-Translator: Luk Claes <luk.claes@ugent.be>\n"
2222 "Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n"
——@@ -25,7 +25,7 @@
2626
2727 #. Type: note
2828 #. Description
29 -#: ../templates:3
 29+#: ../templates:1001
3030 msgid ""
3131 "The http_anonymizer directive has been replaced with header_replace and "
3232 "header_access."
——@@ -35,7 +35,7 @@
3636
3737 #. Type: note
3838 #. Description
39 -#: ../templates:3
 39+#: ../templates:1001
4040 msgid ""
4141 "The http_anonymizer directive that was present in squid 2.1 and 2.2 doesn't "
4242 "exist anymore in squid 2.3 and up. It has been replaced with header_replace "
——@@ -55,7 +55,7 @@
5656
5757 #. Type: note
5858 #. Description
59 -#: ../templates:14
 59+#: ../templates:2001
6060 msgid ""
6161 "The anonymize_headers and fake_user_agent directives have been replaced with "
6262 "header_access and header_replace."
——@@ -65,7 +65,7 @@
6666
6767 #. Type: note
6868 #. Description
69 -#: ../templates:14
 69+#: ../templates:2001
7070 msgid ""
7171 "The anonymize_headers and fake_user_agent directives that were present in "
7272 "squid 2.3 and 2.4 don't exist anymore in squid 2.5 and up. They have been "
——@@ -85,19 +85,19 @@
8686
8787 #. Type: boolean
8888 #. Description
89 -#: ../templates:25
 89+#: ../templates:3001
9090 msgid "There is no automatic upgrade path to squid 2.5."
9191 msgstr "Er is geen automatisch opwaarderingspad voor squid 2.5."
9292
9393 #. Type: boolean
9494 #. Description
95 -#: ../templates:25
 95+#: ../templates:3001
9696 msgid " SQUID 2.5 INSTALLATION WARNING"
9797 msgstr " SQUID 2.5 INSTALLATIE WAARSCHUWING"
9898
9999 #. Type: boolean
100100 #. Description
101 -#: ../templates:25
 101+#: ../templates:3001
102102 msgid ""
103103 "You are upgrading squid from an 1.x version to the 2.5 version. The 1.x and "
104104 "2.5 versions are NOT compatible. The structure of the cache directory is "
——@@ -111,7 +111,7 @@
112112
113113 #. Type: boolean
114114 #. Description
115 -#: ../templates:25
 115+#: ../templates:3001
116116 msgid ""
117117 "If you have an old cache directory, please quit NOW and remove the old cache "
118118 "by hand (in /var/spool/squid). Then re-install this squid version."
——@@ -122,7 +122,7 @@
123123
124124 #. Type: boolean
125125 #. Description
126 -#: ../templates:25
 126+#: ../templates:3001
127127 msgid ""
128128 "Also, please accept the new configuration file. After upgrading your old "
129129 "configuration file can be found in \"/etc/squid.conf.dpkg-old\". Then you "
——@@ -136,19 +136,19 @@
137137
138138 #. Type: boolean
139139 #. Description
140 -#: ../templates:25
 140+#: ../templates:3001
141141 msgid "Do you want to quit now?"
142142 msgstr "Wilt u nu stoppen?"
143143
144144 #. Type: note
145145 #. Description
146 -#: ../templates:45
 146+#: ../templates:4001
147147 msgid "squid-cgi now uses config file for target ACL"
148148 msgstr "squid-cgi gebruikt nu een configuratiebestand voor doel-ACL"
149149
150150 #. Type: note
151151 #. Description
152 -#: ../templates:45
 152+#: ../templates:4001
153153 msgid ""
154154 "squid-cgi now checks a configuration file before connecting to the target "
155155 "host. Only allowed target will be contacted. Please add hosts you want to "
——@@ -161,19 +161,19 @@
162162
163163 #. Type: note
164164 #. Description
165 -#: ../templates:45
 165+#: ../templates:4001
166166 msgid " hostname:port"
167167 msgstr " computernaam:poort"
168168
169169 #. Type: boolean
170170 #. Description
171 -#: ../templates:55
 171+#: ../templates:5001
172172 msgid "Upgrade squid.conf automatically?"
173173 msgstr "squid.conf automatisch opwaarderen?"
174174
175175 #. Type: boolean
176176 #. Description
177 -#: ../templates:55
 177+#: ../templates:5001
178178 msgid ""
179179 "Incompatible settings have been found in the existing squid.conf file; they "
180180 "will prevent squid from starting or working correctly. However, this setup "
——@@ -185,13 +185,13 @@
186186
187187 #. Type: note
188188 #. Description
189 -#: ../templates:63
 189+#: ../templates:6001
190190 msgid "The authenticate_program directive has been replaced with auth_param."
191191 msgstr "De authenticate_program-instelling is vervangen door auth_param."
192192
193193 #. Type: note
194194 #. Description
195 -#: ../templates:63
 195+#: ../templates:6001
196196 msgid ""
197197 "The authenticate_program directive that was present in squid <= 2.4 doesn't "
198198 "exist anymore in squid 2.5 and up. All authentication directives have been "
——@@ -209,7 +209,7 @@
210210
211211 #. Type: note
212212 #. Description
213 -#: ../templates:73
 213+#: ../templates:7001
214214 msgid "Warning: squid may crash when logfiles size is bigger than 2GB."
215215 msgstr ""
216216 "Waarschuwing: squid kan vastlopen wanneer de grootte van een logbestand meer "
——@@ -217,7 +217,7 @@
218218
219219 #. Type: note
220220 #. Description
221 -#: ../templates:73
 221+#: ../templates:7001
222222 msgid ""
223223 "Squid may crash if any of the logfiles grows bigger than 2GB. Please "
224224 "configure /etc/logrotate.d/squid accordingly to your site's traffic."
——@@ -227,13 +227,13 @@
228228
229229 #. Type: boolean
230230 #. Description
231 -#: ../templates:80
 231+#: ../templates:8001
232232 msgid "Fix permissions of cache_dir?"
233233 msgstr "Permissies van cache_dir repareren?"
234234
235235 #. Type: boolean
236236 #. Description
237 -#: ../templates:80
 237+#: ../templates:8001
238238 msgid ""
239239 "Values for cache_effective_user and/or cache_effective_group in config file "
240240 "are incompatible with owner/group of cache directories. Do you want to "
——@@ -245,7 +245,7 @@
246246
247247 #. Type: boolean
248248 #. Description
249 -#: ../templates:80
 249+#: ../templates:8001
250250 msgid ""
251251 "WARNING: If you specified a cache directory different from /var/spool/squid "
252252 "and selected some other directory used by other programs (e.g. /tmp), this "
Index: trunk/debs/squid/debian/po/ja.po
——@@ -14,8 +14,8 @@
1515 msgid ""
1616 msgstr ""
1717 "Project-Id-Version: PACKAGE VERSION\n"
18 -"Report-Msgid-Bugs-To: luigi@debian.org\n"
19 -"POT-Creation-Date: 2006-09-21 16:13+0000\n"
 18+"Report-Msgid-Bugs-To: mark@wikimedia.org\n"
 19+"POT-Creation-Date: 2006-12-06 20:56+0000\n"
2020 "PO-Revision-Date: 2005-04-29 23:38+0900\n"
2121 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
2222 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
——@@ -25,7 +25,7 @@
2626
2727 #. Type: note
2828 #. Description
29 -#: ../templates:3
 29+#: ../templates:1001
3030 msgid ""
3131 "The http_anonymizer directive has been replaced with header_replace and "
3232 "header_access."
——@@ -35,7 +35,7 @@
3636
3737 #. Type: note
3838 #. Description
39 -#: ../templates:3
 39+#: ../templates:1001
4040 msgid ""
4141 "The http_anonymizer directive that was present in squid 2.1 and 2.2 doesn't "
4242 "exist anymore in squid 2.3 and up. It has been replaced with header_replace "
——@@ -54,7 +54,7 @@
5555
5656 #. Type: note
5757 #. Description
58 -#: ../templates:14
 58+#: ../templates:2001
5959 msgid ""
6060 "The anonymize_headers and fake_user_agent directives have been replaced with "
6161 "header_access and header_replace."
——@@ -64,7 +64,7 @@
6565
6666 #. Type: note
6767 #. Description
68 -#: ../templates:14
 68+#: ../templates:2001
6969 msgid ""
7070 "The anonymize_headers and fake_user_agent directives that were present in "
7171 "squid 2.3 and 2.4 don't exist anymore in squid 2.5 and up. They have been "
——@@ -84,19 +84,19 @@
8585
8686 #. Type: boolean
8787 #. Description
88 -#: ../templates:25
 88+#: ../templates:3001
8989 msgid "There is no automatic upgrade path to squid 2.5."
9090 msgstr "squid 2.5 �ؤμ�ư�����μ��ʤ�����ޤ���"
9191
9292 #. Type: boolean
9393 #. Description
94 -#: ../templates:25
 94+#: ../templates:3001
9595 msgid " SQUID 2.5 INSTALLATION WARNING"
9696 msgstr " Squid 2.5 ���󥹥ȡ���ηٹ�"
9797
9898 #. Type: boolean
9999 #. Description
100 -#: ../templates:25
 100+#: ../templates:3001
101101 msgid ""
102102 "You are upgrading squid from an 1.x version to the 2.5 version. The 1.x and "
103103 "2.5 versions are NOT compatible. The structure of the cache directory is "
——@@ -109,7 +109,7 @@
110110
111111 #. Type: boolean
112112 #. Description
113 -#: ../templates:25
 113+#: ../templates:3001
114114 msgid ""
115115 "If you have an old cache directory, please quit NOW and remove the old cache "
116116 "by hand (in /var/spool/squid). Then re-install this squid version."
——@@ -120,7 +120,7 @@
121121
122122 #. Type: boolean
123123 #. Description
124 -#: ../templates:25
 124+#: ../templates:3001
125125 msgid ""
126126 "Also, please accept the new configuration file. After upgrading your old "
127127 "configuration file can be found in \"/etc/squid.conf.dpkg-old\". Then you "
——@@ -133,19 +133,19 @@
134134
135135 #. Type: boolean
136136 #. Description
137 -#: ../templates:25
 137+#: ../templates:3001
138138 msgid "Do you want to quit now?"
139139 msgstr "��������ߤ��ޤ���?"
140140
141141 #. Type: note
142142 #. Description
143 -#: ../templates:45
 143+#: ../templates:4001
144144 msgid "squid-cgi now uses config file for target ACL"
145145 msgstr "squid-cgi �ϸ��ߡ�ACL �Υ������åȤ�����ե������Ȥ��ޤ���"
146146
147147 #. Type: note
148148 #. Description
149 -#: ../templates:45
 149+#: ../templates:4001
150150 msgid ""
151151 "squid-cgi now checks a configuration file before connecting to the target "
152152 "host. Only allowed target will be contacted. Please add hosts you want to "
——@@ -157,19 +157,19 @@
158158
159159 #. Type: note
160160 #. Description
161 -#: ../templates:45
 161+#: ../templates:4001
162162 msgid " hostname:port"
163163 msgstr " �ۥ���̾:�ݡ���"
164164
165165 #. Type: boolean
166166 #. Description
167 -#: ../templates:55
 167+#: ../templates:5001
168168 msgid "Upgrade squid.conf automatically?"
169169 msgstr "squid.conf ��ưŪ�˹������ޤ���?"
170170
171171 #. Type: boolean
172172 #. Description
173 -#: ../templates:55
 173+#: ../templates:5001
174174 msgid ""
175175 "Incompatible settings have been found in the existing squid.conf file; they "
176176 "will prevent squid from starting or working correctly. However, this setup "
——@@ -181,14 +181,14 @@
182182
183183 #. Type: note
184184 #. Description
185 -#: ../templates:63
 185+#: ../templates:6001
186186 msgid "The authenticate_program directive has been replaced with auth_param."
187187 msgstr ""
188188 "authenticate_program �ǥ��쥯�ƥ��֤� auth_param ���֤��������ޤ�����"
189189
190190 #. Type: note
191191 #. Description
192 -#: ../templates:63
 192+#: ../templates:6001
193193 msgid ""
194194 "The authenticate_program directive that was present in squid <= 2.4 doesn't "
195195 "exist anymore in squid 2.5 and up. All authentication directives have been "
——@@ -206,7 +206,7 @@
207207
208208 #. Type: note
209209 #. Description
210 -#: ../templates:73
 210+#: ../templates:7001
211211 msgid "Warning: squid may crash when logfiles size is bigger than 2GB."
212212 msgstr ""
213213 "�ٹ�: squid �ϥ����ե����륵������ 2GB ��Ķ�����Ȥ��˥���å��夹�붲�줬����"
——@@ -214,7 +214,7 @@
215215
216216 #. Type: note
217217 #. Description
218 -#: ../templates:73
 218+#: ../templates:7001
219219 msgid ""
220220 "Squid may crash if any of the logfiles grows bigger than 2GB. Please "
221221 "configure /etc/logrotate.d/squid accordingly to your site's traffic."
——@@ -225,13 +225,13 @@
226226
227227 #. Type: boolean
228228 #. Description
229 -#: ../templates:80
 229+#: ../templates:8001
230230 msgid "Fix permissions of cache_dir?"
231231 msgstr "cache_dir �Υѡ��ߥå����������ޤ���?"
232232
233233 #. Type: boolean
234234 #. Description
235 -#: ../templates:80
 235+#: ../templates:8001
236236 msgid ""
237237 "Values for cache_effective_user and/or cache_effective_group in config file "
238238 "are incompatible with owner/group of cache directories. Do you want to "
——@@ -243,7 +243,7 @@
244244
245245 #. Type: boolean
246246 #. Description
247 -#: ../templates:80
 247+#: ../templates:8001
248248 msgid ""
249249 "WARNING: If you specified a cache directory different from /var/spool/squid "
250250 "and selected some other directory used by other programs (e.g. /tmp), this "
Index: trunk/debs/squid/debian/po/it.po
——@@ -15,8 +15,8 @@
1616 msgid ""
1717 msgstr ""
1818 "Project-Id-Version: squid_2.5.6-9\n"
19 -"Report-Msgid-Bugs-To: luigi@debian.org\n"
20 -"POT-Creation-Date: 2006-09-21 16:13+0000\n"
 19+"Report-Msgid-Bugs-To: mark@wikimedia.org\n"
 20+"POT-Creation-Date: 2006-12-06 20:56+0000\n"
2121 "PO-Revision-Date: 2004-08-04 16:25+0200\n"
2222 "Last-Translator: Luigi Gangitano <luigi@debian.org>\n"
2323 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
——@@ -26,7 +26,7 @@
2727
2828 #. Type: note
2929 #. Description
30 -#: ../templates:3
 30+#: ../templates:1001
3131 #, fuzzy
3232 msgid ""
3333 "The http_anonymizer directive has been replaced with header_replace and "
——@@ -36,7 +36,7 @@
3737
3838 #. Type: note
3939 #. Description
40 -#: ../templates:3
 40+#: ../templates:1001
4141 msgid ""
4242 "The http_anonymizer directive that was present in squid 2.1 and 2.2 doesn't "
4343 "exist anymore in squid 2.3 and up. It has been replaced with header_replace "
——@@ -57,7 +57,7 @@
5858
5959 #. Type: note
6060 #. Description
61 -#: ../templates:14
 61+#: ../templates:2001
6262 #, fuzzy
6363 msgid ""
6464 "The anonymize_headers and fake_user_agent directives have been replaced with "
——@@ -68,7 +68,7 @@
6969
7070 #. Type: note
7171 #. Description
72 -#: ../templates:14
 72+#: ../templates:2001
7373 #, fuzzy
7474 msgid ""
7575 "The anonymize_headers and fake_user_agent directives that were present in "
——@@ -91,20 +91,20 @@
9292
9393 #. Type: boolean
9494 #. Description
95 -#: ../templates:25
 95+#: ../templates:3001
9696 #, fuzzy
9797 msgid "There is no automatic upgrade path to squid 2.5."
9898 msgstr "Non esiste un metodo automatico di aggiornamento a squid 2.5"
9999
100100 #. Type: boolean
101101 #. Description
102 -#: ../templates:25
 102+#: ../templates:3001
103103 msgid " SQUID 2.5 INSTALLATION WARNING"
104104 msgstr " ATTENZIONE: INSTALLAZIONE DI SQUID 2.5"
105105
106106 #. Type: boolean
107107 #. Description
108 -#: ../templates:25
 108+#: ../templates:3001
109109 msgid ""
110110 "You are upgrading squid from an 1.x version to the 2.5 version. The 1.x and "
111111 "2.5 versions are NOT compatible. The structure of the cache directory is "
——@@ -118,7 +118,7 @@
119119
120120 #. Type: boolean
121121 #. Description
122 -#: ../templates:25
 122+#: ../templates:3001
123123 msgid ""
124124 "If you have an old cache directory, please quit NOW and remove the old cache "
125125 "by hand (in /var/spool/squid). Then re-install this squid version."
——@@ -129,7 +129,7 @@
130130
131131 #. Type: boolean
132132 #. Description
133 -#: ../templates:25
 133+#: ../templates:3001
134134 msgid ""
135135 "Also, please accept the new configuration file. After upgrading your old "
136136 "configuration file can be found in \"/etc/squid.conf.dpkg-old\". Then you "
——@@ -144,19 +144,19 @@
145145
146146 #. Type: boolean
147147 #. Description
148 -#: ../templates:25
 148+#: ../templates:3001
149149 msgid "Do you want to quit now?"
150150 msgstr "Vuoi uscire ora?"
151151
152152 #. Type: note
153153 #. Description
154 -#: ../templates:45
 154+#: ../templates:4001
155155 msgid "squid-cgi now uses config file for target ACL"
156156 msgstr "Ora squid-cgi usa un file di configurazione per le ACL"
157157
158158 #. Type: note
159159 #. Description
160 -#: ../templates:45
 160+#: ../templates:4001
161161 msgid ""
162162 "squid-cgi now checks a configuration file before connecting to the target "
163163 "host. Only allowed target will be contacted. Please add hosts you want to "
——@@ -169,19 +169,19 @@
170170
171171 #. Type: note
172172 #. Description
173 -#: ../templates:45
 173+#: ../templates:4001
174174 msgid " hostname:port"
175175 msgstr " nomehost:porta"
176176
177177 #. Type: boolean
178178 #. Description
179 -#: ../templates:55
 179+#: ../templates:5001
180180 msgid "Upgrade squid.conf automatically?"
181181 msgstr "Aggiornare squid.conf automaticamente?"
182182
183183 #. Type: boolean
184184 #. Description
185 -#: ../templates:55
 185+#: ../templates:5001
186186 msgid ""
187187 "Incompatible settings have been found in the existing squid.conf file; they "
188188 "will prevent squid from starting or working correctly. However, this setup "
——@@ -194,14 +194,14 @@
195195
196196 #. Type: note
197197 #. Description
198 -#: ../templates:63
 198+#: ../templates:6001
199199 #, fuzzy
200200 msgid "The authenticate_program directive has been replaced with auth_param."
201201 msgstr "L'opzione authenticate_program � stata sostituita da auth_param"
202202
203203 #. Type: note
204204 #. Description
205 -#: ../templates:63
 205+#: ../templates:6001
206206 msgid ""
207207 "The authenticate_program directive that was present in squid <= 2.4 doesn't "
208208 "exist anymore in squid 2.5 and up. All authentication directives have been "
——@@ -220,7 +220,7 @@
221221
222222 #. Type: note
223223 #. Description
224 -#: ../templates:73
 224+#: ../templates:7001
225225 #, fuzzy
226226 msgid "Warning: squid may crash when logfiles size is bigger than 2GB."
227227 msgstr ""
——@@ -229,7 +229,7 @@
230230
231231 #. Type: note
232232 #. Description
233 -#: ../templates:73
 233+#: ../templates:7001
234234 msgid ""
235235 "Squid may crash if any of the logfiles grows bigger than 2GB. Please "
236236 "configure /etc/logrotate.d/squid accordingly to your site's traffic."
——@@ -240,13 +240,13 @@
241241
242242 #. Type: boolean
243243 #. Description
244 -#: ../templates:80
 244+#: ../templates:8001
245245 msgid "Fix permissions of cache_dir?"
246246 msgstr "Correggo i permessi della cache_dir?"
247247
248248 #. Type: boolean
249249 #. Description
250 -#: ../templates:80
 250+#: ../templates:8001
251251 msgid ""
252252 "Values for cache_effective_user and/or cache_effective_group in config file "
253253 "are incompatible with owner/group of cache directories. Do you want to "
——@@ -259,7 +259,7 @@
260260
261261 #. Type: boolean
262262 #. Description
263 -#: ../templates:80
 263+#: ../templates:8001
264264 msgid ""
265265 "WARNING: If you specified a cache directory different from /var/spool/squid "
266266 "and selected some other directory used by other programs (e.g. /tmp), this "
Index: trunk/debs/squid/debian/po/vi.po
——@@ -5,8 +5,8 @@
66 msgid ""
77 msgstr ""
88 "Project-Id-Version: squid 2.5.10-1\n"
9 -"Report-Msgid-Bugs-To: luigi@debian.org\n"
10 -"POT-Creation-Date: 2006-09-21 16:13+0000\n"
 9+"Report-Msgid-Bugs-To: mark@wikimedia.org\n"
 10+"POT-Creation-Date: 2006-12-06 20:56+0000\n"
1111 "PO-Revision-Date: 2005-07-17 16:13+0930\n"
1212 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
1313 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
——@@ -18,7 +18,7 @@
1919
2020 #. Type: note
2121 #. Description
22 -#: ../templates:3
 22+#: ../templates:1001
2323 msgid ""
2424 "The http_anonymizer directive has been replaced with header_replace and "
2525 "header_access."
——@@ -28,7 +28,7 @@
2929
3030 #. Type: note
3131 #. Description
32 -#: ../templates:3
 32+#: ../templates:1001
3333 msgid ""
3434 "The http_anonymizer directive that was present in squid 2.1 and 2.2 doesn't "
3535 "exist anymore in squid 2.3 and up. It has been replaced with header_replace "
——@@ -49,7 +49,7 @@
5050
5151 #. Type: note
5252 #. Description
53 -#: ../templates:14
 53+#: ../templates:2001
5454 msgid ""
5555 "The anonymize_headers and fake_user_agent directives have been replaced with "
5656 "header_access and header_replace."
——@@ -59,7 +59,7 @@
6060
6161 #. Type: note
6262 #. Description
63 -#: ../templates:14
 63+#: ../templates:2001
6464 msgid ""
6565 "The anonymize_headers and fake_user_agent directives that were present in "
6666 "squid 2.3 and 2.4 don't exist anymore in squid 2.5 and up. They have been "
——@@ -81,19 +81,19 @@
8282
8383 #. Type: boolean
8484 #. Description
85 -#: ../templates:25
 85+#: ../templates:3001
8686 msgid "There is no automatic upgrade path to squid 2.5."
8787 msgstr "Không có đường dẫn tự động nâng cấp nào đến squid phiên bản 2.5."
8888
8989 #. Type: boolean
9090 #. Description
91 -#: ../templates:25
 91+#: ../templates:3001
9292 msgid " SQUID 2.5 INSTALLATION WARNING"
9393 msgstr " CẢNH BÁO CÀI ĐẶT SQUID 2.5"
9494
9595 #. Type: boolean
9696 #. Description
97 -#: ../templates:25
 97+#: ../templates:3001
9898 msgid ""
9999 "You are upgrading squid from an 1.x version to the 2.5 version. The 1.x and "
100100 "2.5 versions are NOT compatible. The structure of the cache directory is "
——@@ -106,7 +106,7 @@
107107
108108 #. Type: boolean
109109 #. Description
110 -#: ../templates:25
 110+#: ../templates:3001
111111 msgid ""
112112 "If you have an old cache directory, please quit NOW and remove the old cache "
113113 "by hand (in /var/spool/squid). Then re-install this squid version."
——@@ -116,7 +116,7 @@
117117
118118 #. Type: boolean
119119 #. Description
120 -#: ../templates:25
 120+#: ../templates:3001
121121 msgid ""
122122 "Also, please accept the new configuration file. After upgrading your old "
123123 "configuration file can be found in \"/etc/squid.conf.dpkg-old\". Then you "
——@@ -129,19 +129,19 @@
130130
131131 #. Type: boolean
132132 #. Description
133 -#: ../templates:25
 133+#: ../templates:3001
134134 msgid "Do you want to quit now?"
135135 msgstr "Bạn có muốn thoát ngây bây giờ không?"
136136
137137 #. Type: note
138138 #. Description
139 -#: ../templates:45
 139+#: ../templates:4001
140140 msgid "squid-cgi now uses config file for target ACL"
141141 msgstr "squid-cgi lúc bây giờ dùng tập tin cấu hình cho ACL đích"
142142
143143 #. Type: note
144144 #. Description
145 -#: ../templates:45
 145+#: ../templates:4001
146146 msgid ""
147147 "squid-cgi now checks a configuration file before connecting to the target "
148148 "host. Only allowed target will be contacted. Please add hosts you want to "
——@@ -154,19 +154,19 @@
155155
156156 #. Type: note
157157 #. Description
158 -#: ../templates:45
 158+#: ../templates:4001
159159 msgid " hostname:port"
160160 msgstr " tên_máy:cổng"
161161
162162 #. Type: boolean
163163 #. Description
164 -#: ../templates:55
 164+#: ../templates:5001
165165 msgid "Upgrade squid.conf automatically?"
166166 msgstr "Tự động nâng cấp «squid.conf» không?"
167167
168168 #. Type: boolean
169169 #. Description
170 -#: ../templates:55
 170+#: ../templates:5001
171171 msgid ""
172172 "Incompatible settings have been found in the existing squid.conf file; they "
173173 "will prevent squid from starting or working correctly. However, this setup "
——@@ -178,13 +178,13 @@
179179
180180 #. Type: note
181181 #. Description
182 -#: ../templates:63
 182+#: ../templates:6001
183183 msgid "The authenticate_program directive has been replaced with auth_param."
184184 msgstr "Chỉ thị «authenticate_program» đã được thay thế bằng «auth_param»."
185185
186186 #. Type: note
187187 #. Description
188 -#: ../templates:63
 188+#: ../templates:6001
189189 msgid ""
190190 "The authenticate_program directive that was present in squid <= 2.4 doesn't "
191191 "exist anymore in squid 2.5 and up. All authentication directives have been "
——@@ -202,7 +202,7 @@
203203
204204 #. Type: note
205205 #. Description
206 -#: ../templates:73
 206+#: ../templates:7001
207207 msgid "Warning: squid may crash when logfiles size is bigger than 2GB."
208208 msgstr ""
209209 "Cảnh báo: trình squid có thể bẻ khóa khi tập tin bản ghi có kích thước hơn "
——@@ -210,7 +210,7 @@
211211
212212 #. Type: note
213213 #. Description
214 -#: ../templates:73
 214+#: ../templates:7001
215215 msgid ""
216216 "Squid may crash if any of the logfiles grows bigger than 2GB. Please "
217217 "configure /etc/logrotate.d/squid accordingly to your site's traffic."
——@@ -220,13 +220,13 @@
221221
222222 #. Type: boolean
223223 #. Description
224 -#: ../templates:80
 224+#: ../templates:8001
225225 msgid "Fix permissions of cache_dir?"
226226 msgstr "Sửa quyền hạn của «cache_dir» không?"
227227
228228 #. Type: boolean
229229 #. Description
230 -#: ../templates:80
 230+#: ../templates:8001
231231 msgid ""
232232 "Values for cache_effective_user and/or cache_effective_group in config file "
233233 "are incompatible with owner/group of cache directories. Do you want to "
——@@ -239,7 +239,7 @@
240240
241241 #. Type: boolean
242242 #. Description
243 -#: ../templates:80
 243+#: ../templates:8001
244244 msgid ""
245245 "WARNING: If you specified a cache directory different from /var/spool/squid "
246246 "and selected some other directory used by other programs (e.g. /tmp), this "
Index: trunk/debs/squid/debian/changelog
——@@ -1,3 +1,10 @@
 2+squid (2.6.5-1wm6) edgy; urgency=low
 3+
 4+ * Build against Google's tcmalloc to solve memory fragmentation issues
 5+ * Actually pass CFLAGS on to ./configure so they get used
 6+
 7+ -- Mark Bergsma <mark@wikimedia.org> Wed, 6 Dec 2006 20:50:09 +0000
 8+
29 squid (2.6.5-1wm5) edgy; urgency=low
310
411 * Insert a 'ulimit -c unlimited' in the startup script, so Squid dumps core
Index: trunk/debs/squid/debian/rules
——@@ -123,7 +123,7 @@
124124 # Configure the package.
125125 config.status:
126126
127 - $(opt_ac_cv_func_setresuid) \
 127+ $(opt_ac_cv_func_setresuid) CFLAGS="$(CFLAGS)" \
128128 ./configure \
129129 --prefix=/usr \
130130 --exec_prefix=/usr \
——@@ -150,6 +150,7 @@
151151 --with-large-files \
152152 --with-maxfd=16384 \
153153 --enable-stacktraces \
 154+ --enable-dlmalloc=-ltcmalloc \
154155 $(DEB_HOST_ARCH_CPU)-debian-$(DEB_HOST_ARCH_OS)
155156 ifeq ($(DEB_HOST_ARCH_OS), linux)
156157 endif