Hi, Le 10/04/2012 14:13, Holger Wansing a écrit : > David Prévot <taffit@debian.org> wrote: >> It seems my remark about intro/why_debian.wml was not understood. It's >> too late now, but let me rephrase it for next time. I was advising to >> commit in all directories the changes that can be trivially fixed (with >> the proper translation-check bump), and then, after that, commit to the >> english directory the changes that can't be trivially updated in >> translations, > I had understood your remark! > And I did it exactly like that! It seems I again failed to make myself clear, let me try it again, taking French as an example. What you did at 2012/04/10 13:34:48 is: http://alioth.debian.org/scm/viewvc.php/webwml/english/intro/why_debian.wml?root=webwml&r1=1.63&r2=1.64&view=patch http://alioth.debian.org/scm/viewvc.php/webwml/french/intro/why_debian.wml?root=webwml&r1=1.37&r2=1.38&view=patch What I would have expected are the attached two steps workflow. First: bumping translation-check in top of your change in translation, minus the problematic changes in English. Second: only the problematic changes in English, no change in translation (this is the actual diff translators have to care about). > Let me explain why: > in Bulgarian "Debian" is translated into "Дебиан". And “GNU/Linux” is translated as “ГНУ/Линукс”, so it shouldn't have been to hard to take care of it (and I noticed you did). Anyway, at worst, in doubt, just don't handle Bulgarian and let the translators take care of it (or ask for help). > IMHO this cases (and several others) will not be covered by > the smart_change.pl method, though. smart_change.pl is not meant to be used blindly without checking the diff, but you can run it as many time as you want and accepts as many regexp as you want. You can use regexp like s,Дебиан ГНУ/Линукс,Дебиан, in top of the others. Le 10/04/2012 14:15, Holger Wansing a écrit : > I didn't plan to leave so much time between, but hey - real life > some times strikes back! > And I thought that would not be a problem, since I have coordinated that > work, I thought. The fix I did to */CD/faq/index.wml was not meant to annoy you in any way, I'm really sorry you took it that way, but since you began to work on other pages in the mean time, I honestly assumed you where not going to deal with this page any more. I'm sorry I didn't mail you instead of fixing it myself. Le 10/04/2012 14:51, Holger Wansing a écrit : > This is one of my changings to english/CD/faq/index.wml: http://alioth.debian.org/scm/viewvc.php/webwml/english/CD/faq/index.wml?root=webwml&r1=1.110&r2=1.111&view=patch And the associated commit in French you did was: http://alioth.debian.org/scm/viewvc.php/webwml/french/CD/faq/index.wml?root=webwml&r1=1.106&r2=1.107&view=patch I.e only the first change, but the translation-check was bumped. Since the second change was trivial and only done for a one or two translations, I took care of it. > And your smart_change.pl commit has set the > translation-check header in the bulgarian file to "1.111". > So the translator has no need to look into this. Indeed, since you already took care of the two changes in the first place: http://alioth.debian.org/scm/viewvc.php/webwml/bulgarian/CD/faq/index.wml?root=webwml&r1=1.15&r2=1.16&view=patch > I don't know how this smart_change script works. https://lists.debian.org/debian-www/2010/06/msg00049.html Maybe the online documentation [0] and « ./smart_change.pl -h » could be improved in that regard. 0: http://www.debian.org/devel/website/working#etiquette Regards David
Index: english/intro/why_debian.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/intro/why_debian.wml,v
retrieving revision 1.63
diff -u -r1.63 why_debian.wml
--- english/intro/why_debian.wml 10 Apr 2012 12:31:39 -0000 1.63
+++ english/intro/why_debian.wml 10 Apr 2012 19:01:50 -0000
@@ -35,7 +35,7 @@
<dt><strong>Easy installation</strong></dt>
- <dd>If you have heard that GNU/Linux is difficult to install, then you
+ <dd>If you have heard that Debian is difficult to install, then you
haven't tried Debian lately. We are constantly improving the
installation process. You can do the installation directly from CD, DOS,
floppies or even over the network.</dd>
@@ -97,7 +97,7 @@
</dl>
-<p>If you are not already a GNU/Linux user, you may also enjoy the following
+<p>If you are not already a Debian user, you may also enjoy the following
benefits:
</p>
@@ -155,7 +155,7 @@
<dt><em><q>Lack of popular commercial software.</q></em></dt>
<dd><p>It is quite true that some popular software is not available for
- GNU/Linux. There are, however, replacement programs for most of those,
+ Debian. There are, however, replacement programs for most of those,
designed to mimic the best features of the proprietary programs, with
the added value of being <a href="free">free software</a>.</p>
@@ -194,7 +194,7 @@
</p>
</dd>
-<dt><em><q>GNU/Linux is hard to configure.</q></em></dt>
+<dt><em><q>Debian is hard to configure.</q></em></dt>
<dd>Note that this says configure, not install, as some people find the
initial installation of Debian easier than Windows. A lot of hardware
@@ -211,7 +211,7 @@
manufacturer only supplies for Windows platforms (software modems or some
laptop wifi devices for
example). However, in most cases, equivalent hardware is available that
- does work with GNU/Linux. Some hardware is not supported because the vendor
+ does work with Debian. Some hardware is not supported because the vendor
chooses not to make the hardware specifications available. This is also
an area that is being worked on.</dd>
Index: french/intro/why_debian.wml
===================================================================
RCS file: /cvs/webwml/webwml/french/intro/why_debian.wml,v
retrieving revision 1.37
diff -u -r1.37 why_debian.wml
--- french/intro/why_debian.wml 10 Apr 2012 12:31:41 -0000 1.37
+++ french/intro/why_debian.wml 10 Apr 2012 19:01:50 -0000
@@ -1,7 +1,7 @@
#use wml::debian::template title="Raisons pour choisir Debian"
#include "$(ENGLISHDIR)/releases/info"
-#use wml::debian::translation-check translation="1.63" maintainer="Guillaume Delacour"
+#use wml::debian::translation-check translation="1.64" maintainer="Guillaume Delacour"
# Traducteurs précédents :
# - Nicolas Bertolissio (2007)
@@ -48,7 +48,7 @@
</dd>
<dt><strong>Une installation facile</strong></dt>
<dd>
- Si vous avez entendu dire que GNU/Linux est difficile à installer, c'est
+ Si vous avez entendu dire que Debian est difficile à installer, c'est
que vous n'avez pas essayé Debian récemment. Nous améliorons constamment le
processus d'installation. Vous pouvez faire l'installation directement
depuis un CD, DOS, des disquettes ou même par le réseau.
@@ -113,7 +113,7 @@
</dl>
<p>
-Si vous n'êtes pas déjà un utilisateur de GNU/Linux, vous pourrez aussi
+Si vous n'êtes pas déjà un utilisateur de Debian, vous pourrez aussi
profiter des avantages suivants :
</p>
@@ -175,7 +175,7 @@
<dd>
<p>
Il est assez vrai que certains logiciels courants ne sont pas disponibles
- sous GNU/Linux. Il y a, cependant, des logiciels de remplacement pour la
+ sous Debian. Il y a, cependant, des logiciels de remplacement pour la
plupart d'entre eux. Ces logiciels de remplacement sont conçus pour imiter
les meilleures fonctionnalités des programmes propriétaires, avec
l'avantage d'être <a href="free">des logiciels libres</a>.
@@ -221,7 +221,7 @@
15 millions d'utilisateurs au début de l'année 2001.
</p>
</dd>
- <dt><em><q>GNU/Linux est difficile à configurer.</q></em></dt>
+ <dt><em><q>Debian est difficile à configurer.</q></em></dt>
<dd>
Notez que l'on dit configurer, pas installer, car il y a des gens qui
trouvent que l'installation de Debian est plus facile que celle de
@@ -238,7 +238,7 @@
pilotes complexes que les fabricants ne fournissent que pour les
plates-formes Windows (les modems implémentés par du logiciel ou les
équipements wifi pour les portables par exemple). Cependant, dans la
- plupart des cas, des matériels équivalents fonctionnant avec GNU/Linux
+ plupart des cas, des matériels équivalents fonctionnant avec Debian
sont disponibles. Certains matériels ne sont pas supportés car les
fabricants choisissent de ne pas rendre disponibles les spécifications.
C'est aussi un sujet sur lequel on travaille.
--- /tmp/why_debian.wml 2012-04-10 15:06:51.000000000 -0400
+++ english/intro/why_debian.wml 2012-04-10 15:06:49.899559314 -0400
@@ -44,7 +44,8 @@
<dd>Debian comes with over <a href="$(HOME)/distrib/packages"><packages_in_stable> different
pieces of software</a>. Every bit of it is <a href="free">free</a>. If
- you have proprietary software that runs under GNU/Linux, you can still use it
+ you have proprietary software that runs under GNU/Linux
+ or GNU/kFreeBSD, you can still use it
- in fact, there may even be an installer in Debian that will
automatically install and set up everything for you.</dd>
@@ -113,11 +114,11 @@
<dt><strong>Fast and easy on memory</strong></dt>
<dd>Other operating systems may be as fast in one or two areas, but
- being based on GNU/Linux, Debian is lean and mean. Windows software run
+ being based on GNU/Linux or GNU/kFreeBSD, Debian is lean and mean. Windows software run
from GNU/Linux using an emulator sometimes runs <strong>faster</strong> than when
run in the native environment.</dd>
-<dt><strong>Drivers for most hardware is written by GNU/Linux users, not the manufacturer.</strong></dt>
+<dt><strong>Drivers for most hardware is written by GNU/Linux / GNU/kFreeBSD users, not the manufacturer.</strong></dt>
<dd>While this can mean delays before new hardware is supported and no
support for some hardware, it enables support for hardware long after
@@ -186,9 +187,10 @@
# This figures need to be updated:
<p>Various other proprietary software is coming out in greater
- numbers, too, as more companies discover the power of GNU/Linux and
+ numbers, too, as more companies discover the power of GNU/Linux
+ / GNU/kFreeBSD and
its largely untapped market with a rapidly growing user base
- (Since GNU/Linux is freely distributable, sales figures can't be used for
+ (since GNU/Linux and GNU/kFreeBSD are freely distributable, sales figures can't be used for
user estimates. Best estimates are that GNU/Linux has 5% of the market,
giving 15 million users as of early 2001).
</p>
Attachment:
signature.asc
Description: OpenPGP digital signature