1.1 --- a/vcs.profiles.pvcs/src/org/netbeans/modules/vcs/profiles/pvcs/config/Bundle.properties	Tue Jun 18 14:50:21 2002 +0000
     1.2 +++ b/vcs.profiles.pvcs/src/org/netbeans/modules/vcs/profiles/pvcs/config/Bundle.properties	Tue Jun 18 20:49:58 2002 +0000
     1.3 @@ -42,10 +42,18 @@
     1.4  PVCS_ProjectName=PVCS Project Name
     1.5  PVCS_ProjectName_Mnemonic=P
     1.6  
     1.7 -PVCS_ProjectDatabase=Project Database:
     1.8 -PVCS_ProjectName=Project Name:
     1.9 -PVCS_UserName=User Name:
    1.10 -PVCS_WorkfileLocation=Workfiles Location:
    1.11 +PVCS_CUST_ProjectDatabase=Project Database:
    1.12 +ACS_PVCS_CUST_ProjectDatabase_mnc=D
    1.13 +ACSD_PVCS_CUST_ProjectDatabase=The Project Database
    1.14 +PVCS_CUST_ProjectName=Project Name:
    1.15 +ACS_PVCS_CUST_ProjectName_mnc=P
    1.16 +ACSD_PVCS_CUST_ProjectName=The Project Name
    1.17 +PVCS_CUST_UserName=User Name:
    1.18 +ACS_PVCS_CUST_UserName_mnc=U
    1.19 +ACSD_PVCS_CUST_UserName=The User Name (might be left blank)
    1.20 +PVCS_CUST_WorkfileLocation=Workfiles Location:
    1.21 +ACS_PVCS_CUST_WorkfileLocation_mnc=W
    1.22 +ACSD_PVCS_CUST_WorkfileLocation=The location of work files
    1.23  
    1.24  PVCS=PVCS
    1.25  PVCS_Mnemonic=P
    1.26 @@ -107,13 +115,12 @@
    1.27  COMMAND_PVCS_CHECKIN_AssignVersion=Assign a version label:
    1.28  COMMAND_PVCS_CHECKIN_FloatingLabel=Float label with the tip revision
    1.29  COMMAND_PVCS_CHECKIN_StartBranch=Start a branch
    1.30 -#COMMAND_PVCS_CHECKIN_Options=Additional Options for ''put'':
    1.31  
    1.32  COMMAND_PVCS_CHECKOUT_Lock=Lock for the Current User
    1.33  COMMAND_PVCS_CHECKOUT_Writable=Check out writable workfile
    1.34  COMMAND_PVCS_CHECKOUT_Revision=Specific Revision:
    1.35  COMMAND_PVCS_CHECKOUT_Version=Version Label:
    1.36 -COMMAND_PVCS_CHECKOUT_ByDate=Checkout by date
    1.37 +COMMAND_PVCS_CHECKOUT_ByDate=Check out by date
    1.38  COMMAND_PVCS_CHECKOUT_NewerThanWork=Revision newer than workfile
    1.39  COMMAND_PVCS_CHECKOUT_NewerThan=Revision newer than date/time:
    1.40  COMMAND_PVCS_CHECKOUT_InBefore=Revision checked in before:
    1.41 @@ -124,22 +131,18 @@
    1.42  COMMAND_PVCS_ADD_KeepLocked=Keep the revision locked
    1.43  COMMAND_PVCS_ADD_Recursive=Add all subdirectories
    1.44  #COMMAND_PVCS_ADDALL_Label=Add All
    1.45 -#COMMAND_PVCS_ADD_Options=Additional Options for ''put'':
    1.46  
    1.47  COMMAND_PVCS_REMOVE_What=Select what to remove:
    1.48  COMMAND_PVCS_REVISION_Tip=Latest trunk revision
    1.49  COMMAND_PVCS_REVISION_Revision=Specific revision(s):
    1.50  COMMAND_PVCS_REVISION_Version=Revisions identified by version label(s):
    1.51 -#COMMAND_PVCS_REMOVE_Options=Additional Options for ''vdel'':
    1.52  
    1.53  COMMAND_PVCS_LOCK_What=Select what to lock:
    1.54  COMMAND_PVCS_LOCK_Recursive=Lock all subdirectories
    1.55 -#COMMAND_PVCS_LOCK_Options=Additional Options for ''vcs'':
    1.56  
    1.57  COMMAND_PVCS_UNLOCK_What=Select what to unlock:
    1.58  COMMAND_PVCS_UNLOCK_User=All locks by user:
    1.59  COMMAND_PVCS_UNLOCK_Recursive=Unlock all subdirectories
    1.60 -#COMMAND_PVCS_UNLOCK_Options=Additional Options for ''vcs'':
    1.61  
    1.62  COMMAND_PVCS_STATUS_ReportType=Report type:
    1.63  COMMAND_PVCS_STATUS_RT_Full=Full history report
    1.64 @@ -166,7 +169,6 @@
    1.65  #COMMAND_PVCS_STATUS_NewestRevision=
    1.66  #COMMAND_PVCS_STATUS_RevisionInfo=
    1.67  #COMMAND_PVCS_STATUS_VersionInfo=
    1.68 -#COMMAND_PVCS_STATUS_Options=Additions Options for ''vlog'':
    1.69  
    1.70  COMMAND_PVCS_DIFF_Label=PVCS Diff
    1.71  COMMAND_PVCS_DIFF_Rev1=Revision 1:
    1.72 @@ -188,8 +190,6 @@
    1.73  COMMAND_PVCS_MERGE_VersionLabel=Version Label:
    1.74  COMMAND_PVCS_MERGE_OutFile=Output File:
    1.75  
    1.76 -COMMAND_PVCS_Suffix=Archive Suffix Template:
    1.77 -
    1.78  CONFIRMATION_PVCS_REMOVE=Are you sure you want to remove the last revision of the file "{0}"?
    1.79  
    1.80  NOTIFICATION_PVCS_REMOVE_Success=The last revision of the file "{0}" was removed successfully.
    1.81 @@ -209,96 +209,132 @@
    1.82  ACSD_PVCS_CHECKIN=Dialog for pvcs checkin command
    1.83  
    1.84  ACS_COMMAND_PVCS_CHECKIN_Reason_mnc=C
    1.85 +ACSD_COMMAND_PVCS_CHECKIN_Reason=Change description of workfile(s)
    1.86  ACS_COMMAND_PVCS_CHECKIN_Force_mnc=U
    1.87 +ACSD_COMMAND_PVCS_CHECKIN_Force=Check in the workfile even if it is unchanged
    1.88  ACS_COMMAND_PVCS_CHECKIN_Out_mnc=O
    1.89 +ACSD_COMMAND_PVCS_CHECKIN_Out=Check the workfile in and immediately out
    1.90  ACS_COMMAND_PVCS_CHECKIN_OutLock_mnc=L
    1.91 +ACSD_COMMAND_PVCS_CHECKIN_OutLock=Apply a lock on checkout
    1.92  ACS_COMMAND_PVCS_CHECKIN_AssignRevision_mnc=R
    1.93 +ACSD_COMMAND_PVCS_CHECKIN_AssignRevision=Assign a specific revision number
    1.94  ACS_COMMAND_PVCS_CHECKIN_AssignVersion_mnc=V
    1.95 +ACSD_COMMAND_PVCS_CHECKIN_AssignVersion=Assign a specific version label
    1.96  ACS_COMMAND_PVCS_CHECKIN_FloatingLabel_mnc=F
    1.97 +ACSD_COMMAND_PVCS_CHECKIN_FloatingLabel=Float label with the tip revision
    1.98  ACS_COMMAND_PVCS_CHECKIN_StartBranch_mnc=B
    1.99 +ACSD_COMMAND_PVCS_CHECKIN_StartBranch=Start a new branch
   1.100  
   1.101  ACSD_PVCS_CHECKOUT=Dialog for pvcs checkout command
   1.102  
   1.103  ACS_COMMAND_PVCS_CHECKOUT_Lock_mnc=L
   1.104 +ACSD_COMMAND_PVCS_CHECKOUT_Lock=Apply lock for the current user
   1.105  ACS_COMMAND_PVCS_CHECKOUT_Writable_mnc=W
   1.106 +ACSD_COMMAND_PVCS_CHECKOUT_Writable=Check out writable workfile
   1.107  ACS_COMMAND_PVCS_CHECKOUT_Revision_mnc=R
   1.108 +ACSD_COMMAND_PVCS_CHECKOUT_Revision=Check out a specific revision
   1.109  ACS_COMMAND_PVCS_CHECKOUT_Version_mnc=V
   1.110 +ACSD_COMMAND_PVCS_CHECKOUT_Version=Check out a specific version label
   1.111  ACS_COMMAND_PVCS_CHECKOUT_ByDate_mnc=D
   1.112 +ACSD_COMMAND_PVCS_CHECKOUT_ByDate=Check out by date
   1.113  ACS_COMMAND_PVCS_CHECKOUT_NewerThanWork_mnc=N
   1.114 +ACSD_COMMAND_PVCS_CHECKOUT_NewerThanWork=Check out a revision newer than workfile
   1.115  ACS_COMMAND_PVCS_CHECKOUT_NewerThan_mnc=e
   1.116 +ACSD_COMMAND_PVCS_CHECKOUT_NewerThan=Check out a revision newer than date/time
   1.117  ACS_COMMAND_PVCS_CHECKOUT_InBefore_mnc=f
   1.118 +ACSD_COMMAND_PVCS_CHECKOUT_InBefore=Check out a revision checked in before date/time
   1.119  ACS_COMMAND_PVCS_CHECKOUT_SetCurrTime_mnc=T
   1.120 +ACSD_COMMAND_PVCS_CHECKOUT_SetCurrTime=Set the date and time of the file to the current time
   1.121  ACS_COMMAND_PVCS_CHECKOUT_Recursive_mnc=A
   1.122 +ACSD_COMMAND_PVCS_CHECKOUT_Recursive=Get all subdirectories recursively
   1.123  
   1.124  ACSD_PVCS_CHECKOUT_ALL=Dialog for pvcs checkout all command
   1.125  
   1.126  ACSD_PVCS_ADD=Dialog for pvcs add command
   1.127  
   1.128  ACS_COMMAND_PVCS_ADD_Reason_mnc=W
   1.129 +ACSD_COMMAND_PVCS_ADD_Reason=The workfile description
   1.130  ACS_COMMAND_PVCS_ADD_KeepLocked_mnc=L
   1.131 +ACSD_COMMAND_PVCS_ADD_KeepLocked=Keep the revision locked after add
   1.132  ACS_COMMAND_PVCS_ADD_Recursive_mnc=A
   1.133 +ACSD_COMMAND_PVCS_ADD_Recursive=Add all subdirectories recursively
   1.134  
   1.135  #ACSD_PVCS_ADD_ALL=Dialog for pvcs add all command
   1.136  
   1.137  ACSD_PVCS_REMOVE=Dialog for pvcs remove command
   1.138  
   1.139  ACS_COMMAND_PVCS_REVISION_Tip_mnc=L
   1.140 +ACSD_COMMAND_PVCS_REVISION_Tip=The latest trunk revision
   1.141  ACS_COMMAND_PVCS_REVISION_Revision_mnc=R
   1.142 +ACSD_COMMAND_PVCS_REVISION_Revision=A specific revision(s)
   1.143  ACS_COMMAND_PVCS_REVISION_Version_mnc=V
   1.144 +ACSD_COMMAND_PVCS_REVISION_Version=Revisions identified by version label(s)
   1.145  
   1.146  ACSD_PVCS_LOCK=Dialog for pvcs lock command
   1.147  
   1.148  ACS_COMMAND_PVCS_LOCK_Recursive_mnc=A
   1.149 +ACSD_COMMAND_PVCS_LOCK_Recursive=Lock all subdirectories recursively
   1.150  
   1.151  ACSD_PVCS_UNLOCK=Dialog for pvcs unlock command
   1.152  
   1.153  ACS_COMMAND_PVCS_UNLOCK_User_mnc=U
   1.154 +ACSD_COMMAND_PVCS_UNLOCK_User=Unlock all locks by a user
   1.155  ACS_COMMAND_PVCS_UNLOCK_Recursive_mnc=A
   1.156 +ACSD_COMMAND_PVCS_UNLOCK_Recursive=Unlock all subdirectories recursively
   1.157  
   1.158  ACSD_PVCS_STATUS=Dialog for pvcs history dialog
   1.159  ACS_COMMAND_PVCS_STATUS_ReportType_mnc=T
   1.160 +ACSD_COMMAND_PVCS_STATUS_ReportType=Select the report type
   1.161  ACS_COMMAND_PVCS_STATUS_Revision_mnc=R
   1.162 +ACSD_COMMAND_PVCS_STATUS_Revision=Report on a specific revision
   1.163  ACS_COMMAND_PVCS_STATUS_Authors_mnc=A
   1.164 +ACSD_COMMAND_PVCS_STATUS_Authors=Report only changes made by certain user(s)
   1.165  ACS_COMMAND_PVCS_STATUS_Lockers_mnc=L
   1.166 +ACSD_COMMAND_PVCS_STATUS_Lockers=List archives, that contains locks by certain user(s)
   1.167  ACS_COMMAND_PVCS_STATUS_Owners_mnc=O
   1.168 +ACSD_COMMAND_PVCS_STATUS_Owners=List archives owned by certain user(s)
   1.169  ACS_COMMAND_PVCS_STATUS_DateFrom_mnc=F
   1.170 +ACSD_COMMAND_PVCS_STATUS_DateFrom=Report om revisions checked in after a specific date
   1.171  ACS_COMMAND_PVCS_STATUS_DateTo_mnc=e
   1.172 +ACSD_COMMAND_PVCS_STATUS_DateTo=Report om revisions checked in before a specific date
   1.173  ACS_COMMAND_PVCS_STATUS_Recursive_mnc=u
   1.174 +ACSD_COMMAND_PVCS_STATUS_Recursive=Report on all subdirectories recursively
   1.175  
   1.176  ACSD_COMMAND_PVCS_DIFF_Label=Dialog for pvcs diff command
   1.177  
   1.178  ACS_COMMAND_PVCS_DIFF_Rev1_mnc=R
   1.179 +ACSD_COMMAND_PVCS_DIFF_Rev1=The first revision to compare
   1.180  ACS_COMMAND_PVCS_DIFF_Ver1_mnc=V
   1.181 +ACSD_COMMAND_PVCS_DIFF_Ver1=The first version label to compare
   1.182  ACS_COMMAND_PVCS_DIFF_Rev2_mnc=e
   1.183 +ACSD_COMMAND_PVCS_DIFF_Rev2=The second revision to compare
   1.184  ACS_COMMAND_PVCS_DIFF_Ver2_mnc=l
   1.185 +ACSD_COMMAND_PVCS_DIFF_Ver2=The second version label to compare
   1.186  ACS_COMMAND_PVCS_DIFF_IgnoreWhite_mnc=W
   1.187 +ACSD_COMMAND_PVCS_DIFF_IgnoreWhite=Ignore white spaces at beginning and end of line
   1.188  ACS_COMMAND_PVCS_DIFF_GenDelta_mnc=D
   1.189 +ACSD_COMMAND_PVCS_DIFF_GenDelta=Generate a delta file
   1.190  ACS_COMMAND_PVCS_DIFF_DeltaFile_mnc=F
   1.191 +ACSD_COMMAND_PVCS_DIFF_DeltaFile=The delta output file
   1.192  
   1.193  ACSD_COMMAND_PVCS_APPLY_DELTA_Label=Dialog for apply of a pvcs delta file
   1.194  
   1.195  ACS_COMMAND_PVCS_APPLY_DELTA_DeltaFile_mnc=F
   1.196 +ACSD_COMMAND_PVCS_APPLY_DELTA_DeltaFile=The delta file to apply
   1.197  
   1.198  ACSD_COMMAND_PVCS_MERGE_Label=Dialog for pvcs merge command
   1.199  
   1.200  ACS_COMMAND_PVCS_MERGE_Parent_RevisionNumber_mnc=R
   1.201 +ACSD_COMMAND_PVCS_MERGE_Parent_RevisionNumber=Parent revision number
   1.202  ACS_COMMAND_PVCS_MERGE_Parent_VersionLabel_mnc=V
   1.203 +ACSD_COMMAND_PVCS_MERGE_Parent_VersionLabel=Parent version label
   1.204  ACS_COMMAND_PVCS_MERGE_B1_RevisionNumber_mnc=e
   1.205 +ACSD_COMMAND_PVCS_MERGE_B1_RevisionNumber=Branch Point 1 revision number
   1.206  ACS_COMMAND_PVCS_MERGE_B1_VersionLabel_mnc=i
   1.207 +ACSD_COMMAND_PVCS_MERGE_B1_VersionLabel=Branch Point 1 version label
   1.208  ACS_COMMAND_PVCS_MERGE_B2_RevisionNumber_mnc=o
   1.209 +ACSD_COMMAND_PVCS_MERGE_B2_RevisionNumber=Branch Point 2 revision number
   1.210  ACS_COMMAND_PVCS_MERGE_B2_VersionLabel_mnc=L
   1.211 +ACSD_COMMAND_PVCS_MERGE_B2_VersionLabel=Branch Point 2 version label
   1.212  ACS_COMMAND_PVCS_MERGE_OutFile_mnc=F
   1.213 -
   1.214 -#ACS_COMMAND_PVCS_CHECKIN_Options_mnc=A
   1.215 -
   1.216 -#ACS_COMMAND_PVCS_ADD_Options_mnc=A
   1.217 -
   1.218 -ACS_COMMAND_PVCS_REMOVE_Options_mnc=A
   1.219 -
   1.220 -ACS_COMMAND_PVCS_LOCK_Options_mnc=A
   1.221 -
   1.222 -ACS_COMMAND_PVCS_UNLOCK_Options_mnc=A
   1.223 -
   1.224 -ACS_COMMAND_PVCS_STATUS_Options_mnc=A
   1.225 -
   1.226 -ACS_COMMAND_PVCS_Suffix_mnc=U
   1.227 +ACSD_COMMAND_PVCS_MERGE_OutFile=Output File