1.1 --- a/src/es/platform/org-netbeans-core-startup/netbeans/core/core/org/netbeans/core/startup/Bundle_es.properties	Tue Jun 24 22:07:06 2014 +0900
     1.2 +++ b/src/es/platform/org-netbeans-core-startup/netbeans/core/core/org/netbeans/core/startup/Bundle_es.properties	Wed Jul 30 04:01:29 2014 -0700
     1.3 @@ -1,6 +1,6 @@
     1.4  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
     1.5  #
     1.6 -# Copyright 1997-2014 Oracle and/or its affiliates. All rights reserved.
     1.7 +# Copyright 1997-2012 Oracle and/or its affiliates. All rights reserved.
     1.8  #
     1.9  # Oracle and Java are registered trademarks of Oracle and/or its affiliates.
    1.10  # Other names may be trademarks of their respective owners.

     2.1 --- a/src/es/platform/org-netbeans-core-ui/org-netbeans-core-ui/org/netbeans/core/ui/options/general/Bundle_es.properties	Tue Jun 24 22:07:06 2014 +0900
     2.2 +++ b/src/es/platform/org-netbeans-core-ui/org-netbeans-core-ui/org/netbeans/core/ui/options/general/Bundle_es.properties	Wed Jul 30 04:01:29 2014 -0700
     2.3 @@ -166,7 +166,7 @@
     2.4  
     2.5  LBL_AdvancedProxyPanel_lSocksHost=Proxy &SOCKS:
     2.6  LBL_AdvancedProxyPanel_lNonProxyHosts=Ning\u00fan Host de Pro&xy:
     2.7 -LBL_AdvancedProxyPanel_cbUseProxyAuthentication=El Proxy Ne&cesita Autenticaci\u00f3n
     2.8 +LBL_AdvancedProxyPanel_cbUseProxyAuthentication=El Proxy Ne&cesita Autenticaci\u00f3n Expl\u00edcita
     2.9  
    2.10  LBL_AdvancedProxyPanel_lUserName=&Usuario:
    2.11  
    2.12 @@ -268,4 +268,5 @@
    2.13  
    2.14  GeneralOptionsPanel.proxy.result.ok=Conexi\u00f3n correcta
    2.15  GeneralOptionsPanel.proxy.result.failed=Fallo de conexi\u00f3n ({0})
    2.16 +AdvancedProxyPanel.cbUseProxyAuthentication.actionCommand=El Proxy Ne&cesita Autenticaci\u00f3n Expl\u00edcita
    2.17  

     3.1 --- a/src/es/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/view/ui/Bundle_es.properties	Tue Jun 24 22:07:06 2014 +0900
     3.2 +++ b/src/es/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/view/ui/Bundle_es.properties	Wed Jul 30 04:01:29 2014 -0700
     3.3 @@ -1,6 +1,6 @@
     3.4  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
     3.5  #
     3.6 -# Copyright 1997-2014 Oracle and/or its affiliates. All rights reserved.
     3.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
     3.8  #
     3.9  # Oracle and Java are registered trademarks of Oracle and/or its affiliates.
    3.10  # Other names may be trademarks of their respective owners.

     4.1 --- a/src/es/platform/org-openide-loaders/org-openide-loaders/org/openide/loaders/Bundle_es.properties	Tue Jun 24 22:07:06 2014 +0900
     4.2 +++ b/src/es/platform/org-openide-loaders/org-openide-loaders/org/openide/loaders/Bundle_es.properties	Wed Jul 30 04:01:29 2014 -0700
     4.3 @@ -41,6 +41,8 @@
     4.4  # made subject to such option by the copyright holder.
     4.5  
     4.6  CTL_SettingsFile=Archivos de Configuraci\u00f3n
     4.7 +# {0} - the path
     4.8 +EXC_FIND_4_INVALID=Parece que el archivo {0} ya no es v\u00e1lido.
     4.9  EXC_NO_LONGER_VALID=El archivo copiado {0} ya no es v\u00e1lido.
    4.10  # {0} - File name
    4.11  LBL_Copying=Copiando {0}

     5.1 --- a/src/es/platform/templates/templates/org/netbeans/modules/templates/ui/Bundle_es.properties	Tue Jun 24 22:07:06 2014 +0900
     5.2 +++ b/src/es/platform/templates/templates/org/netbeans/modules/templates/ui/Bundle_es.properties	Wed Jul 30 04:01:29 2014 -0700
     5.3 @@ -70,6 +70,8 @@
     5.4  
     5.5  ACD_TemplatesPanel_Delete=Suprimir Plantilla
     5.6  
     5.7 +# {0} - The file name
     5.8 +MSG_FileIsLocked=El archivo {0} est\u00e1 en uso.
     5.9  # {0} - file name
    5.10  MSG_TemplatesPanel_Nonexistent_File=El archivo ''{0}''\nno existe. Especifique un archivo existente.
    5.11  # {0} - prefix of the license file name
    5.12 @@ -80,8 +82,8 @@
    5.13  TemplatesPanel_TemplateNode_DisplayName_Desc=Muestra el nombre de esta plantilla. Aparece tanto en el asistente Archivo|Nuevo como en Herramientas|Plantillas.
    5.14  TemplatesPanel_TemplateNode_FileName=Nombre de Archivo
    5.15  TemplatesPanel_TemplateNode_FileName_Desc=Nombre de archivo del archivo que esta plantilla representa.
    5.16 -TemplatesPanel_TemplateNode_License=URL de Licencia
    5.17 -TemplatesPanel_TemplateNode_License_Desc=Ubicaci\u00f3n web autorizada de esta licencia.
    5.18 +TemplatesPanel_TemplateNode_License=URL de licencia
    5.19 +TemplatesPanel_TemplateNode_License_Desc=Ubicaci\u00f3n web autorizada de esta licencia (puede incluir varias separadas por espacios).
    5.20  TemplatesPanel_TemplateNode_ScriptEngine=Motor de Scripts
    5.21  TemplatesPanel_TemplateNode_ScriptEngine_Desc=Motor de scripts usado para procesar esta plantilla.
    5.22  TemplatesPanel_TemplateNode_TemplateCategories=Categor\u00edas de Plantilla

     6.1 --- a/src/fr/platform/org-netbeans-core-startup/netbeans/core/core/org/netbeans/core/startup/Bundle_fr.properties	Tue Jun 24 22:07:06 2014 +0900
     6.2 +++ b/src/fr/platform/org-netbeans-core-startup/netbeans/core/core/org/netbeans/core/startup/Bundle_fr.properties	Wed Jul 30 04:01:29 2014 -0700
     6.3 @@ -1,6 +1,6 @@
     6.4  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
     6.5  #
     6.6 -# Copyright 1997-2014 Oracle and/or its affiliates. All rights reserved.
     6.7 +# Copyright 1997-2012 Oracle and/or its affiliates. All rights reserved.
     6.8  #
     6.9  # Oracle and Java are registered trademarks of Oracle and/or its affiliates.
    6.10  # Other names may be trademarks of their respective owners.

     7.1 --- a/src/fr/platform/org-netbeans-core-ui/org-netbeans-core-ui/org/netbeans/core/ui/options/general/Bundle_fr.properties	Tue Jun 24 22:07:06 2014 +0900
     7.2 +++ b/src/fr/platform/org-netbeans-core-ui/org-netbeans-core-ui/org/netbeans/core/ui/options/general/Bundle_fr.properties	Wed Jul 30 04:01:29 2014 -0700
     7.3 @@ -166,7 +166,7 @@
     7.4  
     7.5  LBL_AdvancedProxyPanel_lSocksHost=Proxy &SOCKS :
     7.6  LBL_AdvancedProxyPanel_lNonProxyHosts=Aucun h\u00f4te pro&xy :
     7.7 -LBL_AdvancedProxyPanel_cbUseProxyAuthentication=Authentification re&quise par le proxy
     7.8 +LBL_AdvancedProxyPanel_cbUseProxyAuthentication=Authentification explicite re&quise par le proxy
     7.9  
    7.10  LBL_AdvancedProxyPanel_lUserName=Nom &utilisateur :
    7.11  
    7.12 @@ -268,4 +268,5 @@
    7.13  
    7.14  GeneralOptionsPanel.proxy.result.ok=Connexion \u00e9tablie
    7.15  GeneralOptionsPanel.proxy.result.failed=Echec de la connexion ({0})
    7.16 +AdvancedProxyPanel.cbUseProxyAuthentication.actionCommand=Authentification explicite re&quise par le proxy
    7.17  

     8.1 --- a/src/fr/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/view/ui/Bundle_fr.properties	Tue Jun 24 22:07:06 2014 +0900
     8.2 +++ b/src/fr/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/view/ui/Bundle_fr.properties	Wed Jul 30 04:01:29 2014 -0700
     8.3 @@ -1,6 +1,6 @@
     8.4  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
     8.5  #
     8.6 -# Copyright 1997-2014 Oracle and/or its affiliates. All rights reserved.
     8.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
     8.8  #
     8.9  # Oracle and Java are registered trademarks of Oracle and/or its affiliates.
    8.10  # Other names may be trademarks of their respective owners.

     9.1 --- a/src/fr/platform/org-openide-loaders/org-openide-loaders/org/openide/loaders/Bundle_fr.properties	Tue Jun 24 22:07:06 2014 +0900
     9.2 +++ b/src/fr/platform/org-openide-loaders/org-openide-loaders/org/openide/loaders/Bundle_fr.properties	Wed Jul 30 04:01:29 2014 -0700
     9.3 @@ -41,6 +41,8 @@
     9.4  # made subject to such option by the copyright holder.
     9.5  
     9.6  CTL_SettingsFile=Fichiers de param\u00e8tres
     9.7 +# {0} - the path
     9.8 +EXC_FIND_4_INVALID=Le fichier {0} semble ne plus \u00eatre valide.
     9.9  EXC_NO_LONGER_VALID=Le fichier copi\u00e9 {0} n''est plus valide.
    9.10  # {0} - File name
    9.11  LBL_Copying=Copie de {0}

    10.1 --- a/src/fr/platform/print/print/org/netbeans/modules/print/ui/Bundle_fr.properties	Tue Jun 24 22:07:06 2014 +0900
    10.2 +++ b/src/fr/platform/print/print/org/netbeans/modules/print/ui/Bundle_fr.properties	Wed Jul 30 04:01:29 2014 -0700
    10.3 @@ -85,7 +85,7 @@
    10.4  LBL_Use_Color=Utiliser les attributs de couleur // &Q
    10.5  LBL_As_Editor=Imprimer comme dans l'\u00e9diteur // &J
    10.6  LBL_Selection=Imprimer la &s\u00e9lection
    10.7 -LBL_Line_Spacing=E&spacement entre les lignes
    10.8 +LBL_Line_Spacing=Int&erligne
    10.9  LBL_Text_Font_and_Color=Police et couleu&r du texte :
   10.10  LBL_Background_Color=Co&uleur d'arri\u00e8re-plan :
   10.11  LBL_Zoom=Zoom

    11.1 --- a/src/fr/platform/templates/templates/org/netbeans/modules/templates/ui/Bundle_fr.properties	Tue Jun 24 22:07:06 2014 +0900
    11.2 +++ b/src/fr/platform/templates/templates/org/netbeans/modules/templates/ui/Bundle_fr.properties	Wed Jul 30 04:01:29 2014 -0700
    11.3 @@ -70,6 +70,8 @@
    11.4  
    11.5  ACD_TemplatesPanel_Delete=Supprimer le mod\u00e8le
    11.6  
    11.7 +# {0} - The file name
    11.8 +MSG_FileIsLocked=Le fichier {0} est en cours d''utilisation.
    11.9  # {0} - file name
   11.10  MSG_TemplatesPanel_Nonexistent_File=Le fichier ''{0}''\nn''existe pas, sp\u00e9cifiez un fichier existant.
   11.11  # {0} - prefix of the license file name
   11.12 @@ -80,8 +82,8 @@
   11.13  TemplatesPanel_TemplateNode_DisplayName_Desc=Nom d'affichage de ce mod\u00e8le. Appara\u00eet dans l'assistant Fichier|Nouveau et dans Outils|Mod\u00e8les
   11.14  TemplatesPanel_TemplateNode_FileName=Nom du fichier
   11.15  TemplatesPanel_TemplateNode_FileName_Desc=Nom du fichier repr\u00e9sent\u00e9 par ce mod\u00e8le.
   11.16 -TemplatesPanel_TemplateNode_License=URL de licence
   11.17 -TemplatesPanel_TemplateNode_License_Desc=Emplacement Web autoris\u00e9 de cette licence.
   11.18 +TemplatesPanel_TemplateNode_License=URL(s) de licence
   11.19 +TemplatesPanel_TemplateNode_License_Desc=Emplacement Web autoris\u00e9 de cette licence (peut en inclure plusieurs, s\u00e9par\u00e9s par des espaces).
   11.20  TemplatesPanel_TemplateNode_ScriptEngine=Moteur de script
   11.21  TemplatesPanel_TemplateNode_ScriptEngine_Desc=Utilisation du moteur de script pour le traitement de ce mod\u00e8le.
   11.22  TemplatesPanel_TemplateNode_TemplateCategories=Cat\u00e9gories de mod\u00e8le

    12.1 --- a/src/it/platform/org-netbeans-core-startup/netbeans/core/core/org/netbeans/core/startup/Bundle_it.properties	Tue Jun 24 22:07:06 2014 +0900
    12.2 +++ b/src/it/platform/org-netbeans-core-startup/netbeans/core/core/org/netbeans/core/startup/Bundle_it.properties	Wed Jul 30 04:01:29 2014 -0700
    12.3 @@ -1,6 +1,6 @@
    12.4  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    12.5  #
    12.6 -# Copyright 1997-2014 Oracle and/or its affiliates. All rights reserved.
    12.7 +# Copyright 1997-2012 Oracle and/or its affiliates. All rights reserved.
    12.8  #
    12.9  # Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   12.10  # Other names may be trademarks of their respective owners.

    13.1 --- a/src/it/platform/org-netbeans-core-ui/org-netbeans-core-ui/org/netbeans/core/ui/options/general/Bundle_it.properties	Tue Jun 24 22:07:06 2014 +0900
    13.2 +++ b/src/it/platform/org-netbeans-core-ui/org-netbeans-core-ui/org/netbeans/core/ui/options/general/Bundle_it.properties	Wed Jul 30 04:01:29 2014 -0700
    13.3 @@ -166,7 +166,7 @@
    13.4  
    13.5  LBL_AdvancedProxyPanel_lSocksHost=Proxy &SOCKS:
    13.6  LBL_AdvancedProxyPanel_lNonProxyHosts=Nessun host prox&y:
    13.7 -LBL_AdvancedProxyPanel_cbUseProxyAuthentication=Ri&chiesta autenticazione per il proxy
    13.8 +LBL_AdvancedProxyPanel_cbUseProxyAuthentication=Ri&chiesta autenticazione esplicita per il proxy
    13.9  
   13.10  LBL_AdvancedProxyPanel_lUserName=Nome &utente:
   13.11  
   13.12 @@ -268,4 +268,5 @@
   13.13  
   13.14  GeneralOptionsPanel.proxy.result.ok=Connessione riuscita
   13.15  GeneralOptionsPanel.proxy.result.failed=Connessione non riuscita ({0})
   13.16 +AdvancedProxyPanel.cbUseProxyAuthentication.actionCommand=Ri&chiesta autenticazione esplicita per il proxy
   13.17  

    14.1 --- a/src/it/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/view/ui/Bundle_it.properties	Tue Jun 24 22:07:06 2014 +0900
    14.2 +++ b/src/it/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/view/ui/Bundle_it.properties	Wed Jul 30 04:01:29 2014 -0700
    14.3 @@ -1,6 +1,6 @@
    14.4  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    14.5  #
    14.6 -# Copyright 1997-2014 Oracle and/or its affiliates. All rights reserved.
    14.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    14.8  #
    14.9  # Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   14.10  # Other names may be trademarks of their respective owners.

    15.1 --- a/src/it/platform/org-openide-loaders/org-openide-loaders/org/openide/loaders/Bundle_it.properties	Tue Jun 24 22:07:06 2014 +0900
    15.2 +++ b/src/it/platform/org-openide-loaders/org-openide-loaders/org/openide/loaders/Bundle_it.properties	Wed Jul 30 04:01:29 2014 -0700
    15.3 @@ -41,6 +41,8 @@
    15.4  # made subject to such option by the copyright holder.
    15.5  
    15.6  CTL_SettingsFile=File di impostazioni
    15.7 +# {0} - the path
    15.8 +EXC_FIND_4_INVALID=Il file {0} non sembra essere pi\u00f9 valido.
    15.9  EXC_NO_LONGER_VALID=Il file copiato {0} non \u00e8 pi\u00f9 valido.
   15.10  # {0} - File name
   15.11  LBL_Copying=Copia di {0}

    16.1 --- a/src/it/platform/templates/templates/org/netbeans/modules/templates/ui/Bundle_it.properties	Tue Jun 24 22:07:06 2014 +0900
    16.2 +++ b/src/it/platform/templates/templates/org/netbeans/modules/templates/ui/Bundle_it.properties	Wed Jul 30 04:01:29 2014 -0700
    16.3 @@ -70,6 +70,8 @@
    16.4  
    16.5  ACD_TemplatesPanel_Delete=Elimina modello
    16.6  
    16.7 +# {0} - The file name
    16.8 +MSG_FileIsLocked=Il file {0} \u00e8 in uso.
    16.9  # {0} - file name
   16.10  MSG_TemplatesPanel_Nonexistent_File=Il file ''{0}''\nnon esiste. Specificare un file esistente.
   16.11  # {0} - prefix of the license file name
   16.12 @@ -81,7 +83,7 @@
   16.13  TemplatesPanel_TemplateNode_FileName=Nome file
   16.14  TemplatesPanel_TemplateNode_FileName_Desc=Nome del file rappresentato da questo modello.
   16.15  TemplatesPanel_TemplateNode_License=URL licenza
   16.16 -TemplatesPanel_TemplateNode_License_Desc=Posizione Web affidabile di questa licenza.
   16.17 +TemplatesPanel_TemplateNode_License_Desc=Posizione Web affidabile di questa licenza (potrebbero esserne incluse diverse, separate da spazi).
   16.18  TemplatesPanel_TemplateNode_ScriptEngine=Motore script
   16.19  TemplatesPanel_TemplateNode_ScriptEngine_Desc=Motore di script utilizzato per l'elaborazione di questo modello.
   16.20  TemplatesPanel_TemplateNode_TemplateCategories=Categorie modello

    17.1 --- a/src/ja/platform/applemenu/applemenu/org/netbeans/modules/applemenu/Bundle_ja.properties	Tue Jun 24 22:07:06 2014 +0900
    17.2 +++ b/src/ja/platform/applemenu/applemenu/org/netbeans/modules/applemenu/Bundle_ja.properties	Wed Jul 30 04:01:29 2014 -0700
    17.3 @@ -45,7 +45,7 @@
    17.4  OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3
    17.5  OpenIDE-Module-Short-Description=Apple\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30fb\u30e1\u30cb\u30e5\u30fc\u306e\u9069\u5207\u306a\u30b5\u30dd\u30fc\u30c8\u3092\u6709\u52b9\u306b\u3057\u307e\u3059
    17.6  
    17.7 -OpenIDE-Module-Long-Description=Apple\u30e1\u30cb\u30e5\u30fc\u306e\u9805\u76ee\u304c\u6b63\u3057\u304f\u6a5f\u80fd\u3059\u308b\u3088\u3046\u306b\u6709\u52b9\u3057\u3066\u3001\u3044\u304f\u3064\u304b\u306e\u6a19\u6e96\u30e1\u30cb\u30e5\u30fc\u9805\u76ee\u3092\u5909\u66f4\u3057\u307e\u3059 - \u300c\u30c4\u30fc\u30eb\u300d\u2192\u300c\u30aa\u30d7\u30b7\u30e7\u30f3\u300d\u306f\u300c\u30d7\u30ea\u30d5\u30a1\u30ec\u30f3\u30b9\u300d\u306b\u3001\u300c\u30d8\u30eb\u30d7\u300d\u2192\u300c\u30d0\u30fc\u30b8\u30e7\u30f3\u60c5\u5831\u300d\u306f\u300c\u30d0\u30fc\u30b8\u30e7\u30f3\u60c5\u5831\u300d\u306b\u3001\u300c\u30d5\u30a1\u30a4\u30eb\u300d\u2192\u300c\u7d42\u4e86\u300d\u306f\u300c\u7d42\u4e86\u300d\u306b\u306a\u308a\u307e\u3059\u3002
    17.8 +OpenIDE-Module-Long-Description=Apple\u30e1\u30cb\u30e5\u30fc\u306e\u9805\u76ee\u304c\u6b63\u3057\u304f\u6a5f\u80fd\u3059\u308b\u3088\u3046\u306b\u6709\u52b9\u3057\u3066\u3001\u3044\u304f\u3064\u304b\u306e\u6a19\u6e96\u30e1\u30cb\u30e5\u30fc\u9805\u76ee\u3092\u5909\u66f4\u3057\u307e\u3059 - \u300c\u30c4\u30fc\u30eb | \u30aa\u30d7\u30b7\u30e7\u30f3\u300d\u306f\u300c\u30d7\u30ea\u30d5\u30a1\u30ec\u30f3\u30b9\u300d\u306b\u3001\u300c\u30d8\u30eb\u30d7 | \u30d0\u30fc\u30b8\u30e7\u30f3\u60c5\u5831\u300d\u306f\u300c\u30d0\u30fc\u30b8\u30e7\u30f3\u60c5\u5831\u300d\u306b\u3001\u300c\u30d5\u30a1\u30a4\u30eb | \u7d42\u4e86\u300d\u306f\u300c\u7d42\u4e86\u300d\u306b\u306a\u308a\u307e\u3059\u3002
    17.9  
   17.10  
   17.11  Toolbars/QuickSearch=\u30af\u30a4\u30c3\u30af\u691c\u7d22(&Q)

    18.1 --- a/src/ja/platform/org-netbeans-core-startup/netbeans/core/core/org/netbeans/core/startup/Bundle_ja.properties	Tue Jun 24 22:07:06 2014 +0900
    18.2 +++ b/src/ja/platform/org-netbeans-core-startup/netbeans/core/core/org/netbeans/core/startup/Bundle_ja.properties	Wed Jul 30 04:01:29 2014 -0700
    18.3 @@ -1,6 +1,6 @@
    18.4  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    18.5  #
    18.6 -# Copyright 1997-2014 Oracle and/or its affiliates. All rights reserved.
    18.7 +# Copyright 1997-2012 Oracle and/or its affiliates. All rights reserved.
    18.8  #
    18.9  # Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   18.10  # Other names may be trademarks of their respective owners.

    19.1 --- a/src/ja/platform/org-netbeans-core-ui/org-netbeans-core-ui/org/netbeans/core/ui/options/general/Bundle_ja.properties	Tue Jun 24 22:07:06 2014 +0900
    19.2 +++ b/src/ja/platform/org-netbeans-core-ui/org-netbeans-core-ui/org/netbeans/core/ui/options/general/Bundle_ja.properties	Wed Jul 30 04:01:29 2014 -0700
    19.3 @@ -166,7 +166,7 @@
    19.4  
    19.5  LBL_AdvancedProxyPanel_lSocksHost=SOCKS\u30d7\u30ed\u30ad\u30b7(&S):
    19.6  LBL_AdvancedProxyPanel_lNonProxyHosts=\u30d7\u30ed\u30ad\u30b7\u30fb\u30db\u30b9\u30c8\u306a\u3057(&X):
    19.7 -LBL_AdvancedProxyPanel_cbUseProxyAuthentication=\u30d7\u30ed\u30ad\u30b7\u306b\u8a8d\u8a3c\u304c\u5fc5\u8981(&Q)
    19.8 +LBL_AdvancedProxyPanel_cbUseProxyAuthentication=\u30d7\u30ed\u30ad\u30b7\u306b\u660e\u793a\u7684\u306a\u8a8d\u8a3c\u304c\u5fc5\u8981(&Q)
    19.9  
   19.10  LBL_AdvancedProxyPanel_lUserName=\u30e6\u30fc\u30b6\u30fc\u540d(&U):
   19.11  
   19.12 @@ -268,4 +268,5 @@
   19.13  
   19.14  GeneralOptionsPanel.proxy.result.ok=\u63a5\u7d9a\u304c\u6e21\u3055\u308c\u307e\u3057\u305f
   19.15  GeneralOptionsPanel.proxy.result.failed=\u63a5\u7d9a\u306b\u5931\u6557\u3057\u307e\u3057\u305f({0})
   19.16 +AdvancedProxyPanel.cbUseProxyAuthentication.actionCommand=\u30d7\u30ed\u30ad\u30b7\u306b\u660e\u793a\u7684\u306a\u8a8d\u8a3c\u304c\u5fc5\u8981(&Q)
   19.17  

    20.1 --- a/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/view/ui/Bundle_ja.properties	Tue Jun 24 22:07:06 2014 +0900
    20.2 +++ b/src/ja/platform/org-netbeans-core-windows/org-netbeans-core-windows/org/netbeans/core/windows/view/ui/Bundle_ja.properties	Wed Jul 30 04:01:29 2014 -0700
    20.3 @@ -1,6 +1,6 @@
    20.4  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
    20.5  #
    20.6 -# Copyright 1997-2014 Oracle and/or its affiliates. All rights reserved.
    20.7 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
    20.8  #
    20.9  # Oracle and Java are registered trademarks of Oracle and/or its affiliates.
   20.10  # Other names may be trademarks of their respective owners.

    21.1 --- a/src/ja/platform/org-openide-loaders/org-openide-loaders/org/openide/loaders/Bundle_ja.properties	Tue Jun 24 22:07:06 2014 +0900
    21.2 +++ b/src/ja/platform/org-openide-loaders/org-openide-loaders/org/openide/loaders/Bundle_ja.properties	Wed Jul 30 04:01:29 2014 -0700
    21.3 @@ -41,6 +41,8 @@
    21.4  # made subject to such option by the copyright holder.
    21.5  
    21.6  CTL_SettingsFile=\u8a2d\u5b9a\u30d5\u30a1\u30a4\u30eb
    21.7 +# {0} - the path
    21.8 +EXC_FIND_4_INVALID=\u30d5\u30a1\u30a4\u30eb{0}\u306f\u6709\u52b9\u3067\u306a\u304f\u306a\u3063\u305f\u3088\u3046\u3067\u3059\u3002
    21.9  EXC_NO_LONGER_VALID=\u30b3\u30d4\u30fc\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb{0}\u306f\u6709\u52b9\u3067\u306f\u306a\u304f\u306a\u308a\u307e\u3057\u305f\u3002
   21.10  # {0} - File name
   21.11  LBL_Copying={0}\u3092\u30b3\u30d4\u30fc\u3057\u3066\u3044\u307e\u3059

    22.1 --- a/src/ja/platform/templates/templates/org/netbeans/modules/templates/ui/Bundle_ja.properties	Tue Jun 24 22:07:06 2014 +0900
    22.2 +++ b/src/ja/platform/templates/templates/org/netbeans/modules/templates/ui/Bundle_ja.properties	Wed Jul 30 04:01:29 2014 -0700
    22.3 @@ -70,6 +70,8 @@
    22.4  
    22.5  ACD_TemplatesPanel_Delete=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u306e\u524a\u9664
    22.6  
    22.7 +# {0} - The file name
    22.8 +MSG_FileIsLocked=\u30d5\u30a1\u30a4\u30eb{0}\u306f\u4f7f\u7528\u4e2d\u3067\u3059\u3002
    22.9  # {0} - file name
   22.10  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
   22.11  # {0} - prefix of the license file name
   22.12 @@ -81,7 +83,7 @@
   22.13  TemplatesPanel_TemplateNode_FileName=\u30d5\u30a1\u30a4\u30eb\u540d
   22.14  TemplatesPanel_TemplateNode_FileName_Desc=\u3053\u306e\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u306b\u3088\u308a\u8868\u3055\u308c\u308b\u30d5\u30a1\u30a4\u30eb\u306e\u30d5\u30a1\u30a4\u30eb\u540d\u3002
   22.15  TemplatesPanel_TemplateNode_License=\u30e9\u30a4\u30bb\u30f3\u30b9URL
   22.16 -TemplatesPanel_TemplateNode_License_Desc=\u3053\u306e\u30e9\u30a4\u30bb\u30f3\u30b9\u306e\u8a31\u8afe\u6a29\u9650\u3092\u6301\u3064Web\u30b5\u30a4\u30c8\u3002
   22.17 +TemplatesPanel_TemplateNode_License_Desc=\u3053\u306e\u30e9\u30a4\u30bb\u30f3\u30b9\u306e\u8a31\u8afe\u6a29\u9650\u3092\u6301\u3064Web\u30ed\u30b1\u30fc\u30b7\u30e7\u30f3(\u30b9\u30da\u30fc\u30b9\u3067\u533a\u5207\u3063\u3066\u8907\u6570\u3092\u542b\u3081\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059)\u3002
   22.18  TemplatesPanel_TemplateNode_ScriptEngine=\u30b9\u30af\u30ea\u30d7\u30c8\u30fb\u30a8\u30f3\u30b8\u30f3
   22.19  TemplatesPanel_TemplateNode_ScriptEngine_Desc=\u3053\u306e\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u3092\u51e6\u7406\u3059\u308b\u305f\u3081\u306e\u30b9\u30af\u30ea\u30d7\u30c8\u30fb\u30a8\u30f3\u30b8\u30f3\u3002
   22.20  TemplatesPanel_TemplateNode_TemplateCategories=\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u30fb\u30ab\u30c6\u30b4\u30ea