Date: Sat, 19 May 2012 17:34:16 GMT From: Rene Ladan <rene@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 211377 for review Message-ID: <201205191734.q4JHYGHc013911@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@211377?ac=10 Change 211377 by rene@rene_acer on 2012/05/19 17:33:29 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#142 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#24 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#142 integrate .. //depot/projects/docproj_nl/share/pgpkeys/vsevolod.key#3 integrate .. //depot/projects/docproj_nl/www/nl/share/sgml/libcommon.xsl#19 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#142 (text+ko) ==== @@ -1,4 +1,4 @@ -<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.1090 2012/05/11 22:27:36 eadler Exp $ --> +<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.1091 2012/05/15 20:18:26 pawel Exp $ --> <!-- NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical order by first name. @@ -5827,6 +5827,11 @@ </listitem> <listitem> + <para>Leo Vandewoestijne + <email>freebsd@dns-lab.com</email></para> + </listitem> + + <listitem> <para>Leonardo Silveira de A. Martins <email>lmartins@nepe.eee.ufg.br</email></para> </listitem> ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#24 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml,v 1.212 2012/02/16 05:06:57 eadler Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml,v 1.213 2012/05/16 16:25:55 gjb Exp $ --> <chapter id="x11"> @@ -1323,9 +1323,9 @@ <para>Several replacements for the default <application>XDM</application> program exist. One of them, - <application>kdm</application> (bundled with + <application>KDM</application> (bundled with <application>KDE</application>) is described later in this - chapter. The <application>kdm</application> display manager offers many visual + chapter. The <application>KDM</application> display manager offers many visual improvements and cosmetic frills, as well as the functionality to allow users to choose their window manager of choice at login time.</para> @@ -1460,7 +1460,7 @@ <para>Yet another option is to configure the display manager to allow choosing the window manager at login time; the section on <link linkend="x11-wm-kde-details">KDE details</link> - explains how to do this for <application>kdm</application>, the + explains how to do this for <application>KDM</application>, the display manager of <application>KDE</application>.</para> </sect3> </sect2> @@ -1504,7 +1504,7 @@ <listitem> <para>Internationalization: <application>KDE</application> - is available in more than 40 languages</para> + is available in more than 55 languages</para> </listitem> <listitem> @@ -1525,13 +1525,16 @@ can be found on the <ulink url="http://www.kde.org/">KDE website</ulink>. For FreeBSD specific information and resources on <application>KDE</application>, consult - the <ulink url="http://freebsd.kde.org/">KDE on FreeBSD - team</ulink>'s website.</para> + the <ulink url="http://freebsd.kde.org/">KDE/FreeBSD + initiative</ulink>'s website.</para> - <para>There are two versions of <application>KDE</application> available on FreeBSD. Version 3 - has been around for a long time, and is very mature. Version 4, - the next generation, is also available in the Ports Collection. - They can even be installed side by side.</para> + <para>There are two versions of <application>KDE</application> + available on FreeBSD. Version 3 has been around for a long + time, and is still available in the Ports Collection though + it's now unmaintained and partially broken. Version 4 is + punctually updated and is the default choice for + <application>KDE</application> users. They can even be + installed side by side.</para> </sect3> <sect3 id="x11-wm-kde-install"> @@ -1541,26 +1544,26 @@ other desktop environment, the software can be easily installed from a package or the Ports Collection:</para> - <para>To install the <application>KDE3</application> package - from the network, simply type:</para> + <para>To install the <application>KDE 3</application> package + from the network, type:</para> <screen>&prompt.root; <userinput>pkg_add -r kde</userinput></screen> - <para>To install the <application>KDE4</application> package - from the network, simply type:</para> + <para>To install the <application>KDE 4</application> package + from the network, type:</para> <screen>&prompt.root; <userinput>pkg_add -r kde4</userinput></screen> <para>&man.pkg.add.1; will automatically fetch the latest version of the application.</para> - <para>To build <application>KDE3</application> from source, + <para>To build <application>KDE 3</application> from source, use the ports tree:</para> <screen>&prompt.root; <userinput>cd /usr/ports/x11/kde3</userinput> &prompt.root; <userinput>make install clean</userinput></screen> - <para>To build <application>KDE4</application> from source, + <para>To build <application>KDE 4</application> from source, use the ports tree:</para> <screen>&prompt.root; <userinput>cd /usr/ports/x11/kde4</userinput> @@ -1571,12 +1574,12 @@ instead of the default window manager. This is accomplished by editing the <filename>.xinitrc</filename> file:</para> - <para>For <application>KDE3</application>:</para> - + <para>For <application>KDE 3</application>:</para> + <screen>&prompt.user; <userinput>echo "exec startkde" > ~/.xinitrc</userinput></screen> - <para>For <application>KDE4</application>:</para> - + <para>For <application>KDE 4</application>:</para> + <screen>&prompt.user; <userinput>echo "exec /usr/local/kde4/bin/startkde" > ~/.xinitrc</userinput></screen> <para>Now, whenever the X Window System is invoked with @@ -1587,7 +1590,7 @@ <application>XDM</application> is being used, the configuration is slightly different. Edit the <filename>.xsession</filename> file instead. Instructions - for <application>kdm</application> are described later in + for <application>KDM</application> are described later in this chapter.</para> </sect3> </sect2> @@ -1618,28 +1621,28 @@ <link linkend="x-xdm">XDM</link> can be used, as described earlier. However, <application>KDE</application> includes an - alternative, <application>kdm</application>, which is designed + alternative, <application>KDM</application>, which is designed to look more attractive and include more login-time options. In particular, users can easily choose (via a menu) which desktop environment (<application>KDE</application>, <application>GNOME</application>, or something else) to run after logging on.</para> - <para>To enable <application>kdm</application>, different files + <para>To enable <application>KDM</application>, different files need to be edited depending on the version of <application>KDE</application>.</para> - <para>For <application>KDE3</application>, the <literal>ttyv8</literal> + <para>For <application>KDE 3</application>, the <literal>ttyv8</literal> entry in <filename>/etc/ttys</filename> has to be adapted as follows:</para> <programlisting>ttyv8 "/usr/local/bin/kdm -nodaemon" xterm on secure</programlisting> - <para>For <application>KDE4</application>, you have to add the - following lines to <filename>/etc/rc.conf</filename>:</para> + <para>For <application>KDE 4</application>, you have to mount + &man.procfs.5; and add the following line to + <filename>/etc/rc.conf</filename>:</para> - <programlisting>local_startup="${local_startup} /usr/local/kde4/etc/rc.d" -kdm4_enable="YES"</programlisting> + <programlisting>kdm4_enable="YES"</programlisting> </sect3> </sect2> ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#142 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1186 2012/05/02 10:21:37 jasone Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1187 2012/05/16 16:25:56 gjb Exp $ --> <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [ @@ -1742,8 +1742,8 @@ <row> <entry><filename>kde*</filename></entry> <entry>Ports from the <ulink - url="http://www.kde.org">K Desktop Environment - (KDE)</ulink> Project.</entry> + url="http://www.kde.org">KDE</ulink>; + Project.</entry> <entry></entry> </row> @@ -6004,7 +6004,8 @@ <entry><makevar>QTNONSTANDARD</makevar></entry> <entry>Suppress modification of <makevar>CONFIGURE_ENV</makevar>, - <makevar>CONFIGURE_ARGS</makevar>, and + <makevar>CONFIGURE_ARGS</makevar>, + <makevar>CPPFLAGS</makevar> and <makevar>MAKE_ENV</makevar>.</entry> </row> </tbody> @@ -6019,30 +6020,26 @@ <tbody> <row> <entry><makevar>QT_COMPONENTS</makevar></entry> - <entry>Specify tool and library dependencies for Qt4. + <entry>Specify tool and library dependencies for Qt 4. See below for details.</entry> </row> <row> <entry><makevar>UIC</makevar></entry> <entry>Set to the path of <command>uic</command> - (read-only variable). Default set according to - <makevar>USE_QT_VER</makevar> value.</entry> + (read-only variable).</entry> </row> <row> <entry><makevar>QMAKE</makevar></entry> <entry>Set to the path of <command>qmake</command> - (read-only variable). Default set according to - <makevar>USE_QT_VER</makevar> value.</entry> + (read-only variable).</entry> </row> <row> <entry><makevar>QMAKESPEC</makevar></entry> <entry>Set to the path of configuration file for - <command>qmake</command> (read-only variable). - Default set according to - <makevar>USE_QT_VER</makevar> value.</entry> + <command>qmake</command> (read-only variable).</entry> </row> </tbody> </tgroup> @@ -6056,8 +6053,9 @@ --with-qt-libraries=${QT_PREFIX}/lib \ --with-extra-libs=${LOCALBASE}/lib \ --with-extra-includes=${LOCALBASE}/include -CONFIGURE_ENV+= MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" \ - QTDIR="${QT_PREFIX}" KDEDIR="${KDE_PREFIX}"</programlisting> +CONFIGURE_ENV+= MOC="${MOC}" LIBS="${QTCFGLIBS}" \ + QTDIR="${QT_PREFIX}" KDEDIR="${KDE_PREFIX}" +CPPFLAGS+= ${QTCPPFLAGS}</programlisting> <para>If <makevar>USE_QT_VER</makevar> is set to <literal>4</literal>, the following settings are also @@ -6070,8 +6068,8 @@ <sect2 id="qt4-components"> <title>Component Selection (Qt 4.x Only)</title> - <para>When <makevar>USE_QT_VER</makevar> is set to 4, - individual Qt4 tool and library dependencies can be + <para>When <makevar>USE_QT_VER</makevar> is set to <literal>4</literal>, + individual Qt 4 tool and library dependencies can be specified in the <makevar>QT_COMPONENTS</makevar> variable. Every component can be suffixed by either <literal>_build</literal> or <literal>_run</literal>, the @@ -6088,7 +6086,7 @@ <filename>/usr/ports/Mk/bsd.qt.mk</filename>):</para> <table frame="none"> - <title>Available Qt4 Library Components</title> + <title>Available Qt 4 Library Components</title> <tgroup cols="2"> <thead> @@ -6122,7 +6120,7 @@ <row> <entry><literal>qt3support</literal></entry> - <entry>Qt3 compatibility library</entry> + <entry>Qt 3 compatibility library</entry> </row> <row> @@ -6154,7 +6152,7 @@ executable after a successful compilation.</para> <table frame="none"> - <title>Available Qt4 Tool Components</title> + <title>Available Qt 4 Tool Components</title> <tgroup cols="2"> <thead> @@ -6178,7 +6176,7 @@ <row> <entry><literal>rcc</literal></entry> - <entry>resource compiler (need if the application + <entry>resource compiler (needed if the application comes with <filename>*.rc</filename> or <filename>*.qrc</filename> files)</entry> </row> @@ -6195,7 +6193,7 @@ </table> <table frame="none"> - <title>Available Qt4 Plugin Components</title> + <title>Available Qt 4 Plugin Components</title> <tgroup cols="2"> <thead> @@ -6223,15 +6221,17 @@ </table> <example id="qt4-components-example"> - <title>Selecting Qt4 Components</title> + <title>Selecting Qt 4 Components</title> - <para>In this example, the ported application uses the Qt4 - graphical user interface library, the Qt4 core library, - all of the Qt4 code generation tools and Qt4's Makefile - generator. Since the gui library implies a dependency on - the core library, corelib does not need to be specified. - The Qt4 code generation tools moc, uic and rcc, as well as - the Makefile generator qmake are only needed at buildtime, + <para>In this example, the ported application uses the Qt 4 + graphical user interface library, the Qt 4 core library, + all of the Qt 4 code generation tools and Qt 4's Makefile + generator. Since the <literal>gui</literal> library implies + a dependency on the core library, <literal>corelib</literal> + does not need to be specified. The Qt 4 code generation tools + <literal>moc</literal>, <literal>uic</literal> and + <literal>rcc</literal>, as well as the Makefile generator + <literal>qmake</literal> are only needed at buildtime, thus they are specified with the <literal>_build</literal> suffix:</para> @@ -6252,7 +6252,7 @@ do-configure: @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ - ${QMAKE} -unix PREFIX=${PREFIX} texmaker.pro</programlisting> + ${QMAKE} PREFIX=${PREFIX} texmaker.pro</programlisting> <para>Note the similarity to the <command>qmake</command> line from the provided <filename>BUILD.sh</filename> script. @@ -6271,14 +6271,14 @@ <itemizedlist> <listitem> <para><emphasis>Missing additional - includepaths.</emphasis> Many applications come with + include paths.</emphasis> Many applications come with system tray icon support, but neglect to look for includes and/or libraries in the X11 directories. You can tell <command>qmake</command> to add directories to - the include and library searchpaths via the command + the include and library search paths via the command line, for example:</para> - <programlisting>${QMAKE} -unix PREFIX=${PREFIX} INCLUDEPATH+=${LOCALBASE}/include \ + <programlisting>${QMAKE} PREFIX=${PREFIX} INCLUDEPATH+=${LOCALBASE}/include \ LIBS+=-L${LOCALBASE}/lib sillyapp.pro</programlisting> </listitem> @@ -6291,8 +6291,8 @@ example for this - look at <filename>patch-texmaker.pro</filename> in the <filename>files</filename> directory of that port for a - template on how to remedy this directly in the Qmake - project file.</para> + template on how to remedy this directly in the + <command>qmake</command> project file.</para> </listitem> </itemizedlist> </sect2> @@ -6336,13 +6336,19 @@ <para>If your application depends on KDE 4.x, set <makevar>USE_KDE4</makevar> to the list of required - components. The most commonly used components are listed - below (up-to-date components are listed in - <makevar>_USE_KDE4_ALL</makevar> in + components. <literal>_build</literal> and + <literal>_run</literal> suffixes can be used to force + components dependency type (e.g., + <literal>baseapps_run</literal>). If no suffix is set, a + default dependency type will be used. If you want to force + both types, add the component twice with both suffixes + (e.g., <literal>automoc4_build automoc4_run</literal>). The + most commonly used components are listed below (up-to-date + components are documented at the top of <filename>/usr/ports/Mk/bsd.kde4.mk</filename>):</para> <table frame="none"> - <title>Available KDE4 Components</title> + <title>Available KDE 4 Components</title> <tgroup cols="2"> <thead> @@ -6354,36 +6360,18 @@ <tbody> <row> - <entry><literal>akonadi</literal></entry> - <entry>Personal information management (PIM) storage - service</entry> - </row> - - <row> - <entry><literal>automoc4</literal></entry> - <entry>Makes port use automoc4 build tool</entry> - </row> - - <row> - <entry><literal>kdebase</literal></entry> - <entry>Basic KDE applications (Konqueror, Dolphin, - Konsole)</entry> + <entry><literal>baseapps</literal></entry> + <entry>Basic applications for KDE Desktop</entry> </row> <row> - <entry><literal>kdeexp</literal></entry> - <entry>Experimental KDE libraries (with non-stable - API)</entry> - </row> - - <row> <entry><literal>kdehier</literal></entry> - <entry>Provides common KDE directories</entry> + <entry>Hierarchy of common KDE directories</entry> </row> <row> <entry><literal>kdelibs</literal></entry> - <entry>The base set of KDE libraries</entry> + <entry>KDE Developer Platform</entry> </row> <row> @@ -6395,60 +6383,58 @@ <row> <entry><literal>pimlibs</literal></entry> - <entry>PIM libraries</entry> + <entry>KDE-Pim libraries</entry> </row> <row> <entry><literal>workspace</literal></entry> - <entry>Applications and libraries which form desktop - (Plasma, KWin)</entry> + <entry>KDE user environments</entry> + </row> + + <row> + <entry><literal>akonadi</literal></entry> + <entry>Storage server for KDE-Pim</entry> + </row> + + <row> + <entry><literal>automoc4</literal></entry> + <entry>Automatic moc for Qt 4 packages</entry> </row> </tbody> </tgroup> </table> <para>KDE 4.x ports are installed into - <literal>${KDE4_PREFIX}</literal>, which is + <makevar>KDE4_PREFIX</makevar>, which is <filename>/usr/local/kde4</filename> currently, to avoid conflicts with KDE 3.x ports. This is achieved by specifying the <literal>kdeprefix</literal> component, which overrides the default <makevar>PREFIX</makevar>. The ports however respect any <makevar>PREFIX</makevar> set via <envar>MAKEFLAGS</envar> environment variable and/or - <application>make</application> arguments.</para> - - <para>KDE 4.x ports may conflict with KDE 3.x ports, so when - the <literal>kdeprefix</literal> component is enabled, they - are installed in <literal>${KDE4_PREFIX}</literal>. - The default value of <literal>KDE4_PREFIX</literal> is - currently <filename>/usr/local/kde4</filename>. Installing - the KDE 4.x ports into a custom <literal>PREFIX</literal> is - also possible. When <literal>PREFIX</literal> is set via - the <envar>MAKEFLAGS</envar> environment variable or via - <application>make</application> options it overrides the - value configured by <literal>kdeprefix</literal>.</para> + <command>make</command> arguments.</para> <example id="kde4-components-example"> <title><makevar>USE_KDE4</makevar> Example</title> - <para>This is a simple example for KDE 4 port. - <makevar>USE_CMAKE</makevar> instructs port to utilize + <para>This is a simple example for a KDE 4 port. + <makevar>USE_CMAKE</makevar> instructs the port to utilize <application>CMake</application> — configuration tool widely spread among KDE 4 projects. <makevar>USE_KDE4</makevar> brings dependency on KDE libraries and makes port using - <application>automoc4</application> at build stage. + <command>automoc4</command> at build stage. Required KDE components and other dependencies can be determined through configure log. <makevar>USE_KDE4</makevar> does not imply <makevar>USE_QT_VER</makevar>. If a port requires some - Qt4 components, <makevar>USE_QT_VER</makevar> should be + Qt 4 components, <makevar>USE_QT_VER</makevar> should be set and then needed components can be specified.</para> <programlisting>USE_CMAKE= yes -USE_KDE4= automoc4 kdelibs kdeprefix +USE_KDE4= kdelibs kdeprefix automoc4 USE_QT_VER= 4 -QT_COMPONENTS= qmake_build moc_build rcc_build uic_build</programlisting> +QT_COMPONENTS= moc_build qmake_build rcc_build uic_build</programlisting> </example> </sect2> </sect1> ==== //depot/projects/docproj_nl/share/pgpkeys/vsevolod.key#3 (text+ko) ==== @@ -1,49 +1,60 @@ -<!-- $FreeBSD: doc/share/pgpkeys/vsevolod.key,v 1.1 2005/07/22 09:12:20 vsevolod Exp $ --> -<!-- -sh addkey.sh vsevolod 213D0033; ---> +<!-- $FreeBSD: doc/share/pgpkeys/vsevolod.key,v 1.4 2012/05/16 14:14:20 vsevolod Exp $ --> <programlisting role="pgpfingerprint"><![CDATA[ -pub 1024D/213D0033 2005-03-14 [expires: 2008-03-13] - Key fingerprint = B852 0010 761E 944A C76D D447 A25D C12C 213D 0033 +pub 4096R/90081437 2012-05-16 [expires: 2017-05-15] + Key fingerprint = DD9A 126C E675 1EA5 2A97 04A3 0764 7B67 9008 1437 uid Vsevolod Stakhov <vsevolod@FreeBSD.org> -uid Vsevolod Stakhov <cebka@jet.msk.su> -uid Vsevolod Stakhov <vsevolod@highsecure.ru> -sub 2048g/786F2187 2005-03-14 [expires: 2008-03-13] +sub 4096R/4A5A0B54 2012-05-16 [expires: 2017-05-15] ]]></programlisting> <programlisting role="pgpkey"><![CDATA[ -----BEGIN PGP PUBLIC KEY BLOCK----- -mQGiBEI1ezcRBADE9OSKYo4FwkV9/HZCsEuq3afu/4cEiRlaS/pod5b5/tv1DGAl -QQdQeNxW8nzDLrODbyCtmJDxvOib4Z2qz2NZOgjTujnlHeKecJJKkXg7bYIgMWy+ -JQNX613fcsgQicUQDyi0nMKcvd8BcKuzDUCGEuyMxEE5UyBPXOKDuPLZNwCgznDP -rjh6cffp737SBR1ViasIresD/RYo8N+aMdwIQwqWXYXuSj6sCDutU2MUsRe9RxaP -iDE+XvLuxRa5BTAitMWrDJqKdCjysADTXl6Owic6+Y9ppk35+VHDq7vsow3v4HrI -znJVb5ZOl7nyaBtsd7v/nRFjQEcko11PxbmAAY8UevbGSmUsOmyT2ZMgYkNgGrvl -jsGZA/9UtsG0IaR9+EGAuvOGey3Rh5AfNVontxJ+FXpCyHgKXWFrJIzbFPJ+iaYN -xd2uUnEcAeGkY6UsK3z6MAvAorJC383tcRyfZQ7nAYhR2tmPVjFCNU/wPLT6MiZQ -LgPbYh+SBWTpofpnAcVmVRk18tqtAXuH3kb+m+JG1EppxT4WMrQjVnNldm9sb2Qg -U3Rha2hvdiA8Y2Via2FAamV0Lm1zay5zdT6IZAQTEQIAJAUCQjV7lAIbAwUJBaOa -gAYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRCiXcEsIT0AMwPVAJ4z7YKxK+3XB8ic -Ml40/9QdnfzA8QCcDbtrLjTHVfMsLZls+CpS7SVOZLK0KVZzZXZvbG9kIFN0YWto -b3YgPHZzZXZvbG9kQGhpZ2hzZWN1cmUucnU+iGQEExECACQFAkI1ezcCGwMFCQWj -moAGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQol3BLCE9ADOu+wCgvhaDI/qqW88t -h1qkpZiSoj1QGhAAn0aH/9Ln20qZlzOzflE+RMNroro2tCdWc2V2b2xvZCBTdGFr -aG92IDx2c2V2b2xvZEBGcmVlQlNELm9yZz6IZAQTEQIAJAUCQt/YkgIbAwUJBaOa -gAYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRCiXcEsIT0AM18MAKCYLPaRezw9CggX -0WGxZ4V2AO/H4QCfe9H8leQkgkf81O3xijejFh4yo225Ag0EQjV7RBAIAPegYMuM -CjkzEiNYAWZNa+IgCrfWTZWuiCkvfvbYlnx2CLCMhtCi6kDIGm8k8ub0MrgI7JnR -z3dVaKUi/ky7lbTCkl5lqLdJCX7lAOmbXrtV8Z/w4ke/9aoA5mRcA5U6IDKemkr3 -2mfEEDY6ZOYltLaOh0oPcX1M3v2NIeJhITi6QeDLOpprcCB2fBaZLNC7elgExxaf -4Ij/Y+QYvZ8ejdOG+AOYHm4DOhWXPyfhhHLRG/U8QY40mYY1BhXZnm8ki/n6ATNn -5/iUzVZVYYOFuuOhl0B4TG01TlDuhvzm3nBblXx4TkXmlJGY+jy9pzyqyI8OpwpF -b5/+Q68f2OBltX8AAwUH/iaq0BjgK3Rk6Z/0Efw0ZVk4oO/RhQWcY0f5QDzPnoBk -DgQcsraDpK+fMRAbNXNjRA7qnTDzyVSjURHEJluNGpXQVXkrO1j5+N5yJXZy7Y+8 -nlUm31UKp8bgzCSck5LcluV9dOQKSD4FvgRmyrt7Zf1Ge824/KkoQaw8MqXGd3hL -vWta5S3YRJZ1xKKYdld9P7GI9PkOSsD1f4fYQpaHiHTQB+/LIsLiiEWzEnVvWnqN -CJoatLuznMB4uTjAmKMrOAjVw85+x98Iz/tgIjA/eFO1OlOx1+3UpwdpAibKXDf3 -dIxbuhsp6xy2G7xbYr+ErgZcpOePy+vvnOxc1gwS4q+ITwQYEQIADwUCQjV7RAIb -DAUJBaOagAAKCRCiXcEsIT0AM/LDAJ900L1+vJyKrr3hP0al12mE3cy+9wCcDeQp -6wzJCGiOCfCGViOv+39ADh4= -=gaWL +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 +XCbWVeYyJqaMXExTQIx+F+uj +=EHpi -----END PGP PUBLIC KEY BLOCK----- ]]></programlisting> ==== //depot/projects/docproj_nl/www/nl/share/sgml/libcommon.xsl#19 (text+ko) ==== @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="ISO-8859-1" ?> <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN" "http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd">; -<!-- $FreeBSD: www/nl/share/sgml/libcommon.xsl,v 1.6 2011/12/18 20:02:22 rene Exp $ +<!-- $FreeBSD: www/nl/share/sgml/libcommon.xsl,v 1.7 2012/05/14 20:13:53 rene Exp $ %SOURCE% share/sgml/libcommon.xsl %SRCID% 1.34 --> @@ -116,7 +116,7 @@ <!-- template: "html-news-list-newsflash-homelink" --> <xsl:template name="html-news-list-newsflash-homelink"> - <a href="&base;/news/news.html">Beginpagina nieuws</a> + <a href="&enbase;/news/news.html">Beginpagina nieuws</a> </xsl:template> <!-- template: "html-news-list-press-preface" --> @@ -136,7 +136,7 @@ <p>Gebruikers met organisatiesoftware dat het iCalendar-formaat begrijpt kunnen zich abonneren op de <a - href="&base;/events/events.ics">&os; evenementenkalender</a> + href="&enbase;/events/events.ics">&os; evenementenkalender</a> dat alle evenementen bevat die hier genoemd zijn.</p> </xsl:template> @@ -415,5 +415,4 @@ <xsl:otherwise>Ongeldige maand</xsl:otherwise> </xsl:choose> </xsl:template> - </xsl:stylesheet>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201205191734.q4JHYGHc013911>