Merge branch 'master' of git.sourceforge.jp:/gitroot/linuxjm/jm

diff --cc manual/cups/translation_list
index a87271c,348fbc4..6844c09
--- 1/manual/cups/translation_list
--- 2/manual/cups/translation_list
+++ b/manual/cups/translation_list
@@@ -1,11 -1,6 +1,11 @@@
  ●:cups:1.5.3:0000/00/00:cancel:1:2012/06/10::cyoichi@maple.ocn.ne.jp:Chonan Yoichi:
 +×:cups:1.5.3:0000/00/00:cups-config:1:::::
 +×:cups:1.5.3:0000/00/00:cupstestdsc:1:::::
 +×:cups:1.5.3:0000/00/00:cupstestppd:1:::::
 +×:cups:1.5.3:0000/00/00:ipptool:1:::::
  ●:cups:1.5.3:0000/00/00:lp:1:2012/06/06::cyoichi@maple.ocn.ne.jp:Chonan Yoichi:
- ×:cups:1.5.3:0000/00/00:lpoptions:1:::::
+ ●:cups:1.5.3:0000/00/00:lpoptions:1:2012/06/15::cyoichi@maple.ocn.ne.jp:Chonan Yoichi:
 +×:cups:1.5.3:0000/00/00:lppasswd:1:::::
  ●:cups:1.5.3:0000/00/00:lpq:1:2012/06/09::cyoichi@maple.ocn.ne.jp:Chonan Yoichi:
  ●:cups:1.5.3:0000/00/00:lpr:1:2012/06/06::cyoichi@maple.ocn.ne.jp:Chonan Yoichi:
  ●:cups:1.5.3:0000/00/00:lprm:1:2012/06/10::cyoichi@maple.ocn.ne.jp:Chonan Yoichi: