Mercurial > hg > openttd
changeset 14121:e4f70b58d783 draft
(svn r18668) -Fix [FS#3450]: the space between the S and X of OS X should be a non-breaking one
line wrap: on
line diff
--- a/src/lang/afrikaans.txt +++ b/src/lang/afrikaans.txt @@ -1369,7 +1369,7 @@ STR_OSNAME_WINDOWS :Windows STR_OSNAME_DOS :DOS STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS X +STR_OSNAME_OSX :OS{NBSP}X STR_OSNAME_BEOS :BeOS STR_OSNAME_HAIKU :Haiku STR_OSNAME_MORPHOS :MorphOS
--- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -1336,7 +1336,7 @@ STR_OSNAME_WINDOWS :Windows STR_OSNAME_DOS :DOS STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS X +STR_OSNAME_OSX :OS{NBSP}X STR_OSNAME_BEOS :BeOS STR_OSNAME_HAIKU :Haiku STR_OSNAME_MORPHOS :MorphOS
--- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -1368,7 +1368,7 @@ STR_OSNAME_WINDOWS :Windows STR_OSNAME_DOS :DOS STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS X +STR_OSNAME_OSX :OS{NBSP}X STR_OSNAME_BEOS :BeOS STR_OSNAME_HAIKU :Haiku STR_OSNAME_MORPHOS :MorphOS
--- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -1452,7 +1452,7 @@ STR_OSNAME_WINDOWS :Windows STR_OSNAME_DOS :DOS STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS X +STR_OSNAME_OSX :OS{NBSP}X STR_OSNAME_BEOS :BeOS STR_OSNAME_HAIKU :Haiku STR_OSNAME_MORPHOS :MorphOS
--- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -1429,7 +1429,7 @@ STR_OSNAME_WINDOWS :Windows STR_OSNAME_DOS :DOS STR_OSNAME_UNIX :Unixu -STR_OSNAME_OSX :OS X +STR_OSNAME_OSX :OS{NBSP}X STR_OSNAME_BEOS :BeOS STR_OSNAME_HAIKU :Haiku STR_OSNAME_MORPHOS :MorphOS
--- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -1366,7 +1366,7 @@ STR_OSNAME_WINDOWS :Windows STR_OSNAME_DOS :DOS STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS X +STR_OSNAME_OSX :OS{NBSP}X STR_OSNAME_BEOS :BeOS STR_OSNAME_HAIKU :Haiku STR_OSNAME_MORPHOS :MorphOS
--- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -1368,7 +1368,7 @@ STR_OSNAME_WINDOWS :Windows STR_OSNAME_DOS :DOS STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS X +STR_OSNAME_OSX :OS{NBSP}X STR_OSNAME_BEOS :BeOS STR_OSNAME_HAIKU :Haiku STR_OSNAME_MORPHOS :MorphOS
--- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -1372,7 +1372,7 @@ STR_OSNAME_WINDOWS :Windows STR_OSNAME_DOS :DOS STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS X +STR_OSNAME_OSX :OS{NBSP}X STR_OSNAME_BEOS :BeOS STR_OSNAME_HAIKU :Haiku STR_OSNAME_MORPHOS :MorphOS
--- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -1335,7 +1335,7 @@ STR_OSNAME_WINDOWS :Windows STR_OSNAME_DOS :DOS STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS X +STR_OSNAME_OSX :OS{NBSP}X STR_OSNAME_BEOS :BeOS STR_OSNAME_HAIKU :Haiku STR_OSNAME_MORPHOS :MorphOS
--- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -1315,7 +1315,7 @@ STR_OSNAME_WINDOWS :Vindozo STR_OSNAME_DOS :DOS STR_OSNAME_UNIX :Unikso -STR_OSNAME_OSX :OS X +STR_OSNAME_OSX :OS{NBSP}X STR_OSNAME_BEOS :BeOS STR_OSNAME_HAIKU :Haiku STR_OSNAME_MORPHOS :MorphOS
--- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -1392,7 +1392,7 @@ STR_OSNAME_WINDOWS :Windows STR_OSNAME_DOS :DOS STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS X +STR_OSNAME_OSX :OS{NBSP}X STR_OSNAME_BEOS :BeOS STR_OSNAME_HAIKU :Haiku STR_OSNAME_MORPHOS :MorphOS
--- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -1368,7 +1368,7 @@ STR_OSNAME_WINDOWS :Windows STR_OSNAME_DOS :DOS STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS X +STR_OSNAME_OSX :OS{NBSP}X STR_OSNAME_BEOS :BeOS STR_OSNAME_HAIKU :Haiku STR_OSNAME_MORPHOS :MorphOS
--- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -1369,7 +1369,7 @@ STR_OSNAME_WINDOWS :Windows STR_OSNAME_DOS :DOS STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS X +STR_OSNAME_OSX :OS{NBSP}X STR_OSNAME_BEOS :BeOS STR_OSNAME_HAIKU :Haiku STR_OSNAME_MORPHOS :MorphOS
--- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -1308,7 +1308,7 @@ STR_OSNAME_WINDOWS :Windows STR_OSNAME_DOS :DOS STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS X +STR_OSNAME_OSX :OS{NBSP}X STR_OSNAME_BEOS :BeOS STR_OSNAME_MORPHOS :MorphOS STR_OSNAME_AMIGAOS :AmigaOS
--- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -1369,7 +1369,7 @@ STR_OSNAME_WINDOWS :Windows STR_OSNAME_DOS :DOS STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS X +STR_OSNAME_OSX :OS{NBSP}X STR_OSNAME_BEOS :BeOS STR_OSNAME_HAIKU :Haiku STR_OSNAME_MORPHOS :MorphOS
--- a/src/lang/greek.txt +++ b/src/lang/greek.txt @@ -1448,7 +1448,7 @@ STR_OSNAME_WINDOWS :Windows STR_OSNAME_DOS :DOS STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS X +STR_OSNAME_OSX :OS{NBSP}X STR_OSNAME_BEOS :BeOS STR_OSNAME_HAIKU :Haiku STR_OSNAME_MORPHOS :MorphOS
--- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -1402,7 +1402,7 @@ STR_OSNAME_WINDOWS :Windows STR_OSNAME_DOS :DOS STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS X +STR_OSNAME_OSX :OS{NBSP}X STR_OSNAME_BEOS :BeOS STR_OSNAME_HAIKU :Haiku STR_OSNAME_MORPHOS :MorphOS
--- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -1328,7 +1328,7 @@ STR_OSNAME_WINDOWS :Windows STR_OSNAME_DOS :DOS STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS X +STR_OSNAME_OSX :OS{NBSP}X STR_OSNAME_BEOS :BeOS STR_OSNAME_MORPHOS :MorphOS STR_OSNAME_AMIGAOS :AmigaOS
--- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -1368,7 +1368,7 @@ STR_OSNAME_WINDOWS :Windows STR_OSNAME_DOS :DOS STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS X +STR_OSNAME_OSX :OS{NBSP}X STR_OSNAME_BEOS :BeOS STR_OSNAME_HAIKU :Haiku STR_OSNAME_MORPHOS :MorphOS
--- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -1370,7 +1370,7 @@ STR_OSNAME_WINDOWS :Windows STR_OSNAME_DOS :DOS STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS X +STR_OSNAME_OSX :OS{NBSP}X STR_OSNAME_BEOS :BeOS STR_OSNAME_HAIKU :Haiku STR_OSNAME_MORPHOS :MorphOS
--- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -1297,7 +1297,7 @@ STR_OSNAME_WINDOWS :Windows STR_OSNAME_DOS :DOS STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS X +STR_OSNAME_OSX :OS{NBSP}X STR_OSNAME_BEOS :BeOS STR_OSNAME_MORPHOS :MorphOS STR_OSNAME_AMIGAOS :AmigaOS
--- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -1369,7 +1369,7 @@ STR_OSNAME_WINDOWS :{G=f}윈도우 STR_OSNAME_DOS :{G=f}DOS STR_OSNAME_UNIX :{G=f}Unix -STR_OSNAME_OSX :{G=f}OS X +STR_OSNAME_OSX :{G=f}OS{NBSP}X STR_OSNAME_BEOS :{G=f}BeOS STR_OSNAME_HAIKU :Haiku STR_OSNAME_MORPHOS :{G=f}MorphOS
--- a/src/lang/latvian.txt +++ b/src/lang/latvian.txt @@ -1336,7 +1336,7 @@ STR_OSNAME_WINDOWS :Windows STR_OSNAME_DOS :DOS STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS X +STR_OSNAME_OSX :OS{NBSP}X STR_OSNAME_BEOS :BeOS STR_OSNAME_MORPHOS :MorphOS STR_OSNAME_AMIGAOS :AmigaOS
--- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -1364,7 +1364,7 @@ STR_OSNAME_WINDOWS :Windows STR_OSNAME_DOS :DOS STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS X +STR_OSNAME_OSX :OS{NBSP}X STR_OSNAME_BEOS :BeOS STR_OSNAME_HAIKU :Haiku STR_OSNAME_MORPHOS :MorphOS
--- a/src/lang/luxembourgish.txt +++ b/src/lang/luxembourgish.txt @@ -1324,7 +1324,7 @@ STR_OSNAME_WINDOWS :Windows STR_OSNAME_DOS :DOS STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS X +STR_OSNAME_OSX :OS{NBSP}X STR_OSNAME_BEOS :BeOS STR_OSNAME_MORPHOS :MorphOS STR_OSNAME_AMIGAOS :AmigaOS
--- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -1368,7 +1368,7 @@ STR_OSNAME_WINDOWS :Windows STR_OSNAME_DOS :DOS STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS X +STR_OSNAME_OSX :OS{NBSP}X STR_OSNAME_BEOS :BeOS STR_OSNAME_HAIKU :Haiku STR_OSNAME_MORPHOS :MorphOS
--- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -1369,7 +1369,7 @@ STR_OSNAME_WINDOWS :Windows STR_OSNAME_DOS :DOS STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS X +STR_OSNAME_OSX :OS{NBSP}X STR_OSNAME_BEOS :BeOS STR_OSNAME_HAIKU :Haiku STR_OSNAME_MORPHOS :MorphOS
--- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -1746,7 +1746,7 @@ STR_OSNAME_WINDOWS :Windows STR_OSNAME_DOS :DOS STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS X +STR_OSNAME_OSX :OS{NBSP}X STR_OSNAME_BEOS :BeOS STR_OSNAME_HAIKU :Haiku STR_OSNAME_MORPHOS :MorphOS
--- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -1368,7 +1368,7 @@ STR_OSNAME_WINDOWS :Windows STR_OSNAME_DOS :DOS STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS X +STR_OSNAME_OSX :OS{NBSP}X STR_OSNAME_BEOS :BeOS STR_OSNAME_HAIKU :Haiku STR_OSNAME_MORPHOS :MorphOS
--- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -1368,7 +1368,7 @@ STR_OSNAME_WINDOWS :Windows STR_OSNAME_DOS :DOS STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS X +STR_OSNAME_OSX :OS{NBSP}X STR_OSNAME_BEOS :BeOS STR_OSNAME_HAIKU :Haiku STR_OSNAME_MORPHOS :MorphOS
--- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -1521,7 +1521,7 @@ STR_OSNAME_WINDOWS :Windows STR_OSNAME_DOS :DOS STR_OSNAME_UNIX :Unix/Linux -STR_OSNAME_OSX :OS X +STR_OSNAME_OSX :OS{NBSP}X STR_OSNAME_BEOS :BeOS STR_OSNAME_HAIKU :Haiku STR_OSNAME_MORPHOS :MorphOS
--- a/src/lang/serbian.txt +++ b/src/lang/serbian.txt @@ -1553,7 +1553,7 @@ STR_OSNAME_WINDOWS :Windows STR_OSNAME_DOS :DOS STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS X +STR_OSNAME_OSX :OS{NBSP}X STR_OSNAME_BEOS :BeOS STR_OSNAME_HAIKU :Haiku STR_OSNAME_MORPHOS :MorphOS
--- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -1335,7 +1335,7 @@ STR_OSNAME_WINDOWS :Windows STR_OSNAME_DOS :DOS STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS X +STR_OSNAME_OSX :OS{NBSP}X STR_OSNAME_BEOS :BeOS STR_OSNAME_HAIKU :Haiku STR_OSNAME_MORPHOS :MorphOS
--- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -1404,7 +1404,7 @@ STR_OSNAME_WINDOWS :Windows STR_OSNAME_DOS :DOS STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS X +STR_OSNAME_OSX :OS{NBSP}X STR_OSNAME_BEOS :BeOS STR_OSNAME_HAIKU :Haiku STR_OSNAME_MORPHOS :MorphOS
--- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -1369,7 +1369,7 @@ STR_OSNAME_WINDOWS :Windows STR_OSNAME_DOS :DOS STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS X +STR_OSNAME_OSX :OS{NBSP}X STR_OSNAME_BEOS :BeOS STR_OSNAME_MORPHOS :MorphOS STR_OSNAME_AMIGAOS :AmigaOS
--- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -1369,7 +1369,7 @@ STR_OSNAME_WINDOWS :Windows STR_OSNAME_DOS :DOS STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS X +STR_OSNAME_OSX :OS{NBSP}X STR_OSNAME_BEOS :BeOS STR_OSNAME_HAIKU :Haiku STR_OSNAME_MORPHOS :MorphOS
--- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -1368,7 +1368,7 @@ STR_OSNAME_WINDOWS :Windows STR_OSNAME_DOS :DOS STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS X +STR_OSNAME_OSX :OS{NBSP}X STR_OSNAME_BEOS :BeOS STR_OSNAME_HAIKU :Haiku STR_OSNAME_MORPHOS :MorphOS
--- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -1348,7 +1348,7 @@ STR_OSNAME_WINDOWS :Windows STR_OSNAME_DOS :DOS STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS X +STR_OSNAME_OSX :OS{NBSP}X STR_OSNAME_BEOS :BeOS STR_OSNAME_HAIKU :Haiku STR_OSNAME_MORPHOS :MorphOS
--- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -1336,7 +1336,7 @@ STR_OSNAME_WINDOWS :Windows STR_OSNAME_DOS :DOS STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS X +STR_OSNAME_OSX :OS{NBSP}X STR_OSNAME_BEOS :BeOS STR_OSNAME_HAIKU :Haiku STR_OSNAME_MORPHOS :MorphOS
--- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -1493,7 +1493,7 @@ STR_OSNAME_WINDOWS :Windows STR_OSNAME_DOS :DOS STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS X +STR_OSNAME_OSX :OS{NBSP}X STR_OSNAME_BEOS :BeOS STR_OSNAME_HAIKU :Haiku STR_OSNAME_MORPHOS :MorphOS
--- a/src/lang/unfinished/basque.txt +++ b/src/lang/unfinished/basque.txt @@ -842,7 +842,7 @@ STR_OSNAME_WINDOWS :Windows STR_OSNAME_DOS :DOS STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS X +STR_OSNAME_OSX :OS{NBSP}X STR_OSNAME_BEOS :BeOS STR_OSNAME_HAIKU :Haiku STR_OSNAME_MORPHOS :MorphOS
--- a/src/lang/unfinished/frisian.txt +++ b/src/lang/unfinished/frisian.txt @@ -872,7 +872,7 @@ STR_OSNAME_WINDOWS :Windows STR_OSNAME_DOS :DOS STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS X +STR_OSNAME_OSX :OS{NBSP}X STR_OSNAME_BEOS :BeOS STR_OSNAME_HAIKU :Haiku STR_OSNAME_MORPHOS :MorphOS
--- a/src/lang/unfinished/macedonian.txt +++ b/src/lang/unfinished/macedonian.txt @@ -677,7 +677,7 @@ # Supported OSes STR_OSNAME_WINDOWS :Windows STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS X +STR_OSNAME_OSX :OS{NBSP}X STR_OSNAME_BEOS :BeOS STR_OSNAME_MORPHOS :MorphOS STR_OSNAME_AMIGAOS :AmigaOS
--- a/src/lang/unfinished/malay.txt +++ b/src/lang/unfinished/malay.txt @@ -861,7 +861,7 @@ STR_OSNAME_WINDOWS :Windows STR_OSNAME_DOS :DOS STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS X +STR_OSNAME_OSX :OS{NBSP}X STR_OSNAME_BEOS :BeOS STR_OSNAME_MORPHOS :MorphOS STR_OSNAME_AMIGAOS :AmigaOS
--- a/src/lang/unfinished/persian.txt +++ b/src/lang/unfinished/persian.txt @@ -754,7 +754,7 @@ STR_OSNAME_WINDOWS :Windows STR_OSNAME_DOS :DOS STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS X +STR_OSNAME_OSX :OS{NBSP}X STR_OSNAME_BEOS :BeOS STR_OSNAME_MORPHOS :MorphOS STR_OSNAME_AMIGAOS :AmigaOS
--- a/src/lang/unfinished/thai.txt +++ b/src/lang/unfinished/thai.txt @@ -928,7 +928,7 @@ STR_OSNAME_WINDOWS :Windows STR_OSNAME_DOS :DOS STR_OSNAME_UNIX :Unix -STR_OSNAME_OSX :OS X +STR_OSNAME_OSX :OS{NBSP}X STR_OSNAME_BEOS :BeOS STR_OSNAME_HAIKU :ระบบปฏิบัติการ Haiku STR_OSNAME_MORPHOS :MorphOS