1.1 --- a/src/de/platform/favorites/favorites/org/netbeans/modules/favorites/templates/Bundle_de.properties Fri Sep 06 11:24:04 2013 +0900
1.2 +++ b/src/de/platform/favorites/favorites/org/netbeans/modules/favorites/templates/Bundle_de.properties Sat Sep 07 20:24:12 2013 +0900
1.3 @@ -77,6 +77,9 @@
1.4
1.5 # {0} - file name
1.6 MSG_TemplatesPanel_Nonexistent_File=Datei ''{0}''\nist nicht vorhanden. Geben Sie eine vorhandene Datei an.
1.7 +# {0} - prefix of the license file name
1.8 +# {1} - suffix of the license file name
1.9 +RenameTemplatePanel.license.warning.text=Name der Lizenzdatei muss mit "{0}" beginnen und mit "{1}" enden.
1.10 RenameTemplatePanel.title.text=Vorlage umbenennen
1.11 TemplatesPanel_TemplateNode_DisplayName=Anzeigename
1.12 TemplatesPanel_TemplateNode_DisplayName_Desc=Anzeigename dieser Vorlage. Der Name wird unter "Datei"|"Neu" sowie unter "Extras"|"Vorlagen" angezeigt.
2.1 --- a/src/de/platform/options-api/options-api/org/netbeans/modules/options/Bundle_de.properties Fri Sep 06 11:24:04 2013 +0900
2.2 +++ b/src/de/platform/options-api/options-api/org/netbeans/modules/options/Bundle_de.properties Sat Sep 07 20:24:12 2013 +0900
2.3 @@ -45,6 +45,7 @@
2.4 # {0} - shortcut to access the search text field
2.5 Filter_Textfield_Hint=Filter ({0})
2.6 Filter_Textfield_Tooltip=Esc oder Enter im leeren Textbereich dr\u00fccken, um Filter zu l\u00f6schen
2.7 +Loading_HelpCtx_Lengthy_Operation=Warten Sie, w\u00e4hrend der Hilfekontext geladen wird.
2.8 OpenIDE-Module-Name=Optionsdialogfeld und SPI
2.9 OpenIDE-Module-Display-Category=Extras
2.10 OpenIDE-Module-Short-Description=Stellt das Dialogfeld "Optionen" bereit sowie eine SPI zum Hinzuf\u00fcgen von Fenstern.
2.11 @@ -72,7 +73,8 @@
2.12 ACS_OptionsPanel=Dialogfeld "Optionen"
2.13 ACS_Export=Exportoptionen
2.14 ACS_Import=Importoptionen
2.15 -ProgressHandle_Saving_Options_DisplayName=Optionen werden gespeichert...
2.16 +Saving_Options_Lengthy_Operation=Warten Sie, w\u00e4hrend die Optionen gespeichert werden.
2.17 +Saving_Options_Lengthy_Operation_Title=Langwieriger Vorgang l\u00e4uft
2.18 TabbedController.pane.AD=Optionsfenster
2.19
2.20 QuickSearch/GoToOption=Optionen
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
3.2 +++ b/src/de/platform/org-netbeans-core-network/org-netbeans-core-network/org/netbeans/core/network/proxy/fallback/Bundle_de.properties Sat Sep 07 20:24:12 2013 +0900
3.3 @@ -0,0 +1,43 @@
3.4 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3.5 +#
3.6 +# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
3.7 +#
3.8 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
3.9 +# Other names may be trademarks of their respective owners.
3.10 +#
3.11 +# The contents of this file are subject to the terms of either the GNU
3.12 +# General Public License Version 2 only ("GPL") or the Common
3.13 +# Development and Distribution License("CDDL") (collectively, the
3.14 +# "License"). You may not use this file except in compliance with the
3.15 +# License. You can obtain a copy of the License at
3.16 +# http://www.netbeans.org/cddl-gplv2.html
3.17 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
3.18 +# specific language governing permissions and limitations under the
3.19 +# License. When distributing the software, include this License Header
3.20 +# Notice in each file and include the License file at
3.21 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
3.22 +# particular file as subject to the "Classpath" exception as provided
3.23 +# by Oracle in the GPL Version 2 section of the License file that
3.24 +# accompanied this code. If applicable, add the following below the
3.25 +# License Header, with the fields enclosed by brackets [] replaced by
3.26 +# your own identifying information:
3.27 +# "Portions Copyrighted [year] [name of copyright owner]"
3.28 +#
3.29 +# If you wish your version of this file to be governed by only the CDDL
3.30 +# or only the GPL Version 2, indicate your decision by adding
3.31 +# "[Contributor] elects to include this software in this distribution
3.32 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
3.33 +# single choice of license, a recipient has the option to distribute
3.34 +# your version of this file under either the CDDL, the GPL Version 2 or
3.35 +# to extend the choice of license to its licensees as provided above.
3.36 +# However, if you add GPL Version 2 code and therefore, elected the GPL
3.37 +# Version 2 license, then the option applies only if the new code is
3.38 +# made subject to such option by the copyright holder.
3.39 +#
3.40 +# Contributor(s):
3.41 +#
3.42 +# Portions Copyrighted 2013 Sun Microsystems, Inc.
3.43 +
3.44 +
3.45 +DefaulNoProxyHosts=localhost,127.0.0.1
3.46 +
4.1 --- a/src/de/platform/org-netbeans-core-ui/org-netbeans-core-ui/org/netbeans/core/ui/options/general/Bundle_de.properties Fri Sep 06 11:24:04 2013 +0900
4.2 +++ b/src/de/platform/org-netbeans-core-ui/org-netbeans-core-ui/org/netbeans/core/ui/options/general/Bundle_de.properties Sat Sep 07 20:24:12 2013 +0900
4.3 @@ -266,4 +266,6 @@
4.4 GeneralOptionsPanel.bReloadProxy.text=Erneut &laden
4.5 GeneralOptionsPanel.bTestConnection.text=&Verbindung testen
4.6
4.7 +GeneralOptionsPanel.proxy.result.ok=Verbindung erfolgreich
4.8 +GeneralOptionsPanel.proxy.result.failed=Verbindung nicht erfolgreich ({0})
4.9
5.1 --- a/src/de/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/options/Bundle_de.properties Fri Sep 06 11:24:04 2013 +0900
5.2 +++ b/src/de/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/options/Bundle_de.properties Sat Sep 07 20:24:12 2013 +0900
5.3 @@ -76,8 +76,8 @@
5.4 WinSysPanel.checkMaximizeNativeLaF.toolTipText=<html>NetBeans verwendet native UI-Komponenten, wenn diese ausreichende\nFunktionalit\u00e4t bieten. <br>W\u00e4hlen Sie diese Option, um die Verwendung nativer Komponenten zu erzwingen, selbst dann, wenn\ndadurch die Funktionalit\u00e4t eingeschr\u00e4nkt wird (z.B. durch die Standarddateiauswahl in Mac OS).
5.5 WinSysPanel.lblLaf.text=&Bevorzugtes Look and Feel:
5.6 WinSysPanel.lblRestart.text=(Neustart erforderlich)
5.7 -Laf_DARK_METAL=Dark Metal
5.8 -Laf_DARK_NIMBUS=Dark Nimbus
5.9 +
5.10 +
5.11 Hint_RESTART_IDE=IDE neu starten
5.12 Descr_Restart=<html><a href="#">Klicken Sie hier, um IDE neu zu starten und das gew\u00e4hlte Look and Feel anzuwenden.
5.13 Hint_ChangeEditorColors=Zu \u00fcbereinstimmenden Editorfarbprofilen wechseln.
6.1 --- a/src/de/platform/org-openide-awt/org-openide-awt/org/netbeans/modules/openide/awt/Bundle_de.properties Fri Sep 06 11:24:04 2013 +0900
6.2 +++ b/src/de/platform/org-openide-awt/org-openide-awt/org/netbeans/modules/openide/awt/Bundle_de.properties Sat Sep 07 20:24:12 2013 +0900
6.3 @@ -43,3 +43,4 @@
6.4 HINT_Shortcuts=Einer Aktion eine Tastenkombination zuweisen
6.5 HINT_Loaders=Aktion f\u00fcr einen Dateityp
6.6
6.7 +
7.1 --- a/src/de/platform/org-openide-filesystems/netbeans/core/org-openide-filesystems/org/openide/filesystems/Bundle_de.properties Fri Sep 06 11:24:04 2013 +0900
7.2 +++ b/src/de/platform/org-openide-filesystems/netbeans/core/org-openide-filesystems/org/openide/filesystems/Bundle_de.properties Sat Sep 07 20:24:12 2013 +0900
7.3 @@ -216,4 +216,3 @@
7.4
7.5 # Logging
7.6 MSG_CACHED_INPUT_STREAM=Stream f\u00fcr {0} wird ge\u00f6ffnet
7.7 -
8.1 --- a/src/de/platform/uihandler/uihandler/org/netbeans/modules/exceptions/Bundle_de.properties Fri Sep 06 11:24:04 2013 +0900
8.2 +++ b/src/de/platform/uihandler/uihandler/org/netbeans/modules/exceptions/Bundle_de.properties Sat Sep 07 20:24:12 2013 +0900
8.3 @@ -51,7 +51,7 @@
8.4 ReportPanel.jLabel1.text=&Benutzername:
8.5 ReportPanel.jLabel3.text=Um \u00fcber den Status dieses Problems informiert werden zu k\u00f6nnen, m\u00fcssen Sie ein registrierter Benutzer sein.
8.6 ReportPanel.jLabel2.text=Wenn Sie nicht registriert sind, k\u00f6nnen Sie den Bericht als Gastbenutzer versenden oder sich jetzt registrieren.
8.7 -ReportPanel.jLabel6.text=Registrieren
8.8 +ReportPanel.jLabel6.text=<html><a href="#">Registrieren</a></html>
8.9
8.10 ReportPanel.AccessibleContext.accessibleDescription=Dialogfeld zur Meldung von Problemen
8.11
9.1 --- a/src/de/platform/uihandler/uihandler/org/netbeans/modules/uihandler/Bundle_de.properties Fri Sep 06 11:24:04 2013 +0900
9.2 +++ b/src/de/platform/uihandler/uihandler/org/netbeans/modules/uihandler/Bundle_de.properties Sat Sep 07 20:24:12 2013 +0900
9.3 @@ -126,6 +126,7 @@
9.4
9.5 # {0} - host
9.6 # {1} - url of upload
9.7 +# {2} - the absolute path to the IDE's log file (defined by the LOG_FILE key above)
9.8 MSG_ConnetionFailed=Log konnte nicht auf {0} hochgeladen werden.
9.9 # {0} - host
9.10 # {1} - url of upload
9.11 @@ -133,6 +134,18 @@
9.12 # String between [URL] and [/URL] is rendered as an URL and it opens in a browser upon a click
9.13 # String between [TTC] and [/TTC] (Text To Copy) is possible to select and copy
9.14 MSG_ConnetionFailedReport=Log konnte nicht hochgeladen werden. Melden Sie das urspr\u00fcngliche Problem direkt unter [URL]http://www.myapplication.org/bugs.html[/URL], und f\u00fcgen Sie die Datei messages.log bei.\nDie Datei messages.log befindet sich unter [TTC]{2}[/TTC].
9.15 +# {0} - host
9.16 +# {1} - url of upload
9.17 +# {2} - the absolute path to the IDE's log file (defined by the LOG_FILE key above)
9.18 +# {3} - response message
9.19 +MSG_ConnetionFailedWithResponse=Log konnte nicht auf {0} hochgeladen werden: {3}
9.20 +# {0} - host
9.21 +# {1} - url of upload
9.22 +# {2} - the absolute path to the IDE's log file (defined by the LOG_FILE key above)
9.23 +# {3} - response message
9.24 +# String between [URL] and [/URL] is rendered as an URL and it opens in a browser upon a click
9.25 +# String between [TTC] and [/TTC] (Text To Copy) is possible to select and copy
9.26 +MSG_ConnetionFailedReportWithResponse=Log konnte nicht hochgeladen werden ({3}). Melden Sie das urspr\u00fcngliche Problem direkt unter [URL]http://www.myapplication.org/bugs.html[/URL], und f\u00fcgen Sie die Datei messages.log bei.\nDie Datei messages.log befindet sich unter [TTC]{2}[/TTC].
9.27 MSG_UploadProgressHandle=Logdatei wird hochgeladen
9.28 MSG_UploadConnecting=Verbindung wird hergestellt...
9.29 MSG_UploadSending=Logs werden gesendet...
10.1 --- a/src/es/platform/favorites/favorites/org/netbeans/modules/favorites/templates/Bundle_es.properties Fri Sep 06 11:24:04 2013 +0900
10.2 +++ b/src/es/platform/favorites/favorites/org/netbeans/modules/favorites/templates/Bundle_es.properties Sat Sep 07 20:24:12 2013 +0900
10.3 @@ -77,6 +77,9 @@
10.4
10.5 # {0} - file name
10.6 MSG_TemplatesPanel_Nonexistent_File=El archivo ''{0}''\nno existe. Especifique un archivo existente.
10.7 +# {0} - prefix of the license file name
10.8 +# {1} - suffix of the license file name
10.9 +RenameTemplatePanel.license.warning.text=El archivo de licencia debe empezar por "{0}" y terminar en "{1}".
10.10 RenameTemplatePanel.title.text=Cambiar Nombre de Plantilla
10.11 TemplatesPanel_TemplateNode_DisplayName=Mostrar Nombre
10.12 TemplatesPanel_TemplateNode_DisplayName_Desc=Muestra el nombre de esta plantilla. Aparece tanto en el asistente Archivo|Nuevo como en Herramientas|Plantillas.
11.1 --- a/src/es/platform/masterfs-linux/masterfs-linux/org/netbeans/modules/masterfs/watcher/linux/Bundle_es.properties Fri Sep 06 11:24:04 2013 +0900
11.2 +++ b/src/es/platform/masterfs-linux/masterfs-linux/org/netbeans/modules/masterfs/watcher/linux/Bundle_es.properties Sat Sep 07 20:24:12 2013 +0900
11.3 @@ -1,1 +1,2 @@
11.4 OpenIDE-Module-Name=Sistema de Archivos Maestro en Linux
11.5 +
12.1 --- a/src/es/platform/masterfs/masterfs/org/netbeans/modules/masterfs/resources/Bundle_es.properties Fri Sep 06 11:24:04 2013 +0900
12.2 +++ b/src/es/platform/masterfs/masterfs/org/netbeans/modules/masterfs/resources/Bundle_es.properties Sat Sep 07 20:24:12 2013 +0900
12.3 @@ -57,4 +57,3 @@
12.4 # {2} = new name of the file (with extension)
12.5 EXC_CannotRename=No se puede cambiar el nombre del archivo {0} en {1} a {2}.
12.6
12.7 -
13.1 --- a/src/es/platform/options-api/options-api/org/netbeans/modules/options/Bundle_es.properties Fri Sep 06 11:24:04 2013 +0900
13.2 +++ b/src/es/platform/options-api/options-api/org/netbeans/modules/options/Bundle_es.properties Sat Sep 07 20:24:12 2013 +0900
13.3 @@ -45,6 +45,7 @@
13.4 # {0} - shortcut to access the search text field
13.5 Filter_Textfield_Hint=Filtro ({0})
13.6 Filter_Textfield_Tooltip=Pulse Esc o Intro sin texto para eliminar el filtro
13.7 +Loading_HelpCtx_Lengthy_Operation=Espere mientras se carga el contexto de ayuda.
13.8 OpenIDE-Module-Name=Cuadro de Di\u00e1logo Opciones y SPI
13.9 OpenIDE-Module-Display-Category=Herramientas
13.10 OpenIDE-Module-Short-Description=Proporciona el cuadro de di\u00e1logo Opciones y un SPI para agregar paneles al mismo.
13.11 @@ -72,7 +73,8 @@
13.12 ACS_OptionsPanel=Cuadro de Di\u00e1logo Opciones
13.13 ACS_Export=Opciones de Exportaci\u00f3n
13.14 ACS_Import=Opciones de Importaci\u00f3n
13.15 -ProgressHandle_Saving_Options_DisplayName=Guardando opciones...
13.16 +Saving_Options_Lengthy_Operation=Espere mientras se guardan las opciones.
13.17 +Saving_Options_Lengthy_Operation_Title=Operaci\u00f3n larga en curso
13.18 TabbedController.pane.AD=Panel Opciones
13.19
13.20 QuickSearch/GoToOption=Opciones
14.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
14.2 +++ b/src/es/platform/org-netbeans-core-network/org-netbeans-core-network/org/netbeans/core/network/proxy/fallback/Bundle_es.properties Sat Sep 07 20:24:12 2013 +0900
14.3 @@ -0,0 +1,43 @@
14.4 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
14.5 +#
14.6 +# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
14.7 +#
14.8 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
14.9 +# Other names may be trademarks of their respective owners.
14.10 +#
14.11 +# The contents of this file are subject to the terms of either the GNU
14.12 +# General Public License Version 2 only ("GPL") or the Common
14.13 +# Development and Distribution License("CDDL") (collectively, the
14.14 +# "License"). You may not use this file except in compliance with the
14.15 +# License. You can obtain a copy of the License at
14.16 +# http://www.netbeans.org/cddl-gplv2.html
14.17 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
14.18 +# specific language governing permissions and limitations under the
14.19 +# License. When distributing the software, include this License Header
14.20 +# Notice in each file and include the License file at
14.21 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
14.22 +# particular file as subject to the "Classpath" exception as provided
14.23 +# by Oracle in the GPL Version 2 section of the License file that
14.24 +# accompanied this code. If applicable, add the following below the
14.25 +# License Header, with the fields enclosed by brackets [] replaced by
14.26 +# your own identifying information:
14.27 +# "Portions Copyrighted [year] [name of copyright owner]"
14.28 +#
14.29 +# If you wish your version of this file to be governed by only the CDDL
14.30 +# or only the GPL Version 2, indicate your decision by adding
14.31 +# "[Contributor] elects to include this software in this distribution
14.32 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
14.33 +# single choice of license, a recipient has the option to distribute
14.34 +# your version of this file under either the CDDL, the GPL Version 2 or
14.35 +# to extend the choice of license to its licensees as provided above.
14.36 +# However, if you add GPL Version 2 code and therefore, elected the GPL
14.37 +# Version 2 license, then the option applies only if the new code is
14.38 +# made subject to such option by the copyright holder.
14.39 +#
14.40 +# Contributor(s):
14.41 +#
14.42 +# Portions Copyrighted 2013 Sun Microsystems, Inc.
14.43 +
14.44 +
14.45 +DefaulNoProxyHosts=localhost,127.0.0.1
14.46 +
15.1 --- a/src/es/platform/org-netbeans-core-ui/org-netbeans-core-ui/org/netbeans/core/ui/options/general/Bundle_es.properties Fri Sep 06 11:24:04 2013 +0900
15.2 +++ b/src/es/platform/org-netbeans-core-ui/org-netbeans-core-ui/org/netbeans/core/ui/options/general/Bundle_es.properties Sat Sep 07 20:24:12 2013 +0900
15.3 @@ -266,4 +266,6 @@
15.4 GeneralOptionsPanel.bReloadProxy.text=Recar&gar
15.5 GeneralOptionsPanel.bTestConnection.text=Probar &conexi\u00f3n
15.6
15.7 +GeneralOptionsPanel.proxy.result.ok=Conexi\u00f3n correcta
15.8 +GeneralOptionsPanel.proxy.result.failed=Fallo de conexi\u00f3n ({0})
15.9
16.1 --- a/src/es/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/options/Bundle_es.properties Fri Sep 06 11:24:04 2013 +0900
16.2 +++ b/src/es/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/options/Bundle_es.properties Sat Sep 07 20:24:12 2013 +0900
16.3 @@ -76,8 +76,8 @@
16.4 WinSysPanel.checkMaximizeNativeLaF.toolTipText=<html>NetBeans utiliza componentes de interfaz de usuario nativa cuando dichos componentes ofrecen suficiente\nfuncionalidad. <br>Seleccione esta opci\u00f3n para forzar el uso de componentes nativos, incluso si con ello se limita\nla funcionalidad (por ejemplo, selector de archivos de Mac OS est\u00e1ndar).
16.5 WinSysPanel.lblLaf.text=Aspecto &preferido:
16.6 WinSysPanel.lblRestart.text=(reinicio necesario)
16.7 -Laf_DARK_METAL=Metal oscuro
16.8 -Laf_DARK_NIMBUS=Gris oscuro
16.9 +
16.10 +
16.11 Hint_RESTART_IDE=Reiniciar IDE
16.12 Descr_Restart=<html><a href="#">Haga clic aqu\u00ed para reiniciar IDE y aplicar el aspecto seleccionado.
16.13 Hint_ChangeEditorColors=Cambiar a perfil de colores de editor coincidentes.
17.1 --- a/src/es/platform/uihandler/uihandler/org/netbeans/modules/exceptions/Bundle_es.properties Fri Sep 06 11:24:04 2013 +0900
17.2 +++ b/src/es/platform/uihandler/uihandler/org/netbeans/modules/exceptions/Bundle_es.properties Sat Sep 07 20:24:12 2013 +0900
17.3 @@ -51,7 +51,7 @@
17.4 ReportPanel.jLabel1.text=&Usuario:
17.5 ReportPanel.jLabel3.text=Tiene que ser un usuario registrado para poder mantenerse informado sobre el estado del problema.
17.6 ReportPanel.jLabel2.text=Si no est\u00e1 registrado, puede enviar el informe como invitado o registrarse ahora.
17.7 -ReportPanel.jLabel6.text=Registrar
17.8 +ReportPanel.jLabel6.text=<html><a href="#">Registrar</a></html>
17.9
17.10 ReportPanel.AccessibleContext.accessibleDescription=Cuadro de di\u00e1logo para informar sobre problemas
17.11
18.1 --- a/src/es/platform/uihandler/uihandler/org/netbeans/modules/uihandler/Bundle_es.properties Fri Sep 06 11:24:04 2013 +0900
18.2 +++ b/src/es/platform/uihandler/uihandler/org/netbeans/modules/uihandler/Bundle_es.properties Sat Sep 07 20:24:12 2013 +0900
18.3 @@ -126,6 +126,7 @@
18.4
18.5 # {0} - host
18.6 # {1} - url of upload
18.7 +# {2} - the absolute path to the IDE's log file (defined by the LOG_FILE key above)
18.8 MSG_ConnetionFailed=Fallo al cargar el log a {0}.
18.9 # {0} - host
18.10 # {1} - url of upload
18.11 @@ -133,6 +134,18 @@
18.12 # String between [URL] and [/URL] is rendered as an URL and it opens in a browser upon a click
18.13 # String between [TTC] and [/TTC] (Text To Copy) is possible to select and copy
18.14 MSG_ConnetionFailedReport=Se ha producido un fallo al cargar el log, informe sobre el problema original directamente en [URL]http://www.myapplication.org/bugs.html[/URL] y adjunte el archivo messages.log.\nEl archivo messages.log est\u00e1 ubicado en [TTC]{2}[/TTC].
18.15 +# {0} - host
18.16 +# {1} - url of upload
18.17 +# {2} - the absolute path to the IDE's log file (defined by the LOG_FILE key above)
18.18 +# {3} - response message
18.19 +MSG_ConnetionFailedWithResponse=Fallo al cargar el log en {0}: {3}
18.20 +# {0} - host
18.21 +# {1} - url of upload
18.22 +# {2} - the absolute path to the IDE's log file (defined by the LOG_FILE key above)
18.23 +# {3} - response message
18.24 +# String between [URL] and [/URL] is rendered as an URL and it opens in a browser upon a click
18.25 +# String between [TTC] and [/TTC] (Text To Copy) is possible to select and copy
18.26 +MSG_ConnetionFailedReportWithResponse=Se ha producido un fallo al cargar el log ({3}), informe sobre el problema original directamente en [URL]http://www.myapplication.org/bugs.html[/URL] y adjunte el archivo messages.log.\nEl archivo messages.log est\u00e1 ubicado en [TTC]{2}[/TTC].
18.27 MSG_UploadProgressHandle=Cargando archivo log
18.28 MSG_UploadConnecting=Conectando...
18.29 MSG_UploadSending=Enviando logs...
19.1 --- a/src/ja/platform/autoupdate-services/ext/updater/org/netbeans/updater/Bundle_ja.properties Fri Sep 06 11:24:04 2013 +0900
19.2 +++ b/src/ja/platform/autoupdate-services/ext/updater/org/netbeans/updater/Bundle_ja.properties Sat Sep 07 20:24:12 2013 +0900
19.3 @@ -69,3 +69,4 @@
19.4
19.5 #UpdaterFrame.isGradient=false // set true to make gradient
19.6 #UpdaterFrame.isGradientVertical=false // set true for vertical gradient
19.7 +
20.1 --- a/src/ja/platform/editor-mimelookup/editor-mimelookup/org/netbeans/modules/editor/mimelookup/Bundle_ja.properties Fri Sep 06 11:24:04 2013 +0900
20.2 +++ b/src/ja/platform/editor-mimelookup/editor-mimelookup/org/netbeans/modules/editor/mimelookup/Bundle_ja.properties Sat Sep 07 20:24:12 2013 +0900
20.3 @@ -44,4 +44,3 @@
20.4 OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
20.5 OpenIDE-Module-Short-Description=MIME\u30eb\u30c3\u30af\u30a2\u30c3\u30d7API\u3067\u3059\u3002
20.6 OpenIDE-Module-Long-Description=MIME\u30eb\u30c3\u30af\u30a2\u30c3\u30d7\u30fb\u30e2\u30b8\u30e5\u30fc\u30eb\u306f\u3001\u8a2d\u5b9a\u3001\u30b5\u30fc\u30d3\u30b9\u3001\u304a\u3088\u3073\u305d\u306e\u4ed6\u306e\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u306b\u4f9d\u5b58\u3059\u308bMIME\u30bf\u30a4\u30d7\u3092\u30eb\u30c3\u30af\u30a2\u30c3\u30d7\u3059\u308b\u305f\u3081\u306eAPI\u3092\u63d0\u4f9b\u3057\u307e\u3059\u3002\u307e\u305f\u3001\u30c7\u30fc\u30bf\u30fb\u30d7\u30ed\u30d0\u30a4\u30c0\u306b\u95a2\u9023\u3059\u308b\u8ffd\u52a0\u306eMIME\u30bf\u30a4\u30d7\u3092\u5b9f\u88c5\u3059\u308b\u305f\u3081\u306eSPI\u3082\u63d0\u4f9b\u3057\u307e\u3059\u3002
20.7 -
21.1 --- a/src/ja/platform/favorites/favorites/org/netbeans/modules/favorites/templates/Bundle_ja.properties Fri Sep 06 11:24:04 2013 +0900
21.2 +++ b/src/ja/platform/favorites/favorites/org/netbeans/modules/favorites/templates/Bundle_ja.properties Sat Sep 07 20:24:12 2013 +0900
21.3 @@ -77,6 +77,9 @@
21.4
21.5 # {0} - file name
21.6 MSG_TemplatesPanel_Nonexistent_File=\u30d5\u30a1\u30a4\u30eb''{0}''\n\u306f\u5b58\u5728\u3057\u307e\u305b\u3093\u3002\u65e2\u5b58\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002
21.7 +# {0} - prefix of the license file name
21.8 +# {1} - suffix of the license file name
21.9 +RenameTemplatePanel.license.warning.text=\u30e9\u30a4\u30bb\u30f3\u30b9\u30fb\u30d5\u30a1\u30a4\u30eb\u540d\u306f"{0}"\u3067\u958b\u59cb\u3057\u3001"{1}"\u3067\u7d42\u4e86\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
21.10 RenameTemplatePanel.title.text=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u306e\u540d\u524d\u5909\u66f4
21.11 TemplatesPanel_TemplateNode_DisplayName=\u8868\u793a\u540d
21.12 TemplatesPanel_TemplateNode_DisplayName_Desc=\u3053\u306e\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u306e\u8868\u793a\u540d\u3002\u300c\u30c4\u30fc\u30eb\u300d>\u300c\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u300d\u3068\u540c\u69d8\u306b\u300c\u30d5\u30a1\u30a4\u30eb\u300d>\u300c\u65b0\u898f\u30a6\u30a3\u30b6\u30fc\u30c9\u300d\u3067\u8868\u793a\u3055\u308c\u307e\u3059\u3002
22.1 --- a/src/ja/platform/options-api/options-api/org/netbeans/modules/options/Bundle_ja.properties Fri Sep 06 11:24:04 2013 +0900
22.2 +++ b/src/ja/platform/options-api/options-api/org/netbeans/modules/options/Bundle_ja.properties Sat Sep 07 20:24:12 2013 +0900
22.3 @@ -45,6 +45,7 @@
22.4 # {0} - shortcut to access the search text field
22.5 Filter_Textfield_Hint=\u30d5\u30a3\u30eb\u30bf({0})
22.6 Filter_Textfield_Tooltip=\u30d5\u30a3\u30eb\u30bf\u3092\u30af\u30ea\u30a2\u3059\u308b\u306b\u306f\u3001[Esc]\u30ad\u30fc\u3092\u62bc\u3059\u304b\u3001\u7a7a\u306e\u30c6\u30ad\u30b9\u30c8\u3092\u5165\u529b\u3057\u307e\u3059
22.7 +Loading_HelpCtx_Lengthy_Operation=\u30d8\u30eb\u30d7\u30fb\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u3092\u30ed\u30fc\u30c9\u3057\u3066\u3044\u307e\u3059\u3002\u3057\u3070\u3089\u304f\u304a\u5f85\u3061\u304f\u3060\u3055\u3044\u3002
22.8 OpenIDE-Module-Name=\u30aa\u30d7\u30b7\u30e7\u30f3\u30fb\u30c0\u30a4\u30a2\u30ed\u30b0\u3068SPI
22.9 OpenIDE-Module-Display-Category=\u30c4\u30fc\u30eb
22.10 OpenIDE-Module-Short-Description=\u30d1\u30cd\u30eb\u3092\u8ffd\u52a0\u3059\u308b\u305f\u3081\u306b\u3001\u300c\u30aa\u30d7\u30b7\u30e7\u30f3\u300d\u30c0\u30a4\u30a2\u30ed\u30b0\u3068SPI\u3092\u63d0\u4f9b\u3057\u307e\u3059\u3002
22.11 @@ -72,7 +73,8 @@
22.12 ACS_OptionsPanel=\u30aa\u30d7\u30b7\u30e7\u30f3\u30fb\u30c0\u30a4\u30a2\u30ed\u30b0
22.13 ACS_Export=\u30aa\u30d7\u30b7\u30e7\u30f3\u306e\u30a8\u30af\u30b9\u30dd\u30fc\u30c8
22.14 ACS_Import=\u30aa\u30d7\u30b7\u30e7\u30f3\u306e\u30a4\u30f3\u30dd\u30fc\u30c8
22.15 -ProgressHandle_Saving_Options_DisplayName=\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u4fdd\u5b58\u3057\u3066\u3044\u307e\u3059...
22.16 +Saving_Options_Lengthy_Operation=\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u4fdd\u5b58\u3057\u3066\u3044\u307e\u3059\u3002\u3057\u3070\u3089\u304f\u304a\u5f85\u3061\u304f\u3060\u3055\u3044\u3002
22.17 +Saving_Options_Lengthy_Operation_Title=\u6642\u9593\u306e\u304b\u304b\u308b\u64cd\u4f5c\u3092\u5b9f\u884c\u4e2d
22.18 TabbedController.pane.AD=\u30aa\u30d7\u30b7\u30e7\u30f3\u30fb\u30d1\u30cd\u30eb
22.19
22.20 QuickSearch/GoToOption=\u30aa\u30d7\u30b7\u30e7\u30f3
23.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
23.2 +++ b/src/ja/platform/org-netbeans-core-network/org-netbeans-core-network/org/netbeans/core/network/proxy/fallback/Bundle_ja.properties Sat Sep 07 20:24:12 2013 +0900
23.3 @@ -0,0 +1,43 @@
23.4 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
23.5 +#
23.6 +# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
23.7 +#
23.8 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
23.9 +# Other names may be trademarks of their respective owners.
23.10 +#
23.11 +# The contents of this file are subject to the terms of either the GNU
23.12 +# General Public License Version 2 only ("GPL") or the Common
23.13 +# Development and Distribution License("CDDL") (collectively, the
23.14 +# "License"). You may not use this file except in compliance with the
23.15 +# License. You can obtain a copy of the License at
23.16 +# http://www.netbeans.org/cddl-gplv2.html
23.17 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
23.18 +# specific language governing permissions and limitations under the
23.19 +# License. When distributing the software, include this License Header
23.20 +# Notice in each file and include the License file at
23.21 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
23.22 +# particular file as subject to the "Classpath" exception as provided
23.23 +# by Oracle in the GPL Version 2 section of the License file that
23.24 +# accompanied this code. If applicable, add the following below the
23.25 +# License Header, with the fields enclosed by brackets [] replaced by
23.26 +# your own identifying information:
23.27 +# "Portions Copyrighted [year] [name of copyright owner]"
23.28 +#
23.29 +# If you wish your version of this file to be governed by only the CDDL
23.30 +# or only the GPL Version 2, indicate your decision by adding
23.31 +# "[Contributor] elects to include this software in this distribution
23.32 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
23.33 +# single choice of license, a recipient has the option to distribute
23.34 +# your version of this file under either the CDDL, the GPL Version 2 or
23.35 +# to extend the choice of license to its licensees as provided above.
23.36 +# However, if you add GPL Version 2 code and therefore, elected the GPL
23.37 +# Version 2 license, then the option applies only if the new code is
23.38 +# made subject to such option by the copyright holder.
23.39 +#
23.40 +# Contributor(s):
23.41 +#
23.42 +# Portions Copyrighted 2013 Sun Microsystems, Inc.
23.43 +
23.44 +
23.45 +DefaulNoProxyHosts=localhost,127.0.0.1
23.46 +
24.1 --- a/src/ja/platform/org-netbeans-core-ui/org-netbeans-core-ui/org/netbeans/core/ui/options/general/Bundle_ja.properties Fri Sep 06 11:24:04 2013 +0900
24.2 +++ b/src/ja/platform/org-netbeans-core-ui/org-netbeans-core-ui/org/netbeans/core/ui/options/general/Bundle_ja.properties Sat Sep 07 20:24:12 2013 +0900
24.3 @@ -266,4 +266,6 @@
24.4 GeneralOptionsPanel.bReloadProxy.text=\u518d\u30ed\u30fc\u30c9(&L)
24.5 GeneralOptionsPanel.bTestConnection.text=\u63a5\u7d9a\u306e\u30c6\u30b9\u30c8(&C)
24.6
24.7 +GeneralOptionsPanel.proxy.result.ok=\u63a5\u7d9a\u304c\u6e21\u3055\u308c\u307e\u3057\u305f
24.8 +GeneralOptionsPanel.proxy.result.failed=\u63a5\u7d9a\u306b\u5931\u6557\u3057\u307e\u3057\u305f({0})
24.9
25.1 --- a/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/options/Bundle_ja.properties Fri Sep 06 11:24:04 2013 +0900
25.2 +++ b/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/options/Bundle_ja.properties Sat Sep 07 20:24:12 2013 +0900
25.3 @@ -76,8 +76,8 @@
25.4 WinSysPanel.checkMaximizeNativeLaF.toolTipText=<html>\u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u304c\u5341\u5206\u306a\u6a5f\u80fd\u3092\u63d0\u4f9b\u3059\u308b\u306e\u3067\u3001NetBeans\u3067\u306f\u30cd\u30a4\u30c6\u30a3\u30d6\u306eUI\u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u304c\u4f7f\u7528\u3055\u308c\u307e\u3059\u3002\n<br>\u6a5f\u80fd\u306b\u5236\u9650\u3055\u308c\u308b\u53ef\u80fd\u6027\u304c\u3042\u308b\u5834\u5408\u3067\u3082(\u305f\u3068\u3048\u3070\u3001\u6a19\u6e96\u306eMac OS\u30d5\u30a1\u30a4\u30eb\u30fb\u30c1\u30e5\u30fc\u30b6)\n\u30cd\u30a4\u30c6\u30a3\u30d6\u30fb\u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u3092\u4f7f\u7528\u3059\u308b\u3088\u3046\u5f37\u5236\u3059\u308b\u306b\u306f\u3001\u3053\u306e\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u9078\u629e\u3057\u307e\u3059\u3002
25.5 WinSysPanel.lblLaf.text=\u512a\u5148\u30eb\u30c3\u30af\u30fb\u30a2\u30f3\u30c9\u30fb\u30d5\u30a3\u30fc\u30eb(&P):
25.6 WinSysPanel.lblRestart.text=(\u518d\u8d77\u52d5\u304c\u5fc5\u8981)
25.7 -Laf_DARK_METAL=\u30c0\u30fc\u30af\u30fb\u30e1\u30bf\u30eb
25.8 -Laf_DARK_NIMBUS=\u30c0\u30fc\u30af\u30fb\u30cb\u30f3\u30d0\u30b9
25.9 +
25.10 +
25.11 Hint_RESTART_IDE=IDE\u306e\u518d\u8d77\u52d5
25.12 Descr_Restart=<html><a href="#">\u3053\u3053\u3092\u30af\u30ea\u30c3\u30af\u3057\u3001IDE\u3092\u518d\u8d77\u52d5\u3057\u3001\u9078\u629e\u3057\u305f\u30eb\u30c3\u30af\u30fb\u30a2\u30f3\u30c9\u30fb\u30d5\u30a3\u30fc\u30eb\u3092\u9069\u7528\u3057\u307e\u3059\u3002
25.13 Hint_ChangeEditorColors=\u4e00\u81f4\u3059\u308b\u30a8\u30c7\u30a3\u30bf\u306e\u8272\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u306b\u5207\u308a\u66ff\u3048\u307e\u3059\u3002
26.1 --- a/src/ja/platform/uihandler/uihandler/org/netbeans/modules/exceptions/Bundle_ja.properties Fri Sep 06 11:24:04 2013 +0900
26.2 +++ b/src/ja/platform/uihandler/uihandler/org/netbeans/modules/exceptions/Bundle_ja.properties Sat Sep 07 20:24:12 2013 +0900
26.3 @@ -51,7 +51,7 @@
26.4 ReportPanel.jLabel1.text=\u30e6\u30fc\u30b6\u30fc\u540d(&U):
26.5 ReportPanel.jLabel3.text=\u3053\u306e\u554f\u984c\u306e\u72b6\u614b\u306b\u3064\u3044\u3066\u901a\u77e5\u3092\u53d7\u3051\u305f\u3044\u5834\u5408\u306f\u3001\u767b\u9332\u30e6\u30fc\u30b6\u30fc\u306b\u306a\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
26.6 ReportPanel.jLabel2.text=\u767b\u9332\u3057\u3066\u3044\u306a\u3044\u5834\u5408\u306f\u3001\u30b2\u30b9\u30c8\u3068\u3057\u3066\u30ec\u30dd\u30fc\u30c8\u3092\u9001\u4fe1\u3059\u308b\u304b\u3001\u4eca\u3059\u3050\u767b\u9332\u3057\u3066\u304f\u3060\u3055\u3044\u3002
26.7 -ReportPanel.jLabel6.text=\u767b\u9332
26.8 +ReportPanel.jLabel6.text=<html><a href="#">\u767b\u9332</a></html>
26.9
26.10 ReportPanel.AccessibleContext.accessibleDescription=\u554f\u984c\u30ec\u30dd\u30fc\u30c8\u7528\u306e\u30c0\u30a4\u30a2\u30ed\u30b0
26.11
27.1 --- a/src/ja/platform/uihandler/uihandler/org/netbeans/modules/uihandler/Bundle_ja.properties Fri Sep 06 11:24:04 2013 +0900
27.2 +++ b/src/ja/platform/uihandler/uihandler/org/netbeans/modules/uihandler/Bundle_ja.properties Sat Sep 07 20:24:12 2013 +0900
27.3 @@ -126,6 +126,7 @@
27.4
27.5 # {0} - host
27.6 # {1} - url of upload
27.7 +# {2} - the absolute path to the IDE's log file (defined by the LOG_FILE key above)
27.8 MSG_ConnetionFailed={0}\u3078\u306e\u30ed\u30b0\u306e\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
27.9 # {0} - host
27.10 # {1} - url of upload
27.11 @@ -133,6 +134,18 @@
27.12 # String between [URL] and [/URL] is rendered as an URL and it opens in a browser upon a click
27.13 # String between [TTC] and [/TTC] (Text To Copy) is possible to select and copy
27.14 MSG_ConnetionFailedReport=\u30ed\u30b0\u306e\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002message.log\u30d5\u30a1\u30a4\u30eb\u3092\u6dfb\u4ed8\u3057\u3001[URL]http://www.myapplication.org/bugs.html[/URL]\u304b\u3089\u76f4\u63a5\u554f\u984c\u3092\u5831\u544a\u3057\u3066\u304f\u3060\u3055\u3044\u3002message.log\u30d5\u30a1\u30a4\u30eb\u306f[TTC]{2}[/TTC]\u306b\u3042\u308a\u307e\u3059\u3002
27.15 +# {0} - host
27.16 +# {1} - url of upload
27.17 +# {2} - the absolute path to the IDE's log file (defined by the LOG_FILE key above)
27.18 +# {3} - response message
27.19 +MSG_ConnetionFailedWithResponse={0}\u3078\u306e\u30ed\u30b0\u306e\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9\u306b\u5931\u6557\u3057\u307e\u3057\u305f: {3}
27.20 +# {0} - host
27.21 +# {1} - url of upload
27.22 +# {2} - the absolute path to the IDE's log file (defined by the LOG_FILE key above)
27.23 +# {3} - response message
27.24 +# String between [URL] and [/URL] is rendered as an URL and it opens in a browser upon a click
27.25 +# String between [TTC] and [/TTC] (Text To Copy) is possible to select and copy
27.26 +MSG_ConnetionFailedReportWithResponse=\u30ed\u30b0\u306e\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9\u306b\u5931\u6557\u3057\u307e\u3057\u305f({3})\u3002message.log\u30d5\u30a1\u30a4\u30eb\u3092\u6dfb\u4ed8\u3057\u3001[URL]http://www.myapplication.org/bugs.html[/URL]\u304b\u3089\u76f4\u63a5\u554f\u984c\u3092\u5831\u544a\u3057\u3066\u304f\u3060\u3055\u3044\u3002\nmessage.log\u30d5\u30a1\u30a4\u30eb\u306f[TTC]{2}[/TTC]\u306b\u3042\u308a\u307e\u3059\u3002
27.27 MSG_UploadProgressHandle=\u30ed\u30b0\u30fb\u30d5\u30a1\u30a4\u30eb\u3092\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9\u3057\u3066\u3044\u307e\u3059
27.28 MSG_UploadConnecting=\u63a5\u7d9a\u3057\u3066\u3044\u307e\u3059...
27.29 MSG_UploadSending=\u30ed\u30b0\u3092\u9001\u4fe1\u3057\u3066\u3044\u307e\u3059...
28.1 --- a/src/ru/platform/core-kit/core-kit/org/netbeans/modules/core/kit/Bundle_ru.properties Fri Sep 06 11:24:04 2013 +0900
28.2 +++ b/src/ru/platform/core-kit/core-kit/org/netbeans/modules/core/kit/Bundle_ru.properties Sat Sep 07 20:24:12 2013 +0900
28.3 @@ -2,3 +2,4 @@
28.4 OpenIDE-Module-Name=\u041f\u043b\u0430\u0442\u0444\u043e\u0440\u043c\u0430 RCP
28.5 OpenIDE-Module-Short-Description=\u041f\u043b\u0430\u0442\u0444\u043e\u0440\u043c\u0430 RCP NetBeans
28.6 OpenIDE-Module-Long-Description=\u041f\u043b\u0430\u0442\u0444\u043e\u0440\u043c\u0430 RCP NetBeans \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u043e\u0431\u0449\u0435\u0439 \u043f\u043b\u0430\u0442\u0444\u043e\u0440\u043c\u043e\u0439 \u0434\u043b\u044f \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0439 Swing. \u041f\u043b\u0430\u0442\u0444\u043e\u0440\u043c\u0430 \u043f\u0440\u0435\u0434\u043e\u0441\u0442\u0430\u0432\u043b\u044f\u0435\u0442 \u0441\u043b\u0443\u0436\u0431\u044b, \u043e\u0431\u0449\u0438\u0435 \u0434\u043b\u044f \u0431\u043e\u043b\u044c\u0448\u0438\u043d\u0441\u0442\u0432\u0430 \u043a\u0440\u0443\u043f\u043d\u044b\u0445 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0439 \u0440\u0430\u0431\u043e\u0447\u0435\u0439 \u0441\u0440\u0435\u0434\u044b: \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u043e\u043a\u043d\u0430\u043c\u0438, \u043c\u0435\u043d\u044e, \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0438 \u0445\u0440\u0430\u043d\u0435\u043d\u0438\u0435 \u0434\u0430\u043d\u043d\u044b\u0445, \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u044f\u043c\u0438, \u0434\u043e\u0441\u0442\u0443\u043f \u043a \u0444\u0430\u0439\u043b\u0430\u043c \u0438 \u043f\u0440.<br><br>\u0414\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0435 \u0441\u0432\u0435\u0434\u0435\u043d\u0438\u044f \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u044b \u043f\u043e \u0430\u0434\u0440\u0435\u0441\u0443 <a href="http://platform.netbeans.org">platform.netbeans.org</a>.
28.7 +
29.1 --- a/src/ru/platform/favorites/favorites/org/netbeans/modules/favorites/templates/Bundle_ru.properties Fri Sep 06 11:24:04 2013 +0900
29.2 +++ b/src/ru/platform/favorites/favorites/org/netbeans/modules/favorites/templates/Bundle_ru.properties Sat Sep 07 20:24:12 2013 +0900
29.3 @@ -77,6 +77,9 @@
29.4
29.5 # {0} - file name
29.6 MSG_TemplatesPanel_Nonexistent_File=\u0424\u0430\u0439\u043b ''{0}''\n\u043e\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0443\u0435\u0442, \u0432\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u044e\u0449\u0438\u0439 \u0444\u0430\u0439\u043b.
29.7 +# {0} - prefix of the license file name
29.8 +# {1} - suffix of the license file name
29.9 +RenameTemplatePanel.license.warning.text=\u0418\u043c\u044f \u0444\u0430\u0439\u043b\u0430 \u043b\u0438\u0446\u0435\u043d\u0437\u0438\u0438 \u0434\u043e\u043b\u0436\u043d\u043e \u043d\u0430\u0447\u0438\u043d\u0430\u0442\u044c\u0441\u044f \u0441 "{0}" \u0438 \u043e\u043a\u0430\u043d\u0447\u0438\u0432\u0430\u0442\u044c\u0441\u044f \u043d\u0430 "{1}".
29.10 RenameTemplatePanel.title.text=\u041f\u0435\u0440\u0435\u0438\u043c\u0435\u043d\u043e\u0432\u0430\u0442\u044c \u0448\u0430\u0431\u043b\u043e\u043d
29.11 TemplatesPanel_TemplateNode_DisplayName=\u041e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435 \u0438\u043c\u0435\u043d\u0438
29.12 TemplatesPanel_TemplateNode_DisplayName_Desc=\u0418\u043c\u044f \u0434\u043b\u044f \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f \u044d\u0442\u043e\u0433\u043e \u0448\u0430\u0431\u043b\u043e\u043d\u0430. \u041e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u0435\u0442\u0441\u044f \u0432 \u043c\u0430\u0441\u0442\u0435\u0440\u0435, \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u043e\u043c \u0432 \u043c\u0435\u043d\u044e "\u0424\u0430\u0439\u043b"|"\u0421\u043e\u0437\u0434\u0430\u0442\u044c", \u0430 \u0442\u0430\u043a\u0436\u0435 "\u0421\u0435\u0440\u0432\u0438\u0441"|"\u0428\u0430\u0431\u043b\u043e\u043d\u044b".
30.1 --- a/src/ru/platform/javahelp/javahelp/org/netbeans/modules/javahelp/resources/Bundle_ru.properties Fri Sep 06 11:24:04 2013 +0900
30.2 +++ b/src/ru/platform/javahelp/javahelp/org/netbeans/modules/javahelp/resources/Bundle_ru.properties Sat Sep 07 20:24:12 2013 +0900
30.3 @@ -48,4 +48,3 @@
30.4 Menu/Help/master-help.xml=\u0421\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u0435 \u0441\u043f\u0440\u0430\u0432\u043a\u0438
30.5 Menu/Help/HelpShortcuts=\u041d\u0430\u0431\u043e\u0440\u044b \u0441\u043f\u0440\u0430\u0432\u043e\u043a
30.6 Actions/Help/master-help.xml=\u0421\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u0435 \u0441\u043f\u0440\u0430\u0432\u043a\u0438
30.7 -
31.1 --- a/src/ru/platform/options-api/options-api/org/netbeans/modules/options/Bundle_ru.properties Fri Sep 06 11:24:04 2013 +0900
31.2 +++ b/src/ru/platform/options-api/options-api/org/netbeans/modules/options/Bundle_ru.properties Sat Sep 07 20:24:12 2013 +0900
31.3 @@ -45,6 +45,7 @@
31.4 # {0} - shortcut to access the search text field
31.5 Filter_Textfield_Hint=\u0424\u0438\u043b\u044c\u0442\u0440 ({0})
31.6 Filter_Textfield_Tooltip=\u0414\u043b\u044f \u0441\u0431\u0440\u043e\u0441\u0430 \u0444\u0438\u043b\u044c\u0442\u0440\u0430 \u0443\u0434\u0430\u043b\u0438\u0442\u0435 \u0442\u0435\u043a\u0441\u0442 \u0438 \u043d\u0430\u0436\u043c\u0438\u0442\u0435 \u043a\u043b\u0430\u0432\u0438\u0448\u0443 Esc \u0438\u043b\u0438 Enter
31.7 +Loading_HelpCtx_Lengthy_Operation=\u0414\u043e\u0436\u0434\u0438\u0442\u0435\u0441\u044c \u043e\u043a\u043e\u043d\u0447\u0430\u043d\u0438\u044f \u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0438 \u043a\u043e\u043d\u0442\u0435\u043a\u0441\u0442\u0430 \u0441\u043f\u0440\u0430\u0432\u043a\u0438.
31.8 OpenIDE-Module-Name=\u0414\u0438\u0430\u043b\u043e\u0433\u043e\u0432\u043e\u0435 \u043e\u043a\u043d\u043e \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u043e\u0432 \u0438 SPI
31.9 OpenIDE-Module-Display-Category=\u0421\u0440\u0435\u0434\u0441\u0442\u0432\u0430
31.10 OpenIDE-Module-Short-Description=\u041f\u0440\u0435\u0434\u043e\u0441\u0442\u0430\u0432\u043b\u044f\u0435\u0442 \u0434\u0438\u0430\u043b\u043e\u0433\u043e\u0432\u043e\u0435 \u043e\u043a\u043d\u043e \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u043e\u0432 \u0438 \u0438\u043d\u0442\u0435\u0440\u0444\u0435\u0439\u0441 SPI \u0434\u043b\u044f \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u0432 \u043d\u0435\u0433\u043e \u043f\u0430\u043d\u0435\u043b\u0435\u0439.
31.11 @@ -72,7 +73,8 @@
31.12 ACS_OptionsPanel=\u0414\u0438\u0430\u043b\u043e\u0433\u043e\u0432\u043e\u0435 \u043e\u043a\u043d\u043e \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u043e\u0432
31.13 ACS_Export=\u042d\u043a\u0441\u043f\u043e\u0440\u0442 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u043e\u0432
31.14 ACS_Import=\u0418\u043c\u043f\u043e\u0440\u0442 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u043e\u0432
31.15 -ProgressHandle_Saving_Options_DisplayName=\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u0438\u044f...
31.16 +Saving_Options_Lengthy_Operation=\u0414\u043e\u0436\u0434\u0438\u0442\u0435\u0441\u044c \u043e\u043a\u043e\u043d\u0447\u0430\u043d\u0438\u044f \u043f\u0440\u043e\u0446\u0435\u0441\u0441\u0430 \u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u0438\u044f \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u043e\u0432.
31.17 +Saving_Options_Lengthy_Operation_Title=\u0412\u044b\u043f\u043e\u043b\u043d\u044f\u0435\u0442\u0441\u044f \u0434\u043b\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0439 \u043f\u0440\u043e\u0446\u0435\u0441\u0441
31.18 TabbedController.pane.AD=\u041f\u0430\u043d\u0435\u043b\u044c \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u043e\u0432
31.19
31.20 QuickSearch/GoToOption=\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b
32.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
32.2 +++ b/src/ru/platform/org-netbeans-core-network/org-netbeans-core-network/org/netbeans/core/network/proxy/fallback/Bundle_ru.properties Sat Sep 07 20:24:12 2013 +0900
32.3 @@ -0,0 +1,43 @@
32.4 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
32.5 +#
32.6 +# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
32.7 +#
32.8 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
32.9 +# Other names may be trademarks of their respective owners.
32.10 +#
32.11 +# The contents of this file are subject to the terms of either the GNU
32.12 +# General Public License Version 2 only ("GPL") or the Common
32.13 +# Development and Distribution License("CDDL") (collectively, the
32.14 +# "License"). You may not use this file except in compliance with the
32.15 +# License. You can obtain a copy of the License at
32.16 +# http://www.netbeans.org/cddl-gplv2.html
32.17 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
32.18 +# specific language governing permissions and limitations under the
32.19 +# License. When distributing the software, include this License Header
32.20 +# Notice in each file and include the License file at
32.21 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
32.22 +# particular file as subject to the "Classpath" exception as provided
32.23 +# by Oracle in the GPL Version 2 section of the License file that
32.24 +# accompanied this code. If applicable, add the following below the
32.25 +# License Header, with the fields enclosed by brackets [] replaced by
32.26 +# your own identifying information:
32.27 +# "Portions Copyrighted [year] [name of copyright owner]"
32.28 +#
32.29 +# If you wish your version of this file to be governed by only the CDDL
32.30 +# or only the GPL Version 2, indicate your decision by adding
32.31 +# "[Contributor] elects to include this software in this distribution
32.32 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
32.33 +# single choice of license, a recipient has the option to distribute
32.34 +# your version of this file under either the CDDL, the GPL Version 2 or
32.35 +# to extend the choice of license to its licensees as provided above.
32.36 +# However, if you add GPL Version 2 code and therefore, elected the GPL
32.37 +# Version 2 license, then the option applies only if the new code is
32.38 +# made subject to such option by the copyright holder.
32.39 +#
32.40 +# Contributor(s):
32.41 +#
32.42 +# Portions Copyrighted 2013 Sun Microsystems, Inc.
32.43 +
32.44 +
32.45 +DefaulNoProxyHosts=localhost,127.0.0.1
32.46 +
33.1 --- a/src/ru/platform/org-netbeans-core-ui/org-netbeans-core-ui/org/netbeans/core/ui/options/general/Bundle_ru.properties Fri Sep 06 11:24:04 2013 +0900
33.2 +++ b/src/ru/platform/org-netbeans-core-ui/org-netbeans-core-ui/org/netbeans/core/ui/options/general/Bundle_ru.properties Sat Sep 07 20:24:12 2013 +0900
33.3 @@ -266,4 +266,6 @@
33.4 GeneralOptionsPanel.bReloadProxy.text=\u041f\u0435\u0440\u0435\u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0430
33.5 GeneralOptionsPanel.bTestConnection.text=\u041f\u0440\u043e\u0432\u0435\u0440\u0438\u0442\u044c \u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0435
33.6
33.7 +GeneralOptionsPanel.proxy.result.ok=\u0421\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0435 \u043f\u0435\u0440\u0435\u0434\u0430\u043d\u043e
33.8 +GeneralOptionsPanel.proxy.result.failed=\u0421\u0431\u043e\u0439 \u043f\u0440\u0438 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0438 \u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u044f ({0})
33.9
34.1 --- a/src/ru/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/options/Bundle_ru.properties Fri Sep 06 11:24:04 2013 +0900
34.2 +++ b/src/ru/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/options/Bundle_ru.properties Sat Sep 07 20:24:12 2013 +0900
34.3 @@ -76,8 +76,8 @@
34.4 WinSysPanel.checkMaximizeNativeLaF.toolTipText=<html>NetBeans \u043f\u043e\u0437\u0432\u043e\u043b\u044f\u0435\u0442 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c \u0441\u043e\u0431\u0441\u0442\u0432\u0435\u043d\u043d\u044b\u0435 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u044b \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u043e\u0433\u043e \u0438\u043d\u0442\u0435\u0440\u0444\u0435\u0439\u0441\u0430 \u043f\u0440\u0438 \u0443\u0441\u043b\u043e\u0432\u0438\u0438 \u043e\u0431\u0435\u0441\u043f\u0435\u0447\u0435\u043d\u0438\u044f \u0434\u043e\u0441\u0442\u0430\u0442\u043e\u0447\u043d\u043e\u0439\n\u0444\u0443\u043d\u043a\u0446\u0438\u043e\u043d\u0430\u043b\u044c\u043d\u043e\u0441\u0442\u0438. <br>\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u044d\u0442\u0443 \u043e\u043f\u0446\u0438\u044e \u0434\u043b\u044f \u043f\u0440\u0438\u043d\u0443\u0434\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0433\u043e \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u044f \u0441\u043e\u0431\u0441\u0442\u0432\u0435\u043d\u043d\u044b\u0445 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u043e\u0432 \u0434\u0430\u0436\u0435\n\u0432 \u0441\u043b\u0443\u0447\u0430\u0435 \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e\u0433\u043e \u043e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u0438\u044f \u0444\u0443\u043d\u043a\u0446\u0438\u043e\u043d\u0430\u043b\u044c\u043d\u043e\u0441\u0442\u0438 (\u043d\u0430\u043f\u0440\u0438\u043c\u0435\u0440, \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0435 \u0441\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u043d\u043e\u0439 \u0443\u0442\u0438\u043b\u0438\u0442\u044b \u0432\u044b\u0431\u043e\u0440\u0430 \u0444\u0430\u0439\u043b\u043e\u0432 Mac OS).
34.5 WinSysPanel.lblLaf.text=\u041f\u0440\u0435\u0434\u043f\u043e\u0447\u0442\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0439 \u0441\u0442\u0438\u043b\u044c \u043e\u0444\u043e\u0440\u043c\u043b\u0435\u043d\u0438\u044f:
34.6 WinSysPanel.lblRestart.text=(\u0442\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u043f\u0435\u0440\u0435\u0437\u0430\u043f\u0443\u0441\u043a)
34.7 -Laf_DARK_METAL=\u0422\u0435\u043c\u043d\u044b\u0439 \u043c\u0435\u0442\u0430\u043b\u043b
34.8 -Laf_DARK_NIMBUS=\u0422\u0435\u043c\u043d\u044b\u0439 \u043e\u0440\u0435\u043e\u043b
34.9 +
34.10 +
34.11 Hint_RESTART_IDE=\u041f\u0435\u0440\u0435\u0437\u0430\u043f\u0443\u0441\u0442\u0438\u0442\u044c IDE
34.12 Descr_Restart=<html><a href="#">\u041d\u0430\u0436\u043c\u0438\u0442\u0435 \u0437\u0434\u0435\u0441\u044c \u0434\u043b\u044f \u043f\u0435\u0440\u0435\u0437\u0430\u043f\u0443\u0441\u043a\u0430 IDE \u0438 \u043f\u0440\u0438\u043c\u0435\u043d\u0435\u043d\u0438\u044f \u0432\u044b\u0431\u0440\u0430\u043d\u043d\u043e\u0433\u043e \u0441\u0442\u0438\u043b\u044f \u043e\u0444\u043e\u0440\u043c\u043b\u0435\u043d\u0438\u044f.
34.13 Hint_ChangeEditorColors=\u041f\u0435\u0440\u0435\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043d\u0430 \u0441\u043e\u043f\u043e\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u0446\u0432\u0435\u0442\u043e\u0432\u043e\u0433\u043e \u043f\u0440\u043e\u0444\u0438\u043b\u044f \u0440\u0435\u0434\u0430\u043a\u0442\u043e\u0440\u0430.
35.1 --- a/src/ru/platform/uihandler/uihandler/org/netbeans/modules/exceptions/Bundle_ru.properties Fri Sep 06 11:24:04 2013 +0900
35.2 +++ b/src/ru/platform/uihandler/uihandler/org/netbeans/modules/exceptions/Bundle_ru.properties Sat Sep 07 20:24:12 2013 +0900
35.3 @@ -51,7 +51,7 @@
35.4 ReportPanel.jLabel1.text=\u0418\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f:
35.5 ReportPanel.jLabel3.text=\u041f\u043e\u043b\u0443\u0447\u0430\u0442\u044c \u0434\u0430\u043d\u043d\u044b\u0435 \u043e \u0441\u043e\u0441\u0442\u043e\u044f\u043d\u0438\u0438 \u043f\u0440\u043e\u0431\u043b\u0435\u043c\u044b \u043c\u043e\u0433\u0443\u0442 \u0442\u043e\u043b\u044c\u043a\u043e \u0437\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u044b\u0435 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0438.
35.6 ReportPanel.jLabel2.text=\u0415\u0441\u043b\u0438 \u0432\u044b \u043d\u0435 \u0437\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u044b, \u043e\u0442\u043f\u0440\u0430\u0432\u044c\u0442\u0435 \u043e\u0442\u0447\u0435\u0442 \u043a\u0430\u043a \u0433\u043e\u0441\u0442\u044c \u0438\u043b\u0438 \u0437\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u0443\u0439\u0442\u0435\u0441\u044c \u0441\u0435\u0439\u0447\u0430\u0441.
35.7 -ReportPanel.jLabel6.text=\u0420\u0435\u0435\u0441\u0442\u0440
35.8 +ReportPanel.jLabel6.text=<html><a href="#">\u0417\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u0442\u044c\u0441\u044f</a></html>
35.9
35.10 ReportPanel.AccessibleContext.accessibleDescription=\u0414\u0438\u0430\u043b\u043e\u0433\u043e\u0432\u043e\u0435 \u043e\u043a\u043d\u043e \u0434\u043b\u044f \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u044f \u043e \u043f\u0440\u043e\u0431\u043b\u0435\u043c\u0430\u0445
35.11
36.1 --- a/src/ru/platform/uihandler/uihandler/org/netbeans/modules/uihandler/Bundle_ru.properties Fri Sep 06 11:24:04 2013 +0900
36.2 +++ b/src/ru/platform/uihandler/uihandler/org/netbeans/modules/uihandler/Bundle_ru.properties Sat Sep 07 20:24:12 2013 +0900
36.3 @@ -126,6 +126,7 @@
36.4
36.5 # {0} - host
36.6 # {1} - url of upload
36.7 +# {2} - the absolute path to the IDE's log file (defined by the LOG_FILE key above)
36.8 MSG_ConnetionFailed=\u0421\u0431\u043e\u0439 \u043f\u0440\u0438 \u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0435 \u0436\u0443\u0440\u043d\u0430\u043b\u0430 \u043d\u0430 {0}!
36.9 # {0} - host
36.10 # {1} - url of upload
36.11 @@ -133,6 +134,18 @@
36.12 # String between [URL] and [/URL] is rendered as an URL and it opens in a browser upon a click
36.13 # String between [TTC] and [/TTC] (Text To Copy) is possible to select and copy
36.14 MSG_ConnetionFailedReport=\u0421\u0431\u043e\u0439 \u043f\u0440\u0438 \u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0435 \u0436\u0443\u0440\u043d\u0430\u043b\u0430. \u0421\u043e\u043e\u0431\u0449\u0438\u0442\u0435 \u043e\u0431 \u0438\u0441\u0445\u043e\u0434\u043d\u043e\u0439 \u043f\u0440\u043e\u0431\u043b\u0435\u043c\u0435 \u043f\u043e \u0430\u0434\u0440\u0435\u0441\u0443 [URL]http://www.myapplication.org/bugs.html[/URL] \u0438 \u043f\u0440\u0438\u043a\u0440\u0435\u043f\u0438\u0442\u0435 \u0444\u0430\u0439\u043b messages.log. \u0424\u0430\u0439\u043b messages.log \u043d\u0430\u0445\u043e\u0434\u0438\u0442\u0441\u044f \u0432 \u043f\u0430\u043f\u043a\u0435 [TTC]{2}[/TTC].
36.15 +# {0} - host
36.16 +# {1} - url of upload
36.17 +# {2} - the absolute path to the IDE's log file (defined by the LOG_FILE key above)
36.18 +# {3} - response message
36.19 +MSG_ConnetionFailedWithResponse=\u0421\u0431\u043e\u0439 \u043f\u0440\u0438 \u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0435 \u0436\u0443\u0440\u043d\u0430\u043b\u0430 \u043d\u0430 {0}: {3}
36.20 +# {0} - host
36.21 +# {1} - url of upload
36.22 +# {2} - the absolute path to the IDE's log file (defined by the LOG_FILE key above)
36.23 +# {3} - response message
36.24 +# String between [URL] and [/URL] is rendered as an URL and it opens in a browser upon a click
36.25 +# String between [TTC] and [/TTC] (Text To Copy) is possible to select and copy
36.26 +MSG_ConnetionFailedReportWithResponse=\u0421\u0431\u043e\u0439 \u043f\u0440\u0438 \u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0435 \u0436\u0443\u0440\u043d\u0430\u043b\u0430 ({3}). \u0421\u043e\u043e\u0431\u0449\u0438\u0442\u0435 \u043e\u0431 \u0438\u0441\u0445\u043e\u0434\u043d\u043e\u0439 \u043f\u0440\u043e\u0431\u043b\u0435\u043c\u0435 \u043f\u043e \u0430\u0434\u0440\u0435\u0441\u0443 [URL]http://www.myapplication.org/bugs.html[/URL] \u0438 \u043f\u0440\u0438\u043a\u0440\u0435\u043f\u0438\u0442\u0435 \u0444\u0430\u0439\u043b messages.log.\n\u0424\u0430\u0439\u043b messages.log file \u043d\u0430\u0445\u043e\u0434\u0438\u0442\u0441\u044f \u0432 [TTC]{2}[/TTC].
36.27 MSG_UploadProgressHandle=\u0412\u044b\u0433\u0440\u0443\u0437\u043a\u0430 \u0444\u0430\u0439\u043b\u0430 \u0436\u0443\u0440\u043d\u0430\u043b\u0430
36.28 MSG_UploadConnecting=\u0423\u0441\u0442\u0430\u043d\u0430\u0432\u043b\u0438\u0432\u0430\u0435\u0442\u0441\u044f \u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0435...
36.29 MSG_UploadSending=\u0418\u0434\u0435\u0442 \u043e\u0442\u043f\u0440\u0430\u0432\u043a\u0430 \u0436\u0443\u0440\u043d\u0430\u043b\u043e\u0432...
37.1 --- a/src/zh_CN/platform/favorites/favorites/org/netbeans/modules/favorites/templates/Bundle_zh_CN.properties Fri Sep 06 11:24:04 2013 +0900
37.2 +++ b/src/zh_CN/platform/favorites/favorites/org/netbeans/modules/favorites/templates/Bundle_zh_CN.properties Sat Sep 07 20:24:12 2013 +0900
37.3 @@ -77,6 +77,9 @@
37.4
37.5 # {0} - file name
37.6 MSG_TemplatesPanel_Nonexistent_File=\u6587\u4ef6 ''{0}''\n\u4e0d\u5b58\u5728, \u8bf7\u6307\u5b9a\u4e00\u4e2a\u73b0\u6709\u6587\u4ef6\u3002
37.7 +# {0} - prefix of the license file name
37.8 +# {1} - suffix of the license file name
37.9 +RenameTemplatePanel.license.warning.text=\u8bb8\u53ef\u8bc1\u6587\u4ef6\u540d\u5fc5\u987b\u4ee5 "{0}" \u5f00\u5934, \u4ee5 "{1}" \u7ed3\u5c3e\u3002
37.10 RenameTemplatePanel.title.text=\u91cd\u547d\u540d\u6a21\u677f
37.11 TemplatesPanel_TemplateNode_DisplayName=\u663e\u793a\u540d\u79f0
37.12 TemplatesPanel_TemplateNode_DisplayName_Desc=\u6b64\u6a21\u677f\u7684\u663e\u793a\u540d\u79f0\u3002\u663e\u793a\u5728\u201c\u6587\u4ef6\u201d|\u201c\u65b0\u5efa\u201d\u5411\u5bfc\u4ee5\u53ca\u201c\u5de5\u5177\u201d|\u201c\u6a21\u677f\u201d\u4e2d\u3002
38.1 --- a/src/zh_CN/platform/options-api/options-api/org/netbeans/modules/options/Bundle_zh_CN.properties Fri Sep 06 11:24:04 2013 +0900
38.2 +++ b/src/zh_CN/platform/options-api/options-api/org/netbeans/modules/options/Bundle_zh_CN.properties Sat Sep 07 20:24:12 2013 +0900
38.3 @@ -45,6 +45,7 @@
38.4 # {0} - shortcut to access the search text field
38.5 Filter_Textfield_Hint=\u8fc7\u6ee4\u5668 ({0})
38.6 Filter_Textfield_Tooltip=\u6309 Esc \u6216\u8f93\u5165\u7a7a\u6587\u672c\u540e\u6309 Enter \u4ee5\u6e05\u9664\u8fc7\u6ee4\u5668
38.7 +Loading_HelpCtx_Lengthy_Operation=\u6b63\u5728\u52a0\u8f7d\u5e2e\u52a9\u4e0a\u4e0b\u6587, \u8bf7\u7a0d\u5019\u3002
38.8 OpenIDE-Module-Name=\u201c\u9009\u9879\u201d\u5bf9\u8bdd\u6846\u548c SPI
38.9 OpenIDE-Module-Display-Category=\u5de5\u5177
38.10 OpenIDE-Module-Short-Description=\u63d0\u4f9b\u201c\u9009\u9879\u201d\u5bf9\u8bdd\u6846\u548c SPI \u4ee5\u5728\u5176\u4e2d\u6dfb\u52a0\u9762\u677f\u3002
38.11 @@ -72,7 +73,8 @@
38.12 ACS_OptionsPanel=\u201c\u9009\u9879\u201d\u5bf9\u8bdd\u6846
38.13 ACS_Export=\u5bfc\u51fa\u9009\u9879
38.14 ACS_Import=\u5bfc\u5165\u9009\u9879
38.15 -ProgressHandle_Saving_Options_DisplayName=\u6b63\u5728\u4fdd\u5b58\u9009\u9879...
38.16 +Saving_Options_Lengthy_Operation=\u6b63\u5728\u4fdd\u5b58\u9009\u9879, \u8bf7\u7a0d\u5019\u3002
38.17 +Saving_Options_Lengthy_Operation_Title=\u6b63\u5728\u8fdb\u884c\u957f\u65f6\u95f4\u64cd\u4f5c
38.18 TabbedController.pane.AD=\u9009\u9879\u9762\u677f
38.19
38.20 QuickSearch/GoToOption=\u9009\u9879
39.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
39.2 +++ b/src/zh_CN/platform/org-netbeans-core-network/org-netbeans-core-network/org/netbeans/core/network/proxy/fallback/Bundle_zh_CN.properties Sat Sep 07 20:24:12 2013 +0900
39.3 @@ -0,0 +1,43 @@
39.4 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
39.5 +#
39.6 +# Copyright 2013 Oracle and/or its affiliates. All rights reserved.
39.7 +#
39.8 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
39.9 +# Other names may be trademarks of their respective owners.
39.10 +#
39.11 +# The contents of this file are subject to the terms of either the GNU
39.12 +# General Public License Version 2 only ("GPL") or the Common
39.13 +# Development and Distribution License("CDDL") (collectively, the
39.14 +# "License"). You may not use this file except in compliance with the
39.15 +# License. You can obtain a copy of the License at
39.16 +# http://www.netbeans.org/cddl-gplv2.html
39.17 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
39.18 +# specific language governing permissions and limitations under the
39.19 +# License. When distributing the software, include this License Header
39.20 +# Notice in each file and include the License file at
39.21 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
39.22 +# particular file as subject to the "Classpath" exception as provided
39.23 +# by Oracle in the GPL Version 2 section of the License file that
39.24 +# accompanied this code. If applicable, add the following below the
39.25 +# License Header, with the fields enclosed by brackets [] replaced by
39.26 +# your own identifying information:
39.27 +# "Portions Copyrighted [year] [name of copyright owner]"
39.28 +#
39.29 +# If you wish your version of this file to be governed by only the CDDL
39.30 +# or only the GPL Version 2, indicate your decision by adding
39.31 +# "[Contributor] elects to include this software in this distribution
39.32 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
39.33 +# single choice of license, a recipient has the option to distribute
39.34 +# your version of this file under either the CDDL, the GPL Version 2 or
39.35 +# to extend the choice of license to its licensees as provided above.
39.36 +# However, if you add GPL Version 2 code and therefore, elected the GPL
39.37 +# Version 2 license, then the option applies only if the new code is
39.38 +# made subject to such option by the copyright holder.
39.39 +#
39.40 +# Contributor(s):
39.41 +#
39.42 +# Portions Copyrighted 2013 Sun Microsystems, Inc.
39.43 +
39.44 +
39.45 +DefaulNoProxyHosts=localhost,127.0.0.1
39.46 +
40.1 --- a/src/zh_CN/platform/org-netbeans-core-ui/org-netbeans-core-ui/org/netbeans/core/ui/options/general/Bundle_zh_CN.properties Fri Sep 06 11:24:04 2013 +0900
40.2 +++ b/src/zh_CN/platform/org-netbeans-core-ui/org-netbeans-core-ui/org/netbeans/core/ui/options/general/Bundle_zh_CN.properties Sat Sep 07 20:24:12 2013 +0900
40.3 @@ -266,4 +266,6 @@
40.4 GeneralOptionsPanel.bReloadProxy.text=\u91cd\u65b0\u52a0\u8f7d(&L)
40.5 GeneralOptionsPanel.bTestConnection.text=\u6d4b\u8bd5\u8fde\u63a5(&C)
40.6
40.7 +GeneralOptionsPanel.proxy.result.ok=\u8fde\u63a5\u901a\u8fc7
40.8 +GeneralOptionsPanel.proxy.result.failed=\u8fde\u63a5\u5931\u8d25 ({0})
40.9
41.1 --- a/src/zh_CN/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/options/Bundle_zh_CN.properties Fri Sep 06 11:24:04 2013 +0900
41.2 +++ b/src/zh_CN/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/options/Bundle_zh_CN.properties Sat Sep 07 20:24:12 2013 +0900
41.3 @@ -76,8 +76,8 @@
41.4 WinSysPanel.checkMaximizeNativeLaF.toolTipText=<html>\u5f53\u672c\u673a UI \u7ec4\u4ef6\u63d0\u4f9b\u8db3\u591f\u7684\n\u529f\u80fd\u65f6, NetBeans \u5c06\u4f7f\u7528\u8fd9\u4e9b\u7ec4\u4ef6\u3002<br>\u9009\u62e9\u6b64\u9009\u9879\u53ef\u5f3a\u5236\u4f7f\u7528\u672c\u673a\u7ec4\u4ef6, \u5373\u4f7f\n\u5728\u53ef\u80fd\u9650\u5236\u67d0\u4e9b\u529f\u80fd (\u4f8b\u5982, \u6807\u51c6 Mac OS \u6587\u4ef6\u9009\u62e9\u5668) \u7684\u60c5\u51b5\u4e0b\u3002
41.5 WinSysPanel.lblLaf.text=\u9996\u9009\u5916\u89c2(&P):
41.6 WinSysPanel.lblRestart.text=(\u9700\u8981\u91cd\u65b0\u542f\u52a8)
41.7 -Laf_DARK_METAL=\u6df1\u8272\u91d1\u5c5e
41.8 -Laf_DARK_NIMBUS=\u6df1\u8272\u5149\u6655
41.9 +
41.10 +
41.11 Hint_RESTART_IDE=\u91cd\u65b0\u542f\u52a8 IDE
41.12 Descr_Restart=<html><a href="#">\u5355\u51fb\u6b64\u5904\u53ef\u91cd\u65b0\u542f\u52a8 IDE \u5e76\u5e94\u7528\u6240\u9009\u7684\u5916\u89c2\u3002
41.13 Hint_ChangeEditorColors=\u5207\u6362\u5230\u5339\u914d\u7684\u7f16\u8f91\u5668\u989c\u8272\u914d\u7f6e\u6587\u4ef6\u3002
42.1 --- a/src/zh_CN/platform/org-netbeans-libs-jna/org-netbeans-libs-jna/org/netbeans/libs/jna/Bundle_zh_CN.properties Fri Sep 06 11:24:04 2013 +0900
42.2 +++ b/src/zh_CN/platform/org-netbeans-libs-jna/org-netbeans-libs-jna/org/netbeans/libs/jna/Bundle_zh_CN.properties Sat Sep 07 20:24:12 2013 +0900
42.3 @@ -45,3 +45,4 @@
42.4 OpenIDE-Module-Display-Category=\u5e93
42.5 OpenIDE-Module-Short-Description=\u6346\u7ed1 JNA \u5e93\u3002
42.6 OpenIDE-Module-Long-Description=\u6b64\u6a21\u5757\u6346\u7ed1 JNA \u5e93\u3002
42.7 +
43.1 --- a/src/zh_CN/platform/org-openide-modules/netbeans/lib/org-openide-modules/org/openide/modules/Bundle_zh_CN.properties Fri Sep 06 11:24:04 2013 +0900
43.2 +++ b/src/zh_CN/platform/org-openide-modules/netbeans/lib/org-openide-modules/org/openide/modules/Bundle_zh_CN.properties Sat Sep 07 20:24:12 2013 +0900
43.3 @@ -45,4 +45,3 @@
43.4 OpenIDE-Module-Display-Category=\u57fa\u7840\u7ed3\u6784
43.5 OpenIDE-Module-Short-Description=\u7528\u4e8e\u83b7\u53d6\u5b89\u88c5\u7684\u6a21\u5757\u76f8\u5173\u4fe1\u606f\u7684 API\u3002
43.6 OpenIDE-Module-Long-Description=\u5141\u8bb8\u83b7\u53d6\u5b89\u88c5\u7684\u6a21\u5757\u5217\u8868, \u68c0\u67e5\u5176\u5c5e\u6027\u548c\u4f9d\u8d56\u5173\u7cfb\u3002
43.7 -
44.1 --- a/src/zh_CN/platform/uihandler/uihandler/org/netbeans/modules/exceptions/Bundle_zh_CN.properties Fri Sep 06 11:24:04 2013 +0900
44.2 +++ b/src/zh_CN/platform/uihandler/uihandler/org/netbeans/modules/exceptions/Bundle_zh_CN.properties Sat Sep 07 20:24:12 2013 +0900
44.3 @@ -51,7 +51,7 @@
44.4 ReportPanel.jLabel1.text=\u7528\u6237\u540d(&U):
44.5 ReportPanel.jLabel3.text=\u5982\u679c\u8981\u968f\u65f6\u4e86\u89e3\u6b64\u95ee\u9898\u7684\u72b6\u6001, \u60a8\u9700\u8981\u6210\u4e3a\u6ce8\u518c\u7528\u6237\u3002
44.6 ReportPanel.jLabel2.text=\u5982\u679c\u5c1a\u672a\u6ce8\u518c, \u53ef\u4ee5\u4ee5\u6765\u5bbe\u8eab\u4efd\u53d1\u9001\u62a5\u544a\u6216\u8005\u7acb\u5373\u6ce8\u518c\u3002
44.7 -ReportPanel.jLabel6.text=\u6ce8\u518c
44.8 +ReportPanel.jLabel6.text=<html><a href="#">\u6ce8\u518c</a></html>
44.9
44.10 ReportPanel.AccessibleContext.accessibleDescription=\u7528\u4e8e\u62a5\u544a\u95ee\u9898\u7684\u5bf9\u8bdd\u6846
44.11
45.1 --- a/src/zh_CN/platform/uihandler/uihandler/org/netbeans/modules/uihandler/Bundle_zh_CN.properties Fri Sep 06 11:24:04 2013 +0900
45.2 +++ b/src/zh_CN/platform/uihandler/uihandler/org/netbeans/modules/uihandler/Bundle_zh_CN.properties Sat Sep 07 20:24:12 2013 +0900
45.3 @@ -126,6 +126,7 @@
45.4
45.5 # {0} - host
45.6 # {1} - url of upload
45.7 +# {2} - the absolute path to the IDE's log file (defined by the LOG_FILE key above)
45.8 MSG_ConnetionFailed=\u65e0\u6cd5\u5c06\u65e5\u5fd7\u4e0a\u8f7d\u5230{0}!
45.9 # {0} - host
45.10 # {1} - url of upload
45.11 @@ -133,6 +134,18 @@
45.12 # String between [URL] and [/URL] is rendered as an URL and it opens in a browser upon a click
45.13 # String between [TTC] and [/TTC] (Text To Copy) is possible to select and copy
45.14 MSG_ConnetionFailedReport=\u65e5\u5fd7\u4e0a\u8f7d\u5931\u8d25, \u8bf7\u76f4\u63a5\u5728 [URL]http://www.myapplication.org/bugs.html[/URL] \u4e2d\u62a5\u544a\u539f\u59cb\u95ee\u9898\u5e76\u968f\u9644 messages.log \u6587\u4ef6\u3002\nmessages.log \u6587\u4ef6\u4f4d\u4e8e [TTC]{2}[/TTC] \u4e2d\u3002
45.15 +# {0} - host
45.16 +# {1} - url of upload
45.17 +# {2} - the absolute path to the IDE's log file (defined by the LOG_FILE key above)
45.18 +# {3} - response message
45.19 +MSG_ConnetionFailedWithResponse=\u65e0\u6cd5\u5c06\u65e5\u5fd7\u4e0a\u8f7d\u5230 {0}: {3}
45.20 +# {0} - host
45.21 +# {1} - url of upload
45.22 +# {2} - the absolute path to the IDE's log file (defined by the LOG_FILE key above)
45.23 +# {3} - response message
45.24 +# String between [URL] and [/URL] is rendered as an URL and it opens in a browser upon a click
45.25 +# String between [TTC] and [/TTC] (Text To Copy) is possible to select and copy
45.26 +MSG_ConnetionFailedReportWithResponse=\u65e5\u5fd7\u4e0a\u8f7d\u5931\u8d25 ({3}), \u8bf7\u76f4\u63a5\u5728 [URL]http://www.myapplication.org/bugs.html[/URL] \u4e2d\u62a5\u544a\u539f\u59cb\u95ee\u9898\u5e76\u968f\u9644 messages.log \u6587\u4ef6\u3002\nmessages.log \u6587\u4ef6\u4f4d\u4e8e [TTC]{2}[/TTC] \u4e2d\u3002
45.27 MSG_UploadProgressHandle=\u6b63\u5728\u4e0a\u8f7d\u65e5\u5fd7\u6587\u4ef6
45.28 MSG_UploadConnecting=\u6b63\u5728\u8fde\u63a5...
45.29 MSG_UploadSending=\u6b63\u5728\u53d1\u9001\u65e5\u5fd7...