components/meld/patches/meld.fr.xml.patch
author Jiri Sasek <Jiri.Sasek@Oracle.COM>
Wed, 26 Mar 2014 13:35:48 -0700
branchs11-update
changeset 3036 19bbecc872de
parent 227 1e1ccdc6b1e6
permissions -rw-r--r--
15769480 SUNBT7140922 service/network/samba should depend on iconv/unicode
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
227
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
     1
--- meld-1.4.0/help/fr/meld.fr.xml	Sun Sep 26 15:25:02 2010
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
     2
+++ meld-1.4.0/help/fr/new.meld.fr.xml	Thu Apr 21 11:02:39 2011
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
     3
@@ -1,6 +1,6 @@
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
     4
 <?xml version="1.0" encoding="utf-8"?>
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
     5
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
     6
-<book id="index" lang="fr">
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
     7
+<book label="" status="final" id="index" lang="fr">
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
     8
   <title>Manuel d'utilisation de Meld</title>
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
     9
 
1e1ccdc6b1e6 7040420 migrate meld to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    10
   <bookinfo>