summaryrefslogtreecommitdiff
path: root/src/strings.c
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2017-11-11 15:42:40 -0800
committerMarcus Huderle <huderlem@gmail.com>2017-11-11 16:06:44 -0800
commit267ada5ce6e2876c4df64275da9ee879a385c6f6 (patch)
tree559417726bbd5f3b18c153c1435f872decfe18b1 /src/strings.c
parent20d00c58ef49fa88533fa07ab1801c381f02b7bf (diff)
parent67ad331441f29545b84d152cbbb4f188098a9c5a (diff)
Merge remote-tracking branch 'upstream/master' into 80c
Diffstat (limited to 'src/strings.c')
-rw-r--r--src/strings.c4
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");