1
0

patch-rules_base_extras_xml_in 29 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727728729730731732733734735736737738739740741742743744745746747748749750751752753754755756757758759760761762763764765766767768769770771772773774775776777778779780781782783784785786787788789790791792793794795796797798799800801802803804805806807808809810811812813814815816817818819820821822823824825826827828829830831832833834835836837838839840841842843844845846847848849850851852853854855
  1. --- xkeyboard-config-2.11.orig/rules/base.extras.xml.in 2013-12-24 00:48:45.000000000 +0100
  2. +++ xkeyboard-config-2.11/rules/base.extras.xml.in 2014-03-04 14:31:19.000000000 +0100
  3. @@ -1,4 +1,4 @@
  4. -<?xml version="1.0" encoding="utf-8"?>
  5. +<?xml version="1.0" encoding="UTF-8"?>
  6. <!DOCTYPE xkbConfigRegistry SYSTEM "xkb.dtd">
  7. <xkbConfigRegistry>
  8. <modelList/>
  9. @@ -6,8 +6,8 @@
  10. <layout>
  11. <configItem>
  12. <name>apl</name>
  13. - <_shortDescription>apl</_shortDescription>
  14. - <_description>APL keyboard symbols</_description>
  15. + <shortDescription>apl</shortDescription>
  16. + <description>APL keyboard symbols</description>
  17. <languageList><iso639Id>eng</iso639Id></languageList>
  18. </configItem>
  19. <variantList>
  20. @@ -58,29 +58,29 @@
  21. <layout>
  22. <configItem>
  23. <name>ca</name>
  24. - <_shortDescription>fr</_shortDescription>
  25. - <_description>French (Canada)</_description>
  26. + <shortDescription>fr</shortDescription>
  27. + <description>French (Canada)</description>
  28. <languageList><iso639Id>fra</iso639Id></languageList>
  29. </configItem>
  30. <variantList>
  31. <variant>
  32. <configItem>
  33. <name>kut</name>
  34. - <_shortDescription>kut</_shortDescription>
  35. - <_description>Kutenai</_description>
  36. + <shortDescription>kut</shortDescription>
  37. + <description>Kutenai</description>
  38. </configItem>
  39. </variant>
  40. <variant>
  41. <configItem>
  42. <name>shs</name>
  43. - <_shortDescription>shs</_shortDescription>
  44. - <_description>Secwepemctsin</_description>
  45. + <shortDescription>shs</shortDescription>
  46. + <description>Secwepemctsin</description>
  47. </configItem>
  48. </variant>
  49. <variant>
  50. <configItem>
  51. <name>sun_type6</name>
  52. - <_description>Multilingual (Canada, Sun Type 6/7)</_description>
  53. + <description>Multilingual (Canada, Sun Type 6/7)</description>
  54. </configItem>
  55. </variant>
  56. </variantList>
  57. @@ -88,8 +88,8 @@
  58. <layout>
  59. <configItem>
  60. <name>de</name>
  61. - <_shortDescription>de</_shortDescription>
  62. - <_description>German</_description>
  63. + <shortDescription>de</shortDescription>
  64. + <description>German</description>
  65. <languageList>
  66. <iso639Id>ger</iso639Id>
  67. </languageList>
  68. @@ -98,7 +98,7 @@
  69. <variant>
  70. <configItem>
  71. <name>us</name>
  72. - <_description>German (US keyboard with German letters)</_description>
  73. + <description>German (US keyboard with German letters)</description>
  74. <languageList>
  75. <iso639Id>eng</iso639Id>
  76. </languageList>
  77. @@ -107,7 +107,7 @@
  78. <variant>
  79. <configItem>
  80. <name>hu</name>
  81. - <_description>German (with Hungarian letters and no dead keys)</_description>
  82. + <description>German (with Hungarian letters and no dead keys)</description>
  83. <languageList>
  84. <iso639Id>ger</iso639Id>
  85. <iso639Id>hun</iso639Id>
  86. @@ -117,7 +117,7 @@
  87. <variant>
  88. <configItem>
  89. <name>sun_type6</name>
  90. - <_description>German (Sun Type 6/7)</_description>
  91. + <description>German (Sun Type 6/7)</description>
  92. </configItem>
  93. </variant>
  94. </variantList>
  95. @@ -125,15 +125,15 @@
  96. <layout>
  97. <configItem>
  98. <name>ir</name>
  99. - <_shortDescription>fa</_shortDescription>
  100. - <_description>Persian</_description>
  101. + <shortDescription>fa</shortDescription>
  102. + <description>Persian</description>
  103. <languageList><iso639Id>per</iso639Id></languageList>
  104. </configItem>
  105. <variantList>
  106. <variant>
  107. <configItem>
  108. <name>ave</name>
  109. - <_description>Avestan</_description>
  110. + <description>Avestan</description>
  111. <languageList><iso639Id>ave</iso639Id></languageList>
  112. </configItem>
  113. </variant>
  114. @@ -142,21 +142,21 @@
  115. <layout>
  116. <configItem>
  117. <name>lt</name>
  118. - <_shortDescription>lt</_shortDescription>
  119. - <_description>Lithuanian</_description>
  120. + <shortDescription>lt</shortDescription>
  121. + <description>Lithuanian</description>
  122. <languageList><iso639Id>lit</iso639Id></languageList>
  123. </configItem>
  124. <variantList>
  125. <variant>
  126. <configItem>
  127. <name>us_dvorak</name>
  128. - <_description>Lithuanian (US Dvorak with Lithuanian letters)</_description>
  129. + <description>Lithuanian (US Dvorak with Lithuanian letters)</description>
  130. </configItem>
  131. </variant>
  132. <variant>
  133. <configItem>
  134. <name>sun_type6</name>
  135. - <_description>Lithuanian (Sun Type 6/7)</_description>
  136. + <description>Lithuanian (Sun Type 6/7)</description>
  137. </configItem>
  138. </variant>
  139. </variantList>
  140. @@ -164,8 +164,8 @@
  141. <layout>
  142. <configItem>
  143. <name>lv</name>
  144. - <_shortDescription>lv</_shortDescription>
  145. - <_description>Latvian</_description>
  146. + <shortDescription>lv</shortDescription>
  147. + <description>Latvian</description>
  148. <languageList>
  149. <iso639Id>lav</iso639Id>
  150. </languageList>
  151. @@ -174,55 +174,55 @@
  152. <variant>
  153. <configItem>
  154. <name>dvorak</name>
  155. - <_description>Latvian (US Dvorak)</_description>
  156. + <description>Latvian (US Dvorak)</description>
  157. </configItem>
  158. </variant>
  159. <variant>
  160. <configItem>
  161. <name>ykeydvorak</name>
  162. - <_description>Latvian (US Dvorak, Y variant)</_description>
  163. + <description>Latvian (US Dvorak, Y variant)</description>
  164. </configItem>
  165. </variant>
  166. <variant>
  167. <configItem>
  168. <name>minuskeydvorak</name>
  169. - <_description>Latvian (US Dvorak, minus variant)</_description>
  170. + <description>Latvian (US Dvorak, minus variant)</description>
  171. </configItem>
  172. </variant>
  173. <variant>
  174. <configItem>
  175. <name>dvorakprogr</name>
  176. - <_description>Latvian (programmer US Dvorak)</_description>
  177. + <description>Latvian (programmer US Dvorak)</description>
  178. </configItem>
  179. </variant>
  180. <variant>
  181. <configItem>
  182. <name>ykeydvorakprogr</name>
  183. - <_description>Latvian (programmer US Dvorak, Y variant)</_description>
  184. + <description>Latvian (programmer US Dvorak, Y variant)</description>
  185. </configItem>
  186. </variant>
  187. <variant>
  188. <configItem>
  189. <name>minuskeydvorakprogr</name>
  190. - <_description>Latvian (programmer US Dvorak, minus variant)</_description>
  191. + <description>Latvian (programmer US Dvorak, minus variant)</description>
  192. </configItem>
  193. </variant>
  194. <variant>
  195. <configItem>
  196. <name>colemak</name>
  197. - <_description>Latvian (US Colemak)</_description>
  198. + <description>Latvian (US Colemak)</description>
  199. </configItem>
  200. </variant>
  201. <variant>
  202. <configItem>
  203. <name>apostrophecolemak</name>
  204. - <_description>Latvian (US Colemak, apostrophe variant)</_description>
  205. + <description>Latvian (US Colemak, apostrophe variant)</description>
  206. </configItem>
  207. </variant>
  208. <variant>
  209. <configItem>
  210. <name>sun_type6</name>
  211. - <_description>Latvian (Sun Type 6/7)</_description>
  212. + <description>Latvian (Sun Type 6/7)</description>
  213. </configItem>
  214. </variant>
  215. </variantList>
  216. @@ -230,34 +230,34 @@
  217. <layout>
  218. <configItem>
  219. <name>us</name>
  220. - <_shortDescription>en</_shortDescription>
  221. - <_description>English (US)</_description>
  222. + <shortDescription>en</shortDescription>
  223. + <description>English (US)</description>
  224. <languageList><iso639Id>eng</iso639Id></languageList>
  225. </configItem>
  226. <variantList>
  227. <variant>
  228. <configItem>
  229. <name>intl-unicode</name>
  230. - <_description>English (US, international AltGr Unicode combining)</_description>
  231. + <description>English (US, international AltGr Unicode combining)</description>
  232. </configItem>
  233. </variant>
  234. <variant>
  235. <configItem>
  236. <name>alt-intl-unicode</name>
  237. - <_description>English (US, international AltGr Unicode combining, alternative)</_description>
  238. + <description>English (US, international AltGr Unicode combining, alternative)</description>
  239. </configItem>
  240. </variant>
  241. <variant>
  242. <configItem>
  243. <name>ats</name>
  244. - <_description>Atsina</_description>
  245. - <!-- No ISO code in ISO639-2, only draft ISO693-3 -->
  246. + <description>Atsina</description>
  247. +
  248. </configItem>
  249. </variant>
  250. <variant>
  251. <configItem>
  252. <name>crd</name>
  253. - <_description>Coeur d'Alene Salish</_description>
  254. + <description>Coeur d'Alene Salish</description>
  255. <languageList><iso639Id>crd</iso639Id></languageList>
  256. </configItem>
  257. </variant>
  258. @@ -274,13 +274,13 @@
  259. <variant>
  260. <configItem>
  261. <name>sun_type6</name>
  262. - <_description>English (US, Sun Type 6/7)</_description>
  263. + <description>English (US, Sun Type 6/7)</description>
  264. </configItem>
  265. </variant>
  266. <variant>
  267. <configItem>
  268. <name>norman</name>
  269. - <_description>English (Norman)</_description>
  270. + <description>English (Norman)</description>
  271. </configItem>
  272. </variant>
  273. </variantList>
  274. @@ -288,27 +288,27 @@
  275. <layout>
  276. <configItem>
  277. <name>pl</name>
  278. - <_shortDescription>pl</_shortDescription>
  279. - <_description>Polish</_description>
  280. + <shortDescription>pl</shortDescription>
  281. + <description>Polish</description>
  282. <languageList><iso639Id>pol</iso639Id></languageList>
  283. </configItem>
  284. <variantList>
  285. <variant>
  286. <configItem>
  287. <name>intl</name>
  288. - <_description>Polish (international with dead keys)</_description>
  289. + <description>Polish (international with dead keys)</description>
  290. </configItem>
  291. </variant>
  292. <variant>
  293. <configItem>
  294. <name>colemak</name>
  295. - <_description>Polish (Colemak)</_description>
  296. + <description>Polish (Colemak)</description>
  297. </configItem>
  298. </variant>
  299. <variant>
  300. <configItem>
  301. <name>sun_type6</name>
  302. - <_description>Polish (Sun Type 6/7)</_description>
  303. + <description>Polish (Sun Type 6/7)</description>
  304. </configItem>
  305. </variant>
  306. </variantList>
  307. @@ -316,16 +316,16 @@
  308. <layout>
  309. <configItem>
  310. <name>ro</name>
  311. - <_shortDescription>ro</_shortDescription>
  312. - <_description>Romanian</_description>
  313. + <shortDescription>ro</shortDescription>
  314. + <description>Romanian</description>
  315. <languageList><iso639Id>rum</iso639Id></languageList>
  316. </configItem>
  317. <variantList>
  318. <variant>
  319. <configItem>
  320. <name>crh_dobruja</name>
  321. - <_shortDescription>crh</_shortDescription>
  322. - <_description>Crimean Tatar (Dobruja Q)</_description>
  323. + <shortDescription>crh</shortDescription>
  324. + <description>Crimean Tatar (Dobruja Q)</description>
  325. <languageList>
  326. <iso639Id>crh</iso639Id>
  327. </languageList>
  328. @@ -334,13 +334,13 @@
  329. <variant>
  330. <configItem>
  331. <name>ergonomic</name>
  332. - <_description>Romanian (ergonomic Touchtype)</_description>
  333. + <description>Romanian (ergonomic Touchtype)</description>
  334. </configItem>
  335. </variant>
  336. <variant>
  337. <configItem>
  338. <name>sun_type6</name>
  339. - <_description>Romanian (Sun Type 6/7)</_description>
  340. + <description>Romanian (Sun Type 6/7)</description>
  341. </configItem>
  342. </variant>
  343. </variantList>
  344. @@ -348,15 +348,15 @@
  345. <layout>
  346. <configItem>
  347. <name>rs</name>
  348. - <_shortDescription>sr</_shortDescription>
  349. - <_description>Serbian</_description>
  350. + <shortDescription>sr</shortDescription>
  351. + <description>Serbian</description>
  352. <languageList><iso639Id>srp</iso639Id></languageList>
  353. </configItem>
  354. <variantList>
  355. <variant>
  356. <configItem>
  357. <name>combiningkeys</name>
  358. - <_description>Serbian (combining accents instead of dead keys)</_description>
  359. + <description>Serbian (combining accents instead of dead keys)</description>
  360. </configItem>
  361. </variant>
  362. </variantList>
  363. @@ -364,8 +364,8 @@
  364. <layout>
  365. <configItem>
  366. <name>ru</name>
  367. - <_shortDescription>ru</_shortDescription>
  368. - <_description>Russian</_description>
  369. + <shortDescription>ru</shortDescription>
  370. + <description>Russian</description>
  371. </configItem>
  372. <variantList>
  373. <variant>
  374. @@ -378,8 +378,8 @@
  375. <variant>
  376. <configItem>
  377. <name>ruu</name>
  378. - <_shortDescription>ru</_shortDescription>
  379. - <_description>Russian (with Ukrainian-Belorussian layout)</_description>
  380. + <shortDescription>ru</shortDescription>
  381. + <description>Russian (with Ukrainian-Belorussian layout)</description>
  382. <languageList><iso639Id>rus</iso639Id>
  383. <iso639Id>ukr</iso639Id>
  384. <iso639Id>bel</iso639Id></languageList>
  385. @@ -388,7 +388,7 @@
  386. <variant>
  387. <configItem>
  388. <name>sun_type6</name>
  389. - <_description>Russian (Sun Type 6/7)</_description>
  390. + <description>Russian (Sun Type 6/7)</description>
  391. </configItem>
  392. </variant>
  393. </variantList>
  394. @@ -396,8 +396,8 @@
  395. <layout>
  396. <configItem>
  397. <name>am</name>
  398. - <_shortDescription>hy</_shortDescription>
  399. - <_description>Armenian</_description>
  400. + <shortDescription>hy</shortDescription>
  401. + <description>Armenian</description>
  402. <languageList>
  403. <iso639Id>hye</iso639Id>
  404. </languageList>
  405. @@ -406,7 +406,7 @@
  406. <variant>
  407. <configItem>
  408. <name>olpc-phonetic</name>
  409. - <_description>Armenian (OLPC phonetic)</_description>
  410. + <description>Armenian (OLPC phonetic)</description>
  411. </configItem>
  412. </variant>
  413. </variantList>
  414. @@ -414,15 +414,15 @@
  415. <layout>
  416. <configItem>
  417. <name>il</name>
  418. - <_shortDescription>he</_shortDescription>
  419. - <_description>Hebrew</_description>
  420. + <shortDescription>he</shortDescription>
  421. + <description>Hebrew</description>
  422. <languageList><iso639Id>heb</iso639Id></languageList>
  423. </configItem>
  424. <variantList>
  425. <variant>
  426. <configItem>
  427. <name>biblicalSIL</name>
  428. - <_description>Hebrew (Biblical, SIL phonetic)</_description>
  429. + <description>Hebrew (Biblical, SIL phonetic)</description>
  430. <languageList><iso639Id>heb</iso639Id></languageList>
  431. </configItem>
  432. </variant>
  433. @@ -431,14 +431,14 @@
  434. <layout>
  435. <configItem>
  436. <name>ara</name>
  437. - <_shortDescription>ar</_shortDescription>
  438. - <_description>Arabic</_description>
  439. + <shortDescription>ar</shortDescription>
  440. + <description>Arabic</description>
  441. </configItem>
  442. <variantList>
  443. <variant>
  444. <configItem>
  445. <name>sun_type6</name>
  446. - <_description>Arabic (Sun Type 6/7)</_description>
  447. + <description>Arabic (Sun Type 6/7)</description>
  448. </configItem>
  449. </variant>
  450. </variantList>
  451. @@ -446,14 +446,14 @@
  452. <layout>
  453. <configItem>
  454. <name>be</name>
  455. - <_shortDescription>be</_shortDescription>
  456. - <_description>Belgian</_description>
  457. + <shortDescription>be</shortDescription>
  458. + <description>Belgian</description>
  459. </configItem>
  460. <variantList>
  461. <variant>
  462. <configItem>
  463. <name>sun_type6</name>
  464. - <_description>Belgian (Sun Type 6/7)</_description>
  465. + <description>Belgian (Sun Type 6/7)</description>
  466. </configItem>
  467. </variant>
  468. </variantList>
  469. @@ -461,14 +461,14 @@
  470. <layout>
  471. <configItem>
  472. <name>br</name>
  473. - <_shortDescription>pt</_shortDescription>
  474. - <_description>Portuguese (Brazil)</_description>
  475. + <shortDescription>pt</shortDescription>
  476. + <description>Portuguese (Brazil)</description>
  477. </configItem>
  478. <variantList>
  479. <variant>
  480. <configItem>
  481. <name>sun_type6</name>
  482. - <_description>Portuguese (Brazil, Sun Type 6/7)</_description>
  483. + <description>Portuguese (Brazil, Sun Type 6/7)</description>
  484. </configItem>
  485. </variant>
  486. </variantList>
  487. @@ -476,14 +476,14 @@
  488. <layout>
  489. <configItem>
  490. <name>cz</name>
  491. - <_shortDescription>cs</_shortDescription>
  492. - <_description>Czech</_description>
  493. + <shortDescription>cs</shortDescription>
  494. + <description>Czech</description>
  495. </configItem>
  496. <variantList>
  497. <variant>
  498. <configItem>
  499. <name>sun_type6</name>
  500. - <_description>Czech (Sun Type 6/7)</_description>
  501. + <description>Czech (Sun Type 6/7)</description>
  502. </configItem>
  503. </variant>
  504. </variantList>
  505. @@ -491,14 +491,14 @@
  506. <layout>
  507. <configItem>
  508. <name>dk</name>
  509. - <_shortDescription>da</_shortDescription>
  510. - <_description>Danish</_description>
  511. + <shortDescription>da</shortDescription>
  512. + <description>Danish</description>
  513. </configItem>
  514. <variantList>
  515. <variant>
  516. <configItem>
  517. <name>sun_type6</name>
  518. - <_description>Danish (Sun Type 6/7)</_description>
  519. + <description>Danish (Sun Type 6/7)</description>
  520. </configItem>
  521. </variant>
  522. </variantList>
  523. @@ -506,14 +506,14 @@
  524. <layout>
  525. <configItem>
  526. <name>nl</name>
  527. - <_shortDescription>nl</_shortDescription>
  528. - <_description>Dutch</_description>
  529. + <shortDescription>nl</shortDescription>
  530. + <description>Dutch</description>
  531. </configItem>
  532. <variantList>
  533. <variant>
  534. <configItem>
  535. <name>sun_type6</name>
  536. - <_description>Dutch (Sun Type 6/7)</_description>
  537. + <description>Dutch (Sun Type 6/7)</description>
  538. </configItem>
  539. </variant>
  540. </variantList>
  541. @@ -521,14 +521,14 @@
  542. <layout>
  543. <configItem>
  544. <name>ee</name>
  545. - <_shortDescription>et</_shortDescription>
  546. - <_description>Estonian</_description>
  547. + <shortDescription>et</shortDescription>
  548. + <description>Estonian</description>
  549. </configItem>
  550. <variantList>
  551. <variant>
  552. <configItem>
  553. <name>sun_type6</name>
  554. - <_description>Estonian (Sun Type 6/7)</_description>
  555. + <description>Estonian (Sun Type 6/7)</description>
  556. </configItem>
  557. </variant>
  558. </variantList>
  559. @@ -536,14 +536,14 @@
  560. <layout>
  561. <configItem>
  562. <name>fi</name>
  563. - <_shortDescription>fi</_shortDescription>
  564. - <_description>Finnish</_description>
  565. + <shortDescription>fi</shortDescription>
  566. + <description>Finnish</description>
  567. </configItem>
  568. <variantList>
  569. <variant>
  570. <configItem>
  571. <name>sun_type6</name>
  572. - <_description>Finnish (Sun Type 6/7)</_description>
  573. + <description>Finnish (Sun Type 6/7)</description>
  574. </configItem>
  575. </variant>
  576. </variantList>
  577. @@ -551,14 +551,14 @@
  578. <layout>
  579. <configItem>
  580. <name>fr</name>
  581. - <_shortDescription>fr</_shortDescription>
  582. - <_description>French</_description>
  583. + <shortDescription>fr</shortDescription>
  584. + <description>French</description>
  585. </configItem>
  586. <variantList>
  587. <variant>
  588. <configItem>
  589. <name>sun_type6</name>
  590. - <_description>French (Sun Type 6/7)</_description>
  591. + <description>French (Sun Type 6/7)</description>
  592. </configItem>
  593. </variant>
  594. </variantList>
  595. @@ -566,14 +566,14 @@
  596. <layout>
  597. <configItem>
  598. <name>gr</name>
  599. - <_shortDescription>gr</_shortDescription>
  600. - <_description>Greek</_description>
  601. + <shortDescription>gr</shortDescription>
  602. + <description>Greek</description>
  603. </configItem>
  604. <variantList>
  605. <variant>
  606. <configItem>
  607. <name>sun_type6</name>
  608. - <_description>Greek (Sun Type 6/7)</_description>
  609. + <description>Greek (Sun Type 6/7)</description>
  610. </configItem>
  611. </variant>
  612. </variantList>
  613. @@ -581,14 +581,14 @@
  614. <layout>
  615. <configItem>
  616. <name>it</name>
  617. - <_shortDescription>it</_shortDescription>
  618. - <_description>Italian</_description>
  619. + <shortDescription>it</shortDescription>
  620. + <description>Italian</description>
  621. </configItem>
  622. <variantList>
  623. <variant>
  624. <configItem>
  625. <name>sun_type6</name>
  626. - <_description>Italian (Sun Type 6/7)</_description>
  627. + <description>Italian (Sun Type 6/7)</description>
  628. </configItem>
  629. </variant>
  630. </variantList>
  631. @@ -596,26 +596,26 @@
  632. <layout>
  633. <configItem>
  634. <name>jp</name>
  635. - <_shortDescription>ja</_shortDescription>
  636. - <_description>Japanese</_description>
  637. + <shortDescription>ja</shortDescription>
  638. + <description>Japanese</description>
  639. </configItem>
  640. <variantList>
  641. <variant>
  642. <configItem>
  643. <name>sun_type6</name>
  644. - <_description>Japanese (Sun Type 6)</_description>
  645. + <description>Japanese (Sun Type 6)</description>
  646. </configItem>
  647. </variant>
  648. <variant>
  649. <configItem>
  650. <name>sun_type7</name>
  651. - <_description>Japanese (Sun Type 7 - pc compatible)</_description>
  652. + <description>Japanese (Sun Type 7 - pc compatible)</description>
  653. </configItem>
  654. </variant>
  655. <variant>
  656. <configItem>
  657. <name>sun_type7_suncompat</name>
  658. - <_description>Japanese (Sun Type 7 - sun compatible)</_description>
  659. + <description>Japanese (Sun Type 7 - sun compatible)</description>
  660. </configItem>
  661. </variant>
  662. </variantList>
  663. @@ -623,14 +623,14 @@
  664. <layout>
  665. <configItem>
  666. <name>no</name>
  667. - <_shortDescription>no</_shortDescription>
  668. - <_description>Norwegian</_description>
  669. + <shortDescription>no</shortDescription>
  670. + <description>Norwegian</description>
  671. </configItem>
  672. <variantList>
  673. <variant>
  674. <configItem>
  675. <name>sun_type6</name>
  676. - <_description>Norwegian (Sun Type 6/7)</_description>
  677. + <description>Norwegian (Sun Type 6/7)</description>
  678. </configItem>
  679. </variant>
  680. </variantList>
  681. @@ -638,14 +638,14 @@
  682. <layout>
  683. <configItem>
  684. <name>pt</name>
  685. - <_shortDescription>pt</_shortDescription>
  686. - <_description>Portuguese</_description>
  687. + <shortDescription>pt</shortDescription>
  688. + <description>Portuguese</description>
  689. </configItem>
  690. <variantList>
  691. <variant>
  692. <configItem>
  693. <name>sun_type6</name>
  694. - <_description>Portuguese (Sun Type 6/7)</_description>
  695. + <description>Portuguese (Sun Type 6/7)</description>
  696. </configItem>
  697. </variant>
  698. </variantList>
  699. @@ -653,14 +653,14 @@
  700. <layout>
  701. <configItem>
  702. <name>sk</name>
  703. - <_shortDescription>sk</_shortDescription>
  704. - <_description>Slovak</_description>
  705. + <shortDescription>sk</shortDescription>
  706. + <description>Slovak</description>
  707. </configItem>
  708. <variantList>
  709. <variant>
  710. <configItem>
  711. <name>sun_type6</name>
  712. - <_description>Slovak (Sun Type 6/7)</_description>
  713. + <description>Slovak (Sun Type 6/7)</description>
  714. </configItem>
  715. </variant>
  716. </variantList>
  717. @@ -668,14 +668,14 @@
  718. <layout>
  719. <configItem>
  720. <name>es</name>
  721. - <_shortDescription>es</_shortDescription>
  722. - <_description>Spanish</_description>
  723. + <shortDescription>es</shortDescription>
  724. + <description>Spanish</description>
  725. </configItem>
  726. <variantList>
  727. <variant>
  728. <configItem>
  729. <name>sun_type6</name>
  730. - <_description>Spanish (Sun Type 6/7)</_description>
  731. + <description>Spanish (Sun Type 6/7)</description>
  732. </configItem>
  733. </variant>
  734. </variantList>
  735. @@ -683,14 +683,14 @@
  736. <layout>
  737. <configItem>
  738. <name>se</name>
  739. - <_shortDescription>sv</_shortDescription>
  740. - <_description>Swedish</_description>
  741. + <shortDescription>sv</shortDescription>
  742. + <description>Swedish</description>
  743. </configItem>
  744. <variantList>
  745. <variant>
  746. <configItem>
  747. <name>sun_type6</name>
  748. - <_description>Swedish (Sun Type 6/7)</_description>
  749. + <description>Swedish (Sun Type 6/7)</description>
  750. </configItem>
  751. </variant>
  752. </variantList>
  753. @@ -698,20 +698,20 @@
  754. <layout>
  755. <configItem>
  756. <name>ch</name>
  757. - <_shortDescription>de</_shortDescription>
  758. - <_description>German (Switzerland)</_description>
  759. + <shortDescription>de</shortDescription>
  760. + <description>German (Switzerland)</description>
  761. </configItem>
  762. <variantList>
  763. <variant>
  764. <configItem>
  765. <name>sun_type6_de</name>
  766. - <_description>German (Switzerland, Sun Type 6/7)</_description>
  767. + <description>German (Switzerland, Sun Type 6/7)</description>
  768. </configItem>
  769. </variant>
  770. <variant>
  771. <configItem>
  772. <name>sun_type6_fr</name>
  773. - <_description>French (Switzerland, Sun Type 6/7)</_description>
  774. + <description>French (Switzerland, Sun Type 6/7)</description>
  775. </configItem>
  776. </variant>
  777. </variantList>
  778. @@ -719,14 +719,14 @@
  779. <layout>
  780. <configItem>
  781. <name>tr</name>
  782. - <_shortDescription>tr</_shortDescription>
  783. - <_description>Turkish</_description>
  784. + <shortDescription>tr</shortDescription>
  785. + <description>Turkish</description>
  786. </configItem>
  787. <variantList>
  788. <variant>
  789. <configItem>
  790. <name>sun_type6</name>
  791. - <_description>Turkish (Sun Type 6/7)</_description>
  792. + <description>Turkish (Sun Type 6/7)</description>
  793. </configItem>
  794. </variant>
  795. </variantList>
  796. @@ -734,14 +734,14 @@
  797. <layout>
  798. <configItem>
  799. <name>ua</name>
  800. - <_shortDescription>uk</_shortDescription>
  801. - <_description>Ukrainian</_description>
  802. + <shortDescription>uk</shortDescription>
  803. + <description>Ukrainian</description>
  804. </configItem>
  805. <variantList>
  806. <variant>
  807. <configItem>
  808. <name>sun_type6</name>
  809. - <_description>Ukrainian (Sun Type 6/7)</_description>
  810. + <description>Ukrainian (Sun Type 6/7)</description>
  811. </configItem>
  812. </variant>
  813. </variantList>
  814. @@ -749,14 +749,14 @@
  815. <layout>
  816. <configItem>
  817. <name>gb</name>
  818. - <_shortDescription>en</_shortDescription>
  819. - <_description>English (UK)</_description>
  820. + <shortDescription>en</shortDescription>
  821. + <description>English (UK)</description>
  822. </configItem>
  823. <variantList>
  824. <variant>
  825. <configItem>
  826. <name>sun_type6</name>
  827. - <_description>English (UK, Sun Type 6/7)</_description>
  828. + <description>English (UK, Sun Type 6/7)</description>
  829. </configItem>
  830. </variant>
  831. </variantList>
  832. @@ -764,18 +764,18 @@
  833. <layout>
  834. <configItem>
  835. <name>kr</name>
  836. - <_shortDescription>ko</_shortDescription>
  837. - <_description>Korean</_description>
  838. + <shortDescription>ko</shortDescription>
  839. + <description>Korean</description>
  840. </configItem>
  841. <variantList>
  842. <variant>
  843. <configItem>
  844. <name>sun_type6</name>
  845. - <_description>Korean (Sun Type 6/7)</_description>
  846. + <description>Korean (Sun Type 6/7)</description>
  847. </configItem>
  848. </variant>
  849. </variantList>
  850. </layout>
  851. </layoutList>
  852. <optionList/>
  853. -</xkbConfigRegistry>
  854. +</xkbConfigRegistry>
  855. \ No newline at end of file