From e7fc59fe997ef07362a47fbc120da2b569e08224 Mon Sep 17 00:00:00 2001 From: Pavel Porvatov Date: Thu, 22 Mar 2012 17:10:48 +0200 Subject: [PATCH 01/26] 6888634: test/closed/javax/swing/Popup/TaskbarPositionTest.java fails Reviewed-by: alexp --- .../share/classes/javax/swing/JPopupMenu.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/jdk/src/share/classes/javax/swing/JPopupMenu.java b/jdk/src/share/classes/javax/swing/JPopupMenu.java index 286d1bb2a0f..01763f666a9 100644 --- a/jdk/src/share/classes/javax/swing/JPopupMenu.java +++ b/jdk/src/share/classes/javax/swing/JPopupMenu.java @@ -359,17 +359,20 @@ public class JPopupMenu extends JComponent implements Accessible,MenuElement { int scrBottomY = scrBounds.y + scrHeight; // Ensure that popup menu fits the screen - if (popupRightX > (long)scrRightX) { + if (popupRightX > (long) scrRightX) { popupLocation.x = scrRightX - popupSize.width; - if( popupLocation.x < scrBounds.x ) { - popupLocation.x = scrBounds.x ; - } } - if (popupBottomY > (long)scrBottomY) { + + if (popupBottomY > (long) scrBottomY) { popupLocation.y = scrBottomY - popupSize.height; - if( popupLocation.y < scrBounds.y ) { - popupLocation.y = scrBounds.y; - } + } + + if (popupLocation.x < scrBounds.x) { + popupLocation.x = scrBounds.x; + } + + if (popupLocation.y < scrBounds.y) { + popupLocation.y = scrBounds.y; } return popupLocation; From 921ffcf9ef3239c37a6aa1d6808de5262e5e7eee Mon Sep 17 00:00:00 2001 From: Charles Lee Date: Fri, 23 Mar 2012 15:16:17 +0200 Subject: [PATCH 02/26] 4310381: Text in multi-row/col JTabbedPane tabs can be truncated/clipped Reviewed-by: rupashka --- .../swing/plaf/basic/BasicTabbedPaneUI.java | 2 + .../swing/JTabbedPane/4310381/bug4310381.html | 6 ++ .../swing/JTabbedPane/4310381/bug4310381.java | 83 +++++++++++++++++++ 3 files changed, 91 insertions(+) create mode 100644 jdk/test/javax/swing/JTabbedPane/4310381/bug4310381.html create mode 100644 jdk/test/javax/swing/JTabbedPane/4310381/bug4310381.java diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java b/jdk/src/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java index 3d80e1200e0..a9b3d26358c 100644 --- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java +++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java @@ -875,6 +875,8 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants { int availTextWidth = tabScroller.croppedEdge.getCropline() - (textRect.x - tabRect.x) - tabScroller.croppedEdge.getCroppedSideWidth(); clippedTitle = SwingUtilities2.clipStringIfNecessary(null, metrics, title, availTextWidth); + } else if (!scrollableTabLayoutEnabled() && isHorizontalTabPlacement()) { + clippedTitle = SwingUtilities2.clipStringIfNecessary(null, metrics, title, textRect.width); } paintText(g, tabPlacement, font, metrics, diff --git a/jdk/test/javax/swing/JTabbedPane/4310381/bug4310381.html b/jdk/test/javax/swing/JTabbedPane/4310381/bug4310381.html new file mode 100644 index 00000000000..d60643e56e4 --- /dev/null +++ b/jdk/test/javax/swing/JTabbedPane/4310381/bug4310381.html @@ -0,0 +1,6 @@ + + + +Observe that long Tab titles are clipped with dots at the end + + diff --git a/jdk/test/javax/swing/JTabbedPane/4310381/bug4310381.java b/jdk/test/javax/swing/JTabbedPane/4310381/bug4310381.java new file mode 100644 index 00000000000..aa570200170 --- /dev/null +++ b/jdk/test/javax/swing/JTabbedPane/4310381/bug4310381.java @@ -0,0 +1,83 @@ +/* + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * Portions Copyright (c) 2012 IBM Corporation + */ + +/* + * @test + * @bug 4310381 + * @summary Text in multi-row/col JTabbedPane tabs can be truncated/clipped + * @author Charles Lee + @run applet/manual=yesno bug4310381.html + */ + + +import javax.swing.*; +import java.awt.*; +import java.lang.reflect.InvocationTargetException; + +public class bug4310381 extends JApplet { + public static void main(String[] args) throws Exception { + SwingUtilities.invokeLater(new Runnable() { + public void run() { + JFrame frame = new JFrame(); + + frame.setContentPane(createContentPane()); + frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); + frame.setSize(150, 200); + frame.setLocationRelativeTo(null); + + frame.setVisible(true); + + } + }); + } + + @Override + public void init() { + try { + SwingUtilities.invokeAndWait(new Runnable() { + @Override + public void run() { + setContentPane(createContentPane()); + } + }); + } catch (InterruptedException | InvocationTargetException e) { + throw new RuntimeException(e); + } + } + + private static Container createContentPane() { + JTabbedPane tab = new JTabbedPane(); + String a2z = "abcdefghijklmnopqrstuvwxyz"; + + tab.addTab("0" + a2z + a2z, new JLabel("0")); + tab.addTab("1" + a2z, new JLabel("1" + a2z)); + tab.addTab("2" + a2z, new JLabel("2" + a2z)); + tab.addTab("3", new JLabel("3" + a2z)); // The last tab in Metal isn't truncated, that's ok + + return tab; + } +} From f1484f0cd4c020148333c27ab5b83af648beed54 Mon Sep 17 00:00:00 2001 From: Anthony Petrov Date: Tue, 27 Mar 2012 15:41:55 +0400 Subject: [PATCH 03/26] 7150516: [macosx] appletviewer shouldn't link against libX11 on the Mac Don't link against libX11 on the Mac Reviewed-by: art --- jdk/make/launchers/Makefile.launcher | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/jdk/make/launchers/Makefile.launcher b/jdk/make/launchers/Makefile.launcher index 4e32af5cb18..a290ccfec08 100644 --- a/jdk/make/launchers/Makefile.launcher +++ b/jdk/make/launchers/Makefile.launcher @@ -155,8 +155,10 @@ endif # GUI tools ifeq ($(GUI_TOOL),true) ifneq ($(PLATFORM), windows) - # Anything with a GUI needs X11 to be linked in. - OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 + ifneq ($(PLATFORM), macosx) + # Anything with a GUI needs X11 to be linked in. + OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 + endif endif endif From b6cab6070fc5e89607fc0f55326f0742cc31e839 Mon Sep 17 00:00:00 2001 From: Anthony Petrov Date: Tue, 27 Mar 2012 15:49:17 +0400 Subject: [PATCH 04/26] 7149085: [macosx] Quit with QuitStrategy CLOSE_ALL_WINDOWS does terminate application Don't force the termination of the event loop in the Quit action handler Reviewed-by: art --- jdk/src/macosx/classes/com/apple/eawt/_AppEventHandler.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jdk/src/macosx/classes/com/apple/eawt/_AppEventHandler.java b/jdk/src/macosx/classes/com/apple/eawt/_AppEventHandler.java index e94b66daf2b..a380e8412fd 100644 --- a/jdk/src/macosx/classes/com/apple/eawt/_AppEventHandler.java +++ b/jdk/src/macosx/classes/com/apple/eawt/_AppEventHandler.java @@ -157,7 +157,10 @@ class _AppEventHandler { } }); } finally { - nativeReplyToAppShouldTerminate(true); + // Either we've just called System.exit(), or the app will call + // it when processing a WINDOW_CLOSING event. Either way, we reply + // to Cocoa that we don't want to exit the event loop yet. + nativeReplyToAppShouldTerminate(false); } } From 5c6579f46b420ba9c6bf65a6950ba04a1a7d5db9 Mon Sep 17 00:00:00 2001 From: Anthony Petrov Date: Tue, 27 Mar 2012 15:53:29 +0400 Subject: [PATCH 05/26] 7132692: [macosx] Class com.apple.eawt not functioning Postpone setting the application delegate until the app is fully initialized Reviewed-by: art --- jdk/src/macosx/native/sun/awt/awt.m | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/jdk/src/macosx/native/sun/awt/awt.m b/jdk/src/macosx/native/sun/awt/awt.m index c519bebbb26..d183d1bc026 100644 --- a/jdk/src/macosx/native/sun/awt/awt.m +++ b/jdk/src/macosx/native/sun/awt/awt.m @@ -306,6 +306,18 @@ AWT_ASSERT_APPKIT_THREAD; // AWT gets here AFTER +[AWTStarter appKitIsRunning:] is called. if (verbose) AWT_DEBUG_LOG(@"got out of the AppKit startup mutex"); } + + // Don't set the delegate until the NSApplication has been created and + // its finishLaunching has initialized it. + // ApplicationDelegate is the support code for com.apple.eawt. + void (^setDelegateBlock)() = ^(){ + OSXAPP_SetApplicationDelegate([ApplicationDelegate sharedDelegate]); + }; + if (onMainThread) { + setDelegateBlock(); + } else { + [JNFRunLoop performOnMainThreadWaiting:YES withBlock:setDelegateBlock]; + } } - (void)starter:(NSArray*)args { @@ -340,10 +352,6 @@ AWT_ASSERT_APPKIT_THREAD; // AppKit Application. NSApplication *app = [NSApplicationAWT sharedApplication]; - // Don't set the delegate until the NSApplication has been created. - // ApplicationDelegate is the support code for com.apple.eawt. - OSXAPP_SetApplicationDelegate([ApplicationDelegate sharedDelegate]); - // AWT gets to this point BEFORE NSApplicationDidFinishLaunchingNotification is sent. if (![app isRunning]) { if (verbose) AWT_DEBUG_LOG(@"+[AWTStarter startAWT]: ![app isRunning]"); From 044b12b8c13a05f3e7769e4154b3ce1af75912a5 Mon Sep 17 00:00:00 2001 From: Sergey Bylokhov Date: Thu, 29 Mar 2012 17:31:48 +0400 Subject: [PATCH 06/26] 7124551: [macosx] Once added, Menu shortcut cannot be removed Reviewed-by: art, anthony --- jdk/src/macosx/native/sun/awt/CMenuItem.m | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/jdk/src/macosx/native/sun/awt/CMenuItem.m b/jdk/src/macosx/native/sun/awt/CMenuItem.m index 5fdf7113638..aa0c2ab03a2 100644 --- a/jdk/src/macosx/native/sun/awt/CMenuItem.m +++ b/jdk/src/macosx/native/sun/awt/CMenuItem.m @@ -125,11 +125,8 @@ AWT_ASSERT_NOT_APPKIT_THREAD; [JNFRunLoop performOnMainThreadWaiting:YES withBlock:^(){ AWT_ASSERT_APPKIT_THREAD; - - if (![theKeyEquivalent isEqualToString:@""]) { - [fMenuItem setKeyEquivalent:theKeyEquivalent]; - [fMenuItem setKeyEquivalentModifierMask:modifierMask]; - } + [fMenuItem setKeyEquivalent:theKeyEquivalent]; + [fMenuItem setKeyEquivalentModifierMask:modifierMask]; [fMenuItem setTitle:theLabel]; }]; } From 6dd51e0e8ebf4f99f8872f1ce12b0bc978e9b5cb Mon Sep 17 00:00:00 2001 From: Anthony Petrov Date: Fri, 30 Mar 2012 18:10:05 +0400 Subject: [PATCH 07/26] 7124428: [macosx] Frame.setExtendedState() doesn't work for undecorated windows Emulate native NSWindow -zoom for undecorated windows Reviewed-by: art --- .../sun/lwawt/macosx/CPlatformWindow.java | 40 +++++++++++++++---- 1 file changed, 33 insertions(+), 7 deletions(-) diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java b/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java index 7f8ee76539b..bcd6207ae91 100644 --- a/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java +++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java @@ -202,6 +202,8 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo private LWWindowPeer peer; private CPlatformView contentView; private CPlatformWindow owner; + private boolean undecorated; // initialized in getInitialStyleBits() + private Rectangle normalBounds = null; // not-null only for undecorated maximized windows public CPlatformWindow(final PeerType peerType) { super(0, true); @@ -277,8 +279,8 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo // Either java.awt.Frame or java.awt.Dialog can be undecorated, however java.awt.Window always is undecorated. { - final boolean undecorated = isFrame ? ((Frame)target).isUndecorated() : (isDialog ? ((Dialog)target).isUndecorated() : true); - if (undecorated) styleBits = SET(styleBits, DECORATED, false); + this.undecorated = isFrame ? ((Frame)target).isUndecorated() : (isDialog ? ((Dialog)target).isUndecorated() : true); + if (this.undecorated) styleBits = SET(styleBits, DECORATED, false); } // Either java.awt.Frame or java.awt.Dialog can be resizable, however java.awt.Window is never resizable @@ -466,6 +468,30 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo nativeSetNSWindowBounds(getNSWindowPtr(), x, y, w, h); } + private void zoom() { + if (!undecorated) { + CWrapper.NSWindow.zoom(getNSWindowPtr()); + } else { + // OS X handles -zoom incorrectly for undecorated windows + final boolean isZoomed = this.normalBounds == null; + deliverZoom(isZoomed); + + Rectangle toBounds; + if (isZoomed) { + this.normalBounds = peer.getBounds(); + long screen = CWrapper.NSWindow.screen(getNSWindowPtr()); + toBounds = CWrapper.NSScreen.visibleFrame(screen).getBounds(); + // Flip the y coordinate + Rectangle frame = CWrapper.NSScreen.frame(screen).getBounds(); + toBounds.y = frame.height - toBounds.y - toBounds.height; + } else { + toBounds = normalBounds; + this.normalBounds = null; + } + setBounds(toBounds.x, toBounds.y, toBounds.width, toBounds.height); + } + } + @Override // PlatformWindow public void setVisible(boolean visible) { final long nsWindowPtr = getNSWindowPtr(); @@ -486,7 +512,7 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo CWrapper.NSWindow.deminiaturize(nsWindowPtr); break; case Frame.MAXIMIZED_BOTH: - CWrapper.NSWindow.zoom(nsWindowPtr); + zoom(); break; } } @@ -526,7 +552,7 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo CWrapper.NSWindow.miniaturize(nsWindowPtr); break; case Frame.MAXIMIZED_BOTH: - CWrapper.NSWindow.zoom(nsWindowPtr); + zoom(); break; } } @@ -692,7 +718,7 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo if (prevWindowState == Frame.MAXIMIZED_BOTH) { // let's return into the normal states first // the zoom call toggles between the normal and the max states - CWrapper.NSWindow.zoom(nsWindowPtr); + zoom(); } CWrapper.NSWindow.miniaturize(nsWindowPtr); break; @@ -701,14 +727,14 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo // let's return into the normal states first CWrapper.NSWindow.deminiaturize(nsWindowPtr); } - CWrapper.NSWindow.zoom(nsWindowPtr); + zoom(); break; case Frame.NORMAL: if (prevWindowState == Frame.ICONIFIED) { CWrapper.NSWindow.deminiaturize(nsWindowPtr); } else if (prevWindowState == Frame.MAXIMIZED_BOTH) { // the zoom call toggles between the normal and the max states - CWrapper.NSWindow.zoom(nsWindowPtr); + zoom(); } break; default: From 045668b4541419f6c0688258ac6c779593a39d53 Mon Sep 17 00:00:00 2001 From: Sean Chou Date: Sat, 31 Mar 2012 16:55:56 +0800 Subject: [PATCH 08/26] 7155298: Editable TextArea/TextField are blocking GUI applications from exit Stop default caret's timer by setVisible(false) when dispose Reviewed-by: anthony, ant --- .../classes/sun/awt/X11/XTextAreaPeer.java | 2 + .../classes/sun/awt/X11/XTextFieldPeer.java | 2 + .../awt/TextArea/DisposeTest/TestDispose.java | 101 +++++++++++++++++ .../TextField/DisposeTest/TestDispose.java | 102 ++++++++++++++++++ 4 files changed, 207 insertions(+) create mode 100644 jdk/test/java/awt/TextArea/DisposeTest/TestDispose.java create mode 100644 jdk/test/java/awt/TextField/DisposeTest/TestDispose.java diff --git a/jdk/src/solaris/classes/sun/awt/X11/XTextAreaPeer.java b/jdk/src/solaris/classes/sun/awt/X11/XTextAreaPeer.java index 37b096f8470..253fa4d1da0 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XTextAreaPeer.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XTextAreaPeer.java @@ -168,6 +168,8 @@ class XTextAreaPeer extends XComponentPeer implements TextAreaPeer { public void dispose() { XToolkit.specialPeerMap.remove(jtext); + // visible caret has a timer thread which must be stopped + jtext.getCaret().setVisible(false); jtext.removeNotify(); textPane.removeNotify(); super.dispose(); diff --git a/jdk/src/solaris/classes/sun/awt/X11/XTextFieldPeer.java b/jdk/src/solaris/classes/sun/awt/X11/XTextFieldPeer.java index 8a09c90735d..6e3b78d1498 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XTextFieldPeer.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XTextFieldPeer.java @@ -104,6 +104,8 @@ public class XTextFieldPeer extends XComponentPeer implements TextFieldPeer { public void dispose() { XToolkit.specialPeerMap.remove(xtext); + // visible caret has a timer thread which must be stopped + xtext.getCaret().setVisible(false); xtext.removeNotify(); super.dispose(); } diff --git a/jdk/test/java/awt/TextArea/DisposeTest/TestDispose.java b/jdk/test/java/awt/TextArea/DisposeTest/TestDispose.java new file mode 100644 index 00000000000..eaa912db93a --- /dev/null +++ b/jdk/test/java/awt/TextArea/DisposeTest/TestDispose.java @@ -0,0 +1,101 @@ +/* + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * Portions Copyright (c) 2012 IBM Corporation + */ + +/* @test + * @bug 7155298 + * @run main/othervm/timeout=60 TestDispose + * @summary Editable TextArea blocks GUI application from exit. + * @author Sean Chou + */ + +import java.awt.FlowLayout; +import java.awt.Frame; +import java.awt.TextArea; +import java.awt.Toolkit; +import java.lang.reflect.InvocationTargetException; + +import javax.swing.JFrame; +import javax.swing.SwingUtilities; + +import sun.awt.SunToolkit; + +public class TestDispose { + + public static Frame frame = null; + public static TextArea textArea = null; + public static volatile Process worker = null; + + public void testDispose() throws InvocationTargetException, + InterruptedException { + SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit(); + + SwingUtilities.invokeAndWait(new Runnable() { + @Override + public void run() { + frame = new JFrame("Test"); + + textArea = new TextArea("editable textArea"); + textArea.setEditable(true); + // textArea.setEditable(false); // this testcase passes if textArea is non-editable + + frame.setLayout(new FlowLayout()); + frame.add(textArea); + + frame.pack(); + frame.setVisible(true); + } + }); + toolkit.realSync(); + + SwingUtilities.invokeAndWait(new Runnable() { + @Override + public void run() { + frame.dispose(); + } + }); + toolkit.realSync(); + } + + public static void main(String[] args) throws Exception{ + if(args.length == 0) { + Runtime.getRuntime().addShutdownHook(new Thread(){ + public void run() { + worker.destroy(); + } + }); + + System.out.println(System.getProperty("java.home")+"/bin/java TestDispose workprocess"); + worker = Runtime.getRuntime().exec(System.getProperty("java.home")+"/bin/java TestDispose workprocess"); + worker.waitFor(); + return; + } + + TestDispose app = new TestDispose(); + app.testDispose(); + } + +} diff --git a/jdk/test/java/awt/TextField/DisposeTest/TestDispose.java b/jdk/test/java/awt/TextField/DisposeTest/TestDispose.java new file mode 100644 index 00000000000..a8a2fdaa9d7 --- /dev/null +++ b/jdk/test/java/awt/TextField/DisposeTest/TestDispose.java @@ -0,0 +1,102 @@ +/* + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * Portions Copyright (c) 2012 IBM Corporation + */ + +/* @test + * @bug 7155298 + * @run main/othervm/timeout=60 TestDispose + * @summary Editable TextField blocks GUI application from exit. + * @author Sean Chou + */ + +import java.awt.FlowLayout; +import java.awt.Frame; +import java.awt.TextField; +import java.awt.Toolkit; +import java.lang.reflect.InvocationTargetException; + +import javax.swing.JFrame; +import javax.swing.SwingUtilities; + +import sun.awt.SunToolkit; + +public class TestDispose { + + public static Frame frame = null; + public static TextField textField = null; + public static volatile Process worker = null; + + public void testDispose() throws InvocationTargetException, + InterruptedException { + SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit(); + + SwingUtilities.invokeAndWait(new Runnable() { + @Override + public void run() { + frame = new JFrame("Test"); + + textField = new TextField("editable textArea"); + textField.setEditable(true); + // textField.setEditable(false); // this testcase passes if textField is non-editable + + frame.setLayout(new FlowLayout()); + frame.add(textField); + + frame.pack(); + frame.setVisible(true); + } + }); + toolkit.realSync(); + + SwingUtilities.invokeAndWait(new Runnable() { + @Override + public void run() { + frame.dispose(); + } + }); + toolkit.realSync(); + + } + + public static void main(String[] args) throws Exception{ + if(args.length == 0) { + Runtime.getRuntime().addShutdownHook(new Thread(){ + public void run() { + worker.destroy(); + } + }); + + System.out.println(System.getProperty("java.home")+"/bin/java TestDispose workprocess"); + worker = Runtime.getRuntime().exec(System.getProperty("java.home")+"/bin/java TestDispose workprocess"); + worker.waitFor(); + return; + } + + TestDispose app = new TestDispose(); + app.testDispose(); + } + +} From e352bc83f0c62389bc41baf020a9ee00ad69e572 Mon Sep 17 00:00:00 2001 From: Anthony Petrov Date: Tue, 3 Apr 2012 16:14:05 +0400 Subject: [PATCH 09/26] 7154177: [macosx] An invisible owner frame becomes visible upon clicking a child window Establish the parent-child relationship for visible windows only Reviewed-by: serb --- .../sun/lwawt/macosx/CPlatformWindow.java | 74 +++++++++-- .../Frame/InvisibleOwner/InvisibleOwner.java | 121 ++++++++++++++++++ 2 files changed, 183 insertions(+), 12 deletions(-) create mode 100644 jdk/test/java/awt/Frame/InvisibleOwner/InvisibleOwner.java diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java b/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java index bcd6207ae91..e2119f5f4ae 100644 --- a/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java +++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java @@ -29,6 +29,7 @@ import java.awt.BufferCapabilities.FlipContents; import java.awt.*; import java.awt.Dialog.ModalityType; import java.awt.event.*; +import java.awt.peer.WindowPeer; import java.beans.*; import java.util.List; @@ -202,6 +203,7 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo private LWWindowPeer peer; private CPlatformView contentView; private CPlatformWindow owner; + private boolean visible = false; // visibility status from native perspective private boolean undecorated; // initialized in getInitialStyleBits() private Rectangle normalBounds = null; // not-null only for undecorated maximized windows @@ -492,19 +494,38 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo } } + private boolean isVisible() { + return this.visible; + } + @Override // PlatformWindow public void setVisible(boolean visible) { final long nsWindowPtr = getNSWindowPtr(); - if (owner != null) { - if (!visible) { + // 1. Process parent-child relationship when hiding + if (!visible) { + // 1a. Unparent my children + for (Window w : target.getOwnedWindows()) { + WindowPeer p = (WindowPeer)w.getPeer(); + if (p instanceof LWWindowPeer) { + CPlatformWindow pw = (CPlatformWindow)((LWWindowPeer)p).getPlatformWindow(); + if (pw != null && pw.isVisible()) { + CWrapper.NSWindow.removeChildWindow(nsWindowPtr, pw.getNSWindowPtr()); + } + } + } + + // 1b. Unparent myself + if (owner != null && owner.isVisible()) { CWrapper.NSWindow.removeChildWindow(owner.getNSWindowPtr(), nsWindowPtr); } } + // 2. Configure stuff updateIconImages(); updateFocusabilityForAutoRequestFocus(false); + // 3. Manage the extended state when hiding if (!visible) { // Cancel out the current native state of the window switch (peer.getState()) { @@ -517,6 +538,7 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo } } + // 4. Actually show or hide the window LWWindowPeer blocker = peer.getBlocker(); if (blocker == null || !visible) { // If it ain't blocked, or is being hidden, go regular way @@ -543,7 +565,9 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo CWrapper.NSWindow.orderWindow(nsWindowPtr, CWrapper.NSWindow.NSWindowBelow, ((CPlatformWindow)blocker.getPlatformWindow()).getNSWindowPtr()); } + this.visible = visible; + // 5. Manage the extended state when showing if (visible) { // Re-apply the extended state as expected in shared code if (target instanceof Frame) { @@ -558,17 +582,35 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo } } + // 6. Configure stuff #2 updateFocusabilityForAutoRequestFocus(true); - if (owner != null) { - if (visible) { + // 7. Manage parent-child relationship when showing + if (visible) { + // 7a. Add myself as a child + if (owner != null && owner.isVisible()) { CWrapper.NSWindow.addChildWindow(owner.getNSWindowPtr(), nsWindowPtr, CWrapper.NSWindow.NSWindowAbove); if (target.isAlwaysOnTop()) { CWrapper.NSWindow.setLevel(nsWindowPtr, CWrapper.NSWindow.NSFloatingWindowLevel); } } + + // 7b. Add my own children to myself + for (Window w : target.getOwnedWindows()) { + WindowPeer p = (WindowPeer)w.getPeer(); + if (p instanceof LWWindowPeer) { + CPlatformWindow pw = (CPlatformWindow)((LWWindowPeer)p).getPlatformWindow(); + if (pw != null && pw.isVisible()) { + CWrapper.NSWindow.addChildWindow(nsWindowPtr, pw.getNSWindowPtr(), CWrapper.NSWindow.NSWindowAbove); + if (w.isAlwaysOnTop()) { + CWrapper.NSWindow.setLevel(pw.getNSWindowPtr(), CWrapper.NSWindow.NSFloatingWindowLevel); + } + } + } + } } + // 8. Deal with the blocker of the window being shown if (blocker != null && visible) { // Make sure the blocker is above its siblings ((CPlatformWindow)blocker.getPlatformWindow()).orderAboveSiblings(); @@ -875,15 +917,23 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo return; } - // Recursively pop up the windows from the very bottom so that only - // the very top-most one becomes the main window - owner.orderAboveSiblings(); + // NOTE: the logic will fail if we have a hierarchy like: + // visible root owner + // invisible owner + // visible dialog + // However, this is an unlikely scenario for real life apps + if (owner.isVisible()) { + // Recursively pop up the windows from the very bottom so that only + // the very top-most one becomes the main window + owner.orderAboveSiblings(); + + // Order the window to front of the stack of child windows + final long nsWindowSelfPtr = getNSWindowPtr(); + final long nsWindowOwnerPtr = owner.getNSWindowPtr(); + CWrapper.NSWindow.removeChildWindow(nsWindowOwnerPtr, nsWindowSelfPtr); + CWrapper.NSWindow.addChildWindow(nsWindowOwnerPtr, nsWindowSelfPtr, CWrapper.NSWindow.NSWindowAbove); + } - // Order the window to front of the stack of child windows - final long nsWindowSelfPtr = getNSWindowPtr(); - final long nsWindowOwnerPtr = owner.getNSWindowPtr(); - CWrapper.NSWindow.removeChildWindow(nsWindowOwnerPtr, nsWindowSelfPtr); - CWrapper.NSWindow.addChildWindow(nsWindowOwnerPtr, nsWindowSelfPtr, CWrapper.NSWindow.NSWindowAbove); if (target.isAlwaysOnTop()) { CWrapper.NSWindow.setLevel(getNSWindowPtr(), CWrapper.NSWindow.NSFloatingWindowLevel); } diff --git a/jdk/test/java/awt/Frame/InvisibleOwner/InvisibleOwner.java b/jdk/test/java/awt/Frame/InvisibleOwner/InvisibleOwner.java new file mode 100644 index 00000000000..007f14d17da --- /dev/null +++ b/jdk/test/java/awt/Frame/InvisibleOwner/InvisibleOwner.java @@ -0,0 +1,121 @@ +/* + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + @test + @bug 7154177 + @summary An invisible owner frame should never become visible + @author anthony.petrov@oracle.com: area=awt.toplevel + @library ../../regtesthelpers + @build Util + @run main InvisibleOwner +*/ + +import java.awt.*; +import java.awt.event.*; +import java.util.*; +import test.java.awt.regtesthelpers.Util; + +public class InvisibleOwner { + private static volatile boolean invisibleOwnerClicked = false; + private static volatile boolean backgroundClicked = false; + + private static final int F_X = 40, F_Y = 40, F_W = 200, F_H = 200; + + public static void main(String[] args) throws AWTException { + // A background frame to compare a pixel color against + Frame helperFrame = new Frame("Background frame"); + helperFrame.setBackground(Color.BLUE); + helperFrame.setBounds(F_X - 10, F_Y - 10, F_W + 20, F_H + 20); + helperFrame.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent ev) { + backgroundClicked= true; + } + }); + helperFrame.setVisible(true); + + // An owner frame that should stay invisible + Frame frame = new Frame("Invisible Frame"); + frame.setBackground(Color.GREEN); + frame.setLocation(F_X, F_Y); + frame.setSize(F_W, F_H); + frame.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent ev) { + invisibleOwnerClicked = true; + } + }); + + // An owned window + final Window window = new Window(frame); + window.setBackground(Color.RED); + window.setSize(200, 200); + window.setLocation(300, 300); + window.setVisible(true); + try { Thread.sleep(1000); } catch (Exception ex) {} + + Robot robot = new Robot(); + + // Clicking the owned window shouldn't make its owner visible + Util.clickOnComp(window, robot); + try { Thread.sleep(500); } catch (Exception ex) {} + + + // Assume the location and size are applied to the frame as expected. + // This should work fine on the Mac. We can't call getLocationOnScreen() + // since from Java perspective the frame is invisible anyway. + + // 1. Check the color at the center of the owner frame + Color c = robot.getPixelColor(F_X + F_W / 2, F_Y + F_H / 2); + System.err.println("Pixel color: " + c); + if (c == null) { + throw new RuntimeException("Robot.getPixelColor() failed"); + } + if (c.equals(frame.getBackground())) { + throw new RuntimeException("The invisible frame has become visible"); + } + if (!c.equals(helperFrame.getBackground())) { + throw new RuntimeException("The background helper frame has been covered by something unexpected"); + } + + // 2. Try to click it + robot.mouseMove(F_X + F_W / 2, F_Y + F_H / 2); + robot.mousePress(InputEvent.BUTTON1_MASK); + robot.mouseRelease(InputEvent.BUTTON1_MASK); + try { Thread.sleep(500); } catch (Exception ex) {} + + // Cleanup + window.dispose(); + frame.dispose(); + helperFrame.dispose(); + + // Final checks + if (invisibleOwnerClicked) { + throw new RuntimeException("An invisible owner frame got clicked. Looks like it became visible."); + } + if (!backgroundClicked) { + throw new RuntimeException("The background helper frame hasn't been clciked"); + } + } +} From ea3e5e2a843c21f7a16e363ccf4d9dab8015cd18 Mon Sep 17 00:00:00 2001 From: Alexander Scherbatiy Date: Wed, 4 Apr 2012 16:27:29 +0400 Subject: [PATCH 10/26] 7093156: NLS Please change the mnemonic assignment system to avoid translation issue (Swing files) Reviewed-by: rupashka --- .../swing/plaf/gtk/resources/gtk.properties | 137 +++--- .../plaf/gtk/resources/gtk_de.properties | 147 +++--- .../plaf/gtk/resources/gtk_es.properties | 147 +++--- .../plaf/gtk/resources/gtk_fr.properties | 147 +++--- .../plaf/gtk/resources/gtk_it.properties | 147 +++--- .../plaf/gtk/resources/gtk_ja.properties | 139 +++--- .../plaf/gtk/resources/gtk_ko.properties | 139 +++--- .../plaf/gtk/resources/gtk_pt_BR.properties | 147 +++--- .../plaf/gtk/resources/gtk_sv.properties | 147 +++--- .../plaf/gtk/resources/gtk_zh_CN.properties | 139 +++--- .../plaf/gtk/resources/gtk_zh_TW.properties | 139 +++--- .../plaf/basic/resources/basic.properties | 418 ++++++++---------- .../plaf/basic/resources/basic_de.properties | 416 ++++++++--------- .../plaf/basic/resources/basic_es.properties | 415 ++++++++--------- .../plaf/basic/resources/basic_fr.properties | 415 ++++++++--------- .../plaf/basic/resources/basic_it.properties | 415 ++++++++--------- .../plaf/basic/resources/basic_ja.properties | 415 ++++++++--------- .../plaf/basic/resources/basic_ko.properties | 415 ++++++++--------- .../basic/resources/basic_pt_BR.properties | 415 ++++++++--------- .../plaf/basic/resources/basic_sv.properties | 415 ++++++++--------- .../basic/resources/basic_zh_CN.properties | 415 ++++++++--------- .../basic/resources/basic_zh_TW.properties | 415 ++++++++--------- .../plaf/metal/resources/metal.properties | 111 +++-- .../plaf/metal/resources/metal_de.properties | 113 +++-- .../plaf/metal/resources/metal_es.properties | 113 +++-- .../plaf/metal/resources/metal_fr.properties | 113 +++-- .../plaf/metal/resources/metal_it.properties | 113 +++-- .../plaf/metal/resources/metal_ja.properties | 113 +++-- .../plaf/metal/resources/metal_ko.properties | 113 +++-- .../metal/resources/metal_pt_BR.properties | 113 +++-- .../plaf/metal/resources/metal_sv.properties | 113 +++-- .../metal/resources/metal_zh_CN.properties | 113 +++-- .../metal/resources/metal_zh_TW.properties | 113 +++-- .../plaf/synth/resources/synth.properties | 94 ++-- .../plaf/synth/resources/synth_de.properties | 94 ++-- .../plaf/synth/resources/synth_es.properties | 94 ++-- .../plaf/synth/resources/synth_fr.properties | 94 ++-- .../plaf/synth/resources/synth_it.properties | 94 ++-- .../plaf/synth/resources/synth_ja.properties | 94 ++-- .../plaf/synth/resources/synth_ko.properties | 94 ++-- .../synth/resources/synth_pt_BR.properties | 94 ++-- .../plaf/synth/resources/synth_sv.properties | 94 ++-- .../synth/resources/synth_zh_CN.properties | 94 ++-- .../synth/resources/synth_zh_TW.properties | 94 ++-- .../share/classes/javax/swing/UIDefaults.java | 118 ++++- 45 files changed, 3861 insertions(+), 4676 deletions(-) diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk.properties b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk.properties index 3696c0e6b10..636d88a9b84 100644 --- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk.properties +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk.properties @@ -1,83 +1,54 @@ -# Refer to the note in basic.properties for a description as to what -# the mnemonics correspond to and how to calculate them. - - - -# GTK specific properties - -# GTK color chooser properties: -GTKColorChooserPanel.nameText=GTK Color Chooser -# mnemonic as a VK_ constant -GTKColorChooserPanel.mnemonic=71 -# Can also define GTKColorChooserPanel.dispalyedMnemonicIndex if you -# want an index other than would normally be underlined by -# GTKColorChooserPanel.mnemonic to be underlined. This is only useful -# if GTKColorChooserPanel.nameText defines the mnemonic character more -# than once and you want a character other than the first underlined. - -# Text and mnemonics for the spinner. You can also defined a different -# index for the mnemonic via xxxMnemonicIndex, for example -# GTKColorChooserPanel.hueMnemonicIndex=1 would indicate the second -# character of GTKColorChooserPanel.hueText should be underlined to -# represent the mnemonic. -GTKColorChooserPanel.hueText=Hue: -GTKColorChooserPanel.hueMnemonic=72 - -GTKColorChooserPanel.redText=Red: -GTKColorChooserPanel.redMnemonic=69 - -GTKColorChooserPanel.saturationText=Saturation: -GTKColorChooserPanel.saturationMnemonic=83 - -GTKColorChooserPanel.greenText=Green: -GTKColorChooserPanel.greenMnemonic=71 - -GTKColorChooserPanel.valueText=Value: -GTKColorChooserPanel.valueMnemonic=86 - -GTKColorChooserPanel.blueText=Blue: -GTKColorChooserPanel.blueMnemonic=66 - -GTKColorChooserPanel.colorNameText=Color Name: -GTKColorChooserPanel.colorNameMnemonic=78 - - - -############ FILE CHOOSER STRINGS ############# - -FileChooser.acceptAllFileFilterText=All Files -FileChooser.newFolderButtonText=New Folder -FileChooser.newFolderButtonMnemonic=78 -FileChooser.newFolderDialogText=Folder name: -FileChooser.newFolderNoDirectoryErrorTitleText=Error -FileChooser.newFolderNoDirectoryErrorText=Error creating directory "{0}": No such file or directory -FileChooser.deleteFileButtonText=Delete File -FileChooser.deleteFileButtonMnemonic=76 -FileChooser.renameFileButtonText=Rename File -FileChooser.renameFileButtonMnemonic=82 -FileChooser.cancelButtonText=Cancel -FileChooser.cancelButtonMnemonic=67 -FileChooser.saveButtonText=OK -FileChooser.saveButtonMnemonic=79 -FileChooser.openButtonText=OK -FileChooser.openButtonMnemonic=79 -FileChooser.saveDialogTitleText=Save -FileChooser.openDialogTitleText=Open -FileChooser.pathLabelText=Selection: -FileChooser.filterLabelText=Filter: -FileChooser.pathLabelMnemonic=83 -FileChooser.foldersLabelText=Folders -FileChooser.foldersLabelMnemonic=68 -FileChooser.filesLabelText=Files -FileChooser.filesLabelMnemonic=70 - -FileChooser.cancelButtonToolTipText=Abort file chooser dialog. -FileChooser.saveButtonToolTipText=Save selected file. -FileChooser.openButtonToolTipText=Open selected file. - -FileChooser.renameFileDialogText=Rename file "{0}" to -FileChooser.renameFileErrorTitle=Error -FileChooser.renameFileErrorText=Error renaming file "{0}" to "{1}" - -OptionPane.okButtonMnemonic=79 -OptionPane.cancelButtonMnemonic=67 +# Refer to the note in basic.properties for a description as to what +# the mnemonics correspond to and how to calculate them. + + + +# GTK specific properties + +# GTK color chooser properties: +GTKColorChooserPanel.textAndMnemonic=>K Color Chooser +# mnemonic as a VK_ constant + +GTKColorChooserPanel.hue.textAndMnemonic=&Hue: + +GTKColorChooserPanel.red.textAndMnemonic=R&ed: + +GTKColorChooserPanel.saturation.textAndMnemonic=&Saturation: + +GTKColorChooserPanel.green.textAndMnemonic=&Green: + +GTKColorChooserPanel.value.textAndMnemonic=&Value: + +GTKColorChooserPanel.blue.textAndMnemonic=&Blue: + +GTKColorChooserPanel.color.textAndMnemonic=Color &Name: + + + +############ FILE CHOOSER STRINGS ############# + +FileChooser.acceptAllFileFilter.textAndMnemonic=All Files +FileChooser.newFolderButton.textAndMnemonic=&New Folder +FileChooser.newFolderDialog.textAndMnemonic=Folder name: +FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=Error +FileChooser.newFolderNoDirectoryError.textAndMnemonic=Error creating directory "{0}": No such file or directory +FileChooser.deleteFileButton.textAndMnemonic=De&lete File +FileChooser.renameFileButton.textAndMnemonic=&Rename File +FileChooser.cancelButton.textAndMnemonic=&Cancel +FileChooser.saveButton.textAndMnemonic=&OK +FileChooser.openButton.textAndMnemonic=&OK +FileChooser.saveDialogTitle.textAndMnemonic=Save +FileChooser.openDialogTitle.textAndMnemonic=Open +FileChooser.pathLabel.textAndMnemonic=&Selection: +FileChooser.filterLabel.textAndMnemonic=Filter: +FileChooser.foldersLabel.textAndMnemonic=Fol&ders +FileChooser.filesLabel.textAndMnemonic=&Files + +FileChooser.cancelButtonToolTip.textAndMnemonic=Abort file chooser dialog. +FileChooser.saveButtonToolTip.textAndMnemonic=Save selected file. +FileChooser.openButtonToolTip.textAndMnemonic=Open selected file. + +FileChooser.renameFileDialog.textAndMnemonic=Rename file "{0}" to +FileChooser.renameFileError.titleAndMnemonic=Error +FileChooser.renameFileError.textAndMnemonic=Error renaming file "{0}" to "{1}" + diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties index 3edb256c427..b4563b4f2fa 100644 --- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties @@ -1,88 +1,59 @@ -# Refer to the note in basic.properties for a description as to what -# the mnemonics correspond to and how to calculate them. - - - -# GTK specific properties - -# GTK color chooser properties: -GTKColorChooserPanel.nameText=GTK-Farbauswahl -# mnemonic as a VK_ constant -GTKColorChooserPanel.mnemonic=71 -# Can also define GTKColorChooserPanel.dispalyedMnemonicIndex if you -# want an index other than would normally be underlined by -# GTKColorChooserPanel.mnemonic to be underlined. This is only useful -# if GTKColorChooserPanel.nameText defines the mnemonic character more -# than once and you want a character other than the first underlined. - -# Text and mnemonics for the spinner. You can also defined a different -# index for the mnemonic via xxxMnemonicIndex, for example -# GTKColorChooserPanel.hueMnemonicIndex=1 would indicate the second -# character of GTKColorChooserPanel.hueText should be underlined to -# represent the mnemonic. -GTKColorChooserPanel.hueText=Farbton: -GTKColorChooserPanel.hueMnemonic=70 - -GTKColorChooserPanel.redText=Rot: -GTKColorChooserPanel.redMnemonic=82 - -GTKColorChooserPanel.saturationText=S\u00E4ttigung: -GTKColorChooserPanel.saturationMnemonic=83 - -GTKColorChooserPanel.greenText=Gr\u00FCn: -GTKColorChooserPanel.greenMnemonic=71 - -GTKColorChooserPanel.valueText=Wert: -GTKColorChooserPanel.valueMnemonic=87 - -GTKColorChooserPanel.blueText=Blau: -GTKColorChooserPanel.blueMnemonic=66 - -GTKColorChooserPanel.colorNameText=Farbname: -GTKColorChooserPanel.colorNameMnemonic=78 - - - -############ FILE CHOOSER STRINGS ############# - -FileChooser.acceptAllFileFilterText=Alle Dateien -FileChooser.newFolderButtonText=Neuer Ordner -FileChooser.newFolderButtonMnemonic=78 -FileChooser.newFolderDialogText=Ordnername: -FileChooser.newFolderNoDirectoryErrorTitleText=Fehler -FileChooser.newFolderNoDirectoryErrorText=Fehler beim Erstellen von Verzeichnis "{0}": Datei oder Verzeichnis nicht vorhanden -FileChooser.deleteFileButtonText=Datei l\u00F6schen -FileChooser.deleteFileButtonMnemonic=76 -FileChooser.renameFileButtonText=Datei umbenennen -FileChooser.renameFileButtonMnemonic=85 -FileChooser.cancelButtonText=Abbrechen -FileChooser.cancelButtonMnemonic=65 -FileChooser.saveButtonText=OK -FileChooser.saveButtonMnemonic=79 -FileChooser.openButtonText=OK -FileChooser.openButtonMnemonic=79 -FileChooser.saveDialogTitleText=Speichern -FileChooser.openDialogTitleText=\u00D6ffnen -FileChooser.pathLabelText=Auswahl: -FileChooser.filterLabelText=Filter: -FileChooser.pathLabelMnemonic=87 -FileChooser.foldersLabelText=Ordner -FileChooser.foldersLabelMnemonic=79 -FileChooser.filesLabelText=Dateien -FileChooser.filesLabelMnemonic=68 - -FileChooser.cancelButtonToolTipText=Dialogfeld f\u00FCr Dateiauswahl schlie\u00DFen. -FileChooser.saveButtonToolTipText=Ausgew\u00E4hlte Datei speichern. -FileChooser.openButtonToolTipText=Ausgew\u00E4hlte Datei \u00F6ffnen. - -FileChooser.renameFileDialogText=Datei "{0}" umbenennen in -FileChooser.renameFileErrorTitle=Fehler -FileChooser.renameFileErrorText=Fehler beim Umbenennen der Datei "{0}" in "{1}" - -# dummy resource added for translation automation -OptionPane.okButtonText=OK -OptionPane.okButtonMnemonic=79 -# dummy resource added for translation automation -OptionPane.cancelButtonText=Abbrechen -OptionPane.cancelButtonMnemonic=65 - +# Refer to the note in basic.properties for a description as to what +# the mnemonics correspond to and how to calculate them. + + + +# GTK specific properties + +# GTK color chooser properties: +GTKColorChooserPanel.textAndMnemonic=>K-Farbauswahl +# mnemonic as a VK_ constant + +GTKColorChooserPanel.hue.textAndMnemonic=&Farbton: + +GTKColorChooserPanel.red.textAndMnemonic=&Rot: + +GTKColorChooserPanel.saturation.textAndMnemonic=S\u00E4ttigung(&S): + +GTKColorChooserPanel.green.textAndMnemonic=Gr\u00FCn(&G): + +GTKColorChooserPanel.value.textAndMnemonic=&Wert: + +GTKColorChooserPanel.blue.textAndMnemonic=&Blau: + +GTKColorChooserPanel.color.textAndMnemonic=Farb&name: + + + +############ FILE CHOOSER STRINGS ############# + +FileChooser.acceptAllFileFilter.textAndMnemonic=Alle Dateien +FileChooser.newFolderButton.textAndMnemonic=&Neuer Ordner +FileChooser.newFolderDialog.textAndMnemonic=Ordnername: +FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=Fehler +FileChooser.newFolderNoDirectoryError.textAndMnemonic=Fehler beim Erstellen von Verzeichnis "{0}": Datei oder Verzeichnis nicht vorhanden +FileChooser.deleteFileButton.textAndMnemonic=Datei l\u00F6schen(&L) +FileChooser.renameFileButton.textAndMnemonic=Datei &umbenennen +FileChooser.cancelButton.textAndMnemonic=&Abbrechen +FileChooser.saveButton.textAndMnemonic=&OK +FileChooser.openButton.textAndMnemonic=&OK +FileChooser.saveDialogTitle.textAndMnemonic=Speichern +FileChooser.openDialogTitle.textAndMnemonic=\u00D6ffnen +FileChooser.pathLabel.textAndMnemonic=Aus&wahl: +FileChooser.filterLabel.textAndMnemonic=Filter: +FileChooser.foldersLabel.textAndMnemonic=&Ordner +FileChooser.filesLabel.textAndMnemonic=&Dateien + +FileChooser.cancelButtonToolTip.textAndMnemonic=Dialogfeld f\u00FCr Dateiauswahl schlie\u00DFen. +FileChooser.saveButtonToolTip.textAndMnemonic=Ausgew\u00E4hlte Datei speichern. +FileChooser.openButtonToolTip.textAndMnemonic=Ausgew\u00E4hlte Datei \u00F6ffnen. + +FileChooser.renameFileDialog.textAndMnemonic=Datei "{0}" umbenennen in +FileChooser.renameFileError.titleAndMnemonic=Fehler +FileChooser.renameFileError.textAndMnemonic=Fehler beim Umbenennen der Datei "{0}" in "{1}" + +# dummy resource added for translation automation +OptionPane.okButton.textAndMnemonic=&OK +# dummy resource added for translation automation +OptionPane.cancelButton.textAndMnemonic=&Abbrechen + diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_es.properties b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_es.properties index 4766de9167e..f4f3f6f6239 100644 --- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_es.properties +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_es.properties @@ -1,88 +1,59 @@ -# Refer to the note in basic.properties for a description as to what -# the mnemonics correspond to and how to calculate them. - - - -# GTK specific properties - -# GTK color chooser properties: -GTKColorChooserPanel.nameText=Selector de Color para GTK -# mnemonic as a VK_ constant -GTKColorChooserPanel.mnemonic=71 -# Can also define GTKColorChooserPanel.dispalyedMnemonicIndex if you -# want an index other than would normally be underlined by -# GTKColorChooserPanel.mnemonic to be underlined. This is only useful -# if GTKColorChooserPanel.nameText defines the mnemonic character more -# than once and you want a character other than the first underlined. - -# Text and mnemonics for the spinner. You can also defined a different -# index for the mnemonic via xxxMnemonicIndex, for example -# GTKColorChooserPanel.hueMnemonicIndex=1 would indicate the second -# character of GTKColorChooserPanel.hueText should be underlined to -# represent the mnemonic. -GTKColorChooserPanel.hueText=Mat: -GTKColorChooserPanel.hueMnemonic=77 - -GTKColorChooserPanel.redText=Rojo: -GTKColorChooserPanel.redMnemonic=74 - -GTKColorChooserPanel.saturationText=Saturaci\u00F3n: -GTKColorChooserPanel.saturationMnemonic=83 - -GTKColorChooserPanel.greenText=Verde: -GTKColorChooserPanel.greenMnemonic=69 - -GTKColorChooserPanel.valueText=Valor: -GTKColorChooserPanel.valueMnemonic=86 - -GTKColorChooserPanel.blueText=Azul: -GTKColorChooserPanel.blueMnemonic=65 - -GTKColorChooserPanel.colorNameText=Nombre del Color: -GTKColorChooserPanel.colorNameMnemonic=78 - - - -############ FILE CHOOSER STRINGS ############# - -FileChooser.acceptAllFileFilterText=Todos los Archivos -FileChooser.newFolderButtonText=Nueva Carpeta -FileChooser.newFolderButtonMnemonic=78 -FileChooser.newFolderDialogText=Nombre de la Carpeta: -FileChooser.newFolderNoDirectoryErrorTitleText=Error -FileChooser.newFolderNoDirectoryErrorText=Error al crear el directorio "{0}": no existe dicho archivo o directorio -FileChooser.deleteFileButtonText=Suprimir Archivo -FileChooser.deleteFileButtonMnemonic=80 -FileChooser.renameFileButtonText=Cambiar Nombre de Archivo -FileChooser.renameFileButtonMnemonic=82 -FileChooser.cancelButtonText=Cancelar -FileChooser.cancelButtonMnemonic=67 -FileChooser.saveButtonText=Aceptar -FileChooser.saveButtonMnemonic=65 -FileChooser.openButtonText=Aceptar -FileChooser.openButtonMnemonic=65 -FileChooser.saveDialogTitleText=Guardar -FileChooser.openDialogTitleText=Abrir -FileChooser.pathLabelText=Selecci\u00F3n: -FileChooser.filterLabelText=Filtro: -FileChooser.pathLabelMnemonic=83 -FileChooser.foldersLabelText=Carpetas -FileChooser.foldersLabelMnemonic=84 -FileChooser.filesLabelText=Archivos -FileChooser.filesLabelMnemonic=65 - -FileChooser.cancelButtonToolTipText=Abortar cuadro de di\u00E1logo del selector de archivos. -FileChooser.saveButtonToolTipText=Guardar el archivo seleccionado. -FileChooser.openButtonToolTipText=Abrir el archivo seleccionado. - -FileChooser.renameFileDialogText=Cambiar el nombre del archivo "{0}" por -FileChooser.renameFileErrorTitle=Error -FileChooser.renameFileErrorText=Error al cambiar el nombre del archivo "{0}" a "{1}" - -# dummy resource added for translation automation -OptionPane.okButtonText=Aceptar -OptionPane.okButtonMnemonic=65 -# dummy resource added for translation automation -OptionPane.cancelButtonText=Cancelar -OptionPane.cancelButtonMnemonic=67 - +# Refer to the note in basic.properties for a description as to what +# the mnemonics correspond to and how to calculate them. + + + +# GTK specific properties + +# GTK color chooser properties: +GTKColorChooserPanel.textAndMnemonic=Selector de Color para >K +# mnemonic as a VK_ constant + +GTKColorChooserPanel.hue.textAndMnemonic=&Mat: + +GTKColorChooserPanel.red.textAndMnemonic=Ro&jo: + +GTKColorChooserPanel.saturation.textAndMnemonic=Saturaci\u00F3n(&S): + +GTKColorChooserPanel.green.textAndMnemonic=V&erde: + +GTKColorChooserPanel.value.textAndMnemonic=&Valor: + +GTKColorChooserPanel.blue.textAndMnemonic=&Azul: + +GTKColorChooserPanel.color.textAndMnemonic=&Nombre del Color: + + + +############ FILE CHOOSER STRINGS ############# + +FileChooser.acceptAllFileFilter.textAndMnemonic=Todos los Archivos +FileChooser.newFolderButton.textAndMnemonic=&Nueva Carpeta +FileChooser.newFolderDialog.textAndMnemonic=Nombre de la Carpeta: +FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=Error +FileChooser.newFolderNoDirectoryError.textAndMnemonic=Error al crear el directorio "{0}": no existe dicho archivo o directorio +FileChooser.deleteFileButton.textAndMnemonic=Su&primir Archivo +FileChooser.renameFileButton.textAndMnemonic=Cambia&r Nombre de Archivo +FileChooser.cancelButton.textAndMnemonic=&Cancelar +FileChooser.saveButton.textAndMnemonic=&Aceptar +FileChooser.openButton.textAndMnemonic=&Aceptar +FileChooser.saveDialogTitle.textAndMnemonic=Guardar +FileChooser.openDialogTitle.textAndMnemonic=Abrir +FileChooser.pathLabel.textAndMnemonic=Selecci\u00F3n(&S): +FileChooser.filterLabel.textAndMnemonic=Filtro: +FileChooser.foldersLabel.textAndMnemonic=Carpe&tas +FileChooser.filesLabel.textAndMnemonic=&Archivos + +FileChooser.cancelButtonToolTip.textAndMnemonic=Abortar cuadro de di\u00E1logo del selector de archivos. +FileChooser.saveButtonToolTip.textAndMnemonic=Guardar el archivo seleccionado. +FileChooser.openButtonToolTip.textAndMnemonic=Abrir el archivo seleccionado. + +FileChooser.renameFileDialog.textAndMnemonic=Cambiar el nombre del archivo "{0}" por +FileChooser.renameFileError.titleAndMnemonic=Error +FileChooser.renameFileError.textAndMnemonic=Error al cambiar el nombre del archivo "{0}" a "{1}" + +# dummy resource added for translation automation +OptionPane.okButton.textAndMnemonic=&Aceptar +# dummy resource added for translation automation +OptionPane.cancelButton.textAndMnemonic=&Cancelar + diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_fr.properties b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_fr.properties index 68f07d2e469..cdc2f03e462 100644 --- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_fr.properties +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_fr.properties @@ -1,88 +1,59 @@ -# Refer to the note in basic.properties for a description as to what -# the mnemonics correspond to and how to calculate them. - - - -# GTK specific properties - -# GTK color chooser properties: -GTKColorChooserPanel.nameText=S\u00E9lecteur de couleurs GTK -# mnemonic as a VK_ constant -GTKColorChooserPanel.mnemonic=71 -# Can also define GTKColorChooserPanel.dispalyedMnemonicIndex if you -# want an index other than would normally be underlined by -# GTKColorChooserPanel.mnemonic to be underlined. This is only useful -# if GTKColorChooserPanel.nameText defines the mnemonic character more -# than once and you want a character other than the first underlined. - -# Text and mnemonics for the spinner. You can also defined a different -# index for the mnemonic via xxxMnemonicIndex, for example -# GTKColorChooserPanel.hueMnemonicIndex=1 would indicate the second -# character of GTKColorChooserPanel.hueText should be underlined to -# represent the mnemonic. -GTKColorChooserPanel.hueText=Teinte : -GTKColorChooserPanel.hueMnemonic=84 - -GTKColorChooserPanel.redText=Rouge\u00A0: -GTKColorChooserPanel.redMnemonic=69 - -GTKColorChooserPanel.saturationText=Saturation : -GTKColorChooserPanel.saturationMnemonic=83 - -GTKColorChooserPanel.greenText=Vert : -GTKColorChooserPanel.greenMnemonic=69 - -GTKColorChooserPanel.valueText=Valeur : -GTKColorChooserPanel.valueMnemonic=86 - -GTKColorChooserPanel.blueText=Bleu : -GTKColorChooserPanel.blueMnemonic=66 - -GTKColorChooserPanel.colorNameText=Nom de couleur : -GTKColorChooserPanel.colorNameMnemonic=78 - - - -############ FILE CHOOSER STRINGS ############# - -FileChooser.acceptAllFileFilterText=Tous les fichiers -FileChooser.newFolderButtonText=Nouveau dossier -FileChooser.newFolderButtonMnemonic=78 -FileChooser.newFolderDialogText=Nom du dossier : -FileChooser.newFolderNoDirectoryErrorTitleText=Erreur -FileChooser.newFolderNoDirectoryErrorText=Erreur lors de la cr\u00E9ation du r\u00E9pertoire "{0}" : ce fichier ou r\u00E9pertoire n''existe pas -FileChooser.deleteFileButtonText=Supprimer le fichier -FileChooser.deleteFileButtonMnemonic=76 -FileChooser.renameFileButtonText=Renommer le fichier -FileChooser.renameFileButtonMnemonic=82 -FileChooser.cancelButtonText=Annuler -FileChooser.cancelButtonMnemonic=65 -FileChooser.saveButtonText=OK -FileChooser.saveButtonMnemonic=79 -FileChooser.openButtonText=OK -FileChooser.openButtonMnemonic=79 -FileChooser.saveDialogTitleText=Enregistrer -FileChooser.openDialogTitleText=Ouvrir -FileChooser.pathLabelText=S\u00E9lection : -FileChooser.filterLabelText=Filtre : -FileChooser.pathLabelMnemonic=83 -FileChooser.foldersLabelText=Dossiers -FileChooser.foldersLabelMnemonic=68 -FileChooser.filesLabelText=Fichiers -FileChooser.filesLabelMnemonic=70 - -FileChooser.cancelButtonToolTipText=Ferme la bo\u00EEte de dialogue du s\u00E9lecteur de fichiers. -FileChooser.saveButtonToolTipText=Enregistre le fichier s\u00E9lectionn\u00E9. -FileChooser.openButtonToolTipText=Ouvre le fichier s\u00E9lectionn\u00E9. - -FileChooser.renameFileDialogText=Renomme le fichier "{0}" en -FileChooser.renameFileErrorTitle=Erreur -FileChooser.renameFileErrorText=Erreur lors du changement de nom du fichier "{0}" en "{1}" - -# dummy resource added for translation automation -OptionPane.okButtonText=OK -OptionPane.okButtonMnemonic=79 -# dummy resource added for translation automation -OptionPane.cancelButtonText=Annuler -OptionPane.cancelButtonMnemonic=65 - +# Refer to the note in basic.properties for a description as to what +# the mnemonics correspond to and how to calculate them. + + + +# GTK specific properties + +# GTK color chooser properties: +GTKColorChooserPanel.textAndMnemonic=S\u00E9lecteur de couleurs GTK(&G) +# mnemonic as a VK_ constant + +GTKColorChooserPanel.hue.textAndMnemonic=&Teinte : + +GTKColorChooserPanel.red.textAndMnemonic=Rouge\u00A0(&E): + +GTKColorChooserPanel.saturation.textAndMnemonic=&Saturation : + +GTKColorChooserPanel.green.textAndMnemonic=V&ert : + +GTKColorChooserPanel.value.textAndMnemonic=&Valeur : + +GTKColorChooserPanel.blue.textAndMnemonic=&Bleu : + +GTKColorChooserPanel.color.textAndMnemonic=&Nom de couleur : + + + +############ FILE CHOOSER STRINGS ############# + +FileChooser.acceptAllFileFilter.textAndMnemonic=Tous les fichiers +FileChooser.newFolderButton.textAndMnemonic=&Nouveau dossier +FileChooser.newFolderDialog.textAndMnemonic=Nom du dossier : +FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=Erreur +FileChooser.newFolderNoDirectoryError.textAndMnemonic=Erreur lors de la cr\u00E9ation du r\u00E9pertoire "{0}" : ce fichier ou r\u00E9pertoire n''existe pas +FileChooser.deleteFileButton.textAndMnemonic=Supprimer &le fichier +FileChooser.renameFileButton.textAndMnemonic=&Renommer le fichier +FileChooser.cancelButton.textAndMnemonic=&Annuler +FileChooser.saveButton.textAndMnemonic=&OK +FileChooser.openButton.textAndMnemonic=&OK +FileChooser.saveDialogTitle.textAndMnemonic=Enregistrer +FileChooser.openDialogTitle.textAndMnemonic=Ouvrir +FileChooser.pathLabel.textAndMnemonic=S\u00E9lection (&S): +FileChooser.filterLabel.textAndMnemonic=Filtre : +FileChooser.foldersLabel.textAndMnemonic=&Dossiers +FileChooser.filesLabel.textAndMnemonic=&Fichiers + +FileChooser.cancelButtonToolTip.textAndMnemonic=Ferme la bo\u00EEte de dialogue du s\u00E9lecteur de fichiers. +FileChooser.saveButtonToolTip.textAndMnemonic=Enregistre le fichier s\u00E9lectionn\u00E9. +FileChooser.openButtonToolTip.textAndMnemonic=Ouvre le fichier s\u00E9lectionn\u00E9. + +FileChooser.renameFileDialog.textAndMnemonic=Renomme le fichier "{0}" en +FileChooser.renameFileError.titleAndMnemonic=Erreur +FileChooser.renameFileError.textAndMnemonic=Erreur lors du changement de nom du fichier "{0}" en "{1}" + +# dummy resource added for translation automation +OptionPane.okButton.textAndMnemonic=&OK +# dummy resource added for translation automation +OptionPane.cancelButton.textAndMnemonic=&Annuler + diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_it.properties b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_it.properties index 70146898dac..f5bc82a27ab 100644 --- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_it.properties +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_it.properties @@ -1,88 +1,59 @@ -# Refer to the note in basic.properties for a description as to what -# the mnemonics correspond to and how to calculate them. - - - -# GTK specific properties - -# GTK color chooser properties: -GTKColorChooserPanel.nameText=Selezione colore GTK -# mnemonic as a VK_ constant -GTKColorChooserPanel.mnemonic=71 -# Can also define GTKColorChooserPanel.dispalyedMnemonicIndex if you -# want an index other than would normally be underlined by -# GTKColorChooserPanel.mnemonic to be underlined. This is only useful -# if GTKColorChooserPanel.nameText defines the mnemonic character more -# than once and you want a character other than the first underlined. - -# Text and mnemonics for the spinner. You can also defined a different -# index for the mnemonic via xxxMnemonicIndex, for example -# GTKColorChooserPanel.hueMnemonicIndex=1 would indicate the second -# character of GTKColorChooserPanel.hueText should be underlined to -# represent the mnemonic. -GTKColorChooserPanel.hueText=Ton.: -GTKColorChooserPanel.hueMnemonic=84 - -GTKColorChooserPanel.redText=Rosso: -GTKColorChooserPanel.redMnemonic=79 - -GTKColorChooserPanel.saturationText=Saturazione: -GTKColorChooserPanel.saturationMnemonic=83 - -GTKColorChooserPanel.greenText=Verde: -GTKColorChooserPanel.greenMnemonic=69 - -GTKColorChooserPanel.valueText=Valore: -GTKColorChooserPanel.valueMnemonic=86 - -GTKColorChooserPanel.blueText=Blu: -GTKColorChooserPanel.blueMnemonic=66 - -GTKColorChooserPanel.colorNameText=Nome colore: -GTKColorChooserPanel.colorNameMnemonic=78 - - - -############ FILE CHOOSER STRINGS ############# - -FileChooser.acceptAllFileFilterText=Tutti i file -FileChooser.newFolderButtonText=Nuova cartella -FileChooser.newFolderButtonMnemonic=78 -FileChooser.newFolderDialogText=Nome della cartella: -FileChooser.newFolderNoDirectoryErrorTitleText=Errore -FileChooser.newFolderNoDirectoryErrorText=Errore durante la creazione della directory "{0}": file o directory inesistente -FileChooser.deleteFileButtonText=Elimina file -FileChooser.deleteFileButtonMnemonic=76 -FileChooser.renameFileButtonText=Rinomina file -FileChooser.renameFileButtonMnemonic=82 -FileChooser.cancelButtonText=Annulla -FileChooser.cancelButtonMnemonic=65 -FileChooser.saveButtonText=OK -FileChooser.saveButtonMnemonic=79 -FileChooser.openButtonText=OK -FileChooser.openButtonMnemonic=79 -FileChooser.saveDialogTitleText=Salva -FileChooser.openDialogTitleText=Apri -FileChooser.pathLabelText=Selezione: -FileChooser.filterLabelText=Filtro: -FileChooser.pathLabelMnemonic=83 -FileChooser.foldersLabelText=Cartelle -FileChooser.foldersLabelMnemonic=84 -FileChooser.filesLabelText=File -FileChooser.filesLabelMnemonic=70 - -FileChooser.cancelButtonToolTipText=Chiude la finestra di dialogo di selezione file. -FileChooser.saveButtonToolTipText=Salva il file selezionato. -FileChooser.openButtonToolTipText=Apre il file selezionato. - -FileChooser.renameFileDialogText=Rinomina file "{0}" in -FileChooser.renameFileErrorTitle=Errore -FileChooser.renameFileErrorText=Errore durante la ridenominazione del file "{0}" in "{1}" - -# dummy resource added for translation automation -OptionPane.okButtonText=OK -OptionPane.okButtonMnemonic=79 -# dummy resource added for translation automation -OptionPane.cancelButtonText=Annulla -OptionPane.cancelButtonMnemonic=65 - +# Refer to the note in basic.properties for a description as to what +# the mnemonics correspond to and how to calculate them. + + + +# GTK specific properties + +# GTK color chooser properties: +GTKColorChooserPanel.textAndMnemonic=Selezione colore >K +# mnemonic as a VK_ constant + +GTKColorChooserPanel.hue.textAndMnemonic=&Ton.: + +GTKColorChooserPanel.red.textAndMnemonic=R&osso: + +GTKColorChooserPanel.saturation.textAndMnemonic=&Saturazione: + +GTKColorChooserPanel.green.textAndMnemonic=V&erde: + +GTKColorChooserPanel.value.textAndMnemonic=&Valore: + +GTKColorChooserPanel.blue.textAndMnemonic=&Blu: + +GTKColorChooserPanel.color.textAndMnemonic=&Nome colore: + + + +############ FILE CHOOSER STRINGS ############# + +FileChooser.acceptAllFileFilter.textAndMnemonic=Tutti i file +FileChooser.newFolderButton.textAndMnemonic=&Nuova cartella +FileChooser.newFolderDialog.textAndMnemonic=Nome della cartella: +FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=Errore +FileChooser.newFolderNoDirectoryError.textAndMnemonic=Errore durante la creazione della directory "{0}": file o directory inesistente +FileChooser.deleteFileButton.textAndMnemonic=E&limina file +FileChooser.renameFileButton.textAndMnemonic=&Rinomina file +FileChooser.cancelButton.textAndMnemonic=&Annulla +FileChooser.saveButton.textAndMnemonic=&OK +FileChooser.openButton.textAndMnemonic=&OK +FileChooser.saveDialogTitle.textAndMnemonic=Salva +FileChooser.openDialogTitle.textAndMnemonic=Apri +FileChooser.pathLabel.textAndMnemonic=&Selezione: +FileChooser.filterLabel.textAndMnemonic=Filtro: +FileChooser.foldersLabel.textAndMnemonic=Car&telle +FileChooser.filesLabel.textAndMnemonic=&File + +FileChooser.cancelButtonToolTip.textAndMnemonic=Chiude la finestra di dialogo di selezione file. +FileChooser.saveButtonToolTip.textAndMnemonic=Salva il file selezionato. +FileChooser.openButtonToolTip.textAndMnemonic=Apre il file selezionato. + +FileChooser.renameFileDialog.textAndMnemonic=Rinomina file "{0}" in +FileChooser.renameFileError.titleAndMnemonic=Errore +FileChooser.renameFileError.textAndMnemonic=Errore durante la ridenominazione del file "{0}" in "{1}" + +# dummy resource added for translation automation +OptionPane.okButton.textAndMnemonic=&OK +# dummy resource added for translation automation +OptionPane.cancelButton.textAndMnemonic=&Annulla + diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ja.properties b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ja.properties index 30560e91620..60dd0cf356f 100644 --- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ja.properties +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ja.properties @@ -1,84 +1,55 @@ -# Refer to the note in basic.properties for a description as to what -# the mnemonics correspond to and how to calculate them. - - - -# GTK specific properties - -# GTK color chooser properties: -GTKColorChooserPanel.nameText=GTK\u30AB\u30E9\u30FC\u30FB\u30C1\u30E5\u30FC\u30B6(G) -# mnemonic as a VK_ constant -GTKColorChooserPanel.mnemonic=71 -# Can also define GTKColorChooserPanel.dispalyedMnemonicIndex if you -# want an index other than would normally be underlined by -# GTKColorChooserPanel.mnemonic to be underlined. This is only useful -# if GTKColorChooserPanel.nameText defines the mnemonic character more -# than once and you want a character other than the first underlined. - -# Text and mnemonics for the spinner. You can also defined a different -# index for the mnemonic via xxxMnemonicIndex, for example -# GTKColorChooserPanel.hueMnemonicIndex=1 would indicate the second -# character of GTKColorChooserPanel.hueText should be underlined to -# represent the mnemonic. -GTKColorChooserPanel.hueText=\u8272\u76F8(H): -GTKColorChooserPanel.hueMnemonic=72 - -GTKColorChooserPanel.redText=\u8D64(E): -GTKColorChooserPanel.redMnemonic=69 - -GTKColorChooserPanel.saturationText=\u5F69\u5EA6(S): -GTKColorChooserPanel.saturationMnemonic=83 - -GTKColorChooserPanel.greenText=\u7DD1(G): -GTKColorChooserPanel.greenMnemonic=71 - -GTKColorChooserPanel.valueText=\u5024(V): -GTKColorChooserPanel.valueMnemonic=86 - -GTKColorChooserPanel.blueText=\u9752(B): -GTKColorChooserPanel.blueMnemonic=66 - -GTKColorChooserPanel.colorNameText=\u8272\u540D(N): -GTKColorChooserPanel.colorNameMnemonic=78 - - - -############ FILE CHOOSER STRINGS ############# - -FileChooser.acceptAllFileFilterText=\u3059\u3079\u3066\u306E\u30D5\u30A1\u30A4\u30EB -FileChooser.newFolderButtonText=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0(N) -FileChooser.newFolderButtonMnemonic=78 -FileChooser.newFolderDialogText=\u30D5\u30A9\u30EB\u30C0\u540D: -FileChooser.newFolderNoDirectoryErrorTitleText=\u30A8\u30E9\u30FC -FileChooser.newFolderNoDirectoryErrorText=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA"{0}"\u306E\u4F5C\u6210\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F: \u3053\u306E\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306F\u5B58\u5728\u3057\u307E\u305B\u3093 -FileChooser.deleteFileButtonText=\u30D5\u30A1\u30A4\u30EB\u306E\u524A\u9664(L) -FileChooser.deleteFileButtonMnemonic=76 -FileChooser.renameFileButtonText=\u30D5\u30A1\u30A4\u30EB\u306E\u540D\u524D\u5909\u66F4(R) -FileChooser.renameFileButtonMnemonic=82 -FileChooser.cancelButtonText=\u53D6\u6D88 -FileChooser.cancelButtonMnemonic=67 -FileChooser.saveButtonText=OK -FileChooser.saveButtonMnemonic=79 -FileChooser.openButtonText=OK -FileChooser.openButtonMnemonic=79 -FileChooser.saveDialogTitleText=\u4FDD\u5B58 -FileChooser.openDialogTitleText=\u958B\u304F -FileChooser.pathLabelText=\u9078\u629E(S): -FileChooser.filterLabelText=\u30D5\u30A3\u30EB\u30BF: -FileChooser.pathLabelMnemonic=83 -FileChooser.foldersLabelText=\u30D5\u30A9\u30EB\u30C0(D) -FileChooser.foldersLabelMnemonic=68 -FileChooser.filesLabelText=\u30D5\u30A1\u30A4\u30EB(F) -FileChooser.filesLabelMnemonic=70 - -FileChooser.cancelButtonToolTipText=\u30D5\u30A1\u30A4\u30EB\u30FB\u30C1\u30E5\u30FC\u30B6\u30FB\u30C0\u30A4\u30A2\u30ED\u30B0\u3092\u7D42\u4E86\u3057\u307E\u3059\u3002 -FileChooser.saveButtonToolTipText=\u9078\u629E\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u4FDD\u5B58\u3057\u307E\u3059\u3002 -FileChooser.openButtonToolTipText=\u9078\u629E\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u958B\u304D\u307E\u3059\u3002 - -FileChooser.renameFileDialogText=\u30D5\u30A1\u30A4\u30EB"{0}"\u3092\u6B21\u306E\u540D\u524D\u306B\u5909\u66F4: -FileChooser.renameFileErrorTitle=\u30A8\u30E9\u30FC -FileChooser.renameFileErrorText=\u30D5\u30A1\u30A4\u30EB"{0}"\u306E"{1}"\u3078\u306E\u5909\u66F4\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F - -#OptionPane.okButtonMnemonic=79 -#OptionPane.cancelButtonMnemonic=67 - +# Refer to the note in basic.properties for a description as to what +# the mnemonics correspond to and how to calculate them. + + + +# GTK specific properties + +# GTK color chooser properties: +GTKColorChooserPanel.textAndMnemonic=GTK\u30AB\u30E9\u30FC\u30FB\u30C1\u30E5\u30FC\u30B6(&G) +# mnemonic as a VK_ constant + +GTKColorChooserPanel.hue.textAndMnemonic=\u8272\u76F8(&H): + +GTKColorChooserPanel.red.textAndMnemonic=\u8D64(&E): + +GTKColorChooserPanel.saturation.textAndMnemonic=\u5F69\u5EA6(&S): + +GTKColorChooserPanel.green.textAndMnemonic=\u7DD1(&G): + +GTKColorChooserPanel.value.textAndMnemonic=\u5024(&V): + +GTKColorChooserPanel.blue.textAndMnemonic=\u9752(&B): + +GTKColorChooserPanel.color.textAndMnemonic=\u8272\u540D(&N): + + + +############ FILE CHOOSER STRINGS ############# + +FileChooser.acceptAllFileFilter.textAndMnemonic=\u3059\u3079\u3066\u306E\u30D5\u30A1\u30A4\u30EB +FileChooser.newFolderButton.textAndMnemonic=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0(&N) +FileChooser.newFolderDialog.textAndMnemonic=\u30D5\u30A9\u30EB\u30C0\u540D: +FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=\u30A8\u30E9\u30FC +FileChooser.newFolderNoDirectoryError.textAndMnemonic=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA"{0}"\u306E\u4F5C\u6210\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F: \u3053\u306E\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306F\u5B58\u5728\u3057\u307E\u305B\u3093 +FileChooser.deleteFileButton.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u306E\u524A\u9664(&L) +FileChooser.renameFileButton.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u306E\u540D\u524D\u5909\u66F4(&R) +FileChooser.cancelButton.textAndMnemonic=\u53D6\u6D88(&C) +FileChooser.saveButton.textAndMnemonic=&OK +FileChooser.openButton.textAndMnemonic=&OK +FileChooser.saveDialogTitle.textAndMnemonic=\u4FDD\u5B58 +FileChooser.openDialogTitle.textAndMnemonic=\u958B\u304F +FileChooser.pathLabel.textAndMnemonic=\u9078\u629E(&S): +FileChooser.filterLabel.textAndMnemonic=\u30D5\u30A3\u30EB\u30BF: +FileChooser.foldersLabel.textAndMnemonic=\u30D5\u30A9\u30EB\u30C0(&D) +FileChooser.filesLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB(&F) + +FileChooser.cancelButtonToolTip.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u30FB\u30C1\u30E5\u30FC\u30B6\u30FB\u30C0\u30A4\u30A2\u30ED\u30B0\u3092\u7D42\u4E86\u3057\u307E\u3059\u3002 +FileChooser.saveButtonToolTip.textAndMnemonic=\u9078\u629E\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u4FDD\u5B58\u3057\u307E\u3059\u3002 +FileChooser.openButtonToolTip.textAndMnemonic=\u9078\u629E\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u958B\u304D\u307E\u3059\u3002 + +FileChooser.renameFileDialog.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB"{0}"\u3092\u6B21\u306E\u540D\u524D\u306B\u5909\u66F4: +FileChooser.renameFileError.titleAndMnemonic=\u30A8\u30E9\u30FC +FileChooser.renameFileError.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB"{0}"\u306E"{1}"\u3078\u306E\u5909\u66F4\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F + + diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ko.properties b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ko.properties index 27802636b7c..e2ffdc1970e 100644 --- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ko.properties +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ko.properties @@ -1,84 +1,55 @@ -# Refer to the note in basic.properties for a description as to what -# the mnemonics correspond to and how to calculate them. - - - -# GTK specific properties - -# GTK color chooser properties: -GTKColorChooserPanel.nameText=GTK \uC0C9\uC0C1 \uC120\uD0DD\uAE30(G) -# mnemonic as a VK_ constant -GTKColorChooserPanel.mnemonic=71 -# Can also define GTKColorChooserPanel.dispalyedMnemonicIndex if you -# want an index other than would normally be underlined by -# GTKColorChooserPanel.mnemonic to be underlined. This is only useful -# if GTKColorChooserPanel.nameText defines the mnemonic character more -# than once and you want a character other than the first underlined. - -# Text and mnemonics for the spinner. You can also defined a different -# index for the mnemonic via xxxMnemonicIndex, for example -# GTKColorChooserPanel.hueMnemonicIndex=1 would indicate the second -# character of GTKColorChooserPanel.hueText should be underlined to -# represent the mnemonic. -GTKColorChooserPanel.hueText=\uC0C9\uC870(H): -GTKColorChooserPanel.hueMnemonic=72 - -GTKColorChooserPanel.redText=\uBE68\uAC04\uC0C9(E): -GTKColorChooserPanel.redMnemonic=69 - -GTKColorChooserPanel.saturationText=\uCC44\uB3C4(S): -GTKColorChooserPanel.saturationMnemonic=83 - -GTKColorChooserPanel.greenText=\uB179\uC0C9(G): -GTKColorChooserPanel.greenMnemonic=71 - -GTKColorChooserPanel.valueText=\uAC12(V): -GTKColorChooserPanel.valueMnemonic=86 - -GTKColorChooserPanel.blueText=\uD30C\uB780\uC0C9(B): -GTKColorChooserPanel.blueMnemonic=66 - -GTKColorChooserPanel.colorNameText=\uC0C9\uC0C1 \uC774\uB984(N): -GTKColorChooserPanel.colorNameMnemonic=78 - - - -############ FILE CHOOSER STRINGS ############# - -FileChooser.acceptAllFileFilterText=\uBAA8\uB4E0 \uD30C\uC77C -FileChooser.newFolderButtonText=\uC0C8 \uD3F4\uB354(N) -FileChooser.newFolderButtonMnemonic=78 -FileChooser.newFolderDialogText=\uD3F4\uB354 \uC774\uB984: -FileChooser.newFolderNoDirectoryErrorTitleText=\uC624\uB958 -FileChooser.newFolderNoDirectoryErrorText="{0}" \uB514\uB809\uD1A0\uB9AC\uB97C \uC0DD\uC131\uD558\uB294 \uC911 \uC624\uB958 \uBC1C\uC0DD: \uD574\uB2F9 \uD30C\uC77C \uB610\uB294 \uB514\uB809\uD1A0\uB9AC\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4. -FileChooser.deleteFileButtonText=\uD30C\uC77C \uC0AD\uC81C(L) -FileChooser.deleteFileButtonMnemonic=76 -FileChooser.renameFileButtonText=\uD30C\uC77C \uC774\uB984 \uBC14\uAFB8\uAE30(R) -FileChooser.renameFileButtonMnemonic=82 -FileChooser.cancelButtonText=\uCDE8\uC18C -FileChooser.cancelButtonMnemonic=67 -FileChooser.saveButtonText=\uD655\uC778 -FileChooser.saveButtonMnemonic=79 -FileChooser.openButtonText=\uD655\uC778 -FileChooser.openButtonMnemonic=79 -FileChooser.saveDialogTitleText=\uC800\uC7A5 -FileChooser.openDialogTitleText=\uC5F4\uAE30 -FileChooser.pathLabelText=\uC120\uD0DD \uC0AC\uD56D(S): -FileChooser.filterLabelText=\uD544\uD130: -FileChooser.pathLabelMnemonic=83 -FileChooser.foldersLabelText=\uD3F4\uB354(D) -FileChooser.foldersLabelMnemonic=68 -FileChooser.filesLabelText=\uD30C\uC77C(F) -FileChooser.filesLabelMnemonic=70 - -FileChooser.cancelButtonToolTipText=\uD30C\uC77C \uC120\uD0DD\uAE30 \uB300\uD654\uC0C1\uC790\uB97C \uC911\uB2E8\uD569\uB2C8\uB2E4. -FileChooser.saveButtonToolTipText=\uC120\uD0DD\uB41C \uD30C\uC77C\uC744 \uC800\uC7A5\uD569\uB2C8\uB2E4. -FileChooser.openButtonToolTipText=\uC120\uD0DD\uB41C \uD30C\uC77C\uC744 \uC5FD\uB2C8\uB2E4. - -FileChooser.renameFileDialogText="{0}" \uD30C\uC77C\uC758 \uC774\uB984 \uBC14\uAFB8\uAE30 -FileChooser.renameFileErrorTitle=\uC624\uB958 -FileChooser.renameFileErrorText="{0}" \uD30C\uC77C\uC758 \uC774\uB984\uC744 "{1}"(\uC73C)\uB85C \uBC14\uAFB8\uB294 \uC911 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. - -#OptionPane.okButtonMnemonic=79 -#OptionPane.cancelButtonMnemonic=67 - +# Refer to the note in basic.properties for a description as to what +# the mnemonics correspond to and how to calculate them. + + + +# GTK specific properties + +# GTK color chooser properties: +GTKColorChooserPanel.textAndMnemonic=GTK \uC0C9\uC0C1 \uC120\uD0DD\uAE30(&G) +# mnemonic as a VK_ constant + +GTKColorChooserPanel.hue.textAndMnemonic=\uC0C9\uC870(&H): + +GTKColorChooserPanel.red.textAndMnemonic=\uBE68\uAC04\uC0C9(&E): + +GTKColorChooserPanel.saturation.textAndMnemonic=\uCC44\uB3C4(&S): + +GTKColorChooserPanel.green.textAndMnemonic=\uB179\uC0C9(&G): + +GTKColorChooserPanel.value.textAndMnemonic=\uAC12(&V): + +GTKColorChooserPanel.blue.textAndMnemonic=\uD30C\uB780\uC0C9(&B): + +GTKColorChooserPanel.color.textAndMnemonic=\uC0C9\uC0C1 \uC774\uB984(&N): + + + +############ FILE CHOOSER STRINGS ############# + +FileChooser.acceptAllFileFilter.textAndMnemonic=\uBAA8\uB4E0 \uD30C\uC77C +FileChooser.newFolderButton.textAndMnemonic=\uC0C8 \uD3F4\uB354(&N) +FileChooser.newFolderDialog.textAndMnemonic=\uD3F4\uB354 \uC774\uB984: +FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=\uC624\uB958 +FileChooser.newFolderNoDirectoryError.textAndMnemonic="{0}" \uB514\uB809\uD1A0\uB9AC\uB97C \uC0DD\uC131\uD558\uB294 \uC911 \uC624\uB958 \uBC1C\uC0DD: \uD574\uB2F9 \uD30C\uC77C \uB610\uB294 \uB514\uB809\uD1A0\uB9AC\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4. +FileChooser.deleteFileButton.textAndMnemonic=\uD30C\uC77C \uC0AD\uC81C(&L) +FileChooser.renameFileButton.textAndMnemonic=\uD30C\uC77C \uC774\uB984 \uBC14\uAFB8\uAE30(&R) +FileChooser.cancelButton.textAndMnemonic=\uCDE8\uC18C(&C) +FileChooser.saveButton.textAndMnemonic=\uD655\uC778(&O) +FileChooser.openButton.textAndMnemonic=\uD655\uC778(&O) +FileChooser.saveDialogTitle.textAndMnemonic=\uC800\uC7A5 +FileChooser.openDialogTitle.textAndMnemonic=\uC5F4\uAE30 +FileChooser.pathLabel.textAndMnemonic=\uC120\uD0DD \uC0AC\uD56D(&S): +FileChooser.filterLabel.textAndMnemonic=\uD544\uD130: +FileChooser.foldersLabel.textAndMnemonic=\uD3F4\uB354(&D) +FileChooser.filesLabel.textAndMnemonic=\uD30C\uC77C(&F) + +FileChooser.cancelButtonToolTip.textAndMnemonic=\uD30C\uC77C \uC120\uD0DD\uAE30 \uB300\uD654\uC0C1\uC790\uB97C \uC911\uB2E8\uD569\uB2C8\uB2E4. +FileChooser.saveButtonToolTip.textAndMnemonic=\uC120\uD0DD\uB41C \uD30C\uC77C\uC744 \uC800\uC7A5\uD569\uB2C8\uB2E4. +FileChooser.openButtonToolTip.textAndMnemonic=\uC120\uD0DD\uB41C \uD30C\uC77C\uC744 \uC5FD\uB2C8\uB2E4. + +FileChooser.renameFileDialog.textAndMnemonic="{0}" \uD30C\uC77C\uC758 \uC774\uB984 \uBC14\uAFB8\uAE30 +FileChooser.renameFileError.titleAndMnemonic=\uC624\uB958 +FileChooser.renameFileError.textAndMnemonic="{0}" \uD30C\uC77C\uC758 \uC774\uB984\uC744 "{1}"(\uC73C)\uB85C \uBC14\uAFB8\uB294 \uC911 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. + + diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_pt_BR.properties b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_pt_BR.properties index 35a510d9947..c9132f33897 100644 --- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_pt_BR.properties +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_pt_BR.properties @@ -1,88 +1,59 @@ -# Refer to the note in basic.properties for a description as to what -# the mnemonics correspond to and how to calculate them. - - - -# GTK specific properties - -# GTK color chooser properties: -GTKColorChooserPanel.nameText=Seletor de Cores do GTK -# mnemonic as a VK_ constant -GTKColorChooserPanel.mnemonic=71 -# Can also define GTKColorChooserPanel.dispalyedMnemonicIndex if you -# want an index other than would normally be underlined by -# GTKColorChooserPanel.mnemonic to be underlined. This is only useful -# if GTKColorChooserPanel.nameText defines the mnemonic character more -# than once and you want a character other than the first underlined. - -# Text and mnemonics for the spinner. You can also defined a different -# index for the mnemonic via xxxMnemonicIndex, for example -# GTKColorChooserPanel.hueMnemonicIndex=1 would indicate the second -# character of GTKColorChooserPanel.hueText should be underlined to -# represent the mnemonic. -GTKColorChooserPanel.hueText=Matiz: -GTKColorChooserPanel.hueMnemonic=77 - -GTKColorChooserPanel.redText=Vermelho: -GTKColorChooserPanel.redMnemonic=69 - -GTKColorChooserPanel.saturationText=Satura\u00E7\u00E3o: -GTKColorChooserPanel.saturationMnemonic=83 - -GTKColorChooserPanel.greenText=Verde: -GTKColorChooserPanel.greenMnemonic=68 - -GTKColorChooserPanel.valueText=Valor: -GTKColorChooserPanel.valueMnemonic=86 - -GTKColorChooserPanel.blueText=Azul: -GTKColorChooserPanel.blueMnemonic=65 - -GTKColorChooserPanel.colorNameText=Nome da Cor: -GTKColorChooserPanel.colorNameMnemonic=78 - - - -############ FILE CHOOSER STRINGS ############# - -FileChooser.acceptAllFileFilterText=Todos os Arquivos -FileChooser.newFolderButtonText=Nova Pasta -FileChooser.newFolderButtonMnemonic=78 -FileChooser.newFolderDialogText=Nome da pasta: -FileChooser.newFolderNoDirectoryErrorTitleText=Erro -FileChooser.newFolderNoDirectoryErrorText=Erro ao criar o diret\u00F3rio "{0}": N\u00E3o h\u00E1 arquivo ou diret\u00F3rio -FileChooser.deleteFileButtonText=Deletar Arquivo -FileChooser.deleteFileButtonMnemonic=76 -FileChooser.renameFileButtonText=Renomear Arquivo -FileChooser.renameFileButtonMnemonic=82 -FileChooser.cancelButtonText=Cancelar -FileChooser.cancelButtonMnemonic=67 -FileChooser.saveButtonText=OK -FileChooser.saveButtonMnemonic=79 -FileChooser.openButtonText=OK -FileChooser.openButtonMnemonic=79 -FileChooser.saveDialogTitleText=Salvar -FileChooser.openDialogTitleText=Abrir -FileChooser.pathLabelText=Sele\u00E7\u00E3o: -FileChooser.filterLabelText=Filtro: -FileChooser.pathLabelMnemonic=83 -FileChooser.foldersLabelText=Pastas -FileChooser.foldersLabelMnemonic=80 -FileChooser.filesLabelText=Arquivos -FileChooser.filesLabelMnemonic=65 - -FileChooser.cancelButtonToolTipText=Abortar caixa de di\u00E1logo do seletor de arquivos. -FileChooser.saveButtonToolTipText=Salvar arquivo selecionado. -FileChooser.openButtonToolTipText=Abrir arquivo selecionado. - -FileChooser.renameFileDialogText=Renomear arquivo "{0}" por -FileChooser.renameFileErrorTitle=Erro -FileChooser.renameFileErrorText=Erro ao renomear o arquivo "{0}" por "{1}" - -# dummy resource added for translation automation -OptionPane.okButtonText=OK -OptionPane.okButtonMnemonic=79 -# dummy resource added for translation automation -OptionPane.cancelButtonText=Cancelar -OptionPane.cancelButtonMnemonic=67 - +# Refer to the note in basic.properties for a description as to what +# the mnemonics correspond to and how to calculate them. + + + +# GTK specific properties + +# GTK color chooser properties: +GTKColorChooserPanel.textAndMnemonic=Seletor de Cores do >K +# mnemonic as a VK_ constant + +GTKColorChooserPanel.hue.textAndMnemonic=&Matiz: + +GTKColorChooserPanel.red.textAndMnemonic=V&ermelho: + +GTKColorChooserPanel.saturation.textAndMnemonic=Satura\u00E7\u00E3o(&S): + +GTKColorChooserPanel.green.textAndMnemonic=Ver&de: + +GTKColorChooserPanel.value.textAndMnemonic=&Valor: + +GTKColorChooserPanel.blue.textAndMnemonic=&Azul: + +GTKColorChooserPanel.color.textAndMnemonic=&Nome da Cor: + + + +############ FILE CHOOSER STRINGS ############# + +FileChooser.acceptAllFileFilter.textAndMnemonic=Todos os Arquivos +FileChooser.newFolderButton.textAndMnemonic=&Nova Pasta +FileChooser.newFolderDialog.textAndMnemonic=Nome da pasta: +FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=Erro +FileChooser.newFolderNoDirectoryError.textAndMnemonic=Erro ao criar o diret\u00F3rio "{0}": N\u00E3o h\u00E1 arquivo ou diret\u00F3rio +FileChooser.deleteFileButton.textAndMnemonic=De&letar Arquivo +FileChooser.renameFileButton.textAndMnemonic=&Renomear Arquivo +FileChooser.cancelButton.textAndMnemonic=&Cancelar +FileChooser.saveButton.textAndMnemonic=&OK +FileChooser.openButton.textAndMnemonic=&OK +FileChooser.saveDialogTitle.textAndMnemonic=Salvar +FileChooser.openDialogTitle.textAndMnemonic=Abrir +FileChooser.pathLabel.textAndMnemonic=Sele\u00E7\u00E3o(&S): +FileChooser.filterLabel.textAndMnemonic=Filtro: +FileChooser.foldersLabel.textAndMnemonic=&Pastas +FileChooser.filesLabel.textAndMnemonic=&Arquivos + +FileChooser.cancelButtonToolTip.textAndMnemonic=Abortar caixa de di\u00E1logo do seletor de arquivos. +FileChooser.saveButtonToolTip.textAndMnemonic=Salvar arquivo selecionado. +FileChooser.openButtonToolTip.textAndMnemonic=Abrir arquivo selecionado. + +FileChooser.renameFileDialog.textAndMnemonic=Renomear arquivo "{0}" por +FileChooser.renameFileError.titleAndMnemonic=Erro +FileChooser.renameFileError.textAndMnemonic=Erro ao renomear o arquivo "{0}" por "{1}" + +# dummy resource added for translation automation +OptionPane.okButton.textAndMnemonic=&OK +# dummy resource added for translation automation +OptionPane.cancelButton.textAndMnemonic=&Cancelar + diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_sv.properties b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_sv.properties index 9dda1e0a50f..ba86527eb38 100644 --- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_sv.properties +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_sv.properties @@ -1,88 +1,59 @@ -# Refer to the note in basic.properties for a description as to what -# the mnemonics correspond to and how to calculate them. - - - -# GTK specific properties - -# GTK color chooser properties: -GTKColorChooserPanel.nameText=GTK-f\u00E4rgv\u00E4ljaren -# mnemonic as a VK_ constant -GTKColorChooserPanel.mnemonic=71 -# Can also define GTKColorChooserPanel.dispalyedMnemonicIndex if you -# want an index other than would normally be underlined by -# GTKColorChooserPanel.mnemonic to be underlined. This is only useful -# if GTKColorChooserPanel.nameText defines the mnemonic character more -# than once and you want a character other than the first underlined. - -# Text and mnemonics for the spinner. You can also defined a different -# index for the mnemonic via xxxMnemonicIndex, for example -# GTKColorChooserPanel.hueMnemonicIndex=1 would indicate the second -# character of GTKColorChooserPanel.hueText should be underlined to -# represent the mnemonic. -GTKColorChooserPanel.hueText=Nyans: -GTKColorChooserPanel.hueMnemonic=78 - -GTKColorChooserPanel.redText=R\u00F6d: -GTKColorChooserPanel.redMnemonic=82 - -GTKColorChooserPanel.saturationText=M\u00E4ttnad: -GTKColorChooserPanel.saturationMnemonic=77 - -GTKColorChooserPanel.greenText=Gr\u00F6n: -GTKColorChooserPanel.greenMnemonic=71 - -GTKColorChooserPanel.valueText=V\u00E4rde: -GTKColorChooserPanel.valueMnemonic=86 - -GTKColorChooserPanel.blueText=Bl\u00E5: -GTKColorChooserPanel.blueMnemonic=66 - -GTKColorChooserPanel.colorNameText=F\u00E4rgnamn: -GTKColorChooserPanel.colorNameMnemonic=70 - - - -############ FILE CHOOSER STRINGS ############# - -FileChooser.acceptAllFileFilterText=Alla filer -FileChooser.newFolderButtonText=Ny mapp -FileChooser.newFolderButtonMnemonic=78 -FileChooser.newFolderDialogText=Mapp: -FileChooser.newFolderNoDirectoryErrorTitleText=Fel -FileChooser.newFolderNoDirectoryErrorText=Ett fel intr\u00E4ffade vid f\u00F6rs\u00F6k att skapa katalogen "{0}": Filen eller katalogen finns inte -FileChooser.deleteFileButtonText=Ta bort fil -FileChooser.deleteFileButtonMnemonic=66 -FileChooser.renameFileButtonText=\u00C4ndra namn p\u00E5 filen -FileChooser.renameFileButtonMnemonic=82 -FileChooser.cancelButtonText=Avbryt -FileChooser.cancelButtonMnemonic=65 -FileChooser.saveButtonText=OK -FileChooser.saveButtonMnemonic=79 -FileChooser.openButtonText=OK -FileChooser.openButtonMnemonic=79 -FileChooser.saveDialogTitleText=Spara -FileChooser.openDialogTitleText=\u00D6ppna -FileChooser.pathLabelText=Urval: -FileChooser.filterLabelText=Filter: -FileChooser.pathLabelMnemonic=85 -FileChooser.foldersLabelText=Mappar -FileChooser.foldersLabelMnemonic=80 -FileChooser.filesLabelText=Filer -FileChooser.filesLabelMnemonic=70 - -FileChooser.cancelButtonToolTipText=Avbryt dialogrutan Filv\u00E4ljare. -FileChooser.saveButtonToolTipText=Spara vald fil. -FileChooser.openButtonToolTipText=\u00D6ppna vald fil. - -FileChooser.renameFileDialogText=Namn\u00E4ndra fil "{0}" till -FileChooser.renameFileErrorTitle=Fel -FileChooser.renameFileErrorText=Fel vid namn\u00E4ndring av fil "{0}" till "{1}" - -# dummy resource added for translation automation -OptionPane.okButtonText=OK -OptionPane.okButtonMnemonic=79 -# dummy resource added for translation automation -OptionPane.cancelButtonText=Avbryt -OptionPane.cancelButtonMnemonic=65 - +# Refer to the note in basic.properties for a description as to what +# the mnemonics correspond to and how to calculate them. + + + +# GTK specific properties + +# GTK color chooser properties: +GTKColorChooserPanel.textAndMnemonic=GTK-f\u00E4rgv\u00E4ljaren(&G) +# mnemonic as a VK_ constant + +GTKColorChooserPanel.hue.textAndMnemonic=&Nyans: + +GTKColorChooserPanel.red.textAndMnemonic=R\u00F6d(&R): + +GTKColorChooserPanel.saturation.textAndMnemonic=M\u00E4ttnad(&M): + +GTKColorChooserPanel.green.textAndMnemonic=Gr\u00F6n(&G): + +GTKColorChooserPanel.value.textAndMnemonic=V\u00E4rde(&V): + +GTKColorChooserPanel.blue.textAndMnemonic=Bl\u00E5(&B): + +GTKColorChooserPanel.color.textAndMnemonic=F\u00E4rgnamn(&F): + + + +############ FILE CHOOSER STRINGS ############# + +FileChooser.acceptAllFileFilter.textAndMnemonic=Alla filer +FileChooser.newFolderButton.textAndMnemonic=&Ny mapp +FileChooser.newFolderDialog.textAndMnemonic=Mapp: +FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=Fel +FileChooser.newFolderNoDirectoryError.textAndMnemonic=Ett fel intr\u00E4ffade vid f\u00F6rs\u00F6k att skapa katalogen "{0}": Filen eller katalogen finns inte +FileChooser.deleteFileButton.textAndMnemonic=Ta &bort fil +FileChooser.renameFileButton.textAndMnemonic=\u00C4ndra namn p\u00E5 filen(&R) +FileChooser.cancelButton.textAndMnemonic=&Avbryt +FileChooser.saveButton.textAndMnemonic=&OK +FileChooser.openButton.textAndMnemonic=&OK +FileChooser.saveDialogTitle.textAndMnemonic=Spara +FileChooser.openDialogTitle.textAndMnemonic=\u00D6ppna +FileChooser.pathLabel.textAndMnemonic=&Urval: +FileChooser.filterLabel.textAndMnemonic=Filter: +FileChooser.foldersLabel.textAndMnemonic=Ma&ppar +FileChooser.filesLabel.textAndMnemonic=&Filer + +FileChooser.cancelButtonToolTip.textAndMnemonic=Avbryt dialogrutan Filv\u00E4ljare. +FileChooser.saveButtonToolTip.textAndMnemonic=Spara vald fil. +FileChooser.openButtonToolTip.textAndMnemonic=\u00D6ppna vald fil. + +FileChooser.renameFileDialog.textAndMnemonic=Namn\u00E4ndra fil "{0}" till +FileChooser.renameFileError.titleAndMnemonic=Fel +FileChooser.renameFileError.textAndMnemonic=Fel vid namn\u00E4ndring av fil "{0}" till "{1}" + +# dummy resource added for translation automation +OptionPane.okButton.textAndMnemonic=&OK +# dummy resource added for translation automation +OptionPane.cancelButton.textAndMnemonic=&Avbryt + diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.properties b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.properties index 9c7793c62ff..bc548dd24f3 100644 --- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.properties +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.properties @@ -1,84 +1,55 @@ -# Refer to the note in basic.properties for a description as to what -# the mnemonics correspond to and how to calculate them. - - - -# GTK specific properties - -# GTK color chooser properties: -GTKColorChooserPanel.nameText=GTK \u989C\u8272\u9009\u62E9\u5668(G) -# mnemonic as a VK_ constant -GTKColorChooserPanel.mnemonic=71 -# Can also define GTKColorChooserPanel.dispalyedMnemonicIndex if you -# want an index other than would normally be underlined by -# GTKColorChooserPanel.mnemonic to be underlined. This is only useful -# if GTKColorChooserPanel.nameText defines the mnemonic character more -# than once and you want a character other than the first underlined. - -# Text and mnemonics for the spinner. You can also defined a different -# index for the mnemonic via xxxMnemonicIndex, for example -# GTKColorChooserPanel.hueMnemonicIndex=1 would indicate the second -# character of GTKColorChooserPanel.hueText should be underlined to -# represent the mnemonic. -GTKColorChooserPanel.hueText=\u8272\u8C03(H): -GTKColorChooserPanel.hueMnemonic=72 - -GTKColorChooserPanel.redText=\u7EA2\u8272(E): -GTKColorChooserPanel.redMnemonic=69 - -GTKColorChooserPanel.saturationText=\u9971\u548C\u5EA6(S): -GTKColorChooserPanel.saturationMnemonic=83 - -GTKColorChooserPanel.greenText=\u7EFF\u8272(G): -GTKColorChooserPanel.greenMnemonic=71 - -GTKColorChooserPanel.valueText=\u503C(V): -GTKColorChooserPanel.valueMnemonic=86 - -GTKColorChooserPanel.blueText=\u84DD\u8272(B): -GTKColorChooserPanel.blueMnemonic=66 - -GTKColorChooserPanel.colorNameText=\u989C\u8272\u540D(N): -GTKColorChooserPanel.colorNameMnemonic=78 - - - -############ FILE CHOOSER STRINGS ############# - -FileChooser.acceptAllFileFilterText=\u6240\u6709\u6587\u4EF6 -FileChooser.newFolderButtonText=\u65B0\u6587\u4EF6\u5939(N) -FileChooser.newFolderButtonMnemonic=78 -FileChooser.newFolderDialogText=\u6587\u4EF6\u5939\u540D: -FileChooser.newFolderNoDirectoryErrorTitleText=\u9519\u8BEF -FileChooser.newFolderNoDirectoryErrorText=\u521B\u5EFA\u76EE\u5F55 "{0}" \u65F6\u51FA\u9519: \u6CA1\u6709\u6B64\u7C7B\u6587\u4EF6\u6216\u76EE\u5F55 -FileChooser.deleteFileButtonText=\u5220\u9664\u6587\u4EF6(L) -FileChooser.deleteFileButtonMnemonic=76 -FileChooser.renameFileButtonText=\u91CD\u547D\u540D\u6587\u4EF6(R) -FileChooser.renameFileButtonMnemonic=82 -FileChooser.cancelButtonText=\u53D6\u6D88 -FileChooser.cancelButtonMnemonic=67 -FileChooser.saveButtonText=\u786E\u5B9A -FileChooser.saveButtonMnemonic=79 -FileChooser.openButtonText=\u786E\u5B9A -FileChooser.openButtonMnemonic=79 -FileChooser.saveDialogTitleText=\u4FDD\u5B58 -FileChooser.openDialogTitleText=\u6253\u5F00 -FileChooser.pathLabelText=\u9009\u5B9A\u5185\u5BB9(S): -FileChooser.filterLabelText=\u7B5B\u9009\u5668: -FileChooser.pathLabelMnemonic=83 -FileChooser.foldersLabelText=\u6587\u4EF6\u5939(D) -FileChooser.foldersLabelMnemonic=68 -FileChooser.filesLabelText=\u6587\u4EF6(F) -FileChooser.filesLabelMnemonic=70 - -FileChooser.cancelButtonToolTipText=\u4E2D\u6B62\u6587\u4EF6\u9009\u62E9\u5668\u5BF9\u8BDD\u6846\u3002 -FileChooser.saveButtonToolTipText=\u4FDD\u5B58\u6240\u9009\u6587\u4EF6\u3002 -FileChooser.openButtonToolTipText=\u6253\u5F00\u6240\u9009\u6587\u4EF6\u3002 - -FileChooser.renameFileDialogText=\u5C06\u6587\u4EF6 "{0}" \u91CD\u547D\u540D\u4E3A -FileChooser.renameFileErrorTitle=\u9519\u8BEF -FileChooser.renameFileErrorText=\u5C06\u6587\u4EF6 "{0}" \u91CD\u547D\u540D\u4E3A "{1}" \u65F6\u51FA\u9519 - -#OptionPane.okButtonMnemonic=79 -#OptionPane.cancelButtonMnemonic=67 - +# Refer to the note in basic.properties for a description as to what +# the mnemonics correspond to and how to calculate them. + + + +# GTK specific properties + +# GTK color chooser properties: +GTKColorChooserPanel.textAndMnemonic=GTK \u989C\u8272\u9009\u62E9\u5668(&G) +# mnemonic as a VK_ constant + +GTKColorChooserPanel.hue.textAndMnemonic=\u8272\u8C03(&H): + +GTKColorChooserPanel.red.textAndMnemonic=\u7EA2\u8272(&E): + +GTKColorChooserPanel.saturation.textAndMnemonic=\u9971\u548C\u5EA6(&S): + +GTKColorChooserPanel.green.textAndMnemonic=\u7EFF\u8272(&G): + +GTKColorChooserPanel.value.textAndMnemonic=\u503C(&V): + +GTKColorChooserPanel.blue.textAndMnemonic=\u84DD\u8272(&B): + +GTKColorChooserPanel.color.textAndMnemonic=\u989C\u8272\u540D(&N): + + + +############ FILE CHOOSER STRINGS ############# + +FileChooser.acceptAllFileFilter.textAndMnemonic=\u6240\u6709\u6587\u4EF6 +FileChooser.newFolderButton.textAndMnemonic=\u65B0\u6587\u4EF6\u5939(&N) +FileChooser.newFolderDialog.textAndMnemonic=\u6587\u4EF6\u5939\u540D: +FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=\u9519\u8BEF +FileChooser.newFolderNoDirectoryError.textAndMnemonic=\u521B\u5EFA\u76EE\u5F55 "{0}" \u65F6\u51FA\u9519: \u6CA1\u6709\u6B64\u7C7B\u6587\u4EF6\u6216\u76EE\u5F55 +FileChooser.deleteFileButton.textAndMnemonic=\u5220\u9664\u6587\u4EF6(&L) +FileChooser.renameFileButton.textAndMnemonic=\u91CD\u547D\u540D\u6587\u4EF6(&R) +FileChooser.cancelButton.textAndMnemonic=\u53D6\u6D88(&C) +FileChooser.saveButton.textAndMnemonic=\u786E\u5B9A(&O) +FileChooser.openButton.textAndMnemonic=\u786E\u5B9A(&O) +FileChooser.saveDialogTitle.textAndMnemonic=\u4FDD\u5B58 +FileChooser.openDialogTitle.textAndMnemonic=\u6253\u5F00 +FileChooser.pathLabel.textAndMnemonic=\u9009\u5B9A\u5185\u5BB9(&S): +FileChooser.filterLabel.textAndMnemonic=\u7B5B\u9009\u5668: +FileChooser.foldersLabel.textAndMnemonic=\u6587\u4EF6\u5939(&D) +FileChooser.filesLabel.textAndMnemonic=\u6587\u4EF6(&F) + +FileChooser.cancelButtonToolTip.textAndMnemonic=\u4E2D\u6B62\u6587\u4EF6\u9009\u62E9\u5668\u5BF9\u8BDD\u6846\u3002 +FileChooser.saveButtonToolTip.textAndMnemonic=\u4FDD\u5B58\u6240\u9009\u6587\u4EF6\u3002 +FileChooser.openButtonToolTip.textAndMnemonic=\u6253\u5F00\u6240\u9009\u6587\u4EF6\u3002 + +FileChooser.renameFileDialog.textAndMnemonic=\u5C06\u6587\u4EF6 "{0}" \u91CD\u547D\u540D\u4E3A +FileChooser.renameFileError.titleAndMnemonic=\u9519\u8BEF +FileChooser.renameFileError.textAndMnemonic=\u5C06\u6587\u4EF6 "{0}" \u91CD\u547D\u540D\u4E3A "{1}" \u65F6\u51FA\u9519 + + diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.properties b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.properties index 68fdd917034..79466ec36e6 100644 --- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.properties +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.properties @@ -1,84 +1,55 @@ -# Refer to the note in basic.properties for a description as to what -# the mnemonics correspond to and how to calculate them. - - - -# GTK specific properties - -# GTK color chooser properties: -GTKColorChooserPanel.nameText=GTK \u8272\u5F69\u9078\u64C7\u5668(G) -# mnemonic as a VK_ constant -GTKColorChooserPanel.mnemonic=71 -# Can also define GTKColorChooserPanel.dispalyedMnemonicIndex if you -# want an index other than would normally be underlined by -# GTKColorChooserPanel.mnemonic to be underlined. This is only useful -# if GTKColorChooserPanel.nameText defines the mnemonic character more -# than once and you want a character other than the first underlined. - -# Text and mnemonics for the spinner. You can also defined a different -# index for the mnemonic via xxxMnemonicIndex, for example -# GTKColorChooserPanel.hueMnemonicIndex=1 would indicate the second -# character of GTKColorChooserPanel.hueText should be underlined to -# represent the mnemonic. -GTKColorChooserPanel.hueText=\u8272\u8ABF(H)\uFF1A -GTKColorChooserPanel.hueMnemonic=72 - -GTKColorChooserPanel.redText=\u7D05(E): -GTKColorChooserPanel.redMnemonic=69 - -GTKColorChooserPanel.saturationText=\u5F69\u5EA6(S): -GTKColorChooserPanel.saturationMnemonic=83 - -GTKColorChooserPanel.greenText=\u7DA0(G): -GTKColorChooserPanel.greenMnemonic=71 - -GTKColorChooserPanel.valueText=\u503C(V): -GTKColorChooserPanel.valueMnemonic=86 - -GTKColorChooserPanel.blueText=\u85CD(B): -GTKColorChooserPanel.blueMnemonic=66 - -GTKColorChooserPanel.colorNameText=\u984F\u8272\u540D\u7A31(N): -GTKColorChooserPanel.colorNameMnemonic=78 - - - -############ FILE CHOOSER STRINGS ############# - -FileChooser.acceptAllFileFilterText=\u6240\u6709\u6A94\u6848 -FileChooser.newFolderButtonText=\u65B0\u5EFA\u8CC7\u6599\u593E(N) -FileChooser.newFolderButtonMnemonic=78 -FileChooser.newFolderDialogText=\u8CC7\u6599\u593E\u540D\u7A31: -FileChooser.newFolderNoDirectoryErrorTitleText=\u932F\u8AA4 -FileChooser.newFolderNoDirectoryErrorText=\u5EFA\u7ACB\u76EE\u9304 "{0}" \u6642\u767C\u751F\u932F\u8AA4: \u6C92\u6709\u6B64\u6A94\u6848\u6216\u76EE\u9304 -FileChooser.deleteFileButtonText=\u522A\u9664\u6A94\u6848(L) -FileChooser.deleteFileButtonMnemonic=76 -FileChooser.renameFileButtonText=\u91CD\u65B0\u547D\u540D\u6A94\u6848(R) -FileChooser.renameFileButtonMnemonic=82 -FileChooser.cancelButtonText=\u53D6\u6D88 -FileChooser.cancelButtonMnemonic=67 -FileChooser.saveButtonText=\u78BA\u5B9A -FileChooser.saveButtonMnemonic=79 -FileChooser.openButtonText=\u78BA\u5B9A -FileChooser.openButtonMnemonic=79 -FileChooser.saveDialogTitleText=\u5132\u5B58 -FileChooser.openDialogTitleText=\u958B\u555F -FileChooser.pathLabelText=\u9078\u53D6(S): -FileChooser.filterLabelText=\u7BE9\u9078: -FileChooser.pathLabelMnemonic=83 -FileChooser.foldersLabelText=\u8CC7\u6599\u593E(D) -FileChooser.foldersLabelMnemonic=68 -FileChooser.filesLabelText=\u6A94\u6848(F) -FileChooser.filesLabelMnemonic=70 - -FileChooser.cancelButtonToolTipText=\u4E2D\u6B62\u6A94\u6848\u9078\u64C7\u5668\u5C0D\u8A71\u65B9\u584A\u3002 -FileChooser.saveButtonToolTipText=\u5132\u5B58\u9078\u53D6\u7684\u6A94\u6848\u3002 -FileChooser.openButtonToolTipText=\u958B\u555F\u9078\u53D6\u7684\u6A94\u6848\u3002 - -FileChooser.renameFileDialogText=\u5C07\u6A94\u6848 "{0}" \u91CD\u65B0\u547D\u540D\u70BA -FileChooser.renameFileErrorTitle=\u932F\u8AA4 -FileChooser.renameFileErrorText=\u5C07\u6A94\u6848 "{0}" \u91CD\u65B0\u547D\u540D\u70BA "{1}" \u6642\u51FA\u73FE\u932F\u8AA4 - -#OptionPane.okButtonMnemonic=79 -#OptionPane.cancelButtonMnemonic=67 - +# Refer to the note in basic.properties for a description as to what +# the mnemonics correspond to and how to calculate them. + + + +# GTK specific properties + +# GTK color chooser properties: +GTKColorChooserPanel.textAndMnemonic=GTK \u8272\u5F69\u9078\u64C7\u5668(&G) +# mnemonic as a VK_ constant + +GTKColorChooserPanel.hue.textAndMnemonic=\u8272\u8ABF(&H)\uFF1A + +GTKColorChooserPanel.red.textAndMnemonic=\u7D05(&E): + +GTKColorChooserPanel.saturation.textAndMnemonic=\u5F69\u5EA6(&S): + +GTKColorChooserPanel.green.textAndMnemonic=\u7DA0(&G): + +GTKColorChooserPanel.value.textAndMnemonic=\u503C(&V): + +GTKColorChooserPanel.blue.textAndMnemonic=\u85CD(&B): + +GTKColorChooserPanel.color.textAndMnemonic=\u984F\u8272\u540D\u7A31(&N): + + + +############ FILE CHOOSER STRINGS ############# + +FileChooser.acceptAllFileFilter.textAndMnemonic=\u6240\u6709\u6A94\u6848 +FileChooser.newFolderButton.textAndMnemonic=\u65B0\u5EFA\u8CC7\u6599\u593E(&N) +FileChooser.newFolderDialog.textAndMnemonic=\u8CC7\u6599\u593E\u540D\u7A31: +FileChooser.newFolderNoDirectoryErrorTitle.textAndMnemonic=\u932F\u8AA4 +FileChooser.newFolderNoDirectoryError.textAndMnemonic=\u5EFA\u7ACB\u76EE\u9304 "{0}" \u6642\u767C\u751F\u932F\u8AA4: \u6C92\u6709\u6B64\u6A94\u6848\u6216\u76EE\u9304 +FileChooser.deleteFileButton.textAndMnemonic=\u522A\u9664\u6A94\u6848(&L) +FileChooser.renameFileButton.textAndMnemonic=\u91CD\u65B0\u547D\u540D\u6A94\u6848(&R) +FileChooser.cancelButton.textAndMnemonic=\u53D6\u6D88(&C) +FileChooser.saveButton.textAndMnemonic=\u78BA\u5B9A(&O) +FileChooser.openButton.textAndMnemonic=\u78BA\u5B9A(&O) +FileChooser.saveDialogTitle.textAndMnemonic=\u5132\u5B58 +FileChooser.openDialogTitle.textAndMnemonic=\u958B\u555F +FileChooser.pathLabel.textAndMnemonic=\u9078\u53D6(&S): +FileChooser.filterLabel.textAndMnemonic=\u7BE9\u9078: +FileChooser.foldersLabel.textAndMnemonic=\u8CC7\u6599\u593E(&D) +FileChooser.filesLabel.textAndMnemonic=\u6A94\u6848(&F) + +FileChooser.cancelButtonToolTip.textAndMnemonic=\u4E2D\u6B62\u6A94\u6848\u9078\u64C7\u5668\u5C0D\u8A71\u65B9\u584A\u3002 +FileChooser.saveButtonToolTip.textAndMnemonic=\u5132\u5B58\u9078\u53D6\u7684\u6A94\u6848\u3002 +FileChooser.openButtonToolTip.textAndMnemonic=\u958B\u555F\u9078\u53D6\u7684\u6A94\u6848\u3002 + +FileChooser.renameFileDialog.textAndMnemonic=\u5C07\u6A94\u6848 "{0}" \u91CD\u65B0\u547D\u540D\u70BA +FileChooser.renameFileError.titleAndMnemonic=\u932F\u8AA4 +FileChooser.renameFileError.textAndMnemonic=\u5C07\u6A94\u6848 "{0}" \u91CD\u65B0\u547D\u540D\u70BA "{1}" \u6642\u51FA\u73FE\u932F\u8AA4 + + diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic.properties index 701ea8f4d11..335d69a4a84 100644 --- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic.properties +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic.properties @@ -1,229 +1,189 @@ -# This properties file is used to create a PropertyResourceBundle -# It contains Locale specific strings used in Swing -# Currently, the following components need this for support: -# -# ColorChooser -# FileChooser -# OptionPane -# -# When this file is read in, the strings are put into the -# defaults table. This is an implementation detail of the current -# workings of Swing. DO NOT DEPEND ON THIS. -# This may change in future versions of Swing as we improve localization -# support. -# -# MNEMONIC NOTE: -# Many of strings in this file are used by widgets that have a -# mnemonic, for example: -# ColorChooser.rgbNameText=RGB -# ColorChooser.rgbMnemonic=71 -# ColorChooser.rgbDisplayedMnemonicIndex=1 -# Indicates that the tab in the ColorChooser for RGB colors will have -# the text 'RGB', further the mnemonic character will be 'g' and that -# a decoration will be provided under the 'G'. This will typically -# look like: RGB -# - -# 71 corresponds to the decimal value of the VK constant defined -# in java/awt/KeyEvent.java. VK_G is defined as: -# -# public static final int VK_G = 0x47; -# -# 0x47 is a hex number and needs to be converted to decimal. -# A simple way to calculate this for a-z is to add 64 to the index of -# the letter in the alphabet. As 'a' is in the 1st letter the mnemonic -# for 'a' is 65, 'b' is 66... -# -# The xxDisplayedMnemonicIndex is used to indicate the index of the -# character that should be underlined in the String, with 0 -# corresponding to the first character in the String. -# -# One important thing to remember is that the mnemonic MUST exist in -# the String, if it does not exist you should add text that makes it -# exist. This will typically take the form 'XXXX (M)' where M is the -# character for the mnemonic. -# -# @author Steve Wilson - -############ FILE CHOOSER STRINGS ############# -FileChooser.fileDescriptionText=Generic File -FileChooser.directoryDescriptionText=Directory -FileChooser.newFolderErrorText=Error creating new folder -FileChooser.newFolderErrorSeparator= : -FileChooser.newFolderParentDoesntExistTitleText=Unable to create folder -FileChooser.newFolderParentDoesntExistText=Unable to create the folder.\n\nThe system cannot find the path specified. -FileChooser.renameErrorTitleText=Error Renaming File or Folder -FileChooser.renameErrorText=Cannot rename {0} -FileChooser.renameErrorFileExistsText=Cannot rename {0}: A file with the name you specified already exists. \ - Specify a different file name. -FileChooser.acceptAllFileFilterText=All Files -FileChooser.cancelButtonText=Cancel -#FileChooser.cancelButtonMnemonic=67 // not needed? -FileChooser.saveButtonText=Save -FileChooser.saveButtonMnemonic=83 // not needed? -FileChooser.openButtonText=Open -FileChooser.openButtonMnemonic=79 //not needed? -FileChooser.saveDialogTitleText=Save -FileChooser.openDialogTitleText=Open -FileChooser.updateButtonText=Update -FileChooser.updateButtonMnemonic=85 -FileChooser.helpButtonText=Help -FileChooser.helpButtonMnemonic=72 -FileChooser.directoryOpenButtonText=Open -FileChooser.directoryOpenButtonMnemonic=79 - -# File Size Units -FileChooser.fileSizeKiloBytes={0} KB -FileChooser.fileSizeMegaBytes={0} MB -FileChooser.fileSizeGigaBytes={0} GB - -# These strings are platform dependent not look and feel dependent. -FileChooser.win32.newFolder=New Folder -FileChooser.win32.newFolder.subsequent=New Folder ({0}) -FileChooser.other.newFolder=NewFolder -FileChooser.other.newFolder.subsequent=NewFolder.{0} - - -## file chooser tooltips ### -FileChooser.cancelButtonToolTipText=Abort file chooser dialog -FileChooser.saveButtonToolTipText=Save selected file -FileChooser.openButtonToolTipText=Open selected file -FileChooser.updateButtonToolTipText=Update directory listing -FileChooser.helpButtonToolTipText=FileChooser help -FileChooser.directoryOpenButtonToolTipText=Open selected directory - -FileChooser.filesListAccessibleName=Files List -FileChooser.filesDetailsAccessibleName=Files Details - -############ COLOR CHOOSER STRINGS ############# -ColorChooser.previewText=Preview -ColorChooser.okText=OK -ColorChooser.cancelText=Cancel -ColorChooser.resetText=Reset -# VK_XXX constant for 'ColorChooser.resetText' button to make mnemonic -ColorChooser.resetMnemonic=82 -ColorChooser.sampleText=Sample Text Sample Text -ColorChooser.swatchesNameText=Swatches -ColorChooser.swatchesMnemonic=83 -ColorChooser.swatchesRecentText=Recent: -# Each of the ColorChooser types can define a mnemonic, as a KeyEvent.VK_XXX -# constant, and an index into the text to render the mnemonic as. The -# mnemonic is xxxMnemonic and the index of the character to underline is -# xxxDisplayedMnemonicIndex. -ColorChooser.hsvNameText=HSV -ColorChooser.hsvMnemonic=72 -ColorChooser.hsvHueText=Hue -ColorChooser.hsvSaturationText=Saturation -ColorChooser.hsvValueText=Value -ColorChooser.hsvTransparencyText=Transparency -ColorChooser.hslNameText=HSL -ColorChooser.hslMnemonic=76 -ColorChooser.hslHueText=Hue -ColorChooser.hslSaturationText=Saturation -ColorChooser.hslLightnessText=Lightness -ColorChooser.hslTransparencyText=Transparency -ColorChooser.rgbNameText=RGB -ColorChooser.rgbMnemonic=71 -ColorChooser.rgbRedText=Red -ColorChooser.rgbRedMnemonic=68 // not needed? -ColorChooser.rgbGreenText=Green -ColorChooser.rgbGreenMnemonic=78 // not needed? -ColorChooser.rgbBlueText=Blue -ColorChooser.rgbBlueMnemonic=66 // not needed? -ColorChooser.rgbAlphaText=Alpha -ColorChooser.rgbHexCodeText=Color Code -ColorChooser.rgbHexCodeMnemonic=67 -ColorChooser.cmykNameText=CMYK -ColorChooser.cmykMnemonic=77 -ColorChooser.cmykCyanText=Cyan -ColorChooser.cmykMagentaText=Magenta -ColorChooser.cmykYellowText=Yellow -ColorChooser.cmykBlackText=Black -ColorChooser.cmykAlphaText=Alpha - -############ OPTION PANE STRINGS ############# -# Mnemonic keys correspond to KeyEvent.VK_XXX constant -# We only define mnemonics for YES/NO, but for completeness you can -# define mnemonics for any of the buttons. -OptionPane.yesButtonText=Yes -OptionPane.yesButtonMnemonic=89 -OptionPane.noButtonText=No -OptionPane.noButtonMnemonic=78 -OptionPane.okButtonText=OK -#OptionPane.okButtonMnemonic=0 -OptionPane.cancelButtonText=Cancel -#OptionPane.cancelButtonMnemonic=0 -OptionPane.titleText=Select an Option -# Title for the dialog for the showInputDialog methods. Only used if -# the developer uses one of the variants that doesn't take a title. -OptionPane.inputDialogTitle=Input -# Title for the dialog for the showMessageDialog methods. Only used if -# the developer uses one of the variants that doesn't take a title. -OptionPane.messageDialogTitle=Message - -############ Printing Dialog Strings ############ -PrintingDialog.titleProgressText=Printing -PrintingDialog.titleAbortingText=Printing (Aborting) - -PrintingDialog.contentInitialText=Printing in progress... - -# The following string will be formatted by a MessageFormat -# and {0} will be replaced by page number being printed -PrintingDialog.contentProgressText=Printed page {0}... - -PrintingDialog.contentAbortingText=Printing aborting... - -PrintingDialog.abortButtonText=Abort -PrintingDialog.abortButtonMnemonic=65 -PrintingDialog.abortButtonDisplayedMnemonicIndex=0 -PrintingDialog.abortButtonToolTipText=Abort Printing - -############ Internal Frame Strings ############ -InternalFrame.iconButtonToolTip=Minimize -InternalFrame.maxButtonToolTip=Maximize -InternalFrame.restoreButtonToolTip=Restore -InternalFrame.closeButtonToolTip=Close - -############ Internal Frame Title Pane Strings ############ -InternalFrameTitlePane.restoreButtonText=Restore -InternalFrameTitlePane.moveButtonText=Move -InternalFrameTitlePane.sizeButtonText=Size -InternalFrameTitlePane.minimizeButtonText=Minimize -InternalFrameTitlePane.maximizeButtonText=Maximize -InternalFrameTitlePane.closeButtonText=Close - -############ Text strings ############# -# Used for html forms -FormView.submitButtonText=Submit Query -FormView.resetButtonText=Reset -FormView.browseFileButtonText=Browse... - -############ Abstract Document Strings ############ -AbstractDocument.styleChangeText=style change -AbstractDocument.additionText=addition -AbstractDocument.deletionText=deletion -AbstractDocument.undoText=Undo -AbstractDocument.redoText=Redo - -############ Abstract Button Strings ############ -AbstractButton.clickText=click - -############ Abstract Undoable Edit Strings ############ -AbstractUndoableEdit.undoText=Undo -AbstractUndoableEdit.redoText=Redo - -############ Combo Box Strings ############ -ComboBox.togglePopupText=togglePopup - -############ Progress Monitor Strings ############ -ProgressMonitor.progressText=Progress... - -############ Split Pane Strings ############ -SplitPane.leftButtonText=left button -SplitPane.rightButtonText=right button -# Used for Isindex -IsindexView.prompt=This is a searchable index. Enter search keywords: - -############ InternalFrameTitlePane Strings ############ -InternalFrameTitlePane.iconifyButtonAccessibleName=Iconify -InternalFrameTitlePane.maximizeButtonAccessibleName=Maximize -InternalFrameTitlePane.closeButtonAccessibleName=Close +# This properties file is used to create a PropertyResourceBundle +# It contains Locale specific strings used in Swing +# Currently, the following components need this for support: +# +# ColorChooser +# FileChooser +# OptionPane +# +# When this file is read in, the strings are put into the +# defaults table. This is an implementation detail of the current +# workings of Swing. DO NOT DEPEND ON THIS. +# This may change in future versions of Swing as we improve localization +# support. +# +# MNEMONIC NOTE: +# Many of strings in this file are used by widgets that have a +# mnemonic, for example: +# ColorChooser.rgbNameTextAndMnemonic=R&GB +# +# Indicates that the tab in the ColorChooser for RGB colors will have +# the text 'RGB', further the mnemonic character will be 'g' and that +# a decoration will be provided under the 'G'. This will typically +# look like: RGB +# - +# +# One important thing to remember is that the mnemonic MUST exist in +# the String, if it does not exist you should add text that makes it +# exist. This will typically take the form 'XXXX (M)' where M is the +# character for the mnemonic. +# +# @author Steve Wilson + +############ FILE CHOOSER STRINGS ############# +FileChooser.fileDescription.textAndMnemonic=Generic File +FileChooser.directoryDescription.textAndMnemonic=Directory +FileChooser.newFolderError.textAndMnemonic=Error creating new folder +FileChooser.newFolderErrorSeparator= : +FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=Unable to create folder +FileChooser.newFolderParentDoesntExist.textAndMnemonic=Unable to create the folder.\n\nThe system cannot find the path specified. +FileChooser.renameErrorTitle.textAndMnemonic=Error Renaming File or Folder +FileChooser.renameError.textAndMnemonic=Cannot rename {0} +FileChooser.renameErrorFileExists.textAndMnemonic=Cannot rename {0}: A file with the name you specified already exists. \ + Specify a different file name. +FileChooser.acceptAllFileFilter.textAndMnemonic=All Files +FileChooser.cancelButton.textAndMnemonic=Cancel +FileChooser.saveButton.textAndMnemonic=&Save +FileChooser.openButton.textAndMnemonic=&Open +FileChooser.saveDialogTitle.textAndMnemonic=Save +FileChooser.openDialogTitle.textAndMnemonic=Open +FileChooser.updateButton.textAndMnemonic=&Update +FileChooser.helpButton.textAndMnemonic=&Help +FileChooser.directoryOpenButton.textAndMnemonic=&Open + +# File Size Units +FileChooser.fileSizeKiloBytes={0} KB +FileChooser.fileSizeMegaBytes={0} MB +FileChooser.fileSizeGigaBytes={0} GB + +# These strings are platform dependent not look and feel dependent. +FileChooser.win32.newFolder=New Folder +FileChooser.win32.newFolder.subsequent=New Folder ({0}) +FileChooser.other.newFolder=NewFolder +FileChooser.other.newFolder.subsequent=NewFolder.{0} + + +## file chooser tooltips ### +FileChooser.cancelButtonToolTip.textAndMnemonic=Abort file chooser dialog +FileChooser.saveButtonToolTip.textAndMnemonic=Save selected file +FileChooser.openButtonToolTip.textAndMnemonic=Open selected file +FileChooser.updateButtonToolTip.textAndMnemonic=Update directory listing +FileChooser.helpButtonToolTip.textAndMnemonic=FileChooser help +FileChooser.directoryOpenButtonToolTip.textAndMnemonic=Open selected directory + +FileChooser.filesListAccessibleName=Files List +FileChooser.filesDetailsAccessibleName=Files Details + +############ COLOR CHOOSER STRINGS ############# +ColorChooser.preview.textAndMnemonic=Preview +ColorChooser.ok.textAndMnemonic=OK +ColorChooser.cancel.textAndMnemonic=Cancel +ColorChooser.reset.textAndMnemonic=&Reset +ColorChooser.sample.textAndMnemonic=Sample Text Sample Text +ColorChooser.swatches.textAndMnemonic=&Swatches +ColorChooser.swatchesRecent.textAndMnemonic=Recent: +ColorChooser.hsv.textAndMnemonic=&HSV +ColorChooser.hsvHue.textAndMnemonic=Hue +ColorChooser.hsvSaturation.textAndMnemonic=Saturation +ColorChooser.hsvValue.textAndMnemonic=Value +ColorChooser.hsvTransparency.textAndMnemonic=Transparency +ColorChooser.hsl.textAndMnemonic=HS&L +ColorChooser.hslHue.textAndMnemonic=Hue +ColorChooser.hslSaturation.textAndMnemonic=Saturation +ColorChooser.hslLightness.textAndMnemonic=Lightness +ColorChooser.hslTransparency.textAndMnemonic=Transparency +ColorChooser.rgb.textAndMnemonic=R&GB +ColorChooser.rgbRed.textAndMnemonic=Re&d +ColorChooser.rgbGreen.textAndMnemonic=Gree&n +ColorChooser.rgbBlue.textAndMnemonic=&Blue +ColorChooser.rgbAlpha.textAndMnemonic=Alpha +ColorChooser.rgbHexCode.textAndMnemonic=&Color Code +ColorChooser.cmyk.textAndMnemonic=C&MYK +ColorChooser.cmykCyan.textAndMnemonic=Cyan +ColorChooser.cmykMagenta.textAndMnemonic=Magenta +ColorChooser.cmykYellow.textAndMnemonic=Yellow +ColorChooser.cmykBlack.textAndMnemonic=Black +ColorChooser.cmykAlpha.textAndMnemonic=Alpha + +############ OPTION PANE STRINGS ############# +# We only define mnemonics for YES/NO, but for completeness you can +# define mnemonics for any of the buttons. +OptionPane.yesButton.textAndMnemonic=&Yes +OptionPane.noButton.textAndMnemonic=&No +OptionPane.okButton.textAndMnemonic=OK +#OptionPane.okButtonMnemonic=0 +OptionPane.cancelButton.textAndMnemonic=Cancel +#OptionPane.cancelButtonMnemonic=0 +OptionPane.title.textAndMnemonic=Select an Option +# Title for the dialog for the showInputDialog methods. Only used if +# the developer uses one of the variants that doesn't take a title. +OptionPane.inputDialog.titleAndMnemonic=Input +# Title for the dialog for the showMessageDialog methods. Only used if +# the developer uses one of the variants that doesn't take a title. +OptionPane.messageDialog.titleAndMnemonic=Message + +############ Printing Dialog Strings ############ +PrintingDialog.titleProgress.textAndMnemonic=Printing +PrintingDialog.titleAborting.textAndMnemonic=Printing (Aborting) + +PrintingDialog.contentInitial.textAndMnemonic=Printing in progress... + +# The following string will be formatted by a MessageFormat +# and {0} will be replaced by page number being printed +PrintingDialog.contentProgress.textAndMnemonic=Printed page {0}... + +PrintingDialog.contentAborting.textAndMnemonic=Printing aborting... + +PrintingDialog.abortButton.textAndMnemonic=&Abort +PrintingDialog.abortButtonToolTip.textAndMnemonic=Abort Printing + +############ Internal Frame Strings ############ +InternalFrame.iconButtonToolTip=Minimize +InternalFrame.maxButtonToolTip=Maximize +InternalFrame.restoreButtonToolTip=Restore +InternalFrame.closeButtonToolTip=Close + +############ Internal Frame Title Pane Strings ############ +InternalFrameTitlePane.restoreButton.textAndMnemonic=Restore +InternalFrameTitlePane.moveButton.textAndMnemonic=Move +InternalFrameTitlePane.sizeButton.textAndMnemonic=Size +InternalFrameTitlePane.minimizeButton.textAndMnemonic=Minimize +InternalFrameTitlePane.maximizeButton.textAndMnemonic=Maximize +InternalFrameTitlePane.closeButton.textAndMnemonic=Close + +############ Text strings ############# +# Used for html forms +FormView.submitButton.textAndMnemonic=Submit Query +FormView.resetButton.textAndMnemonic=Reset +FormView.browseFileButton.textAndMnemonic=Browse... + +############ Abstract Document Strings ############ +AbstractDocument.styleChange.textAndMnemonic=style change +AbstractDocument.addition.textAndMnemonic=addition +AbstractDocument.deletion.textAndMnemonic=deletion +AbstractDocument.undo.textAndMnemonic=Undo +AbstractDocument.redo.textAndMnemonic=Redo + +############ Abstract Button Strings ############ +AbstractButton.click.textAndMnemonic=click + +############ Abstract Undoable Edit Strings ############ +AbstractUndoableEdit.undo.textAndMnemonic=Undo +AbstractUndoableEdit.redo.textAndMnemonic=Redo + +############ Combo Box Strings ############ +ComboBox.togglePopup.textAndMnemonic=togglePopup + +############ Progress Monitor Strings ############ +ProgressMonitor.progress.textAndMnemonic=Progress... + +############ Split Pane Strings ############ +SplitPane.leftButton.textAndMnemonic=left button +SplitPane.rightButton.textAndMnemonic=right button +# Used for Isindex +IsindexView.prompt=This is a searchable index. Enter search keywords: + +############ InternalFrameTitlePane Strings ############ +InternalFrameTitlePane.iconifyButtonAccessibleName=Iconify +InternalFrameTitlePane.maximizeButtonAccessibleName=Maximize +InternalFrameTitlePane.closeButtonAccessibleName=Close diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_de.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_de.properties index 31cfad20abd..27db54f78f3 100644 --- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_de.properties +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_de.properties @@ -1,229 +1,187 @@ -# This properties file is used to create a PropertyResourceBundle -# It contains Locale specific strings used in Swing -# Currently, the following components need this for support: -# -# ColorChooser -# FileChooser -# OptionPane -# -# When this file is read in, the strings are put into the -# defaults table. This is an implementation detail of the current -# workings of Swing. DO NOT DEPEND ON THIS. -# This may change in future versions of Swing as we improve localization -# support. -# -# MNEMONIC NOTE: -# Many of strings in this file are used by widgets that have a -# mnemonic, for example: -# ColorChooser.rgbNameText=RGB -# ColorChooser.rgbMnemonic=71 -# ColorChooser.rgbDisplayedMnemonicIndex=1 -# Indicates that the tab in the ColorChooser for RGB colors will have -# the text 'RGB', further the mnemonic character will be 'g' and that -# a decoration will be provided under the 'G'. This will typically -# look like: RGB -# - -# 71 corresponds to the decimal value of the VK constant defined -# in java/awt/KeyEvent.java. VK_G is defined as: -# -# public static final int VK_G = 0x47; -# -# 0x47 is a hex number and needs to be converted to decimal. -# A simple way to calculate this for a-z is to add 64 to the index of -# the letter in the alphabet. As 'a' is in the 1st letter the mnemonic -# for 'a' is 65, 'b' is 66... -# -# The xxDisplayedMnemonicIndex is used to indicate the index of the -# character that should be underlined in the String, with 0 -# corresponding to the first character in the String. -# -# One important thing to remember is that the mnemonic MUST exist in -# the String, if it does not exist you should add text that makes it -# exist. This will typically take the form 'XXXX (M)' where M is the -# character for the mnemonic. -# -# @author Steve Wilson - -############ FILE CHOOSER STRINGS ############# -FileChooser.fileDescriptionText=Allgemeine Datei -FileChooser.directoryDescriptionText=Verzeichnis -FileChooser.newFolderErrorText=Fehler beim Erstellen eines neuen Ordners -FileChooser.newFolderErrorSeparator= : -FileChooser.newFolderParentDoesntExistTitleText=Ordner kann nicht erstellt werden -FileChooser.newFolderParentDoesntExistText=Ordner kann nicht erstellt werden.\n\nSystem kann den angegebenen Pfad nicht finden. -FileChooser.renameErrorTitleText=Fehler beim Umbenennen von Datei oder Ordner -FileChooser.renameErrorText={0} kann nicht umbenannt werden -FileChooser.renameErrorFileExistsText={0} kann nicht umbenannt werden: Es ist bereits eine Datei mit dem angegebenen Namen vorhanden. Geben Sie einen anderen Dateinamen an. -FileChooser.acceptAllFileFilterText=Alle Dateien -FileChooser.cancelButtonText=Abbrechen -FileChooser.cancelButtonMnemonic=65 -FileChooser.saveButtonText=Speichern -FileChooser.saveButtonMnemonic=83 -FileChooser.openButtonText=\u00D6ffnen -FileChooser.openButtonMnemonic=70 -FileChooser.saveDialogTitleText=Speichern -FileChooser.openDialogTitleText=\u00D6ffnen -FileChooser.updateButtonText=Aktualisieren -FileChooser.updateButtonMnemonic=75 -FileChooser.helpButtonText=Hilfe -FileChooser.helpButtonMnemonic=72 -FileChooser.directoryOpenButtonText=\u00D6ffnen -FileChooser.directoryOpenButtonMnemonic=70 - -# File Size Units -FileChooser.fileSizeKiloBytes={0} KB -FileChooser.fileSizeMegaBytes={0} MB -FileChooser.fileSizeGigaBytes={0} GB - -# These strings are platform dependent not look and feel dependent. -FileChooser.win32.newFolder=Neuer Ordner -FileChooser.win32.newFolder.subsequent=Neuer Ordner ({0}) -FileChooser.other.newFolder=NewFolder -FileChooser.other.newFolder.subsequent=NewFolder.{0} - - -## file chooser tooltips ### -FileChooser.cancelButtonToolTipText=Dialogfeld f\u00FCr Dateiauswahl schlie\u00DFen -FileChooser.saveButtonToolTipText=Ausgew\u00E4hlte Datei speichern -FileChooser.openButtonToolTipText=Ausgew\u00E4hlte Datei \u00F6ffnen -FileChooser.updateButtonToolTipText=Verzeichnisliste aktualisieren -FileChooser.helpButtonToolTipText=FileChooser-Hilfe -FileChooser.directoryOpenButtonToolTipText=Ausgew\u00E4hltes Verzeichnis \u00F6ffnen - -FileChooser.filesListAccessibleName=Files List -FileChooser.filesDetailsAccessibleName=Files Details - -############ COLOR CHOOSER STRINGS ############# -ColorChooser.previewText=Vorschau -ColorChooser.okText=OK -ColorChooser.cancelText=Abbrechen -ColorChooser.resetText=Zur\u00FCcksetzen -# VK_XXX constant for 'ColorChooser.resetText' button to make mnemonic -ColorChooser.resetMnemonic=90 -ColorChooser.sampleText=Beispieltext Beispieltext -ColorChooser.swatchesNameText=Swatches -ColorChooser.swatchesMnemonic=83 -ColorChooser.swatchesRecentText=Aktuell: -# Each of the ColorChooser types can define a mnemonic, as a KeyEvent.VK_XXX -# constant, and an index into the text to render the mnemonic as. The -# mnemonic is xxxMnemonic and the index of the character to underline is -# xxxDisplayedMnemonicIndex. -ColorChooser.hsvNameText=HSV -ColorChooser.hsvMnemonic=72 -ColorChooser.hsvHueText=Farbton -ColorChooser.hsvSaturationText=S\u00E4ttigung -ColorChooser.hsvValueText=Wert -ColorChooser.hsvTransparencyText=Transparenz -ColorChooser.hslNameText=HSL -ColorChooser.hslMnemonic=76 -ColorChooser.hslHueText=Farbton -ColorChooser.hslSaturationText=S\u00E4ttigung -ColorChooser.hslLightnessText=Helligkeit -ColorChooser.hslTransparencyText=Transparenz -ColorChooser.rgbNameText=RGB -ColorChooser.rgbMnemonic=71 -ColorChooser.rgbRedText=Rot -ColorChooser.rgbRedMnemonic=84 -ColorChooser.rgbGreenText=Gr\u00FCn -ColorChooser.rgbGreenMnemonic=78 -ColorChooser.rgbBlueText=Blau -ColorChooser.rgbBlueMnemonic=66 -ColorChooser.rgbAlphaText=Alpha -ColorChooser.rgbHexCodeText=Farbcode -ColorChooser.rgbHexCodeMnemonic=70 -ColorChooser.cmykNameText=CMYK -ColorChooser.cmykMnemonic=77 -ColorChooser.cmykCyanText=Zyan -ColorChooser.cmykMagentaText=Magenta -ColorChooser.cmykYellowText=Gelb -ColorChooser.cmykBlackText=Schwarz -ColorChooser.cmykAlphaText=Alpha - -############ OPTION PANE STRINGS ############# -# Mnemonic keys correspond to KeyEvent.VK_XXX constant -# We only define mnemonics for YES/NO, but for completeness you can -# define mnemonics for any of the buttons. -OptionPane.yesButtonText=Ja -OptionPane.yesButtonMnemonic=74 -OptionPane.noButtonText=Nein -OptionPane.noButtonMnemonic=78 -OptionPane.okButtonText=OK -OptionPane.okButtonMnemonic=O -OptionPane.cancelButtonText=Abbrechen -OptionPane.cancelButtonMnemonic=A -OptionPane.titleText=Option ausw\u00E4hlen -# Title for the dialog for the showInputDialog methods. Only used if -# the developer uses one of the variants that doesn't take a title. -OptionPane.inputDialogTitle=Eingabe -# Title for the dialog for the showMessageDialog methods. Only used if -# the developer uses one of the variants that doesn't take a title. -OptionPane.messageDialogTitle=Meldung - -############ Printing Dialog Strings ############ -PrintingDialog.titleProgressText=Drucken -PrintingDialog.titleAbortingText=Drucken (Abbruch) - -PrintingDialog.contentInitialText=Druckvorgang l\u00E4uft... - -# The following string will be formatted by a MessageFormat -# and {0} will be replaced by page number being printed -PrintingDialog.contentProgressText=Seite {0} wurde gedruckt... - -PrintingDialog.contentAbortingText=Druckvorgang wird abgebrochen... - -PrintingDialog.abortButtonText=Abbruch -PrintingDialog.abortButtonMnemonic=65 -PrintingDialog.abortButtonDisplayedMnemonicIndex=0 -PrintingDialog.abortButtonToolTipText=Druckvorgang abbrechen - -############ Internal Frame Strings ############ -InternalFrame.iconButtonToolTip=Minimieren -InternalFrame.maxButtonToolTip=Maximieren -InternalFrame.restoreButtonToolTip=Wiederherstellen -InternalFrame.closeButtonToolTip=Schlie\u00DFen - -############ Internal Frame Title Pane Strings ############ -InternalFrameTitlePane.restoreButtonText=Wiederherstellen -InternalFrameTitlePane.moveButtonText=Verschieben -InternalFrameTitlePane.sizeButtonText=Gr\u00F6\u00DFe -InternalFrameTitlePane.minimizeButtonText=Minimieren -InternalFrameTitlePane.maximizeButtonText=Maximieren -InternalFrameTitlePane.closeButtonText=Schlie\u00DFen - -############ Text strings ############# -# Used for html forms -FormView.submitButtonText=Abfrage weiterleiten -FormView.resetButtonText=Zur\u00FCcksetzen -FormView.browseFileButtonText=Durchsuchen... - -############ Abstract Document Strings ############ -AbstractDocument.styleChangeText=Formatvorlagen\u00E4nderung -AbstractDocument.additionText=Hinzuf\u00FCgen -AbstractDocument.deletionText=L\u00F6schen -AbstractDocument.undoText=R\u00FCckg\u00E4ngig -AbstractDocument.redoText=Wiederherstellen - -############ Abstract Button Strings ############ -AbstractButton.clickText=Klicken - -############ Abstract Undoable Edit Strings ############ -AbstractUndoableEdit.undoText=R\u00FCckg\u00E4ngig -AbstractUndoableEdit.redoText=Wiederherstellen - -############ Combo Box Strings ############ -ComboBox.togglePopupText=togglePopup - -############ Progress Monitor Strings ############ -ProgressMonitor.progressText=Fortschritt... - -############ Split Pane Strings ############ -SplitPane.leftButtonText=linke Schaltfl\u00E4che -SplitPane.rightButtonText=rechte Schaltfl\u00E4che -# Used for Isindex -IsindexView.prompt=Dieser Index kann durchsucht werden. Geben Sie Schl\u00FCsselw\u00F6rter f\u00FCr die Suche ein: - -############ InternalFrameTitlePane Strings ############ -InternalFrameTitlePane.iconifyButtonAccessibleName=Als Symbol darstellen -InternalFrameTitlePane.maximizeButtonAccessibleName=Maximieren -InternalFrameTitlePane.closeButtonAccessibleName=Schlie\u00DFen - +# This properties file is used to create a PropertyResourceBundle +# It contains Locale specific strings used in Swing +# Currently, the following components need this for support: +# +# ColorChooser +# FileChooser +# OptionPane +# +# When this file is read in, the strings are put into the +# defaults table. This is an implementation detail of the current +# workings of Swing. DO NOT DEPEND ON THIS. +# This may change in future versions of Swing as we improve localization +# support. +# +# MNEMONIC NOTE: +# Many of strings in this file are used by widgets that have a +# mnemonic, for example: +# ColorChooser.rgbNameTextAndMnemonic=R&GB +# +# Indicates that the tab in the ColorChooser for RGB colors will have +# the text 'RGB', further the mnemonic character will be 'g' and that +# a decoration will be provided under the 'G'. This will typically +# look like: RGB +# - +# +# One important thing to remember is that the mnemonic MUST exist in +# the String, if it does not exist you should add text that makes it +# exist. This will typically take the form 'XXXX (M)' where M is the +# character for the mnemonic. +# +# @author Steve Wilson + +############ FILE CHOOSER STRINGS ############# +FileChooser.fileDescription.textAndMnemonic=Allgemeine Datei +FileChooser.directoryDescription.textAndMnemonic=Verzeichnis +FileChooser.newFolderError.textAndMnemonic=Fehler beim Erstellen eines neuen Ordners +FileChooser.newFolderErrorSeparator= : +FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=Ordner kann nicht erstellt werden +FileChooser.newFolderParentDoesntExist.textAndMnemonic=Ordner kann nicht erstellt werden.\n\nSystem kann den angegebenen Pfad nicht finden. +FileChooser.renameErrorTitle.textAndMnemonic=Fehler beim Umbenennen von Datei oder Ordner +FileChooser.renameError.textAndMnemonic={0} kann nicht umbenannt werden +FileChooser.renameErrorFileExists.textAndMnemonic={0} kann nicht umbenannt werden: Es ist bereits eine Datei mit dem angegebenen Namen vorhanden. Geben Sie einen anderen Dateinamen an. +FileChooser.acceptAllFileFilter.textAndMnemonic=Alle Dateien +FileChooser.cancelButton.textAndMnemonic=&Abbrechen +FileChooser.saveButton.textAndMnemonic=&Speichern +FileChooser.openButton.textAndMnemonic=\u00D6ffnen(&F) +FileChooser.saveDialogTitle.textAndMnemonic=Speichern +FileChooser.openDialogTitle.textAndMnemonic=\u00D6ffnen +FileChooser.updateButton.textAndMnemonic=A&ktualisieren +FileChooser.helpButton.textAndMnemonic=&Hilfe +FileChooser.directoryOpenButton.textAndMnemonic=\u00D6ffnen(&F) + +# File Size Units +FileChooser.fileSizeKiloBytes={0} KB +FileChooser.fileSizeMegaBytes={0} MB +FileChooser.fileSizeGigaBytes={0} GB + +# These strings are platform dependent not look and feel dependent. +FileChooser.win32.newFolder=Neuer Ordner +FileChooser.win32.newFolder.subsequent=Neuer Ordner ({0}) +FileChooser.other.newFolder=NewFolder +FileChooser.other.newFolder.subsequent=NewFolder.{0} + + +## file chooser tooltips ### +FileChooser.cancelButtonToolTip.textAndMnemonic=Dialogfeld f\u00FCr Dateiauswahl schlie\u00DFen +FileChooser.saveButtonToolTip.textAndMnemonic=Ausgew\u00E4hlte Datei speichern +FileChooser.openButtonToolTip.textAndMnemonic=Ausgew\u00E4hlte Datei \u00F6ffnen +FileChooser.updateButtonToolTip.textAndMnemonic=Verzeichnisliste aktualisieren +FileChooser.helpButtonToolTip.textAndMnemonic=FileChooser-Hilfe +FileChooser.directoryOpenButtonToolTip.textAndMnemonic=Ausgew\u00E4hltes Verzeichnis \u00F6ffnen + +FileChooser.filesListAccessibleName=Files List +FileChooser.filesDetailsAccessibleName=Files Details + +############ COLOR CHOOSER STRINGS ############# +ColorChooser.preview.textAndMnemonic=Vorschau +ColorChooser.ok.textAndMnemonic=OK +ColorChooser.cancel.textAndMnemonic=Abbrechen +ColorChooser.reset.textAndMnemonic=Zur\u00FCcksetzen(&Z) +ColorChooser.sample.textAndMnemonic=Beispieltext Beispieltext +ColorChooser.swatches.textAndMnemonic=&Swatches +ColorChooser.swatchesRecent.textAndMnemonic=Aktuell: +ColorChooser.hsv.textAndMnemonic=&HSV +ColorChooser.hsvHue.textAndMnemonic=Farbton +ColorChooser.hsvSaturation.textAndMnemonic=S\u00E4ttigung +ColorChooser.hsvValue.textAndMnemonic=Wert +ColorChooser.hsvTransparency.textAndMnemonic=Transparenz +ColorChooser.hsl.textAndMnemonic=HS&L +ColorChooser.hslHue.textAndMnemonic=Farbton +ColorChooser.hslSaturation.textAndMnemonic=S\u00E4ttigung +ColorChooser.hslLightness.textAndMnemonic=Helligkeit +ColorChooser.hslTransparency.textAndMnemonic=Transparenz +ColorChooser.rgb.textAndMnemonic=R&GB +ColorChooser.rgbRed.textAndMnemonic=Ro&t +ColorChooser.rgbGreen.textAndMnemonic=Gr\u00FCn(&N) +ColorChooser.rgbBlue.textAndMnemonic=&Blau +ColorChooser.rgbAlpha.textAndMnemonic=Alpha +ColorChooser.rgbHexCode.textAndMnemonic=&Farbcode +ColorChooser.cmyk.textAndMnemonic=C&MYK +ColorChooser.cmykCyan.textAndMnemonic=Zyan +ColorChooser.cmykMagenta.textAndMnemonic=Magenta +ColorChooser.cmykYellow.textAndMnemonic=Gelb +ColorChooser.cmykBlack.textAndMnemonic=Schwarz +ColorChooser.cmykAlpha.textAndMnemonic=Alpha + +############ OPTION PANE STRINGS ############# +# We only define mnemonics for YES/NO, but for completeness you can +# define mnemonics for any of the buttons. +OptionPane.yesButton.textAndMnemonic=&Ja +OptionPane.noButton.textAndMnemonic=&Nein +OptionPane.okButton.textAndMnemonic=&OK +OptionPane.cancelButton.textAndMnemonic=&Abbrechen +OptionPane.title.textAndMnemonic=Option ausw\u00E4hlen +# Title for the dialog for the showInputDialog methods. Only used if +# the developer uses one of the variants that doesn't take a title. +OptionPane.inputDialog.titleAndMnemonic=Eingabe +# Title for the dialog for the showMessageDialog methods. Only used if +# the developer uses one of the variants that doesn't take a title. +OptionPane.messageDialog.titleAndMnemonic=Meldung + +############ Printing Dialog Strings ############ +PrintingDialog.titleProgress.textAndMnemonic=Drucken +PrintingDialog.titleAborting.textAndMnemonic=Drucken (Abbruch) + +PrintingDialog.contentInitial.textAndMnemonic=Druckvorgang l\u00E4uft... + +# The following string will be formatted by a MessageFormat +# and {0} will be replaced by page number being printed +PrintingDialog.contentProgress.textAndMnemonic=Seite {0} wurde gedruckt... + +PrintingDialog.contentAborting.textAndMnemonic=Druckvorgang wird abgebrochen... + +PrintingDialog.abortButton.textAndMnemonic=&Abbruch +PrintingDialog.abortButtonToolTip.textAndMnemonic=Druckvorgang abbrechen + +############ Internal Frame Strings ############ +InternalFrame.iconButtonToolTip=Minimieren +InternalFrame.maxButtonToolTip=Maximieren +InternalFrame.restoreButtonToolTip=Wiederherstellen +InternalFrame.closeButtonToolTip=Schlie\u00DFen + +############ Internal Frame Title Pane Strings ############ +InternalFrameTitlePane.restoreButton.textAndMnemonic=Wiederherstellen +InternalFrameTitlePane.moveButton.textAndMnemonic=Verschieben +InternalFrameTitlePane.sizeButton.textAndMnemonic=Gr\u00F6\u00DFe +InternalFrameTitlePane.minimizeButton.textAndMnemonic=Minimieren +InternalFrameTitlePane.maximizeButton.textAndMnemonic=Maximieren +InternalFrameTitlePane.closeButton.textAndMnemonic=Schlie\u00DFen + +############ Text strings ############# +# Used for html forms +FormView.submitButton.textAndMnemonic=Abfrage weiterleiten +FormView.resetButton.textAndMnemonic=Zur\u00FCcksetzen +FormView.browseFileButton.textAndMnemonic=Durchsuchen... + +############ Abstract Document Strings ############ +AbstractDocument.styleChange.textAndMnemonic=Formatvorlagen\u00E4nderung +AbstractDocument.addition.textAndMnemonic=Hinzuf\u00FCgen +AbstractDocument.deletion.textAndMnemonic=L\u00F6schen +AbstractDocument.undo.textAndMnemonic=R\u00FCckg\u00E4ngig +AbstractDocument.redo.textAndMnemonic=Wiederherstellen + +############ Abstract Button Strings ############ +AbstractButton.click.textAndMnemonic=Klicken + +############ Abstract Undoable Edit Strings ############ +AbstractUndoableEdit.undo.textAndMnemonic=R\u00FCckg\u00E4ngig +AbstractUndoableEdit.redo.textAndMnemonic=Wiederherstellen + +############ Combo Box Strings ############ +ComboBox.togglePopup.textAndMnemonic=togglePopup + +############ Progress Monitor Strings ############ +ProgressMonitor.progress.textAndMnemonic=Fortschritt... + +############ Split Pane Strings ############ +SplitPane.leftButton.textAndMnemonic=linke Schaltfl\u00E4che +SplitPane.rightButton.textAndMnemonic=rechte Schaltfl\u00E4che +# Used for Isindex +IsindexView.prompt=Dieser Index kann durchsucht werden. Geben Sie Schl\u00FCsselw\u00F6rter f\u00FCr die Suche ein: + +############ InternalFrameTitlePane Strings ############ +InternalFrameTitlePane.iconifyButtonAccessibleName=Als Symbol darstellen +InternalFrameTitlePane.maximizeButtonAccessibleName=Maximieren +InternalFrameTitlePane.closeButtonAccessibleName=Schlie\u00DFen + diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_es.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_es.properties index 912f8365cda..df7789e4d58 100644 --- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_es.properties +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_es.properties @@ -1,229 +1,186 @@ -# This properties file is used to create a PropertyResourceBundle -# It contains Locale specific strings used in Swing -# Currently, the following components need this for support: -# -# ColorChooser -# FileChooser -# OptionPane -# -# When this file is read in, the strings are put into the -# defaults table. This is an implementation detail of the current -# workings of Swing. DO NOT DEPEND ON THIS. -# This may change in future versions of Swing as we improve localization -# support. -# -# MNEMONIC NOTE: -# Many of strings in this file are used by widgets that have a -# mnemonic, for example: -# ColorChooser.rgbNameText=RGB -# ColorChooser.rgbMnemonic=71 -# ColorChooser.rgbDisplayedMnemonicIndex=1 -# Indicates that the tab in the ColorChooser for RGB colors will have -# the text 'RGB', further the mnemonic character will be 'g' and that -# a decoration will be provided under the 'G'. This will typically -# look like: RGB -# - -# 71 corresponds to the decimal value of the VK constant defined -# in java/awt/KeyEvent.java. VK_G is defined as: -# -# public static final int VK_G = 0x47; -# -# 0x47 is a hex number and needs to be converted to decimal. -# A simple way to calculate this for a-z is to add 64 to the index of -# the letter in the alphabet. As 'a' is in the 1st letter the mnemonic -# for 'a' is 65, 'b' is 66... -# -# The xxDisplayedMnemonicIndex is used to indicate the index of the -# character that should be underlined in the String, with 0 -# corresponding to the first character in the String. -# -# One important thing to remember is that the mnemonic MUST exist in -# the String, if it does not exist you should add text that makes it -# exist. This will typically take the form 'XXXX (M)' where M is the -# character for the mnemonic. -# -# @author Steve Wilson - -############ FILE CHOOSER STRINGS ############# -FileChooser.fileDescriptionText=Archivo Gen\u00E9rico -FileChooser.directoryDescriptionText=Directorio -FileChooser.newFolderErrorText=Error al crear una nueva carpeta -FileChooser.newFolderErrorSeparator= : -FileChooser.newFolderParentDoesntExistTitleText=No se ha podido crear la carpeta -FileChooser.newFolderParentDoesntExistText=No se ha podido crear la carpeta.\n\nEl sistema no puede encontrar la ruta de acceso especificada. -FileChooser.renameErrorTitleText=Error al cambiar el nombre del archivo o carpeta -FileChooser.renameErrorText=No se puede cambiar el nombre de {0} -FileChooser.renameErrorFileExistsText=No se puede cambiar el nombre de {0}: ya existe un archivo con el nombre especificado. Especifique otro nombre de archivo. -FileChooser.acceptAllFileFilterText=Todos los Archivos -FileChooser.cancelButtonText=Cancelar -FileChooser.cancelButtonMnemonic=67 -FileChooser.saveButtonText=Guardar -FileChooser.saveButtonMnemonic=71 -FileChooser.openButtonText=Abrir -FileChooser.openButtonMnemonic=66 -FileChooser.saveDialogTitleText=Guardar -FileChooser.openDialogTitleText=Abrir -FileChooser.updateButtonText=Actualizar -FileChooser.updateButtonMnemonic=85 -FileChooser.helpButtonText=Ayuda -FileChooser.helpButtonMnemonic=89 -FileChooser.directoryOpenButtonText=Abrir -FileChooser.directoryOpenButtonMnemonic=65 - -# File Size Units -FileChooser.fileSizeKiloBytes={0} KB -FileChooser.fileSizeMegaBytes={0} MB -FileChooser.fileSizeGigaBytes={0} GB - -# These strings are platform dependent not look and feel dependent. -FileChooser.win32.newFolder=Nueva Carpeta -FileChooser.win32.newFolder.subsequent=Nueva Carpeta ({0}) -FileChooser.other.newFolder=Nueva Carpeta -FileChooser.other.newFolder.subsequent=Nueva Carpeta.{0} - - -## file chooser tooltips ### -FileChooser.cancelButtonToolTipText=Cuadro de di\u00E1logo para abortar el selector de archivos -FileChooser.saveButtonToolTipText=Guardar archivo seleccionado -FileChooser.openButtonToolTipText=Abrir archivo seleccionado -FileChooser.updateButtonToolTipText=Actualizar lista de directorios -FileChooser.helpButtonToolTipText=Ayuda del Selector de Archivos -FileChooser.directoryOpenButtonToolTipText=Abrir directorio seleccionado - -FileChooser.filesListAccessibleName=Files List -FileChooser.filesDetailsAccessibleName=Files Details - -############ COLOR CHOOSER STRINGS ############# -ColorChooser.previewText=Presentaci\u00F3n Preliminar -ColorChooser.okText=Aceptar -ColorChooser.cancelText=Cancelar -ColorChooser.resetText=Restablecer -# VK_XXX constant for 'ColorChooser.resetText' button to make mnemonic -ColorChooser.resetMnemonic=82 -ColorChooser.sampleText=Texto de Ejemplo Texto de Ejemplo -ColorChooser.swatchesNameText=Muestras -ColorChooser.swatchesMnemonic=83 -ColorChooser.swatchesRecentText=Reciente: -# Each of the ColorChooser types can define a mnemonic, as a KeyEvent.VK_XXX -# constant, and an index into the text to render the mnemonic as. The -# mnemonic is xxxMnemonic and the index of the character to underline is -# xxxDisplayedMnemonicIndex. -ColorChooser.hsvNameText=HSV -ColorChooser.hsvMnemonic=72 -ColorChooser.hsvHueText=Matiz -ColorChooser.hsvSaturationText=Saturaci\u00F3n -ColorChooser.hsvValueText=Valor -ColorChooser.hsvTransparencyText=Transparencia -ColorChooser.hslNameText=HSL -ColorChooser.hslMnemonic=76 -ColorChooser.hslHueText=Matiz -ColorChooser.hslSaturationText=Saturaci\u00F3n -ColorChooser.hslLightnessText=Iluminaci\u00F3n -ColorChooser.hslTransparencyText=Transparencia -ColorChooser.rgbNameText=RGB -ColorChooser.rgbMnemonic=71 -ColorChooser.rgbRedText=Rojo -ColorChooser.rgbRedMnemonic=74 -ColorChooser.rgbGreenText=Verde -ColorChooser.rgbGreenMnemonic=86 -ColorChooser.rgbBlueText=Azul -ColorChooser.rgbBlueMnemonic=90 -ColorChooser.rgbAlphaText=Alfa -ColorChooser.rgbHexCodeText=C\u00F3digo de Color -ColorChooser.rgbHexCodeMnemonic=67 -ColorChooser.cmykNameText=CMYK -ColorChooser.cmykMnemonic=77 -ColorChooser.cmykCyanText=Cian -ColorChooser.cmykMagentaText=Magenta -ColorChooser.cmykYellowText=Amarillo -ColorChooser.cmykBlackText=Negro -ColorChooser.cmykAlphaText=Alfa - -############ OPTION PANE STRINGS ############# -# Mnemonic keys correspond to KeyEvent.VK_XXX constant -# We only define mnemonics for YES/NO, but for completeness you can -# define mnemonics for any of the buttons. -OptionPane.yesButtonText=S\u00ED -OptionPane.yesButtonMnemonic=83 -OptionPane.noButtonText=No -OptionPane.noButtonMnemonic=78 -OptionPane.okButtonText=Aceptar -OptionPane.okButtonMnemonic=O -OptionPane.cancelButtonText=Cancelar -OptionPane.cancelButtonMnemonic=C -OptionPane.titleText=Seleccionar una Opci\u00F3n -# Title for the dialog for the showInputDialog methods. Only used if -# the developer uses one of the variants that doesn't take a title. -OptionPane.inputDialogTitle=Entrada -# Title for the dialog for the showMessageDialog methods. Only used if -# the developer uses one of the variants that doesn't take a title. -OptionPane.messageDialogTitle=Mensaje - -############ Printing Dialog Strings ############ -PrintingDialog.titleProgressText=Impresi\u00F3n -PrintingDialog.titleAbortingText=Impresi\u00F3n (Abortando) - -PrintingDialog.contentInitialText=Impresi\u00F3n en curso... - -# The following string will be formatted by a MessageFormat -# and {0} will be replaced by page number being printed -PrintingDialog.contentProgressText=P\u00E1gina impresa {0}... - -PrintingDialog.contentAbortingText=Abortando la impresi\u00F3n... - -PrintingDialog.abortButtonText=Abortar -PrintingDialog.abortButtonMnemonic=65 -PrintingDialog.abortButtonDisplayedMnemonicIndex=0 -PrintingDialog.abortButtonToolTipText=Abortar Impresi\u00F3n - -############ Internal Frame Strings ############ -InternalFrame.iconButtonToolTip=Minimizar -InternalFrame.maxButtonToolTip=Maximizar -InternalFrame.restoreButtonToolTip=Restaurar -InternalFrame.closeButtonToolTip=Cerrar - -############ Internal Frame Title Pane Strings ############ -InternalFrameTitlePane.restoreButtonText=Restaurar -InternalFrameTitlePane.moveButtonText=Mover -InternalFrameTitlePane.sizeButtonText=Tama\u00F1o -InternalFrameTitlePane.minimizeButtonText=Minimizar -InternalFrameTitlePane.maximizeButtonText=Maximizar -InternalFrameTitlePane.closeButtonText=Cerrar - -############ Text strings ############# -# Used for html forms -FormView.submitButtonText=Enviar Consulta -FormView.resetButtonText=Restablecer -FormView.browseFileButtonText=Examinar... - -############ Abstract Document Strings ############ -AbstractDocument.styleChangeText=cambio de estilo -AbstractDocument.additionText=agregaci\u00F3n -AbstractDocument.deletionText=supresi\u00F3n -AbstractDocument.undoText=Deshacer -AbstractDocument.redoText=Rehacer - -############ Abstract Button Strings ############ -AbstractButton.clickText=hacer clic - -############ Abstract Undoable Edit Strings ############ -AbstractUndoableEdit.undoText=Deshacer -AbstractUndoableEdit.redoText=Rehacer - -############ Combo Box Strings ############ -ComboBox.togglePopupText=togglePopup - -############ Progress Monitor Strings ############ -ProgressMonitor.progressText=Progreso... - -############ Split Pane Strings ############ -SplitPane.leftButtonText=bot\u00F3n izquierdo -SplitPane.rightButtonText=bot\u00F3n derecho -# Used for Isindex -IsindexView.prompt=En este \u00EDndice se pueden efectuar b\u00FAsquedas. Escriba las palabras clave de b\u00FAsqueda: - -############ InternalFrameTitlePane Strings ############ -InternalFrameTitlePane.iconifyButtonAccessibleName=Convertir en Icono -InternalFrameTitlePane.maximizeButtonAccessibleName=Maximizar -InternalFrameTitlePane.closeButtonAccessibleName=Cerrar - +# This properties file is used to create a PropertyResourceBundle +# It contains Locale specific strings used in Swing +# Currently, the following components need this for support: +# +# ColorChooser +# FileChooser +# OptionPane +# +# When this file is read in, the strings are put into the +# defaults table. This is an implementation detail of the current +# workings of Swing. DO NOT DEPEND ON THIS. +# This may change in future versions of Swing as we improve localization +# support. +# +# MNEMONIC NOTE: +# Many of strings in this file are used by widgets that have a +# mnemonic, for example: +# ColorChooser.rgbNameTextAndMnemonic=R&GB +# Indicates that the tab in the ColorChooser for RGB colors will have +# the text 'RGB', further the mnemonic character will be 'g' and that +# a decoration will be provided under the 'G'. This will typically +# look like: RGB +# - +# +# One important thing to remember is that the mnemonic MUST exist in +# the String, if it does not exist you should add text that makes it +# exist. This will typically take the form 'XXXX (M)' where M is the +# character for the mnemonic. +# +# @author Steve Wilson + +############ FILE CHOOSER STRINGS ############# +FileChooser.fileDescription.textAndMnemonic=Archivo Gen\u00E9rico +FileChooser.directoryDescription.textAndMnemonic=Directorio +FileChooser.newFolderError.textAndMnemonic=Error al crear una nueva carpeta +FileChooser.newFolderErrorSeparator= : +FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=No se ha podido crear la carpeta +FileChooser.newFolderParentDoesntExist.textAndMnemonic=No se ha podido crear la carpeta.\n\nEl sistema no puede encontrar la ruta de acceso especificada. +FileChooser.renameErrorTitle.textAndMnemonic=Error al cambiar el nombre del archivo o carpeta +FileChooser.renameError.textAndMnemonic=No se puede cambiar el nombre de {0} +FileChooser.renameErrorFileExists.textAndMnemonic=No se puede cambiar el nombre de {0}: ya existe un archivo con el nombre especificado. Especifique otro nombre de archivo. +FileChooser.acceptAllFileFilter.textAndMnemonic=Todos los Archivos +FileChooser.cancelButton.textAndMnemonic=&Cancelar +FileChooser.saveButton.textAndMnemonic=&Guardar +FileChooser.openButton.textAndMnemonic=A&brir +FileChooser.saveDialogTitle.textAndMnemonic=Guardar +FileChooser.openDialogTitle.textAndMnemonic=Abrir +FileChooser.updateButton.textAndMnemonic=Act&ualizar +FileChooser.helpButton.textAndMnemonic=A&yuda +FileChooser.directoryOpenButton.textAndMnemonic=&Abrir + +# File Size Units +FileChooser.fileSizeKiloBytes={0} KB +FileChooser.fileSizeMegaBytes={0} MB +FileChooser.fileSizeGigaBytes={0} GB + +# These strings are platform dependent not look and feel dependent. +FileChooser.win32.newFolder=Nueva Carpeta +FileChooser.win32.newFolder.subsequent=Nueva Carpeta ({0}) +FileChooser.other.newFolder=Nueva Carpeta +FileChooser.other.newFolder.subsequent=Nueva Carpeta.{0} + + +## file chooser tooltips ### +FileChooser.cancelButtonToolTip.textAndMnemonic=Cuadro de di\u00E1logo para abortar el selector de archivos +FileChooser.saveButtonToolTip.textAndMnemonic=Guardar archivo seleccionado +FileChooser.openButtonToolTip.textAndMnemonic=Abrir archivo seleccionado +FileChooser.updateButtonToolTip.textAndMnemonic=Actualizar lista de directorios +FileChooser.helpButtonToolTip.textAndMnemonic=Ayuda del Selector de Archivos +FileChooser.directoryOpenButtonToolTip.textAndMnemonic=Abrir directorio seleccionado + +FileChooser.filesListAccessibleName=Files List +FileChooser.filesDetailsAccessibleName=Files Details + +############ COLOR CHOOSER STRINGS ############# +ColorChooser.preview.textAndMnemonic=Presentaci\u00F3n Preliminar +ColorChooser.ok.textAndMnemonic=Aceptar +ColorChooser.cancel.textAndMnemonic=Cancelar +ColorChooser.reset.textAndMnemonic=&Restablecer +ColorChooser.sample.textAndMnemonic=Texto de Ejemplo Texto de Ejemplo +ColorChooser.swatches.textAndMnemonic=Mue&stras +ColorChooser.swatchesRecent.textAndMnemonic=Reciente: +ColorChooser.hsv.textAndMnemonic=&HSV +ColorChooser.hsvHue.textAndMnemonic=Matiz +ColorChooser.hsvSaturation.textAndMnemonic=Saturaci\u00F3n +ColorChooser.hsvValue.textAndMnemonic=Valor +ColorChooser.hsvTransparency.textAndMnemonic=Transparencia +ColorChooser.hsl.textAndMnemonic=HS&L +ColorChooser.hslHue.textAndMnemonic=Matiz +ColorChooser.hslSaturation.textAndMnemonic=Saturaci\u00F3n +ColorChooser.hslLightness.textAndMnemonic=Iluminaci\u00F3n +ColorChooser.hslTransparency.textAndMnemonic=Transparencia +ColorChooser.rgb.textAndMnemonic=R&GB +ColorChooser.rgbRed.textAndMnemonic=Ro&jo +ColorChooser.rgbGreen.textAndMnemonic=&Verde +ColorChooser.rgbBlue.textAndMnemonic=A&zul +ColorChooser.rgbAlpha.textAndMnemonic=Alfa +ColorChooser.rgbHexCode.textAndMnemonic=C\u00F3digo de Color(&C) +ColorChooser.cmyk.textAndMnemonic=C&MYK +ColorChooser.cmykCyan.textAndMnemonic=Cian +ColorChooser.cmykMagenta.textAndMnemonic=Magenta +ColorChooser.cmykYellow.textAndMnemonic=Amarillo +ColorChooser.cmykBlack.textAndMnemonic=Negro +ColorChooser.cmykAlpha.textAndMnemonic=Alfa + +############ OPTION PANE STRINGS ############# +# We only define mnemonics for YES/NO, but for completeness you can +# define mnemonics for any of the buttons. +OptionPane.yesButton.textAndMnemonic=S\u00ED(&S) +OptionPane.noButton.textAndMnemonic=&No +OptionPane.okButton.textAndMnemonic=Aceptar(&O) +OptionPane.cancelButton.textAndMnemonic=&Cancelar +OptionPane.title.textAndMnemonic=Seleccionar una Opci\u00F3n +# Title for the dialog for the showInputDialog methods. Only used if +# the developer uses one of the variants that doesn't take a title. +OptionPane.inputDialog.titleAndMnemonic=Entrada +# Title for the dialog for the showMessageDialog methods. Only used if +# the developer uses one of the variants that doesn't take a title. +OptionPane.messageDialog.titleAndMnemonic=Mensaje + +############ Printing Dialog Strings ############ +PrintingDialog.titleProgress.textAndMnemonic=Impresi\u00F3n +PrintingDialog.titleAborting.textAndMnemonic=Impresi\u00F3n (Abortando) + +PrintingDialog.contentInitial.textAndMnemonic=Impresi\u00F3n en curso... + +# The following string will be formatted by a MessageFormat +# and {0} will be replaced by page number being printed +PrintingDialog.contentProgress.textAndMnemonic=P\u00E1gina impresa {0}... + +PrintingDialog.contentAborting.textAndMnemonic=Abortando la impresi\u00F3n... + +PrintingDialog.abortButton.textAndMnemonic=&Abortar +PrintingDialog.abortButtonToolTip.textAndMnemonic=Abortar Impresi\u00F3n + +############ Internal Frame Strings ############ +InternalFrame.iconButtonToolTip=Minimizar +InternalFrame.maxButtonToolTip=Maximizar +InternalFrame.restoreButtonToolTip=Restaurar +InternalFrame.closeButtonToolTip=Cerrar + +############ Internal Frame Title Pane Strings ############ +InternalFrameTitlePane.restoreButton.textAndMnemonic=Restaurar +InternalFrameTitlePane.moveButton.textAndMnemonic=Mover +InternalFrameTitlePane.sizeButton.textAndMnemonic=Tama\u00F1o +InternalFrameTitlePane.minimizeButton.textAndMnemonic=Minimizar +InternalFrameTitlePane.maximizeButton.textAndMnemonic=Maximizar +InternalFrameTitlePane.closeButton.textAndMnemonic=Cerrar + +############ Text strings ############# +# Used for html forms +FormView.submitButton.textAndMnemonic=Enviar Consulta +FormView.resetButton.textAndMnemonic=Restablecer +FormView.browseFileButton.textAndMnemonic=Examinar... + +############ Abstract Document Strings ############ +AbstractDocument.styleChange.textAndMnemonic=cambio de estilo +AbstractDocument.addition.textAndMnemonic=agregaci\u00F3n +AbstractDocument.deletion.textAndMnemonic=supresi\u00F3n +AbstractDocument.undo.textAndMnemonic=Deshacer +AbstractDocument.redo.textAndMnemonic=Rehacer + +############ Abstract Button Strings ############ +AbstractButton.click.textAndMnemonic=hacer clic + +############ Abstract Undoable Edit Strings ############ +AbstractUndoableEdit.undo.textAndMnemonic=Deshacer +AbstractUndoableEdit.redo.textAndMnemonic=Rehacer + +############ Combo Box Strings ############ +ComboBox.togglePopup.textAndMnemonic=togglePopup + +############ Progress Monitor Strings ############ +ProgressMonitor.progress.textAndMnemonic=Progreso... + +############ Split Pane Strings ############ +SplitPane.leftButton.textAndMnemonic=bot\u00F3n izquierdo +SplitPane.rightButton.textAndMnemonic=bot\u00F3n derecho +# Used for Isindex +IsindexView.prompt=En este \u00EDndice se pueden efectuar b\u00FAsquedas. Escriba las palabras clave de b\u00FAsqueda: + +############ InternalFrameTitlePane Strings ############ +InternalFrameTitlePane.iconifyButtonAccessibleName=Convertir en Icono +InternalFrameTitlePane.maximizeButtonAccessibleName=Maximizar +InternalFrameTitlePane.closeButtonAccessibleName=Cerrar + diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_fr.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_fr.properties index ee529a1bae5..8b34ac03b9f 100644 --- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_fr.properties +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_fr.properties @@ -1,229 +1,186 @@ -# This properties file is used to create a PropertyResourceBundle -# It contains Locale specific strings used in Swing -# Currently, the following components need this for support: -# -# ColorChooser -# FileChooser -# OptionPane -# -# When this file is read in, the strings are put into the -# defaults table. This is an implementation detail of the current -# workings of Swing. DO NOT DEPEND ON THIS. -# This may change in future versions of Swing as we improve localization -# support. -# -# MNEMONIC NOTE: -# Many of strings in this file are used by widgets that have a -# mnemonic, for example: -# ColorChooser.rgbNameText=RGB -# ColorChooser.rgbMnemonic=71 -# ColorChooser.rgbDisplayedMnemonicIndex=1 -# Indicates that the tab in the ColorChooser for RGB colors will have -# the text 'RGB', further the mnemonic character will be 'g' and that -# a decoration will be provided under the 'G'. This will typically -# look like: RGB -# - -# 71 corresponds to the decimal value of the VK constant defined -# in java/awt/KeyEvent.java. VK_G is defined as: -# -# public static final int VK_G = 0x47; -# -# 0x47 is a hex number and needs to be converted to decimal. -# A simple way to calculate this for a-z is to add 64 to the index of -# the letter in the alphabet. As 'a' is in the 1st letter the mnemonic -# for 'a' is 65, 'b' is 66... -# -# The xxDisplayedMnemonicIndex is used to indicate the index of the -# character that should be underlined in the String, with 0 -# corresponding to the first character in the String. -# -# One important thing to remember is that the mnemonic MUST exist in -# the String, if it does not exist you should add text that makes it -# exist. This will typically take the form 'XXXX (M)' where M is the -# character for the mnemonic. -# -# @author Steve Wilson - -############ FILE CHOOSER STRINGS ############# -FileChooser.fileDescriptionText=Fichier g\u00E9n\u00E9rique -FileChooser.directoryDescriptionText=R\u00E9pertoire -FileChooser.newFolderErrorText=Erreur lors de la cr\u00E9ation du dossier -FileChooser.newFolderErrorSeparator= : -FileChooser.newFolderParentDoesntExistTitleText=Impossible de cr\u00E9er le dossier -FileChooser.newFolderParentDoesntExistText=Impossible de cr\u00E9er le dossier.\n\nLe syst\u00E8me ne parvient pas \u00E0 trouver le chemin indiqu\u00E9. -FileChooser.renameErrorTitleText=Erreur lors du changement de nom du fichier ou du dossier -FileChooser.renameErrorText=Impossible de renommer {0} -FileChooser.renameErrorFileExistsText=Impossible de renommer {0} : il existe d\u00E9j\u00E0 un fichier portant le nom indiqu\u00E9. Indiquez-en un autre. -FileChooser.acceptAllFileFilterText=Tous les fichiers -FileChooser.cancelButtonText=Annuler -FileChooser.cancelButtonMnemonic=65 -FileChooser.saveButtonText=Enregistrer -FileChooser.saveButtonMnemonic=83 -FileChooser.openButtonText=Ouvrir -FileChooser.openButtonMnemonic=79 -FileChooser.saveDialogTitleText=Enregistrer -FileChooser.openDialogTitleText=Ouvrir -FileChooser.updateButtonText=Mettre \u00E0 jour -FileChooser.updateButtonMnemonic=85 -FileChooser.helpButtonText=Aide -FileChooser.helpButtonMnemonic=65 -FileChooser.directoryOpenButtonText=Ouvrir -FileChooser.directoryOpenButtonMnemonic=79 - -# File Size Units -FileChooser.fileSizeKiloBytes={0} KB -FileChooser.fileSizeMegaBytes={0} MB -FileChooser.fileSizeGigaBytes={0} GB - -# These strings are platform dependent not look and feel dependent. -FileChooser.win32.newFolder=Nouveau dossier -FileChooser.win32.newFolder.subsequent=Nouveau dossier ({0}) -FileChooser.other.newFolder=NewFolder -FileChooser.other.newFolder.subsequent=NewFolder.{0} - - -## file chooser tooltips ### -FileChooser.cancelButtonToolTipText=Ferme la bo\u00EEte de dialogue du s\u00E9lecteur de fichiers -FileChooser.saveButtonToolTipText=Enregistre le fichier s\u00E9lectionn\u00E9 -FileChooser.openButtonToolTipText=Ouvre le fichier s\u00E9lectionn\u00E9 -FileChooser.updateButtonToolTipText=Met \u00E0 jour la liste des r\u00E9pertoires -FileChooser.helpButtonToolTipText=Aide du s\u00E9lecteur de fichiers -FileChooser.directoryOpenButtonToolTipText=Ouvre le r\u00E9pertoire s\u00E9lectionn\u00E9 - -FileChooser.filesListAccessibleName=Files List -FileChooser.filesDetailsAccessibleName=Files Details - -############ COLOR CHOOSER STRINGS ############# -ColorChooser.previewText=Aper\u00E7u -ColorChooser.okText=OK -ColorChooser.cancelText=Annuler -ColorChooser.resetText=R\u00E9initialiser -# VK_XXX constant for 'ColorChooser.resetText' button to make mnemonic -ColorChooser.resetMnemonic=82 -ColorChooser.sampleText=Echantillon de texte Echantillon de texte -ColorChooser.swatchesNameText=Echantillons -ColorChooser.swatchesMnemonic=69 -ColorChooser.swatchesRecentText=Dernier : -# Each of the ColorChooser types can define a mnemonic, as a KeyEvent.VK_XXX -# constant, and an index into the text to render the mnemonic as. The -# mnemonic is xxxMnemonic and the index of the character to underline is -# xxxDisplayedMnemonicIndex. -ColorChooser.hsvNameText=TSV -ColorChooser.hsvMnemonic=84 -ColorChooser.hsvHueText=Teinte -ColorChooser.hsvSaturationText=Saturation -ColorChooser.hsvValueText=Valeur -ColorChooser.hsvTransparencyText=Transparence -ColorChooser.hslNameText=TSL -ColorChooser.hslMnemonic=76 -ColorChooser.hslHueText=Teinte -ColorChooser.hslSaturationText=Saturation -ColorChooser.hslLightnessText=Lumi\u00E8re -ColorChooser.hslTransparencyText=Transparence -ColorChooser.rgbNameText=RVB -ColorChooser.rgbMnemonic=86 -ColorChooser.rgbRedText=Rouge -ColorChooser.rgbRedMnemonic=79 -ColorChooser.rgbGreenText=Vert -ColorChooser.rgbGreenMnemonic=86 -ColorChooser.rgbBlueText=Bleu -ColorChooser.rgbBlueMnemonic=66 -ColorChooser.rgbAlphaText=Alpha -ColorChooser.rgbHexCodeText=Code couleur -ColorChooser.rgbHexCodeMnemonic=67 -ColorChooser.cmykNameText=CMYK -ColorChooser.cmykMnemonic=77 -ColorChooser.cmykCyanText=Cyan -ColorChooser.cmykMagentaText=Magenta -ColorChooser.cmykYellowText=Jaune -ColorChooser.cmykBlackText=Noir -ColorChooser.cmykAlphaText=Alpha - -############ OPTION PANE STRINGS ############# -# Mnemonic keys correspond to KeyEvent.VK_XXX constant -# We only define mnemonics for YES/NO, but for completeness you can -# define mnemonics for any of the buttons. -OptionPane.yesButtonText=Oui -OptionPane.yesButtonMnemonic=79 -OptionPane.noButtonText=Non -OptionPane.noButtonMnemonic=78 -OptionPane.okButtonText=OK -OptionPane.okButtonMnemonic=O -OptionPane.cancelButtonText=Annuler -OptionPane.cancelButtonMnemonic=A -OptionPane.titleText=S\u00E9lectionner une option -# Title for the dialog for the showInputDialog methods. Only used if -# the developer uses one of the variants that doesn't take a title. -OptionPane.inputDialogTitle=Entr\u00E9e -# Title for the dialog for the showMessageDialog methods. Only used if -# the developer uses one of the variants that doesn't take a title. -OptionPane.messageDialogTitle=Message - -############ Printing Dialog Strings ############ -PrintingDialog.titleProgressText=Impression -PrintingDialog.titleAbortingText=Impression (abandon) - -PrintingDialog.contentInitialText=Impression en cours... - -# The following string will be formatted by a MessageFormat -# and {0} will be replaced by page number being printed -PrintingDialog.contentProgressText=Page {0} imprim\u00E9e... - -PrintingDialog.contentAbortingText=Abandon de l'impression... - -PrintingDialog.abortButtonText=Abandonner -PrintingDialog.abortButtonMnemonic=65 -PrintingDialog.abortButtonDisplayedMnemonicIndex=0 -PrintingDialog.abortButtonToolTipText=Abandonner l'impression - -############ Internal Frame Strings ############ -InternalFrame.iconButtonToolTip=R\u00E9duire -InternalFrame.maxButtonToolTip=Agrandir -InternalFrame.restoreButtonToolTip=Restaurer -InternalFrame.closeButtonToolTip=Fermer - -############ Internal Frame Title Pane Strings ############ -InternalFrameTitlePane.restoreButtonText=Restaurer -InternalFrameTitlePane.moveButtonText=D\u00E9placer -InternalFrameTitlePane.sizeButtonText=Taille -InternalFrameTitlePane.minimizeButtonText=R\u00E9duire -InternalFrameTitlePane.maximizeButtonText=Agrandir -InternalFrameTitlePane.closeButtonText=Fermer - -############ Text strings ############# -# Used for html forms -FormView.submitButtonText=Soumettre la requ\u00EAte -FormView.resetButtonText=R\u00E9initialiser -FormView.browseFileButtonText=Parcourir... - -############ Abstract Document Strings ############ -AbstractDocument.styleChangeText=modification de style -AbstractDocument.additionText=ajout -AbstractDocument.deletionText=suppression -AbstractDocument.undoText=Annuler -AbstractDocument.redoText=R\u00E9tablir - -############ Abstract Button Strings ############ -AbstractButton.clickText=cliquer - -############ Abstract Undoable Edit Strings ############ -AbstractUndoableEdit.undoText=Annuler -AbstractUndoableEdit.redoText=R\u00E9tablir - -############ Combo Box Strings ############ -ComboBox.togglePopupText=togglePopup - -############ Progress Monitor Strings ############ -ProgressMonitor.progressText=Progression... - -############ Split Pane Strings ############ -SplitPane.leftButtonText=bouton gauche -SplitPane.rightButtonText=bouton droit -# Used for Isindex -IsindexView.prompt=Ceci est un index de recherche. Tapez des mots-cl\u00E9s pour la recherche : - -############ InternalFrameTitlePane Strings ############ -InternalFrameTitlePane.iconifyButtonAccessibleName=R\u00E9duire -InternalFrameTitlePane.maximizeButtonAccessibleName=Agrandir -InternalFrameTitlePane.closeButtonAccessibleName=Fermer - +# This properties file is used to create a PropertyResourceBundle +# It contains Locale specific strings used in Swing +# Currently, the following components need this for support: +# +# ColorChooser +# FileChooser +# OptionPane +# +# When this file is read in, the strings are put into the +# defaults table. This is an implementation detail of the current +# workings of Swing. DO NOT DEPEND ON THIS. +# This may change in future versions of Swing as we improve localization +# support. +# +# MNEMONIC NOTE: +# Many of strings in this file are used by widgets that have a +# mnemonic, for example: +# ColorChooser.rgbNameTextAndMnemonic=R&GB +# Indicates that the tab in the ColorChooser for RGB colors will have +# the text 'RGB', further the mnemonic character will be 'g' and that +# a decoration will be provided under the 'G'. This will typically +# look like: RGB +# - +# +# One important thing to remember is that the mnemonic MUST exist in +# the String, if it does not exist you should add text that makes it +# exist. This will typically take the form 'XXXX (M)' where M is the +# character for the mnemonic. +# +# @author Steve Wilson + +############ FILE CHOOSER STRINGS ############# +FileChooser.fileDescription.textAndMnemonic=Fichier g\u00E9n\u00E9rique +FileChooser.directoryDescription.textAndMnemonic=R\u00E9pertoire +FileChooser.newFolderError.textAndMnemonic=Erreur lors de la cr\u00E9ation du dossier +FileChooser.newFolderErrorSeparator= : +FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=Impossible de cr\u00E9er le dossier +FileChooser.newFolderParentDoesntExist.textAndMnemonic=Impossible de cr\u00E9er le dossier.\n\nLe syst\u00E8me ne parvient pas \u00E0 trouver le chemin indiqu\u00E9. +FileChooser.renameErrorTitle.textAndMnemonic=Erreur lors du changement de nom du fichier ou du dossier +FileChooser.renameError.textAndMnemonic=Impossible de renommer {0} +FileChooser.renameErrorFileExists.textAndMnemonic=Impossible de renommer {0} : il existe d\u00E9j\u00E0 un fichier portant le nom indiqu\u00E9. Indiquez-en un autre. +FileChooser.acceptAllFileFilter.textAndMnemonic=Tous les fichiers +FileChooser.cancelButton.textAndMnemonic=&Annuler +FileChooser.saveButton.textAndMnemonic=Enregi&strer +FileChooser.openButton.textAndMnemonic=&Ouvrir +FileChooser.saveDialogTitle.textAndMnemonic=Enregistrer +FileChooser.openDialogTitle.textAndMnemonic=Ouvrir +FileChooser.updateButton.textAndMnemonic=Mettre \u00E0 jour(&U) +FileChooser.helpButton.textAndMnemonic=&Aide +FileChooser.directoryOpenButton.textAndMnemonic=&Ouvrir + +# File Size Units +FileChooser.fileSizeKiloBytes={0} KB +FileChooser.fileSizeMegaBytes={0} MB +FileChooser.fileSizeGigaBytes={0} GB + +# These strings are platform dependent not look and feel dependent. +FileChooser.win32.newFolder=Nouveau dossier +FileChooser.win32.newFolder.subsequent=Nouveau dossier ({0}) +FileChooser.other.newFolder=NewFolder +FileChooser.other.newFolder.subsequent=NewFolder.{0} + + +## file chooser tooltips ### +FileChooser.cancelButtonToolTip.textAndMnemonic=Ferme la bo\u00EEte de dialogue du s\u00E9lecteur de fichiers +FileChooser.saveButtonToolTip.textAndMnemonic=Enregistre le fichier s\u00E9lectionn\u00E9 +FileChooser.openButtonToolTip.textAndMnemonic=Ouvre le fichier s\u00E9lectionn\u00E9 +FileChooser.updateButtonToolTip.textAndMnemonic=Met \u00E0 jour la liste des r\u00E9pertoires +FileChooser.helpButtonToolTip.textAndMnemonic=Aide du s\u00E9lecteur de fichiers +FileChooser.directoryOpenButtonToolTip.textAndMnemonic=Ouvre le r\u00E9pertoire s\u00E9lectionn\u00E9 + +FileChooser.filesListAccessibleName=Files List +FileChooser.filesDetailsAccessibleName=Files Details + +############ COLOR CHOOSER STRINGS ############# +ColorChooser.preview.textAndMnemonic=Aper\u00E7u +ColorChooser.ok.textAndMnemonic=OK +ColorChooser.cancel.textAndMnemonic=Annuler +ColorChooser.reset.textAndMnemonic=R\u00E9initialiser(&R) +ColorChooser.sample.textAndMnemonic=Echantillon de texte Echantillon de texte +ColorChooser.swatches.textAndMnemonic=&Echantillons +ColorChooser.swatchesRecent.textAndMnemonic=Dernier : +ColorChooser.hsv.textAndMnemonic=&TSV +ColorChooser.hsvHue.textAndMnemonic=Teinte +ColorChooser.hsvSaturation.textAndMnemonic=Saturation +ColorChooser.hsvValue.textAndMnemonic=Valeur +ColorChooser.hsvTransparency.textAndMnemonic=Transparence +ColorChooser.hsl.textAndMnemonic=TS&L +ColorChooser.hslHue.textAndMnemonic=Teinte +ColorChooser.hslSaturation.textAndMnemonic=Saturation +ColorChooser.hslLightness.textAndMnemonic=Lumi\u00E8re +ColorChooser.hslTransparency.textAndMnemonic=Transparence +ColorChooser.rgb.textAndMnemonic=R&VB +ColorChooser.rgbRed.textAndMnemonic=R&ouge +ColorChooser.rgbGreen.textAndMnemonic=&Vert +ColorChooser.rgbBlue.textAndMnemonic=&Bleu +ColorChooser.rgbAlpha.textAndMnemonic=Alpha +ColorChooser.rgbHexCode.textAndMnemonic=&Code couleur +ColorChooser.cmyk.textAndMnemonic=C&MYK +ColorChooser.cmykCyan.textAndMnemonic=Cyan +ColorChooser.cmykMagenta.textAndMnemonic=Magenta +ColorChooser.cmykYellow.textAndMnemonic=Jaune +ColorChooser.cmykBlack.textAndMnemonic=Noir +ColorChooser.cmykAlpha.textAndMnemonic=Alpha + +############ OPTION PANE STRINGS ############# +# We only define mnemonics for YES/NO, but for completeness you can +# define mnemonics for any of the buttons. +OptionPane.yesButton.textAndMnemonic=&Oui +OptionPane.noButton.textAndMnemonic=&Non +OptionPane.okButton.textAndMnemonic=&OK +OptionPane.cancelButton.textAndMnemonic=&Annuler +OptionPane.title.textAndMnemonic=S\u00E9lectionner une option +# Title for the dialog for the showInputDialog methods. Only used if +# the developer uses one of the variants that doesn't take a title. +OptionPane.inputDialog.titleAndMnemonic=Entr\u00E9e +# Title for the dialog for the showMessageDialog methods. Only used if +# the developer uses one of the variants that doesn't take a title. +OptionPane.messageDialog.titleAndMnemonic=Message + +############ Printing Dialog Strings ############ +PrintingDialog.titleProgress.textAndMnemonic=Impression +PrintingDialog.titleAborting.textAndMnemonic=Impression (abandon) + +PrintingDialog.contentInitial.textAndMnemonic=Impression en cours... + +# The following string will be formatted by a MessageFormat +# and {0} will be replaced by page number being printed +PrintingDialog.contentProgress.textAndMnemonic=Page {0} imprim\u00E9e... + +PrintingDialog.contentAborting.textAndMnemonic=Abandon de l'impression... + +PrintingDialog.abortButton.textAndMnemonic=&Abandonner +PrintingDialog.abortButtonToolTip.textAndMnemonic=Abandonner l'impression + +############ Internal Frame Strings ############ +InternalFrame.iconButtonToolTip=R\u00E9duire +InternalFrame.maxButtonToolTip=Agrandir +InternalFrame.restoreButtonToolTip=Restaurer +InternalFrame.closeButtonToolTip=Fermer + +############ Internal Frame Title Pane Strings ############ +InternalFrameTitlePane.restoreButton.textAndMnemonic=Restaurer +InternalFrameTitlePane.moveButton.textAndMnemonic=D\u00E9placer +InternalFrameTitlePane.sizeButton.textAndMnemonic=Taille +InternalFrameTitlePane.minimizeButton.textAndMnemonic=R\u00E9duire +InternalFrameTitlePane.maximizeButton.textAndMnemonic=Agrandir +InternalFrameTitlePane.closeButton.textAndMnemonic=Fermer + +############ Text strings ############# +# Used for html forms +FormView.submitButton.textAndMnemonic=Soumettre la requ\u00EAte +FormView.resetButton.textAndMnemonic=R\u00E9initialiser +FormView.browseFileButton.textAndMnemonic=Parcourir... + +############ Abstract Document Strings ############ +AbstractDocument.styleChange.textAndMnemonic=modification de style +AbstractDocument.addition.textAndMnemonic=ajout +AbstractDocument.deletion.textAndMnemonic=suppression +AbstractDocument.undo.textAndMnemonic=Annuler +AbstractDocument.redo.textAndMnemonic=R\u00E9tablir + +############ Abstract Button Strings ############ +AbstractButton.click.textAndMnemonic=cliquer + +############ Abstract Undoable Edit Strings ############ +AbstractUndoableEdit.undo.textAndMnemonic=Annuler +AbstractUndoableEdit.redo.textAndMnemonic=R\u00E9tablir + +############ Combo Box Strings ############ +ComboBox.togglePopup.textAndMnemonic=togglePopup + +############ Progress Monitor Strings ############ +ProgressMonitor.progress.textAndMnemonic=Progression... + +############ Split Pane Strings ############ +SplitPane.leftButton.textAndMnemonic=bouton gauche +SplitPane.rightButton.textAndMnemonic=bouton droit +# Used for Isindex +IsindexView.prompt=Ceci est un index de recherche. Tapez des mots-cl\u00E9s pour la recherche : + +############ InternalFrameTitlePane Strings ############ +InternalFrameTitlePane.iconifyButtonAccessibleName=R\u00E9duire +InternalFrameTitlePane.maximizeButtonAccessibleName=Agrandir +InternalFrameTitlePane.closeButtonAccessibleName=Fermer + diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_it.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_it.properties index d28f8910bed..9e3c28b6ef5 100644 --- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_it.properties +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_it.properties @@ -1,229 +1,186 @@ -# This properties file is used to create a PropertyResourceBundle -# It contains Locale specific strings used in Swing -# Currently, the following components need this for support: -# -# ColorChooser -# FileChooser -# OptionPane -# -# When this file is read in, the strings are put into the -# defaults table. This is an implementation detail of the current -# workings of Swing. DO NOT DEPEND ON THIS. -# This may change in future versions of Swing as we improve localization -# support. -# -# MNEMONIC NOTE: -# Many of strings in this file are used by widgets that have a -# mnemonic, for example: -# ColorChooser.rgbNameText=RGB -# ColorChooser.rgbMnemonic=71 -# ColorChooser.rgbDisplayedMnemonicIndex=1 -# Indicates that the tab in the ColorChooser for RGB colors will have -# the text 'RGB', further the mnemonic character will be 'g' and that -# a decoration will be provided under the 'G'. This will typically -# look like: RGB -# - -# 71 corresponds to the decimal value of the VK constant defined -# in java/awt/KeyEvent.java. VK_G is defined as: -# -# public static final int VK_G = 0x47; -# -# 0x47 is a hex number and needs to be converted to decimal. -# A simple way to calculate this for a-z is to add 64 to the index of -# the letter in the alphabet. As 'a' is in the 1st letter the mnemonic -# for 'a' is 65, 'b' is 66... -# -# The xxDisplayedMnemonicIndex is used to indicate the index of the -# character that should be underlined in the String, with 0 -# corresponding to the first character in the String. -# -# One important thing to remember is that the mnemonic MUST exist in -# the String, if it does not exist you should add text that makes it -# exist. This will typically take the form 'XXXX (M)' where M is the -# character for the mnemonic. -# -# @author Steve Wilson - -############ FILE CHOOSER STRINGS ############# -FileChooser.fileDescriptionText=File generico -FileChooser.directoryDescriptionText=Directory -FileChooser.newFolderErrorText=Errore durante la creazione della nuova cartella -FileChooser.newFolderErrorSeparator= : -FileChooser.newFolderParentDoesntExistTitleText=Impossibile creare la cartella -FileChooser.newFolderParentDoesntExistText=Impossibile creare la cartella.\n\nIl sistema non \u00E8 in grado di trovare il percorso specificato. -FileChooser.renameErrorTitleText=Errore durante la ridenominazione del file o della cartella -FileChooser.renameErrorText=Impossibile rinominare {0} -FileChooser.renameErrorFileExistsText=Impossibile rinominare {0}: esiste gi\u00E0 un file con il nome specificato. Specificare un altro nome. -FileChooser.acceptAllFileFilterText=Tutti i file -FileChooser.cancelButtonText=Annulla -FileChooser.cancelButtonMnemonic=65 -FileChooser.saveButtonText=Salva -FileChooser.saveButtonMnemonic=86 -FileChooser.openButtonText=Apri -FileChooser.openButtonMnemonic=80 -FileChooser.saveDialogTitleText=Salva -FileChooser.openDialogTitleText=Apri -FileChooser.updateButtonText=Aggiorna -FileChooser.updateButtonMnemonic=71 -FileChooser.helpButtonText=?(H) -FileChooser.helpButtonMnemonic=72 -FileChooser.directoryOpenButtonText=Apri -FileChooser.directoryOpenButtonMnemonic=65 - -# File Size Units -FileChooser.fileSizeKiloBytes={0} KB -FileChooser.fileSizeMegaBytes={0} MB -FileChooser.fileSizeGigaBytes={0} GB - -# These strings are platform dependent not look and feel dependent. -FileChooser.win32.newFolder=Nuova cartella -FileChooser.win32.newFolder.subsequent=Nuova cartella ({0}) -FileChooser.other.newFolder=NewFolder -FileChooser.other.newFolder.subsequent=NewFolder.{0} - - -## file chooser tooltips ### -FileChooser.cancelButtonToolTipText=Chiude la finestra di dialogo di selezione file -FileChooser.saveButtonToolTipText=Salva il file selezionato -FileChooser.openButtonToolTipText=Apre il file selezionato -FileChooser.updateButtonToolTipText=Aggiorna la lista directory -FileChooser.helpButtonToolTipText=Guida FileChooser -FileChooser.directoryOpenButtonToolTipText=Apre la directory selezionata - -FileChooser.filesListAccessibleName=Files List -FileChooser.filesDetailsAccessibleName=Files Details - -############ COLOR CHOOSER STRINGS ############# -ColorChooser.previewText=Anteprima -ColorChooser.okText=OK -ColorChooser.cancelText=Annulla -ColorChooser.resetText=Reimposta -# VK_XXX constant for 'ColorChooser.resetText' button to make mnemonic -ColorChooser.resetMnemonic=82 -ColorChooser.sampleText=Testo di prova Testo di prova -ColorChooser.swatchesNameText=Colori campione -ColorChooser.swatchesMnemonic=80 -ColorChooser.swatchesRecentText=Recenti: -# Each of the ColorChooser types can define a mnemonic, as a KeyEvent.VK_XXX -# constant, and an index into the text to render the mnemonic as. The -# mnemonic is xxxMnemonic and the index of the character to underline is -# xxxDisplayedMnemonicIndex. -ColorChooser.hsvNameText=HSV -ColorChooser.hsvMnemonic=72 -ColorChooser.hsvHueText=Tonalit\u00E0 -ColorChooser.hsvSaturationText=Saturazione -ColorChooser.hsvValueText=Valore -ColorChooser.hsvTransparencyText=Trasparenza -ColorChooser.hslNameText=HSL -ColorChooser.hslMnemonic=76 -ColorChooser.hslHueText=Tonalit\u00E0 -ColorChooser.hslSaturationText=Saturazione -ColorChooser.hslLightnessText=Luminosit\u00E0 -ColorChooser.hslTransparencyText=Trasparenza -ColorChooser.rgbNameText=RGB -ColorChooser.rgbMnemonic=71 -ColorChooser.rgbRedText=Rosso -ColorChooser.rgbRedMnemonic=83 -ColorChooser.rgbGreenText=Verde -ColorChooser.rgbGreenMnemonic=68 -ColorChooser.rgbBlueText=Blu -ColorChooser.rgbBlueMnemonic=66 -ColorChooser.rgbAlphaText=Alfa -ColorChooser.rgbHexCodeText=Codice colori -ColorChooser.rgbHexCodeMnemonic=67 -ColorChooser.cmykNameText=CMYK -ColorChooser.cmykMnemonic=77 -ColorChooser.cmykCyanText=Ciano -ColorChooser.cmykMagentaText=Magenta -ColorChooser.cmykYellowText=Giallo -ColorChooser.cmykBlackText=Nero -ColorChooser.cmykAlphaText=Alfa - -############ OPTION PANE STRINGS ############# -# Mnemonic keys correspond to KeyEvent.VK_XXX constant -# We only define mnemonics for YES/NO, but for completeness you can -# define mnemonics for any of the buttons. -OptionPane.yesButtonText=S\u00EC -OptionPane.yesButtonMnemonic=83 -OptionPane.noButtonText=No -OptionPane.noButtonMnemonic=78 -OptionPane.okButtonText=OK -OptionPane.okButtonMnemonic=O -OptionPane.cancelButtonText=Annulla -OptionPane.cancelButtonMnemonic=A -OptionPane.titleText=Selezionare una opzione -# Title for the dialog for the showInputDialog methods. Only used if -# the developer uses one of the variants that doesn't take a title. -OptionPane.inputDialogTitle=Input -# Title for the dialog for the showMessageDialog methods. Only used if -# the developer uses one of the variants that doesn't take a title. -OptionPane.messageDialogTitle=Messaggio - -############ Printing Dialog Strings ############ -PrintingDialog.titleProgressText=Stampa in corso -PrintingDialog.titleAbortingText=Stampa in corso (operazione interrotta) - -PrintingDialog.contentInitialText=Stampa in corso... - -# The following string will be formatted by a MessageFormat -# and {0} will be replaced by page number being printed -PrintingDialog.contentProgressText=Pagina stampata {0}... - -PrintingDialog.contentAbortingText=Interruzione della stampa... - -PrintingDialog.abortButtonText=Interrompi -PrintingDialog.abortButtonMnemonic=78 -PrintingDialog.abortButtonDisplayedMnemonicIndex=0 -PrintingDialog.abortButtonToolTipText=Interrompi la stampa - -############ Internal Frame Strings ############ -InternalFrame.iconButtonToolTip=Riduci a icona -InternalFrame.maxButtonToolTip=Ingrandisci -InternalFrame.restoreButtonToolTip=Ripristina -InternalFrame.closeButtonToolTip=Chiudi - -############ Internal Frame Title Pane Strings ############ -InternalFrameTitlePane.restoreButtonText=Ripristina -InternalFrameTitlePane.moveButtonText=Sposta -InternalFrameTitlePane.sizeButtonText=Dimensioni -InternalFrameTitlePane.minimizeButtonText=Riduci a icona -InternalFrameTitlePane.maximizeButtonText=Ingrandisci -InternalFrameTitlePane.closeButtonText=Chiudi - -############ Text strings ############# -# Used for html forms -FormView.submitButtonText=Sottometti query -FormView.resetButtonText=Reimposta -FormView.browseFileButtonText=Sfoglia... - -############ Abstract Document Strings ############ -AbstractDocument.styleChangeText=modifica di stile -AbstractDocument.additionText=aggiunta -AbstractDocument.deletionText=eliminazione -AbstractDocument.undoText=Annulla -AbstractDocument.redoText=Ripeti - -############ Abstract Button Strings ############ -AbstractButton.clickText=fare clic - -############ Abstract Undoable Edit Strings ############ -AbstractUndoableEdit.undoText=Annulla -AbstractUndoableEdit.redoText=Ripeti - -############ Combo Box Strings ############ -ComboBox.togglePopupText=togglePopup - -############ Progress Monitor Strings ############ -ProgressMonitor.progressText=Avanzamento... - -############ Split Pane Strings ############ -SplitPane.leftButtonText=tasto sinistro -SplitPane.rightButtonText=tasto destro -# Used for Isindex -IsindexView.prompt=Questo \u00E8 un indice di ricerca. Immettere le parole chiave: - -############ InternalFrameTitlePane Strings ############ -InternalFrameTitlePane.iconifyButtonAccessibleName=Riduci a icona -InternalFrameTitlePane.maximizeButtonAccessibleName=Ingrandisci -InternalFrameTitlePane.closeButtonAccessibleName=Chiudi - +# This properties file is used to create a PropertyResourceBundle +# It contains Locale specific strings used in Swing +# Currently, the following components need this for support: +# +# ColorChooser +# FileChooser +# OptionPane +# +# When this file is read in, the strings are put into the +# defaults table. This is an implementation detail of the current +# workings of Swing. DO NOT DEPEND ON THIS. +# This may change in future versions of Swing as we improve localization +# support. +# +# MNEMONIC NOTE: +# Many of strings in this file are used by widgets that have a +# mnemonic, for example: +# ColorChooser.rgbNameTextAndMnemonic=R&GB +# Indicates that the tab in the ColorChooser for RGB colors will have +# the text 'RGB', further the mnemonic character will be 'g' and that +# a decoration will be provided under the 'G'. This will typically +# look like: RGB +# - +# +# One important thing to remember is that the mnemonic MUST exist in +# the String, if it does not exist you should add text that makes it +# exist. This will typically take the form 'XXXX (M)' where M is the +# character for the mnemonic. +# +# @author Steve Wilson + +############ FILE CHOOSER STRINGS ############# +FileChooser.fileDescription.textAndMnemonic=File generico +FileChooser.directoryDescription.textAndMnemonic=Directory +FileChooser.newFolderError.textAndMnemonic=Errore durante la creazione della nuova cartella +FileChooser.newFolderErrorSeparator= : +FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=Impossibile creare la cartella +FileChooser.newFolderParentDoesntExist.textAndMnemonic=Impossibile creare la cartella.\n\nIl sistema non \u00E8 in grado di trovare il percorso specificato. +FileChooser.renameErrorTitle.textAndMnemonic=Errore durante la ridenominazione del file o della cartella +FileChooser.renameError.textAndMnemonic=Impossibile rinominare {0} +FileChooser.renameErrorFileExists.textAndMnemonic=Impossibile rinominare {0}: esiste gi\u00E0 un file con il nome specificato. Specificare un altro nome. +FileChooser.acceptAllFileFilter.textAndMnemonic=Tutti i file +FileChooser.cancelButton.textAndMnemonic=&Annulla +FileChooser.saveButton.textAndMnemonic=Sal&va +FileChooser.openButton.textAndMnemonic=A&pri +FileChooser.saveDialogTitle.textAndMnemonic=Salva +FileChooser.openDialogTitle.textAndMnemonic=Apri +FileChooser.updateButton.textAndMnemonic=A&ggiorna +FileChooser.helpButton.textAndMnemonic=?(&H) +FileChooser.directoryOpenButton.textAndMnemonic=&Apri + +# File Size Units +FileChooser.fileSizeKiloBytes={0} KB +FileChooser.fileSizeMegaBytes={0} MB +FileChooser.fileSizeGigaBytes={0} GB + +# These strings are platform dependent not look and feel dependent. +FileChooser.win32.newFolder=Nuova cartella +FileChooser.win32.newFolder.subsequent=Nuova cartella ({0}) +FileChooser.other.newFolder=NewFolder +FileChooser.other.newFolder.subsequent=NewFolder.{0} + + +## file chooser tooltips ### +FileChooser.cancelButtonToolTip.textAndMnemonic=Chiude la finestra di dialogo di selezione file +FileChooser.saveButtonToolTip.textAndMnemonic=Salva il file selezionato +FileChooser.openButtonToolTip.textAndMnemonic=Apre il file selezionato +FileChooser.updateButtonToolTip.textAndMnemonic=Aggiorna la lista directory +FileChooser.helpButtonToolTip.textAndMnemonic=Guida FileChooser +FileChooser.directoryOpenButtonToolTip.textAndMnemonic=Apre la directory selezionata + +FileChooser.filesListAccessibleName=Files List +FileChooser.filesDetailsAccessibleName=Files Details + +############ COLOR CHOOSER STRINGS ############# +ColorChooser.preview.textAndMnemonic=Anteprima +ColorChooser.ok.textAndMnemonic=OK +ColorChooser.cancel.textAndMnemonic=Annulla +ColorChooser.reset.textAndMnemonic=&Reimposta +ColorChooser.sample.textAndMnemonic=Testo di prova Testo di prova +ColorChooser.swatches.textAndMnemonic=Colori cam&pione +ColorChooser.swatchesRecent.textAndMnemonic=Recenti: +ColorChooser.hsv.textAndMnemonic=&HSV +ColorChooser.hsvHue.textAndMnemonic=Tonalit\u00E0 +ColorChooser.hsvSaturation.textAndMnemonic=Saturazione +ColorChooser.hsvValue.textAndMnemonic=Valore +ColorChooser.hsvTransparency.textAndMnemonic=Trasparenza +ColorChooser.hsl.textAndMnemonic=HS&L +ColorChooser.hslHue.textAndMnemonic=Tonalit\u00E0 +ColorChooser.hslSaturation.textAndMnemonic=Saturazione +ColorChooser.hslLightness.textAndMnemonic=Luminosit\u00E0 +ColorChooser.hslTransparency.textAndMnemonic=Trasparenza +ColorChooser.rgb.textAndMnemonic=R&GB +ColorChooser.rgbRed.textAndMnemonic=Ro&sso +ColorChooser.rgbGreen.textAndMnemonic=Ver&de +ColorChooser.rgbBlue.textAndMnemonic=&Blu +ColorChooser.rgbAlpha.textAndMnemonic=Alfa +ColorChooser.rgbHexCode.textAndMnemonic=&Codice colori +ColorChooser.cmyk.textAndMnemonic=C&MYK +ColorChooser.cmykCyan.textAndMnemonic=Ciano +ColorChooser.cmykMagenta.textAndMnemonic=Magenta +ColorChooser.cmykYellow.textAndMnemonic=Giallo +ColorChooser.cmykBlack.textAndMnemonic=Nero +ColorChooser.cmykAlpha.textAndMnemonic=Alfa + +############ OPTION PANE STRINGS ############# +# We only define mnemonics for YES/NO, but for completeness you can +# define mnemonics for any of the buttons. +OptionPane.yesButton.textAndMnemonic=S\u00EC(&S) +OptionPane.noButton.textAndMnemonic=&No +OptionPane.okButton.textAndMnemonic=&OK +OptionPane.cancelButton.textAndMnemonic=&Annulla +OptionPane.title.textAndMnemonic=Selezionare una opzione +# Title for the dialog for the showInputDialog methods. Only used if +# the developer uses one of the variants that doesn't take a title. +OptionPane.inputDialog.titleAndMnemonic=Input +# Title for the dialog for the showMessageDialog methods. Only used if +# the developer uses one of the variants that doesn't take a title. +OptionPane.messageDialog.titleAndMnemonic=Messaggio + +############ Printing Dialog Strings ############ +PrintingDialog.titleProgress.textAndMnemonic=Stampa in corso +PrintingDialog.titleAborting.textAndMnemonic=Stampa in corso (operazione interrotta) + +PrintingDialog.contentInitial.textAndMnemonic=Stampa in corso... + +# The following string will be formatted by a MessageFormat +# and {0} will be replaced by page number being printed +PrintingDialog.contentProgress.textAndMnemonic=Pagina stampata {0}... + +PrintingDialog.contentAborting.textAndMnemonic=Interruzione della stampa... + +PrintingDialog.abortButton.textAndMnemonic=I&nterrompi +PrintingDialog.abortButtonToolTip.textAndMnemonic=Interrompi la stampa + +############ Internal Frame Strings ############ +InternalFrame.iconButtonToolTip=Riduci a icona +InternalFrame.maxButtonToolTip=Ingrandisci +InternalFrame.restoreButtonToolTip=Ripristina +InternalFrame.closeButtonToolTip=Chiudi + +############ Internal Frame Title Pane Strings ############ +InternalFrameTitlePane.restoreButton.textAndMnemonic=Ripristina +InternalFrameTitlePane.moveButton.textAndMnemonic=Sposta +InternalFrameTitlePane.sizeButton.textAndMnemonic=Dimensioni +InternalFrameTitlePane.minimizeButton.textAndMnemonic=Riduci a icona +InternalFrameTitlePane.maximizeButton.textAndMnemonic=Ingrandisci +InternalFrameTitlePane.closeButton.textAndMnemonic=Chiudi + +############ Text strings ############# +# Used for html forms +FormView.submitButton.textAndMnemonic=Sottometti query +FormView.resetButton.textAndMnemonic=Reimposta +FormView.browseFileButton.textAndMnemonic=Sfoglia... + +############ Abstract Document Strings ############ +AbstractDocument.styleChange.textAndMnemonic=modifica di stile +AbstractDocument.addition.textAndMnemonic=aggiunta +AbstractDocument.deletion.textAndMnemonic=eliminazione +AbstractDocument.undo.textAndMnemonic=Annulla +AbstractDocument.redo.textAndMnemonic=Ripeti + +############ Abstract Button Strings ############ +AbstractButton.click.textAndMnemonic=fare clic + +############ Abstract Undoable Edit Strings ############ +AbstractUndoableEdit.undo.textAndMnemonic=Annulla +AbstractUndoableEdit.redo.textAndMnemonic=Ripeti + +############ Combo Box Strings ############ +ComboBox.togglePopup.textAndMnemonic=togglePopup + +############ Progress Monitor Strings ############ +ProgressMonitor.progress.textAndMnemonic=Avanzamento... + +############ Split Pane Strings ############ +SplitPane.leftButton.textAndMnemonic=tasto sinistro +SplitPane.rightButton.textAndMnemonic=tasto destro +# Used for Isindex +IsindexView.prompt=Questo \u00E8 un indice di ricerca. Immettere le parole chiave: + +############ InternalFrameTitlePane Strings ############ +InternalFrameTitlePane.iconifyButtonAccessibleName=Riduci a icona +InternalFrameTitlePane.maximizeButtonAccessibleName=Ingrandisci +InternalFrameTitlePane.closeButtonAccessibleName=Chiudi + diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ja.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ja.properties index 0630dbb1ab3..71d1e582e0b 100644 --- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ja.properties +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ja.properties @@ -1,229 +1,186 @@ -# This properties file is used to create a PropertyResourceBundle -# It contains Locale specific strings used in Swing -# Currently, the following components need this for support: -# -# ColorChooser -# FileChooser -# OptionPane -# -# When this file is read in, the strings are put into the -# defaults table. This is an implementation detail of the current -# workings of Swing. DO NOT DEPEND ON THIS. -# This may change in future versions of Swing as we improve localization -# support. -# -# MNEMONIC NOTE: -# Many of strings in this file are used by widgets that have a -# mnemonic, for example: -# ColorChooser.rgbNameText=RGB -# ColorChooser.rgbMnemonic=71 -# ColorChooser.rgbDisplayedMnemonicIndex=1 -# Indicates that the tab in the ColorChooser for RGB colors will have -# the text 'RGB', further the mnemonic character will be 'g' and that -# a decoration will be provided under the 'G'. This will typically -# look like: RGB -# - -# 71 corresponds to the decimal value of the VK constant defined -# in java/awt/KeyEvent.java. VK_G is defined as: -# -# public static final int VK_G = 0x47; -# -# 0x47 is a hex number and needs to be converted to decimal. -# A simple way to calculate this for a-z is to add 64 to the index of -# the letter in the alphabet. As 'a' is in the 1st letter the mnemonic -# for 'a' is 65, 'b' is 66... -# -# The xxDisplayedMnemonicIndex is used to indicate the index of the -# character that should be underlined in the String, with 0 -# corresponding to the first character in the String. -# -# One important thing to remember is that the mnemonic MUST exist in -# the String, if it does not exist you should add text that makes it -# exist. This will typically take the form 'XXXX (M)' where M is the -# character for the mnemonic. -# -# @author Steve Wilson - -############ FILE CHOOSER STRINGS ############# -FileChooser.fileDescriptionText=\u6C4E\u7528\u30D5\u30A1\u30A4\u30EB -FileChooser.directoryDescriptionText=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA -FileChooser.newFolderErrorText=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0\u306E\u4F5C\u6210\u30A8\u30E9\u30FC -FileChooser.newFolderErrorSeparator= : -FileChooser.newFolderParentDoesntExistTitleText=\u30D5\u30A9\u30EB\u30C0\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093 -FileChooser.newFolderParentDoesntExistText=\u30D5\u30A9\u30EB\u30C0\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3002\n\n\u6307\u5B9A\u3057\u305F\u30D1\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002 -FileChooser.renameErrorTitleText=\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30D5\u30A9\u30EB\u30C0\u306E\u540D\u524D\u5909\u66F4\u30A8\u30E9\u30FC -FileChooser.renameErrorText={0}\u306E\u540D\u524D\u3092\u5909\u66F4\u3067\u304D\u307E\u305B\u3093 -FileChooser.renameErrorFileExistsText={0}\u306E\u540D\u524D\u3092\u5909\u66F4\u3067\u304D\u307E\u305B\u3093: \u6307\u5B9A\u3057\u305F\u540D\u524D\u306E\u30D5\u30A1\u30A4\u30EB\u306F\u3059\u3067\u306B\u5B58\u5728\u3057\u307E\u3059\u3002\u5225\u306E\u30D5\u30A1\u30A4\u30EB\u540D\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002 -FileChooser.acceptAllFileFilterText=\u3059\u3079\u3066\u306E\u30D5\u30A1\u30A4\u30EB -FileChooser.cancelButtonText=\u53D6\u6D88 -FileChooser.cancelButtonMnemonic=67 -FileChooser.saveButtonText=\u4FDD\u5B58 -FileChooser.saveButtonMnemonic=83 -FileChooser.openButtonText=\u958B\u304F -FileChooser.openButtonMnemonic=79 -FileChooser.saveDialogTitleText=\u4FDD\u5B58 -FileChooser.openDialogTitleText=\u958B\u304F -FileChooser.updateButtonText=\u66F4\u65B0(U) -FileChooser.updateButtonMnemonic=85 -FileChooser.helpButtonText=\u30D8\u30EB\u30D7(H) -FileChooser.helpButtonMnemonic=72 -FileChooser.directoryOpenButtonText=\u958B\u304F(O) -FileChooser.directoryOpenButtonMnemonic=79 - -# File Size Units -FileChooser.fileSizeKiloBytes={0} KB -FileChooser.fileSizeMegaBytes={0} MB -FileChooser.fileSizeGigaBytes={0} GB - -# These strings are platform dependent not look and feel dependent. -FileChooser.win32.newFolder=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0 -FileChooser.win32.newFolder.subsequent=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0({0}) -FileChooser.other.newFolder=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0 -FileChooser.other.newFolder.subsequent=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0.{0} - - -## file chooser tooltips ### -FileChooser.cancelButtonToolTipText=\u30D5\u30A1\u30A4\u30EB\u30FB\u30C1\u30E5\u30FC\u30B6\u30FB\u30C0\u30A4\u30A2\u30ED\u30B0\u3092\u7D42\u4E86\u3057\u307E\u3059 -FileChooser.saveButtonToolTipText=\u9078\u629E\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u4FDD\u5B58\u3057\u307E\u3059 -FileChooser.openButtonToolTipText=\u9078\u629E\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u958B\u304D\u307E\u3059 -FileChooser.updateButtonToolTipText=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u30EA\u30B9\u30C8\u3092\u66F4\u65B0\u3057\u307E\u3059 -FileChooser.helpButtonToolTipText=FileChooser\u306E\u30D8\u30EB\u30D7\u3067\u3059 -FileChooser.directoryOpenButtonToolTipText=\u9078\u629E\u3057\u305F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u958B\u304D\u307E\u3059 - -FileChooser.filesListAccessibleName=Files List -FileChooser.filesDetailsAccessibleName=Files Details - -############ COLOR CHOOSER STRINGS ############# -ColorChooser.previewText=\u30D7\u30EC\u30D3\u30E5\u30FC -ColorChooser.okText=OK -ColorChooser.cancelText=\u53D6\u6D88 -ColorChooser.resetText=\u30EA\u30BB\u30C3\u30C8(R) -# VK_XXX constant for 'ColorChooser.resetText' button to make mnemonic -ColorChooser.resetMnemonic=82 -ColorChooser.sampleText=\u30B5\u30F3\u30D7\u30EB\u30FB\u30C6\u30AD\u30B9\u30C8 \u30B5\u30F3\u30D7\u30EB\u30FB\u30C6\u30AD\u30B9\u30C8 -ColorChooser.swatchesNameText=\u30B5\u30F3\u30D7\u30EB(S) -ColorChooser.swatchesMnemonic=83 -ColorChooser.swatchesRecentText=\u6700\u65B0: -# Each of the ColorChooser types can define a mnemonic, as a KeyEvent.VK_XXX -# constant, and an index into the text to render the mnemonic as. The -# mnemonic is xxxMnemonic and the index of the character to underline is -# xxxDisplayedMnemonicIndex. -ColorChooser.hsvNameText=HSV -ColorChooser.hsvMnemonic=72 -ColorChooser.hsvHueText=\u8272\u76F8 -ColorChooser.hsvSaturationText=\u5F69\u5EA6 -ColorChooser.hsvValueText=\u5024 -ColorChooser.hsvTransparencyText=\u900F\u660E\u5EA6 -ColorChooser.hslNameText=HSL -ColorChooser.hslMnemonic=76 -ColorChooser.hslHueText=\u8272\u76F8 -ColorChooser.hslSaturationText=\u5F69\u5EA6 -ColorChooser.hslLightnessText=\u660E\u5EA6 -ColorChooser.hslTransparencyText=\u900F\u660E\u5EA6 -ColorChooser.rgbNameText=RGB -ColorChooser.rgbMnemonic=71 -ColorChooser.rgbRedText=\u8D64 -ColorChooser.rgbRedMnemonic=68 -ColorChooser.rgbGreenText=\u7DD1 -ColorChooser.rgbGreenMnemonic=78 -ColorChooser.rgbBlueText=\u9752 -ColorChooser.rgbBlueMnemonic=66 -ColorChooser.rgbAlphaText=\u30A2\u30EB\u30D5\u30A1 -ColorChooser.rgbHexCodeText=\u8272\u30B3\u30FC\u30C9(C) -ColorChooser.rgbHexCodeMnemonic=67 -ColorChooser.cmykNameText=CMYK -ColorChooser.cmykMnemonic=77 -ColorChooser.cmykCyanText=\u30B7\u30A2\u30F3 -ColorChooser.cmykMagentaText=\u30DE\u30BC\u30F3\u30BF -ColorChooser.cmykYellowText=\u9EC4 -ColorChooser.cmykBlackText=\u9ED2 -ColorChooser.cmykAlphaText=\u30A2\u30EB\u30D5\u30A1 - -############ OPTION PANE STRINGS ############# -# Mnemonic keys correspond to KeyEvent.VK_XXX constant -# We only define mnemonics for YES/NO, but for completeness you can -# define mnemonics for any of the buttons. -OptionPane.yesButtonText=\u306F\u3044(Y) -OptionPane.yesButtonMnemonic=89 -OptionPane.noButtonText=\u3044\u3044\u3048(N) -OptionPane.noButtonMnemonic=78 -OptionPane.okButtonText=OK -OptionPane.okButtonMnemonic=O -OptionPane.cancelButtonText=\u53D6\u6D88 -OptionPane.cancelButtonMnemonic=0 -OptionPane.titleText=\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u9078\u629E -# Title for the dialog for the showInputDialog methods. Only used if -# the developer uses one of the variants that doesn't take a title. -OptionPane.inputDialogTitle=\u5165\u529B -# Title for the dialog for the showMessageDialog methods. Only used if -# the developer uses one of the variants that doesn't take a title. -OptionPane.messageDialogTitle=\u30E1\u30C3\u30BB\u30FC\u30B8 - -############ Printing Dialog Strings ############ -PrintingDialog.titleProgressText=\u5370\u5237\u3057\u3066\u3044\u307E\u3059 -PrintingDialog.titleAbortingText=\u5370\u5237\u3092\u4E2D\u6B62\u3057\u3066\u3044\u307E\u3059 - -PrintingDialog.contentInitialText=\u5370\u5237\u4E2D... - -# The following string will be formatted by a MessageFormat -# and {0} will be replaced by page number being printed -PrintingDialog.contentProgressText=\u30DA\u30FC\u30B8{0}\u3092\u5370\u5237\u3057\u307E\u3057\u305F... - -PrintingDialog.contentAbortingText=\u5370\u5237\u3092\u4E2D\u6B62\u3057\u3066\u3044\u307E\u3059... - -PrintingDialog.abortButtonText=\u4E2D\u6B62(A) -PrintingDialog.abortButtonMnemonic=65 -PrintingDialog.abortButtonDisplayedMnemonicIndex=0 -PrintingDialog.abortButtonToolTipText=\u5370\u5237\u306E\u4E2D\u6B62 - -############ Internal Frame Strings ############ -InternalFrame.iconButtonToolTip=\u6700\u5C0F\u5316 -InternalFrame.maxButtonToolTip=\u6700\u5927\u5316 -InternalFrame.restoreButtonToolTip=\u5FA9\u5143 -InternalFrame.closeButtonToolTip=\u9589\u3058\u308B - -############ Internal Frame Title Pane Strings ############ -InternalFrameTitlePane.restoreButtonText=\u5FA9\u5143 -InternalFrameTitlePane.moveButtonText=\u79FB\u52D5 -InternalFrameTitlePane.sizeButtonText=\u30B5\u30A4\u30BA -InternalFrameTitlePane.minimizeButtonText=\u6700\u5C0F\u5316 -InternalFrameTitlePane.maximizeButtonText=\u6700\u5927\u5316 -InternalFrameTitlePane.closeButtonText=\u9589\u3058\u308B - -############ Text strings ############# -# Used for html forms -FormView.submitButtonText=\u554F\u5408\u305B\u306E\u5B9F\u884C -FormView.resetButtonText=\u30EA\u30BB\u30C3\u30C8 -FormView.browseFileButtonText=\u53C2\u7167... - -############ Abstract Document Strings ############ -AbstractDocument.styleChangeText=\u30B9\u30BF\u30A4\u30EB\u5909\u66F4 -AbstractDocument.additionText=\u8FFD\u52A0 -AbstractDocument.deletionText=\u524A\u9664 -AbstractDocument.undoText=\u5143\u306B\u623B\u3059 -AbstractDocument.redoText=\u3084\u308A\u76F4\u3057 - -############ Abstract Button Strings ############ -AbstractButton.clickText=\u30AF\u30EA\u30C3\u30AF - -############ Abstract Undoable Edit Strings ############ -AbstractUndoableEdit.undoText=\u5143\u306B\u623B\u3059 -AbstractUndoableEdit.redoText=\u3084\u308A\u76F4\u3057 - -############ Combo Box Strings ############ -ComboBox.togglePopupText=\u30C8\u30B0\u30EB\u30FB\u30DD\u30C3\u30D7\u30A2\u30C3\u30D7 - -############ Progress Monitor Strings ############ -ProgressMonitor.progressText=\u9032\u884C\u4E2D... - -############ Split Pane Strings ############ -SplitPane.leftButtonText=\u5DE6\u30DC\u30BF\u30F3 -SplitPane.rightButtonText=\u53F3\u30DC\u30BF\u30F3 -# Used for Isindex -IsindexView.prompt=\u691C\u7D22\u7528\u306E\u7D22\u5F15\u3067\u3059\u3002\u691C\u7D22\u3059\u308B\u30AD\u30FC\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044: - -############ InternalFrameTitlePane Strings ############ -InternalFrameTitlePane.iconifyButtonAccessibleName=\u30A2\u30A4\u30B3\u30F3\u5316 -InternalFrameTitlePane.maximizeButtonAccessibleName=\u6700\u5927\u5316 -InternalFrameTitlePane.closeButtonAccessibleName=\u9589\u3058\u308B - +# This properties file is used to create a PropertyResourceBundle +# It contains Locale specific strings used in Swing +# Currently, the following components need this for support: +# +# ColorChooser +# FileChooser +# OptionPane +# +# When this file is read in, the strings are put into the +# defaults table. This is an implementation detail of the current +# workings of Swing. DO NOT DEPEND ON THIS. +# This may change in future versions of Swing as we improve localization +# support. +# +# MNEMONIC NOTE: +# Many of strings in this file are used by widgets that have a +# mnemonic, for example: +# ColorChooser.rgbNameTextAndMnemonic=R&GB +# Indicates that the tab in the ColorChooser for RGB colors will have +# the text 'RGB', further the mnemonic character will be 'g' and that +# a decoration will be provided under the 'G'. This will typically +# look like: RGB +# - +# +# One important thing to remember is that the mnemonic MUST exist in +# the String, if it does not exist you should add text that makes it +# exist. This will typically take the form 'XXXX (M)' where M is the +# character for the mnemonic. +# +# @author Steve Wilson + +############ FILE CHOOSER STRINGS ############# +FileChooser.fileDescription.textAndMnemonic=\u6C4E\u7528\u30D5\u30A1\u30A4\u30EB +FileChooser.directoryDescription.textAndMnemonic=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA +FileChooser.newFolderError.textAndMnemonic=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0\u306E\u4F5C\u6210\u30A8\u30E9\u30FC +FileChooser.newFolderErrorSeparator= : +FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=\u30D5\u30A9\u30EB\u30C0\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093 +FileChooser.newFolderParentDoesntExist.textAndMnemonic=\u30D5\u30A9\u30EB\u30C0\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3002\n\n\u6307\u5B9A\u3057\u305F\u30D1\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002 +FileChooser.renameErrorTitle.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30D5\u30A9\u30EB\u30C0\u306E\u540D\u524D\u5909\u66F4\u30A8\u30E9\u30FC +FileChooser.renameError.textAndMnemonic={0}\u306E\u540D\u524D\u3092\u5909\u66F4\u3067\u304D\u307E\u305B\u3093 +FileChooser.renameErrorFileExists.textAndMnemonic={0}\u306E\u540D\u524D\u3092\u5909\u66F4\u3067\u304D\u307E\u305B\u3093: \u6307\u5B9A\u3057\u305F\u540D\u524D\u306E\u30D5\u30A1\u30A4\u30EB\u306F\u3059\u3067\u306B\u5B58\u5728\u3057\u307E\u3059\u3002\u5225\u306E\u30D5\u30A1\u30A4\u30EB\u540D\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +FileChooser.acceptAllFileFilter.textAndMnemonic=\u3059\u3079\u3066\u306E\u30D5\u30A1\u30A4\u30EB +FileChooser.cancelButton.textAndMnemonic=\u53D6\u6D88(&C) +FileChooser.saveButton.textAndMnemonic=\u4FDD\u5B58(&S) +FileChooser.openButton.textAndMnemonic=\u958B\u304F(&O) +FileChooser.saveDialogTitle.textAndMnemonic=\u4FDD\u5B58 +FileChooser.openDialogTitle.textAndMnemonic=\u958B\u304F +FileChooser.updateButton.textAndMnemonic=\u66F4\u65B0(&U) +FileChooser.helpButton.textAndMnemonic=\u30D8\u30EB\u30D7(&H) +FileChooser.directoryOpenButton.textAndMnemonic=\u958B\u304F(&O) + +# File Size Units +FileChooser.fileSizeKiloBytes={0} KB +FileChooser.fileSizeMegaBytes={0} MB +FileChooser.fileSizeGigaBytes={0} GB + +# These strings are platform dependent not look and feel dependent. +FileChooser.win32.newFolder=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0 +FileChooser.win32.newFolder.subsequent=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0({0}) +FileChooser.other.newFolder=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0 +FileChooser.other.newFolder.subsequent=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0.{0} + + +## file chooser tooltips ### +FileChooser.cancelButtonToolTip.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u30FB\u30C1\u30E5\u30FC\u30B6\u30FB\u30C0\u30A4\u30A2\u30ED\u30B0\u3092\u7D42\u4E86\u3057\u307E\u3059 +FileChooser.saveButtonToolTip.textAndMnemonic=\u9078\u629E\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u4FDD\u5B58\u3057\u307E\u3059 +FileChooser.openButtonToolTip.textAndMnemonic=\u9078\u629E\u3057\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u958B\u304D\u307E\u3059 +FileChooser.updateButtonToolTip.textAndMnemonic=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u30EA\u30B9\u30C8\u3092\u66F4\u65B0\u3057\u307E\u3059 +FileChooser.helpButtonToolTip.textAndMnemonic=FileChooser\u306E\u30D8\u30EB\u30D7\u3067\u3059 +FileChooser.directoryOpenButtonToolTip.textAndMnemonic=\u9078\u629E\u3057\u305F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u958B\u304D\u307E\u3059 + +FileChooser.filesListAccessibleName=Files List +FileChooser.filesDetailsAccessibleName=Files Details + +############ COLOR CHOOSER STRINGS ############# +ColorChooser.preview.textAndMnemonic=\u30D7\u30EC\u30D3\u30E5\u30FC +ColorChooser.ok.textAndMnemonic=OK +ColorChooser.cancel.textAndMnemonic=\u53D6\u6D88 +ColorChooser.reset.textAndMnemonic=\u30EA\u30BB\u30C3\u30C8(&R) +ColorChooser.sample.textAndMnemonic=\u30B5\u30F3\u30D7\u30EB\u30FB\u30C6\u30AD\u30B9\u30C8 \u30B5\u30F3\u30D7\u30EB\u30FB\u30C6\u30AD\u30B9\u30C8 +ColorChooser.swatches.textAndMnemonic=\u30B5\u30F3\u30D7\u30EB(&S) +ColorChooser.swatchesRecent.textAndMnemonic=\u6700\u65B0: +ColorChooser.hsv.textAndMnemonic=&HSV +ColorChooser.hsvHue.textAndMnemonic=\u8272\u76F8 +ColorChooser.hsvSaturation.textAndMnemonic=\u5F69\u5EA6 +ColorChooser.hsvValue.textAndMnemonic=\u5024 +ColorChooser.hsvTransparency.textAndMnemonic=\u900F\u660E\u5EA6 +ColorChooser.hsl.textAndMnemonic=HS&L +ColorChooser.hslHue.textAndMnemonic=\u8272\u76F8 +ColorChooser.hslSaturation.textAndMnemonic=\u5F69\u5EA6 +ColorChooser.hslLightness.textAndMnemonic=\u660E\u5EA6 +ColorChooser.hslTransparency.textAndMnemonic=\u900F\u660E\u5EA6 +ColorChooser.rgb.textAndMnemonic=R&GB +ColorChooser.rgbRed.textAndMnemonic=\u8D64(&D) +ColorChooser.rgbGreen.textAndMnemonic=\u7DD1(&N) +ColorChooser.rgbBlue.textAndMnemonic=\u9752(&B) +ColorChooser.rgbAlpha.textAndMnemonic=\u30A2\u30EB\u30D5\u30A1 +ColorChooser.rgbHexCode.textAndMnemonic=\u8272\u30B3\u30FC\u30C9(&C) +ColorChooser.cmyk.textAndMnemonic=C&MYK +ColorChooser.cmykCyan.textAndMnemonic=\u30B7\u30A2\u30F3 +ColorChooser.cmykMagenta.textAndMnemonic=\u30DE\u30BC\u30F3\u30BF +ColorChooser.cmykYellow.textAndMnemonic=\u9EC4 +ColorChooser.cmykBlack.textAndMnemonic=\u9ED2 +ColorChooser.cmykAlpha.textAndMnemonic=\u30A2\u30EB\u30D5\u30A1 + +############ OPTION PANE STRINGS ############# +# We only define mnemonics for YES/NO, but for completeness you can +# define mnemonics for any of the buttons. +OptionPane.yesButton.textAndMnemonic=\u306F\u3044(&Y) +OptionPane.noButton.textAndMnemonic=\u3044\u3044\u3048(&N) +OptionPane.okButton.textAndMnemonic=&OK +OptionPane.cancelButton.textAndMnemonic=\u53D6\u6D88 +OptionPane.title.textAndMnemonic=\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u9078\u629E +# Title for the dialog for the showInputDialog methods. Only used if +# the developer uses one of the variants that doesn't take a title. +OptionPane.inputDialog.titleAndMnemonic=\u5165\u529B +# Title for the dialog for the showMessageDialog methods. Only used if +# the developer uses one of the variants that doesn't take a title. +OptionPane.messageDialog.titleAndMnemonic=\u30E1\u30C3\u30BB\u30FC\u30B8 + +############ Printing Dialog Strings ############ +PrintingDialog.titleProgress.textAndMnemonic=\u5370\u5237\u3057\u3066\u3044\u307E\u3059 +PrintingDialog.titleAborting.textAndMnemonic=\u5370\u5237\u3092\u4E2D\u6B62\u3057\u3066\u3044\u307E\u3059 + +PrintingDialog.contentInitial.textAndMnemonic=\u5370\u5237\u4E2D... + +# The following string will be formatted by a MessageFormat +# and {0} will be replaced by page number being printed +PrintingDialog.contentProgress.textAndMnemonic=\u30DA\u30FC\u30B8{0}\u3092\u5370\u5237\u3057\u307E\u3057\u305F... + +PrintingDialog.contentAborting.textAndMnemonic=\u5370\u5237\u3092\u4E2D\u6B62\u3057\u3066\u3044\u307E\u3059... + +PrintingDialog.abortButton.textAndMnemonic=\u4E2D\u6B62(&A) +PrintingDialog.abortButtonToolTip.textAndMnemonic=\u5370\u5237\u306E\u4E2D\u6B62 + +############ Internal Frame Strings ############ +InternalFrame.iconButtonToolTip=\u6700\u5C0F\u5316 +InternalFrame.maxButtonToolTip=\u6700\u5927\u5316 +InternalFrame.restoreButtonToolTip=\u5FA9\u5143 +InternalFrame.closeButtonToolTip=\u9589\u3058\u308B + +############ Internal Frame Title Pane Strings ############ +InternalFrameTitlePane.restoreButton.textAndMnemonic=\u5FA9\u5143 +InternalFrameTitlePane.moveButton.textAndMnemonic=\u79FB\u52D5 +InternalFrameTitlePane.sizeButton.textAndMnemonic=\u30B5\u30A4\u30BA +InternalFrameTitlePane.minimizeButton.textAndMnemonic=\u6700\u5C0F\u5316 +InternalFrameTitlePane.maximizeButton.textAndMnemonic=\u6700\u5927\u5316 +InternalFrameTitlePane.closeButton.textAndMnemonic=\u9589\u3058\u308B + +############ Text strings ############# +# Used for html forms +FormView.submitButton.textAndMnemonic=\u554F\u5408\u305B\u306E\u5B9F\u884C +FormView.resetButton.textAndMnemonic=\u30EA\u30BB\u30C3\u30C8 +FormView.browseFileButton.textAndMnemonic=\u53C2\u7167... + +############ Abstract Document Strings ############ +AbstractDocument.styleChange.textAndMnemonic=\u30B9\u30BF\u30A4\u30EB\u5909\u66F4 +AbstractDocument.addition.textAndMnemonic=\u8FFD\u52A0 +AbstractDocument.deletion.textAndMnemonic=\u524A\u9664 +AbstractDocument.undo.textAndMnemonic=\u5143\u306B\u623B\u3059 +AbstractDocument.redo.textAndMnemonic=\u3084\u308A\u76F4\u3057 + +############ Abstract Button Strings ############ +AbstractButton.click.textAndMnemonic=\u30AF\u30EA\u30C3\u30AF + +############ Abstract Undoable Edit Strings ############ +AbstractUndoableEdit.undo.textAndMnemonic=\u5143\u306B\u623B\u3059 +AbstractUndoableEdit.redo.textAndMnemonic=\u3084\u308A\u76F4\u3057 + +############ Combo Box Strings ############ +ComboBox.togglePopup.textAndMnemonic=\u30C8\u30B0\u30EB\u30FB\u30DD\u30C3\u30D7\u30A2\u30C3\u30D7 + +############ Progress Monitor Strings ############ +ProgressMonitor.progress.textAndMnemonic=\u9032\u884C\u4E2D... + +############ Split Pane Strings ############ +SplitPane.leftButton.textAndMnemonic=\u5DE6\u30DC\u30BF\u30F3 +SplitPane.rightButton.textAndMnemonic=\u53F3\u30DC\u30BF\u30F3 +# Used for Isindex +IsindexView.prompt=\u691C\u7D22\u7528\u306E\u7D22\u5F15\u3067\u3059\u3002\u691C\u7D22\u3059\u308B\u30AD\u30FC\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044: + +############ InternalFrameTitlePane Strings ############ +InternalFrameTitlePane.iconifyButtonAccessibleName=\u30A2\u30A4\u30B3\u30F3\u5316 +InternalFrameTitlePane.maximizeButtonAccessibleName=\u6700\u5927\u5316 +InternalFrameTitlePane.closeButtonAccessibleName=\u9589\u3058\u308B + diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties index 947319d0440..0a7e2acb9ed 100644 --- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties @@ -1,229 +1,186 @@ -# This properties file is used to create a PropertyResourceBundle -# It contains Locale specific strings used in Swing -# Currently, the following components need this for support: -# -# ColorChooser -# FileChooser -# OptionPane -# -# When this file is read in, the strings are put into the -# defaults table. This is an implementation detail of the current -# workings of Swing. DO NOT DEPEND ON THIS. -# This may change in future versions of Swing as we improve localization -# support. -# -# MNEMONIC NOTE: -# Many of strings in this file are used by widgets that have a -# mnemonic, for example: -# ColorChooser.rgbNameText=RGB -# ColorChooser.rgbMnemonic=71 -# ColorChooser.rgbDisplayedMnemonicIndex=1 -# Indicates that the tab in the ColorChooser for RGB colors will have -# the text 'RGB', further the mnemonic character will be 'g' and that -# a decoration will be provided under the 'G'. This will typically -# look like: RGB -# - -# 71 corresponds to the decimal value of the VK constant defined -# in java/awt/KeyEvent.java. VK_G is defined as: -# -# public static final int VK_G = 0x47; -# -# 0x47 is a hex number and needs to be converted to decimal. -# A simple way to calculate this for a-z is to add 64 to the index of -# the letter in the alphabet. As 'a' is in the 1st letter the mnemonic -# for 'a' is 65, 'b' is 66... -# -# The xxDisplayedMnemonicIndex is used to indicate the index of the -# character that should be underlined in the String, with 0 -# corresponding to the first character in the String. -# -# One important thing to remember is that the mnemonic MUST exist in -# the String, if it does not exist you should add text that makes it -# exist. This will typically take the form 'XXXX (M)' where M is the -# character for the mnemonic. -# -# @author Steve Wilson - -############ FILE CHOOSER STRINGS ############# -FileChooser.fileDescriptionText=\uC77C\uBC18 \uD30C\uC77C -FileChooser.directoryDescriptionText=\uB514\uB809\uD1A0\uB9AC -FileChooser.newFolderErrorText=\uC0C8 \uD3F4\uB354\uB97C \uC0DD\uC131\uD558\uB294 \uC911 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. -FileChooser.newFolderErrorSeparator= : -FileChooser.newFolderParentDoesntExistTitleText=\uD3F4\uB354\uB97C \uC0DD\uC131\uD560 \uC218 \uC5C6\uC74C -FileChooser.newFolderParentDoesntExistText=\uD3F4\uB354\uB97C \uC0DD\uC131\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.\n\n\uC2DC\uC2A4\uD15C\uC5D0\uC11C \uC9C0\uC815\uB41C \uACBD\uB85C\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. -FileChooser.renameErrorTitleText=\uD30C\uC77C \uB610\uB294 \uD3F4\uB354 \uC774\uB984 \uBC14\uAFB8\uB294 \uC911 \uC624\uB958 \uBC1C\uC0DD -FileChooser.renameErrorText={0}\uC758 \uC774\uB984\uC744 \uBC14\uAFC0 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. -FileChooser.renameErrorFileExistsText={0}\uC758 \uC774\uB984\uC744 \uBC14\uAFC0 \uC218 \uC5C6\uC74C: \uC9C0\uC815\uD55C \uC774\uB984\uC744 \uC0AC\uC6A9\uD558\uB294 \uD30C\uC77C\uC774 \uC874\uC7AC\uD569\uB2C8\uB2E4. \uB2E4\uB978 \uD30C\uC77C \uC774\uB984\uC744 \uC9C0\uC815\uD558\uC2ED\uC2DC\uC624. -FileChooser.acceptAllFileFilterText=\uBAA8\uB4E0 \uD30C\uC77C -FileChooser.cancelButtonText=\uCDE8\uC18C -FileChooser.cancelButtonMnemonic=67 -FileChooser.saveButtonText=\uC800\uC7A5 -FileChooser.saveButtonMnemonic=83 -FileChooser.openButtonText=\uC5F4\uAE30 -FileChooser.openButtonMnemonic=79 -FileChooser.saveDialogTitleText=\uC800\uC7A5 -FileChooser.openDialogTitleText=\uC5F4\uAE30 -FileChooser.updateButtonText=\uAC31\uC2E0(U) -FileChooser.updateButtonMnemonic=85 -FileChooser.helpButtonText=\uB3C4\uC6C0\uB9D0(H) -FileChooser.helpButtonMnemonic=72 -FileChooser.directoryOpenButtonText=\uC5F4\uAE30(O) -FileChooser.directoryOpenButtonMnemonic=79 - -# File Size Units -FileChooser.fileSizeKiloBytes={0} KB -FileChooser.fileSizeMegaBytes={0} MB -FileChooser.fileSizeGigaBytes={0} GB - -# These strings are platform dependent not look and feel dependent. -FileChooser.win32.newFolder=\uC0C8 \uD3F4\uB354 -FileChooser.win32.newFolder.subsequent=\uC0C8 \uD3F4\uB354({0}) -FileChooser.other.newFolder=NewFolder -FileChooser.other.newFolder.subsequent=NewFolder.{0} - - -## file chooser tooltips ### -FileChooser.cancelButtonToolTipText=\uD30C\uC77C \uC120\uD0DD\uAE30 \uB300\uD654\uC0C1\uC790 \uC911\uB2E8 -FileChooser.saveButtonToolTipText=\uC120\uD0DD\uB41C \uD30C\uC77C \uC800\uC7A5 -FileChooser.openButtonToolTipText=\uC120\uD0DD\uB41C \uD30C\uC77C \uC5F4\uAE30 -FileChooser.updateButtonToolTipText=\uB514\uB809\uD1A0\uB9AC \uBAA9\uB85D \uAC31\uC2E0 -FileChooser.helpButtonToolTipText=FileChooser \uB3C4\uC6C0\uB9D0 -FileChooser.directoryOpenButtonToolTipText=\uC120\uD0DD\uB41C \uB514\uB809\uD1A0\uB9AC \uC5F4\uAE30 - -FileChooser.filesListAccessibleName=Files List -FileChooser.filesDetailsAccessibleName=Files Details - -############ COLOR CHOOSER STRINGS ############# -ColorChooser.previewText=\uBBF8\uB9AC\uBCF4\uAE30 -ColorChooser.okText=\uD655\uC778 -ColorChooser.cancelText=\uCDE8\uC18C -ColorChooser.resetText=\uC7AC\uC124\uC815(R) -# VK_XXX constant for 'ColorChooser.resetText' button to make mnemonic -ColorChooser.resetMnemonic=82 -ColorChooser.sampleText=\uC0D8\uD50C \uD14D\uC2A4\uD2B8 \uC0D8\uD50C \uD14D\uC2A4\uD2B8 -ColorChooser.swatchesNameText=\uACAC\uBCF8(S) -ColorChooser.swatchesMnemonic=83 -ColorChooser.swatchesRecentText=\uCD5C\uADFC \uBAA9\uB85D: -# Each of the ColorChooser types can define a mnemonic, as a KeyEvent.VK_XXX -# constant, and an index into the text to render the mnemonic as. The -# mnemonic is xxxMnemonic and the index of the character to underline is -# xxxDisplayedMnemonicIndex. -ColorChooser.hsvNameText=HSV -ColorChooser.hsvMnemonic=72 -ColorChooser.hsvHueText=\uC0C9\uC870 -ColorChooser.hsvSaturationText=\uCC44\uB3C4 -ColorChooser.hsvValueText=\uAC12 -ColorChooser.hsvTransparencyText=\uD22C\uBA85 -ColorChooser.hslNameText=HSL -ColorChooser.hslMnemonic=76 -ColorChooser.hslHueText=\uC0C9\uC870 -ColorChooser.hslSaturationText=\uCC44\uB3C4 -ColorChooser.hslLightnessText=\uBC1D\uAE30 -ColorChooser.hslTransparencyText=\uD22C\uBA85 -ColorChooser.rgbNameText=RGB -ColorChooser.rgbMnemonic=71 -ColorChooser.rgbRedText=\uBE68\uAC04\uC0C9 -ColorChooser.rgbRedMnemonic=68 -ColorChooser.rgbGreenText=\uB179\uC0C9 -ColorChooser.rgbGreenMnemonic=78 -ColorChooser.rgbBlueText=\uD30C\uB780\uC0C9 -ColorChooser.rgbBlueMnemonic=66 -ColorChooser.rgbAlphaText=\uC54C\uD30C -ColorChooser.rgbHexCodeText=\uC0C9\uC0C1 \uCF54\uB4DC(C) -ColorChooser.rgbHexCodeMnemonic=67 -ColorChooser.cmykNameText=CMYK -ColorChooser.cmykMnemonic=77 -ColorChooser.cmykCyanText=\uCCAD\uB85D\uC0C9 -ColorChooser.cmykMagentaText=\uC9C4\uD64D\uC0C9 -ColorChooser.cmykYellowText=\uB178\uB780\uC0C9 -ColorChooser.cmykBlackText=\uAC80\uC815\uC0C9 -ColorChooser.cmykAlphaText=\uC54C\uD30C - -############ OPTION PANE STRINGS ############# -# Mnemonic keys correspond to KeyEvent.VK_XXX constant -# We only define mnemonics for YES/NO, but for completeness you can -# define mnemonics for any of the buttons. -OptionPane.yesButtonText=\uC608(Y) -OptionPane.yesButtonMnemonic=89 -OptionPane.noButtonText=\uC544\uB2C8\uC624(N) -OptionPane.noButtonMnemonic=78 -OptionPane.okButtonText=\uD655\uC778 -OptionPane.okButtonMnemonic=O -OptionPane.cancelButtonText=\uCDE8\uC18C -OptionPane.cancelButtonMnemonic=0 -OptionPane.titleText=\uC635\uC158 \uC120\uD0DD -# Title for the dialog for the showInputDialog methods. Only used if -# the developer uses one of the variants that doesn't take a title. -OptionPane.inputDialogTitle=\uC785\uB825 -# Title for the dialog for the showMessageDialog methods. Only used if -# the developer uses one of the variants that doesn't take a title. -OptionPane.messageDialogTitle=\uBA54\uC2DC\uC9C0 - -############ Printing Dialog Strings ############ -PrintingDialog.titleProgressText=\uC778\uC1C4 -PrintingDialog.titleAbortingText=\uC778\uC1C4(\uC911\uB2E8 \uC911) - -PrintingDialog.contentInitialText=\uC778\uC1C4 \uC9C4\uD589 \uC911... - -# The following string will be formatted by a MessageFormat -# and {0} will be replaced by page number being printed -PrintingDialog.contentProgressText=\uC778\uC1C4\uB41C \uD398\uC774\uC9C0 {0}... - -PrintingDialog.contentAbortingText=\uC778\uC1C4 \uC911\uB2E8 \uC911... - -PrintingDialog.abortButtonText=\uC911\uB2E8(A) -PrintingDialog.abortButtonMnemonic=65 -PrintingDialog.abortButtonDisplayedMnemonicIndex=0 -PrintingDialog.abortButtonToolTipText=\uC778\uC1C4 \uC911\uB2E8 - -############ Internal Frame Strings ############ -InternalFrame.iconButtonToolTip=\uCD5C\uC18C\uD654 -InternalFrame.maxButtonToolTip=\uCD5C\uB300\uD654 -InternalFrame.restoreButtonToolTip=\uBCF5\uC6D0 -InternalFrame.closeButtonToolTip=\uB2EB\uAE30 - -############ Internal Frame Title Pane Strings ############ -InternalFrameTitlePane.restoreButtonText=\uBCF5\uC6D0 -InternalFrameTitlePane.moveButtonText=\uC774\uB3D9 -InternalFrameTitlePane.sizeButtonText=\uD06C\uAE30 -InternalFrameTitlePane.minimizeButtonText=\uCD5C\uC18C\uD654 -InternalFrameTitlePane.maximizeButtonText=\uCD5C\uB300\uD654 -InternalFrameTitlePane.closeButtonText=\uB2EB\uAE30 - -############ Text strings ############# -# Used for html forms -FormView.submitButtonText=\uC9C8\uC758 \uC81C\uCD9C -FormView.resetButtonText=\uC7AC\uC124\uC815 -FormView.browseFileButtonText=\uCC3E\uC544\uBCF4\uAE30... - -############ Abstract Document Strings ############ -AbstractDocument.styleChangeText=\uC2A4\uD0C0\uC77C \uBCC0\uACBD -AbstractDocument.additionText=\uCD94\uAC00 -AbstractDocument.deletionText=\uC0AD\uC81C -AbstractDocument.undoText=\uC2E4\uD589 \uCDE8\uC18C -AbstractDocument.redoText=\uC7AC\uC2E4\uD589 - -############ Abstract Button Strings ############ -AbstractButton.clickText=\uB204\uB974\uAE30 - -############ Abstract Undoable Edit Strings ############ -AbstractUndoableEdit.undoText=\uC2E4\uD589 \uCDE8\uC18C -AbstractUndoableEdit.redoText=\uC7AC\uC2E4\uD589 - -############ Combo Box Strings ############ -ComboBox.togglePopupText=togglePopup - -############ Progress Monitor Strings ############ -ProgressMonitor.progressText=\uC9C4\uD589... - -############ Split Pane Strings ############ -SplitPane.leftButtonText=\uC67C\uCABD \uB2E8\uCD94 -SplitPane.rightButtonText=\uC624\uB978\uCABD \uB2E8\uCD94 -# Used for Isindex -IsindexView.prompt=\uB2E4\uC74C\uC740 \uAC80\uC0C9 \uAC00\uB2A5\uD55C \uC778\uB371\uC2A4\uC785\uB2C8\uB2E4. \uAC80\uC0C9 \uD0A4\uC6CC\uB4DC \uC785\uB825: - -############ InternalFrameTitlePane Strings ############ -InternalFrameTitlePane.iconifyButtonAccessibleName=\uC544\uC774\uCF58\uD654 -InternalFrameTitlePane.maximizeButtonAccessibleName=\uCD5C\uB300\uD654 -InternalFrameTitlePane.closeButtonAccessibleName=\uB2EB\uAE30 - +# This properties file is used to create a PropertyResourceBundle +# It contains Locale specific strings used in Swing +# Currently, the following components need this for support: +# +# ColorChooser +# FileChooser +# OptionPane +# +# When this file is read in, the strings are put into the +# defaults table. This is an implementation detail of the current +# workings of Swing. DO NOT DEPEND ON THIS. +# This may change in future versions of Swing as we improve localization +# support. +# +# MNEMONIC NOTE: +# Many of strings in this file are used by widgets that have a +# mnemonic, for example: +# ColorChooser.rgbNameTextAndMnemonic=R&GB +# Indicates that the tab in the ColorChooser for RGB colors will have +# the text 'RGB', further the mnemonic character will be 'g' and that +# a decoration will be provided under the 'G'. This will typically +# look like: RGB +# - +# +# One important thing to remember is that the mnemonic MUST exist in +# the String, if it does not exist you should add text that makes it +# exist. This will typically take the form 'XXXX (M)' where M is the +# character for the mnemonic. +# +# @author Steve Wilson + +############ FILE CHOOSER STRINGS ############# +FileChooser.fileDescription.textAndMnemonic=\uC77C\uBC18 \uD30C\uC77C +FileChooser.directoryDescription.textAndMnemonic=\uB514\uB809\uD1A0\uB9AC +FileChooser.newFolderError.textAndMnemonic=\uC0C8 \uD3F4\uB354\uB97C \uC0DD\uC131\uD558\uB294 \uC911 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. +FileChooser.newFolderErrorSeparator= : +FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=\uD3F4\uB354\uB97C \uC0DD\uC131\uD560 \uC218 \uC5C6\uC74C +FileChooser.newFolderParentDoesntExist.textAndMnemonic=\uD3F4\uB354\uB97C \uC0DD\uC131\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.\n\n\uC2DC\uC2A4\uD15C\uC5D0\uC11C \uC9C0\uC815\uB41C \uACBD\uB85C\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. +FileChooser.renameErrorTitle.textAndMnemonic=\uD30C\uC77C \uB610\uB294 \uD3F4\uB354 \uC774\uB984 \uBC14\uAFB8\uB294 \uC911 \uC624\uB958 \uBC1C\uC0DD +FileChooser.renameError.textAndMnemonic={0}\uC758 \uC774\uB984\uC744 \uBC14\uAFC0 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. +FileChooser.renameErrorFileExists.textAndMnemonic={0}\uC758 \uC774\uB984\uC744 \uBC14\uAFC0 \uC218 \uC5C6\uC74C: \uC9C0\uC815\uD55C \uC774\uB984\uC744 \uC0AC\uC6A9\uD558\uB294 \uD30C\uC77C\uC774 \uC874\uC7AC\uD569\uB2C8\uB2E4. \uB2E4\uB978 \uD30C\uC77C \uC774\uB984\uC744 \uC9C0\uC815\uD558\uC2ED\uC2DC\uC624. +FileChooser.acceptAllFileFilter.textAndMnemonic=\uBAA8\uB4E0 \uD30C\uC77C +FileChooser.cancelButton.textAndMnemonic=\uCDE8\uC18C(&C) +FileChooser.saveButton.textAndMnemonic=\uC800\uC7A5(&S) +FileChooser.openButton.textAndMnemonic=\uC5F4\uAE30(&O) +FileChooser.saveDialogTitle.textAndMnemonic=\uC800\uC7A5 +FileChooser.openDialogTitle.textAndMnemonic=\uC5F4\uAE30 +FileChooser.updateButton.textAndMnemonic=\uAC31\uC2E0(&U) +FileChooser.helpButton.textAndMnemonic=\uB3C4\uC6C0\uB9D0(&H) +FileChooser.directoryOpenButton.textAndMnemonic=\uC5F4\uAE30(&O) + +# File Size Units +FileChooser.fileSizeKiloBytes={0} KB +FileChooser.fileSizeMegaBytes={0} MB +FileChooser.fileSizeGigaBytes={0} GB + +# These strings are platform dependent not look and feel dependent. +FileChooser.win32.newFolder=\uC0C8 \uD3F4\uB354 +FileChooser.win32.newFolder.subsequent=\uC0C8 \uD3F4\uB354({0}) +FileChooser.other.newFolder=NewFolder +FileChooser.other.newFolder.subsequent=NewFolder.{0} + + +## file chooser tooltips ### +FileChooser.cancelButtonToolTip.textAndMnemonic=\uD30C\uC77C \uC120\uD0DD\uAE30 \uB300\uD654\uC0C1\uC790 \uC911\uB2E8 +FileChooser.saveButtonToolTip.textAndMnemonic=\uC120\uD0DD\uB41C \uD30C\uC77C \uC800\uC7A5 +FileChooser.openButtonToolTip.textAndMnemonic=\uC120\uD0DD\uB41C \uD30C\uC77C \uC5F4\uAE30 +FileChooser.updateButtonToolTip.textAndMnemonic=\uB514\uB809\uD1A0\uB9AC \uBAA9\uB85D \uAC31\uC2E0 +FileChooser.helpButtonToolTip.textAndMnemonic=FileChooser \uB3C4\uC6C0\uB9D0 +FileChooser.directoryOpenButtonToolTip.textAndMnemonic=\uC120\uD0DD\uB41C \uB514\uB809\uD1A0\uB9AC \uC5F4\uAE30 + +FileChooser.filesListAccessibleName=Files List +FileChooser.filesDetailsAccessibleName=Files Details + +############ COLOR CHOOSER STRINGS ############# +ColorChooser.preview.textAndMnemonic=\uBBF8\uB9AC\uBCF4\uAE30 +ColorChooser.ok.textAndMnemonic=\uD655\uC778 +ColorChooser.cancel.textAndMnemonic=\uCDE8\uC18C +ColorChooser.reset.textAndMnemonic=\uC7AC\uC124\uC815(&R) +ColorChooser.sample.textAndMnemonic=\uC0D8\uD50C \uD14D\uC2A4\uD2B8 \uC0D8\uD50C \uD14D\uC2A4\uD2B8 +ColorChooser.swatches.textAndMnemonic=\uACAC\uBCF8(&S) +ColorChooser.swatchesRecent.textAndMnemonic=\uCD5C\uADFC \uBAA9\uB85D: +ColorChooser.hsv.textAndMnemonic=&HSV +ColorChooser.hsvHue.textAndMnemonic=\uC0C9\uC870 +ColorChooser.hsvSaturation.textAndMnemonic=\uCC44\uB3C4 +ColorChooser.hsvValue.textAndMnemonic=\uAC12 +ColorChooser.hsvTransparency.textAndMnemonic=\uD22C\uBA85 +ColorChooser.hsl.textAndMnemonic=HS&L +ColorChooser.hslHue.textAndMnemonic=\uC0C9\uC870 +ColorChooser.hslSaturation.textAndMnemonic=\uCC44\uB3C4 +ColorChooser.hslLightness.textAndMnemonic=\uBC1D\uAE30 +ColorChooser.hslTransparency.textAndMnemonic=\uD22C\uBA85 +ColorChooser.rgb.textAndMnemonic=R&GB +ColorChooser.rgbRed.textAndMnemonic=\uBE68\uAC04\uC0C9(&D) +ColorChooser.rgbGreen.textAndMnemonic=\uB179\uC0C9(&N) +ColorChooser.rgbBlue.textAndMnemonic=\uD30C\uB780\uC0C9(&B) +ColorChooser.rgbAlpha.textAndMnemonic=\uC54C\uD30C +ColorChooser.rgbHexCode.textAndMnemonic=\uC0C9\uC0C1 \uCF54\uB4DC(&C) +ColorChooser.cmyk.textAndMnemonic=C&MYK +ColorChooser.cmykCyan.textAndMnemonic=\uCCAD\uB85D\uC0C9 +ColorChooser.cmykMagenta.textAndMnemonic=\uC9C4\uD64D\uC0C9 +ColorChooser.cmykYellow.textAndMnemonic=\uB178\uB780\uC0C9 +ColorChooser.cmykBlack.textAndMnemonic=\uAC80\uC815\uC0C9 +ColorChooser.cmykAlpha.textAndMnemonic=\uC54C\uD30C + +############ OPTION PANE STRINGS ############# +# We only define mnemonics for YES/NO, but for completeness you can +# define mnemonics for any of the buttons. +OptionPane.yesButton.textAndMnemonic=\uC608(&Y) +OptionPane.noButton.textAndMnemonic=\uC544\uB2C8\uC624(&N) +OptionPane.okButton.textAndMnemonic=\uD655\uC778(&O) +OptionPane.cancelButton.textAndMnemonic=\uCDE8\uC18C +OptionPane.title.textAndMnemonic=\uC635\uC158 \uC120\uD0DD +# Title for the dialog for the showInputDialog methods. Only used if +# the developer uses one of the variants that doesn't take a title. +OptionPane.inputDialog.titleAndMnemonic=\uC785\uB825 +# Title for the dialog for the showMessageDialog methods. Only used if +# the developer uses one of the variants that doesn't take a title. +OptionPane.messageDialog.titleAndMnemonic=\uBA54\uC2DC\uC9C0 + +############ Printing Dialog Strings ############ +PrintingDialog.titleProgress.textAndMnemonic=\uC778\uC1C4 +PrintingDialog.titleAborting.textAndMnemonic=\uC778\uC1C4(\uC911\uB2E8 \uC911) + +PrintingDialog.contentInitial.textAndMnemonic=\uC778\uC1C4 \uC9C4\uD589 \uC911... + +# The following string will be formatted by a MessageFormat +# and {0} will be replaced by page number being printed +PrintingDialog.contentProgress.textAndMnemonic=\uC778\uC1C4\uB41C \uD398\uC774\uC9C0 {0}... + +PrintingDialog.contentAborting.textAndMnemonic=\uC778\uC1C4 \uC911\uB2E8 \uC911... + +PrintingDialog.abortButton.textAndMnemonic=\uC911\uB2E8(&A) +PrintingDialog.abortButtonToolTip.textAndMnemonic=\uC778\uC1C4 \uC911\uB2E8 + +############ Internal Frame Strings ############ +InternalFrame.iconButtonToolTip=\uCD5C\uC18C\uD654 +InternalFrame.maxButtonToolTip=\uCD5C\uB300\uD654 +InternalFrame.restoreButtonToolTip=\uBCF5\uC6D0 +InternalFrame.closeButtonToolTip=\uB2EB\uAE30 + +############ Internal Frame Title Pane Strings ############ +InternalFrameTitlePane.restoreButton.textAndMnemonic=\uBCF5\uC6D0 +InternalFrameTitlePane.moveButton.textAndMnemonic=\uC774\uB3D9 +InternalFrameTitlePane.sizeButton.textAndMnemonic=\uD06C\uAE30 +InternalFrameTitlePane.minimizeButton.textAndMnemonic=\uCD5C\uC18C\uD654 +InternalFrameTitlePane.maximizeButton.textAndMnemonic=\uCD5C\uB300\uD654 +InternalFrameTitlePane.closeButton.textAndMnemonic=\uB2EB\uAE30 + +############ Text strings ############# +# Used for html forms +FormView.submitButton.textAndMnemonic=\uC9C8\uC758 \uC81C\uCD9C +FormView.resetButton.textAndMnemonic=\uC7AC\uC124\uC815 +FormView.browseFileButton.textAndMnemonic=\uCC3E\uC544\uBCF4\uAE30... + +############ Abstract Document Strings ############ +AbstractDocument.styleChange.textAndMnemonic=\uC2A4\uD0C0\uC77C \uBCC0\uACBD +AbstractDocument.addition.textAndMnemonic=\uCD94\uAC00 +AbstractDocument.deletion.textAndMnemonic=\uC0AD\uC81C +AbstractDocument.undo.textAndMnemonic=\uC2E4\uD589 \uCDE8\uC18C +AbstractDocument.redo.textAndMnemonic=\uC7AC\uC2E4\uD589 + +############ Abstract Button Strings ############ +AbstractButton.click.textAndMnemonic=\uB204\uB974\uAE30 + +############ Abstract Undoable Edit Strings ############ +AbstractUndoableEdit.undo.textAndMnemonic=\uC2E4\uD589 \uCDE8\uC18C +AbstractUndoableEdit.redo.textAndMnemonic=\uC7AC\uC2E4\uD589 + +############ Combo Box Strings ############ +ComboBox.togglePopup.textAndMnemonic=togglePopup + +############ Progress Monitor Strings ############ +ProgressMonitor.progress.textAndMnemonic=\uC9C4\uD589... + +############ Split Pane Strings ############ +SplitPane.leftButton.textAndMnemonic=\uC67C\uCABD \uB2E8\uCD94 +SplitPane.rightButton.textAndMnemonic=\uC624\uB978\uCABD \uB2E8\uCD94 +# Used for Isindex +IsindexView.prompt=\uB2E4\uC74C\uC740 \uAC80\uC0C9 \uAC00\uB2A5\uD55C \uC778\uB371\uC2A4\uC785\uB2C8\uB2E4. \uAC80\uC0C9 \uD0A4\uC6CC\uB4DC \uC785\uB825: + +############ InternalFrameTitlePane Strings ############ +InternalFrameTitlePane.iconifyButtonAccessibleName=\uC544\uC774\uCF58\uD654 +InternalFrameTitlePane.maximizeButtonAccessibleName=\uCD5C\uB300\uD654 +InternalFrameTitlePane.closeButtonAccessibleName=\uB2EB\uAE30 + diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_pt_BR.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_pt_BR.properties index 81ec864482d..c90eeaafde2 100644 --- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_pt_BR.properties +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_pt_BR.properties @@ -1,229 +1,186 @@ -# This properties file is used to create a PropertyResourceBundle -# It contains Locale specific strings used in Swing -# Currently, the following components need this for support: -# -# ColorChooser -# FileChooser -# OptionPane -# -# When this file is read in, the strings are put into the -# defaults table. This is an implementation detail of the current -# workings of Swing. DO NOT DEPEND ON THIS. -# This may change in future versions of Swing as we improve localization -# support. -# -# MNEMONIC NOTE: -# Many of strings in this file are used by widgets that have a -# mnemonic, for example: -# ColorChooser.rgbNameText=RGB -# ColorChooser.rgbMnemonic=71 -# ColorChooser.rgbDisplayedMnemonicIndex=1 -# Indicates that the tab in the ColorChooser for RGB colors will have -# the text 'RGB', further the mnemonic character will be 'g' and that -# a decoration will be provided under the 'G'. This will typically -# look like: RGB -# - -# 71 corresponds to the decimal value of the VK constant defined -# in java/awt/KeyEvent.java. VK_G is defined as: -# -# public static final int VK_G = 0x47; -# -# 0x47 is a hex number and needs to be converted to decimal. -# A simple way to calculate this for a-z is to add 64 to the index of -# the letter in the alphabet. As 'a' is in the 1st letter the mnemonic -# for 'a' is 65, 'b' is 66... -# -# The xxDisplayedMnemonicIndex is used to indicate the index of the -# character that should be underlined in the String, with 0 -# corresponding to the first character in the String. -# -# One important thing to remember is that the mnemonic MUST exist in -# the String, if it does not exist you should add text that makes it -# exist. This will typically take the form 'XXXX (M)' where M is the -# character for the mnemonic. -# -# @author Steve Wilson - -############ FILE CHOOSER STRINGS ############# -FileChooser.fileDescriptionText=Arquivo Gen\u00E9rico -FileChooser.directoryDescriptionText=Diret\u00F3rio -FileChooser.newFolderErrorText=Erro ao criar nova pasta -FileChooser.newFolderErrorSeparator= : -FileChooser.newFolderParentDoesntExistTitleText=N\u00E3o \u00E9 poss\u00EDvel criar a pasta -FileChooser.newFolderParentDoesntExistText=N\u00E3o \u00E9 poss\u00EDvel criar a pasta.\n\nO sistema n\u00E3o pode localizar o caminho especificado. -FileChooser.renameErrorTitleText=Erro ao Renomear o Arquivo ou a Pasta -FileChooser.renameErrorText=N\u00E3o \u00E9 poss\u00EDvel renomear {0} -FileChooser.renameErrorFileExistsText=N\u00E3o \u00E9 poss\u00EDvel renomear {0}: Um arquivo com o nome especificado j\u00E1 existe. Especifique outro nome de arquivo. -FileChooser.acceptAllFileFilterText=Todos os Arquivos -FileChooser.cancelButtonText=Cancelar -FileChooser.cancelButtonMnemonic=67 -FileChooser.saveButtonText=Salvar -FileChooser.saveButtonMnemonic=83 -FileChooser.openButtonText=Abrir -FileChooser.openButtonMnemonic=66 -FileChooser.saveDialogTitleText=Salvar -FileChooser.openDialogTitleText=Abrir -FileChooser.updateButtonText=Atualizar -FileChooser.updateButtonMnemonic=85 -FileChooser.helpButtonText=Ajuda -FileChooser.helpButtonMnemonic=85 -FileChooser.directoryOpenButtonText=Abrir -FileChooser.directoryOpenButtonMnemonic=66 - -# File Size Units -FileChooser.fileSizeKiloBytes={0} KB -FileChooser.fileSizeMegaBytes={0} MB -FileChooser.fileSizeGigaBytes={0} GB - -# These strings are platform dependent not look and feel dependent. -FileChooser.win32.newFolder=Nova Pasta -FileChooser.win32.newFolder.subsequent=Nova Pasta ({0}) -FileChooser.other.newFolder=NewFolder -FileChooser.other.newFolder.subsequent=NewFolder.{0} - - -## file chooser tooltips ### -FileChooser.cancelButtonToolTipText=Abortar caixa de di\u00E1logo do seletor de arquivos -FileChooser.saveButtonToolTipText=Salvar arquivo selecionado -FileChooser.openButtonToolTipText=Abrir arquivo selecionado -FileChooser.updateButtonToolTipText=Atualizar lista de diret\u00F3rios -FileChooser.helpButtonToolTipText=Ajuda do FileChooser -FileChooser.directoryOpenButtonToolTipText=Abrir diret\u00F3rio selecionado - -FileChooser.filesListAccessibleName=Files List -FileChooser.filesDetailsAccessibleName=Files Details - -############ COLOR CHOOSER STRINGS ############# -ColorChooser.previewText=Visualizar -ColorChooser.okText=OK -ColorChooser.cancelText=Cancelar -ColorChooser.resetText=Redefinir -# VK_XXX constant for 'ColorChooser.resetText' button to make mnemonic -ColorChooser.resetMnemonic=82 -ColorChooser.sampleText=Texto de Amostra Texto de Amostra -ColorChooser.swatchesNameText=Amostras -ColorChooser.swatchesMnemonic=83 -ColorChooser.swatchesRecentText=Recente: -# Each of the ColorChooser types can define a mnemonic, as a KeyEvent.VK_XXX -# constant, and an index into the text to render the mnemonic as. The -# mnemonic is xxxMnemonic and the index of the character to underline is -# xxxDisplayedMnemonicIndex. -ColorChooser.hsvNameText=HSV -ColorChooser.hsvMnemonic=72 -ColorChooser.hsvHueText=Matiz -ColorChooser.hsvSaturationText=Satura\u00E7\u00E3o -ColorChooser.hsvValueText=Valor -ColorChooser.hsvTransparencyText=Transpar\u00EAncia -ColorChooser.hslNameText=HSL -ColorChooser.hslMnemonic=76 -ColorChooser.hslHueText=Matiz -ColorChooser.hslSaturationText=Satura\u00E7\u00E3o -ColorChooser.hslLightnessText=Clareza -ColorChooser.hslTransparencyText=Transpar\u00EAncia -ColorChooser.rgbNameText=RGB -ColorChooser.rgbMnemonic=71 -ColorChooser.rgbRedText=Vermelho -ColorChooser.rgbRedMnemonic=86 -ColorChooser.rgbGreenText=Verde -ColorChooser.rgbGreenMnemonic=86 -ColorChooser.rgbBlueText=Azul -ColorChooser.rgbBlueMnemonic=65 -ColorChooser.rgbAlphaText=Alfa -ColorChooser.rgbHexCodeText=C\u00F3digo da Cor -ColorChooser.rgbHexCodeMnemonic=67 -ColorChooser.cmykNameText=CMYK -ColorChooser.cmykMnemonic=77 -ColorChooser.cmykCyanText=Ciano -ColorChooser.cmykMagentaText=Magenta -ColorChooser.cmykYellowText=Amarelo -ColorChooser.cmykBlackText=Preto -ColorChooser.cmykAlphaText=Alfa - -############ OPTION PANE STRINGS ############# -# Mnemonic keys correspond to KeyEvent.VK_XXX constant -# We only define mnemonics for YES/NO, but for completeness you can -# define mnemonics for any of the buttons. -OptionPane.yesButtonText=Sim -OptionPane.yesButtonMnemonic=83 -OptionPane.noButtonText=N\u00E3o -OptionPane.noButtonMnemonic=78 -OptionPane.okButtonText=OK -OptionPane.okButtonMnemonic=O -OptionPane.cancelButtonText=Cancelar -OptionPane.cancelButtonMnemonic=C -OptionPane.titleText=Selecionar uma Op\u00E7\u00E3o -# Title for the dialog for the showInputDialog methods. Only used if -# the developer uses one of the variants that doesn't take a title. -OptionPane.inputDialogTitle=Entrada -# Title for the dialog for the showMessageDialog methods. Only used if -# the developer uses one of the variants that doesn't take a title. -OptionPane.messageDialogTitle=Mensagem - -############ Printing Dialog Strings ############ -PrintingDialog.titleProgressText=Impress\u00E3o -PrintingDialog.titleAbortingText=Impress\u00E3o (Abortando) - -PrintingDialog.contentInitialText=Impress\u00E3o em andamento... - -# The following string will be formatted by a MessageFormat -# and {0} will be replaced by page number being printed -PrintingDialog.contentProgressText=P\u00E1gina impressa {0}... - -PrintingDialog.contentAbortingText=Abortando impress\u00E3o... - -PrintingDialog.abortButtonText=Abortar -PrintingDialog.abortButtonMnemonic=65 -PrintingDialog.abortButtonDisplayedMnemonicIndex=0 -PrintingDialog.abortButtonToolTipText=Abortar Impress\u00E3o - -############ Internal Frame Strings ############ -InternalFrame.iconButtonToolTip=Minimizar -InternalFrame.maxButtonToolTip=Maximizar -InternalFrame.restoreButtonToolTip=Restaurar -InternalFrame.closeButtonToolTip=Fechar - -############ Internal Frame Title Pane Strings ############ -InternalFrameTitlePane.restoreButtonText=Restaurar -InternalFrameTitlePane.moveButtonText=Mover -InternalFrameTitlePane.sizeButtonText=Tamanho -InternalFrameTitlePane.minimizeButtonText=Minimizar -InternalFrameTitlePane.maximizeButtonText=Maximizar -InternalFrameTitlePane.closeButtonText=Fechar - -############ Text strings ############# -# Used for html forms -FormView.submitButtonText=Submeter Consulta -FormView.resetButtonText=Redefinir -FormView.browseFileButtonText=Procurar... - -############ Abstract Document Strings ############ -AbstractDocument.styleChangeText=altera\u00E7\u00E3o de estilo -AbstractDocument.additionText=adi\u00E7\u00E3o -AbstractDocument.deletionText=dele\u00E7\u00E3o -AbstractDocument.undoText=Desfazer -AbstractDocument.redoText=Refazer - -############ Abstract Button Strings ############ -AbstractButton.clickText=clicar - -############ Abstract Undoable Edit Strings ############ -AbstractUndoableEdit.undoText=Desfazer -AbstractUndoableEdit.redoText=Refazer - -############ Combo Box Strings ############ -ComboBox.togglePopupText=togglePopup - -############ Progress Monitor Strings ############ -ProgressMonitor.progressText=Progresso... - -############ Split Pane Strings ############ -SplitPane.leftButtonText=bot\u00E3o esquerdo -SplitPane.rightButtonText=bot\u00E3o direito -# Used for Isindex -IsindexView.prompt=Trata-se de um \u00EDndice pesquis\u00E1vel. Informe as palavras-chave de pesquisa: - -############ InternalFrameTitlePane Strings ############ -InternalFrameTitlePane.iconifyButtonAccessibleName=Iconify -InternalFrameTitlePane.maximizeButtonAccessibleName=Maximizar -InternalFrameTitlePane.closeButtonAccessibleName=Fechar - +# This properties file is used to create a PropertyResourceBundle +# It contains Locale specific strings used in Swing +# Currently, the following components need this for support: +# +# ColorChooser +# FileChooser +# OptionPane +# +# When this file is read in, the strings are put into the +# defaults table. This is an implementation detail of the current +# workings of Swing. DO NOT DEPEND ON THIS. +# This may change in future versions of Swing as we improve localization +# support. +# +# MNEMONIC NOTE: +# Many of strings in this file are used by widgets that have a +# mnemonic, for example: +# ColorChooser.rgbNameTextAndMnemonic=R&GB +# Indicates that the tab in the ColorChooser for RGB colors will have +# the text 'RGB', further the mnemonic character will be 'g' and that +# a decoration will be provided under the 'G'. This will typically +# look like: RGB +# - +# +# One important thing to remember is that the mnemonic MUST exist in +# the String, if it does not exist you should add text that makes it +# exist. This will typically take the form 'XXXX (M)' where M is the +# character for the mnemonic. +# +# @author Steve Wilson + +############ FILE CHOOSER STRINGS ############# +FileChooser.fileDescription.textAndMnemonic=Arquivo Gen\u00E9rico +FileChooser.directoryDescription.textAndMnemonic=Diret\u00F3rio +FileChooser.newFolderError.textAndMnemonic=Erro ao criar nova pasta +FileChooser.newFolderErrorSeparator= : +FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=N\u00E3o \u00E9 poss\u00EDvel criar a pasta +FileChooser.newFolderParentDoesntExist.textAndMnemonic=N\u00E3o \u00E9 poss\u00EDvel criar a pasta.\n\nO sistema n\u00E3o pode localizar o caminho especificado. +FileChooser.renameErrorTitle.textAndMnemonic=Erro ao Renomear o Arquivo ou a Pasta +FileChooser.renameError.textAndMnemonic=N\u00E3o \u00E9 poss\u00EDvel renomear {0} +FileChooser.renameErrorFileExists.textAndMnemonic=N\u00E3o \u00E9 poss\u00EDvel renomear {0}: Um arquivo com o nome especificado j\u00E1 existe. Especifique outro nome de arquivo. +FileChooser.acceptAllFileFilter.textAndMnemonic=Todos os Arquivos +FileChooser.cancelButton.textAndMnemonic=&Cancelar +FileChooser.saveButton.textAndMnemonic=&Salvar +FileChooser.openButton.textAndMnemonic=A&brir +FileChooser.saveDialogTitle.textAndMnemonic=Salvar +FileChooser.openDialogTitle.textAndMnemonic=Abrir +FileChooser.updateButton.textAndMnemonic=At&ualizar +FileChooser.helpButton.textAndMnemonic=Aj&uda +FileChooser.directoryOpenButton.textAndMnemonic=A&brir + +# File Size Units +FileChooser.fileSizeKiloBytes={0} KB +FileChooser.fileSizeMegaBytes={0} MB +FileChooser.fileSizeGigaBytes={0} GB + +# These strings are platform dependent not look and feel dependent. +FileChooser.win32.newFolder=Nova Pasta +FileChooser.win32.newFolder.subsequent=Nova Pasta ({0}) +FileChooser.other.newFolder=NewFolder +FileChooser.other.newFolder.subsequent=NewFolder.{0} + + +## file chooser tooltips ### +FileChooser.cancelButtonToolTip.textAndMnemonic=Abortar caixa de di\u00E1logo do seletor de arquivos +FileChooser.saveButtonToolTip.textAndMnemonic=Salvar arquivo selecionado +FileChooser.openButtonToolTip.textAndMnemonic=Abrir arquivo selecionado +FileChooser.updateButtonToolTip.textAndMnemonic=Atualizar lista de diret\u00F3rios +FileChooser.helpButtonToolTip.textAndMnemonic=Ajuda do FileChooser +FileChooser.directoryOpenButtonToolTip.textAndMnemonic=Abrir diret\u00F3rio selecionado + +FileChooser.filesListAccessibleName=Files List +FileChooser.filesDetailsAccessibleName=Files Details + +############ COLOR CHOOSER STRINGS ############# +ColorChooser.preview.textAndMnemonic=Visualizar +ColorChooser.ok.textAndMnemonic=OK +ColorChooser.cancel.textAndMnemonic=Cancelar +ColorChooser.reset.textAndMnemonic=&Redefinir +ColorChooser.sample.textAndMnemonic=Texto de Amostra Texto de Amostra +ColorChooser.swatches.textAndMnemonic=Amo&stras +ColorChooser.swatchesRecent.textAndMnemonic=Recente: +ColorChooser.hsv.textAndMnemonic=&HSV +ColorChooser.hsvHue.textAndMnemonic=Matiz +ColorChooser.hsvSaturation.textAndMnemonic=Satura\u00E7\u00E3o +ColorChooser.hsvValue.textAndMnemonic=Valor +ColorChooser.hsvTransparency.textAndMnemonic=Transpar\u00EAncia +ColorChooser.hsl.textAndMnemonic=HS&L +ColorChooser.hslHue.textAndMnemonic=Matiz +ColorChooser.hslSaturation.textAndMnemonic=Satura\u00E7\u00E3o +ColorChooser.hslLightness.textAndMnemonic=Clareza +ColorChooser.hslTransparency.textAndMnemonic=Transpar\u00EAncia +ColorChooser.rgb.textAndMnemonic=R&GB +ColorChooser.rgbRed.textAndMnemonic=&Vermelho +ColorChooser.rgbGreen.textAndMnemonic=&Verde +ColorChooser.rgbBlue.textAndMnemonic=&Azul +ColorChooser.rgbAlpha.textAndMnemonic=Alfa +ColorChooser.rgbHexCode.textAndMnemonic=C\u00F3digo da Cor(&C) +ColorChooser.cmyk.textAndMnemonic=C&MYK +ColorChooser.cmykCyan.textAndMnemonic=Ciano +ColorChooser.cmykMagenta.textAndMnemonic=Magenta +ColorChooser.cmykYellow.textAndMnemonic=Amarelo +ColorChooser.cmykBlack.textAndMnemonic=Preto +ColorChooser.cmykAlpha.textAndMnemonic=Alfa + +############ OPTION PANE STRINGS ############# +# We only define mnemonics for YES/NO, but for completeness you can +# define mnemonics for any of the buttons. +OptionPane.yesButton.textAndMnemonic=&Sim +OptionPane.noButton.textAndMnemonic=N\u00E3o(&N) +OptionPane.okButton.textAndMnemonic=&OK +OptionPane.cancelButton.textAndMnemonic=&Cancelar +OptionPane.title.textAndMnemonic=Selecionar uma Op\u00E7\u00E3o +# Title for the dialog for the showInputDialog methods. Only used if +# the developer uses one of the variants that doesn't take a title. +OptionPane.inputDialog.titleAndMnemonic=Entrada +# Title for the dialog for the showMessageDialog methods. Only used if +# the developer uses one of the variants that doesn't take a title. +OptionPane.messageDialog.titleAndMnemonic=Mensagem + +############ Printing Dialog Strings ############ +PrintingDialog.titleProgress.textAndMnemonic=Impress\u00E3o +PrintingDialog.titleAborting.textAndMnemonic=Impress\u00E3o (Abortando) + +PrintingDialog.contentInitial.textAndMnemonic=Impress\u00E3o em andamento... + +# The following string will be formatted by a MessageFormat +# and {0} will be replaced by page number being printed +PrintingDialog.contentProgress.textAndMnemonic=P\u00E1gina impressa {0}... + +PrintingDialog.contentAborting.textAndMnemonic=Abortando impress\u00E3o... + +PrintingDialog.abortButton.textAndMnemonic=&Abortar +PrintingDialog.abortButtonToolTip.textAndMnemonic=Abortar Impress\u00E3o + +############ Internal Frame Strings ############ +InternalFrame.iconButtonToolTip=Minimizar +InternalFrame.maxButtonToolTip=Maximizar +InternalFrame.restoreButtonToolTip=Restaurar +InternalFrame.closeButtonToolTip=Fechar + +############ Internal Frame Title Pane Strings ############ +InternalFrameTitlePane.restoreButton.textAndMnemonic=Restaurar +InternalFrameTitlePane.moveButton.textAndMnemonic=Mover +InternalFrameTitlePane.sizeButton.textAndMnemonic=Tamanho +InternalFrameTitlePane.minimizeButton.textAndMnemonic=Minimizar +InternalFrameTitlePane.maximizeButton.textAndMnemonic=Maximizar +InternalFrameTitlePane.closeButton.textAndMnemonic=Fechar + +############ Text strings ############# +# Used for html forms +FormView.submitButton.textAndMnemonic=Submeter Consulta +FormView.resetButton.textAndMnemonic=Redefinir +FormView.browseFileButton.textAndMnemonic=Procurar... + +############ Abstract Document Strings ############ +AbstractDocument.styleChange.textAndMnemonic=altera\u00E7\u00E3o de estilo +AbstractDocument.addition.textAndMnemonic=adi\u00E7\u00E3o +AbstractDocument.deletion.textAndMnemonic=dele\u00E7\u00E3o +AbstractDocument.undo.textAndMnemonic=Desfazer +AbstractDocument.redo.textAndMnemonic=Refazer + +############ Abstract Button Strings ############ +AbstractButton.click.textAndMnemonic=clicar + +############ Abstract Undoable Edit Strings ############ +AbstractUndoableEdit.undo.textAndMnemonic=Desfazer +AbstractUndoableEdit.redo.textAndMnemonic=Refazer + +############ Combo Box Strings ############ +ComboBox.togglePopup.textAndMnemonic=togglePopup + +############ Progress Monitor Strings ############ +ProgressMonitor.progress.textAndMnemonic=Progresso... + +############ Split Pane Strings ############ +SplitPane.leftButton.textAndMnemonic=bot\u00E3o esquerdo +SplitPane.rightButton.textAndMnemonic=bot\u00E3o direito +# Used for Isindex +IsindexView.prompt=Trata-se de um \u00EDndice pesquis\u00E1vel. Informe as palavras-chave de pesquisa: + +############ InternalFrameTitlePane Strings ############ +InternalFrameTitlePane.iconifyButtonAccessibleName=Iconify +InternalFrameTitlePane.maximizeButtonAccessibleName=Maximizar +InternalFrameTitlePane.closeButtonAccessibleName=Fechar + diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties index c74c0874b1a..195aaead4c9 100644 --- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties @@ -1,229 +1,186 @@ -# This properties file is used to create a PropertyResourceBundle -# It contains Locale specific strings used in Swing -# Currently, the following components need this for support: -# -# ColorChooser -# FileChooser -# OptionPane -# -# When this file is read in, the strings are put into the -# defaults table. This is an implementation detail of the current -# workings of Swing. DO NOT DEPEND ON THIS. -# This may change in future versions of Swing as we improve localization -# support. -# -# MNEMONIC NOTE: -# Many of strings in this file are used by widgets that have a -# mnemonic, for example: -# ColorChooser.rgbNameText=RGB -# ColorChooser.rgbMnemonic=71 -# ColorChooser.rgbDisplayedMnemonicIndex=1 -# Indicates that the tab in the ColorChooser for RGB colors will have -# the text 'RGB', further the mnemonic character will be 'g' and that -# a decoration will be provided under the 'G'. This will typically -# look like: RGB -# - -# 71 corresponds to the decimal value of the VK constant defined -# in java/awt/KeyEvent.java. VK_G is defined as: -# -# public static final int VK_G = 0x47; -# -# 0x47 is a hex number and needs to be converted to decimal. -# A simple way to calculate this for a-z is to add 64 to the index of -# the letter in the alphabet. As 'a' is in the 1st letter the mnemonic -# for 'a' is 65, 'b' is 66... -# -# The xxDisplayedMnemonicIndex is used to indicate the index of the -# character that should be underlined in the String, with 0 -# corresponding to the first character in the String. -# -# One important thing to remember is that the mnemonic MUST exist in -# the String, if it does not exist you should add text that makes it -# exist. This will typically take the form 'XXXX (M)' where M is the -# character for the mnemonic. -# -# @author Steve Wilson - -############ FILE CHOOSER STRINGS ############# -FileChooser.fileDescriptionText=Generisk fil -FileChooser.directoryDescriptionText=Katalog -FileChooser.newFolderErrorText=Fel uppstod n\u00E4r ny mapp skapades -FileChooser.newFolderErrorSeparator= : -FileChooser.newFolderParentDoesntExistTitleText=Kan inte skapa mappen -FileChooser.newFolderParentDoesntExistText=Kan inte skapa mappen.\n\nSystemet kan inte hitta angiven s\u00F6kv\u00E4g. -FileChooser.renameErrorTitleText=Ett fel intr\u00E4ffade vid f\u00F6rs\u00F6k att \u00E4ndra namn p\u00E5 fil eller mapp -FileChooser.renameErrorText=Kan inte namn\u00E4ndra {0} -FileChooser.renameErrorFileExistsText=Kan inte namn\u00E4ndra {0}: En fil med angivet namn finns redan. Ange ett annat filnamn. -FileChooser.acceptAllFileFilterText=Alla filer -FileChooser.cancelButtonText=Avbryt -FileChooser.cancelButtonMnemonic=65 -FileChooser.saveButtonText=Spara -FileChooser.saveButtonMnemonic=83 -FileChooser.openButtonText=\u00D6ppna -FileChooser.openButtonMnemonic=80 -FileChooser.saveDialogTitleText=Spara -FileChooser.openDialogTitleText=\u00D6ppna -FileChooser.updateButtonText=Uppdatera -FileChooser.updateButtonMnemonic=68 -FileChooser.helpButtonText=Hj\u00E4lp -FileChooser.helpButtonMnemonic=72 -FileChooser.directoryOpenButtonText=\u00D6ppna -FileChooser.directoryOpenButtonMnemonic=80 - -# File Size Units -FileChooser.fileSizeKiloBytes={0} KB -FileChooser.fileSizeMegaBytes={0} MB -FileChooser.fileSizeGigaBytes={0} GB - -# These strings are platform dependent not look and feel dependent. -FileChooser.win32.newFolder=Ny mapp -FileChooser.win32.newFolder.subsequent=Ny mapp ({0}) -FileChooser.other.newFolder=Ny mapp -FileChooser.other.newFolder.subsequent=Ny mapp.{0} - - -## file chooser tooltips ### -FileChooser.cancelButtonToolTipText=Avbryt filvalsdialogruta -FileChooser.saveButtonToolTipText=Spara vald fil -FileChooser.openButtonToolTipText=\u00D6ppna vald fil -FileChooser.updateButtonToolTipText=Uppdatera kataloglistan -FileChooser.helpButtonToolTipText=Hj\u00E4lp - Filv\u00E4ljare -FileChooser.directoryOpenButtonToolTipText=\u00D6ppna vald katalog - -FileChooser.filesListAccessibleName=Files List -FileChooser.filesDetailsAccessibleName=Files Details - -############ COLOR CHOOSER STRINGS ############# -ColorChooser.previewText=Granska -ColorChooser.okText=OK -ColorChooser.cancelText=Avbryt -ColorChooser.resetText=\u00C5terst\u00E4ll -# VK_XXX constant for 'ColorChooser.resetText' button to make mnemonic -ColorChooser.resetMnemonic=84 -ColorChooser.sampleText=Exempeltext Exempeltext -ColorChooser.swatchesNameText=Prov -ColorChooser.swatchesMnemonic=80 -ColorChooser.swatchesRecentText=Senaste: -# Each of the ColorChooser types can define a mnemonic, as a KeyEvent.VK_XXX -# constant, and an index into the text to render the mnemonic as. The -# mnemonic is xxxMnemonic and the index of the character to underline is -# xxxDisplayedMnemonicIndex. -ColorChooser.hsvNameText=HSV -ColorChooser.hsvMnemonic=72 -ColorChooser.hsvHueText=Nyans -ColorChooser.hsvSaturationText=M\u00E4ttnad -ColorChooser.hsvValueText=V\u00E4rde -ColorChooser.hsvTransparencyText=Transparens -ColorChooser.hslNameText=HSL -ColorChooser.hslMnemonic=76 -ColorChooser.hslHueText=Nyans -ColorChooser.hslSaturationText=M\u00E4ttnad -ColorChooser.hslLightnessText=Ljusstyrka -ColorChooser.hslTransparencyText=Transparens -ColorChooser.rgbNameText=RGB -ColorChooser.rgbMnemonic=71 -ColorChooser.rgbRedText=R\u00F6d -ColorChooser.rgbRedMnemonic=68 -ColorChooser.rgbGreenText=Gr\u00F6n -ColorChooser.rgbGreenMnemonic=78 -ColorChooser.rgbBlueText=Bl\u00E5 -ColorChooser.rgbBlueMnemonic=66 -ColorChooser.rgbAlphaText=Alfa -ColorChooser.rgbHexCodeText=F\u00E4rgkod -ColorChooser.rgbHexCodeMnemonic=70 -ColorChooser.cmykNameText=CMYK -ColorChooser.cmykMnemonic=77 -ColorChooser.cmykCyanText=Cyan -ColorChooser.cmykMagentaText=Magenta -ColorChooser.cmykYellowText=Gul -ColorChooser.cmykBlackText=Svart -ColorChooser.cmykAlphaText=Alfa - -############ OPTION PANE STRINGS ############# -# Mnemonic keys correspond to KeyEvent.VK_XXX constant -# We only define mnemonics for YES/NO, but for completeness you can -# define mnemonics for any of the buttons. -OptionPane.yesButtonText=Ja -OptionPane.yesButtonMnemonic=74 -OptionPane.noButtonText=Nej -OptionPane.noButtonMnemonic=78 -OptionPane.okButtonText=OK -OptionPane.okButtonMnemonic=O -OptionPane.cancelButtonText=Avbryt -OptionPane.cancelButtonMnemonic=A -OptionPane.titleText=V\u00E4lj ett alternativ -# Title for the dialog for the showInputDialog methods. Only used if -# the developer uses one of the variants that doesn't take a title. -OptionPane.inputDialogTitle=Indata -# Title for the dialog for the showMessageDialog methods. Only used if -# the developer uses one of the variants that doesn't take a title. -OptionPane.messageDialogTitle=Meddelande - -############ Printing Dialog Strings ############ -PrintingDialog.titleProgressText=Skriver ut -PrintingDialog.titleAbortingText=Skriver ut (avbryter) - -PrintingDialog.contentInitialText=Utskrift p\u00E5g\u00E5r... - -# The following string will be formatted by a MessageFormat -# and {0} will be replaced by page number being printed -PrintingDialog.contentProgressText=Utskriven sida {0}... - -PrintingDialog.contentAbortingText=Utskriften avbryts... - -PrintingDialog.abortButtonText=Avbryt -PrintingDialog.abortButtonMnemonic=65 -PrintingDialog.abortButtonDisplayedMnemonicIndex=0 -PrintingDialog.abortButtonToolTipText=Avbryt utskrift - -############ Internal Frame Strings ############ -InternalFrame.iconButtonToolTip=Minimera -InternalFrame.maxButtonToolTip=Maximera -InternalFrame.restoreButtonToolTip=\u00C5terst\u00E4ll -InternalFrame.closeButtonToolTip=St\u00E4ng - -############ Internal Frame Title Pane Strings ############ -InternalFrameTitlePane.restoreButtonText=\u00C5terst\u00E4ll -InternalFrameTitlePane.moveButtonText=Flytta -InternalFrameTitlePane.sizeButtonText=Storlek -InternalFrameTitlePane.minimizeButtonText=Minimera -InternalFrameTitlePane.maximizeButtonText=Maximera -InternalFrameTitlePane.closeButtonText=St\u00E4ng - -############ Text strings ############# -# Used for html forms -FormView.submitButtonText=Skicka fr\u00E5ga -FormView.resetButtonText=\u00C5terst\u00E4ll -FormView.browseFileButtonText=Bl\u00E4ddra... - -############ Abstract Document Strings ############ -AbstractDocument.styleChangeText=format\u00E4ndring -AbstractDocument.additionText=till\u00E4gg -AbstractDocument.deletionText=borttagning -AbstractDocument.undoText=\u00C5ngra -AbstractDocument.redoText=G\u00F6r om - -############ Abstract Button Strings ############ -AbstractButton.clickText=klicka - -############ Abstract Undoable Edit Strings ############ -AbstractUndoableEdit.undoText=\u00C5ngra -AbstractUndoableEdit.redoText=G\u00F6r om - -############ Combo Box Strings ############ -ComboBox.togglePopupText=v\u00E4xlaPopup - -############ Progress Monitor Strings ############ -ProgressMonitor.progressText=P\u00E5g\u00E5r... - -############ Split Pane Strings ############ -SplitPane.leftButtonText=v\u00E4nster knapp -SplitPane.rightButtonText=h\u00F6ger knapp -# Used for Isindex -IsindexView.prompt=Detta \u00E4r ett s\u00F6kbart index. Ange s\u00F6kord: - -############ InternalFrameTitlePane Strings ############ -InternalFrameTitlePane.iconifyButtonAccessibleName=Minimera -InternalFrameTitlePane.maximizeButtonAccessibleName=Maximera -InternalFrameTitlePane.closeButtonAccessibleName=St\u00E4ng - +# This properties file is used to create a PropertyResourceBundle +# It contains Locale specific strings used in Swing +# Currently, the following components need this for support: +# +# ColorChooser +# FileChooser +# OptionPane +# +# When this file is read in, the strings are put into the +# defaults table. This is an implementation detail of the current +# workings of Swing. DO NOT DEPEND ON THIS. +# This may change in future versions of Swing as we improve localization +# support. +# +# MNEMONIC NOTE: +# Many of strings in this file are used by widgets that have a +# mnemonic, for example: +# ColorChooser.rgbNameTextAndMnemonic=R&GB +# Indicates that the tab in the ColorChooser for RGB colors will have +# the text 'RGB', further the mnemonic character will be 'g' and that +# a decoration will be provided under the 'G'. This will typically +# look like: RGB +# - +# +# One important thing to remember is that the mnemonic MUST exist in +# the String, if it does not exist you should add text that makes it +# exist. This will typically take the form 'XXXX (M)' where M is the +# character for the mnemonic. +# +# @author Steve Wilson + +############ FILE CHOOSER STRINGS ############# +FileChooser.fileDescription.textAndMnemonic=Generisk fil +FileChooser.directoryDescription.textAndMnemonic=Katalog +FileChooser.newFolderError.textAndMnemonic=Fel uppstod n\u00E4r ny mapp skapades +FileChooser.newFolderErrorSeparator= : +FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=Kan inte skapa mappen +FileChooser.newFolderParentDoesntExist.textAndMnemonic=Kan inte skapa mappen.\n\nSystemet kan inte hitta angiven s\u00F6kv\u00E4g. +FileChooser.renameErrorTitle.textAndMnemonic=Ett fel intr\u00E4ffade vid f\u00F6rs\u00F6k att \u00E4ndra namn p\u00E5 fil eller mapp +FileChooser.renameError.textAndMnemonic=Kan inte namn\u00E4ndra {0} +FileChooser.renameErrorFileExists.textAndMnemonic=Kan inte namn\u00E4ndra {0}: En fil med angivet namn finns redan. Ange ett annat filnamn. +FileChooser.acceptAllFileFilter.textAndMnemonic=Alla filer +FileChooser.cancelButton.textAndMnemonic=&Avbryt +FileChooser.saveButton.textAndMnemonic=&Spara +FileChooser.openButton.textAndMnemonic=\u00D6ppna(&P) +FileChooser.saveDialogTitle.textAndMnemonic=Spara +FileChooser.openDialogTitle.textAndMnemonic=\u00D6ppna +FileChooser.updateButton.textAndMnemonic=Upp&datera +FileChooser.helpButton.textAndMnemonic=Hj\u00E4lp(&H) +FileChooser.directoryOpenButton.textAndMnemonic=\u00D6ppna(&P) + +# File Size Units +FileChooser.fileSizeKiloBytes={0} KB +FileChooser.fileSizeMegaBytes={0} MB +FileChooser.fileSizeGigaBytes={0} GB + +# These strings are platform dependent not look and feel dependent. +FileChooser.win32.newFolder=Ny mapp +FileChooser.win32.newFolder.subsequent=Ny mapp ({0}) +FileChooser.other.newFolder=Ny mapp +FileChooser.other.newFolder.subsequent=Ny mapp.{0} + + +## file chooser tooltips ### +FileChooser.cancelButtonToolTip.textAndMnemonic=Avbryt filvalsdialogruta +FileChooser.saveButtonToolTip.textAndMnemonic=Spara vald fil +FileChooser.openButtonToolTip.textAndMnemonic=\u00D6ppna vald fil +FileChooser.updateButtonToolTip.textAndMnemonic=Uppdatera kataloglistan +FileChooser.helpButtonToolTip.textAndMnemonic=Hj\u00E4lp - Filv\u00E4ljare +FileChooser.directoryOpenButtonToolTip.textAndMnemonic=\u00D6ppna vald katalog + +FileChooser.filesListAccessibleName=Files List +FileChooser.filesDetailsAccessibleName=Files Details + +############ COLOR CHOOSER STRINGS ############# +ColorChooser.preview.textAndMnemonic=Granska +ColorChooser.ok.textAndMnemonic=OK +ColorChooser.cancel.textAndMnemonic=Avbryt +ColorChooser.reset.textAndMnemonic=\u00C5terst\u00E4ll(&T) +ColorChooser.sample.textAndMnemonic=Exempeltext Exempeltext +ColorChooser.swatches.textAndMnemonic=&Prov +ColorChooser.swatchesRecent.textAndMnemonic=Senaste: +ColorChooser.hsv.textAndMnemonic=&HSV +ColorChooser.hsvHue.textAndMnemonic=Nyans +ColorChooser.hsvSaturation.textAndMnemonic=M\u00E4ttnad +ColorChooser.hsvValue.textAndMnemonic=V\u00E4rde +ColorChooser.hsvTransparency.textAndMnemonic=Transparens +ColorChooser.hsl.textAndMnemonic=HS&L +ColorChooser.hslHue.textAndMnemonic=Nyans +ColorChooser.hslSaturation.textAndMnemonic=M\u00E4ttnad +ColorChooser.hslLightness.textAndMnemonic=Ljusstyrka +ColorChooser.hslTransparency.textAndMnemonic=Transparens +ColorChooser.rgb.textAndMnemonic=R&GB +ColorChooser.rgbRed.textAndMnemonic=R\u00F6d(&D) +ColorChooser.rgbGreen.textAndMnemonic=Gr\u00F6n(&N) +ColorChooser.rgbBlue.textAndMnemonic=Bl\u00E5(&B) +ColorChooser.rgbAlpha.textAndMnemonic=Alfa +ColorChooser.rgbHexCode.textAndMnemonic=F\u00E4rgkod(&F) +ColorChooser.cmyk.textAndMnemonic=C&MYK +ColorChooser.cmykCyan.textAndMnemonic=Cyan +ColorChooser.cmykMagenta.textAndMnemonic=Magenta +ColorChooser.cmykYellow.textAndMnemonic=Gul +ColorChooser.cmykBlack.textAndMnemonic=Svart +ColorChooser.cmykAlpha.textAndMnemonic=Alfa + +############ OPTION PANE STRINGS ############# +# We only define mnemonics for YES/NO, but for completeness you can +# define mnemonics for any of the buttons. +OptionPane.yesButton.textAndMnemonic=&Ja +OptionPane.noButton.textAndMnemonic=&Nej +OptionPane.okButton.textAndMnemonic=&OK +OptionPane.cancelButton.textAndMnemonic=&Avbryt +OptionPane.title.textAndMnemonic=V\u00E4lj ett alternativ +# Title for the dialog for the showInputDialog methods. Only used if +# the developer uses one of the variants that doesn't take a title. +OptionPane.inputDialog.titleAndMnemonic=Indata +# Title for the dialog for the showMessageDialog methods. Only used if +# the developer uses one of the variants that doesn't take a title. +OptionPane.messageDialog.titleAndMnemonic=Meddelande + +############ Printing Dialog Strings ############ +PrintingDialog.titleProgress.textAndMnemonic=Skriver ut +PrintingDialog.titleAborting.textAndMnemonic=Skriver ut (avbryter) + +PrintingDialog.contentInitial.textAndMnemonic=Utskrift p\u00E5g\u00E5r... + +# The following string will be formatted by a MessageFormat +# and {0} will be replaced by page number being printed +PrintingDialog.contentProgress.textAndMnemonic=Utskriven sida {0}... + +PrintingDialog.contentAborting.textAndMnemonic=Utskriften avbryts... + +PrintingDialog.abortButton.textAndMnemonic=&Avbryt +PrintingDialog.abortButtonToolTip.textAndMnemonic=Avbryt utskrift + +############ Internal Frame Strings ############ +InternalFrame.iconButtonToolTip=Minimera +InternalFrame.maxButtonToolTip=Maximera +InternalFrame.restoreButtonToolTip=\u00C5terst\u00E4ll +InternalFrame.closeButtonToolTip=St\u00E4ng + +############ Internal Frame Title Pane Strings ############ +InternalFrameTitlePane.restoreButton.textAndMnemonic=\u00C5terst\u00E4ll +InternalFrameTitlePane.moveButton.textAndMnemonic=Flytta +InternalFrameTitlePane.sizeButton.textAndMnemonic=Storlek +InternalFrameTitlePane.minimizeButton.textAndMnemonic=Minimera +InternalFrameTitlePane.maximizeButton.textAndMnemonic=Maximera +InternalFrameTitlePane.closeButton.textAndMnemonic=St\u00E4ng + +############ Text strings ############# +# Used for html forms +FormView.submitButton.textAndMnemonic=Skicka fr\u00E5ga +FormView.resetButton.textAndMnemonic=\u00C5terst\u00E4ll +FormView.browseFileButton.textAndMnemonic=Bl\u00E4ddra... + +############ Abstract Document Strings ############ +AbstractDocument.styleChange.textAndMnemonic=format\u00E4ndring +AbstractDocument.addition.textAndMnemonic=till\u00E4gg +AbstractDocument.deletion.textAndMnemonic=borttagning +AbstractDocument.undo.textAndMnemonic=\u00C5ngra +AbstractDocument.redo.textAndMnemonic=G\u00F6r om + +############ Abstract Button Strings ############ +AbstractButton.click.textAndMnemonic=klicka + +############ Abstract Undoable Edit Strings ############ +AbstractUndoableEdit.undo.textAndMnemonic=\u00C5ngra +AbstractUndoableEdit.redo.textAndMnemonic=G\u00F6r om + +############ Combo Box Strings ############ +ComboBox.togglePopup.textAndMnemonic=v\u00E4xlaPopup + +############ Progress Monitor Strings ############ +ProgressMonitor.progress.textAndMnemonic=P\u00E5g\u00E5r... + +############ Split Pane Strings ############ +SplitPane.leftButton.textAndMnemonic=v\u00E4nster knapp +SplitPane.rightButton.textAndMnemonic=h\u00F6ger knapp +# Used for Isindex +IsindexView.prompt=Detta \u00E4r ett s\u00F6kbart index. Ange s\u00F6kord: + +############ InternalFrameTitlePane Strings ############ +InternalFrameTitlePane.iconifyButtonAccessibleName=Minimera +InternalFrameTitlePane.maximizeButtonAccessibleName=Maximera +InternalFrameTitlePane.closeButtonAccessibleName=St\u00E4ng + diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties index 01c83e396e5..1c6d27c1ed0 100644 --- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties @@ -1,229 +1,186 @@ -# This properties file is used to create a PropertyResourceBundle -# It contains Locale specific strings used in Swing -# Currently, the following components need this for support: -# -# ColorChooser -# FileChooser -# OptionPane -# -# When this file is read in, the strings are put into the -# defaults table. This is an implementation detail of the current -# workings of Swing. DO NOT DEPEND ON THIS. -# This may change in future versions of Swing as we improve localization -# support. -# -# MNEMONIC NOTE: -# Many of strings in this file are used by widgets that have a -# mnemonic, for example: -# ColorChooser.rgbNameText=RGB -# ColorChooser.rgbMnemonic=71 -# ColorChooser.rgbDisplayedMnemonicIndex=1 -# Indicates that the tab in the ColorChooser for RGB colors will have -# the text 'RGB', further the mnemonic character will be 'g' and that -# a decoration will be provided under the 'G'. This will typically -# look like: RGB -# - -# 71 corresponds to the decimal value of the VK constant defined -# in java/awt/KeyEvent.java. VK_G is defined as: -# -# public static final int VK_G = 0x47; -# -# 0x47 is a hex number and needs to be converted to decimal. -# A simple way to calculate this for a-z is to add 64 to the index of -# the letter in the alphabet. As 'a' is in the 1st letter the mnemonic -# for 'a' is 65, 'b' is 66... -# -# The xxDisplayedMnemonicIndex is used to indicate the index of the -# character that should be underlined in the String, with 0 -# corresponding to the first character in the String. -# -# One important thing to remember is that the mnemonic MUST exist in -# the String, if it does not exist you should add text that makes it -# exist. This will typically take the form 'XXXX (M)' where M is the -# character for the mnemonic. -# -# @author Steve Wilson - -############ FILE CHOOSER STRINGS ############# -FileChooser.fileDescriptionText=\u666E\u901A\u7684\u6587\u4EF6 -FileChooser.directoryDescriptionText=\u76EE\u5F55 -FileChooser.newFolderErrorText=\u521B\u5EFA\u65B0\u7684\u6587\u4EF6\u5939\u65F6\u51FA\u9519 -FileChooser.newFolderErrorSeparator= : -FileChooser.newFolderParentDoesntExistTitleText=\u65E0\u6CD5\u521B\u5EFA\u6587\u4EF6\u5939 -FileChooser.newFolderParentDoesntExistText=\u65E0\u6CD5\u521B\u5EFA\u6587\u4EF6\u5939\u3002\n\n\u7CFB\u7EDF\u627E\u4E0D\u5230\u6307\u5B9A\u7684\u8DEF\u5F84\u3002 -FileChooser.renameErrorTitleText=\u91CD\u547D\u540D\u6587\u4EF6\u6216\u6587\u4EF6\u5939\u65F6\u51FA\u9519 -FileChooser.renameErrorText=\u65E0\u6CD5\u91CD\u547D\u540D{0} -FileChooser.renameErrorFileExistsText=\u65E0\u6CD5\u91CD\u547D\u540D{0}: \u5DF2\u5B58\u5728\u5177\u6709\u6240\u6307\u5B9A\u540D\u79F0\u7684\u6587\u4EF6\u3002\u8BF7\u6307\u5B9A\u5176\u4ED6\u6587\u4EF6\u540D\u3002 -FileChooser.acceptAllFileFilterText=\u6240\u6709\u6587\u4EF6 -FileChooser.cancelButtonText=\u53D6\u6D88 -FileChooser.cancelButtonMnemonic=67 -FileChooser.saveButtonText=\u4FDD\u5B58 -FileChooser.saveButtonMnemonic=83 -FileChooser.openButtonText=\u6253\u5F00 -FileChooser.openButtonMnemonic=79 -FileChooser.saveDialogTitleText=\u4FDD\u5B58 -FileChooser.openDialogTitleText=\u6253\u5F00 -FileChooser.updateButtonText=\u66F4\u65B0(U) -FileChooser.updateButtonMnemonic=85 -FileChooser.helpButtonText=\u5E2E\u52A9(H) -FileChooser.helpButtonMnemonic=72 -FileChooser.directoryOpenButtonText=\u6253\u5F00(O) -FileChooser.directoryOpenButtonMnemonic=79 - -# File Size Units -FileChooser.fileSizeKiloBytes={0} KB -FileChooser.fileSizeMegaBytes={0} MB -FileChooser.fileSizeGigaBytes={0} GB - -# These strings are platform dependent not look and feel dependent. -FileChooser.win32.newFolder=\u65B0\u5EFA\u6587\u4EF6\u5939 -FileChooser.win32.newFolder.subsequent=\u65B0\u5EFA\u6587\u4EF6\u5939 ({0}) -FileChooser.other.newFolder=NewFolder -FileChooser.other.newFolder.subsequent=NewFolder.{0} - - -## file chooser tooltips ### -FileChooser.cancelButtonToolTipText=\u4E2D\u6B62\u6587\u4EF6\u9009\u62E9\u5668\u5BF9\u8BDD\u6846 -FileChooser.saveButtonToolTipText=\u4FDD\u5B58\u6240\u9009\u6587\u4EF6 -FileChooser.openButtonToolTipText=\u6253\u5F00\u6240\u9009\u6587\u4EF6 -FileChooser.updateButtonToolTipText=\u66F4\u65B0\u76EE\u5F55\u5217\u8868 -FileChooser.helpButtonToolTipText=FileChooser \u5E2E\u52A9 -FileChooser.directoryOpenButtonToolTipText=\u6253\u5F00\u9009\u62E9\u7684\u76EE\u5F55 - -FileChooser.filesListAccessibleName=Files List -FileChooser.filesDetailsAccessibleName=Files Details - -############ COLOR CHOOSER STRINGS ############# -ColorChooser.previewText=\u9884\u89C8 -ColorChooser.okText=\u786E\u5B9A -ColorChooser.cancelText=\u53D6\u6D88 -ColorChooser.resetText=\u91CD\u7F6E(R) -# VK_XXX constant for 'ColorChooser.resetText' button to make mnemonic -ColorChooser.resetMnemonic=82 -ColorChooser.sampleText=\u793A\u4F8B\u6587\u672C \u793A\u4F8B\u6587\u672C -ColorChooser.swatchesNameText=\u793A\u4F8B(S) -ColorChooser.swatchesMnemonic=83 -ColorChooser.swatchesRecentText=\u6700\u8FD1: -# Each of the ColorChooser types can define a mnemonic, as a KeyEvent.VK_XXX -# constant, and an index into the text to render the mnemonic as. The -# mnemonic is xxxMnemonic and the index of the character to underline is -# xxxDisplayedMnemonicIndex. -ColorChooser.hsvNameText=HSV -ColorChooser.hsvMnemonic=72 -ColorChooser.hsvHueText=\u8272\u8C03 -ColorChooser.hsvSaturationText=\u9971\u548C\u5EA6 -ColorChooser.hsvValueText=\u503C -ColorChooser.hsvTransparencyText=\u900F\u660E\u5EA6 -ColorChooser.hslNameText=HSL -ColorChooser.hslMnemonic=76 -ColorChooser.hslHueText=\u8272\u8C03 -ColorChooser.hslSaturationText=\u9971\u548C\u5EA6 -ColorChooser.hslLightnessText=\u4EAE\u5EA6 -ColorChooser.hslTransparencyText=\u900F\u660E\u5EA6 -ColorChooser.rgbNameText=RGB -ColorChooser.rgbMnemonic=71 -ColorChooser.rgbRedText=\u7EA2\u8272 -ColorChooser.rgbRedMnemonic=68 -ColorChooser.rgbGreenText=\u7EFF\u8272 -ColorChooser.rgbGreenMnemonic=78 -ColorChooser.rgbBlueText=\u84DD\u8272 -ColorChooser.rgbBlueMnemonic=66 -ColorChooser.rgbAlphaText=Alpha -ColorChooser.rgbHexCodeText=\u989C\u8272\u4EE3\u7801(C) -ColorChooser.rgbHexCodeMnemonic=67 -ColorChooser.cmykNameText=CMYK -ColorChooser.cmykMnemonic=77 -ColorChooser.cmykCyanText=\u9752\u8272 -ColorChooser.cmykMagentaText=\u7D2B\u7EA2\u8272 -ColorChooser.cmykYellowText=\u9EC4\u8272 -ColorChooser.cmykBlackText=\u9ED1\u8272 -ColorChooser.cmykAlphaText=Alpha - -############ OPTION PANE STRINGS ############# -# Mnemonic keys correspond to KeyEvent.VK_XXX constant -# We only define mnemonics for YES/NO, but for completeness you can -# define mnemonics for any of the buttons. -OptionPane.yesButtonText=\u662F(Y) -OptionPane.yesButtonMnemonic=89 -OptionPane.noButtonText=\u5426(N) -OptionPane.noButtonMnemonic=78 -OptionPane.okButtonText=\u786E\u5B9A -OptionPane.okButtonMnemonic=O -OptionPane.cancelButtonText=\u53D6\u6D88 -OptionPane.cancelButtonMnemonic=0 -OptionPane.titleText=\u9009\u62E9\u4E00\u4E2A\u9009\u9879 -# Title for the dialog for the showInputDialog methods. Only used if -# the developer uses one of the variants that doesn't take a title. -OptionPane.inputDialogTitle=\u8F93\u5165 -# Title for the dialog for the showMessageDialog methods. Only used if -# the developer uses one of the variants that doesn't take a title. -OptionPane.messageDialogTitle=\u6D88\u606F - -############ Printing Dialog Strings ############ -PrintingDialog.titleProgressText=\u6253\u5370 -PrintingDialog.titleAbortingText=\u6253\u5370 (\u6B63\u5728\u4E2D\u6B62) - -PrintingDialog.contentInitialText=\u6B63\u5728\u8FDB\u884C\u6253\u5370... - -# The following string will be formatted by a MessageFormat -# and {0} will be replaced by page number being printed -PrintingDialog.contentProgressText=\u5DF2\u6253\u5370\u9875 {0}... - -PrintingDialog.contentAbortingText=\u6B63\u5728\u4E2D\u6B62\u6253\u5370... - -PrintingDialog.abortButtonText=\u4E2D\u6B62(A) -PrintingDialog.abortButtonMnemonic=65 -PrintingDialog.abortButtonDisplayedMnemonicIndex=0 -PrintingDialog.abortButtonToolTipText=\u4E2D\u6B62\u6253\u5370 - -############ Internal Frame Strings ############ -InternalFrame.iconButtonToolTip=\u6700\u5C0F\u5316 -InternalFrame.maxButtonToolTip=\u6700\u5927\u5316 -InternalFrame.restoreButtonToolTip=\u8FD8\u539F -InternalFrame.closeButtonToolTip=\u5173\u95ED - -############ Internal Frame Title Pane Strings ############ -InternalFrameTitlePane.restoreButtonText=\u8FD8\u539F -InternalFrameTitlePane.moveButtonText=\u79FB\u52A8 -InternalFrameTitlePane.sizeButtonText=\u5927\u5C0F -InternalFrameTitlePane.minimizeButtonText=\u6700\u5C0F\u5316 -InternalFrameTitlePane.maximizeButtonText=\u6700\u5927\u5316 -InternalFrameTitlePane.closeButtonText=\u5173\u95ED - -############ Text strings ############# -# Used for html forms -FormView.submitButtonText=\u63D0\u4EA4\u67E5\u8BE2 -FormView.resetButtonText=\u91CD\u8BBE -FormView.browseFileButtonText=\u6D4F\u89C8... - -############ Abstract Document Strings ############ -AbstractDocument.styleChangeText=\u6837\u5F0F\u66F4\u6539 -AbstractDocument.additionText=\u6DFB\u52A0 -AbstractDocument.deletionText=\u5220\u9664 -AbstractDocument.undoText=\u64A4\u6D88 -AbstractDocument.redoText=\u91CD\u505A - -############ Abstract Button Strings ############ -AbstractButton.clickText=\u5355\u51FB - -############ Abstract Undoable Edit Strings ############ -AbstractUndoableEdit.undoText=\u64A4\u6D88 -AbstractUndoableEdit.redoText=\u91CD\u505A - -############ Combo Box Strings ############ -ComboBox.togglePopupText=togglePopup - -############ Progress Monitor Strings ############ -ProgressMonitor.progressText=\u8FDB\u5EA6... - -############ Split Pane Strings ############ -SplitPane.leftButtonText=\u5DE6\u952E -SplitPane.rightButtonText=\u53F3\u952E -# Used for Isindex -IsindexView.prompt=\u8FD9\u662F\u53EF\u641C\u7D22\u7D22\u5F15\u3002\u8BF7\u8F93\u5165\u641C\u7D22\u5173\u952E\u5B57: - -############ InternalFrameTitlePane Strings ############ -InternalFrameTitlePane.iconifyButtonAccessibleName=\u56FE\u6807\u5316 -InternalFrameTitlePane.maximizeButtonAccessibleName=\u6700\u5927\u5316 -InternalFrameTitlePane.closeButtonAccessibleName=\u5173\u95ED - +# This properties file is used to create a PropertyResourceBundle +# It contains Locale specific strings used in Swing +# Currently, the following components need this for support: +# +# ColorChooser +# FileChooser +# OptionPane +# +# When this file is read in, the strings are put into the +# defaults table. This is an implementation detail of the current +# workings of Swing. DO NOT DEPEND ON THIS. +# This may change in future versions of Swing as we improve localization +# support. +# +# MNEMONIC NOTE: +# Many of strings in this file are used by widgets that have a +# mnemonic, for example: +# ColorChooser.rgbNameTextAndMnemonic=R&GB +# Indicates that the tab in the ColorChooser for RGB colors will have +# the text 'RGB', further the mnemonic character will be 'g' and that +# a decoration will be provided under the 'G'. This will typically +# look like: RGB +# - +# +# One important thing to remember is that the mnemonic MUST exist in +# the String, if it does not exist you should add text that makes it +# exist. This will typically take the form 'XXXX (M)' where M is the +# character for the mnemonic. +# +# @author Steve Wilson + +############ FILE CHOOSER STRINGS ############# +FileChooser.fileDescription.textAndMnemonic=\u666E\u901A\u7684\u6587\u4EF6 +FileChooser.directoryDescription.textAndMnemonic=\u76EE\u5F55 +FileChooser.newFolderError.textAndMnemonic=\u521B\u5EFA\u65B0\u7684\u6587\u4EF6\u5939\u65F6\u51FA\u9519 +FileChooser.newFolderErrorSeparator= : +FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=\u65E0\u6CD5\u521B\u5EFA\u6587\u4EF6\u5939 +FileChooser.newFolderParentDoesntExist.textAndMnemonic=\u65E0\u6CD5\u521B\u5EFA\u6587\u4EF6\u5939\u3002\n\n\u7CFB\u7EDF\u627E\u4E0D\u5230\u6307\u5B9A\u7684\u8DEF\u5F84\u3002 +FileChooser.renameErrorTitle.textAndMnemonic=\u91CD\u547D\u540D\u6587\u4EF6\u6216\u6587\u4EF6\u5939\u65F6\u51FA\u9519 +FileChooser.renameError.textAndMnemonic=\u65E0\u6CD5\u91CD\u547D\u540D{0} +FileChooser.renameErrorFileExists.textAndMnemonic=\u65E0\u6CD5\u91CD\u547D\u540D{0}: \u5DF2\u5B58\u5728\u5177\u6709\u6240\u6307\u5B9A\u540D\u79F0\u7684\u6587\u4EF6\u3002\u8BF7\u6307\u5B9A\u5176\u4ED6\u6587\u4EF6\u540D\u3002 +FileChooser.acceptAllFileFilter.textAndMnemonic=\u6240\u6709\u6587\u4EF6 +FileChooser.cancelButton.textAndMnemonic=\u53D6\u6D88(&C) +FileChooser.saveButton.textAndMnemonic=\u4FDD\u5B58(&S) +FileChooser.openButton.textAndMnemonic=\u6253\u5F00(&O) +FileChooser.saveDialogTitle.textAndMnemonic=\u4FDD\u5B58 +FileChooser.openDialogTitle.textAndMnemonic=\u6253\u5F00 +FileChooser.updateButton.textAndMnemonic=\u66F4\u65B0(&U) +FileChooser.helpButton.textAndMnemonic=\u5E2E\u52A9(&H) +FileChooser.directoryOpenButton.textAndMnemonic=\u6253\u5F00(&O) + +# File Size Units +FileChooser.fileSizeKiloBytes={0} KB +FileChooser.fileSizeMegaBytes={0} MB +FileChooser.fileSizeGigaBytes={0} GB + +# These strings are platform dependent not look and feel dependent. +FileChooser.win32.newFolder=\u65B0\u5EFA\u6587\u4EF6\u5939 +FileChooser.win32.newFolder.subsequent=\u65B0\u5EFA\u6587\u4EF6\u5939 ({0}) +FileChooser.other.newFolder=NewFolder +FileChooser.other.newFolder.subsequent=NewFolder.{0} + + +## file chooser tooltips ### +FileChooser.cancelButtonToolTip.textAndMnemonic=\u4E2D\u6B62\u6587\u4EF6\u9009\u62E9\u5668\u5BF9\u8BDD\u6846 +FileChooser.saveButtonToolTip.textAndMnemonic=\u4FDD\u5B58\u6240\u9009\u6587\u4EF6 +FileChooser.openButtonToolTip.textAndMnemonic=\u6253\u5F00\u6240\u9009\u6587\u4EF6 +FileChooser.updateButtonToolTip.textAndMnemonic=\u66F4\u65B0\u76EE\u5F55\u5217\u8868 +FileChooser.helpButtonToolTip.textAndMnemonic=FileChooser \u5E2E\u52A9 +FileChooser.directoryOpenButtonToolTip.textAndMnemonic=\u6253\u5F00\u9009\u62E9\u7684\u76EE\u5F55 + +FileChooser.filesListAccessibleName=Files List +FileChooser.filesDetailsAccessibleName=Files Details + +############ COLOR CHOOSER STRINGS ############# +ColorChooser.preview.textAndMnemonic=\u9884\u89C8 +ColorChooser.ok.textAndMnemonic=\u786E\u5B9A +ColorChooser.cancel.textAndMnemonic=\u53D6\u6D88 +ColorChooser.reset.textAndMnemonic=\u91CD\u7F6E(&R) +ColorChooser.sample.textAndMnemonic=\u793A\u4F8B\u6587\u672C \u793A\u4F8B\u6587\u672C +ColorChooser.swatches.textAndMnemonic=\u793A\u4F8B(&S) +ColorChooser.swatchesRecent.textAndMnemonic=\u6700\u8FD1: +ColorChooser.hsv.textAndMnemonic=&HSV +ColorChooser.hsvHue.textAndMnemonic=\u8272\u8C03 +ColorChooser.hsvSaturation.textAndMnemonic=\u9971\u548C\u5EA6 +ColorChooser.hsvValue.textAndMnemonic=\u503C +ColorChooser.hsvTransparency.textAndMnemonic=\u900F\u660E\u5EA6 +ColorChooser.hsl.textAndMnemonic=HS&L +ColorChooser.hslHue.textAndMnemonic=\u8272\u8C03 +ColorChooser.hslSaturation.textAndMnemonic=\u9971\u548C\u5EA6 +ColorChooser.hslLightness.textAndMnemonic=\u4EAE\u5EA6 +ColorChooser.hslTransparency.textAndMnemonic=\u900F\u660E\u5EA6 +ColorChooser.rgb.textAndMnemonic=R&GB +ColorChooser.rgbRed.textAndMnemonic=\u7EA2\u8272(&D) +ColorChooser.rgbGreen.textAndMnemonic=\u7EFF\u8272(&N) +ColorChooser.rgbBlue.textAndMnemonic=\u84DD\u8272(&B) +ColorChooser.rgbAlpha.textAndMnemonic=Alpha +ColorChooser.rgbHexCode.textAndMnemonic=\u989C\u8272\u4EE3\u7801(&C) +ColorChooser.cmyk.textAndMnemonic=C&MYK +ColorChooser.cmykCyan.textAndMnemonic=\u9752\u8272 +ColorChooser.cmykMagenta.textAndMnemonic=\u7D2B\u7EA2\u8272 +ColorChooser.cmykYellow.textAndMnemonic=\u9EC4\u8272 +ColorChooser.cmykBlack.textAndMnemonic=\u9ED1\u8272 +ColorChooser.cmykAlpha.textAndMnemonic=Alpha + +############ OPTION PANE STRINGS ############# +# We only define mnemonics for YES/NO, but for completeness you can +# define mnemonics for any of the buttons. +OptionPane.yesButton.textAndMnemonic=\u662F(&Y) +OptionPane.noButton.textAndMnemonic=\u5426(&N) +OptionPane.okButton.textAndMnemonic=\u786E\u5B9A(&O) +OptionPane.cancelButton.textAndMnemonic=\u53D6\u6D88 +OptionPane.title.textAndMnemonic=\u9009\u62E9\u4E00\u4E2A\u9009\u9879 +# Title for the dialog for the showInputDialog methods. Only used if +# the developer uses one of the variants that doesn't take a title. +OptionPane.inputDialog.titleAndMnemonic=\u8F93\u5165 +# Title for the dialog for the showMessageDialog methods. Only used if +# the developer uses one of the variants that doesn't take a title. +OptionPane.messageDialog.titleAndMnemonic=\u6D88\u606F + +############ Printing Dialog Strings ############ +PrintingDialog.titleProgress.textAndMnemonic=\u6253\u5370 +PrintingDialog.titleAborting.textAndMnemonic=\u6253\u5370 (\u6B63\u5728\u4E2D\u6B62) + +PrintingDialog.contentInitial.textAndMnemonic=\u6B63\u5728\u8FDB\u884C\u6253\u5370... + +# The following string will be formatted by a MessageFormat +# and {0} will be replaced by page number being printed +PrintingDialog.contentProgress.textAndMnemonic=\u5DF2\u6253\u5370\u9875 {0}... + +PrintingDialog.contentAborting.textAndMnemonic=\u6B63\u5728\u4E2D\u6B62\u6253\u5370... + +PrintingDialog.abortButton.textAndMnemonic=\u4E2D\u6B62(&A) +PrintingDialog.abortButtonToolTip.textAndMnemonic=\u4E2D\u6B62\u6253\u5370 + +############ Internal Frame Strings ############ +InternalFrame.iconButtonToolTip=\u6700\u5C0F\u5316 +InternalFrame.maxButtonToolTip=\u6700\u5927\u5316 +InternalFrame.restoreButtonToolTip=\u8FD8\u539F +InternalFrame.closeButtonToolTip=\u5173\u95ED + +############ Internal Frame Title Pane Strings ############ +InternalFrameTitlePane.restoreButton.textAndMnemonic=\u8FD8\u539F +InternalFrameTitlePane.moveButton.textAndMnemonic=\u79FB\u52A8 +InternalFrameTitlePane.sizeButton.textAndMnemonic=\u5927\u5C0F +InternalFrameTitlePane.minimizeButton.textAndMnemonic=\u6700\u5C0F\u5316 +InternalFrameTitlePane.maximizeButton.textAndMnemonic=\u6700\u5927\u5316 +InternalFrameTitlePane.closeButton.textAndMnemonic=\u5173\u95ED + +############ Text strings ############# +# Used for html forms +FormView.submitButton.textAndMnemonic=\u63D0\u4EA4\u67E5\u8BE2 +FormView.resetButton.textAndMnemonic=\u91CD\u8BBE +FormView.browseFileButton.textAndMnemonic=\u6D4F\u89C8... + +############ Abstract Document Strings ############ +AbstractDocument.styleChange.textAndMnemonic=\u6837\u5F0F\u66F4\u6539 +AbstractDocument.addition.textAndMnemonic=\u6DFB\u52A0 +AbstractDocument.deletion.textAndMnemonic=\u5220\u9664 +AbstractDocument.undo.textAndMnemonic=\u64A4\u6D88 +AbstractDocument.redo.textAndMnemonic=\u91CD\u505A + +############ Abstract Button Strings ############ +AbstractButton.click.textAndMnemonic=\u5355\u51FB + +############ Abstract Undoable Edit Strings ############ +AbstractUndoableEdit.undo.textAndMnemonic=\u64A4\u6D88 +AbstractUndoableEdit.redo.textAndMnemonic=\u91CD\u505A + +############ Combo Box Strings ############ +ComboBox.togglePopup.textAndMnemonic=togglePopup + +############ Progress Monitor Strings ############ +ProgressMonitor.progress.textAndMnemonic=\u8FDB\u5EA6... + +############ Split Pane Strings ############ +SplitPane.leftButton.textAndMnemonic=\u5DE6\u952E +SplitPane.rightButton.textAndMnemonic=\u53F3\u952E +# Used for Isindex +IsindexView.prompt=\u8FD9\u662F\u53EF\u641C\u7D22\u7D22\u5F15\u3002\u8BF7\u8F93\u5165\u641C\u7D22\u5173\u952E\u5B57: + +############ InternalFrameTitlePane Strings ############ +InternalFrameTitlePane.iconifyButtonAccessibleName=\u56FE\u6807\u5316 +InternalFrameTitlePane.maximizeButtonAccessibleName=\u6700\u5927\u5316 +InternalFrameTitlePane.closeButtonAccessibleName=\u5173\u95ED + diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties index 0caca8cd707..bfcd7424788 100644 --- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties @@ -1,229 +1,186 @@ -# This properties file is used to create a PropertyResourceBundle -# It contains Locale specific strings used in Swing -# Currently, the following components need this for support: -# -# ColorChooser -# FileChooser -# OptionPane -# -# When this file is read in, the strings are put into the -# defaults table. This is an implementation detail of the current -# workings of Swing. DO NOT DEPEND ON THIS. -# This may change in future versions of Swing as we improve localization -# support. -# -# MNEMONIC NOTE: -# Many of strings in this file are used by widgets that have a -# mnemonic, for example: -# ColorChooser.rgbNameText=RGB -# ColorChooser.rgbMnemonic=71 -# ColorChooser.rgbDisplayedMnemonicIndex=1 -# Indicates that the tab in the ColorChooser for RGB colors will have -# the text 'RGB', further the mnemonic character will be 'g' and that -# a decoration will be provided under the 'G'. This will typically -# look like: RGB -# - -# 71 corresponds to the decimal value of the VK constant defined -# in java/awt/KeyEvent.java. VK_G is defined as: -# -# public static final int VK_G = 0x47; -# -# 0x47 is a hex number and needs to be converted to decimal. -# A simple way to calculate this for a-z is to add 64 to the index of -# the letter in the alphabet. As 'a' is in the 1st letter the mnemonic -# for 'a' is 65, 'b' is 66... -# -# The xxDisplayedMnemonicIndex is used to indicate the index of the -# character that should be underlined in the String, with 0 -# corresponding to the first character in the String. -# -# One important thing to remember is that the mnemonic MUST exist in -# the String, if it does not exist you should add text that makes it -# exist. This will typically take the form 'XXXX (M)' where M is the -# character for the mnemonic. -# -# @author Steve Wilson - -############ FILE CHOOSER STRINGS ############# -FileChooser.fileDescriptionText=\u4E00\u822C\u6A94\u6848 -FileChooser.directoryDescriptionText=\u76EE\u9304 -FileChooser.newFolderErrorText=\u5EFA\u7ACB\u65B0\u8CC7\u6599\u593E\u6642\u767C\u751F\u932F\u8AA4 -FileChooser.newFolderErrorSeparator= : -FileChooser.newFolderParentDoesntExistTitleText=\u7121\u6CD5\u5EFA\u7ACB\u8CC7\u6599\u593E -FileChooser.newFolderParentDoesntExistText=\u7121\u6CD5\u5EFA\u7ACB\u8CC7\u6599\u593E\u3002\n\n\u7CFB\u7D71\u627E\u4E0D\u5230\u6307\u5B9A\u7684\u8DEF\u5F91\u3002 -FileChooser.renameErrorTitleText=\u91CD\u65B0\u547D\u540D\u6A94\u6848\u6216\u8CC7\u6599\u593E\u6642\u767C\u751F\u932F\u8AA4\u3002 -FileChooser.renameErrorText=\u7121\u6CD5\u91CD\u65B0\u547D\u540D {0} -FileChooser.renameErrorFileExistsText=\u7121\u6CD5\u91CD\u65B0\u547D\u540D {0}: \u5DF2\u7D93\u5B58\u5728\u60A8\u6240\u6307\u5B9A\u540D\u7A31\u7684\u6A94\u6848\u3002\u8ACB\u6307\u5B9A\u4E0D\u540C\u7684\u540D\u7A31\u3002 -FileChooser.acceptAllFileFilterText=\u6240\u6709\u6A94\u6848 -FileChooser.cancelButtonText=\u53D6\u6D88 -FileChooser.cancelButtonMnemonic=67 -FileChooser.saveButtonText=\u5132\u5B58 -FileChooser.saveButtonMnemonic=83 -FileChooser.openButtonText=\u958B\u555F -FileChooser.openButtonMnemonic=79 -FileChooser.saveDialogTitleText=\u5132\u5B58 -FileChooser.openDialogTitleText=\u958B\u555F -FileChooser.updateButtonText=\u66F4\u65B0(U) -FileChooser.updateButtonMnemonic=85 -FileChooser.helpButtonText=\u8AAA\u660E(H) -FileChooser.helpButtonMnemonic=72 -FileChooser.directoryOpenButtonText=\u958B\u555F(O) -FileChooser.directoryOpenButtonMnemonic=79 - -# File Size Units -FileChooser.fileSizeKiloBytes={0} KB -FileChooser.fileSizeMegaBytes={0} MB -FileChooser.fileSizeGigaBytes={0} GB - -# These strings are platform dependent not look and feel dependent. -FileChooser.win32.newFolder=\u65B0\u8CC7\u6599\u593E -FileChooser.win32.newFolder.subsequent=\u65B0\u8CC7\u6599\u593E ({0}) -FileChooser.other.newFolder=\u65B0\u8CC7\u6599\u593E -FileChooser.other.newFolder.subsequent=\u65B0\u8CC7\u6599\u593E.{0} - - -## file chooser tooltips ### -FileChooser.cancelButtonToolTipText=\u4E2D\u6B62\u6A94\u6848\u9078\u64C7\u5668\u5C0D\u8A71\u65B9\u584A -FileChooser.saveButtonToolTipText=\u5132\u5B58\u9078\u53D6\u7684\u6A94\u6848 -FileChooser.openButtonToolTipText=\u958B\u555F\u9078\u53D6\u7684\u6A94\u6848 -FileChooser.updateButtonToolTipText=\u66F4\u65B0\u76EE\u9304\u6E05\u55AE -FileChooser.helpButtonToolTipText=\u300C\u6A94\u6848\u9078\u64C7\u5668\u300D\u8AAA\u660E -FileChooser.directoryOpenButtonToolTipText=\u958B\u555F\u9078\u53D6\u7684\u76EE\u9304 - -FileChooser.filesListAccessibleName=Files List -FileChooser.filesDetailsAccessibleName=Files Details - -############ COLOR CHOOSER STRINGS ############# -ColorChooser.previewText=\u9810\u89BD -ColorChooser.okText=\u78BA\u5B9A -ColorChooser.cancelText=\u53D6\u6D88 -ColorChooser.resetText=\u91CD\u8A2D(R) -# VK_XXX constant for 'ColorChooser.resetText' button to make mnemonic -ColorChooser.resetMnemonic=82 -ColorChooser.sampleText=\u7BC4\u4F8B\u6587\u5B57 \u7BC4\u4F8B\u6587\u5B57 -ColorChooser.swatchesNameText=\u8ABF\u8272\u677F(S) -ColorChooser.swatchesMnemonic=83 -ColorChooser.swatchesRecentText=\u6700\u65B0\u9078\u64C7: -# Each of the ColorChooser types can define a mnemonic, as a KeyEvent.VK_XXX -# constant, and an index into the text to render the mnemonic as. The -# mnemonic is xxxMnemonic and the index of the character to underline is -# xxxDisplayedMnemonicIndex. -ColorChooser.hsvNameText=HSV -ColorChooser.hsvMnemonic=72 -ColorChooser.hsvHueText=\u8272\u8ABF -ColorChooser.hsvSaturationText=\u5F69\u5EA6 -ColorChooser.hsvValueText=\u6578\u503C -ColorChooser.hsvTransparencyText=\u900F\u660E\u5EA6 -ColorChooser.hslNameText=HSL -ColorChooser.hslMnemonic=76 -ColorChooser.hslHueText=\u8272\u8ABF -ColorChooser.hslSaturationText=\u5F69\u5EA6 -ColorChooser.hslLightnessText=\u4EAE\u5EA6 -ColorChooser.hslTransparencyText=\u900F\u660E\u5EA6 -ColorChooser.rgbNameText=RGB -ColorChooser.rgbMnemonic=71 -ColorChooser.rgbRedText=\u7D05 -ColorChooser.rgbRedMnemonic=68 -ColorChooser.rgbGreenText=\u7DA0 -ColorChooser.rgbGreenMnemonic=78 -ColorChooser.rgbBlueText=\u85CD -ColorChooser.rgbBlueMnemonic=66 -ColorChooser.rgbAlphaText=Alpha -ColorChooser.rgbHexCodeText=\u984F\u8272\u4EE3\u78BC(C) -ColorChooser.rgbHexCodeMnemonic=67 -ColorChooser.cmykNameText=CMYK -ColorChooser.cmykMnemonic=77 -ColorChooser.cmykCyanText=\u85CD\u7DA0\u8272 -ColorChooser.cmykMagentaText=\u7D2B\u7D05\u8272 -ColorChooser.cmykYellowText=\u9EC3\u8272 -ColorChooser.cmykBlackText=\u9ED1\u8272 -ColorChooser.cmykAlphaText=Alpha - -############ OPTION PANE STRINGS ############# -# Mnemonic keys correspond to KeyEvent.VK_XXX constant -# We only define mnemonics for YES/NO, but for completeness you can -# define mnemonics for any of the buttons. -OptionPane.yesButtonText=\u662F(Y) -OptionPane.yesButtonMnemonic=89 -OptionPane.noButtonText=\u5426(N) -OptionPane.noButtonMnemonic=78 -OptionPane.okButtonText=\u78BA\u5B9A -OptionPane.okButtonMnemonic=O -OptionPane.cancelButtonText=\u53D6\u6D88 -OptionPane.cancelButtonMnemonic=0 -OptionPane.titleText=\u9078\u53D6\u4E00\u500B\u9078\u9805 -# Title for the dialog for the showInputDialog methods. Only used if -# the developer uses one of the variants that doesn't take a title. -OptionPane.inputDialogTitle=\u8F38\u5165 -# Title for the dialog for the showMessageDialog methods. Only used if -# the developer uses one of the variants that doesn't take a title. -OptionPane.messageDialogTitle=\u8A0A\u606F - -############ Printing Dialog Strings ############ -PrintingDialog.titleProgressText=\u5217\u5370 -PrintingDialog.titleAbortingText=\u5217\u5370 (\u4E2D\u6B62) - -PrintingDialog.contentInitialText=\u6B63\u5728\u5217\u5370... - -# The following string will be formatted by a MessageFormat -# and {0} will be replaced by page number being printed -PrintingDialog.contentProgressText=\u5DF2\u5217\u5370\u7684\u9801\u9762 {0}... - -PrintingDialog.contentAbortingText=\u6B63\u5728\u4E2D\u6B62\u5217\u5370... - -PrintingDialog.abortButtonText=\u4E2D\u6B62(A) -PrintingDialog.abortButtonMnemonic=65 -PrintingDialog.abortButtonDisplayedMnemonicIndex=0 -PrintingDialog.abortButtonToolTipText=\u4E2D\u6B62\u5217\u5370 - -############ Internal Frame Strings ############ -InternalFrame.iconButtonToolTip=\u6700\u5C0F\u5316 -InternalFrame.maxButtonToolTip=\u6700\u5927\u5316 -InternalFrame.restoreButtonToolTip=\u5FA9\u539F -InternalFrame.closeButtonToolTip=\u95DC\u9589 - -############ Internal Frame Title Pane Strings ############ -InternalFrameTitlePane.restoreButtonText=\u5FA9\u539F -InternalFrameTitlePane.moveButtonText=\u79FB\u52D5 -InternalFrameTitlePane.sizeButtonText=\u5927\u5C0F -InternalFrameTitlePane.minimizeButtonText=\u6700\u5C0F\u5316 -InternalFrameTitlePane.maximizeButtonText=\u6700\u5927\u5316 -InternalFrameTitlePane.closeButtonText=\u95DC\u9589 - -############ Text strings ############# -# Used for html forms -FormView.submitButtonText=\u9001\u51FA\u67E5\u8A62 -FormView.resetButtonText=\u91CD\u8A2D -FormView.browseFileButtonText=\u700F\u89BD... - -############ Abstract Document Strings ############ -AbstractDocument.styleChangeText=\u6A23\u5F0F\u8B8A\u66F4 -AbstractDocument.additionText=\u9644\u52A0 -AbstractDocument.deletionText=\u522A\u9664 -AbstractDocument.undoText=\u9084\u539F -AbstractDocument.redoText=\u91CD\u505A - -############ Abstract Button Strings ############ -AbstractButton.clickText=\u6309\u4E00\u4E0B - -############ Abstract Undoable Edit Strings ############ -AbstractUndoableEdit.undoText=\u9084\u539F -AbstractUndoableEdit.redoText=\u91CD\u505A - -############ Combo Box Strings ############ -ComboBox.togglePopupText=\u5207\u63DB\u5373\u73FE\u5F0F\u8996\u7A97 - -############ Progress Monitor Strings ############ -ProgressMonitor.progressText=\u9032\u5EA6... - -############ Split Pane Strings ############ -SplitPane.leftButtonText=\u5DE6\u6309\u9215 -SplitPane.rightButtonText=\u53F3\u6309\u9215 -# Used for Isindex -IsindexView.prompt=\u9019\u662F\u4E00\u500B\u53EF\u641C\u5C0B\u7684\u7D22\u5F15\u3002\u8F38\u5165\u641C\u5C0B\u95DC\u9375\u5B57: - -############ InternalFrameTitlePane Strings ############ -InternalFrameTitlePane.iconifyButtonAccessibleName=\u5716\u793A\u5316 -InternalFrameTitlePane.maximizeButtonAccessibleName=\u6700\u5927\u5316 -InternalFrameTitlePane.closeButtonAccessibleName=\u95DC\u9589 - +# This properties file is used to create a PropertyResourceBundle +# It contains Locale specific strings used in Swing +# Currently, the following components need this for support: +# +# ColorChooser +# FileChooser +# OptionPane +# +# When this file is read in, the strings are put into the +# defaults table. This is an implementation detail of the current +# workings of Swing. DO NOT DEPEND ON THIS. +# This may change in future versions of Swing as we improve localization +# support. +# +# MNEMONIC NOTE: +# Many of strings in this file are used by widgets that have a +# mnemonic, for example: +# ColorChooser.rgbNameTextAndMnemonic=R&GB +# Indicates that the tab in the ColorChooser for RGB colors will have +# the text 'RGB', further the mnemonic character will be 'g' and that +# a decoration will be provided under the 'G'. This will typically +# look like: RGB +# - +# +# One important thing to remember is that the mnemonic MUST exist in +# the String, if it does not exist you should add text that makes it +# exist. This will typically take the form 'XXXX (M)' where M is the +# character for the mnemonic. +# +# @author Steve Wilson + +############ FILE CHOOSER STRINGS ############# +FileChooser.fileDescription.textAndMnemonic=\u4E00\u822C\u6A94\u6848 +FileChooser.directoryDescription.textAndMnemonic=\u76EE\u9304 +FileChooser.newFolderError.textAndMnemonic=\u5EFA\u7ACB\u65B0\u8CC7\u6599\u593E\u6642\u767C\u751F\u932F\u8AA4 +FileChooser.newFolderErrorSeparator= : +FileChooser.newFolderParentDoesntExistTitle.textAndMnemonic=\u7121\u6CD5\u5EFA\u7ACB\u8CC7\u6599\u593E +FileChooser.newFolderParentDoesntExist.textAndMnemonic=\u7121\u6CD5\u5EFA\u7ACB\u8CC7\u6599\u593E\u3002\n\n\u7CFB\u7D71\u627E\u4E0D\u5230\u6307\u5B9A\u7684\u8DEF\u5F91\u3002 +FileChooser.renameErrorTitle.textAndMnemonic=\u91CD\u65B0\u547D\u540D\u6A94\u6848\u6216\u8CC7\u6599\u593E\u6642\u767C\u751F\u932F\u8AA4\u3002 +FileChooser.renameError.textAndMnemonic=\u7121\u6CD5\u91CD\u65B0\u547D\u540D {0} +FileChooser.renameErrorFileExists.textAndMnemonic=\u7121\u6CD5\u91CD\u65B0\u547D\u540D {0}: \u5DF2\u7D93\u5B58\u5728\u60A8\u6240\u6307\u5B9A\u540D\u7A31\u7684\u6A94\u6848\u3002\u8ACB\u6307\u5B9A\u4E0D\u540C\u7684\u540D\u7A31\u3002 +FileChooser.acceptAllFileFilter.textAndMnemonic=\u6240\u6709\u6A94\u6848 +FileChooser.cancelButton.textAndMnemonic=\u53D6\u6D88(&C) +FileChooser.saveButton.textAndMnemonic=\u5132\u5B58(&S) +FileChooser.openButton.textAndMnemonic=\u958B\u555F(&O) +FileChooser.saveDialogTitle.textAndMnemonic=\u5132\u5B58 +FileChooser.openDialogTitle.textAndMnemonic=\u958B\u555F +FileChooser.updateButton.textAndMnemonic=\u66F4\u65B0(&U) +FileChooser.helpButton.textAndMnemonic=\u8AAA\u660E(&H) +FileChooser.directoryOpenButton.textAndMnemonic=\u958B\u555F(&O) + +# File Size Units +FileChooser.fileSizeKiloBytes={0} KB +FileChooser.fileSizeMegaBytes={0} MB +FileChooser.fileSizeGigaBytes={0} GB + +# These strings are platform dependent not look and feel dependent. +FileChooser.win32.newFolder=\u65B0\u8CC7\u6599\u593E +FileChooser.win32.newFolder.subsequent=\u65B0\u8CC7\u6599\u593E ({0}) +FileChooser.other.newFolder=\u65B0\u8CC7\u6599\u593E +FileChooser.other.newFolder.subsequent=\u65B0\u8CC7\u6599\u593E.{0} + + +## file chooser tooltips ### +FileChooser.cancelButtonToolTip.textAndMnemonic=\u4E2D\u6B62\u6A94\u6848\u9078\u64C7\u5668\u5C0D\u8A71\u65B9\u584A +FileChooser.saveButtonToolTip.textAndMnemonic=\u5132\u5B58\u9078\u53D6\u7684\u6A94\u6848 +FileChooser.openButtonToolTip.textAndMnemonic=\u958B\u555F\u9078\u53D6\u7684\u6A94\u6848 +FileChooser.updateButtonToolTip.textAndMnemonic=\u66F4\u65B0\u76EE\u9304\u6E05\u55AE +FileChooser.helpButtonToolTip.textAndMnemonic=\u300C\u6A94\u6848\u9078\u64C7\u5668\u300D\u8AAA\u660E +FileChooser.directoryOpenButtonToolTip.textAndMnemonic=\u958B\u555F\u9078\u53D6\u7684\u76EE\u9304 + +FileChooser.filesListAccessibleName=Files List +FileChooser.filesDetailsAccessibleName=Files Details + +############ COLOR CHOOSER STRINGS ############# +ColorChooser.preview.textAndMnemonic=\u9810\u89BD +ColorChooser.ok.textAndMnemonic=\u78BA\u5B9A +ColorChooser.cancel.textAndMnemonic=\u53D6\u6D88 +ColorChooser.reset.textAndMnemonic=\u91CD\u8A2D(&R) +ColorChooser.sample.textAndMnemonic=\u7BC4\u4F8B\u6587\u5B57 \u7BC4\u4F8B\u6587\u5B57 +ColorChooser.swatches.textAndMnemonic=\u8ABF\u8272\u677F(&S) +ColorChooser.swatchesRecent.textAndMnemonic=\u6700\u65B0\u9078\u64C7: +ColorChooser.hsv.textAndMnemonic=&HSV +ColorChooser.hsvHue.textAndMnemonic=\u8272\u8ABF +ColorChooser.hsvSaturation.textAndMnemonic=\u5F69\u5EA6 +ColorChooser.hsvValue.textAndMnemonic=\u6578\u503C +ColorChooser.hsvTransparency.textAndMnemonic=\u900F\u660E\u5EA6 +ColorChooser.hsl.textAndMnemonic=HS&L +ColorChooser.hslHue.textAndMnemonic=\u8272\u8ABF +ColorChooser.hslSaturation.textAndMnemonic=\u5F69\u5EA6 +ColorChooser.hslLightness.textAndMnemonic=\u4EAE\u5EA6 +ColorChooser.hslTransparency.textAndMnemonic=\u900F\u660E\u5EA6 +ColorChooser.rgb.textAndMnemonic=R&GB +ColorChooser.rgbRed.textAndMnemonic=\u7D05(&D) +ColorChooser.rgbGreen.textAndMnemonic=\u7DA0(&N) +ColorChooser.rgbBlue.textAndMnemonic=\u85CD(&B) +ColorChooser.rgbAlpha.textAndMnemonic=Alpha +ColorChooser.rgbHexCode.textAndMnemonic=\u984F\u8272\u4EE3\u78BC(&C) +ColorChooser.cmyk.textAndMnemonic=C&MYK +ColorChooser.cmykCyan.textAndMnemonic=\u85CD\u7DA0\u8272 +ColorChooser.cmykMagenta.textAndMnemonic=\u7D2B\u7D05\u8272 +ColorChooser.cmykYellow.textAndMnemonic=\u9EC3\u8272 +ColorChooser.cmykBlack.textAndMnemonic=\u9ED1\u8272 +ColorChooser.cmykAlpha.textAndMnemonic=Alpha + +############ OPTION PANE STRINGS ############# +# We only define mnemonics for YES/NO, but for completeness you can +# define mnemonics for any of the buttons. +OptionPane.yesButton.textAndMnemonic=\u662F(&Y) +OptionPane.noButton.textAndMnemonic=\u5426(&N) +OptionPane.okButton.textAndMnemonic=\u78BA\u5B9A(&O) +OptionPane.cancelButton.textAndMnemonic=\u53D6\u6D88 +OptionPane.title.textAndMnemonic=\u9078\u53D6\u4E00\u500B\u9078\u9805 +# Title for the dialog for the showInputDialog methods. Only used if +# the developer uses one of the variants that doesn't take a title. +OptionPane.inputDialog.titleAndMnemonic=\u8F38\u5165 +# Title for the dialog for the showMessageDialog methods. Only used if +# the developer uses one of the variants that doesn't take a title. +OptionPane.messageDialog.titleAndMnemonic=\u8A0A\u606F + +############ Printing Dialog Strings ############ +PrintingDialog.titleProgress.textAndMnemonic=\u5217\u5370 +PrintingDialog.titleAborting.textAndMnemonic=\u5217\u5370 (\u4E2D\u6B62) + +PrintingDialog.contentInitial.textAndMnemonic=\u6B63\u5728\u5217\u5370... + +# The following string will be formatted by a MessageFormat +# and {0} will be replaced by page number being printed +PrintingDialog.contentProgress.textAndMnemonic=\u5DF2\u5217\u5370\u7684\u9801\u9762 {0}... + +PrintingDialog.contentAborting.textAndMnemonic=\u6B63\u5728\u4E2D\u6B62\u5217\u5370... + +PrintingDialog.abortButton.textAndMnemonic=\u4E2D\u6B62(&A) +PrintingDialog.abortButtonToolTip.textAndMnemonic=\u4E2D\u6B62\u5217\u5370 + +############ Internal Frame Strings ############ +InternalFrame.iconButtonToolTip=\u6700\u5C0F\u5316 +InternalFrame.maxButtonToolTip=\u6700\u5927\u5316 +InternalFrame.restoreButtonToolTip=\u5FA9\u539F +InternalFrame.closeButtonToolTip=\u95DC\u9589 + +############ Internal Frame Title Pane Strings ############ +InternalFrameTitlePane.restoreButton.textAndMnemonic=\u5FA9\u539F +InternalFrameTitlePane.moveButton.textAndMnemonic=\u79FB\u52D5 +InternalFrameTitlePane.sizeButton.textAndMnemonic=\u5927\u5C0F +InternalFrameTitlePane.minimizeButton.textAndMnemonic=\u6700\u5C0F\u5316 +InternalFrameTitlePane.maximizeButton.textAndMnemonic=\u6700\u5927\u5316 +InternalFrameTitlePane.closeButton.textAndMnemonic=\u95DC\u9589 + +############ Text strings ############# +# Used for html forms +FormView.submitButton.textAndMnemonic=\u9001\u51FA\u67E5\u8A62 +FormView.resetButton.textAndMnemonic=\u91CD\u8A2D +FormView.browseFileButton.textAndMnemonic=\u700F\u89BD... + +############ Abstract Document Strings ############ +AbstractDocument.styleChange.textAndMnemonic=\u6A23\u5F0F\u8B8A\u66F4 +AbstractDocument.addition.textAndMnemonic=\u9644\u52A0 +AbstractDocument.deletion.textAndMnemonic=\u522A\u9664 +AbstractDocument.undo.textAndMnemonic=\u9084\u539F +AbstractDocument.redo.textAndMnemonic=\u91CD\u505A + +############ Abstract Button Strings ############ +AbstractButton.click.textAndMnemonic=\u6309\u4E00\u4E0B + +############ Abstract Undoable Edit Strings ############ +AbstractUndoableEdit.undo.textAndMnemonic=\u9084\u539F +AbstractUndoableEdit.redo.textAndMnemonic=\u91CD\u505A + +############ Combo Box Strings ############ +ComboBox.togglePopup.textAndMnemonic=\u5207\u63DB\u5373\u73FE\u5F0F\u8996\u7A97 + +############ Progress Monitor Strings ############ +ProgressMonitor.progress.textAndMnemonic=\u9032\u5EA6... + +############ Split Pane Strings ############ +SplitPane.leftButton.textAndMnemonic=\u5DE6\u6309\u9215 +SplitPane.rightButton.textAndMnemonic=\u53F3\u6309\u9215 +# Used for Isindex +IsindexView.prompt=\u9019\u662F\u4E00\u500B\u53EF\u641C\u5C0B\u7684\u7D22\u5F15\u3002\u8F38\u5165\u641C\u5C0B\u95DC\u9375\u5B57: + +############ InternalFrameTitlePane Strings ############ +InternalFrameTitlePane.iconifyButtonAccessibleName=\u5716\u793A\u5316 +InternalFrameTitlePane.maximizeButtonAccessibleName=\u6700\u5927\u5316 +InternalFrameTitlePane.closeButtonAccessibleName=\u95DC\u9589 + diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal.properties index 3ae82055bd9..eceaa608636 100644 --- a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal.properties +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal.properties @@ -1,60 +1,51 @@ -# This properties file is used to create a PropertyResourceBundle -# It contains Locale specific strings used be the Metal Look and Feel. -# Currently, the following components need this for support: -# -# FileChooser -# -# When this file is read in, the strings are put into the -# defaults table. This is an implementation detail of the current -# workings of Swing. DO NOT DEPEND ON THIS. -# This may change in future versions of Swing as we improve localization -# support. -# -# Refer to the note in basic.properties for a description as to what -# the mnemonics correspond to and how to calculate them. -# -# @author Steve Wilson - - -############ FILE CHOOSER STRINGS ############# - -FileChooser.lookInLabelText=Look In: -FileChooser.lookInLabelMnemonic=73 -FileChooser.saveInLabelText=Save In: -FileChooser.fileNameLabelText=File Name: -FileChooser.fileNameLabelMnemonic=78 -FileChooser.folderNameLabelText=Folder name: -FileChooser.folderNameLabelMnemonic=78 -FileChooser.filesOfTypeLabelText=Files of Type: -FileChooser.filesOfTypeLabelMnemonic=84 -FileChooser.upFolderToolTipText=Up One Level -FileChooser.upFolderAccessibleName=Up -FileChooser.homeFolderToolTipText=Home -FileChooser.homeFolderAccessibleName=Home -FileChooser.newFolderToolTipText=Create New Folder -FileChooser.newFolderAccessibleName=New Folder -FileChooser.newFolderActionLabelText=New Folder -FileChooser.listViewButtonToolTipText=List -FileChooser.listViewButtonAccessibleName=List -FileChooser.listViewActionLabelText=List -FileChooser.detailsViewButtonToolTipText=Details -FileChooser.detailsViewButtonAccessibleName=Details -FileChooser.detailsViewActionLabelText=Details -FileChooser.refreshActionLabelText=Refresh -FileChooser.viewMenuLabelText=View -FileChooser.fileNameHeaderText=Name -FileChooser.fileSizeHeaderText=Size -FileChooser.fileTypeHeaderText=Type -FileChooser.fileDateHeaderText=Modified -FileChooser.fileAttrHeaderText=Attributes - -############ Used by MetalTitlePane if rendering window decorations############ -# All mnemonics are KeyEvent.VK_XXX as integers -MetalTitlePane.restoreTitle=Restore -MetalTitlePane.restoreMnemonic=82 -MetalTitlePane.iconifyTitle=Minimize -MetalTitlePane.iconifyMnemonic=69 -MetalTitlePane.maximizeTitle=Maximize -MetalTitlePane.maximizeMnemonic=88 -MetalTitlePane.closeTitle=Close -MetalTitlePane.closeMnemonic=67 +# This properties file is used to create a PropertyResourceBundle +# It contains Locale specific strings used be the Metal Look and Feel. +# Currently, the following components need this for support: +# +# FileChooser +# +# When this file is read in, the strings are put into the +# defaults table. This is an implementation detail of the current +# workings of Swing. DO NOT DEPEND ON THIS. +# This may change in future versions of Swing as we improve localization +# support. +# +# Refer to the note in basic.properties for a description as to what +# the mnemonics correspond to and how to calculate them. +# +# @author Steve Wilson + + +############ FILE CHOOSER STRINGS ############# + +FileChooser.lookInLabel.textAndMnemonic=Look &In: +FileChooser.saveInLabel.textAndMnemonic=Save In: +FileChooser.fileNameLabel.textAndMnemonic=File &Name: +FileChooser.folderNameLabel.textAndMnemonic=Folder &name: +FileChooser.filesOfTypeLabel.textAndMnemonic=Files of &Type: +FileChooser.upFolderToolTip.textAndMnemonic=Up One Level +FileChooser.upFolderAccessibleName=Up +FileChooser.homeFolderToolTip.textAndMnemonic=Home +FileChooser.homeFolderAccessibleName=Home +FileChooser.newFolderToolTip.textAndMnemonic=Create New Folder +FileChooser.newFolderAccessibleName=New Folder +FileChooser.newFolderActionLabel.textAndMnemonic=New Folder +FileChooser.listViewButtonToolTip.textAndMnemonic=List +FileChooser.listViewButtonAccessibleName=List +FileChooser.listViewActionLabel.textAndMnemonic=List +FileChooser.detailsViewButtonToolTip.textAndMnemonic=Details +FileChooser.detailsViewButtonAccessibleName=Details +FileChooser.detailsViewActionLabel.textAndMnemonic=Details +FileChooser.refreshActionLabel.textAndMnemonic=Refresh +FileChooser.viewMenuLabel.textAndMnemonic=View +FileChooser.fileNameHeader.textAndMnemonic=Name +FileChooser.fileSizeHeader.textAndMnemonic=Size +FileChooser.fileTypeHeader.textAndMnemonic=Type +FileChooser.fileDateHeader.textAndMnemonic=Modified +FileChooser.fileAttrHeader.textAndMnemonic=Attributes + +############ Used by MetalTitlePane if rendering window decorations############ +MetalTitlePane.restore.titleAndMnemonic=&Restore +MetalTitlePane.iconify.titleAndMnemonic=Minimiz&e +MetalTitlePane.maximize.titleAndMnemonic=Ma&ximize +MetalTitlePane.close.titleAndMnemonic=&Close diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_de.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_de.properties index 124449e236a..cb8f07ee55c 100644 --- a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_de.properties +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_de.properties @@ -1,61 +1,52 @@ -# This properties file is used to create a PropertyResourceBundle -# It contains Locale specific strings used be the Metal Look and Feel. -# Currently, the following components need this for support: -# -# FileChooser -# -# When this file is read in, the strings are put into the -# defaults table. This is an implementation detail of the current -# workings of Swing. DO NOT DEPEND ON THIS. -# This may change in future versions of Swing as we improve localization -# support. -# -# Refer to the note in basic.properties for a description as to what -# the mnemonics correspond to and how to calculate them. -# -# @author Steve Wilson - - -############ FILE CHOOSER STRINGS ############# - -FileChooser.lookInLabelText=Suchen in: -FileChooser.lookInLabelMnemonic=73 -FileChooser.saveInLabelText=Speichern in: -FileChooser.fileNameLabelText=Dateiname: -FileChooser.fileNameLabelMnemonic=78 -FileChooser.folderNameLabelText=Ordnername: -FileChooser.folderNameLabelMnemonic=78 -FileChooser.filesOfTypeLabelText=Dateityp: -FileChooser.filesOfTypeLabelMnemonic=84 -FileChooser.upFolderToolTipText=Eine Ebene h\u00F6her -FileChooser.upFolderAccessibleName=Nach oben -FileChooser.homeFolderToolTipText=Home -FileChooser.homeFolderAccessibleName=Home -FileChooser.newFolderToolTipText=Neuen Ordner erstellen -FileChooser.newFolderAccessibleName=Neuer Ordner -FileChooser.newFolderActionLabelText=Neuer Ordner -FileChooser.listViewButtonToolTipText=Liste -FileChooser.listViewButtonAccessibleName=Liste -FileChooser.listViewActionLabelText=Liste -FileChooser.detailsViewButtonToolTipText=Details -FileChooser.detailsViewButtonAccessibleName=Details -FileChooser.detailsViewActionLabelText=Details -FileChooser.refreshActionLabelText=Aktualisieren -FileChooser.viewMenuLabelText=Ansicht -FileChooser.fileNameHeaderText=Name -FileChooser.fileSizeHeaderText=Gr\u00F6\u00DFe -FileChooser.fileTypeHeaderText=Typ -FileChooser.fileDateHeaderText=Ge\u00E4ndert -FileChooser.fileAttrHeaderText=Attribute - -############ Used by MetalTitlePane if rendering window decorations############ -# All mnemonics are KeyEvent.VK_XXX as integers -MetalTitlePane.restoreTitle=Wiederherstellen -MetalTitlePane.restoreMnemonic=87 -MetalTitlePane.iconifyTitle=Minimieren -MetalTitlePane.iconifyMnemonic=82 -MetalTitlePane.maximizeTitle=Maximieren -MetalTitlePane.maximizeMnemonic=88 -MetalTitlePane.closeTitle=Schlie\u00DFen -MetalTitlePane.closeMnemonic=83 - +# This properties file is used to create a PropertyResourceBundle +# It contains Locale specific strings used be the Metal Look and Feel. +# Currently, the following components need this for support: +# +# FileChooser +# +# When this file is read in, the strings are put into the +# defaults table. This is an implementation detail of the current +# workings of Swing. DO NOT DEPEND ON THIS. +# This may change in future versions of Swing as we improve localization +# support. +# +# Refer to the note in basic.properties for a description as to what +# the mnemonics correspond to and how to calculate them. +# +# @author Steve Wilson + + +############ FILE CHOOSER STRINGS ############# + +FileChooser.lookInLabel.textAndMnemonic=Suchen &in: +FileChooser.saveInLabel.textAndMnemonic=Speichern in: +FileChooser.fileNameLabel.textAndMnemonic=Datei&name: +FileChooser.folderNameLabel.textAndMnemonic=Ord&nername: +FileChooser.filesOfTypeLabel.textAndMnemonic=Da&teityp: +FileChooser.upFolderToolTip.textAndMnemonic=Eine Ebene h\u00F6her +FileChooser.upFolderAccessibleName=Nach oben +FileChooser.homeFolderToolTip.textAndMnemonic=Home +FileChooser.homeFolderAccessibleName=Home +FileChooser.newFolderToolTip.textAndMnemonic=Neuen Ordner erstellen +FileChooser.newFolderAccessibleName=Neuer Ordner +FileChooser.newFolderActionLabel.textAndMnemonic=Neuer Ordner +FileChooser.listViewButtonToolTip.textAndMnemonic=Liste +FileChooser.listViewButtonAccessibleName=Liste +FileChooser.listViewActionLabel.textAndMnemonic=Liste +FileChooser.detailsViewButtonToolTip.textAndMnemonic=Details +FileChooser.detailsViewButtonAccessibleName=Details +FileChooser.detailsViewActionLabel.textAndMnemonic=Details +FileChooser.refreshActionLabel.textAndMnemonic=Aktualisieren +FileChooser.viewMenuLabel.textAndMnemonic=Ansicht +FileChooser.fileNameHeader.textAndMnemonic=Name +FileChooser.fileSizeHeader.textAndMnemonic=Gr\u00F6\u00DFe +FileChooser.fileTypeHeader.textAndMnemonic=Typ +FileChooser.fileDateHeader.textAndMnemonic=Ge\u00E4ndert +FileChooser.fileAttrHeader.textAndMnemonic=Attribute + +############ Used by MetalTitlePane if rendering window decorations############ +MetalTitlePane.restore.titleAndMnemonic=&Wiederherstellen +MetalTitlePane.iconify.titleAndMnemonic=Minimie&ren +MetalTitlePane.maximize.titleAndMnemonic=Ma&ximieren +MetalTitlePane.close.titleAndMnemonic=Schlie\u00DFen(&S) + diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_es.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_es.properties index 4bfeaaf0e61..16d3a3db0f3 100644 --- a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_es.properties +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_es.properties @@ -1,61 +1,52 @@ -# This properties file is used to create a PropertyResourceBundle -# It contains Locale specific strings used be the Metal Look and Feel. -# Currently, the following components need this for support: -# -# FileChooser -# -# When this file is read in, the strings are put into the -# defaults table. This is an implementation detail of the current -# workings of Swing. DO NOT DEPEND ON THIS. -# This may change in future versions of Swing as we improve localization -# support. -# -# Refer to the note in basic.properties for a description as to what -# the mnemonics correspond to and how to calculate them. -# -# @author Steve Wilson - - -############ FILE CHOOSER STRINGS ############# - -FileChooser.lookInLabelText=Buscar en: -FileChooser.lookInLabelMnemonic=73 -FileChooser.saveInLabelText=Guardar en: -FileChooser.fileNameLabelText=Nombre de Archivo: -FileChooser.fileNameLabelMnemonic=78 -FileChooser.folderNameLabelText=Nombre de la Carpeta: -FileChooser.folderNameLabelMnemonic=78 -FileChooser.filesOfTypeLabelText=Archivos de Tipo: -FileChooser.filesOfTypeLabelMnemonic=84 -FileChooser.upFolderToolTipText=Subir un Nivel -FileChooser.upFolderAccessibleName=Arriba -FileChooser.homeFolderToolTipText=Inicio -FileChooser.homeFolderAccessibleName=Inicio -FileChooser.newFolderToolTipText=Crear Nueva Carpeta -FileChooser.newFolderAccessibleName=Nueva Carpeta -FileChooser.newFolderActionLabelText=Nueva Carpeta -FileChooser.listViewButtonToolTipText=Lista -FileChooser.listViewButtonAccessibleName=Lista -FileChooser.listViewActionLabelText=Lista -FileChooser.detailsViewButtonToolTipText=Detalles -FileChooser.detailsViewButtonAccessibleName=Detalles -FileChooser.detailsViewActionLabelText=Detalles -FileChooser.refreshActionLabelText=Refrescar -FileChooser.viewMenuLabelText=Ver -FileChooser.fileNameHeaderText=Nombre -FileChooser.fileSizeHeaderText=Tama\u00F1o -FileChooser.fileTypeHeaderText=Tipo -FileChooser.fileDateHeaderText=Modificado -FileChooser.fileAttrHeaderText=Atributos - -############ Used by MetalTitlePane if rendering window decorations############ -# All mnemonics are KeyEvent.VK_XXX as integers -MetalTitlePane.restoreTitle=Restaurar -MetalTitlePane.restoreMnemonic=82 -MetalTitlePane.iconifyTitle=Minimizar -MetalTitlePane.iconifyMnemonic=90 -MetalTitlePane.maximizeTitle=Maximizar -MetalTitlePane.maximizeMnemonic=88 -MetalTitlePane.closeTitle=Cerrar -MetalTitlePane.closeMnemonic=67 - +# This properties file is used to create a PropertyResourceBundle +# It contains Locale specific strings used be the Metal Look and Feel. +# Currently, the following components need this for support: +# +# FileChooser +# +# When this file is read in, the strings are put into the +# defaults table. This is an implementation detail of the current +# workings of Swing. DO NOT DEPEND ON THIS. +# This may change in future versions of Swing as we improve localization +# support. +# +# Refer to the note in basic.properties for a description as to what +# the mnemonics correspond to and how to calculate them. +# +# @author Steve Wilson + + +############ FILE CHOOSER STRINGS ############# + +FileChooser.lookInLabel.textAndMnemonic=Buscar en(&I): +FileChooser.saveInLabel.textAndMnemonic=Guardar en: +FileChooser.fileNameLabel.textAndMnemonic=&Nombre de Archivo: +FileChooser.folderNameLabel.textAndMnemonic=&Nombre de la Carpeta: +FileChooser.filesOfTypeLabel.textAndMnemonic=Archivos de &Tipo: +FileChooser.upFolderToolTip.textAndMnemonic=Subir un Nivel +FileChooser.upFolderAccessibleName=Arriba +FileChooser.homeFolderToolTip.textAndMnemonic=Inicio +FileChooser.homeFolderAccessibleName=Inicio +FileChooser.newFolderToolTip.textAndMnemonic=Crear Nueva Carpeta +FileChooser.newFolderAccessibleName=Nueva Carpeta +FileChooser.newFolderActionLabel.textAndMnemonic=Nueva Carpeta +FileChooser.listViewButtonToolTip.textAndMnemonic=Lista +FileChooser.listViewButtonAccessibleName=Lista +FileChooser.listViewActionLabel.textAndMnemonic=Lista +FileChooser.detailsViewButtonToolTip.textAndMnemonic=Detalles +FileChooser.detailsViewButtonAccessibleName=Detalles +FileChooser.detailsViewActionLabel.textAndMnemonic=Detalles +FileChooser.refreshActionLabel.textAndMnemonic=Refrescar +FileChooser.viewMenuLabel.textAndMnemonic=Ver +FileChooser.fileNameHeader.textAndMnemonic=Nombre +FileChooser.fileSizeHeader.textAndMnemonic=Tama\u00F1o +FileChooser.fileTypeHeader.textAndMnemonic=Tipo +FileChooser.fileDateHeader.textAndMnemonic=Modificado +FileChooser.fileAttrHeader.textAndMnemonic=Atributos + +############ Used by MetalTitlePane if rendering window decorations############ +MetalTitlePane.restore.titleAndMnemonic=&Restaurar +MetalTitlePane.iconify.titleAndMnemonic=Minimi&zar +MetalTitlePane.maximize.titleAndMnemonic=Ma&ximizar +MetalTitlePane.close.titleAndMnemonic=&Cerrar + diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_fr.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_fr.properties index 2f91a500365..aed395ef647 100644 --- a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_fr.properties +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_fr.properties @@ -1,61 +1,52 @@ -# This properties file is used to create a PropertyResourceBundle -# It contains Locale specific strings used be the Metal Look and Feel. -# Currently, the following components need this for support: -# -# FileChooser -# -# When this file is read in, the strings are put into the -# defaults table. This is an implementation detail of the current -# workings of Swing. DO NOT DEPEND ON THIS. -# This may change in future versions of Swing as we improve localization -# support. -# -# Refer to the note in basic.properties for a description as to what -# the mnemonics correspond to and how to calculate them. -# -# @author Steve Wilson - - -############ FILE CHOOSER STRINGS ############# - -FileChooser.lookInLabelText=Rechercher dans : -FileChooser.lookInLabelMnemonic=73 -FileChooser.saveInLabelText=Enregistrer dans : -FileChooser.fileNameLabelText=Nom du fichier : -FileChooser.fileNameLabelMnemonic=78 -FileChooser.folderNameLabelText=Nom du dossier : -FileChooser.folderNameLabelMnemonic=78 -FileChooser.filesOfTypeLabelText=Fichiers de type : -FileChooser.filesOfTypeLabelMnemonic=84 -FileChooser.upFolderToolTipText=Remonte d'un niveau. -FileChooser.upFolderAccessibleName=Monter -FileChooser.homeFolderToolTipText=R\u00E9pertoire d'origine -FileChooser.homeFolderAccessibleName=R\u00E9pertoire d'origine -FileChooser.newFolderToolTipText=Cr\u00E9e un dossier. -FileChooser.newFolderAccessibleName=Nouveau dossier -FileChooser.newFolderActionLabelText=Nouveau dossier -FileChooser.listViewButtonToolTipText=Liste -FileChooser.listViewButtonAccessibleName=Liste -FileChooser.listViewActionLabelText=Liste -FileChooser.detailsViewButtonToolTipText=D\u00E9tails -FileChooser.detailsViewButtonAccessibleName=D\u00E9tails -FileChooser.detailsViewActionLabelText=D\u00E9tails -FileChooser.refreshActionLabelText=Actualiser -FileChooser.viewMenuLabelText=Affichage -FileChooser.fileNameHeaderText=Nom -FileChooser.fileSizeHeaderText=Taille -FileChooser.fileTypeHeaderText=Type -FileChooser.fileDateHeaderText=Modifi\u00E9 -FileChooser.fileAttrHeaderText=Attributs - -############ Used by MetalTitlePane if rendering window decorations############ -# All mnemonics are KeyEvent.VK_XXX as integers -MetalTitlePane.restoreTitle=Restaurer -MetalTitlePane.restoreMnemonic=82 -MetalTitlePane.iconifyTitle=R\u00E9duire -MetalTitlePane.iconifyMnemonic=68 -MetalTitlePane.maximizeTitle=Agrandir -MetalTitlePane.maximizeMnemonic=65 -MetalTitlePane.closeTitle=Fermer -MetalTitlePane.closeMnemonic=70 - +# This properties file is used to create a PropertyResourceBundle +# It contains Locale specific strings used be the Metal Look and Feel. +# Currently, the following components need this for support: +# +# FileChooser +# +# When this file is read in, the strings are put into the +# defaults table. This is an implementation detail of the current +# workings of Swing. DO NOT DEPEND ON THIS. +# This may change in future versions of Swing as we improve localization +# support. +# +# Refer to the note in basic.properties for a description as to what +# the mnemonics correspond to and how to calculate them. +# +# @author Steve Wilson + + +############ FILE CHOOSER STRINGS ############# + +FileChooser.lookInLabel.textAndMnemonic=Rechercher dans (&I): +FileChooser.saveInLabel.textAndMnemonic=Enregistrer dans : +FileChooser.fileNameLabel.textAndMnemonic=&Nom du fichier : +FileChooser.folderNameLabel.textAndMnemonic=&Nom du dossier : +FileChooser.filesOfTypeLabel.textAndMnemonic=Fichiers de &type : +FileChooser.upFolderToolTip.textAndMnemonic=Remonte d'un niveau. +FileChooser.upFolderAccessibleName=Monter +FileChooser.homeFolderToolTip.textAndMnemonic=R\u00E9pertoire d'origine +FileChooser.homeFolderAccessibleName=R\u00E9pertoire d'origine +FileChooser.newFolderToolTip.textAndMnemonic=Cr\u00E9e un dossier. +FileChooser.newFolderAccessibleName=Nouveau dossier +FileChooser.newFolderActionLabel.textAndMnemonic=Nouveau dossier +FileChooser.listViewButtonToolTip.textAndMnemonic=Liste +FileChooser.listViewButtonAccessibleName=Liste +FileChooser.listViewActionLabel.textAndMnemonic=Liste +FileChooser.detailsViewButtonToolTip.textAndMnemonic=D\u00E9tails +FileChooser.detailsViewButtonAccessibleName=D\u00E9tails +FileChooser.detailsViewActionLabel.textAndMnemonic=D\u00E9tails +FileChooser.refreshActionLabel.textAndMnemonic=Actualiser +FileChooser.viewMenuLabel.textAndMnemonic=Affichage +FileChooser.fileNameHeader.textAndMnemonic=Nom +FileChooser.fileSizeHeader.textAndMnemonic=Taille +FileChooser.fileTypeHeader.textAndMnemonic=Type +FileChooser.fileDateHeader.textAndMnemonic=Modifi\u00E9 +FileChooser.fileAttrHeader.textAndMnemonic=Attributs + +############ Used by MetalTitlePane if rendering window decorations############ +MetalTitlePane.restore.titleAndMnemonic=&Restaurer +MetalTitlePane.iconify.titleAndMnemonic=R\u00E9duire(&D) +MetalTitlePane.maximize.titleAndMnemonic=&Agrandir +MetalTitlePane.close.titleAndMnemonic=&Fermer + diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_it.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_it.properties index b0bd9f03070..83dadeae3b9 100644 --- a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_it.properties +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_it.properties @@ -1,61 +1,52 @@ -# This properties file is used to create a PropertyResourceBundle -# It contains Locale specific strings used be the Metal Look and Feel. -# Currently, the following components need this for support: -# -# FileChooser -# -# When this file is read in, the strings are put into the -# defaults table. This is an implementation detail of the current -# workings of Swing. DO NOT DEPEND ON THIS. -# This may change in future versions of Swing as we improve localization -# support. -# -# Refer to the note in basic.properties for a description as to what -# the mnemonics correspond to and how to calculate them. -# -# @author Steve Wilson - - -############ FILE CHOOSER STRINGS ############# - -FileChooser.lookInLabelText=Cerca in: -FileChooser.lookInLabelMnemonic=73 -FileChooser.saveInLabelText=Salva in: -FileChooser.fileNameLabelText=Nome file: -FileChooser.fileNameLabelMnemonic=78 -FileChooser.folderNameLabelText=Nome della cartella: -FileChooser.folderNameLabelMnemonic=78 -FileChooser.filesOfTypeLabelText=Tipo file: -FileChooser.filesOfTypeLabelMnemonic=84 -FileChooser.upFolderToolTipText=Cartella superiore -FileChooser.upFolderAccessibleName=Superiore -FileChooser.homeFolderToolTipText=Home -FileChooser.homeFolderAccessibleName=Home -FileChooser.newFolderToolTipText=Crea nuova cartella -FileChooser.newFolderAccessibleName=Nuova cartella -FileChooser.newFolderActionLabelText=Nuova cartella -FileChooser.listViewButtonToolTipText=Lista -FileChooser.listViewButtonAccessibleName=Lista -FileChooser.listViewActionLabelText=Lista -FileChooser.detailsViewButtonToolTipText=Dettagli -FileChooser.detailsViewButtonAccessibleName=Dettagli -FileChooser.detailsViewActionLabelText=Dettagli -FileChooser.refreshActionLabelText=Aggiorna -FileChooser.viewMenuLabelText=Visualizza -FileChooser.fileNameHeaderText=Nome -FileChooser.fileSizeHeaderText=Dimensioni -FileChooser.fileTypeHeaderText=Tipo -FileChooser.fileDateHeaderText=Modificato -FileChooser.fileAttrHeaderText=Attributi - -############ Used by MetalTitlePane if rendering window decorations############ -# All mnemonics are KeyEvent.VK_XXX as integers -MetalTitlePane.restoreTitle=Ripristina -MetalTitlePane.restoreMnemonic=82 -MetalTitlePane.iconifyTitle=Riduci a icona -MetalTitlePane.iconifyMnemonic=85 -MetalTitlePane.maximizeTitle=Ingrandisci -MetalTitlePane.maximizeMnemonic=71 -MetalTitlePane.closeTitle=Chiudi -MetalTitlePane.closeMnemonic=67 - +# This properties file is used to create a PropertyResourceBundle +# It contains Locale specific strings used be the Metal Look and Feel. +# Currently, the following components need this for support: +# +# FileChooser +# +# When this file is read in, the strings are put into the +# defaults table. This is an implementation detail of the current +# workings of Swing. DO NOT DEPEND ON THIS. +# This may change in future versions of Swing as we improve localization +# support. +# +# Refer to the note in basic.properties for a description as to what +# the mnemonics correspond to and how to calculate them. +# +# @author Steve Wilson + + +############ FILE CHOOSER STRINGS ############# + +FileChooser.lookInLabel.textAndMnemonic=Cerca &in: +FileChooser.saveInLabel.textAndMnemonic=Salva in: +FileChooser.fileNameLabel.textAndMnemonic=&Nome file: +FileChooser.folderNameLabel.textAndMnemonic=&Nome della cartella: +FileChooser.filesOfTypeLabel.textAndMnemonic=&Tipo file: +FileChooser.upFolderToolTip.textAndMnemonic=Cartella superiore +FileChooser.upFolderAccessibleName=Superiore +FileChooser.homeFolderToolTip.textAndMnemonic=Home +FileChooser.homeFolderAccessibleName=Home +FileChooser.newFolderToolTip.textAndMnemonic=Crea nuova cartella +FileChooser.newFolderAccessibleName=Nuova cartella +FileChooser.newFolderActionLabel.textAndMnemonic=Nuova cartella +FileChooser.listViewButtonToolTip.textAndMnemonic=Lista +FileChooser.listViewButtonAccessibleName=Lista +FileChooser.listViewActionLabel.textAndMnemonic=Lista +FileChooser.detailsViewButtonToolTip.textAndMnemonic=Dettagli +FileChooser.detailsViewButtonAccessibleName=Dettagli +FileChooser.detailsViewActionLabel.textAndMnemonic=Dettagli +FileChooser.refreshActionLabel.textAndMnemonic=Aggiorna +FileChooser.viewMenuLabel.textAndMnemonic=Visualizza +FileChooser.fileNameHeader.textAndMnemonic=Nome +FileChooser.fileSizeHeader.textAndMnemonic=Dimensioni +FileChooser.fileTypeHeader.textAndMnemonic=Tipo +FileChooser.fileDateHeader.textAndMnemonic=Modificato +FileChooser.fileAttrHeader.textAndMnemonic=Attributi + +############ Used by MetalTitlePane if rendering window decorations############ +MetalTitlePane.restore.titleAndMnemonic=&Ripristina +MetalTitlePane.iconify.titleAndMnemonic=Rid&uci a icona +MetalTitlePane.maximize.titleAndMnemonic=In&grandisci +MetalTitlePane.close.titleAndMnemonic=&Chiudi + diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ja.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ja.properties index 4e467cec4db..51e2a47b5f7 100644 --- a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ja.properties +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ja.properties @@ -1,61 +1,52 @@ -# This properties file is used to create a PropertyResourceBundle -# It contains Locale specific strings used be the Metal Look and Feel. -# Currently, the following components need this for support: -# -# FileChooser -# -# When this file is read in, the strings are put into the -# defaults table. This is an implementation detail of the current -# workings of Swing. DO NOT DEPEND ON THIS. -# This may change in future versions of Swing as we improve localization -# support. -# -# Refer to the note in basic.properties for a description as to what -# the mnemonics correspond to and how to calculate them. -# -# @author Steve Wilson - - -############ FILE CHOOSER STRINGS ############# - -FileChooser.lookInLabelText=\u53C2\u7167: -FileChooser.lookInLabelMnemonic=73 -FileChooser.saveInLabelText=\u4FDD\u5B58: -FileChooser.fileNameLabelText=\u30D5\u30A1\u30A4\u30EB\u540D: -FileChooser.fileNameLabelMnemonic=78 -FileChooser.folderNameLabelText=\u30D5\u30A9\u30EB\u30C0\u540D: -FileChooser.folderNameLabelMnemonic=78 -FileChooser.filesOfTypeLabelText=\u30D5\u30A1\u30A4\u30EB\u306E\u30BF\u30A4\u30D7: -FileChooser.filesOfTypeLabelMnemonic=84 -FileChooser.upFolderToolTipText=1\u30EC\u30D9\u30EB\u4E0A\u3078 -FileChooser.upFolderAccessibleName=\u4E0A\u3078 -FileChooser.homeFolderToolTipText=\u30DB\u30FC\u30E0 -FileChooser.homeFolderAccessibleName=\u30DB\u30FC\u30E0 -FileChooser.newFolderToolTipText=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0\u306E\u4F5C\u6210 -FileChooser.newFolderAccessibleName=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0 -FileChooser.newFolderActionLabelText=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0 -FileChooser.listViewButtonToolTipText=\u30EA\u30B9\u30C8 -FileChooser.listViewButtonAccessibleName=\u30EA\u30B9\u30C8 -FileChooser.listViewActionLabelText=\u30EA\u30B9\u30C8 -FileChooser.detailsViewButtonToolTipText=\u8A73\u7D30 -FileChooser.detailsViewButtonAccessibleName=\u8A73\u7D30 -FileChooser.detailsViewActionLabelText=\u8A73\u7D30 -FileChooser.refreshActionLabelText=\u30EA\u30D5\u30EC\u30C3\u30B7\u30E5 -FileChooser.viewMenuLabelText=\u8868\u793A -FileChooser.fileNameHeaderText=\u540D\u524D -FileChooser.fileSizeHeaderText=\u30B5\u30A4\u30BA -FileChooser.fileTypeHeaderText=\u30BF\u30A4\u30D7 -FileChooser.fileDateHeaderText=\u4FEE\u6B63\u65E5 -FileChooser.fileAttrHeaderText=\u5C5E\u6027 - -############ Used by MetalTitlePane if rendering window decorations############ -# All mnemonics are KeyEvent.VK_XXX as integers -MetalTitlePane.restoreTitle=\u5FA9\u5143(R) -MetalTitlePane.restoreMnemonic=82 -MetalTitlePane.iconifyTitle=\u6700\u5C0F\u5316(E) -MetalTitlePane.iconifyMnemonic=69 -MetalTitlePane.maximizeTitle=\u6700\u5927\u5316(X) -MetalTitlePane.maximizeMnemonic=88 -MetalTitlePane.closeTitle=\u9589\u3058\u308B(C) -MetalTitlePane.closeMnemonic=67 - +# This properties file is used to create a PropertyResourceBundle +# It contains Locale specific strings used be the Metal Look and Feel. +# Currently, the following components need this for support: +# +# FileChooser +# +# When this file is read in, the strings are put into the +# defaults table. This is an implementation detail of the current +# workings of Swing. DO NOT DEPEND ON THIS. +# This may change in future versions of Swing as we improve localization +# support. +# +# Refer to the note in basic.properties for a description as to what +# the mnemonics correspond to and how to calculate them. +# +# @author Steve Wilson + + +############ FILE CHOOSER STRINGS ############# + +FileChooser.lookInLabel.textAndMnemonic=\u53C2\u7167(&I): +FileChooser.saveInLabel.textAndMnemonic=\u4FDD\u5B58: +FileChooser.fileNameLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u540D(&N): +FileChooser.folderNameLabel.textAndMnemonic=\u30D5\u30A9\u30EB\u30C0\u540D(&N): +FileChooser.filesOfTypeLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u306E\u30BF\u30A4\u30D7(&T): +FileChooser.upFolderToolTip.textAndMnemonic=1\u30EC\u30D9\u30EB\u4E0A\u3078 +FileChooser.upFolderAccessibleName=\u4E0A\u3078 +FileChooser.homeFolderToolTip.textAndMnemonic=\u30DB\u30FC\u30E0 +FileChooser.homeFolderAccessibleName=\u30DB\u30FC\u30E0 +FileChooser.newFolderToolTip.textAndMnemonic=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0\u306E\u4F5C\u6210 +FileChooser.newFolderAccessibleName=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0 +FileChooser.newFolderActionLabel.textAndMnemonic=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0 +FileChooser.listViewButtonToolTip.textAndMnemonic=\u30EA\u30B9\u30C8 +FileChooser.listViewButtonAccessibleName=\u30EA\u30B9\u30C8 +FileChooser.listViewActionLabel.textAndMnemonic=\u30EA\u30B9\u30C8 +FileChooser.detailsViewButtonToolTip.textAndMnemonic=\u8A73\u7D30 +FileChooser.detailsViewButtonAccessibleName=\u8A73\u7D30 +FileChooser.detailsViewActionLabel.textAndMnemonic=\u8A73\u7D30 +FileChooser.refreshActionLabel.textAndMnemonic=\u30EA\u30D5\u30EC\u30C3\u30B7\u30E5 +FileChooser.viewMenuLabel.textAndMnemonic=\u8868\u793A +FileChooser.fileNameHeader.textAndMnemonic=\u540D\u524D +FileChooser.fileSizeHeader.textAndMnemonic=\u30B5\u30A4\u30BA +FileChooser.fileTypeHeader.textAndMnemonic=\u30BF\u30A4\u30D7 +FileChooser.fileDateHeader.textAndMnemonic=\u4FEE\u6B63\u65E5 +FileChooser.fileAttrHeader.textAndMnemonic=\u5C5E\u6027 + +############ Used by MetalTitlePane if rendering window decorations############ +MetalTitlePane.restore.titleAndMnemonic=\u5FA9\u5143(&R) +MetalTitlePane.iconify.titleAndMnemonic=\u6700\u5C0F\u5316(&E) +MetalTitlePane.maximize.titleAndMnemonic=\u6700\u5927\u5316(&X) +MetalTitlePane.close.titleAndMnemonic=\u9589\u3058\u308B(&C) + diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ko.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ko.properties index 3cd5e20da12..af433f5401b 100644 --- a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ko.properties +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ko.properties @@ -1,61 +1,52 @@ -# This properties file is used to create a PropertyResourceBundle -# It contains Locale specific strings used be the Metal Look and Feel. -# Currently, the following components need this for support: -# -# FileChooser -# -# When this file is read in, the strings are put into the -# defaults table. This is an implementation detail of the current -# workings of Swing. DO NOT DEPEND ON THIS. -# This may change in future versions of Swing as we improve localization -# support. -# -# Refer to the note in basic.properties for a description as to what -# the mnemonics correspond to and how to calculate them. -# -# @author Steve Wilson - - -############ FILE CHOOSER STRINGS ############# - -FileChooser.lookInLabelText=\uAC80\uC0C9 \uC704\uCE58: -FileChooser.lookInLabelMnemonic=73 -FileChooser.saveInLabelText=\uC800\uC7A5 \uC704\uCE58: -FileChooser.fileNameLabelText=\uD30C\uC77C \uC774\uB984: -FileChooser.fileNameLabelMnemonic=78 -FileChooser.folderNameLabelText=\uD3F4\uB354 \uC774\uB984: -FileChooser.folderNameLabelMnemonic=78 -FileChooser.filesOfTypeLabelText=\uD30C\uC77C \uC720\uD615: -FileChooser.filesOfTypeLabelMnemonic=84 -FileChooser.upFolderToolTipText=\uD55C \uB808\uBCA8 \uC704\uB85C -FileChooser.upFolderAccessibleName=\uC704\uB85C -FileChooser.homeFolderToolTipText=\uD648 -FileChooser.homeFolderAccessibleName=\uD648 -FileChooser.newFolderToolTipText=\uC0C8 \uD3F4\uB354 \uC0DD\uC131 -FileChooser.newFolderAccessibleName=\uC0C8 \uD3F4\uB354 -FileChooser.newFolderActionLabelText=\uC0C8 \uD3F4\uB354 -FileChooser.listViewButtonToolTipText=\uBAA9\uB85D -FileChooser.listViewButtonAccessibleName=\uBAA9\uB85D -FileChooser.listViewActionLabelText=\uBAA9\uB85D -FileChooser.detailsViewButtonToolTipText=\uC138\uBD80 \uC815\uBCF4 -FileChooser.detailsViewButtonAccessibleName=\uC138\uBD80 \uC815\uBCF4 -FileChooser.detailsViewActionLabelText=\uC138\uBD80 \uC815\uBCF4 -FileChooser.refreshActionLabelText=\uC0C8\uB85C \uACE0\uCE68 -FileChooser.viewMenuLabelText=\uBCF4\uAE30 -FileChooser.fileNameHeaderText=\uC774\uB984 -FileChooser.fileSizeHeaderText=\uD06C\uAE30 -FileChooser.fileTypeHeaderText=\uC720\uD615 -FileChooser.fileDateHeaderText=\uC218\uC815 \uB0A0\uC9DC -FileChooser.fileAttrHeaderText=\uC18D\uC131 - -############ Used by MetalTitlePane if rendering window decorations############ -# All mnemonics are KeyEvent.VK_XXX as integers -MetalTitlePane.restoreTitle=\uBCF5\uC6D0(R) -MetalTitlePane.restoreMnemonic=82 -MetalTitlePane.iconifyTitle=\uCD5C\uC18C\uD654(E) -MetalTitlePane.iconifyMnemonic=69 -MetalTitlePane.maximizeTitle=\uCD5C\uB300\uD654(X) -MetalTitlePane.maximizeMnemonic=88 -MetalTitlePane.closeTitle=\uB2EB\uAE30(C) -MetalTitlePane.closeMnemonic=67 - +# This properties file is used to create a PropertyResourceBundle +# It contains Locale specific strings used be the Metal Look and Feel. +# Currently, the following components need this for support: +# +# FileChooser +# +# When this file is read in, the strings are put into the +# defaults table. This is an implementation detail of the current +# workings of Swing. DO NOT DEPEND ON THIS. +# This may change in future versions of Swing as we improve localization +# support. +# +# Refer to the note in basic.properties for a description as to what +# the mnemonics correspond to and how to calculate them. +# +# @author Steve Wilson + + +############ FILE CHOOSER STRINGS ############# + +FileChooser.lookInLabel.textAndMnemonic=\uAC80\uC0C9 \uC704\uCE58(&I): +FileChooser.saveInLabel.textAndMnemonic=\uC800\uC7A5 \uC704\uCE58: +FileChooser.fileNameLabel.textAndMnemonic=\uD30C\uC77C \uC774\uB984(&N): +FileChooser.folderNameLabel.textAndMnemonic=\uD3F4\uB354 \uC774\uB984(&N): +FileChooser.filesOfTypeLabel.textAndMnemonic=\uD30C\uC77C \uC720\uD615(&T): +FileChooser.upFolderToolTip.textAndMnemonic=\uD55C \uB808\uBCA8 \uC704\uB85C +FileChooser.upFolderAccessibleName=\uC704\uB85C +FileChooser.homeFolderToolTip.textAndMnemonic=\uD648 +FileChooser.homeFolderAccessibleName=\uD648 +FileChooser.newFolderToolTip.textAndMnemonic=\uC0C8 \uD3F4\uB354 \uC0DD\uC131 +FileChooser.newFolderAccessibleName=\uC0C8 \uD3F4\uB354 +FileChooser.newFolderActionLabel.textAndMnemonic=\uC0C8 \uD3F4\uB354 +FileChooser.listViewButtonToolTip.textAndMnemonic=\uBAA9\uB85D +FileChooser.listViewButtonAccessibleName=\uBAA9\uB85D +FileChooser.listViewActionLabel.textAndMnemonic=\uBAA9\uB85D +FileChooser.detailsViewButtonToolTip.textAndMnemonic=\uC138\uBD80 \uC815\uBCF4 +FileChooser.detailsViewButtonAccessibleName=\uC138\uBD80 \uC815\uBCF4 +FileChooser.detailsViewActionLabel.textAndMnemonic=\uC138\uBD80 \uC815\uBCF4 +FileChooser.refreshActionLabel.textAndMnemonic=\uC0C8\uB85C \uACE0\uCE68 +FileChooser.viewMenuLabel.textAndMnemonic=\uBCF4\uAE30 +FileChooser.fileNameHeader.textAndMnemonic=\uC774\uB984 +FileChooser.fileSizeHeader.textAndMnemonic=\uD06C\uAE30 +FileChooser.fileTypeHeader.textAndMnemonic=\uC720\uD615 +FileChooser.fileDateHeader.textAndMnemonic=\uC218\uC815 \uB0A0\uC9DC +FileChooser.fileAttrHeader.textAndMnemonic=\uC18D\uC131 + +############ Used by MetalTitlePane if rendering window decorations############ +MetalTitlePane.restore.titleAndMnemonic=\uBCF5\uC6D0(&R) +MetalTitlePane.iconify.titleAndMnemonic=\uCD5C\uC18C\uD654(&E) +MetalTitlePane.maximize.titleAndMnemonic=\uCD5C\uB300\uD654(&X) +MetalTitlePane.close.titleAndMnemonic=\uB2EB\uAE30(&C) + diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_pt_BR.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_pt_BR.properties index 903f1d1bae0..81d1813dea5 100644 --- a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_pt_BR.properties +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_pt_BR.properties @@ -1,61 +1,52 @@ -# This properties file is used to create a PropertyResourceBundle -# It contains Locale specific strings used be the Metal Look and Feel. -# Currently, the following components need this for support: -# -# FileChooser -# -# When this file is read in, the strings are put into the -# defaults table. This is an implementation detail of the current -# workings of Swing. DO NOT DEPEND ON THIS. -# This may change in future versions of Swing as we improve localization -# support. -# -# Refer to the note in basic.properties for a description as to what -# the mnemonics correspond to and how to calculate them. -# -# @author Steve Wilson - - -############ FILE CHOOSER STRINGS ############# - -FileChooser.lookInLabelText=Consultar Em: -FileChooser.lookInLabelMnemonic=73 -FileChooser.saveInLabelText=Salvar Em: -FileChooser.fileNameLabelText=Nome do Arquivo: -FileChooser.fileNameLabelMnemonic=78 -FileChooser.folderNameLabelText=Nome da pasta: -FileChooser.folderNameLabelMnemonic=78 -FileChooser.filesOfTypeLabelText=Arquivos do Tipo: -FileChooser.filesOfTypeLabelMnemonic=84 -FileChooser.upFolderToolTipText=Um N\u00EDvel Acima -FileChooser.upFolderAccessibleName=Acima -FileChooser.homeFolderToolTipText=In\u00EDcio -FileChooser.homeFolderAccessibleName=In\u00EDcio -FileChooser.newFolderToolTipText=Criar Nova Pasta -FileChooser.newFolderAccessibleName=Nova Pasta -FileChooser.newFolderActionLabelText=Nova Pasta -FileChooser.listViewButtonToolTipText=Lista -FileChooser.listViewButtonAccessibleName=Lista -FileChooser.listViewActionLabelText=Lista -FileChooser.detailsViewButtonToolTipText=Detalhes -FileChooser.detailsViewButtonAccessibleName=Detalhes -FileChooser.detailsViewActionLabelText=Detalhes -FileChooser.refreshActionLabelText=Atualizar -FileChooser.viewMenuLabelText=Exibir -FileChooser.fileNameHeaderText=Nome -FileChooser.fileSizeHeaderText=Tamanho -FileChooser.fileTypeHeaderText=Tipo -FileChooser.fileDateHeaderText=Modificado -FileChooser.fileAttrHeaderText=Atributos - -############ Used by MetalTitlePane if rendering window decorations############ -# All mnemonics are KeyEvent.VK_XXX as integers -MetalTitlePane.restoreTitle=Restaurar -MetalTitlePane.restoreMnemonic=82 -MetalTitlePane.iconifyTitle=Minimizar -MetalTitlePane.iconifyMnemonic=77 -MetalTitlePane.maximizeTitle=Maximizar -MetalTitlePane.maximizeMnemonic=88 -MetalTitlePane.closeTitle=Fechar -MetalTitlePane.closeMnemonic=70 - +# This properties file is used to create a PropertyResourceBundle +# It contains Locale specific strings used be the Metal Look and Feel. +# Currently, the following components need this for support: +# +# FileChooser +# +# When this file is read in, the strings are put into the +# defaults table. This is an implementation detail of the current +# workings of Swing. DO NOT DEPEND ON THIS. +# This may change in future versions of Swing as we improve localization +# support. +# +# Refer to the note in basic.properties for a description as to what +# the mnemonics correspond to and how to calculate them. +# +# @author Steve Wilson + + +############ FILE CHOOSER STRINGS ############# + +FileChooser.lookInLabel.textAndMnemonic=Consultar Em(&I): +FileChooser.saveInLabel.textAndMnemonic=Salvar Em: +FileChooser.fileNameLabel.textAndMnemonic=&Nome do Arquivo: +FileChooser.folderNameLabel.textAndMnemonic=&Nome da pasta: +FileChooser.filesOfTypeLabel.textAndMnemonic=Arquivos do &Tipo: +FileChooser.upFolderToolTip.textAndMnemonic=Um N\u00EDvel Acima +FileChooser.upFolderAccessibleName=Acima +FileChooser.homeFolderToolTip.textAndMnemonic=In\u00EDcio +FileChooser.homeFolderAccessibleName=In\u00EDcio +FileChooser.newFolderToolTip.textAndMnemonic=Criar Nova Pasta +FileChooser.newFolderAccessibleName=Nova Pasta +FileChooser.newFolderActionLabel.textAndMnemonic=Nova Pasta +FileChooser.listViewButtonToolTip.textAndMnemonic=Lista +FileChooser.listViewButtonAccessibleName=Lista +FileChooser.listViewActionLabel.textAndMnemonic=Lista +FileChooser.detailsViewButtonToolTip.textAndMnemonic=Detalhes +FileChooser.detailsViewButtonAccessibleName=Detalhes +FileChooser.detailsViewActionLabel.textAndMnemonic=Detalhes +FileChooser.refreshActionLabel.textAndMnemonic=Atualizar +FileChooser.viewMenuLabel.textAndMnemonic=Exibir +FileChooser.fileNameHeader.textAndMnemonic=Nome +FileChooser.fileSizeHeader.textAndMnemonic=Tamanho +FileChooser.fileTypeHeader.textAndMnemonic=Tipo +FileChooser.fileDateHeader.textAndMnemonic=Modificado +FileChooser.fileAttrHeader.textAndMnemonic=Atributos + +############ Used by MetalTitlePane if rendering window decorations############ +MetalTitlePane.restore.titleAndMnemonic=&Restaurar +MetalTitlePane.iconify.titleAndMnemonic=&Minimizar +MetalTitlePane.maximize.titleAndMnemonic=Ma&ximizar +MetalTitlePane.close.titleAndMnemonic=&Fechar + diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_sv.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_sv.properties index 0f76c987f12..9caa9619969 100644 --- a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_sv.properties +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_sv.properties @@ -1,61 +1,52 @@ -# This properties file is used to create a PropertyResourceBundle -# It contains Locale specific strings used be the Metal Look and Feel. -# Currently, the following components need this for support: -# -# FileChooser -# -# When this file is read in, the strings are put into the -# defaults table. This is an implementation detail of the current -# workings of Swing. DO NOT DEPEND ON THIS. -# This may change in future versions of Swing as we improve localization -# support. -# -# Refer to the note in basic.properties for a description as to what -# the mnemonics correspond to and how to calculate them. -# -# @author Steve Wilson - - -############ FILE CHOOSER STRINGS ############# - -FileChooser.lookInLabelText=Leta i: -FileChooser.lookInLabelMnemonic=73 -FileChooser.saveInLabelText=Spara i: -FileChooser.fileNameLabelText=Filnamn: -FileChooser.fileNameLabelMnemonic=78 -FileChooser.folderNameLabelText=Mapp: -FileChooser.folderNameLabelMnemonic=78 -FileChooser.filesOfTypeLabelText=Filformat: -FileChooser.filesOfTypeLabelMnemonic=84 -FileChooser.upFolderToolTipText=Upp en niv\u00E5 -FileChooser.upFolderAccessibleName=Upp -FileChooser.homeFolderToolTipText=Hem -FileChooser.homeFolderAccessibleName=Hem -FileChooser.newFolderToolTipText=Skapa ny mapp -FileChooser.newFolderAccessibleName=Ny mapp -FileChooser.newFolderActionLabelText=Ny mapp -FileChooser.listViewButtonToolTipText=Lista -FileChooser.listViewButtonAccessibleName=Lista -FileChooser.listViewActionLabelText=Lista -FileChooser.detailsViewButtonToolTipText=Detaljer -FileChooser.detailsViewButtonAccessibleName=Detaljer -FileChooser.detailsViewActionLabelText=Detaljer -FileChooser.refreshActionLabelText=F\u00F6rnya -FileChooser.viewMenuLabelText=Vy -FileChooser.fileNameHeaderText=Namn -FileChooser.fileSizeHeaderText=Storlek -FileChooser.fileTypeHeaderText=Typ -FileChooser.fileDateHeaderText=\u00C4ndrad -FileChooser.fileAttrHeaderText=Attribut - -############ Used by MetalTitlePane if rendering window decorations############ -# All mnemonics are KeyEvent.VK_XXX as integers -MetalTitlePane.restoreTitle=\u00C5terst\u00E4ll -MetalTitlePane.restoreMnemonic=82 -MetalTitlePane.iconifyTitle=Minimera -MetalTitlePane.iconifyMnemonic=69 -MetalTitlePane.maximizeTitle=Maximera -MetalTitlePane.maximizeMnemonic=88 -MetalTitlePane.closeTitle=St\u00E4ng -MetalTitlePane.closeMnemonic=83 - +# This properties file is used to create a PropertyResourceBundle +# It contains Locale specific strings used be the Metal Look and Feel. +# Currently, the following components need this for support: +# +# FileChooser +# +# When this file is read in, the strings are put into the +# defaults table. This is an implementation detail of the current +# workings of Swing. DO NOT DEPEND ON THIS. +# This may change in future versions of Swing as we improve localization +# support. +# +# Refer to the note in basic.properties for a description as to what +# the mnemonics correspond to and how to calculate them. +# +# @author Steve Wilson + + +############ FILE CHOOSER STRINGS ############# + +FileChooser.lookInLabel.textAndMnemonic=Leta &i: +FileChooser.saveInLabel.textAndMnemonic=Spara i: +FileChooser.fileNameLabel.textAndMnemonic=Fil&namn: +FileChooser.folderNameLabel.textAndMnemonic=Mapp(&N): +FileChooser.filesOfTypeLabel.textAndMnemonic=Filforma&t: +FileChooser.upFolderToolTip.textAndMnemonic=Upp en niv\u00E5 +FileChooser.upFolderAccessibleName=Upp +FileChooser.homeFolderToolTip.textAndMnemonic=Hem +FileChooser.homeFolderAccessibleName=Hem +FileChooser.newFolderToolTip.textAndMnemonic=Skapa ny mapp +FileChooser.newFolderAccessibleName=Ny mapp +FileChooser.newFolderActionLabel.textAndMnemonic=Ny mapp +FileChooser.listViewButtonToolTip.textAndMnemonic=Lista +FileChooser.listViewButtonAccessibleName=Lista +FileChooser.listViewActionLabel.textAndMnemonic=Lista +FileChooser.detailsViewButtonToolTip.textAndMnemonic=Detaljer +FileChooser.detailsViewButtonAccessibleName=Detaljer +FileChooser.detailsViewActionLabel.textAndMnemonic=Detaljer +FileChooser.refreshActionLabel.textAndMnemonic=F\u00F6rnya +FileChooser.viewMenuLabel.textAndMnemonic=Vy +FileChooser.fileNameHeader.textAndMnemonic=Namn +FileChooser.fileSizeHeader.textAndMnemonic=Storlek +FileChooser.fileTypeHeader.textAndMnemonic=Typ +FileChooser.fileDateHeader.textAndMnemonic=\u00C4ndrad +FileChooser.fileAttrHeader.textAndMnemonic=Attribut + +############ Used by MetalTitlePane if rendering window decorations############ +MetalTitlePane.restore.titleAndMnemonic=\u00C5terst\u00E4ll(&R) +MetalTitlePane.iconify.titleAndMnemonic=Minim&era +MetalTitlePane.maximize.titleAndMnemonic=Ma&ximera +MetalTitlePane.close.titleAndMnemonic=St\u00E4ng(&S) + diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_CN.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_CN.properties index 73405a09398..c4aad838863 100644 --- a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_CN.properties +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_CN.properties @@ -1,61 +1,52 @@ -# This properties file is used to create a PropertyResourceBundle -# It contains Locale specific strings used be the Metal Look and Feel. -# Currently, the following components need this for support: -# -# FileChooser -# -# When this file is read in, the strings are put into the -# defaults table. This is an implementation detail of the current -# workings of Swing. DO NOT DEPEND ON THIS. -# This may change in future versions of Swing as we improve localization -# support. -# -# Refer to the note in basic.properties for a description as to what -# the mnemonics correspond to and how to calculate them. -# -# @author Steve Wilson - - -############ FILE CHOOSER STRINGS ############# - -FileChooser.lookInLabelText=\u67E5\u770B: -FileChooser.lookInLabelMnemonic=73 -FileChooser.saveInLabelText=\u4FDD\u5B58: -FileChooser.fileNameLabelText=\u6587\u4EF6\u540D: -FileChooser.fileNameLabelMnemonic=78 -FileChooser.folderNameLabelText=\u6587\u4EF6\u5939\u540D: -FileChooser.folderNameLabelMnemonic=78 -FileChooser.filesOfTypeLabelText=\u6587\u4EF6\u7C7B\u578B: -FileChooser.filesOfTypeLabelMnemonic=84 -FileChooser.upFolderToolTipText=\u5411\u4E0A\u4E00\u7EA7 -FileChooser.upFolderAccessibleName=\u5411\u4E0A -FileChooser.homeFolderToolTipText=\u4E3B\u76EE\u5F55 -FileChooser.homeFolderAccessibleName=\u4E3B\u76EE\u5F55 -FileChooser.newFolderToolTipText=\u521B\u5EFA\u65B0\u6587\u4EF6\u5939 -FileChooser.newFolderAccessibleName=\u65B0\u5EFA\u6587\u4EF6\u5939 -FileChooser.newFolderActionLabelText=\u65B0\u5EFA\u6587\u4EF6\u5939 -FileChooser.listViewButtonToolTipText=\u5217\u8868 -FileChooser.listViewButtonAccessibleName=\u5217\u8868 -FileChooser.listViewActionLabelText=\u5217\u8868 -FileChooser.detailsViewButtonToolTipText=\u8BE6\u7EC6\u8D44\u6599 -FileChooser.detailsViewButtonAccessibleName=\u8BE6\u7EC6\u8D44\u6599 -FileChooser.detailsViewActionLabelText=\u8BE6\u7EC6\u8D44\u6599 -FileChooser.refreshActionLabelText=\u5237\u65B0 -FileChooser.viewMenuLabelText=\u89C6\u56FE -FileChooser.fileNameHeaderText=\u540D\u79F0 -FileChooser.fileSizeHeaderText=\u5927\u5C0F -FileChooser.fileTypeHeaderText=\u7C7B\u578B -FileChooser.fileDateHeaderText=\u4FEE\u6539\u65E5\u671F -FileChooser.fileAttrHeaderText=\u5C5E\u6027 - -############ Used by MetalTitlePane if rendering window decorations############ -# All mnemonics are KeyEvent.VK_XXX as integers -MetalTitlePane.restoreTitle=\u8FD8\u539F(R) -MetalTitlePane.restoreMnemonic=82 -MetalTitlePane.iconifyTitle=\u6700\u5C0F\u5316(E) -MetalTitlePane.iconifyMnemonic=69 -MetalTitlePane.maximizeTitle=\u6700\u5927\u5316(X) -MetalTitlePane.maximizeMnemonic=88 -MetalTitlePane.closeTitle=\u5173\u95ED(C) -MetalTitlePane.closeMnemonic=67 - +# This properties file is used to create a PropertyResourceBundle +# It contains Locale specific strings used be the Metal Look and Feel. +# Currently, the following components need this for support: +# +# FileChooser +# +# When this file is read in, the strings are put into the +# defaults table. This is an implementation detail of the current +# workings of Swing. DO NOT DEPEND ON THIS. +# This may change in future versions of Swing as we improve localization +# support. +# +# Refer to the note in basic.properties for a description as to what +# the mnemonics correspond to and how to calculate them. +# +# @author Steve Wilson + + +############ FILE CHOOSER STRINGS ############# + +FileChooser.lookInLabel.textAndMnemonic=\u67E5\u770B(&I): +FileChooser.saveInLabel.textAndMnemonic=\u4FDD\u5B58: +FileChooser.fileNameLabel.textAndMnemonic=\u6587\u4EF6\u540D(&N): +FileChooser.folderNameLabel.textAndMnemonic=\u6587\u4EF6\u5939\u540D(&N): +FileChooser.filesOfTypeLabel.textAndMnemonic=\u6587\u4EF6\u7C7B\u578B(&T): +FileChooser.upFolderToolTip.textAndMnemonic=\u5411\u4E0A\u4E00\u7EA7 +FileChooser.upFolderAccessibleName=\u5411\u4E0A +FileChooser.homeFolderToolTip.textAndMnemonic=\u4E3B\u76EE\u5F55 +FileChooser.homeFolderAccessibleName=\u4E3B\u76EE\u5F55 +FileChooser.newFolderToolTip.textAndMnemonic=\u521B\u5EFA\u65B0\u6587\u4EF6\u5939 +FileChooser.newFolderAccessibleName=\u65B0\u5EFA\u6587\u4EF6\u5939 +FileChooser.newFolderActionLabel.textAndMnemonic=\u65B0\u5EFA\u6587\u4EF6\u5939 +FileChooser.listViewButtonToolTip.textAndMnemonic=\u5217\u8868 +FileChooser.listViewButtonAccessibleName=\u5217\u8868 +FileChooser.listViewActionLabel.textAndMnemonic=\u5217\u8868 +FileChooser.detailsViewButtonToolTip.textAndMnemonic=\u8BE6\u7EC6\u8D44\u6599 +FileChooser.detailsViewButtonAccessibleName=\u8BE6\u7EC6\u8D44\u6599 +FileChooser.detailsViewActionLabel.textAndMnemonic=\u8BE6\u7EC6\u8D44\u6599 +FileChooser.refreshActionLabel.textAndMnemonic=\u5237\u65B0 +FileChooser.viewMenuLabel.textAndMnemonic=\u89C6\u56FE +FileChooser.fileNameHeader.textAndMnemonic=\u540D\u79F0 +FileChooser.fileSizeHeader.textAndMnemonic=\u5927\u5C0F +FileChooser.fileTypeHeader.textAndMnemonic=\u7C7B\u578B +FileChooser.fileDateHeader.textAndMnemonic=\u4FEE\u6539\u65E5\u671F +FileChooser.fileAttrHeader.textAndMnemonic=\u5C5E\u6027 + +############ Used by MetalTitlePane if rendering window decorations############ +MetalTitlePane.restore.titleAndMnemonic=\u8FD8\u539F(&R) +MetalTitlePane.iconify.titleAndMnemonic=\u6700\u5C0F\u5316(&E) +MetalTitlePane.maximize.titleAndMnemonic=\u6700\u5927\u5316(&X) +MetalTitlePane.close.titleAndMnemonic=\u5173\u95ED(&C) + diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_TW.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_TW.properties index 6f70ad739dd..a1df8894e4f 100644 --- a/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_TW.properties +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_TW.properties @@ -1,61 +1,52 @@ -# This properties file is used to create a PropertyResourceBundle -# It contains Locale specific strings used be the Metal Look and Feel. -# Currently, the following components need this for support: -# -# FileChooser -# -# When this file is read in, the strings are put into the -# defaults table. This is an implementation detail of the current -# workings of Swing. DO NOT DEPEND ON THIS. -# This may change in future versions of Swing as we improve localization -# support. -# -# Refer to the note in basic.properties for a description as to what -# the mnemonics correspond to and how to calculate them. -# -# @author Steve Wilson - - -############ FILE CHOOSER STRINGS ############# - -FileChooser.lookInLabelText=\u67E5\u8A62: -FileChooser.lookInLabelMnemonic=73 -FileChooser.saveInLabelText=\u5132\u5B58\u65BC: -FileChooser.fileNameLabelText=\u6A94\u6848\u540D\u7A31: -FileChooser.fileNameLabelMnemonic=78 -FileChooser.folderNameLabelText=\u8CC7\u6599\u593E\u540D\u7A31: -FileChooser.folderNameLabelMnemonic=78 -FileChooser.filesOfTypeLabelText=\u6A94\u6848\u985E\u578B: -FileChooser.filesOfTypeLabelMnemonic=84 -FileChooser.upFolderToolTipText=\u5F80\u4E0A\u4E00\u5C64 -FileChooser.upFolderAccessibleName=\u5F80\u4E0A -FileChooser.homeFolderToolTipText=\u4E3B\u76EE\u9304 -FileChooser.homeFolderAccessibleName=\u4E3B\u76EE\u9304 -FileChooser.newFolderToolTipText=\u5EFA\u7ACB\u65B0\u8CC7\u6599\u593E -FileChooser.newFolderAccessibleName=\u65B0\u8CC7\u6599\u593E -FileChooser.newFolderActionLabelText=\u65B0\u8CC7\u6599\u593E -FileChooser.listViewButtonToolTipText=\u6E05\u55AE -FileChooser.listViewButtonAccessibleName=\u6E05\u55AE -FileChooser.listViewActionLabelText=\u6E05\u55AE -FileChooser.detailsViewButtonToolTipText=\u8A73\u7D30\u8CC7\u8A0A -FileChooser.detailsViewButtonAccessibleName=\u8A73\u7D30\u8CC7\u8A0A -FileChooser.detailsViewActionLabelText=\u8A73\u7D30\u8CC7\u8A0A -FileChooser.refreshActionLabelText=\u91CD\u65B0\u6574\u7406 -FileChooser.viewMenuLabelText=\u6AA2\u8996 -FileChooser.fileNameHeaderText=\u540D\u7A31 -FileChooser.fileSizeHeaderText=\u5927\u5C0F -FileChooser.fileTypeHeaderText=\u985E\u578B -FileChooser.fileDateHeaderText=\u4FEE\u6539\u65E5\u671F -FileChooser.fileAttrHeaderText=\u5C6C\u6027 - -############ Used by MetalTitlePane if rendering window decorations############ -# All mnemonics are KeyEvent.VK_XXX as integers -MetalTitlePane.restoreTitle=\u56DE\u5FA9(R) -MetalTitlePane.restoreMnemonic=82 -MetalTitlePane.iconifyTitle=\u6700\u5C0F\u5316(E) -MetalTitlePane.iconifyMnemonic=69 -MetalTitlePane.maximizeTitle=\u6700\u5927\u5316(X) -MetalTitlePane.maximizeMnemonic=88 -MetalTitlePane.closeTitle=\u95DC\u9589(C) -MetalTitlePane.closeMnemonic=67 - +# This properties file is used to create a PropertyResourceBundle +# It contains Locale specific strings used be the Metal Look and Feel. +# Currently, the following components need this for support: +# +# FileChooser +# +# When this file is read in, the strings are put into the +# defaults table. This is an implementation detail of the current +# workings of Swing. DO NOT DEPEND ON THIS. +# This may change in future versions of Swing as we improve localization +# support. +# +# Refer to the note in basic.properties for a description as to what +# the mnemonics correspond to and how to calculate them. +# +# @author Steve Wilson + + +############ FILE CHOOSER STRINGS ############# + +FileChooser.lookInLabel.textAndMnemonic=\u67E5\u8A62(&I): +FileChooser.saveInLabel.textAndMnemonic=\u5132\u5B58\u65BC: +FileChooser.fileNameLabel.textAndMnemonic=\u6A94\u6848\u540D\u7A31(&N): +FileChooser.folderNameLabel.textAndMnemonic=\u8CC7\u6599\u593E\u540D\u7A31(&N): +FileChooser.filesOfTypeLabel.textAndMnemonic=\u6A94\u6848\u985E\u578B(&T): +FileChooser.upFolderToolTip.textAndMnemonic=\u5F80\u4E0A\u4E00\u5C64 +FileChooser.upFolderAccessibleName=\u5F80\u4E0A +FileChooser.homeFolderToolTip.textAndMnemonic=\u4E3B\u76EE\u9304 +FileChooser.homeFolderAccessibleName=\u4E3B\u76EE\u9304 +FileChooser.newFolderToolTip.textAndMnemonic=\u5EFA\u7ACB\u65B0\u8CC7\u6599\u593E +FileChooser.newFolderAccessibleName=\u65B0\u8CC7\u6599\u593E +FileChooser.newFolderActionLabel.textAndMnemonic=\u65B0\u8CC7\u6599\u593E +FileChooser.listViewButtonToolTip.textAndMnemonic=\u6E05\u55AE +FileChooser.listViewButtonAccessibleName=\u6E05\u55AE +FileChooser.listViewActionLabel.textAndMnemonic=\u6E05\u55AE +FileChooser.detailsViewButtonToolTip.textAndMnemonic=\u8A73\u7D30\u8CC7\u8A0A +FileChooser.detailsViewButtonAccessibleName=\u8A73\u7D30\u8CC7\u8A0A +FileChooser.detailsViewActionLabel.textAndMnemonic=\u8A73\u7D30\u8CC7\u8A0A +FileChooser.refreshActionLabel.textAndMnemonic=\u91CD\u65B0\u6574\u7406 +FileChooser.viewMenuLabel.textAndMnemonic=\u6AA2\u8996 +FileChooser.fileNameHeader.textAndMnemonic=\u540D\u7A31 +FileChooser.fileSizeHeader.textAndMnemonic=\u5927\u5C0F +FileChooser.fileTypeHeader.textAndMnemonic=\u985E\u578B +FileChooser.fileDateHeader.textAndMnemonic=\u4FEE\u6539\u65E5\u671F +FileChooser.fileAttrHeader.textAndMnemonic=\u5C6C\u6027 + +############ Used by MetalTitlePane if rendering window decorations############ +MetalTitlePane.restore.titleAndMnemonic=\u56DE\u5FA9(&R) +MetalTitlePane.iconify.titleAndMnemonic=\u6700\u5C0F\u5316(&E) +MetalTitlePane.maximize.titleAndMnemonic=\u6700\u5927\u5316(&X) +MetalTitlePane.close.titleAndMnemonic=\u95DC\u9589(&C) + diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth.properties index 67e2890fc05..35d23564492 100644 --- a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth.properties +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth.properties @@ -1,49 +1,45 @@ -# This properties file is used to create a PropertyResourceBundle -# It contains Locale specific strings used be the Synth Look and Feel. -# Currently, the following components need this for support: -# -# FileChooser -# -# When this file is read in, the strings are put into the -# defaults table. This is an implementation detail of the current -# workings of Swing. DO NOT DEPEND ON THIS. -# This may change in future versions of Swing as we improve localization -# support. -# -# Refer to the note in basic.properties for a description as to what -# the mnemonics correspond to and how to calculate them. -# -# @author Steve Wilson - - -############ FILE CHOOSER STRINGS ############# - -FileChooser.lookInLabelText=Look In: -FileChooser.lookInLabelMnemonic=73 -FileChooser.saveInLabelText=Save In: -FileChooser.fileNameLabelText=File Name: -FileChooser.fileNameLabelMnemonic=78 -FileChooser.folderNameLabelText=Folder Name: -FileChooser.folderNameLabelMnemonic=78 -FileChooser.filesOfTypeLabelText=Files of Type: -FileChooser.filesOfTypeLabelMnemonic=84 -FileChooser.upFolderToolTipText=Up One Level -FileChooser.upFolderAccessibleName=Up -FileChooser.homeFolderToolTipText=Home -FileChooser.homeFolderAccessibleName=Home -FileChooser.newFolderToolTipText=Create New Folder -FileChooser.newFolderAccessibleName=New Folder -FileChooser.newFolderActionLabelText=New Folder -FileChooser.listViewButtonToolTipText=List -FileChooser.listViewButtonAccessibleName=List -FileChooser.listViewActionLabelText=List -FileChooser.detailsViewButtonToolTipText=Details -FileChooser.detailsViewButtonAccessibleName=Details -FileChooser.detailsViewActionLabelText=Details -FileChooser.refreshActionLabelText=Refresh -FileChooser.viewMenuLabelText=View -FileChooser.fileNameHeaderText=Name -FileChooser.fileSizeHeaderText=Size -FileChooser.fileTypeHeaderText=Type -FileChooser.fileDateHeaderText=Modified -FileChooser.fileAttrHeaderText=Attributes +# This properties file is used to create a PropertyResourceBundle +# It contains Locale specific strings used be the Synth Look and Feel. +# Currently, the following components need this for support: +# +# FileChooser +# +# When this file is read in, the strings are put into the +# defaults table. This is an implementation detail of the current +# workings of Swing. DO NOT DEPEND ON THIS. +# This may change in future versions of Swing as we improve localization +# support. +# +# Refer to the note in basic.properties for a description as to what +# the mnemonics correspond to and how to calculate them. +# +# @author Steve Wilson + + +############ FILE CHOOSER STRINGS ############# + +FileChooser.lookInLabel.textAndMnemonic=Look &In: +FileChooser.saveInLabel.textAndMnemonic=Save In: +FileChooser.fileNameLabel.textAndMnemonic=File &Name: +FileChooser.folderNameLabel.textAndMnemonic=Folder &Name: +FileChooser.filesOfTypeLabel.textAndMnemonic=Files of &Type: +FileChooser.upFolderToolTip.textAndMnemonic=Up One Level +FileChooser.upFolderAccessibleName=Up +FileChooser.homeFolderToolTip.textAndMnemonic=Home +FileChooser.homeFolderAccessibleName=Home +FileChooser.newFolderToolTip.textAndMnemonic=Create New Folder +FileChooser.newFolderAccessibleName=New Folder +FileChooser.newFolderActionLabel.textAndMnemonic=New Folder +FileChooser.listViewButtonToolTip.textAndMnemonic=List +FileChooser.listViewButtonAccessibleName=List +FileChooser.listViewActionLabel.textAndMnemonic=List +FileChooser.detailsViewButtonToolTip.textAndMnemonic=Details +FileChooser.detailsViewButtonAccessibleName=Details +FileChooser.detailsViewActionLabel.textAndMnemonic=Details +FileChooser.refreshActionLabel.textAndMnemonic=Refresh +FileChooser.viewMenuLabel.textAndMnemonic=View +FileChooser.fileNameHeader.textAndMnemonic=Name +FileChooser.fileSizeHeader.textAndMnemonic=Size +FileChooser.fileTypeHeader.textAndMnemonic=Type +FileChooser.fileDateHeader.textAndMnemonic=Modified +FileChooser.fileAttrHeader.textAndMnemonic=Attributes diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_de.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_de.properties index 8da54b891ac..a58cdcfa158 100644 --- a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_de.properties +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_de.properties @@ -1,49 +1,45 @@ -# This properties file is used to create a PropertyResourceBundle -# It contains Locale specific strings used be the Synth Look and Feel. -# Currently, the following components need this for support: -# -# FileChooser -# -# When this file is read in, the strings are put into the -# defaults table. This is an implementation detail of the current -# workings of Swing. DO NOT DEPEND ON THIS. -# This may change in future versions of Swing as we improve localization -# support. -# -# Refer to the note in basic.properties for a description as to what -# the mnemonics correspond to and how to calculate them. -# -# @author Steve Wilson - - -############ FILE CHOOSER STRINGS ############# - -FileChooser.lookInLabelText=Suchen in: -FileChooser.lookInLabelMnemonic=73 -FileChooser.saveInLabelText=Speichern in: -FileChooser.fileNameLabelText=Dateiname: -FileChooser.fileNameLabelMnemonic=78 -FileChooser.folderNameLabelText=Ordnername: -FileChooser.folderNameLabelMnemonic=78 -FileChooser.filesOfTypeLabelText=Dateityp: -FileChooser.filesOfTypeLabelMnemonic=84 -FileChooser.upFolderToolTipText=Eine Ebene h\u00F6her -FileChooser.upFolderAccessibleName=Nach oben -FileChooser.homeFolderToolTipText=Home -FileChooser.homeFolderAccessibleName=Home -FileChooser.newFolderToolTipText=Neuen Ordner erstellen -FileChooser.newFolderAccessibleName=Neuer Ordner -FileChooser.newFolderActionLabelText=Neuer Ordner -FileChooser.listViewButtonToolTipText=Liste -FileChooser.listViewButtonAccessibleName=Liste -FileChooser.listViewActionLabelText=Liste -FileChooser.detailsViewButtonToolTipText=Details -FileChooser.detailsViewButtonAccessibleName=Details -FileChooser.detailsViewActionLabelText=Details -FileChooser.refreshActionLabelText=Aktualisieren -FileChooser.viewMenuLabelText=Ansicht -FileChooser.fileNameHeaderText=Name -FileChooser.fileSizeHeaderText=Gr\u00F6\u00DFe -FileChooser.fileTypeHeaderText=Typ -FileChooser.fileDateHeaderText=Ge\u00E4ndert -FileChooser.fileAttrHeaderText=Attribute +# This properties file is used to create a PropertyResourceBundle +# It contains Locale specific strings used be the Synth Look and Feel. +# Currently, the following components need this for support: +# +# FileChooser +# +# When this file is read in, the strings are put into the +# defaults table. This is an implementation detail of the current +# workings of Swing. DO NOT DEPEND ON THIS. +# This may change in future versions of Swing as we improve localization +# support. +# +# Refer to the note in basic.properties for a description as to what +# the mnemonics correspond to and how to calculate them. +# +# @author Steve Wilson + + +############ FILE CHOOSER STRINGS ############# + +FileChooser.lookInLabel.textAndMnemonic=Suchen &in: +FileChooser.saveInLabel.textAndMnemonic=Speichern in: +FileChooser.fileNameLabel.textAndMnemonic=Datei&name: +FileChooser.folderNameLabel.textAndMnemonic=Ord&nername: +FileChooser.filesOfTypeLabel.textAndMnemonic=Da&teityp: +FileChooser.upFolderToolTip.textAndMnemonic=Eine Ebene h\u00F6her +FileChooser.upFolderAccessibleName=Nach oben +FileChooser.homeFolderToolTip.textAndMnemonic=Home +FileChooser.homeFolderAccessibleName=Home +FileChooser.newFolderToolTip.textAndMnemonic=Neuen Ordner erstellen +FileChooser.newFolderAccessibleName=Neuer Ordner +FileChooser.newFolderActionLabel.textAndMnemonic=Neuer Ordner +FileChooser.listViewButtonToolTip.textAndMnemonic=Liste +FileChooser.listViewButtonAccessibleName=Liste +FileChooser.listViewActionLabel.textAndMnemonic=Liste +FileChooser.detailsViewButtonToolTip.textAndMnemonic=Details +FileChooser.detailsViewButtonAccessibleName=Details +FileChooser.detailsViewActionLabel.textAndMnemonic=Details +FileChooser.refreshActionLabel.textAndMnemonic=Aktualisieren +FileChooser.viewMenuLabel.textAndMnemonic=Ansicht +FileChooser.fileNameHeader.textAndMnemonic=Name +FileChooser.fileSizeHeader.textAndMnemonic=Gr\u00F6\u00DFe +FileChooser.fileTypeHeader.textAndMnemonic=Typ +FileChooser.fileDateHeader.textAndMnemonic=Ge\u00E4ndert +FileChooser.fileAttrHeader.textAndMnemonic=Attribute diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_es.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_es.properties index 14229e87f04..8d8def6e8fb 100644 --- a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_es.properties +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_es.properties @@ -1,49 +1,45 @@ -# This properties file is used to create a PropertyResourceBundle -# It contains Locale specific strings used be the Synth Look and Feel. -# Currently, the following components need this for support: -# -# FileChooser -# -# When this file is read in, the strings are put into the -# defaults table. This is an implementation detail of the current -# workings of Swing. DO NOT DEPEND ON THIS. -# This may change in future versions of Swing as we improve localization -# support. -# -# Refer to the note in basic.properties for a description as to what -# the mnemonics correspond to and how to calculate them. -# -# @author Steve Wilson - - -############ FILE CHOOSER STRINGS ############# - -FileChooser.lookInLabelText=Buscar en: -FileChooser.lookInLabelMnemonic=73 -FileChooser.saveInLabelText=Guardar en: -FileChooser.fileNameLabelText=Nombre de Archivo: -FileChooser.fileNameLabelMnemonic=78 -FileChooser.folderNameLabelText=Nombre de la Carpeta: -FileChooser.folderNameLabelMnemonic=78 -FileChooser.filesOfTypeLabelText=Archivos de Tipo: -FileChooser.filesOfTypeLabelMnemonic=84 -FileChooser.upFolderToolTipText=Subir un Nivel -FileChooser.upFolderAccessibleName=Arriba -FileChooser.homeFolderToolTipText=Inicio -FileChooser.homeFolderAccessibleName=Inicio -FileChooser.newFolderToolTipText=Crear Nueva Carpeta -FileChooser.newFolderAccessibleName=Nueva Carpeta -FileChooser.newFolderActionLabelText=Nueva Carpeta -FileChooser.listViewButtonToolTipText=Lista -FileChooser.listViewButtonAccessibleName=Lista -FileChooser.listViewActionLabelText=Lista -FileChooser.detailsViewButtonToolTipText=Detalles -FileChooser.detailsViewButtonAccessibleName=Detalles -FileChooser.detailsViewActionLabelText=Detalles -FileChooser.refreshActionLabelText=Refrescar -FileChooser.viewMenuLabelText=Ver -FileChooser.fileNameHeaderText=Nombre -FileChooser.fileSizeHeaderText=Tama\u00F1o -FileChooser.fileTypeHeaderText=Tipo -FileChooser.fileDateHeaderText=Modificado -FileChooser.fileAttrHeaderText=Atributos +# This properties file is used to create a PropertyResourceBundle +# It contains Locale specific strings used be the Synth Look and Feel. +# Currently, the following components need this for support: +# +# FileChooser +# +# When this file is read in, the strings are put into the +# defaults table. This is an implementation detail of the current +# workings of Swing. DO NOT DEPEND ON THIS. +# This may change in future versions of Swing as we improve localization +# support. +# +# Refer to the note in basic.properties for a description as to what +# the mnemonics correspond to and how to calculate them. +# +# @author Steve Wilson + + +############ FILE CHOOSER STRINGS ############# + +FileChooser.lookInLabel.textAndMnemonic=Buscar en(&I): +FileChooser.saveInLabel.textAndMnemonic=Guardar en: +FileChooser.fileNameLabel.textAndMnemonic=&Nombre de Archivo: +FileChooser.folderNameLabel.textAndMnemonic=&Nombre de la Carpeta: +FileChooser.filesOfTypeLabel.textAndMnemonic=Archivos de &Tipo: +FileChooser.upFolderToolTip.textAndMnemonic=Subir un Nivel +FileChooser.upFolderAccessibleName=Arriba +FileChooser.homeFolderToolTip.textAndMnemonic=Inicio +FileChooser.homeFolderAccessibleName=Inicio +FileChooser.newFolderToolTip.textAndMnemonic=Crear Nueva Carpeta +FileChooser.newFolderAccessibleName=Nueva Carpeta +FileChooser.newFolderActionLabel.textAndMnemonic=Nueva Carpeta +FileChooser.listViewButtonToolTip.textAndMnemonic=Lista +FileChooser.listViewButtonAccessibleName=Lista +FileChooser.listViewActionLabel.textAndMnemonic=Lista +FileChooser.detailsViewButtonToolTip.textAndMnemonic=Detalles +FileChooser.detailsViewButtonAccessibleName=Detalles +FileChooser.detailsViewActionLabel.textAndMnemonic=Detalles +FileChooser.refreshActionLabel.textAndMnemonic=Refrescar +FileChooser.viewMenuLabel.textAndMnemonic=Ver +FileChooser.fileNameHeader.textAndMnemonic=Nombre +FileChooser.fileSizeHeader.textAndMnemonic=Tama\u00F1o +FileChooser.fileTypeHeader.textAndMnemonic=Tipo +FileChooser.fileDateHeader.textAndMnemonic=Modificado +FileChooser.fileAttrHeader.textAndMnemonic=Atributos diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_fr.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_fr.properties index 7660e7dc4b6..225e42cb8c3 100644 --- a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_fr.properties +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_fr.properties @@ -1,49 +1,45 @@ -# This properties file is used to create a PropertyResourceBundle -# It contains Locale specific strings used be the Synth Look and Feel. -# Currently, the following components need this for support: -# -# FileChooser -# -# When this file is read in, the strings are put into the -# defaults table. This is an implementation detail of the current -# workings of Swing. DO NOT DEPEND ON THIS. -# This may change in future versions of Swing as we improve localization -# support. -# -# Refer to the note in basic.properties for a description as to what -# the mnemonics correspond to and how to calculate them. -# -# @author Steve Wilson - - -############ FILE CHOOSER STRINGS ############# - -FileChooser.lookInLabelText=Rechercher dans : -FileChooser.lookInLabelMnemonic=73 -FileChooser.saveInLabelText=Enregistrer dans : -FileChooser.fileNameLabelText=Nom du fichier : -FileChooser.fileNameLabelMnemonic=78 -FileChooser.folderNameLabelText=Nom du dossier : -FileChooser.folderNameLabelMnemonic=78 -FileChooser.filesOfTypeLabelText=Fichiers de type : -FileChooser.filesOfTypeLabelMnemonic=84 -FileChooser.upFolderToolTipText=Remonte d'un niveau. -FileChooser.upFolderAccessibleName=Monter -FileChooser.homeFolderToolTipText=R\u00E9pertoire d'origine -FileChooser.homeFolderAccessibleName=R\u00E9pertoire d'origine -FileChooser.newFolderToolTipText=Cr\u00E9e un dossier. -FileChooser.newFolderAccessibleName=Nouveau dossier -FileChooser.newFolderActionLabelText=Nouveau dossier -FileChooser.listViewButtonToolTipText=Liste -FileChooser.listViewButtonAccessibleName=Liste -FileChooser.listViewActionLabelText=Liste -FileChooser.detailsViewButtonToolTipText=D\u00E9tails -FileChooser.detailsViewButtonAccessibleName=D\u00E9tails -FileChooser.detailsViewActionLabelText=D\u00E9tails -FileChooser.refreshActionLabelText=Actualiser -FileChooser.viewMenuLabelText=Affichage -FileChooser.fileNameHeaderText=Nom -FileChooser.fileSizeHeaderText=Taille -FileChooser.fileTypeHeaderText=Type -FileChooser.fileDateHeaderText=Modifi\u00E9 -FileChooser.fileAttrHeaderText=Attributs +# This properties file is used to create a PropertyResourceBundle +# It contains Locale specific strings used be the Synth Look and Feel. +# Currently, the following components need this for support: +# +# FileChooser +# +# When this file is read in, the strings are put into the +# defaults table. This is an implementation detail of the current +# workings of Swing. DO NOT DEPEND ON THIS. +# This may change in future versions of Swing as we improve localization +# support. +# +# Refer to the note in basic.properties for a description as to what +# the mnemonics correspond to and how to calculate them. +# +# @author Steve Wilson + + +############ FILE CHOOSER STRINGS ############# + +FileChooser.lookInLabel.textAndMnemonic=Rechercher dans (&I): +FileChooser.saveInLabel.textAndMnemonic=Enregistrer dans : +FileChooser.fileNameLabel.textAndMnemonic=&Nom du fichier : +FileChooser.folderNameLabel.textAndMnemonic=&Nom du dossier : +FileChooser.filesOfTypeLabel.textAndMnemonic=Fichiers de &type : +FileChooser.upFolderToolTip.textAndMnemonic=Remonte d'un niveau. +FileChooser.upFolderAccessibleName=Monter +FileChooser.homeFolderToolTip.textAndMnemonic=R\u00E9pertoire d'origine +FileChooser.homeFolderAccessibleName=R\u00E9pertoire d'origine +FileChooser.newFolderToolTip.textAndMnemonic=Cr\u00E9e un dossier. +FileChooser.newFolderAccessibleName=Nouveau dossier +FileChooser.newFolderActionLabel.textAndMnemonic=Nouveau dossier +FileChooser.listViewButtonToolTip.textAndMnemonic=Liste +FileChooser.listViewButtonAccessibleName=Liste +FileChooser.listViewActionLabel.textAndMnemonic=Liste +FileChooser.detailsViewButtonToolTip.textAndMnemonic=D\u00E9tails +FileChooser.detailsViewButtonAccessibleName=D\u00E9tails +FileChooser.detailsViewActionLabel.textAndMnemonic=D\u00E9tails +FileChooser.refreshActionLabel.textAndMnemonic=Actualiser +FileChooser.viewMenuLabel.textAndMnemonic=Affichage +FileChooser.fileNameHeader.textAndMnemonic=Nom +FileChooser.fileSizeHeader.textAndMnemonic=Taille +FileChooser.fileTypeHeader.textAndMnemonic=Type +FileChooser.fileDateHeader.textAndMnemonic=Modifi\u00E9 +FileChooser.fileAttrHeader.textAndMnemonic=Attributs diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_it.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_it.properties index 8a1535e8502..58e6d4e5703 100644 --- a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_it.properties +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_it.properties @@ -1,49 +1,45 @@ -# This properties file is used to create a PropertyResourceBundle -# It contains Locale specific strings used be the Synth Look and Feel. -# Currently, the following components need this for support: -# -# FileChooser -# -# When this file is read in, the strings are put into the -# defaults table. This is an implementation detail of the current -# workings of Swing. DO NOT DEPEND ON THIS. -# This may change in future versions of Swing as we improve localization -# support. -# -# Refer to the note in basic.properties for a description as to what -# the mnemonics correspond to and how to calculate them. -# -# @author Steve Wilson - - -############ FILE CHOOSER STRINGS ############# - -FileChooser.lookInLabelText=Cerca in: -FileChooser.lookInLabelMnemonic=73 -FileChooser.saveInLabelText=Salva in: -FileChooser.fileNameLabelText=Nome file: -FileChooser.fileNameLabelMnemonic=78 -FileChooser.folderNameLabelText=Nome della cartella: -FileChooser.folderNameLabelMnemonic=78 -FileChooser.filesOfTypeLabelText=Tipo file: -FileChooser.filesOfTypeLabelMnemonic=84 -FileChooser.upFolderToolTipText=Cartella superiore -FileChooser.upFolderAccessibleName=Superiore -FileChooser.homeFolderToolTipText=Home -FileChooser.homeFolderAccessibleName=Home -FileChooser.newFolderToolTipText=Crea nuova cartella -FileChooser.newFolderAccessibleName=Nuova cartella -FileChooser.newFolderActionLabelText=Nuova cartella -FileChooser.listViewButtonToolTipText=Lista -FileChooser.listViewButtonAccessibleName=Lista -FileChooser.listViewActionLabelText=Lista -FileChooser.detailsViewButtonToolTipText=Dettagli -FileChooser.detailsViewButtonAccessibleName=Dettagli -FileChooser.detailsViewActionLabelText=Dettagli -FileChooser.refreshActionLabelText=Aggiorna -FileChooser.viewMenuLabelText=Visualizza -FileChooser.fileNameHeaderText=Nome -FileChooser.fileSizeHeaderText=Dimensioni -FileChooser.fileTypeHeaderText=Tipo -FileChooser.fileDateHeaderText=Modificato -FileChooser.fileAttrHeaderText=Attributi +# This properties file is used to create a PropertyResourceBundle +# It contains Locale specific strings used be the Synth Look and Feel. +# Currently, the following components need this for support: +# +# FileChooser +# +# When this file is read in, the strings are put into the +# defaults table. This is an implementation detail of the current +# workings of Swing. DO NOT DEPEND ON THIS. +# This may change in future versions of Swing as we improve localization +# support. +# +# Refer to the note in basic.properties for a description as to what +# the mnemonics correspond to and how to calculate them. +# +# @author Steve Wilson + + +############ FILE CHOOSER STRINGS ############# + +FileChooser.lookInLabel.textAndMnemonic=Cerca &in: +FileChooser.saveInLabel.textAndMnemonic=Salva in: +FileChooser.fileNameLabel.textAndMnemonic=&Nome file: +FileChooser.folderNameLabel.textAndMnemonic=&Nome della cartella: +FileChooser.filesOfTypeLabel.textAndMnemonic=&Tipo file: +FileChooser.upFolderToolTip.textAndMnemonic=Cartella superiore +FileChooser.upFolderAccessibleName=Superiore +FileChooser.homeFolderToolTip.textAndMnemonic=Home +FileChooser.homeFolderAccessibleName=Home +FileChooser.newFolderToolTip.textAndMnemonic=Crea nuova cartella +FileChooser.newFolderAccessibleName=Nuova cartella +FileChooser.newFolderActionLabel.textAndMnemonic=Nuova cartella +FileChooser.listViewButtonToolTip.textAndMnemonic=Lista +FileChooser.listViewButtonAccessibleName=Lista +FileChooser.listViewActionLabel.textAndMnemonic=Lista +FileChooser.detailsViewButtonToolTip.textAndMnemonic=Dettagli +FileChooser.detailsViewButtonAccessibleName=Dettagli +FileChooser.detailsViewActionLabel.textAndMnemonic=Dettagli +FileChooser.refreshActionLabel.textAndMnemonic=Aggiorna +FileChooser.viewMenuLabel.textAndMnemonic=Visualizza +FileChooser.fileNameHeader.textAndMnemonic=Nome +FileChooser.fileSizeHeader.textAndMnemonic=Dimensioni +FileChooser.fileTypeHeader.textAndMnemonic=Tipo +FileChooser.fileDateHeader.textAndMnemonic=Modificato +FileChooser.fileAttrHeader.textAndMnemonic=Attributi diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ja.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ja.properties index d49e038a890..f248f96920c 100644 --- a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ja.properties +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ja.properties @@ -1,49 +1,45 @@ -# This properties file is used to create a PropertyResourceBundle -# It contains Locale specific strings used be the Synth Look and Feel. -# Currently, the following components need this for support: -# -# FileChooser -# -# When this file is read in, the strings are put into the -# defaults table. This is an implementation detail of the current -# workings of Swing. DO NOT DEPEND ON THIS. -# This may change in future versions of Swing as we improve localization -# support. -# -# Refer to the note in basic.properties for a description as to what -# the mnemonics correspond to and how to calculate them. -# -# @author Steve Wilson - - -############ FILE CHOOSER STRINGS ############# - -FileChooser.lookInLabelText=\u53C2\u7167: -FileChooser.lookInLabelMnemonic=73 -FileChooser.saveInLabelText=\u4FDD\u5B58: -FileChooser.fileNameLabelText=\u30D5\u30A1\u30A4\u30EB\u540D: -FileChooser.fileNameLabelMnemonic=78 -FileChooser.folderNameLabelText=\u30D5\u30A9\u30EB\u30C0\u540D: -FileChooser.folderNameLabelMnemonic=78 -FileChooser.filesOfTypeLabelText=\u30D5\u30A1\u30A4\u30EB\u306E\u30BF\u30A4\u30D7: -FileChooser.filesOfTypeLabelMnemonic=84 -FileChooser.upFolderToolTipText=1\u30EC\u30D9\u30EB\u4E0A\u3078 -FileChooser.upFolderAccessibleName=\u4E0A\u3078 -FileChooser.homeFolderToolTipText=\u30DB\u30FC\u30E0 -FileChooser.homeFolderAccessibleName=\u30DB\u30FC\u30E0 -FileChooser.newFolderToolTipText=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0\u306E\u4F5C\u6210 -FileChooser.newFolderAccessibleName=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0 -FileChooser.newFolderActionLabelText=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0 -FileChooser.listViewButtonToolTipText=\u30EA\u30B9\u30C8 -FileChooser.listViewButtonAccessibleName=\u30EA\u30B9\u30C8 -FileChooser.listViewActionLabelText=\u30EA\u30B9\u30C8 -FileChooser.detailsViewButtonToolTipText=\u8A73\u7D30 -FileChooser.detailsViewButtonAccessibleName=\u8A73\u7D30 -FileChooser.detailsViewActionLabelText=\u8A73\u7D30 -FileChooser.refreshActionLabelText=\u30EA\u30D5\u30EC\u30C3\u30B7\u30E5 -FileChooser.viewMenuLabelText=\u8868\u793A -FileChooser.fileNameHeaderText=\u540D\u524D -FileChooser.fileSizeHeaderText=\u30B5\u30A4\u30BA -FileChooser.fileTypeHeaderText=\u30BF\u30A4\u30D7 -FileChooser.fileDateHeaderText=\u4FEE\u6B63\u65E5 -FileChooser.fileAttrHeaderText=\u5C5E\u6027 +# This properties file is used to create a PropertyResourceBundle +# It contains Locale specific strings used be the Synth Look and Feel. +# Currently, the following components need this for support: +# +# FileChooser +# +# When this file is read in, the strings are put into the +# defaults table. This is an implementation detail of the current +# workings of Swing. DO NOT DEPEND ON THIS. +# This may change in future versions of Swing as we improve localization +# support. +# +# Refer to the note in basic.properties for a description as to what +# the mnemonics correspond to and how to calculate them. +# +# @author Steve Wilson + + +############ FILE CHOOSER STRINGS ############# + +FileChooser.lookInLabel.textAndMnemonic=\u53C2\u7167(&I): +FileChooser.saveInLabel.textAndMnemonic=\u4FDD\u5B58: +FileChooser.fileNameLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u540D(&N): +FileChooser.folderNameLabel.textAndMnemonic=\u30D5\u30A9\u30EB\u30C0\u540D(&N): +FileChooser.filesOfTypeLabel.textAndMnemonic=\u30D5\u30A1\u30A4\u30EB\u306E\u30BF\u30A4\u30D7(&T): +FileChooser.upFolderToolTip.textAndMnemonic=1\u30EC\u30D9\u30EB\u4E0A\u3078 +FileChooser.upFolderAccessibleName=\u4E0A\u3078 +FileChooser.homeFolderToolTip.textAndMnemonic=\u30DB\u30FC\u30E0 +FileChooser.homeFolderAccessibleName=\u30DB\u30FC\u30E0 +FileChooser.newFolderToolTip.textAndMnemonic=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0\u306E\u4F5C\u6210 +FileChooser.newFolderAccessibleName=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0 +FileChooser.newFolderActionLabel.textAndMnemonic=\u65B0\u898F\u30D5\u30A9\u30EB\u30C0 +FileChooser.listViewButtonToolTip.textAndMnemonic=\u30EA\u30B9\u30C8 +FileChooser.listViewButtonAccessibleName=\u30EA\u30B9\u30C8 +FileChooser.listViewActionLabel.textAndMnemonic=\u30EA\u30B9\u30C8 +FileChooser.detailsViewButtonToolTip.textAndMnemonic=\u8A73\u7D30 +FileChooser.detailsViewButtonAccessibleName=\u8A73\u7D30 +FileChooser.detailsViewActionLabel.textAndMnemonic=\u8A73\u7D30 +FileChooser.refreshActionLabel.textAndMnemonic=\u30EA\u30D5\u30EC\u30C3\u30B7\u30E5 +FileChooser.viewMenuLabel.textAndMnemonic=\u8868\u793A +FileChooser.fileNameHeader.textAndMnemonic=\u540D\u524D +FileChooser.fileSizeHeader.textAndMnemonic=\u30B5\u30A4\u30BA +FileChooser.fileTypeHeader.textAndMnemonic=\u30BF\u30A4\u30D7 +FileChooser.fileDateHeader.textAndMnemonic=\u4FEE\u6B63\u65E5 +FileChooser.fileAttrHeader.textAndMnemonic=\u5C5E\u6027 diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ko.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ko.properties index ff3b3829139..4024f5903ac 100644 --- a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ko.properties +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ko.properties @@ -1,49 +1,45 @@ -# This properties file is used to create a PropertyResourceBundle -# It contains Locale specific strings used be the Synth Look and Feel. -# Currently, the following components need this for support: -# -# FileChooser -# -# When this file is read in, the strings are put into the -# defaults table. This is an implementation detail of the current -# workings of Swing. DO NOT DEPEND ON THIS. -# This may change in future versions of Swing as we improve localization -# support. -# -# Refer to the note in basic.properties for a description as to what -# the mnemonics correspond to and how to calculate them. -# -# @author Steve Wilson - - -############ FILE CHOOSER STRINGS ############# - -FileChooser.lookInLabelText=\uAC80\uC0C9 \uC704\uCE58: -FileChooser.lookInLabelMnemonic=73 -FileChooser.saveInLabelText=\uC800\uC7A5 \uC704\uCE58: -FileChooser.fileNameLabelText=\uD30C\uC77C \uC774\uB984: -FileChooser.fileNameLabelMnemonic=78 -FileChooser.folderNameLabelText=\uD3F4\uB354 \uC774\uB984: -FileChooser.folderNameLabelMnemonic=78 -FileChooser.filesOfTypeLabelText=\uD30C\uC77C \uC720\uD615: -FileChooser.filesOfTypeLabelMnemonic=84 -FileChooser.upFolderToolTipText=\uD55C \uB808\uBCA8 \uC704\uB85C -FileChooser.upFolderAccessibleName=\uC704\uB85C -FileChooser.homeFolderToolTipText=\uD648 -FileChooser.homeFolderAccessibleName=\uD648 -FileChooser.newFolderToolTipText=\uC0C8 \uD3F4\uB354 \uC0DD\uC131 -FileChooser.newFolderAccessibleName=\uC0C8 \uD3F4\uB354 -FileChooser.newFolderActionLabelText=\uC0C8 \uD3F4\uB354 -FileChooser.listViewButtonToolTipText=\uBAA9\uB85D -FileChooser.listViewButtonAccessibleName=\uBAA9\uB85D -FileChooser.listViewActionLabelText=\uBAA9\uB85D -FileChooser.detailsViewButtonToolTipText=\uC138\uBD80 \uC815\uBCF4 -FileChooser.detailsViewButtonAccessibleName=\uC138\uBD80 \uC815\uBCF4 -FileChooser.detailsViewActionLabelText=\uC138\uBD80 \uC815\uBCF4 -FileChooser.refreshActionLabelText=\uC0C8\uB85C \uACE0\uCE68 -FileChooser.viewMenuLabelText=\uBCF4\uAE30 -FileChooser.fileNameHeaderText=\uC774\uB984 -FileChooser.fileSizeHeaderText=\uD06C\uAE30 -FileChooser.fileTypeHeaderText=\uC720\uD615 -FileChooser.fileDateHeaderText=\uC218\uC815 \uB0A0\uC9DC -FileChooser.fileAttrHeaderText=\uC18D\uC131 +# This properties file is used to create a PropertyResourceBundle +# It contains Locale specific strings used be the Synth Look and Feel. +# Currently, the following components need this for support: +# +# FileChooser +# +# When this file is read in, the strings are put into the +# defaults table. This is an implementation detail of the current +# workings of Swing. DO NOT DEPEND ON THIS. +# This may change in future versions of Swing as we improve localization +# support. +# +# Refer to the note in basic.properties for a description as to what +# the mnemonics correspond to and how to calculate them. +# +# @author Steve Wilson + + +############ FILE CHOOSER STRINGS ############# + +FileChooser.lookInLabel.textAndMnemonic=\uAC80\uC0C9 \uC704\uCE58(&I): +FileChooser.saveInLabel.textAndMnemonic=\uC800\uC7A5 \uC704\uCE58: +FileChooser.fileNameLabel.textAndMnemonic=\uD30C\uC77C \uC774\uB984(&N): +FileChooser.folderNameLabel.textAndMnemonic=\uD3F4\uB354 \uC774\uB984(&N): +FileChooser.filesOfTypeLabel.textAndMnemonic=\uD30C\uC77C \uC720\uD615(&T): +FileChooser.upFolderToolTip.textAndMnemonic=\uD55C \uB808\uBCA8 \uC704\uB85C +FileChooser.upFolderAccessibleName=\uC704\uB85C +FileChooser.homeFolderToolTip.textAndMnemonic=\uD648 +FileChooser.homeFolderAccessibleName=\uD648 +FileChooser.newFolderToolTip.textAndMnemonic=\uC0C8 \uD3F4\uB354 \uC0DD\uC131 +FileChooser.newFolderAccessibleName=\uC0C8 \uD3F4\uB354 +FileChooser.newFolderActionLabel.textAndMnemonic=\uC0C8 \uD3F4\uB354 +FileChooser.listViewButtonToolTip.textAndMnemonic=\uBAA9\uB85D +FileChooser.listViewButtonAccessibleName=\uBAA9\uB85D +FileChooser.listViewActionLabel.textAndMnemonic=\uBAA9\uB85D +FileChooser.detailsViewButtonToolTip.textAndMnemonic=\uC138\uBD80 \uC815\uBCF4 +FileChooser.detailsViewButtonAccessibleName=\uC138\uBD80 \uC815\uBCF4 +FileChooser.detailsViewActionLabel.textAndMnemonic=\uC138\uBD80 \uC815\uBCF4 +FileChooser.refreshActionLabel.textAndMnemonic=\uC0C8\uB85C \uACE0\uCE68 +FileChooser.viewMenuLabel.textAndMnemonic=\uBCF4\uAE30 +FileChooser.fileNameHeader.textAndMnemonic=\uC774\uB984 +FileChooser.fileSizeHeader.textAndMnemonic=\uD06C\uAE30 +FileChooser.fileTypeHeader.textAndMnemonic=\uC720\uD615 +FileChooser.fileDateHeader.textAndMnemonic=\uC218\uC815 \uB0A0\uC9DC +FileChooser.fileAttrHeader.textAndMnemonic=\uC18D\uC131 diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_pt_BR.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_pt_BR.properties index bb94bb19a80..58ca990e553 100644 --- a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_pt_BR.properties +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_pt_BR.properties @@ -1,49 +1,45 @@ -# This properties file is used to create a PropertyResourceBundle -# It contains Locale specific strings used be the Synth Look and Feel. -# Currently, the following components need this for support: -# -# FileChooser -# -# When this file is read in, the strings are put into the -# defaults table. This is an implementation detail of the current -# workings of Swing. DO NOT DEPEND ON THIS. -# This may change in future versions of Swing as we improve localization -# support. -# -# Refer to the note in basic.properties for a description as to what -# the mnemonics correspond to and how to calculate them. -# -# @author Steve Wilson - - -############ FILE CHOOSER STRINGS ############# - -FileChooser.lookInLabelText=Consultar Em: -FileChooser.lookInLabelMnemonic=73 -FileChooser.saveInLabelText=Salvar Em: -FileChooser.fileNameLabelText=Nome do Arquivo: -FileChooser.fileNameLabelMnemonic=78 -FileChooser.folderNameLabelText=Nome da pasta: -FileChooser.folderNameLabelMnemonic=78 -FileChooser.filesOfTypeLabelText=Arquivos do Tipo: -FileChooser.filesOfTypeLabelMnemonic=84 -FileChooser.upFolderToolTipText=Um N\u00EDvel Acima -FileChooser.upFolderAccessibleName=Acima -FileChooser.homeFolderToolTipText=In\u00EDcio -FileChooser.homeFolderAccessibleName=In\u00EDcio -FileChooser.newFolderToolTipText=Criar Nova Pasta -FileChooser.newFolderAccessibleName=Nova Pasta -FileChooser.newFolderActionLabelText=Nova Pasta -FileChooser.listViewButtonToolTipText=Lista -FileChooser.listViewButtonAccessibleName=Lista -FileChooser.listViewActionLabelText=Lista -FileChooser.detailsViewButtonToolTipText=Detalhes -FileChooser.detailsViewButtonAccessibleName=Detalhes -FileChooser.detailsViewActionLabelText=Detalhes -FileChooser.refreshActionLabelText=Atualizar -FileChooser.viewMenuLabelText=Exibir -FileChooser.fileNameHeaderText=Nome -FileChooser.fileSizeHeaderText=Tamanho -FileChooser.fileTypeHeaderText=Tipo -FileChooser.fileDateHeaderText=Modificado -FileChooser.fileAttrHeaderText=Atributos +# This properties file is used to create a PropertyResourceBundle +# It contains Locale specific strings used be the Synth Look and Feel. +# Currently, the following components need this for support: +# +# FileChooser +# +# When this file is read in, the strings are put into the +# defaults table. This is an implementation detail of the current +# workings of Swing. DO NOT DEPEND ON THIS. +# This may change in future versions of Swing as we improve localization +# support. +# +# Refer to the note in basic.properties for a description as to what +# the mnemonics correspond to and how to calculate them. +# +# @author Steve Wilson + + +############ FILE CHOOSER STRINGS ############# + +FileChooser.lookInLabel.textAndMnemonic=Consultar Em(&I): +FileChooser.saveInLabel.textAndMnemonic=Salvar Em: +FileChooser.fileNameLabel.textAndMnemonic=&Nome do Arquivo: +FileChooser.folderNameLabel.textAndMnemonic=&Nome da pasta: +FileChooser.filesOfTypeLabel.textAndMnemonic=Arquivos do &Tipo: +FileChooser.upFolderToolTip.textAndMnemonic=Um N\u00EDvel Acima +FileChooser.upFolderAccessibleName=Acima +FileChooser.homeFolderToolTip.textAndMnemonic=In\u00EDcio +FileChooser.homeFolderAccessibleName=In\u00EDcio +FileChooser.newFolderToolTip.textAndMnemonic=Criar Nova Pasta +FileChooser.newFolderAccessibleName=Nova Pasta +FileChooser.newFolderActionLabel.textAndMnemonic=Nova Pasta +FileChooser.listViewButtonToolTip.textAndMnemonic=Lista +FileChooser.listViewButtonAccessibleName=Lista +FileChooser.listViewActionLabel.textAndMnemonic=Lista +FileChooser.detailsViewButtonToolTip.textAndMnemonic=Detalhes +FileChooser.detailsViewButtonAccessibleName=Detalhes +FileChooser.detailsViewActionLabel.textAndMnemonic=Detalhes +FileChooser.refreshActionLabel.textAndMnemonic=Atualizar +FileChooser.viewMenuLabel.textAndMnemonic=Exibir +FileChooser.fileNameHeader.textAndMnemonic=Nome +FileChooser.fileSizeHeader.textAndMnemonic=Tamanho +FileChooser.fileTypeHeader.textAndMnemonic=Tipo +FileChooser.fileDateHeader.textAndMnemonic=Modificado +FileChooser.fileAttrHeader.textAndMnemonic=Atributos diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_sv.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_sv.properties index 1d23ec84539..d1889196d5c 100644 --- a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_sv.properties +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_sv.properties @@ -1,49 +1,45 @@ -# This properties file is used to create a PropertyResourceBundle -# It contains Locale specific strings used be the Synth Look and Feel. -# Currently, the following components need this for support: -# -# FileChooser -# -# When this file is read in, the strings are put into the -# defaults table. This is an implementation detail of the current -# workings of Swing. DO NOT DEPEND ON THIS. -# This may change in future versions of Swing as we improve localization -# support. -# -# Refer to the note in basic.properties for a description as to what -# the mnemonics correspond to and how to calculate them. -# -# @author Steve Wilson - - -############ FILE CHOOSER STRINGS ############# - -FileChooser.lookInLabelText=Leta i: -FileChooser.lookInLabelMnemonic=73 -FileChooser.saveInLabelText=Spara i: -FileChooser.fileNameLabelText=Filnamn: -FileChooser.fileNameLabelMnemonic=78 -FileChooser.folderNameLabelText=Mapp: -FileChooser.folderNameLabelMnemonic=78 -FileChooser.filesOfTypeLabelText=Filformat: -FileChooser.filesOfTypeLabelMnemonic=84 -FileChooser.upFolderToolTipText=Upp en niv\u00E5 -FileChooser.upFolderAccessibleName=Upp -FileChooser.homeFolderToolTipText=Hem -FileChooser.homeFolderAccessibleName=Hem -FileChooser.newFolderToolTipText=Skapa ny mapp -FileChooser.newFolderAccessibleName=Ny mapp -FileChooser.newFolderActionLabelText=Ny mapp -FileChooser.listViewButtonToolTipText=Lista -FileChooser.listViewButtonAccessibleName=Lista -FileChooser.listViewActionLabelText=Lista -FileChooser.detailsViewButtonToolTipText=Detaljer -FileChooser.detailsViewButtonAccessibleName=Detaljer -FileChooser.detailsViewActionLabelText=Detaljer -FileChooser.refreshActionLabelText=F\u00F6rnya -FileChooser.viewMenuLabelText=Vy -FileChooser.fileNameHeaderText=Namn -FileChooser.fileSizeHeaderText=Storlek -FileChooser.fileTypeHeaderText=Typ -FileChooser.fileDateHeaderText=\u00C4ndrad -FileChooser.fileAttrHeaderText=Attribut +# This properties file is used to create a PropertyResourceBundle +# It contains Locale specific strings used be the Synth Look and Feel. +# Currently, the following components need this for support: +# +# FileChooser +# +# When this file is read in, the strings are put into the +# defaults table. This is an implementation detail of the current +# workings of Swing. DO NOT DEPEND ON THIS. +# This may change in future versions of Swing as we improve localization +# support. +# +# Refer to the note in basic.properties for a description as to what +# the mnemonics correspond to and how to calculate them. +# +# @author Steve Wilson + + +############ FILE CHOOSER STRINGS ############# + +FileChooser.lookInLabel.textAndMnemonic=Leta &i: +FileChooser.saveInLabel.textAndMnemonic=Spara i: +FileChooser.fileNameLabel.textAndMnemonic=Fil&namn: +FileChooser.folderNameLabel.textAndMnemonic=Mapp(&N): +FileChooser.filesOfTypeLabel.textAndMnemonic=Filforma&t: +FileChooser.upFolderToolTip.textAndMnemonic=Upp en niv\u00E5 +FileChooser.upFolderAccessibleName=Upp +FileChooser.homeFolderToolTip.textAndMnemonic=Hem +FileChooser.homeFolderAccessibleName=Hem +FileChooser.newFolderToolTip.textAndMnemonic=Skapa ny mapp +FileChooser.newFolderAccessibleName=Ny mapp +FileChooser.newFolderActionLabel.textAndMnemonic=Ny mapp +FileChooser.listViewButtonToolTip.textAndMnemonic=Lista +FileChooser.listViewButtonAccessibleName=Lista +FileChooser.listViewActionLabel.textAndMnemonic=Lista +FileChooser.detailsViewButtonToolTip.textAndMnemonic=Detaljer +FileChooser.detailsViewButtonAccessibleName=Detaljer +FileChooser.detailsViewActionLabel.textAndMnemonic=Detaljer +FileChooser.refreshActionLabel.textAndMnemonic=F\u00F6rnya +FileChooser.viewMenuLabel.textAndMnemonic=Vy +FileChooser.fileNameHeader.textAndMnemonic=Namn +FileChooser.fileSizeHeader.textAndMnemonic=Storlek +FileChooser.fileTypeHeader.textAndMnemonic=Typ +FileChooser.fileDateHeader.textAndMnemonic=\u00C4ndrad +FileChooser.fileAttrHeader.textAndMnemonic=Attribut diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_CN.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_CN.properties index 5269dcc7c17..f80024ae8b7 100644 --- a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_CN.properties +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_CN.properties @@ -1,49 +1,45 @@ -# This properties file is used to create a PropertyResourceBundle -# It contains Locale specific strings used be the Synth Look and Feel. -# Currently, the following components need this for support: -# -# FileChooser -# -# When this file is read in, the strings are put into the -# defaults table. This is an implementation detail of the current -# workings of Swing. DO NOT DEPEND ON THIS. -# This may change in future versions of Swing as we improve localization -# support. -# -# Refer to the note in basic.properties for a description as to what -# the mnemonics correspond to and how to calculate them. -# -# @author Steve Wilson - - -############ FILE CHOOSER STRINGS ############# - -FileChooser.lookInLabelText=\u67E5\u770B: -FileChooser.lookInLabelMnemonic=73 -FileChooser.saveInLabelText=\u4FDD\u5B58: -FileChooser.fileNameLabelText=\u6587\u4EF6\u540D: -FileChooser.fileNameLabelMnemonic=78 -FileChooser.folderNameLabelText=\u6587\u4EF6\u5939\u540D: -FileChooser.folderNameLabelMnemonic=78 -FileChooser.filesOfTypeLabelText=\u6587\u4EF6\u7C7B\u578B: -FileChooser.filesOfTypeLabelMnemonic=84 -FileChooser.upFolderToolTipText=\u5411\u4E0A\u4E00\u7EA7 -FileChooser.upFolderAccessibleName=\u5411\u4E0A -FileChooser.homeFolderToolTipText=\u4E3B\u76EE\u5F55 -FileChooser.homeFolderAccessibleName=\u4E3B\u76EE\u5F55 -FileChooser.newFolderToolTipText=\u521B\u5EFA\u65B0\u6587\u4EF6\u5939 -FileChooser.newFolderAccessibleName=\u65B0\u5EFA\u6587\u4EF6\u5939 -FileChooser.newFolderActionLabelText=\u65B0\u5EFA\u6587\u4EF6\u5939 -FileChooser.listViewButtonToolTipText=\u5217\u8868 -FileChooser.listViewButtonAccessibleName=\u5217\u8868 -FileChooser.listViewActionLabelText=\u5217\u8868 -FileChooser.detailsViewButtonToolTipText=\u8BE6\u7EC6\u8D44\u6599 -FileChooser.detailsViewButtonAccessibleName=\u8BE6\u7EC6\u8D44\u6599 -FileChooser.detailsViewActionLabelText=\u8BE6\u7EC6\u8D44\u6599 -FileChooser.refreshActionLabelText=\u5237\u65B0 -FileChooser.viewMenuLabelText=\u89C6\u56FE -FileChooser.fileNameHeaderText=\u540D\u79F0 -FileChooser.fileSizeHeaderText=\u5927\u5C0F -FileChooser.fileTypeHeaderText=\u7C7B\u578B -FileChooser.fileDateHeaderText=\u4FEE\u6539\u65E5\u671F -FileChooser.fileAttrHeaderText=\u5C5E\u6027 +# This properties file is used to create a PropertyResourceBundle +# It contains Locale specific strings used be the Synth Look and Feel. +# Currently, the following components need this for support: +# +# FileChooser +# +# When this file is read in, the strings are put into the +# defaults table. This is an implementation detail of the current +# workings of Swing. DO NOT DEPEND ON THIS. +# This may change in future versions of Swing as we improve localization +# support. +# +# Refer to the note in basic.properties for a description as to what +# the mnemonics correspond to and how to calculate them. +# +# @author Steve Wilson + + +############ FILE CHOOSER STRINGS ############# + +FileChooser.lookInLabel.textAndMnemonic=\u67E5\u770B(&I): +FileChooser.saveInLabel.textAndMnemonic=\u4FDD\u5B58: +FileChooser.fileNameLabel.textAndMnemonic=\u6587\u4EF6\u540D(&N): +FileChooser.folderNameLabel.textAndMnemonic=\u6587\u4EF6\u5939\u540D(&N): +FileChooser.filesOfTypeLabel.textAndMnemonic=\u6587\u4EF6\u7C7B\u578B(&T): +FileChooser.upFolderToolTip.textAndMnemonic=\u5411\u4E0A\u4E00\u7EA7 +FileChooser.upFolderAccessibleName=\u5411\u4E0A +FileChooser.homeFolderToolTip.textAndMnemonic=\u4E3B\u76EE\u5F55 +FileChooser.homeFolderAccessibleName=\u4E3B\u76EE\u5F55 +FileChooser.newFolderToolTip.textAndMnemonic=\u521B\u5EFA\u65B0\u6587\u4EF6\u5939 +FileChooser.newFolderAccessibleName=\u65B0\u5EFA\u6587\u4EF6\u5939 +FileChooser.newFolderActionLabel.textAndMnemonic=\u65B0\u5EFA\u6587\u4EF6\u5939 +FileChooser.listViewButtonToolTip.textAndMnemonic=\u5217\u8868 +FileChooser.listViewButtonAccessibleName=\u5217\u8868 +FileChooser.listViewActionLabel.textAndMnemonic=\u5217\u8868 +FileChooser.detailsViewButtonToolTip.textAndMnemonic=\u8BE6\u7EC6\u8D44\u6599 +FileChooser.detailsViewButtonAccessibleName=\u8BE6\u7EC6\u8D44\u6599 +FileChooser.detailsViewActionLabel.textAndMnemonic=\u8BE6\u7EC6\u8D44\u6599 +FileChooser.refreshActionLabel.textAndMnemonic=\u5237\u65B0 +FileChooser.viewMenuLabel.textAndMnemonic=\u89C6\u56FE +FileChooser.fileNameHeader.textAndMnemonic=\u540D\u79F0 +FileChooser.fileSizeHeader.textAndMnemonic=\u5927\u5C0F +FileChooser.fileTypeHeader.textAndMnemonic=\u7C7B\u578B +FileChooser.fileDateHeader.textAndMnemonic=\u4FEE\u6539\u65E5\u671F +FileChooser.fileAttrHeader.textAndMnemonic=\u5C5E\u6027 diff --git a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_TW.properties b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_TW.properties index b76aa0b5eda..6985cbc4993 100644 --- a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_TW.properties +++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_TW.properties @@ -1,49 +1,45 @@ -# This properties file is used to create a PropertyResourceBundle -# It contains Locale specific strings used be the Synth Look and Feel. -# Currently, the following components need this for support: -# -# FileChooser -# -# When this file is read in, the strings are put into the -# defaults table. This is an implementation detail of the current -# workings of Swing. DO NOT DEPEND ON THIS. -# This may change in future versions of Swing as we improve localization -# support. -# -# Refer to the note in basic.properties for a description as to what -# the mnemonics correspond to and how to calculate them. -# -# @author Steve Wilson - - -############ FILE CHOOSER STRINGS ############# - -FileChooser.lookInLabelText=\u67E5\u8A62: -FileChooser.lookInLabelMnemonic=73 -FileChooser.saveInLabelText=\u5132\u5B58\u65BC: -FileChooser.fileNameLabelText=\u6A94\u6848\u540D\u7A31: -FileChooser.fileNameLabelMnemonic=78 -FileChooser.folderNameLabelText=\u8CC7\u6599\u593E\u540D\u7A31: -FileChooser.folderNameLabelMnemonic=78 -FileChooser.filesOfTypeLabelText=\u6A94\u6848\u985E\u578B: -FileChooser.filesOfTypeLabelMnemonic=84 -FileChooser.upFolderToolTipText=\u5F80\u4E0A\u4E00\u5C64 -FileChooser.upFolderAccessibleName=\u5F80\u4E0A -FileChooser.homeFolderToolTipText=\u4E3B\u76EE\u9304 -FileChooser.homeFolderAccessibleName=\u4E3B\u76EE\u9304 -FileChooser.newFolderToolTipText=\u5EFA\u7ACB\u65B0\u8CC7\u6599\u593E -FileChooser.newFolderAccessibleName=\u65B0\u8CC7\u6599\u593E -FileChooser.newFolderActionLabelText=\u65B0\u8CC7\u6599\u593E -FileChooser.listViewButtonToolTipText=\u6E05\u55AE -FileChooser.listViewButtonAccessibleName=\u6E05\u55AE -FileChooser.listViewActionLabelText=\u6E05\u55AE -FileChooser.detailsViewButtonToolTipText=\u8A73\u7D30\u8CC7\u8A0A -FileChooser.detailsViewButtonAccessibleName=\u8A73\u7D30\u8CC7\u8A0A -FileChooser.detailsViewActionLabelText=\u8A73\u7D30\u8CC7\u8A0A -FileChooser.refreshActionLabelText=\u91CD\u65B0\u6574\u7406 -FileChooser.viewMenuLabelText=\u6AA2\u8996 -FileChooser.fileNameHeaderText=\u540D\u7A31 -FileChooser.fileSizeHeaderText=\u5927\u5C0F -FileChooser.fileTypeHeaderText=\u985E\u578B -FileChooser.fileDateHeaderText=\u4FEE\u6539\u65E5\u671F -FileChooser.fileAttrHeaderText=\u5C6C\u6027 +# This properties file is used to create a PropertyResourceBundle +# It contains Locale specific strings used be the Synth Look and Feel. +# Currently, the following components need this for support: +# +# FileChooser +# +# When this file is read in, the strings are put into the +# defaults table. This is an implementation detail of the current +# workings of Swing. DO NOT DEPEND ON THIS. +# This may change in future versions of Swing as we improve localization +# support. +# +# Refer to the note in basic.properties for a description as to what +# the mnemonics correspond to and how to calculate them. +# +# @author Steve Wilson + + +############ FILE CHOOSER STRINGS ############# + +FileChooser.lookInLabel.textAndMnemonic=\u67E5\u8A62(&I): +FileChooser.saveInLabel.textAndMnemonic=\u5132\u5B58\u65BC: +FileChooser.fileNameLabel.textAndMnemonic=\u6A94\u6848\u540D\u7A31(&N): +FileChooser.folderNameLabel.textAndMnemonic=\u8CC7\u6599\u593E\u540D\u7A31(&N): +FileChooser.filesOfTypeLabel.textAndMnemonic=\u6A94\u6848\u985E\u578B(&T): +FileChooser.upFolderToolTip.textAndMnemonic=\u5F80\u4E0A\u4E00\u5C64 +FileChooser.upFolderAccessibleName=\u5F80\u4E0A +FileChooser.homeFolderToolTip.textAndMnemonic=\u4E3B\u76EE\u9304 +FileChooser.homeFolderAccessibleName=\u4E3B\u76EE\u9304 +FileChooser.newFolderToolTip.textAndMnemonic=\u5EFA\u7ACB\u65B0\u8CC7\u6599\u593E +FileChooser.newFolderAccessibleName=\u65B0\u8CC7\u6599\u593E +FileChooser.newFolderActionLabel.textAndMnemonic=\u65B0\u8CC7\u6599\u593E +FileChooser.listViewButtonToolTip.textAndMnemonic=\u6E05\u55AE +FileChooser.listViewButtonAccessibleName=\u6E05\u55AE +FileChooser.listViewActionLabel.textAndMnemonic=\u6E05\u55AE +FileChooser.detailsViewButtonToolTip.textAndMnemonic=\u8A73\u7D30\u8CC7\u8A0A +FileChooser.detailsViewButtonAccessibleName=\u8A73\u7D30\u8CC7\u8A0A +FileChooser.detailsViewActionLabel.textAndMnemonic=\u8A73\u7D30\u8CC7\u8A0A +FileChooser.refreshActionLabel.textAndMnemonic=\u91CD\u65B0\u6574\u7406 +FileChooser.viewMenuLabel.textAndMnemonic=\u6AA2\u8996 +FileChooser.fileNameHeader.textAndMnemonic=\u540D\u7A31 +FileChooser.fileSizeHeader.textAndMnemonic=\u5927\u5C0F +FileChooser.fileTypeHeader.textAndMnemonic=\u985E\u578B +FileChooser.fileDateHeader.textAndMnemonic=\u4FEE\u6539\u65E5\u671F +FileChooser.fileAttrHeader.textAndMnemonic=\u5C6C\u6027 diff --git a/jdk/src/share/classes/javax/swing/UIDefaults.java b/jdk/src/share/classes/javax/swing/UIDefaults.java index 6b98a492824..9f22122d7b2 100644 --- a/jdk/src/share/classes/javax/swing/UIDefaults.java +++ b/jdk/src/share/classes/javax/swing/UIDefaults.java @@ -297,7 +297,7 @@ public class UIDefaults extends Hashtable Map values = resourceCache.get(l); if (values == null) { - values = new HashMap(); + values = new TextAndMnemonicHashMap(); for (int i=resourceBundles.size()-1; i >= 0; i--) { String bundleName = resourceBundles.get(i); try { @@ -1215,4 +1215,120 @@ public class UIDefaults extends Hashtable return null; } } + + /** + * TextAndMnemonicHashMap stores swing resource strings. Many of strings + * can have a mnemonic. For example: + * FileChooser.saveButton.textAndMnemonic=&Save + * For this case method get returns "Save" for the key "FileChooser.saveButtonText" and + * mnemonic "S" for the key "FileChooser.saveButtonMnemonic" + * + * There are several patterns for the text and mnemonic suffixes which are checked by the + * TextAndMnemonicHashMap class. + * Patterns which are converted to the xxx.textAndMnemonic key: + * (xxxNameText, xxxNameMnemonic) + * (xxxNameText, xxxMnemonic) + * (xxx.nameText, xxx.mnemonic) + * (xxxText, xxxMnemonic) + * + * These patterns can have a mnemonic index in format + * (xxxDisplayedMnemonicIndex) + * + * Pattern which is converted to the xxx.titleAndMnemonic key: + * (xxxTitle, xxxMnemonic) + * + */ + private static class TextAndMnemonicHashMap extends HashMap { + + static final String AND_MNEMONIC = "AndMnemonic"; + static final String TITLE_SUFFIX = ".titleAndMnemonic"; + static final String TEXT_SUFFIX = ".textAndMnemonic"; + + @Override + public Object get(Object key) { + + Object value = super.get(key); + + if (value == null) { + + boolean checkTitle = false; + + String stringKey = key.toString(); + String compositeKey = null; + + if (stringKey.endsWith(AND_MNEMONIC)) { + return null; + } + + if (stringKey.endsWith(".mnemonic")) { + compositeKey = composeKey(stringKey, 9, TEXT_SUFFIX); + } else if (stringKey.endsWith("NameMnemonic")) { + compositeKey = composeKey(stringKey, 12, TEXT_SUFFIX); + } else if (stringKey.endsWith("Mnemonic")) { + compositeKey = composeKey(stringKey, 8, TEXT_SUFFIX); + checkTitle = true; + } + + if (compositeKey != null) { + value = super.get(compositeKey); + if (value == null && checkTitle) { + compositeKey = composeKey(stringKey, 8, TITLE_SUFFIX); + value = super.get(compositeKey); + } + + return value == null ? null : getMnemonicFromProperty(value.toString()); + } + + if (stringKey.endsWith("NameText")) { + compositeKey = composeKey(stringKey, 8, TEXT_SUFFIX); + } else if (stringKey.endsWith(".nameText")) { + compositeKey = composeKey(stringKey, 9, TEXT_SUFFIX); + } else if (stringKey.endsWith("Text")) { + compositeKey = composeKey(stringKey, 4, TEXT_SUFFIX); + } else if (stringKey.endsWith("Title")) { + compositeKey = composeKey(stringKey, 5, TITLE_SUFFIX); + } + + if (compositeKey != null) { + value = super.get(compositeKey); + return value == null ? null : getTextFromProperty(value.toString()); + } + + if (stringKey.endsWith("DisplayedMnemonicIndex")) { + compositeKey = composeKey(stringKey, 22, TEXT_SUFFIX); + value = super.get(compositeKey); + if (value == null) { + compositeKey = composeKey(stringKey, 22, TITLE_SUFFIX); + value = super.get(compositeKey); + } + return value == null ? null : getIndexFromProperty(value.toString()); + } + } + + return value; + } + + String composeKey(String key, int reduce, String sufix) { + return key.substring(0, key.length() - reduce) + sufix; + } + + String getTextFromProperty(String text) { + return text.replace("&", ""); + } + + String getMnemonicFromProperty(String text) { + int index = text.indexOf('&'); + if (0 <= index && index < text.length() - 1) { + char c = text.charAt(index + 1); + return Integer.toString((int) Character.toUpperCase(c)); + } + return null; + } + + String getIndexFromProperty(String text) { + int index = text.indexOf('&'); + return (index == -1) ? null : Integer.toString(index); + } + } + } From 60b713fd8dc11f649dca0904b306f0cbaa068dd2 Mon Sep 17 00:00:00 2001 From: Chris Hegarty Date: Wed, 4 Apr 2012 15:14:00 +0100 Subject: [PATCH 11/26] 6963841: java/util/concurrent/Phaser/Basic.java fails intermittently Reviewed-by: dl, dholmes --- jdk/test/java/util/concurrent/Phaser/Basic.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/jdk/test/java/util/concurrent/Phaser/Basic.java b/jdk/test/java/util/concurrent/Phaser/Basic.java index d9f60ecd3ae..ec9f01cfe30 100644 --- a/jdk/test/java/util/concurrent/Phaser/Basic.java +++ b/jdk/test/java/util/concurrent/Phaser/Basic.java @@ -96,7 +96,7 @@ public class Basic { int phase = atTheStartingGate.getPhase(); equal(phase, atTheStartingGate.arrive()); int awaitPhase = atTheStartingGate.awaitAdvanceInterruptibly - (phase, 10, SECONDS); + (phase, 30, SECONDS); if (expectNextPhase) check(awaitPhase == (phase + 1)); pass(); @@ -188,7 +188,7 @@ public class Basic { case 2: case 6: case 7: return awaiter(phaser, -1, SECONDS); default: - return awaiter(phaser, 10, SECONDS); }} + return awaiter(phaser, 30, SECONDS); }} public void remove() {throw new UnsupportedOperationException();}}; } @@ -204,7 +204,7 @@ public class Basic { case 2: case 5: return awaiter(phaser, -1, SECONDS); default: - return awaiter(phaser, 10, SECONDS); }} + return awaiter(phaser, 30, SECONDS); }} public void remove() {throw new UnsupportedOperationException();}}; } @@ -251,9 +251,11 @@ public class Basic { int phase = phaser.getPhase(); for (int i = 0; i < 4; i++) { check(phaser.getPhase() == phase); - Awaiter a1 = awaiter(phaser, 10, SECONDS); a1.start(); + Awaiter a1 = awaiter(phaser, 30, SECONDS); a1.start(); Arriver a2 = arrivers.next(); a2.start(); toTheStartingGate(); + // allow a1 to block in awaitAdvanceInterruptibly + Thread.sleep(2000); a1.interrupt(); a1.join(); phaser.arriveAndAwaitAdvance(); From 38e189dcc0b43384d4ee73d17497997cc4ca8c8e Mon Sep 17 00:00:00 2001 From: Alexander Zuev Date: Wed, 4 Apr 2012 20:31:50 +0400 Subject: [PATCH 12/26] 7153735: [macosx] Text with diacritics is pasted with broken encoding Reviewed-by: anthony --- jdk/make/common/Defs-linux.gmk | 5 + jdk/make/common/Defs-macosx.gmk | 5 + jdk/make/common/Defs-solaris.gmk | 5 + jdk/make/common/Defs-windows.gmk | 5 + jdk/make/java/awt/Makefile | 2 +- jdk/src/macosx/lib/content-types.properties | 276 ++++++++++++++++++++ jdk/src/macosx/lib/flavormap.properties | 78 ++++++ 7 files changed, 375 insertions(+), 1 deletion(-) create mode 100644 jdk/src/macosx/lib/content-types.properties create mode 100644 jdk/src/macosx/lib/flavormap.properties diff --git a/jdk/make/common/Defs-linux.gmk b/jdk/make/common/Defs-linux.gmk index 499bcff8bb0..ca5f15971d5 100644 --- a/jdk/make/common/Defs-linux.gmk +++ b/jdk/make/common/Defs-linux.gmk @@ -53,6 +53,11 @@ ifndef PLATFORM_SRC PLATFORM_SRC = $(BUILDDIR)/../src/solaris endif # PLATFORM_SRC +# Location of the various .properties files specific to Linux platform +ifndef PLATFORM_PROPERTIES + PLATFORM_PROPERTIES = $(BUILDDIR)/../src/solaris/lib +endif # PLATFORM_SRC + # Platform specific closed sources ifndef OPENJDK ifndef CLOSED_PLATFORM_SRC diff --git a/jdk/make/common/Defs-macosx.gmk b/jdk/make/common/Defs-macosx.gmk index d6b8307f639..53871ac1d5f 100644 --- a/jdk/make/common/Defs-macosx.gmk +++ b/jdk/make/common/Defs-macosx.gmk @@ -53,6 +53,11 @@ ifndef PLATFORM_SRC PLATFORM_SRC = $(BUILDDIR)/../src/solaris endif # PLATFORM_SRC +# Location of the various .properties files specific to MacOS X platform +ifndef PLATFORM_PROPERTIES + PLATFORM_PROPERTIES = $(BUILDDIR)/../src/macosx/lib +endif # PLATFORM_SRC + PLATFORM_SRC_MACOS = $(BUILDDIR)/../src/macosx # BSD build pulls its platform sources from the solaris tree. diff --git a/jdk/make/common/Defs-solaris.gmk b/jdk/make/common/Defs-solaris.gmk index 9826b61a6f8..32f1089f90d 100644 --- a/jdk/make/common/Defs-solaris.gmk +++ b/jdk/make/common/Defs-solaris.gmk @@ -51,6 +51,11 @@ ifndef PLATFORM_SRC PLATFORM_SRC = $(BUILDDIR)/../src/solaris endif # PLATFORM_SRC +# Location of the various .properties files specific to Solaris platform +ifndef PLATFORM_PROPERTIES + PLATFORM_PROPERTIES = $(BUILDDIR)/../src/solaris/lib +endif # PLATFORM_SRC + # Platform specific closed sources ifndef OPENJDK ifndef CLOSED_PLATFORM_SRC diff --git a/jdk/make/common/Defs-windows.gmk b/jdk/make/common/Defs-windows.gmk index c23d0244906..f6ed134232a 100644 --- a/jdk/make/common/Defs-windows.gmk +++ b/jdk/make/common/Defs-windows.gmk @@ -52,6 +52,11 @@ ifndef PLATFORM_SRC PLATFORM_SRC = $(BUILDDIR)/../src/windows endif # PLATFORM_SRC +# Location of the various .properties files specific to Windows platform +ifndef PLATFORM_PROPERTIES + PLATFORM_PROPERTIES = $(BUILDDIR)/../src/windows/lib +endif # PLATFORM_SRC + # Platform specific closed sources ifndef OPENJDK ifndef CLOSED_PLATFORM_SRC diff --git a/jdk/make/java/awt/Makefile b/jdk/make/java/awt/Makefile index 6cabc50f19a..2bc9e76a943 100644 --- a/jdk/make/java/awt/Makefile +++ b/jdk/make/java/awt/Makefile @@ -57,7 +57,7 @@ LIBPROPS = $(_LIBPROPS:%=$(LIBDIR)/%) properties: $(LIBDIR) $(LIBPROPS) -$(LIBDIR)/%.properties: $(PLATFORM_SRC)/lib/%.properties +$(LIBDIR)/%.properties: $(PLATFORM_PROPERTIES)/%.properties $(install-file) properties.clean : diff --git a/jdk/src/macosx/lib/content-types.properties b/jdk/src/macosx/lib/content-types.properties new file mode 100644 index 00000000000..2126b01188a --- /dev/null +++ b/jdk/src/macosx/lib/content-types.properties @@ -0,0 +1,276 @@ +#sun.net.www MIME content-types table +# +# Property fields: +# +# ::= 'description' '=' +# ::= 'file_extensions' '=' +# ::= 'icon' '=' +# ::= 'browser' | 'application' | 'save' | 'unknown' +# ::= 'application' '=' +# + +# +# The "we don't know anything about this data" type(s). +# Used internally to mark unrecognized types. +# +content/unknown: description=Unknown Content +unknown/unknown: description=Unknown Data Type + +# +# The template we should use for temporary files when launching an application +# to view a document of given type. +# +temp.file.template: /tmp/%s + +# +# The "real" types. +# +application/octet-stream: \ + description=Generic Binary Stream;\ + file_extensions=.saveme,.dump,.hqx,.arc,.o,.a,.bin,.exe,.z,.gz + +application/oda: \ + description=ODA Document;\ + file_extensions=.oda + +application/pdf: \ + description=Adobe PDF Format;\ + file_extensions=.pdf + +application/postscript: \ + description=Postscript File;\ + file_extensions=.eps,.ai,.ps;\ + icon=ps;\ + action=application;\ + application=imagetool %s + +application/x-dvi: \ + description=TeX DVI File;\ + file_extensions=.dvi;\ + action=application;\ + application=xdvi %s + +application/x-hdf: \ + description=Hierarchical Data Format;\ + file_extensions=.hdf;\ + action=save + +application/x-latex: \ + description=LaTeX Source;\ + file_extensions=.latex + +application/x-netcdf: \ + description=Unidata netCDF Data Format;\ + file_extensions=.nc,.cdf;\ + action=save + +application/x-tex: \ + description=TeX Source;\ + file_extensions=.tex + +application/x-texinfo: \ + description=Gnu Texinfo;\ + file_extensions=.texinfo,.texi + +application/x-troff: \ + description=Troff Source;\ + file_extensions=.t,.tr,.roff;\ + action=application;\ + application=xterm -title troff -e sh -c \"nroff %s | col | more -w\" + +application/x-troff-man: \ + description=Troff Manpage Source;\ + file_extensions=.man;\ + action=application;\ + application=xterm -title troff -e sh -c \"nroff -man %s | col | more -w\" + +application/x-troff-me: \ + description=Troff ME Macros;\ + file_extensions=.me;\ + action=application;\ + application=xterm -title troff -e sh -c \"nroff -me %s | col | more -w\" + +application/x-troff-ms: \ + description=Troff MS Macros;\ + file_extensions=.ms;\ + action=application;\ + application=xterm -title troff -e sh -c \"nroff -ms %s | col | more -w\" + +application/x-wais-source: \ + description=Wais Source;\ + file_extensions=.src,.wsrc + +application/zip: \ + description=Zip File;\ + file_extensions=.zip;\ + icon=zip;\ + action=save + +application/x-bcpio: \ + description=Old Binary CPIO Archive;\ + file_extensions=.bcpio; action=save + +application/x-cpio: \ + description=Unix CPIO Archive;\ + file_extensions=.cpio; action=save + +application/x-gtar: \ + description=Gnu Tar Archive;\ + file_extensions=.gtar;\ + icon=tar;\ + action=save + +application/x-shar: \ + description=Shell Archive;\ + file_extensions=.sh,.shar;\ + action=save + +application/x-sv4cpio: \ + description=SVR4 CPIO Archive;\ + file_extensions=.sv4cpio; action=save + +application/x-sv4crc: \ + description=SVR4 CPIO with CRC;\ + file_extensions=.sv4crc; action=save + +application/x-tar: \ + description=Tar Archive;\ + file_extensions=.tar;\ + icon=tar;\ + action=save + +application/x-ustar: \ + description=US Tar Archive;\ + file_extensions=.ustar;\ + action=save + +audio/basic: \ + description=Basic Audio;\ + file_extensions=.snd,.au;\ + icon=audio;\ + action=application;\ + application=audiotool %s + +audio/x-aiff: \ + description=Audio Interchange Format File;\ + file_extensions=.aifc,.aif,.aiff;\ + icon=aiff + +audio/x-wav: \ + description=Wav Audio;\ + file_extensions=.wav;\ + icon=wav + +image/gif: \ + description=GIF Image;\ + file_extensions=.gif;\ + icon=gif;\ + action=browser + +image/ief: \ + description=Image Exchange Format;\ + file_extensions=.ief + +image/jpeg: \ + description=JPEG Image;\ + file_extensions=.jfif,.jfif-tbnl,.jpe,.jpg,.jpeg;\ + icon=jpeg;\ + action=browser;\ + application=imagetool %s + +image/tiff: \ + description=TIFF Image;\ + file_extensions=.tif,.tiff;\ + icon=tiff + +image/vnd.fpx: \ + description=FlashPix Image;\ + file_extensions=.fpx,.fpix + +image/x-cmu-rast: \ + description=CMU Raster Image;\ + file_extensions=.ras + +image/x-portable-anymap: \ + description=PBM Anymap Format;\ + file_extensions=.pnm + +image/x-portable-bitmap: \ + description=PBM Bitmap Format;\ + file_extensions=.pbm + +image/x-portable-graymap: \ + description=PBM Graymap Format;\ + file_extensions=.pgm + +image/x-portable-pixmap: \ + description=PBM Pixmap Format;\ + file_extensions=.ppm + +image/x-rgb: \ + description=RGB Image;\ + file_extensions=.rgb + +image/x-xbitmap: \ + description=X Bitmap Image;\ + file_extensions=.xbm,.xpm + +image/x-xwindowdump: \ + description=X Window Dump Image;\ + file_extensions=.xwd + +image/png: \ + description=PNG Image;\ + file_extensions=.png;\ + icon=png;\ + action=browser + +text/html: \ + description=HTML Document;\ + file_extensions=.htm,.html;\ + icon=html + +text/plain: \ + description=Plain Text;\ + file_extensions=.text,.c,.cc,.c++,.h,.pl,.txt,.java,.el;\ + icon=text;\ + action=browser + +text/tab-separated-values: \ + description=Tab Separated Values Text;\ + file_extensions=.tsv + +text/x-setext: \ + description=Structure Enhanced Text;\ + file_extensions=.etx + +video/mpeg: \ + description=MPEG Video Clip;\ + file_extensions=.mpg,.mpe,.mpeg;\ + icon=mpeg;\ + action=application;\ + application=mpeg_play %s + +video/quicktime: \ + description=QuickTime Video Clip;\ + file_extensions=.mov,.qt + +application/x-troff-msvideo: \ + description=AVI Video;\ + file_extensions=.avi;\ + icon=avi + +video/x-sgi-movie: \ + description=SGI Movie;\ + file_extensions=.movie,.mv + +message/rfc822: \ + description=Internet Email Message;\ + file_extensions=.mime + +application/xml: \ + description=XML document;\ + file_extensions=.xml + + + diff --git a/jdk/src/macosx/lib/flavormap.properties b/jdk/src/macosx/lib/flavormap.properties new file mode 100644 index 00000000000..5e17d6e3d83 --- /dev/null +++ b/jdk/src/macosx/lib/flavormap.properties @@ -0,0 +1,78 @@ +# +# This properties file is used to initialize the default +# java.awt.datatransfer.SystemFlavorMap. It contains the X11 platform-specific, +# default mappings between common X11 selection atoms and platform-independent +# MIME type strings, which will be converted into +# java.awt.datatransfer.DataFlavors. +# +# These default mappings may be augmented by specifying the +# +# AWT.DnD.flavorMapFileURL +# +# property in the appropriate awt.properties file. The specified properties URL +# will be loaded into the SystemFlavorMap. +# +# The standard format is: +# +# = +# +# should be a string identifier that the native platform will +# recognize as a valid data format. should specify both a MIME +# primary type and a MIME subtype separated by a '/'. The MIME type may include +# parameters, where each parameter is a key/value pair separated by '=', and +# where each parameter to the MIME type is separated by a ';'. +# +# Because SystemFlavorMap implements FlavorTable, developers are free to +# duplicate both native keys and DataFlavor values. If a mapping contains a +# duplicate key or value, earlier mappings which included this key or value +# will be preferred. +# +# Mappings whose values specify DataFlavors with primary MIME types of +# "text", and which support the charset parameter, should specify the exact +# format in which the native platform expects the data. The "charset" +# parameter specifies the char to byte encoding, the "eoln" parameter +# specifies the end-of-line marker, and the "terminators" parameter specifies +# the number of terminating NUL bytes. Note that "eoln" and "terminators" +# are not standardized MIME type parameters. They are specific to this file +# format ONLY. They will not appear in any of the DataFlavors returned by the +# SystemFlavorMap at the Java level. +# +# If the "charset" parameter is omitted, or has zero length, the platform +# default encoding is assumed. If the "eoln" parameter is omitted, or has +# zero length, "\n" is assumed. If the "terminators" parameter is omitted, +# or has a value less than zero, zero is assumed. +# +# Upon initialization, the data transfer subsystem will record the specified +# details of the native text format, but the default SystemFlavorMap will +# present a large set of synthesized DataFlavors which map, in both +# directions, to the native. After receiving data from the application in one +# of the synthetic DataFlavors, the data transfer subsystem will transform +# the data stream into the format specified in this file before passing the +# transformed stream to the native system. +# +# Mappings whose values specify DataFlavors with primary MIME types of +# "text", but which do not support the charset parameter, will be treated as +# opaque, 8-bit data. They will not undergo any transformation process, and +# any "charset", "eoln", or "terminators" parameters specified in this file +# will be ignored. +# +# See java.awt.datatransfer.DataFlavor.selectBestTextFlavor for a list of +# text flavors which support the charset parameter. + +UTF8_STRING=text/plain;charset=UTF-8;eoln="\n";terminators=0 + +# The COMPOUND_TEXT support for inter-client text transfer is disabled by +# default. The reason is that many native applications prefer this format over +# other native text formats, but are unable to decode the textual data in this +# format properly. This results in java-to-native text transfer failures. +# To enable the COMPOUND_TEXT support for this JRE installation uncomment +# the line below. + +# COMPOUND_TEXT=text/plain;charset=x-compound-text;eoln="\n";terminators=0 + +TEXT=text/plain;eoln="\n";terminators=0 +STRING=text/plain;charset=UTF-8;eoln="\n";terminators=0 +FILE_NAME=application/x-java-file-list;class=java.util.List +text/uri-list=application/x-java-file-list;class=java.util.List +PNG=image/x-java-image;class=java.awt.Image +JFIF=image/x-java-image;class=java.awt.Image From 0881e4a989b921cfa0ba0480a107e7d7a25c651b Mon Sep 17 00:00:00 2001 From: Darryl Mocek Date: Wed, 4 Apr 2012 15:57:04 -0700 Subject: [PATCH 13/26] 7159130: add java/rmi/transport/pinClientSocketFactory to problem list Reviewed-by: smarks --- jdk/test/ProblemList.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt index 70a44d7c466..94db829ba11 100644 --- a/jdk/test/ProblemList.txt +++ b/jdk/test/ProblemList.txt @@ -252,6 +252,9 @@ java/rmi/transport/rapidExportUnexport/RapidExportUnexport.java linux-all # 7132247 java/rmi/registry/readTest/readTest.sh windows-all +# 7142596 +java/rmi/transport/pinClientSocketFactory/PinClientSocketFactory.java generic-all + ############################################################################ # jdk_security From f3e1a941c5cadd63bfc1bad7159114e96ee88eef Mon Sep 17 00:00:00 2001 From: Jim Gish Date: Thu, 5 Apr 2012 13:57:37 +0100 Subject: [PATCH 14/26] 7133806: Typo in Files.newByteChannel javadoc Reviewed-by: chegar --- jdk/src/share/classes/java/nio/file/Files.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jdk/src/share/classes/java/nio/file/Files.java b/jdk/src/share/classes/java/nio/file/Files.java index f46ae4cd40b..e3449b048e2 100644 --- a/jdk/src/share/classes/java/nio/file/Files.java +++ b/jdk/src/share/classes/java/nio/file/Files.java @@ -269,7 +269,7 @@ public final class Files { * WritableByteChannel wbc = Files.newByteChannel(path, EnumSet.of(CREATE,APPEND)); * * // create file with initial permissions, opening it for both reading and writing - * {@code FileAttribute<> perms = ...} + * {@code FileAttribute> perms = ...} * SeekableByteChannel sbc = Files.newByteChannel(path, EnumSet.of(CREATE_NEW,READ,WRITE), perms); * * From 9b1c60970bd2a5187b942aee9a16b544c23e9f6f Mon Sep 17 00:00:00 2001 From: David Katleman Date: Thu, 5 Apr 2012 13:05:00 -0700 Subject: [PATCH 15/26] Added tag jdk8-b33 for changeset fceb406055d8 --- jdk/.hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/jdk/.hgtags b/jdk/.hgtags index 70d9485e8f6..f6f4a8d7971 100644 --- a/jdk/.hgtags +++ b/jdk/.hgtags @@ -154,3 +154,4 @@ c5b882dce0fe27e05dc64debc92b1fb9ebf880ec jdk8-b29 cdbb33303ea344d5e9013e2dd642e7a6e7768db6 jdk8-b30 27f0c08c427c65fcab6917edf646f59058e59524 jdk8-b31 ddfe5562f61f54ed2121ac0c73b688b94f3e66b5 jdk8-b32 +78cea258caaba3980ba186c426da82c8fe41bfd7 jdk8-b33 From 79f8fba3f9ff4c094f5db4b3bc8852ab78e54562 Mon Sep 17 00:00:00 2001 From: Sean Zhou Date: Tue, 10 Apr 2012 10:17:36 +0800 Subject: [PATCH 16/26] 7121314: Behavior mismatch between AbstractCollection.toArray(T[] ) and its spec Co-authored-by: Ulf Zibis Co-authored-by: David Holmes Reviewed-by: dholmes, mduigou --- .../classes/java/util/AbstractCollection.java | 14 +- .../util/AbstractCollection/ToArrayTest.java | 215 ++++++++++++++++++ 2 files changed, 226 insertions(+), 3 deletions(-) create mode 100644 jdk/test/java/util/AbstractCollection/ToArrayTest.java diff --git a/jdk/src/share/classes/java/util/AbstractCollection.java b/jdk/src/share/classes/java/util/AbstractCollection.java index 2ae70f7ec93..a32d41156a3 100644 --- a/jdk/src/share/classes/java/util/AbstractCollection.java +++ b/jdk/src/share/classes/java/util/AbstractCollection.java @@ -180,13 +180,21 @@ public abstract class AbstractCollection implements Collection { for (int i = 0; i < r.length; i++) { if (! it.hasNext()) { // fewer elements than expected - if (a != r) + if (a == r) { + r[i] = null; // null-terminate + } else if (a.length < i) { return Arrays.copyOf(r, i); - r[i] = null; // null-terminate - return r; + } else { + System.arraycopy(r, 0, a, 0, i); + if (a.length > i) { + a[i] = null; + } + } + return a; } r[i] = (T)it.next(); } + // more elements than expected return it.hasNext() ? finishToArray(r, it) : r; } diff --git a/jdk/test/java/util/AbstractCollection/ToArrayTest.java b/jdk/test/java/util/AbstractCollection/ToArrayTest.java new file mode 100644 index 00000000000..1cbf66fdf15 --- /dev/null +++ b/jdk/test/java/util/AbstractCollection/ToArrayTest.java @@ -0,0 +1,215 @@ +/* + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 7121314 + * @summary AbstractCollection.toArray(T[]) doesn't return the given array + * in concurrent modification. + * @author Ulf Zibis, David Holmes + */ + +import java.util.AbstractCollection; +import java.util.Arrays; +import java.util.Iterator; + +public class ToArrayTest { + + static class TestCollection extends AbstractCollection { + private final E[] elements; + private int[] sizes; + private int nextSize; + + public TestCollection(E[] elements) { + this.elements = elements; + setSizeSequence(new int[] { elements.length }); + } + + /* + * Sets the values that size() will return on each use. The next + * call to size will return sizes[0], then sizes[1] etc. This allows us + * to emulate a concurrent change to the contents of the collection + * without having to perform concurrent changes. If sizes[n+1] contains + * a larger value, the collection will appear to have shrunk when + * iterated; if a smaller value then the collection will appear to have + * grown when iterated. + */ + void setSizeSequence(int... sizes) { + this.sizes = sizes; + nextSize = 0; + } + + /* can change collection's size after each invocation */ + @Override + public int size() { + return sizes[nextSize == sizes.length - 1 ? nextSize : nextSize++]; + } + + @Override + public Iterator iterator() { + return new Iterator() { + int pos = 0; + + public boolean hasNext() { + return pos < sizes[nextSize]; + } + public E next() { + return elements[pos++]; + } + public void remove() { + throw new UnsupportedOperationException( + "Not supported yet."); + } + }; + } + } + + static final Object[] OBJECTS = { new Object(), new Object(), new Object() }; + static final TestCollection CANDIDATE = new TestCollection(OBJECTS); + static final int CAP = OBJECTS.length; // capacity of the CANDIDATE + static final int LAST = CAP - 1; // last possible array index + Object[] a; + Object[] res; + + int last() { + return a.length - 1; + } + + protected void test() throws Throwable { + // Check array type conversion + res = new TestCollection<>(new Object[] { "1", "2" }).toArray(new String[0]); + check(res instanceof String[]); + check(res.length == 2); + check(res[1] == "2"); + + // Check incompatible type of target array + try { + res = CANDIDATE.toArray(new String[CAP]); + check(false); + } catch (Throwable t) { + check(t instanceof ArrayStoreException); + } + + // Check more elements than a.length + a = new Object[CAP - 1]; // appears too small + res = CANDIDATE.toArray(a); + check(res != a); + check(res[LAST] != null); + + // Check equal elements as a.length + a = new Object[CAP]; // appears to match + res = CANDIDATE.toArray(a); + check(res == a); + check(res[last()] != null); + + // Check equal elements as a.length + a = new Object[CAP + 1]; // appears too big + res = CANDIDATE.toArray(a); + check(res == a); + check(res[last()] == null); + + // Check less elements than expected, but more than a.length + a = new Object[CAP - 2]; // appears too small + CANDIDATE.setSizeSequence(CAP, CAP - 1); + res = CANDIDATE.toArray(a); + check(res != a); + check(res.length == CAP - 1); + check(res[LAST - 1] != null); + + // Check less elements than expected, but equal as a.length + a = Arrays.copyOf(OBJECTS, CAP); // appears to match + CANDIDATE.setSizeSequence(CAP, CAP - 1); + res = CANDIDATE.toArray(a); + check(res == a); + check(res[last()] == null); + + // Check more elements than expected and more than a.length + a = new Object[CAP - 1]; // appears to match + CANDIDATE.setSizeSequence(CAP - 1, CAP); + res = CANDIDATE.toArray(a); + check(res != a); + check(res[LAST] != null); + + // Check more elements than expected, but equal as a.length + a = new Object[CAP - 1]; // appears to match + CANDIDATE.setSizeSequence(CAP - 2, CAP - 1); + res = CANDIDATE.toArray(a); + check(res == a); + check(res[last()] != null); + + // Check more elements than expected, but less than a.length + a = Arrays.copyOf(OBJECTS, CAP); // appears to match + CANDIDATE.setSizeSequence(CAP - 2, CAP - 1); + res = CANDIDATE.toArray(a); + check(res == a); + check(res[last()] == null); + + test_7121314(); + } + + /* + * Major target of this testcase, bug 7121314. + */ + protected void test_7121314() throws Throwable { + // Check equal elements as a.length, but less than expected + a = new Object[CAP - 1]; // appears too small + CANDIDATE.setSizeSequence(CAP, CAP - 1); + res = CANDIDATE.toArray(a); + check(res == a); + check(res[last()] != null); + + // Check less elements than a.length and less than expected + a = Arrays.copyOf(OBJECTS, CAP - 1); // appears too small + CANDIDATE.setSizeSequence(CAP, CAP - 2); + res = CANDIDATE.toArray(a); + check(res == a); + check(res[last()] == null); + + } + + public static void main(String[] args) throws Throwable { + ToArrayTest testcase = new ToArrayTest(); + try { + testcase.test(); + } catch (Throwable t) { + unexpected(t); + } + + System.out.printf("%nPassed = %d, failed = %d%n%n", passed, failed); + if (failed > 0) throw new Exception("Some tests failed"); + } + + //--------------------- Infrastructure --------------------------- + static volatile int passed = 0, failed = 0; + static void pass() { passed++; } + static void fail() { failed++; Thread.dumpStack(); } + static void fail(String msg) { System.out.println(msg); fail(); } + static void unexpected(Throwable t) { failed++; t.printStackTrace(); } + static void check(boolean cond) { if (cond) pass(); else fail(); } + static void equal(Object x, Object y) { + if (x == null ? y == null : x.equals(y)) pass(); + else {System.out.println(x + " not equal to " + y); fail(); } + } +} + + From 9c8af427e8d203cc87a852758deb8de8866aab4b Mon Sep 17 00:00:00 2001 From: Weijun Wang Date: Tue, 10 Apr 2012 12:15:03 +0800 Subject: [PATCH 17/26] 7158329: NPE in sun.security.krb5.Credentials.acquireDefaultCreds() Reviewed-by: valeriep, jjg --- .../sun/security/krb5/Credentials.java | 29 ++++--- .../sun/security/krb5/ccache/EmptyCC.java | 83 +++++++++++++++++++ 2 files changed, 101 insertions(+), 11 deletions(-) create mode 100644 jdk/test/sun/security/krb5/ccache/EmptyCC.java diff --git a/jdk/src/share/classes/sun/security/krb5/Credentials.java b/jdk/src/share/classes/sun/security/krb5/Credentials.java index 15328cdaecf..3414e2f6e72 100644 --- a/jdk/src/share/classes/sun/security/krb5/Credentials.java +++ b/jdk/src/share/classes/sun/security/krb5/Credentials.java @@ -330,12 +330,17 @@ public class Credentials { CredentialsCache ccache = CredentialsCache.getInstance(princ, ticketCache); - if (ccache == null) + if (ccache == null) { return null; + } sun.security.krb5.internal.ccache.Credentials tgtCred = ccache.getDefaultCreds(); + if (tgtCred == null) { + return null; + } + if (EType.isSupported(tgtCred.getEType())) { return tgtCred.setKrbCreds(); } else { @@ -375,19 +380,21 @@ public class Credentials { cache = CredentialsCache.getInstance(); } if (cache != null) { - if (DEBUG) { - System.out.println(">>> KrbCreds found the default ticket " + - "granting ticket in credential cache."); - } sun.security.krb5.internal.ccache.Credentials temp = cache.getDefaultCreds(); - if (EType.isSupported(temp.getEType())) { - result = temp.setKrbCreds(); - } else { + if (temp != null) { if (DEBUG) { - System.out.println( - ">>> unsupported key type found the default TGT: " + - temp.getEType()); + System.out.println(">>> KrbCreds found the default ticket" + + " granting ticket in credential cache."); + } + if (EType.isSupported(temp.getEType())) { + result = temp.setKrbCreds(); + } else { + if (DEBUG) { + System.out.println( + ">>> unsupported key type found the default TGT: " + + temp.getEType()); + } } } } diff --git a/jdk/test/sun/security/krb5/ccache/EmptyCC.java b/jdk/test/sun/security/krb5/ccache/EmptyCC.java new file mode 100644 index 00000000000..d5bfc008651 --- /dev/null +++ b/jdk/test/sun/security/krb5/ccache/EmptyCC.java @@ -0,0 +1,83 @@ +/* + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 7158329 + * @summary NPE in sun.security.krb5.Credentials.acquireDefaultCreds() + * @compile -XDignore.symbol.file EmptyCC.java + * @run main EmptyCC + */ +import java.io.File; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import sun.security.krb5.Credentials; +import sun.security.krb5.PrincipalName; +import sun.security.krb5.internal.ccache.CredentialsCache; + +public class EmptyCC { + public static void main(String[] args) throws Exception { + final PrincipalName pn = new PrincipalName("dummy@FOO.COM"); + final String ccache = "tmpcc"; + + if (args.length == 0) { + // Main process, write the ccache and launch sub process + CredentialsCache cache = CredentialsCache.create(pn, ccache); + cache.save(); + + // java -cp $test.classes EmptyCC readcc + ProcessBuilder pb = new ProcessBuilder( + new File(new File(System.getProperty("java.home"), "bin"), + "java").getPath(), + "-cp", + System.getProperty("test.classes"), + "EmptyCC", + "readcc" + ); + + pb.environment().put("KRB5CCNAME", ccache); + pb.redirectErrorStream(true); + + Process p = pb.start(); + try (InputStream ins = p.getInputStream()) { + byte[] buf = new byte[8192]; + int n; + while ((n = ins.read(buf)) > 0) { + System.out.write(buf, 0, n); + } + } + if (p.waitFor() != 0) { + throw new Exception("Test failed"); + } + } else { + // Sub process, read the ccache + String cc = System.getenv("KRB5CCNAME"); + if (!cc.equals(ccache)) { + throw new Exception("env not set correctly"); + } + Credentials.acquireTGTFromCache(pn, null); + } + } +} From 2c28d27dcf7d24cbdd262b39e33aee66cee864b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Gr=C3=B6nlund?= Date: Tue, 10 Apr 2012 10:32:00 +0200 Subject: [PATCH 18/26] 7154809: JDI: update JDI/JDB debugee commandline option parsing Update debugee commandline parsing Reviewed-by: dcubed, dsamersoff, sla --- .../tools/example/debug/tty/VMConnection.java | 163 ++++++++++++++++++ 1 file changed, 163 insertions(+) diff --git a/jdk/src/share/classes/com/sun/tools/example/debug/tty/VMConnection.java b/jdk/src/share/classes/com/sun/tools/example/debug/tty/VMConnection.java index 73a075b172b..34a0037f7ca 100644 --- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/VMConnection.java +++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/VMConnection.java @@ -114,6 +114,23 @@ class VMConnection { String value = token.substring(index + 1, token.length() - 1); // Remove comma delimiter + /* + * for values enclosed in quotes (single and/or double quotes) + * strip off enclosing quote chars + * needed for quote enclosed delimited substrings + */ + if (name.equals("options")) { + StringBuilder sb = new StringBuilder(); + for (String s : splitStringAtNonEnclosedWhiteSpace(value)) { + while (isEnclosed(s, "\"") || isEnclosed(s, "'")) { + s = s.substring(1, s.length() - 1); + } + sb.append(s); + sb.append(" "); + } + value = sb.toString(); + } + Connector.Argument argument = arguments.get(name); if (argument == null) { throw new IllegalArgumentException @@ -136,6 +153,152 @@ class VMConnection { return arguments; } + private static boolean isEnclosed(String value, String enclosingChar) { + if (value.indexOf(enclosingChar) == 0) { + int lastIndex = value.lastIndexOf(enclosingChar); + if (lastIndex > 0 && lastIndex == value.length() - 1) { + return true; + } + } + return false; + } + + private static List splitStringAtNonEnclosedWhiteSpace(String value) throws IllegalArgumentException { + List al = new ArrayList(); + char[] arr; + int startPosition = 0; + int endPosition = 0; + final char SPACE = ' '; + final char DOUBLEQ = '"'; + final char SINGLEQ = '\''; + + /* + * An "open" or "active" enclosing state is where + * the first valid start quote qualifier is found, + * and there is a search in progress for the + * relevant end matching quote + * + * enclosingTargetChar set to SPACE + * is used to signal a non open enclosing state + */ + char enclosingTargetChar = SPACE; + + if (value == null) { + throw new IllegalArgumentException + (MessageOutput.format("value string is null")); + } + + // split parameter string into individual chars + arr = value.toCharArray(); + + for (int i = 0; i < arr.length; i++) { + switch (arr[i]) { + case SPACE: { + // do nothing for spaces + // unless last in array + if (isLastChar(arr, i)) { + endPosition = i; + // break for substring creation + break; + } + continue; + } + case DOUBLEQ: + case SINGLEQ: { + if (enclosingTargetChar == arr[i]) { + // potential match to close open enclosing + if (isNextCharWhitespace(arr, i)) { + // if peek next is whitespace + // then enclosing is a valid substring + endPosition = i; + // reset enclosing target char + enclosingTargetChar = SPACE; + // break for substring creation + break; + } + } + if (enclosingTargetChar == SPACE) { + // no open enclosing state + // handle as normal char + if (isPreviousCharWhitespace(arr, i)) { + startPosition = i; + // peek forward for end candidates + if (value.indexOf(arr[i], i + 1) >= 0) { + // set open enclosing state by + // setting up the target char + enclosingTargetChar = arr[i]; + } else { + // no more target chars left to match + // end enclosing, handle as normal char + if (isNextCharWhitespace(arr, i)) { + endPosition = i; + // break for substring creation + break; + } + } + } + } + continue; + } + default: { + // normal non-space, non-" and non-' chars + if (enclosingTargetChar == SPACE) { + // no open enclosing state + if (isPreviousCharWhitespace(arr, i)) { + // start of space delim substring + startPosition = i; + } + if (isNextCharWhitespace(arr, i)) { + // end of space delim substring + endPosition = i; + // break for substring creation + break; + } + } + continue; + } + } + + // break's end up here + if (startPosition > endPosition) { + throw new IllegalArgumentException + (MessageOutput.format("Illegal option values")); + } + + // extract substring and add to List + al.add(value.substring(startPosition, ++endPosition)); + + // set new start position + i = startPosition = endPosition; + + } // for loop + + return al; + } + + static private boolean isPreviousCharWhitespace(char[] arr, int curr_pos) { + return isCharWhitespace(arr, curr_pos - 1); + } + + static private boolean isNextCharWhitespace(char[] arr, int curr_pos) { + return isCharWhitespace(arr, curr_pos + 1); + } + + static private boolean isCharWhitespace(char[] arr, int pos) { + if (pos < 0 || pos >= arr.length) { + // outside arraybounds is considered an implicit space + return true; + } + if (arr[pos] == ' ') { + return true; + } + return false; + } + + static private boolean isLastChar(char[] arr, int pos) { + return (pos + 1 == arr.length); + } + VMConnection(String connectSpec, int traceFlags) { String nameString; String argString; From 8a66dbf0776d7418bfef855abe722b01d0d4e480 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joel=20Borggr=C3=A9n-Franck?= Date: Tue, 10 Apr 2012 10:45:56 +0200 Subject: [PATCH 19/26] 7158930: (ann) library support for repeating annotations is not built when compiling the JDK Reviewed-by: ohair, erikj --- jdk/make/java/java/reflect/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jdk/make/java/java/reflect/Makefile b/jdk/make/java/java/reflect/Makefile index 40bd886c081..6dfceb8bd5e 100644 --- a/jdk/make/java/java/reflect/Makefile +++ b/jdk/make/java/java/reflect/Makefile @@ -36,7 +36,7 @@ include $(BUILDDIR)/common/Defs.gmk # # Files to compile. # -AUTO_FILES_JAVA_DIRS = java/lang/reflect sun/reflect +AUTO_FILES_JAVA_DIRS = java/lang/reflect sun/reflect java/lang/annotation # # Install .lib file. From 5017ee9fdb496a864ac61a5b8fb50c9f5313f20f Mon Sep 17 00:00:00 2001 From: "Daniel D. Daugherty" Date: Wed, 11 Apr 2012 07:26:35 -0700 Subject: [PATCH 20/26] 7071907: JDK: Full Debug Symbols Add initial FDS support to some libraries and programs. Reviewed-by: kamg, fparain, sspitsyn, dsamersoff --- jdk/make/com/sun/tools/attach/Makefile | 4 +- jdk/make/common/Defs-linux.gmk | 16 ++++++- jdk/make/common/Defs-solaris.gmk | 20 ++++++++- jdk/make/common/Library.gmk | 40 +++++++++++++++++ jdk/make/common/Program.gmk | 44 +++++++++++++++++++ jdk/make/common/Release.gmk | 10 +++-- jdk/make/java/instrument/Makefile | 4 +- jdk/make/java/java_crw_demo/Makefile | 4 +- jdk/make/java/java_hprof_demo/Makefile | 4 +- jdk/make/java/main/java/Makefile | 4 +- jdk/make/java/management/Makefile | 4 +- jdk/make/java/npt/Makefile | 4 +- jdk/make/java/verify/Makefile | 4 +- jdk/make/jpda/jdwp/Makefile | 4 +- jdk/make/jpda/transport/socket/Makefile | 4 +- jdk/make/launchers/Makefile.launcher | 2 + .../mkdemo/jvmti/compiledMethodLoad/Makefile | 4 +- jdk/make/mkdemo/jvmti/gctest/Makefile | 4 +- jdk/make/mkdemo/jvmti/heapTracker/Makefile | 4 +- jdk/make/mkdemo/jvmti/heapViewer/Makefile | 4 +- jdk/make/mkdemo/jvmti/hprof/Makefile | 4 +- jdk/make/mkdemo/jvmti/minst/Makefile | 4 +- jdk/make/mkdemo/jvmti/mtrace/Makefile | 4 +- jdk/make/mkdemo/jvmti/versionCheck/Makefile | 4 +- jdk/make/mkdemo/jvmti/waiters/Makefile | 4 +- jdk/make/sun/tracing/dtrace/Makefile | 5 ++- 26 files changed, 186 insertions(+), 27 deletions(-) diff --git a/jdk/make/com/sun/tools/attach/Makefile b/jdk/make/com/sun/tools/attach/Makefile index 1f12824be5c..9053eaa4d24 100644 --- a/jdk/make/com/sun/tools/attach/Makefile +++ b/jdk/make/com/sun/tools/attach/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -24,6 +24,8 @@ # +LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1 + BUILDDIR = ../../../.. PACKAGE = com.sun.tools.attach LIBRARY = attach diff --git a/jdk/make/common/Defs-linux.gmk b/jdk/make/common/Defs-linux.gmk index 02bfc4ccb75..9d403b11538 100644 --- a/jdk/make/common/Defs-linux.gmk +++ b/jdk/make/common/Defs-linux.gmk @@ -131,8 +131,9 @@ ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) # Setting ENABLE_FULL_DEBUG_SYMBOLS=1 (and OBJCOPY) above enables the # JDK build to import .debuginfo or .diz files from the HotSpot build. # However, adding FDS support to the JDK build will occur in phases - # so a different make variable (LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS) - # is used to indicate that a particular library supports FDS. + # so a different make variable (LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS + # and PROGRAM_SUPPORTS_FULL_DEBUG_SYMBOLS) is used to indicate that a + # particular library or program supports FDS. ifeq ($(OBJCOPY),) _JUNK_ := $(shell \ @@ -261,6 +262,17 @@ ifeq ($(DEBUG_BINARIES), true) CFLAGS_REQUIRED += $(DEBUG_FLAG) endif +# If Full Debug Symbols is enabled, then we want the same debug and +# optimization flags as used by FASTDEBUG. +# +ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) + ifeq ($(LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS),1) + ifeq ($(VARIANT), OPT) + CC_OPT = $(DEBUG_FLAG) $(CC_OPT/$(FASTDEBUG_OPTIMIZATION_LEVEL)) + endif + endif +endif + CFLAGS_OPT = $(CC_OPT) CFLAGS_DBG = $(DEBUG_FLAG) CFLAGS_COMMON += $(CFLAGS_REQUIRED) diff --git a/jdk/make/common/Defs-solaris.gmk b/jdk/make/common/Defs-solaris.gmk index bb484c561a5..ad445e97848 100644 --- a/jdk/make/common/Defs-solaris.gmk +++ b/jdk/make/common/Defs-solaris.gmk @@ -138,8 +138,9 @@ ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) # Setting ENABLE_FULL_DEBUG_SYMBOLS=1 (and OBJCOPY) above enables the # JDK build to import .debuginfo or .diz files from the HotSpot build. # However, adding FDS support to the JDK build will occur in phases - # so a different make variable (LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS) - # is used to indicate that a particular library supports FDS. + # so a different make variable (LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS + # and PROGRAM_SUPPORTS_FULL_DEBUG_SYMBOLS) is used to indicate that a + # particular library or program supports FDS. ifeq ($(OBJCOPY),) _JUNK_ := $(shell \ @@ -240,6 +241,21 @@ ifeq ($(FASTDEBUG), true) CXXFLAGS_DEBUG_OPTION = -g0 $(CXX_OPT/$(FASTDEBUG_OPTIMIZATION_LEVEL)) endif +# If Full Debug Symbols is enabled, then we want the same debug and +# optimization flags as used by FASTDEBUG. We also want all the +# debug info in one place (-xs). +# +ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) + ifeq ($(LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS),1) + ifeq ($(VARIANT), OPT) + CC_OPT = -g -xs $(CC_OPT/$(FASTDEBUG_OPTIMIZATION_LEVEL)) + CXX_OPT = -g0 -xs $(CXX_OPT/$(FASTDEBUG_OPTIMIZATION_LEVEL)) + endif + CFLAGS_DEBUG_OPTION += -xs + CXXFLAGS_DEBUG_OPTION += -xs + endif +endif + CFLAGS_COMMON = -L$(OBJDIR) # Do not allow C99 language features like declarations in code etc. diff --git a/jdk/make/common/Library.gmk b/jdk/make/common/Library.gmk index 00c7897d404..2583e83dc5d 100644 --- a/jdk/make/common/Library.gmk +++ b/jdk/make/common/Library.gmk @@ -181,8 +181,17 @@ $(ACTUAL_LIBRARY):: $(OBJDIR)/$(LIBRARY).lcf $(CP) $(OBJDIR)/$(@F) $@ @$(call binary_file_verification,$@) ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) + ifeq ($(ZIP_DEBUGINFO_FILES),1) + (set -e ; \ + $(CD) $(OBJDIR) ; \ + $(ZIPEXE) -q $(LIBRARY).diz $(LIBRARY).map $(LIBRARY).pdb ; \ + ) + $(CP) $(OBJDIR)/$(LIBRARY).diz $(@D) + $(RM) $(OBJDIR)/$(LIBRARY).map $(OBJDIR)/$(LIBRARY).pdb + else $(CP) $(OBJDIR)/$(LIBRARY).map $(@D) $(CP) $(OBJDIR)/$(LIBRARY).pdb $(@D) + endif endif endif # LIBRARY @@ -248,6 +257,37 @@ else # LIBRARY ifeq ($(WRITE_LIBVERSION),true) $(MCS) -d -a "$(FULL_VERSION)" $@ endif # WRITE_LIBVERSION + ifneq ($(PLATFORM), macosx) + ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) + ifeq ($(LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS),1) + (set -e ; \ + $(CD) $(@D) ; \ + $(OBJCOPY) --only-keep-debug $(@F) $(LIBRARY).debuginfo ; \ + $(OBJCOPY) --add-gnu-debuglink=$(LIBRARY).debuginfo $(@F) ; \ + ) + ifeq ($(STRIP_POLICY),all_strip) + $(STRIP) $@ + else + ifeq ($(STRIP_POLICY),min_strip) + ifeq ($(PLATFORM), solaris) + $(STRIP) -x $@ + else + # assume Linux + $(STRIP) -g $@ + endif + # implied else here is no stripping at all + endif + endif + ifeq ($(ZIP_DEBUGINFO_FILES),1) + (set -e ; \ + $(CD) $(@D) ; \ + $(ZIPEXE) -q $(LIBRARY).diz $(LIBRARY).debuginfo ; \ + $(RM) $(LIBRARY).debuginfo ; \ + ) + endif + endif # LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS + endif # ENABLE_FULL_DEBUG_SYMBOLS + endif # PLATFORM-!macosx endif # LIBRARY endif # PLATFORM diff --git a/jdk/make/common/Program.gmk b/jdk/make/common/Program.gmk index c57ca01fa84..5cc83429b27 100644 --- a/jdk/make/common/Program.gmk +++ b/jdk/make/common/Program.gmk @@ -189,6 +189,15 @@ endif $(MT) /manifest $(OBJDIR)/$(PROGRAM).exe.manifest /outputresource:$@;#1 endif @$(call binary_file_verification,$@) + ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) + ifeq ($(ZIP_DEBUGINFO_FILES),1) + (set -e ; \ + $(CD) $(OBJDIR) ; \ + $(ZIPEXE) -q $(PROGRAM).diz $(PROGRAM).map $(PROGRAM).pdb ; \ + $(RM) $(PROGRAM).map $(PROGRAM).pdb ; \ + ) + endif + endif else # # Note that we have to link -lthread even when USE_PTHREADS is true. @@ -232,6 +241,37 @@ else -codesign -s openjdk_codesign $@ endif @$(call binary_file_verification,$@) + ifneq ($(PLATFORM), macosx) + ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) + ifeq ($(PROGRAM_SUPPORTS_FULL_DEBUG_SYMBOLS),1) + (set -e ; \ + $(CD) $(@D) ; \ + $(OBJCOPY) --only-keep-debug $(@F) $(@F).debuginfo ; \ + $(OBJCOPY) --add-gnu-debuglink=$(@F).debuginfo $(@F) ; \ + ) + ifeq ($(STRIP_POLICY),all_strip) + $(STRIP) $@ + else + ifeq ($(STRIP_POLICY),min_strip) + ifeq ($(PLATFORM), solaris) + $(STRIP) -x $@ + else + # assume Linux + $(STRIP) -g $@ + endif + # implied else here is no stripping at all + endif + endif + ifeq ($(ZIP_DEBUGINFO_FILES),1) + (set -e ; \ + $(CD) $(@D) ; \ + $(ZIPEXE) -q $(@F).diz $(@F).debuginfo ; \ + $(RM) $(@F).debuginfo ; \ + ) + endif + endif # PROGRAM_SUPPORTS_FULL_DEBUG_SYMBOLS + endif # ENABLE_FULL_DEBUG_SYMBOLS + endif # PLATFORM-!macosx endif # PLATFORM clean:: @@ -240,12 +280,16 @@ ifeq ($(PLATFORM), windows) $(RM) $(OBJDIR)/$(PROGRAM).ico $(RM) $(OBJDIR)/$(PROGRAM).lcf $(RM) $(OBJDIR)/$(PROGRAM).map + $(RM) $(OBJDIR)/$(PROGRAM).pdb $(RM) $(OBJDIR)/$(PROGRAM).exp $(RM) $(OBJDIR)/$(PROGRAM).lib $(RM) $(OBJDIR)/$(PROGRAM)$(EXE_SUFFIX) $(RM) $(OBJDIR)/$(PROGRAM).ilk $(RM) *.pdb +else + $(RM) $(OBJDIR)/$(PROGRAM).debuginfo endif + $(RM) $(OBJDIR)/$(PROGRAM).diz clobber:: diff --git a/jdk/make/common/Release.gmk b/jdk/make/common/Release.gmk index d4e551146e0..d8ec1b713d7 100644 --- a/jdk/make/common/Release.gmk +++ b/jdk/make/common/Release.gmk @@ -873,7 +873,9 @@ ifeq ($(PLATFORM), windows) -o -name \*.dll | $(EGREP) -v -i "$(MSVCRNN_DLL)" > $@ else $(FIND) $(JRE_IMAGE_DIR)/lib -type f -name \*.$(LIB_SUFFIX) >> $@ - $(FILE) `$(FIND) $(JRE_IMAGE_DIR)/bin -type f -name \*$(EXE_SUFFIX)` \ +# The FILE command reports .debuginfo files as "ELF", but we don't want +# those files in the JRE_BIN_LIST file. EXE_SUFFIX is empty on non-Windows. + $(FILE) `$(FIND) $(JRE_IMAGE_DIR)/bin -type f ! -name '*.debuginfo' -name \*$(EXE_SUFFIX)` \ | $(EGREP) 'ELF' | $(CUT) -d':' -f1 >> $@ endif @@ -1140,9 +1142,11 @@ ifeq ($(PLATFORM), windows) else $(RM) $@ $(FIND) $(JDK_IMAGE_DIR)/jre/lib -type f -name \*.$(LIB_SUFFIX) >> $@ - $(FILE) `$(FIND) $(JDK_IMAGE_DIR)/jre/bin -type f -name \*$(EXE_SUFFIX)` \ +# The FILE command reports .debuginfo files as "ELF", but we don't want +# those files in the JDK_BIN_LIST file. EXE_SUFFIX is empty on non-Windows. + $(FILE) `$(FIND) $(JDK_IMAGE_DIR)/jre/bin -type f ! -name '*.debuginfo' -name \*$(EXE_SUFFIX)` \ | $(EGREP) 'ELF' | $(CUT) -d':' -f1 >> $@ - file `$(FIND) $(JDK_IMAGE_DIR)/bin -type f -name \*$(EXE_SUFFIX)` \ + file `$(FIND) $(JDK_IMAGE_DIR)/bin -type f ! -name '*.debuginfo' -name \*$(EXE_SUFFIX)` \ | $(EGREP) 'ELF' | $(CUT) -d':' -f1 >> $@ endif diff --git a/jdk/make/java/instrument/Makefile b/jdk/make/java/instrument/Makefile index 76a05537290..c81ce671977 100644 --- a/jdk/make/java/instrument/Makefile +++ b/jdk/make/java/instrument/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -26,6 +26,8 @@ # Makefile for building the Java Programming Language Instrumentation Services # agent, supporting java.lang.instrument +LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1 + BUILDDIR = ../.. PACKAGE = sun.instrument LIBRARY = instrument diff --git a/jdk/make/java/java_crw_demo/Makefile b/jdk/make/java/java_crw_demo/Makefile index ebcadd74656..96da00baaa2 100644 --- a/jdk/make/java/java_crw_demo/Makefile +++ b/jdk/make/java/java_crw_demo/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -23,6 +23,8 @@ # questions. # +LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1 + BUILDDIR = ../.. LIBRARY = java_crw_demo diff --git a/jdk/make/java/java_hprof_demo/Makefile b/jdk/make/java/java_hprof_demo/Makefile index 9880547be71..7aab2e412d2 100644 --- a/jdk/make/java/java_hprof_demo/Makefile +++ b/jdk/make/java/java_hprof_demo/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -23,6 +23,8 @@ # questions. # +LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1 + BUILDDIR = ../.. LIBRARY = hprof PRODUCT = sun diff --git a/jdk/make/java/main/java/Makefile b/jdk/make/java/main/java/Makefile index 1766880712c..1c3478b24f0 100644 --- a/jdk/make/java/main/java/Makefile +++ b/jdk/make/java/main/java/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -23,6 +23,8 @@ # questions. # +PROGRAM_SUPPORTS_FULL_DEBUG_SYMBOLS=1 + BUILDDIR = ../../.. PROGRAM = java PRODUCT = java diff --git a/jdk/make/java/management/Makefile b/jdk/make/java/management/Makefile index bffb5ed7bdd..61b1dc572af 100644 --- a/jdk/make/java/management/Makefile +++ b/jdk/make/java/management/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -23,6 +23,8 @@ # questions. # +LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1 + BUILDDIR = ../.. PACKAGE = java.lang.management LIBRARY = management diff --git a/jdk/make/java/npt/Makefile b/jdk/make/java/npt/Makefile index e5efd9dd423..39fdde696ee 100644 --- a/jdk/make/java/npt/Makefile +++ b/jdk/make/java/npt/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -23,6 +23,8 @@ # questions. # +LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1 + BUILDDIR = ../.. # It's currently used by jpda and hprof. Put it in base module for now. diff --git a/jdk/make/java/verify/Makefile b/jdk/make/java/verify/Makefile index 4343e4aa0dc..9100069f77c 100644 --- a/jdk/make/java/verify/Makefile +++ b/jdk/make/java/verify/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -27,6 +27,8 @@ # Build libverify.so # +LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1 + BUILDDIR = ../.. PRODUCT = java LIBRARY = verify diff --git a/jdk/make/jpda/jdwp/Makefile b/jdk/make/jpda/jdwp/Makefile index 99286ae8266..fb440072e68 100644 --- a/jdk/make/jpda/jdwp/Makefile +++ b/jdk/make/jpda/jdwp/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -27,6 +27,8 @@ # Makefile for building JDWP # +LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1 + BUILDDIR = ../.. PACKAGE = com.sun.tools.jdwp PRODUCT = jpda diff --git a/jdk/make/jpda/transport/socket/Makefile b/jdk/make/jpda/transport/socket/Makefile index 0f7fc2b8a90..6e44f3457f0 100644 --- a/jdk/make/jpda/transport/socket/Makefile +++ b/jdk/make/jpda/transport/socket/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -27,6 +27,8 @@ # Makefile for building the JDI back-end implementation # +LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1 + BUILDDIR = ../../.. LIBRARY = dt_socket PRODUCT = jbug diff --git a/jdk/make/launchers/Makefile.launcher b/jdk/make/launchers/Makefile.launcher index a290ccfec08..3183a0522d0 100644 --- a/jdk/make/launchers/Makefile.launcher +++ b/jdk/make/launchers/Makefile.launcher @@ -27,6 +27,8 @@ # Makefile for building simple launchers # +PROGRAM_SUPPORTS_FULL_DEBUG_SYMBOLS=1 + BUILDDIR = .. PACKAGE = launcher PRODUCT = sun diff --git a/jdk/make/mkdemo/jvmti/compiledMethodLoad/Makefile b/jdk/make/mkdemo/jvmti/compiledMethodLoad/Makefile index b53a1e71025..955ad684188 100644 --- a/jdk/make/mkdemo/jvmti/compiledMethodLoad/Makefile +++ b/jdk/make/mkdemo/jvmti/compiledMethodLoad/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -23,6 +23,8 @@ # questions. # +LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1 + BUILDDIR = ../../.. PRODUCT = demo/jvmti DEMONAME = compiledMethodLoad diff --git a/jdk/make/mkdemo/jvmti/gctest/Makefile b/jdk/make/mkdemo/jvmti/gctest/Makefile index 8423d77490d..537c0733e7a 100644 --- a/jdk/make/mkdemo/jvmti/gctest/Makefile +++ b/jdk/make/mkdemo/jvmti/gctest/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -23,6 +23,8 @@ # questions. # +LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1 + BUILDDIR = ../../.. PRODUCT = demo/jvmti DEMONAME = gctest diff --git a/jdk/make/mkdemo/jvmti/heapTracker/Makefile b/jdk/make/mkdemo/jvmti/heapTracker/Makefile index 3e46e5bf8e1..e58dcccb219 100644 --- a/jdk/make/mkdemo/jvmti/heapTracker/Makefile +++ b/jdk/make/mkdemo/jvmti/heapTracker/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -23,6 +23,8 @@ # questions. # +LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1 + BUILDDIR = ../../.. PRODUCT = demo/jvmti DEMONAME = heapTracker diff --git a/jdk/make/mkdemo/jvmti/heapViewer/Makefile b/jdk/make/mkdemo/jvmti/heapViewer/Makefile index e697d1939b2..2431f3de1dc 100644 --- a/jdk/make/mkdemo/jvmti/heapViewer/Makefile +++ b/jdk/make/mkdemo/jvmti/heapViewer/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -23,6 +23,8 @@ # questions. # +LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1 + BUILDDIR = ../../.. PRODUCT = demo/jvmti DEMONAME = heapViewer diff --git a/jdk/make/mkdemo/jvmti/hprof/Makefile b/jdk/make/mkdemo/jvmti/hprof/Makefile index fca8ec4d193..29d71b5ba36 100644 --- a/jdk/make/mkdemo/jvmti/hprof/Makefile +++ b/jdk/make/mkdemo/jvmti/hprof/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -23,6 +23,8 @@ # questions. # +LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1 + BUILDDIR = ../../.. PRODUCT = demo/jvmti DEMONAME = hprof diff --git a/jdk/make/mkdemo/jvmti/minst/Makefile b/jdk/make/mkdemo/jvmti/minst/Makefile index c73e15eed9d..bc0bd56b89b 100644 --- a/jdk/make/mkdemo/jvmti/minst/Makefile +++ b/jdk/make/mkdemo/jvmti/minst/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -23,6 +23,8 @@ # questions. # +LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1 + BUILDDIR = ../../.. PRODUCT = demo/jvmti DEMONAME = minst diff --git a/jdk/make/mkdemo/jvmti/mtrace/Makefile b/jdk/make/mkdemo/jvmti/mtrace/Makefile index e4ec50f4b54..6057c964f77 100644 --- a/jdk/make/mkdemo/jvmti/mtrace/Makefile +++ b/jdk/make/mkdemo/jvmti/mtrace/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -23,6 +23,8 @@ # questions. # +LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1 + BUILDDIR = ../../.. PRODUCT = demo/jvmti DEMONAME = mtrace diff --git a/jdk/make/mkdemo/jvmti/versionCheck/Makefile b/jdk/make/mkdemo/jvmti/versionCheck/Makefile index 0be53f141cc..a850ba26b2c 100644 --- a/jdk/make/mkdemo/jvmti/versionCheck/Makefile +++ b/jdk/make/mkdemo/jvmti/versionCheck/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -23,6 +23,8 @@ # questions. # +LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1 + BUILDDIR = ../../.. PRODUCT = demo/jvmti DEMONAME = versionCheck diff --git a/jdk/make/mkdemo/jvmti/waiters/Makefile b/jdk/make/mkdemo/jvmti/waiters/Makefile index 9929c0602bf..dd850b4bbf4 100644 --- a/jdk/make/mkdemo/jvmti/waiters/Makefile +++ b/jdk/make/mkdemo/jvmti/waiters/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -23,6 +23,8 @@ # questions. # +LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1 + BUILDDIR = ../../.. PRODUCT = demo/jvmti DEMONAME = waiters diff --git a/jdk/make/sun/tracing/dtrace/Makefile b/jdk/make/sun/tracing/dtrace/Makefile index bf4d68bd26a..c0d3c97daba 100644 --- a/jdk/make/sun/tracing/dtrace/Makefile +++ b/jdk/make/sun/tracing/dtrace/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -26,6 +26,9 @@ # # Makefile for building dtrace extension # + +LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS=1 + BUILDDIR = ../../.. PACKAGE = sun.tracing.dtrace LIBRARY = jsdt From 8716e4744b2bc9bef74ba5c76af8eaa87d201e8b Mon Sep 17 00:00:00 2001 From: Bradford Wetmore Date: Wed, 11 Apr 2012 17:12:35 -0700 Subject: [PATCH 21/26] 7157903: JSSE client sockets are very slow Reviewed-by: xuelei --- .../sun/security/ssl/AppOutputStream.java | 15 +++- .../sun/security/ssl/EngineOutputRecord.java | 10 ++- .../sun/security/ssl/OutputRecord.java | 77 +++++++++++++++++-- .../sun/security/ssl/SSLSocketImpl.java | 47 +++++++++-- 4 files changed, 131 insertions(+), 18 deletions(-) diff --git a/jdk/src/share/classes/sun/security/ssl/AppOutputStream.java b/jdk/src/share/classes/sun/security/ssl/AppOutputStream.java index 6be00b8e2d1..f9f6e9e8ab9 100644 --- a/jdk/src/share/classes/sun/security/ssl/AppOutputStream.java +++ b/jdk/src/share/classes/sun/security/ssl/AppOutputStream.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -91,9 +91,20 @@ class AppOutputStream extends OutputStream { // however they like; if we buffered here, they couldn't. try { do { + boolean holdRecord = false; int howmuch; if (isFirstRecordOfThePayload && c.needToSplitPayload()) { howmuch = Math.min(0x01, r.availableDataBytes()); + /* + * Nagle's algorithm (TCP_NODELAY) was coming into + * play here when writing short (split) packets. + * Signal to the OutputRecord code to internally + * buffer this small packet until the next outbound + * packet (of any type) is written. + */ + if ((len != 1) && (howmuch == 1)) { + holdRecord = true; + } } else { howmuch = Math.min(len, r.availableDataBytes()); } @@ -108,7 +119,7 @@ class AppOutputStream extends OutputStream { off += howmuch; len -= howmuch; } - c.writeRecord(r); + c.writeRecord(r, holdRecord); c.checkWrite(); } while (len > 0); } catch (Exception e) { diff --git a/jdk/src/share/classes/sun/security/ssl/EngineOutputRecord.java b/jdk/src/share/classes/sun/security/ssl/EngineOutputRecord.java index 707fd04f8d3..e5eb7f759c4 100644 --- a/jdk/src/share/classes/sun/security/ssl/EngineOutputRecord.java +++ b/jdk/src/share/classes/sun/security/ssl/EngineOutputRecord.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -155,8 +155,9 @@ final class EngineOutputRecord extends OutputRecord { * data to be generated/output before the exception is ever * generated. */ - void writeBuffer(OutputStream s, byte [] buf, int off, int len) - throws IOException { + @Override + void writeBuffer(OutputStream s, byte [] buf, int off, int len, + int debugOffset) throws IOException { /* * Copy data out of buffer, it's ready to go. */ @@ -196,7 +197,8 @@ final class EngineOutputRecord extends OutputRecord { // compress(); // eventually addMAC(writeMAC); encrypt(writeCipher); - write((OutputStream)null); // send down for processing + write((OutputStream)null, false, // send down for processing + (ByteArrayOutputStream)null); } return; } diff --git a/jdk/src/share/classes/sun/security/ssl/OutputRecord.java b/jdk/src/share/classes/sun/security/ssl/OutputRecord.java index e5c7a6def78..ca3cf7bb9b3 100644 --- a/jdk/src/share/classes/sun/security/ssl/OutputRecord.java +++ b/jdk/src/share/classes/sun/security/ssl/OutputRecord.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -28,6 +28,7 @@ package sun.security.ssl; import java.io.*; import java.nio.*; +import java.util.Arrays; import javax.net.ssl.SSLException; import sun.misc.HexDumpEncoder; @@ -226,6 +227,24 @@ class OutputRecord extends ByteArrayOutputStream implements Record { return maxDataSize - dataSize; } + /* + * Increases the capacity if necessary to ensure that it can hold + * at least the number of elements specified by the minimum + * capacity argument. + * + * Note that the increased capacity is only can be used for held + * record buffer. Please DO NOT update the availableDataBytes() + * according to the expended buffer capacity. + * + * @see availableDataBytes() + */ + private void ensureCapacity(int minCapacity) { + // overflow-conscious code + if (minCapacity > buf.length) { + buf = Arrays.copyOf(buf, minCapacity); + } + } + /* * Return the type of SSL record that's buffered here. */ @@ -243,7 +262,9 @@ class OutputRecord extends ByteArrayOutputStream implements Record { * that synchronization be done elsewhere. Also, this does its work * in a single low level write, for efficiency. */ - void write(OutputStream s) throws IOException { + void write(OutputStream s, boolean holdRecord, + ByteArrayOutputStream heldRecordBuffer) throws IOException { + /* * Don't emit content-free records. (Even change cipher spec * messages have a byte of data!) @@ -300,7 +321,49 @@ class OutputRecord extends ByteArrayOutputStream implements Record { } firstMessage = false; - writeBuffer(s, buf, 0, count); + /* + * The upper levels may want us to delay sending this packet so + * multiple TLS Records can be sent in one (or more) TCP packets. + * If so, add this packet to the heldRecordBuffer. + * + * NOTE: all writes have been synchronized by upper levels. + */ + int debugOffset = 0; + if (holdRecord) { + /* + * If holdRecord is true, we must have a heldRecordBuffer. + * + * Don't worry about the override of writeBuffer(), because + * when holdRecord is true, the implementation in this class + * will be used. + */ + writeBuffer(heldRecordBuffer, buf, 0, count, debugOffset); + } else { + // It's time to send, do we have buffered data? + // May or may not have a heldRecordBuffer. + if (heldRecordBuffer != null && heldRecordBuffer.size() > 0) { + int heldLen = heldRecordBuffer.size(); + + // Ensure the capacity of this buffer. + ensureCapacity(count + heldLen); + + // Slide everything in the buffer to the right. + System.arraycopy(buf, 0, buf, heldLen, count); + + // Prepend the held record to the buffer. + System.arraycopy( + heldRecordBuffer.toByteArray(), 0, buf, 0, heldLen); + count += heldLen; + + // Clear the held buffer. + heldRecordBuffer.reset(); + + // The held buffer has been dumped, set the debug dump offset. + debugOffset = heldLen; + } + writeBuffer(s, buf, 0, count, debugOffset); + } + reset(); } @@ -309,15 +372,17 @@ class OutputRecord extends ByteArrayOutputStream implements Record { * we'll override this method and let it take the appropriate * action. */ - void writeBuffer(OutputStream s, byte [] buf, int off, int len) - throws IOException { + void writeBuffer(OutputStream s, byte [] buf, int off, int len, + int debugOffset) throws IOException { s.write(buf, off, len); s.flush(); + // Output only the record from the specified debug offset. if (debug != null && Debug.isOn("packet")) { try { HexDumpEncoder hd = new HexDumpEncoder(); - ByteBuffer bb = ByteBuffer.wrap(buf, off, len); + ByteBuffer bb = ByteBuffer.wrap( + buf, off + debugOffset, len - debugOffset); System.out.println("[Raw write]: length = " + bb.remaining()); diff --git a/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java b/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java index db11db8a195..b9f22993198 100644 --- a/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java +++ b/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -374,6 +374,12 @@ final public class SSLSocketImpl extends BaseSSLSocketImpl { */ private boolean isFirstAppOutputRecord = true; + /* + * If AppOutputStream needs to delay writes of small packets, we + * will use this to store the data until we actually do the write. + */ + private ByteArrayOutputStream heldRecordBuffer = null; + // // CONSTRUCTORS AND INITIALIZATION CODE // @@ -653,6 +659,17 @@ final public class SSLSocketImpl extends BaseSSLSocketImpl { // READING AND WRITING RECORDS // + /* + * AppOutputStream calls may need to buffer multiple outbound + * application packets. + * + * All other writeRecord() calls will not buffer, so do not hold + * these records. + */ + void writeRecord(OutputRecord r) throws IOException { + writeRecord(r, false); + } + /* * Record Output. Application data can't be sent until the first * handshake establishes a session. @@ -660,7 +677,7 @@ final public class SSLSocketImpl extends BaseSSLSocketImpl { * NOTE: we let empty records be written as a hook to force some * TCP-level activity, notably handshaking, to occur. */ - void writeRecord(OutputRecord r) throws IOException { + void writeRecord(OutputRecord r, boolean holdRecord) throws IOException { /* * The loop is in case of HANDSHAKE --> ERROR transitions, etc */ @@ -731,7 +748,7 @@ final public class SSLSocketImpl extends BaseSSLSocketImpl { try { if (writeLock.tryLock(getSoLinger(), TimeUnit.SECONDS)) { try { - writeRecordInternal(r); + writeRecordInternal(r, holdRecord); } finally { writeLock.unlock(); } @@ -779,7 +796,7 @@ final public class SSLSocketImpl extends BaseSSLSocketImpl { } else { writeLock.lock(); try { - writeRecordInternal(r); + writeRecordInternal(r, holdRecord); } finally { writeLock.unlock(); } @@ -787,11 +804,29 @@ final public class SSLSocketImpl extends BaseSSLSocketImpl { } } - private void writeRecordInternal(OutputRecord r) throws IOException { + private void writeRecordInternal(OutputRecord r, + boolean holdRecord) throws IOException { + // r.compress(c); r.addMAC(writeMAC); r.encrypt(writeCipher); - r.write(sockOutput); + + if (holdRecord) { + // If we were requested to delay the record due to possibility + // of Nagle's being active when finally got to writing, and + // it's actually not, we don't really need to delay it. + if (getTcpNoDelay()) { + holdRecord = false; + } else { + // We need to hold the record, so let's provide + // a per-socket place to do it. + if (heldRecordBuffer == null) { + // Likely only need 37 bytes. + heldRecordBuffer = new ByteArrayOutputStream(40); + } + } + } + r.write(sockOutput, holdRecord, heldRecordBuffer); /* * Check the sequence number state From 00b38ee051120f40ba249af2aef92f2371d889c9 Mon Sep 17 00:00:00 2001 From: Deven You Date: Thu, 12 Apr 2012 15:04:39 +0800 Subject: [PATCH 22/26] 6610897: New constructor in sun.tools.java.ClassPath builds a path using File.separator instead of File.pathSeparator Reviewed-by: alanb --- .../classes/sun/tools/java/ClassPath.java | 4 +- .../tools/classpath/RMICClassPathTest.java | 55 +++++++++++++++++++ 2 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 jdk/test/sun/tools/classpath/RMICClassPathTest.java diff --git a/jdk/src/share/classes/sun/tools/java/ClassPath.java b/jdk/src/share/classes/sun/tools/java/ClassPath.java index ccb1cfffc18..5f8aa01e6b8 100644 --- a/jdk/src/share/classes/sun/tools/java/ClassPath.java +++ b/jdk/src/share/classes/sun/tools/java/ClassPath.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1994, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -141,7 +141,7 @@ class ClassPath { } else { StringBuilder sb = new StringBuilder(patharray[0]); for (int i = 1; i < patharray.length; i++) { - sb.append(File.separator); + sb.append(File.pathSeparatorChar); sb.append(patharray[i]); } this.pathstr = sb.toString(); diff --git a/jdk/test/sun/tools/classpath/RMICClassPathTest.java b/jdk/test/sun/tools/classpath/RMICClassPathTest.java new file mode 100644 index 00000000000..a79d21b8339 --- /dev/null +++ b/jdk/test/sun/tools/classpath/RMICClassPathTest.java @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * Portions Copyright (c) 2012 IBM Corporation + */ + +/* @test + * @bug 6610897 + * @summary New constructor in sun.tools.java.ClassPath builds a path using + * File.separator instead of File.pathSeparator + * @run main RMICClassPathTest + */ + +import java.io.File; + +import sun.rmi.rmic.BatchEnvironment; + +public class RMICClassPathTest { + public static void main(String[] args) throws Exception { + String sysPath = "/home/~user/jdk/jre/lib/rt.jar"; + String extDir = ""; + String clPath = "/home/~user/user.jar" + File.pathSeparator + + "/home/~user/user2.jar" + File.pathSeparator + + "/home/~user/user3.jar"; + + String cpStr = BatchEnvironment.createClassPath(clPath, sysPath, extDir).toString(); + + String[] paths = cpStr.split(File.pathSeparator); + + if (paths.length != 4) { + throw new Exception("ClassPath length is not correct: the expected length is 4 and the actual length is " + paths.length); + } + } +} From 17d3cafd5be1918f8532973e90e58c60b3c6d47d Mon Sep 17 00:00:00 2001 From: Xueming Shen Date: Thu, 12 Apr 2012 10:43:04 -0700 Subject: [PATCH 23/26] 7156873: (zipfs) FileSystems.newFileSystem(uri, env) fails for uri with escaped octets To use URI.getRawSchemeSpecificPart() to get the scheme part of the uri Reviewed-by: alanb, chegar --- .../sun/nio/zipfs/ZipFileSystemProvider.java | 2 +- jdk/test/demo/zipfs/ZFSTests.java | 56 +++++++++++++++++++ 2 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 jdk/test/demo/zipfs/ZFSTests.java diff --git a/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java b/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java index 49bb826e003..5c844bca027 100644 --- a/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java +++ b/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java @@ -78,7 +78,7 @@ public class ZipFileSystemProvider extends FileSystemProvider { } try { // only support legacy JAR URL syntax jar:{uri}!/{entry} for now - String spec = uri.getSchemeSpecificPart(); + String spec = uri.getRawSchemeSpecificPart(); int sep = spec.indexOf("!/"); if (sep != -1) spec = spec.substring(0, sep); diff --git a/jdk/test/demo/zipfs/ZFSTests.java b/jdk/test/demo/zipfs/ZFSTests.java new file mode 100644 index 00000000000..c5d6e8c9e9f --- /dev/null +++ b/jdk/test/demo/zipfs/ZFSTests.java @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* @test + @bug 7156873 + @summary ZipFileSystem regression tests + */ + + +import java.net.URI; +import java.nio.file.*; +import java.util.Map; +import java.util.HashMap; + +public class ZFSTests { + + public static void main(String[] args) throws Throwable { + test7156873(); + } + + static void test7156873() throws Throwable { + String DIRWITHSPACE = "testdir with spaces"; + Path dir = Paths.get(DIRWITHSPACE); + Path path = Paths.get(DIRWITHSPACE, "file.zip"); + try { + Files.createDirectory(dir); + URI uri = URI.create("jar:" + path.toUri()); + Map env = new HashMap(); + env.put("create", "true"); + try (FileSystem fs = FileSystems.newFileSystem(uri, env)) {} + } finally { + Files.deleteIfExists(path); + Files.deleteIfExists(dir); + } + } +} From d4817a1e4fed62485ba167c08d2e0b9c6986c6ef Mon Sep 17 00:00:00 2001 From: Xueming Shen Date: Thu, 12 Apr 2012 10:55:51 -0700 Subject: [PATCH 24/26] 7152690: Initialization error with charset SJIS_0213 when security manager is enabled To use doPrivileged block to wrap the data reading code Reviewed-by: alanb --- .../classes/sun/nio/cs/ext/SJIS_0213.java | 12 +++++-- jdk/test/sun/nio/cs/TestSJIS0213_SM.java | 36 +++++++++++++++++++ 2 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 jdk/test/sun/nio/cs/TestSJIS0213_SM.java diff --git a/jdk/src/share/classes/sun/nio/cs/ext/SJIS_0213.java b/jdk/src/share/classes/sun/nio/cs/ext/SJIS_0213.java index 6c47bd64016..10fd8b726a6 100644 --- a/jdk/src/share/classes/sun/nio/cs/ext/SJIS_0213.java +++ b/jdk/src/share/classes/sun/nio/cs/ext/SJIS_0213.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -31,6 +31,8 @@ import java.nio.charset.Charset; import java.nio.charset.CharsetEncoder; import java.nio.charset.CharsetDecoder; import java.nio.charset.CoderResult; +import java.security.AccessController; +import java.security.PrivilegedAction; import java.util.Arrays; import sun.nio.cs.CharsetMapping; @@ -73,8 +75,12 @@ public class SJIS_0213 extends Charset { return new Encoder(this); } - static CharsetMapping mapping = - CharsetMapping.get(SJIS_0213.class.getResourceAsStream("sjis0213.dat")); + static CharsetMapping mapping = AccessController.doPrivileged( + new PrivilegedAction() { + public CharsetMapping run() { + return CharsetMapping.get(SJIS_0213.class.getResourceAsStream("sjis0213.dat")); + } + }); protected static class Decoder extends CharsetDecoder { protected static final char UNMAPPABLE = CharsetMapping.UNMAPPABLE_DECODING; diff --git a/jdk/test/sun/nio/cs/TestSJIS0213_SM.java b/jdk/test/sun/nio/cs/TestSJIS0213_SM.java new file mode 100644 index 00000000000..753cfb784f0 --- /dev/null +++ b/jdk/test/sun/nio/cs/TestSJIS0213_SM.java @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* @test + @bug 7152690 + @summary Initialize SJIS_0213 charset with SecurityManager enabled + */ +public class TestSJIS0213_SM { + public static void main(String[] args) throws Throwable { + SecurityManager sm = System.getSecurityManager(); + if (sm == null) { + System.setSecurityManager(new SecurityManager()); + } + java.nio.charset.Charset.forName("SJIS_0213"); + } +} From 1f4653910f4e6932dd3c057f78722fc0a357e3b3 Mon Sep 17 00:00:00 2001 From: Xueming Shen Date: Thu, 12 Apr 2012 15:01:41 -0700 Subject: [PATCH 25/26] 7067045: replaceAll("\u20ac", "$"); causses java.lang.StringIndexOutOfBoundsExceptio Updated to throw IAE instead. Reviewed-by: lancea --- jdk/src/share/classes/java/util/regex/Matcher.java | 11 +++++++---- jdk/test/java/util/regex/RegExTest.java | 12 ++++++++++++ 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/jdk/src/share/classes/java/util/regex/Matcher.java b/jdk/src/share/classes/java/util/regex/Matcher.java index d654790b24c..5e437e6e8be 100644 --- a/jdk/src/share/classes/java/util/regex/Matcher.java +++ b/jdk/src/share/classes/java/util/regex/Matcher.java @@ -759,16 +759,19 @@ public final class Matcher implements MatchResult { char nextChar = replacement.charAt(cursor); if (nextChar == '\\') { cursor++; + if (cursor == replacement.length()) + throw new IllegalArgumentException( + "character to be escaped is missing"); nextChar = replacement.charAt(cursor); result.append(nextChar); cursor++; } else if (nextChar == '$') { // Skip past $ cursor++; - // A StringIndexOutOfBoundsException is thrown if - // this "$" is the last character in replacement - // string in current implementation, a IAE might be - // more appropriate. + // Throw IAE if this "$" is the last character in replacement + if (cursor == replacement.length()) + throw new IllegalArgumentException( + "Illegal group reference: group index is missing"); nextChar = replacement.charAt(cursor); int refNum = -1; if (nextChar == '{') { diff --git a/jdk/test/java/util/regex/RegExTest.java b/jdk/test/java/util/regex/RegExTest.java index 159e9afddd9..f583769ecb2 100644 --- a/jdk/test/java/util/regex/RegExTest.java +++ b/jdk/test/java/util/regex/RegExTest.java @@ -33,6 +33,7 @@ * 5013885 5003322 4988891 5098443 5110268 6173522 4829857 5027748 6376940 * 6358731 6178785 6284152 6231989 6497148 6486934 6233084 6504326 6635133 * 6350801 6676425 6878475 6919132 6931676 6948903 6990617 7014645 7039066 + * 7067045 */ import java.util.regex.*; @@ -852,6 +853,17 @@ public class RegExTest { if (!result.equals(toSupplementaries("zzz\\t$\\$zzz"))) failCount++; + // IAE should be thrown if backslash or '$' is the last character + // in replacement string + try { + "\uac00".replaceAll("\uac00", "$"); + "\uac00".replaceAll("\uac00", "\\"); + failCount++; + } catch (IllegalArgumentException iie) { + } catch (Exception e) { + failCount++; + } + report("Literal replacement"); } From 9de05ceb7a3614cd1a1d3eecf41bc3570fcaee55 Mon Sep 17 00:00:00 2001 From: "Daniel D. Daugherty" Date: Thu, 12 Apr 2012 16:23:24 -0700 Subject: [PATCH 26/26] 7160895: tools/launcher/VersionCheck.java attempts to launch .debuginfo Do not install .debuginfo files in bin dir. Reviewed-by: ksrini, sspitsyn --- jdk/make/common/Program.gmk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/jdk/make/common/Program.gmk b/jdk/make/common/Program.gmk index 5cc83429b27..4e211d84600 100644 --- a/jdk/make/common/Program.gmk +++ b/jdk/make/common/Program.gmk @@ -268,6 +268,11 @@ else $(ZIPEXE) -q $(@F).diz $(@F).debuginfo ; \ $(RM) $(@F).debuginfo ; \ ) + # save ZIP'ed debug info with rest of the program's build artifacts + $(MV) $@.diz $(OBJDIR) + else + # save debug info with rest of the program's build artifacts + $(MV) $@.debuginfo $(OBJDIR) endif endif # PROGRAM_SUPPORTS_FULL_DEBUG_SYMBOLS endif # ENABLE_FULL_DEBUG_SYMBOLS