インライン・テンプレート・ファイル

# HG changeset patch # User Masaki Katakai # Date 1462327014 25200 # Node ID 54b887ce3f128a10b139bcc5beecd678e651c847 # Parent 19c1f587083711e15acfee728f93caa24da13bfd name changed to Oracle Developer Studio diff -r 19c1f5870837 -r 54b887ce3f12 src/ja/cnd/cnd-asm/cnd-asm/org/netbeans/modules/cnd/asm/core/resources/il-file_ja.html --- a/src/ja/cnd/cnd-asm/cnd-asm/org/netbeans/modules/cnd/asm/core/resources/il-file_ja.html Sun Dec 06 23:38:29 2015 -0800 +++ b/src/ja/cnd/cnd-asm/cnd-asm/org/netbeans/modules/cnd/asm/core/resources/il-file_ja.html Tue May 03 18:56:54 2016 -0700 @@ -43,6 +43,6 @@ インライン・テンプレート・ファイル - インライン・テンプレート・ファイル(Oracle Solaris Studioでサポート) + インライン・テンプレート・ファイル(Oracle Developer Studioでサポート) diff -r 19c1f5870837 -r 54b887ce3f12 src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/Bundle_ja.properties --- a/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/Bundle_ja.properties Sun Dec 06 23:38:29 2015 -0800 +++ b/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/Bundle_ja.properties Tue May 03 18:56:54 2016 -0700 @@ -284,13 +284,13 @@ # # StartDebuggerPanel # -TITLE_StartNewSession=\u65b0\u3057\u3044\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u958b\u59cb +TITLE_StartNewSession=\u65b0\u898f\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u958b\u59cb # {0} description of program already being debugged # {1} name of host program is being debugged on FMT_StartNewSession=\u30d7\u30ed\u30b0\u30e9\u30e0\n\t{0}\n\u304c\u3059\u3067\u306b{1}\u3067\u30c7\u30d0\u30c3\u30b0\u3055\u308c\u3066\u3044\u307e\u3059\u3002\n\u3053\u306e\u30d7\u30ed\u30b0\u30e9\u30e0\u3092\u7d42\u4e86\u3057\u3066\u65b0\u3057\u3044\u30d7\u30ed\u30b0\u30e9\u30e0\u306e\u30c7\u30d0\u30c3\u30b0\u3092\u958b\u59cb\u3059\u308b\u306b\u306f\u3001\u300c\u65e2\u5b58\u306e\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u518d\u5229\u7528\u300d\u3092\u9078\u629e\u3057\u307e\u3059\u3002\u73fe\u5728\u306e\u30d7\u30ed\u30b0\u30e9\u30e0\u3068\u65b0\u3057\u3044\u30d7\u30ed\u30b0\u30e9\u30e0\u306e\u4e21\u65b9\u3092\u30c7\u30d0\u30c3\u30b0\u3059\u308b\u306b\u306f\u3001\u300c\u8ffd\u52a0\u306e\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u958b\u59cb\u300d\u3092\u9078\u629e\u3057\u307e\u3059\u3002\u73fe\u5728\u306e\u30d7\u30ed\u30b0\u30e9\u30e0\u306e\u30c7\u30d0\u30c3\u30b0\u3060\u3051\u3092\u7d9a\u884c\u3059\u308b\u306b\u306f\u3001\u300c\u53d6\u6d88\u3057\u300d\u3092\u9078\u629e\u3057\u307e\u3059\u3002 -CTL_session_reuse=\u65b0\u3057\u3044\u30bf\u30fc\u30b2\u30c3\u30c8\u3092\u30ed\u30fc\u30c9\u3059\u308b\u3068\u304d\u306f\u5e38\u306b\u65e2\u5b58\u306e\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u518d\u5229\u7528 +CTL_session_reuse=\u65b0\u898f\u30bf\u30fc\u30b2\u30c3\u30c8\u3092\u30ed\u30fc\u30c9\u3059\u308b\u3068\u304d\u306f\u5e38\u306b\u65e2\u5b58\u306e\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u518d\u5229\u7528 -ACSD_session_reuse=\u65b0\u3057\u3044\u30bf\u30fc\u30b2\u30c3\u30c8\u3092\u30ed\u30fc\u30c9\u3059\u308b\u3068\u304d\u306f\u5e38\u306b\u65e2\u5b58\u306e\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u518d\u5229\u7528 +ACSD_session_reuse=\u65b0\u898f\u30bf\u30fc\u30b2\u30c3\u30c8\u3092\u30ed\u30fc\u30c9\u3059\u308b\u3068\u304d\u306f\u5e38\u306b\u65e2\u5b58\u306e\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u518d\u5229\u7528 CTL_FinishAndStart=\u65e2\u5b58\u306e\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u518d\u5229\u7528 ACSD_FinishAndStart=\u65e2\u5b58\u306e\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u518d\u5229\u7528 diff -r 19c1f5870837 -r 54b887ce3f12 src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/options/Bundle_ja.properties --- a/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/options/Bundle_ja.properties Sun Dec 06 23:38:29 2015 -0800 +++ b/src/ja/cnd/cnd-debugger-common2/cnd-debugger-common2/org/netbeans/modules/cnd/debugger/common2/debugger/options/Bundle_ja.properties Tue May 03 18:56:54 2016 -0700 @@ -157,7 +157,7 @@ HINT_mt_scalable=\u591a\u6570\u306eLWP\u3092\u30c7\u30d0\u30c3\u30b0\u3059\u308b\u5834\u5408\u306b\u30ea\u30bd\u30fc\u30b9\u4f7f\u7528\u91cf\u3092\u4f4e\u6e1b(\u30d1\u30d5\u30a9\u30fc\u30de\u30f3\u30b9\u3082\u4f4e\u4e0b) ACSD_mt_scalable=\u591a\u6570\u306eLWP\u3092\u30c7\u30d0\u30c3\u30b0\u3059\u308b\u5834\u5408\u306b\u30ea\u30bd\u30fc\u30b9\u4f7f\u7528\u91cf\u3092\u4f4e\u6e1b(\u30d1\u30d5\u30a9\u30fc\u30de\u30f3\u30b9\u3082\u4f4e\u4e0b) -LABEL_mt_sync_tracking=\u540c\u671f\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u3092\u8ffd\u8de1 +LABEL_mt_sync_tracking=\u540c\u671f\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u3092\u30c8\u30e9\u30c3\u30ad\u30f3\u30b0 ACSD_mt_sync_tracking=\u30aa\u30f3 LABEL_dbx_init_file=Dbx\u521d\u671f\u5316\u30d5\u30a1\u30a4\u30eb @@ -334,8 +334,8 @@ LABEL_save_watches=\u30a6\u30a9\u30c3\u30c1\u306e\u4fdd\u5b58\u3068\u5fa9\u5143 -LABEL_session_reuse=\u65b0\u3057\u3044\u30bf\u30fc\u30b2\u30c3\u30c8\u3092\u30ed\u30fc\u30c9\u3059\u308b\u3068\u304d\u306f\u5e38\u306b\u65e2\u5b58\u306e\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u518d\u5229\u7528 -ACSD_session_reuse=\u65b0\u3057\u3044\u30bf\u30fc\u30b2\u30c3\u30c8\u3092\u30ed\u30fc\u30c9\u3059\u308b\u3068\u304d\u306f\u5e38\u306b\u65e2\u5b58\u306e\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u518d\u5229\u7528 +LABEL_session_reuse=\u65b0\u898f\u30bf\u30fc\u30b2\u30c3\u30c8\u3092\u30ed\u30fc\u30c9\u3059\u308b\u3068\u304d\u306f\u5e38\u306b\u65e2\u5b58\u306e\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u518d\u5229\u7528 +ACSD_session_reuse=\u65b0\u898f\u30bf\u30fc\u30b2\u30c3\u30c8\u3092\u30ed\u30fc\u30c9\u3059\u308b\u3068\u304d\u306f\u5e38\u306b\u65e2\u5b58\u306e\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u518d\u5229\u7528 ACSD_session_reuse_on=\u30aa\u30f3 ACSD_session_reuse_off=\u30aa\u30d5 diff -r 19c1f5870837 -r 54b887ce3f12 src/ja/cnd/cnd-discovery/cnd-discovery/org/netbeans/modules/cnd/discovery/projectimport/Bundle_ja.properties --- a/src/ja/cnd/cnd-discovery/cnd-discovery/org/netbeans/modules/cnd/discovery/projectimport/Bundle_ja.properties Sun Dec 06 23:38:29 2015 -0800 +++ b/src/ja/cnd/cnd-discovery/cnd-discovery/org/netbeans/modules/cnd/discovery/projectimport/Bundle_ja.properties Tue May 03 18:56:54 2016 -0700 @@ -87,8 +87,8 @@ BUILD_LABEL=\u30d3\u30eb\u30c9 BUILD_REMOTE_LABEL=\u30d3\u30eb\u30c9 - {0} -ERROR_FIND_PROJECT_CREATOR=Oracle Solaris Studio 12.3\u4ee5\u964d\u304c\u30db\u30b9\u30c8{0}\u3067\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002 -ERROR_RUN_PROJECT_CREATOR=Oracle Solaris Studio 12.3\u4ee5\u964d\u3092\u30db\u30b9\u30c8{0}\u3067\u5b9f\u884c\u3067\u304d\u307e\u305b\u3093\u3002 +ERROR_FIND_PROJECT_CREATOR=Oracle Solaris Studio(\u30d0\u30fc\u30b8\u30e7\u30f312.3\u4ee5\u964d)\u307e\u305f\u306fOracle Developer Studio\u304c\u30db\u30b9\u30c8{0}\u3067\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002 +ERROR_RUN_PROJECT_CREATOR=Oracle Solaris Studio(\u30d0\u30fc\u30b8\u30e7\u30f312.3\u4ee5\u964d)\u307e\u305f\u306fOracle Developer Studio\u3092\u30db\u30b9\u30c8{0}\u3067\u5b9f\u884c\u3067\u304d\u307e\u305b\u3093\u3002 RUN_PROJECT_CREATOR=\u30db\u30b9\u30c8{0}\u3067\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u4f5c\u6210\u4e2d... CONFIGURING_PROJECT_CREATOR=\u30db\u30b9\u30c8{0}\u3067\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u69cb\u6210\u4e2d... diff -r 19c1f5870837 -r 54b887ce3f12 src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/pi_ja.html --- a/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/pi_ja.html Sun Dec 06 23:38:29 2015 -0800 +++ b/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/pi_ja.html Tue May 03 18:56:54 2016 -0700 @@ -9,6 +9,6 @@ - 円周率を計算する5つの異なる実装。Oracle Solaris Studioコンパイラでのみ機能する構成もあります。 + 円周率を計算する5つの異なる実装。Oracle Developer Studioコンパイラでのみ機能する構成もあります。 diff -r 19c1f5870837 -r 54b887ce3f12 src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/wizards/Bundle_ja.properties --- a/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/wizards/Bundle_ja.properties Sun Dec 06 23:38:29 2015 -0800 +++ b/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/wizards/Bundle_ja.properties Tue May 03 18:56:54 2016 -0700 @@ -354,6 +354,8 @@ SelectModeError4=\u30d5\u30a9\u30eb\u30c0"{0}"\u306f\u3059\u3067\u306bNetBeans\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3068\u3057\u3066\u4f7f\u7528\u3055\u308c\u3066\u3044\u307e\u3059 SelectModeError5=\u30d5\u30a9\u30eb\u30c0"{0}"\u306b\u3001make\u30d5\u30a1\u30a4\u30eb\u3082configure\u30b9\u30af\u30ea\u30d7\u30c8\u3082\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f SelectModeError6=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u30d5\u30a1\u30a4\u30eb\u30fb\u30b7\u30b9\u30c6\u30e0\u306e\u30eb\u30fc\u30c8\u306b\u7f6e\u304f\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093 +SelectModeError7="{0}"\u306f\u5b58\u5728\u3057\u307e\u305b\u3093 +SelectModeError8="{0}"\u306f\u7d76\u5bfe\u30d1\u30b9\u3067\u306f\u3042\u308a\u307e\u305b\u3093 CleanInfoMessageSimpleMode=\u6d88\u53bb\u304a\u3088\u3073\u30d3\u30eb\u30c9\u306e\u30a2\u30af\u30b7\u30e7\u30f3\u306f\u81ea\u52d5\u7684\u306b\u5b9f\u884c\u3055\u308c\u308b\u3053\u3068\u306b\u6ce8\u610f\u3057\u3066\u304f\u3060\u3055\u3044 SelectModeSimpleInstructionExtraText_Configure=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u304c\u4f5c\u6210\u3055\u308c\u305f\u3042\u3068\u3001\u69cb\u6210\u30b9\u30af\u30ea\u30d7\u30c8\u3068\u3001\u751f\u6210\u3055\u308c\u305fMakefile\u306e\u300c\u6d88\u53bb\u3057\u3066\u30d3\u30eb\u30c9\u300d\u30a2\u30af\u30b7\u30e7\u30f3\u304c\u81ea\u52d5\u7684\u306b\u5b9f\u884c\u3055\u308c\u307e\u3059\u3002 SelectModeSimpleInstructionExtraText_Make=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u304c\u4f5c\u6210\u3055\u308c\u305f\u3042\u3068\u3001\u65e2\u5b58\u306eMakefile\u3067\u6307\u5b9a\u3055\u308c\u3066\u3044\u308b\u300c\u6d88\u53bb\u3057\u3066\u30d3\u30eb\u30c9\u300d\u30a2\u30af\u30b7\u30e7\u30f3\u304c\u81ea\u52d5\u7684\u306b\u5b9f\u884c\u3055\u308c\u307e\u3059\u3002 @@ -442,7 +444,7 @@ MSG_LocalProjectAlreadyExists=\u30ed\u30fc\u30ab\u30eb\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8{0}\u306f\u3059\u3067\u306b\u5b58\u5728\u3057\u307e\u3059 SelectBinaryPanelVisual.cancelSearch.text=\u691c\u7d22\u306e\u505c\u6b62(&O) -ERROR_FIND_PROJECT_CREATOR=\u30ea\u30e2\u30fc\u30c8\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u4f5c\u6210\u3067\u306f\u3001\u30db\u30b9\u30c8{0}\u3067Oracle Solaris Studio 12.3\u4ee5\u964d\u304c\u5fc5\u8981\u306b\u306a\u308a\u307e\u3059\u3002 +ERROR_FIND_PROJECT_CREATOR=\u30ea\u30e2\u30fc\u30c8\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u4f5c\u6210\u306b\u306f\u3001Oracle Solaris Studio(\u30d0\u30fc\u30b8\u30e7\u30f312.3\u4ee5\u964d)\u307e\u305f\u306fOracle Developer Studio\u304c\u30db\u30b9\u30c8{0}\u3067\u5fc5\u8981\u3067\u3059\u3002 PanelProjectLocationVisual.Validating_Wizard=\u691c\u67fb\u4e2d... SERVICE_NOT_AVALIABLE=\u4e00\u90e8\u306eC/C++\u30e2\u30b8\u30e5\u30fc\u30eb\u304c\u30ed\u30fc\u30c9\u3055\u308c\u3066\u3044\u306a\u3044\u305f\u3081\u3001\n\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\n\u300c\u30c4\u30fc\u30eb\u300d>\u300c\u30d7\u30e9\u30b0\u30a4\u30f3\u300d\u3092\u4ecb\u3057\u3066C/C++\u6a5f\u80fd\u3092\n(\u518d)\u30a2\u30af\u30c6\u30a3\u30d6\u5316\u3057\u3066\u304f\u3060\u3055\u3044\u3002 diff -r 19c1f5870837 -r 54b887ce3f12 src/ja/cnd/cnd-modelimpl/cnd-modelimpl/org/netbeans/modules/cnd/modelimpl/parser/clank/Bundle_ja.properties --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/ja/cnd/cnd-modelimpl/cnd-modelimpl/org/netbeans/modules/cnd/modelimpl/parser/clank/Bundle_ja.properties Tue May 03 18:56:54 2016 -0700 @@ -0,0 +1,49 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2015 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. +# +# Contributor(s): +# +# Portions Copyrighted 2015 Sun Microsystems, Inc. + +#Debug strings, NOI18N +NULL_PATH=\u30c7\u30a3\u30ec\u30af\u30c6\u30a3\u30d6"{0}"\u306e\u672a\u89e3\u6c7a\u306e\u30d1\u30b9\u3002 +UNRESOLVED_FILE_OWNER="{0}"\u306e\u672a\u89e3\u6c7a\u306e\u30d5\u30a1\u30a4\u30eb\u6240\u6709\u8005\u3002 +START_PROJECT_CLOSED=\u30d5\u30a1\u30a4\u30eb"{1}"\u304c{2}\u304b\u3089\u30a4\u30f3\u30af\u30eb\u30fc\u30c9\u3055\u308c\u305f\u3068\u304d\u3001\u958b\u59cb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8"{0}"\u306f\u3059\u3067\u306b\u9589\u3058\u3066\u3044\u307e\u3059\u3002 +INVALID_START_PROJECT=\u30d5\u30a1\u30a4\u30eb"{1}"\u304c{2}\u304b\u3089\u30a4\u30f3\u30af\u30eb\u30fc\u30c9\u3055\u308c\u305f\u3068\u304d\u3001\u958b\u59cb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8"{0}"\u306f\u7121\u52b9\u3067\u3059\u3002 +START_PROJECT_CANNOT_CREATE_FILE=\u30d5\u30a1\u30a4\u30eb"{1}"\u304c{2}\u304b\u3089\u30a4\u30f3\u30af\u30eb\u30fc\u30c9\u3055\u308c\u305f\u3068\u304d\u3001\u958b\u59cb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8"{0}"\u306f\u30d5\u30a1\u30a4\u30eb\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3002 +NULL_START_PROJECT=\u30d5\u30a1\u30a4\u30eb"{1}"\u304c{2}\u304b\u3089\u30a4\u30f3\u30af\u30eb\u30fc\u30c9\u3055\u308c\u305f\u3068\u304d\u3001\u958b\u59cb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306fnull\u3067\u3059\u3002 + + diff -r 19c1f5870837 -r 54b887ce3f12 src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/hints/Bundle_ja.properties --- a/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/hints/Bundle_ja.properties Sun Dec 06 23:38:29 2015 -0800 +++ b/src/ja/cnd/cnd-refactoring/cnd-refactoring/org/netbeans/modules/cnd/refactoring/hints/Bundle_ja.properties Tue May 03 18:56:54 2016 -0700 @@ -7,9 +7,9 @@ IntroduceVariable.description=\u5909\u6570\u3092\u5c0e\u5165 FIX_IntroduceVariable=\u5909\u6570\u3092\u5c0e\u5165 -AssignVariable.name=\u65b0\u3057\u3044\u5909\u6570\u306b\u623b\u308a\u5024\u3092\u5272\u5f53\u3066 -AssignVariable.description=\u65b0\u3057\u3044\u5909\u6570\u306b\u623b\u308a\u5024\u3092\u5272\u5f53\u3066 -FIX_AssignResultToVariable=\u65b0\u3057\u3044\u5909\u6570\u306b\u623b\u308a\u5024\u3092\u5272\u5f53\u3066 +AssignVariable.name=\u65b0\u898f\u5909\u6570\u306b\u623b\u308a\u5024\u3092\u5272\u5f53\u3066 +AssignVariable.description=\u65b0\u898f\u5909\u6570\u306b\u623b\u308a\u5024\u3092\u5272\u5f53\u3066 +FIX_AssignResultToVariable=\u65b0\u898f\u5909\u6570\u306b\u623b\u308a\u5024\u3092\u5272\u5f53\u3066 AddMissingCases.name=\u6b20\u843d\u3057\u3066\u3044\u308bCase\u53e5\u306e\u8ffd\u52a0 AddMissingCases.description=\u6b20\u843d\u3057\u3066\u3044\u308bCase\u53e5\u306e\u8ffd\u52a0 diff -r 19c1f5870837 -r 54b887ce3f12 src/ja/cnd/cnd-remote-projectui/cnd-remote-projectui/org/netbeans/modules/cnd/remote/projectui/wizard/cnd/Bundle_ja.properties --- a/src/ja/cnd/cnd-remote-projectui/cnd-remote-projectui/org/netbeans/modules/cnd/remote/projectui/wizard/cnd/Bundle_ja.properties Sun Dec 06 23:38:29 2015 -0800 +++ b/src/ja/cnd/cnd-remote-projectui/cnd-remote-projectui/org/netbeans/modules/cnd/remote/projectui/wizard/cnd/Bundle_ja.properties Tue May 03 18:56:54 2016 -0700 @@ -91,8 +91,8 @@ # NewMakeProjectWizardIterator LAB_IteratorName={0}/{1} -ERROR_FIND_PROJECT_CREATOR=Oracle Solaris Studio 12.3\u4ee5\u964d\u304c\u30db\u30b9\u30c8{0}\u3067\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002 -ERROR_RUN_PROJECT_CREATOR=Oracle Solaris Studio 12.3\u4ee5\u964d\u3092\u30db\u30b9\u30c8{0}\u3067\u5b9f\u884c\u3067\u304d\u307e\u305b\u3093:\n{1}\u3002 +ERROR_FIND_PROJECT_CREATOR=Oracle Solaris Studio(\u30d0\u30fc\u30b8\u30e7\u30f312.3\u4ee5\u964d)\u307e\u305f\u306fOracle Developer Studio\u304c\u30db\u30b9\u30c8{0}\u3067\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002 +ERROR_RUN_PROJECT_CREATOR=Oracle Solaris Studio(\u30d0\u30fc\u30b8\u30e7\u30f312.3\u4ee5\u964d)\u307e\u305f\u306fOracle Developer Studio\u3092\u30db\u30b9\u30c8{0}\u3067\u5b9f\u884c\u3067\u304d\u307e\u305b\u3093:\n{1}\u3002 RUN_PROJECT_CREATOR=\u30db\u30b9\u30c8{0}\u3067\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u4f5c\u6210\u4e2d... CONFIGURING_PROJECT_CREATOR=\u30db\u30b9\u30c8{0}\u3067\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u69cb\u6210\u4e2d... diff -r 19c1f5870837 -r 54b887ce3f12 src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/ui/Bundle_ja.properties --- a/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/ui/Bundle_ja.properties Sun Dec 06 23:38:29 2015 -0800 +++ b/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/ui/Bundle_ja.properties Tue May 03 18:56:54 2016 -0700 @@ -130,5 +130,5 @@ EditPathMapDialog.restore.text=\u30c7\u30d5\u30a9\u30eb\u30c8\u306b\u623b\u3059(&R) HostPropertiesDialog.errorLabel.text=\u30a8\u30e9\u30fc HostPropertiesDialog.serverRecordPanel.border.title=\u305d\u306e\u4ed6 -HostPropertiesDialog.cbACL.text=ACL\u30d9\u30fc\u30b9\u306e\u30ea\u30e2\u30fc\u30c8\u30fb\u30d5\u30a1\u30a4\u30eb\u6a29\u9650\u306e\u78ba\u8a8d(&C) +HostPropertiesDialog.cbACL.text=ACL\u30d9\u30fc\u30b9\u306e\u30ea\u30e2\u30fc\u30c8\u30fb\u30d5\u30a1\u30a4\u30eb\u6a29\u9650\u306e\u78ba\u8a8d(&L) diff -r 19c1f5870837 -r 54b887ce3f12 src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/remote/ui/Bundle_ja.properties --- a/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/remote/ui/Bundle_ja.properties Sun Dec 06 23:38:29 2015 -0800 +++ b/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/remote/ui/Bundle_ja.properties Tue May 03 18:56:54 2016 -0700 @@ -1,5 +1,6 @@ LBL_HostRootNode=C/C++\u30d3\u30eb\u30c9\u30fb\u30db\u30b9\u30c8 AddHostMenuItem=\u65b0\u898f\u30db\u30b9\u30c8\u306e\u8ffd\u52a0... +AddNewHostAction=\u65b0\u898f\u30db\u30b9\u30c8\u306e\u8ffd\u52a0 RemoveHostMenuItem=\u30db\u30b9\u30c8\u3092\u524a\u9664(%R) RemoveHostCaption=\u30db\u30b9\u30c8\u3092\u524a\u9664 RemoveHostQuestion=\u672c\u5f53\u306b{0}\u3092\u4e00\u89a7\u304b\u3089\u524a\u9664\u3057\u307e\u3059\u304b? diff -r 19c1f5870837 -r 54b887ce3f12 src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/makefile/wizard/Bundle_ja.properties --- a/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/makefile/wizard/Bundle_ja.properties Sun Dec 06 23:38:29 2015 -0800 +++ b/src/ja/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/makefile/wizard/Bundle_ja.properties Tue May 03 18:56:54 2016 -0700 @@ -128,9 +128,9 @@ # PlatformTypePanel LBL_PlatformTypePanel=Makefile\u30bf\u30a4\u30d7\u3068\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u3092\u9078\u629e -TXT_PlatformTypeMsg1=Oracle Solaris Studio\u306e\u30b3\u30f3\u30d1\u30a4\u30e9\u306f\u3055\u307e\u3056\u307e\u306a\u70b9\u3067GNU\u306e\u3082\u306e\u3068\u7570\u306a\u308a\u307e\u3059\u3002\u3053\u306e\u30a6\u30a3\u30b6\u30fc\u30c9\u3067Oracle Solaris Studio\u306e\u30b3\u30f3\u30d1\u30a4\u30e9\u30fb\u30bb\u30c3\u30c8\u307e\u305f\u306fGNU\u306e\u30b3\u30f3\u30d1\u30a4\u30e9\u30fb\u30bb\u30c3\u30c8\u3068\u4e92\u63db\u6027\u306e\u3042\u308bMakefile\u3092\u4f5c\u6210\u3067\u304d\u307e\u3059\u3002 +TXT_PlatformTypeMsg1=Oracle Developer Studio\u306e\u30b3\u30f3\u30d1\u30a4\u30e9\u306f\u69d8\u3005\u306a\u70b9\u3067GNU\u306e\u3082\u306e\u3068\u7570\u306a\u308a\u307e\u3059\u3002\u3053\u306e\u30a6\u30a3\u30b6\u30fc\u30c9\u3067Oracle Developer Studio\u306e\u30b3\u30f3\u30d1\u30a4\u30e9\u30fb\u30bb\u30c3\u30c8\u307e\u305f\u306fGNU\u306e\u30b3\u30f3\u30d1\u30a4\u30e9\u30fb\u30bb\u30c3\u30c8\u3068\u4e92\u63db\u6027\u306e\u3042\u308bMakefile\u3092\u4f5c\u6210\u3067\u304d\u307e\u3059\u3002 LBL_CompilerType=\u4f7f\u7528\u3059\u308b\u30b3\u30f3\u30d1\u30a4\u30e9\u30fb\u30bb\u30c3\u30c8\u3092\u9078\u629e: -RB_CompilerTypeSun=Oracle Solaris Studio\u30b3\u30f3\u30d1\u30a4\u30e9 +RB_CompilerTypeSun=Oracle Developer Studio\u30b3\u30f3\u30d1\u30a4\u30e9 RB_CompilerTypeGNU=GNU\u30b3\u30f3\u30d1\u30a4\u30e9 @@ -147,8 +147,8 @@ # CompilerTypePanel and PlatformTypePanel LBL_CompilerTypePanel=Makefile\u30bf\u30a4\u30d7\u3092\u9078\u629e -TXT_CompilerTypeMsg1=Oracle Solaris Studio\u306emake\u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3\u3068\u30b3\u30f3\u30d1\u30a4\u30e9\u306f\u3055\u307e\u3056\u307e\u306a\u70b9\u3067GNU\u306e\u3082\u306e\u3068\u7570\u306a\u308a\u307e\u3059\u3002\u3053\u306e\u30a6\u30a3\u30b6\u30fc\u30c9\u3067\u3001Oracle Solaris Studio\u306e\u30c4\u30fc\u30eb\u30bb\u30c3\u30c8\u307e\u305f\u306fGNU\u306e\u30c4\u30fc\u30eb\u30bb\u30c3\u30c8(make\u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3\u3084\u30b3\u30f3\u30d1\u30a4\u30e9)\u3068\u4e92\u63db\u6027\u306e\u3042\u308bMakefile\u3092\u4f5c\u6210\u3067\u304d\u307e\u3059\u3002\u307e\u305f\u3001\u4e21\u65b9\u306e\u30c4\u30fc\u30eb\u30bb\u30c3\u30c8\u3067\u52d5\u4f5c\u3059\u308b\u4e00\u822c\u7684\u3067\u591a\u5c11\u8907\u96d1\u306aMakefile\u3082\u4f5c\u6210\u3067\u304d\u307e\u3059\u3002 -RB_CompilerTypeBoth=Oracle Solaris Studio\u304a\u3088\u3073GNU\u30b3\u30f3\u30d1\u30a4\u30e9 +TXT_CompilerTypeMsg1=Oracle Developer Studio\u306emake\u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3\u3068\u30b3\u30f3\u30d1\u30a4\u30e9\u306f\u69d8\u3005\u306a\u70b9\u3067GNU\u306e\u3082\u306e\u3068\u7570\u306a\u308a\u307e\u3059\u3002\u3053\u306e\u30a6\u30a3\u30b6\u30fc\u30c9\u3067\u3001Oracle Developer Studio\u306e\u30c4\u30fc\u30eb\u30bb\u30c3\u30c8\u307e\u305f\u306fGNU\u306e\u30c4\u30fc\u30eb\u30bb\u30c3\u30c8(make\u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3\u3084\u30b3\u30f3\u30d1\u30a4\u30e9)\u3068\u4e92\u63db\u6027\u306e\u3042\u308bMakefile\u3092\u4f5c\u6210\u3067\u304d\u307e\u3059\u3002\u307e\u305f\u3001\u4e21\u65b9\u306e\u30c4\u30fc\u30eb\u30bb\u30c3\u30c8\u3067\u52d5\u4f5c\u3059\u308b\u4e00\u822c\u7684\u3067\u591a\u5c11\u8907\u96d1\u306aMakefile\u3082\u4f5c\u6210\u3067\u304d\u307e\u3059\u3002 +RB_CompilerTypeBoth=Oracle Developer Studio\u304a\u3088\u3073GNU\u30b3\u30f3\u30d1\u30a4\u30e9 @@ -200,7 +200,7 @@ TB_DynamicLib=\u52d5\u7684\u30ea\u30f3\u30af(-ldl) TB_Curses=Curses: CRT\u753b\u9762\u306e\u5236\u5fa1(-lcurses) TB_RWTools=RW Tools++ (-library=rwtools7,iostream) -TB_PerfLib=Oracle Solaris Studio\u30d1\u30d5\u30a9\u30fc\u30de\u30f3\u30b9\u30fb\u30e9\u30a4\u30d6\u30e9\u30ea(-xlic_lib=sunperf) +TB_PerfLib=Oracle Developer Studio\u30d1\u30d5\u30a9\u30fc\u30de\u30f3\u30b9\u30fb\u30e9\u30a4\u30d6\u30e9\u30ea(-xlic_lib=sunperf) diff -r 19c1f5870837 -r 54b887ce3f12 src/ja/cnd/cnd-toolchain/cnd-toolchain/org/netbeans/modules/cnd/toolchain/Bundle_ja.properties --- a/src/ja/cnd/cnd-toolchain/cnd-toolchain/org/netbeans/modules/cnd/toolchain/Bundle_ja.properties Sun Dec 06 23:38:29 2015 -0800 +++ b/src/ja/cnd/cnd-toolchain/cnd-toolchain/org/netbeans/modules/cnd/toolchain/Bundle_ja.properties Tue May 03 18:56:54 2016 -0700 @@ -1,8 +1,8 @@ OpenIDE-Module-Display-Category=C/C++ OpenIDE-Module-Name=C/C++\u30c4\u30fc\u30eb\u30fb\u30b3\u30ec\u30af\u30b7\u30e7\u30f3 -CND/ToolChains/OSS_solaris-sparc=Oracle Solaris Studio -CND/ToolChains/OSS_solaris-x86_linux=Oracle Solaris Studio -CND/ToolChains/OSS_linuxCompatGNU=GNU\u4e92\u63db\u30e2\u30fc\u30c9\u306eOracle Solaris Studio +CND/ToolChains/OSS_solaris-sparc=Oracle Developer Studio +CND/ToolChains/OSS_solaris-x86_linux=Oracle Developer Studio +CND/ToolChains/OSS_linuxCompatGNU=GNU\u4e92\u63db\u30e2\u30fc\u30c9\u306eOracle Developer Studio CND/ToolChains/OSS_5.13_solaris-sparc={Oracle Solaris Studio 12.4} CND/ToolChains/OSS_5.13_solaris-x86_linux={Oracle Solaris Studio 12.4} CND/ToolChains/OSS_5.13_linuxCompatGNU=GNU\u4e92\u63db\u30e2\u30fc\u30c9\u306e{Oracle Solaris Studio 12.4} @@ -19,8 +19,7 @@ CND/ToolChains/SunStudio_10=Sun Studio 10 CND/ToolChains/SunStudio_9=Sun Studio 9 CND/ToolChains/SunStudio_8=Sun Studio 8 -CND/ToolChains/SunStudio=Sun Studio -CND/ToolChains/OracleSolarisStudio=Oracle Solaris Studio +CND/ToolChains/OracleDeveloperStudio=Oracle Developer Studio CND/ToolChains/Cygwin=GNU Cygwin CND/ToolChains/MinGW=GNU MinGW CND/ToolChains/MinGW_TDM=GNU MinGW TDM diff -r 19c1f5870837 -r 54b887ce3f12 src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/branch/Bundle_ja.properties --- a/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/branch/Bundle_ja.properties Sun Dec 06 23:38:29 2015 -0800 +++ b/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/branch/Bundle_ja.properties Tue May 03 18:56:54 2016 -0700 @@ -116,7 +116,7 @@ LBL_SetTrackingAction_PopupName=\u30c8\u30e9\u30c3\u30af\u6e08\u5206\u5c90\u306e\u8a2d\u5b9a... # {0} - branch name # {1} - tracked branch name -MSG_SetTrackingAction.result=\u5206\u5c90"{0}"\u304c\u5206\u5c90"{1}"\u3092\u8ffd\u8de1\u3059\u308b\u3088\u3046\u30de\u30fc\u30af\u3055\u308c\u3066\u3044\u307e\u3059 +MSG_SetTrackingAction.result=\u5206\u5c90"{0}"\u304c\u5206\u5c90"{1}"\u3092\u30c8\u30e9\u30c3\u30ad\u30f3\u30b0\u3059\u308b\u3088\u3046\u30de\u30fc\u30af\u3055\u308c\u3066\u3044\u307e\u3059 # {0} - branch name # {1} - tracked branch name MSG_SyncBranchAction.result=\u5206\u5c90{0}\u3092{1}\u3068\u540c\u671f\u3057\u3066\u3044\u307e\u3059\n @@ -137,5 +137,5 @@ CherryPickPanel.jLabel1.text=HEAD\u306b\u9069\u7528(\u30c1\u30a7\u30ea\u30fc\u30fb\u30d4\u30c3\u30af)\u3059\u308b\u30ea\u30d3\u30b8\u30e7\u30f3\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044 # {0} - branch name # {1} - tracked branch name -SelectTrackedBranchPanel.info=\u5206\u5c90"{0}"\u304c\u5206\u5c90"{1}"\u306e\u8ffd\u8de1\u3092\u958b\u59cb\u3057\u307e\u3059 +SelectTrackedBranchPanel.info=\u5206\u5c90"{0}"\u304c\u5206\u5c90"{1}"\u306e\u30c8\u30e9\u30c3\u30ad\u30f3\u30b0\u3092\u958b\u59cb\u3057\u307e\u3059 diff -r 19c1f5870837 -r 54b887ce3f12 src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/checkout/Bundle_ja.properties --- a/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/checkout/Bundle_ja.properties Sun Dec 06 23:38:29 2015 -0800 +++ b/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/checkout/Bundle_ja.properties Tue May 03 18:56:54 2016 -0700 @@ -63,8 +63,8 @@ RevertChangesPanel.revertAllRadioButton.text=\u4f5c\u696d\u30c4\u30ea\u30fc\u3068\u7d22\u5f15\u306e\u30b3\u30df\u30c3\u30c8\u3055\u308c\u3066\u3044\u306a\u3044\u5909\u66f4\u3092\u5143\u306b\u623b\u3059(&W) # translation hint - HEAD is a git specific term for last revisition in repository, do not translate this word RevertChangesPanel.revertIndexRadioButton.text=\u7d22\u5f15\u306e\u30b3\u30df\u30c3\u30c8\u3055\u308c\u3066\u3044\u306a\u3044\u5909\u66f4\u306e\u307f\u3092HEAD\u306b\u623b\u3059(&E) -RevertChangesPanel.removeAllNewCheckBox.text=\u65b0\u3057\u3044\u30d5\u30a1\u30a4\u30eb\u3068\u30d5\u30a9\u30eb\u30c0\u3082\u524a\u9664\u3059\u308b(&I) -RevertChangesPanel.removeWTNewCheckBox.text=\u65b0\u3057\u3044\u30d5\u30a1\u30a4\u30eb\u3068\u30d5\u30a9\u30eb\u30c0\u3082\u524a\u9664\u3059\u308b(&O) +RevertChangesPanel.removeAllNewCheckBox.text=\u65b0\u898f\u30d5\u30a1\u30a4\u30eb\u3068\u30d5\u30a9\u30eb\u30c0\u3082\u524a\u9664\u3059\u308b(&I) +RevertChangesPanel.removeWTNewCheckBox.text=\u65b0\u898f\u30d5\u30a1\u30a4\u30eb\u3068\u30d5\u30a9\u30eb\u30c0\u3082\u524a\u9664\u3059\u308b(&O) LBL_CheckoutRevisionAction_Name=\u30ea\u30d3\u30b8\u30e7\u30f3\u306e\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8(&R)... LBL_CheckoutRevisionAction_PopupName=\u30ea\u30d3\u30b8\u30e7\u30f3\u306e\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8... LBL_CheckoutRevision.OKButton.text=\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8(&C) @@ -73,7 +73,7 @@ LBL_Progress.RefreshingStatuses = \u30b9\u30c6\u30fc\u30bf\u30b9\u3092\u30ea\u30d5\u30ec\u30c3\u30b7\u30e5\u3057\u3066\u3044\u307e\u3059... CheckoutRevisionPanel.jLabel2.text=\u5206\u5c90\u540d(&N): -CheckoutRevisionPanel.cbCheckoutAsNewBranch.text=\u65b0\u3057\u3044\u5206\u5c90\u3068\u3057\u3066\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8(&B) +CheckoutRevisionPanel.cbCheckoutAsNewBranch.text=\u65b0\u898f\u5206\u5c90\u3068\u3057\u3066\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8(&B) CheckoutRevision.jLabel1.text=\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u3059\u308b\u30ea\u30d3\u30b8\u30e7\u30f3\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044 MSG_CheckoutRevisionAction.branchCreated = \u5206\u5c90\u304c\u4f5c\u6210\u3055\u308c\u307e\u3057\u305f\n\u540d\u524d: {0}\n\u5143: {1}\nID: {2} MSG_CheckoutRevisionAction.checkoutConflicts = \u4f5c\u696d\u30b3\u30d4\u30fc\u306e\u30ed\u30fc\u30ab\u30eb\u5074\u3067\u306e\u4fee\u6b63\u306b\u3088\u3063\u3066\u3001\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u306e\u7af6\u5408\u304c\u767a\u751f\u3059\u308b\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002\n\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406\u30d3\u30e5\u30fc\u3067\u3001\u305d\u308c\u3089\u3092\u30de\u30fc\u30b8\u3001\u5143\u306b\u623b\u3059\u3001\u78ba\u8a8d\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002 diff -r 19c1f5870837 -r 54b887ce3f12 src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/push/Bundle_ja.properties --- a/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/push/Bundle_ja.properties Sun Dec 06 23:38:29 2015 -0800 +++ b/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/ui/push/Bundle_ja.properties Tue May 03 18:56:54 2016 -0700 @@ -44,7 +44,7 @@ CTL_PushAction.report.pullButton.text=\u5909\u66f4\u306e\u30d7\u30eb(&P) LBL_Push.createNewBranch=\u65b0\u898f\u5206\u5c90\u3092\u4f5c\u6210\u3057\u307e\u3059\u304b\u3002 LBL_Push.pushToUpstreamFailed=\u30a2\u30c3\u30d7\u30b9\u30c8\u30ea\u30fc\u30e0\u3078\u306e\u30d7\u30c3\u30b7\u30e5\u306b\u5931\u6557\u3057\u307e\u3057\u305f -LBL_Push.setupTracking=\u30ea\u30e2\u30fc\u30c8\u8ffd\u8de1\u3092\u8a2d\u5b9a\u3057\u307e\u3059\u304b\u3002 +LBL_Push.setupTracking=\u30ea\u30e2\u30fc\u30c8\u30fb\u30c8\u30e9\u30c3\u30ad\u30f3\u30b0\u3092\u8a2d\u5b9a\u3057\u307e\u3059\u304b\u3002 # {0} - repository name LBL_PushAction.progressName=\u30d7\u30c3\u30b7\u30e5\u3057\u3066\u3044\u307e\u3059 - {0} LBL_PushAction.pullingChanges.finished=\u30ea\u30e2\u30fc\u30c8\u306e\u5909\u66f4\u304c\u30d7\u30eb\u3055\u308c\u307e\u3057\u305f @@ -72,7 +72,7 @@ MSG_Push.createNewBranch=\u30d7\u30c3\u30b7\u30e5\u3067\u30ea\u30e2\u30fc\u30c8\u30fb\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u65b0\u898f\u5206\u5c90"{0}"\u3092\u4f5c\u6210\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u307e\u3059\u3002\n\u7d9a\u884c\u3057\u3066\u5206\u5c90\u3092\u4f5c\u6210\u3057\u307e\u3059\u304b\u3002 # {0} - remote branch name # {1} - branch name -MSG_Push.setupTracking=\u5206\u5c90"{0}"\u306f\u30ed\u30fc\u30ab\u30eb\u306b\u4f5c\u6210\u3055\u308c\u307e\u3057\u305f\u3002\n\u30ea\u30e2\u30fc\u30c8\u5206\u5c90\u3092\u8ffd\u8de1\u3059\u308b\u3088\u3046\u5206\u5c90"{1}"\u3092\u8a2d\u5b9a\u3057\u307e\u3059\u304b\u3002 +MSG_Push.setupTracking=\u5206\u5c90"{0}"\u306f\u30ed\u30fc\u30ab\u30eb\u306b\u4f5c\u6210\u3055\u308c\u307e\u3057\u305f\u3002\n\u30ea\u30e2\u30fc\u30c8\u5206\u5c90\u3092\u30c8\u30e9\u30c3\u30ad\u30f3\u30b0\u3059\u308b\u3088\u3046\u5206\u5c90"{1}"\u3092\u8a2d\u5b9a\u3057\u307e\u3059\u304b\u3002 # {0} - branch name MSG_PushAction.branchDeleted=\u5206\u5c90{0}\u306f\u30ed\u30fc\u30ab\u30eb\u30fb\u30ea\u30dd\u30b8\u30c8\u30ea\u3067\u524a\u9664\u3055\u308c\u307e\u3057\u305f\u3002 MSG_PushAction.finalizing = \u30d5\u30a1\u30a4\u30ca\u30e9\u30a4\u30ba\u3057\u3066\u3044\u307e\u3059 @@ -86,7 +86,7 @@ MSG_PushAction.report.errors=\u30d7\u30c3\u30b7\u30e5\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\n\u51fa\u529b\u3092\u958b\u3044\u3066\u3001\u8a73\u7d30\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002 # {0} - local branch name # {1} - tracked branch name -MSG_PushAction.trackingUpdated=\u30d6\u30e9\u30f3\u30c1{0}\u304c{1}\u3092\u8ffd\u8de1\u3059\u308b\u3088\u3046\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u307e\u3059 +MSG_PushAction.trackingUpdated=\u30d6\u30e9\u30f3\u30c1{0}\u304c{1}\u3092\u30c8\u30e9\u30c3\u30ad\u30f3\u30b0\u3059\u308b\u3088\u3046\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u307e\u3059 # {0} - branch name # {1} - branch head id # {2} - result of the update diff -r 19c1f5870837 -r 54b887ce3f12 src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/utils/Bundle_ja.properties --- a/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/utils/Bundle_ja.properties Sun Dec 06 23:38:29 2015 -0800 +++ b/src/ja/dlight/git-remote/git-remote/org/netbeans/modules/git/remote/utils/Bundle_ja.properties Tue May 03 18:56:54 2016 -0700 @@ -42,9 +42,9 @@ LBL_FileSelector_Title=\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u9078\u629e BK2022=\u505c\u6b62 # {0} - branch name -MSG_Err.noTrackedBranch=\u30ed\u30fc\u30ab\u30eb{0}\u306b\u5bfe\u3057\u3066\u8ffd\u8de1\u3055\u308c\u308b\u30ea\u30e2\u30fc\u30c8\u5206\u5c90\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093 +MSG_Err.noTrackedBranch=\u30ed\u30fc\u30ab\u30eb{0}\u306b\u5bfe\u3057\u3066\u30c8\u30e9\u30c3\u30ad\u30f3\u30b0\u3055\u308c\u308b\u30ea\u30e2\u30fc\u30c8\u5206\u5c90\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093 # {0} - branch name -MSG_Err.trackedBranchLocal=\u8ffd\u8de1\u3055\u308c\u308b\u5206\u5c90{0}\u306f\u30ea\u30e2\u30fc\u30c8\u5206\u5c90\u3067\u306f\u3042\u308a\u307e\u305b\u3093 +MSG_Err.trackedBranchLocal=\u30c8\u30e9\u30c3\u30ad\u30f3\u30b0\u3055\u308c\u308b\u5206\u5c90{0}\u306f\u30ea\u30e2\u30fc\u30c8\u5206\u5c90\u3067\u306f\u3042\u308a\u307e\u305b\u3093 # {0} - [history view] # {1} - [diff] MSG_LogUtils.updateBranch.actions=\u5909\u66f4\u3092{0}\u3067\u3001\u307e\u305f\u306f{1}\u3068\u3057\u3066\u8868\u793a\n diff -r 19c1f5870837 -r 54b887ce3f12 src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/options/Bundle_ja.properties --- a/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/options/Bundle_ja.properties Sun Dec 06 23:38:29 2015 -0800 +++ b/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/options/Bundle_ja.properties Tue May 03 18:56:54 2016 -0700 @@ -125,7 +125,7 @@ MercurialPanel.cbInternalMergeToolEnabled.toolTipText=NetBeans\u306e\u30de\u30fc\u30b8\u30fb\u30c4\u30fc\u30eb\u306f\u3001\u30de\u30fc\u30b8\u4e2d\u306e\u7af6\u5408\u3092\u89e3\u6c7a\u3059\u308b\u305f\u3081\u306b\u4f7f\u7528\u3055\u308c\u307e\u3059\u3002hg\u69cb\u6210\u30d5\u30a1\u30a4\u30eb\u3067\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u308b\u30de\u30fc\u30b8\u30fb\u30c4\u30fc\u30eb\u3092\u4f7f\u7528\u3059\u308b\u306b\u306f\u3001\u7121\u52b9\u306b\u3057\u307e\u3059\u3002 MercurialPanel.cbInternalMergeToolEnabled.text=\u7af6\u5408\u306e\u89e3\u6c7a\u306b\u5185\u90e8\u30de\u30fc\u30b8\u30fb\u30c4\u30fc\u30eb\u3092\u4f7f\u7528(&I) MercurialPanel.excludeNewFiles.toolTipText=\u65b0\u898f\u4f5c\u6210\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb\u306f\u624b\u52d5\u3067\u30b3\u30df\u30c3\u30c8\u306b\u542b\u3081\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059 -MercurialPanel.excludeNewFiles.text=\u65b0\u3057\u3044\u30d5\u30a1\u30a4\u30eb\u306b\u300c\u30b3\u30df\u30c3\u30c8\u304b\u3089\u9664\u5916(&E)\u300d\u3092\u81ea\u52d5\u7684\u306b\u9069\u7528 +MercurialPanel.excludeNewFiles.text=\u65b0\u898f\u30d5\u30a1\u30a4\u30eb\u306b\u300c\u30b3\u30df\u30c3\u30c8\u304b\u3089\u9664\u5916(&E)\u300d\u3092\u81ea\u52d5\u7684\u306b\u9069\u7528 KW_Colors=\u8272 MercurialPanel.jLabel10.text=\u30d3\u30eb\u30c9\u30fb\u30db\u30b9\u30c8(&H): diff -r 19c1f5870837 -r 54b887ce3f12 src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/rollback/Bundle_ja.properties --- a/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/rollback/Bundle_ja.properties Sun Dec 06 23:38:29 2015 -0800 +++ b/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/rollback/Bundle_ja.properties Tue May 03 18:56:54 2016 -0700 @@ -152,3 +152,4 @@ ACSD_revisionsComboBox=\u30b9\u30c8\u30ea\u30c3\u30d7\u3059\u308b\u30ea\u30d3\u30b8\u30e7\u30f3\u3092\u6307\u5b9a ACSD_revisionsComboBoxBackout=\u53d6\u308a\u6d88\u3059\u30ea\u30d3\u30b8\u30e7\u30f3\u3092\u6307\u5b9a ACSD_commitMsgField=\u30d0\u30c3\u30af\u30a2\u30a6\u30c8\u30fb\u30c1\u30a7\u30f3\u30b8\u30bb\u30c3\u30c8\u306b\u4f7f\u7528\u3059\u308b\u30b3\u30df\u30c3\u30c8\u30fb\u30e1\u30c3\u30bb\u30fc\u30b8\u3092\u6307\u5b9a + diff -r 19c1f5870837 -r 54b887ce3f12 src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/update/Bundle_ja.properties --- a/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/update/Bundle_ja.properties Sun Dec 06 23:38:29 2015 -0800 +++ b/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/update/Bundle_ja.properties Tue May 03 18:56:54 2016 -0700 @@ -95,7 +95,7 @@ RevertModificationsPanel.infoLabel2.text=(\u4f5c\u696d\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306e\u307f\u5909\u66f4\u3057\u3001\u30ea\u30dd\u30b8\u30c8\u30ea\u306f\u5909\u66f4\u3057\u306a\u3044) RevertModificationsPanel.doBackupChxBox.text=\u30ed\u30fc\u30ab\u30eb\u3067\u5909\u66f4\u3092\u884c\u306a\u3063\u305f\u30d5\u30a1\u30a4\u30eb\u3092<\u30d5\u30a1\u30a4\u30eb\u540d>.orig\u306b\u30d0\u30c3\u30af\u30a2\u30c3\u30d7(&B) RevertModificationsPanel.doPurgeChxBox.text=\u65b0\u305f\u306b\u8ffd\u52a0\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb\u3068\u30d5\u30a9\u30eb\u30c0\u3092\u524a\u9664(&N) -RevertModificationsPanel.doPurgeChxBox.desc=\u65b0\u3057\u3044\u30d5\u30a1\u30a4\u30eb\u304a\u3088\u3073\u7a7a\u306e\u30d5\u30a9\u30eb\u30c0\u304c\u30c7\u30a3\u30b9\u30af\u304b\u3089\u524a\u9664\u3055\u308c\u307e\u3059 +RevertModificationsPanel.doPurgeChxBox.desc=\u65b0\u898f\u30d5\u30a1\u30a4\u30eb\u304a\u3088\u3073\u7a7a\u306e\u30d5\u30a9\u30eb\u30c0\u304c\u30c7\u30a3\u30b9\u30af\u304b\u3089\u524a\u9664\u3055\u308c\u307e\u3059 UpdatePanel.infoLabel.text=\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u4f5c\u696d\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306b\u3042\u308b\u30d5\u30a1\u30a4\u30eb\u3092\u9078\u629e\u3057\u305f\u30ea\u30d3\u30b8\u30e7\u30f3\u306b\u66f4\u65b0 UpdatePanel.infoLabel2.text=(\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u4f5c\u696d\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306e\u89aa\u3092\u3053\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u306b\u8a2d\u5b9a) diff -r 19c1f5870837 -r 54b887ce3f12 src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/util/Bundle_ja.properties --- a/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/util/Bundle_ja.properties Sun Dec 06 23:38:29 2015 -0800 +++ b/src/ja/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/util/Bundle_ja.properties Tue May 03 18:56:54 2016 -0700 @@ -57,7 +57,7 @@ MSG_COMMIT_FAILED = \u30b3\u30df\u30c3\u30c8\u30fb\u30b3\u30de\u30f3\u30c9\u304c\u5931\u6557\u3057\u307e\u3057\u305f\n\n\u8a73\u7d30\u306f\u300c\u51fa\u529b\u300d\u30a6\u30a3\u30f3\u30c9\u30a6\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044 MSG_RENAME_FAILED = \u540d\u524d\u5909\u66f4\u30b3\u30de\u30f3\u30c9\u304c\u5931\u6557\u3057\u307e\u3057\u305f\n\n\u8a73\u7d30\u306f\u300c\u51fa\u529b\u300d\u30a6\u30a3\u30f3\u30c9\u30a6\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044 MSG_COPY_FAILED = \u30b3\u30d4\u30fc\u30fb\u30b3\u30de\u30f3\u30c9\u304c\u5931\u6557\u3057\u307e\u3057\u305f\n\n\u8a73\u7d30\u306f\u300c\u51fa\u529b\u300d\u30a6\u30a3\u30f3\u30c9\u30a6\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044 -MSG_ALREADY_TRACKED = \u30d5\u30a1\u30a4\u30eb\u306e\u5834\u6240\u306f\u3059\u3067\u306b\u8ffd\u8de1\u3055\u308c\u3066\u3044\u307e\u3059\n\n\u8a73\u7d30\u306f\u300c\u51fa\u529b\u300d\u30a6\u30a3\u30f3\u30c9\u30a6\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044 +MSG_ALREADY_TRACKED = \u30d5\u30a1\u30a4\u30eb\u306e\u5834\u6240\u306f\u3059\u3067\u306b\u30c8\u30e9\u30c3\u30ad\u30f3\u30b0\u3055\u308c\u3066\u3044\u307e\u3059\n\n\u8a73\u7d30\u306f\u300c\u51fa\u529b\u300d\u30a6\u30a3\u30f3\u30c9\u30a6\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044 MSG_REVERT_FAILED = \u5143\u306b\u623b\u3059\u30b3\u30de\u30f3\u30c9\u304c\u5931\u6557\u3057\u307e\u3057\u305f\n\n\u8a73\u7d30\u306f\u300c\u51fa\u529b\u300d\u30a6\u30a3\u30f3\u30c9\u30a6\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044 MSG_EXPORT_FAILED = \u30a8\u30af\u30b9\u30dd\u30fc\u30c8\u30fb\u30b3\u30de\u30f3\u30c9\u304c\u5931\u6557\u3057\u307e\u3057\u305f\n\n\u8a73\u7d30\u306f\u300c\u51fa\u529b\u300d\u30a6\u30a3\u30f3\u30c9\u30a6\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044 MSG_BUNDLE_FAILED = \u30d0\u30f3\u30c9\u30eb\u30fb\u30b3\u30de\u30f3\u30c9\u304c\u5931\u6557\u3057\u307e\u3057\u305f\n\n\u8a73\u7d30\u306f\u300c\u51fa\u529b\u300d\u30a6\u30a3\u30f3\u30c9\u30a6\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044 diff -r 19c1f5870837 -r 54b887ce3f12 src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/options/Bundle_ja.properties --- a/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/options/Bundle_ja.properties Sun Dec 06 23:38:29 2015 -0800 +++ b/src/ja/dlight/subversion-remote/subversion-remote/org/netbeans/modules/subversion/remote/options/Bundle_ja.properties Tue May 03 18:56:54 2016 -0700 @@ -112,7 +112,7 @@ SvnOptionsPanel.cbOpenOutputWindow.text=\u51fa\u529b\u30a6\u30a3\u30f3\u30c9\u30a6\u306e\u30bf\u30d6\u3092\u81ea\u52d5\u7684\u306b\u958b\u304f(&W) ACSD_SvnOptionsPanel.cbOpenOutput.text=Subversion\u30b3\u30de\u30f3\u30c9\u306e\u51fa\u529b\u306f\u3001\u5fc5\u8981\u306b\u5fdc\u3058\u3066\u958b\u304f\u51fa\u529b\u30a6\u30a3\u30f3\u30c9\u30a6\u306e\u30bf\u30d6\u306b\u30ed\u30b0\u8a18\u9332\u3055\u308c\u307e\u3059\u3002 SvnOptionsPanel.excludeNewFiles.toolTipText=\u65b0\u898f\u4f5c\u6210\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb\u306f\u624b\u52d5\u3067\u30b3\u30df\u30c3\u30c8\u306b\u542b\u3081\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059 -SvnOptionsPanel.excludeNewFiles.text=\u65b0\u3057\u3044\u30d5\u30a1\u30a4\u30eb\u306b\u300c\u30b3\u30df\u30c3\u30c8\u304b\u3089\u9664\u5916(&E)\u300d\u3092\u81ea\u52d5\u7684\u306b\u9069\u7528 +SvnOptionsPanel.excludeNewFiles.text=\u65b0\u898f\u30d5\u30a1\u30a4\u30eb\u306b\u300c\u30b3\u30df\u30c3\u30c8\u304b\u3089\u9664\u5916(&E)\u300d\u3092\u81ea\u52d5\u7684\u306b\u9069\u7528 FileChooser.SvnExecutables.desc=SVN\u5b9f\u884c\u53ef\u80fd\u30d5\u30a1\u30a4\u30eb FileChooser.SvnLibs.desc=SVN JavaHL\u30e9\u30a4\u30d6\u30e9\u30ea SvnOptionsPanel.prefixRepositoryPath.text=\u30ea\u30dd\u30b8\u30c8\u30eaURL\u3092\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u5834\u6240\u306e\u63a5\u982d\u8f9e\u306b\u3059\u308b(&R) diff -r 19c1f5870837 -r 54b887ce3f12 src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-asm-core-resources-il-file_ja.html --- a/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-asm-core-resources-il-file_ja.html Sun Dec 06 23:38:29 2015 -0800 +++ b/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-asm-core-resources-il-file_ja.html Tue May 03 18:56:54 2016 -0700 @@ -43,6 +43,6 @@ インライン・テンプレート・ファイル - インライン・テンプレート・ファイル(Oracle Solaris Studioでサポート) + インライン・テンプレート・ファイル(Oracle Developer Studioでサポート) diff -r 19c1f5870837 -r 54b887ce3f12 src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-pi_ja.html --- a/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-pi_ja.html Sun Dec 06 23:38:29 2015 -0800 +++ b/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-pi_ja.html Tue May 03 18:56:54 2016 -0700 @@ -9,6 +9,6 @@ - 円周率を計算する5つの異なる実装。Oracle Solaris Studioコンパイラでのみ機能する構成もあります。 + 円周率を計算する5つの異なる実装。Oracle Developer Studioコンパイラでのみ機能する構成もあります。 diff -r 19c1f5870837 -r 54b887ce3f12 src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/dlight/Bundle_ja.properties --- a/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/dlight/Bundle_ja.properties Sun Dec 06 23:38:29 2015 -0800 +++ b/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/dlight/Bundle_ja.properties Tue May 03 18:56:54 2016 -0700 @@ -5,4 +5,3 @@ - diff -r 19c1f5870837 -r 54b887ce3f12 src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/support/Bundle_ja.properties --- a/src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/support/Bundle_ja.properties Sun Dec 06 23:38:29 2015 -0800 +++ b/src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/support/Bundle_ja.properties Tue May 03 18:56:54 2016 -0700 @@ -49,3 +49,8 @@ #TITLE_Message=From {0}: TITLE_Message_Ex={0}\u304b\u3089: {1} +Authentication.gssapi-with-mic=GSS-API +Authentication.publickey=\u516c\u958b\u9375 +Authentication.keyboard-interactive=\u30ad\u30fc\u30dc\u30fc\u30c9\u5bfe\u8a71\u578b +Authentication.password=\u30d1\u30b9\u30ef\u30fc\u30c9 + diff -r 19c1f5870837 -r 54b887ce3f12 src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/support/ui/Bundle_ja.properties --- a/src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/support/ui/Bundle_ja.properties Sun Dec 06 23:38:29 2015 -0800 +++ b/src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/support/ui/Bundle_ja.properties Tue May 03 18:56:54 2016 -0700 @@ -110,6 +110,7 @@ AuthTypeSelectorDlg.jPanel1.border.title=\u8aac\u660e: AuthenticationSettingsPanel.validationError.isDirectory.text={0}\u306f\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3067\u3059 AuthenticationSettingsPanel.validationError.emptyKey.text=SSH\u79d8\u5bc6\u9375\u306e\u3042\u308b\u30d5\u30a1\u30a4\u30eb\u306e\u30d1\u30b9\u3092\u6307\u5b9a\u3059\u308b\u304b\u3001\u30d1\u30b9\u30ef\u30fc\u30c9\u8a8d\u8a3c\u3092\u4f7f\u7528\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059 +AuthenticationSettingsPanel.validationError.emptyMethodList.text=\u8a8d\u8a3c\u65b9\u6cd5\u304c\u9078\u629e\u3055\u308c\u3066\u3044\u307e\u305b\u3093 AuthenticationSettingsPanel.validationError.invalidKey.text=\u30d5\u30a1\u30a4\u30eb{0}\u306e\u5185\u5bb9\u306f\u6709\u52b9\u306aSSH\u79d8\u5bc6\u9375\u3067\u306f\u3042\u308a\u307e\u305b\u3093 AuthenticationSettingsPanel.validationError.fileNotFound.text=\u30d5\u30a1\u30a4\u30eb{0}\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093 AuthenticationSettingsPanel.validationError.fileNotReadable.text={0}\u3092\u8aad\u307f\u8fbc\u3081\u307e\u305b\u3093 @@ -123,4 +124,28 @@ SSHKeyFileChooser.DialogTitle.text=SSH\u9375\u30d5\u30a1\u30a4\u30eb\u3092\u9078\u629e SSHKeyFileChooser.SSHKeyFileType.text=SSH\u79d8\u5bc6\u9375\u30d5\u30a1\u30a4\u30eb +AuthenticationSettingsPanel.connectionSettings.text=\u63a5\u7d9a\u8a2d\u5b9a(&S) +AuthenticationSettingsPanel.preferredAuthenticationsLabel.text=\u512a\u5148\u8a8d\u8a3c(&F): +AuthenticationSettingsPanel.upButton.text=\u4e0a(&U) +AuthenticationSettingsPanel.downButton.text=\u4e0b(&D) +AuthenticationSettingsPanel.timeoutLabel.text=\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8(&T): +AuthenticationSettingsPanel.downButton.toolTipText=\u4e0b\u3078\u79fb\u52d5 +AuthenticationSettingsPanel.connectionSettings.AccessibleContext.accessibleName=\u63a5\u7d9a\u8a2d\u5b9a +AuthenticationSettingsPanel.connectionSettings.AccessibleContext.accessibleDescription=\u8ffd\u52a0\u306e\u63a5\u7d9a\u8a2d\u5b9a +AuthenticationSettingsPanel.preferredAuthenticationsLabel.AccessibleContext.accessibleName=\u512a\u5148\u8a8d\u8a3c +AuthenticationSettingsPanel.preferredAuthenticationsLabel.AccessibleContext.accessibleDescription=\u512a\u5148\u8a8d\u8a3c\u9806\u5e8f +AuthenticationSettingsPanel.upButton.AccessibleContext.accessibleName=\u4e0a +AuthenticationSettingsPanel.upButton.AccessibleContext.accessibleDescription=\u8a8d\u8a3c\u3092\u4e0a\u306b\u79fb\u52d5 +AuthenticationSettingsPanel.downButton.AccessibleContext.accessibleName=\u4e0b +AuthenticationSettingsPanel.downButton.AccessibleContext.accessibleDescription=\u8a8d\u8a3c\u3092\u4e0b\u306b\u79fb\u52d5 +AuthenticationSettingsPanel.timeoutLabel.AccessibleContext.accessibleName=\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8 +AuthenticationSettingsPanel.timeoutLabel.AccessibleContext.accessibleDescription=\u63a5\u7d9a\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8 +AuthenticationSettingsPanel.timeoutSpinner.AccessibleContext.accessibleName=\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8 +AuthenticationSettingsPanel.timeoutSpinner.AccessibleContext.accessibleDescription=\u63a5\u7d9a\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8 +AuthenticationSettingsPanel.connectionSettings.toolTipText=\u8ffd\u52a0\u306e\u63a5\u7d9a\u8a2d\u5b9a +AuthenticationSettingsPanel.timeoutLabel.toolTipText=\u63a5\u7d9a\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8 +AuthenticationSettingsPanel.preferredAuthenticationsLabel.toolTipText=\u512a\u5148\u8a8d\u8a3c\u9806\u5e8f +AuthenticationSettingsPanel.upButton.toolTipText=\u4e0a\u306b\u79fb\u52d5 +AuthenticationSettingsPanel.authenticationsList.toolTipText=\u512a\u5148\u8a8d\u8a3c\u9806\u5e8f +AuthenticationSettingsPanel.timeoutSpinner.toolTipText=\u63a5\u7d9a\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8 diff -r 19c1f5870837 -r 54b887ce3f12 src/ja/ide/dlight-terminal/dlight-terminal/org/netbeans/modules/dlight/terminal/action/Bundle_ja.properties --- a/src/ja/ide/dlight-terminal/dlight-terminal/org/netbeans/modules/dlight/terminal/action/Bundle_ja.properties Sun Dec 06 23:38:29 2015 -0800 +++ b/src/ja/ide/dlight-terminal/dlight-terminal/org/netbeans/modules/dlight/terminal/action/Bundle_ja.properties Tue May 03 18:56:54 2016 -0700 @@ -2,8 +2,8 @@ CTL_RemoteTerminalAction=\u30ea\u30e2\u30fc\u30c8\u30fb\u30bf\u30fc\u30df\u30ca\u30eb RemoteConnectionTitle=SSH\u63a5\u7d9a TerminalAction.FailedToStart.text=\u30bf\u30fc\u30df\u30ca\u30eb\u306e\u8d77\u52d5\u306b\u5931\u6557\u3057\u307e\u3057\u305f: {0} -RemoteTerminalShortDescr=\u65b0\u3057\u3044\u30ea\u30e2\u30fc\u30c8\u30fb\u30bf\u30fc\u30df\u30ca\u30eb\u30fb\u30bf\u30d6\u3092\u4f5c\u6210 -LocalTerminalShortDescr=\u65b0\u3057\u3044\u30ed\u30fc\u30ab\u30eb\u30fb\u30bf\u30fc\u30df\u30ca\u30eb\u30fb\u30bf\u30d6\u3092\u4f5c\u6210 +RemoteTerminalShortDescr=\u65b0\u898f\u30ea\u30e2\u30fc\u30c8\u30fb\u30bf\u30fc\u30df\u30ca\u30eb\u30fb\u30bf\u30d6\u3092\u4f5c\u6210 +LocalTerminalShortDescr=\u65b0\u898f\u30ed\u30fc\u30ab\u30eb\u30fb\u30bf\u30fc\u30df\u30ca\u30eb\u30fb\u30bf\u30d6\u3092\u4f5c\u6210 TerminalOptionsShortDescr=\u30bf\u30fc\u30df\u30ca\u30eb\u306e\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u958b\u304d\u307e\u3059 CTL_ShowTerminalAction=\u30bf\u30fc\u30df\u30ca\u30eb(&E) ShowTerminalShortDescr=\u30bf\u30fc\u30df\u30ca\u30eb\u30fb\u30a6\u30a3\u30f3\u30c9\u30a6\u3092\u958b\u304f diff -r 19c1f5870837 -r 54b887ce3f12 src/zh_CN/cnd/cnd-asm/cnd-asm/org/netbeans/modules/cnd/asm/core/resources/il-file_zh_CN.html --- a/src/zh_CN/cnd/cnd-asm/cnd-asm/org/netbeans/modules/cnd/asm/core/resources/il-file_zh_CN.html Sun Dec 06 23:38:29 2015 -0800 +++ b/src/zh_CN/cnd/cnd-asm/cnd-asm/org/netbeans/modules/cnd/asm/core/resources/il-file_zh_CN.html Tue May 03 18:56:54 2016 -0700 @@ -43,6 +43,6 @@ 内联模板文件 - 内联模板文件 (在 Oracle Solaris Studio 中受支持) + 内联模板文件 (在 Oracle Developer Studio 中受支持) diff -r 19c1f5870837 -r 54b887ce3f12 src/zh_CN/cnd/cnd-discovery/cnd-discovery/org/netbeans/modules/cnd/discovery/projectimport/Bundle_zh_CN.properties --- a/src/zh_CN/cnd/cnd-discovery/cnd-discovery/org/netbeans/modules/cnd/discovery/projectimport/Bundle_zh_CN.properties Sun Dec 06 23:38:29 2015 -0800 +++ b/src/zh_CN/cnd/cnd-discovery/cnd-discovery/org/netbeans/modules/cnd/discovery/projectimport/Bundle_zh_CN.properties Tue May 03 18:56:54 2016 -0700 @@ -87,8 +87,8 @@ BUILD_LABEL=\u6784\u5efa BUILD_REMOTE_LABEL=\u6784\u5efa - {0} -ERROR_FIND_PROJECT_CREATOR=\u5728\u4e3b\u673a{0}\u4e0a\u627e\u4e0d\u5230 Oracle Solaris Studio 12.3 \u6216\u66f4\u9ad8\u7248\u672c\u3002 -ERROR_RUN_PROJECT_CREATOR=\u65e0\u6cd5\u5728\u4e3b\u673a{0}\u4e0a\u8fd0\u884c Oracle Solaris Studio 12.3 \u6216\u66f4\u9ad8\u7248\u672c\u3002 +ERROR_FIND_PROJECT_CREATOR=\u5728\u4e3b\u673a {0} \u4e0a\u627e\u4e0d\u5230 Oracle Solaris Studio (\u7248\u672c 12.3 \u6216\u66f4\u9ad8\u7248\u672c) \u6216 Oracle Developer Studio\u3002 +ERROR_RUN_PROJECT_CREATOR=\u65e0\u6cd5\u5728\u4e3b\u673a {0} \u4e0a\u8fd0\u884c Oracle Solaris Studio (\u7248\u672c 12.3 \u6216\u66f4\u9ad8\u7248\u672c) \u6216 Oracle Developer Studio\u3002 RUN_PROJECT_CREATOR=\u6b63\u5728\u4e3b\u673a{0}\u4e0a\u521b\u5efa\u9879\u76ee... CONFIGURING_PROJECT_CREATOR=\u6b63\u5728\u4e3b\u673a{0}\u4e0a\u914d\u7f6e\u9879\u76ee... diff -r 19c1f5870837 -r 54b887ce3f12 src/zh_CN/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/pi_zh_CN.html --- a/src/zh_CN/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/pi_zh_CN.html Sun Dec 06 23:38:29 2015 -0800 +++ b/src/zh_CN/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/resources/samples/pi_zh_CN.html Tue May 03 18:56:54 2016 -0700 @@ -9,6 +9,6 @@ - 计算 Pi 的五种不同的实现方式。某些配置可能仅适用于 Oracle Solaris Studio 编译器。 + 计算 Pi 的五种不同的实现方式。某些配置可能仅适用于 Oracle Developer Studio 编译器。 diff -r 19c1f5870837 -r 54b887ce3f12 src/zh_CN/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/wizards/Bundle_zh_CN.properties --- a/src/zh_CN/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/wizards/Bundle_zh_CN.properties Sun Dec 06 23:38:29 2015 -0800 +++ b/src/zh_CN/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/ui/wizards/Bundle_zh_CN.properties Tue May 03 18:56:54 2016 -0700 @@ -354,6 +354,8 @@ SelectModeError4=\u6587\u4ef6\u5939 "{0}" \u5df2\u7528\u4f5c NetBeans \u9879\u76ee\u6587\u4ef6\u5939 SelectModeError5=\u5728\u6587\u4ef6\u5939 "{0}" \u4e2d\u627e\u4e0d\u5230 makefile \u6216\u914d\u7f6e\u811a\u672c SelectModeError6=\u9879\u76ee\u4e0d\u80fd\u4f4d\u4e8e\u6587\u4ef6\u7cfb\u7edf\u6839\u76ee\u5f55\u4e2d +SelectModeError7="{0}" \u4e0d\u5b58\u5728 +SelectModeError8="{0}" \u4e0d\u662f\u7edd\u5bf9\u8def\u5f84 CleanInfoMessageSimpleMode=\u8bf7\u6ce8\u610f, \u5c06\u81ea\u52a8\u8fd0\u884c\u6e05\u7406\u548c\u201c\u6784\u5efa\u201d\u64cd\u4f5c SelectModeSimpleInstructionExtraText_Configure=\u521b\u5efa\u9879\u76ee\u540e, \u5c06\u81ea\u52a8\u8fd0\u884c\u914d\u7f6e\u811a\u672c\u4ee5\u53ca\u6784\u5efa\u7684 makefile \u7684\u6e05\u7406\u548c\u6784\u5efa\u64cd\u4f5c\u3002 SelectModeSimpleInstructionExtraText_Make=\u521b\u5efa\u9879\u76ee\u540e, \u5c06\u81ea\u52a8\u8fd0\u884c\u73b0\u6709 makefile \u4e2d\u6307\u5b9a\u7684\u6e05\u7406\u548c\u6784\u5efa\u64cd\u4f5c\u3002 @@ -442,7 +444,7 @@ MSG_LocalProjectAlreadyExists=\u672c\u5730\u9879\u76ee{0}\u5df2\u5b58\u5728 SelectBinaryPanelVisual.cancelSearch.text=\u505c\u6b62\u641c\u7d22(&O) -ERROR_FIND_PROJECT_CREATOR=\u521b\u5efa\u8fdc\u7a0b\u9879\u76ee\u9700\u8981\u4e3b\u673a{0}\u4e0a\u5177\u6709 Oracle Solaris Studio 12.3 \u6216\u66f4\u9ad8\u7248\u672c\u3002 +ERROR_FIND_PROJECT_CREATOR=\u521b\u5efa\u8fdc\u7a0b\u9879\u76ee\u9700\u8981\u5728\u4e3b\u673a {0} \u4e0a\u8fd0\u884c Oracle Solaris Studio (\u7248\u672c 12.3 \u6216\u66f4\u9ad8\u7248\u672c) \u6216 Oracle Developer Studio\u3002 PanelProjectLocationVisual.Validating_Wizard=\u6b63\u5728\u9a8c\u8bc1... SERVICE_NOT_AVALIABLE=\u65e0\u6cd5\u521b\u5efa\u9879\u76ee,\n\u56e0\u4e3a\u5e76\u975e\u6240\u6709 C/C++ \u6a21\u5757\u5747\u5df2\u52a0\u8f7d\u3002\n\u8bf7\u5c1d\u8bd5\u901a\u8fc7\u201c\u5de5\u5177 > \u63d2\u4ef6\u201d(\u91cd\u65b0) \u6fc0\u6d3b\nC/C++ \u529f\u80fd\u3002 diff -r 19c1f5870837 -r 54b887ce3f12 src/zh_CN/cnd/cnd-modelimpl/cnd-modelimpl/org/netbeans/modules/cnd/modelimpl/parser/clank/Bundle_zh_CN.properties --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/zh_CN/cnd/cnd-modelimpl/cnd-modelimpl/org/netbeans/modules/cnd/modelimpl/parser/clank/Bundle_zh_CN.properties Tue May 03 18:56:54 2016 -0700 @@ -0,0 +1,49 @@ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 2015 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. +# +# Contributor(s): +# +# Portions Copyrighted 2015 Sun Microsystems, Inc. + +#Debug strings, NOI18N +NULL_PATH=\u6307\u4ee4 "{0}" \u7684\u672a\u89e3\u6790\u8def\u5f84\u3002 +UNRESOLVED_FILE_OWNER="{0}" \u7684\u672a\u89e3\u6790\u6587\u4ef6\u6240\u6709\u8005\u3002 +START_PROJECT_CLOSED=\u5728\u4ece {2} \u5305\u62ec\u6587\u4ef6 "{1}" \u65f6, \u542f\u52a8\u9879\u76ee "{0}" \u5df2\u5173\u95ed\u3002 +INVALID_START_PROJECT=\u5728\u4ece {2} \u5305\u62ec\u6587\u4ef6 "{1}" \u65f6, \u542f\u52a8\u9879\u76ee "{0}" \u65e0\u6548\u3002 +START_PROJECT_CANNOT_CREATE_FILE=\u5728\u4ece {2} \u5305\u62ec\u6587\u4ef6 "{1}" \u65f6, \u542f\u52a8\u9879\u76ee "{0}" \u65e0\u6cd5\u521b\u5efa\u6587\u4ef6\u3002 +NULL_START_PROJECT=\u5728\u4ece {2} \u5305\u62ec\u6587\u4ef6 "{1}" \u65f6, \u542f\u52a8\u9879\u76ee\u4e3a\u7a7a\u503c\u3002 + + diff -r 19c1f5870837 -r 54b887ce3f12 src/zh_CN/cnd/cnd-remote-projectui/cnd-remote-projectui/org/netbeans/modules/cnd/remote/projectui/wizard/cnd/Bundle_zh_CN.properties --- a/src/zh_CN/cnd/cnd-remote-projectui/cnd-remote-projectui/org/netbeans/modules/cnd/remote/projectui/wizard/cnd/Bundle_zh_CN.properties Sun Dec 06 23:38:29 2015 -0800 +++ b/src/zh_CN/cnd/cnd-remote-projectui/cnd-remote-projectui/org/netbeans/modules/cnd/remote/projectui/wizard/cnd/Bundle_zh_CN.properties Tue May 03 18:56:54 2016 -0700 @@ -91,8 +91,8 @@ # NewMakeProjectWizardIterator LAB_IteratorName={0}/{1} -ERROR_FIND_PROJECT_CREATOR=\u5728\u4e3b\u673a{0}\u4e0a\u627e\u4e0d\u5230 Oracle Solaris Studio 12.3 \u6216\u66f4\u9ad8\u7248\u672c\u3002 -ERROR_RUN_PROJECT_CREATOR=\u65e0\u6cd5\u5728\u4e3b\u673a{0}\u4e0a\u8fd0\u884c Oracle Solaris Studio 12.3 \u6216\u66f4\u9ad8\u7248\u672c:\n{1}\u3002 +ERROR_FIND_PROJECT_CREATOR=\u5728\u4e3b\u673a {0} \u4e0a\u627e\u4e0d\u5230 Oracle Solaris Studio (\u7248\u672c 12.3 \u6216\u66f4\u9ad8\u7248\u672c) \u6216 Oracle Developer Studio\u3002 +ERROR_RUN_PROJECT_CREATOR=\u65e0\u6cd5\u5728\u4e3b\u673a {0} \u4e0a\u8fd0\u884c Oracle Solaris Studio (\u7248\u672c 12.3 \u6216\u66f4\u9ad8\u7248\u672c) \u6216 Oracle Developer Studio:\n{1}\u3002 RUN_PROJECT_CREATOR=\u6b63\u5728\u4e3b\u673a{0}\u4e0a\u521b\u5efa\u9879\u76ee... CONFIGURING_PROJECT_CREATOR=\u6b63\u5728\u4e3b\u673a{0}\u4e0a\u914d\u7f6e\u9879\u76ee... diff -r 19c1f5870837 -r 54b887ce3f12 src/zh_CN/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/ui/Bundle_zh_CN.properties --- a/src/zh_CN/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/ui/Bundle_zh_CN.properties Sun Dec 06 23:38:29 2015 -0800 +++ b/src/zh_CN/cnd/cnd-remote/cnd-remote/org/netbeans/modules/cnd/remote/ui/Bundle_zh_CN.properties Tue May 03 18:56:54 2016 -0700 @@ -130,5 +130,5 @@ EditPathMapDialog.restore.text=\u6062\u590d\u9ed8\u8ba4\u8bbe\u7f6e(&R) HostPropertiesDialog.errorLabel.text=\u9519\u8bef HostPropertiesDialog.serverRecordPanel.border.title=\u5176\u4ed6 -HostPropertiesDialog.cbACL.text=\u68c0\u67e5\u57fa\u4e8e ACL \u7684\u8fdc\u7a0b\u6587\u4ef6\u6743\u9650(&C) +HostPropertiesDialog.cbACL.text=\u68c0\u67e5\u57fa\u4e8e ACL \u7684\u8fdc\u7a0b\u6587\u4ef6\u6743\u9650(&L) diff -r 19c1f5870837 -r 54b887ce3f12 src/zh_CN/cnd/cnd-remote/cnd-remote/org/netbeans/modules/remote/ui/Bundle_zh_CN.properties --- a/src/zh_CN/cnd/cnd-remote/cnd-remote/org/netbeans/modules/remote/ui/Bundle_zh_CN.properties Sun Dec 06 23:38:29 2015 -0800 +++ b/src/zh_CN/cnd/cnd-remote/cnd-remote/org/netbeans/modules/remote/ui/Bundle_zh_CN.properties Tue May 03 18:56:54 2016 -0700 @@ -1,5 +1,6 @@ LBL_HostRootNode=C/C++ \u6784\u5efa\u4e3b\u673a AddHostMenuItem=\u6dfb\u52a0\u65b0\u4e3b\u673a(&A)... +AddNewHostAction=\u6dfb\u52a0\u65b0\u4e3b\u673a RemoveHostMenuItem=\u5220\u9664\u4e3b\u673a(&R) RemoveHostCaption=\u5220\u9664\u4e3b\u673a RemoveHostQuestion=\u662f\u5426\u786e\u5b9e\u8981\u4ece\u5217\u8868\u4e2d\u5220\u9664{0}? diff -r 19c1f5870837 -r 54b887ce3f12 src/zh_CN/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/makefile/wizard/Bundle_zh_CN.properties --- a/src/zh_CN/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/makefile/wizard/Bundle_zh_CN.properties Sun Dec 06 23:38:29 2015 -0800 +++ b/src/zh_CN/cnd/cnd-script/cnd-script/org/netbeans/modules/cnd/makefile/wizard/Bundle_zh_CN.properties Tue May 03 18:56:54 2016 -0700 @@ -128,9 +128,9 @@ # PlatformTypePanel LBL_PlatformTypePanel=\u9009\u62e9 Makefile \u7c7b\u578b\u548c\u5e73\u53f0 -TXT_PlatformTypeMsg1=Oracle Solaris Studio \u7f16\u8bd1\u5668\u4e0e GNU \u7f16\u8bd1\u5668\u4e4b\u95f4\u5b58\u5728\u8bb8\u591a\u4e0d\u540c\u3002\u4f7f\u7528\u6b64\u5411\u5bfc\u53ef\u4ee5\u521b\u5efa\u4e0e Oracle Solaris Studio \u6216 GNU \u7684\u7f16\u8bd1\u5668\u96c6\u5408\u76f8\u517c\u5bb9\u7684 makefile\u3002 +TXT_PlatformTypeMsg1=Oracle Developer Studio \u7f16\u8bd1\u5668\u4e0e GNU \u7f16\u8bd1\u5668\u4e4b\u95f4\u5b58\u5728\u8bf8\u591a\u4e0d\u540c\u3002\u4f7f\u7528\u6b64\u5411\u5bfc\u53ef\u4ee5\u521b\u5efa\u4e0e Oracle Developer Studio \u7f16\u8bd1\u5668\u96c6\u6216 GNU \u7f16\u8bd1\u5668\u96c6\u76f8\u517c\u5bb9\u7684 makefile\u3002 LBL_CompilerType=\u9009\u62e9\u8981\u4f7f\u7528\u7684\u7f16\u8bd1\u5668\u96c6\u5408: -RB_CompilerTypeSun=Oracle Solaris Studio \u7f16\u8bd1\u5668 +RB_CompilerTypeSun=Oracle Developer Studio \u7f16\u8bd1\u5668 RB_CompilerTypeGNU=GNU \u7f16\u8bd1\u5668 @@ -147,8 +147,8 @@ # CompilerTypePanel and PlatformTypePanel LBL_CompilerTypePanel=\u9009\u62e9 Makefile \u7c7b\u578b -TXT_CompilerTypeMsg1=Oracle Solaris Studio \u7684 make \u5b9e\u7528\u7a0b\u5e8f\u548c\u7f16\u8bd1\u5668\u4e0e GNU \u7684 make \u5b9e\u7528\u7a0b\u5e8f\u548c\u7f16\u8bd1\u5668\u4e4b\u95f4\u5b58\u5728\u8bb8\u591a\u4e0d\u540c\u3002\u4f7f\u7528\u6b64\u5411\u5bfc\u53ef\u4ee5\u521b\u5efa\u4e0e Oracle Solaris Studio \u6216 GNU \u7684\u5de5\u5177\u96c6 (make \u5b9e\u7528\u7a0b\u5e8f\u548c\u7f16\u8bd1\u5668) \u76f8\u517c\u5bb9\u7684 makefile, \u6216\u8005\u4e5f\u53ef\u4ee5\u521b\u5efa\u4e00\u4e2a\u9002\u7528\u4e24\u79cd\u5de5\u5177\u96c6\u7684\u901a\u7528\u4e14\u7a0d\u5fae\u590d\u6742\u7684 makefile\u3002 -RB_CompilerTypeBoth=Oracle Solaris Studio \u548c GNU \u7f16\u8bd1\u5668 +TXT_CompilerTypeMsg1=Oracle Developer Studio \u7684 make \u5b9e\u7528\u7a0b\u5e8f\u548c\u7f16\u8bd1\u5668\u4e0e GNU \u7684 make \u5b9e\u7528\u7a0b\u5e8f\u548c\u7f16\u8bd1\u5668\u4e4b\u95f4\u5b58\u5728\u8bf8\u591a\u4e0d\u540c\u3002\u4f7f\u7528\u6b64\u5411\u5bfc\u53ef\u4ee5\u521b\u5efa\u4e0e Oracle Developer Studio \u5de5\u5177\u96c6\u6216 GNU \u5de5\u5177\u96c6 (make \u5b9e\u7528\u7a0b\u5e8f\u548c\u7f16\u8bd1\u5668) \u76f8\u517c\u5bb9\u7684 makefile, \u4e5f\u53ef\u4ee5\u521b\u5efa\u4e00\u4e2a\u9002\u7528\u4e8e\u4e24\u79cd\u5de5\u5177\u96c6\u7684\u901a\u7528\u4e14\u7a0d\u5fae\u590d\u6742\u7684 makefile\u3002 +RB_CompilerTypeBoth=Oracle Developer Studio \u548c GNU \u7f16\u8bd1\u5668 @@ -200,7 +200,7 @@ TB_DynamicLib=\u52a8\u6001\u94fe\u63a5 (-ldl) TB_Curses=Curses: CRT \u5c4f\u5e55\u5904\u7406 (-lcurses) TB_RWTools=RW Tools++ (-library=rwtools7,iostream) -TB_PerfLib=Oracle Solaris Studio \u6027\u80fd\u5e93 (-xlic_lib=sunperf) +TB_PerfLib=Oracle Developer Studio \u6027\u80fd\u5e93 (-xlic_lib=sunperf) diff -r 19c1f5870837 -r 54b887ce3f12 src/zh_CN/cnd/cnd-toolchain/cnd-toolchain/org/netbeans/modules/cnd/toolchain/Bundle_zh_CN.properties --- a/src/zh_CN/cnd/cnd-toolchain/cnd-toolchain/org/netbeans/modules/cnd/toolchain/Bundle_zh_CN.properties Sun Dec 06 23:38:29 2015 -0800 +++ b/src/zh_CN/cnd/cnd-toolchain/cnd-toolchain/org/netbeans/modules/cnd/toolchain/Bundle_zh_CN.properties Tue May 03 18:56:54 2016 -0700 @@ -1,8 +1,8 @@ OpenIDE-Module-Display-Category=C/C++ OpenIDE-Module-Name=C/C++ \u5de5\u5177\u96c6\u5408 -CND/ToolChains/OSS_solaris-sparc=Oracle Solaris Studio -CND/ToolChains/OSS_solaris-x86_linux=Oracle Solaris Studio -CND/ToolChains/OSS_linuxCompatGNU=GNU \u517c\u5bb9\u6a21\u5f0f\u4e0b\u7684 Oracle Solaris Studio +CND/ToolChains/OSS_solaris-sparc=Oracle Developer Studio +CND/ToolChains/OSS_solaris-x86_linux=Oracle Developer Studio +CND/ToolChains/OSS_linuxCompatGNU=GNU \u517c\u5bb9\u6a21\u5f0f\u4e0b\u7684 Oracle Developer Studio CND/ToolChains/OSS_5.13_solaris-sparc={Oracle Solaris Studio 12.4} CND/ToolChains/OSS_5.13_solaris-x86_linux={Oracle Solaris Studio 12.4} CND/ToolChains/OSS_5.13_linuxCompatGNU=GNU \u517c\u5bb9\u6a21\u5f0f\u4e0b\u7684 {Oracle Solaris Studio 12.4} @@ -19,8 +19,7 @@ CND/ToolChains/SunStudio_10=Sun Studio 10 CND/ToolChains/SunStudio_9=Sun Studio 9 CND/ToolChains/SunStudio_8=Sun Studio 8 -CND/ToolChains/SunStudio=Sun Studio -CND/ToolChains/OracleSolarisStudio=Oracle Solaris Studio +CND/ToolChains/OracleDeveloperStudio=Oracle Developer Studio CND/ToolChains/Cygwin=GNU Cygwin CND/ToolChains/MinGW=GNU MinGW CND/ToolChains/MinGW_TDM=GNU MinGW TDM diff -r 19c1f5870837 -r 54b887ce3f12 src/zh_CN/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/rollback/Bundle_zh_CN.properties --- a/src/zh_CN/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/rollback/Bundle_zh_CN.properties Sun Dec 06 23:38:29 2015 -0800 +++ b/src/zh_CN/dlight/mercurial-remote/mercurial-remote/org/netbeans/modules/mercurial/remote/ui/rollback/Bundle_zh_CN.properties Tue May 03 18:56:54 2016 -0700 @@ -152,3 +152,4 @@ ACSD_revisionsComboBox=\u6307\u5b9a\u8981\u53bb\u9664\u7684\u4fee\u8ba2\u7248\u672c ACSD_revisionsComboBoxBackout=\u6307\u5b9a\u8981\u56de\u9000\u7684\u4fee\u8ba2\u7248\u672c ACSD_commitMsgField=\u6307\u5b9a\u7528\u4e8e\u56de\u9000\u66f4\u6539\u96c6\u7684\u63d0\u4ea4\u6d88\u606f + diff -r 19c1f5870837 -r 54b887ce3f12 src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-asm-core-resources-il-file_zh_CN.html --- a/src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-asm-core-resources-il-file_zh_CN.html Sun Dec 06 23:38:29 2015 -0800 +++ b/src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-asm-core-resources-il-file_zh_CN.html Tue May 03 18:56:54 2016 -0700 @@ -43,6 +43,6 @@ 内联模板文件 - 内联模板文件 (在 Oracle Solaris Studio 中受支持) + 内联模板文件 (在 Oracle Developer Studio 中受支持) diff -r 19c1f5870837 -r 54b887ce3f12 src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-pi_zh_CN.html --- a/src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-pi_zh_CN.html Sun Dec 06 23:38:29 2015 -0800 +++ b/src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/cnd/org-netbeans-modules-cnd-makeproject-ui-resources-samples-pi_zh_CN.html Tue May 03 18:56:54 2016 -0700 @@ -9,6 +9,6 @@ - 计算 Pi 的五种不同的实现方式。某些配置可能仅适用于 Oracle Solaris Studio 编译器。 + 计算 Pi 的五种不同的实现方式。某些配置可能仅适用于 Oracle Developer Studio 编译器。 diff -r 19c1f5870837 -r 54b887ce3f12 src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/dlight/Bundle_zh_CN.properties --- a/src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/dlight/Bundle_zh_CN.properties Sun Dec 06 23:38:29 2015 -0800 +++ b/src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/dlight/Bundle_zh_CN.properties Tue May 03 18:56:54 2016 -0700 @@ -5,4 +5,3 @@ - diff -r 19c1f5870837 -r 54b887ce3f12 src/zh_CN/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/support/Bundle_zh_CN.properties --- a/src/zh_CN/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/support/Bundle_zh_CN.properties Sun Dec 06 23:38:29 2015 -0800 +++ b/src/zh_CN/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/support/Bundle_zh_CN.properties Tue May 03 18:56:54 2016 -0700 @@ -49,3 +49,8 @@ #TITLE_Message=From {0}: TITLE_Message_Ex=\u6765\u81ea{0}: {1} +Authentication.gssapi-with-mic=GSS-API +Authentication.publickey=\u516c\u5171\u5bc6\u94a5 +Authentication.keyboard-interactive=Keyboard-interactive +Authentication.password=\u53e3\u4ee4 + diff -r 19c1f5870837 -r 54b887ce3f12 src/zh_CN/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/support/ui/Bundle_zh_CN.properties --- a/src/zh_CN/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/support/ui/Bundle_zh_CN.properties Sun Dec 06 23:38:29 2015 -0800 +++ b/src/zh_CN/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/support/ui/Bundle_zh_CN.properties Tue May 03 18:56:54 2016 -0700 @@ -110,6 +110,7 @@ AuthTypeSelectorDlg.jPanel1.border.title=\u63cf\u8ff0: AuthenticationSettingsPanel.validationError.isDirectory.text={0} \u662f\u4e00\u4e2a\u76ee\u5f55 AuthenticationSettingsPanel.validationError.emptyKey.text=\u5fc5\u987b\u63d0\u4f9b\u4e00\u4e2a\u5177\u6709 SSH \u79c1\u6709\u5bc6\u94a5\u7684\u6587\u4ef6\u8def\u5f84\u6216\u4f7f\u7528\u53e3\u4ee4\u9a8c\u8bc1 +AuthenticationSettingsPanel.validationError.emptyMethodList.text=\u672a\u9009\u62e9\u9a8c\u8bc1\u65b9\u6cd5 AuthenticationSettingsPanel.validationError.invalidKey.text=\u6587\u4ef6{0}\u7684\u5185\u5bb9\u4e0d\u662f\u6709\u6548\u7684 SSH \u79c1\u6709\u5bc6\u94a5 AuthenticationSettingsPanel.validationError.fileNotFound.text=\u627e\u4e0d\u5230\u6587\u4ef6{0} AuthenticationSettingsPanel.validationError.fileNotReadable.text=\u65e0\u6cd5\u8bfb\u53d6{0} @@ -123,4 +124,28 @@ SSHKeyFileChooser.DialogTitle.text=\u9009\u62e9 SSH \u5bc6\u94a5\u6587\u4ef6 SSHKeyFileChooser.SSHKeyFileType.text=SSH \u79c1\u6709\u5bc6\u94a5\u6587\u4ef6 +AuthenticationSettingsPanel.connectionSettings.text=\u8fde\u63a5\u8bbe\u7f6e(&S) +AuthenticationSettingsPanel.preferredAuthenticationsLabel.text=\u9996\u9009\u9a8c\u8bc1(&F): +AuthenticationSettingsPanel.upButton.text=\u4e0a\u79fb(&U) +AuthenticationSettingsPanel.downButton.text=\u4e0b\u79fb(&D) +AuthenticationSettingsPanel.timeoutLabel.text=\u8d85\u65f6(&T): +AuthenticationSettingsPanel.downButton.toolTipText=\u4e0b\u79fb +AuthenticationSettingsPanel.connectionSettings.AccessibleContext.accessibleName=\u8fde\u63a5\u8bbe\u7f6e +AuthenticationSettingsPanel.connectionSettings.AccessibleContext.accessibleDescription=\u5176\u4ed6\u8fde\u63a5\u8bbe\u7f6e +AuthenticationSettingsPanel.preferredAuthenticationsLabel.AccessibleContext.accessibleName=\u9996\u9009\u9a8c\u8bc1 +AuthenticationSettingsPanel.preferredAuthenticationsLabel.AccessibleContext.accessibleDescription=\u9996\u9009\u9a8c\u8bc1\u987a\u5e8f +AuthenticationSettingsPanel.upButton.AccessibleContext.accessibleName=\u4e0a\u79fb +AuthenticationSettingsPanel.upButton.AccessibleContext.accessibleDescription=\u5411\u4e0a\u79fb\u52a8\u9a8c\u8bc1 +AuthenticationSettingsPanel.downButton.AccessibleContext.accessibleName=\u4e0b\u79fb +AuthenticationSettingsPanel.downButton.AccessibleContext.accessibleDescription=\u5411\u4e0b\u79fb\u52a8\u9a8c\u8bc1 +AuthenticationSettingsPanel.timeoutLabel.AccessibleContext.accessibleName=\u8d85\u65f6 +AuthenticationSettingsPanel.timeoutLabel.AccessibleContext.accessibleDescription=\u8fde\u63a5\u8d85\u65f6 +AuthenticationSettingsPanel.timeoutSpinner.AccessibleContext.accessibleName=\u8d85\u65f6 +AuthenticationSettingsPanel.timeoutSpinner.AccessibleContext.accessibleDescription=\u8fde\u63a5\u8d85\u65f6 +AuthenticationSettingsPanel.connectionSettings.toolTipText=\u5176\u4ed6\u8fde\u63a5\u8bbe\u7f6e +AuthenticationSettingsPanel.timeoutLabel.toolTipText=\u8fde\u63a5\u8d85\u65f6 +AuthenticationSettingsPanel.preferredAuthenticationsLabel.toolTipText=\u9996\u9009\u9a8c\u8bc1\u987a\u5e8f +AuthenticationSettingsPanel.upButton.toolTipText=\u4e0a\u79fb +AuthenticationSettingsPanel.authenticationsList.toolTipText=\u9996\u9009\u9a8c\u8bc1\u987a\u5e8f +AuthenticationSettingsPanel.timeoutSpinner.toolTipText=\u8fde\u63a5\u8d85\u65f6