Index: src/org/netbeans/modules/mercurial/Bundle.properties
===================================================================
RCS file: /cvs/versioncontrol/mercurial/src/org/netbeans/modules/mercurial/Attic/Bundle.properties,v
retrieving revision 1.11.6.1
diff -u -r1.11.6.1 Bundle.properties
--- src/org/netbeans/modules/mercurial/Bundle.properties 10 Dec 2007 21:26:10 -0000 1.11.6.1
+++ src/org/netbeans/modules/mercurial/Bundle.properties 29 Feb 2008 15:22:14 -0000
@@ -44,7 +44,7 @@
OpenIDE-Module-Short-Description=Mercurial Versioning System
# Note: Changing the label below to &Mercurial, breaks the app
-CTL_Mercurial_MainMenu = Mercurial
+CTL_Mercurial_MainMenu = &Mercurial
CTL_Mercurial_DisplayName = Mercurial
## Annotator.java
@@ -92,55 +92,53 @@
textAnnotation = {0}
-CTL_MenuItem_Create = Initialize Project
+CTL_MenuItem_Create = I&nitialize Project
CTL_PopupMenuItem_Create = Initialize &Mercurial Project
-CTL_PopupMenuItem_CloneOther = Clone Other...
-CTL_PopupMenuItem_CloneLocal = Clone - {0}
+CTL_PopupMenuItem_CloneOther = Clone Ot&her...
+CTL_PopupMenuItem_CloneLocal = Cl&one - {0}
-CTL_PopupMenuItem_Status = Status
-CTL_PopupMenuItem_Diff = Diff
-CTL_PopupMenuItem_Update = Update
-CTL_PopupMenuItem_Commit = Commit...
-CTL_PopupMenuItem_ExportDiff = Export Diff...
-CTL_PopupMenuItem_ImportDiff = Import Patches...
-CTL_PopupMenuItem_Ignore = &Ignore
-CTL_PopupMenuItem_Unignore = Un&ignore
-CTL_PopupMenuItem_PushOther = Push Other...
-CTL_PopupMenuItem_PushLocal = Push to - default
-CTL_PopupMenuItem_PullOther = Pull Other...
-CTL_PopupMenuItem_PullLocal = Pull from - default
-CTL_PopupMenuItem_Rollback = Rollback
-CTL_PopupMenuItem_Revert = Revert Modifications
-CTL_PopupMenuItem_Merge = Merge
-CTL_PopupMenuItem_Resolve = Resolve Conflicts
-CTL_PopupMenuItem_MarkResolved = Mark as Resolved
-
-CTL_PopupMenuItem_Serve = Serve...
-CTL_PopupMenuItem_Remove = Remove
-CTL_PopupMenuItem_Log = Show History
-CTL_PopupMenuItem_HideAnnotations = Hide Annotations
-CTL_PopupMenuItem_ShowAnnotations = Show Annotations
+CTL_PopupMenuItem_Status = &Status
+CTL_PopupMenuItem_Diff = &Diff
+CTL_PopupMenuItem_Update = &Update
+CTL_PopupMenuItem_Commit = &Commit...
+CTL_PopupMenuItem_ExportDiff = E&xport Diff...
+CTL_PopupMenuItem_ImportDiff = Im&port Patches...
+CTL_PopupMenuItem_Ignore = &Toggle Ignore
+CTL_PopupMenuItem_ShowIncoming = Show Incomin&g
+CTL_PopupMenuItem_ShowOut = Sho&w Out
+CTL_PopupMenuItem_FetchLocal = &Fetch
+CTL_PopupMenuItem_PushOther = Pu&sh Other...
+CTL_PopupMenuItem_PushLocal = Push &to - default
+CTL_PopupMenuItem_PullOther = Pu&ll Other...
+CTL_PopupMenuItem_PullLocal = Pull f&rom - default
+CTL_PopupMenuItem_Rollback = Rollbac&k
+CTL_PopupMenuItem_Revert = Re&vert Modifications
+CTL_PopupMenuItem_Merge = M&erge
+CTL_PopupMenuItem_Resolve = Resolve Confl&icts
+CTL_PopupMenuItem_MarkResolved = M&ark as Resolved
+
+CTL_PopupMenuItem_Log = Show Histor&y
+CTL_PopupMenuItem_HideAnnotations = Hide &Annotations
+CTL_PopupMenuItem_ShowAnnotations = Show &Annotations
CTL_PopupMenuItem_GetClean = Re&vert Modifications
CTL_PopupMenuItem_RevertDelete = Re&vert Delete
-CTL_PopupMenuItem_View = View...
-CTL_PopupMenuItem_Properties = Properties...
+CTL_PopupMenuItem_View = Vie&w...
+CTL_PopupMenuItem_Properties = Pr&operties...
CTL_PopupMenuItem_IncludeInCommit=Include in Commit
CTL_PopupMenuItem_ExcludeFromCommit=Exclude from Commit
-BK1001=
-
-CTL_OutputTab_Name = HG Output
-
-MSG_UnknownURL=[Unknown repository URL]
MSG_ActionCanceledByUser = Action canceled by user
-MSG_AbortReadCommitMsg = abort: can't read commit message
-MSG_UnableExecuteCmd = unable to execute hg command:
+MSG_Change_Progress = Changing ...
+MSG_Create_Progress = Creating ...
MSG_Remove_Progress = Removing ...
MSG_Move_Progress = Moving ...
-MSG_Add_Progress = Adding ...
-MSG_NO_PUSH_PULL_PATH = no default
-MSG_VERSION_CONFIRM = Confirm Mercurial version
-MSG_VERSION_CONFIRM_QUERY The version of Mercurial found ({0}) is not the version ({1}) supported by the NetBeans Mercurial Plugin.\nDo you want to use this version of mercurial with the plugin?
+MSG_VERSION_CONFIRM = Confirm Mercurial Version
+MSG_VERSION_CONFIRM_QUERY The version of Mercurial found ({0}) is not one supported by the NetBeans Mercurial Plugin.\nDo you want to use this version of Mercurial with the plugin?
+MSG_VERSION_NONE_TITLE = Mercurial not Found
+MSG_VERSION_NONE_MSG = Mercurial could not be found.\nNo Mercurial commands can be executed.\n\nPlease check Mercurial is installed and on your PATH.
+MSG_VERSION_NONE_OUTPUT_MSG = INFO: Mercurial could not be found.\nNo Mercurial commands can be executed.
+MSG_USING_VERSION_MSG = INFO: Using version {0} of Mercurial.
+MSG_NOT_USING_VERSION_MSG = INFO: User has elected not to use version {0} of Mercurial.\n\nNo Mercurial commands can be executed.
LBL_Queued = {0} (Queued)
Index: src/org/netbeans/modules/mercurial/options/Bundle.properties
===================================================================
RCS file: /cvs/versioncontrol/mercurial/src/org/netbeans/modules/mercurial/options/Attic/Bundle.properties,v
retrieving revision 1.7.6.1
diff -u -r1.7.6.1 Bundle.properties
--- src/org/netbeans/modules/mercurial/options/Bundle.properties 10 Dec 2007 21:26:10 -0000 1.7.6.1
+++ src/org/netbeans/modules/mercurial/options/Bundle.properties 29 Feb 2008 15:22:14 -0000
@@ -38,9 +38,6 @@
# made subject to such option by the copyright holder.
-CTL_ManageLabels = Manage Labels
-ACSD_ManageLabels = Lets you manage Mercurial Status Labels
-
CTL_PropertiesDialog_Title=Mercurial Extensions Editor
CTL_Properties_Action_Cancel = Cancel
CTL_Properties_Action_OK = OK
@@ -75,21 +72,11 @@
MercurialPanel.label.revision = stays for Revision
MercurialPanel.label.status = stays for Status
-MercurialPanel.label.folder = stays for Branch or Tag Name
-
-//AnnotationSettings.edit.title = Edit the URL Pattern Regular Expresion
-//AnnotationSettings.new.title = Add a new URL Pattern Regular Expresion
-
-//AnnotationHelpPanel.jLabel1.text=Use the Annotation Format table to setup annotation of specific Repository Folders containig Branches or Tags
- URL Pattern - a Regular Expression to match a Repository Folder
\t- e. g. .*/(branches|tags)/(.+?)/.* will match any URL containing a folder named 'branches' or 'tags'
- Annotation - specifies how a file from a specific Repository Folder should be annotated.
The value may be plain text mixed with references to a group from the RegExp in URL Pattern
\t - e. g. mybranch \\2 gives a label consisting from the string "mybranch" and
a substring matching with the second group in URL Pattern
An URL Pattern .*/(branches|tags)/(.+?)/.* and an Annotation mybranch - \\2 will then cause that all files from
the URL http\://some // NOI18N
-svnserver.org/svn/branches/MyProject_branch1/ will be Labeled with "mybranch - MyProject_branch1" // NOI18N
-
-//AnnotationSettingsPanel.warningLabel.text=Wrong Regular Expresion: {0}
-
-//AnnotationSettingsPanel.wizardButton.text=Add with Wizard
+MercurialPanel.label.folder = stays for Branch or Tag Name
-//AnnotationSettingsPanel.editButton.text=Edit
+MSG_STATUS_LABEL_WITH_REVSION_TITLE = Revision Label Performance
+MSG_STATUS_LABEL_WITH_REVSION_MSG = Revision labels {revision} have been added.\n\nThis can seriously effect performance when viewing Mercurial controlled Projects.\nUsing Show Annotations or Show History on selected files is a more efficient way to get revision information.
-//AnnotationSettingsPanel.tableLabel.text=Repository Folder (Branch/Tag) Name\:
MercurialPanel.labelVariables.title=Select Variables
MercurialPanel.labelVariables.acsd=Lets you select a Variable
@@ -110,3 +97,16 @@
MercurialPanel.ExportFilename.text=&Default Export Filename\:
MercurialPanel.browseButton2.text=B&rowse...
+
+
+PropertiesPanel.jLabel2.text=Property &Name:
+PropertiesPanel.jLabel1.text=Property &Value:
+PropertiesPanel.btnAdd.text=&Add
+PropertiesPanel.btnRemove.text=&Remove
+jLabel3.txt=Mercurial &Properties:
+ACSD_PropertiesTable = Lists of mercurial properties.
+LBL_Properties_Progress=Scanning mercurial properties
+
+CTL_PropertiesTable_Column_Name=Name
+CTL_PropertiesTable_Column_Value=Value
+
Index: src/org/netbeans/modules/mercurial/ui/annotate/Bundle.properties
===================================================================
RCS file: /cvs/versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/annotate/Attic/Bundle.properties,v
retrieving revision 1.5
diff -u -r1.5 Bundle.properties
--- src/org/netbeans/modules/mercurial/ui/annotate/Bundle.properties 3 Oct 2007 18:00:42 -0000 1.5
+++ src/org/netbeans/modules/mercurial/ui/annotate/Bundle.properties 29 Feb 2008 15:22:14 -0000
@@ -44,17 +44,6 @@
CTL_MenuItem_DiffToRevision = Diff {0} to {1}
CTL_MenuItem_Revert = Revert Modifications...
-## AnnotationAction.java
-CTL_MenuItem_HideAnnotations = Hide &Annotations
-CTL_MenuItem_HideAnnotations_Context = Hide &Annotations
-CTL_MenuItem_HideAnnotations_Context_Multiple = Hide &Annotations
-CTL_MenuItem_HideAnnotations_Projects = Hide &Annotations
-
-CTL_MenuItem_ShowAnnotations = Show &Annotations
-CTL_MenuItem_ShowAnnotations_Context = Show "{0}" &Annotations
-CTL_MenuItem_ShowAnnotations_Context_Multiple = Show &Annotations
-CTL_MenuItem_ShowAnnotations_Projects = Show &Annotations
-
CTL_MenuItem_CloseAnnotations = Close Annotations
MSG_Revert_Progress=Reverting...
MSG_Annotation_Progress=Annotating...
@@ -62,4 +51,3 @@
MSG_ANNOTATE_TITLE = Mercurial Annotate
MSG_ANNOTATE_TITLE_SEP = ------------------
MSG_ANNOTATE_DONE = INFO: End of Annotate
-M
Index: src/org/netbeans/modules/mercurial/ui/commit/Bundle.properties
===================================================================
RCS file: /cvs/versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/commit/Attic/Bundle.properties,v
retrieving revision 1.5.6.1
diff -u -r1.5.6.1 Bundle.properties
--- src/org/netbeans/modules/mercurial/ui/commit/Bundle.properties 10 Dec 2007 21:26:16 -0000 1.5.6.1
+++ src/org/netbeans/modules/mercurial/ui/commit/Bundle.properties 29 Feb 2008 15:22:15 -0000
@@ -38,9 +38,6 @@
# made subject to such option by the copyright holder.
-MSG_CommitAction_MultipleProjects = {0} Projects
-MSG_CommitAction_MultipleFiles = {0} Files
-
MSG_COMMIT_TITLE = Mercurial Commit
MSG_COMMIT_TITLE_SEP = ----------------
MSG_COMMIT_INIT_SEP_ONE = Committing {0} file to repository for {1}:
@@ -51,84 +48,11 @@
MSG_COMMIT_NOT_SUPPORTED_INVIEW = Commit is not supported in this View.
MSG_COMMIT_NOT_SUPPORTED_INVIEW_TITLE = Mecurial Commit
-#CTL_MenuItem_Commit = C&ommit...
-#CTL_MenuItem_Commit_Context = C&ommit "{0}"...
-#CTL_MenuItem_Commit_Context_Multiple = C&ommit Files...
-#CTL_MenuItem_Commit_Projects=C&ommit {0} Projects...
-
-#CTL_MenuItem_CommitRunning = Committing
-#CTL_MenuItem_CommitRunning_Context = Committing "{0}"
-#CTL_MenuItem_CommitRunning_Context_Multiple = Committing Files
-#CTL_MenuItem_CommitRunning_Projects=Committing {0} Projects
-
-#popup_commit_exclude=Exclude from Commit
-#popup_commit_exclude_Context=Exclude "{0}" from Commit
-#popup_commit_exclude_Context_Multiple=Exclude Files from Commit
-#popup_commit_exclude_Projects=Exclude {0} Projects from Commit
-#popup_commit_excludeRunning=Excluding from Commit
-#popup_commit_excludeRunning_Context=Excluding "{0}" from Commit
-#popup_commit_excludeRunning_Context_Multiple=Excluding Files from Commit
-#popup_commit_excludeRunning_Projects=Excluding {0} Projects from Commit
-
-#popup_commit_include=Include in Commit
-#popup_commit_include_Context=Include "{0}" in Commit
-#popup_commit_include_Context_Multiple=Include Files in Commit
-#popup_commit_include_Projects=Include {0} Projects in Commit
-#popup_commit_includeRunning=Including in Commit
-#popup_commit_includeRunning_Context=Including "{0}" in Commit
-#popup_commit_includeRunning_Context_Multiple=Including Files in Commit
-#popup_commit_includeRunning_Projects=Including {0} Projects in Commit
-
-#resolve = Mark Resolved
-#resolve_Context = Mark "{0}" Resolved
-#resolve_Context_Multiple = Mark Files Resolved
-#resolve_Projects=Mark {0} Projects Resolved
-#resolveRunning = Marking Resolved
-#resolveRunning_Context = Marking "{0}" Resolved
-#resolveRunning_Context_Multiple = Marking Files Resolved
-#resolveRunning_Projects=Marking {0} Projects Resolved
-
-#Delete=Delete
-#Delete_Context=Delete "{0}"
-#Delete_Context_Multiple = Delete Files
-#Delete_Projects=Delete {0} Projects
-#DeleteRunning=Deleting
-#DeleteRunning_Context=Deleting "{0}"
-#DeleteRunning_Context_Multiple = Deleting Files
-#DeleteRunning_Projects=Deleting {0} Projects
-
-#CTL_DeleteLocal_Title = Confirm Delete
-#CTL_DeleteLocal_Prompt = Do you want to delete selected files?
-##{0} filename
-#BK0001=Can not lock {0}.
-
-
-#MSG_NoProjectFiles_Prompt = There are no open projects under CVS control.
-#MSG_NoProjectFiles_Title = Update All Files
-
-#CTL_MenuItem_CommitProjects = C&ommit All Files
-#CTL_MenuItem_CommitProjectsRunning = Committing All Files
-#CTL_DialogTitle_AllProjects = All Projects
-#CTL_CommitForm_Action_Commit = Commit
-#TT_CommitDialog_Action_Commit = Confirm settings and commit
-#CTL_CommitForm_Action_Cancel = Cancel
-#ACSD_CommitDialog_Action_Cancel = Cancel commit
-
-#MSG_NoFilesToCommit_Title = Commit files
-#MSG_NoFilesToCommit_Prompt = There are no files to commit.
CTL_CommitDialog_Title = Commit - {0}
-#ACSD_CommitDialog = This dialog lets you review list files to commit, exclude or include individual files and write commit message describing your changes.
CTL_CommitDialog_Title_Branches = Commit - {0} - multiple branches
CTL_CommitDialog_Title_Branch = Commit - {0} - "{1}" branch
-#CTL_CommitDialog_Title_Multi = {0} files
CTL_CommitForm_Message=Commit &Message\:
-#TT_CommitForm_Message=Description of changes your are committing
-#MNE_CommitForm_Message=M
-#CTL_CommitForm_Locally=Run locally (-l)
-#CTL_CommitForm_Revision=Commit to revision (-r)\:
-#MNE_CommitForm_Locally=L
-#MNE_CommitForm_Revision=R
MSG_CommitForm_ErrorRemoteChanges=You cannot commit remotely modified Files. Run Update first.
MSG_CommitForm_ErrorConflicts=You cannot commit Files with Conflicts. Edit Files and resolve Conflicts first.
MSG_CommitForm_ErrorMultipleBranches = Warning: Committing to multiple Branches, see Branch column.
@@ -142,18 +66,10 @@
CTL_CommitTable_Column_Action = Commit Action
CTL_CommitTable_Column_Folder = Repository Path
-#CTL_CommitOption_AddAsText = Add as Text
-#CTL_CommitOption_AddAsBinary = Add as Binary
-#CTL_CommitOption_AddDirectory = Add Directory
CTL_CommitOption_Commit = Commit
CTL_CommitOption_CommitRemove = Remove
CTL_CommitOption_Exclude = Exclude from Commit
-#BK0001=Committing Changes
-#MSG_CommitExecutor_CmdDisplayName = Committing {0}
-#BK0002=Committing
-#BK1009=Preparing Commit...
-#CTL_Commit_Title=Commit
CTL_Commit_Action_Commit=C&ommit
ACSN_Commit_Action_Commit=Commit
ACSD_Commit_Action_Commit=Commit
@@ -161,10 +77,7 @@
ACSN_Commit_Action_Cancel=Cancel
ACSD_Commit_Action_Cancel=Cancel
LBL_Commit_Progress=Committing...
-#CTL_MenuItem_CommitAll=C&ommit All Files
-#CTL_CommitAll_WindowTitle = {0} Projects
CTL_CommitForm_NotInRepository=[not in repository]
-#CTL_CommitForm_RecentLink=Recent Messages
CTL_CommitForm_RecentTitle = Select A Commit Message
CTL_CommitForm_RecentPrompt = Recent Commit &Messages:
Index: src/org/netbeans/modules/mercurial/ui/diff/Bundle.properties
===================================================================
RCS file: /cvs/versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/diff/Attic/Bundle.properties,v
retrieving revision 1.7.2.1
diff -u -r1.7.2.1 Bundle.properties
--- src/org/netbeans/modules/mercurial/ui/diff/Bundle.properties 10 Dec 2007 21:26:08 -0000 1.7.2.1
+++ src/org/netbeans/modules/mercurial/ui/diff/Bundle.properties 29 Feb 2008 15:22:15 -0000
@@ -37,20 +37,6 @@
# Version 2 license, then the option applies only if the new code is
# made subject to such option by the copyright holder.
-## DiffAction.java
-##CTL_MenuItem_Diff = &Diff
-##CTL_MenuItem_Diff_Context = &Diff "{0}"
-##CTL_MenuItem_Diff_Context_Multiple = &Diff Files
-##CTL_MenuItem_Diff_Projects=&Diff {0} Projects
-##CTL_MenuItem_DiffRunning = Diffing
-##CTL_MenuItem_DiffRunning_Context = Diffing "{0}"
-##CTL_MenuItem_DiffRunning_Context_Multiple = Diffing Files
-##CTL_MenuItem_DiffRunning_Projects=Diffing {0} Projects
-
-## DiffStreamSource.java
-#{0} = getTitle()
-##BK5001=[Binary File {0}]
-
## DiffTopComponent.java
ACSN_Diff_Top_Component = Diff
ACSD_Diff_Top_Component = Diff
@@ -58,46 +44,21 @@
## DiffMainPanel.java
CTL_DiffPanel_Title = {0} [ Diff ]
MSG_DiffPanel_NoContent = Fetching Files from Repository. Please wait ...
-CTL_DiffPanel_Label_Title=Repository Diff
MSG_DiffPanel_NoFileSelected =
-CTL_DiffPanel_Local=&Local
-CTL_DiffPanel_Local_Tooltip=Show Locally Modified Files
-CTL_DiffPanel_Remote=&Remote
-CTL_DiffPanel_Remote_Tooltip=Show Remotely Modified Files
-CTL_DiffPanel_All=R&emote vs Local
-CTL_DiffPanel_All_Tooltip=Show Both Locally and Remotely Modified Files
CTL_DiffPanel_Next_Tooltip=Go to Next Difference
CTL_DiffPanel_Prev_Tooltip=Go to Previous Difference
-CTL_DiffPanel_Update_Tooltip=Update All
-CTL_DiffPanel_Commit_Tooltip=Commit All
-MSG_RefreshDiff_Tooltip = Refresh Diff
MSG_UpdateDiff_Tooltip = Update "{0}"
MSG_CommitDiff_Tooltip = Commit "{0}"
-##MSG_DiffPanel_NoBaseRevision = No Base Revision
MSG_DiffPanel_BaseRevision = Base ({0})
-MSG_DiffPanel_RemoteModified = Remotely Modified (Based On {0})
MSG_DiffPanel_LocalModified = Locally Modified (Based On {0})
MSG_DiffPanel_LocalConflict = Local Conflict (Based On {0})
MSG_DiffPanel_LocalNew = Locally New
MSG_DiffPanel_LocalDeleted = Locally Deleted
-##MSG_DiffPanel_RemoteNew = Remotely New
-##MSG_DiffPanel_RemoteDeleted = Remotely Deleted
MSG_DiffPanel_NoLocalChanges =
MSG_DiffPanel_NoRemoteChanges =
MSG_DiffPanel_NoAllChanges =
-CTL_Diff_DiffAll = Di&ff All Files
MSG_Refresh_Progress=Updating Statuses...
-##CTL_DiffAll_WindowTitle = {0} Projects
-##MSG_Update_Progress=Updating Statuses...
-##LBL_Diff_Property = {0} Property
-##LBL_Diff_PropertyBase = {0} Property Base
-##LBL_Diff_PropertyLocallyModified = {0} Property Locally Modified
-##LBL_Diff_PropertyLocallyDeleted = {0} Property Locally Deleted
-##LBL_Diff_PropertyLocallyNew = {0} Property Locally New
-##LBL_Diff_Anonymous=anonymous
-##LBL_Diff_Padding=[Padding Below the Diff]
-CTL_DiffPanel_BranchInfoNotCommitted = - not yet committed
CTL_ExportForm_Action_Export=E&xport
ACSN_ExportForm_Action_Export=Export
@@ -117,12 +78,15 @@
LBL_ImportDiff_Progress=Importing Patches
+BK3005=Replace existing {0} file?
+
ACSD_ImportBrowseFolder = Lets you browse for mercurial import file.
ImportBrowse_title=Browse for the Import File
#~
MSG_Refreshing_Revisions = Refreshing Revisions
MSG_Revision_Default =
+MSG_EXPORT_NOTHING = No revisions available, nothing to export.
ExportDiffPanel.revisionsLabel.text=&Export from:
ExportDiffPanel.fileLabel.text=&Output File:
ExportDiffPanel.browseButtonl.text=&Browse...
@@ -130,10 +94,12 @@
MSG_EXPORT_TITLE = Mercurial Export
MSG_EXPORT_TITLE_SEP = ----------------
MSG_EXPORT_DONE = INFO: End of Export
+MSG_EXPORT_NOTHING = Nothing comitted, so nothing to Export.
MSG_IMPORT_TITLE = Mercurial Import
MSG_IMPORT_TITLE_SEP = ----------------
MSG_IMPORT_DONE = INFO: End of Import
+MSG_IMPORT_NOTHING = Nothing yet comitted, so not yet able to Import.
MSG_DIFF_TITLE = Mercurial Diff
MSG_DIFF_TITLE_SEP = --------------
@@ -153,3 +119,5 @@
ACSD_DiffTable = Shows lists of files that have changed
refreshButton.toolTipText=Refresh Diff
+
+MSG_Fetching_Revisions = Fetching Revisions...
Index: src/org/netbeans/modules/mercurial/ui/ignore/Bundle.properties
===================================================================
RCS file: /cvs/versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/ignore/Attic/Bundle.properties,v
retrieving revision 1.3
diff -u -r1.3 Bundle.properties
--- src/org/netbeans/modules/mercurial/ui/ignore/Bundle.properties 3 Oct 2007 18:00:50 -0000 1.3
+++ src/org/netbeans/modules/mercurial/ui/ignore/Bundle.properties 29 Feb 2008 15:22:15 -0000
@@ -37,24 +37,6 @@
# Version 2 license, then the option applies only if the new code is
# made subject to such option by the copyright holder.
-CTL_MenuItem_Ignore = &Ignore
-CTL_MenuItem_Ignore_Context = &Ignore "{0}"
-CTL_MenuItem_Ignore_Context_Multiple = &Ignore {0} files
-CTL_MenuItem_IgnoreRunning = &Ignoring
-CTL_MenuItem_IgnoreRunning_Context = &Ignoring "{0}"
-CTL_MenuItem_IgnoreRunning_Context_Multiple = &Ignoring {0} files
-
-CTL_MenuItem_Unignore = Un&ignore
-CTL_MenuItem_Unignore_Context = Un&ignore "{0}"
-CTL_MenuItem_Unignore_Context_Multiple = Un&ignore {0} files
-CTL_MenuItem_UnignoreRunning = Un&ignoring
-CTL_MenuItem_UnignoreRunning_Context = Un&ignoring "{0}"
-CTL_MenuItem_UnignoreRunning_Context_Multiple = Un&ignoring {0} files
-
-CTL_Cancel=Cancel
-CTL_Ignore=Ignore
-CTL_IgnoreFiles=Ignore Files
-
LBL_Ignore_Progress=Ignoring...
MSG_IGNORE_TITLE = Mercurial Ignore
Index: src/org/netbeans/modules/mercurial/ui/log/Bundle.properties
===================================================================
RCS file: /cvs/versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/log/Attic/Bundle.properties,v
retrieving revision 1.5
diff -u -r1.5 Bundle.properties
--- src/org/netbeans/modules/mercurial/ui/log/Bundle.properties 9 Oct 2007 10:09:55 -0000 1.5
+++ src/org/netbeans/modules/mercurial/ui/log/Bundle.properties 29 Feb 2008 15:22:19 -0000
@@ -38,14 +38,118 @@
# made subject to such option by the copyright holder.
+MSG_Out_TabTitle = Mercurial Out - {0}
+MSG_Incoming_TabTitle = Mercurial Incoming - {0}
+
MSG_Log_Progress=Showing History...
MSG_Log_TabTitle = Mercurial History - {0}
MSG_Log_TabTitleNotCommitted = Mercurial History - {0} (not committed)
MSG_Log_Title = Mercurial History
MSG_Log_Title_Sep = -----------------
-MSG_Log_DONE = INFO: End of Mercurial History
+MSG_Log_DONE = INFO: End of Mercurial History
MSG_Log_Files = INFO History for file(s): {0}
MSG_Log_PrjName = INFO Project Name: {0}
MSG_Log_PrjPath = INFO Project Path: {0}
MSG_Log_Pull_Path = INFO Pull Path: {0}
MSG_Log_Push_Path = INFO Push Path: {0}
+MSG_Log_Nothing = Nothing yet comitted, so no History available.
+
+CTL_MenuItem_SearchHistory = Search &History...
+CTL_MenuItem_SearchHistory_Context = Search &History...
+CTL_MenuItem_SearchHistory_Context_Multiple = Search Files &History...
+CTL_MenuItem_SearchHistory_Projects = Search {0} Projects History...
+
+CTL_SearchHistory_Title = {0} [Search History]
+
+CTL_UseCommitMessage=&Message\:
+TT_CommitMessage=Search for a case insensitive substring in commit messages or leave blank.
+CTL_UseUsername=&Username\:
+TT_Username=Search for commits made by a given user or leave blank.
+CTL_UseFrom=&From\:
+TT_From=Find only commits starting from a specified revision or a date. Leave blank otherwise.
+CTL_UseTo=&To\:
+TT_To=Find only commits before a specified revision or a date. Leave blank otherwise.
+CTL_Search=S&earch
+TT_Search=Execute search
+CTL_Summary=Summary
+TT_Summary=Show search results as a single list of all found commits
+TT_OutSummary=Show Outgoing changesets as a single list of all Outgoing commits
+TT_IncomingSummary=Show Incoming changesets as a single list of all Incoming commits
+CTL_ShowDiff=&Diff
+TT_ShowDiff=Show search results as a tree view of all commits with possibility to easily diff any two revisions
+TT_OutShowDiff=Show Outgoing changesets as a tree view of all Outgoing commits with possibility to easily diff any two revisions
+TT_IncomingShowDiff=Show Incoming changesets as a tree view of all Incoming commits with possibility to easily diff any two revisions
+CTL_ShowSummary=&Summary
+
+ACSN_SearchHistoryT_Top_Component = Search History
+ACSD_SearchHistoryT_Top_Component = Search History
+
+ACSN_Divider = Divider
+ACSD_Divider = Divider
+
+MSG_StatusSymlinkWarning = Warning: Search History does not search deleted files. See the Output window for details.
+MSG_SymlinkWarning1 = Warning: Search History will not search occurrences in deleted files due to problem in CVS server setup.
+MSG_SymlinkWarning2 = See {0} how to work around this problem.
+
+LBL_SearchHistory_Searching =
+LBL_SearchHistory_NoResults =
+
+ACSN_SummaryView_List = List of found commits
+ACSD_SummaryView_List = Flat list of found commits sorted by file name and revision number.
+CTL_SummaryView_Diff = Diff {0} and {1}
+CTL_SummaryView_DiffToPrevious = Diff to Previous Revision
+CTL_SummaryView_RollbackTo = Revert to {0}
+CTL_SummaryView_View = View
+CTL_Action_Opening=Opening {0}...
+CTL_SummaryView_RollbackChange = Rollback Changes
+MSG_SummaryView_RollingBackChange = Rolling Back Changes
+CTL_Action_DiffTo = Diff to:
+CTL_SummaryView_Previous = Previous
+MSG_SummaryView_DeadState = (state: dead; file was removed in this revision)
+
+CTL_Action_Revert = Revert
+CTL_Action_Diff = Diff
+
+CTL_Action_RollbackTo = Revert to {0}
+CTL_Action_RollbackChange = Rollback Changes
+CTL_Rollback_Title = Confirm Rollback
+CTL_Rollback_Prompt = Do you want to overwrite file "{0}" with revision {1}?
+
+CTL_FindAssociateChanges_OpenProjects_Title = {0} Projects
+
+LBL_DiffTree_Column_Name = File Revision
+LBL_DiffTree_Column_Username = User
+LBL_DiffTree_Column_Time = Time
+LBL_DiffTree_Column_Message = Message
+
+LBL_DiffTree_Column_Name_Desc = Revision and Name of the File
+LBL_DiffTree_Column_Username_Desc = Author of the Change
+LBL_DiffTree_Column_Time_Desc = Time of Change
+LBL_DiffTree_Column_Message_Desc = Commit Message
+
+MSG_DiffPanel_NoRevisions =
+MSG_DiffPanel_TooManyRevisions =
+MSG_DiffPanel_IllegalSelection =
+
+CTL_FromToHint=(Revision/Date\:YYYY-MM-DD)
+
+BK0001=Searching History
+
+#org.netbeans.modules.versioning.system.cvss.ui.history.SearchHistoryPanel
+CTL_DiffPanel_Next_Tooltip=Next Difference
+
+#org.netbeans.modules.versioning.system.cvss.ui.history.SearchHistoryPanel
+CTL_DiffPanel_Prev_Tooltip=CTL_DiffPanel_Prev_Tooltip
+
+ACSN_NextDifference=Go To Next Difference
+ACSN_PrevDifference=Go To Previous Difference
+ACSD_NextDifference=Go To Next Difference
+ACSD_PrevDifference=Go To Previous Difference
+
+MSG_Search_PleaseWait=Please wait...
+MSG_Search_ResolvingTagProgress=Resolving tag URL...
+MSG_Search_Progress=Searching...
+MSG_Revert_Progress=Reverting...
+MSG_Rollback_Progress=Rolling Back...
+LBL_NumberOfChangedPaths = \ ({0} changes)
+
Index: src/org/netbeans/modules/mercurial/ui/pull/Bundle.properties
===================================================================
RCS file: /cvs/versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/pull/Attic/Bundle.properties,v
retrieving revision 1.11.4.2
diff -u -r1.11.4.2 Bundle.properties
--- src/org/netbeans/modules/mercurial/ui/pull/Bundle.properties 10 Dec 2007 21:26:12 -0000 1.11.4.2
+++ src/org/netbeans/modules/mercurial/ui/pull/Bundle.properties 29 Feb 2008 15:22:20 -0000
@@ -40,6 +40,7 @@
MSG_PULL_PROGRESS = Pulling...
MSG_PULL_FROM = INFO Pull From: {0} - {1}
MSG_PULL_FROM_NONAME = INFO Pull From: {0}
+MSG_PULL_TO_NONAME = INFO To: {0}
MSG_PULL_TO = INFO To: {0} - {1}
MSG_PULL_TITLE = Mercurial Pull
MSG_PULL_TITLE_SEP = --------------
@@ -51,6 +52,7 @@
MSG_PULL_NOT_SUPPORTED_INVIEW = Pull is not supported in this View
MSG_NO_DEFAULT_PULL_SET = No default Pull path set for this project.\n\nPlease set a default Pull path using Mercurial > Properties.
+MSG_NO_DEFAULT_PULL_SET_MSG = No default Pull path set for this project.\nPlease set a default Pull path using Mercurial > Properties.
MSG_PULL_MERGE_CONFIRM_TITLE = Confirm Merge after Pull
MSG_PULL_MERGE_CONFIRM_QUERY = Pull has completed and Merge is Required.\nMerge the pulled changes now?
MSG_PULL_MERGE_UNCOMMITTED_CONFIRM_QUERY = Pull has completed and there were uncommitted merges.\nMerge is Required.\nMerge the pulled changes now?
@@ -72,3 +74,15 @@
MSG_PULL_LOCALMODS_CONFIRM_TITLE = Confirm Pull with Local Modifications
MSG_PULL_LOCALMODS_CANCEL = INFO Pull cancelled by user as there are conflict/locally modified/new file(s).
MSG_PULL_OVERWRITE_LOCAL = WARNING Pull will overwrite the following conflict/locally modified/new file(s):
+
+MSG_FETCH_TITLE = Mercurial Fetch
+MSG_FETCH_TITLE_SEP = ---------------
+MSG_FETCH_LAUNCH_INFO = INFO: Running Fetch for {0}
+MSG_FETCH_PROGRESS = Fetching...
+
+MSG_FETCH_SETFETCH_PROP_CONFIRM_TITLE = Add Fetch Extension
+MSG_FETCH_SETFETCH_PROP_CONFIRM_QUERY= To work fetch requires the Fetch extension to be added to your .hgrc config file.\n\nDo you want this extension added now?
+MSG_FETCH_SETHGK_PROP_DO_INFO = INFO: Setting fetch in your .hgrc config file
+MSG_FETCH_NOTSETHGK_PROP_INFO = INFO: fetch not set in your .hgrc config file, so Fetch can not be run
+
+MSG_FETCH_DONE = INFO: End of Mercurial Fetch
Index: src/org/netbeans/modules/mercurial/ui/push/Bundle.properties
===================================================================
RCS file: /cvs/versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/push/Attic/Bundle.properties,v
retrieving revision 1.9.4.2
diff -u -r1.9.4.2 Bundle.properties
--- src/org/netbeans/modules/mercurial/ui/push/Bundle.properties 10 Dec 2007 21:26:11 -0000 1.9.4.2
+++ src/org/netbeans/modules/mercurial/ui/push/Bundle.properties 29 Feb 2008 15:22:20 -0000
@@ -40,6 +40,7 @@
MSG_PUSH_PROGRESS = Pushing...
MSG_PUSH_TO = INFO Push To: {0} - {1}
MSG_PUSH_FROM = INFO From: {0} - {1}
+MSG_PUSH_FROM_NONAME = INFO From: {0}
MSG_PUSH_TO_NONAME = INFO Push To: {0}
MSG_PUSH_TITLE = Mercurial Push
MSG_PUSH_TITLE_SEP = --------------
@@ -53,7 +54,12 @@
MSG_PUSH_NOT_SUPPORTED_INVIEW_TITLE = Mercurial Push
MSG_PUSH_NOT_SUPPORTED_INVIEW = Push is not supported in this View
+MSG_PUSH_ERROR_TITLE = Unable to Push
+MSG_PUSH_ERROR_QUERY = Push will not be performed as it would create remote branches.\n\nYou must first resync by doing a Pull from the target repository and Merge.
+MSG_PUSH_ERROR_CANCELED = INFO: Unable to Push as remote branches would be created
+
MSG_NO_DEFAULT_PUSH_SET = No default Push path set for this project.\n\nPlease set a default Push path using Mercurial > Properties.
+MSG_NO_DEFAULT_PUSH_SET_MSG = No default Push path set for this project.\nPlease set a default Push path using Mercurial > Properties.
MSG_PUSH_MERGE_CONFIRM_TITLE = Confirm Merge after Push
MSG_PUSH_MERGE_CONFIRM_QUERY = Push has completed and Merge is Required.\nMerge the pushed changes now?
MSG_PUSH_MERGE_UNCOMMITTED_CONFIRM_QUERY = Push has completed and there were uncommitted merges.\nMerge is Required.\nMerge the pushed changes now?
Index: src/org/netbeans/modules/mercurial/ui/repository/Bundle.properties
===================================================================
RCS file: /cvs/versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/repository/Attic/Bundle.properties,v
retrieving revision 1.4.2.2
diff -u -r1.4.2.2 Bundle.properties
--- src/org/netbeans/modules/mercurial/ui/repository/Bundle.properties 10 Dec 2007 21:26:16 -0000 1.4.2.2
+++ src/org/netbeans/modules/mercurial/ui/repository/Bundle.properties 29 Feb 2008 15:22:20 -0000
@@ -56,17 +56,6 @@
ACSN_RepositoryURL=Repository URL
ACSD_RepositoryURL=Recently used Repository URLs
-TT_RepositoryUrl=IDE directly supports following Mercurial URL types\:\
-- file\:///repository_path
\
-- for direct Mercurial repositories access
\
-- http\://hostname/repository_path
\
-- for connecting Mercurial repository via WebDAV protocol
\
-- static-http\://hostname/repository_path
\
-- for connecting Mercurial repository without requiring a special server on the web host
\
-- \ssh://hostname/repository_path
\
-- for connecting Mercurial repository via ssh
\
-
-
TT_svn_xxx=\
- on Windows:
- plink -l username -pw password
plink -l username -i C:\\Path\\To\\Private.key \
- on Unixes:
- ssh -l username -i path/to/privateKey
\
@@ -76,30 +65,9 @@
TT_Password=Your password used for authentication
ACSD_RepositoryPanel= In this panel you specify the Repository URL and any parameters needed for making connection to it.
-## ProxySelector.java
-BK1001=&Use NetBeans Proxy Settings
-BK1002=H&TTP Proxy
-BK1003=&SOCKS Proxy
-BK1004=P&roxy Host\:
-BK1005=P&ort\:
-BK1006=Proxy Server Requires &Login
-BK1007=Na&me\:
-BK1008=&Password\:
-BK1009=&No Proxy (direct connection)
-BK2023=Can not access\:
-BK2004=Proxy Configuration
-BK2018=Repository
+BK2018=Repository
-TT_ProxyLogin=Check if the proxy server requires authentication
-TT_ProxyPort=TCP/IP port number of the proxy server
-TT_ProxyHost=TCP/IP host name of the proxy server
-TT_UseSystemProxy=Use proxy settings defined in IDE or use operating system settings
-TT_UseNoProxy=Connect directly to server
-TT_UseHttpsProxy=Connect via HTTP proxy
-TT_UseSocksProxy=Connect via SOCKS 4 or SOCKS 5 proxy
-TT_ProxyUsername=Username for authentication on proxy server
-TT_ProxyPassword=Password for authentication on proxy server
ACSD_ProxyDialog=This dialog lets you specify network connection parameters to use when connection to a given Mercurial server. Possible options include: HTTP proxy, SOCKS proxy, direct connection or system default.
MSG_Repository_WrongRevision = Wrong revision number: {0}
@@ -109,8 +77,9 @@
IDE directly supports the following Mercurial URL types:\
- {0}
- for direct Mercurial repositories access
\
- {1}
- for connecting Mercurial repository via WebDAV protocol
\
- - {2}
- for connecting Mercurial repository without requiring a special server on the web host
\
- - {3}
- for connecting Mercurial repository via ssh
\
+ - {2}
- for connecting Mercurial repository via WebDAV protocol with SSL encryption
\
+ - {3}
- for connecting Mercurial repository without requiring a special server on the web host
\
+ - {4}
- for connecting Mercurial repository via ssh
\
ACSD_RepositoryPanel_Title=Specify Mercurial repository location
Index: src/org/netbeans/modules/mercurial/ui/status/Bundle.properties
===================================================================
RCS file: /cvs/versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/status/Attic/Bundle.properties,v
retrieving revision 1.6.2.1
diff -u -r1.6.2.1 Bundle.properties
--- src/org/netbeans/modules/mercurial/ui/status/Bundle.properties 16 Nov 2007 17:28:16 -0000 1.6.2.1
+++ src/org/netbeans/modules/mercurial/ui/status/Bundle.properties 29 Feb 2008 15:22:21 -0000
@@ -47,25 +47,16 @@
ACSN_VersioningTable = List of modified files
ACSD_VersioningTable = Lists all files that are not in sync with repository
-BK1001=Preparing...
MSG_Preparing = Preparing...
MSG_Refreshing_Versioning_View = Refreshing Status...
-CTL_Synchronize_Action_All_Label=&All
-CTL_Synchronize_Action_Local_Label=&Local
-CTL_Synchronize_Action_Remote_Label=&Remote
-MSG_No_Changes_Local =
-MSG_No_Changes_Remote =
MSG_No_Changes_All =
CTL_Synchronize_Action_Diff_Tooltip=Diff All
CTL_Synchronize_Action_Update_Tooltip=Update All
CTL_CommitForm_Action_Commit_Tooltip=Commit All
CTL_Synchronize_Action_Refresh_Tooltip=Refresh Status
-CTL_Synchronize_Action_Local_Tooltip=Show Local Changes
-CTL_Synchronize_Action_Remote_Tooltip=Show Repository Changes
-CTL_Synchronize_Action_All_Tooltip=Show All Changes
CTL_VersioningView_Column_File_Title = File
CTL_VersioningView_Column_File_Desc = Name of the file
@@ -84,24 +75,17 @@
BK2005=File name
BK2006=Pure File name without Path
BK2007=Status
-BK2008=Last known CVS status
+BK2008=Last known Mercurial status
#Actions
CTL_MenuItem_ShowAllChanges_Label = Show All Changes
CTL_MenuItem_OpenVersioning = &Mercurial
CTL_ShowAllChanges_WindowTitle = All Projects
-##ShowChanges.java
-CTL_MenuItem_ShowChanges = Sho&w Changes
-CTL_MenuItem_ShowChanges_Context = Sho&w "{0}" Changes
-CTL_MenuItem_ShowChanges_Context_Multiple = Sho&w Files Changes
-CTL_MenuItem_ShowChanges_Projects=Sho&w {0} Projects Changes
-
## OpenInEditorAction.java
CTL_Synchronize_Popup_OpenInEditor=Open
LBL_Location_NotInRepository=[not in repository]
-LBL_RepositoryPath_LoadingProgress=Asking remote repository...
LBL_Refresh_Progress=Refreshing...
CTL_VersioningView_BranchTitle = "{0}" branch
@@ -109,14 +93,3 @@
CTL_VersioningView_BranchInfo = head rev {0} ({1})
CTL_VersioningView_BranchInfoNotCommitted = not yet committed
CTL_VersioningView_StatusTitle = Repository Status - {0}
-CTL_PopupMenuItem_ConflictResolved=Mark as Resolved
-
-CTL_PopupMenuItem_Diff = Diff
-CTL_PopupMenuItem_ExcludeFromCommit = Exclude From Commit
-CTL_PopupMenuItem_IncludeInCommit= Include In Commit
-CTL_PopupMenuItem_GetClean= Get Clean
-CTL_PopupMenuItem_RevertDelete= Revert Delete
-CTL_PopupMenuItem_HideAnnotations= Hide Annotations
-CTL_PopupMenuItem_ShowAnnotations= Show Annotations
-CTL_PopupMenuItem_MarkResolved= Mark Resolved
-CTL_PopupMenuItem_Commit= Commit
Index: src/org/netbeans/modules/mercurial/ui/update/Bundle.properties
===================================================================
RCS file: /cvs/versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/update/Attic/Bundle.properties,v
retrieving revision 1.4.6.1
diff -u -r1.4.6.1 Bundle.properties
--- src/org/netbeans/modules/mercurial/ui/update/Bundle.properties 10 Dec 2007 21:26:14 -0000 1.4.6.1
+++ src/org/netbeans/modules/mercurial/ui/update/Bundle.properties 29 Feb 2008 15:22:21 -0000
@@ -37,42 +37,9 @@
# Version 2 license, then the option applies only if the new code is
# made subject to such option by the copyright holder.
-## UpdateAction.java
-CTL_MenuItem_Update = &Update
-CTL_MenuItem_Update_Context = &Update "{0}"
-CTL_MenuItem_Update_Context_Multiple = &Update Files
-CTL_MenuItem_Update_Projects=&Update {0} Projects
-
-CTL_MenuItem_UpdateRunning = Updating
-CTL_MenuItem_UpdateRunning_Context = Updating "{0}"
-CTL_MenuItem_UpdateRunning_Context_Multiple = Updating Files
-CTL_MenuItem_UpdateRunning_Projects=Updating {0} Projects
-
-CTL_MenuItem_Revert = &Revert Modifications
-CTL_MenuItem_Revert_Context = &Revert "{0}" Modifications
-CTL_MenuItem_Revert_Context_Multiple = &Revert Files Modifications
-CTL_MenuItem_Revert_Projects=&Revert {0} Projects Modifications
-
-CTL_MenuItem_RevertRunning = Reverting Modifications
-CTL_MenuItem_RevertRunning_Context = Reverting "{0}" Modifications
-CTL_MenuItem_RevertRunning_Context_Multiple = Reverting Files Modifications
-CTL_MenuItem_RevertRunning_Projects=Reverting {0} Projects Modifications
-
-CTL_MenuItem_UpdateWithDependencies = Update Project with De&pendencies
-CTL_MenuItem_UpdateWithDependencies_Context = Update "{0}" with De&pendencies
-CTL_MenuItem_UpdateWithDependencies_Context_Multiple = Update Projects with De&pendencies
-CTL_MenuItem_UpdateWithDependencies_Projects=Update {0} Projects with De&pendencies
-
-ResolveConflicts=Resolve Conflicts
-ResolveConflicts_Context=Resolve "{0}" Conflicts
-ResolveConflicts_Context_Multiple=Resolve Conflicts
-ResolveConflicts_Projects=Resolve {0} Projects Conflicts
-
Diff.titleWorkingFile = Local Working File
Diff.titleRevision = Remote file
Merge.titleResult = Result after merge
-NoConflictsInFile = No conflicts found in file.
-MSG_NoConflicts = No conflicts found in files.
MSG_NoConflictsFound=No Conflicts found\!
CTL_RevertForm_Action_Revert=&Revert
@@ -85,37 +52,11 @@
CTL_MultiRevertDialog=Revert Modifications - Multiple Files
ACSD_RevertDialog=Revert Modifications - {0}
ACSD_MultiRevertDialog=Revert Modifications - Multiple Files
-MSG_Update_Conflicts=Mercurial update caused conflicts\!
-MSG_Update_Completed=Mercurial update completed
MSG_Update_Progress=Updating...
MSG_Revert_Progress=Reverting...
-CTL_MenuItem_UpdateAll=Updat&e All Files
-
-## Revert Panel
-CTL_RevertPanel_RevertLocal = Revert &Local Changes
-CTL_RevertPanel_RevertSingle=Revert Modifications from &Single Commit
-CTL_RevertPanel_RevertMulti=Revert Modifications from &Previous Commits
-CTL_RevertPanel_SingleRevision=&Revision\:
-CTL_RevertPanel_StartingRevision=S&tarting Revision\:
-CTL_RevertPanel_EndingRevision=En&ding Revision\:
-CTL_RevertPanel_Search1=S&earch...
-CTL_RevertPanel_Search2=Se&arch...
-CTL_RevertPanel_Search3=Sear&ch...
-CTL_RevertPanel_EmptyHint=(empty means repository HEAD)
-ACSD_RevertPanel_RevertLocal=Revert Local Changes
-ACSD_RevertPanel_RevertSingle=Revert Modifications from Single Commit
-ACSD_RevertPanel_SingleRevision=Desired Revision for Revert
-ACSD_RevertPanel_RevertMulti=Revert Modifications from Previous Commits
-ACSD_RevertPanel_StartingRevision=Starting Revision for Revert
-ACSD_RevertPanel_EndingRevision=Ending Revision for Revert
-ACSD_RevertPanel_Search1=Search For Revision
-ACSD_RevertPanel_Search2=Search For Starting Revision
-ACSD_RevertPanel_Search3=Search For Ending Revision
#~
-CTL_RevertPanel_RevertNewFiles=Remove newly added Files and Folders
-
MSG_UPDATE_TITLE = Mercurial Update
MSG_UPDATE_TITLE_SEP = ----------------
MSG_UPDATE_DONE = INFO: End of Update
@@ -124,12 +65,11 @@
MSG_REVERT_TITLE_SEP = ----------------
MSG_REVERT_REVISION_STR = Reverting to revision {0}
MSG_REVERT_DONE = INFO: End of Revert
+MSG_REVERT_NOTHING = Nothing yet comitted, so no nothing to revert.
MSG_Refreshing_Revert_Versions = Refreshing Revert Versions
MSG_Revision_Default =
-CTL_RevertPanel_RevertMulti_1=
-RevertModificationsPanel.revisionsLabel.text=Choose from &Modified Revisions:
-MSG_NoConflictsFound = No merge conflicts found
+MSG_ConflictResolved_Progress = Marking resolved...
-MSG_ConlictResolved_Progress = Marking resolved...
+RevertModificationsPanel.revisionsLabel.text=Choose from &Modified Revisions:
Index: src/org/netbeans/modules/mercurial/ui/view/Bundle.properties
===================================================================
RCS file: /cvs/versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/view/Attic/Bundle.properties,v
retrieving revision 1.2.6.1
diff -u -r1.2.6.1 Bundle.properties
--- src/org/netbeans/modules/mercurial/ui/view/Bundle.properties 10 Dec 2007 21:26:14 -0000 1.2.6.1
+++ src/org/netbeans/modules/mercurial/ui/view/Bundle.properties 29 Feb 2008 15:22:21 -0000
@@ -45,7 +45,7 @@
MSG_VIEW_HGK_NOT_FOUND_TITLE = Hgk not found
MSG_VIEW_HGK_NOT_FOUND_INFO = INFO: hgk is not on your PATH, please install hgk or if installed, modify your PATH
MSG_VIEW_SETHGK_PROP_CONFIRM_TITLE = Add Hgk Extension
-MSG_VIEW_SETHGK_PROP_CONFIRM_QUERY = To work View requires the hgk extension to be added to your ~/.hgrc.\n\nDo you want this extension added now?
-MSG_VIEW_SETHGK_PROP_DO_INFO = INFO: Setting hgkext.hgk in ~/.hgrc
+MSG_VIEW_SETHGK_PROP_CONFIRM_QUERY = To work View requires the hgk extension to be added to your .hgrc config file.\n\nDo you want this extension added now?
+MSG_VIEW_SETHGK_PROP_DO_INFO = INFO: Setting hgkext.hgk in your .hgrc config file
-MSG_VIEW_NOTSETHGK_PROP_INFO = INFO: hgkext.hgk not set in ~/.hgrc so View can not be launched
+MSG_VIEW_NOTSETHGK_PROP_INFO = INFO: hgkext.hgk not set in your .hgrc config file, so View can not be launched
Index: src/org/netbeans/modules/mercurial/ui/wizards/Bundle.properties
===================================================================
RCS file: /cvs/versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/wizards/Attic/Bundle.properties,v
retrieving revision 1.13
diff -u -r1.13 Bundle.properties
--- src/org/netbeans/modules/mercurial/ui/wizards/Bundle.properties 17 Oct 2007 14:43:59 -0000 1.13
+++ src/org/netbeans/modules/mercurial/ui/wizards/Bundle.properties 29 Feb 2008 15:22:21 -0000
@@ -39,8 +39,6 @@
repositoryPanel.Name=Mercurial Repository
-LBL_Clone_Progress=Cloning External Repository
-
ACSD_BrowseFolder = Lets you browse for directory for cloned repository.
Browse_title=Browse for the Parent directory
Folders=Folders
@@ -60,7 +58,6 @@
BK2022=Stop
BK2012=Connecting to Mercurial Repository...
CTL_Repository_Canceled=Action canceled by user
-CTL_Repository_Invalid = No information available for\: {0}
MSG_Progress_Terminating=Terminating connection to Mercurial Repository.
MSG_Progress_Clone_CannotAccess_Err=Cannot access the repository
MSG_Progress_Clone_InvalidURL_Err=Invalid Repository URL
Index: src/org/netbeans/modules/mercurial/util/Bundle.properties
===================================================================
RCS file: /cvs/versioncontrol/mercurial/src/org/netbeans/modules/mercurial/util/Attic/Bundle.properties,v
retrieving revision 1.16.4.1
diff -u -r1.16.4.1 Bundle.properties
--- src/org/netbeans/modules/mercurial/util/Bundle.properties 16 Nov 2007 17:28:42 -0000 1.16.4.1
+++ src/org/netbeans/modules/mercurial/util/Bundle.properties 29 Feb 2008 15:22:22 -0000
@@ -39,7 +39,6 @@
MSG_WARN_UPDATE_MERGE_TEXT = Merge is required - run menu command "Merge"
MSG_WARN_UPDATE_COMMIT_TEXT = Merge has been done, invoke "Commit" menu item\n to commit these changes before doing an "Update"
-MSG_WARN_MERGE_COMMIT_TEXT = Merge has been done, invoke "Commit" menu item\n to commit these changes before doing another "Merge"
MSG_WARN_NO_VIEW_TEXT = hg: unknown command 'view'\n Have you added "hgext.hgk =" to extensions section of .hgrc?
MSG_WARN_HGK_NOT_FOUND_TEXT = sh: hgk not found\n Is the location of hgk in your path?
@@ -50,7 +49,6 @@
MSG_CREATE_FAILED = Create command has failed\n\nSee Output Window for further details
MSG_NO_REPOSITORY_ERR = Mercurial repository could not be found
MSG_NO_RESPONSE_ERR = no suitable response from remote hg!
-MSG_NO_HG_CMD_ERR = \nMercurial could not be found.\n\nPlease check Mercurial is installed and on your PATH
MSG_FAILED_TO_READ_COMMIT_MESSAGE = Failed to read commit message
MSG_COMMIT_FAILED = Commit command has failed\n\nSee Output Window for further details
MSG_RENAME_FAILED = Rename command has failed\n\nSee Output Window for further details
@@ -63,3 +61,16 @@
MSG_COMMAND_ERR = ERROR Command failed:
MSG_COMMAND_INFO_ERR = Command: {0}\nOutput: {1}
MSG_ARG_LIST_TOO_LONG_ERR = \nMercurial command "hg {0}" could not be executed as too many argumensts ({1}) where passed\n\nPlease perform this operation from the command line.
+
+MSG_USING_PROXY_INFO = using IDE Options->General Proxy settings: {0}
+MSG_IGNORE_FILES = Do you want to add temporary files created during Merge and Revert to .hgignore file?
+MSG_IGNORE_FILES_TITLE = Ignore temporary Files
+
+MSG_UNABLE_TO_IGNORE = Ignore is not supported as .hgignore file contains syntax change line
+MSG_UNABLE_TO_IGNORE_TITLE = Unable to Ignore
+MSG_UNABLE_TO_UNIGNORE = Unignore is not supported as .hgignore file contains syntax change line
+MSG_UNABLE_TO_UNIGNORE_TITLE = Unable to Unignore
+MSG_SEARCH_HISTORY_TITLE = Search History
+MSG_SEARCH_HISTORY_WARN_BOTHDATES_NEEDED_TEXT = You cannot mix Revisions and Dates.\nPlease specify both From and To Dates or Revisions only.
+MSG_SEARCH_HISTORY_WARN_FROM_BEFORE_TODATE_NEEDED_TEXT = The From date is after the To date.\nPlease specify a From date before the To date.
+