Merge branch 'master' into 'caorunzhe'

# Conflicts:
#   bibliography.bib

bibliography.bib

@@ -706,7 +706,7 @@
 }
 }
 
 
 @inproceedings{DBLP:conf/acl/WangW97,
 @inproceedings{DBLP:conf/acl/WangW97,
-  author    = {Ye$\dash$Yi Wang and
+  author    = {Ye-Yi Wang and
                Alex Waibel},
                Alex Waibel},
   title     = {Decoding Algorithm in Statistical Machine Translation},
   title     = {Decoding Algorithm in Statistical Machine Translation},
   pages     = {366--372},
   pages     = {366--372},
@@ -744,7 +744,7 @@
   author    = {Philipp Koehn and
   author    = {Philipp Koehn and
                Hieu Hoang and
                Hieu Hoang and
                Alexandra Birch and
                Alexandra Birch and
-               Chris Callison$\dash$Burch and
+               Chris Callison-Burch and
                Marcello Federico and
                Marcello Federico and
                Nicola Bertoldi and
                Nicola Bertoldi and
                Brooke Cowan and
                Brooke Cowan and
@@ -1050,7 +1050,7 @@
   author    = {Kishore Papineni and
   author    = {Kishore Papineni and
                Salim Roukos and
                Salim Roukos and
                Todd Ward and
                Todd Ward and
-               Weijing Zhu},
+               Wei-jing Zhu},
   title     = {Bleu: a Method for Automatic Evaluation of Machine Translation},
   title     = {Bleu: a Method for Automatic Evaluation of Machine Translation},
   pages     = {311--318},
   pages     = {311--318},
   publisher = {{ACL}},
   publisher = {{ACL}},
@@ -1067,9 +1067,9 @@
 }
 }
 
 
 @inproceedings{DBLP:conf/coling/SuWC92,
 @inproceedings{DBLP:conf/coling/SuWC92,
-  author    = {Keh$\dash$Yih Su and
-               Ming$\dash$Wen Wu and
-               Jing$\dash$Shin Chang},
+  author    = {Keh-Yih Su and
+               Ming-Wen Wu and
+               Jing-Shin Chang},
   title     = {A New Quantitative Quality Measure for Machine Translation Systems},
   title     = {A New Quantitative Quality Measure for Machine Translation Systems},
   pages     = {433--439},
   pages     = {433--439},
   year      = {1992}
   year      = {1992}
@@ -1313,7 +1313,7 @@
 @inproceedings{DBLP:conf/interspeech/FetterDR96,
 @inproceedings{DBLP:conf/interspeech/FetterDR96,
   author    = {Pablo Fetter and
   author    = {Pablo Fetter and
                Fr{\'{e}}d{\'{e}}ric Dandurand and
                Fr{\'{e}}d{\'{e}}ric Dandurand and
-               Peter Regel$\dash$Brietzmann},
+               Peter Regel-Brietzmann},
   title     = {Word graph rescoring using confidence measures},
   title     = {Word graph rescoring using confidence measures},
   publisher = {{ISCA}},
   publisher = {{ISCA}},
   year      = {1996}
   year      = {1996}
@@ -1493,7 +1493,7 @@
   year={2006}
   year={2006}
 }
 }
 @inproceedings{DBLP:conf/wmt/Callison-BurchF07,
 @inproceedings{DBLP:conf/wmt/Callison-BurchF07,
-  author    = {Chris Callison$\dash$Burch and
+  author    = {Chris Callison-Burch and
                Cameron S. Fordyce and
                Cameron S. Fordyce and
                Philipp Koehn and
                Philipp Koehn and
                Christof Monz and
                Christof Monz and
@@ -1504,7 +1504,7 @@
   year      = {2007}
   year      = {2007}
 }
 }
 @inproceedings{DBLP:conf/wmt/Callison-BurchK12,
 @inproceedings{DBLP:conf/wmt/Callison-BurchK12,
-  author    = {Chris Callison$\dash$Burch and
+  author    = {Chris Callison-Burch and
                Philipp Koehn and
                Philipp Koehn and
                Christof Monz and
                Christof Monz and
                Matt Post and
                Matt Post and
@@ -1633,7 +1633,7 @@
   year={2006}
   year={2006}
 }
 }
 @inproceedings{DBLP:conf/acl/LoBSW14,
 @inproceedings{DBLP:conf/acl/LoBSW14,
-  author    = {Chi$\dash$kiu Lo and
+  author    = {Chi-kiu Lo and
                Meriem Beloucif and
                Meriem Beloucif and
                Markus Saers and
                Markus Saers and
                Dekai Wu},
                Dekai Wu},