From: <dal...@us...> - 2009-01-01 16:42:20
|
Revision: 14277 http://jedit.svn.sourceforge.net/jedit/?rev=14277&view=rev Author: daleanson Date: 2009-01-01 16:42:16 +0000 (Thu, 01 Jan 2009) Log Message: ----------- put strings in property file Modified Paths: -------------- plugins/SVNPlugin/trunk/SVNPlugin.props plugins/SVNPlugin/trunk/src/ise/plugin/svn/data/MergeData.java plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/MergeDialog.java Modified: plugins/SVNPlugin/trunk/SVNPlugin.props =================================================================== --- plugins/SVNPlugin/trunk/SVNPlugin.props 2009-01-01 16:41:41 UTC (rev 14276) +++ plugins/SVNPlugin/trunk/SVNPlugin.props 2009-01-01 16:42:16 UTC (rev 14277) @@ -322,6 +322,8 @@ ips.Skipped_files>=Skipped files: ips.Updated_files>=Updated files: ips.Merge_Dry_Run_Results>=Merge Dry Run Results: +ips.Show=Show +ips.Merge_Options>=Merge Options: # for MkDir dialog ips.mkdir=mkdir @@ -528,6 +530,8 @@ ips.Checkout_complete_at_revision=Checkout complete at revision ips.Checkout_completed,_revision=Checkout completed, revision ips.Checkout_failed.=Checkout failed. +ips.Choose_a_value>=Choose a value: +ips.Choose_one_or_more_values>=Choose one or more values: ips.Cleaning_up_...=Cleaning up ... ips.Cleanup=Cleanup ips.Commit=Commit @@ -559,6 +563,12 @@ ips.Importing_...=Importing ... ips.Info=Info ips.Info_Error=Info Error +ips.Invalid_end_revision.=Invalid end revision. +ips.Invalid_from_path.=Invalid from path. +ips.Invalid_merge_'from'.=Invalid merge 'from'. +ips.Invalid_start_revision.=Invalid start revision. +ips.Invalid_values_for_merge_request.=Invalid values for merge request. +ips.Invalid_working_copy.=Invalid working copy. ips.Jan=Jan ips.Jul=Jul ips.Jun=Jun @@ -580,6 +590,7 @@ ips.Preparing_SVN_diff...=Preparing SVN diff... ips.Preparing_to_diff...=Preparing to diff... ips.Properties=Properties +ips.Property=Property ips.Recursive_Resolved?=Recursive Resolved? ips.Recursive_Revert?=Recursive Revert? ips.Recursively_resolve_all_files_in_selected_directories?=Recursively resolve all files in selected directories? @@ -592,23 +603,20 @@ ips.Reverting_...=Reverting ... ips.SVN_Diff_created.=SVN Diff created. ips.Sep=Sep +ips.Select_Repository_Location=Select Repository Location ips.Show_Child_Properties?=Show Child Properties? +ips.Show_log_for_this_file.=Show log for this file. ips.Status=Status +ips.Stopped_'Property'_action.=Stopped 'Property' action. ips.Switching_...=Switching ... ips.Unable_to_compare_directories.=Unable to compare directories. ips.Unable_to_create_SVN_diff.=Unable to create SVN diff. ips.Unable_to_fetch_contents_for_comparison.=Unable to fetch contents for comparison. +ips.Unable_to_stop_'Property'_action.=Unable to stop 'Property' action. ips.Unlock=Unlock ips.Unlocking_...=Unlocking ... ips.Updating_...=Updating ... ips.Warning>_Local_Modifications=Warning: Local Modifications ips.Would_you_like_to_create_a_project_from_these_files?=Would you like to create a project from these files? ips.Would_you_like_to_see_properties_for_subdirectories_and_files?=Would you like to see properties for subdirectories and files? -ips.Stopped_'Property'_action.=Stopped 'Property' action. -ips.Unable_to_stop_'Property'_action.=Unable to stop 'Property' action. -ips.Property=Property -ips.Choose_a_value>=Choose a value: -ips.Choose_one_or_more_values>=Choose one or more values: -ips.Choose_a_value>=Choose a value: -ips.Select_Repository_Location=Select Repository Location -ips.Show_log_for_this_file.=Show log for this file. + Modified: plugins/SVNPlugin/trunk/src/ise/plugin/svn/data/MergeData.java =================================================================== --- plugins/SVNPlugin/trunk/src/ise/plugin/svn/data/MergeData.java 2009-01-01 16:41:41 UTC (rev 14276) +++ plugins/SVNPlugin/trunk/src/ise/plugin/svn/data/MergeData.java 2009-01-01 16:42:16 UTC (rev 14277) @@ -70,10 +70,10 @@ public String commandLineEquivalent() { if ( fromFile == null && fromPath == null ) { - return "Invalid merge 'from'."; + return jEdit.getProperty("ips.Invalid_merge_'from'.", "Invalid merge 'from'."); } if ( startRevision == null ) { - return "Invalid start revision."; + return jEdit.getProperty("ips.Invalid_start_revision.", "Invalid start revision."); } StringBuffer sb = new StringBuffer(); @@ -115,7 +115,7 @@ } sb.append( " " ); if ( destFile == null ) { - return "Invalid working copy."; + return jEdit.getProperty("ips.Invalid_working_copy.", "Invalid working copy."); } else { sb.append( destFile.getAbsolutePath() ); @@ -125,17 +125,17 @@ else if ( toFile != null || toPath != null ) { // svn merge sourceURL1@N sourceURL2@M WCPATH if ( fromFile == null && fromPath == null ) { - return "Invalid from path."; + return jEdit.getProperty("ips.Invalid_from_path.", "Invalid from path."); } if ( endRevision == null ) { - return "Invalid end revision."; + return jEdit.getProperty("ips.Invalid_end_revision.", "Invalid end revision."); } sb.append( fromFile == null ? fromPath : fromFile.getAbsolutePath() ).append( "@" ); sb.append( startRevision.getNumber() ).append( " " ); sb.append( toFile == null ? toPath : toFile.getAbsolutePath() ).append( "@" ); sb.append( endRevision.getNumber() ).append( " " ); if ( destFile == null ) { - return "Invalid working copy."; + return jEdit.getProperty("ips.Invalid_working_copy.", "Invalid working copy."); } else { sb.append( destFile.getAbsolutePath() ); @@ -143,7 +143,7 @@ return sb.toString(); } else { - return "Invalid values for merge request."; + return jEdit.getProperty("ips.Invalid_values_for_merge_request.", "Invalid values for merge request."); } } Modified: plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/MergeDialog.java =================================================================== --- plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/MergeDialog.java 2009-01-01 16:41:41 UTC (rev 14276) +++ plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/MergeDialog.java 2009-01-01 16:42:16 UTC (rev 14277) @@ -171,7 +171,7 @@ // merge option checkboxes JPanel merge_options_panel = new JPanel( new KappaLayout() ); - merge_options_panel.setBorder( BorderFactory.createTitledBorder( "Merge Options:" ) ); + merge_options_panel.setBorder( BorderFactory.createTitledBorder( jEdit.getProperty("ips.Merge_Options>", "Merge Options:") ) ); final JCheckBox dryrun_cb = new JCheckBox( jEdit.getProperty( "ips.Dry_run", "Dry run" ) ); dryrun_cb.setSelected( true ); final JCheckBox force_cb = new JCheckBox( jEdit.getProperty( "ips.Force", "Force" ) ); @@ -193,7 +193,7 @@ command_line.setWrapStyleWord( true ); command_line.setFont( new Font("Monospaced", Font.PLAIN, 10) ); command_line.setEditable( false ); - JButton show_command_line = new JButton( "Show" ); + JButton show_command_line = new JButton( jEdit.getProperty("ips.Show", "Show") ); show_command_line.addActionListener( new ActionListener() { public void actionPerformed( ActionEvent ae ) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |