Changeset 28626 for main

Timestamp:

2013-11-14T15:38:21+13:00 (10 years ago)

Author:

ak19

Message:

GLI and GEMS Edit menu refers to Apple key on Macs instead of the Ctrl key, since Professor Witten and Jenny discovered that the Apple key now works on Mac machines in GLI (and the Ctrl doesn't work anymore).

Location:

main/trunk/gli

Files:

• classes/dictionary.properties (modified) (1 diff)
• classes/dictionary_am.properties (modified) (1 diff)
• classes/dictionary_ar.properties (modified) (1 diff)
• classes/dictionary_ca.properties (modified) (1 diff)
• classes/dictionary_el.properties (modified) (1 diff)
• classes/dictionary_es.properties (modified) (1 diff)
• classes/dictionary_fr.properties (modified) (1 diff)
• classes/dictionary_hy.properties (modified) (1 diff)
• classes/dictionary_ja.properties (modified) (1 diff)
• classes/dictionary_kk.properties (modified) (1 diff)
• classes/dictionary_kn.properties (modified) (1 diff)
• classes/dictionary_lv.properties (modified) (1 diff)
• classes/dictionary_mn.properties (modified) (1 diff)
• classes/dictionary_mr.properties (modified) (1 diff)
• classes/dictionary_ne.properties (modified) (1 diff)
• classes/dictionary_ro.properties (modified) (1 diff)
• classes/dictionary_ru.properties (modified) (1 diff)
• classes/dictionary_ta.properties (modified) (1 diff)
• classes/dictionary_th.properties (modified) (1 diff)
• classes/dictionary_vi.properties (modified) (1 diff)
• classes/dictionary_zh.properties (modified) (1 diff)
• src/org/greenstone/gatherer/gems/GEMS.java (modified) (1 diff)
• src/org/greenstone/gatherer/gui/MenuBar.java (modified) (2 diffs)

main/trunk/gli/classes/dictionary.properties

@@ -765 +765 @@
 Menu.Copy_Collection:Copy this collection to...
 Menu.Edit:Edit
-Menu.Edit_Copy:Copy (ctrl-c)
-Menu.Edit_Cut:Cut (ctrl-x)
-Menu.Edit_Paste:Paste (ctrl-v)
+Menu.Edit_Copy:Copy ({0}-c)
+Menu.Edit_Cut:Cut ({0}-x)
+Menu.Edit_Paste:Paste ({0}-v)
 Menu.Expand:Open Folder
 Menu.Explode_Metadata_Database:Explode metadata database

main/trunk/gli/classes/dictionary_am.properties

@@ -1036 +1036 @@
 Menu.Edit:አርታእ  
 Menu.Edit_Copy:á‰
-ዳ (ctrl-c)  
-Menu.Edit_Cut:ቁሚጥ (ctrl-x)  
-Menu.Edit_Paste:ለጥፍ (ctrl-v)  
+ዳ ({0}-c)  
+Menu.Edit_Cut:ቁሚጥ ({0}-x)  
+Menu.Edit_Paste:ለጥፍ ({0}-v)  
 Menu.Expand:አቃፊ ክፈት  
 Menu.Explode_Metadata_Database:ዚሜታዳታ ዳታቀዝ በትን  

main/trunk/gli/classes/dictionary_ar.properties

@@ -2184 +2184 @@
 وعة الي ....
 Menu.Edit:تحديث
-Menu.Edit_Copy:نسخ (ctrl-c)
-Menu.Edit_Cut:قطع (ctrl-x)
-Menu.Edit_Paste:لصق (ctrl-v)
+Menu.Edit_Copy:نسخ ({0}-c)
+Menu.Edit_Cut:قطع ({0}-x)
+Menu.Edit_Paste:لصق ({0}-v)
 Menu.Expand:فتح Ù
 جلد

main/trunk/gli/classes/dictionary_ca.properties

@@ -764 +764 @@
 Menu.Copy_Collection:Copia aquesta col·lecció a...  
 Menu.Edit:Edita  
-Menu.Edit_Copy:Copia (ctrl-c)  
-Menu.Edit_Cut:Talla (ctrl-x)  
-Menu.Edit_Paste:Enganxa (ctrl-v)  
+Menu.Edit_Copy:Copia ({0}-c)  
+Menu.Edit_Cut:Talla ({0}-x)  
+Menu.Edit_Paste:Enganxa ({0}-v)  
 Menu.Expand:Obre carpeta  
 Menu.Explode_Metadata_Database:Disgrega base de metadades  

main/trunk/gli/classes/dictionary_el.properties

@@ -1176 +1176 @@
 Menu.Collapse:Κλείσε το φάκελο  
 Menu.Edit:ΕπεΟεργασία  
-Menu.Edit_Copy:ΑΜτιγραφή (ctrl-c)  
-Menu.Edit_Cut:Αποκοπή (ctrl-x)  
-Menu.Edit_Paste:Επικόληση (ctrl-v)  
+Menu.Edit_Copy:ΑΜτιγραφή ({0}-c)  
+Menu.Edit_Cut:Αποκοπή ({0}-x)  
+Menu.Edit_Paste:Επικόληση ({0}-v)  
 Menu.Expand:ΆΜοιγΌα ΊακέλοÏ
   

main/trunk/gli/classes/dictionary_es.properties

@@ -765 +765 @@
 Menu.Copy_Collection:Copiar esta colección a 

 Menu.Edit:Editar
-Menu.Edit_Copy:Copiar (ctrl-c)
-Menu.Edit_Cut:Cortar (ctrl-x)
-Menu.Edit_Paste:Pegar (ctrl-v)
+Menu.Edit_Copy:Copiar ({0}-c)
+Menu.Edit_Cut:Cortar ({0}-x)
+Menu.Edit_Paste:Pegar ({0}-v)
 Menu.Expand:Abrir carpeta
 Menu.Explode_Metadata_Database:Explotar la base de datos de metadatos

main/trunk/gli/classes/dictionary_fr.properties

@@ -765 +765 @@
 Menu.Copy_Collection:Copier cette collection vers

 Menu.Edit:Modifier
-Menu.Edit_Copy:Copier (ctrl-c)
-Menu.Edit_Cut:Couper (ctrl-x)
-Menu.Edit_Paste:Coller (ctrl-v)
+Menu.Edit_Copy:Copier ({0}-c)
+Menu.Edit_Cut:Couper ({0}-x)
+Menu.Edit_Paste:Coller ({0}-v)
 Menu.Expand:Ouvrir Dossier
 Menu.Explode_Metadata_Database:Éclater la base de données de métadonnées

main/trunk/gli/classes/dictionary_hy.properties

@@ -810 +810 @@
 Menu.Edit:ԜՎբագրել  
 Menu.Edit_Copy:ԿրկնÖ
-Ö€Õ«Õ¶Õ¡Õ¯ÕžÖ‚ÕŽ (ctrl-c)  
-Menu.Edit_Cut:Կտրել (ctrl-x)  
-Menu.Edit_Paste:ԱՎրացնել (ctrl-v)  
+Ö€Õ«Õ¶Õ¡Õ¯ÕžÖ‚ÕŽ ({0}-c)  
+Menu.Edit_Cut:Կտրել ({0}-x)  
+Menu.Edit_Paste:ԱՎրացնել ({0}-v)  
 Menu.Expand:Բացել թղթպանակ՚  
 Menu.Explode_Metadata_Database:Պայթեցնել Õ„Õ¥Õ¿Õ¡Õ¿ÕŸÕµÕ¡Õ¬Õ« Õ¿ÕŸÕµÕ¡Õ¬Õ¶Õ¥Ö€Õ« Õ·Õ¿Õ¥ÕŽÕ¡Ö€Õ¡Õ¶Õš  

main/trunk/gli/classes/dictionary_ja.properties

@@ -848 +848 @@
 Menu.Copy_Collection:このコレクションをコピヌする   
 Menu.Edit:線集する  
-Menu.Edit_Copy:コピヌする(ctrl-c)  
-Menu.Edit_Cut:カットする(ctrl-x)  
-Menu.Edit_Paste:ペヌストする(ctrl-v)  
+Menu.Edit_Copy:コピヌする({0}-c)  
+Menu.Edit_Cut:カットする({0}-x)  
+Menu.Edit_Paste:ペヌストする({0}-v)  
 Menu.Expand:フォルダヌを開く  
 Menu.Explode_Metadata_Database:メタデヌタ・デヌタベヌスを展開する  

main/trunk/gli/classes/dictionary_kk.properties

@@ -768 +768 @@
 Menu.Collapse:ПапкаМы жабу
 Menu.Edit:РеЎакцОялау
-Menu.Edit_Copy:Көшіру (ctrl-c)
-Menu.Edit_Cut:ҚПю(ctrl-x)
-Menu.Edit_Paste:Кесу (ctrl-v)
+Menu.Edit_Copy:Көшіру ({0}-c)
+Menu.Edit_Cut:ҚПю({0}-x)
+Menu.Edit_Paste:Кесу ({0}-v)
 Menu.Expand:ПапкаМы ашу
 Menu.Explode_Metadata_Database:МетаберілгеМЎерЌеМ берілгеМЎер базасыМ бөлу

main/trunk/gli/classes/dictionary_kn.properties

@@ -870 +870 @@
 Menu.Copy_Collection:ಈ ಞಂಗ್ರಹವಚ್ಚು ಗೆ ಚಕಲು ಮಟಡಿ   
 Menu.Edit:ಀಿಊ್ಊು  
-Menu.Edit_Copy:ಚಕಲು ಮಟಡು(ctrl-c)
-Menu.Edit_Cut:ಕಀ್ಀರಿಞು(ctrl-x)
+Menu.Edit_Copy:ಚಕಲು ಮಟಡು({0}-c)
+Menu.Edit_Cut:ಕಀ್ಀರಿಞು({0}-x)
 Menu.Edit_Paste:à²
-ಂಟಿಞು(ctrl-v)
+ಂಟಿಞು({0}-v)
 Menu.Expand:ಕಡಀಕಟ್ಟಚ್ಚು ಀೆರೆ.  
 Menu.Explode_Metadata_Database:ಮೆಟಡೇಟಟ ಊಀ್ಀಟಂಶವಚ್ಚು ವಿಞ್ಀರಿಞಿ.  

main/trunk/gli/classes/dictionary_lv.properties

@@ -674 +674 @@
 Menu.Collapse:Aizvērt Mapi
 Menu.Edit:Rediģēt
-Menu.Edit_Copy:Kopēt (ctrl-c)
-Menu.Edit_Cut:Izgriezt (ctrl-x)
-Menu.Edit_Paste:Ielīmēt (ctrl-v)
+Menu.Edit_Copy:Kopēt ({0}-c)
+Menu.Edit_Cut:Izgriezt ({0}-x)
+Menu.Edit_Paste:Ielīmēt ({0}-v)
 Menu.Expand:Atvērt Mapi
 Menu.Explode_Metadata_Database:Sadalīt metadatu datu bāzi

main/trunk/gli/classes/dictionary_mn.properties

@@ -1619 +1619 @@
 
 Menu.Edit_Copy:ХуулаÑ
- (ctrl-c)
+ ({0}-c)
 Menu.Edit_Cut:ЗөөÑ
- (ctrl-x)
+ ({0}-x)
 Menu.Edit_Paste:Хуулбарыг саМаÑ
  ПйгППс гаргаÑ
- (ctrl-v)
+ ({0}-v)
 Menu.Expand:Хавтасыг МээÑ
 

main/trunk/gli/classes/dictionary_mr.properties

@@ -917 +917 @@
 Menu.Copy_Collection:à€¹à€Ÿ à€žà€‚à€—à¥à€°à€¹ à€•à¥‰à€ªà¥€ à€•à€°à€Ÿ...  
 Menu.Edit:à€²à€¿à€¹à€Ÿ  
-Menu.Edit_Copy:à€ªà¥à€°à€€(ctrl-c)  
-Menu.Edit_Cut:à€•à€Ÿ(ctrl-x)  
-Menu.Edit_Paste:à€ªà¥‡à€žà¥à€Ÿ (ctrl-v)  
+Menu.Edit_Copy:à€ªà¥à€°à€€({0}-c)  
+Menu.Edit_Cut:à€•à€Ÿ({0}-x)  
+Menu.Edit_Paste:à€ªà¥‡à€žà¥à€Ÿ ({0}-v)  
 Menu.Expand:à€«à¥‹à€²à¥à€¡à€° à€‰à€˜à€¡à€Ÿ  
 Menu.Explode_Metadata_Database:à€à€•à¥à€žà€ªà¥à€²à¥‹à€¡ à€®à¥‡à€Ÿà€Ÿà€¡à¥‡à€Ÿà€Ÿ  à€¡à¥‡à€Ÿà€Ÿà€¬à¥‡à€ž  

main/trunk/gli/classes/dictionary_ne.properties

@@ -862 +862 @@
 Menu.Collapse:à€«à¥‹à€²à¥à€¡à€°à€²à€Ÿà€ˆ ( folder ) à€¬à€šà¥à€Š à€—à€°à¥à€šà¥à€¹à¥‹à€žà¥  
 Menu.Edit:à€žà€®à¥à€ªà€Ÿà€Šà€š à€—à€°à¥à€šà¥à€¹à¥‹à€žà¥  
-Menu.Edit_Copy:à€ªà¥à€°à€€à€¿à€²à€¿à€ªà€¿ à€¬à€šà€Ÿà€‰à€šà¥à€¹à¥‹à€žà¥ ( à€•à€šà¥à€Ÿà¥à€°à¥‹à€² - à€žà€¿ ) (ctrl-c)  
-Menu.Edit_Cut:à€•à€Ÿà€Ÿà¥à€šà¥à€¹à¥‹à€žà¥  ( à€•à€šà¥à€Ÿà¥à€°à¥‹à€² - à€à€•à¥à€ž ) (ctrl-x)  
-Menu.Edit_Paste:à€à€• à€ à€Ÿà€à€‰ à€¬à€Ÿà€Ÿ à€†à€°à¥à€•à¥‹ à€ à€Ÿà€à€‰à€®à€Ÿ à€žà€Ÿà€°à¥à€šà¥à€¹à¥‹à€žà¥ (à€•à€šà¥à€Ÿà¥à€°à¥‹à€² - à€­à€¿ )(ctrl-v)  
+Menu.Edit_Copy:à€ªà¥à€°à€€à€¿à€²à€¿à€ªà€¿ à€¬à€šà€Ÿà€‰à€šà¥à€¹à¥‹à€žà¥ ( à€•à€šà¥à€Ÿà¥à€°à¥‹à€² - à€žà€¿ ) ({0}-c)  
+Menu.Edit_Cut:à€•à€Ÿà€Ÿà¥à€šà¥à€¹à¥‹à€žà¥  ( à€•à€šà¥à€Ÿà¥à€°à¥‹à€² - à€à€•à¥à€ž ) ({0}-x)  
+Menu.Edit_Paste:à€à€• à€ à€Ÿà€à€‰ à€¬à€Ÿà€Ÿ à€†à€°à¥à€•à¥‹ à€ à€Ÿà€à€‰à€®à€Ÿ à€žà€Ÿà€°à¥à€šà¥à€¹à¥‹à€žà¥ (à€•à€šà¥à€Ÿà¥à€°à¥‹à€² - à€­à€¿ )({0}-v)  
 Menu.Expand:à€«à¥‹à€²à¥à€¡à€° à€–à¥‹à€²à¥à€šà¥à€¹à¥‹à€žà¥  
 Menu.Explode_Metadata_Database:à€†à€§à€Ÿà€°à€­à¥‚à€€ à€€à€¥à¥à€¯ à€¬à€Ÿà€Ÿ metadata à€µà€¿à€žà¥à€«à¥‹à€Ÿ à€—à€°à€Ÿà€‰à€šà¥à€¹à¥‹à€ž  

main/trunk/gli/classes/dictionary_ro.properties

@@ -696 +696 @@
 Menu.Collapse:Închide Dosarul  
 Menu.Edit:Editează  
-Menu.Edit_Copy:Copy (ctrl-c)  
-Menu.Edit_Cut:Cut (ctrl-x)  
-Menu.Edit_Paste:Paste(lipeşte) (ctrl-v)  
+Menu.Edit_Copy:Copy ({0}-c)  
+Menu.Edit_Cut:Cut ({0}-x)  
+Menu.Edit_Paste:Paste(lipeşte) ({0}-v)  
 Menu.Expand:Deschide Dosar  
 Menu.Explode_Metadata_Database:Extinde baza de date cu metadate  

main/trunk/gli/classes/dictionary_ru.properties

@@ -854 +854 @@
 Menu.Collapse:Закрыть папку
 Menu.Edit:РеЎактОрПвать
-Menu.Edit_Copy:КПпОрПвать (ctrl-c)
-Menu.Edit_Cut:Вырезать (ctrl-x)
-Menu.Edit_Paste:ВставОть (ctrl-v)
+Menu.Edit_Copy:КПпОрПвать ({0}-c)
+Menu.Edit_Cut:Вырезать ({0}-x)
+Menu.Edit_Paste:ВставОть ({0}-v)
 Menu.Expand:Открыть папку
 Menu.Explode_Metadata_Database:РаспреЎелОМь базу ЎаММыÑ

main/trunk/gli/classes/dictionary_ta.properties

@@ -889 +889 @@
 Menu.Collapse:மடிப்பு மூடவும்  
 Menu.Edit:சீரமைக்கவும்  
-Menu.Edit_Copy:சகல் எடுக்கவும் (ctrl-c)  
-Menu.Edit_Cut:வெட்டு(ctrl-x)  
-Menu.Edit_Paste:ஓட்டவும் (ctrl-v)  
+Menu.Edit_Copy:சகல் எடுக்கவும் ({0}-c)  
+Menu.Edit_Cut:வெட்டு({0}-x)  
+Menu.Edit_Paste:ஓட்டவும் ({0}-v)  
 Menu.Expand:மடிப்பு ஀ிரக்கவும்  
 Menu.Explode_Metadata_Database:மீ஀ரவு ஀ரவு஀்஀ளம் ஀ெரிக்கவும்  

main/trunk/gli/classes/dictionary_th.properties

@@ -734 +734 @@
 Menu.Collapse:àž›àžŽàž”à¹‚àžŸàž¥à¹€àž”àž­àž£à¹Œ  
 Menu.Edit:à¹àžà¹‰à¹„àž‚  
-Menu.Edit_Copy:àž—àž³àžªàž³à¹€àž™àž² (ctrl-c)  
-Menu.Edit_Cut:àž•àž±àž” (ctrl-x)  
-Menu.Edit_Paste:àž§àž²àž‡ (ctrl-v)  
+Menu.Edit_Copy:àž—àž³àžªàž³à¹€àž™àž² ({0}-c)  
+Menu.Edit_Cut:àž•àž±àž” ({0}-x)  
+Menu.Edit_Paste:àž§àž²àž‡ ({0}-v)  
 Menu.Expand:à¹€àž›àžŽàž”à¹‚àžŸàž¥à¹€àž”àž­àž£à¹Œ  
 Menu.Explode_Metadata_Database:àžàž£àž°àžˆàž²àž¢àžàž²àž™àž‚à¹‰àž­àž¡àž¹àž¥à¹€àž¡àž—àž²àž”àž²àž—àž²  

main/trunk/gli/classes/dictionary_vi.properties

@@ -764 +764 @@
 Menu.Copy_Collection:Sao sưu tập nà y sang ...  
 Menu.Edit:Hiệu đính  
-Menu.Edit_Copy:Sao (ctrl-c)  
-Menu.Edit_Cut:Cắt (ctrl-x)  
-Menu.Edit_Paste:Dán (ctrl-v)  
+Menu.Edit_Copy:Sao ({0}-c)  
+Menu.Edit_Cut:Cắt ({0}-x)  
+Menu.Edit_Paste:Dán ({0}-v)  
 Menu.Expand:Mở thư mục  
 Menu.Explode_Metadata_Database:Mở bung CSDL siêu dữ liệu  

main/trunk/gli/classes/dictionary_zh.properties

@@ -918 +918 @@
 ³é—­æ–‡ä»¶å€¹
 Menu.Edit:猖蟑
-Menu.Edit_Copy:倍制 (ctrl-c)
-Menu.Edit_Cut:剪切 (ctrl-x)
-Menu.Edit_Paste:粘莎 (ctrl-v)
+Menu.Edit_Copy:倍制 ({0}-c)
+Menu.Edit_Cut:剪切 ({0}-x)
+Menu.Edit_Paste:粘莎 ({0}-v)
 Menu.Expand:打匀文件倹
 Menu.Explode_Metadata_Database:展匀å

main/trunk/gli/src/org/greenstone/gatherer/gems/GEMS.java

@@ -447 +447 @@
         edit = new JMenu();
         edit.setText(Dictionary.get("Menu.Edit"));
-        
-        edit_cut = new JMenuItem(Dictionary.get("Menu.Edit_Cut"));
+        String modkey = Utility.isMac() ? "apple" : "ctrl";
+        edit_cut = new JMenuItem(Dictionary.get("Menu.Edit_Cut", modkey));
         edit_cut.addActionListener(this);
         
-        edit_copy = new JMenuItem(Dictionary.get("Menu.Edit_Copy"));
+        edit_copy = new JMenuItem(Dictionary.get("Menu.Edit_Copy", modkey));
         edit_copy.addActionListener(this);
         
-        edit_paste = new JMenuItem(Dictionary.get("Menu.Edit_Paste"));
+        edit_paste = new JMenuItem(Dictionary.get("Menu.Edit_Paste", modkey));
         edit_paste.addActionListener(this);
         

main/trunk/gli/src/org/greenstone/gatherer/gui/MenuBar.java

@@ -45 +45 @@
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.util.JarTools;
+import org.greenstone.gatherer.util.Utility;
 
 /** The menu bar for the Gatherer main GUI. 
@@ -161 +162 @@
     edit.setText(Dictionary.get("Menu.Edit"));
     edit.setComponentOrientation(Dictionary.getOrientation());
-        
-    edit_cut = new JMenuItem(Dictionary.get("Menu.Edit_Cut"));
+        String modkey = Utility.isMac() ? "apple" : "ctrl";
+    edit_cut = new JMenuItem(Dictionary.get("Menu.Edit_Cut", modkey));
     edit_cut.addActionListener(Gatherer.g_man);
     edit_cut.setComponentOrientation(Dictionary.getOrientation());
         
-    edit_copy = new JMenuItem(Dictionary.get("Menu.Edit_Copy"));
+    edit_copy = new JMenuItem(Dictionary.get("Menu.Edit_Copy", modkey));
     edit_copy.addActionListener(Gatherer.g_man);
         edit_copy.setComponentOrientation(Dictionary.getOrientation());
     
-    edit_paste = new JMenuItem(Dictionary.get("Menu.Edit_Paste"));
+    edit_paste = new JMenuItem(Dictionary.get("Menu.Edit_Paste", modkey));
     edit_paste.addActionListener(Gatherer.g_man);
     edit_paste.setComponentOrientation(Dictionary.getOrientation());