summaryrefslogtreecommitdiffstats
path: root/po/ja.po
diff options
context:
space:
mode:
authorYuri Chornoivan <yurchor@ukr.net>2019-04-26 11:50:43 +0300
committerYuri Chornoivan <yurchor@ukr.net>2019-04-26 11:55:53 +0300
commitccce037f656be9ded9f805574949c06aea1f033a (patch)
treee1cf569d0b8f131e61b6318988fb3932ad19006a /po/ja.po
parent096342273cfac5ac002e28f446cfc2db2c9c6465 (diff)
downloadmageiawelcome-ccce037f656be9ded9f805574949c06aea1f033a.tar
mageiawelcome-ccce037f656be9ded9f805574949c06aea1f033a.tar.gz
mageiawelcome-ccce037f656be9ded9f805574949c06aea1f033a.tar.bz2
mageiawelcome-ccce037f656be9ded9f805574949c06aea1f033a.tar.xz
mageiawelcome-ccce037f656be9ded9f805574949c06aea1f033a.zip
Resolve the conflict
Diffstat (limited to 'po/ja.po')
-rw-r--r--po/ja.po2
1 files changed, 1 insertions, 1 deletions
diff --git a/po/ja.po b/po/ja.po
index 67c2a98..c4e53cb 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -44,7 +44,7 @@ msgstr "mageiawelcome"
#: mageiawelcome.py:73
msgctxt "ConfList|"
-msgid "<b>Congratulations!</b><BR />You have are now running {}"
+msgid "<b>Congratulations!</b><BR />You are now running {}"
msgstr "<b>おめでとうございます!</b><BR />あなたは現在 {} を実行中です"
#: mageiawelcome.py:74