Skip to content

Commit

Permalink
Replace three ascii dots with the unicode ellipsis (#34777)
Browse files Browse the repository at this point in the history
  • Loading branch information
Qrox authored and ZhilkinSerg committed Oct 17, 2019
1 parent 5b03f7b commit 8f0f6bb
Show file tree
Hide file tree
Showing 49 changed files with 471 additions and 471 deletions.
6 changes: 3 additions & 3 deletions src/action.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -771,7 +771,7 @@ action_id handle_action_menu()
}
REGISTER_ACTION( ACTION_HELP );
if( ( entry = &entries.back() ) ) {
entry->txt += "..."; // help _is_a menu.
entry->txt += ""; // help _is_a menu.
}
if( hotkey_for_action( ACTION_DEBUG ) > -1 ) {
REGISTER_CATEGORY( _( "Debug" ) ); // register with global key
Expand Down Expand Up @@ -809,7 +809,7 @@ action_id handle_action_menu()
} else if( category == _( "Debug" ) ) {
REGISTER_ACTION( ACTION_DEBUG );
if( ( entry = &entries.back() ) ) {
entry->txt += "..."; // debug _is_a menu.
entry->txt += ""; // debug _is_a menu.
}
#if !defined(TILES)
REGISTER_ACTION( ACTION_TOGGLE_FULLSCREEN );
Expand Down Expand Up @@ -892,7 +892,7 @@ action_id handle_action_menu()

if( category != "back" ) {
std::string msg = _( "Back" );
msg += "...";
msg += "";
entries.emplace_back( 2 * NUM_ACTIONS, true,
hotkey_for_action( ACTION_ACTIONMENU ), msg );
}
Expand Down
12 changes: 6 additions & 6 deletions src/activity_handlers.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2916,7 +2916,7 @@ void activity_handlers::find_mount_do_turn( player_activity *act, player *p )

void activity_handlers::wait_npc_finish( player_activity *act, player *p )
{
p->add_msg_if_player( _( "%s finishes with you..." ), act->str_values[0] );
p->add_msg_if_player( _( "%s finishes with you" ), act->str_values[0] );
act->set_to_null();
}

Expand Down Expand Up @@ -2966,7 +2966,7 @@ void activity_handlers::try_sleep_do_turn( player_activity *act, player *p )
p->fall_asleep();
p->remove_value( "sleep_query" );
} else if( one_in( 1000 ) ) {
p->add_msg_if_player( _( "You toss and turn..." ) );
p->add_msg_if_player( _( "You toss and turn" ) );
}
if( calendar::once_every( 30_minutes ) ) {
try_sleep_query( act, p );
Expand Down Expand Up @@ -3169,7 +3169,7 @@ void activity_handlers::operation_do_turn( player_activity *act, player *p )
void activity_handlers::try_sleep_finish( player_activity *act, player *p )
{
if( !p->has_effect( effect_sleep ) ) {
p->add_msg_if_player( _( "You try to sleep, but can't..." ) );
p->add_msg_if_player( _( "You try to sleep, but can't" ) );
}
act->set_to_null();
}
Expand Down Expand Up @@ -4140,15 +4140,15 @@ void activity_handlers::robot_control_finish( player_activity *act, player *p )
return; // Do not do the other effects if the robot died
}
if( one_in( 3 ) ) {
p->add_msg_if_player( _( "...and turns friendly!" ) );
p->add_msg_if_player( _( "and turns friendly!" ) );
if( one_in( 3 ) ) { //did the robot became friendly permanently?
z->friendly = -1; //it did
} else {
z->friendly = rng( 5, 40 ); // it didn't
}
}
} else {
p->add_msg_if_player( _( "...but the robot refuses to acknowledge you as an ally!" ) );
p->add_msg_if_player( _( "but the robot refuses to acknowledge you as an ally!" ) );
}
p->practice( skill_id( "computer" ), 10 );
}
Expand Down Expand Up @@ -4437,7 +4437,7 @@ void activity_handlers::mind_splicer_finish( player_activity *act, player *p )
return;
}
item &data_card = *act->targets[0];
p->add_msg_if_player( m_info, _( "...you finally find the memory banks." ) );
p->add_msg_if_player( m_info, _( "you finally find the memory banks." ) );
p->add_msg_if_player( m_info, _( "The kit makes a copy of the data inside the bionic." ) );
data_card.contents.clear();
data_card.put_in( item( "mind_scan_robofac" ) );
Expand Down
12 changes: 6 additions & 6 deletions src/addiction.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ void addict_effect( player &u, addiction &add )
u.stim--;
}
if( rng( 8, 400 ) < in ) {
u.add_msg_if_player( m_bad, _( "Your hands start shaking... you need it bad!" ) );
u.add_msg_if_player( m_bad, _( "Your hands start shaking you need it bad!" ) );
u.add_effect( effect_shakes, 2_minutes );
}
break;
Expand All @@ -104,8 +104,8 @@ void addict_effect( player &u, addiction &add )
u.add_morale( morale_type, -35, -10 * in );
} else if( rng( 8, 300 ) < in ) {
const std::string msg_2 = add.type == ADD_ALCOHOL ?
_( "Your hands start shaking... you need a drink bad!" ) :
_( "You're shaking... you need some diazepam!" );
_( "Your hands start shaking you need a drink bad!" ) :
_( "You're shaking you need some diazepam!" );
u.add_msg_if_player( m_bad, msg_2 );
u.add_morale( morale_type, -35, -10 * in );
u.add_effect( effect_shakes, 5_minutes );
Expand Down Expand Up @@ -143,7 +143,7 @@ void addict_effect( player &u, addiction &add )
u.mod_healthy_mod( -1, -in * 30 );
}
if( one_in( 20 ) && dice( 2, 20 ) < in ) {
u.add_msg_if_player( m_bad, _( "Your hands start shaking... you need some painkillers." ) );
u.add_msg_if_player( m_bad, _( "Your hands start shaking you need some painkillers." ) );
u.add_morale( MORALE_CRAVING_OPIATE, -40, -10 * in );
u.add_effect( effect_shakes, 2_minutes + in * 30_seconds );
} else if( one_in( 20 ) && dice( 2, 30 ) < in ) {
Expand All @@ -167,7 +167,7 @@ void addict_effect( player &u, addiction &add )
u.add_msg_if_player( m_warning, _( "You feel depressed. Speed would help." ) );
u.add_morale( MORALE_CRAVING_SPEED, -25, -20 * in );
} else if( one_in( 10 ) && dice( 2, 80 ) < in ) {
u.add_msg_if_player( m_bad, _( "Your hands start shaking... you need a pick-me-up." ) );
u.add_msg_if_player( m_bad, _( "Your hands start shaking you need a pick-me-up." ) );
u.add_morale( MORALE_CRAVING_SPEED, -25, -20 * in );
u.add_effect( effect_shakes, in * 2_minutes );
} else if( one_in( 50 ) && dice( 2, 100 ) < in ) {
Expand Down Expand Up @@ -216,7 +216,7 @@ void addict_effect( player &u, addiction &add )
}
} else if( in > 5 || one_in( 500 - 15 * in ) ) {
u.add_msg_if_player( m_warning, rng( 0, 6 ) < in ? _( "You haven't had any mutagen lately." ) :
_( "You could use some new parts..." ) );
_( "You could use some new parts" ) );
u.add_morale( MORALE_CRAVING_MUTAGEN, -5, -50 );
}
break;
Expand Down
4 changes: 2 additions & 2 deletions src/advanced_inv.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1202,7 +1202,7 @@ bool advanced_inventory::move_all_items( bool nested_call )
if( spane.get_area() == AIM_ALL ) {
// move all to `AIM_WORN' doesn't make sense (see `MAX_WORN_PER_TYPE')
if( dpane.get_area() == AIM_WORN ) {
popup( _( "You look at the items, then your clothes, and scratch your head..." ) );
popup( _( "You look at the items, then your clothes, and scratch your head" ) );
return false;
}
// if the source pane (AIM_ALL) is empty, then show a message and leave
Expand Down Expand Up @@ -1422,7 +1422,7 @@ bool advanced_inventory::move_all_items( bool nested_call )
bool advanced_inventory::show_sort_menu( advanced_inventory_pane &pane )
{
uilist sm;
sm.text = _( "Sort by..." );
sm.text = _( "Sort by" );
sm.addentry( SORTBY_NONE, true, 'u', _( "Unsorted (recently added first)" ) );
sm.addentry( SORTBY_NAME, true, 'n', get_sortname( SORTBY_NAME ) );
sm.addentry( SORTBY_WEIGHT, true, 'w', get_sortname( SORTBY_WEIGHT ) );
Expand Down
2 changes: 1 addition & 1 deletion src/animation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class basic_animation
g->draw_panels();

query_popup()
.wait_message( "%s", _( "Hang on a bit..." ) )
.wait_message( "%s", _( "Hang on a bit" ) )
.on_top( true )
.show();

Expand Down
12 changes: 6 additions & 6 deletions src/avatar.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ bool avatar::read( int inventory_position, const bool continuous )
if( !has_identified( it.typeId() ) ) {
if( reader != this ) {
add_msg( m_info, fail_messages[0] );
add_msg( m_info, _( "%s reads aloud..." ), reader->disp_name() );
add_msg( m_info, _( "%s reads aloud" ), reader->disp_name() );
}
assign_activity( act );
return true;
Expand Down Expand Up @@ -554,9 +554,9 @@ bool avatar::read( int inventory_position, const bool continuous )
if( !continuous || activity.position != act.position ) {
if( reader != this ) {
add_msg( m_info, fail_messages[0] );
add_msg( m_info, _( "%s reads aloud..." ), reader->disp_name() );
add_msg( m_info, _( "%s reads aloud" ), reader->disp_name() );
} else if( !learners.empty() || !fun_learners.empty() ) {
add_msg( m_info, _( "You read aloud..." ) );
add_msg( m_info, _( "You read aloud" ) );
}
}

Expand Down Expand Up @@ -840,7 +840,7 @@ void avatar::do_read( item &book )
add_msg( m_info, _( "Rereading the %s isn't as much fun for %s." ),
book.type_name(), names );
if( out_of_chapters.front() == disp_name() && one_in( 6 ) ) {
add_msg( m_info, _( "Maybe you should find something new to read..." ) );
add_msg( m_info, _( "Maybe you should find something new to read" ) );
}
}

Expand Down Expand Up @@ -917,9 +917,9 @@ void avatar::wake_up()
}
if( has_effect( effect_slept_through_alarm ) ) {
if( has_bionic( bio_watch ) ) {
add_msg( m_warning, _( "It looks like you've slept through your internal alarm..." ) );
add_msg( m_warning, _( "It looks like you've slept through your internal alarm" ) );
} else {
add_msg( m_warning, _( "It looks like you've slept through the alarm..." ) );
add_msg( m_warning, _( "It looks like you've slept through the alarm" ) );
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions src/avatar_action.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ bool avatar_action::move( avatar &you, map &m, int dx, int dy, int dz )
}
}
if( newdist > curdist ) {
add_msg( m_info, _( "You cannot pull yourself away from the faultline..." ) );
add_msg( m_info, _( "You cannot pull yourself away from the faultline" ) );
return false;
}
}
Expand Down Expand Up @@ -251,7 +251,7 @@ bool avatar_action::move( avatar &you, map &m, int dx, int dy, int dz )
add_msg( m_good, _( "Your willpower asserts itself, and so do you!" ) );
} else {
you.moves -= rng( 2, 8 ) * 10;
add_msg( m_bad, _( "You're too pacified to strike anything..." ) );
add_msg( m_bad, _( "You're too pacified to strike anything" ) );
return false;
}
}
Expand Down Expand Up @@ -596,7 +596,7 @@ bool avatar_action::fire_check( avatar &you, const map &m, const targeting_data
add_msg( m_good, _( "Your eyes steel, and you raise your weapon!" ) );
} else {
you.moves -= rng( 2, 5 ) * 10;
add_msg( m_bad, _( "You can't fire your weapon, it's too heavy..." ) );
add_msg( m_bad, _( "You can't fire your weapon, it's too heavy" ) );
// break a possible loop when aiming
if( you.activity ) {
you.cancel_activity();
Expand Down Expand Up @@ -877,7 +877,7 @@ void avatar_action::plthrow( avatar &you, int pos,
add_msg( m_good, _( "You concentrate mightily, and your body obeys!" ) );
} else {
you.moves -= rng( 2, 5 ) * 10;
add_msg( m_bad, _( "You can't muster up the effort to throw anything..." ) );
add_msg( m_bad, _( "You can't muster up the effort to throw anything" ) );
return;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/bionics.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1275,7 +1275,7 @@ int player::bionics_pl_skill( const skill_id &most_important_skill, const skill_
// People trained in bionics gain an additional advantage towards using it
if( has_trait( trait_PROF_AUTODOC ) ) {
pl_skill += 7;
add_msg( m_neutral, _( "A lifetime of augmentation has taught %s a thing or two..." ),
add_msg( m_neutral, _( "A lifetime of augmentation has taught %s a thing or two" ),
disp_name() );
}
return pl_skill;
Expand Down
Loading

0 comments on commit 8f0f6bb

Please sign in to comment.