~ubuntu-branches/ubuntu/trusty/xkeyboard-config/trusty-proposed

« back to all changes in this revision

Viewing changes to symbols/br

  • Committer: Bazaar Package Importer
  • Author(s): Bryce Harrington
  • Date: 2011-02-01 11:57:39 UTC
  • mfrom: (12.2.7 experimental)
  • Revision ID: james.westby@ubuntu.com-20110201115739-6kl4l72rx5l7zjc0
Tags: 2.1-1ubuntu1
* Merge from debian of 2.1 release.
  - Fixes Ubuntu bugs:
    + Sindhi keyboard layout (locale: sd_PK, sd_IN) (LP: #588918)
    + Fix conflict between Mali and Malayalam layouts (LP: #575660)
    + Support for Philippines "National Keyboard Layout" (LP: #672881)
    + Support for Kinesis keyboard geometry (LP: #393887)
    + Support for Apple Aluminium keyboards (LP: #696232)
    + Support for abnt2 keyboard, thinkpad variant for Lenovo 3000 v100
      laptops (LP: #359719)
    + Fix CapsLock misspelling (LP: #592448)
  - Remaining Ubuntu changes:
    + xkb-data-i18n.install, xkb-data.install, rules: Split out
      xkb-data-i18n to be used by console-setup.
    + rules: Generate pot file for translations during build
    + 104_macbook_expose_and_dashboard.patch: Add keycode definitions
        required for Apples Expose & Dashboard keys (F3/F4).
    + 105_intelligent_keyboard.patch: Add support for the Intelligent
      Keyboard K04
    + 107_lao.patch: New keyboard layout for Lao, implemented as
      an alternative to the default one.
    + 108_taiwan.patch: New keyboard layouts for Taiwan.
* Drop 102_mac_aliases.patch: This appears to have some side effects,
  and the patch was not taken by upstream because it was an incomplete
  fix.  Reopens bug 327963
* Drop patches included in the new upstream release:
    - 106_fixspell3d.patch: upstream
    - 109_mali.patch: upstream
    - 110_variants-cleanup.patch
    - 111_il-missing-symbol.patch
    - 112_zero-with-spacing.patch
    - 113_cz-dvorak-ucw.patch
    - 114_ejn_4_level.patch
    - 115_aluminium_geometries.patch
    - 116_aluminium_keycodes.patch
    - 117_aluminium_symbols.patch
    - 118_aluminium_aliases.patch
    - 119_aluminium_pc_compat.patch
    - 120_aluminium_rules.patch
    - 121_tamil_chars.patch
    - 122_olpc-azerty.patch
    - 123_fix_i18n.patch
    - 124_serbian_ru_level3.patch
    - 125_mapping_tools_launch5_menukb.patch
    - 126_swahili_arabic.patch
    - 127_restore_gb_colemak.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
44
44
 
45
45
    key <AB11>  { [     slash,   question,       degree, questiondown ] };
46
46
 
47
 
    key <KPPT>  { [ KP_Decimal ]        };
 
47
    modifier_map Mod3   { Scroll_Lock };
48
48
 
49
49
    include "kpdl(comma)"
50
50
 
187
187
 
188
188
    key <SPCE> { [        space,           space,         nobreakspace,     nobreakspace ] };
189
189
 
190
 
// Configures the "." and the "," for the numeric keypad
191
 
    key <KPPT> { [ KP_Decimal              ] };
 
190
// Configures the "," for the numeric keypad
192
191
    include "kpdl(comma)"
193
192
 
194
193
// Configures the use of the AltGr key
268
267
 
269
268
    key <SPCE> { [        space,           space,         nobreakspace,     nobreakspace ] };
270
269
 
271
 
// Configures the "." and the "," for the numeric keypad
272
 
    key <KPPT> { [ KP_Decimal              ] };
 
270
// Configures the "," for the numeric keypad
273
271
    include "kpdl(comma)"
274
272
 
275
273
// Configures the use of the AltGr key