1.1 --- a/src/de/platform/masterfs-windows/masterfs-windows/org/netbeans/modules/masterfs/watcher/windows/Bundle_de.properties Tue Oct 13 14:00:02 2015 +0900
1.2 +++ b/src/de/platform/masterfs-windows/masterfs-windows/org/netbeans/modules/masterfs/watcher/windows/Bundle_de.properties Wed Oct 14 03:46:20 2015 -0700
1.3 @@ -1,2 +1,1 @@
1.4 OpenIDE-Module-Name=Master-Dateisystem @ Windows
1.5 -
2.1 --- a/src/de/platform/options-keymap/options-keymap/org/netbeans/modules/options/keymap/Bundle_de.properties Tue Oct 13 14:00:02 2015 +0900
2.2 +++ b/src/de/platform/options-keymap/options-keymap/org/netbeans/modules/options/keymap/Bundle_de.properties Wed Oct 14 03:46:20 2015 -0700
2.3 @@ -197,6 +197,11 @@
2.4
2.5 Import.failed.unknown.id=Einige Aktionen wurden nicht gefunden, und ihre Bindings wurden nicht importiert. Weitere Informationen hierzu finden Sie im Log
2.6 Import.failed.title=Tastenbelegungsprofil importieren
2.7 +Export.failed.title=Tastenbelegungsprofil exportieren
2.8 +# {0} - localized exception message
2.9 +Import.io.error=Fehler beim Lesen der Datei: {0}
2.10 +Export.io.error=Fehler beim Schreiben der Datei: {0}
2.11 +Import.invalid.file=Ung\u00fcltiges Dateiformat
2.12 KeymapPanel.waitLabel.text=Warten Sie, w\u00e4hrend Aktionen erfasst werden
2.13 KeymapPanel.actionProgress.string=Warten Sie, w\u00e4hrend Aktionen geladen werden
2.14 KeymapPanel.btnPrintAsHTML.text=&Als HTML anzeigen
3.1 --- a/src/de/platform/org-netbeans-api-htmlui/org-netbeans-api-htmlui/org/netbeans/modules/htmlui/Bundle_de.properties Tue Oct 13 14:00:02 2015 +0900
3.2 +++ b/src/de/platform/org-netbeans-api-htmlui/org-netbeans-api-htmlui/org/netbeans/modules/htmlui/Bundle_de.properties Wed Oct 14 03:46:20 2015 -0700
3.3 @@ -2,3 +2,14 @@
3.4 CTL_OK=OK
3.5 OpenIDE-Module-Name=HTML UI API
3.6
3.7 +AlertTitle=Warnung
3.8 +AlertCloseButton=Schlie\u00dfen
3.9 +
3.10 +ConfirmTitle=Frage
3.11 +ConfirmOKButton=OK
3.12 +ConfirmCancelButton=Abbrechen
3.13 +
3.14 +PromptTitle=Frage
3.15 +PromptOKButton=OK
3.16 +PromptCancelButton=Abbrechen
3.17 +
4.1 --- a/src/de/platform/org-netbeans-core-startup/netbeans/core/core/org/netbeans/core/startup/Bundle_de.properties Tue Oct 13 14:00:02 2015 +0900
4.2 +++ b/src/de/platform/org-netbeans-core-startup/netbeans/core/core/org/netbeans/core/startup/Bundle_de.properties Wed Oct 14 03:46:20 2015 -0700
4.3 @@ -1,6 +1,6 @@
4.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
4.5 #
4.6 -# Copyright 1997-2012 Oracle and/or its affiliates. All rights reserved.
4.7 +# Copyright 1997-2015 Oracle and/or its affiliates. All rights reserved.
4.8 #
4.9 # Oracle and Java are registered trademarks of Oracle and/or its affiliates.
4.10 # Other names may be trademarks of their respective owners.
5.1 --- a/src/de/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/view/ui/Bundle_de.properties Tue Oct 13 14:00:02 2015 +0900
5.2 +++ b/src/de/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/view/ui/Bundle_de.properties Wed Oct 14 03:46:20 2015 -0700
5.3 @@ -1,6 +1,6 @@
5.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
5.5 #
5.6 -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
5.7 +# Copyright 1997-2015 Oracle and/or its affiliates. All rights reserved.
5.8 #
5.9 # Oracle and Java are registered trademarks of Oracle and/or its affiliates.
5.10 # Other names may be trademarks of their respective owners.
6.1 --- a/src/de/platform/org-netbeans-libs-junit4/org-netbeans-libs-junit4/org/netbeans/libs/junit4/Bundle_de.properties Tue Oct 13 14:00:02 2015 +0900
6.2 +++ b/src/de/platform/org-netbeans-libs-junit4/org-netbeans-libs-junit4/org/netbeans/libs/junit4/Bundle_de.properties Wed Oct 14 03:46:20 2015 -0700
6.3 @@ -44,3 +44,4 @@
6.4 OpenIDE-Module-Display-Category=Bibliotheken
6.5 OpenIDE-Module-Short-Description=B\u00fcndelt die JUnit 4.x-Testbibliothek.
6.6 OpenIDE-Module-Long-Description=Umfasst die JUnit 4.x-Bibliothek f\u00fcr Unit-Tests.
6.7 +
7.1 --- a/src/es/platform/masterfs-windows/masterfs-windows/org/netbeans/modules/masterfs/watcher/windows/Bundle_es.properties Tue Oct 13 14:00:02 2015 +0900
7.2 +++ b/src/es/platform/masterfs-windows/masterfs-windows/org/netbeans/modules/masterfs/watcher/windows/Bundle_es.properties Wed Oct 14 03:46:20 2015 -0700
7.3 @@ -1,2 +1,1 @@
7.4 OpenIDE-Module-Name=Sistema de Archivos Maestro en Windows
7.5 -
8.1 --- a/src/es/platform/options-keymap/options-keymap/org/netbeans/modules/options/keymap/Bundle_es.properties Tue Oct 13 14:00:02 2015 +0900
8.2 +++ b/src/es/platform/options-keymap/options-keymap/org/netbeans/modules/options/keymap/Bundle_es.properties Wed Oct 14 03:46:20 2015 -0700
8.3 @@ -197,6 +197,11 @@
8.4
8.5 Import.failed.unknown.id=No se han encontrado algunas acciones y sus enlaces no se han importado. Consulte el log para obtener m\u00e1s informaci\u00f3n
8.6 Import.failed.title=Importar Perfil de Asignaci\u00f3n de Teclas
8.7 +Export.failed.title=Exportar Perfil de Asignaci\u00f3n de Teclas
8.8 +# {0} - localized exception message
8.9 +Import.io.error=Error al leer el archivo: {0}
8.10 +Export.io.error=Error al escribir el archivo: {0}
8.11 +Import.invalid.file=Formato de archivo no v\u00e1lido
8.12 KeymapPanel.waitLabel.text=Espere mientras se recopilan las acciones
8.13 KeymapPanel.actionProgress.string=Espere mientras se cargan las acciones
8.14 KeymapPanel.btnPrintAsHTML.text=Mostr&ar como HTML
9.1 --- a/src/es/platform/org-netbeans-api-htmlui/org-netbeans-api-htmlui/org/netbeans/modules/htmlui/Bundle_es.properties Tue Oct 13 14:00:02 2015 +0900
9.2 +++ b/src/es/platform/org-netbeans-api-htmlui/org-netbeans-api-htmlui/org/netbeans/modules/htmlui/Bundle_es.properties Wed Oct 14 03:46:20 2015 -0700
9.3 @@ -2,3 +2,14 @@
9.4 CTL_OK=Aceptar
9.5 OpenIDE-Module-Name=HTML UI API
9.6
9.7 +AlertTitle=Advertencia
9.8 +AlertCloseButton=Cerrar
9.9 +
9.10 +ConfirmTitle=Pregunta
9.11 +ConfirmOKButton=Aceptar
9.12 +ConfirmCancelButton=Cancelar
9.13 +
9.14 +PromptTitle=Pregunta
9.15 +PromptOKButton=Aceptar
9.16 +PromptCancelButton=Cancelar
9.17 +
10.1 --- a/src/es/platform/org-netbeans-core-startup/netbeans/core/core/org/netbeans/core/startup/Bundle_es.properties Tue Oct 13 14:00:02 2015 +0900
10.2 +++ b/src/es/platform/org-netbeans-core-startup/netbeans/core/core/org/netbeans/core/startup/Bundle_es.properties Wed Oct 14 03:46:20 2015 -0700
10.3 @@ -1,6 +1,6 @@
10.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
10.5 #
10.6 -# Copyright 1997-2012 Oracle and/or its affiliates. All rights reserved.
10.7 +# Copyright 1997-2015 Oracle and/or its affiliates. All rights reserved.
10.8 #
10.9 # Oracle and Java are registered trademarks of Oracle and/or its affiliates.
10.10 # Other names may be trademarks of their respective owners.
11.1 --- a/src/es/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/view/ui/Bundle_es.properties Tue Oct 13 14:00:02 2015 +0900
11.2 +++ b/src/es/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/view/ui/Bundle_es.properties Wed Oct 14 03:46:20 2015 -0700
11.3 @@ -1,6 +1,6 @@
11.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
11.5 #
11.6 -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
11.7 +# Copyright 1997-2015 Oracle and/or its affiliates. All rights reserved.
11.8 #
11.9 # Oracle and Java are registered trademarks of Oracle and/or its affiliates.
11.10 # Other names may be trademarks of their respective owners.
12.1 --- a/src/es/platform/org-netbeans-libs-junit4/org-netbeans-libs-junit4/org/netbeans/libs/junit4/Bundle_es.properties Tue Oct 13 14:00:02 2015 +0900
12.2 +++ b/src/es/platform/org-netbeans-libs-junit4/org-netbeans-libs-junit4/org/netbeans/libs/junit4/Bundle_es.properties Wed Oct 14 03:46:20 2015 -0700
12.3 @@ -44,3 +44,4 @@
12.4 OpenIDE-Module-Display-Category=Bibliotecas
12.5 OpenIDE-Module-Short-Description=Agrupa la biblioteca de pruebas de JUnit 4.x.
12.6 OpenIDE-Module-Long-Description=Incluye la biblioteca de pruebas de unidades de JUnit 4.x.
12.7 +
13.1 --- a/src/fr/platform/masterfs-windows/masterfs-windows/org/netbeans/modules/masterfs/watcher/windows/Bundle_fr.properties Tue Oct 13 14:00:02 2015 +0900
13.2 +++ b/src/fr/platform/masterfs-windows/masterfs-windows/org/netbeans/modules/masterfs/watcher/windows/Bundle_fr.properties Wed Oct 14 03:46:20 2015 -0700
13.3 @@ -1,2 +1,1 @@
13.4 OpenIDE-Module-Name=Syst\u00e8me de fichiers ma\u00eetre sur Windows
13.5 -
14.1 --- a/src/fr/platform/options-keymap/options-keymap/org/netbeans/modules/options/keymap/Bundle_fr.properties Tue Oct 13 14:00:02 2015 +0900
14.2 +++ b/src/fr/platform/options-keymap/options-keymap/org/netbeans/modules/options/keymap/Bundle_fr.properties Wed Oct 14 03:46:20 2015 -0700
14.3 @@ -197,6 +197,11 @@
14.4
14.5 Import.failed.unknown.id=Certaines actions sont introuvables et leurs liaisons n'ont pas \u00e9t\u00e9 import\u00e9es ; consultez le journal pour plus de d\u00e9tails
14.6 Import.failed.title=Importer le profil de correspondance de touches
14.7 +Export.failed.title=Exporter le profil de correspondance de touches
14.8 +# {0} - localized exception message
14.9 +Import.io.error=Erreur lors de la lecture du fichier : {0}
14.10 +Export.io.error=Erreur lors de l''\u00e9criture du fichier : {0}
14.11 +Import.invalid.file=Format de fichier non valide
14.12 KeymapPanel.waitLabel.text=Veuillez patienter pendant la collecte des actions
14.13 KeymapPanel.actionProgress.string=Veuillez patienter pendant le chargement des actions
14.14 KeymapPanel.btnPrintAsHTML.text=&Afficher au format HTML
15.1 --- a/src/fr/platform/org-netbeans-api-htmlui/org-netbeans-api-htmlui/org/netbeans/modules/htmlui/Bundle_fr.properties Tue Oct 13 14:00:02 2015 +0900
15.2 +++ b/src/fr/platform/org-netbeans-api-htmlui/org-netbeans-api-htmlui/org/netbeans/modules/htmlui/Bundle_fr.properties Wed Oct 14 03:46:20 2015 -0700
15.3 @@ -2,3 +2,14 @@
15.4 CTL_OK=OK
15.5 OpenIDE-Module-Name=HTML UI API
15.6
15.7 +AlertTitle=Avertissement
15.8 +AlertCloseButton=Fermer
15.9 +
15.10 +ConfirmTitle=Question
15.11 +ConfirmOKButton=OK
15.12 +ConfirmCancelButton=Annuler
15.13 +
15.14 +PromptTitle=Question
15.15 +PromptOKButton=OK
15.16 +PromptCancelButton=Annuler
15.17 +
16.1 --- a/src/fr/platform/org-netbeans-core-startup/netbeans/core/core/org/netbeans/core/startup/Bundle_fr.properties Tue Oct 13 14:00:02 2015 +0900
16.2 +++ b/src/fr/platform/org-netbeans-core-startup/netbeans/core/core/org/netbeans/core/startup/Bundle_fr.properties Wed Oct 14 03:46:20 2015 -0700
16.3 @@ -1,6 +1,6 @@
16.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
16.5 #
16.6 -# Copyright 1997-2012 Oracle and/or its affiliates. All rights reserved.
16.7 +# Copyright 1997-2015 Oracle and/or its affiliates. All rights reserved.
16.8 #
16.9 # Oracle and Java are registered trademarks of Oracle and/or its affiliates.
16.10 # Other names may be trademarks of their respective owners.
17.1 --- a/src/fr/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/view/ui/Bundle_fr.properties Tue Oct 13 14:00:02 2015 +0900
17.2 +++ b/src/fr/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/view/ui/Bundle_fr.properties Wed Oct 14 03:46:20 2015 -0700
17.3 @@ -1,6 +1,6 @@
17.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
17.5 #
17.6 -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
17.7 +# Copyright 1997-2015 Oracle and/or its affiliates. All rights reserved.
17.8 #
17.9 # Oracle and Java are registered trademarks of Oracle and/or its affiliates.
17.10 # Other names may be trademarks of their respective owners.
18.1 --- a/src/fr/platform/org-netbeans-libs-junit4/org-netbeans-libs-junit4/org/netbeans/libs/junit4/Bundle_fr.properties Tue Oct 13 14:00:02 2015 +0900
18.2 +++ b/src/fr/platform/org-netbeans-libs-junit4/org-netbeans-libs-junit4/org/netbeans/libs/junit4/Bundle_fr.properties Wed Oct 14 03:46:20 2015 -0700
18.3 @@ -44,3 +44,4 @@
18.4 OpenIDE-Module-Display-Category=Biblioth\u00e8ques
18.5 OpenIDE-Module-Short-Description=Contient la biblioth\u00e8que de test JUnit 4.x.
18.6 OpenIDE-Module-Long-Description=Inclut la biblioth\u00e8que de test d'unit\u00e9 JUnit 4.x.
18.7 +
19.1 --- a/src/it/platform/masterfs-windows/masterfs-windows/org/netbeans/modules/masterfs/watcher/windows/Bundle_it.properties Tue Oct 13 14:00:02 2015 +0900
19.2 +++ b/src/it/platform/masterfs-windows/masterfs-windows/org/netbeans/modules/masterfs/watcher/windows/Bundle_it.properties Wed Oct 14 03:46:20 2015 -0700
19.3 @@ -1,2 +1,1 @@
19.4 OpenIDE-Module-Name=File system principale @ Windows
19.5 -
20.1 --- a/src/it/platform/options-keymap/options-keymap/org/netbeans/modules/options/keymap/Bundle_it.properties Tue Oct 13 14:00:02 2015 +0900
20.2 +++ b/src/it/platform/options-keymap/options-keymap/org/netbeans/modules/options/keymap/Bundle_it.properties Wed Oct 14 03:46:20 2015 -0700
20.3 @@ -197,6 +197,11 @@
20.4
20.5 Import.failed.unknown.id=Alcune azioni non sono state trovate e le relative associazioni non sono state importate. Vedere il log per i dettagli.
20.6 Import.failed.title=Importa profilo keymap
20.7 +Export.failed.title=Esporta profilo keymap
20.8 +# {0} - localized exception message
20.9 +Import.io.error=Errore durante la lettura del file: {0}
20.10 +Export.io.error=Errore durante la scrittura del file: {0}
20.11 +Import.invalid.file=Formato file non valido
20.12 KeymapPanel.waitLabel.text=Attendere la raccolta delle azioni
20.13 KeymapPanel.actionProgress.string=Attendere il caricamento delle azioni
20.14 KeymapPanel.btnPrintAsHTML.text=Mostra &come HTML
21.1 --- a/src/it/platform/org-netbeans-api-htmlui/org-netbeans-api-htmlui/org/netbeans/modules/htmlui/Bundle_it.properties Tue Oct 13 14:00:02 2015 +0900
21.2 +++ b/src/it/platform/org-netbeans-api-htmlui/org-netbeans-api-htmlui/org/netbeans/modules/htmlui/Bundle_it.properties Wed Oct 14 03:46:20 2015 -0700
21.3 @@ -2,3 +2,14 @@
21.4 CTL_OK=OK
21.5 OpenIDE-Module-Name=HTML UI API
21.6
21.7 +AlertTitle=Avvertenza
21.8 +AlertCloseButton=Chiudi
21.9 +
21.10 +ConfirmTitle=Domanda
21.11 +ConfirmOKButton=OK
21.12 +ConfirmCancelButton=Annulla
21.13 +
21.14 +PromptTitle=Domanda
21.15 +PromptOKButton=OK
21.16 +PromptCancelButton=Annulla
21.17 +
22.1 --- a/src/it/platform/org-netbeans-core-startup/netbeans/core/core/org/netbeans/core/startup/Bundle_it.properties Tue Oct 13 14:00:02 2015 +0900
22.2 +++ b/src/it/platform/org-netbeans-core-startup/netbeans/core/core/org/netbeans/core/startup/Bundle_it.properties Wed Oct 14 03:46:20 2015 -0700
22.3 @@ -1,6 +1,6 @@
22.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
22.5 #
22.6 -# Copyright 1997-2012 Oracle and/or its affiliates. All rights reserved.
22.7 +# Copyright 1997-2015 Oracle and/or its affiliates. All rights reserved.
22.8 #
22.9 # Oracle and Java are registered trademarks of Oracle and/or its affiliates.
22.10 # Other names may be trademarks of their respective owners.
23.1 --- a/src/it/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/view/ui/Bundle_it.properties Tue Oct 13 14:00:02 2015 +0900
23.2 +++ b/src/it/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/view/ui/Bundle_it.properties Wed Oct 14 03:46:20 2015 -0700
23.3 @@ -1,6 +1,6 @@
23.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
23.5 #
23.6 -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
23.7 +# Copyright 1997-2015 Oracle and/or its affiliates. All rights reserved.
23.8 #
23.9 # Oracle and Java are registered trademarks of Oracle and/or its affiliates.
23.10 # Other names may be trademarks of their respective owners.
24.1 --- a/src/it/platform/org-netbeans-libs-junit4/org-netbeans-libs-junit4/org/netbeans/libs/junit4/Bundle_it.properties Tue Oct 13 14:00:02 2015 +0900
24.2 +++ b/src/it/platform/org-netbeans-libs-junit4/org-netbeans-libs-junit4/org/netbeans/libs/junit4/Bundle_it.properties Wed Oct 14 03:46:20 2015 -0700
24.3 @@ -44,3 +44,4 @@
24.4 OpenIDE-Module-Display-Category=Librerie
24.5 OpenIDE-Module-Short-Description=Inserisce in un bundle la libreria di test JUnit 4.x.
24.6 OpenIDE-Module-Long-Description=Include la libreria di test dell'unit\u00e0 JUnit 4.x.
24.7 +
25.1 --- a/src/ja/platform/masterfs-windows/masterfs-windows/org/netbeans/modules/masterfs/watcher/windows/Bundle_ja.properties Tue Oct 13 14:00:02 2015 +0900
25.2 +++ b/src/ja/platform/masterfs-windows/masterfs-windows/org/netbeans/modules/masterfs/watcher/windows/Bundle_ja.properties Wed Oct 14 03:46:20 2015 -0700
25.3 @@ -1,2 +1,1 @@
25.4 OpenIDE-Module-Name=\u30de\u30b9\u30bf\u30fc\u30fb\u30d5\u30a1\u30a4\u30eb\u30b7\u30b9\u30c6\u30e0@ Windows
25.5 -
26.1 --- a/src/ja/platform/options-keymap/options-keymap/org/netbeans/modules/options/keymap/Bundle_ja.properties Tue Oct 13 14:00:02 2015 +0900
26.2 +++ b/src/ja/platform/options-keymap/options-keymap/org/netbeans/modules/options/keymap/Bundle_ja.properties Wed Oct 14 03:46:20 2015 -0700
26.3 @@ -197,6 +197,11 @@
26.4
26.5 Import.failed.unknown.id=\u3044\u304f\u3064\u304b\u306e\u30a2\u30af\u30b7\u30e7\u30f3\u304c\u898b\u3064\u304b\u3089\u306a\u304b\u3063\u305f\u305f\u3081\u3001\u305d\u308c\u3089\u306e\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0\u306f\u30a4\u30f3\u30dd\u30fc\u30c8\u3055\u308c\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u8a73\u7d30\u306f\u30ed\u30b0\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044
26.6 Import.failed.title=\u30ad\u30fc\u30de\u30c3\u30d7\u30fb\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u306e\u30a4\u30f3\u30dd\u30fc\u30c8
26.7 +Export.failed.title=\u30ad\u30fc\u30de\u30c3\u30d7\u30fb\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u306e\u30a8\u30af\u30b9\u30dd\u30fc\u30c8
26.8 +# {0} - localized exception message
26.9 +Import.io.error=\u30d5\u30a1\u30a4\u30eb\u306e\u8aad\u53d6\u308a\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f: {0}
26.10 +Export.io.error=\u30d5\u30a1\u30a4\u30eb\u306e\u66f8\u8fbc\u307f\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f: {0}
26.11 +Import.invalid.file=\u7121\u52b9\u306a\u30d5\u30a1\u30a4\u30eb\u30fb\u30d5\u30a9\u30fc\u30de\u30c3\u30c8
26.12 KeymapPanel.waitLabel.text=\u30a2\u30af\u30b7\u30e7\u30f3\u306e\u53ce\u96c6\u4e2d\u306f\u5f85\u6a5f\u3057\u3066\u304f\u3060\u3055\u3044
26.13 KeymapPanel.actionProgress.string=\u30a2\u30af\u30b7\u30e7\u30f3\u306e\u30ed\u30fc\u30c9\u4e2d\u306f\u5f85\u6a5f\u3057\u3066\u304f\u3060\u3055\u3044
26.14 KeymapPanel.btnPrintAsHTML.text=HTML\u3068\u3057\u3066\u8868\u793a(&A)
27.1 --- a/src/ja/platform/org-netbeans-api-htmlui/org-netbeans-api-htmlui/org/netbeans/modules/htmlui/Bundle_ja.properties Tue Oct 13 14:00:02 2015 +0900
27.2 +++ b/src/ja/platform/org-netbeans-api-htmlui/org-netbeans-api-htmlui/org/netbeans/modules/htmlui/Bundle_ja.properties Wed Oct 14 03:46:20 2015 -0700
27.3 @@ -2,3 +2,14 @@
27.4 CTL_OK=OK
27.5 OpenIDE-Module-Name=HTML UI API
27.6
27.7 +AlertTitle=\u8b66\u544a
27.8 +AlertCloseButton=\u9589\u3058\u308b
27.9 +
27.10 +ConfirmTitle=\u8cea\u554f
27.11 +ConfirmOKButton=OK
27.12 +ConfirmCancelButton=\u53d6\u6d88
27.13 +
27.14 +PromptTitle=\u8cea\u554f
27.15 +PromptOKButton=OK
27.16 +PromptCancelButton=\u53d6\u6d88
27.17 +
28.1 --- a/src/ja/platform/org-netbeans-core-startup/netbeans/core/core/org/netbeans/core/startup/Bundle_ja.properties Tue Oct 13 14:00:02 2015 +0900
28.2 +++ b/src/ja/platform/org-netbeans-core-startup/netbeans/core/core/org/netbeans/core/startup/Bundle_ja.properties Wed Oct 14 03:46:20 2015 -0700
28.3 @@ -1,6 +1,6 @@
28.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
28.5 #
28.6 -# Copyright 1997-2012 Oracle and/or its affiliates. All rights reserved.
28.7 +# Copyright 1997-2015 Oracle and/or its affiliates. All rights reserved.
28.8 #
28.9 # Oracle and Java are registered trademarks of Oracle and/or its affiliates.
28.10 # Other names may be trademarks of their respective owners.
29.1 --- a/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/view/ui/Bundle_ja.properties Tue Oct 13 14:00:02 2015 +0900
29.2 +++ b/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/view/ui/Bundle_ja.properties Wed Oct 14 03:46:20 2015 -0700
29.3 @@ -1,6 +1,6 @@
29.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
29.5 #
29.6 -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
29.7 +# Copyright 1997-2015 Oracle and/or its affiliates. All rights reserved.
29.8 #
29.9 # Oracle and Java are registered trademarks of Oracle and/or its affiliates.
29.10 # Other names may be trademarks of their respective owners.
30.1 --- a/src/ja/platform/org-netbeans-libs-junit4/org-netbeans-libs-junit4/org/netbeans/libs/junit4/Bundle_ja.properties Tue Oct 13 14:00:02 2015 +0900
30.2 +++ b/src/ja/platform/org-netbeans-libs-junit4/org-netbeans-libs-junit4/org/netbeans/libs/junit4/Bundle_ja.properties Wed Oct 14 03:46:20 2015 -0700
30.3 @@ -44,3 +44,4 @@
30.4 OpenIDE-Module-Display-Category=\u30e9\u30a4\u30d6\u30e9\u30ea
30.5 OpenIDE-Module-Short-Description=JUnit 4.x\u30c6\u30b9\u30c8\u30fb\u30e9\u30a4\u30d6\u30e9\u30ea\u3092\u30d0\u30f3\u30c9\u30eb\u3057\u307e\u3059\u3002
30.6 OpenIDE-Module-Long-Description=JUnit 4.x\u5358\u4f53\u30c6\u30b9\u30c8\u30fb\u30e9\u30a4\u30d6\u30e9\u30ea\u304c\u542b\u307e\u308c\u307e\u3059\u3002
30.7 +
31.1 --- a/src/pt_BR/platform/masterfs-windows/masterfs-windows/org/netbeans/modules/masterfs/watcher/windows/Bundle_pt_BR.properties Tue Oct 13 14:00:02 2015 +0900
31.2 +++ b/src/pt_BR/platform/masterfs-windows/masterfs-windows/org/netbeans/modules/masterfs/watcher/windows/Bundle_pt_BR.properties Wed Oct 14 03:46:20 2015 -0700
31.3 @@ -1,2 +1,1 @@
31.4 OpenIDE-Module-Name=Sistema de Arquivos Mestre @ Windows
31.5 -
32.1 --- a/src/pt_BR/platform/options-keymap/options-keymap/org/netbeans/modules/options/keymap/Bundle_pt_BR.properties Tue Oct 13 14:00:02 2015 +0900
32.2 +++ b/src/pt_BR/platform/options-keymap/options-keymap/org/netbeans/modules/options/keymap/Bundle_pt_BR.properties Wed Oct 14 03:46:20 2015 -0700
32.3 @@ -197,8 +197,13 @@
32.4
32.5 Import.failed.unknown.id=Algumas a\u00e7\u00f5es n\u00e3o foram encontradas e suas vincula\u00e7\u00f5es n\u00e3o foram importadas; acesse o log para obter detalhes
32.6 Import.failed.title=Importar Perfil de Mapa de Teclas
32.7 +Export.failed.title=Exportar Perfil de Mapa de Teclas
32.8 +# {0} - localized exception message
32.9 +Import.io.error=Erro ao ler o arquivo: {0}
32.10 +Export.io.error=Erro ao gravar arquivo: {0}
32.11 +Import.invalid.file=Formato de arquivo inv\u00e1lido
32.12 KeymapPanel.waitLabel.text=Aguarde enquanto as a\u00e7\u00f5es s\u00e3o coletadas
32.13 KeymapPanel.actionProgress.string=Aguarde enquanto as a\u00e7\u00f5es s\u00e3o carregadas
32.14 KeymapPanel.btnPrintAsHTML.text=Mostrar &como HTML
32.15 -KeymapPanel.btnPrintAsHTML.toolTipText=Gere um arquivo HTML imprim\u00edvel para o perfil do mapa de chaves atual e abra-o no Browser HTML.
32.16 +KeymapPanel.btnPrintAsHTML.toolTipText=Gere um arquivo HTML imprim\u00edvel para o perfil do mapa de teclas atual e abra-o no Browser HTML.
32.17
33.1 --- a/src/pt_BR/platform/org-netbeans-api-htmlui/org-netbeans-api-htmlui/org/netbeans/modules/htmlui/Bundle_pt_BR.properties Tue Oct 13 14:00:02 2015 +0900
33.2 +++ b/src/pt_BR/platform/org-netbeans-api-htmlui/org-netbeans-api-htmlui/org/netbeans/modules/htmlui/Bundle_pt_BR.properties Wed Oct 14 03:46:20 2015 -0700
33.3 @@ -2,3 +2,14 @@
33.4 CTL_OK=OK
33.5 OpenIDE-Module-Name=HTML UI API
33.6
33.7 +AlertTitle=Advert\u00eancia
33.8 +AlertCloseButton=Fechar
33.9 +
33.10 +ConfirmTitle=Pergunta
33.11 +ConfirmOKButton=OK
33.12 +ConfirmCancelButton=Cancelar
33.13 +
33.14 +PromptTitle=Pergunta
33.15 +PromptOKButton=OK
33.16 +PromptCancelButton=Cancelar
33.17 +
34.1 --- a/src/pt_BR/platform/org-netbeans-core-startup/netbeans/core/core/org/netbeans/core/startup/Bundle_pt_BR.properties Tue Oct 13 14:00:02 2015 +0900
34.2 +++ b/src/pt_BR/platform/org-netbeans-core-startup/netbeans/core/core/org/netbeans/core/startup/Bundle_pt_BR.properties Wed Oct 14 03:46:20 2015 -0700
34.3 @@ -1,6 +1,6 @@
34.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
34.5 #
34.6 -# Copyright 1997-2012 Oracle and/or its affiliates. All rights reserved.
34.7 +# Copyright 1997-2015 Oracle and/or its affiliates. All rights reserved.
34.8 #
34.9 # Oracle and Java are registered trademarks of Oracle and/or its affiliates.
34.10 # Other names may be trademarks of their respective owners.
35.1 --- a/src/pt_BR/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/view/ui/Bundle_pt_BR.properties Tue Oct 13 14:00:02 2015 +0900
35.2 +++ b/src/pt_BR/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/view/ui/Bundle_pt_BR.properties Wed Oct 14 03:46:20 2015 -0700
35.3 @@ -1,6 +1,6 @@
35.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
35.5 #
35.6 -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
35.7 +# Copyright 1997-2015 Oracle and/or its affiliates. All rights reserved.
35.8 #
35.9 # Oracle and Java are registered trademarks of Oracle and/or its affiliates.
35.10 # Other names may be trademarks of their respective owners.
36.1 --- a/src/pt_BR/platform/org-netbeans-libs-junit4/org-netbeans-libs-junit4/org/netbeans/libs/junit4/Bundle_pt_BR.properties Tue Oct 13 14:00:02 2015 +0900
36.2 +++ b/src/pt_BR/platform/org-netbeans-libs-junit4/org-netbeans-libs-junit4/org/netbeans/libs/junit4/Bundle_pt_BR.properties Wed Oct 14 03:46:20 2015 -0700
36.3 @@ -44,3 +44,4 @@
36.4 OpenIDE-Module-Display-Category=Bibliotecas
36.5 OpenIDE-Module-Short-Description=Empacota a biblioteca de teste JUnit 4.x
36.6 OpenIDE-Module-Long-Description=Inclui a biblioteca de teste de unidade JUnit 4.x
36.7 +
37.1 --- a/src/ru/platform/masterfs-windows/masterfs-windows/org/netbeans/modules/masterfs/watcher/windows/Bundle_ru.properties Tue Oct 13 14:00:02 2015 +0900
37.2 +++ b/src/ru/platform/masterfs-windows/masterfs-windows/org/netbeans/modules/masterfs/watcher/windows/Bundle_ru.properties Wed Oct 14 03:46:20 2015 -0700
37.3 @@ -1,2 +1,1 @@
37.4 OpenIDE-Module-Name=\u0413\u043b\u0430\u0432\u043d\u0430\u044f \u0444\u0430\u0439\u043b\u043e\u0432\u0430\u044f \u0441\u0438\u0441\u0442\u0435\u043c\u0430 Windows
37.5 -
38.1 --- a/src/ru/platform/options-keymap/options-keymap/org/netbeans/modules/options/keymap/Bundle_ru.properties Tue Oct 13 14:00:02 2015 +0900
38.2 +++ b/src/ru/platform/options-keymap/options-keymap/org/netbeans/modules/options/keymap/Bundle_ru.properties Wed Oct 14 03:46:20 2015 -0700
38.3 @@ -196,7 +196,12 @@
38.4
38.5
38.6 Import.failed.unknown.id=\u041d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u044b \u043d\u0435\u043a\u043e\u0442\u043e\u0440\u044b\u0435 \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u044f, \u0438\u043c\u043f\u043e\u0440\u0442 \u0438\u0445 \u043f\u0440\u0438\u0432\u044f\u0437\u043e\u043a \u043d\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d. \u041f\u043e\u0434\u0440\u043e\u0431\u043d\u044b\u0435 \u0441\u0432\u0435\u0434\u0435\u043d\u0438\u044f \u0441\u043c. \u0432 \u0436\u0443\u0440\u043d\u0430\u043b\u0435
38.7 -Import.failed.title=\u0418\u043c\u043f\u043e\u0440\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u043f\u0440\u043e\u0444\u0438\u043b\u044c \u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0439 \u043a\u043b\u0430\u0432\u0438\u0448
38.8 +Import.failed.title=\u0418\u043c\u043f\u043e\u0440\u0442 \u043f\u0440\u043e\u0444\u0438\u043b\u044f \u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0439 \u043a\u043b\u0430\u0432\u0438\u0448
38.9 +Export.failed.title=\u042d\u043a\u0441\u043f\u043e\u0440\u0442 \u043f\u0440\u043e\u0444\u0438\u043b\u044f \u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0439 \u043a\u043b\u0430\u0432\u0438\u0448
38.10 +# {0} - localized exception message
38.11 +Import.io.error=\u041e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u0438 \u0447\u0442\u0435\u043d\u0438\u0438 \u0444\u0430\u0439\u043b\u0430: {0}
38.12 +Export.io.error=\u041e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u0438 \u0437\u0430\u043f\u0438\u0441\u0438 \u0444\u0430\u0439\u043b\u0430: {0}
38.13 +Import.invalid.file=\u041d\u0435\u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c\u044b\u0439 \u0444\u043e\u0440\u043c\u0430\u0442 \u0444\u0430\u0439\u043b\u0430
38.14 KeymapPanel.waitLabel.text=\u0412\u044b\u043f\u043e\u043b\u043d\u044f\u0435\u0442\u0441\u044f \u0441\u0431\u043e\u0440 \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0439. \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043f\u043e\u0434\u043e\u0436\u0434\u0438\u0442\u0435.
38.15 KeymapPanel.actionProgress.string=\u0412\u044b\u043f\u043e\u043b\u043d\u044f\u0435\u0442\u0441\u044f \u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0430 \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0439. \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043f\u043e\u0434\u043e\u0436\u0434\u0438\u0442\u0435.
38.16 KeymapPanel.btnPrintAsHTML.text=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u044c \u043a\u0430\u043a HTML
39.1 --- a/src/ru/platform/org-netbeans-api-htmlui/org-netbeans-api-htmlui/org/netbeans/modules/htmlui/Bundle_ru.properties Tue Oct 13 14:00:02 2015 +0900
39.2 +++ b/src/ru/platform/org-netbeans-api-htmlui/org-netbeans-api-htmlui/org/netbeans/modules/htmlui/Bundle_ru.properties Wed Oct 14 03:46:20 2015 -0700
39.3 @@ -2,3 +2,14 @@
39.4 CTL_OK=\u041e\u041a
39.5 OpenIDE-Module-Name=HTML UI API
39.6
39.7 +AlertTitle=\u041f\u0440\u0435\u0434\u0443\u043f\u0440\u0435\u0436\u0434\u0435\u043d\u0438\u0435
39.8 +AlertCloseButton=\u0417\u0430\u043a\u0440\u044b\u0442\u044c
39.9 +
39.10 +ConfirmTitle=\u0412\u043e\u043f\u0440\u043e\u0441
39.11 +ConfirmOKButton=\u041e\u041a
39.12 +ConfirmCancelButton=\u041e\u0442\u043c\u0435\u043d\u0430
39.13 +
39.14 +PromptTitle=\u0412\u043e\u043f\u0440\u043e\u0441
39.15 +PromptOKButton=\u041e\u041a
39.16 +PromptCancelButton=\u041e\u0442\u043c\u0435\u043d\u0430
39.17 +
40.1 --- a/src/ru/platform/org-netbeans-api-search/org-netbeans-api-search/org/netbeans/modules/search/Bundle_ru.properties Tue Oct 13 14:00:02 2015 +0900
40.2 +++ b/src/ru/platform/org-netbeans-api-search/org-netbeans-api-search/org/netbeans/modules/search/Bundle_ru.properties Wed Oct 14 03:46:20 2015 -0700
40.3 @@ -92,7 +92,7 @@
40.4 TEXT_BUTTON_REPLACE_INVALID=\u041d\u0435\u043a\u043e\u0442\u043e\u0440\u044b\u0435 \u0438\u0437 \u0432\u044b\u0431\u0440\u0430\u043d\u043d\u044b\u0445 \u0441\u043e\u0432\u043f\u0430\u0434\u0435\u043d\u0438\u0439 \u0443\u0441\u0442\u0430\u0440\u0435\u043b\u0438
40.5 ACS_TEXT_BUTTON_REPLACE=\u0412\u044b\u043f\u043e\u043b\u043d\u044f\u0435\u0442 \u0437\u0430\u043c\u0435\u043d\u0443 \u0432\u0441\u0435\u0445 \u0441\u043e\u0432\u043f\u0430\u0434\u0435\u043d\u0438\u0439, \u0432\u044b\u0431\u0440\u0430\u043d\u043d\u044b\u0445 \u0441 \u043f\u043e\u043c\u043e\u0449\u044c\u044e \u0444\u043b\u0430\u0436\u043a\u0430
40.6 # {0} number of matches that were replaced. Please do not translate "choice".
40.7 -TEXT_INFO_REPLACE_FINISHED={0} {0,choice,0#\u0441\u043e\u0432\u043f\u0430\u0434\u0435\u043d\u0438\u0439|1#\u0441\u043e\u0432\u043f\u0430\u0434\u0435\u043d\u0438\u0435|1<\u0441\u043e\u0432\u043f\u0430\u0434\u0435\u043d\u0438\u044f} \u0437\u0430\u043c\u0435\u043d\u0435\u043d\u043e
40.8 +TEXT_INFO_REPLACE_FINISHED={0} {0,choice,0#\u0441\u043e\u0432\u043f\u0430\u0434\u0435\u043d\u0438\u0439|1#\u0441\u043e\u0432\u043f\u0430\u0434\u0435\u043d\u0438\u0435|1<\u0441\u043e\u0432\u043f\u0430\u0434\u0435\u043d\u0438\u0439} \u0437\u0430\u043c\u0435\u043d\u0435\u043d\u043e
40.9 TEXT_BUTTON_CUSTOMIZE=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u043a\u0440\u0438\u0442\u0435\u0440\u0438\u0439
40.10 ACS_TEXT_BUTTON_CUSTOMIZE=\u041f\u043e\u043a\u0430\u0437\u044b\u0432\u0430\u0435\u0442 \u0434\u0438\u0430\u043b\u043e\u0433\u043e\u0432\u043e\u0435 \u043e\u043a\u043d\u043e \u043f\u043e\u0438\u0441\u043a\u0430, \u043f\u043e\u0437\u0432\u043e\u043b\u044f\u044e\u0449\u0438\u0439 \u0438\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u043a\u0440\u0438\u0442\u0435\u0440\u0438\u0438 \u043f\u043e\u0438\u0441\u043a\u0430
40.11 TEXT_BUTTON_NEW_TAB=\u041e\u0442\u043a\u0440\u044b\u0442\u044c \u0432 \u043d\u043e\u0432\u043e\u0439 \u0432\u043a\u043b\u0430\u0434\u043a\u0435
40.12 @@ -133,12 +133,12 @@
40.13 # {0} number of files. Please do not translate "choice".
40.14 TEXT_MSG_FOUND_X_NODES=\u041d\u0430\u0439\u0434\u0435\u043d\u043e {0} {0,choice,1#\u0441\u043e\u0432\u043f\u0430\u0434\u0430\u044e\u0449\u0438\u0439 \u0444\u0430\u0439\u043b|1<\u0441\u043e\u0432\u043f\u0430\u0434\u0430\u044e\u0449\u0438\u0445 \u0444\u0430\u0439\u043b\u043e\u0432}.
40.15 # {0} number of files, {1} total number of matches (matching strings)
40.16 -TEXT_MSG_FOUND_X_NODES_FULLTEXT=\u041d\u0430\u0439\u0434\u0435\u043d\u043e {1} {1,choice,1#\u0441\u043e\u0432\u043f\u0430\u0434\u0435\u043d\u0438\u0435|1<\u0441\u043e\u0432\u043f\u0430\u0434\u0435\u043d\u0438\u044f} \u0438\u0437 <b>{2}</b> \u0432 {0} {0,choice,1#\u0444\u0430\u0439\u043b\u0435|1<\u0444\u0430\u0439\u043b\u0430\u0445}.
40.17 +TEXT_MSG_FOUND_X_NODES_FULLTEXT=\u041d\u0430\u0439\u0434\u0435\u043d\u043e {1} {1,choice,1#\u0441\u043e\u0432\u043f\u0430\u0434\u0435\u043d\u0438\u0435|1<\u0441\u043e\u0432\u043f\u0430\u0434\u0435\u043d\u0438\u0439} \u0438\u0437 <b>{2}</b> \u0432 {0} {0,choice,1#\u0444\u0430\u0439\u043b\u0435|1<\u0444\u0430\u0439\u043b\u0430\u0445}.
40.18 # {0} number of files, {1} total number of matches (matching strings), {2} pattern being found, {3} replace string
40.19 TEXT_MSG_FOUND_X_NODES_REPLACE=\u041d\u0430\u0439\u0434\u0435\u043d\u043e {1} {1,choice,1#\u0441\u043e\u0432\u043f\u0430\u0434\u0435\u043d\u0438\u0435|1<\u0441\u043e\u0432\u043f\u0430\u0434\u0435\u043d\u0438\u0439} \u0438\u0437 <b>{2}</b> \u0432 {0} {0,choice,1#\u0444\u0430\u0439\u043b\u0435|1<\u0444\u0430\u0439\u043b\u0430\u0445}. \u041d\u0430\u0439\u0434\u0435\u043d\u043d\u044b\u0435 \u0441\u043e\u0432\u043f\u0430\u0434\u0435\u043d\u0438\u044f \u0431\u0443\u0434\u0443\u0442 \u0437\u0430\u043c\u0435\u043d\u0435\u043d\u044b \u043d\u0430 <b>{3}</b>.
40.20 # {0} number of files
40.21 # {1} number of matches
40.22 -TEXT_MSG_FOUND_X_NODES_LIMIT=\u041f\u043e\u043a\u0430 \u043d\u0430\u0439\u0434\u0435\u043d\u043e {1} {1,choice,1#\u0441\u043e\u0432\u043f\u0430\u0434\u0435\u043d\u0438\u0435|1<\u0441\u043e\u0432\u043f\u0430\u0434\u0435\u043d\u0438\u044f} \u0432 {0} {0,choice,1#\u0444\u0430\u0439\u043b\u0435|1<\u0444\u0430\u0439\u043b\u0430\u0445}.
40.23 +TEXT_MSG_FOUND_X_NODES_LIMIT=\u041f\u043e\u043a\u0430 \u043d\u0430\u0439\u0434\u0435\u043d\u043e {1} {1,choice,1#\u0441\u043e\u0432\u043f\u0430\u0434\u0435\u043d\u0438\u0435|1<\u0441\u043e\u0432\u043f\u0430\u0434\u0435\u043d\u0438\u0439} \u0432 {0} {0,choice,1#\u0444\u0430\u0439\u043b\u0435|1<\u0444\u0430\u0439\u043b\u0430\u0445}.
40.24 TEXT_MSG_NOT_ENOUGH_MEMORY=\u041f\u043e\u0438\u0441\u043a \u043e\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d. \u041d\u0435\u0434\u043e\u0441\u0442\u0430\u0442\u043e\u0447\u043d\u043e \u043f\u0430\u043c\u044f\u0442\u0438 \u0434\u043b\u044f \u043f\u0440\u043e\u0432\u0435\u0440\u043a\u0438 \u0444\u0430\u0439\u043b\u0430 {0} ({1} \u041a\u0411)
40.25 TEXT_MSG_LIMIT_REACHED_FILES_COUNT=\u041f\u043e\u0438\u0441\u043a \u043e\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d \u0438\u0437-\u0437\u0430 \u0434\u043e\u0441\u0442\u0438\u0436\u0435\u043d\u0438\u044f \u043b\u0438\u043c\u0438\u0442\u0430 \u043a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u0430 \u0441\u043e\u0432\u043f\u0430\u0434\u0430\u044e\u0449\u0438\u0445 \u0444\u0430\u0439\u043b\u043e\u0432 ({0,number}).
40.26 TEXT_MSG_LIMIT_REACHED_MATCHES_COUNT=\u041f\u043e\u0438\u0441\u043a \u043e\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d \u043f\u043e \u043f\u0440\u0438\u0447\u0438\u043d\u0435 \u0434\u043e\u0441\u0442\u0438\u0436\u0435\u043d\u0438\u044f \u0438\u043b\u0438 \u043f\u0440\u0435\u0432\u044b\u0448\u0435\u043d\u0438\u044f \u043b\u0438\u043c\u0438\u0442\u0430 \u043a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u0430 \u0441\u043e\u0432\u043f\u0430\u0434\u0435\u043d\u0438\u0439 ({0,number}).
41.1 --- a/src/ru/platform/org-netbeans-core-startup/netbeans/core/core/org/netbeans/core/startup/Bundle_ru.properties Tue Oct 13 14:00:02 2015 +0900
41.2 +++ b/src/ru/platform/org-netbeans-core-startup/netbeans/core/core/org/netbeans/core/startup/Bundle_ru.properties Wed Oct 14 03:46:20 2015 -0700
41.3 @@ -1,6 +1,6 @@
41.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
41.5 #
41.6 -# Copyright 1997-2012 Oracle and/or its affiliates. All rights reserved.
41.7 +# Copyright 1997-2015 Oracle and/or its affiliates. All rights reserved.
41.8 #
41.9 # Oracle and Java are registered trademarks of Oracle and/or its affiliates.
41.10 # Other names may be trademarks of their respective owners.
42.1 --- a/src/ru/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/view/ui/Bundle_ru.properties Tue Oct 13 14:00:02 2015 +0900
42.2 +++ b/src/ru/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/view/ui/Bundle_ru.properties Wed Oct 14 03:46:20 2015 -0700
42.3 @@ -1,6 +1,6 @@
42.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
42.5 #
42.6 -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
42.7 +# Copyright 1997-2015 Oracle and/or its affiliates. All rights reserved.
42.8 #
42.9 # Oracle and Java are registered trademarks of Oracle and/or its affiliates.
42.10 # Other names may be trademarks of their respective owners.
43.1 --- a/src/ru/platform/org-netbeans-libs-junit4/org-netbeans-libs-junit4/org/netbeans/libs/junit4/Bundle_ru.properties Tue Oct 13 14:00:02 2015 +0900
43.2 +++ b/src/ru/platform/org-netbeans-libs-junit4/org-netbeans-libs-junit4/org/netbeans/libs/junit4/Bundle_ru.properties Wed Oct 14 03:46:20 2015 -0700
43.3 @@ -44,3 +44,4 @@
43.4 OpenIDE-Module-Display-Category=\u0411\u0438\u0431\u043b\u0438\u043e\u0442\u0435\u043a\u0438
43.5 OpenIDE-Module-Short-Description=\u0418\u043d\u0442\u0435\u0433\u0440\u0438\u0440\u0443\u0435\u0442 \u0431\u0438\u0431\u043b\u0438\u043e\u0442\u0435\u043a\u0443 \u0442\u0435\u0441\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f JUnit 4.x.
43.6 OpenIDE-Module-Long-Description=\u0412\u043a\u043b\u044e\u0447\u0430\u0435\u0442 \u0431\u0438\u0431\u043b\u0438\u043e\u0442\u0435\u043a\u0443 \u043c\u043e\u0434\u0443\u043b\u044c\u043d\u043e\u0433\u043e \u0442\u0435\u0441\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f JUnit 4.x.
43.7 +
44.1 --- a/src/zh_CN/platform/masterfs-windows/masterfs-windows/org/netbeans/modules/masterfs/watcher/windows/Bundle_zh_CN.properties Tue Oct 13 14:00:02 2015 +0900
44.2 +++ b/src/zh_CN/platform/masterfs-windows/masterfs-windows/org/netbeans/modules/masterfs/watcher/windows/Bundle_zh_CN.properties Wed Oct 14 03:46:20 2015 -0700
44.3 @@ -1,2 +1,1 @@
44.4 OpenIDE-Module-Name=\u4e3b\u6587\u4ef6\u7cfb\u7edf @ Windows
44.5 -
45.1 --- a/src/zh_CN/platform/options-keymap/options-keymap/org/netbeans/modules/options/keymap/Bundle_zh_CN.properties Tue Oct 13 14:00:02 2015 +0900
45.2 +++ b/src/zh_CN/platform/options-keymap/options-keymap/org/netbeans/modules/options/keymap/Bundle_zh_CN.properties Wed Oct 14 03:46:20 2015 -0700
45.3 @@ -197,6 +197,11 @@
45.4
45.5 Import.failed.unknown.id=\u67d0\u4e9b\u64cd\u4f5c\u672a\u627e\u5230, \u56e0\u6b64\u672a\u5bfc\u5165\u5176\u7ed1\u5b9a, \u6709\u5173\u8be6\u7ec6\u4fe1\u606f, \u8bf7\u53c2\u89c1\u65e5\u5fd7
45.6 Import.failed.title=\u5bfc\u5165\u5feb\u6377\u952e\u6620\u5c04\u914d\u7f6e\u6587\u4ef6
45.7 +Export.failed.title=\u5bfc\u51fa\u5feb\u6377\u952e\u6620\u5c04\u914d\u7f6e\u6587\u4ef6
45.8 +# {0} - localized exception message
45.9 +Import.io.error=\u8bfb\u53d6\u6587\u4ef6\u65f6\u51fa\u9519: {0}
45.10 +Export.io.error=\u5199\u5165\u6587\u4ef6\u65f6\u51fa\u9519: {0}
45.11 +Import.invalid.file=\u6587\u4ef6\u683c\u5f0f\u65e0\u6548
45.12 KeymapPanel.waitLabel.text=\u8bf7\u7a0d\u5019, \u6b63\u5728\u6536\u96c6\u64cd\u4f5c
45.13 KeymapPanel.actionProgress.string=\u8bf7\u7a0d\u5019, \u6b63\u5728\u52a0\u8f7d\u64cd\u4f5c
45.14 KeymapPanel.btnPrintAsHTML.text=\u663e\u793a\u4e3a HTML(&A)
46.1 --- a/src/zh_CN/platform/org-netbeans-api-htmlui/org-netbeans-api-htmlui/org/netbeans/modules/htmlui/Bundle_zh_CN.properties Tue Oct 13 14:00:02 2015 +0900
46.2 +++ b/src/zh_CN/platform/org-netbeans-api-htmlui/org-netbeans-api-htmlui/org/netbeans/modules/htmlui/Bundle_zh_CN.properties Wed Oct 14 03:46:20 2015 -0700
46.3 @@ -2,3 +2,14 @@
46.4 CTL_OK=\u786e\u5b9a
46.5 OpenIDE-Module-Name=HTML UI API
46.6
46.7 +AlertTitle=\u8b66\u544a
46.8 +AlertCloseButton=\u5173\u95ed
46.9 +
46.10 +ConfirmTitle=\u95ee\u9898
46.11 +ConfirmOKButton=\u786e\u5b9a
46.12 +ConfirmCancelButton=\u53d6\u6d88
46.13 +
46.14 +PromptTitle=\u95ee\u9898
46.15 +PromptOKButton=\u786e\u5b9a
46.16 +PromptCancelButton=\u53d6\u6d88
46.17 +
47.1 --- a/src/zh_CN/platform/org-netbeans-core-startup/netbeans/core/core/org/netbeans/core/startup/Bundle_zh_CN.properties Tue Oct 13 14:00:02 2015 +0900
47.2 +++ b/src/zh_CN/platform/org-netbeans-core-startup/netbeans/core/core/org/netbeans/core/startup/Bundle_zh_CN.properties Wed Oct 14 03:46:20 2015 -0700
47.3 @@ -1,6 +1,6 @@
47.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
47.5 #
47.6 -# Copyright 1997-2012 Oracle and/or its affiliates. All rights reserved.
47.7 +# Copyright 1997-2015 Oracle and/or its affiliates. All rights reserved.
47.8 #
47.9 # Oracle and Java are registered trademarks of Oracle and/or its affiliates.
47.10 # Other names may be trademarks of their respective owners.
48.1 --- a/src/zh_CN/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/view/ui/Bundle_zh_CN.properties Tue Oct 13 14:00:02 2015 +0900
48.2 +++ b/src/zh_CN/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/view/ui/Bundle_zh_CN.properties Wed Oct 14 03:46:20 2015 -0700
48.3 @@ -1,6 +1,6 @@
48.4 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
48.5 #
48.6 -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
48.7 +# Copyright 1997-2015 Oracle and/or its affiliates. All rights reserved.
48.8 #
48.9 # Oracle and Java are registered trademarks of Oracle and/or its affiliates.
48.10 # Other names may be trademarks of their respective owners.
49.1 --- a/src/zh_CN/platform/org-netbeans-libs-junit4/org-netbeans-libs-junit4/org/netbeans/libs/junit4/Bundle_zh_CN.properties Tue Oct 13 14:00:02 2015 +0900
49.2 +++ b/src/zh_CN/platform/org-netbeans-libs-junit4/org-netbeans-libs-junit4/org/netbeans/libs/junit4/Bundle_zh_CN.properties Wed Oct 14 03:46:20 2015 -0700
49.3 @@ -44,3 +44,4 @@
49.4 OpenIDE-Module-Display-Category=\u5e93
49.5 OpenIDE-Module-Short-Description=\u6346\u7ed1 JUnit 4.x \u6d4b\u8bd5\u5e93\u3002
49.6 OpenIDE-Module-Long-Description=\u5305\u62ec JUnit 4.x \u5355\u5143\u6d4b\u8bd5\u5e93\u3002
49.7 +