svn merge ^/branches/released .

1 files changed, 7 insertions, 7 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/no b/xorg-server/xkeyboard-config/symbols/no
index 9515be154..2dc0e6ea9 100644
--- a/xorg-server/xkeyboard-config/symbols/no
+++ b/xorg-server/xkeyboard-config/symbols/no
@@ -9,7 +9,7 @@ xkb_symbols "basic" {
 

     include "latin(type2)"

 

-    name[Group1]="Norway";

+    name[Group1]="Norwegian";

 

     key <AB09>	{ [    period,      colon, ellipsis,   periodcentered ]	};

     key <AB10>	{ [     minus, underscore,       endash,       emdash ]	};

@@ -42,7 +42,7 @@ xkb_symbols "nodeadkeys" {
 

     include "no(basic)"

 

-    name[Group1]="Norway - Eliminate dead keys";

+    name[Group1]="Norwegian (eliminate dead keys)";

 

     key <AE12>	{ [ backslash,      grave,        acute,       ogonek ]	};

     key <AD12>	{ [ diaeresis, asciicircum,   asciitilde,      macron ]	};

@@ -57,7 +57,7 @@ partial alphanumeric_keys
 xkb_symbols "dvorak" {

     include "us(dvorak)"

 

-    name[Group1]="Norway - Dvorak";

+    name[Group1]="Norwegian (Dvorak)";

 

     key <TLDE> { [	  bar,	section, brokenbar, paragraph	] };

 

@@ -118,7 +118,7 @@ partial alphanumeric_keys
 xkb_symbols "smi" {

     include "latin"

 

-    name[Group1]= "Norway - Northern Saami";

+    name[Group1]= "Northern Saami (Norway)";

 

     key <AE01>	{ [         1,     exclam,    copyright,   exclamdown ]	};

     key <AE02>	{ [         2,   quotedbl,           at,   registered ]	};

@@ -181,7 +181,7 @@ xkb_symbols "smi_nodeadkeys" {
 

     include "no(smi)"

 

-    name[Group1]= "Norway - Northern Saami, eliminate dead keys";

+    name[Group1]= "Northern Saami (Norway, eliminate dead keys)";

 

     key <AE12>	{ [ backslash,      grave,        acute,       ogonek ]	};

 };

@@ -194,7 +194,7 @@ xkb_symbols "mac" {
     // keyboard and a very simple Norwegian keybaord

 

     include "latin(type4)"

-    name[Group1]= "Norway - Macintosh";

+    name[Group1]= "Norwegian (Macintosh)";

 

     key <TLDE>	{ [       bar,    section     ]	};

     key <AE03>	{ [         3, numbersign,     sterling,     sterling ]	};

@@ -218,7 +218,7 @@ xkb_symbols "mac_nodeadkeys" {
 

     // Modifies the basic Norwegian layout to eliminate dead keys

     include "no(mac)"

-    name[Group1]= "Norway - Macintosh, eliminate dead keys";

+    name[Group1]= "Norwegian (Macintosh, eliminate dead keys)";

 

     key <AE12>	{ [      grave,     acute,        acute,       ogonek ]	};

     key <AD12>	{ [  diaeresis, asciicircum, asciitilde,       macron ]	};