From 28a5c22e4f39bc987d0b01553a64a873f9f8814c Mon Sep 17 00:00:00 2001
From: vdhoeven <vdhoeven@64cb5145-927a-446d-8aed-2fb7b4773692>
Date: Mon, 14 Dec 2009 13:24:16 +0000
Subject: [PATCH] Shorthand -> shortcut

git-svn-id: svn://svn.savannah.gnu.org/texmacs/trunk@2887 64cb5145-927a-446d-8aed-2fb7b4773692
---
 src/TeXmacs/langs/natural/dic/english-czech.scm      | 2 +-
 src/TeXmacs/langs/natural/dic/english-danish.scm     | 2 +-
 src/TeXmacs/langs/natural/dic/english-dutch.scm      | 2 +-
 src/TeXmacs/langs/natural/dic/english-finnish.scm    | 2 +-
 src/TeXmacs/langs/natural/dic/english-french.scm     | 2 +-
 src/TeXmacs/langs/natural/dic/english-german.scm     | 2 +-
 src/TeXmacs/langs/natural/dic/english-greek.scm      | 2 +-
 src/TeXmacs/langs/natural/dic/english-hungarian.scm  | 2 +-
 src/TeXmacs/langs/natural/dic/english-italian.scm    | 2 +-
 src/TeXmacs/langs/natural/dic/english-new.scm        | 2 +-
 src/TeXmacs/langs/natural/dic/english-polish.scm     | 2 +-
 src/TeXmacs/langs/natural/dic/english-portuguese.scm | 2 +-
 src/TeXmacs/langs/natural/dic/english-romanian.scm   | 2 +-
 src/TeXmacs/langs/natural/dic/english-russian.scm    | 2 +-
 src/TeXmacs/langs/natural/dic/english-slovene.scm    | 2 +-
 src/TeXmacs/langs/natural/dic/english-spanish.scm    | 2 +-
 src/TeXmacs/langs/natural/dic/english-taiwanese.scm  | 2 +-
 src/TeXmacs/langs/natural/dic/english-ukrainian.scm  | 2 +-
 src/src/Edit/Interface/edit_interface.hpp            | 2 +-
 src/src/Edit/Interface/edit_keyboard.cpp             | 6 +++---
 20 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/TeXmacs/langs/natural/dic/english-czech.scm b/src/TeXmacs/langs/natural/dic/english-czech.scm
index 7213c91c..07fa991d 100644
--- a/src/TeXmacs/langs/natural/dic/english-czech.scm
+++ b/src/TeXmacs/langs/natural/dic/english-czech.scm
@@ -597,7 +597,7 @@
 ("keyboard" "klávesnice")
 ("keyboard equivalent" "klávesová zkratka")
 ("keyboard modifiers" "klávesové modifikátory")
-("keyboard shorthand" "klávesová zkratka")
+("keyboard shortcut" "klávesová zkratka")
 ("keymaps" "mapování kláves")
 ("keyword" "klí£ové slovo")
 ("keywords" "klí£ová slova")
diff --git a/src/TeXmacs/langs/natural/dic/english-danish.scm b/src/TeXmacs/langs/natural/dic/english-danish.scm
index 0d2b47ed..e205352f 100644
--- a/src/TeXmacs/langs/natural/dic/english-danish.scm
+++ b/src/TeXmacs/langs/natural/dic/english-danish.scm
@@ -600,7 +600,7 @@
 ("keyboard" "tastatur")
 ("keyboard equivalent" "tastaturgenvej")
 ("keyboard modifiers" "kombitaster")
-("keyboard shorthand" "tastaturgenvej")
+("keyboard shortcut" "tastaturgenvej")
 ("keymaps" "tastaturlayout")
 ("keyword" "nøgleord")
 ("keywords" "nøgleord")
diff --git a/src/TeXmacs/langs/natural/dic/english-dutch.scm b/src/TeXmacs/langs/natural/dic/english-dutch.scm
index d9b0e005..784e48dc 100644
--- a/src/TeXmacs/langs/natural/dic/english-dutch.scm
+++ b/src/TeXmacs/langs/natural/dic/english-dutch.scm
@@ -719,7 +719,7 @@
 ("keyboard" "toetsenbord")
 ("keyboard equivalent" "via toetsenbord")
 ("keyboard modifiers" "toetsenbordwijzigingen")
-("keyboard shorthand" "toetsenbordafkorting")
+("keyboard shortcut" "toetsenbordafkorting")
 ("keymaps" "toetsenbord")
 ("keyword" "sleutelwoord")
 ("keywords" "sleutelwoorden")
diff --git a/src/TeXmacs/langs/natural/dic/english-finnish.scm b/src/TeXmacs/langs/natural/dic/english-finnish.scm
index 32932d2d..8542cab0 100644
--- a/src/TeXmacs/langs/natural/dic/english-finnish.scm
+++ b/src/TeXmacs/langs/natural/dic/english-finnish.scm
@@ -586,7 +586,7 @@
 ("keyboard" "näppäimistö")
 ("keyboard equivalent" "vastine näppäimistöllä")
 ("keyboard modifiers" "näppäinmuuntimet")
-("keyboard shorthand" "näppäimistölyhenne")
+("keyboard shortcut" "näppäimistölyhenne")
 ("keymaps" "näppäinkartat")
 ("keyword" "avainsana")
 ("keywords" "avainsanat")
diff --git a/src/TeXmacs/langs/natural/dic/english-french.scm b/src/TeXmacs/langs/natural/dic/english-french.scm
index e11cb64d..676008c0 100644
--- a/src/TeXmacs/langs/natural/dic/english-french.scm
+++ b/src/TeXmacs/langs/natural/dic/english-french.scm
@@ -724,7 +724,7 @@ dans la pr
 ("keyboard" "clavier")
 ("keyboard equivalent" "raccourci clavier")
 ("keyboard modifiers" "modificateurs de clavier")
-("keyboard shorthand" "raccourci clavier")
+("keyboard shortcut" "raccourci clavier")
 ("keymaps" "claviers")
 ("keyword" "mot-clef")
 ("keywords" "mots-clefs")
diff --git a/src/TeXmacs/langs/natural/dic/english-german.scm b/src/TeXmacs/langs/natural/dic/english-german.scm
index f16a4d9a..61a92cb3 100644
--- a/src/TeXmacs/langs/natural/dic/english-german.scm
+++ b/src/TeXmacs/langs/natural/dic/english-german.scm
@@ -660,7 +660,7 @@
 ("keyboard" "Tastatur")
 ("keyboard equivalent" "Tastenkombination")
 ("keyboard modifiers" "Tastatur-Modifikator")
-("keyboard shorthand" "Tastenkombination")
+("keyboard shortcut" "Tastenkombination")
 ("keymaps" "Tastatur Mappings")
 ("keyword" "Stichwort")
 ("keywords" "Stichworte")
diff --git a/src/TeXmacs/langs/natural/dic/english-greek.scm b/src/TeXmacs/langs/natural/dic/english-greek.scm
index cda620ae..572449f7 100644
--- a/src/TeXmacs/langs/natural/dic/english-greek.scm
+++ b/src/TeXmacs/langs/natural/dic/english-greek.scm
@@ -503,7 +503,7 @@
 ("justify text" "ðëÞñçò åõèõãñÜììéóç êåéìÝíïõ")
 ("keyboard" "ðëçêôñïëüãéï")
 ("keyboard equivalent" "áíôßóôïé÷ï ðëÞêôñï")
-("keyboard shorthand" "ðëÞêôñï óõíôüìåõóçò")
+("keyboard shortcut" "ðëÞêôñï óõíôüìåõóçò")
 ("keymaps" "keymaps")
 ("kill" "åîïõäåôÝñùóç")
 ("known bugs" "ãíùóôÜ bugs")
diff --git a/src/TeXmacs/langs/natural/dic/english-hungarian.scm b/src/TeXmacs/langs/natural/dic/english-hungarian.scm
index e50c1c17..e3b59ee8 100644
--- a/src/TeXmacs/langs/natural/dic/english-hungarian.scm
+++ b/src/TeXmacs/langs/natural/dic/english-hungarian.scm
@@ -757,7 +757,7 @@ veg m
 ("keyboard" "billenty¶zet")
 ("keyboard equivalent" "megfelel® billenty¶")
 ("keyboard modifiers" "billenty¶módosítók")
-("keyboard shorthand" "gyorsbillenty¶k")
+("keyboard shortcut" "gyorsbillenty¶k")
 ("keymaps" "billenty¶kiosztások")
 ("keyword" "kulcsszó")
 ("keywords" "kulcsszavak")
diff --git a/src/TeXmacs/langs/natural/dic/english-italian.scm b/src/TeXmacs/langs/natural/dic/english-italian.scm
index e5ad0a31..2a104c70 100644
--- a/src/TeXmacs/langs/natural/dic/english-italian.scm
+++ b/src/TeXmacs/langs/natural/dic/english-italian.scm
@@ -598,7 +598,7 @@
 ("keyboard" "tastiera")
 ("keyboard equivalent" "equivalente da tastiera")
 ("keyboard modifiers" "modificatori da tastiera")
-("keyboard shorthand" "scorciatoia da tastiera")
+("keyboard shortcut" "scorciatoia da tastiera")
 ("keymaps" "mappe di tastiera")
 ("keyword" "parola chiave")
 ("keywords" "parole chiave")
diff --git a/src/TeXmacs/langs/natural/dic/english-new.scm b/src/TeXmacs/langs/natural/dic/english-new.scm
index 13c74df8..6aac1afe 100644
--- a/src/TeXmacs/langs/natural/dic/english-new.scm
+++ b/src/TeXmacs/langs/natural/dic/english-new.scm
@@ -712,7 +712,7 @@
 ("keyboard" "")
 ("keyboard equivalent" "")
 ("keyboard modifiers" "")
-("keyboard shorthand" "")
+("keyboard shortcut" "")
 ("keymaps" "")
 ("keyword" "")
 ("keywords" "")
diff --git a/src/TeXmacs/langs/natural/dic/english-polish.scm b/src/TeXmacs/langs/natural/dic/english-polish.scm
index 6bd90907..54c780d4 100644
--- a/src/TeXmacs/langs/natural/dic/english-polish.scm
+++ b/src/TeXmacs/langs/natural/dic/english-polish.scm
@@ -605,7 +605,7 @@
 ("keyboard" "klawiatura")
 ("keyboard equivalent" "skrót klawiszowy")
 ("keyboard modifiers" "modyfikatory klawiatury")
-("keyboard shorthand" "skrót klawiszowy")
+("keyboard shortcut" "skrót klawiszowy")
 ("keymaps" "mapa klawiszy")
 ("keyword" "sªowo kluczowe")
 ("keywords" "sªowa kluczowe")
diff --git a/src/TeXmacs/langs/natural/dic/english-portuguese.scm b/src/TeXmacs/langs/natural/dic/english-portuguese.scm
index ef7a1b21..840cbad1 100644
--- a/src/TeXmacs/langs/natural/dic/english-portuguese.scm
+++ b/src/TeXmacs/langs/natural/dic/english-portuguese.scm
@@ -588,7 +588,7 @@
 ("keyboard" "teclado")
 ("keyboard equivalent" "equivalente do teclado")
 ("keyboard modifiers" "modificadores do teclado")
-("keyboard shorthand" "atalho do teclado")
+("keyboard shortcut" "atalho do teclado")
 ("keymaps" "mapa de teclado")
 ("keyword" "palavra chave")
 ("keywords" "palavras chaves")
diff --git a/src/TeXmacs/langs/natural/dic/english-romanian.scm b/src/TeXmacs/langs/natural/dic/english-romanian.scm
index 290ecea4..262ae38c 100644
--- a/src/TeXmacs/langs/natural/dic/english-romanian.scm
+++ b/src/TeXmacs/langs/natural/dic/english-romanian.scm
@@ -598,7 +598,7 @@
 ("keyboard" "tastatur ")
 ("keyboard equivalent" "echivalent tastatur ")
 ("keyboard modifiers" "modoficatori de tastatur ")
-("keyboard shorthand" "scurt tur ")
+("keyboard shortcut" "scurt tur ")
 ("keymaps" "tastaturi")
 ("keyword" "cuvânt cheie")
 ("keywords" "cuvinte cheie")
diff --git a/src/TeXmacs/langs/natural/dic/english-russian.scm b/src/TeXmacs/langs/natural/dic/english-russian.scm
index c1beec5f..ab209efb 100644
--- a/src/TeXmacs/langs/natural/dic/english-russian.scm
+++ b/src/TeXmacs/langs/natural/dic/english-russian.scm
@@ -656,7 +656,7 @@
 ("keyboard" "êëàâèàòóðà")
 ("keyboard equivalent" "êëàâèàòóðíûé ýêâèâàëåíò")
 ("keyboard modifiers" "êëàâèàòóðíûå ìîäèôèêàòîðû")
-("keyboard shorthand" "êëàâèàòóðíîå ñîêðàùåíèå")
+("keyboard shortcut" "êëàâèàòóðíîå ñîêðàùåíèå")
 ("keymaps" "keymaps")
 ("keyword" "êëþ÷åâîå ñëîâî")
 ("keywords" "êëþ÷åâûå ñëîâà")
diff --git a/src/TeXmacs/langs/natural/dic/english-slovene.scm b/src/TeXmacs/langs/natural/dic/english-slovene.scm
index bf9b56a1..2e613c91 100644
--- a/src/TeXmacs/langs/natural/dic/english-slovene.scm
+++ b/src/TeXmacs/langs/natural/dic/english-slovene.scm
@@ -665,7 +665,7 @@
 ("justify text" "poravnaj besedilo obojestransko")
 ("keyboard equivalent" "ekvivalent na tipkovnici")
 ("keyboard modifiers" "modifikator tipkovnice")
-("keyboard shorthand" "okraj²ava na tipkovnici")
+("keyboard shortcut" "okraj²ava na tipkovnici")
 ("keyboard" "tipkovnica")
 ("keymaps" "razporeditve tipk")
 ("key" "tipka")
diff --git a/src/TeXmacs/langs/natural/dic/english-spanish.scm b/src/TeXmacs/langs/natural/dic/english-spanish.scm
index 45241cf7..0bac0e59 100644
--- a/src/TeXmacs/langs/natural/dic/english-spanish.scm
+++ b/src/TeXmacs/langs/natural/dic/english-spanish.scm
@@ -622,7 +622,7 @@
 ("keyboard" "teclado")
 ("keyboard equivalent" "equivalencia de teclado")
 ("keyboard modifiers" "modificadores de teclado")
-("keyboard shorthand" "atajo de teclado")
+("keyboard shortcut" "atajo de teclado")
 ("keymaps" "disposición del teclado")
 ("keyword" "palabra clave")
 ("keywords" "palabras clave")
diff --git a/src/TeXmacs/langs/natural/dic/english-taiwanese.scm b/src/TeXmacs/langs/natural/dic/english-taiwanese.scm
index af9af682..b64637c0 100644
--- a/src/TeXmacs/langs/natural/dic/english-taiwanese.scm
+++ b/src/TeXmacs/langs/natural/dic/english-taiwanese.scm
@@ -663,7 +663,7 @@ general public license 授權.")
 ("keyboard" "鍵盤")
 ("keyboard equivalent" "")
 ("keyboard modifiers" "")
-("keyboard shorthand" "")
+("keyboard shortcut" "")
 ("keymaps" "")
 ("keyword" "關鍵字")
 ("keywords" "關鍵語")
diff --git a/src/TeXmacs/langs/natural/dic/english-ukrainian.scm b/src/TeXmacs/langs/natural/dic/english-ukrainian.scm
index 93554ee8..400d3cc7 100644
--- a/src/TeXmacs/langs/natural/dic/english-ukrainian.scm
+++ b/src/TeXmacs/langs/natural/dic/english-ukrainian.scm
@@ -587,7 +587,7 @@
 ("justify text" "âèðiâíÿòè òåêñò")
 ("keyboard equivalent" "êëàâiàòóðíèé åêâiâàëåíò")
 ("keyboard modifiers" "ìîäèôiêàòîðè êëàâiàòóðè")
-("keyboard shorthand" "êëàâiàòóðíå ñêîðî÷åííÿ")
+("keyboard shortcut" "êëàâiàòóðíå ñêîðî÷åííÿ")
 ("keyboard" "êëàâiàòóðà")
 ("keymaps" "ìàïè êëàâiø")
 ("keywords" "êëþ÷îâi ñëîâà")
diff --git a/src/src/Edit/Interface/edit_interface.hpp b/src/src/Edit/Interface/edit_interface.hpp
index 05cf7d88..5f992ea7 100644
--- a/src/src/Edit/Interface/edit_interface.hpp
+++ b/src/src/Edit/Interface/edit_interface.hpp
@@ -32,7 +32,7 @@ protected:
   time_t        next_animate;  // time for next animation
   bool          full_screen;   // full screen mode ?
   bool          got_focus;     // do we have keyboard focus ?
-  string        sh_s;          // current string for shorthands
+  string        sh_s;          // current string for shortcuts
   double        sh_mark;       // 0 or mark for undoing shortcut
   widget        popup_win;     // the current popup window
   string        message_l;     // a left message to display
diff --git a/src/src/Edit/Interface/edit_keyboard.cpp b/src/src/Edit/Interface/edit_keyboard.cpp
index c7b73871..1831b244 100644
--- a/src/src/Edit/Interface/edit_keyboard.cpp
+++ b/src/src/Edit/Interface/edit_keyboard.cpp
@@ -26,7 +26,7 @@ edit_interface_rep::get_input_mode () {
 void
 edit_interface_rep::set_input_mode (int mode) {
   interrupt_shortcut ();
-  // avoids keyboard shorthands when using the menu between two keystrokes
+  // avoids keyboard shortcuts when using the menu between two keystrokes
 
   if ((mode == INPUT_NORMAL) && (input_mode != INPUT_NORMAL)) {
     selection_cancel ();
@@ -96,8 +96,8 @@ edit_interface_rep::try_shortcut (string comb) {
     mark_start (sh_mark);
     string rew= sv->kbd_post_rewrite (sh_s);
     if (N(help)>0) set_message (help, rew);
-    else if (shorth == rew) set_message ("keyboard shorthand: " * rew);
-    else set_message ("keyboard shorthand: " * rew, shorth);
+    else if (shorth == rew) set_message ("keyboard shortcut: " * rew);
+    else set_message ("keyboard shortcut: " * rew, shorth);
     if ((status & 1) == 1) cmd ();
     else if (N(shorth) > 0) insert_tree (shorth);
     //cout << "Mark= " << sh_mark << "\n";
-- 
2.11.4.GIT