Permalink
Browse files

remove extraneous commit conflict characters

  • Loading branch information...
lstein committed Jul 18, 2011
1 parent 5381d81 commit 982518106992f5242fb4e46aabdefdbab1170a1e
Showing with 12 additions and 16 deletions.
  1. +0 −5 conf/languages/en.pm
  2. +0 −1 lib/Bio/Graphics/Browser2.pm
  3. +12 −10 t/testdata/conf/languages/POSIX.pm
View
@@ -680,13 +680,8 @@ END
'<br><br>To complete the account creation process and to log into your %s ' .
'account, please type in your username and click the "Continue" button below.',
MUST_TYPE_USERNAME => 'You must type in your username to continue.',
-<<<<<<< HEAD
INCORRECT_LINK => 'The confirmation code provided is either incorrect or expired.<br> Please click continue to exit.',
PENDING => 'pending',
-=======
- INCORRECT_LINK => 'The link provided is either incorrect or expired.<br> Please click continue to exit.',
->>>>>>> 21582ac
-
WELCOME => 'Welcome, %s',
LOG_OUT_DESC => 'Click here to log out from %s',
LOG_OUT => 'Log Out',
@@ -157,7 +157,6 @@ sub make_path {
my $path = shift;
return unless $path =~ /^(.+)$/;
$path = $1;
- warn $path;
mkpath($path,0,0777) unless -d $path;
}
@@ -90,10 +90,6 @@ END
DOWNLOAD => 'Download',
- DOWNLOAD_ALL => 'Download entire dataset',
-
- TRACK_ID => 'Track ID=<b>%s</b>',
-
DISPLAY_SETTINGS => 'Display Settings',
TRACKS => 'Tracks',
@@ -111,7 +107,14 @@ END
ADDED_TO => 'Add track to favorites',
#############
+
+ SNAPSHOT_FORM => 'Snapshot Name',
+ CURRENT_SNAPSHOT => 'Current Snapshot:',
+
+ TIMESTAMP => 'Snapshot Timestamp [GMT]',
+
+ SNAPSHOT_SELECT => 'Saved Snapshots',
SELECT_TRACKS => 'Select Tracks',
@@ -153,8 +156,6 @@ END
SELECT_SUBTRACKS => 'showing %d/%d subtracks',
- NO_TRACK_CITATION => 'There is no additional information about this track.',
-
EDIT => 'Edit File...',
DELETE => 'Delete File',
@@ -225,7 +226,9 @@ END
REMOTE_TITLE => 'Add remote annotations',
- IPAD_BALLOON => 'Tap features twice to see more details',
+ #ipad
+ IPAD_BALLOON => '\nTap feature again to see more details',
+ #
REMOTE_URL => 'Enter remote track URL',
@@ -396,7 +399,6 @@ END
ADD_DESCRIPTION => 'Click to add a description',
ADD_TITLE => 'Click to edit the title',
- EDIT_LABEL => 'Click to view track. Shift or control-click to edit.',
NO_DESCRIPTION => 'No description',
CONFIGURATION => 'Configuration',
@@ -476,7 +478,7 @@ END
DOWNLOAD_THIS_TRACK => '<b>Download this track test</b>',
- ABOUT_THIS_TRACK => '<b>About track <i>%s</i></b>',
+ ABOUT_THIS_TRACK => '<b>About this track</b>',
SUBTRACKS_SHOWN => 'This track contains selectable subtracks. Click to modify the selection or change subtrack order.',
@@ -673,7 +675,7 @@ END
'<br><br>To complete the account creation process and to log into your %s ' .
'account, please type in your username and click the "Continue" button below.',
MUST_TYPE_USERNAME => 'You must type in your username to continue.',
- INCORRECT_LINK => 'The confirmation code provided is either incorrect or expired.<br> Please click continue to exit.',
+ INCORRECT_LINK => 'The link provided is either incorrect or expired.<br> Please click continue to exit.',
PENDING => 'pending',
WELCOME => 'Welcome, %s',

0 comments on commit 9825181

Please sign in to comment.