1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[509] correct and remove google license</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>509</dd>
<dt>Author</dt> <dd>ennael</dd>
<dt>Date</dt> <dd>2011-02-11 09:59:42 +0100 (Fri, 11 Feb 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>correct and remove google license</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#drakxtrunkperlinstallanypm">drakx/trunk/perl-install/any.pm</a></li>
<li><a href="#drakxtrunkperlinstallmessagespm">drakx/trunk/perl-install/messages.pm</a></li>
<li><a href="#drakxtrunkperlinstallsharepoafpo">drakx/trunk/perl-install/share/po/af.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepoampo">drakx/trunk/perl-install/share/po/am.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepoarpo">drakx/trunk/perl-install/share/po/ar.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepoazpo">drakx/trunk/perl-install/share/po/az.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepobepo">drakx/trunk/perl-install/share/po/be.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepobgpo">drakx/trunk/perl-install/share/po/bg.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepobnpo">drakx/trunk/perl-install/share/po/bn.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepobrpo">drakx/trunk/perl-install/share/po/br.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepobspo">drakx/trunk/perl-install/share/po/bs.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepocapo">drakx/trunk/perl-install/share/po/ca.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepocspo">drakx/trunk/perl-install/share/po/cs.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepocypo">drakx/trunk/perl-install/share/po/cy.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepodapo">drakx/trunk/perl-install/share/po/da.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepodepo">drakx/trunk/perl-install/share/po/de.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepoelpo">drakx/trunk/perl-install/share/po/el.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepoeopo">drakx/trunk/perl-install/share/po/eo.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepoespo">drakx/trunk/perl-install/share/po/es.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepoetpo">drakx/trunk/perl-install/share/po/et.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepoeupo">drakx/trunk/perl-install/share/po/eu.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepofapo">drakx/trunk/perl-install/share/po/fa.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepofipo">drakx/trunk/perl-install/share/po/fi.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepofrpo">drakx/trunk/perl-install/share/po/fr.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepofurpo">drakx/trunk/perl-install/share/po/fur.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepogapo">drakx/trunk/perl-install/share/po/ga.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepoglpo">drakx/trunk/perl-install/share/po/gl.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepohepo">drakx/trunk/perl-install/share/po/he.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepohipo">drakx/trunk/perl-install/share/po/hi.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepohrpo">drakx/trunk/perl-install/share/po/hr.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepohupo">drakx/trunk/perl-install/share/po/hu.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepoidpo">drakx/trunk/perl-install/share/po/id.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepoispo">drakx/trunk/perl-install/share/po/is.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepoitpo">drakx/trunk/perl-install/share/po/it.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepojapo">drakx/trunk/perl-install/share/po/ja.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepokopo">drakx/trunk/perl-install/share/po/ko.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepokypo">drakx/trunk/perl-install/share/po/ky.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepoltpo">drakx/trunk/perl-install/share/po/lt.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepoltgpo">drakx/trunk/perl-install/share/po/ltg.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepolvpo">drakx/trunk/perl-install/share/po/lv.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepomkpo">drakx/trunk/perl-install/share/po/mk.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepomnpo">drakx/trunk/perl-install/share/po/mn.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepomspo">drakx/trunk/perl-install/share/po/ms.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepomtpo">drakx/trunk/perl-install/share/po/mt.po</a></li>
<li><a href="#drakxtrunkperlinstallshareponbpo">drakx/trunk/perl-install/share/po/nb.po</a></li>
<li><a href="#drakxtrunkperlinstallshareponlpo">drakx/trunk/perl-install/share/po/nl.po</a></li>
<li><a href="#drakxtrunkperlinstallshareponnpo">drakx/trunk/perl-install/share/po/nn.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepopa_INpo">drakx/trunk/perl-install/share/po/pa_IN.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepoplpo">drakx/trunk/perl-install/share/po/pl.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepoptpo">drakx/trunk/perl-install/share/po/pt.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepopt_BRpo">drakx/trunk/perl-install/share/po/pt_BR.po</a></li>
<li><a href="#drakxtrunkperlinstallshareporopo">drakx/trunk/perl-install/share/po/ro.po</a></li>
<li><a href="#drakxtrunkperlinstallshareporupo">drakx/trunk/perl-install/share/po/ru.po</a></li>
<li><a href="#drakxtrunkperlinstallshareposcpo">drakx/trunk/perl-install/share/po/sc.po</a></li>
<li><a href="#drakxtrunkperlinstallshareposkpo">drakx/trunk/perl-install/share/po/sk.po</a></li>
<li><a href="#drakxtrunkperlinstallshareposlpo">drakx/trunk/perl-install/share/po/sl.po</a></li>
<li><a href="#drakxtrunkperlinstallshareposqpo">drakx/trunk/perl-install/share/po/sq.po</a></li>
<li><a href="#drakxtrunkperlinstallshareposrpo">drakx/trunk/perl-install/share/po/sr.po</a></li>
<li><a href="#drakxtrunkperlinstallshareposrLatnpo">drakx/trunk/perl-install/share/po/sr@Latn.po</a></li>
<li><a href="#drakxtrunkperlinstallshareposvpo">drakx/trunk/perl-install/share/po/sv.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepotapo">drakx/trunk/perl-install/share/po/ta.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepotgpo">drakx/trunk/perl-install/share/po/tg.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepothpo">drakx/trunk/perl-install/share/po/th.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepotlpo">drakx/trunk/perl-install/share/po/tl.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepotrpo">drakx/trunk/perl-install/share/po/tr.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepoukpo">drakx/trunk/perl-install/share/po/uk.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepouzpo">drakx/trunk/perl-install/share/po/uz.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepouzcyrillicpo">drakx/trunk/perl-install/share/po/uz@cyrillic.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepovipo">drakx/trunk/perl-install/share/po/vi.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepowapo">drakx/trunk/perl-install/share/po/wa.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepozh_CNpo">drakx/trunk/perl-install/share/po/zh_CN.po</a></li>
<li><a href="#drakxtrunkperlinstallsharepozh_TWpo">drakx/trunk/perl-install/share/po/zh_TW.po</a></li>
</ul>
</div>
<div id="patch"><pre>
<a id="drakxtrunkperlinstallanypm">Modified: drakx/trunk/perl-install/any.pm</a>
===================================================================
--- drakx/trunk/perl-install/any.pm 2011-02-10 22:40:02 UTC (rev 508)
+++ drakx/trunk/perl-install/any.pm 2011-02-11 08:59:42 UTC (rev 509)
@@ -1,4 +1,4 @@
-package any; # $Id: any.pm 270668 2010-08-19 16:10:50Z nanardon $
+package any; # $Id$
use diagnostics;
use strict;
@@ -638,7 +638,7 @@
format => sub {
my ($e) = @_;
ref($e) ?
- ($b->{default} eq $e->{label} ? " \xA0* " : " \xA0 ") . "$e->{label} ($e->{kernel_or_dev})" :
+ ($b->{default} eq $e->{label} ? " * " : " ") . "$e->{label} ($e->{kernel_or_dev})" :
translate($e);
}, list => $b->{entries},
} ], Add => $Add, Modify => $Modify, Remove => $Remove, Up => $Up, Down => $Down)) {
@@ -1054,22 +1054,17 @@
}
sub acceptLicense {
- my ($in, $google) = @_;
+ my ($in) = @_;
require messages;
my $release_notes = get_release_notes($in);
my $r = $::testing ? 'Accept' : 'Refuse';
- my $license = join("\n\n\n",
- messages::main_license($google, $google),
- messages::warning_about_patents(),
- if_($google, messages::google_provisions()));
-
$in->ask_from_({ title => N("License agreement"),
focus_first => 1,
cancel => N("Quit"),
- messages => formatAlaTeX($license),
+ messages => formatAlaTeX(messages::main_license() . "\n\n\n" . messages::warning_about_patents()),
interactive_help_id => 'acceptLicense',
callbacks => { ok_disabled => sub { $r eq 'Refuse' } },
},
@@ -1130,7 +1125,7 @@
my $non_utf8 = 0;
add2hash($common, { cancel => '',
focus_first => 1,
- advanced_messages => formatAlaTeX(N("Mageia Linux can support multiple languages. Select
+ advanced_messages => formatAlaTeX(N("Mandriva Linux can support multiple languages. Select
the languages you would like to install. They will be available
when your installation is complete and you restart your system.")),
advanced_label => N("Multi languages"),
<a id="drakxtrunkperlinstallmessagespm">Modified: drakx/trunk/perl-install/messages.pm</a>
===================================================================
--- drakx/trunk/perl-install/messages.pm 2011-02-10 22:40:02 UTC (rev 508)
+++ drakx/trunk/perl-install/messages.pm 2011-02-11 08:59:42 UTC (rev 509)
@@ -7,9 +7,6 @@
sub main_license {
- #TODO: Change the API to not use $google, which is unused now
- my ($us, $google) = @_;
-
#-PO: keep the double empty lines between sections, this is formatted a la LaTeX
N("Introduction
@@ -89,23 +86,7 @@
The terms and conditions of this License are governed by the Laws of France.
All disputes on the terms of this license will preferably be settled out of court. As a last
resort, the dispute will be referred to the appropriate Courts of Law of Paris - France.
-For any question on this document, please contact Mageia",
-$us ? "\n\n" . N("You agree not to (i) sell, export, re-export, transfer, divert, disclose technical data, or
-dispose of, any Software to any person, entity, or destination prohibited by US export laws
-or regulations including, without limitation, Cuba, Iran, North Korea, Sudan and Syria; or
-(ii) use any Software for any use prohibited by the laws or regulations of the United States.
-
-U.S. GOVERNMENT RESTRICTED RIGHTS.
-
-The Software Products and any accompanying documentation are and shall be deemed to be
-\"commercial computer software\" and \"commercial computer software documentation,\" respectively,
-as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, modification, reproduction,
-release, performance, display or disclosure of the Software and any accompanying documentation
-by the United States Government shall be governed solely by the terms of this Agreement and any
-other applicable licence agreements and shall be prohibited except to the extent expressly permitted
-by the terms of this Agreement.") . "\n" : '',
-N("Most of these components are governed under the terms and conditions of the GNU
-General Public Licence, hereafter called \"GPL\", or of similar licenses."));
+For any question on this document, please contact Mageia.
}
sub warning_about_patents() {
<a id="drakxtrunkperlinstallsharepoafpo">Modified: drakx/trunk/perl-install/share/po/af.po</a>
===================================================================
--- drakx/trunk/perl-install/share/po/af.po 2011-02-10 22:40:02 UTC (rev 508)
+++ drakx/trunk/perl-install/share/po/af.po 2011-02-11 08:59:42 UTC (rev 509)
@@ -4815,8 +4815,8 @@
"The Software Products and attached documentation are provided \"as is\", "
"with no warranty, to the \n"
"extent permitted by law.\n"
-"Neither Mageia nor its licensors or suppliers will, in any "
-"circumstances and to the extent \n"
+"Neither Mageia nor its licensors or suppliers will, in any circumstances and "
+"to the extent \n"
"permitted by law, be liable for any special, incidental, direct or indirect "
"damages whatsoever \n"
"(including without limitation damages for loss of business, interruption of "
@@ -4831,8 +4831,8 @@
"LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
"COUNTRIES\n"
"\n"
-"To the extent permitted by law, neither Mageia nor its licensors, "
-"suppliers or\n"
+"To the extent permitted by law, neither Mageia nor its licensors, suppliers "
+"or\n"
"distributors will, in any circumstances, be liable for any special, "
"incidental, direct or indirect \n"
"damages whatsoever (including without limitation damages for loss of "
@@ -4877,8 +4877,8 @@
"respective authors and are \n"
"protected by intellectual property and copyright laws applicable to software "
"programs.\n"
-"Mageia and its suppliers and licensors reserves their rights to "
-"modify or adapt the Software \n"
+"Mageia and its suppliers and licensors reserves their rights to modify or "
+"adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
"\"Mageia\", \"Mageia Linux\" and associated logos are trademarks of "
"Mageia \n"
@@ -6735,8 +6735,7 @@
" --help - vertoon hierdie hulp boodskap.\n"
" --report - program behoort een van die Mageia nutsprogramme te "
"wees\n"
-" --incedent - program behoort een van die Mageia nutsprogramme te "
-"wees"
+" --incedent - program behoort een van die Mageia nutsprogramme te wees"
#: standalone.pm:66
#, c-format
<a id="drakxtrunkperlinstallsharepoampo">Modified: drakx/trunk/perl-install/share/po/am.po</a>
===================================================================
--- drakx/trunk/perl-install/share/po/am.po 2011-02-10 22:40:02 UTC (rev 508)
+++ drakx/trunk/perl-install/share/po/am.po 2011-02-11 08:59:42 UTC (rev 509)
@@ -4613,8 +4613,8 @@
"The Software Products and attached documentation are provided \"as is\", "
"with no warranty, to the \n"
"extent permitted by law.\n"
-"Neither Mageia nor its licensors or suppliers will, in any "
-"circumstances and to the extent \n"
+"Neither Mageia nor its licensors or suppliers will, in any circumstances and "
+"to the extent \n"
"permitted by law, be liable for any special, incidental, direct or indirect "
"damages whatsoever \n"
"(including without limitation damages for loss of business, interruption of "
@@ -4629,8 +4629,8 @@
"LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
"COUNTRIES\n"
"\n"
-"To the extent permitted by law, neither Mageia nor its licensors, "
-"suppliers or\n"
+"To the extent permitted by law, neither Mageia nor its licensors, suppliers "
+"or\n"
"distributors will, in any circumstances, be liable for any special, "
"incidental, direct or indirect \n"
"damages whatsoever (including without limitation damages for loss of "
@@ -4675,8 +4675,8 @@
"respective authors and are \n"
"protected by intellectual property and copyright laws applicable to software "
"programs.\n"
-"Mageia and its suppliers and licensors reserves their rights to "
-"modify or adapt the Software \n"
+"Mageia and its suppliers and licensors reserves their rights to modify or "
+"adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
"\"Mageia\", \"Mageia Linux\" and associated logos are trademarks of "
"Mageia \n"
<a id="drakxtrunkperlinstallsharepoarpo">Modified: drakx/trunk/perl-install/share/po/ar.po</a>
===================================================================
--- drakx/trunk/perl-install/share/po/ar.po 2011-02-10 22:40:02 UTC (rev 508)
+++ drakx/trunk/perl-install/share/po/ar.po 2011-02-11 08:59:42 UTC (rev 509)
@@ -4810,8 +4810,8 @@
"The Software Products and attached documentation are provided \"as is\", "
"with no warranty, to the \n"
"extent permitted by law.\n"
-"Neither Mageia nor its licensors or suppliers will, in any "
-"circumstances and to the extent \n"
+"Neither Mageia nor its licensors or suppliers will, in any circumstances and "
+"to the extent \n"
"permitted by law, be liable for any special, incidental, direct or indirect "
"damages whatsoever \n"
"(including without limitation damages for loss of business, interruption of "
@@ -4826,8 +4826,8 @@
"LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
"COUNTRIES\n"
"\n"
-"To the extent permitted by law, neither Mageia nor its licensors, "
-"suppliers or\n"
+"To the extent permitted by law, neither Mageia nor its licensors, suppliers "
+"or\n"
"distributors will, in any circumstances, be liable for any special, "
"incidental, direct or indirect \n"
"damages whatsoever (including without limitation damages for loss of "
@@ -4872,8 +4872,8 @@
"respective authors and are \n"
"protected by intellectual property and copyright laws applicable to software "
"programs.\n"
-"Mageia and its suppliers and licensors reserves their rights to "
-"modify or adapt the Software \n"
+"Mageia and its suppliers and licensors reserves their rights to modify or "
+"adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
"\"Mageia\", \"Mageia Linux\" and associated logos are trademarks of "
"Mageia \n"
@@ -4970,8 +4970,8 @@
"قوانين الملكيّة الفكريّة وحقوق النّشر المنطبقة على البرمجيّات.\n"
"تحتفظ ماندريبا ش.م. بحقّها في تعديل أو تكييف المنتجات البرمجيّة، بحذافيرها \n"
"أو أجزاء معيّنة منها، بشتّى الطّرق ولسائر الأغراض.\n"
-"\"Mageia\" و \"Mageia Linux\" والشّعارات المتعلّقة هي علاماتٌ تجاريّة "
-"لماندريبا ش.م. \n"
+"\"Mageia\" و \"Mageia Linux\" والشّعارات المتعلّقة هي علاماتٌ تجاريّة لماندريبا "
+"ش.م. \n"
"\n"
"\n"
"5. القوانين الحاكمة \n"
<a id="drakxtrunkperlinstallsharepoazpo">Modified: drakx/trunk/perl-install/share/po/az.po</a>
===================================================================
--- drakx/trunk/perl-install/share/po/az.po 2011-02-10 22:40:02 UTC (rev 508)
+++ drakx/trunk/perl-install/share/po/az.po 2011-02-11 08:59:42 UTC (rev 509)
@@ -4822,8 +4822,8 @@
"The Software Products and attached documentation are provided \"as is\", "
"with no warranty, to the \n"
"extent permitted by law.\n"
-"Neither Mageia nor its licensors or suppliers will, in any "
-"circumstances and to the extent \n"
+"Neither Mageia nor its licensors or suppliers will, in any circumstances and "
+"to the extent \n"
"permitted by law, be liable for any special, incidental, direct or indirect "
"damages whatsoever \n"
"(including without limitation damages for loss of business, interruption of "
@@ -4838,8 +4838,8 @@
"LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
"COUNTRIES\n"
"\n"
-"To the extent permitted by law, neither Mageia nor its licensors, "
-"suppliers or\n"
+"To the extent permitted by law, neither Mageia nor its licensors, suppliers "
+"or\n"
"distributors will, in any circumstances, be liable for any special, "
"incidental, direct or indirect \n"
"damages whatsoever (including without limitation damages for loss of "
@@ -4884,8 +4884,8 @@
"respective authors and are \n"
"protected by intellectual property and copyright laws applicable to software "
"programs.\n"
-"Mageia and its suppliers and licensors reserves their rights to "
-"modify or adapt the Software \n"
+"Mageia and its suppliers and licensors reserves their rights to modify or "
+"adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
"\"Mageia\", \"Mageia Linux\" and associated logos are trademarks of "
"Mageia \n"
@@ -4943,23 +4943,23 @@
"The Software Products and attached documentation are provided \"as is\", "
"with no warranty, to the \n"
"extent permitted by law.\n"
-"Mageia will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
+"Mageia will, in no circumstances and to the extent permitted by law, be "
+"liable for any special,\n"
"incidental, direct or indirect damages whatsoever (including without "
"limitation damages for loss of \n"
"business, interruption of business, financial loss, legal fees and penalties "
"resulting from a court \n"
"judgment, or any other consequential loss) arising out of the use or "
"inability to use the Software \n"
-"Products, even if Mageia has been advised of the possibility or "
-"occurence of such \n"
+"Products, even if Mageia has been advised of the possibility or occurence of "
+"such \n"
"damages.\n"
"\n"
"LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
"COUNTRIES\n"
"\n"
-"To the extent permitted by law, Mageia or its distributors will, in "
-"no circumstances, be \n"
+"To the extent permitted by law, Mageia or its distributors will, in no "
+"circumstances, be \n"
"liable for any special, incidental, direct or indirect damages whatsoever "
"(including without \n"
"limitation damages for loss of business, interruption of business, financial "
@@ -5002,8 +5002,8 @@
"respective authors and are \n"
"protected by intellectual property and copyright laws applicable to software "
"programs.\n"
-"Mageia reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
+"Mageia reserves its rights to modify or adapt the Software Products, as a "
+"whole or in \n"
"parts, by all means and for all purposes.\n"
"\"Mageia\", \"Mageia Linux\" and associated logos are trademarks of "
"Mageia \n"
<a id="drakxtrunkperlinstallsharepobepo">Modified: drakx/trunk/perl-install/share/po/be.po</a>
===================================================================
--- drakx/trunk/perl-install/share/po/be.po 2011-02-10 22:40:02 UTC (rev 508)
+++ drakx/trunk/perl-install/share/po/be.po 2011-02-11 08:59:42 UTC (rev 509)
@@ -4635,8 +4635,8 @@
"The Software Products and attached documentation are provided \"as is\", "
"with no warranty, to the \n"
"extent permitted by law.\n"
-"Neither Mageia nor its licensors or suppliers will, in any "
-"circumstances and to the extent \n"
+"Neither Mageia nor its licensors or suppliers will, in any circumstances and "
+"to the extent \n"
"permitted by law, be liable for any special, incidental, direct or indirect "
"damages whatsoever \n"
"(including without limitation damages for loss of business, interruption of "
@@ -4651,8 +4651,8 @@
"LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
"COUNTRIES\n"
"\n"
-"To the extent permitted by law, neither Mageia nor its licensors, "
-"suppliers or\n"
+"To the extent permitted by law, neither Mageia nor its licensors, suppliers "
+"or\n"
"distributors will, in any circumstances, be liable for any special, "
"incidental, direct or indirect \n"
"damages whatsoever (including without limitation damages for loss of "
@@ -4697,8 +4697,8 @@
"respective authors and are \n"
"protected by intellectual property and copyright laws applicable to software "
"programs.\n"
-"Mageia and its suppliers and licensors reserves their rights to "
-"modify or adapt the Software \n"
+"Mageia and its suppliers and licensors reserves their rights to modify or "
+"adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
"\"Mageia\", \"Mageia Linux\" and associated logos are trademarks of "
"Mageia \n"
<a id="drakxtrunkperlinstallsharepobgpo">Modified: drakx/trunk/perl-install/share/po/bg.po</a>
===================================================================
--- drakx/trunk/perl-install/share/po/bg.po 2011-02-10 22:40:02 UTC (rev 508)
+++ drakx/trunk/perl-install/share/po/bg.po 2011-02-11 08:59:42 UTC (rev 509)
@@ -4806,8 +4806,8 @@
"The Software Products and attached documentation are provided \"as is\", "
"with no warranty, to the \n"
"extent permitted by law.\n"
-"Neither Mageia nor its licensors or suppliers will, in any "
-"circumstances and to the extent \n"
+"Neither Mageia nor its licensors or suppliers will, in any circumstances and "
+"to the extent \n"
"permitted by law, be liable for any special, incidental, direct or indirect "
"damages whatsoever \n"
"(including without limitation damages for loss of business, interruption of "
@@ -4822,8 +4822,8 @@
"LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
"COUNTRIES\n"
"\n"
-"To the extent permitted by law, neither Mageia nor its licensors, "
-"suppliers or\n"
+"To the extent permitted by law, neither Mageia nor its licensors, suppliers "
+"or\n"
"distributors will, in any circumstances, be liable for any special, "
"incidental, direct or indirect \n"
"damages whatsoever (including without limitation damages for loss of "
@@ -4868,8 +4868,8 @@
"respective authors and are \n"
"protected by intellectual property and copyright laws applicable to software "
"programs.\n"
-"Mageia and its suppliers and licensors reserves their rights to "
-"modify or adapt the Software \n"
+"Mageia and its suppliers and licensors reserves their rights to modify or "
+"adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
"\"Mageia\", \"Mageia Linux\" and associated logos are trademarks of "
"Mageia \n"
@@ -4926,22 +4926,22 @@
"Софтуерните Продукти и приложената документация се предоставят \"такива "
"каквито са\", без гаранция,\n"
"в рамките на разрешеното от закона.\n"
-"Mageia, при никакви обстоятелства и в рамките на закона, не е "
-"отговорна за каквито да e\n"
+"Mageia, при никакви обстоятелства и в рамките на закона, не е отговорна за "
+"каквито да e\n"
"умишлени, случайни, преки или косвени щети (включително загуба на данни за "
"работа, прекратяване на,\n"
"работа, финансови загуби, законни данъци и наказания в резултат на съдебно "
"решение или каквато и да е\n"
"друга произлизащи от това загуби) произтичащи от употребата или от "
"невъзможността да се употреби\n"
-"Софтуерния Продукт, даже ако Mageia да е известила за възможността "
-"или случването на такава загуба.\n"
+"Софтуерния Продукт, даже ако Mageia да е известила за възможността или "
+"случването на такава загуба.\n"
"\n"
"ОГРАНИЧЕНА ОТГОВОРНОСТ СВЪРЗАНА С ПРИТЕЖАВАНЕТО ИЛИ ИЗПОЛЗВАНЕТО НА ЗАБРАНЕН "
"СОФТУЕР В НЯКОИ СТРАНИ\n"
"\n"
-"В рамките на закона, Mageia и нейните дистрибутори няма при никакви "
-"условия да бъдат\n"
+"В рамките на закона, Mageia и нейните дистрибутори няма при никакви условия "
+"да бъдат\n"
"отговорни за каквито и да било умишлени, случайни, преки или косвени щети "
"(включително загуба на данни\n"
"за работа, прекратяване на, работа, финансови загуби, законни данъци и "
@@ -4972,8 +4972,8 @@
"към Mageia.\n"
"Програмите разработени от Mageia се управляват от GPL Лиценза. "
"Документацията написана\n"
-"от Mageia се управлява от специален лиценз. Моля, погледнете "
-"документацията за\n"
+"от Mageia се управлява от специален лиценз. Моля, погледнете документацията "
+"за\n"
"повече информация.\n"
"\n"
"\n"
@@ -4983,8 +4983,8 @@
"съответните им автори и са\n"
"защитени от законите за интелектуалната собственост и за копиране прилагани "
"за софтуерните програми.\n"
-"Mageia запазва правото си да модифицира и пригодява Софтуерния "
-"Продукт, като цяло или на\n"
+"Mageia запазва правото си да модифицира и пригодява Софтуерния Продукт, като "
+"цяло или на\n"
@@ Diff output truncated at 20000 characters. @@
</pre></div>
</body>
</html>
|
