diff options
author | Marcus Huderle <huderlem@gmail.com> | 2017-09-30 16:41:16 -0700 |
---|---|---|
committer | Marcus Huderle <huderlem@gmail.com> | 2017-09-30 16:41:16 -0700 |
commit | 4c5bfdc153a8484c00aae30ed22badf006d7f8d9 (patch) | |
tree | 47bfb4286c03f021d48ffadde5da675a9f903f61 /src/strings.c | |
parent | aaa09d735451cced915bc6bacfce45ced8e33fa1 (diff) | |
parent | f74d4742f597a423b7a8685d72c06597c8c78db7 (diff) |
Merge remote-tracking branch 'upstream/master' into name_labels
Diffstat (limited to 'src/strings.c')
-rw-r--r-- | src/strings.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/strings.c b/src/strings.c index 219c5bec1..6c8dce9d6 100644 --- a/src/strings.c +++ b/src/strings.c @@ -861,7 +861,7 @@ const u8 gOtherText_AtBattleStart[] = _("At the battle’s start."); const u8 gOtherText_UponWinningBattle[] = _("Upon winning a battle."); const u8 gOtherText_UponLosingBattle[] = _("Upon losing a battle."); -// mauville_old_man? +// mauville_man? const u8 gOtherText_TheBardsSong[] = _("The BARD’s Song"); const u8 gOtherText_WhatsHipHappening[] = _("What’s hip and happening?"); const u8 gOtherText_Interview[] = _("Interview"); @@ -1781,7 +1781,7 @@ const u8 gOtherText_AtBattleStart[] = _("Zum Kampfbeginn"); const u8 gOtherText_UponWinningBattle[] = _("Über den Sieg"); const u8 gOtherText_UponLosingBattle[] = _("Über die Niederlage"); -// mauville_old_man? +// mauville_man? const u8 gOtherText_TheBardsSong[] = _("Das BARDEN-Lied"); const u8 gOtherText_WhatsHipHappening[] = _("Was ist hip? Was ist top?"); const u8 gOtherText_Interview[] = _("Interview"); |