- merged from DEVEL

Changed files:
    XTerm.ad-pl -> 1.16
    oclock.desktop -> 1.10
    xcalc.desktop -> 1.5
    xclipboard.desktop -> 1.11
    xclock.desktop -> 1.7
    xconsole.desktop -> 1.12
    xedit.desktop -> 1.8
    xeyes.desktop -> 1.7
    xload.desktop -> 1.4
    xmag.desktop -> 1.4
    xterm.desktop -> 1.11

diff --git a/XTerm.ad-pl b/XTerm.ad-pl
index 5e0d6fa7319bcf168785a909e1bdcb781a573f23..9b4e2c1968fe7905b4a6cbdbc5fb1a485df6fc74 100644 (file)
--- a/XTerm.ad-pl
+++ b/XTerm.ad-pl
@@ -169,6 +169,8 @@ NXTerm.JoinSession:                 False
        <Key>KP_Subtract: string(-)\n\
        Shift<Key>KP_Home: scroll-back(100,page)\n\
        Shift<Key>KP_End: scroll-forw(100,page)\n\
+       <Key>KP_Home: string(0x1b) string("[H")\n\
+       <Key>KP_End: string(0x1b) string("[F")\n\
        Shift<Key>Prior:scroll-back(1,page)\n\
        Shift<Key>Next:scroll-forw(1,page)\n\
        <Key>F16: start-extend() select-end(PRIMARY, CUT_BUFFER0, CLIPBOARD)\n\
@@ -177,8 +179,12 @@ NXTerm.JoinSession:                        False
        <Key>R13: scroll-forw(100,page)\n\
        Ctrl<Key>Home: string(0x1b) string("[1;5H")\n\
        Shift<Key>Home: string(0x1b) string("[1;2H")\n\
+       ~Meta<Key>Home: string(0x1b) string("[H")\n\
+       Meta<Key>Home: string(0x1b) string(0x1b) string("[H")\n\
        Ctrl<Key>End: string(0x1b) string("[1;5F")\n\
        Shift<Key>End: string(0x1b) string("[1;2F")\n\
+       ~Meta<Key>End: string(0x1b) string("[F")\n\
+       Meta<Key>End: string(0x1b) string(0x1b) string("[F")\n\
        Ctrl<Key>Insert: string(0x1b) string("[2;5~")\n\
        Shift<Key>Insert: string(0x1b) string("[2;2~")\n\
        ~Meta<Key>Insert: string(0x1b) string("[2~")\n\
@@ -208,19 +214,15 @@ NXTerm.JoinSession:                       False
        Ctrl Shift<Key>Left: string(0x1b) string("[1;6D")\n\
        Ctrl<Key>Left: string(0x1b) string("[1;5D")\n\
        Shift<Key>Left: string(0x1b) string("O2D")\n\
-       Mod5<Key>Left: string(0x1b) string("b")\n\
        ~Meta<Key>Left: string(0x1b) string("OD")\n\
        Meta<Key>Left: string(0x1b) string(0x1b) string("OD")\n\
        Ctrl Shift<Key>Right: string(0x1b) string("[1;6C")\n\
        Ctrl<Key>Right: string(0x1b) string("[1;5C")\n\
        Shift<Key>Right: string(0x1b) string("O2C")\n\
-       Mod5<Key>Right: string(0x1b) string("f")\n\
        ~Meta<Key>Right: string(0x1b) string("OC")\n\
        Meta<Key>Right: string(0x1b) string(0x1b) string("OC")\n\
        ~Meta<Key>Return: string(0x0d)\n\
        Meta<Key>Return: string(0x1b) string(0x0d)\n\
-       Ctrl<Key>Tab: string(0x1b) string(0x09)\n\
-       Mod5<Key>Tab: string(0x1b) string(0x09)\n\
        ~Meta<Key>Tab: string(0x09)\n\
        Meta<Key>Tab: string(0x1b) string(0x09)\n\
        ~s<Key>F1: string(0x1b) string("[11~")\n\
@@ -258,7 +260,6 @@ NXTerm.JoinSession:                 False
        a<Key>space: string(0x1b) string(" ")\n\
        a s<Key>question: string(0x1b) string("?")\n\
        a s<Key>exclam: string(0x1b) string("!")\n\
-       a<Key>`: string(0x1b) string("`")\n\
        a<Key>1: string(0x1b) string("1")\n\
        a<Key>2: string(0x1b) string("2")\n\
        a<Key>3: string(0x1b) string("3")\n\

diff --git a/oclock.desktop b/oclock.desktop
index 75b7f9f38d1e24bf3843e6a0565fcbb60517ee44..4f41c6fa54d625d69d21e07ee7b32148a76e1d1f 100644 (file)
--- a/oclock.desktop
+++ b/oclock.desktop
@@ -36,9 +36,9 @@ Comment[it]=Orologio
 Comment[ja]=時計
 Comment[lt]=Laikrodis
 Comment[lv]=Pulkstenis
-Comment[nb]=Rund klokke
 Comment[nl]=Klok
 Comment[nn]=Klokke
+Comment[no]=Rund klokke
 Comment[pl]=Okrągły zegar
 Comment[pt]=Relógio
 Comment[pt_BR]=Relógio
@@ -61,5 +61,5 @@ Exec=oclock
 Terminal=false
 Icon=oclock.png
 Type=Application
-Categories=Utility;Clock;
+Categories=Utility;X-X11;
 # vi: encoding=utf-8

diff --git a/xcalc.desktop b/xcalc.desktop
index e808211fe2baaa7948fcb4222c4a7850a8b05a14..0bbcbaf8e0746a30b636ecee694eb78fe81c07b4 100644 (file)
--- a/xcalc.desktop
+++ b/xcalc.desktop
@@ -8,5 +8,5 @@ GenericName[pl]=Kalkulator
 Exec=xcalc
 Icon=xcalc
 Type=Application
-Categories=Utility;Calculator;
+Categories=Utility;Calculator;X-X11;
 # vi: encoding=utf-8

diff --git a/xclipboard.desktop b/xclipboard.desktop
index 1b69e52f48a3d2494c5ef3a385f7ab8bbdf3660b..a096e71e1b19384b5a833e8ac38fe0bab63f55fc 100644 (file)
--- a/xclipboard.desktop
+++ b/xclipboard.desktop
@@ -21,7 +21,7 @@ Name[it]=Appunti di X
 Name[ko]=X용 클립보드
 Name[lv]=X Starpliktuve
 Name[mk]=X инсерти
-Name[nb]=X-utklippstavle
+Name[no]=X-utklippstavle
 Name[oc]=Tapissaria X
 Name[pl]=X schowek
 Name[pt]=Área de Transferência X
@@ -64,8 +64,8 @@ Comment[ja]=クリップボードビューア
 Comment[lt]=Laikinos talpyklės žiūriklis
 Comment[lv]=Starpliktuves Skatītājs
 Comment[nl]=klembordweergaveprogramma
-Comment[nb]=Fremviser for utklippstavlen
 Comment[nn]=Utklippstavlevisar
+Comment[no]=Fremviser for utklippstavlen
 Comment[pl]=Przeglądarka schowka dla X11
 Comment[pt]=Visualizador da área de tranferência do X
 Comment[pt_BR]=Visualizador da área de transferência do X
@@ -88,5 +88,5 @@ Exec=xclipboard
 Icon=xclipboard.png
 Type=Application
 Terminal=false
-Categories=Utility;
+Categories=Utility;X-X11;
 # vi: encoding=utf-8

diff --git a/xclock.desktop b/xclock.desktop
index b224efd086f7ceaf3dbc3ef4206c413c33b47288..13b0fdfce05f5bbe5a6ac0db71a3332093b26e52 100644 (file)
--- a/xclock.desktop
+++ b/xclock.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 SwallowTitle=xclock
-SwallowTitle[nb]=xclock
+SwallowTitle[no]=xclock
 SwallowTitle[pl]=xclock
 SwallowExec=xclock -padding 0
 Name=X Clock
@@ -26,8 +26,8 @@ Name[ko]=X용 시계
 Name[lv]=X Pulkstenis
 Name[mi]=Karaka X
 Name[mk]=X часовник
-Name[nb]=X-klokke
 Name[nn]=X-klokke
+Name[no]=X-klokke
 Name[oc]=orlotge X
 Name[pl]=X zegar
 Name[pt]=Relógio X
@@ -68,9 +68,9 @@ Comment[it]=Orologio
 Comment[ja]=時計
 Comment[lt]=Laikrodis
 Comment[lv]=Pulkstenis
-Comment[nb]=Rund klokke
 Comment[nl]=klok
 Comment[nn]=Klokke
+Comment[no]=Rund klokke
 Comment[pl]=Zegar
 Comment[pt]=Relógio
 Comment[pt_BR]=Relógio
@@ -94,5 +94,5 @@ Exec=xclock
 Icon=xclock.png
 Terminal=false
 Type=Application
-Categories=Utility;Clock;
+Categories=Utility;Clock;X-X11;
 # vi: encoding=utf-8

diff --git a/xconsole.desktop b/xconsole.desktop
index 0d5bad421865769115c96118b8dfe6a2fa5df7ee..9b7e6e6513655040227e34c6ddcbcb275f9c3bba 100644 (file)
--- a/xconsole.desktop
+++ b/xconsole.desktop
@@ -9,7 +9,7 @@ Name[hr]=X konzola
 Name[hu]=X konzol
 Name[is]=X kerfisskjár
 Name[it]=Console di X
-Name[nb]=X-konsoll
+Name[no]=X-konsoll
 Name[pl]=X Konsola
 Name[pt]=Consola X
 Name[pt_BR]=Console X
@@ -29,7 +29,7 @@ Comment[hr]=X konzola
 Comment[hu]=X konzol néző
 Comment[is]=xconsole:  Birta skilaboð send til kerfisskjás
 Comment[it]=Console per Xwin
-Comment[nb]=X-konsoll
+Comment[no]=X-konsoll
 Comment[pl]=X Konsola
 Comment[pt]=Consola X
 Comment[pt_BR]=Console X
@@ -43,6 +43,6 @@ Icon=xconsole.png
 TerminalOptions=
 Terminal=false
 Type=Application
-Categories=System;
+Categories=Utility;X-X11;
 Encoding=UTF-8
 # vi: encoding=utf-8

diff --git a/xedit.desktop b/xedit.desktop
index c72b7b615de3fa8aa470a4f197e3fe6c4c20856f..9fed2ffea708b185e6a52fa15c8eb113bc56bf86 100644 (file)
--- a/xedit.desktop
+++ b/xedit.desktop
@@ -19,8 +19,8 @@ Name[it]=Editor X
 Name[ko]=X용 편집기
 Name[lv]=X Redaktors
 Name[mi]=Kaiwhakatika X
-Name[nb]=X-redigerer
 Name[nn]=X-redigering
+Name[no]=X-redigerer
 Name[oc]=Editor X
 Name[pl]=X edytor
 Name[pt]=Editor X
@@ -59,9 +59,9 @@ Comment[ja]=テキストエディタ
 Comment[lt]=Teksto redaktorius
 Comment[lv]=Teksta Redaktors
 Comment[mt]=Editur tat-test
-Comment[nb]=Tekstredigerer
 Comment[nl]=teksteditor
 Comment[nn]=Skriveprogram
+Comment[no]=Tekstredigerer
 Comment[pl]=Edytor tekstowy
 Comment[pt]=Editor de Texto
 Comment[pt_BR]=Editor de Texto
@@ -84,5 +84,5 @@ Exec=xedit
 Icon=xedit.png
 Type=Application
 Terminal=false
-Categories=Utility;TextEditor;
+Categories=Utility;TextEditor;X-X11;
 # vi: encoding=utf-8

diff --git a/xeyes.desktop b/xeyes.desktop
index 76716a9b122538ae040de6ba9642c1780eb63926..a697294e849a7bb72fd74a37172d20eefad19602 100644 (file)
--- a/xeyes.desktop
+++ b/xeyes.desktop
@@ -18,8 +18,8 @@ Name[ko]=눈
 Name[lv]=X Acis
 Name[mi]=Whatu X
 Name[mk]=X очи
-Name[nb]=X-øyne
 Name[nn]=X-auge
+Name[no]=X-øyne
 Name[pl]=X oczy
 Name[pt]=Olhos X
 Name[ro]=Ochi

diff --git a/xload.desktop b/xload.desktop
index 84046ca8903b5759e2987960386485a384ea060d..324133cee8d384b4f22513aa55f8366417f88cf8 100644 (file)
--- a/xload.desktop
+++ b/xload.desktop
@@ -8,5 +8,5 @@ Exec=xload
 Icon=xload
 SwallowExec=xload -nolabel -fg green -bg Black -hl red -update 3 -geometry 25x25
 Type=Application
-Categories=System;Monitor;
+Categories=Utility;X-X11;
 # vi: encoding=utf-8

diff --git a/xmag.desktop b/xmag.desktop
index cfbdda1b4bfe57c07095fc98e5b8757a92805c25..0910591af23574d49313c719387dfff93410a0bb 100644 (file)
--- a/xmag.desktop
+++ b/xmag.desktop
@@ -8,5 +8,5 @@ GenericName=Desktop Magnifier
 Exec=xmag
 Icon=xmag
 Type=Application
-Categories=Utility;Accessibility;
+Categories=Utility;X-X11;
 # vi: encoding=utf-8

diff --git a/xterm.desktop b/xterm.desktop
index 4a4aca4e6fedc882ded8adb4d4837acc28f01c05..6dae046219e1d6b8eac60836885576e1570d5572 100644 (file)
--- a/xterm.desktop
+++ b/xterm.desktop
@@ -11,7 +11,7 @@ Comment[fr]=Emulateur de terminal xterm
 Comment[hu]=X terminál
 Comment[is]=xterm:  X skjáhermir
 Comment[it]=Terminale per X Window
-Comment[nb]=X-terminal
+Comment[no]=X-terminal
 Comment[pl]=Emulator terminala dla X11
 Comment[pt]=Terminal X
 Comment[pt_BR]=Terminal X