summaryrefslogtreecommitdiff
path: root/src/locales/ja.json
diff options
context:
space:
mode:
authorStefan <mu.stefan@googlemail.com>2015-04-11 12:10:37 +0200
committerStefan <mu.stefan@googlemail.com>2015-04-11 12:10:37 +0200
commitaa0d14c7d71da3d3c4f123e1577848c026bccf0b (patch)
tree19cc760c2aa04ab57eb23e500dc442c0a901a7d1 /src/locales/ja.json
parent573a912e4f1b481fca8f3c8146972e78f76278e2 (diff)
parentcc34f4e325830f798321b8152095c4dccd6b465f (diff)
downloadetherpad-lite-aa0d14c7d71da3d3c4f123e1577848c026bccf0b.zip
Merge branch 'master' of git://github.com/ether/etherpad-lite into create_pad_special_characters
Diffstat (limited to 'src/locales/ja.json')
-rw-r--r--src/locales/ja.json1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/locales/ja.json b/src/locales/ja.json
index 011c935a..62e6dc62 100644
--- a/src/locales/ja.json
+++ b/src/locales/ja.json
@@ -49,7 +49,6 @@
"pad.importExport.exportword": "Microsoft Word",
"pad.importExport.exportpdf": "PDF",
"pad.importExport.exportopen": "ODF (Open Document Format)",
- "pad.importExport.exportdokuwiki": "DokuWiki",
"pad.importExport.abiword.innerHTML": "プレーンテキストまたは HTML ファイルからのみインポートできます。より高度なインポート機能を使用するには、<a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-in-Ubuntu-or-OpenSuse-or-SLES-with-AbiWord\">abiword をインストール</a>してください。",
"pad.modals.connected": "接続されました。",
"pad.modals.reconnecting": "パッドに再接続中...",