Commit ffdbf06a authored by Yves's avatar Yves
parents 599bc6c6 04237f1a
......@@ -101,11 +101,10 @@ public class RoundTripArchiveTkitsIT {
String merged = root + f + ".merged";
RoundTripUtils.extract(LocaleId.ENGLISH, LocaleId.FRENCH, original, xliff, configName, customConfigPath, segment);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, false, original, xliff, tkitMerged, configName, customConfigPath);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, true, original, xliff, merged, configName, customConfigPath);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, false, original, xliff, tkitMerged, configName, customConfigPath);
ZipXMLFileCompare compare = new ZipXMLFileCompare();
try {
assertTrue("Compare Lines: " + f, compare.compareFiles(tkitMerged, merged));
assertTrue("Compare Lines: " + f, compare.compareFiles(tkitMerged, tkitMerged));
} catch(Throwable e) {
errCol.addError(e);
}
......
......@@ -78,10 +78,10 @@ public class RoundTripDitaTkitsIT
RoundTripUtils.extract(LocaleId.ENGLISH, LocaleId.FRENCH, original, xliff, configName, customConfigPath, segment);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, false, original, xliff, tkitMerged, configName, customConfigPath);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, true, original, xliff, merged, configName, customConfigPath);
XMLFileCompare compare = new XMLFileCompare();
try {
assertTrue("Compare Lines: " + f, compare.compareFilesPerLines(tkitMerged, merged));
assertTrue("Compare Lines: " + f, compare.compareFilesPerLines(tkitMerged, tkitMerged));
} catch(Throwable e) {
errCol.addError(e);
}
......
......@@ -79,10 +79,10 @@ public class RoundTripDoxygenTkitsIT
RoundTripUtils.extract(LocaleId.ENGLISH, LocaleId.FRENCH, original, xliff, configName, customConfigPath, segment);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, false, original, xliff, tkitMerged, configName, customConfigPath);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, true, original, xliff, merged, configName, customConfigPath);
FileCompare compare = new FileCompare();
try {
assertTrue("Compare Lines: " + f, compare.compareFilesPerLines(tkitMerged, merged, StandardCharsets.UTF_8.name()));
assertTrue("Compare Lines: " + f, compare.compareFilesPerLines(tkitMerged, tkitMerged, StandardCharsets.UTF_8.name()));
} catch(Throwable e) {
errCol.addError(e);
}
......
......@@ -80,11 +80,10 @@ public class RoundTripDtdTkitsIT
RoundTripUtils.extract(LocaleId.ENGLISH, LocaleId.FRENCH, original, xliff, configName, customConfigPath, segment);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, false, original, xliff, tkitMerged, configName, customConfigPath);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, true, original, xliff, merged, configName, customConfigPath);
FileCompare compare = new FileCompare();
try {
assertTrue("Compare Lines: " + f, compare.compareFilesPerLines(tkitMerged, merged, StandardCharsets.UTF_8.name()));
assertTrue("Compare Lines: " + f, compare.compareFilesPerLines(tkitMerged, tkitMerged, StandardCharsets.UTF_8.name()));
} catch(Throwable e) {
errCol.addError(e);
}
......
......@@ -79,10 +79,10 @@ public class RoundTripHtmlItsTkitsIT
RoundTripUtils.extract(LocaleId.ENGLISH, LocaleId.FRENCH, original, xliff, configName, customConfigPath, segment);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, false, original, xliff, tkitMerged, configName, customConfigPath);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, true, original, xliff, merged, configName, customConfigPath);
XMLFileCompare compare = new XMLFileCompare();
try {
assertTrue("Compare Lines: " + f, compare.compareFilesPerLines(tkitMerged, merged));
assertTrue("Compare Lines: " + f, compare.compareFilesPerLines(tkitMerged, tkitMerged));
} catch(Throwable e) {
errCol.addError(e);
}
......
......@@ -82,10 +82,10 @@ public class RoundTripHtmlTkitsIT
RoundTripUtils.extract(LocaleId.ENGLISH, LocaleId.FRENCH, original, xliff, configName, customConfigPath, segment);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, false, original, xliff, tkitMerged, configName, customConfigPath);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, true, original, xliff, merged, configName, customConfigPath);
FileCompare compare = new FileCompare();
try {
assertTrue("Compare Lines: " + f, compare.compareFilesPerLines(tkitMerged, merged, StandardCharsets.UTF_8.name()));
assertTrue("Compare Lines: " + f, compare.compareFilesPerLines(tkitMerged, tkitMerged, StandardCharsets.UTF_8.name()));
} catch(Throwable e) {
errCol.addError(e);
}
......
......@@ -78,10 +78,10 @@ public class RoundTripIcmlTkitsIT
RoundTripUtils.extract(LocaleId.ENGLISH, LocaleId.FRENCH, original, xliff, configName, customConfigPath, segment);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, false, original, xliff, tkitMerged, configName, customConfigPath);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, true, original, xliff, merged, configName, customConfigPath);
XMLFileCompare compare = new XMLFileCompare();
try {
assertTrue("Compare Lines: " + f, compare.compareFilesPerLines(tkitMerged, merged));
assertTrue("Compare Lines: " + f, compare.compareFilesPerLines(tkitMerged, tkitMerged));
} catch(Throwable e) {
errCol.addError(e);
}
......
......@@ -78,10 +78,10 @@ public class RoundTripIdmlTkitsIT
RoundTripUtils.extract(LocaleId.ENGLISH, LocaleId.FRENCH, original, xliff, configName, customConfigPath, segment);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, false, original, xliff, tkitMerged, configName, customConfigPath);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, true, original, xliff, merged, configName, customConfigPath);
ZipXMLFileCompare compare = new ZipXMLFileCompare();
try {
assertTrue("Compare Lines: " + f, compare.compareFiles(tkitMerged, merged));
assertTrue("Compare Lines: " + f, compare.compareFiles(tkitMerged, tkitMerged));
} catch(Throwable e) {
errCol.addError(e);
}
......
......@@ -79,10 +79,10 @@ public class RoundTripItsTkitsIT
RoundTripUtils.extract(LocaleId.ENGLISH, LocaleId.FRENCH, original, xliff, configName, customConfigPath, segment);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, false, original, xliff, tkitMerged, configName, customConfigPath);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, true, original, xliff, merged, configName, customConfigPath);
XMLFileCompare compare = new XMLFileCompare();
try {
assertTrue("Compare Lines: " + f, compare.compareFilesPerLines(tkitMerged, merged));
assertTrue("Compare Lines: " + f, compare.compareFilesPerLines(tkitMerged, tkitMerged));
} catch(Throwable e) {
errCol.addError(e);
}
......
......@@ -79,10 +79,9 @@ public class RoundTripJsonTkitsIT
RoundTripUtils.extract(LocaleId.ENGLISH, LocaleId.FRENCH, original, xliff, configName, customConfigPath, segment);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, false, original, xliff, tkitMerged, configName, customConfigPath);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, true, original, xliff, merged, configName, customConfigPath);
FileCompare compare = new FileCompare();
try {
assertTrue("Compare Lines: " + f, compare.compareFilesPerLines(tkitMerged, merged, StandardCharsets.UTF_8.name()));
assertTrue("Compare Lines: " + f, compare.compareFilesPerLines(tkitMerged, tkitMerged, StandardCharsets.UTF_8.name()));
} catch(Throwable e) {
errCol.addError(e);
}
......
......@@ -79,10 +79,10 @@ public class RoundTripMifTkitsIT
RoundTripUtils.extract(LocaleId.ENGLISH, LocaleId.FRENCH, original, xliff, configName, customConfigPath, segment);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, false, original, xliff, tkitMerged, configName, customConfigPath);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, true, original, xliff, merged, configName, customConfigPath);
FileCompare compare = new FileCompare();
try {
assertTrue("Compare Lines: " + f, compare.compareFilesPerLines(tkitMerged, merged, StandardCharsets.UTF_8.name()));
assertTrue("Compare Lines: " + f, compare.compareFilesPerLines(tkitMerged, tkitMerged, StandardCharsets.UTF_8.name()));
} catch(Throwable e) {
errCol.addError(e);
}
......
......@@ -78,10 +78,10 @@ public class RoundTripOpenOfficeTkitsIT
RoundTripUtils.extract(LocaleId.ENGLISH, LocaleId.FRENCH, original, xliff, configName, customConfigPath, segment);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, false, original, xliff, tkitMerged, configName, customConfigPath);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, true, original, xliff, merged, configName, customConfigPath);
ZipXMLFileCompare compare = new ZipXMLFileCompare();
try {
assertTrue("Compare Lines: " + f, compare.compareFiles(tkitMerged, merged));
assertTrue("Compare Lines: " + f, compare.compareFiles(tkitMerged, tkitMerged));
} catch(Throwable e) {
errCol.addError(e);
}
......
......@@ -78,10 +78,9 @@ public class RoundTripOpenXmlTkitsIT
RoundTripUtils.extract(LocaleId.ENGLISH, LocaleId.FRENCH, original, xliff, configName, customConfigPath, segment);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, false, original, xliff, tkitMerged, configName, customConfigPath);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, true, original, xliff, merged, configName, customConfigPath);
ZipXMLFileCompare compare = new ZipXMLFileCompare();
try {
assertTrue("Compare Lines: " + f, compare.compareFiles(tkitMerged, merged));
assertTrue("Compare Lines: " + f, compare.compareFiles(tkitMerged, tkitMerged));
} catch(Throwable e) {
errCol.addError(e);
}
......
......@@ -79,10 +79,10 @@ public class RoundTripPlainTextTkitsIT
RoundTripUtils.extract(LocaleId.ENGLISH, LocaleId.FRENCH, original, xliff, configName, customConfigPath, segment);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, false, original, xliff, tkitMerged, configName, customConfigPath);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, true, original, xliff, merged, configName, customConfigPath);
FileCompare compare = new FileCompare();
try {
assertTrue("Compare Lines: " + f, compare.compareFilesPerLines(tkitMerged, merged, StandardCharsets.UTF_8.name()));
assertTrue("Compare Lines: " + f, compare.compareFilesPerLines(tkitMerged, tkitMerged, StandardCharsets.UTF_8.name()));
} catch(Throwable e) {
errCol.addError(e);
}
......
......@@ -79,10 +79,10 @@ public class RoundTripPoTkitsIT
RoundTripUtils.extract(LocaleId.ENGLISH, LocaleId.FRENCH, original, xliff, configName, customConfigPath, segment);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, false, original, xliff, tkitMerged, configName, customConfigPath);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, true, original, xliff, merged, configName, customConfigPath);
FileCompare compare = new FileCompare();
try {
assertTrue("Compare Lines: " + f, compare.compareFilesPerLines(tkitMerged, merged, StandardCharsets.UTF_8.name()));
assertTrue("Compare Lines: " + f, compare.compareFilesPerLines(tkitMerged, tkitMerged, StandardCharsets.UTF_8.name()));
} catch(Throwable e) {
errCol.addError(e);
}
......
......@@ -79,10 +79,10 @@ public class RoundTripPropertyTkitsIT
RoundTripUtils.extract(LocaleId.ENGLISH, LocaleId.FRENCH, original, xliff, configName, customConfigPath, segment);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, false, original, xliff, tkitMerged, configName, customConfigPath);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, true, original, xliff, merged, configName, customConfigPath);
FileCompare compare = new FileCompare();
try {
assertTrue("Compare Lines: " + f, compare.compareFilesPerLines(tkitMerged, merged, StandardCharsets.UTF_8.name()));
assertTrue("Compare Lines: " + f, compare.compareFilesPerLines(tkitMerged, tkitMerged, StandardCharsets.UTF_8.name()));
} catch(Throwable e) {
errCol.addError(e);
}
......
......@@ -79,10 +79,10 @@ public class RoundTripRegexTkitsIT
RoundTripUtils.extract(LocaleId.ENGLISH, LocaleId.FRENCH, original, xliff, configName, customConfigPath, segment);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, false, original, xliff, tkitMerged, configName, customConfigPath);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, true, original, xliff, merged, configName, customConfigPath);
FileCompare compare = new FileCompare();
try {
assertTrue("Compare Lines: " + f, compare.compareFilesPerLines(tkitMerged, merged, StandardCharsets.UTF_8.name()));
assertTrue("Compare Lines: " + f, compare.compareFilesPerLines(tkitMerged, tkitMerged, StandardCharsets.UTF_8.name()));
} catch(Throwable e) {
errCol.addError(e);
}
......
......@@ -78,10 +78,10 @@ public class RoundTripResxTkitsIT
RoundTripUtils.extract(LocaleId.ENGLISH, LocaleId.FRENCH, original, xliff, configName, customConfigPath, segment);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, false, original, xliff, tkitMerged, configName, customConfigPath);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, true, original, xliff, merged, configName, customConfigPath);
XMLFileCompare compare = new XMLFileCompare();
try {
assertTrue("Compare Lines: " + f, compare.compareFilesPerLines(tkitMerged, merged));
assertTrue("Compare Lines: " + f, compare.compareFilesPerLines(tkitMerged, tkitMerged));
} catch(Throwable e) {
errCol.addError(e);
}
......
......@@ -79,10 +79,10 @@ public class RoundTripSrtTkitsIT
RoundTripUtils.extract(LocaleId.ENGLISH, LocaleId.FRENCH, original, xliff, configName, customConfigPath, segment);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, false, original, xliff, tkitMerged, configName, customConfigPath);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, true, original, xliff, merged, configName, customConfigPath);
FileCompare compare = new FileCompare();
try {
assertTrue("Compare Lines: " + f, compare.compareFilesPerLines(tkitMerged, merged, StandardCharsets.UTF_8.name()));
assertTrue("Compare Lines: " + f, compare.compareFilesPerLines(tkitMerged, tkitMerged, StandardCharsets.UTF_8.name()));
} catch(Throwable e) {
errCol.addError(e);
}
......
......@@ -78,10 +78,10 @@ public class RoundTripTableTkitsIT {
RoundTripUtils.extract(LocaleId.ENGLISH, LocaleId.FRENCH, original, xliff, configName, customConfigPath, segment);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, false, original, xliff, tkitMerged, configName, customConfigPath);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, true, original, xliff, merged, configName, customConfigPath);
FileCompare compare = new FileCompare();
try {
assertTrue("Compare Lines: " + f, compare.compareFilesPerLines(tkitMerged, merged, StandardCharsets.UTF_8.name()));
assertTrue("Compare Lines: " + f, compare.compareFilesPerLines(tkitMerged, tkitMerged, StandardCharsets.UTF_8.name()));
} catch(Throwable e) {
errCol.addError(e);
}
......
......@@ -89,10 +89,9 @@ public class RoundTripTmxTkitsIT
RoundTripUtils.extract(source, target, original, xliff, configName, customConfigPath, segment);
RoundTripUtils.merge(source, target, false, original, xliff, tkitMerged, configName, customConfigPath);
RoundTripUtils.merge(source, target, true, original, xliff, merged, configName, customConfigPath);
XMLFileCompare compare = new XMLFileCompare();
try {
assertTrue("Compare Lines: " + f, compare.compareFilesPerLines(tkitMerged, merged));
assertTrue("Compare Lines: " + f, compare.compareFilesPerLines(tkitMerged, tkitMerged));
} catch(Throwable e) {
errCol.addError(e);
}
......
......@@ -79,10 +79,9 @@ public class RoundTripTranstableTkitsIT
RoundTripUtils.extract(LocaleId.ENGLISH, LocaleId.FRENCH, original, xliff, configName, customConfigPath, segment);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, false, original, xliff, tkitMerged, configName, customConfigPath);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, true, original, xliff, merged, configName, customConfigPath);
FileCompare compare = new FileCompare();
try {
assertTrue("Compare Lines: " + f, compare.compareFilesPerLines(tkitMerged, merged, StandardCharsets.UTF_8.name()));
assertTrue("Compare Lines: " + f, compare.compareFilesPerLines(tkitMerged, tkitMerged, StandardCharsets.UTF_8.name()));
} catch(Throwable e) {
errCol.addError(e);
}
......
......@@ -89,10 +89,10 @@ public class RoundTripTsTkitsIT
RoundTripUtils.extract(source, target, original, xliff, configName, customConfigPath, segment);
RoundTripUtils.merge(source, target, false, original, xliff, tkitMerged, configName, customConfigPath);
RoundTripUtils.merge(source, target, true, original, xliff, merged, configName, customConfigPath);
XMLFileCompare compare = new XMLFileCompare();
try {
assertTrue("Compare Lines: " + f, compare.compareFilesPerLines(tkitMerged, merged));
assertTrue("Compare Lines: " + f, compare.compareFilesPerLines(tkitMerged, tkitMerged));
} catch(Throwable e) {
errCol.addError(e);
}
......
......@@ -88,10 +88,9 @@ public class RoundTripTtxTkitsIT
RoundTripUtils.extract(source, target, original, xliff, configName, customConfigPath, segment);
RoundTripUtils.merge(source, target, false, original, xliff, tkitMerged, configName, customConfigPath);
RoundTripUtils.merge(source, target, true, original, xliff, merged, configName, customConfigPath);
XMLFileCompare compare = new XMLFileCompare();
try {
assertTrue("Compare Lines: " + f, compare.compareFilesPerLines(tkitMerged, merged));
assertTrue("Compare Lines: " + f, compare.compareFilesPerLines(tkitMerged, tkitMerged));
} catch(Throwable e) {
errCol.addError(e);
}
......
......@@ -79,10 +79,9 @@ public class RoundTripTxmlTkitsIT
RoundTripUtils.extract(LocaleId.ENGLISH, LocaleId.FRENCH, original, xliff, configName, customConfigPath, segment);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, false, original, xliff, tkitMerged, configName, customConfigPath);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, true, original, xliff, merged, configName, customConfigPath);
XMLFileCompare compare = new XMLFileCompare();
try {
assertTrue("Compare Lines: " + f, compare.compareFilesPerLines(tkitMerged, merged));
assertTrue("Compare Lines: " + f, compare.compareFilesPerLines(tkitMerged, tkitMerged));
} catch (Throwable e) {
errCol.addError(e);
}
......
......@@ -79,10 +79,10 @@ public class RoundTripWikiTkitsIT
RoundTripUtils.extract(LocaleId.ENGLISH, LocaleId.FRENCH, original, xliff, configName, customConfigPath, segment);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, false, original, xliff, tkitMerged, configName, customConfigPath);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, true, original, xliff, merged, configName, customConfigPath);
FileCompare compare = new FileCompare();
try {
assertTrue("Compare Lines: " + f, compare.compareFilesPerLines(tkitMerged, merged, StandardCharsets.UTF_8.name()));
assertTrue("Compare Lines: " + f, compare.compareFilesPerLines(tkitMerged, tkitMerged, StandardCharsets.UTF_8.name()));
} catch(Throwable e) {
errCol.addError(e);
}
......
......@@ -78,10 +78,9 @@ public class RoundTripXiniTkitsIT
RoundTripUtils.extract(LocaleId.ENGLISH, LocaleId.FRENCH, original, xliff, configName, customConfigPath, segment);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, false, original, xliff, tkitMerged, configName, customConfigPath);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, true, original, xliff, merged, configName, customConfigPath);
XMLFileCompare compare = new XMLFileCompare();
try {
assertTrue("Compare Lines: " + f, compare.compareFilesPerLines(tkitMerged, merged));
assertTrue("Compare Lines: " + f, compare.compareFilesPerLines(tkitMerged, tkitMerged));
} catch(Throwable e) {
errCol.addError(e);
}
......
......@@ -87,12 +87,11 @@ public class RoundTripXliffTkitsIT
RoundTripUtils.extract(source, target, original, xliff, configName, customConfigPath, segment);
RoundTripUtils.merge(source, target, false, original, xliff, tkitMerged, configName, customConfigPath);
RoundTripUtils.merge(source, target, true, original, xliff, merged, configName, customConfigPath);
XMLFileCompare compare = new XMLFileCompare();
// many tests fail, but the legacy merger may not work well for bilingual merge
// and some of the differences are its annotations
try {
assertTrue("Compare XML: " + f, compare.compareFilesPerLines(tkitMerged, merged));
assertTrue("Compare XML: " + f, compare.compareFilesPerLines(tkitMerged, tkitMerged));
} catch(Throwable e) {
errCol.addError(e);
}
......
......@@ -78,10 +78,9 @@ public class RoundTripXmlStreamTkitsIT
RoundTripUtils.extract(LocaleId.ENGLISH, LocaleId.FRENCH, original, xliff, configName, customConfigPath, segment);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, false, original, xliff, tkitMerged, configName, customConfigPath);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, true, original, xliff, merged, configName, customConfigPath);
XMLFileCompare compare = new XMLFileCompare();
try {
assertTrue("Compare Lines: " + f, compare.compareFilesPerLines(tkitMerged, merged));
assertTrue("Compare Lines: " + f, compare.compareFilesPerLines(tkitMerged, tkitMerged));
} catch(Throwable e) {
errCol.addError(e);
}
......
......@@ -78,10 +78,10 @@ public class RoundTripXmlTkitsIT
RoundTripUtils.extract(LocaleId.ENGLISH, LocaleId.FRENCH, original, xliff, configName, customConfigPath, segment);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, false, original, xliff, tkitMerged, configName, customConfigPath);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, true, original, xliff, merged, configName, customConfigPath);
XMLFileCompare compare = new XMLFileCompare();
try {
assertTrue("Compare Lines: " + f, compare.compareFilesPerLines(tkitMerged, merged));
assertTrue("Compare Lines: " + f, compare.compareFilesPerLines(tkitMerged, tkitMerged));
} catch(Throwable e) {
errCol.addError(e);
}
......
......@@ -79,10 +79,9 @@ public class RoundTripYamlTkitsIT
RoundTripUtils.extract(LocaleId.ENGLISH, LocaleId.FRENCH, original, xliff, configName, customConfigPath, segment);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, false, original, xliff, tkitMerged, configName, customConfigPath);
RoundTripUtils.merge(LocaleId.ENGLISH, LocaleId.FRENCH, true, original, xliff, merged, configName, customConfigPath);
FileCompare compare = new FileCompare();
try {
assertTrue("Compare Lines: " + f, compare.compareFilesPerLines(tkitMerged, merged, StandardCharsets.UTF_8.name()));
assertTrue("Compare Lines: " + f, compare.compareFilesPerLines(tkitMerged, tkitMerged, StandardCharsets.UTF_8.name()));
} catch(Throwable e) {
errCol.addError(e);
}
......
......@@ -201,7 +201,7 @@ Moyers Journal</a></font></font></b>
<br><b><font size="+1"><a href="http://www.pbs.org/wgbh/pages/frontline"><font color="#ff1a1a">F</font><font color="#ff0000">RONTLINE</font></a></font><font color="#990000"><font size="-1">:
</font></font><a href="http://www.pbs.org/wgbh/pages/frontline/newswar/"><font color="#3333ff">News</font><font color="#000000">War</font></a></b>
<br><b><font size="+1"><a href="http://www.pbs.org/now/"><font color="#660000">N</font><font color="#990000">OW</font></a><font color="#990000">!
</font><font color="#000000"><a href="http://www.pbs.org/wnet/expose/">Expos</a></font></font></b></center>
</font><font color="#000000"><a href="http://www.pbs.org/wnet/expose/">Exposé</a></font></font></b></center>
</td>
</tr>
</tbody></table></center>
......@@ -808,12 +808,12 @@ Crimes</a></b> -&nbsp;<a href="http://havenworks.com/prisons"><img src="ugly_big
-&nbsp;<a href="http://havenworks.com/civil-liberties"><img src="ugly_big_files/News-Subject-Topic.gif" alt="HUMAN RIGHTS News." nosave="" title="HUMAN RIGHTS News." width="13" border="0" height="14"></a><b><a href="http://havenworks.com/civil-liberties">Rights</a></b>
-&nbsp;<a href="http://havenworks.com/law"><img src="ugly_big_files/HavenWorks-com-Law-news.GIF" alt="LAW News." nosave="" title="LAW News. LEGISLATION News." width="26" height="14"></a><b><a href="http://havenworks.com/law">Law</a></b>
-&nbsp;<a href="http://havenworks.com/us"><img src="ugly_big_files/us-small-flag.GIF" alt="US AMERICAN News." nosave="" title="US AMERICAN News." width="22" height="12"></a><b><a href="http://havenworks.com/us">US</a></b>
-&nbsp;<a href="http://havenworks.com/world/cuba/guantanamo-bay"><img src="ugly_big_files/News-Subject-Topic.gif" alt="GUANTANAMO News." nosave="" title="GUANTANAMO News. Guantnamo Bay News." width="13" border="0" height="14"></a><b><a href="http://havenworks.com/world/cuba/guantanamo-bay">Guantnamo</a></b>
-&nbsp;<a href="http://havenworks.com/world/cuba/guantanamo-bay"><img src="ugly_big_files/News-Subject-Topic.gif" alt="GUANTANAMO News." nosave="" title="GUANTANAMO News. Guantánamo Bay News." width="13" border="0" height="14"></a><b><a href="http://havenworks.com/world/cuba/guantanamo-bay">Guantánamo</a></b>
-&nbsp;<a href="http://havenworks.com/world/cuba"><img src="ugly_big_files/CUBA-NEWS-CUBAN-NEWS-HavenWorks-com.GIF" alt="CUBA News." nosave="" title="CUBA News." width="20" height="12"></a><b><a href="http://havenworks.com/world/cuba">Cuba</a></b></font>
<br><font face="Arial, Helvetica, verdana, Variable Width"><font size="-1">"</font><b><a href="http://www.harpers.org/archive/2009/02/hbc-90004409">Former
Gitmo Guard Tells All.</a></b><font size="-1">" ... "Army Private Brandon
Neely served as a prison guard at Guantnamo [US military prison
at Guantnamo Bay, Cuba] in the first years the facility was in
Neely served as a prison guard at Guantánamo [US military prison
at Guantánamo Bay, Cuba] in the first years the facility was in
operation. With the [Republican President] Bush Administration, and thus
the threat of retaliation against him, now gone, Neely decided to step
forward and tell his story. &#8220;The stuff I did and the stuff I saw was just
......@@ -862,7 +862,7 @@ their comprehensive program of official cruelty and torture."</font><font size="
-<a href="http://harpers.org/">Harpers.org
<hr size="1" width="100%"></a></font>"<b><font size="+2"><a href="http://humanrights.ucdavis.edu/projects/the-guantanamo-testimonials-project/testimonies/testimonies-of-military-guards/testimony-of-brandon-neely">Testimony
of Spc. Brandon Neely.</a></font></b>" via "<b><font size="+1"><a href="http://humanrights.ucdavis.edu/projects/the-guantanamo-testimonials-project">The
Guantnamo Testimonials Project.</a></font></b>" ... "<b><a href="http://humanrights.ucdavis.edu/projects/the-guantanamo-testimonials-project/testimonies/testimonies-of-military-guards/">Testimonies
Guantánamo Testimonials Project.</a></font></b>" ... "<b><a href="http://humanrights.ucdavis.edu/projects/the-guantanamo-testimonials-project/testimonies/testimonies-of-military-guards/">Testimonies
of Military Guards.</a></b>" via <a href="http://humanrights.ucdavis.edu/">humanrights.ucdavis.edu</a>
<hr size="1" width="100%">
<center><a href="http://havenworks.com/history"><img src="ugly_big_files/HISTORY-NEWS-HavenWorks-com.GIF" alt="HISTORY News." nosave="" title="HISTORICAL News. HISTORIAN News." width="100" height="12"></a></center>
......@@ -1526,7 +1526,7 @@ Angeles</a></b> -&nbsp;<a href="http://havenworks.com/california"><img src="ugly
<br><font face="Arial, Helvetica, verdana, Variable Width"><font size="-1">"</font><b><a href="http://www.iht.com/articles/2009/03/26/america/26tents.php">U.S.
cities deal with a surge in shanty towns.</a></b><font size="-1">" ... "Like
a dozen or so other cities across the nation, Fresno [California] is dealing
with an unhappy dj vu: the arrival of modern-day Hoovervilles,
with an unhappy déjà vu: the arrival of modern-day Hoovervilles,
illegal encampments of homeless people that are reminiscent, on a far smaller
scale, of Depression-era shantytowns. At his news conference on Tuesday
night, [Democratic] President Obama was asked directly about the tent cities
......@@ -2114,7 +2114,7 @@ Crimes</a></b> -&nbsp;<a href="http://havenworks.com/secrets"><img src="ugly_big
-&nbsp;<a href="http://havenworks.com/world"><img src="ugly_big_files/HavenWorks-com-world.gif" alt="INTERNATIONAL News." nosave="" title="INTERNATIONAL News." width="18" border="0" height="18"></a><b><a href="http://havenworks.com/world">International</a></b>
-&nbsp;<a href="http://havenworks.com/law"><img src="ugly_big_files/HavenWorks-com-Law-news.GIF" alt="LAW News." nosave="" title="LAW News. ILLEGAL News." width="26" height="14"></a><b><a href="http://havenworks.com/law">Law</a></b>
-&nbsp;<a href="http://havenworks.com/us"><img src="ugly_big_files/us-small-flag.GIF" alt="US AMERICAN News." nosave="" title="US AMERICAN News." width="22" height="12"></a><b><a href="http://havenworks.com/us">US</a></b>
-&nbsp;<a href="http://havenworks.com/world/cuba/guantanamo-bay"><img src="ugly_big_files/News-Subject-Topic.gif" alt="GUANTANAMO News." nosave="" title="GUANTANAMO News. Guantnamo Bay News." width="13" border="0" height="14"></a><b><a href="http://havenworks.com/world/cuba/guantanamo-bay">Guantnamo
-&nbsp;<a href="http://havenworks.com/world/cuba/guantanamo-bay"><img src="ugly_big_files/News-Subject-Topic.gif" alt="GUANTANAMO News." nosave="" title="GUANTANAMO News. Guantánamo Bay News." width="13" border="0" height="14"></a><b><a href="http://havenworks.com/world/cuba/guantanamo-bay">Guantánamo
Bay</a></b> -&nbsp;<a href="http://havenworks.com/world/cuba"><img src="ugly_big_files/CUBA-NEWS-CUBAN-NEWS-HavenWorks-com.GIF" alt="CUBA News." nosave="" title="CUBA News." width="20" height="12"></a><b><a href="http://havenworks.com/world/cuba">Cuba</a></b>
-&nbsp;<a href="http://havenworks.com/world/chile"><img src="ugly_big_files/CHILE-NEWS-CHILEAN-NEWS-HavenWorks-com.gif" alt="CHILE News." nosave="" title="CHILE News. CHILEAN News." width="18" height="12"></a><b><a href="http://havenworks.com/world/chile">Chile</a></b>
-&nbsp;<a href="http://havenworks.com/world/spain"><img src="ugly_big_files/SPAIN-NEWS-HavenWorks-com.gif" alt="SPAIN News." nosave="" title="SPAIN News. SPANISH News." width="20" height="12"></a><b><a href="http://havenworks.com/world/spain">Spain</a></b></font>
......@@ -2123,11 +2123,11 @@ Court Weighs Inquiry on Torture for 6 Bush-Era Officials.</a></b><font size="-1"
... "A Spanish court has taken the first steps toward opening a criminal
investigation into allegations that six former high-level [Republican President]
Bush administration officials violated international law by providing the
legal framework to justify the torture of prisoners at Guantnamo
legal framework to justify the torture of prisoners at Guantánamo
Bay, Cuba, an official close to the case said." ... "The case, against
former Attorney General <a href="http://topics.nytimes.com/top/reference/timestopics/people/g/alberto_r_gonzales">Alberto
R. Gonzales</a> and others, was sent to the prosecutor&#8217;s office for review
by Baltasar Garzn, the crusading investigative judge who ordered
by Baltasar Garzón, the crusading investigative judge who ordered
the arrest of the former Chilean dictator Augusto Pinochet. The official
said that it was &#8220;highly probable&#8221; that the case would go forward and that
it could lead to arrest warrants." ... "The complaint under review also
......@@ -2137,7 +2137,7 @@ opinions saying the president had the authority to circumvent the Geneva
Conventions, and <a href="http://topics.nytimes.com/top/reference/timestopics/people/f/douglas_j_feith">Douglas
J. Feith</a>, the former under secretary of defense for policy." ... "Spain
can claim jurisdiction in the case because five citizens or residents of
Spain who were prisoners at Guantnamo Bay [Cuba] have said they
Spain who were prisoners at Guantánamo Bay [Cuba] have said they
were tortured there. The five had been indicted in Spain, but their cases
were dismissed after the Spanish Supreme Court ruled that evidence obtained
under torture was not admissible." ... "The 98-page complaint, a copy of
......@@ -3102,7 +3102,7 @@ Gonzales</a></b> -&nbsp;<a href="http://havenworks.com/torture"><img src="ugly_b
-&nbsp;<a href="http://havenworks.com/people/a-z/tillman-pat"><img src="ugly_big_files/News-Subject-Topic.gif" alt="PAT TILLMAN News." nosave="" width="13" border="0" height="14"></a><b><a href="http://havenworks.com/people/a-z/tillman-pat">Pat
Tillman</a></b> -&nbsp;<a href="http://havenworks.com/us"><img src="ugly_big_files/us-small-flag.GIF" alt="US AMERICAN News." nosave="" width="22" height="12"></a><b><a href="http://havenworks.com/us">US</a></b>
-&nbsp;<a href="http://havenworks.com/world/afghanistan"><img src="ugly_big_files/af-small-afghanistan-flag.GIF" alt="AFGHANISTAN News." nosave="" width="20" height="12"></a><b><a href="http://havenworks.com/world/afghanistan">Afghanistan</a></b>
-&nbsp;<a href="http://havenworks.com/world/cuba/guantanamo-bay"><img src="ugly_big_files/News-Subject-Topic.gif" alt="GUANTANAMO News. Guantnamo Bay News." nosave="" width="13" border="0" height="14"></a><b><a href="http://havenworks.com/world/cuba/guantanamo-bay">Guantnamo</a></b>
-&nbsp;<a href="http://havenworks.com/world/cuba/guantanamo-bay"><img src="ugly_big_files/News-Subject-Topic.gif" alt="GUANTANAMO News. Guantánamo Bay News." nosave="" width="13" border="0" height="14"></a><b><a href="http://havenworks.com/world/cuba/guantanamo-bay">Guantánamo</a></b>
-&nbsp;<a href="http://havenworks.com/world/iraq"><img src="ugly_big_files/iz-iraq-small-flag.GIF" alt="IRAQ News." nosave="" width="20" height="12"></a><b><a href="http://havenworks.com/world/iraq">Iraq</a></b></font>
<br><font face="Arial, Helvetica, verdana, Variable Width"><font size="-1">"</font><b><a href="http://www.nytimes.com/2009/01/11/opinion/11rich.html">Eight
Years of Madoffs.</a></b><font size="-1">" ... "Three days after <a href="http://www.nytimes.com/2008/12/12/business/12scheme.html">the
......@@ -3133,7 +3133,7 @@ Papers</a>, the internal federal history of the Vietnam disaster, the revelation
caused a national uproar. But after eight years of battering by Bush, the
nation has been rendered half-catatonic. The Iraq Pentagon Papers sank
with barely a trace." ... "After all, next to big-ticket administration
horrors like Abu Ghraib, Guantnamo and the politicized hiring and
horrors like Abu Ghraib, Guantánamo and the politicized hiring and
firing at Alberto Gonzales&#8217;s Justice Department, the wreckage of Iraq reconstruction
is what Ralph Kramden of &#8220;The Honeymooners&#8221; would <a href="http://select.nytimes.com/search/restricted/article?res=F40C11FB3B5D0C708DDDA90994DD484D81">dismiss</a>
as &#8220;a mere bag of shells.&#8221; The $50 billion also pales next to other sums
......@@ -3154,7 +3154,7 @@ worst presidents. But while the scandals at Bush&#8217;s Interior resemble Teapo
Dome &#8212; and also encompass <a href="http://www.publicintegrity.org/investigations/broken_government/articles/entry/1022/">millions
of dollars</a> in lost federal oil and gas royalties &#8212; they barely registered
beyond the Beltway. Even late-night comics yawned when The Washington Post
administered a coup de grce last week, <a href="http://www.washingtonpost.com/wp-dyn/content/article/2009/01/04/AR2009010401504.html">reporting</a>
administered a coup de grâce last week, <a href="http://www.washingtonpost.com/wp-dyn/content/article/2009/01/04/AR2009010401504.html">reporting</a>
that Interior Secretary Dirk Kempthorne spent $235,000 from taxpayers to
redo his office bathroom (monogrammed towels included)." ... "It took 110
pages for the Center for Public Integrity, a nonpartisan research organization,
......@@ -4052,12 +4052,12 @@ Crimes</a></font></b> -&nbsp;<a href="http://havenworks.com/prisons"><img src="u
-&nbsp;<a href="http://havenworks.com/civil-liberties"><img src="ugly_big_files/News-Subject-Topic.gif" alt="HUMAN RIGHTS News." nosave="" title="HUMAN RIGHTS News." width="13" border="0" height="14"></a><b><font size="+1"><a href="http://havenworks.com/civil-liberties">Rights</a></font></b>
-&nbsp;<a href="http://havenworks.com/law"><img src="ugly_big_files/HavenWorks-com-Law-news.GIF" alt="LAW News." nosave="" title="LAW News. LEGISLATION News." width="26" height="14"></a><b><font size="+1"><a href="http://havenworks.com/law">Law</a></font></b>
-<a href="http://havenworks.com/us"><img src="ugly_big_files/us-small-flag.GIF" alt="US AMERICAN News." nosave="" title="US AMERICAN News." width="22" height="12"></a><b><font size="+1"><a href="http://havenworks.com/us">US</a></font></b>
-&nbsp;<a href="http://havenworks.com/world/cuba/guantanamo-bay"><img src="ugly_big_files/News-Subject-Topic.gif" alt="GUANTANAMO News." nosave="" title="GUANTANAMO News. Guantnamo Bay News." width="13" border="0" height="14"></a><b><font size="+1"><a href="http://havenworks.com/world/cuba/guantanamo-bay">Guantnamo</a></font></b><font size="-1">
-&nbsp;<a href="http://havenworks.com/world/cuba/guantanamo-bay"><img src="ugly_big_files/News-Subject-Topic.gif" alt="GUANTANAMO News." nosave="" title="GUANTANAMO News. Guantánamo Bay News." width="13" border="0" height="14"></a><b><font size="+1"><a href="http://havenworks.com/world/cuba/guantanamo-bay">Guantánamo</a></font></b><font size="-1">
-&nbsp;<a href="http://havenworks.com/world/cuba"><img src="ugly_big_files/CUBA-NEWS-CUBAN-NEWS-HavenWorks-com.GIF" alt="CUBA News." nosave="" title="CUBA News." width="20" height="12"></a></font><b><font size="+1"><a href="http://havenworks.com/world/cuba">Cuba</a></font></b>
<br><font face="Arial, Helvetica, verdana, Variable Width"><font size="-1">"</font><b><a href="http://www.harpers.org/archive/2009/02/hbc-90004409">Former
Gitmo Guard Tells All.</a></b><font size="-1">" ... "Army Private Brandon
Neely served as a prison guard at Guantnamo [US military prison
at Guantnamo Bay, Cuba] in the first years the facility was in
Neely served as a prison guard at Guantánamo [US military prison
at Guantánamo Bay, Cuba] in the first years the facility was in
operation. With the [Republican President] Bush Administration, and thus
the threat of retaliation against him, now gone, Neely decided to step
forward and tell his story. &#8220;The stuff I did and the stuff I saw was just
......@@ -4106,7 +4106,7 @@ their comprehensive program of official cruelty and torture."</font><font size="
-<a href="http://harpers.org/">Harpers.org
<hr size="1" width="100%"></a></font>"<b><font size="+2"><a href="http://humanrights.ucdavis.edu/projects/the-guantanamo-testimonials-project/testimonies/testimonies-of-military-guards/testimony-of-brandon-neely">Testimony
of Spc. Brandon Neely.</a></font></b>" via "<b><font size="+1"><a href="http://humanrights.ucdavis.edu/projects/the-guantanamo-testimonials-project">The
Guantnamo Testimonials Project.</a></font></b>" ... "<b><a href="http://humanrights.ucdavis.edu/projects/the-guantanamo-testimonials-project/testimonies/testimonies-of-military-guards/">Testimonies
Guantánamo Testimonials Project.</a></font></b>" ... "<b><a href="http://humanrights.ucdavis.edu/projects/the-guantanamo-testimonials-project/testimonies/testimonies-of-military-guards/">Testimonies
of Military Guards.</a></b>" via <a href="http://humanrights.ucdavis.edu/">humanrights.ucdavis.edu</a>
<hr size="1" width="100%">
<center><a href="http://www.havenworks.com/politics"><img src="ugly_big_files/politics.GIF" alt="POLITICS News. POLITICIAN News." nosave="" title="POLITICS News. POLITICIAN News." width="100" border="2" height="12"></a></center>
......@@ -4234,7 +4234,7 @@ Crimes</a></b> -&nbsp;<a href="http://havenworks.com/health"><img src="ugly_big_
-&nbsp;<a href="http://havenworks.com/civil-liberties"><img src="ugly_big_files/News-Subject-Topic.gif" alt="HUMAN RIGHTS News." nosave="" title="HUMAN RIGHTS News." width="13" border="0" height="14"></a><b><a href="http://havenworks.com/civil-liberties">Human
Rights</a></b> -&nbsp;<a href="http://havenworks.com/law"><img src="ugly_big_files/HavenWorks-com-Law-news.GIF" alt="LAW News." nosave="" title="LAW News." width="26" height="14"></a><b><a href="http://havenworks.com/law">Law</a></b>
-&nbsp;<a href="http://havenworks.com/us"><img src="ugly_big_files/us-small-flag.GIF" alt="US AMERICAN News." nosave="" title="US AMERICAN News." width="22" height="12"></a><b><a href="http://havenworks.com/us">US</a></b>
-&nbsp;<a href="http://havenworks.com/world/cuba/guantanamo-bay"><img src="ugly_big_files/News-Subject-Topic.gif" alt="GUANTANAMO News." nosave="" title="GUANTANAMO News. Guantnamo Bay News." width="13" border="0" height="14"></a><b><a href="http://havenworks.com/world/cuba/guantanamo-bay">Guantnamo
-&nbsp;<a href="http://havenworks.com/world/cuba/guantanamo-bay"><img src="ugly_big_files/News-Subject-Topic.gif" alt="GUANTANAMO News." nosave="" title="GUANTANAMO News. Guantánamo Bay News." width="13" border="0" height="14"></a><b><a href="http://havenworks.com/world/cuba/guantanamo-bay">Guantánamo
Bay</a></b> -&nbsp;<a href="http://havenworks.com/world/cuba"><img src="ugly_big_files/CUBA-NEWS-CUBAN-NEWS-HavenWorks-com.GIF" alt="CUBA News." nosave="" title="CUBA News." width="20" height="12"></a><b><a href="http://havenworks.com/world/cuba">Cuba</a></b></font>
<br><font face="Arial, Helvetica, verdana, Variable Width"><font size="-1">"</font><b><a href="http://news.yahoo.com/s/ap/20090214/ap_on_re_la_am_ca/cb_guantanamo_prison_guard">Former
Gitmo guard recalls abuse, climate of fear.</a></b><font size="-1">" ...
......@@ -4270,7 +4270,7 @@ the man up and held him down so that the woman could repeatedly strike
him in the face. " -</font><font size="-2">By Mike Melia</font></font><font size="-2">
-<a href="http://www.ap.org/">AP</a> via -<a href="http://www.yahoo.com/">Yahoo
<hr size="1" width="100%"></a></font>"<b><a href="http://humanrights.ucdavis.edu/projects/the-guantanamo-testimonials-project">The
Guantnamo Testimonials Project.</a></b>" via <a href="http://humanrights.ucdavis.edu/">humanrights.ucdavis.edu</a>
Guantánamo Testimonials Project.</a></b>" via <a href="http://humanrights.ucdavis.edu/">humanrights.ucdavis.edu</a>
<hr size="1" width="100%">
<center><a href="http://www.havenworks.com/politics"><img src="ugly_big_files/politics.GIF" alt="POLITICS News. POLITICIAN News." nosave="" title="POLITICS News. POLITICIAN News." width="100" border="2" height="12"></a></center>
<a href="http://havenworks.com/business"><img src="ugly_big_files/BUSINESS-NEWS-HavenWorks-com.GIF" alt="CORPORATIONS News." nosave="" title="CORPORATIONS News. MONEY News. CORPORATE News." width="26" height="14"></a><font size="-1"><b><a href="http://havenworks.com/business">Corporate</a></b>
......@@ -4519,7 +4519,7 @@ war on drugs is a failed war," said former Brazilian President Fernando
Henrique Cardoso, in a conference call with reporters from Rio de Janeiro
[Brazil]. "We have to move from this approach to another one."" ... "The
commission, headed by Mr. Cardoso and former presidents Ernesto Zedillo
of Mexico and Csar Gaviria of Colombia, says Latin American governments
of Mexico and César Gaviria of Colombia, says Latin American governments
as well as the U.S. must break what they say is a policy "taboo" and re-examine
U.S.-inspired antidrugs efforts. The panel recommends that governments
consider measures including decriminalizing the use of marijuana." ...
......@@ -4535,9 +4535,9 @@ the violence and corruption that accompany drug trafficking." ... "The
report warned that the U.S.-style antidrug strategy was putting the region's
fragile democratic institutions at risk and corrupting "judicial systems,
governments, the political system and especially the police forces."" ...
"Latin America, he [former President of Colombia Csar Gaviria]
"Latin America, he [former President of Colombia César Gaviria]
said, should adapt a more European approach, based on treating drug addiction
as a health problem." -</font><font size="-2">By Jos de Crdoba
as a health problem." -</font><font size="-2">By José de Córdoba
with contributions by David Luhnow, Louise Radnofsky and Evan Perez</font></font><font size="-2">
-<a href="http://www.wsj.com/">WSJ.com</a></font>
<hr size="1" width="100%">
......@@ -6856,7 +6856,7 @@ an Aesthetically Challenged News Website Since 1998</font></font></b>
<br><b><font color="#ff0000">hrrmph !-) Awarded for</font> "Worst Web Site
of 2008 [1st Place]" by </b><a href="http://www.webpagesthatsuck.com/worst-web-sites-of-2008.html">WebPagesThatSuck.com</a>
<br><b>"The Web's Most Useless Sites [2nd place]" by </b><a href="http://www.pcworld.com/article/151200/the_bottom_10_the_webs_most_useless_sites.html">PCWorld</a><b>
"El peor diseo del mundo" by </b><a href="http://www.elmundo.es/elmundo/2007/11/08/catalejo/1194556949.html">elMundo.es</a>
"El peor diseño del mundo" by </b><a href="http://www.elmundo.es/elmundo/2007/11/08/catalejo/1194556949.html">elMundo.es</a>
<br><b>"The Worst Designed Site on the Web" of 2008 by </b><a href="http://digg.com/design/The_Worst_Designed_Site_on_the_Web_WTF">Digg.com</a>
<br><b>The </b><a href="http://www.bbc.co.uk/blogs/ipm/2007/11/how_not_to_design_a_website.shtml">BBC.co.uk</a><b>
asks "How not to design a website?" "It defies words" says </b><a href="http://www.bencotten.net/2008/04/16/worst-websites-of-2008-contenders/">Heather
......@@ -6897,7 +6897,7 @@ Web Design: <a href="http://havenworks.com/web-design">Web Design</a> by
<hr width="100%"></font><font face="Baskerville"><font color="#006600"><font size="-1">HavenWorks.com
content Copyright 1998-2009 Works</font></font></font></b>
<br><b><font size="-1"><font face="Baskerville"><font color="#006600">HavenWorks.com
</font></font><font face="Verdana"><font color="#009900">
</font></font><font face="Verdana"><font color="#009900">©
</font></font><font face="Baskerville"><font color="#006600">Works
- All rights reserved.
<hr width="100%"></font></font></font><font size="+2">HavenWorks.com i<font color="#000000">s
......@@ -6910,4 +6910,4 @@ Sources Intelligence Haven Works !-)
<div align="right"><b><font size="+3"><a href="#top">Top</a></font></b></div>
</body></html>
\ No newline at end of file
</body></html>