Merge branch 'develop' of github.com:ether/etherpad-lite into support-images

This commit is contained in:
John McLear 2013-12-26 16:58:16 +00:00
commit 34c485c33e

View file

@ -4,6 +4,7 @@
"Mogoeilor"
]
},
"pad.toolbar.bold.title": "توپر",
"pad.toolbar.italic.title": "کج کوله(ctrl-l)",
"pad.toolbar.underline.title": "زیر خط دار بین (Ctrl-U)",
"pad.toolbar.ol.title": "نوم گه منظم",
@ -56,5 +57,6 @@
"pad.userlist.unnamed": "نوم نهشته",
"pad.userlist.guest": "میزوان",
"pad.userlist.deny": "پرو کردن",
"pad.userlist.approve": "اصلا کردن"
"pad.userlist.approve": "اصلا کردن",
"pad.impexp.importing": "د حالت وارد کردن"
}