1.1 --- a/src/ja/ide/org-netbeans-libs-git/org-netbeans-libs-git/org/netbeans/libs/git/Bundle_ja.properties Wed Apr 25 18:30:02 2012 +0900
1.2 +++ b/src/ja/ide/org-netbeans-libs-git/org-netbeans-libs-git/org/netbeans/libs/git/Bundle_ja.properties Wed Apr 25 18:36:58 2012 +0900
1.3 @@ -59,18 +59,18 @@
1.4 MSG_Exception_CheckoutConflicts = \u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u6642\u306e\u885d\u7a81
1.5
1.6 #GitConflictDescriptor
1.7 -MSG_GitConflictDescriptor_BOTH_DELETED.shortDesc = \u4e21\u65b9\u306b\u3088\u3063\u3066\u524a\u9664\u6e08\u307f
1.8 -MSG_GitConflictDescriptor_BOTH_DELETED.desc = \u30d5\u30a1\u30a4\u30eb\u306f\u4e21\u65b9\u306e\u5206\u5c90\u3067\u524a\u9664\u3055\u308c\u307e\u3057\u305f
1.9 -MSG_GitConflictDescriptor_ADDED_BY_US.shortDesc = \u79c1\u305f\u3061\u306b\u3088\u3063\u3066\u8ffd\u52a0\u6e08\u307f
1.10 +#MSG_GitConflictDescriptor_BOTH_DELETED.shortDesc = \u4e21\u65b9\u306b\u3088\u3063\u3066\u524a\u9664\u6e08\u307f
1.11 +#MSG_GitConflictDescriptor_BOTH_DELETED.desc = \u30d5\u30a1\u30a4\u30eb\u306f\u4e21\u65b9\u306e\u5206\u5c90\u3067\u524a\u9664\u3055\u308c\u307e\u3057\u305f
1.12 +#MSG_GitConflictDescriptor_ADDED_BY_US.shortDesc = \u79c1\u305f\u3061\u306b\u3088\u3063\u3066\u8ffd\u52a0\u6e08\u307f
1.13 MSG_GitConflictDescriptor_ADDED_BY_US.desc = \u73fe\u5728\u306e\u5206\u5c90\u306b\u30d5\u30a1\u30a4\u30eb\u304c\u8ffd\u52a0\u3055\u308c\u307e\u3057\u305f
1.14 -MSG_GitConflictDescriptor_DELETED_BY_THEM.shortDesc = \u5f7c\u3089\u306b\u3088\u3063\u3066\u524a\u9664\u6e08\u307f
1.15 -MSG_GitConflictDescriptor_DELETED_BY_THEM.desc = \u4ed6\u306e\u5206\u5c90\u3067\u30d5\u30a1\u30a4\u30eb\u304c\u524a\u9664\u3055\u308c\u307e\u3057\u305f
1.16 -MSG_GitConflictDescriptor_ADDED_BY_THEM.shortDesc = \u5f7c\u3089\u306b\u3088\u3063\u3066\u8ffd\u52a0\u6e08\u307f
1.17 -MSG_GitConflictDescriptor_ADDED_BY_THEM.desc = \u4ed6\u306e\u5206\u5c90\u306b\u30d5\u30a1\u30a4\u30eb\u304c\u8ffd\u52a0\u3055\u308c\u307e\u3057\u305f
1.18 -MSG_GitConflictDescriptor_DELETED_BY_US.shortDesc = \u79c1\u305f\u3061\u306b\u3088\u3063\u3066\u524a\u9664\u6e08\u307f
1.19 -MSG_GitConflictDescriptor_DELETED_BY_US.desc = \u73fe\u5728\u306e\u5206\u5c90\u3067\u30d5\u30a1\u30a4\u30eb\u304c\u524a\u9664\u3055\u308c\u307e\u3057\u305f
1.20 -MSG_GitConflictDescriptor_BOTH_ADDED.shortDesc = \u4e21\u65b9\u306b\u3088\u3063\u3066\u8ffd\u52a0\u6e08\u307f
1.21 -MSG_GitConflictDescriptor_BOTH_ADDED.desc = \u4e21\u65b9\u306e\u5206\u5c90\u306b\u30d5\u30a1\u30a4\u30eb\u304c\u8ffd\u52a0\u3055\u308c\u307e\u3057\u305f
1.22 -MSG_GitConflictDescriptor_BOTH_MODIFIED.shortDesc = \u4e21\u65b9\u306b\u3088\u3063\u3066\u5909\u66f4\u6e08\u307f
1.23 -MSG_GitConflictDescriptor_BOTH_MODIFIED.desc = \u4e21\u65b9\u306e\u5206\u5c90\u3067\u30d5\u30a1\u30a4\u30eb\u304c\u5909\u66f4\u3055\u308c\u307e\u3057\u305f
1.24 +#MSG_GitConflictDescriptor_DELETED_BY_THEM.shortDesc = \u5f7c\u3089\u306b\u3088\u3063\u3066\u524a\u9664\u6e08\u307f
1.25 +#MSG_GitConflictDescriptor_DELETED_BY_THEM.desc = \u4ed6\u306e\u5206\u5c90\u3067\u30d5\u30a1\u30a4\u30eb\u304c\u524a\u9664\u3055\u308c\u307e\u3057\u305f
1.26 +#MSG_GitConflictDescriptor_ADDED_BY_THEM.shortDesc = \u5f7c\u3089\u306b\u3088\u3063\u3066\u8ffd\u52a0\u6e08\u307f
1.27 +#MSG_GitConflictDescriptor_ADDED_BY_THEM.desc = \u4ed6\u306e\u5206\u5c90\u306b\u30d5\u30a1\u30a4\u30eb\u304c\u8ffd\u52a0\u3055\u308c\u307e\u3057\u305f
1.28 +#MSG_GitConflictDescriptor_DELETED_BY_US.shortDesc = \u79c1\u305f\u3061\u306b\u3088\u3063\u3066\u524a\u9664\u6e08\u307f
1.29 +#MSG_GitConflictDescriptor_DELETED_BY_US.desc = \u73fe\u5728\u306e\u5206\u5c90\u3067\u30d5\u30a1\u30a4\u30eb\u304c\u524a\u9664\u3055\u308c\u307e\u3057\u305f
1.30 +#MSG_GitConflictDescriptor_BOTH_ADDED.shortDesc = \u4e21\u65b9\u306b\u3088\u3063\u3066\u8ffd\u52a0\u6e08\u307f
1.31 +#MSG_GitConflictDescriptor_BOTH_ADDED.desc = \u4e21\u65b9\u306e\u5206\u5c90\u306b\u30d5\u30a1\u30a4\u30eb\u304c\u8ffd\u52a0\u3055\u308c\u307e\u3057\u305f
1.32 +#MSG_GitConflictDescriptor_BOTH_MODIFIED.shortDesc = \u4e21\u65b9\u306b\u3088\u3063\u3066\u5909\u66f4\u6e08\u307f
1.33 +#MSG_GitConflictDescriptor_BOTH_MODIFIED.desc = \u4e21\u65b9\u306e\u5206\u5c90\u3067\u30d5\u30a1\u30a4\u30eb\u304c\u5909\u66f4\u3055\u308c\u307e\u3057\u305f
1.34
2.1 --- a/src/ja/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/Bundle_ja.properties Wed Apr 25 18:30:02 2012 +0900
2.2 +++ b/src/ja/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/Bundle_ja.properties Wed Apr 25 18:36:58 2012 +0900
2.3 @@ -41,7 +41,7 @@
2.4 ACSD_JavaExtSourcesProjectLocation=\u65e2\u5b58\u306e\u30bd\u30fc\u30b9\u3092\u4f7f\u7528\u3059\u308b JavaFX \u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u65b0\u898f\u4f5c\u6210\u3057\u307e\u3059
2.5 #NOI18N
2.6 #TXT_ClassName=Main
2.7 -TXT_ClassNamePreloader=\u30d7\u30ec\u30ed\u30fc\u30c0\u30fc
2.8 +#TXT_ClassNamePreloader=\u30d7\u30ec\u30ed\u30fc\u30c0\u30fc
2.9 #NOI18N
2.10 #TXT_PackageNamePrefix=pkg
2.11 LAB_ConfigureProject=\u540d\u524d\u3068\u5834\u6240
3.1 --- a/src/ja/mobility/vmd-midp/vmd-midp/org/netbeans/modules/vmd/midp/propertyeditors/Bundle_ja.properties Wed Apr 25 18:30:02 2012 +0900
3.2 +++ b/src/ja/mobility/vmd-midp/vmd-midp/org/netbeans/modules/vmd/midp/propertyeditors/Bundle_ja.properties Wed Apr 25 18:36:58 2012 +0900
3.3 @@ -41,7 +41,7 @@
3.4 # made subject to such option by the copyright holder.
3.5
3.6 # PropertyEditorPreferredSize
3.7 -LBL_PREF_SIZE_UNLOCKED_TXT=\u30ed\u30c3\u30af\u89e3\u9664
3.8 +#LBL_PREF_SIZE_UNLOCKED_TXT=\u30ed\u30c3\u30af\u89e3\u9664
3.9 LBL_PREF_SIZE_UNLOCKED=\u30ed\u30c3\u30af\u89e3\u9664(&L)
3.10
3.11 # PropertyEditorImage
3.12 @@ -85,7 +85,7 @@
3.13 #PropertyValueGaugeMaxValue
3.14 LBL_GAUGE_MAX_VALUE_STR=\u6700\u5927\u5024(&M):
3.15 LBL_GAUGE_MAX_VALUE_UCLABEL=\u30b2\u30fc\u30b8\u6700\u5927\u5024
3.16 -LBL_MAX_VALUE_INDEFINITE_TXT=\u4e0d\u5b9a\u6570
3.17 +#LBL_MAX_VALUE_INDEFINITE_TXT=\u4e0d\u5b9a\u6570
3.18 LBL_MAX_VALUE_INDEFINITE=\u4e0d\u5b9a\u6570(&I)
3.19
3.20 #PropertyEditorBooleanUC
3.21 @@ -150,7 +150,7 @@
3.22 #MNM_TIMEOUTPE_FOREVER=F
3.23 LBL_TIMEOUT_STR=\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8(&T):
3.24 LBL_TIMEOUT_UCLABEL=\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8
3.25 -LBL_TIMEOUTPE_FOREVER_TXT=\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8\u306a\u3057
3.26 +#LBL_TIMEOUTPE_FOREVER_TXT=\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8\u306a\u3057
3.27 ACSN_TIMEOUT_STR=\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8
3.28 ACSD_TIMEOUT_STR=\u30ab\u30b9\u30bf\u30e0\u306e\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8\u5024\u3092\u9078\u629e\u3057\u307e\u3059
3.29 ACSN_TIMEOUTPE_FOREVER=\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8\u306a\u3057
3.30 @@ -227,7 +227,7 @@
3.31 MNM_ITEMLAYOUTPE_GEN_DEFAULT=D
3.32 ACSN_ITEMLAYOUTPE_GEN_DEFAULT=\u4e00\u822c\u306e\u30c7\u30d5\u30a9\u30eb\u30c8\u306e\u30ec\u30a4\u30a2\u30a6\u30c8
3.33 ACSD_ITEMLAYOUTPE_GEN_DEFAULT=\u4e00\u822c\u306e\u30c7\u30d5\u30a9\u30eb\u30c8\u306e\u30ec\u30a4\u30a2\u30a6\u30c8\u3092\u9078\u629e\u3057\u307e\u3059
3.34 -LBL_ITEMLAYOUTPE_GEN_MIDP2=MIDP 2
3.35 +#LBL_ITEMLAYOUTPE_GEN_MIDP2=MIDP 2
3.36 MNM_ITEMLAYOUTPE_GEN_MIDP2=2
3.37 ACSN_ITEMLAYOUTPE_GEN_MIDP2=\u4e00\u822c\u306e MIDP 2 \u30ec\u30a4\u30a2\u30a6\u30c8
3.38 #ACSD_ITEMLAYOUTPE_GEN_MIDP2=Selects general MIDP 2 layout
3.39 @@ -363,9 +363,9 @@
3.40 #LBL_FONTPE_RB_SMALL=Small
3.41 #MNM_FONTPE_RB_SMALL=A
3.42
3.43 -LBL_TEXTFIELDPE_CAPS_WORD=INITIAL_CAPS_WORD
3.44 +#LBL_TEXTFIELDPE_CAPS_WORD=INITIAL_CAPS_WORD
3.45 MNM_TEXTFIELDPE_CAPS_WORD=W
3.46 -LBL_TEXTFIELDPE_CAPS_SENTENCE=INITIAL_CAPS_SENTENCE
3.47 +#LBL_TEXTFIELDPE_CAPS_SENTENCE=INITIAL_CAPS_SENTENCE
3.48 MNM_TEXTFIELDPE_CAPS_SENTENCE=E
3.49 LBL_TEXTFIELDPE_URL=URL
3.50 MNM_TEXTFIELDPE_URL=R
4.1 --- a/src/ja/platform/autoupdate-ui/autoupdate-ui/org/netbeans/modules/autoupdate/ui/Bundle_ja.properties Wed Apr 25 18:30:02 2012 +0900
4.2 +++ b/src/ja/platform/autoupdate-ui/autoupdate-ui/org/netbeans/modules/autoupdate/ui/Bundle_ja.properties Wed Apr 25 18:36:58 2012 +0900
4.3 @@ -32,7 +32,7 @@
4.4 UnitTab_Tooltip_AddAction_LOCAL=\u30ed\u30fc\u30ab\u30eb\u3067\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u3057\u305f\u30d7\u30e9\u30b0\u30a4\u30f3\u3092\u8ffd\u52a0
4.5 UnitTab_Tooltip_RemoveAction_LOCAL=\u30d7\u30e9\u30b0\u30a4\u30f3\u3092\u4e00\u89a7\u304b\u3089\u524a\u9664
4.6 UnitTab_bTabAction_Name_LOCAL=\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb(&I)
4.7 -UnitTab_lHowManySelected_TextFormatWithSize={0}, {1}
4.8 +#UnitTab_lHowManySelected_TextFormatWithSize={0}, {1}
4.9 UnitTab_lHowManySelected_Single_Text={0} \u500b\u306e\u30d7\u30e9\u30b0\u30a4\u30f3\u304c\u9078\u629e\u3055\u308c\u307e\u3057\u305f
4.10 UnitTab_lHowManySelected_Many_Text={0} \u500b\u306e\u30d7\u30e9\u30b0\u30a4\u30f3\u304c\u9078\u629e\u3055\u308c\u307e\u3057\u305f
4.11 UnitTab_OperationName_Text_INSTALLED=\u30a2\u30f3\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb
4.12 @@ -54,7 +54,7 @@
4.13 NotificationMoreAlreadyInstalled=\u30d7\u30e9\u30b0\u30a4\u30f3 "{0}" \u306f\u3059\u3067\u306b\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3055\u308c\u3066\u3044\u307e\u3059\u3002
4.14 NotificationAlreadyPresent=\u30d7\u30e9\u30b0\u30a4\u30f3 "{0}" \u306f\u3059\u3067\u306b\u8ffd\u52a0\u3055\u308c\u3066\u3044\u307e\u3059\u3002"{1}" \u306b\u7f6e\u304d\u63db\u3048\u307e\u3059\u304b ?
4.15 NotificationAlreadyPresentTitle=\u30d7\u30e9\u30b0\u30a4\u30f3\u306e\u7f6e\u63db
4.16 -NotificationPlugin={0} [{1}]
4.17 +#NotificationPlugin={0} [{1}]
4.18 #TODO: message should contain spec.version
4.19 #NotificationAlreadyPreparedToIntsall=Plugin {0}, specification version {1} is already prepared to install.
4.20 CTL_FileChooser_Title=\u30d7\u30e9\u30b0\u30a4\u30f3\u306e\u8ffd\u52a0
4.21 @@ -120,12 +120,12 @@
4.22 SettingsTab_NewProviderURL=http://
4.23 SettingsTab_UpdateUnitProvider_Description=\u8aac\u660e:
4.24 SettingsTab_UpdateUnitProvider_URL=URL:
4.25 -Utilities_DownloadSize_GB=GB
4.26 -Utilities_DownloadSize_MB=MB
4.27 -Utilities_DownloadSize_kB=kB
4.28 -Utilities_DownloadSize_B=B
4.29 -PluginManagerUI_Tabs_NameFormat={0} ({1})
4.30 -PluginManagerUI_Tabs_CountFormat={0}/{1}
4.31 +#Utilities_DownloadSize_GB=GB
4.32 +#Utilities_DownloadSize_MB=MB
4.33 +#Utilities_DownloadSize_kB=kB
4.34 +#Utilities_DownloadSize_B=B
4.35 +#PluginManagerUI_Tabs_NameFormat={0} ({1})
4.36 +#PluginManagerUI_Tabs_CountFormat={0}/{1}
4.37 UnitDetails_Category_NoDescription=
4.38 UnitDetails_Plugin_Version=\u30d0\u30fc\u30b8\u30e7\u30f3:
4.39 UnitDetails_Plugin_InstalledVersion=\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u6e08\u307f\u306e\u30d0\u30fc\u30b8\u30e7\u30f3:
5.1 --- a/src/pt_BR/ide/org-netbeans-libs-git/org-netbeans-libs-git/org/netbeans/libs/git/Bundle_pt_BR.properties Wed Apr 25 18:30:02 2012 +0900
5.2 +++ b/src/pt_BR/ide/org-netbeans-libs-git/org-netbeans-libs-git/org/netbeans/libs/git/Bundle_pt_BR.properties Wed Apr 25 18:36:58 2012 +0900
5.3 @@ -59,18 +59,18 @@
5.4 MSG_Exception_CheckoutConflicts = Conflitos durante o check-out
5.5
5.6 #GitConflictDescriptor
5.7 -MSG_GitConflictDescriptor_BOTH_DELETED.shortDesc = Exclu\u00eddo por ambos
5.8 -MSG_GitConflictDescriptor_BOTH_DELETED.desc = O arquivo foi exclu\u00eddo nas duas ramifica\u00e7\u00f5es
5.9 -MSG_GitConflictDescriptor_ADDED_BY_US.shortDesc = Adicionado por n\u00f3s
5.10 +#MSG_GitConflictDescriptor_BOTH_DELETED.shortDesc = Exclu\u00eddo por ambos
5.11 +#MSG_GitConflictDescriptor_BOTH_DELETED.desc = O arquivo foi exclu\u00eddo nas duas ramifica\u00e7\u00f5es
5.12 +#MSG_GitConflictDescriptor_ADDED_BY_US.shortDesc = Adicionado por n\u00f3s
5.13 MSG_GitConflictDescriptor_ADDED_BY_US.desc = O arquivo foi adicionado na ramifica\u00e7\u00e3o atual
5.14 -MSG_GitConflictDescriptor_DELETED_BY_THEM.shortDesc = Exclu\u00eddo por eles
5.15 -MSG_GitConflictDescriptor_DELETED_BY_THEM.desc = O arquivo foi exclu\u00eddo em outra ramifica\u00e7\u00e3o
5.16 -MSG_GitConflictDescriptor_ADDED_BY_THEM.shortDesc = Adicionado por eles
5.17 -MSG_GitConflictDescriptor_ADDED_BY_THEM.desc = O arquivo foi adicionado em outra ramifica\u00e7\u00e3o
5.18 -MSG_GitConflictDescriptor_DELETED_BY_US.shortDesc = Exclu\u00eddo por n\u00f3s
5.19 -MSG_GitConflictDescriptor_DELETED_BY_US.desc = O arquivo foi exclu\u00eddo na ramifica\u00e7\u00e3o atual
5.20 -MSG_GitConflictDescriptor_BOTH_ADDED.shortDesc = Adicionado por ambos
5.21 -MSG_GitConflictDescriptor_BOTH_ADDED.desc = O arquivo foi adicionado nas duas ramifica\u00e7\u00f5es
5.22 -MSG_GitConflictDescriptor_BOTH_MODIFIED.shortDesc = Modificado por ambos
5.23 -MSG_GitConflictDescriptor_BOTH_MODIFIED.desc = O arquivo foi modificado nas duas ramifica\u00e7\u00f5es
5.24 +#MSG_GitConflictDescriptor_DELETED_BY_THEM.shortDesc = Exclu\u00eddo por eles
5.25 +#MSG_GitConflictDescriptor_DELETED_BY_THEM.desc = O arquivo foi exclu\u00eddo em outra ramifica\u00e7\u00e3o
5.26 +#MSG_GitConflictDescriptor_ADDED_BY_THEM.shortDesc = Adicionado por eles
5.27 +#MSG_GitConflictDescriptor_ADDED_BY_THEM.desc = O arquivo foi adicionado em outra ramifica\u00e7\u00e3o
5.28 +#MSG_GitConflictDescriptor_DELETED_BY_US.shortDesc = Exclu\u00eddo por n\u00f3s
5.29 +#MSG_GitConflictDescriptor_DELETED_BY_US.desc = O arquivo foi exclu\u00eddo na ramifica\u00e7\u00e3o atual
5.30 +#MSG_GitConflictDescriptor_BOTH_ADDED.shortDesc = Adicionado por ambos
5.31 +#MSG_GitConflictDescriptor_BOTH_ADDED.desc = O arquivo foi adicionado nas duas ramifica\u00e7\u00f5es
5.32 +#MSG_GitConflictDescriptor_BOTH_MODIFIED.shortDesc = Modificado por ambos
5.33 +#MSG_GitConflictDescriptor_BOTH_MODIFIED.desc = O arquivo foi modificado nas duas ramifica\u00e7\u00f5es
5.34
6.1 --- a/src/pt_BR/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/Bundle_pt_BR.properties Wed Apr 25 18:30:02 2012 +0900
6.2 +++ b/src/pt_BR/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/Bundle_pt_BR.properties Wed Apr 25 18:36:58 2012 +0900
6.3 @@ -41,7 +41,7 @@
6.4 ACSD_JavaExtSourcesProjectLocation=Cria um novo projeto do JavaFX com origens existentes
6.5 #NOI18N
6.6 #TXT_ClassName=Main
6.7 -TXT_ClassNamePreloader=Pr\u00e9-carregador
6.8 +#TXT_ClassNamePreloader=Pr\u00e9-carregador
6.9 #NOI18N
6.10 #TXT_PackageNamePrefix=pkg
6.11 LAB_ConfigureProject=Nome e local
7.1 --- a/src/pt_BR/mobility/vmd-midp/vmd-midp/org/netbeans/modules/vmd/midp/propertyeditors/Bundle_pt_BR.properties Wed Apr 25 18:30:02 2012 +0900
7.2 +++ b/src/pt_BR/mobility/vmd-midp/vmd-midp/org/netbeans/modules/vmd/midp/propertyeditors/Bundle_pt_BR.properties Wed Apr 25 18:36:58 2012 +0900
7.3 @@ -41,7 +41,7 @@
7.4 # made subject to such option by the copyright holder.
7.5
7.6 # PropertyEditorPreferredSize
7.7 -LBL_PREF_SIZE_UNLOCKED_TXT=DESTRAVADO
7.8 +#LBL_PREF_SIZE_UNLOCKED_TXT=DESTRAVADO
7.9 LBL_PREF_SIZE_UNLOCKED=Des&travado
7.10
7.11 # PropertyEditorImage
7.12 @@ -85,7 +85,7 @@
7.13 #PropertyValueGaugeMaxValue
7.14 LBL_GAUGE_MAX_VALUE_STR=Valor &m\u00e1ximo:
7.15 LBL_GAUGE_MAX_VALUE_UCLABEL=Valor de medida m\u00e1xima
7.16 -LBL_MAX_VALUE_INDEFINITE_TXT=INDEFINIDO
7.17 +#LBL_MAX_VALUE_INDEFINITE_TXT=INDEFINIDO
7.18 LBL_MAX_VALUE_INDEFINITE=&Indefinido
7.19
7.20 #PropertyEditorBooleanUC
7.21 @@ -150,7 +150,7 @@
7.22 #MNM_TIMEOUTPE_FOREVER=F
7.23 LBL_TIMEOUT_STR=&Tempo de espera:
7.24 LBL_TIMEOUT_UCLABEL=Tempo de espera
7.25 -LBL_TIMEOUTPE_FOREVER_TXT=SEMPRE
7.26 +#LBL_TIMEOUTPE_FOREVER_TXT=SEMPRE
7.27 ACSN_TIMEOUT_STR=Tempo de espera
7.28 ACSD_TIMEOUT_STR=Seleciona o valor do tempo de espera personalizado
7.29 ACSN_TIMEOUTPE_FOREVER=Sempre
7.30 @@ -227,7 +227,7 @@
7.31 MNM_ITEMLAYOUTPE_GEN_DEFAULT=D
7.32 ACSN_ITEMLAYOUTPE_GEN_DEFAULT=Layout padr\u00e3o geral
7.33 ACSD_ITEMLAYOUTPE_GEN_DEFAULT=Seleciona o layout padr\u00e3o geral
7.34 -LBL_ITEMLAYOUTPE_GEN_MIDP2=MIDP 2
7.35 +#LBL_ITEMLAYOUTPE_GEN_MIDP2=MIDP 2
7.36 MNM_ITEMLAYOUTPE_GEN_MIDP2=2
7.37 ACSN_ITEMLAYOUTPE_GEN_MIDP2=Layout MIDP 2 geral
7.38 #ACSD_ITEMLAYOUTPE_GEN_MIDP2=Selects general MIDP 2 layout
7.39 @@ -363,9 +363,9 @@
7.40 #LBL_FONTPE_RB_SMALL=Small
7.41 #MNM_FONTPE_RB_SMALL=A
7.42
7.43 -LBL_TEXTFIELDPE_CAPS_WORD=INITIAL_CAPS_WORD
7.44 +#LBL_TEXTFIELDPE_CAPS_WORD=INITIAL_CAPS_WORD
7.45 MNM_TEXTFIELDPE_CAPS_WORD=m
7.46 -LBL_TEXTFIELDPE_CAPS_SENTENCE=INITIAL_CAPS_SENTENCE
7.47 +#LBL_TEXTFIELDPE_CAPS_SENTENCE=INITIAL_CAPS_SENTENCE
7.48 MNM_TEXTFIELDPE_CAPS_SENTENCE=E
7.49 LBL_TEXTFIELDPE_URL=URL
7.50 MNM_TEXTFIELDPE_URL=R
8.1 --- a/src/pt_BR/platform/autoupdate-ui/autoupdate-ui/org/netbeans/modules/autoupdate/ui/Bundle_pt_BR.properties Wed Apr 25 18:30:02 2012 +0900
8.2 +++ b/src/pt_BR/platform/autoupdate-ui/autoupdate-ui/org/netbeans/modules/autoupdate/ui/Bundle_pt_BR.properties Wed Apr 25 18:36:58 2012 +0900
8.3 @@ -32,7 +32,7 @@
8.4 UnitTab_Tooltip_AddAction_LOCAL=Adicionar plug-ins baixados localmente
8.5 UnitTab_Tooltip_RemoveAction_LOCAL=Remover o plug-in da lista
8.6 UnitTab_bTabAction_Name_LOCAL=&Instalar
8.7 -UnitTab_lHowManySelected_TextFormatWithSize={0}, {1}
8.8 +#UnitTab_lHowManySelected_TextFormatWithSize={0}, {1}
8.9 UnitTab_lHowManySelected_Single_Text={0} plug-in selecionado
8.10 UnitTab_lHowManySelected_Many_Text={0} plug-ins selecionados
8.11 UnitTab_OperationName_Text_INSTALLED=Desinstalar
8.12 @@ -54,7 +54,7 @@
8.13 NotificationMoreAlreadyInstalled=Os plug-ins "{0}" j\u00e1 est\u00e3o instalados.
8.14 NotificationAlreadyPresent=O plug-in "{0}" j\u00e1 est\u00e1 instalado. Deseja substuir por "{1}"?
8.15 NotificationAlreadyPresentTitle=Substituir plug-in
8.16 -NotificationPlugin={0} [{1}]
8.17 +#NotificationPlugin={0} [{1}]
8.18 #TODO: message should contain spec.version
8.19 #NotificationAlreadyPreparedToIntsall=Plugin {0}, specification version {1} is already prepared to install.
8.20 CTL_FileChooser_Title=Adicionar plug-ins
8.21 @@ -120,12 +120,12 @@
8.22 SettingsTab_NewProviderURL=http://
8.23 SettingsTab_UpdateUnitProvider_Description=Descri\u00e7\u00e3o:
8.24 SettingsTab_UpdateUnitProvider_URL=URL:
8.25 -Utilities_DownloadSize_GB=GB
8.26 -Utilities_DownloadSize_MB=MB
8.27 -Utilities_DownloadSize_kB=kB
8.28 -Utilities_DownloadSize_B=I
8.29 -PluginManagerUI_Tabs_NameFormat={0} ({1})
8.30 -PluginManagerUI_Tabs_CountFormat={0}/{1}
8.31 +#Utilities_DownloadSize_GB=GB
8.32 +#Utilities_DownloadSize_MB=MB
8.33 +#Utilities_DownloadSize_kB=kB
8.34 +#Utilities_DownloadSize_B=I
8.35 +#PluginManagerUI_Tabs_NameFormat={0} ({1})
8.36 +#PluginManagerUI_Tabs_CountFormat={0}/{1}
8.37 UnitDetails_Category_NoDescription=
8.38 UnitDetails_Plugin_Version=Vers\u00e3o:
8.39 UnitDetails_Plugin_InstalledVersion=Vers\u00e3o instalada:
9.1 --- a/src/ru/ide/org-netbeans-libs-git/org-netbeans-libs-git/org/netbeans/libs/git/Bundle_ru.properties Wed Apr 25 18:30:02 2012 +0900
9.2 +++ b/src/ru/ide/org-netbeans-libs-git/org-netbeans-libs-git/org/netbeans/libs/git/Bundle_ru.properties Wed Apr 25 18:36:58 2012 +0900
9.3 @@ -59,18 +59,18 @@
9.4 MSG_Exception_CheckoutConflicts = \u041a\u043e\u043d\u0444\u043b\u0438\u043a\u0442\u044b \u043f\u0440\u0438 \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u0438
9.5
9.6 #GitConflictDescriptor
9.7 -MSG_GitConflictDescriptor_BOTH_DELETED.shortDesc = \u0423\u0434\u0430\u043b\u0435\u043d \u043e\u0431\u043e\u0438\u043c\u0438
9.8 -MSG_GitConflictDescriptor_BOTH_DELETED.desc = \u0424\u0430\u0439\u043b \u0431\u044b\u043b \u0443\u0434\u0430\u043b\u0435\u043d \u0432 \u043e\u0431\u0435\u0438\u0445 \u0432\u0435\u0442\u0432\u044f\u0445
9.9 -MSG_GitConflictDescriptor_ADDED_BY_US.shortDesc = \u0414\u043e\u0431\u0430\u0432\u043b\u0435\u043d \u043d\u0430\u043c\u0438
9.10 +#MSG_GitConflictDescriptor_BOTH_DELETED.shortDesc = \u0423\u0434\u0430\u043b\u0435\u043d \u043e\u0431\u043e\u0438\u043c\u0438
9.11 +#MSG_GitConflictDescriptor_BOTH_DELETED.desc = \u0424\u0430\u0439\u043b \u0431\u044b\u043b \u0443\u0434\u0430\u043b\u0435\u043d \u0432 \u043e\u0431\u0435\u0438\u0445 \u0432\u0435\u0442\u0432\u044f\u0445
9.12 +#MSG_GitConflictDescriptor_ADDED_BY_US.shortDesc = \u0414\u043e\u0431\u0430\u0432\u043b\u0435\u043d \u043d\u0430\u043c\u0438
9.13 MSG_GitConflictDescriptor_ADDED_BY_US.desc = \u0424\u0430\u0439\u043b \u0431\u044b\u043b \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d \u0432 \u0442\u0435\u043a\u0443\u0449\u0435\u0439 \u0432\u0435\u0442\u0432\u0438
9.14 -MSG_GitConflictDescriptor_DELETED_BY_THEM.shortDesc = \u0423\u0434\u0430\u043b\u0435\u043d \u0438\u043c\u0438
9.15 -MSG_GitConflictDescriptor_DELETED_BY_THEM.desc = \u0424\u0430\u0439\u043b \u0431\u044b\u043b \u0443\u0434\u0430\u043b\u0435\u043d \u0432 \u0434\u0440\u0443\u0433\u043e\u0439 \u0432\u0435\u0442\u0432\u0438
9.16 -MSG_GitConflictDescriptor_ADDED_BY_THEM.shortDesc = \u0414\u043e\u0431\u0430\u0432\u043b\u0435\u043d \u0438\u043c\u0438
9.17 -MSG_GitConflictDescriptor_ADDED_BY_THEM.desc = \u0424\u0430\u0439\u043b \u0431\u044b\u043b \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d \u0432 \u0434\u0440\u0443\u0433\u043e\u0439 \u0432\u0435\u0442\u0432\u0438
9.18 -MSG_GitConflictDescriptor_DELETED_BY_US.shortDesc = \u0423\u0434\u0430\u043b\u0435\u043d \u043d\u0430\u043c\u0438
9.19 -MSG_GitConflictDescriptor_DELETED_BY_US.desc = \u0424\u0430\u0439\u043b \u0431\u044b\u043b \u0443\u0434\u0430\u043b\u0435\u043d \u0432 \u0442\u0435\u043a\u0443\u0449\u0435\u0439 \u0432\u0435\u0442\u0432\u0438
9.20 -MSG_GitConflictDescriptor_BOTH_ADDED.shortDesc = \u0414\u043e\u0431\u0430\u0432\u043b\u0435\u043d \u043e\u0431\u043e\u0438\u043c\u0438
9.21 -MSG_GitConflictDescriptor_BOTH_ADDED.desc = \u0424\u0430\u0439\u043b \u0431\u044b\u043b \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d \u0432 \u043e\u0431\u0435\u0438\u0445 \u0432\u0435\u0442\u0432\u044f\u0445
9.22 -MSG_GitConflictDescriptor_BOTH_MODIFIED.shortDesc = \u0418\u0437\u043c\u0435\u043d\u0435\u043d \u043e\u0431\u043e\u0438\u043c\u0438
9.23 -MSG_GitConflictDescriptor_BOTH_MODIFIED.desc = \u0424\u0430\u0439\u043b \u0431\u044b\u043b \u0438\u0437\u043c\u0435\u043d\u0435\u043d \u0432 \u043e\u0431\u0435\u0438\u0445 \u0432\u0435\u0442\u0432\u044f\u0445
9.24 +#MSG_GitConflictDescriptor_DELETED_BY_THEM.shortDesc = \u0423\u0434\u0430\u043b\u0435\u043d \u0438\u043c\u0438
9.25 +#MSG_GitConflictDescriptor_DELETED_BY_THEM.desc = \u0424\u0430\u0439\u043b \u0431\u044b\u043b \u0443\u0434\u0430\u043b\u0435\u043d \u0432 \u0434\u0440\u0443\u0433\u043e\u0439 \u0432\u0435\u0442\u0432\u0438
9.26 +#MSG_GitConflictDescriptor_ADDED_BY_THEM.shortDesc = \u0414\u043e\u0431\u0430\u0432\u043b\u0435\u043d \u0438\u043c\u0438
9.27 +#MSG_GitConflictDescriptor_ADDED_BY_THEM.desc = \u0424\u0430\u0439\u043b \u0431\u044b\u043b \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d \u0432 \u0434\u0440\u0443\u0433\u043e\u0439 \u0432\u0435\u0442\u0432\u0438
9.28 +#MSG_GitConflictDescriptor_DELETED_BY_US.shortDesc = \u0423\u0434\u0430\u043b\u0435\u043d \u043d\u0430\u043c\u0438
9.29 +#MSG_GitConflictDescriptor_DELETED_BY_US.desc = \u0424\u0430\u0439\u043b \u0431\u044b\u043b \u0443\u0434\u0430\u043b\u0435\u043d \u0432 \u0442\u0435\u043a\u0443\u0449\u0435\u0439 \u0432\u0435\u0442\u0432\u0438
9.30 +#MSG_GitConflictDescriptor_BOTH_ADDED.shortDesc = \u0414\u043e\u0431\u0430\u0432\u043b\u0435\u043d \u043e\u0431\u043e\u0438\u043c\u0438
9.31 +#MSG_GitConflictDescriptor_BOTH_ADDED.desc = \u0424\u0430\u0439\u043b \u0431\u044b\u043b \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d \u0432 \u043e\u0431\u0435\u0438\u0445 \u0432\u0435\u0442\u0432\u044f\u0445
9.32 +#MSG_GitConflictDescriptor_BOTH_MODIFIED.shortDesc = \u0418\u0437\u043c\u0435\u043d\u0435\u043d \u043e\u0431\u043e\u0438\u043c\u0438
9.33 +#MSG_GitConflictDescriptor_BOTH_MODIFIED.desc = \u0424\u0430\u0439\u043b \u0431\u044b\u043b \u0438\u0437\u043c\u0435\u043d\u0435\u043d \u0432 \u043e\u0431\u0435\u0438\u0445 \u0432\u0435\u0442\u0432\u044f\u0445
9.34
10.1 --- a/src/ru/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/Bundle_ru.properties Wed Apr 25 18:30:02 2012 +0900
10.2 +++ b/src/ru/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/Bundle_ru.properties Wed Apr 25 18:36:58 2012 +0900
10.3 @@ -41,7 +41,7 @@
10.4 ACSD_JavaExtSourcesProjectLocation=\u0421\u043e\u0437\u0434\u0430\u0435\u0442 \u043d\u043e\u0432\u044b\u0439 \u043f\u0440\u043e\u0435\u043a\u0442 JavaFX \u0434\u043b\u044f \u0443\u0436\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u044e\u0449\u0438\u0445 \u0438\u0441\u0445\u043e\u0434\u043d\u044b\u0445 \u0444\u0430\u0439\u043b\u043e\u0432
10.5 #NOI18N
10.6 #TXT_ClassName=Main
10.7 -TXT_ClassNamePreloader=\u0421\u0440\u0435\u0434\u0441\u0442\u0432\u043e \u043f\u0440\u0435\u0434\u0432\u0430\u0440\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0439 \u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0438
10.8 +#TXT_ClassNamePreloader=\u0421\u0440\u0435\u0434\u0441\u0442\u0432\u043e \u043f\u0440\u0435\u0434\u0432\u0430\u0440\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0439 \u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0438
10.9 #NOI18N
10.10 #TXT_PackageNamePrefix=pkg
10.11 LAB_ConfigureProject=\u0418\u043c\u044f \u0438 \u0440\u0430\u0441\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435
11.1 --- a/src/ru/mobility/vmd-midp/vmd-midp/org/netbeans/modules/vmd/midp/propertyeditors/Bundle_ru.properties Wed Apr 25 18:30:02 2012 +0900
11.2 +++ b/src/ru/mobility/vmd-midp/vmd-midp/org/netbeans/modules/vmd/midp/propertyeditors/Bundle_ru.properties Wed Apr 25 18:36:58 2012 +0900
11.3 @@ -41,7 +41,7 @@
11.4 # made subject to such option by the copyright holder.
11.5
11.6 # PropertyEditorPreferredSize
11.7 -LBL_PREF_SIZE_UNLOCKED_TXT=UNLOCKED
11.8 +#LBL_PREF_SIZE_UNLOCKED_TXT=UNLOCKED
11.9 LBL_PREF_SIZE_UNLOCKED=\u0420\u0430\u0437\u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u043d\u043e
11.10
11.11 # PropertyEditorImage
11.12 @@ -85,7 +85,7 @@
11.13 #PropertyValueGaugeMaxValue
11.14 LBL_GAUGE_MAX_VALUE_STR=\u041c\u0430\u043a\u0441\u0438\u043c\u0430\u043b\u044c\u043d\u043e\u0435 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435:
11.15 LBL_GAUGE_MAX_VALUE_UCLABEL=\u041c\u0430\u043a\u0441\u0438\u043c\u0430\u043b\u044c\u043d\u043e\u0435 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435 \u0448\u043a\u0430\u043b\u044b
11.16 -LBL_MAX_VALUE_INDEFINITE_TXT=INDEFINITE
11.17 +#LBL_MAX_VALUE_INDEFINITE_TXT=INDEFINITE
11.18 LBL_MAX_VALUE_INDEFINITE=\u041d\u0435\u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u043d\u044b\u0439
11.19
11.20 #PropertyEditorBooleanUC
11.21 @@ -150,7 +150,7 @@
11.22 #MNM_TIMEOUTPE_FOREVER=F
11.23 LBL_TIMEOUT_STR=\u0412\u0440\u0435\u043c\u044f \u043e\u0436\u0438\u0434\u0430\u043d\u0438\u044f:
11.24 LBL_TIMEOUT_UCLABEL=\u0412\u0440\u0435\u043c\u044f \u043e\u0436\u0438\u0434\u0430\u043d\u0438\u044f
11.25 -LBL_TIMEOUTPE_FOREVER_TXT=FOREVER
11.26 +#LBL_TIMEOUTPE_FOREVER_TXT=FOREVER
11.27 ACSN_TIMEOUT_STR=\u0412\u0440\u0435\u043c\u044f \u043e\u0436\u0438\u0434\u0430\u043d\u0438\u044f
11.28 ACSD_TIMEOUT_STR=\u0412\u044b\u0431\u043e\u0440 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u043e\u0433\u043e \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f \u0432\u0440\u0435\u043c\u0435\u043d\u0438 \u043e\u0436\u0438\u0434\u0430\u043d\u0438\u044f
11.29 ACSN_TIMEOUTPE_FOREVER=\u0412\u0441\u0435\u0433\u0434\u0430
11.30 @@ -227,7 +227,7 @@
11.31 MNM_ITEMLAYOUTPE_GEN_DEFAULT=D
11.32 ACSN_ITEMLAYOUTPE_GEN_DEFAULT=\u041e\u0431\u0449\u0430\u044f \u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0430 \u043f\u043e \u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\u044e
11.33 ACSD_ITEMLAYOUTPE_GEN_DEFAULT=\u0412\u044b\u0431\u043e\u0440 \u043e\u0431\u0449\u0435\u0439 \u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0438 \u043f\u043e \u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\u044e
11.34 -LBL_ITEMLAYOUTPE_GEN_MIDP2=MIDP 2
11.35 +#LBL_ITEMLAYOUTPE_GEN_MIDP2=MIDP 2
11.36 MNM_ITEMLAYOUTPE_GEN_MIDP2=2
11.37 ACSN_ITEMLAYOUTPE_GEN_MIDP2=\u041e\u0431\u0449\u0430\u044f \u043a\u043e\u043c\u043f\u043e\u043d\u043e\u0432\u043a\u0430 MIDP 2
11.38 #ACSD_ITEMLAYOUTPE_GEN_MIDP2=Selects general MIDP 2 layout
11.39 @@ -363,9 +363,9 @@
11.40 #LBL_FONTPE_RB_SMALL=Small
11.41 #MNM_FONTPE_RB_SMALL=A
11.42
11.43 -LBL_TEXTFIELDPE_CAPS_WORD=INITIAL_CAPS_WORD
11.44 +#LBL_TEXTFIELDPE_CAPS_WORD=INITIAL_CAPS_WORD
11.45 MNM_TEXTFIELDPE_CAPS_WORD=W
11.46 -LBL_TEXTFIELDPE_CAPS_SENTENCE=INITIAL_CAPS_SENTENCE
11.47 +#LBL_TEXTFIELDPE_CAPS_SENTENCE=INITIAL_CAPS_SENTENCE
11.48 MNM_TEXTFIELDPE_CAPS_SENTENCE=E
11.49 LBL_TEXTFIELDPE_URL=URL-\u0430\u0434\u0440\u0435\u0441
11.50 MNM_TEXTFIELDPE_URL=R
12.1 --- a/src/ru/platform/autoupdate-ui/autoupdate-ui/org/netbeans/modules/autoupdate/ui/Bundle_ru.properties Wed Apr 25 18:30:02 2012 +0900
12.2 +++ b/src/ru/platform/autoupdate-ui/autoupdate-ui/org/netbeans/modules/autoupdate/ui/Bundle_ru.properties Wed Apr 25 18:36:58 2012 +0900
12.3 @@ -32,7 +32,7 @@
12.4 UnitTab_Tooltip_AddAction_LOCAL=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043b\u043e\u043a\u0430\u043b\u044c\u043d\u043e \u0437\u0430\u0433\u0440\u0443\u0436\u0435\u043d\u043d\u044b\u0435 \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0430\u0435\u043c\u044b\u0435 \u043c\u043e\u0434\u0443\u043b\u0438
12.5 UnitTab_Tooltip_RemoveAction_LOCAL=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0430\u0435\u043c\u044b\u0439 \u043c\u043e\u0434\u0443\u043b\u044c \u0438\u0437 \u0441\u043f\u0438\u0441\u043a\u0430
12.6 UnitTab_bTabAction_Name_LOCAL=\u0423\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c
12.7 -UnitTab_lHowManySelected_TextFormatWithSize={0}, {1}
12.8 +#UnitTab_lHowManySelected_TextFormatWithSize={0}, {1}
12.9 UnitTab_lHowManySelected_Single_Text=\u0412\u044b\u0431\u0440\u0430\u043d {0} \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0430\u0435\u043c\u044b\u0439 \u043c\u043e\u0434\u0443\u043b\u044c
12.10 UnitTab_lHowManySelected_Many_Text=\u0412\u044b\u0431\u0440\u0430\u043d\u043e {0} \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0430\u0435\u043c\u044b\u0445 \u043c\u043e\u0434\u0443\u043b\u0435\u0439
12.11 UnitTab_OperationName_Text_INSTALLED=\u0423\u0434\u0430\u043b\u0438\u0442\u044c
12.12 @@ -54,7 +54,7 @@
12.13 NotificationMoreAlreadyInstalled=\u041f\u043e\u0434\u043a\u043b\u044e\u0447\u0430\u0435\u043c\u044b\u0435 \u043c\u043e\u0434\u0443\u043b\u0438 "{0}" \u0443\u0436\u0435 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u044b.
12.14 NotificationAlreadyPresent=\u041f\u043e\u0434\u043a\u043b\u044e\u0447\u0430\u0435\u043c\u044b\u0439 \u043c\u043e\u0434\u0443\u043b\u044c "{0}" \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d. \u0417\u0430\u043c\u0435\u043d\u0438\u0442\u044c \u0435\u0433\u043e \u043d\u0430 "{1}"?
12.15 NotificationAlreadyPresentTitle=\u0417\u0430\u043c\u0435\u043d\u0438\u0442\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0430\u0435\u043c\u044b\u0439 \u043c\u043e\u0434\u0443\u043b\u044c
12.16 -NotificationPlugin={0} [{1}]
12.17 +#NotificationPlugin={0} [{1}]
12.18 #TODO: message should contain spec.version
12.19 #NotificationAlreadyPreparedToIntsall=Plugin {0}, specification version {1} is already prepared to install.
12.20 CTL_FileChooser_Title=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0430\u0435\u043c\u044b\u0435 \u043c\u043e\u0434\u0443\u043b\u0438
12.21 @@ -120,12 +120,12 @@
12.22 SettingsTab_NewProviderURL=http://
12.23 SettingsTab_UpdateUnitProvider_Description=\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435:
12.24 SettingsTab_UpdateUnitProvider_URL=URL-\u0430\u0434\u0440\u0435\u0441:
12.25 -Utilities_DownloadSize_GB=\u0413\u0411
12.26 -Utilities_DownloadSize_MB=\u041c\u0411
12.27 -Utilities_DownloadSize_kB=\u041a\u0411
12.28 -Utilities_DownloadSize_B=\u0411
12.29 -PluginManagerUI_Tabs_NameFormat={0} ({1})
12.30 -PluginManagerUI_Tabs_CountFormat={0}/{1}
12.31 +#Utilities_DownloadSize_GB=\u0413\u0411
12.32 +#Utilities_DownloadSize_MB=\u041c\u0411
12.33 +#Utilities_DownloadSize_kB=\u041a\u0411
12.34 +#Utilities_DownloadSize_B=\u0411
12.35 +#PluginManagerUI_Tabs_NameFormat={0} ({1})
12.36 +#PluginManagerUI_Tabs_CountFormat={0}/{1}
12.37 UnitDetails_Category_NoDescription=
12.38 UnitDetails_Plugin_Version=\u0412\u0435\u0440\u0441\u0438\u044f:
12.39 UnitDetails_Plugin_InstalledVersion=\u0423\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u043d\u0430\u044f \u0432\u0435\u0440\u0441\u0438\u044f:
13.1 --- a/src/zh_CN/ide/org-netbeans-libs-git/org-netbeans-libs-git/org/netbeans/libs/git/Bundle_zh_CN.properties Wed Apr 25 18:30:02 2012 +0900
13.2 +++ b/src/zh_CN/ide/org-netbeans-libs-git/org-netbeans-libs-git/org/netbeans/libs/git/Bundle_zh_CN.properties Wed Apr 25 18:36:58 2012 +0900
13.3 @@ -59,18 +59,18 @@
13.4 MSG_Exception_CheckoutConflicts = \u5728\u7b7e\u51fa\u671f\u95f4\u53d1\u751f\u51b2\u7a81
13.5
13.6 #GitConflictDescriptor
13.7 -MSG_GitConflictDescriptor_BOTH_DELETED.shortDesc = \u7531\u53cc\u65b9\u5220\u9664
13.8 -MSG_GitConflictDescriptor_BOTH_DELETED.desc = \u5728\u4e24\u4e2a\u5206\u652f\u4e2d\u5220\u9664\u4e86\u8be5\u6587\u4ef6
13.9 -MSG_GitConflictDescriptor_ADDED_BY_US.shortDesc = \u7531\u6211\u4eec\u6dfb\u52a0
13.10 +#MSG_GitConflictDescriptor_BOTH_DELETED.shortDesc = \u7531\u53cc\u65b9\u5220\u9664
13.11 +#MSG_GitConflictDescriptor_BOTH_DELETED.desc = \u5728\u4e24\u4e2a\u5206\u652f\u4e2d\u5220\u9664\u4e86\u8be5\u6587\u4ef6
13.12 +#MSG_GitConflictDescriptor_ADDED_BY_US.shortDesc = \u7531\u6211\u4eec\u6dfb\u52a0
13.13 MSG_GitConflictDescriptor_ADDED_BY_US.desc = \u5728\u5f53\u524d\u5206\u652f\u4e2d\u6dfb\u52a0\u4e86\u8be5\u6587\u4ef6
13.14 -MSG_GitConflictDescriptor_DELETED_BY_THEM.shortDesc = \u7531\u4ed6\u4eec\u5220\u9664
13.15 -MSG_GitConflictDescriptor_DELETED_BY_THEM.desc = \u5728\u53e6\u4e00\u4e2a\u5206\u652f\u4e2d\u5220\u9664\u4e86\u8be5\u6587\u4ef6
13.16 -MSG_GitConflictDescriptor_ADDED_BY_THEM.shortDesc = \u7531\u4ed6\u4eec\u6dfb\u52a0
13.17 -MSG_GitConflictDescriptor_ADDED_BY_THEM.desc = \u5728\u53e6\u4e00\u4e2a\u5206\u652f\u4e2d\u6dfb\u52a0\u4e86\u8be5\u6587\u4ef6
13.18 -MSG_GitConflictDescriptor_DELETED_BY_US.shortDesc = \u7531\u6211\u4eec\u5220\u9664
13.19 -MSG_GitConflictDescriptor_DELETED_BY_US.desc = \u5728\u5f53\u524d\u5206\u652f\u4e2d\u5220\u9664\u4e86\u8be5\u6587\u4ef6
13.20 -MSG_GitConflictDescriptor_BOTH_ADDED.shortDesc = \u7531\u53cc\u65b9\u6dfb\u52a0
13.21 -MSG_GitConflictDescriptor_BOTH_ADDED.desc = \u5728\u4e24\u4e2a\u5206\u652f\u4e2d\u6dfb\u52a0\u4e86\u8be5\u6587\u4ef6
13.22 -MSG_GitConflictDescriptor_BOTH_MODIFIED.shortDesc = \u7531\u53cc\u65b9\u4fee\u6539
13.23 -MSG_GitConflictDescriptor_BOTH_MODIFIED.desc = \u5728\u4e24\u4e2a\u5206\u652f\u4e2d\u4fee\u6539\u4e86\u8be5\u6587\u4ef6
13.24 +#MSG_GitConflictDescriptor_DELETED_BY_THEM.shortDesc = \u7531\u4ed6\u4eec\u5220\u9664
13.25 +#MSG_GitConflictDescriptor_DELETED_BY_THEM.desc = \u5728\u53e6\u4e00\u4e2a\u5206\u652f\u4e2d\u5220\u9664\u4e86\u8be5\u6587\u4ef6
13.26 +#MSG_GitConflictDescriptor_ADDED_BY_THEM.shortDesc = \u7531\u4ed6\u4eec\u6dfb\u52a0
13.27 +#MSG_GitConflictDescriptor_ADDED_BY_THEM.desc = \u5728\u53e6\u4e00\u4e2a\u5206\u652f\u4e2d\u6dfb\u52a0\u4e86\u8be5\u6587\u4ef6
13.28 +#MSG_GitConflictDescriptor_DELETED_BY_US.shortDesc = \u7531\u6211\u4eec\u5220\u9664
13.29 +#MSG_GitConflictDescriptor_DELETED_BY_US.desc = \u5728\u5f53\u524d\u5206\u652f\u4e2d\u5220\u9664\u4e86\u8be5\u6587\u4ef6
13.30 +#MSG_GitConflictDescriptor_BOTH_ADDED.shortDesc = \u7531\u53cc\u65b9\u6dfb\u52a0
13.31 +#MSG_GitConflictDescriptor_BOTH_ADDED.desc = \u5728\u4e24\u4e2a\u5206\u652f\u4e2d\u6dfb\u52a0\u4e86\u8be5\u6587\u4ef6
13.32 +#MSG_GitConflictDescriptor_BOTH_MODIFIED.shortDesc = \u7531\u53cc\u65b9\u4fee\u6539
13.33 +#MSG_GitConflictDescriptor_BOTH_MODIFIED.desc = \u5728\u4e24\u4e2a\u5206\u652f\u4e2d\u4fee\u6539\u4e86\u8be5\u6587\u4ef6
13.34
14.1 --- a/src/zh_CN/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/Bundle_zh_CN.properties Wed Apr 25 18:30:02 2012 +0900
14.2 +++ b/src/zh_CN/javafx/javafx2-project/javafx2-project/org/netbeans/modules/javafx2/project/Bundle_zh_CN.properties Wed Apr 25 18:36:58 2012 +0900
14.3 @@ -41,7 +41,7 @@
14.4 ACSD_JavaExtSourcesProjectLocation=\u4f7f\u7528\u73b0\u6709\u6e90\u4ee3\u7801\u521b\u5efa\u65b0\u7684 JavaFX \u9879\u76ee
14.5 #NOI18N
14.6 #TXT_ClassName=Main
14.7 -TXT_ClassNamePreloader=\u9884\u52a0\u8f7d\u5668
14.8 +#TXT_ClassNamePreloader=\u9884\u52a0\u8f7d\u5668
14.9 #NOI18N
14.10 #TXT_PackageNamePrefix=pkg
14.11 LAB_ConfigureProject=\u540d\u79f0\u548c\u4f4d\u7f6e
15.1 --- a/src/zh_CN/mobility/vmd-midp/vmd-midp/org/netbeans/modules/vmd/midp/propertyeditors/Bundle_zh_CN.properties Wed Apr 25 18:30:02 2012 +0900
15.2 +++ b/src/zh_CN/mobility/vmd-midp/vmd-midp/org/netbeans/modules/vmd/midp/propertyeditors/Bundle_zh_CN.properties Wed Apr 25 18:36:58 2012 +0900
15.3 @@ -41,7 +41,7 @@
15.4 # made subject to such option by the copyright holder.
15.5
15.6 # PropertyEditorPreferredSize
15.7 -LBL_PREF_SIZE_UNLOCKED_TXT=\u89e3\u9501
15.8 +#LBL_PREF_SIZE_UNLOCKED_TXT=\u89e3\u9501
15.9 LBL_PREF_SIZE_UNLOCKED=\u89e3\u9501(&L)
15.10
15.11 # PropertyEditorImage
15.12 @@ -85,7 +85,7 @@
15.13 #PropertyValueGaugeMaxValue
15.14 LBL_GAUGE_MAX_VALUE_STR=\u6700\u5927\u503c(&M)\uff1a
15.15 LBL_GAUGE_MAX_VALUE_UCLABEL=\u6807\u5c3a\u6700\u5927\u503c
15.16 -LBL_MAX_VALUE_INDEFINITE_TXT=\u4e0d\u786e\u5b9a
15.17 +#LBL_MAX_VALUE_INDEFINITE_TXT=\u4e0d\u786e\u5b9a
15.18 LBL_MAX_VALUE_INDEFINITE=\u4e0d\u786e\u5b9a(&I)
15.19
15.20 #PropertyEditorBooleanUC
15.21 @@ -150,7 +150,7 @@
15.22 #MNM_TIMEOUTPE_FOREVER=F
15.23 LBL_TIMEOUT_STR=\u8d85\u65f6(&T)\uff1a
15.24 LBL_TIMEOUT_UCLABEL=\u8d85\u65f6
15.25 -LBL_TIMEOUTPE_FOREVER_TXT=\u59cb\u7ec8
15.26 +#LBL_TIMEOUTPE_FOREVER_TXT=\u59cb\u7ec8
15.27 ACSN_TIMEOUT_STR=\u8d85\u65f6
15.28 ACSD_TIMEOUT_STR=\u9009\u62e9\u5b9a\u5236\u8d85\u65f6\u503c
15.29 ACSN_TIMEOUTPE_FOREVER=\u59cb\u7ec8
15.30 @@ -227,7 +227,7 @@
15.31 MNM_ITEMLAYOUTPE_GEN_DEFAULT=D
15.32 ACSN_ITEMLAYOUTPE_GEN_DEFAULT=\u5e38\u89c4\u7f3a\u7701\u5e03\u5c40
15.33 ACSD_ITEMLAYOUTPE_GEN_DEFAULT=\u9009\u62e9\u5e38\u89c4\u7f3a\u7701\u5e03\u5c40
15.34 -LBL_ITEMLAYOUTPE_GEN_MIDP2=MIDP 2
15.35 +#LBL_ITEMLAYOUTPE_GEN_MIDP2=MIDP 2
15.36 MNM_ITEMLAYOUTPE_GEN_MIDP2=2
15.37 ACSN_ITEMLAYOUTPE_GEN_MIDP2=\u5e38\u89c4 MIDP 2 \u5e03\u5c40
15.38 #ACSD_ITEMLAYOUTPE_GEN_MIDP2=Selects general MIDP 2 layout
15.39 @@ -363,9 +363,9 @@
15.40 #LBL_FONTPE_RB_SMALL=Small
15.41 #MNM_FONTPE_RB_SMALL=A
15.42
15.43 -LBL_TEXTFIELDPE_CAPS_WORD=INITIAL_CAPS_WORD
15.44 +#LBL_TEXTFIELDPE_CAPS_WORD=INITIAL_CAPS_WORD
15.45 MNM_TEXTFIELDPE_CAPS_WORD=W
15.46 -LBL_TEXTFIELDPE_CAPS_SENTENCE=INITIAL_CAPS_SENTENCE
15.47 +#LBL_TEXTFIELDPE_CAPS_SENTENCE=INITIAL_CAPS_SENTENCE
15.48 MNM_TEXTFIELDPE_CAPS_SENTENCE=E
15.49 LBL_TEXTFIELDPE_URL=URL
15.50 MNM_TEXTFIELDPE_URL=R
16.1 --- a/src/zh_CN/platform/autoupdate-ui/autoupdate-ui/org/netbeans/modules/autoupdate/ui/Bundle_zh_CN.properties Wed Apr 25 18:30:02 2012 +0900
16.2 +++ b/src/zh_CN/platform/autoupdate-ui/autoupdate-ui/org/netbeans/modules/autoupdate/ui/Bundle_zh_CN.properties Wed Apr 25 18:36:58 2012 +0900
16.3 @@ -32,7 +32,7 @@
16.4 UnitTab_Tooltip_AddAction_LOCAL=\u6dfb\u52a0\u672c\u5730\u4e0b\u8f7d\u7684\u63d2\u4ef6
16.5 UnitTab_Tooltip_RemoveAction_LOCAL=\u4ece\u5217\u8868\u4e2d\u5220\u9664\u63d2\u4ef6
16.6 UnitTab_bTabAction_Name_LOCAL=\u5b89\u88c5(&I)
16.7 -UnitTab_lHowManySelected_TextFormatWithSize={0}\uff0c{1}
16.8 +#UnitTab_lHowManySelected_TextFormatWithSize={0}\uff0c{1}
16.9 UnitTab_lHowManySelected_Single_Text=\u5df2\u9009\u62e9 {0} \u63d2\u4ef6
16.10 UnitTab_lHowManySelected_Many_Text=\u5df2\u9009\u62e9 {0} \u4e2a\u63d2\u4ef6
16.11 UnitTab_OperationName_Text_INSTALLED=\u5378\u8f7d
16.12 @@ -54,7 +54,7 @@
16.13 NotificationMoreAlreadyInstalled=\u5df2\u5b89\u88c5 "{0}" \u4e2a\u63d2\u4ef6\u3002
16.14 NotificationAlreadyPresent=\u5df2\u6dfb\u52a0\u63d2\u4ef6 "{0}"\u3002\u662f\u5426\u8981\u66ff\u6362\u4e3a "{1}"\uff1f
16.15 NotificationAlreadyPresentTitle=\u66ff\u6362\u63d2\u4ef6
16.16 -NotificationPlugin={0} [{1}]
16.17 +#NotificationPlugin={0} [{1}]
16.18 #TODO: message should contain spec.version
16.19 #NotificationAlreadyPreparedToIntsall=Plugin {0}, specification version {1} is already prepared to install.
16.20 CTL_FileChooser_Title=\u6dfb\u52a0\u63d2\u4ef6
16.21 @@ -120,12 +120,12 @@
16.22 SettingsTab_NewProviderURL=http://
16.23 SettingsTab_UpdateUnitProvider_Description=\u63cf\u8ff0\uff1a
16.24 SettingsTab_UpdateUnitProvider_URL=URL\uff1a
16.25 -Utilities_DownloadSize_GB=GB
16.26 -Utilities_DownloadSize_MB=MB
16.27 -Utilities_DownloadSize_kB=kB
16.28 -Utilities_DownloadSize_B=B
16.29 -PluginManagerUI_Tabs_NameFormat={0} ({1})
16.30 -PluginManagerUI_Tabs_CountFormat={0}/{1}
16.31 +#Utilities_DownloadSize_GB=GB
16.32 +#Utilities_DownloadSize_MB=MB
16.33 +#Utilities_DownloadSize_kB=kB
16.34 +#Utilities_DownloadSize_B=B
16.35 +#PluginManagerUI_Tabs_NameFormat={0} ({1})
16.36 +#PluginManagerUI_Tabs_CountFormat={0}/{1}
16.37 UnitDetails_Category_NoDescription=
16.38 UnitDetails_Plugin_Version=\u7248\u672c\uff1a
16.39 UnitDetails_Plugin_InstalledVersion=\u5b89\u88c5\u7684\u7248\u672c\uff1a