1.1 --- a/src/ja/cnd/cnd-discovery/cnd-discovery/org/netbeans/modules/cnd/discovery/projectimport/Bundle_ja.properties Thu Dec 01 10:27:42 2011 +0900
1.2 +++ b/src/ja/cnd/cnd-discovery/cnd-discovery/org/netbeans/modules/cnd/discovery/projectimport/Bundle_ja.properties Thu Dec 01 17:14:33 2011 +0900
1.3 @@ -37,7 +37,7 @@
1.4 ConfigureActionName=\u69cb\u6210
1.5
1.6 Dialog_Title=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u4f5c\u6210\u30b9\u30c6\u30fc\u30bf\u30b9
1.7 -Dialog_Action=\u8a73\u7d30
1.8 +#Dialog_Action=\u8a73\u7d30
1.9 Configure_Success=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u30b3\u30fc\u30c9\u652f\u63f4\u69cb\u6210\u306f\u6210\u529f\u3067\u3057\u305f
1.10 Configure_Info=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u30b3\u30fc\u30c9\u652f\u63f4\u69cb\u6210\u306f\u90e8\u5206\u7684\u306b\u5b8c\u4e86\u3057\u307e\u3057\u305f
1.11 Configure_Fail=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u30b3\u30fc\u30c9\u652f\u63f4\u69cb\u6210\u306f\u5931\u6557\u3057\u307e\u3057\u305f\u3002
1.12 @@ -77,7 +77,7 @@
1.13 ImportExecutable.Progress=\u30d0\u30a4\u30ca\u30ea\u3092\u89e3\u6790...
1.14 ImportExecutable.Progress.ProjectCreating=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u4f5c\u6210\u4e2d...
1.15
1.16 -MAKE_LABEL={0} (make)
1.17 -MAKE_REMOTE_LABEL={0} (Make) - {2}
1.18 +#MAKE_LABEL={0} (make)
1.19 +#MAKE_REMOTE_LABEL={0} (Make) - {2}
1.20
1.21
2.1 --- a/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/platform/Bundle_ja.properties Thu Dec 01 10:27:42 2011 +0900
2.2 +++ b/src/ja/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/platform/Bundle_ja.properties Thu Dec 01 17:14:33 2011 +0900
2.3 @@ -58,5 +58,5 @@
2.4 StdLib.DynamicLinking=\u52d5\u7684\u30ea\u30f3\u30af
2.5 #StdLib.CUnit=CUnit
2.6 #StdLib.CppUnit=CppUnit
2.7 -StdLib.OracleInstantClient=OracleInstantClient
2.8 +#StdLib.OracleInstantClient=OracleInstantClient
2.9
3.1 --- a/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/Bundle_ja.properties Thu Dec 01 10:27:42 2011 +0900
3.2 +++ b/src/ja/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/Bundle_ja.properties Thu Dec 01 17:14:33 2011 +0900
3.3 @@ -99,8 +99,8 @@
3.4
3.5
3.6 ## Database vendor display names
3.7 -DBVendor_oracle=Oracle (OCI)
3.8 -DBVendor_oracle-thin=Oracle thin
3.9 +#DBVendor_oracle=Oracle (OCI)
3.10 +#DBVendor_oracle-thin=Oracle thin
3.11 DBVendor_sybase1=Sybase (jConnect 4.2 \u4ee5\u524d)
3.12 DBVendor_sybase2=Sybase (jConnect 5.2)
3.13 DBVendor_datadirect_sql=Microsoft SQL Server (DataDirect Connect for JDBC)
4.1 --- a/src/ja/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/Bundle_ja.properties Thu Dec 01 10:27:42 2011 +0900
4.2 +++ b/src/ja/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/Bundle_ja.properties Thu Dec 01 17:14:33 2011 +0900
4.3 @@ -49,10 +49,10 @@
4.4
4.5 MSG_Loading_Config=\u30d5\u30a1\u30a4\u30eb\u304b\u3089\u306e\u69cb\u6210\u306e\u8aad\u307f\u8fbc\u307f\u6642\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
4.6
4.7 -LBL_OracleWebLogic=Oracle WebLogic Server {0}
4.8 -LBL_OracleWebLogicAlt=Oracle WebLogic Server {0} ({1})
4.9 +#LBL_OracleWebLogic=Oracle WebLogic Server {0}
4.10 +#LBL_OracleWebLogicAlt=Oracle WebLogic Server {0} ({1})
4.11
4.12 LBL_OracleJvmHotSpot=Java HotSpot
4.13 -LBL_OracleJvmJRockit=Oracle JRockit
4.14 +#LBL_OracleJvmJRockit=Oracle JRockit
4.15 LBL_OracleJvmDefault=\u30c7\u30d5\u30a9\u30eb\u30c8
4.16
5.1 --- a/src/ja/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/resources/Bundle_ja.properties Thu Dec 01 10:27:42 2011 +0900
5.2 +++ b/src/ja/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/resources/Bundle_ja.properties Thu Dec 01 17:14:33 2011 +0900
5.3 @@ -42,7 +42,7 @@
5.4 # made subject to such option by the copyright holder.
5.5 #
5.6
5.7 -OpenIDE-Module-Name=Oracle WebLogic Server
5.8 +#OpenIDE-Module-Name=Oracle WebLogic Server
5.9 OpenIDE-Module-Display-Category=Java Web \u304a\u3088\u3073 EE
5.10 OpenIDE-Module-Short-Description=Oracle WebLogic Server \u7528\u30d7\u30e9\u30b0\u30a4\u30f3
5.11 OpenIDE-Module-Long-Description=\u3053\u306e\u30d7\u30e9\u30b0\u30a4\u30f3\u306b\u3088\u308a\u3001Oracle WebLogic Server \u4e0a\u3067 J2EE \u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u306e\u69cb\u6210\u3001\u914d\u5099\u3001\u30c7\u30d0\u30c3\u30b0\u3092 J2EE \u958b\u767a\u30e2\u30b8\u30e5\u30fc\u30eb\u3067\u3067\u304d\u308b\u3088\u3046\u306b\u306a\u308a\u307e\u3059\u3002
6.1 --- a/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/Bundle_ja.properties Thu Dec 01 10:27:42 2011 +0900
6.2 +++ b/src/ja/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/Bundle_ja.properties Thu Dec 01 17:14:33 2011 +0900
6.3 @@ -114,7 +114,7 @@
6.4 Templates/SunResources/JMS_Resource=JMS \u30ea\u30bd\u30fc\u30b9
6.5 Services/MIMEResolver/org-netbeans-modules-j2ee-sun-share-mime-resolver.xml=sun-* \u914d\u5099\u8a18\u8ff0\u5b50\u30d5\u30a1\u30a4\u30eb
6.6 Templates/SunResources/sunDD=GlassFish \u8a18\u8ff0\u5b50
6.7 -TXT_displayName=Oracle WebLogic Server
6.8 +#TXT_displayName=Oracle WebLogic Server
6.9 javaee-api-6.0=Java EE 6 API \u30e9\u30a4\u30d6\u30e9\u30ea
6.10 javaee-web-api-6.0=Java EE Web 6 API \u30e9\u30a4\u30d6\u30e9\u30ea
6.11 javaee-endorsed-api-6.0=Java EE 6 \u63a8\u5968 API \u30e9\u30a4\u30d6\u30e9\u30ea
7.1 --- a/src/ja/ide/css-editor/css-editor/org/netbeans/modules/css/editor/actions/Bundle_ja.properties Thu Dec 01 10:27:42 2011 +0900
7.2 +++ b/src/ja/ide/css-editor/css-editor/org/netbeans/modules/css/editor/actions/Bundle_ja.properties Thu Dec 01 17:14:33 2011 +0900
7.3 @@ -92,7 +92,7 @@
7.4 No_preview_available=\u30d7\u30ec\u30d3\u30e5\u30fc\u3067\u304d\u307e\u305b\u3093
7.5
7.6
7.7 -Sample_Text=\u30b5\u30f3\u30d7\u30eb\u30c6\u30ad\u30b9\u30c8
7.8 +#Sample_Text=\u30b5\u30f3\u30d7\u30eb\u30c6\u30ad\u30b9\u30c8
7.9
7.10
7.11 Create_Rule=\u898f\u5247\u3092\u4f5c\u6210
8.1 --- a/src/ja/ide/css-editor/css-editor/org/netbeans/modules/css/editor/ui/Bundle_ja.properties Thu Dec 01 10:27:42 2011 +0900
8.2 +++ b/src/ja/ide/css-editor/css-editor/org/netbeans/modules/css/editor/ui/Bundle_ja.properties Thu Dec 01 17:14:33 2011 +0900
8.3 @@ -92,7 +92,7 @@
8.4 No_preview_available=\u30d7\u30ec\u30d3\u30e5\u30fc\u3067\u304d\u307e\u305b\u3093
8.5
8.6
8.7 -Sample_Text=\u30b5\u30f3\u30d7\u30eb\u30c6\u30ad\u30b9\u30c8
8.8 +#Sample_Text=\u30b5\u30f3\u30d7\u30eb\u30c6\u30ad\u30b9\u30c8
8.9
8.10
8.11 Create_Rule=\u898f\u5247\u3092\u4f5c\u6210
9.1 --- a/src/ja/ide/db/db/org/netbeans/modules/db/util/Bundle_ja.properties Thu Dec 01 10:27:42 2011 +0900
9.2 +++ b/src/ja/ide/db/db/org/netbeans/modules/db/util/Bundle_ja.properties Thu Dec 01 17:14:33 2011 +0900
9.3 @@ -56,8 +56,8 @@
9.4 DRIVERNAME_JavaDbEmbedded=Java DB (\u57cb\u3081\u8fbc\u307f)
9.5 DRIVERNAME_JavaDbNetwork=Java DB (\u30cd\u30c3\u30c8\u30ef\u30fc\u30af)
9.6 DRIVERNAME_PostgreSQL=PostgreSQL
9.7 -DRIVERNAME_OracleThin=Oracle Thin
9.8 -DRIVERNAME_OracleOCI=Oracle OCI
9.9 +#DRIVERNAME_OracleThin=Oracle Thin
9.10 +#DRIVERNAME_OracleOCI=Oracle OCI
9.11 DRIVERNAME_JTDS=jTDS
9.12 DRIVERNAME_DB2JCC=IBM DB2 Universal Driver
9.13 DRIVERNAME_MSSQL2005=Microsoft SQL Server 2005
10.1 --- a/src/ja/java/java-source/java-source/org/netbeans/modules/java/ui/Bundle_ja.properties Thu Dec 01 10:27:42 2011 +0900
10.2 +++ b/src/ja/java/java-source/java-source/org/netbeans/modules/java/ui/Bundle_ja.properties Thu Dec 01 17:14:33 2011 +0900
10.3 @@ -232,9 +232,9 @@
10.4
10.5 #SAMPLE_Spaces=@Anno(paramA="aValue", paramB="bValue")public class ClassA {public int number = 1;private String text ="A";static float[] floats = new float[3];protected double[] doubles = new double[]{3.67,40,2e-30};static {floats[0]=12.6f;}public ClassA() {}public int meth(String text, int number) {if (number==13) {return (int)System.currentTimeMillis();}else {}for( int i = 20; i < 100; i++) {synchronized(this) {while(i%13>5)meth( text + " ", number++);}}for(float f : floats)System.out.println(f);switch(number) {case 1\:do { out( (2+3)*this.number--); } while(this.number > 6);return 10;case 2\:try {toString();}catch ( IllegalStateException illegalStateException ) {illegalStateException.printStackTrace();}finally {return 20;}default\:return number > 100 ? -1 : -2;}} }
10.6
10.7 -SAMPLE_Comments=public class ClassA {\n/**\n\u3053\u308c\u306f\u30b5\u30f3\u30d7\u30eb\u30e1\u30bd\u30c3\u30c9\u306e\u8aac\u660e\u306e\u6700\u521d\u306e\u90e8\u5206\u3067\u3059\u3002\n2 \u3064\u76ee\u306e\u90e8\u5206\u306f\u3001\u624b\u52d5\u306e\u6539\u884c\u306e\u5f8c\u306b\u914d\u7f6e\u3055\u308c\u3066\u3044\u307e\u3059\u3002\n\n\u6700\u5f8c\u306e\u90e8\u5206\u306f\u7a7a\u884c\u306e\u5f8c\u306b\u914d\u7f6e\u3055\u308c\u3066\u3044\u307e\u3059\u3002\n@param text \u6700\u521d\u306e\u30d1\u30e9\u30e1\u30fc\u30bf\u306e\u8aac\u660e\n@param number 2 \u3064\u76ee\u306e\u30d1\u30e9\u30e1\u30fc\u30bf\u306e\u8aac\u660e\n@return \u3053\u308c\u306f\u623b\u308a\u5024\u306e\u8aac\u660e\n@throws ExcepA \u6700\u521d\u306e\u4f8b\u5916\u306e\u8aac\u660e\n@throws ExcB 2 \u3064\u76ee\u306e\u4f8b\u5916\u306e\u8aac\u660e\n*/\npublic String meth(String text, int number) throws ExceptionA, ExcB {\n/*\u3053\u308c\u306f 1 \u884c\u306e\u30b3\u30e1\u30f3\u30c8\u3067\u3059*/\n\u623b\u308a\u6570 > 0 ? text : null;\n}\n}
10.8 +#SAMPLE_Comments=public class ClassA {\n/**\n\u3053\u308c\u306f\u30b5\u30f3\u30d7\u30eb\u30e1\u30bd\u30c3\u30c9\u306e\u8aac\u660e\u306e\u6700\u521d\u306e\u90e8\u5206\u3067\u3059\u3002\n2 \u3064\u76ee\u306e\u90e8\u5206\u306f\u3001\u624b\u52d5\u306e\u6539\u884c\u306e\u5f8c\u306b\u914d\u7f6e\u3055\u308c\u3066\u3044\u307e\u3059\u3002\n\n\u6700\u5f8c\u306e\u90e8\u5206\u306f\u7a7a\u884c\u306e\u5f8c\u306b\u914d\u7f6e\u3055\u308c\u3066\u3044\u307e\u3059\u3002\n@param text \u6700\u521d\u306e\u30d1\u30e9\u30e1\u30fc\u30bf\u306e\u8aac\u660e\n@param number 2 \u3064\u76ee\u306e\u30d1\u30e9\u30e1\u30fc\u30bf\u306e\u8aac\u660e\n@return \u3053\u308c\u306f\u623b\u308a\u5024\u306e\u8aac\u660e\n@throws ExcepA \u6700\u521d\u306e\u4f8b\u5916\u306e\u8aac\u660e\n@throws ExcB 2 \u3064\u76ee\u306e\u4f8b\u5916\u306e\u8aac\u660e\n*/\npublic String meth(String text, int number) throws ExceptionA, ExcB {\n/*\u3053\u308c\u306f 1 \u884c\u306e\u30b3\u30e1\u30f3\u30c8\u3067\u3059*/\n\u623b\u308a\u6570 > 0 ? text : null;\n}\n}
10.9
10.10 -SAMPLE_Imports=package org.netbeans.samples;public class ClassA {public void method() {}}
10.11 +#SAMPLE_Imports=package org.netbeans.samples;public class ClassA {public void method() {}}
10.12
10.13 #nlFinallyCheckBox1.text="finall&y"
10.14
11.1 --- a/src/ja/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/Bundle_ja.properties Thu Dec 01 10:27:42 2011 +0900
11.2 +++ b/src/ja/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/Bundle_ja.properties Thu Dec 01 17:14:33 2011 +0900
11.3 @@ -242,7 +242,7 @@
11.4 #COMMENT_dontuse_preloader=This project does not use Preloader
11.5 #COMMENT_javafx=This is a JavaFX project
11.6 #COMMENT_oldjnlp=Pre-JavaFX 2.0 WebStart is deactivated in JavaFX 2.0 projects
11.7 -COMMENT_oldjar=JavaFX 2.0 \u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3067\u306f\u3001JavaFX 2.0 \u4ee5\u5916\u306e JAR \u30d5\u30a1\u30a4\u30eb\u306e\u4f5c\u6210\u306f\u7121\u52b9\u306b\u306a\u3063\u3066\u3044\u307e\u3059
11.8 +#COMMENT_oldjar=JavaFX 2.0 \u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3067\u306f\u3001JavaFX 2.0 \u4ee5\u5916\u306e JAR \u30d5\u30a1\u30a4\u30eb\u306e\u4f5c\u6210\u306f\u7121\u52b9\u306b\u306a\u3063\u3066\u3044\u307e\u3059
11.9 #COMMENT_prepreloader=Preloader can not use a preloader
11.10 #COMMENT_updatemode=If true, application update mode is set to 'background', if false, update mode is set to 'eager'
11.11 #COMMENT_app_args=Do not set application arguments here, this property is re-generated from javafx.param.* properties
12.1 --- a/src/pt_BR/cnd/cnd-discovery/cnd-discovery/org/netbeans/modules/cnd/discovery/projectimport/Bundle_pt_BR.properties Thu Dec 01 10:27:42 2011 +0900
12.2 +++ b/src/pt_BR/cnd/cnd-discovery/cnd-discovery/org/netbeans/modules/cnd/discovery/projectimport/Bundle_pt_BR.properties Thu Dec 01 17:14:33 2011 +0900
12.3 @@ -37,7 +37,7 @@
12.4 ConfigureActionName=Configurar
12.5
12.6 Dialog_Title=Status da cria\u00e7\u00e3o do projeto
12.7 -Dialog_Action=detalhes
12.8 +#Dialog_Action=detalhes
12.9 Configure_Success=Sucesso na configura\u00e7\u00e3o do projeto para assist\u00eancia de c\u00f3digo
12.10 Configure_Info=Configurar o projeto para assist\u00eancia de c\u00f3digo foi parcialmente conclu\u00eddo.
12.11 Configure_Fail=Falha na configura\u00e7\u00e3o do projeto para assist\u00eancia de c\u00f3digo
12.12 @@ -77,7 +77,7 @@
12.13 ImportExecutable.Progress=Analisar bin\u00e1rio...
12.14 ImportExecutable.Progress.ProjectCreating=Criando projeto...
12.15
12.16 -MAKE_LABEL={0} (Make)
12.17 -MAKE_REMOTE_LABEL={0} (Make) - {2}
12.18 +#MAKE_LABEL={0} (Make)
12.19 +#MAKE_REMOTE_LABEL={0} (Make) - {2}
12.20
12.21
13.1 --- a/src/pt_BR/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/platform/Bundle_pt_BR.properties Thu Dec 01 10:27:42 2011 +0900
13.2 +++ b/src/pt_BR/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/platform/Bundle_pt_BR.properties Thu Dec 01 17:14:33 2011 +0900
13.3 @@ -58,5 +58,5 @@
13.4 StdLib.DynamicLinking=Vincula\u00e7\u00e3o din\u00e2mica
13.5 #StdLib.CUnit=CUnit
13.6 #StdLib.CppUnit=CppUnit
13.7 -StdLib.OracleInstantClient=OracleInstantClient
13.8 +#StdLib.OracleInstantClient=OracleInstantClient
13.9
14.1 --- a/src/pt_BR/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/Bundle_pt_BR.properties Thu Dec 01 10:27:42 2011 +0900
14.2 +++ b/src/pt_BR/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/Bundle_pt_BR.properties Thu Dec 01 17:14:33 2011 +0900
14.3 @@ -99,8 +99,8 @@
14.4
14.5
14.6 ## Database vendor display names
14.7 -DBVendor_oracle=Oracle (OCI)
14.8 -DBVendor_oracle-thin=Oracle thin
14.9 +#DBVendor_oracle=Oracle (OCI)
14.10 +#DBVendor_oracle-thin=Oracle thin
14.11 DBVendor_sybase1=Sybase (jConnect 4.2 e anterior)
14.12 DBVendor_sybase2=Sybase (jConnect 5.2)
14.13 DBVendor_datadirect_sql=Servidor Microsoft SQL (Conector DataDirect para JDBC)
15.1 --- a/src/pt_BR/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/Bundle_pt_BR.properties Thu Dec 01 10:27:42 2011 +0900
15.2 +++ b/src/pt_BR/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/Bundle_pt_BR.properties Thu Dec 01 17:14:33 2011 +0900
15.3 @@ -49,10 +49,10 @@
15.4
15.5 MSG_Loading_Config=Erro ao carregar configura\u00e7\u00e3o a partir de arquivo.
15.6
15.7 -LBL_OracleWebLogic=Oracle WebLogic Server {0}
15.8 -LBL_OracleWebLogicAlt=Oracle WebLogic Server {0} ({1})
15.9 +#LBL_OracleWebLogic=Oracle WebLogic Server {0}
15.10 +#LBL_OracleWebLogicAlt=Oracle WebLogic Server {0} ({1})
15.11
15.12 LBL_OracleJvmHotSpot=Java HotSpot
15.13 -LBL_OracleJvmJRockit=Oracle JRockit
15.14 +#LBL_OracleJvmJRockit=Oracle JRockit
15.15 LBL_OracleJvmDefault=Padr\u00e3o
15.16
16.1 --- a/src/pt_BR/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/resources/Bundle_pt_BR.properties Thu Dec 01 10:27:42 2011 +0900
16.2 +++ b/src/pt_BR/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/resources/Bundle_pt_BR.properties Thu Dec 01 17:14:33 2011 +0900
16.3 @@ -42,7 +42,7 @@
16.4 # made subject to such option by the copyright holder.
16.5 #
16.6
16.7 -OpenIDE-Module-Name=Oracle WebLogic Server
16.8 +#OpenIDE-Module-Name=Oracle WebLogic Server
16.9 OpenIDE-Module-Display-Category=Java Web e EE
16.10 OpenIDE-Module-Short-Description=Plug-in para o Oracle WebLogic Server
16.11 OpenIDE-Module-Long-Description=O plug-in ativa m\u00f3dulos de desenvolvimento J2EE para configurar, implementar e depurar componentes J2EE no Oracle WebLogic Server
17.1 --- a/src/pt_BR/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/Bundle_pt_BR.properties Thu Dec 01 10:27:42 2011 +0900
17.2 +++ b/src/pt_BR/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/Bundle_pt_BR.properties Thu Dec 01 17:14:33 2011 +0900
17.3 @@ -114,7 +114,7 @@
17.4 Templates/SunResources/JMS_Resource=Recurso JMS
17.5 Services/MIMEResolver/org-netbeans-modules-j2ee-sun-share-mime-resolver.xml=Arquivo sun-* do descritor de deployment
17.6 Templates/SunResources/sunDD=Descritor GlassFish
17.7 -TXT_displayName=Oracle WebLogic Server
17.8 +#TXT_displayName=Oracle WebLogic Server
17.9 javaee-api-6.0=Biblioteca Java EE 6 API
17.10 javaee-web-api-6.0=Biblioteca Java EE Web 6 API
17.11 javaee-endorsed-api-6.0=Biblioteca Java EE 6 endossado para API
18.1 --- a/src/pt_BR/ide/css-editor/css-editor/org/netbeans/modules/css/editor/actions/Bundle_pt_BR.properties Thu Dec 01 10:27:42 2011 +0900
18.2 +++ b/src/pt_BR/ide/css-editor/css-editor/org/netbeans/modules/css/editor/actions/Bundle_pt_BR.properties Thu Dec 01 17:14:33 2011 +0900
18.3 @@ -92,7 +92,7 @@
18.4 No_preview_available=Nenhuma visualiza\u00e7\u00e3o dispon\u00edvel
18.5
18.6
18.7 -Sample_Text=Texto de exemplo
18.8 +#Sample_Text=Texto de exemplo
18.9
18.10
18.11 Create_Rule=Criar regra
19.1 --- a/src/pt_BR/ide/css-editor/css-editor/org/netbeans/modules/css/editor/ui/Bundle_pt_BR.properties Thu Dec 01 10:27:42 2011 +0900
19.2 +++ b/src/pt_BR/ide/css-editor/css-editor/org/netbeans/modules/css/editor/ui/Bundle_pt_BR.properties Thu Dec 01 17:14:33 2011 +0900
19.3 @@ -92,7 +92,7 @@
19.4 No_preview_available=Nenhuma visualiza\u00e7\u00e3o dispon\u00edvel
19.5
19.6
19.7 -Sample_Text=Texto de exemplo
19.8 +#Sample_Text=Texto de exemplo
19.9
19.10
19.11 Create_Rule=Criar regra
20.1 --- a/src/pt_BR/ide/db/db/org/netbeans/modules/db/util/Bundle_pt_BR.properties Thu Dec 01 10:27:42 2011 +0900
20.2 +++ b/src/pt_BR/ide/db/db/org/netbeans/modules/db/util/Bundle_pt_BR.properties Thu Dec 01 17:14:33 2011 +0900
20.3 @@ -56,8 +56,8 @@
20.4 DRIVERNAME_JavaDbEmbedded=Java DB (incorporado)
20.5 DRIVERNAME_JavaDbNetwork=Java DB (rede)
20.6 DRIVERNAME_PostgreSQL=PostgreSQL
20.7 -DRIVERNAME_OracleThin=Oracle Thin
20.8 -DRIVERNAME_OracleOCI=Oracle OCI
20.9 +#DRIVERNAME_OracleThin=Oracle Thin
20.10 +#DRIVERNAME_OracleOCI=Oracle OCI
20.11 DRIVERNAME_JTDS=jTDS
20.12 DRIVERNAME_DB2JCC=IBM DB2 Universal Driver
20.13 DRIVERNAME_MSSQL2005=Microsoft SQL Server 2005
21.1 --- a/src/pt_BR/java/java-source/java-source/org/netbeans/modules/java/ui/Bundle_pt_BR.properties Thu Dec 01 10:27:42 2011 +0900
21.2 +++ b/src/pt_BR/java/java-source/java-source/org/netbeans/modules/java/ui/Bundle_pt_BR.properties Thu Dec 01 17:14:33 2011 +0900
21.3 @@ -232,9 +232,9 @@
21.4
21.5 #SAMPLE_Spaces=@Anno(paramA="aValue", paramB="bValue")public class ClassA {public int number = 1;private String text ="A";static float[] floats = new float[3];protected double[] doubles = new double[]{3.67,40,2e-30};static {floats[0]=12.6f;}public ClassA() {}public int meth(String text, int number) {if (number==13) {return (int)System.currentTimeMillis();}else {}for( int i = 20; i < 100; i++) {synchronized(this) {while(i%13>5)meth( text + " ", number++);}}for(float f : floats)System.out.println(f);switch(number) {case 1\:do { out( (2+3)*this.number--); } while(this.number > 6);return 10;case 2\:try {toString();}catch ( IllegalStateException illegalStateException ) {illegalStateException.printStackTrace();}finally {return 20;}default\:return number > 100 ? -1 : -2;}} }
21.6
21.7 -SAMPLE_Comments=public class ClassA {\n/**\nEsta \u00e9 a primeira parte de uma descri\u00e7\u00e3o de m\u00e9todo de amostra.\nA segunda parte \u00e9 inserida ap\u00f3s uma nova linha manual.\n\nA \u00faltima parte \u00e9 inserida ap\u00f3s uma linha em branco.\n@param text \u00e9 a primeira descri\u00e7\u00e3o do par\u00e2metro\n@param number \u00e9 a segunda descri\u00e7\u00e3o do par\u00e2metro\n@return this \u00e9 a descri\u00e7\u00e3o do valor de retorno\n@throws ExcepA a primeira descri\u00e7\u00e3o de exce\u00e7\u00e3o\n@throws ExcB a segunda descri\u00e7\u00e3o de exce\u00e7\u00e3o\n*/\npublic String meth(String text, int number) lan\u00e7a ExceptionA, ExcB {\n/*Este \u00e9 um coment\u00e1rio de uma linha*/\nreturn number > 0 ? text : null;\n}\n}
21.8 +#SAMPLE_Comments=public class ClassA {\n/**\nEsta \u00e9 a primeira parte de uma descri\u00e7\u00e3o de m\u00e9todo de amostra.\nA segunda parte \u00e9 inserida ap\u00f3s uma nova linha manual.\n\nA \u00faltima parte \u00e9 inserida ap\u00f3s uma linha em branco.\n@param text \u00e9 a primeira descri\u00e7\u00e3o do par\u00e2metro\n@param number \u00e9 a segunda descri\u00e7\u00e3o do par\u00e2metro\n@return this \u00e9 a descri\u00e7\u00e3o do valor de retorno\n@throws ExcepA a primeira descri\u00e7\u00e3o de exce\u00e7\u00e3o\n@throws ExcB a segunda descri\u00e7\u00e3o de exce\u00e7\u00e3o\n*/\npublic String meth(String text, int number) lan\u00e7a ExceptionA, ExcB {\n/*Este \u00e9 um coment\u00e1rio de uma linha*/\nreturn number > 0 ? text : null;\n}\n}
21.9
21.10 -SAMPLE_Imports=package org.netbeans.samples;public class ClassA {public void method() {}}
21.11 +#SAMPLE_Imports=package org.netbeans.samples;public class ClassA {public void method() {}}
21.12
21.13 #nlFinallyCheckBox1.text="finall&y"
21.14
22.1 --- a/src/pt_BR/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/Bundle_pt_BR.properties Thu Dec 01 10:27:42 2011 +0900
22.2 +++ b/src/pt_BR/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/Bundle_pt_BR.properties Thu Dec 01 17:14:33 2011 +0900
22.3 @@ -242,7 +242,7 @@
22.4 #COMMENT_dontuse_preloader=This project does not use Preloader
22.5 #COMMENT_javafx=This is a JavaFX project
22.6 #COMMENT_oldjnlp=Pre-JavaFX 2.0 WebStart is deactivated in JavaFX 2.0 projects
22.7 -COMMENT_oldjar=A cria\u00e7\u00e3o de arquivo jar n\u00e3o-JavaFX 2.0 est\u00e1 desativada em projetos JavaFX 2.0
22.8 +#COMMENT_oldjar=A cria\u00e7\u00e3o de arquivo jar n\u00e3o-JavaFX 2.0 est\u00e1 desativada em projetos JavaFX 2.0
22.9 #COMMENT_prepreloader=Preloader can not use a preloader
22.10 #COMMENT_updatemode=If true, application update mode is set to 'background', if false, update mode is set to 'eager'
22.11 #COMMENT_app_args=Do not set application arguments here, this property is re-generated from javafx.param.* properties
23.1 --- a/src/ru/cnd/cnd-discovery/cnd-discovery/org/netbeans/modules/cnd/discovery/projectimport/Bundle_ru.properties Thu Dec 01 10:27:42 2011 +0900
23.2 +++ b/src/ru/cnd/cnd-discovery/cnd-discovery/org/netbeans/modules/cnd/discovery/projectimport/Bundle_ru.properties Thu Dec 01 17:14:33 2011 +0900
23.3 @@ -37,7 +37,7 @@
23.4 ConfigureActionName=\u041d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u044c
23.5
23.6 Dialog_Title=\u0421\u043e\u0441\u0442\u043e\u044f\u043d\u0438\u0435 \u043f\u0440\u043e\u0446\u0435\u0441\u0441\u0430 \u0441\u043e\u0437\u0434\u0430\u043d\u0438\u044f \u043f\u0440\u043e\u0435\u043a\u0442\u0430
23.7 -Dialog_Action=\u043f\u043e\u0434\u0440\u043e\u0431\u043d\u043e\u0441\u0442\u0438
23.8 +#Dialog_Action=\u043f\u043e\u0434\u0440\u043e\u0431\u043d\u043e\u0441\u0442\u0438
23.9 Configure_Success=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043f\u0440\u043e\u0435\u043a\u0442\u0430 \u0434\u043b\u044f \u043f\u043e\u043c\u043e\u0449\u0438 \u043f\u0440\u0438 \u0440\u0430\u0431\u043e\u0442\u0435 \u0441 \u043a\u043e\u0434\u043e\u043c \u0437\u0430\u0432\u0435\u0440\u0448\u0438\u043b\u0430\u0441\u044c \u0443\u0441\u043f\u0435\u0448\u043d\u043e.
23.10 Configure_Info=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043f\u0440\u043e\u0435\u043a\u0442\u0430 \u0434\u043b\u044f \u043f\u043e\u043c\u043e\u0449\u0438 \u043f\u0440\u0438 \u0440\u0430\u0431\u043e\u0442\u0435 \u0441 \u043a\u043e\u0434\u043e\u043c \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430 \u0447\u0430\u0441\u0442\u0438\u0447\u043d\u043e.
23.11 Configure_Fail=\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0432\u044b\u043f\u043e\u043b\u043d\u0438\u0442\u044c \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0443 \u043f\u0440\u043e\u0435\u043a\u0442\u0430...
23.12 @@ -77,7 +77,7 @@
23.13 ImportExecutable.Progress=\u0410\u043d\u0430\u043b\u0438\u0437\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0431\u0438\u043d\u0430\u0440\u043d\u044b\u0439 \u0444\u0430\u0439\u043b...
23.14 ImportExecutable.Progress.ProjectCreating=\u0421\u043e\u0437\u0434\u0430\u043d\u0438\u0435 \u043f\u0440\u043e\u0435\u043a\u0442\u0430...
23.15
23.16 -MAKE_LABEL={0} (Make)
23.17 -MAKE_REMOTE_LABEL={0} (Make) - {2}
23.18 +#MAKE_LABEL={0} (Make)
23.19 +#MAKE_REMOTE_LABEL={0} (Make) - {2}
23.20
23.21
24.1 --- a/src/ru/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/platform/Bundle_ru.properties Thu Dec 01 10:27:42 2011 +0900
24.2 +++ b/src/ru/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/platform/Bundle_ru.properties Thu Dec 01 17:14:33 2011 +0900
24.3 @@ -58,5 +58,5 @@
24.4 StdLib.DynamicLinking=\u0414\u0438\u043d\u0430\u043c\u0438\u0447\u0435\u0441\u043a\u043e\u0435 \u0441\u0432\u044f\u0437\u044b\u0432\u0430\u043d\u0438\u0435
24.5 #StdLib.CUnit=CUnit
24.6 #StdLib.CppUnit=CppUnit
24.7 -StdLib.OracleInstantClient=OracleInstantClient
24.8 +#StdLib.OracleInstantClient=OracleInstantClient
24.9
25.1 --- a/src/ru/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/Bundle_ru.properties Thu Dec 01 10:27:42 2011 +0900
25.2 +++ b/src/ru/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/Bundle_ru.properties Thu Dec 01 17:14:33 2011 +0900
25.3 @@ -99,8 +99,8 @@
25.4
25.5
25.6 ## Database vendor display names
25.7 -DBVendor_oracle=Oracle (OCI)
25.8 -DBVendor_oracle-thin=\u0422\u043e\u043d\u043a\u0438\u0439 \u043a\u043b\u0438\u0435\u043d\u0442 Oracle
25.9 +#DBVendor_oracle=Oracle (OCI)
25.10 +#DBVendor_oracle-thin=\u0422\u043e\u043d\u043a\u0438\u0439 \u043a\u043b\u0438\u0435\u043d\u0442 Oracle
25.11 DBVendor_sybase1=Sybase (jConnect 4.2 \u0438 \u0431\u043e\u043b\u0435\u0435 \u0440\u0430\u043d\u043d\u0438\u0435 \u0432\u0435\u0440\u0441\u0438\u0438)
25.12 DBVendor_sybase2=Sybase (jConnect 5.2)
25.13 DBVendor_datadirect_sql=Microsoft SQL Server (DataDirect Connect \u0434\u043b\u044f JDBC)
26.1 --- a/src/ru/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/Bundle_ru.properties Thu Dec 01 10:27:42 2011 +0900
26.2 +++ b/src/ru/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/Bundle_ru.properties Thu Dec 01 17:14:33 2011 +0900
26.3 @@ -49,10 +49,10 @@
26.4
26.5 MSG_Loading_Config=\u041e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u0438 \u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043a \u0438\u0437 \u0444\u0430\u0439\u043b\u0430.
26.6
26.7 -LBL_OracleWebLogic=Oracle WebLogic Server {0}
26.8 -LBL_OracleWebLogicAlt=Oracle WebLogic Server {0} ({1})
26.9 +#LBL_OracleWebLogic=Oracle WebLogic Server {0}
26.10 +#LBL_OracleWebLogicAlt=Oracle WebLogic Server {0} ({1})
26.11
26.12 LBL_OracleJvmHotSpot=Java HotSpot
26.13 -LBL_OracleJvmJRockit=Oracle JRockit
26.14 +#LBL_OracleJvmJRockit=Oracle JRockit
26.15 LBL_OracleJvmDefault=\u041f\u043e \u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\u044e
26.16
27.1 --- a/src/ru/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/resources/Bundle_ru.properties Thu Dec 01 10:27:42 2011 +0900
27.2 +++ b/src/ru/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/resources/Bundle_ru.properties Thu Dec 01 17:14:33 2011 +0900
27.3 @@ -42,7 +42,7 @@
27.4 # made subject to such option by the copyright holder.
27.5 #
27.6
27.7 -OpenIDE-Module-Name=\u0421\u0435\u0440\u0432\u0435\u0440 Oracle WebLogic
27.8 +#OpenIDE-Module-Name=\u0421\u0435\u0440\u0432\u0435\u0440 Oracle WebLogic
27.9 OpenIDE-Module-Display-Category=Java Web \u0438 EE
27.10 OpenIDE-Module-Short-Description=\u041f\u043e\u0434\u043a\u043b\u044e\u0447\u0430\u0435\u043c\u044b\u0439 \u043c\u043e\u0434\u0443\u043b\u044c \u0434\u043b\u044f Oracle WebLogic Server
27.11 OpenIDE-Module-Long-Description=\u042d\u0442\u043e\u0442 \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0430\u0435\u043c\u044b\u0439 \u043c\u043e\u0434\u0443\u043b\u044c \u043f\u043e\u0437\u0432\u043e\u043b\u044f\u0435\u0442 \u0432\u044b\u043f\u043e\u043b\u043d\u044f\u0442\u044c \u0441 \u043f\u043e\u043c\u043e\u0449\u044c\u044e \u043c\u043e\u0434\u0443\u043b\u0435\u0439 \u0440\u0430\u0437\u0432\u0435\u0440\u0442\u044b\u0432\u0430\u043d\u0438\u044f J2EE \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0443, \u0440\u0430\u0437\u0432\u0435\u0440\u0442\u044b\u0432\u0430\u043d\u0438\u0435 \u0438 \u043e\u0442\u043b\u0430\u0434\u043a\u0443 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u043e\u0432 J2EE \u043d\u0430 Oracle WebLogic Server
28.1 --- a/src/ru/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/Bundle_ru.properties Thu Dec 01 10:27:42 2011 +0900
28.2 +++ b/src/ru/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/Bundle_ru.properties Thu Dec 01 17:14:33 2011 +0900
28.3 @@ -114,7 +114,7 @@
28.4 Templates/SunResources/JMS_Resource=\u0420\u0435\u0441\u0443\u0440\u0441\u044b JMS
28.5 Services/MIMEResolver/org-netbeans-modules-j2ee-sun-share-mime-resolver.xml=\u0424\u0430\u0439\u043b \u0434\u0435\u0441\u043a\u0440\u0438\u043f\u0442\u043e\u0440\u0430 \u0440\u0430\u0437\u0432\u0435\u0440\u0442\u044b\u0432\u0430\u043d\u0438\u044f sun-*
28.6 Templates/SunResources/sunDD=\u0414\u0435\u0441\u043a\u0440\u0438\u043f\u0442\u043e\u0440 GlassFish
28.7 -TXT_displayName=\u0421\u0435\u0440\u0432\u0435\u0440 Oracle WebLogic
28.8 +#TXT_displayName=\u0421\u0435\u0440\u0432\u0435\u0440 Oracle WebLogic
28.9 javaee-api-6.0=\u0411\u0438\u0431\u043b\u0438\u043e\u0442\u0435\u043a\u0430 API Java EE 6
28.10 javaee-web-api-6.0=\u0411\u0438\u0431\u043b\u0438\u043e\u0442\u0435\u043a\u0430 API Java EE Web 6
28.11 javaee-endorsed-api-6.0=\u0411\u0438\u0431\u043b\u0438\u043e\u0442\u0435\u043a\u0430 API Java EE 6 Endorsed
29.1 --- a/src/ru/ide/css-editor/css-editor/org/netbeans/modules/css/editor/actions/Bundle_ru.properties Thu Dec 01 10:27:42 2011 +0900
29.2 +++ b/src/ru/ide/css-editor/css-editor/org/netbeans/modules/css/editor/actions/Bundle_ru.properties Thu Dec 01 17:14:33 2011 +0900
29.3 @@ -92,7 +92,7 @@
29.4 No_preview_available=\u041f\u0440\u0435\u0434\u0432\u0430\u0440\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0439 \u043f\u0440\u043e\u0441\u043c\u043e\u0442\u0440 \u043d\u0435\u0434\u043e\u0441\u0442\u0443\u043f\u0435\u043d
29.5
29.6
29.7 -Sample_Text=\u041f\u0440\u0438\u043c\u0435\u0440 \u0442\u0435\u043a\u0441\u0442\u0430
29.8 +#Sample_Text=\u041f\u0440\u0438\u043c\u0435\u0440 \u0442\u0435\u043a\u0441\u0442\u0430
29.9
29.10
29.11 Create_Rule=\u0421\u043e\u0437\u0434\u0430\u0442\u044c \u043f\u0440\u0430\u0432\u0438\u043b\u043e
30.1 --- a/src/ru/ide/css-editor/css-editor/org/netbeans/modules/css/editor/ui/Bundle_ru.properties Thu Dec 01 10:27:42 2011 +0900
30.2 +++ b/src/ru/ide/css-editor/css-editor/org/netbeans/modules/css/editor/ui/Bundle_ru.properties Thu Dec 01 17:14:33 2011 +0900
30.3 @@ -92,7 +92,7 @@
30.4 No_preview_available=\u041f\u0440\u0435\u0434\u0432\u0430\u0440\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0439 \u043f\u0440\u043e\u0441\u043c\u043e\u0442\u0440 \u043d\u0435\u0434\u043e\u0441\u0442\u0443\u043f\u0435\u043d
30.5
30.6
30.7 -Sample_Text=\u041f\u0440\u0438\u043c\u0435\u0440 \u0442\u0435\u043a\u0441\u0442\u0430
30.8 +#Sample_Text=\u041f\u0440\u0438\u043c\u0435\u0440 \u0442\u0435\u043a\u0441\u0442\u0430
30.9
30.10
30.11 Create_Rule=\u0421\u043e\u0437\u0434\u0430\u0442\u044c \u043f\u0440\u0430\u0432\u0438\u043b\u043e
31.1 --- a/src/ru/ide/db/db/org/netbeans/modules/db/util/Bundle_ru.properties Thu Dec 01 10:27:42 2011 +0900
31.2 +++ b/src/ru/ide/db/db/org/netbeans/modules/db/util/Bundle_ru.properties Thu Dec 01 17:14:33 2011 +0900
31.3 @@ -56,8 +56,8 @@
31.4 DRIVERNAME_JavaDbEmbedded=Java DB (\u0432\u0441\u0442\u0440\u043e\u0435\u043d\u043d\u0430\u044f)
31.5 DRIVERNAME_JavaDbNetwork=Java DB (\u0432 \u0441\u0435\u0442\u0438)
31.6 DRIVERNAME_PostgreSQL=PostgreSQL
31.7 -DRIVERNAME_OracleThin=Oracle Thin
31.8 -DRIVERNAME_OracleOCI=Oracle OCI
31.9 +#DRIVERNAME_OracleThin=Oracle Thin
31.10 +#DRIVERNAME_OracleOCI=Oracle OCI
31.11 DRIVERNAME_JTDS=jTDS
31.12 DRIVERNAME_DB2JCC=IBM DB2 Universal Driver
31.13 DRIVERNAME_MSSQL2005=Microsoft SQL Server 2005
32.1 --- a/src/ru/java/java-source/java-source/org/netbeans/modules/java/ui/Bundle_ru.properties Thu Dec 01 10:27:42 2011 +0900
32.2 +++ b/src/ru/java/java-source/java-source/org/netbeans/modules/java/ui/Bundle_ru.properties Thu Dec 01 17:14:33 2011 +0900
32.3 @@ -232,9 +232,9 @@
32.4
32.5 #SAMPLE_Spaces=@Anno(paramA="aValue", paramB="bValue")public class ClassA {public int number = 1;private String text ="A";static float[] floats = new float[3];protected double[] doubles = new double[]{3.67,40,2e-30};static {floats[0]=12.6f;}public ClassA() {}public int meth(String text, int number) {if (number==13) {return (int)System.currentTimeMillis();}else {}for( int i = 20; i < 100; i++) {synchronized(this) {while(i%13>5)meth( text + " ", number++);}}for(float f : floats)System.out.println(f);switch(number) {case 1\:do { out( (2+3)*this.number--); } while(this.number > 6);return 10;case 2\:try {toString();}catch ( IllegalStateException illegalStateException ) {illegalStateException.printStackTrace();}finally {return 20;}default\:return number > 100 ? -1 : -2;}} }
32.6
32.7 -SAMPLE_Comments=public class ClassA {\n/**\n\u042d\u0442\u043e \u043f\u0435\u0440\u0432\u0430\u044f \u0447\u0430\u0441\u0442\u044c \u043e\u0431\u0440\u0430\u0437\u0446\u0430 \u043e\u043f\u0438\u0441\u0430\u043d\u0438\u044f \u043c\u0435\u0442\u043e\u0434\u0430.\n\u0412\u0442\u043e\u0440\u0430\u044f \u0447\u0430\u0441\u0442\u044c \u0432\u0432\u0435\u0434\u0435\u043d\u0430 \u043f\u043e\u0441\u043b\u0435 \u0432\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u043d\u043e\u0433\u043e \u0432\u0440\u0443\u0447\u043d\u0443\u044e \u043f\u0435\u0440\u0435\u043d\u043e\u0441\u0430 \u0441\u0442\u0440\u043e\u043a\u0438.\n\n\u041f\u043e\u0441\u043b\u0435\u0434\u043d\u044f\u044f \u0447\u0430\u0441\u0442\u044c \u0432\u0432\u0435\u0434\u0435\u043d\u0430 \u043f\u043e\u0441\u043b\u0435 \u043f\u0443\u0441\u0442\u043e\u0439 \u0441\u0442\u0440\u043e\u043a\u0438.\n@param text \u043e\u043f\u0438\u0441\u0430\u043d\u0438\u0435 \u043f\u0435\u0440\u0432\u043e\u0433\u043e \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0430\n@param number \u043e\u043f\u0438\u0441\u0430\u043d\u0438\u0435 \u0432\u0442\u043e\u0440\u043e\u0433\u043e \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0430\n@return \u043e\u043f\u0438\u0441\u0430\u043d\u0438\u0435 \u0432\u043e\u0437\u0432\u0440\u0430\u0449\u0430\u0435\u043c\u043e\u0433\u043e \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f\n@throws ExcepA \u043e\u043f\u0438\u0441\u0430\u043d\u0438\u0435 \u043f\u0435\u0440\u0432\u043e\u0433\u043e \u0438\u0441\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f\n@throws ExcB \u043e\u043f\u0438\u0441\u0430\u043d\u0438\u0435 \u0432\u0442\u043e\u0440\u043e\u0433\u043e \u0438\u0441\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f\n*/\npublic String meth(String text, int number) throws ExceptionA, ExcB {\n/*\u041a\u043e\u043c\u043c\u0435\u043d\u0442\u0430\u0440\u0438\u0439 \u0432 \u043e\u0434\u043d\u0443 \u0441\u0442\u0440\u043e\u043a\u0443*/\nreturn number > 0 ? text : null;\n}\n}
32.8 +#SAMPLE_Comments=public class ClassA {\n/**\n\u042d\u0442\u043e \u043f\u0435\u0440\u0432\u0430\u044f \u0447\u0430\u0441\u0442\u044c \u043e\u0431\u0440\u0430\u0437\u0446\u0430 \u043e\u043f\u0438\u0441\u0430\u043d\u0438\u044f \u043c\u0435\u0442\u043e\u0434\u0430.\n\u0412\u0442\u043e\u0440\u0430\u044f \u0447\u0430\u0441\u0442\u044c \u0432\u0432\u0435\u0434\u0435\u043d\u0430 \u043f\u043e\u0441\u043b\u0435 \u0432\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u043d\u043e\u0433\u043e \u0432\u0440\u0443\u0447\u043d\u0443\u044e \u043f\u0435\u0440\u0435\u043d\u043e\u0441\u0430 \u0441\u0442\u0440\u043e\u043a\u0438.\n\n\u041f\u043e\u0441\u043b\u0435\u0434\u043d\u044f\u044f \u0447\u0430\u0441\u0442\u044c \u0432\u0432\u0435\u0434\u0435\u043d\u0430 \u043f\u043e\u0441\u043b\u0435 \u043f\u0443\u0441\u0442\u043e\u0439 \u0441\u0442\u0440\u043e\u043a\u0438.\n@param text \u043e\u043f\u0438\u0441\u0430\u043d\u0438\u0435 \u043f\u0435\u0440\u0432\u043e\u0433\u043e \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0430\n@param number \u043e\u043f\u0438\u0441\u0430\u043d\u0438\u0435 \u0432\u0442\u043e\u0440\u043e\u0433\u043e \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0430\n@return \u043e\u043f\u0438\u0441\u0430\u043d\u0438\u0435 \u0432\u043e\u0437\u0432\u0440\u0430\u0449\u0430\u0435\u043c\u043e\u0433\u043e \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f\n@throws ExcepA \u043e\u043f\u0438\u0441\u0430\u043d\u0438\u0435 \u043f\u0435\u0440\u0432\u043e\u0433\u043e \u0438\u0441\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f\n@throws ExcB \u043e\u043f\u0438\u0441\u0430\u043d\u0438\u0435 \u0432\u0442\u043e\u0440\u043e\u0433\u043e \u0438\u0441\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f\n*/\npublic String meth(String text, int number) throws ExceptionA, ExcB {\n/*\u041a\u043e\u043c\u043c\u0435\u043d\u0442\u0430\u0440\u0438\u0439 \u0432 \u043e\u0434\u043d\u0443 \u0441\u0442\u0440\u043e\u043a\u0443*/\nreturn number > 0 ? text : null;\n}\n}
32.9
32.10 -SAMPLE_Imports=package org.netbeans.samples;public class ClassA {public void method() {}}
32.11 +#SAMPLE_Imports=package org.netbeans.samples;public class ClassA {public void method() {}}
32.12
32.13 #nlFinallyCheckBox1.text="finall&y"
32.14
33.1 --- a/src/ru/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/Bundle_ru.properties Thu Dec 01 10:27:42 2011 +0900
33.2 +++ b/src/ru/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/Bundle_ru.properties Thu Dec 01 17:14:33 2011 +0900
33.3 @@ -242,7 +242,7 @@
33.4 #COMMENT_dontuse_preloader=This project does not use Preloader
33.5 #COMMENT_javafx=This is a JavaFX project
33.6 #COMMENT_oldjnlp=Pre-JavaFX 2.0 WebStart is deactivated in JavaFX 2.0 projects
33.7 -COMMENT_oldjar=\u0421\u043e\u0437\u0434\u0430\u043d\u0438\u0435 \u0444\u0430\u0439\u043b\u043e\u0432, \u043d\u0435 \u044f\u0432\u043b\u044f\u044e\u0449\u0438\u0445\u0441\u044f JavaFX 2.0 jar, \u0432\u044b\u043a\u043b\u044e\u0447\u0435\u043d\u043e \u0432 \u043f\u0440\u043e\u0435\u043a\u0442\u0430\u0445 JavaFX 2.0
33.8 +#COMMENT_oldjar=\u0421\u043e\u0437\u0434\u0430\u043d\u0438\u0435 \u0444\u0430\u0439\u043b\u043e\u0432, \u043d\u0435 \u044f\u0432\u043b\u044f\u044e\u0449\u0438\u0445\u0441\u044f JavaFX 2.0 jar, \u0432\u044b\u043a\u043b\u044e\u0447\u0435\u043d\u043e \u0432 \u043f\u0440\u043e\u0435\u043a\u0442\u0430\u0445 JavaFX 2.0
33.9 #COMMENT_prepreloader=Preloader can not use a preloader
33.10 #COMMENT_updatemode=If true, application update mode is set to 'background', if false, update mode is set to 'eager'
33.11 #COMMENT_app_args=Do not set application arguments here, this property is re-generated from javafx.param.* properties
34.1 --- a/src/zh_CN/cnd/cnd-discovery/cnd-discovery/org/netbeans/modules/cnd/discovery/projectimport/Bundle_zh_CN.properties Thu Dec 01 10:27:42 2011 +0900
34.2 +++ b/src/zh_CN/cnd/cnd-discovery/cnd-discovery/org/netbeans/modules/cnd/discovery/projectimport/Bundle_zh_CN.properties Thu Dec 01 17:14:33 2011 +0900
34.3 @@ -37,7 +37,7 @@
34.4 ConfigureActionName=\u914d\u7f6e
34.5
34.6 Dialog_Title=\u9879\u76ee\u521b\u5efa\u72b6\u6001
34.7 -Dialog_Action=\u8be6\u7ec6\u4fe1\u606f
34.8 +#Dialog_Action=\u8be6\u7ec6\u4fe1\u606f
34.9 Configure_Success=\u5df2\u6210\u529f\u914d\u7f6e\u9879\u76ee\u4ee5\u83b7\u5f97\u4ee3\u7801\u5e2e\u52a9\u3002
34.10 Configure_Info=\u5df2\u90e8\u5206\u5b8c\u6210\u4e3a\u83b7\u5f97\u4ee3\u7801\u5e2e\u52a9\u800c\u8fdb\u884c\u7684\u9879\u76ee\u914d\u7f6e\u64cd\u4f5c\u3002
34.11 Configure_Fail=\u65e0\u6cd5\u914d\u7f6e\u9879\u76ee\u4ee5\u83b7\u5f97\u4ee3\u7801\u5e2e\u52a9\u3002
34.12 @@ -77,7 +77,7 @@
34.13 ImportExecutable.Progress=\u6b63\u5728\u5206\u6790\u4e8c\u8fdb\u5236\u6587\u4ef6...
34.14 ImportExecutable.Progress.ProjectCreating=\u6b63\u5728\u521b\u5efa\u9879\u76ee...
34.15
34.16 -MAKE_LABEL={0} (Make)
34.17 -MAKE_REMOTE_LABEL={0} (Make) - {2}
34.18 +#MAKE_LABEL={0} (Make)
34.19 +#MAKE_REMOTE_LABEL={0} (Make) - {2}
34.20
34.21
35.1 --- a/src/zh_CN/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/platform/Bundle_zh_CN.properties Thu Dec 01 10:27:42 2011 +0900
35.2 +++ b/src/zh_CN/cnd/cnd-makeproject/cnd-makeproject/org/netbeans/modules/cnd/makeproject/platform/Bundle_zh_CN.properties Thu Dec 01 17:14:33 2011 +0900
35.3 @@ -58,5 +58,5 @@
35.4 StdLib.DynamicLinking=\u52a8\u6001\u94fe\u63a5
35.5 #StdLib.CUnit=CUnit
35.6 #StdLib.CppUnit=CppUnit
35.7 -StdLib.OracleInstantClient=OracleInstantClient
35.8 +#StdLib.OracleInstantClient=OracleInstantClient
35.9
36.1 --- a/src/zh_CN/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/Bundle_zh_CN.properties Thu Dec 01 10:27:42 2011 +0900
36.2 +++ b/src/zh_CN/enterprise/j2ee-sun-appsrv/j2ee-sun-appsrv/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/Bundle_zh_CN.properties Thu Dec 01 17:14:33 2011 +0900
36.3 @@ -99,8 +99,8 @@
36.4
36.5
36.6 ## Database vendor display names
36.7 -DBVendor_oracle=Oracle (OCI)
36.8 -DBVendor_oracle-thin=Oracle thin
36.9 +#DBVendor_oracle=Oracle (OCI)
36.10 +#DBVendor_oracle-thin=Oracle thin
36.11 DBVendor_sybase1=Sybase\uff08jConnect 4.2 \u53ca\u65e9\u671f\u7248\u672c\uff09
36.12 DBVendor_sybase2=Sybase (jConnect 5.2)
36.13 DBVendor_datadirect_sql=Microsoft SQL Server (DataDirect Connect for JDBC)
37.1 --- a/src/zh_CN/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/Bundle_zh_CN.properties Thu Dec 01 10:27:42 2011 +0900
37.2 +++ b/src/zh_CN/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/Bundle_zh_CN.properties Thu Dec 01 17:14:33 2011 +0900
37.3 @@ -49,10 +49,10 @@
37.4
37.5 MSG_Loading_Config=\u4ece\u6587\u4ef6\u4e2d\u88c5\u5165\u914d\u7f6e\u65f6\u51fa\u73b0\u9519\u8bef\u3002
37.6
37.7 -LBL_OracleWebLogic=Oracle WebLogic Server {0}
37.8 -LBL_OracleWebLogicAlt=Oracle WebLogic Server {0} ({1})
37.9 +#LBL_OracleWebLogic=Oracle WebLogic Server {0}
37.10 +#LBL_OracleWebLogicAlt=Oracle WebLogic Server {0} ({1})
37.11
37.12 LBL_OracleJvmHotSpot=Java \u70ed\u70b9
37.13 -LBL_OracleJvmJRockit=Oracle JRockit
37.14 +#LBL_OracleJvmJRockit=Oracle JRockit
37.15 LBL_OracleJvmDefault=\u7f3a\u7701
37.16
38.1 --- a/src/zh_CN/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/resources/Bundle_zh_CN.properties Thu Dec 01 10:27:42 2011 +0900
38.2 +++ b/src/zh_CN/enterprise/j2ee-weblogic9/j2ee-weblogic9/org/netbeans/modules/j2ee/weblogic9/resources/Bundle_zh_CN.properties Thu Dec 01 17:14:33 2011 +0900
38.3 @@ -42,7 +42,7 @@
38.4 # made subject to such option by the copyright holder.
38.5 #
38.6
38.7 -OpenIDE-Module-Name=Oracle WebLogic Server
38.8 +#OpenIDE-Module-Name=Oracle WebLogic Server
38.9 OpenIDE-Module-Display-Category=Java Web \u548c Java EE
38.10 OpenIDE-Module-Short-Description=Oracle WebLogic Server \u63d2\u4ef6
38.11 OpenIDE-Module-Long-Description=\u8be5\u63d2\u4ef6\u5141\u8bb8 J2EE \u5f00\u53d1\u6a21\u5757\u5728 Oracle WebLogic Server \u4e0a\u914d\u7f6e\u3001\u90e8\u7f72\u548c\u8c03\u8bd5 J2EE \u7ec4\u4ef6
39.1 --- a/src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/Bundle_zh_CN.properties Thu Dec 01 10:27:42 2011 +0900
39.2 +++ b/src/zh_CN/ergonomics/ide-ergonomics/ide-ergonomics/org/netbeans/modules/ide/ergonomics/enterprise/Bundle_zh_CN.properties Thu Dec 01 17:14:33 2011 +0900
39.3 @@ -114,7 +114,7 @@
39.4 Templates/SunResources/JMS_Resource=JMS \u8d44\u6e90
39.5 Services/MIMEResolver/org-netbeans-modules-j2ee-sun-share-mime-resolver.xml=sun-* \u90e8\u7f72\u63cf\u8ff0\u7b26\u6587\u4ef6
39.6 Templates/SunResources/sunDD=GlassFish \u63cf\u8ff0\u7b26
39.7 -TXT_displayName=Oracle WebLogic Server
39.8 +#TXT_displayName=Oracle WebLogic Server
39.9 javaee-api-6.0=Java EE 6 API \u5e93
39.10 javaee-web-api-6.0=Java EE Web 6 API \u5e93
39.11 javaee-endorsed-api-6.0=Java EE 6 \u652f\u6301\u7684 API \u5e93
40.1 --- a/src/zh_CN/ide/css-editor/css-editor/org/netbeans/modules/css/editor/actions/Bundle_zh_CN.properties Thu Dec 01 10:27:42 2011 +0900
40.2 +++ b/src/zh_CN/ide/css-editor/css-editor/org/netbeans/modules/css/editor/actions/Bundle_zh_CN.properties Thu Dec 01 17:14:33 2011 +0900
40.3 @@ -92,7 +92,7 @@
40.4 No_preview_available=\u65e0\u53ef\u7528\u7684\u9884\u89c8
40.5
40.6
40.7 -Sample_Text=\u6837\u4f8b\u6587\u672c
40.8 +#Sample_Text=\u6837\u4f8b\u6587\u672c
40.9
40.10
40.11 Create_Rule=\u521b\u5efa\u89c4\u5219
41.1 --- a/src/zh_CN/ide/css-editor/css-editor/org/netbeans/modules/css/editor/ui/Bundle_zh_CN.properties Thu Dec 01 10:27:42 2011 +0900
41.2 +++ b/src/zh_CN/ide/css-editor/css-editor/org/netbeans/modules/css/editor/ui/Bundle_zh_CN.properties Thu Dec 01 17:14:33 2011 +0900
41.3 @@ -92,7 +92,7 @@
41.4 No_preview_available=\u65e0\u53ef\u7528\u7684\u9884\u89c8
41.5
41.6
41.7 -Sample_Text=\u6837\u4f8b\u6587\u672c
41.8 +#Sample_Text=\u6837\u4f8b\u6587\u672c
41.9
41.10
41.11 Create_Rule=\u521b\u5efa\u89c4\u5219
42.1 --- a/src/zh_CN/ide/db/db/org/netbeans/modules/db/util/Bundle_zh_CN.properties Thu Dec 01 10:27:42 2011 +0900
42.2 +++ b/src/zh_CN/ide/db/db/org/netbeans/modules/db/util/Bundle_zh_CN.properties Thu Dec 01 17:14:33 2011 +0900
42.3 @@ -56,8 +56,8 @@
42.4 DRIVERNAME_JavaDbEmbedded=Java DB\uff08\u5d4c\u5165\u5f0f\uff09
42.5 DRIVERNAME_JavaDbNetwork=Java DB\uff08\u7f51\u7edc\uff09
42.6 DRIVERNAME_PostgreSQL=PostgreSQL
42.7 -DRIVERNAME_OracleThin=Oracle Thin
42.8 -DRIVERNAME_OracleOCI=Oracle OCI
42.9 +#DRIVERNAME_OracleThin=Oracle Thin
42.10 +#DRIVERNAME_OracleOCI=Oracle OCI
42.11 DRIVERNAME_JTDS=jTDS
42.12 DRIVERNAME_DB2JCC=IBM DB2 \u901a\u7528\u9a71\u52a8\u7a0b\u5e8f
42.13 DRIVERNAME_MSSQL2005=Microsoft SQL Server 2005
43.1 --- a/src/zh_CN/java/java-source/java-source/org/netbeans/modules/java/ui/Bundle_zh_CN.properties Thu Dec 01 10:27:42 2011 +0900
43.2 +++ b/src/zh_CN/java/java-source/java-source/org/netbeans/modules/java/ui/Bundle_zh_CN.properties Thu Dec 01 17:14:33 2011 +0900
43.3 @@ -232,9 +232,9 @@
43.4
43.5 #SAMPLE_Spaces=@Anno(paramA="aValue", paramB="bValue")public class ClassA {public int number = 1;private String text ="A";static float[] floats = new float[3];protected double[] doubles = new double[]{3.67,40,2e-30};static {floats[0]=12.6f;}public ClassA() {}public int meth(String text, int number) {if (number==13) {return (int)System.currentTimeMillis();}else {}for( int i = 20; i < 100; i++) {synchronized(this) {while(i%13>5)meth( text + " ", number++);}}for(float f : floats)System.out.println(f);switch(number) {case 1\:do { out( (2+3)*this.number--); } while(this.number > 6);return 10;case 2\:try {toString();}catch ( IllegalStateException illegalStateException ) {illegalStateException.printStackTrace();}finally {return 20;}default\:return number > 100 ? -1 : -2;}} }
43.6
43.7 -SAMPLE_Comments=public class ClassA {\n/**\nThis is the first part of a sample method description.\nThe second part is placed after a manual newline.\n\nThe last part is placed after an empty line.\n@param text the first parameter description\n@param number the second parameter description\n@return this is the return value description\n@throws ExcepA the first exception description\n@throws ExcB the second exception description\n*/\npublic String meth(String text, int number) throws ExceptionA, ExcB {\n/*This is one line comment*/\nreturn number > 0 ? text : null;\n}\n}
43.8 +#SAMPLE_Comments=public class ClassA {\n/**\nThis is the first part of a sample method description.\nThe second part is placed after a manual newline.\n\nThe last part is placed after an empty line.\n@param text the first parameter description\n@param number the second parameter description\n@return this is the return value description\n@throws ExcepA the first exception description\n@throws ExcB the second exception description\n*/\npublic String meth(String text, int number) throws ExceptionA, ExcB {\n/*This is one line comment*/\nreturn number > 0 ? text : null;\n}\n}
43.9
43.10 -SAMPLE_Imports=package org.netbeans.samples;public class ClassA {public void method() {}}
43.11 +#SAMPLE_Imports=package org.netbeans.samples;public class ClassA {public void method() {}}
43.12
43.13 #nlFinallyCheckBox1.text="finall&y"
43.14
44.1 --- a/src/zh_CN/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/Bundle_zh_CN.properties Thu Dec 01 10:27:42 2011 +0900
44.2 +++ b/src/zh_CN/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/Bundle_zh_CN.properties Thu Dec 01 17:14:33 2011 +0900
44.3 @@ -242,7 +242,7 @@
44.4 #COMMENT_dontuse_preloader=This project does not use Preloader
44.5 #COMMENT_javafx=This is a JavaFX project
44.6 #COMMENT_oldjnlp=Pre-JavaFX 2.0 WebStart is deactivated in JavaFX 2.0 projects
44.7 -COMMENT_oldjar=Non-JavaFX 2.0 jar file creation is deactivated in JavaFX 2.0 projects
44.8 +#COMMENT_oldjar=Non-JavaFX 2.0 jar file creation is deactivated in JavaFX 2.0 projects
44.9 #COMMENT_prepreloader=Preloader can not use a preloader
44.10 #COMMENT_updatemode=If true, application update mode is set to 'background', if false, update mode is set to 'eager'
44.11 #COMMENT_app_args=Do not set application arguments here, this property is re-generated from javafx.param.* properties