1.1 --- 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
1.2 +++ 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
1.3 @@ -43,6 +43,6 @@
1.4 <title>インライン・テンプレート・ファイル</title>
1.5 </head>
1.6 <body>
1.7 - インライン・テンプレート・ファイル(Oracle Solaris Studioでサポート)
1.8 + インライン・テンプレート・ファイル(Oracle Developer Studioでサポート)
1.9 </body>
1.10 </html>
2.1 --- 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
2.2 +++ 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
2.3 @@ -284,13 +284,13 @@
2.4 #
2.5 # StartDebuggerPanel
2.6 #
2.7 -TITLE_StartNewSession=\u65b0\u3057\u3044\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u958b\u59cb
2.8 +TITLE_StartNewSession=\u65b0\u898f\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u958b\u59cb
2.9 # {0} description of program already being debugged
2.10 # {1} name of host program is being debugged on
2.11 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
2.12 -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
2.13 +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
2.14
2.15 -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
2.16 +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
2.17 CTL_FinishAndStart=\u65e2\u5b58\u306e\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u518d\u5229\u7528
2.18
2.19 ACSD_FinishAndStart=\u65e2\u5b58\u306e\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u518d\u5229\u7528
3.1 --- 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
3.2 +++ 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
3.3 @@ -157,7 +157,7 @@
3.4 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)
3.5 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)
3.6
3.7 -LABEL_mt_sync_tracking=\u540c\u671f\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u3092\u8ffd\u8de1
3.8 +LABEL_mt_sync_tracking=\u540c\u671f\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u3092\u30c8\u30e9\u30c3\u30ad\u30f3\u30b0
3.9 ACSD_mt_sync_tracking=\u30aa\u30f3
3.10
3.11 LABEL_dbx_init_file=Dbx\u521d\u671f\u5316\u30d5\u30a1\u30a4\u30eb
3.12 @@ -334,8 +334,8 @@
3.13
3.14 LABEL_save_watches=\u30a6\u30a9\u30c3\u30c1\u306e\u4fdd\u5b58\u3068\u5fa9\u5143
3.15
3.16 -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
3.17 -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
3.18 +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
3.19 +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
3.20
3.21 ACSD_session_reuse_on=\u30aa\u30f3
3.22 ACSD_session_reuse_off=\u30aa\u30d5
4.1 --- 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
4.2 +++ 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
4.3 @@ -87,8 +87,8 @@
4.4 BUILD_LABEL=\u30d3\u30eb\u30c9
4.5 BUILD_REMOTE_LABEL=\u30d3\u30eb\u30c9 - {0}
4.6
4.7 -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
4.8 -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
4.9 +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
4.10 +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
4.11 RUN_PROJECT_CREATOR=\u30db\u30b9\u30c8{0}\u3067\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u4f5c\u6210\u4e2d...
4.12 CONFIGURING_PROJECT_CREATOR=\u30db\u30b9\u30c8{0}\u3067\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u69cb\u6210\u4e2d...
4.13
5.1 --- 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
5.2 +++ 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
5.3 @@ -9,6 +9,6 @@
5.4 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
5.5 </head>
5.6 <BODY>
5.7 - 円周率を計算する5つの異なる実装。Oracle Solaris Studioコンパイラでのみ機能する構成もあります。
5.8 + 円周率を計算する5つの異なる実装。Oracle Developer Studioコンパイラでのみ機能する構成もあります。
5.9 </BODY>
5.10 </HTML>
6.1 --- 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
6.2 +++ 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
6.3 @@ -354,6 +354,8 @@
6.4 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
6.5 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
6.6 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
6.7 +SelectModeError7="{0}"\u306f\u5b58\u5728\u3057\u307e\u305b\u3093
6.8 +SelectModeError8="{0}"\u306f\u7d76\u5bfe\u30d1\u30b9\u3067\u306f\u3042\u308a\u307e\u305b\u3093
6.9 CleanInfoMessageSimpleMode=<b>\u6d88\u53bb</b>\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
6.10 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
6.11 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
6.12 @@ -442,7 +444,7 @@
6.13 MSG_LocalProjectAlreadyExists=\u30ed\u30fc\u30ab\u30eb\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8{0}\u306f\u3059\u3067\u306b\u5b58\u5728\u3057\u307e\u3059
6.14 SelectBinaryPanelVisual.cancelSearch.text=\u691c\u7d22\u306e\u505c\u6b62(&O)
6.15
6.16 -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
6.17 +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
6.18 PanelProjectLocationVisual.Validating_Wizard=\u691c\u67fb\u4e2d...
6.19
6.20 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
7.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
7.2 +++ 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
7.3 @@ -0,0 +1,49 @@
7.4 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
7.5 +#
7.6 +# Copyright 2015 Oracle and/or its affiliates. All rights reserved.
7.7 +#
7.8 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
7.9 +# Other names may be trademarks of their respective owners.
7.10 +#
7.11 +# The contents of this file are subject to the terms of either the GNU
7.12 +# General Public License Version 2 only ("GPL") or the Common
7.13 +# Development and Distribution License("CDDL") (collectively, the
7.14 +# "License"). You may not use this file except in compliance with the
7.15 +# License. You can obtain a copy of the License at
7.16 +# http://www.netbeans.org/cddl-gplv2.html
7.17 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
7.18 +# specific language governing permissions and limitations under the
7.19 +# License. When distributing the software, include this License Header
7.20 +# Notice in each file and include the License file at
7.21 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
7.22 +# particular file as subject to the "Classpath" exception as provided
7.23 +# by Oracle in the GPL Version 2 section of the License file that
7.24 +# accompanied this code. If applicable, add the following below the
7.25 +# License Header, with the fields enclosed by brackets [] replaced by
7.26 +# your own identifying information:
7.27 +# "Portions Copyrighted [year] [name of copyright owner]"
7.28 +#
7.29 +# If you wish your version of this file to be governed by only the CDDL
7.30 +# or only the GPL Version 2, indicate your decision by adding
7.31 +# "[Contributor] elects to include this software in this distribution
7.32 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
7.33 +# single choice of license, a recipient has the option to distribute
7.34 +# your version of this file under either the CDDL, the GPL Version 2 or
7.35 +# to extend the choice of license to its licensees as provided above.
7.36 +# However, if you add GPL Version 2 code and therefore, elected the GPL
7.37 +# Version 2 license, then the option applies only if the new code is
7.38 +# made subject to such option by the copyright holder.
7.39 +#
7.40 +# Contributor(s):
7.41 +#
7.42 +# Portions Copyrighted 2015 Sun Microsystems, Inc.
7.43 +
7.44 +#Debug strings, NOI18N
7.45 +NULL_PATH=\u30c7\u30a3\u30ec\u30af\u30c6\u30a3\u30d6"{0}"\u306e\u672a\u89e3\u6c7a\u306e\u30d1\u30b9\u3002
7.46 +UNRESOLVED_FILE_OWNER="{0}"\u306e\u672a\u89e3\u6c7a\u306e\u30d5\u30a1\u30a4\u30eb\u6240\u6709\u8005\u3002
7.47 +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
7.48 +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
7.49 +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
7.50 +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
7.51 +
7.52 +
8.1 --- 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
8.2 +++ 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
8.3 @@ -7,9 +7,9 @@
8.4 IntroduceVariable.description=\u5909\u6570\u3092\u5c0e\u5165
8.5 FIX_IntroduceVariable=\u5909\u6570\u3092\u5c0e\u5165
8.6
8.7 -AssignVariable.name=\u65b0\u3057\u3044\u5909\u6570\u306b\u623b\u308a\u5024\u3092\u5272\u5f53\u3066
8.8 -AssignVariable.description=\u65b0\u3057\u3044\u5909\u6570\u306b\u623b\u308a\u5024\u3092\u5272\u5f53\u3066
8.9 -FIX_AssignResultToVariable=\u65b0\u3057\u3044\u5909\u6570\u306b\u623b\u308a\u5024\u3092\u5272\u5f53\u3066
8.10 +AssignVariable.name=\u65b0\u898f\u5909\u6570\u306b\u623b\u308a\u5024\u3092\u5272\u5f53\u3066
8.11 +AssignVariable.description=\u65b0\u898f\u5909\u6570\u306b\u623b\u308a\u5024\u3092\u5272\u5f53\u3066
8.12 +FIX_AssignResultToVariable=\u65b0\u898f\u5909\u6570\u306b\u623b\u308a\u5024\u3092\u5272\u5f53\u3066
8.13
8.14 AddMissingCases.name=\u6b20\u843d\u3057\u3066\u3044\u308bCase\u53e5\u306e\u8ffd\u52a0
8.15 AddMissingCases.description=\u6b20\u843d\u3057\u3066\u3044\u308bCase\u53e5\u306e\u8ffd\u52a0
9.1 --- 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
9.2 +++ 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
9.3 @@ -91,8 +91,8 @@
9.4 # NewMakeProjectWizardIterator
9.5 LAB_IteratorName={0}/{1}
9.6
9.7 -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
9.8 -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
9.9 +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
9.10 +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
9.11 RUN_PROJECT_CREATOR=\u30db\u30b9\u30c8{0}\u3067\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u4f5c\u6210\u4e2d...
9.12 CONFIGURING_PROJECT_CREATOR=\u30db\u30b9\u30c8{0}\u3067\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u69cb\u6210\u4e2d...
9.13
10.1 --- 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
10.2 +++ 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
10.3 @@ -130,5 +130,5 @@
10.4 EditPathMapDialog.restore.text=\u30c7\u30d5\u30a9\u30eb\u30c8\u306b\u623b\u3059(&R)
10.5 HostPropertiesDialog.errorLabel.text=\u30a8\u30e9\u30fc
10.6 HostPropertiesDialog.serverRecordPanel.border.title=\u305d\u306e\u4ed6
10.7 -HostPropertiesDialog.cbACL.text=ACL\u30d9\u30fc\u30b9\u306e\u30ea\u30e2\u30fc\u30c8\u30fb\u30d5\u30a1\u30a4\u30eb\u6a29\u9650\u306e\u78ba\u8a8d(&C)
10.8 +HostPropertiesDialog.cbACL.text=ACL\u30d9\u30fc\u30b9\u306e\u30ea\u30e2\u30fc\u30c8\u30fb\u30d5\u30a1\u30a4\u30eb\u6a29\u9650\u306e\u78ba\u8a8d(&L)
10.9
11.1 --- a/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/remote/ui/Bundle_ja.properties Sun Dec 06 23:38:29 2015 -0800
11.2 +++ b/src/ja/cnd/cnd-remote/cnd-remote/org/netbeans/modules/remote/ui/Bundle_ja.properties Tue May 03 18:56:54 2016 -0700
11.3 @@ -1,5 +1,6 @@
11.4 LBL_HostRootNode=C/C++\u30d3\u30eb\u30c9\u30fb\u30db\u30b9\u30c8
11.5 AddHostMenuItem=\u65b0\u898f\u30db\u30b9\u30c8\u306e\u8ffd\u52a0...
11.6 +AddNewHostAction=\u65b0\u898f\u30db\u30b9\u30c8\u306e\u8ffd\u52a0
11.7 RemoveHostMenuItem=\u30db\u30b9\u30c8\u3092\u524a\u9664(%R)
11.8 RemoveHostCaption=\u30db\u30b9\u30c8\u3092\u524a\u9664
11.9 RemoveHostQuestion=\u672c\u5f53\u306b{0}\u3092\u4e00\u89a7\u304b\u3089\u524a\u9664\u3057\u307e\u3059\u304b?
12.1 --- 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
12.2 +++ 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
12.3 @@ -128,9 +128,9 @@
12.4
12.5 # PlatformTypePanel
12.6 LBL_PlatformTypePanel=Makefile\u30bf\u30a4\u30d7\u3068\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u3092\u9078\u629e
12.7 -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
12.8 +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
12.9 LBL_CompilerType=\u4f7f\u7528\u3059\u308b\u30b3\u30f3\u30d1\u30a4\u30e9\u30fb\u30bb\u30c3\u30c8\u3092\u9078\u629e:
12.10 -RB_CompilerTypeSun=Oracle Solaris Studio\u30b3\u30f3\u30d1\u30a4\u30e9
12.11 +RB_CompilerTypeSun=Oracle Developer Studio\u30b3\u30f3\u30d1\u30a4\u30e9
12.12
12.13 RB_CompilerTypeGNU=GNU\u30b3\u30f3\u30d1\u30a4\u30e9
12.14
12.15 @@ -147,8 +147,8 @@
12.16
12.17 # CompilerTypePanel and PlatformTypePanel
12.18 LBL_CompilerTypePanel=Makefile\u30bf\u30a4\u30d7\u3092\u9078\u629e
12.19 -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
12.20 -RB_CompilerTypeBoth=Oracle Solaris Studio\u304a\u3088\u3073GNU\u30b3\u30f3\u30d1\u30a4\u30e9
12.21 +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
12.22 +RB_CompilerTypeBoth=Oracle Developer Studio\u304a\u3088\u3073GNU\u30b3\u30f3\u30d1\u30a4\u30e9
12.23
12.24
12.25
12.26 @@ -200,7 +200,7 @@
12.27 TB_DynamicLib=\u52d5\u7684\u30ea\u30f3\u30af(-ldl)
12.28 TB_Curses=Curses: CRT\u753b\u9762\u306e\u5236\u5fa1(-lcurses)
12.29 TB_RWTools=RW Tools++ (-library=rwtools7,iostream)
12.30 -TB_PerfLib=Oracle Solaris Studio\u30d1\u30d5\u30a9\u30fc\u30de\u30f3\u30b9\u30fb\u30e9\u30a4\u30d6\u30e9\u30ea(-xlic_lib=sunperf)
12.31 +TB_PerfLib=Oracle Developer Studio\u30d1\u30d5\u30a9\u30fc\u30de\u30f3\u30b9\u30fb\u30e9\u30a4\u30d6\u30e9\u30ea(-xlic_lib=sunperf)
12.32
12.33
12.34
13.1 --- a/src/ja/cnd/cnd-toolchain/cnd-toolchain/org/netbeans/modules/cnd/toolchain/Bundle_ja.properties Sun Dec 06 23:38:29 2015 -0800
13.2 +++ b/src/ja/cnd/cnd-toolchain/cnd-toolchain/org/netbeans/modules/cnd/toolchain/Bundle_ja.properties Tue May 03 18:56:54 2016 -0700
13.3 @@ -1,8 +1,8 @@
13.4 OpenIDE-Module-Display-Category=C/C++
13.5 OpenIDE-Module-Name=C/C++\u30c4\u30fc\u30eb\u30fb\u30b3\u30ec\u30af\u30b7\u30e7\u30f3
13.6 -CND/ToolChains/OSS_solaris-sparc=Oracle Solaris Studio
13.7 -CND/ToolChains/OSS_solaris-x86_linux=Oracle Solaris Studio
13.8 -CND/ToolChains/OSS_linuxCompatGNU=GNU\u4e92\u63db\u30e2\u30fc\u30c9\u306eOracle Solaris Studio
13.9 +CND/ToolChains/OSS_solaris-sparc=Oracle Developer Studio
13.10 +CND/ToolChains/OSS_solaris-x86_linux=Oracle Developer Studio
13.11 +CND/ToolChains/OSS_linuxCompatGNU=GNU\u4e92\u63db\u30e2\u30fc\u30c9\u306eOracle Developer Studio
13.12 CND/ToolChains/OSS_5.13_solaris-sparc={Oracle Solaris Studio 12.4}
13.13 CND/ToolChains/OSS_5.13_solaris-x86_linux={Oracle Solaris Studio 12.4}
13.14 CND/ToolChains/OSS_5.13_linuxCompatGNU=GNU\u4e92\u63db\u30e2\u30fc\u30c9\u306e{Oracle Solaris Studio 12.4}
13.15 @@ -19,8 +19,7 @@
13.16 CND/ToolChains/SunStudio_10=Sun Studio 10
13.17 CND/ToolChains/SunStudio_9=Sun Studio 9
13.18 CND/ToolChains/SunStudio_8=Sun Studio 8
13.19 -CND/ToolChains/SunStudio=Sun Studio
13.20 -CND/ToolChains/OracleSolarisStudio=Oracle Solaris Studio
13.21 +CND/ToolChains/OracleDeveloperStudio=Oracle Developer Studio
13.22 CND/ToolChains/Cygwin=GNU Cygwin
13.23 CND/ToolChains/MinGW=GNU MinGW
13.24 CND/ToolChains/MinGW_TDM=GNU MinGW TDM
14.1 --- 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
14.2 +++ 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
14.3 @@ -116,7 +116,7 @@
14.4 LBL_SetTrackingAction_PopupName=\u30c8\u30e9\u30c3\u30af\u6e08\u5206\u5c90\u306e\u8a2d\u5b9a...
14.5 # {0} - branch name
14.6 # {1} - tracked branch name
14.7 -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
14.8 +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
14.9 # {0} - branch name
14.10 # {1} - tracked branch name
14.11 MSG_SyncBranchAction.result=\u5206\u5c90{0}\u3092{1}\u3068\u540c\u671f\u3057\u3066\u3044\u307e\u3059\n
14.12 @@ -137,5 +137,5 @@
14.13 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
14.14 # {0} - branch name
14.15 # {1} - tracked branch name
14.16 -SelectTrackedBranchPanel.info=\u5206\u5c90"{0}"\u304c\u5206\u5c90"{1}"\u306e\u8ffd\u8de1\u3092\u958b\u59cb\u3057\u307e\u3059
14.17 +SelectTrackedBranchPanel.info=\u5206\u5c90"{0}"\u304c\u5206\u5c90"{1}"\u306e\u30c8\u30e9\u30c3\u30ad\u30f3\u30b0\u3092\u958b\u59cb\u3057\u307e\u3059
14.18
15.1 --- 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
15.2 +++ 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
15.3 @@ -63,8 +63,8 @@
15.4 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)
15.5 # translation hint - HEAD is a git specific term for last revisition in repository, do not translate this word
15.6 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)
15.7 -RevertChangesPanel.removeAllNewCheckBox.text=\u65b0\u3057\u3044\u30d5\u30a1\u30a4\u30eb\u3068\u30d5\u30a9\u30eb\u30c0\u3082\u524a\u9664\u3059\u308b(&I)
15.8 -RevertChangesPanel.removeWTNewCheckBox.text=\u65b0\u3057\u3044\u30d5\u30a1\u30a4\u30eb\u3068\u30d5\u30a9\u30eb\u30c0\u3082\u524a\u9664\u3059\u308b(&O)
15.9 +RevertChangesPanel.removeAllNewCheckBox.text=\u65b0\u898f\u30d5\u30a1\u30a4\u30eb\u3068\u30d5\u30a9\u30eb\u30c0\u3082\u524a\u9664\u3059\u308b(&I)
15.10 +RevertChangesPanel.removeWTNewCheckBox.text=\u65b0\u898f\u30d5\u30a1\u30a4\u30eb\u3068\u30d5\u30a9\u30eb\u30c0\u3082\u524a\u9664\u3059\u308b(&O)
15.11 LBL_CheckoutRevisionAction_Name=\u30ea\u30d3\u30b8\u30e7\u30f3\u306e\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8(&R)...
15.12 LBL_CheckoutRevisionAction_PopupName=\u30ea\u30d3\u30b8\u30e7\u30f3\u306e\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8...
15.13 LBL_CheckoutRevision.OKButton.text=\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8(&C)
15.14 @@ -73,7 +73,7 @@
15.15 LBL_Progress.RefreshingStatuses = \u30b9\u30c6\u30fc\u30bf\u30b9\u3092\u30ea\u30d5\u30ec\u30c3\u30b7\u30e5\u3057\u3066\u3044\u307e\u3059...
15.16 CheckoutRevisionPanel.jLabel2.text=\u5206\u5c90\u540d(&N):
15.17
15.18 -CheckoutRevisionPanel.cbCheckoutAsNewBranch.text=\u65b0\u3057\u3044\u5206\u5c90\u3068\u3057\u3066\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8(&B)
15.19 +CheckoutRevisionPanel.cbCheckoutAsNewBranch.text=\u65b0\u898f\u5206\u5c90\u3068\u3057\u3066\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8(&B)
15.20 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
15.21 MSG_CheckoutRevisionAction.branchCreated = \u5206\u5c90\u304c\u4f5c\u6210\u3055\u308c\u307e\u3057\u305f\n\u540d\u524d: {0}\n\u5143: {1}\nID: {2}
15.22 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
16.1 --- 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
16.2 +++ 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
16.3 @@ -44,7 +44,7 @@
16.4 CTL_PushAction.report.pullButton.text=\u5909\u66f4\u306e\u30d7\u30eb(&P)
16.5 LBL_Push.createNewBranch=\u65b0\u898f\u5206\u5c90\u3092\u4f5c\u6210\u3057\u307e\u3059\u304b\u3002
16.6 LBL_Push.pushToUpstreamFailed=\u30a2\u30c3\u30d7\u30b9\u30c8\u30ea\u30fc\u30e0\u3078\u306e\u30d7\u30c3\u30b7\u30e5\u306b\u5931\u6557\u3057\u307e\u3057\u305f
16.7 -LBL_Push.setupTracking=\u30ea\u30e2\u30fc\u30c8\u8ffd\u8de1\u3092\u8a2d\u5b9a\u3057\u307e\u3059\u304b\u3002
16.8 +LBL_Push.setupTracking=\u30ea\u30e2\u30fc\u30c8\u30fb\u30c8\u30e9\u30c3\u30ad\u30f3\u30b0\u3092\u8a2d\u5b9a\u3057\u307e\u3059\u304b\u3002
16.9 # {0} - repository name
16.10 LBL_PushAction.progressName=\u30d7\u30c3\u30b7\u30e5\u3057\u3066\u3044\u307e\u3059 - {0}
16.11 LBL_PushAction.pullingChanges.finished=\u30ea\u30e2\u30fc\u30c8\u306e\u5909\u66f4\u304c\u30d7\u30eb\u3055\u308c\u307e\u3057\u305f
16.12 @@ -72,7 +72,7 @@
16.13 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
16.14 # {0} - remote branch name
16.15 # {1} - branch name
16.16 -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
16.17 +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
16.18 # {0} - branch name
16.19 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
16.20 MSG_PushAction.finalizing = \u30d5\u30a1\u30a4\u30ca\u30e9\u30a4\u30ba\u3057\u3066\u3044\u307e\u3059
16.21 @@ -86,7 +86,7 @@
16.22 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
16.23 # {0} - local branch name
16.24 # {1} - tracked branch name
16.25 -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
16.26 +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
16.27 # {0} - branch name
16.28 # {1} - branch head id
16.29 # {2} - result of the update
17.1 --- 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
17.2 +++ 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
17.3 @@ -42,9 +42,9 @@
17.4 LBL_FileSelector_Title=\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u9078\u629e
17.5 BK2022=\u505c\u6b62
17.6 # {0} - branch name
17.7 -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
17.8 +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
17.9 # {0} - branch name
17.10 -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
17.11 +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
17.12 # {0} - [history view]
17.13 # {1} - [diff]
17.14 MSG_LogUtils.updateBranch.actions=\u5909\u66f4\u3092{0}\u3067\u3001\u307e\u305f\u306f{1}\u3068\u3057\u3066\u8868\u793a\n
18.1 --- 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
18.2 +++ 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
18.3 @@ -125,7 +125,7 @@
18.4 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
18.5 MercurialPanel.cbInternalMergeToolEnabled.text=\u7af6\u5408\u306e\u89e3\u6c7a\u306b\u5185\u90e8\u30de\u30fc\u30b8\u30fb\u30c4\u30fc\u30eb\u3092\u4f7f\u7528(&I)
18.6 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
18.7 -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
18.8 +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
18.9 KW_Colors=\u8272
18.10 MercurialPanel.jLabel10.text=\u30d3\u30eb\u30c9\u30fb\u30db\u30b9\u30c8(&H):
18.11
19.1 --- 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
19.2 +++ 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
19.3 @@ -152,3 +152,4 @@
19.4 ACSD_revisionsComboBox=\u30b9\u30c8\u30ea\u30c3\u30d7\u3059\u308b\u30ea\u30d3\u30b8\u30e7\u30f3\u3092\u6307\u5b9a
19.5 ACSD_revisionsComboBoxBackout=\u53d6\u308a\u6d88\u3059\u30ea\u30d3\u30b8\u30e7\u30f3\u3092\u6307\u5b9a
19.6 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
19.7 +
20.1 --- 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
20.2 +++ 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
20.3 @@ -95,7 +95,7 @@
20.4 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)
20.5 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)
20.6 RevertModificationsPanel.doPurgeChxBox.text=\u65b0\u305f\u306b\u8ffd\u52a0\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb\u3068\u30d5\u30a9\u30eb\u30c0\u3092\u524a\u9664(&N)
20.7 -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
20.8 +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
20.9
20.10 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
20.11 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)
21.1 --- 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
21.2 +++ 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
21.3 @@ -57,7 +57,7 @@
21.4 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
21.5 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
21.6 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
21.7 -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
21.8 +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
21.9 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
21.10 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
21.11 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
22.1 --- 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
22.2 +++ 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
22.3 @@ -112,7 +112,7 @@
22.4 SvnOptionsPanel.cbOpenOutputWindow.text=\u51fa\u529b\u30a6\u30a3\u30f3\u30c9\u30a6\u306e\u30bf\u30d6\u3092\u81ea\u52d5\u7684\u306b\u958b\u304f(&W)
22.5 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
22.6 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
22.7 -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
22.8 +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
22.9 FileChooser.SvnExecutables.desc=SVN\u5b9f\u884c\u53ef\u80fd\u30d5\u30a1\u30a4\u30eb
22.10 FileChooser.SvnLibs.desc=SVN JavaHL\u30e9\u30a4\u30d6\u30e9\u30ea
22.11 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)
23.1 --- 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
23.2 +++ 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
23.3 @@ -43,6 +43,6 @@
23.4 <title>インライン・テンプレート・ファイル</title>
23.5 </head>
23.6 <body>
23.7 - インライン・テンプレート・ファイル(Oracle Solaris Studioでサポート)
23.8 + インライン・テンプレート・ファイル(Oracle Developer Studioでサポート)
23.9 </body>
23.10 </html>
24.1 --- 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
24.2 +++ 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
24.3 @@ -9,6 +9,6 @@
24.4 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
24.5 </head>
24.6 <BODY>
24.7 - 円周率を計算する5つの異なる実装。Oracle Solaris Studioコンパイラでのみ機能する構成もあります。
24.8 + 円周率を計算する5つの異なる実装。Oracle Developer Studioコンパイラでのみ機能する構成もあります。
24.9 </BODY>
24.10 </HTML>
25.1 --- 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
25.2 +++ 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
25.3 @@ -5,4 +5,3 @@
25.4
25.5
25.6
25.7 -
26.1 --- a/src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/support/Bundle_ja.properties Sun Dec 06 23:38:29 2015 -0800
26.2 +++ b/src/ja/ide/dlight-nativeexecution/dlight-nativeexecution/org/netbeans/modules/nativeexecution/support/Bundle_ja.properties Tue May 03 18:56:54 2016 -0700
26.3 @@ -49,3 +49,8 @@
26.4 #TITLE_Message=From {0}:
26.5 TITLE_Message_Ex={0}\u304b\u3089: {1}
26.6
26.7 +Authentication.gssapi-with-mic=GSS-API
26.8 +Authentication.publickey=\u516c\u958b\u9375
26.9 +Authentication.keyboard-interactive=\u30ad\u30fc\u30dc\u30fc\u30c9\u5bfe\u8a71\u578b
26.10 +Authentication.password=\u30d1\u30b9\u30ef\u30fc\u30c9
26.11 +
27.1 --- 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
27.2 +++ 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
27.3 @@ -110,6 +110,7 @@
27.4 AuthTypeSelectorDlg.jPanel1.border.title=\u8aac\u660e:
27.5 AuthenticationSettingsPanel.validationError.isDirectory.text={0}\u306f\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3067\u3059
27.6 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
27.7 +AuthenticationSettingsPanel.validationError.emptyMethodList.text=\u8a8d\u8a3c\u65b9\u6cd5\u304c\u9078\u629e\u3055\u308c\u3066\u3044\u307e\u305b\u3093
27.8 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
27.9 AuthenticationSettingsPanel.validationError.fileNotFound.text=\u30d5\u30a1\u30a4\u30eb{0}\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093
27.10 AuthenticationSettingsPanel.validationError.fileNotReadable.text={0}\u3092\u8aad\u307f\u8fbc\u3081\u307e\u305b\u3093
27.11 @@ -123,4 +124,28 @@
27.12
27.13 SSHKeyFileChooser.DialogTitle.text=SSH\u9375\u30d5\u30a1\u30a4\u30eb\u3092\u9078\u629e
27.14 SSHKeyFileChooser.SSHKeyFileType.text=SSH\u79d8\u5bc6\u9375\u30d5\u30a1\u30a4\u30eb
27.15 +AuthenticationSettingsPanel.connectionSettings.text=\u63a5\u7d9a\u8a2d\u5b9a(&S)
27.16 +AuthenticationSettingsPanel.preferredAuthenticationsLabel.text=\u512a\u5148\u8a8d\u8a3c(&F):
27.17 +AuthenticationSettingsPanel.upButton.text=\u4e0a(&U)
27.18 +AuthenticationSettingsPanel.downButton.text=\u4e0b(&D)
27.19 +AuthenticationSettingsPanel.timeoutLabel.text=\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8(&T):
27.20 +AuthenticationSettingsPanel.downButton.toolTipText=\u4e0b\u3078\u79fb\u52d5
27.21 +AuthenticationSettingsPanel.connectionSettings.AccessibleContext.accessibleName=\u63a5\u7d9a\u8a2d\u5b9a
27.22 +AuthenticationSettingsPanel.connectionSettings.AccessibleContext.accessibleDescription=\u8ffd\u52a0\u306e\u63a5\u7d9a\u8a2d\u5b9a
27.23 +AuthenticationSettingsPanel.preferredAuthenticationsLabel.AccessibleContext.accessibleName=\u512a\u5148\u8a8d\u8a3c
27.24 +AuthenticationSettingsPanel.preferredAuthenticationsLabel.AccessibleContext.accessibleDescription=\u512a\u5148\u8a8d\u8a3c\u9806\u5e8f
27.25 +AuthenticationSettingsPanel.upButton.AccessibleContext.accessibleName=\u4e0a
27.26 +AuthenticationSettingsPanel.upButton.AccessibleContext.accessibleDescription=\u8a8d\u8a3c\u3092\u4e0a\u306b\u79fb\u52d5
27.27 +AuthenticationSettingsPanel.downButton.AccessibleContext.accessibleName=\u4e0b
27.28 +AuthenticationSettingsPanel.downButton.AccessibleContext.accessibleDescription=\u8a8d\u8a3c\u3092\u4e0b\u306b\u79fb\u52d5
27.29 +AuthenticationSettingsPanel.timeoutLabel.AccessibleContext.accessibleName=\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8
27.30 +AuthenticationSettingsPanel.timeoutLabel.AccessibleContext.accessibleDescription=\u63a5\u7d9a\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8
27.31 +AuthenticationSettingsPanel.timeoutSpinner.AccessibleContext.accessibleName=\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8
27.32 +AuthenticationSettingsPanel.timeoutSpinner.AccessibleContext.accessibleDescription=\u63a5\u7d9a\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8
27.33 +AuthenticationSettingsPanel.connectionSettings.toolTipText=\u8ffd\u52a0\u306e\u63a5\u7d9a\u8a2d\u5b9a
27.34 +AuthenticationSettingsPanel.timeoutLabel.toolTipText=\u63a5\u7d9a\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8
27.35 +AuthenticationSettingsPanel.preferredAuthenticationsLabel.toolTipText=\u512a\u5148\u8a8d\u8a3c\u9806\u5e8f
27.36 +AuthenticationSettingsPanel.upButton.toolTipText=\u4e0a\u306b\u79fb\u52d5
27.37 +AuthenticationSettingsPanel.authenticationsList.toolTipText=\u512a\u5148\u8a8d\u8a3c\u9806\u5e8f
27.38 +AuthenticationSettingsPanel.timeoutSpinner.toolTipText=\u63a5\u7d9a\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8
27.39
28.1 --- 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
28.2 +++ 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
28.3 @@ -2,8 +2,8 @@
28.4 CTL_RemoteTerminalAction=\u30ea\u30e2\u30fc\u30c8\u30fb\u30bf\u30fc\u30df\u30ca\u30eb
28.5 RemoteConnectionTitle=SSH\u63a5\u7d9a
28.6 TerminalAction.FailedToStart.text=\u30bf\u30fc\u30df\u30ca\u30eb\u306e\u8d77\u52d5\u306b\u5931\u6557\u3057\u307e\u3057\u305f: {0}
28.7 -RemoteTerminalShortDescr=\u65b0\u3057\u3044\u30ea\u30e2\u30fc\u30c8\u30fb\u30bf\u30fc\u30df\u30ca\u30eb\u30fb\u30bf\u30d6\u3092\u4f5c\u6210
28.8 -LocalTerminalShortDescr=\u65b0\u3057\u3044\u30ed\u30fc\u30ab\u30eb\u30fb\u30bf\u30fc\u30df\u30ca\u30eb\u30fb\u30bf\u30d6\u3092\u4f5c\u6210
28.9 +RemoteTerminalShortDescr=\u65b0\u898f\u30ea\u30e2\u30fc\u30c8\u30fb\u30bf\u30fc\u30df\u30ca\u30eb\u30fb\u30bf\u30d6\u3092\u4f5c\u6210
28.10 +LocalTerminalShortDescr=\u65b0\u898f\u30ed\u30fc\u30ab\u30eb\u30fb\u30bf\u30fc\u30df\u30ca\u30eb\u30fb\u30bf\u30d6\u3092\u4f5c\u6210
28.11 TerminalOptionsShortDescr=\u30bf\u30fc\u30df\u30ca\u30eb\u306e\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u958b\u304d\u307e\u3059
28.12 CTL_ShowTerminalAction=\u30bf\u30fc\u30df\u30ca\u30eb(&E)
28.13 ShowTerminalShortDescr=\u30bf\u30fc\u30df\u30ca\u30eb\u30fb\u30a6\u30a3\u30f3\u30c9\u30a6\u3092\u958b\u304f
29.1 --- 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
29.2 +++ 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
29.3 @@ -43,6 +43,6 @@
29.4 <title>内联模板文件</title>
29.5 </head>
29.6 <body>
29.7 - 内联模板文件 (在 Oracle Solaris Studio 中受支持)
29.8 + 内联模板文件 (在 Oracle Developer Studio 中受支持)
29.9 </body>
29.10 </html>
30.1 --- 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
30.2 +++ 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
30.3 @@ -87,8 +87,8 @@
30.4 BUILD_LABEL=\u6784\u5efa
30.5 BUILD_REMOTE_LABEL=\u6784\u5efa - {0}
30.6
30.7 -ERROR_FIND_PROJECT_CREATOR=\u5728\u4e3b\u673a{0}\u4e0a\u627e\u4e0d\u5230 Oracle Solaris Studio 12.3 \u6216\u66f4\u9ad8\u7248\u672c\u3002
30.8 -ERROR_RUN_PROJECT_CREATOR=\u65e0\u6cd5\u5728\u4e3b\u673a{0}\u4e0a\u8fd0\u884c Oracle Solaris Studio 12.3 \u6216\u66f4\u9ad8\u7248\u672c\u3002
30.9 +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
30.10 +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
30.11 RUN_PROJECT_CREATOR=\u6b63\u5728\u4e3b\u673a{0}\u4e0a\u521b\u5efa\u9879\u76ee...
30.12 CONFIGURING_PROJECT_CREATOR=\u6b63\u5728\u4e3b\u673a{0}\u4e0a\u914d\u7f6e\u9879\u76ee...
30.13
31.1 --- 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
31.2 +++ 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
31.3 @@ -9,6 +9,6 @@
31.4 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
31.5 </head>
31.6 <BODY>
31.7 - 计算 Pi 的五种不同的实现方式。某些配置可能仅适用于 Oracle Solaris Studio 编译器。
31.8 + 计算 Pi 的五种不同的实现方式。某些配置可能仅适用于 Oracle Developer Studio 编译器。
31.9 </BODY>
31.10 </HTML>
32.1 --- 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
32.2 +++ 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
32.3 @@ -354,6 +354,8 @@
32.4 SelectModeError4=\u6587\u4ef6\u5939 "{0}" \u5df2\u7528\u4f5c NetBeans \u9879\u76ee\u6587\u4ef6\u5939
32.5 SelectModeError5=\u5728\u6587\u4ef6\u5939 "{0}" \u4e2d\u627e\u4e0d\u5230 makefile \u6216\u914d\u7f6e\u811a\u672c
32.6 SelectModeError6=\u9879\u76ee\u4e0d\u80fd\u4f4d\u4e8e\u6587\u4ef6\u7cfb\u7edf\u6839\u76ee\u5f55\u4e2d
32.7 +SelectModeError7="{0}" \u4e0d\u5b58\u5728
32.8 +SelectModeError8="{0}" \u4e0d\u662f\u7edd\u5bf9\u8def\u5f84
32.9 CleanInfoMessageSimpleMode=\u8bf7\u6ce8\u610f, \u5c06\u81ea\u52a8\u8fd0\u884c<b>\u6e05\u7406</b>\u548c\u201c\u6784\u5efa\u201d\u64cd\u4f5c
32.10 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
32.11 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
32.12 @@ -442,7 +444,7 @@
32.13 MSG_LocalProjectAlreadyExists=\u672c\u5730\u9879\u76ee{0}\u5df2\u5b58\u5728
32.14 SelectBinaryPanelVisual.cancelSearch.text=\u505c\u6b62\u641c\u7d22(&O)
32.15
32.16 -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
32.17 +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
32.18 PanelProjectLocationVisual.Validating_Wizard=\u6b63\u5728\u9a8c\u8bc1...
32.19
32.20 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
33.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
33.2 +++ 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
33.3 @@ -0,0 +1,49 @@
33.4 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
33.5 +#
33.6 +# Copyright 2015 Oracle and/or its affiliates. All rights reserved.
33.7 +#
33.8 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
33.9 +# Other names may be trademarks of their respective owners.
33.10 +#
33.11 +# The contents of this file are subject to the terms of either the GNU
33.12 +# General Public License Version 2 only ("GPL") or the Common
33.13 +# Development and Distribution License("CDDL") (collectively, the
33.14 +# "License"). You may not use this file except in compliance with the
33.15 +# License. You can obtain a copy of the License at
33.16 +# http://www.netbeans.org/cddl-gplv2.html
33.17 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
33.18 +# specific language governing permissions and limitations under the
33.19 +# License. When distributing the software, include this License Header
33.20 +# Notice in each file and include the License file at
33.21 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
33.22 +# particular file as subject to the "Classpath" exception as provided
33.23 +# by Oracle in the GPL Version 2 section of the License file that
33.24 +# accompanied this code. If applicable, add the following below the
33.25 +# License Header, with the fields enclosed by brackets [] replaced by
33.26 +# your own identifying information:
33.27 +# "Portions Copyrighted [year] [name of copyright owner]"
33.28 +#
33.29 +# If you wish your version of this file to be governed by only the CDDL
33.30 +# or only the GPL Version 2, indicate your decision by adding
33.31 +# "[Contributor] elects to include this software in this distribution
33.32 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
33.33 +# single choice of license, a recipient has the option to distribute
33.34 +# your version of this file under either the CDDL, the GPL Version 2 or
33.35 +# to extend the choice of license to its licensees as provided above.
33.36 +# However, if you add GPL Version 2 code and therefore, elected the GPL
33.37 +# Version 2 license, then the option applies only if the new code is
33.38 +# made subject to such option by the copyright holder.
33.39 +#
33.40 +# Contributor(s):
33.41 +#
33.42 +# Portions Copyrighted 2015 Sun Microsystems, Inc.
33.43 +
33.44 +#Debug strings, NOI18N
33.45 +NULL_PATH=\u6307\u4ee4 "{0}" \u7684\u672a\u89e3\u6790\u8def\u5f84\u3002
33.46 +UNRESOLVED_FILE_OWNER="{0}" \u7684\u672a\u89e3\u6790\u6587\u4ef6\u6240\u6709\u8005\u3002
33.47 +START_PROJECT_CLOSED=\u5728\u4ece {2} \u5305\u62ec\u6587\u4ef6 "{1}" \u65f6, \u542f\u52a8\u9879\u76ee "{0}" \u5df2\u5173\u95ed\u3002
33.48 +INVALID_START_PROJECT=\u5728\u4ece {2} \u5305\u62ec\u6587\u4ef6 "{1}" \u65f6, \u542f\u52a8\u9879\u76ee "{0}" \u65e0\u6548\u3002
33.49 +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
33.50 +NULL_START_PROJECT=\u5728\u4ece {2} \u5305\u62ec\u6587\u4ef6 "{1}" \u65f6, \u542f\u52a8\u9879\u76ee\u4e3a\u7a7a\u503c\u3002
33.51 +
33.52 +
34.1 --- 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
34.2 +++ 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
34.3 @@ -91,8 +91,8 @@
34.4 # NewMakeProjectWizardIterator
34.5 LAB_IteratorName={0}/{1}
34.6
34.7 -ERROR_FIND_PROJECT_CREATOR=\u5728\u4e3b\u673a{0}\u4e0a\u627e\u4e0d\u5230 Oracle Solaris Studio 12.3 \u6216\u66f4\u9ad8\u7248\u672c\u3002
34.8 -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
34.9 +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
34.10 +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
34.11 RUN_PROJECT_CREATOR=\u6b63\u5728\u4e3b\u673a{0}\u4e0a\u521b\u5efa\u9879\u76ee...
34.12 CONFIGURING_PROJECT_CREATOR=\u6b63\u5728\u4e3b\u673a{0}\u4e0a\u914d\u7f6e\u9879\u76ee...
34.13
35.1 --- 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
35.2 +++ 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
35.3 @@ -130,5 +130,5 @@
35.4 EditPathMapDialog.restore.text=\u6062\u590d\u9ed8\u8ba4\u8bbe\u7f6e(&R)
35.5 HostPropertiesDialog.errorLabel.text=\u9519\u8bef
35.6 HostPropertiesDialog.serverRecordPanel.border.title=\u5176\u4ed6
35.7 -HostPropertiesDialog.cbACL.text=\u68c0\u67e5\u57fa\u4e8e ACL \u7684\u8fdc\u7a0b\u6587\u4ef6\u6743\u9650(&C)
35.8 +HostPropertiesDialog.cbACL.text=\u68c0\u67e5\u57fa\u4e8e ACL \u7684\u8fdc\u7a0b\u6587\u4ef6\u6743\u9650(&L)
35.9
36.1 --- 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
36.2 +++ 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
36.3 @@ -1,5 +1,6 @@
36.4 LBL_HostRootNode=C/C++ \u6784\u5efa\u4e3b\u673a
36.5 AddHostMenuItem=\u6dfb\u52a0\u65b0\u4e3b\u673a(&A)...
36.6 +AddNewHostAction=\u6dfb\u52a0\u65b0\u4e3b\u673a
36.7 RemoveHostMenuItem=\u5220\u9664\u4e3b\u673a(&R)
36.8 RemoveHostCaption=\u5220\u9664\u4e3b\u673a
36.9 RemoveHostQuestion=\u662f\u5426\u786e\u5b9e\u8981\u4ece\u5217\u8868\u4e2d\u5220\u9664{0}?
37.1 --- 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
37.2 +++ 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
37.3 @@ -128,9 +128,9 @@
37.4
37.5 # PlatformTypePanel
37.6 LBL_PlatformTypePanel=\u9009\u62e9 Makefile \u7c7b\u578b\u548c\u5e73\u53f0
37.7 -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
37.8 +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
37.9 LBL_CompilerType=\u9009\u62e9\u8981\u4f7f\u7528\u7684\u7f16\u8bd1\u5668\u96c6\u5408:
37.10 -RB_CompilerTypeSun=Oracle Solaris Studio \u7f16\u8bd1\u5668
37.11 +RB_CompilerTypeSun=Oracle Developer Studio \u7f16\u8bd1\u5668
37.12
37.13 RB_CompilerTypeGNU=GNU \u7f16\u8bd1\u5668
37.14
37.15 @@ -147,8 +147,8 @@
37.16
37.17 # CompilerTypePanel and PlatformTypePanel
37.18 LBL_CompilerTypePanel=\u9009\u62e9 Makefile \u7c7b\u578b
37.19 -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
37.20 -RB_CompilerTypeBoth=Oracle Solaris Studio \u548c GNU \u7f16\u8bd1\u5668
37.21 +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
37.22 +RB_CompilerTypeBoth=Oracle Developer Studio \u548c GNU \u7f16\u8bd1\u5668
37.23
37.24
37.25
37.26 @@ -200,7 +200,7 @@
37.27 TB_DynamicLib=\u52a8\u6001\u94fe\u63a5 (-ldl)
37.28 TB_Curses=Curses: CRT \u5c4f\u5e55\u5904\u7406 (-lcurses)
37.29 TB_RWTools=RW Tools++ (-library=rwtools7,iostream)
37.30 -TB_PerfLib=Oracle Solaris Studio \u6027\u80fd\u5e93 (-xlic_lib=sunperf)
37.31 +TB_PerfLib=Oracle Developer Studio \u6027\u80fd\u5e93 (-xlic_lib=sunperf)
37.32
37.33
37.34
38.1 --- 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
38.2 +++ 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
38.3 @@ -1,8 +1,8 @@
38.4 OpenIDE-Module-Display-Category=C/C++
38.5 OpenIDE-Module-Name=C/C++ \u5de5\u5177\u96c6\u5408
38.6 -CND/ToolChains/OSS_solaris-sparc=Oracle Solaris Studio
38.7 -CND/ToolChains/OSS_solaris-x86_linux=Oracle Solaris Studio
38.8 -CND/ToolChains/OSS_linuxCompatGNU=GNU \u517c\u5bb9\u6a21\u5f0f\u4e0b\u7684 Oracle Solaris Studio
38.9 +CND/ToolChains/OSS_solaris-sparc=Oracle Developer Studio
38.10 +CND/ToolChains/OSS_solaris-x86_linux=Oracle Developer Studio
38.11 +CND/ToolChains/OSS_linuxCompatGNU=GNU \u517c\u5bb9\u6a21\u5f0f\u4e0b\u7684 Oracle Developer Studio
38.12 CND/ToolChains/OSS_5.13_solaris-sparc={Oracle Solaris Studio 12.4}
38.13 CND/ToolChains/OSS_5.13_solaris-x86_linux={Oracle Solaris Studio 12.4}
38.14 CND/ToolChains/OSS_5.13_linuxCompatGNU=GNU \u517c\u5bb9\u6a21\u5f0f\u4e0b\u7684 {Oracle Solaris Studio 12.4}
38.15 @@ -19,8 +19,7 @@
38.16 CND/ToolChains/SunStudio_10=Sun Studio 10
38.17 CND/ToolChains/SunStudio_9=Sun Studio 9
38.18 CND/ToolChains/SunStudio_8=Sun Studio 8
38.19 -CND/ToolChains/SunStudio=Sun Studio
38.20 -CND/ToolChains/OracleSolarisStudio=Oracle Solaris Studio
38.21 +CND/ToolChains/OracleDeveloperStudio=Oracle Developer Studio
38.22 CND/ToolChains/Cygwin=GNU Cygwin
38.23 CND/ToolChains/MinGW=GNU MinGW
38.24 CND/ToolChains/MinGW_TDM=GNU MinGW TDM
39.1 --- 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
39.2 +++ 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
39.3 @@ -152,3 +152,4 @@
39.4 ACSD_revisionsComboBox=\u6307\u5b9a\u8981\u53bb\u9664\u7684\u4fee\u8ba2\u7248\u672c
39.5 ACSD_revisionsComboBoxBackout=\u6307\u5b9a\u8981\u56de\u9000\u7684\u4fee\u8ba2\u7248\u672c
39.6 ACSD_commitMsgField=\u6307\u5b9a\u7528\u4e8e\u56de\u9000\u66f4\u6539\u96c6\u7684\u63d0\u4ea4\u6d88\u606f
39.7 +
40.1 --- 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
40.2 +++ 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
40.3 @@ -43,6 +43,6 @@
40.4 <title>内联模板文件</title>
40.5 </head>
40.6 <body>
40.7 - 内联模板文件 (在 Oracle Solaris Studio 中受支持)
40.8 + 内联模板文件 (在 Oracle Developer Studio 中受支持)
40.9 </body>
40.10 </html>
41.1 --- 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
41.2 +++ 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
41.3 @@ -9,6 +9,6 @@
41.4 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
41.5 </head>
41.6 <BODY>
41.7 - 计算 Pi 的五种不同的实现方式。某些配置可能仅适用于 Oracle Solaris Studio 编译器。
41.8 + 计算 Pi 的五种不同的实现方式。某些配置可能仅适用于 Oracle Developer Studio 编译器。
41.9 </BODY>
41.10 </HTML>
42.1 --- 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
42.2 +++ 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
42.3 @@ -5,4 +5,3 @@
42.4
42.5
42.6
42.7 -
43.1 --- 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
43.2 +++ 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
43.3 @@ -49,3 +49,8 @@
43.4 #TITLE_Message=From {0}:
43.5 TITLE_Message_Ex=\u6765\u81ea{0}: {1}
43.6
43.7 +Authentication.gssapi-with-mic=GSS-API
43.8 +Authentication.publickey=\u516c\u5171\u5bc6\u94a5
43.9 +Authentication.keyboard-interactive=Keyboard-interactive
43.10 +Authentication.password=\u53e3\u4ee4
43.11 +
44.1 --- 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
44.2 +++ 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
44.3 @@ -110,6 +110,7 @@
44.4 AuthTypeSelectorDlg.jPanel1.border.title=\u63cf\u8ff0:
44.5 AuthenticationSettingsPanel.validationError.isDirectory.text={0} \u662f\u4e00\u4e2a\u76ee\u5f55
44.6 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
44.7 +AuthenticationSettingsPanel.validationError.emptyMethodList.text=\u672a\u9009\u62e9\u9a8c\u8bc1\u65b9\u6cd5
44.8 AuthenticationSettingsPanel.validationError.invalidKey.text=\u6587\u4ef6{0}\u7684\u5185\u5bb9\u4e0d\u662f\u6709\u6548\u7684 SSH \u79c1\u6709\u5bc6\u94a5
44.9 AuthenticationSettingsPanel.validationError.fileNotFound.text=\u627e\u4e0d\u5230\u6587\u4ef6{0}
44.10 AuthenticationSettingsPanel.validationError.fileNotReadable.text=\u65e0\u6cd5\u8bfb\u53d6{0}
44.11 @@ -123,4 +124,28 @@
44.12
44.13 SSHKeyFileChooser.DialogTitle.text=\u9009\u62e9 SSH \u5bc6\u94a5\u6587\u4ef6
44.14 SSHKeyFileChooser.SSHKeyFileType.text=SSH \u79c1\u6709\u5bc6\u94a5\u6587\u4ef6
44.15 +AuthenticationSettingsPanel.connectionSettings.text=\u8fde\u63a5\u8bbe\u7f6e(&S)
44.16 +AuthenticationSettingsPanel.preferredAuthenticationsLabel.text=\u9996\u9009\u9a8c\u8bc1(&F):
44.17 +AuthenticationSettingsPanel.upButton.text=\u4e0a\u79fb(&U)
44.18 +AuthenticationSettingsPanel.downButton.text=\u4e0b\u79fb(&D)
44.19 +AuthenticationSettingsPanel.timeoutLabel.text=\u8d85\u65f6(&T):
44.20 +AuthenticationSettingsPanel.downButton.toolTipText=\u4e0b\u79fb
44.21 +AuthenticationSettingsPanel.connectionSettings.AccessibleContext.accessibleName=\u8fde\u63a5\u8bbe\u7f6e
44.22 +AuthenticationSettingsPanel.connectionSettings.AccessibleContext.accessibleDescription=\u5176\u4ed6\u8fde\u63a5\u8bbe\u7f6e
44.23 +AuthenticationSettingsPanel.preferredAuthenticationsLabel.AccessibleContext.accessibleName=\u9996\u9009\u9a8c\u8bc1
44.24 +AuthenticationSettingsPanel.preferredAuthenticationsLabel.AccessibleContext.accessibleDescription=\u9996\u9009\u9a8c\u8bc1\u987a\u5e8f
44.25 +AuthenticationSettingsPanel.upButton.AccessibleContext.accessibleName=\u4e0a\u79fb
44.26 +AuthenticationSettingsPanel.upButton.AccessibleContext.accessibleDescription=\u5411\u4e0a\u79fb\u52a8\u9a8c\u8bc1
44.27 +AuthenticationSettingsPanel.downButton.AccessibleContext.accessibleName=\u4e0b\u79fb
44.28 +AuthenticationSettingsPanel.downButton.AccessibleContext.accessibleDescription=\u5411\u4e0b\u79fb\u52a8\u9a8c\u8bc1
44.29 +AuthenticationSettingsPanel.timeoutLabel.AccessibleContext.accessibleName=\u8d85\u65f6
44.30 +AuthenticationSettingsPanel.timeoutLabel.AccessibleContext.accessibleDescription=\u8fde\u63a5\u8d85\u65f6
44.31 +AuthenticationSettingsPanel.timeoutSpinner.AccessibleContext.accessibleName=\u8d85\u65f6
44.32 +AuthenticationSettingsPanel.timeoutSpinner.AccessibleContext.accessibleDescription=\u8fde\u63a5\u8d85\u65f6
44.33 +AuthenticationSettingsPanel.connectionSettings.toolTipText=\u5176\u4ed6\u8fde\u63a5\u8bbe\u7f6e
44.34 +AuthenticationSettingsPanel.timeoutLabel.toolTipText=\u8fde\u63a5\u8d85\u65f6
44.35 +AuthenticationSettingsPanel.preferredAuthenticationsLabel.toolTipText=\u9996\u9009\u9a8c\u8bc1\u987a\u5e8f
44.36 +AuthenticationSettingsPanel.upButton.toolTipText=\u4e0a\u79fb
44.37 +AuthenticationSettingsPanel.authenticationsList.toolTipText=\u9996\u9009\u9a8c\u8bc1\u987a\u5e8f
44.38 +AuthenticationSettingsPanel.timeoutSpinner.toolTipText=\u8fde\u63a5\u8d85\u65f6
44.39