1.1 --- a/vcscvs/src/org/netbeans/modules/vcs/cmdline/Bundle.properties Thu Jul 20 14:53:46 2000 +0000
1.2 +++ b/vcscvs/src/org/netbeans/modules/vcs/cmdline/Bundle.properties Thu Jul 20 19:29:38 2000 +0000
1.3 @@ -135,7 +135,7 @@
1.4
1.5 # cacheId
1.6 PROP_cacheId=Cache Id
1.7 -HINT_cacheId=Directory under vcs/cache in which cached data is to be kept.
1.8 +HINT_cacheId=Directory under vcs/cache/ in which cached data is to be kept.
1.9
1.10 # config
1.11 PROP_config=Configuration
1.12 @@ -151,7 +151,9 @@
1.13
1.14 # do edit command
1.15 PROP_edit=Call edit command
1.16 -HINT_edit=Enable automatic execution of cvs edit command on read only files.
1.17 +HINT_edit=Enable automatic execution of `cvs edit'' command on read-only files.
1.18 +
1.19 +# [PENDING] the next three properties have much too long names, pls. shorten
1.20
1.21 # execute pre commit command which downloads the commit template
1.22 PROP_executePreCommit=Check for message template before commit
1.23 @@ -159,11 +161,11 @@
1.24
1.25 # Ask for additional user parameters
1.26 PROP_acceptUserParams=Ask for advanced options
1.27 -HINT_acceptUserParams=Ask for additional options to the command.
1.28 +HINT_acceptUserParams=Ask for additional options to every command.
1.29
1.30 # Run Refresh command on refresh of file statuses. (If working off-line this should be off.)
1.31 PROP_runRefreshCommand=Run CVS command to refresh the status of files
1.32 -HINT_runRefreshCommand=Automatically run CVS command to retrieve the latest file status.
1.33 +HINT_runRefreshCommand=Automatically run a CVS command to retrieve the latest file status.
1.34
1.35 #--------------------------------------------------------------------
1.36 # AdditionalCommandDialog
1.37 @@ -346,18 +348,19 @@
1.38 #--------------------------------------------------------------------
1.39 # VcsCache
1.40 DLG_DownloadRecursively=Download contents of VCS recursively ?
1.41 -DLG_RefreshCommandDisabled=The execution of refresh command is disabled. Do you want to enable it ?
1.42 +DLG_RefreshCommandDisabled=Execution of the refresh command is disabled. Do you want to enable it ?
1.43 CTL_StatusLocal=Local
1.44 -CTL_StatusNotInSync=Not in synch
1.45 +CTL_StatusNotInSync=Not in Synch
1.46 CTL_StatusUnknown=Unknown
1.47 -CTL_StatusNotInView=Not in view
1.48 +# [PENDING] "Not in View" is StarTeam terminology, no?
1.49 +CTL_StatusNotInView=Not in View
1.50 CTL_DefaultModifiedStatus=Locally Modified
1.51
1.52 #--------------------------------------------------------------------
1.53 # CvsCustomizer
1.54 CvsCustomizer.localRadioButton.text=\ Local CVS (local)
1.55 CvsCustomizer.serverRadioButton.text=\ Remote CVS (server)
1.56 -CvsCustomizer.pserverRadioButton.text=\ Password protected server (pserver)
1.57 +CvsCustomizer.pserverRadioButton.text=\ Password-protected server (pserver)
1.58 CvsCustomizer.userNameLabel.text=User Name\:
1.59 CvsCustomizer.serverLabel.text=Server\:
1.60 CvsCustomizer.repositoryLabel.text=Repository\:
1.61 @@ -376,7 +379,10 @@
1.62 CvsCustomizer.connectionPanel.borderTitle=CVS Connection Type
1.63 CvsCustomizer.propsPanel.borderTitle=CVS Settings
1.64 #CvsCustomizer.loginHOWTO=To log into CVS, open a command shell, \nchange the directory for the working directory, \nrun the CVS command with the following arguments \nand enter the password:\n
1.65 -CvsCustomizer.loginHOWTO=To log into CVS, open a command shell, \nrun the CVS command with the following arguments \nand enter the password:\n
1.66 +CvsCustomizer.loginHOWTO=\
1.67 + To log into CVS, open a command shell,\n\
1.68 + run the CVS command with the following arguments,\n\
1.69 + and enter your password:\n
1.70 CvsCustomizer.canNotChangeWD=Cannot change the working directory
1.71 CvsCustomizer.nonNegative=A non-negative integer value is expected.
1.72 CvsCustomizer.notDirectory=Not a directory: {0}.
1.73 @@ -389,20 +395,20 @@
1.74 CvsCustomizer.rootDirTextField.toolTipText=Enter the directory where your working files are stored.
1.75 CvsCustomizer.moduleTextField.toolTipText=Enter the module name you want to work with.
1.76 CvsCustomizer.relMountTextField.toolTipText=Enter the mount point inside your working directory.
1.77 -CvsCustomizer.cvsExeTextField.toolTipText=Path to the CVS executable. Leave "cvs" when it is in PATH variable.
1.78 -CvsCustomizer.cygwinCheckBox.toolTipText=You have to use a unix command shell on Windows 95/98.
1.79 -CvsCustomizer.cygwinTextField.toolTipText=Enter the full path to the unix shell.
1.80 +CvsCustomizer.cvsExeTextField.toolTipText=Path to the CVS executable. Leave as "cvs" when it is in the PATH variable.
1.81 +CvsCustomizer.cygwinCheckBox.toolTipText=You must use a Unix command shell on Windows 95/98.
1.82 +CvsCustomizer.cygwinTextField.toolTipText=Enter the full path to the Unix shell.
1.83 CvsCustomizer.refreshTextField.toolTipText=Local files will be refreshed with this period.
1.84 CvsCustomizer.okButton.text=OK
1.85 CvsCustomizer.cancelButton.text=Cancel
1.86 CvsCustomizer.applyButton.text=Apply
1.87 CvsCustomizer.localRadioButton.toolTipText=Select this to access your local CVS repository.
1.88 -CvsCustomizer.serverRadioButton.toolTipText=Select this to access the remote CVS repository on a server.
1.89 -CvsCustomizer.pserverRadioButton.toolTipText=Select this to access the remote CVS repository on a pserver.
1.90 -CvsCustomizer.wrongPassword=The authentification failed. Wrong password or settings.
1.91 -CvsCustomizer.errorWritingPass=Error while writing .cvspass file. Password hasn't been saved.
1.92 +CvsCustomizer.serverRadioButton.toolTipText=Select this to access a remote CVS repository (shell-based).
1.93 +CvsCustomizer.pserverRadioButton.toolTipText=Select this to access a remote CVS repository (pserver password-based).
1.94 +CvsCustomizer.wrongPassword=The authentication failed. Perhaps you misentered your password or misconfigured the settings.
1.95 +CvsCustomizer.errorWritingPass=An error occurred while writing the .cvspass file. Your password has not been saved.
1.96 CvsCustomizer.passwordLabel=Password\:
1.97 -CvsCustomizer.CheckoutRunning=The checkout command is running. Filesystem will be mounted when finished.
1.98 +CvsCustomizer.CheckoutRunning=The checkout command is running. The filesystem will be mounted when it is finished.
1.99 CvsCustomizer.title=Customizer
1.100 CvsCustomizer.btnRelMount.text=Browse...
1.101 CvsCustomizer.lbRelMount.text=Relative Mountpoint \:
1.102 @@ -411,15 +417,17 @@
1.103 #----------------------------------------------------------------------
1.104 # ExecuteSelector
1.105 MSG_VariableSelector=Variable Selector
1.106 -MSG_VariableSelectorIgnored=Variable Selector is not a java class and therefore it is ignored.
1.107 +# [PENDING] what does this mean?
1.108 +MSG_VariableSelectorIgnored=Variable Selector is not a Java class and therefore it is ignored.
1.109
1.110 SubmenuWatches=Watches
1.111 SubmenuEditing=Editing
1.112 CvsCustomizer.nextButton.text=Next
1.113 +# [PENDING] ??
1.114 CvsCustomizer.connectionPanel.name=null
1.115 -CvsCustomizer.emptyWorkingDir=There are no CVS files in the working directory. Please select modules to checkout in the following dialog.
1.116 -CvsCustomizer.lblPassLocation.text=Pserver passfile full path\:
1.117 -CvsInitModuleSelectorDialog.taText.text=Your working directory is empty. Please select one or more modules to checkout first.
1.118 +CvsCustomizer.emptyWorkingDir=There are no CVS files in your working directory. Please select some modules to check out in the following dialog.
1.119 +CvsCustomizer.lblPassLocation.text=`pserver'' password file full path\:
1.120 +CvsInitModuleSelectorDialog.taText.text=Your working directory is empty. Please select one or more modules to check out first.
1.121 CvsCustomizer.inputPassword=Please enter your password\:
1.122 CvsModuleSelectorDialog.lbWarning.text=Your working directory is empty.
1.123 CvsModuleSelectorDialog.lblOptions.text=Please select one of the following options:
1.124 @@ -446,7 +454,8 @@
1.125 NewCvsCustomizer.lbUser.text=User name\ :
1.126 NewCvsCustomizer.lbServer.text=Server\ :
1.127 NewCvsCustomizer.btnRepository.label=Browse...
1.128 -NewCvsCustomizer.rbPserver.label=\ Password protected server (pserver)
1.129 +NewCvsCustomizer.rbPserver.label=\ Password-protected server (pserver)
1.130 +# [PENDING] trailing space intentional?
1.131 NewCvsCustomizer.rbServer.text=\ Remote server (server)
1.132 NewCvsCustomizer.rbLocal.text=\ Local CVS (local)
1.133 NewCvsCustomizer.passwordLabel=Enter password\:
1.134 @@ -456,17 +465,17 @@
1.135 NewCvsCustomizer.columnModule=Module
1.136 NewCvsCustomizer.columnStatus=Status
1.137 NewCvsCustomizer.waitingForModules=Please wait, modules are loading ...
1.138 -NewCvsCustomizer.waitingForCheckout=Please wait, checkout proceeds.
1.139 +NewCvsCustomizer.waitingForCheckout=Please wait, checkout in process.
1.140 NewCvsCustomizer.checkoutFinished=Module(s) checkout finished.
1.141 NewCvsCustomizer.wizardName=CVS Setup
1.142 NewCvsCustomizer.mountDialogLabel=Setting Relative Mountpoint
1.143 -NewCvsCustomizer.checkoutDialogLabel=Checkout
1.144 +NewCvsCustomizer.checkoutDialogLabel=Check Out
1.145 NewCvsCustomizer.serverDialogLabel=Server settings
1.146 NewCvsCustomizer.workDialogLabel=Basic settings
1.147 -NewCvsCustomizer.dirNotExists=The given directory does not exist.
1.148 -NewCvsCustomizer.notDirectory=The Working directory is not a directory.
1.149 -NewCvsCustomizer.rbCheckModule.text=Checkout Module
1.150 -NewCvsCustomizer.rbCheckout.text=Command line checkout
1.151 +NewCvsCustomizer.dirNotExists=The supplied directory does not exist.
1.152 +NewCvsCustomizer.notDirectory=The working directory is not really a directory.
1.153 +NewCvsCustomizer.rbCheckModule.text=Check Out Module
1.154 +NewCvsCustomizer.rbCheckout.text=Command-line checkout
1.155 NewCvsCustomizer.jLabel1.text=Checkout command parameters\:
1.156 NewCvsCustomizer.repositoryNonExistent=The directory where the Cvs repository should reside, does not exist.
1.157
2.1 --- a/vcscvs/src/org/netbeans/modules/vcs/cmdline/commands/Bundle.properties Thu Jul 20 14:53:46 2000 +0000
2.2 +++ b/vcscvs/src/org/netbeans/modules/vcs/cmdline/commands/Bundle.properties Thu Jul 20 19:29:38 2000 +0000
2.3 @@ -33,7 +33,7 @@
2.4 CvsBranchFrame.revATextField.toolTipText=Click the left mouse button to select the revision
2.5 CvsBranchFrame.title=CVS Branches
2.6 CvsBranchFrame.revBTextField.toolTipText=Click the right mouse button to select the revision
2.7 -CvsBranchFrame.hintLabel.text=HINT: Click the left/right mouse button to select the revision A/B.
2.8 +CvsBranchFrame.hintLabel.text=Hint: click the left then right mouse buttons to select the start (A) and end (B) revisions.
2.9
2.10 CvsDiffFrame.fileLabel1.text=CVS Repository file
2.11 CvsDiffFrame.fileLabel2.text=Working file
2.12 @@ -49,7 +49,7 @@
2.13 CvsRevisionChooser.infoLabel.text=Command On Revision
2.14
2.15 CvsWatchDialog.title=Set Watch
2.16 -CvsWatchDialog.file.title=Set Watch On {0}
2.17 +CvsWatchDialog.file.title=Set Watch on {0}
2.18 CvsWatchDialog.jButton1.text=OK
2.19 CvsWatchDialog.jButton2.text=Cancel
2.20 CvsWatchDialog.watchLabel.text=Choose the watch actions to add\:
3.1 --- a/vcscvs/src/org/netbeans/modules/vcs/cmdline/passwd/Bundle.properties Thu Jul 20 14:53:46 2000 +0000
3.2 +++ b/vcscvs/src/org/netbeans/modules/vcs/cmdline/passwd/Bundle.properties Thu Jul 20 19:29:38 2000 +0000
3.3 @@ -9,12 +9,13 @@
3.4 # Code is Sun Microsystems, Inc. Portions Copyright 1997-2000 Sun
3.5 # Microsystems, Inc. All Rights Reserved.
3.6
3.7 -
3.8 +# [PENDING] this stuff seems to be duplicated in main bundle for module,
3.9 +# please delete redundant text!
3.10
3.11 #--------------------------------------------------------------------
3.12 # CVSPasswd
3.13 -CVSPasswd.errorWritingPass=Error while writing .cvspass file. Password hasn't been saved.
3.14 -CVSPasswd.unknownHost=Cannot verify password. Unknown host.
3.15 +CVSPasswd.errorWritingPass=Error while writing .cvspass file. Your password has not been saved.
3.16 +CVSPasswd.unknownHost=Cannot verify password: unknown host.
3.17 CVSPasswd.connectionIOError=Could not open connection to host.
3.18 -CVSPasswd.wrongPassword=The authentification failed. Wrong password or settings.
3.19 -#------------------------------------------------------------------- ---
3.20 +CVSPasswd.wrongPassword=Authentication failed: you mistyped your password or misconfigured some settings.
3.21 +#--------------------------------------------------------------------