1.1 --- a/src/de/platform/masterfs-windows/masterfs-windows/org/netbeans/modules/masterfs/watcher/windows/Bundle_de.properties	Tue Aug 18 12:13:46 2015 -0700
     1.2 +++ b/src/de/platform/masterfs-windows/masterfs-windows/org/netbeans/modules/masterfs/watcher/windows/Bundle_de.properties	Mon Sep 28 05:59:05 2015 -0700
     1.3 @@ -1,1 +1,2 @@
     1.4  OpenIDE-Module-Name=Master-Dateisystem @ Windows
     1.5 +

     2.1 --- a/src/de/platform/options-api/options-api/org/netbeans/modules/options/export/Bundle_de.properties	Tue Aug 18 12:13:46 2015 -0700
     2.2 +++ b/src/de/platform/options-api/options-api/org/netbeans/modules/options/export/Bundle_de.properties	Mon Sep 28 05:59:05 2015 -0700
     2.3 @@ -72,7 +72,7 @@
     2.4  OptionsChooserPanel.import.file.chooser.title=W\u00e4hlen Sie eine ZIP-Datei oder ein Benutzerverzeichnis aus
     2.5  OptionsChooserPanel.import.invalid.userdir.title=Ung\u00fcltiges Benutzerverzeichnis?
     2.6  # 0 - folder path
     2.7 -OptionsChooserPanel.import.invalid.userdir=Ordner {0} ist anscheinend kein g\u00fcltiges Benutzerverzeichnis. M\u00f6chten Sie wirklich Optionen von diesem Speicherort importieren?
     2.8 +OptionsChooserPanel.import.invalid.userdir=Ordner {0} ist anscheinend kein g\u00fcltiges Benutzerverzeichnis. Der Import von Optionen von diesem Speicherort kann nicht fortgesetzt werden.
     2.9  OptionsChooserPanel.AD=Fenster f\u00fcr die Auswahl von zu exportierenden/importierenden Optionen
    2.10  OptionsChooserPanel.import.error=Fehler beim Importieren von Optionen. F\u00fchren Sie die Anwendung mit dem Parameter -J-Dorg.netbeans.modules.options.export.level=100 aus. Einzelheiten finden Sie im Log.
    2.11  # 0 - zip file path

     3.1 --- a/src/de/platform/org-netbeans-core-ui/org-netbeans-core-ui/org/netbeans/core/ui/options/filetypes/Bundle_de.properties	Tue Aug 18 12:13:46 2015 -0700
     3.2 +++ b/src/de/platform/org-netbeans-core-ui/org-netbeans-core-ui/org/netbeans/core/ui/options/filetypes/Bundle_de.properties	Mon Sep 28 05:59:05 2015 -0700
     3.3 @@ -101,6 +101,6 @@
     3.4  
     3.5  ERR_CantConvert=Objekt {0} kann nicht in Typ {1} konvertiert werden
     3.6  ERR_CantOpen={0} kann nicht ge\u00f6ffnet werden
     3.7 -FileAssociationsPanel.lblScanning.text=Scan erfolgt
     3.8 +FileAssociationsPanel.lblScanning.text=Scan wird ausgef\u00fchrt
     3.9  FileAssociationsPanel.ignoreHiddenInHome.text=Alle ausgeblendeten Dateien (.*) im Home-Ordner ignorieren
    3.10  

     4.1 --- a/src/de/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/options/Bundle_de.properties	Tue Aug 18 12:13:46 2015 -0700
     4.2 +++ b/src/de/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/options/Bundle_de.properties	Mon Sep 28 05:59:05 2015 -0700
     4.3 @@ -52,9 +52,6 @@
     4.4  IsSnapScreenEdgesTooltip=Aktiviert das Einrasten verschiebbarer Fenster an den Bildschirmecken
     4.5  IsSnappingTooltip=Aktiviert das automatische Einrasten verschiebbarer Fenster f\u00fcr ein einfacheres Layout
     4.6  
     4.7 -KW_LafOptions=Look and Feel
     4.8 -KW_TabsOptions=Editor-Registerkarten, mehrzeilig
     4.9 -Laf_DisplayName=Look and Feel
    4.10  NoAlphaSupport=Transparente Fenster werden vom Betriebssystem nicht unterst\u00fctzt
    4.11  LBL_DragWindowImage=Fensterbil&d beim Ziehen
    4.12  LBL_TransparentDragWindow=Transparentes &Fensterbild beim Ziehen
    4.13 @@ -64,7 +61,6 @@
    4.14  LBL_CloseActivatesRecentDocument=S&chlie\u00dfen aktiviert das letzte Dokument
    4.15  OptionsCategory_Keywords_Appearance=Look and Feel, Windows, Dokumentenregisterkarte
    4.16  OptionsCategory_Name_Appearance=Darstellung
    4.17 -Tabs_DisplayName=Dokumentregisterkarten
    4.18  TIP_CloseActivatesMostRecentDocument=Beim Schlie\u00dfen eines Dokuments wird das letzte Dokument anstelle des Nachbardokuments aktiviert
    4.19  
    4.20  KW_WindowOptions=Fensteroptionen,Darstellung,Editor-Registerkartenplatzierung,Mehrzeilige Registerkarten,Ziehen von Fenstern, Verschiebbare Fenster, Look and Feel
    4.21 @@ -86,3 +82,8 @@
    4.22  TabsPanel.isCloseActivatesMostRecentDocument.AccessibleContext.accessibleDescription=Beim Schlie\u00dfen eines Dokuments wird das letzte Dokument aktiviert
    4.23  TabsPanel.jLabel1.text=Platzierung der Registerkarten:
    4.24  
    4.25 +Laf_DisplayName=Look and Feel
    4.26 +KW_LafOptions=Look, Feel, Look and Feel
    4.27 +KW_TabsOptions=Editor-Registerkarten, mehrzeilig
    4.28 +Tabs_DisplayName=Dokumentregisterkarten
    4.29 +

     5.1 --- a/src/de/platform/org-netbeans-libs-junit4/org-netbeans-libs-junit4/org/netbeans/libs/junit4/Bundle_de.properties	Tue Aug 18 12:13:46 2015 -0700
     5.2 +++ b/src/de/platform/org-netbeans-libs-junit4/org-netbeans-libs-junit4/org/netbeans/libs/junit4/Bundle_de.properties	Mon Sep 28 05:59:05 2015 -0700
     5.3 @@ -44,4 +44,3 @@
     5.4  OpenIDE-Module-Display-Category=Bibliotheken
     5.5  OpenIDE-Module-Short-Description=B\u00fcndelt die JUnit 4.x-Testbibliothek.
     5.6  OpenIDE-Module-Long-Description=Umfasst die JUnit 4.x-Bibliothek f\u00fcr Unit-Tests.
     5.7 -

     6.1 --- a/src/de/platform/org-openide-explorer/org-openide-explorer/org/openide/explorer/view/Bundle_de.properties	Tue Aug 18 12:13:46 2015 -0700
     6.2 +++ b/src/de/platform/org-openide-explorer/org-openide-explorer/org/openide/explorer/view/Bundle_de.properties	Mon Sep 28 05:59:05 2015 -0700
     6.3 @@ -114,7 +114,7 @@
     6.4  LBL_QuickFilter=Nur Zeilen anzeigen, in denen
     6.5  
     6.6  CTL_ColumnsSelector=Sichtbare Spalten \u00e4ndern
     6.7 -ACN_ColumnsSelector=Spalten-Selector
     6.8 +ACN_ColumnsSelector=Spaltenselektor
     6.9  ACD_ColumnsSelector=Sichtbare Spalten ausw\u00e4hlen
    6.10  
    6.11  ColumnsSelectorHint=Die in der Liste anzuzeigenden Spalten w\u00e4hlen

     7.1 --- a/src/de/platform/org-openide-filesystems/netbeans/core/org-openide-filesystems/org/openide/filesystems/Bundle_de.properties	Tue Aug 18 12:13:46 2015 -0700
     7.2 +++ b/src/de/platform/org-openide-filesystems/netbeans/core/org-openide-filesystems/org/openide/filesystems/Bundle_de.properties	Mon Sep 28 05:59:05 2015 -0700
     7.3 @@ -167,6 +167,13 @@
     7.4  # {1} = name of file
     7.5  EXC_ApplicationCreateError=Datei {1} wird im Ordner {0} nicht gefunden.
     7.6  
     7.7 +# Application error
     7.8 +# {0} = folder name
     7.9 +# {1} = name of file
    7.10 +# {2} = file system string representation
    7.11 +# {3} = file object string representation
    7.12 +EXC_ApplicationCreateErrorMulti=Datei {1} wird im Ordner {0} (FileSystem {2}, FileObject {3}) nicht gefunden.
    7.13 +
    7.14  
    7.15  # {0} - unused
    7.16  # {1} - unused

     8.1 --- a/src/es/platform/masterfs-windows/masterfs-windows/org/netbeans/modules/masterfs/watcher/windows/Bundle_es.properties	Tue Aug 18 12:13:46 2015 -0700
     8.2 +++ b/src/es/platform/masterfs-windows/masterfs-windows/org/netbeans/modules/masterfs/watcher/windows/Bundle_es.properties	Mon Sep 28 05:59:05 2015 -0700
     8.3 @@ -1,1 +1,2 @@
     8.4  OpenIDE-Module-Name=Sistema de Archivos Maestro en Windows
     8.5 +

     9.1 --- a/src/es/platform/options-api/options-api/org/netbeans/modules/options/export/Bundle_es.properties	Tue Aug 18 12:13:46 2015 -0700
     9.2 +++ b/src/es/platform/options-api/options-api/org/netbeans/modules/options/export/Bundle_es.properties	Mon Sep 28 05:59:05 2015 -0700
     9.3 @@ -72,7 +72,7 @@
     9.4  OptionsChooserPanel.import.file.chooser.title=Seleccione un archivo ZIP o un directorio de usuario
     9.5  OptionsChooserPanel.import.invalid.userdir.title=\u00bfDirectorio de Usuario No V\u00e1lido?
     9.6  # 0 - folder path
     9.7 -OptionsChooserPanel.import.invalid.userdir=La carpeta {0} no parece ser un directorio de usuario v\u00e1lido. \u00bfSeguro que desea importar las opciones desde esta ubicaci\u00f3n?
     9.8 +OptionsChooserPanel.import.invalid.userdir=La ruta de carpeta {0} no parece ser un directorio de usuario v\u00e1lido. No se puede continuar con la opci\u00f3n de importaci\u00f3n desde esta ubicaci\u00f3n.
     9.9  OptionsChooserPanel.AD=Panel para elegir opciones de exportaci\u00f3n/importaci\u00f3n
    9.10  OptionsChooserPanel.import.error=Error al importar las opciones. Ejecute la aplicaci\u00f3n utilizando el par\u00e1metro -J-Dorg.netbeans.modules.options.export.level=100 y consulte los detalles en el log.
    9.11  # 0 - zip file path

    10.1 --- a/src/es/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/options/Bundle_es.properties	Tue Aug 18 12:13:46 2015 -0700
    10.2 +++ b/src/es/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/options/Bundle_es.properties	Mon Sep 28 05:59:05 2015 -0700
    10.3 @@ -52,9 +52,6 @@
    10.4  IsSnapScreenEdgesTooltip=Permite ajustar las ventanas flotantes a los bordes de la pantalla
    10.5  IsSnappingTooltip=Activa el ajuste autom\u00e1tico de las ventanas flotantes para facilitar el manejo del dise\u00f1o
    10.6  
    10.7 -KW_LafOptions=Interfaz de Usuario
    10.8 -KW_TabsOptions=separadores de editor, varias filas
    10.9 -Laf_DisplayName=Aspecto
   10.10  NoAlphaSupport=El sistema operativo no es compatible con la transparencia de ventanas
   10.11  LBL_DragWindowImage=Imagen &de ventana de arrastre
   10.12  LBL_TransparentDragWindow=Imagen de &ventana de arrastre transparente
   10.13 @@ -64,7 +61,6 @@
   10.14  LBL_CloseActivatesRecentDocument=Activar documentos m\u00e1s recientes al &cerrar
   10.15  OptionsCategory_Keywords_Appearance=aspecto, windows, separador de documentos
   10.16  OptionsCategory_Name_Appearance=Aspecto
   10.17 -Tabs_DisplayName=Separadores de Documento
   10.18  TIP_CloseActivatesMostRecentDocument=Cuando se cierra un documento, se activa el documento m\u00e1s reciente en lugar del vecino
   10.19  
   10.20  KW_WindowOptions=Opciones de ventana, Apariencia, Ubicaci\u00f3n del separador de editor, Separadores de varias filas, Arrastre de ventanas, Ventanas flotantes, Aspecto
   10.21 @@ -86,3 +82,8 @@
   10.22  TabsPanel.isCloseActivatesMostRecentDocument.AccessibleContext.accessibleDescription=Cuando se cierra un documento, se activa el documento m\u00e1s reciente
   10.23  TabsPanel.jLabel1.text=Ubicaci\u00f3n los separadores:
   10.24  
   10.25 +Laf_DisplayName=Aspecto
   10.26 +KW_LafOptions=aspecto, Aspecto
   10.27 +KW_TabsOptions=separadores de editor, varias filas
   10.28 +Tabs_DisplayName=Separadores de Documento
   10.29 +

    11.1 --- a/src/es/platform/org-netbeans-libs-junit4/org-netbeans-libs-junit4/org/netbeans/libs/junit4/Bundle_es.properties	Tue Aug 18 12:13:46 2015 -0700
    11.2 +++ b/src/es/platform/org-netbeans-libs-junit4/org-netbeans-libs-junit4/org/netbeans/libs/junit4/Bundle_es.properties	Mon Sep 28 05:59:05 2015 -0700
    11.3 @@ -44,4 +44,3 @@
    11.4  OpenIDE-Module-Display-Category=Bibliotecas
    11.5  OpenIDE-Module-Short-Description=Agrupa la biblioteca de pruebas de JUnit 4.x.
    11.6  OpenIDE-Module-Long-Description=Incluye la biblioteca de pruebas de unidades de JUnit 4.x.
    11.7 -

    12.1 --- a/src/es/platform/org-openide-filesystems/netbeans/core/org-openide-filesystems/org/openide/filesystems/Bundle_es.properties	Tue Aug 18 12:13:46 2015 -0700
    12.2 +++ b/src/es/platform/org-openide-filesystems/netbeans/core/org-openide-filesystems/org/openide/filesystems/Bundle_es.properties	Mon Sep 28 05:59:05 2015 -0700
    12.3 @@ -167,6 +167,13 @@
    12.4  # {1} = name of file
    12.5  EXC_ApplicationCreateError=No se ha encontrado el archivo {1} en la carpeta {0}.
    12.6  
    12.7 +# Application error
    12.8 +# {0} = folder name
    12.9 +# {1} = name of file
   12.10 +# {2} = file system string representation
   12.11 +# {3} = file object string representation
   12.12 +EXC_ApplicationCreateErrorMulti=No se ha encontrado el archivo {1} en la carpeta {0} (sistema de archivos {2}, objeto de archivo {3}).
   12.13 +
   12.14  
   12.15  # {0} - unused
   12.16  # {1} - unused

    13.1 --- a/src/fr/platform/masterfs-windows/masterfs-windows/org/netbeans/modules/masterfs/watcher/windows/Bundle_fr.properties	Tue Aug 18 12:13:46 2015 -0700
    13.2 +++ b/src/fr/platform/masterfs-windows/masterfs-windows/org/netbeans/modules/masterfs/watcher/windows/Bundle_fr.properties	Mon Sep 28 05:59:05 2015 -0700
    13.3 @@ -1,1 +1,2 @@
    13.4  OpenIDE-Module-Name=Syst\u00e8me de fichiers ma\u00eetre sur Windows
    13.5 +

    14.1 --- a/src/fr/platform/options-api/options-api/org/netbeans/modules/options/export/Bundle_fr.properties	Tue Aug 18 12:13:46 2015 -0700
    14.2 +++ b/src/fr/platform/options-api/options-api/org/netbeans/modules/options/export/Bundle_fr.properties	Mon Sep 28 05:59:05 2015 -0700
    14.3 @@ -72,7 +72,7 @@
    14.4  OptionsChooserPanel.import.file.chooser.title=S\u00e9lectionnez un fichier ZIP ou un r\u00e9pertoire utilisateur
    14.5  OptionsChooserPanel.import.invalid.userdir.title=R\u00e9pertoire utilisateur non valide ?
    14.6  # 0 - folder path
    14.7 -OptionsChooserPanel.import.invalid.userdir=Le dossier {0} ne semble pas \u00eatre un r\u00e9pertoire utilisateur valide. Voulez-vous importer les options \u00e0 partir de cet emplacement ?
    14.8 +OptionsChooserPanel.import.invalid.userdir=Le dossier {0} ne semble pas \u00eatre un r\u00e9pertoire utilisateur valide. Impossible de poursuivre l''import des options \u00e0 partir de cet emplacement.
    14.9  OptionsChooserPanel.AD=Panneau de s\u00e9lection des options d'export/import
   14.10  OptionsChooserPanel.import.error=Erreur lors de l'import des options. Ex\u00e9cutez l'application avec le param\u00e8tre -J-Dorg.netbeans.modules.options.export.level=100 et consultez le journal pour obtenir des d\u00e9tails.
   14.11  # 0 - zip file path

    15.1 --- a/src/fr/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/options/Bundle_fr.properties	Tue Aug 18 12:13:46 2015 -0700
    15.2 +++ b/src/fr/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/options/Bundle_fr.properties	Mon Sep 28 05:59:05 2015 -0700
    15.3 @@ -52,9 +52,6 @@
    15.4  IsSnapScreenEdgesTooltip=Active l'ancrage des fen\u00eatres flottantes aux bords de l'\u00e9cran
    15.5  IsSnappingTooltip=Active l'ancrage automatique des fen\u00eatres flottantes pour une gestion plus facile de la pr\u00e9sentation
    15.6  
    15.7 -KW_LafOptions=Pr\u00e9sentation
    15.8 -KW_TabsOptions=onglets Editeur, multilignes
    15.9 -Laf_DisplayName=Pr\u00e9sentation
   15.10  NoAlphaSupport=La transparence de fen\u00eatre n'est pas prise en charge par le syst\u00e8me d'exploitation
   15.11  LBL_DragWindowImage=Image &de la fen\u00eatre lors du glissement
   15.12  LBL_TransparentDragWindow=&Image de la fen\u00eatre transparente lors du glissement
   15.13 @@ -64,7 +61,6 @@
   15.14  LBL_CloseActivatesRecentDocument=La fermeture a&ctive le document le plus r\u00e9cent
   15.15  OptionsCategory_Keywords_Appearance=pr\u00e9sentation, fen\u00eatres, onglet de document
   15.16  OptionsCategory_Name_Appearance=Apparence
   15.17 -Tabs_DisplayName=Onglets de document
   15.18  TIP_CloseActivatesMostRecentDocument=Lorsqu'un document est ferm\u00e9, le document le plus r\u00e9cent devient actif \u00e0 la place du document voisin
   15.19  
   15.20  KW_WindowOptions=Options de fen\u00eatre, apparence, position de l'onglet Editeur, onglets multilignes, d\u00e9placement de fen\u00eatre, fen\u00eatres flottantes, pr\u00e9sentation
   15.21 @@ -86,3 +82,8 @@
   15.22  TabsPanel.isCloseActivatesMostRecentDocument.AccessibleContext.accessibleDescription=Lorsqu'un document est ferm\u00e9, le document le plus r\u00e9cent devient actif
   15.23  TabsPanel.jLabel1.text=Position des onglets :
   15.24  
   15.25 +Laf_DisplayName=Pr\u00e9sentation
   15.26 +KW_LafOptions=pr\u00e9sentation, Pr\u00e9sentation
   15.27 +KW_TabsOptions=onglets Editeur, multilignes
   15.28 +Tabs_DisplayName=Onglets de document
   15.29 +

    16.1 --- a/src/fr/platform/org-netbeans-libs-junit4/org-netbeans-libs-junit4/org/netbeans/libs/junit4/Bundle_fr.properties	Tue Aug 18 12:13:46 2015 -0700
    16.2 +++ b/src/fr/platform/org-netbeans-libs-junit4/org-netbeans-libs-junit4/org/netbeans/libs/junit4/Bundle_fr.properties	Mon Sep 28 05:59:05 2015 -0700
    16.3 @@ -44,4 +44,3 @@
    16.4  OpenIDE-Module-Display-Category=Biblioth\u00e8ques
    16.5  OpenIDE-Module-Short-Description=Contient la biblioth\u00e8que de test JUnit 4.x.
    16.6  OpenIDE-Module-Long-Description=Inclut la biblioth\u00e8que de test d'unit\u00e9 JUnit 4.x.
    16.7 -

    17.1 --- a/src/fr/platform/org-openide-filesystems/netbeans/core/org-openide-filesystems/org/openide/filesystems/Bundle_fr.properties	Tue Aug 18 12:13:46 2015 -0700
    17.2 +++ b/src/fr/platform/org-openide-filesystems/netbeans/core/org-openide-filesystems/org/openide/filesystems/Bundle_fr.properties	Mon Sep 28 05:59:05 2015 -0700
    17.3 @@ -167,6 +167,13 @@
    17.4  # {1} = name of file
    17.5  EXC_ApplicationCreateError=Fichier {1} introuvable dans le dossier {0}.
    17.6  
    17.7 +# Application error
    17.8 +# {0} = folder name
    17.9 +# {1} = name of file
   17.10 +# {2} = file system string representation
   17.11 +# {3} = file object string representation
   17.12 +EXC_ApplicationCreateErrorMulti=Fichier {1} introuvable dans le dossier {0} (FileSystem {2}, FileObject {3}).
   17.13 +
   17.14  
   17.15  # {0} - unused
   17.16  # {1} - unused

    18.1 --- a/src/it/platform/masterfs-windows/masterfs-windows/org/netbeans/modules/masterfs/watcher/windows/Bundle_it.properties	Tue Aug 18 12:13:46 2015 -0700
    18.2 +++ b/src/it/platform/masterfs-windows/masterfs-windows/org/netbeans/modules/masterfs/watcher/windows/Bundle_it.properties	Mon Sep 28 05:59:05 2015 -0700
    18.3 @@ -1,1 +1,2 @@
    18.4  OpenIDE-Module-Name=File system principale @ Windows
    18.5 +

    19.1 --- a/src/it/platform/options-api/options-api/org/netbeans/modules/options/export/Bundle_it.properties	Tue Aug 18 12:13:46 2015 -0700
    19.2 +++ b/src/it/platform/options-api/options-api/org/netbeans/modules/options/export/Bundle_it.properties	Mon Sep 28 05:59:05 2015 -0700
    19.3 @@ -72,7 +72,7 @@
    19.4  OptionsChooserPanel.import.file.chooser.title=Seleziona file zip o directory utente
    19.5  OptionsChooserPanel.import.invalid.userdir.title=Directory utente non valida?
    19.6  # 0 - folder path
    19.7 -OptionsChooserPanel.import.invalid.userdir=La cartella {0} non sembra essere una directory utente valida. Importare le opzioni da questa posizione?
    19.8 +OptionsChooserPanel.import.invalid.userdir=La cartella {0} non sembra essere una directory utente valida. Impossibile procedere con l''importazione delle opzioni da questa posizione.
    19.9  OptionsChooserPanel.AD=Pannello per scegliere le opzioni per l'esportazione/importazione
   19.10  OptionsChooserPanel.import.error=Errore durante l'importazione delle opzioni. Eseguire l'applicazione con il parametro -J-Dorg.netbeans.modules.options.export.level=100 ed esaminare il log per i dettagli.
   19.11  # 0 - zip file path

    20.1 --- a/src/it/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/options/Bundle_it.properties	Tue Aug 18 12:13:46 2015 -0700
    20.2 +++ b/src/it/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/options/Bundle_it.properties	Mon Sep 28 05:59:05 2015 -0700
    20.3 @@ -52,9 +52,6 @@
    20.4  IsSnapScreenEdgesTooltip=Abilita l'aggancio delle finestre mobili ai bordi dello schermo
    20.5  IsSnappingTooltip=Abilita l'aggancio automatico delle finestre mobili per una gestione semplificata del layout
    20.6  
    20.7 -KW_LafOptions=Aspetto
    20.8 -KW_TabsOptions=schede editor, a pi\u00f9 righe
    20.9 -Laf_DisplayName=Aspetto
   20.10  NoAlphaSupport=La trasparenza della finestra non \u00e8 supportata dal sistema operativo
   20.11  LBL_DragWindowImage=&Trascina immagine della finestra
   20.12  LBL_TransparentDragWindow=Trascinamento trasparente immagine della &finestra
   20.13 @@ -64,7 +61,6 @@
   20.14  LBL_CloseActivatesRecentDocument=&La chiusura attiva il documento pi\u00f9 recente
   20.15  OptionsCategory_Keywords_Appearance=aspetto, finestre, scheda documento
   20.16  OptionsCategory_Name_Appearance=Aspetto
   20.17 -Tabs_DisplayName=Schede documento
   20.18  TIP_CloseActivatesMostRecentDocument=Quando viene chiuso un documento, diventa attivo il documento pi\u00f9 recente anzich\u00e9 quello vicino
   20.19  
   20.20  KW_WindowOptions=Opzioni finestra, Aspetto, Posizione scheda Editor, Schede a pi\u00f9 righe, Trascinamento finestra, Finestre mobili, Aspetto
   20.21 @@ -86,3 +82,8 @@
   20.22  TabsPanel.isCloseActivatesMostRecentDocument.AccessibleContext.accessibleDescription=Quando viene chiuso un documento, diventa attivo il documento pi\u00f9 recente
   20.23  TabsPanel.jLabel1.text=Posizione schede:
   20.24  
   20.25 +Laf_DisplayName=Aspetto
   20.26 +KW_LafOptions=aspetto, Aspetto
   20.27 +KW_TabsOptions=schede editor, a pi\u00f9 righe
   20.28 +Tabs_DisplayName=Schede documento
   20.29 +

    21.1 --- a/src/it/platform/org-netbeans-libs-junit4/org-netbeans-libs-junit4/org/netbeans/libs/junit4/Bundle_it.properties	Tue Aug 18 12:13:46 2015 -0700
    21.2 +++ b/src/it/platform/org-netbeans-libs-junit4/org-netbeans-libs-junit4/org/netbeans/libs/junit4/Bundle_it.properties	Mon Sep 28 05:59:05 2015 -0700
    21.3 @@ -44,4 +44,3 @@
    21.4  OpenIDE-Module-Display-Category=Librerie
    21.5  OpenIDE-Module-Short-Description=Inserisce in un bundle la libreria di test JUnit 4.x.
    21.6  OpenIDE-Module-Long-Description=Include la libreria di test dell'unit\u00e0 JUnit 4.x.
    21.7 -

    22.1 --- a/src/it/platform/org-openide-filesystems/netbeans/core/org-openide-filesystems/org/openide/filesystems/Bundle_it.properties	Tue Aug 18 12:13:46 2015 -0700
    22.2 +++ b/src/it/platform/org-openide-filesystems/netbeans/core/org-openide-filesystems/org/openide/filesystems/Bundle_it.properties	Mon Sep 28 05:59:05 2015 -0700
    22.3 @@ -167,6 +167,13 @@
    22.4  # {1} = name of file
    22.5  EXC_ApplicationCreateError=Impossibile trovare il file {1} nella cartella {0}.
    22.6  
    22.7 +# Application error
    22.8 +# {0} = folder name
    22.9 +# {1} = name of file
   22.10 +# {2} = file system string representation
   22.11 +# {3} = file object string representation
   22.12 +EXC_ApplicationCreateErrorMulti=Impossibile trovare il file {1} nella cartella {0} (FileSystem {2}, FileObject {3}).
   22.13 +
   22.14  
   22.15  # {0} - unused
   22.16  # {1} - unused

    23.1 --- a/src/ja/platform/masterfs-windows/masterfs-windows/org/netbeans/modules/masterfs/watcher/windows/Bundle_ja.properties	Tue Aug 18 12:13:46 2015 -0700
    23.2 +++ b/src/ja/platform/masterfs-windows/masterfs-windows/org/netbeans/modules/masterfs/watcher/windows/Bundle_ja.properties	Mon Sep 28 05:59:05 2015 -0700
    23.3 @@ -1,1 +1,2 @@
    23.4  OpenIDE-Module-Name=\u30de\u30b9\u30bf\u30fc\u30fb\u30d5\u30a1\u30a4\u30eb\u30b7\u30b9\u30c6\u30e0@ Windows
    23.5 +

    24.1 --- a/src/ja/platform/options-api/options-api/org/netbeans/modules/options/export/Bundle_ja.properties	Tue Aug 18 12:13:46 2015 -0700
    24.2 +++ b/src/ja/platform/options-api/options-api/org/netbeans/modules/options/export/Bundle_ja.properties	Mon Sep 28 05:59:05 2015 -0700
    24.3 @@ -72,7 +72,7 @@
    24.4  OptionsChooserPanel.import.file.chooser.title=ZIP\u30d5\u30a1\u30a4\u30eb\u307e\u305f\u306f\u30e6\u30fc\u30b6\u30fc\u30fb\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3092\u9078\u629e
    24.5  OptionsChooserPanel.import.invalid.userdir.title=\u7121\u52b9\u306a\u30e6\u30fc\u30b6\u30fc\u30fb\u30c7\u30a3\u30ec\u30af\u30c8\u30ea?
    24.6  # 0 - folder path
    24.7 -OptionsChooserPanel.import.invalid.userdir=\u30d5\u30a9\u30eb\u30c0{0}\u306f\u6709\u52b9\u306a\u30e6\u30fc\u30b6\u30fc\u30fb\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3067\u306f\u306a\u3044\u3088\u3046\u3067\u3059\u3002\u672c\u5f53\u306b\u3053\u306e\u5834\u6240\u304b\u3089\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u30a4\u30f3\u30dd\u30fc\u30c8\u3057\u307e\u3059\u304b\u3002
    24.8 +OptionsChooserPanel.import.invalid.userdir=\u30d5\u30a9\u30eb\u30c0{0}\u306f\u6709\u52b9\u306a\u30e6\u30fc\u30b6\u30fc\u30fb\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3067\u306f\u306a\u3044\u3088\u3046\u3067\u3059\u3002\u3053\u306e\u5834\u6240\u304b\u3089\u30aa\u30d7\u30b7\u30e7\u30f3\u306e\u30a4\u30f3\u30dd\u30fc\u30c8\u306f\u7d9a\u884c\u3067\u304d\u307e\u305b\u3093\u3002
    24.9  OptionsChooserPanel.AD=\u30a8\u30af\u30b9\u30dd\u30fc\u30c8/\u30a4\u30f3\u30dd\u30fc\u30c8\u3059\u308b\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u9078\u629e\u3059\u308b\u30d1\u30cd\u30eb
   24.10  OptionsChooserPanel.import.error=\u30aa\u30d7\u30b7\u30e7\u30f3\u306e\u30a4\u30f3\u30dd\u30fc\u30c8\u4e2d\u306b\u30a8\u30e9\u30fc\u30fb\u30d1\u30e9\u30e1\u30fc\u30bf -J-Dorg.netbeans.modules.options.export.level=100\u3092\u6307\u5b9a\u3057\u3066\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u5b9f\u884c\u3057\u3001\u30ed\u30b0\u3067\u8a73\u7d30\u60c5\u5831\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
   24.11  # 0 - zip file path

    25.1 --- a/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/options/Bundle_ja.properties	Tue Aug 18 12:13:46 2015 -0700
    25.2 +++ b/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/options/Bundle_ja.properties	Mon Sep 28 05:59:05 2015 -0700
    25.3 @@ -52,9 +52,6 @@
    25.4  IsSnapScreenEdgesTooltip=\u30d5\u30ed\u30fc\u30c6\u30a3\u30f3\u30b0\u30fb\u30a6\u30a3\u30f3\u30c9\u30a6\u306e\u753b\u9762\u306e\u7aef\u3078\u306e\u30b9\u30ca\u30c3\u30d7\u3092\u6709\u52b9\u306b\u3057\u307e\u3059
    25.5  IsSnappingTooltip=\u30ec\u30a4\u30a2\u30a6\u30c8\u3092\u51e6\u7406\u3057\u3084\u3059\u3044\u3088\u3046\u306b\u30d5\u30ed\u30fc\u30c6\u30a3\u30f3\u30b0\u30fb\u30a6\u30a3\u30f3\u30c9\u30a6\u306e\u81ea\u52d5\u30b9\u30ca\u30c3\u30d7\u3092\u6709\u52b9\u306b\u3057\u307e\u3059
    25.6  
    25.7 -KW_LafOptions=\u30eb\u30c3\u30af\u30fb\u30a2\u30f3\u30c9\u30fb\u30d5\u30a3\u30fc\u30eb
    25.8 -KW_TabsOptions=\u30a8\u30c7\u30a3\u30bf\u30fb\u30bf\u30d6,\u8907\u6570\u884c
    25.9 -Laf_DisplayName=\u30eb\u30c3\u30af\u30fb\u30a2\u30f3\u30c9\u30fb\u30d5\u30a3\u30fc\u30eb
   25.10  NoAlphaSupport=\u30a6\u30a3\u30f3\u30c9\u30a6\u306e\u900f\u660e\u5316\u306fOS\u3067\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093
   25.11  LBL_DragWindowImage=\u30c9\u30e9\u30c3\u30b0\u30fb\u30a6\u30a3\u30f3\u30c9\u30a6\u30fb\u30a4\u30e1\u30fc\u30b8(&D)
   25.12  LBL_TransparentDragWindow=\u900f\u660e\u30c9\u30e9\u30c3\u30b0\u30fb\u30a6\u30a3\u30f3\u30c9\u30a6\u30fb\u30a4\u30e1\u30fc\u30b8(&W)
   25.13 @@ -64,7 +61,6 @@
   25.14  LBL_CloseActivatesRecentDocument=\u300c\u9589\u3058\u308b\u300d\u3067\u6700\u65b0\u306e\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u3092\u30a2\u30af\u30c6\u30a3\u30d6\u5316(&C)
   25.15  OptionsCategory_Keywords_Appearance=\u30eb\u30c3\u30af\u30fb\u30a2\u30f3\u30c9\u30fb\u30d5\u30a3\u30fc\u30eb\u3001\u30a6\u30a3\u30f3\u30c9\u30a6\u3001\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u30fb\u30bf\u30d6
   25.16  OptionsCategory_Name_Appearance=\u5916\u89b3
   25.17 -Tabs_DisplayName=\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u30fb\u30bf\u30d6
   25.18  TIP_CloseActivatesMostRecentDocument=\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u3092\u9589\u3058\u308b\u3068\u3001\u96a3\u63a5\u3059\u308b\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u3067\u306f\u306a\u304f\u3001\u6700\u65b0\u306e\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u304c\u30a2\u30af\u30c6\u30a3\u30d6\u306b\u306a\u308a\u307e\u3059
   25.19  
   25.20  KW_WindowOptions=\u30a6\u30a3\u30f3\u30c9\u30a6\u30fb\u30aa\u30d7\u30b7\u30e7\u30f3,\u5916\u89b3,\u30a8\u30c7\u30a3\u30bf\u306e\u30bf\u30d6\u914d\u7f6e,\u8907\u6570\u884c\u30bf\u30d6,\u30a6\u30a3\u30f3\u30c9\u30a6\u30fb\u30c9\u30e9\u30c3\u30b0,\u30d5\u30ed\u30fc\u30c6\u30a3\u30f3\u30b0\u30fb\u30a6\u30a3\u30f3\u30c9\u30a6,\u30eb\u30c3\u30af\u30fb\u30a2\u30f3\u30c9\u30fb\u30d5\u30a3\u30fc\u30eb
   25.21 @@ -86,3 +82,8 @@
   25.22  TabsPanel.isCloseActivatesMostRecentDocument.AccessibleContext.accessibleDescription=\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u3092\u9589\u3058\u308b\u3068\u3001\u6700\u65b0\u306e\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u304c\u30a2\u30af\u30c6\u30a3\u30d6\u306b\u306a\u308a\u307e\u3059
   25.23  TabsPanel.jLabel1.text=\u30bf\u30d6\u914d\u7f6e:
   25.24  
   25.25 +Laf_DisplayName=\u30eb\u30c3\u30af\u30fb\u30a2\u30f3\u30c9\u30fb\u30d5\u30a3\u30fc\u30eb
   25.26 +KW_LafOptions=\u30eb\u30c3\u30af,\u30d5\u30a3\u30fc\u30eb,\u30eb\u30c3\u30af\u30fb\u30a2\u30f3\u30c9\u30fb\u30d5\u30a3\u30fc\u30eb
   25.27 +KW_TabsOptions=\u30a8\u30c7\u30a3\u30bf\u30fb\u30bf\u30d6,\u8907\u6570\u884c
   25.28 +Tabs_DisplayName=\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u30fb\u30bf\u30d6
   25.29 +

    26.1 --- a/src/ja/platform/org-netbeans-libs-junit4/org-netbeans-libs-junit4/org/netbeans/libs/junit4/Bundle_ja.properties	Tue Aug 18 12:13:46 2015 -0700
    26.2 +++ b/src/ja/platform/org-netbeans-libs-junit4/org-netbeans-libs-junit4/org/netbeans/libs/junit4/Bundle_ja.properties	Mon Sep 28 05:59:05 2015 -0700
    26.3 @@ -44,4 +44,3 @@
    26.4  OpenIDE-Module-Display-Category=\u30e9\u30a4\u30d6\u30e9\u30ea
    26.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
    26.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
    26.7 -

    27.1 --- a/src/ja/platform/org-openide-filesystems/netbeans/core/org-openide-filesystems/org/openide/filesystems/Bundle_ja.properties	Tue Aug 18 12:13:46 2015 -0700
    27.2 +++ b/src/ja/platform/org-openide-filesystems/netbeans/core/org-openide-filesystems/org/openide/filesystems/Bundle_ja.properties	Mon Sep 28 05:59:05 2015 -0700
    27.3 @@ -167,6 +167,13 @@
    27.4  # {1} = name of file
    27.5  EXC_ApplicationCreateError=\u30d5\u30a1\u30a4\u30eb{1}\u304c\u30d5\u30a9\u30eb\u30c0{0}\u4e2d\u306b\u3042\u308a\u307e\u305b\u3093\u3002
    27.6  
    27.7 +# Application error
    27.8 +# {0} = folder name
    27.9 +# {1} = name of file
   27.10 +# {2} = file system string representation
   27.11 +# {3} = file object string representation
   27.12 +EXC_ApplicationCreateErrorMulti=\u30d5\u30a1\u30a4\u30eb{1}\u304c\u30d5\u30a9\u30eb\u30c0{0}\u4e2d\u306b\u3042\u308a\u307e\u305b\u3093(FileSystem {2}\u3001FileObject {3})\u3002
   27.13 +
   27.14  
   27.15  # {0} - unused
   27.16  # {1} - unused

    28.1 --- a/src/pt_BR/platform/masterfs-windows/masterfs-windows/org/netbeans/modules/masterfs/watcher/windows/Bundle_pt_BR.properties	Tue Aug 18 12:13:46 2015 -0700
    28.2 +++ b/src/pt_BR/platform/masterfs-windows/masterfs-windows/org/netbeans/modules/masterfs/watcher/windows/Bundle_pt_BR.properties	Mon Sep 28 05:59:05 2015 -0700
    28.3 @@ -1,1 +1,2 @@
    28.4  OpenIDE-Module-Name=Sistema de Arquivos Mestre @ Windows
    28.5 +

    29.1 --- a/src/pt_BR/platform/options-api/options-api/org/netbeans/modules/options/export/Bundle_pt_BR.properties	Tue Aug 18 12:13:46 2015 -0700
    29.2 +++ b/src/pt_BR/platform/options-api/options-api/org/netbeans/modules/options/export/Bundle_pt_BR.properties	Mon Sep 28 05:59:05 2015 -0700
    29.3 @@ -72,7 +72,7 @@
    29.4  OptionsChooserPanel.import.file.chooser.title=Selecione um arquivo zip ou um diret\u00f3rio de usu\u00e1rio
    29.5  OptionsChooserPanel.import.invalid.userdir.title=Diret\u00f3rio de Usu\u00e1rio Inv\u00e1lido?
    29.6  # 0 - folder path
    29.7 -OptionsChooserPanel.import.invalid.userdir=A pasta {0} n\u00e3o parece ser um diret\u00f3rio de usu\u00e1rio v\u00e1lido. Tem certeza de que deseja importar op\u00e7\u00f5es desta localiza\u00e7\u00e3o?
    29.8 +OptionsChooserPanel.import.invalid.userdir=A pasta {0} n\u00e3o parece ser um userdir v\u00e1lido. A importa\u00e7\u00e3o de op\u00e7\u00f5es desse local n\u00e3o pode continuar.
    29.9  OptionsChooserPanel.AD=Painel para escolher as op\u00e7\u00f5es para exporta\u00e7\u00e3o/importa\u00e7\u00e3o
   29.10  OptionsChooserPanel.import.error=Erro ao importar as op\u00e7\u00f5es. Execute a aplica\u00e7\u00e3o com o par\u00e2metro -J-Dorg.netbeans.modules.options.export.level=100 e consulte o log para obter detalhes.
   29.11  # 0 - zip file path

    30.1 --- a/src/pt_BR/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/options/Bundle_pt_BR.properties	Tue Aug 18 12:13:46 2015 -0700
    30.2 +++ b/src/pt_BR/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/options/Bundle_pt_BR.properties	Mon Sep 28 05:59:05 2015 -0700
    30.3 @@ -52,9 +52,6 @@
    30.4  IsSnapScreenEdgesTooltip=Ativa o encaixe das janelas flutuantes nas bordas da tela
    30.5  IsSnappingTooltip=Ativa o encaixe autom\u00e1tico das janelas flutuantes para tratamento mais f\u00e1cil de layout
    30.6  
    30.7 -KW_LafOptions=Apar\u00eancia e recursos
    30.8 -KW_TabsOptions=tabula\u00e7\u00f5es do editor, multilinhas
    30.9 -Laf_DisplayName=Apar\u00eancia e Recursos
   30.10  NoAlphaSupport=A transpar\u00eancia de janela n\u00e3o \u00e9 aceita pelo SO
   30.11  LBL_DragWindowImage=&Arrastar imagem da janela
   30.12  LBL_TransparentDragWindow=Imagem da &janela arrastada transparente
   30.13 @@ -64,7 +61,6 @@
   30.14  LBL_CloseActivatesRecentDocument=&Fechar e ativar o documento mais recente
   30.15  OptionsCategory_Keywords_Appearance=apar\u00eancia e recursos, janelas, guia documento
   30.16  OptionsCategory_Name_Appearance=Apar\u00eancia
   30.17 -Tabs_DisplayName=Guias de Documento
   30.18  TIP_CloseActivatesMostRecentDocument=Quando um documento \u00e9 fechado, o documento mais recente fica ativo em vez do seu vizinho
   30.19  
   30.20  KW_WindowOptions=Op\u00e7\u00f5es da Janela, Apar\u00eancia, Posicionamento da guia do Editor, Guias de v\u00e1rias linhas, Arrastar da janela, Janelas Flutuantes, Apar\u00eancia
   30.21 @@ -86,3 +82,8 @@
   30.22  TabsPanel.isCloseActivatesMostRecentDocument.AccessibleContext.accessibleDescription=Quando um documento \u00e9 fechado, o documento mais recente se torna ativo
   30.23  TabsPanel.jLabel1.text=Posicionamento de guias:
   30.24  
   30.25 +Laf_DisplayName=Apar\u00eancia e Recursos
   30.26 +KW_LafOptions=apar\u00eancia, recursos, Apar\u00eancia e recursos
   30.27 +KW_TabsOptions=tabula\u00e7\u00f5es do editor, multilinhas
   30.28 +Tabs_DisplayName=Guias de Documento
   30.29 +

    31.1 --- a/src/pt_BR/platform/org-netbeans-libs-junit4/org-netbeans-libs-junit4/org/netbeans/libs/junit4/Bundle_pt_BR.properties	Tue Aug 18 12:13:46 2015 -0700
    31.2 +++ b/src/pt_BR/platform/org-netbeans-libs-junit4/org-netbeans-libs-junit4/org/netbeans/libs/junit4/Bundle_pt_BR.properties	Mon Sep 28 05:59:05 2015 -0700
    31.3 @@ -44,4 +44,3 @@
    31.4  OpenIDE-Module-Display-Category=Bibliotecas
    31.5  OpenIDE-Module-Short-Description=Empacota a biblioteca de teste JUnit 4.x
    31.6  OpenIDE-Module-Long-Description=Inclui a biblioteca de teste de unidade JUnit 4.x
    31.7 -

    32.1 --- a/src/pt_BR/platform/org-openide-filesystems/netbeans/core/org-openide-filesystems/org/openide/filesystems/Bundle_pt_BR.properties	Tue Aug 18 12:13:46 2015 -0700
    32.2 +++ b/src/pt_BR/platform/org-openide-filesystems/netbeans/core/org-openide-filesystems/org/openide/filesystems/Bundle_pt_BR.properties	Mon Sep 28 05:59:05 2015 -0700
    32.3 @@ -167,6 +167,13 @@
    32.4  # {1} = name of file
    32.5  EXC_ApplicationCreateError=O arquivo {1} n\u00e3o pode ser localizado na pasta {0}.
    32.6  
    32.7 +# Application error
    32.8 +# {0} = folder name
    32.9 +# {1} = name of file
   32.10 +# {2} = file system string representation
   32.11 +# {3} = file object string representation
   32.12 +EXC_ApplicationCreateErrorMulti=O arquivo {1} n\u00e3o pode ser localizado na pasta {0} (FileSystem {2}, FileObject {3}).
   32.13 +
   32.14  
   32.15  # {0} - unused
   32.16  # {1} - unused

    33.1 --- a/src/zh_CN/platform/masterfs-windows/masterfs-windows/org/netbeans/modules/masterfs/watcher/windows/Bundle_zh_CN.properties	Tue Aug 18 12:13:46 2015 -0700
    33.2 +++ b/src/zh_CN/platform/masterfs-windows/masterfs-windows/org/netbeans/modules/masterfs/watcher/windows/Bundle_zh_CN.properties	Mon Sep 28 05:59:05 2015 -0700
    33.3 @@ -1,1 +1,2 @@
    33.4  OpenIDE-Module-Name=\u4e3b\u6587\u4ef6\u7cfb\u7edf @ Windows
    33.5 +

    34.1 --- a/src/zh_CN/platform/options-api/options-api/org/netbeans/modules/options/export/Bundle_zh_CN.properties	Tue Aug 18 12:13:46 2015 -0700
    34.2 +++ b/src/zh_CN/platform/options-api/options-api/org/netbeans/modules/options/export/Bundle_zh_CN.properties	Mon Sep 28 05:59:05 2015 -0700
    34.3 @@ -72,7 +72,7 @@
    34.4  OptionsChooserPanel.import.file.chooser.title=\u9009\u62e9 zip \u6587\u4ef6\u6216 userdir
    34.5  OptionsChooserPanel.import.invalid.userdir.title=\u65e0\u6548\u7684 userdir?
    34.6  # 0 - folder path
    34.7 -OptionsChooserPanel.import.invalid.userdir=\u6587\u4ef6\u5939 {0} \u4f3c\u4e4e\u4e0d\u662f\u6709\u6548\u7684 userdir\u3002\u662f\u5426\u786e\u5b9e\u8981\u4ece\u6b64\u4f4d\u7f6e\u5bfc\u5165\u9009\u9879?
    34.8 +OptionsChooserPanel.import.invalid.userdir=\u6587\u4ef6\u5939{0}\u4f3c\u4e4e\u4e0d\u662f\u6709\u6548\u7684 userdir\u3002\u65e0\u6cd5\u7ee7\u7eed\u4ece\u6b64\u4f4d\u7f6e\u5bfc\u5165\u9009\u9879\u3002
    34.9  OptionsChooserPanel.AD=\u7528\u4e8e\u9009\u62e9\u8981\u5bfc\u51fa/\u5bfc\u5165\u7684\u9009\u9879\u7684\u9762\u677f
   34.10  OptionsChooserPanel.import.error=\u5bfc\u5165\u9009\u9879\u65f6\u51fa\u9519\u3002\u4f7f\u7528\u53c2\u6570 -J-Dorg.netbeans.modules.options.export.level=100 \u8fd0\u884c\u5e94\u7528\u7a0b\u5e8f\u5e76\u67e5\u770b\u65e5\u5fd7\u4ee5\u4e86\u89e3\u8be6\u7ec6\u4fe1\u606f\u3002
   34.11  # 0 - zip file path

    35.1 --- a/src/zh_CN/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/options/Bundle_zh_CN.properties	Tue Aug 18 12:13:46 2015 -0700
    35.2 +++ b/src/zh_CN/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/options/Bundle_zh_CN.properties	Mon Sep 28 05:59:05 2015 -0700
    35.3 @@ -52,9 +52,6 @@
    35.4  IsSnapScreenEdgesTooltip=\u5c06\u6d6e\u52a8\u7a97\u53e3\u4e0e\u5c4f\u5e55\u8fb9\u7f18\u5bf9\u9f50
    35.5  IsSnappingTooltip=\u542f\u7528\u6d6e\u52a8\u7a97\u53e3\u81ea\u52a8\u5bf9\u9f50\u4ee5\u4fbf\u66f4\u8f7b\u677e\u5730\u5904\u7406\u5e03\u5c40
    35.6  
    35.7 -KW_LafOptions=\u5916\u89c2
    35.8 -KW_TabsOptions=\u7f16\u8f91\u5668\u6807\u7b7e, \u591a\u884c
    35.9 -Laf_DisplayName=\u5916\u89c2
   35.10  NoAlphaSupport=\u64cd\u4f5c\u7cfb\u7edf\u4e0d\u652f\u6301\u7a97\u53e3\u900f\u660e
   35.11  LBL_DragWindowImage=\u62d6\u52a8\u7a97\u53e3\u56fe\u50cf(&D)
   35.12  LBL_TransparentDragWindow=\u900f\u660e\u62d6\u52a8\u7a97\u53e3\u56fe\u50cf(&W)
   35.13 @@ -64,7 +61,6 @@
   35.14  LBL_CloseActivatesRecentDocument=\u5173\u95ed\u65f6\u6fc0\u6d3b\u6700\u8fd1\u7684\u6587\u6863(&C)
   35.15  OptionsCategory_Keywords_Appearance=\u5916\u89c2, \u7a97\u53e3, \u6587\u6863\u6807\u7b7e
   35.16  OptionsCategory_Name_Appearance=\u5916\u89c2
   35.17 -Tabs_DisplayName=\u6587\u6863\u6807\u7b7e
   35.18  TIP_CloseActivatesMostRecentDocument=\u5173\u95ed\u6587\u6863\u65f6\u6fc0\u6d3b\u6700\u8fd1\u7684\u6587\u6863 (\u800c\u4e0d\u662f\u5176\u76f8\u90bb\u6587\u6863)
   35.19  
   35.20  KW_WindowOptions=\u7a97\u53e3\u9009\u9879,\u5916\u89c2,\u7f16\u8f91\u5668\u6807\u7b7e\u4f4d\u7f6e,\u591a\u884c\u6807\u7b7e,\u7a97\u53e3\u62d6\u52a8,\u6d6e\u52a8\u7a97\u53e3,\u5916\u89c2
   35.21 @@ -86,3 +82,8 @@
   35.22  TabsPanel.isCloseActivatesMostRecentDocument.AccessibleContext.accessibleDescription=\u5173\u95ed\u6587\u6863\u65f6\u6fc0\u6d3b\u6700\u8fd1\u7684\u6587\u6863
   35.23  TabsPanel.jLabel1.text=\u6807\u7b7e\u4f4d\u7f6e:
   35.24  
   35.25 +Laf_DisplayName=\u5916\u89c2
   35.26 +KW_LafOptions=\u5916\u89c2, \u5916\u89c2, \u5916\u89c2
   35.27 +KW_TabsOptions=\u7f16\u8f91\u5668\u6807\u7b7e, \u591a\u884c
   35.28 +Tabs_DisplayName=\u6587\u6863\u6807\u7b7e
   35.29 +

    36.1 --- a/src/zh_CN/platform/org-netbeans-libs-junit4/org-netbeans-libs-junit4/org/netbeans/libs/junit4/Bundle_zh_CN.properties	Tue Aug 18 12:13:46 2015 -0700
    36.2 +++ b/src/zh_CN/platform/org-netbeans-libs-junit4/org-netbeans-libs-junit4/org/netbeans/libs/junit4/Bundle_zh_CN.properties	Mon Sep 28 05:59:05 2015 -0700
    36.3 @@ -44,4 +44,3 @@
    36.4  OpenIDE-Module-Display-Category=\u5e93
    36.5  OpenIDE-Module-Short-Description=\u6346\u7ed1 JUnit 4.x \u6d4b\u8bd5\u5e93\u3002
    36.6  OpenIDE-Module-Long-Description=\u5305\u62ec JUnit 4.x \u5355\u5143\u6d4b\u8bd5\u5e93\u3002
    36.7 -

    37.1 --- a/src/zh_CN/platform/org-openide-filesystems/netbeans/core/org-openide-filesystems/org/openide/filesystems/Bundle_zh_CN.properties	Tue Aug 18 12:13:46 2015 -0700
    37.2 +++ b/src/zh_CN/platform/org-openide-filesystems/netbeans/core/org-openide-filesystems/org/openide/filesystems/Bundle_zh_CN.properties	Mon Sep 28 05:59:05 2015 -0700
    37.3 @@ -167,6 +167,13 @@
    37.4  # {1} = name of file
    37.5  EXC_ApplicationCreateError=\u5728\u6587\u4ef6\u5939 {0} \u4e2d\u627e\u4e0d\u5230\u6587\u4ef6{1}\u3002
    37.6  
    37.7 +# Application error
    37.8 +# {0} = folder name
    37.9 +# {1} = name of file
   37.10 +# {2} = file system string representation
   37.11 +# {3} = file object string representation
   37.12 +EXC_ApplicationCreateErrorMulti=\u5728\u6587\u4ef6\u5939{0}\u4e2d\u627e\u4e0d\u5230\u6587\u4ef6{1} (\u6587\u4ef6\u7cfb\u7edf{2}, \u6587\u4ef6\u5bf9\u8c61{3})\u3002
   37.13 +
   37.14  
   37.15  # {0} - unused
   37.16  # {1} - unused