Index: /branches/Ver2.2/extras/for_wordpressme2011/ja_EUC/language/japanese/admin.php =================================================================== --- /branches/Ver2.2/extras/for_wordpressme2011/ja_EUC/language/japanese/admin.php (revision 527) +++ /branches/Ver2.2/extras/for_wordpressme2011/ja_EUC/language/japanese/admin.php (revision 528) @@ -19,4 +19,6 @@ define("_AM_XP2_SYS_REPORT","¥ì¥Ý¡¼¥È·Á¼°¤Çɽ¼¨"); define("_AM_XP2_SYS_NORMAL","¥Î¡¼¥Þ¥ë·Á¼°¤Çɽ¼¨"); + define("_AM_XP2_BLOCK_OPTIONS","¥Ö¥í¥Ã¥¯¥ª¥×¥·¥ç¥ó"); + define("_AM_XP2_GROUP_ROLE","¥°¥ë¡¼¥×¸¢¸Â"); // Block Check Index: /branches/Ver2.2/extras/for_wordpressme2011/ja_EUC/language/japanese/blocks.php =================================================================== --- /branches/Ver2.2/extras/for_wordpressme2011/ja_EUC/language/japanese/blocks.php (revision 527) +++ /branches/Ver2.2/extras/for_wordpressme2011/ja_EUC/language/japanese/blocks.php (revision 528) @@ -27,4 +27,5 @@ define("_MB_XP2_FILE_NAME","¥Õ¥¡¥¤¥ë̾"); define("_MB_XP2_THISTEMPLATE","¤³¤Î¥Ö¥í¥Ã¥¯¤Î¥Æ¥ó¥×¥ì¡¼¥È"); + define("_MB_XP2_NO_JSCRIPT","¥Ö¥é¥¦¥¶¤ÇJavascript¤òÍ­¸ú¤Ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£"); // recent comment block @@ -48,4 +49,5 @@ define("_MB_XP2_DAYS_AND","¤«¤é"); define("_MB_XP2_DAYS_AGO","ÆüÁ°¤Þ¤Ç¤Î´Ö"); + define("_MB_XP2_CATS_DIRECT_SELECT","ID¤òľÀÜ»ØÄê(Ê£¿ô¤¢¤ë¾ì¹ç¤Ï¥«¥ó¥Þ¶èÀÚ¤ê¤ÇÆþÎÏ)"); // recent posts list Index: /branches/Ver2.2/extras/for_wordpressme2011/ja_EUC/wp-content/plugins/xpressme/language/xpressme-ja_EUC.po =================================================================== --- /branches/Ver2.2/extras/for_wordpressme2011/ja_EUC/wp-content/plugins/xpressme/language/xpressme-ja_EUC.po (revision 527) +++ /branches/Ver2.2/extras/for_wordpressme2011/ja_EUC/wp-content/plugins/xpressme/language/xpressme-ja_EUC.po (revision 528) @@ -8,6 +8,6 @@ "Project-Id-Version: XPressME Plugin\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-06 21:59+0900\n" -"PO-Revision-Date: 2009-11-24 18:42+0900\n" +"POT-Creation-Date: 2010-02-26 16:00+0900\n" +"PO-Revision-Date: 2010-02-26 16:19+0900\n" "Last-Translator: toemon \n" "Language-Team: toemon \n" @@ -43,113 +43,113 @@ msgstr "¥â¥¸¥å¡¼¥ë´ÉÍý¤Ø" -#: xpressme.php:164 +#: xpressme.php:159 msgid "XPressME Display Setting" msgstr "XPressME ɽ¼¨ÀßÄê" -#: xpressme.php:170 +#: xpressme.php:165 msgid "Thema Sidebar Display" msgstr "¥Æ¡¼¥Þɽ¼¨»þ¤Ë¥µ¥¤¥É¥Ð¡¼É½¼¨¤¹¤ë¡£" -#: xpressme.php:171 -#: xpressme.php:263 -#: xpressme.php:269 -#: xpressme.php:274 -#: xpressme.php:280 -#: xpressme_class.php:296 -#: xpressme_class.php:314 -#: xpressme_class.php:445 -#: xpressme_class.php:456 +#: xpressme.php:166 +#: xpressme.php:259 +#: xpressme.php:265 +#: xpressme.php:270 +#: xpressme.php:276 +#: xpressme_class.php:330 +#: xpressme_class.php:348 +#: xpressme_class.php:479 +#: xpressme_class.php:490 msgid "YES" msgstr "¤Ï¤¤" -#: xpressme.php:172 -#: xpressme.php:264 -#: xpressme.php:270 -#: xpressme.php:275 -#: xpressme.php:281 -#: xpressme_class.php:297 -#: xpressme_class.php:315 -#: xpressme_class.php:446 -#: xpressme_class.php:457 +#: xpressme.php:167 +#: xpressme.php:260 +#: xpressme.php:266 +#: xpressme.php:271 +#: xpressme.php:277 +#: xpressme_class.php:331 +#: xpressme_class.php:349 +#: xpressme_class.php:480 +#: xpressme_class.php:491 msgid "NO" msgstr "¤¤¤¤¤¨" -#: xpressme.php:181 -#: xpressme.php:232 -#: xpressme.php:291 +#: xpressme.php:176 +#: xpressme.php:228 +#: xpressme.php:287 msgid "Update Config" msgstr "¹¹¿·" -#: xpressme.php:182 -#: xpressme.php:233 -#: xpressme.php:292 +#: xpressme.php:177 +#: xpressme.php:229 +#: xpressme.php:288 msgid "Preset Config" msgstr "¥×¥ê¥»¥Ã¥È" -#: xpressme.php:214 +#: xpressme.php:210 msgid "XPressME Integration Setting" msgstr "XPressME Åý¹çÀßÄê" -#: xpressme.php:218 +#: xpressme.php:214 msgid "Media Upload Base Path" msgstr "¥á¥Ç¥£¥¢¥¢¥Ã¥×¥í¡¼¥É¤Î¥Ù¡¼¥¹¥Ñ¥¹ÀßÄê" -#: xpressme.php:222 +#: xpressme.php:218 msgid "Use XOOPS UPLOAD PATH" msgstr "XOOPS¤Î¥¢¥Ã¥×¥í¡¼¥É¥Ñ¥¹¤ò»ÈÍѤ¹¤ë¡£" -#: xpressme.php:223 +#: xpressme.php:219 msgid "USE WordPress BASE_PATH" msgstr "WordPress¤Î¥Ù¡¼¥¹¥Ñ¥¹¤ò»ÈÍѤ¹¤ë¡£" -#: xpressme.php:257 +#: xpressme.php:253 msgid "XPressME Other Setting" msgstr "XPressME ¤½¤Î¾¤ÎÀßÄê" -#: xpressme.php:262 +#: xpressme.php:258 msgid "The change tracking of the post is preserved" msgstr "Åê¹Æ¤ÎÊѹ¹ÍúÎò¤òÍ­¸ú¤Ë¤¹¤ë¡£" -#: xpressme.php:268 +#: xpressme.php:264 msgid "Select Multi user mode" msgstr "¥Þ¥ë¥Á¥æ¡¼¥¶¡¼¥â¡¼¥É¤òÁªÂò" -#: xpressme.php:273 +#: xpressme.php:269 msgid "Is the posts author views counted?" msgstr "Åê¹Æ¼Ô¤Î±ÜÍ÷¤ò¥«¥¦¥ó¥È¤·¤Þ¤¹¤«¡©" -#: xpressme.php:279 +#: xpressme.php:275 msgid "Is SQL debugging window displayed?" msgstr "SQL¥Ç¥Ð¥Ã¥°¥¦¥£¥ó¥É¤òɽ¼¨¤·¤Þ¤¹¤«¡©" -#: xpressme.php:284 +#: xpressme.php:280 msgid "Select warning display of block file version check" msgstr "¥Ö¥í¥Ã¥¯¥Õ¥¡¥¤¥ë¤Î¥Ð¡¼¥¸¥ç¥ó¥Á¥§¥Ã¥¯»þ¤Ë¤ª¤±¤ë·Ù¹ðɽ¼¨" -#: xpressme.php:285 +#: xpressme.php:281 msgid "Do display" msgstr "ɽ¼¨¤¹¤ë" -#: xpressme.php:286 +#: xpressme.php:282 msgid "Do not display" msgstr "ɽ¼¨¤·¤Ê¤¤" #: xpressme_class.php:61 -#: xpressme_class.php:243 +#: xpressme_class.php:277 msgid "Older Post" msgstr "Á°¤ÎÅê¹Æ¤Ø" #: xpressme_class.php:62 -#: xpressme_class.php:246 +#: xpressme_class.php:280 msgid "Newer Post" msgstr "¼¡¤ÎÅê¹Æ¤Ø" #: xpressme_class.php:64 -#: xpressme_class.php:249 +#: xpressme_class.php:283 msgid "Older Entries" msgstr "Á°¥Ú¡¼¥¸¤Ø" #: xpressme_class.php:65 -#: xpressme_class.php:252 +#: xpressme_class.php:286 msgid "Newer Entries" msgstr "¼¡¥Ú¡¼¥¸¤Ø" @@ -157,274 +157,278 @@ #: xpressme_class.php:79 #: xpressme_class.php:80 -#: xpressme_class.php:255 +#: xpressme_class.php:289 msgid "Read the rest of this entry »" msgstr "¤³¤ÎÅê¹Æ¤Î³¤­¤òÆÉ¤à »" -#: xpressme_class.php:356 +#: xpressme_class.php:390 msgid "Single Post Navi Setting" msgstr "¥·¥ó¥°¥ë¥Ý¥¹¥È¥Ê¥Ó¤ÎÀßÄê" -#: xpressme_class.php:361 -#: xpressme_class.php:406 +#: xpressme_class.php:395 +#: xpressme_class.php:440 msgid "Adjustment of Navi link display position" msgstr "¥ê¥ó¥¯¤Îɽ¼¨°ÌÃÖÀßÄê" -#: xpressme_class.php:364 +#: xpressme_class.php:398 msgid "'Old Post Link' is displayed in the left, and 'Newer Post Link' is displayed in the right" msgstr "°ÊÁ°¤Îµ­»ö¤Ø¤Î¥ê¥ó¥¯¤òº¸¤Ë¡¢¤è¤ê¿·¤·¤¤µ­»ö¤Ø¤Î¥ê¥ó¥¯¤ò±¦¤Ëɽ¼¨" -#: xpressme_class.php:365 +#: xpressme_class.php:399 msgid "'Newer Post Link' is displayed in the left, and 'Old Post Link' is displayed in the right" msgstr "¤è¤ê¿·¤·¤¤µ­»ö¤Ø¤Î¥ê¥ó¥¯¤òº¸¤Ë¡¢¸Å¤¤µ­»ö¤Ø¤Î¥ê¥ó¥¯¤ò±¦¤Ëɽ¼¨" -#: xpressme_class.php:371 +#: xpressme_class.php:405 msgid "Select Display name of PostNavi Link" msgstr "ɽ¼¨¤¹¤ë¥ê¥ó¥¯¥Æ¥­¥¹¥È¤òÁªÂò" -#: xpressme_class.php:374 +#: xpressme_class.php:408 msgid "Title of post" msgstr "Åê¹Æµ­»ö¤Î¥¿¥¤¥È¥ë¤òɽ¼¨" -#: xpressme_class.php:375 +#: xpressme_class.php:409 msgid "Title of Navi" msgstr "¥Ê¥Ó¥¿¥¤¥È¥ë¤òɽ¼¨" -#: xpressme_class.php:381 +#: xpressme_class.php:415 msgid "Display Navi Title of Old Post Link" msgstr "¸Å¤¤µ­»ö¤Ø¤Î¥Ê¥Ó¥¿¥¤¥È¥ë¤òÀßÄê" -#: xpressme_class.php:388 +#: xpressme_class.php:422 msgid "Display Navi Title of Newer Post Link" msgstr "¤è¤ê¿·¤·¤¤µ­»ö¤Ø¤Î¥Ê¥Ó¥¿¥¤¥È¥ë¤òÀßÄê" -#: xpressme_class.php:401 +#: xpressme_class.php:435 msgid "Posts List Page Navi Setting" msgstr "¥Ý¥¹¥È¥ê¥¹¥È¥Ú¡¼¥¸¥Ê¥Ó¤ÎÀßÄê" -#: xpressme_class.php:409 +#: xpressme_class.php:443 msgid "'Old Page Link' is displayed in the left, and 'Newer Page Link' is displayed in the right" msgstr "¸Å¤¤¥Ú¡¼¥¸¤Ø¤Î¥ê¥ó¥¯¤òº¸¤Ë¡¢¤è¤ê¿·¤·¤¤¥Ú¡¼¥¸¤Ø¤Î¥ê¥ó¥¯¤ò±¦¤Ëɽ¼¨" -#: xpressme_class.php:410 +#: xpressme_class.php:444 msgid "'Newer Page Link' is displayed in the left, and 'Old Page Link' is displayed in the right" msgstr "¤è¤ê¿·¤·¤¤¥Ú¡¼¥¸¤Ø¤Î¥ê¥ó¥¯¤òº¸¤Ë¡¢¸Å¤¤¥Ú¡¼¥¸¤Ø¤Î¥ê¥ó¥¯¤ò±¦¤Ëɽ¼¨" -#: xpressme_class.php:416 +#: xpressme_class.php:450 msgid "Display Navi Title of Old Page Link" msgstr "¸Å¤¤¥Ú¡¼¥¸¤Ø¤Î¥Ê¥Ó¥¿¥¤¥È¥ë¤òÀßÄê" -#: xpressme_class.php:423 +#: xpressme_class.php:457 msgid "Display Navi Title of Newer Page Link" msgstr "¤è¤ê¿·¤·¤¤¥Ú¡¼¥¸¤Ø¤Î¥Ê¥Ó¥¿¥¤¥È¥ë¤òÀßÄê" -#: xpressme_class.php:436 +#: xpressme_class.php:470 msgid "Dashboard feed Display Setting" msgstr "¥À¥Ã¥·¥å¥Ü¡¼¥É¡¡¥Õ¥£¡¼¥Éɽ¼¨ÀßÄê" -#: xpressme_class.php:442 +#: xpressme_class.php:476 msgid "Display XPressMe Integration Kit Blog" msgstr "XPressME Integration Kit ¥Ö¥í¥°¤òɽ¼¨¤¹¤ë¡£" -#: xpressme_class.php:453 +#: xpressme_class.php:487 msgid "Display XPressMe Integration Kit Forum" msgstr "XPressME Integration Kit ¥Õ¥©¡¼¥é¥à¤òɽ¼¨¤¹¤ë¡£" -#: xpressme_class.php:471 +#: xpressme_class.php:505 msgid "Role Setting at Login" msgstr "¥í¥°¥¤¥ó»þ¤Î¸¢¸ÂÀßÄê" -#: xpressme_class.php:474 +#: xpressme_class.php:508 msgid "XOOPS Groupe" msgstr "XOOPS¥°¥ë¡¼¥×̾" -#: xpressme_class.php:474 +#: xpressme_class.php:508 msgid "WordPress Role" msgstr "WordPress¤Ç¤Î¸¢¸Â" -#: xpressme_class.php:474 +#: xpressme_class.php:508 msgid "Role is set at each login" msgstr "¥í¥°¥¤¥ó»þ¡¢¾ï¤Ë¸¢¸Â¤ò¹¹¿·¤¹¤ë" -#: xpressme_class.php:500 -#: xpressme_class.php:504 -#: xpressme_class.php:507 +#: xpressme_class.php:513 +msgid "module cannot be read" +msgstr "¥â¥¸¥å¡¼¥ë¥¢¥¯¥»¥¹¸¢¸Â¤Ê¤·" + +#: xpressme_class.php:545 +#: xpressme_class.php:549 +#: xpressme_class.php:552 msgid "Default Role of WordPress" msgstr "WordPress¤Î¥Ç¥Õ¥©¥ë¥È¸¢¸Â" -#: xpressme_class.php:501 -#: xpressme_class.php:505 -#: xpressme_class.php:508 +#: xpressme_class.php:546 +#: xpressme_class.php:550 +#: xpressme_class.php:553 msgid "Group User Doesn't Register" msgstr "¥æ¡¼¥¶ÅÐÏ¿¤·¤Ê¤¤" -#: xpressme_class.php:521 +#: xpressme_class.php:566 msgid "Only the Admin can set Group Role Setting" msgstr "´ÉÍý¼Ô¤À¤±¤¬¥°¥ë¡¼¥×¸¢¸Â¤òÀßÄê¤Ç¤­¤Þ¤¹¡£" -#: xpressme_class.php:541 +#: xpressme_class.php:586 msgid "WordPress MU cannot integrate the comments." msgstr "WordPress MU¤Ï¥³¥á¥ó¥ÈÅý¹ç¤Ç¤­¤Þ¤»¤ó¡£" -#: xpressme_class.php:543 +#: xpressme_class.php:588 msgid "Do Not Comment Integration." msgstr "¥³¥á¥ó¥ÈÅý¹ç¤·¤Þ¤»¤ó¡£" -#: xpressme_class.php:578 +#: xpressme_class.php:623 msgid "Comment integration with D3Forum" msgstr "D3Forum¤È¤Î¥³¥á¥ó¥ÈÅý¹ç" -#: xpressme_class.php:580 +#: xpressme_class.php:625 msgid "Select the forum of D3Forum that does the comment integration from the following lists." msgstr "°Ê²¼¤Î¥ê¥¹¥È¤«¤é¥³¥á¥ó¥ÈÅý¹ç¤ò¤¹¤ëD3Forum¤Î¥Õ¥©¡¼¥é¥à¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£" -#: xpressme_class.php:585 +#: xpressme_class.php:630 msgid "Select the Type of display of D3Forum comment." msgstr "D3Forum¤Îɽ¼¨¥¿¥¤¥×¤òÁªÂò" -#: xpressme_class.php:587 -#: xpressme_class.php:590 +#: xpressme_class.php:632 +#: xpressme_class.php:635 msgid "Flat" msgstr "¥Õ¥é¥Ã¥È" -#: xpressme_class.php:588 -#: xpressme_class.php:591 +#: xpressme_class.php:633 +#: xpressme_class.php:636 msgid "Threaded" msgstr "¥¹¥ì¥Ã¥É" -#: xpressme_class.php:594 +#: xpressme_class.php:639 msgid "Select the order of display of D3Forum comment." msgstr "D3Forum¥³¥á¥ó¥È¤Îɽ¼¨½ç¤òÁªÂò" -#: xpressme_class.php:596 -#: xpressme_class.php:599 +#: xpressme_class.php:641 +#: xpressme_class.php:644 msgid "DESC" msgstr "¹ß½ç" -#: xpressme_class.php:597 -#: xpressme_class.php:600 +#: xpressme_class.php:642 +#: xpressme_class.php:645 msgid "ASC" msgstr "¾º½ç" -#: xpressme_class.php:603 +#: xpressme_class.php:648 msgid "Number of displays of D3Forum comments." msgstr "D3Forum¤Î¥³¥á¥ó¥Èɽ¼¨¿ô" -#: xpressme_class.php:606 +#: xpressme_class.php:651 msgid "The import and the export between Wordpress Comments and the D3Forum Posts can be done. " msgstr "WordPress¥³¥á¥ó¥È¤ÈD3Forum¥Ý¥¹¥È´Ö¤Î°ì³çžÁ÷¡Ê¥¨¥¯¥¹¥Ý¡¼¥È¡¦¥¤¥ó¥Ý¡¼¥È¡Ë" -#: xpressme_class.php:607 +#: xpressme_class.php:652 msgid "Export to D3Forum" msgstr "D3Forum¤Ø°ì³ç¥¨¥¯¥¹¥Ý¡¼¥È" -#: xpressme_class.php:608 +#: xpressme_class.php:653 msgid "Import from D3Forum" msgstr "D3Forum¤«¤é°ì³ç¥¤¥ó¥Ý¡¼¥È" -#: xpressme_class.php:621 +#: xpressme_class.php:666 msgid "Contents Excerpt Setting" msgstr "µ­»öÈ´¿è¤ÎÀßÄê" -#: xpressme_class.php:626 +#: xpressme_class.php:671 msgid "Is the excerpt display done with the archive of contents?" msgstr "µ­»ö¤Î¥¢¡¼¥«¥¤¥Ö¤ÇÈ´¿èɽ¼¨¤ò¹Ô¤¤¤Þ¤¹¤«¡©" -#: xpressme_class.php:633 +#: xpressme_class.php:678 msgid "When ASCII character more than the set ratio is included, it is judged ASCII contents. " msgstr "ASCIIʸ»ú¤¬´Þ¤Þ¤ì¤ëÈæΨ¤¬ÀßÄꤵ¤ì¤¿Ãͤè¤êÂ礭¤¤¾ì¹ç¡¢ASCIIʸ»ú¥³¥ó¥Æ¥ó¥Ä¤ÈȽÃǤ·¤Þ¤¹¡£" -#: xpressme_class.php:640 +#: xpressme_class.php:685 msgid "Excerpt length of word for ASCII contents" msgstr "ASCII¥³¥ó¥Æ¥ó¥Ä¤ÎÈ´¿èñ¸ì¿ô" -#: xpressme_class.php:647 +#: xpressme_class.php:692 msgid "Excerpt length of character for multibyte contents" msgstr "¥Þ¥ë¥Á¥Ð¥¤¥È¥³¥ó¥Æ¥ó¥Ä¤ÎÈ´¿èʸ»ú¿ô" -#: xpressme_class.php:654 +#: xpressme_class.php:699 msgid "This text is displayed in the link that reads contents not excerpted.(Is not displayed for the blank.)" msgstr "È´¿è¤µ¤ì¤Æ¤¤¤Ê¤¤¥³¥ó¥Æ¥ó¥Ä¤òÆɤि¤á¤Î¥ê¥ó¥¯¤Ëɽ¼¨¤µ¤ì¤ë¥Æ¥­¥¹¥È(¶õÇò¤Î¾ì¹ç¥ê¥ó¥¯¤òɽ¼¨¤·¤Þ¤»¤ó)" -#: xpressme_class.php:661 +#: xpressme_class.php:706 msgid "This text is displayed in the link that more tag (<!--more-->). " msgstr "more ¥¿¥° (<!--more-->)¤Î¥ê¥ó¥¯¤Ëɽ¼¨¤µ¤ì¤ë¥Æ¥­¥¹¥È" -#: xpressme_class.php:673 +#: xpressme_class.php:718 msgid "Display Mode Setting" msgstr "ɽ¼¨¥â¡¼¥ÉÀßÄê" -#: xpressme_class.php:676 +#: xpressme_class.php:721 msgid "Select the XPressME Display Mode." msgstr "XPressME¤Îɽ¼¨¥â¡¼¥É¤ÎÁªÂò" -#: xpressme_class.php:681 +#: xpressme_class.php:726 msgid "Xoops Mode" msgstr "XOOPS¥â¡¼¥É" -#: xpressme_class.php:685 +#: xpressme_class.php:730 msgid "WordPress Mode" msgstr "WordPress¥â¡¼¥É" -#: xpressme_class.php:689 +#: xpressme_class.php:734 msgid "User select" msgstr "¥æ¡¼¥¶¤Ë¤è¤ëÁªÂò" -#: xpressme_class.php:694 +#: xpressme_class.php:739 msgid "Select the theme used in the XOOPS Mode." msgstr "XOOPS¥â¡¼¥É¤Ç»ÈÍѤ¹¤ë¥Æ¡¼¥Þ¤òÁªÂò" -#: xpressme_class.php:699 +#: xpressme_class.php:744 msgid "Use WordPress Selected Themes" msgstr "WordPress¤ÇÁªÂò¤·¤¿¥Æ¡¼¥Þ¤ò»È¤¦" -#: xpressme_class.php:717 +#: xpressme_class.php:762 msgid "Header Meta Option" msgstr "¥Ø¥Ã¥À¥á¥¿¡¡¥ª¥×¥·¥ç¥ó" -#: xpressme_class.php:722 +#: xpressme_class.php:767 msgid "Select the Header keyword." msgstr "¥Ø¥Ã¥À¤Ç»ÈÍѤ¹¤ë¥­¡¼¥ï¡¼¥É¤ÎÁªÂò" -#: xpressme_class.php:727 +#: xpressme_class.php:772 msgid "Xoops KeyWord" msgstr "XOOPS¤Î¥­¡¼¥ï¡¼¥É" -#: xpressme_class.php:730 +#: xpressme_class.php:775 msgid "WordPress KeyWord" msgstr "WordPress¤Î¥­¡¼¥ï¡¼¥É" -#: xpressme_class.php:733 +#: xpressme_class.php:778 msgid "WordPress & Xoops KeyWord" msgstr "WordPress£ê¤ÈXOOPS¤Î¥­¡¼¥ï¡¼¥É" -#: xpressme_class.php:739 +#: xpressme_class.php:784 msgid "Select the Header Description." msgstr "¥Ø¥Ã¥À¤Ç»ÈÍѤ¹¤ë¥Ç¥£¥¹¥¯¥ê¥×¥·¥ç¥ó¡ÊÀâÌÀ¡Ë¤ÎÁªÂò" -#: xpressme_class.php:744 +#: xpressme_class.php:789 msgid "Xoops Description" msgstr "XOOPS¤Î¥Ç¥£¥¹¥¯¥ê¥×¥·¥ç¥ó" -#: xpressme_class.php:747 +#: xpressme_class.php:792 msgid "WordPress Description" msgstr "WordPress¤Î¥Ç¥£¥¹¥¯¥ê¥×¥·¥ç¥ó" -#: xpressme_class.php:750 +#: xpressme_class.php:795 msgid "WordPress & Xoops Description" msgstr "WordPress¤ÈXOOPS¤Î¥Ç¥£¥¹¥¯¥ê¥×¥·¥ç¥ó" -#: xpressme_class.php:756 +#: xpressme_class.php:801 msgid "Select the Header Robots Index." msgstr "¥Ø¥Ã¥À¤Ç»ÈÍѤ¹¤ë¥í¥Ü¥Ã¥È¥¤¥ó¥Ç¥Ã¥¯¥¹¤ÎÁªÂò" -#: xpressme_class.php:761 +#: xpressme_class.php:806 msgid "Xoops Robots Index" msgstr "XOOPS¤Î¥í¥Ü¥Ã¥È¥¤¥ó¥Ç¥Ã¥¯¥¹" -#: xpressme_class.php:764 +#: xpressme_class.php:809 msgid "WordPress Robots Index" msgstr "WordPress¤Î¥í¥Ü¥Ã¥È¥¤¥ó¥Ç¥Ã¥¯¥¹" -#: xpressme_class.php:793 +#: xpressme_class.php:838 #, php-format msgid "Unable to create directory %s. Is its parent directory writable by the server?" @@ -498,81 +502,81 @@ msgstr "%s¤Î¥Ñ¡¼¥Þ¥ê¥ó¥¯" -#: include/custom_functions.php:429 -#: include/custom_functions.php:459 +#: include/custom_functions.php:431 +#: include/custom_functions.php:461 #, php-format msgid "views :%d" msgstr "±ÜÍ÷¿ô :%d" -#: include/custom_functions.php:623 +#: include/custom_functions.php:625 msgid "Main" msgstr "¥á¥¤¥ó" -#: include/custom_functions.php:626 +#: include/custom_functions.php:628 #, php-format msgid "Archive for the ‘%s’ Category" msgstr "¥«¥Æ¥´¥ê¡¼ ‘%s’ ¤Î¥¢¡¼¥«¥¤¥Ö" -#: include/custom_functions.php:629 +#: include/custom_functions.php:631 #, php-format msgid "Posts Tagged ‘%s’" msgstr "‘%s’ ¥¿¥°¤Î¤Ä¤¤¤Æ¤¤¤ëÅê¹Æ" -#: include/custom_functions.php:632 +#: include/custom_functions.php:634 #, php-format msgid "Archive for %s|Daily archive page" msgstr "%s¤ÎÆüÊÌ¥¢¡¼¥«¥¤¥Ö" -#: include/custom_functions.php:632 +#: include/custom_functions.php:634 msgid "F jS, Y" msgstr "Yǯn·îjÆü" -#: include/custom_functions.php:634 +#: include/custom_functions.php:636 #, php-format msgid "Archive for %s|Monthly archive page" msgstr "%s¤Î·îÊÌ¥¢¡¼¥«¥¤¥Ö" -#: include/custom_functions.php:634 +#: include/custom_functions.php:636 msgid "F, Y" msgstr "Yǯn·î" -#: include/custom_functions.php:636 +#: include/custom_functions.php:638 #, php-format msgid "Archive for %s|Yearly archive page" msgstr "%s¤ÎǯÊÌ¥¢¡¼¥«¥¤¥Ö " -#: include/custom_functions.php:636 +#: include/custom_functions.php:638 msgid "Y" msgstr "Yǯ" -#: include/custom_functions.php:639 +#: include/custom_functions.php:641 #, php-format msgid "Archive for the ‘%s’ Author" msgstr "Åê¹Æ¼Ô ‘%s’ ¤Î¥¢¡¼¥«¥¤¥Ö" -#: include/custom_functions.php:642 +#: include/custom_functions.php:644 #, php-format msgid "Search Results of word ‘%s’" msgstr "‘%s’ ¤Î¸¡º÷·ë²Ì" -#: include/custom_functions.php:648 #: include/custom_functions.php:650 +#: include/custom_functions.php:652 #, php-format msgid "Article of %s" msgstr "%s¤Îµ­»ö" -#: include/custom_functions.php:672 +#: include/custom_functions.php:674 #, php-format msgid "From %1$s on site %2$s" msgstr "¥µ¥¤¥È %2$s ¤Î %1$s ¤è¤ê" -#: include/custom_functions.php:693 +#: include/custom_functions.php:695 msgid "No Trackback/Pingback" msgstr "¥È¥é¥Ã¥¯¥Ð¥Ã¥¯¡¦¥Ô¥ó¥Ð¥Ã¥¯¤Ï¤¢¤ê¤Þ¤»¤ó" -#: include/custom_functions.php:694 +#: include/custom_functions.php:696 msgid "One Trackback/Pingback" msgstr "¥È¥é¥Ã¥¯¥Ð¥Ã¥¯¡¦¥Ô¥ó¥Ð¥Ã¥¯ 1 ·ï" -#: include/custom_functions.php:695 +#: include/custom_functions.php:697 msgid "% TrackBack/Pingback" msgstr "¥È¥é¥Ã¥¯¥Ð¥Ã¥¯¡¦¥Ô¥ó¥Ð¥Ã¥¯ % ·ï" @@ -620,5 +624,5 @@ msgstr "WordPress¥â¡¼¥É¤ØÀÚÂØ" -#: include/xpress_common_functions.php:390 +#: include/xpress_common_functions.php:382 #, php-format msgid "Block file %1$s is an old version %2$s.
used block file %3$s of new version %4$s." @@ -629,54 +633,56 @@ msgstr "XPressME ¥¢¥Ã¥×¥°¥ì¡¼¥É" -#: include/xpress_upgrade.php:28 +#: include/xpress_upgrade.php:27 #, php-format msgid "You are using a XPressME Integration Kit development version (%1$s). Cool! Please stay updated." msgstr "¤ª»È¤¤¤Î XPressME Integration Kit ¤Ï³«È¯ÈÇ (%1$s) ¤Ç¤¹¡£¤¹¤Ð¤é¤·¤¤ ! ¤É¤¦¤¾ºÇ¿·ÈǤò»È¤¤Â³¤±¤Æ¤¯¤À¤µ¤¤¡£" -#: include/xpress_upgrade.php:32 +#: include/xpress_upgrade.php:31 msgid "There is a new version of XPressME Integration Kit available for upgrade" msgstr "¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤Î XPressME Integration Kit ¤Ë¥¢¥Ã¥×¥°¥ì¡¼¥É¤¬²Äǽ¤Ç¤¹" -#: include/xpress_upgrade.php:35 +#: include/xpress_upgrade.php:33 #, php-format msgid "You can upgrade to version %s download the package and install it manually:" msgstr "¥Ð¡¼¥¸¥ç¥ó %s ¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¼êÆ°¤Ç¥À¥¦¥ó¥í¡¼¥É¤·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£" -#: include/xpress_upgrade.php:38 -#: include/xpress_upgrade.php:61 +#: include/xpress_upgrade.php:36 +#: include/xpress_upgrade.php:60 #, php-format msgid "Download %s" msgstr "%s ¤ò¥À¥¦¥ó¥í¡¼¥É" -#: include/xpress_upgrade.php:43 +#: include/xpress_upgrade.php:41 +#: include/xpress_upgrade.php:68 #, php-format msgid "You can download the differential file from version %s to %s and upgrade it manually:" msgstr "¥Ð¡¼¥¸¥ç¥ó%s¤«¤é%s¤Ø¤Îº¹Ê¬¥Õ¥¡¥¤¥ë¤ò¥À¥¦¥ó¥í¡¼¥É¤·¡¢¼êÆ°¤Ç¥¢¥Ã¥×¥°¥ì¡¼¥É¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡§" -#: include/xpress_upgrade.php:46 +#: include/xpress_upgrade.php:44 +#: include/xpress_upgrade.php:71 #, php-format msgid "Download differential file for %s" msgstr "%s¤Îº¹Ê¬¥Õ¥¡¥¤¥ë¤ò¥À¥¦¥ó¥í¡¼¥É" -#: include/xpress_upgrade.php:50 +#: include/xpress_upgrade.php:48 msgid "You have the latest version of XPressME Integration Kit. You do not need to upgrade" msgstr "ºÇ¿·¥Ð¡¼¥¸¥ç¥ó¤Î XPressME Integration Kit ¤ò¤´ÍøÍÑÃæ¤Ç¤¹¡£¥¢¥Ã¥×¥°¥ì¡¼¥É¤ÎɬÍפϤ¢¤ê¤Þ¤»¤ó¡£" -#: include/xpress_upgrade.php:58 +#: include/xpress_upgrade.php:57 #, php-format msgid "You can use the development version %s download the package and install it manually:" msgstr "³«È¯¥Ð¡¼¥¸¥ç¥ó %s ¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¼êÆ°¤Ç¥À¥¦¥ó¥í¡¼¥É¤·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£" -#: include/xpress_upgrade.php:67 +#: include/xpress_upgrade.php:78 #, php-format msgid "There is no response from version check API now. sorry, please confirm it after." msgstr "¸½ºß¡¢version check API¤«¤é¤Î¥ì¥¹¥Ý¥ó¥¹¤¬¤¢¤ê¤Þ¤»¤ó¡£¡¡¿½¤·Ìõ¤¢¤ê¤Þ¤»¤ó¤¬¡¢¤·¤Ð¤é¤¯¸å¤Ç³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£" -#: include/xpress_upgrade.php:212 +#: include/xpress_upgrade.php:235 #, php-format msgid "XPressME Integration Kit Version %1$s is available! Please update now." msgstr "XPressME Integration Kit Version %1$s ¤¬ÍøÍѲÄǽ¤Ç¤¹ ! ¥¢¥Ã¥×¥Ç¡¼¥È¤·¤Æ¤¯¤À¤µ¤¤¡£" -#: include/xpress_upgrade.php:214 +#: include/xpress_upgrade.php:237 #, php-format msgid "XPressME Integration Kit Version %1$s is available! Please notify the site administrator." Index: /branches/Ver2.2/extras/for_wordpressme2011/ja_UTF/language/ja_utf8/admin.php =================================================================== --- /branches/Ver2.2/extras/for_wordpressme2011/ja_UTF/language/ja_utf8/admin.php (revision 527) +++ /branches/Ver2.2/extras/for_wordpressme2011/ja_UTF/language/ja_utf8/admin.php (revision 528) @@ -19,4 +19,6 @@ define("_AM_XP2_SYS_REPORT","レポート形式で表示"); define("_AM_XP2_SYS_NORMAL","ノーマル形式で表示"); + define("_AM_XP2_BLOCK_OPTIONS","ブロックオプション"); + define("_AM_XP2_GROUP_ROLE","グループ権限"); // Block Check Index: /branches/Ver2.2/extras/for_wordpressme2011/ja_UTF/language/ja_utf8/blocks.php =================================================================== --- /branches/Ver2.2/extras/for_wordpressme2011/ja_UTF/language/ja_utf8/blocks.php (revision 527) +++ /branches/Ver2.2/extras/for_wordpressme2011/ja_UTF/language/ja_utf8/blocks.php (revision 528) @@ -27,4 +27,5 @@ define("_MB_XP2_FILE_NAME","ファイル名"); define("_MB_XP2_THISTEMPLATE","このブロックのテンプレート"); + define("_MB_XP2_NO_JSCRIPT","ブラウザでJavascriptを有効にする必要があります。"); // recent comment block @@ -48,4 +49,5 @@ define("_MB_XP2_DAYS_AND","から"); define("_MB_XP2_DAYS_AGO","日前までの間"); + define("_MB_XP2_CATS_DIRECT_SELECT","IDを直接指定(複数ある場合はカンマ区切りで入力)"); // recent posts list Index: /branches/Ver2.2/extras/for_wordpressme2011/ja_UTF/wp-content/plugins/xpressme/language/xpressme-ja_UTF.po =================================================================== --- /branches/Ver2.2/extras/for_wordpressme2011/ja_UTF/wp-content/plugins/xpressme/language/xpressme-ja_UTF.po (revision 527) +++ /branches/Ver2.2/extras/for_wordpressme2011/ja_UTF/wp-content/plugins/xpressme/language/xpressme-ja_UTF.po (revision 528) @@ -8,6 +8,6 @@ "Project-Id-Version: XPressME Plugin\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-06 21:59+0900\n" -"PO-Revision-Date: 2009-11-20 12:53+0900\n" +"POT-Creation-Date: 2010-02-26 16:00+0900\n" +"PO-Revision-Date: 2010-02-26 16:14+0900\n" "Last-Translator: toemon \n" "Language-Team: toemon \n" @@ -43,113 +43,113 @@ msgstr "モジュール管理へ" -#: xpressme.php:164 +#: xpressme.php:159 msgid "XPressME Display Setting" msgstr "XPressME 表示設定" -#: xpressme.php:170 +#: xpressme.php:165 msgid "Thema Sidebar Display" msgstr "テーマ表示時にサイドバー表示する。" -#: xpressme.php:171 -#: xpressme.php:263 -#: xpressme.php:269 -#: xpressme.php:274 -#: xpressme.php:280 -#: xpressme_class.php:296 -#: xpressme_class.php:314 -#: xpressme_class.php:445 -#: xpressme_class.php:456 +#: xpressme.php:166 +#: xpressme.php:259 +#: xpressme.php:265 +#: xpressme.php:270 +#: xpressme.php:276 +#: xpressme_class.php:330 +#: xpressme_class.php:348 +#: xpressme_class.php:479 +#: xpressme_class.php:490 msgid "YES" msgstr "はい" -#: xpressme.php:172 -#: xpressme.php:264 -#: xpressme.php:270 -#: xpressme.php:275 -#: xpressme.php:281 -#: xpressme_class.php:297 -#: xpressme_class.php:315 -#: xpressme_class.php:446 -#: xpressme_class.php:457 +#: xpressme.php:167 +#: xpressme.php:260 +#: xpressme.php:266 +#: xpressme.php:271 +#: xpressme.php:277 +#: xpressme_class.php:331 +#: xpressme_class.php:349 +#: xpressme_class.php:480 +#: xpressme_class.php:491 msgid "NO" msgstr "いいえ" -#: xpressme.php:181 -#: xpressme.php:232 -#: xpressme.php:291 +#: xpressme.php:176 +#: xpressme.php:228 +#: xpressme.php:287 msgid "Update Config" msgstr "更新" -#: xpressme.php:182 -#: xpressme.php:233 -#: xpressme.php:292 +#: xpressme.php:177 +#: xpressme.php:229 +#: xpressme.php:288 msgid "Preset Config" msgstr "プリセット" -#: xpressme.php:214 +#: xpressme.php:210 msgid "XPressME Integration Setting" msgstr "XPressME 統合設定" -#: xpressme.php:218 +#: xpressme.php:214 msgid "Media Upload Base Path" msgstr "メディアアップロードのベースパス設定" -#: xpressme.php:222 +#: xpressme.php:218 msgid "Use XOOPS UPLOAD PATH" msgstr "XOOPSのアップロードパスを使用する。" -#: xpressme.php:223 +#: xpressme.php:219 msgid "USE WordPress BASE_PATH" msgstr "WordPressのベースパスを使用する。" -#: xpressme.php:257 +#: xpressme.php:253 msgid "XPressME Other Setting" msgstr "XPressME その他の設定" -#: xpressme.php:262 +#: xpressme.php:258 msgid "The change tracking of the post is preserved" msgstr "投稿の変更履歴を有効にする。" -#: xpressme.php:268 +#: xpressme.php:264 msgid "Select Multi user mode" msgstr "マルチユーザーモードを選択" -#: xpressme.php:273 +#: xpressme.php:269 msgid "Is the posts author views counted?" msgstr "投稿者の閲覧をカウントしますか？" -#: xpressme.php:279 +#: xpressme.php:275 msgid "Is SQL debugging window displayed?" msgstr "SQLデバッグウィンドを表示しますか？" -#: xpressme.php:284 +#: xpressme.php:280 msgid "Select warning display of block file version check" msgstr "ブロックファイルのバージョンチェック時における警告表示" -#: xpressme.php:285 +#: xpressme.php:281 msgid "Do display" msgstr "表示する" -#: xpressme.php:286 +#: xpressme.php:282 msgid "Do not display" msgstr "表示しない" #: xpressme_class.php:61 -#: xpressme_class.php:243 +#: xpressme_class.php:277 msgid "Older Post" msgstr "前の投稿へ" #: xpressme_class.php:62 -#: xpressme_class.php:246 +#: xpressme_class.php:280 msgid "Newer Post" msgstr "次の投稿へ" #: xpressme_class.php:64 -#: xpressme_class.php:249 +#: xpressme_class.php:283 msgid "Older Entries" msgstr "前ページへ" #: xpressme_class.php:65 -#: xpressme_class.php:252 +#: xpressme_class.php:286 msgid "Newer Entries" msgstr "次ページへ" @@ -157,274 +157,278 @@ #: xpressme_class.php:79 #: xpressme_class.php:80 -#: xpressme_class.php:255 +#: xpressme_class.php:289 msgid "Read the rest of this entry »" msgstr "この投稿の続きを読む »" -#: xpressme_class.php:356 +#: xpressme_class.php:390 msgid "Single Post Navi Setting" msgstr "シングルポストナビの設定" -#: xpressme_class.php:361 -#: xpressme_class.php:406 +#: xpressme_class.php:395 +#: xpressme_class.php:440 msgid "Adjustment of Navi link display position" msgstr "リンクの表示位置設定" -#: xpressme_class.php:364 +#: xpressme_class.php:398 msgid "'Old Post Link' is displayed in the left, and 'Newer Post Link' is displayed in the right" msgstr "以前の記事へのリンクを左に、より新しい記事へのリンクを右に表示" -#: xpressme_class.php:365 +#: xpressme_class.php:399 msgid "'Newer Post Link' is displayed in the left, and 'Old Post Link' is displayed in the right" msgstr "より新しい記事へのリンクを左に、古い記事へのリンクを右に表示" -#: xpressme_class.php:371 +#: xpressme_class.php:405 msgid "Select Display name of PostNavi Link" msgstr "表示するリンクテキストを選択" -#: xpressme_class.php:374 +#: xpressme_class.php:408 msgid "Title of post" msgstr "投稿記事のタイトルを表示" -#: xpressme_class.php:375 +#: xpressme_class.php:409 msgid "Title of Navi" msgstr "ナビタイトルを表示" -#: xpressme_class.php:381 +#: xpressme_class.php:415 msgid "Display Navi Title of Old Post Link" msgstr "古い記事へのナビタイトルを設定" -#: xpressme_class.php:388 +#: xpressme_class.php:422 msgid "Display Navi Title of Newer Post Link" msgstr "より新しい記事へのナビタイトルを設定" -#: xpressme_class.php:401 +#: xpressme_class.php:435 msgid "Posts List Page Navi Setting" msgstr "ポストリストページナビの設定" -#: xpressme_class.php:409 +#: xpressme_class.php:443 msgid "'Old Page Link' is displayed in the left, and 'Newer Page Link' is displayed in the right" msgstr "古いページへのリンクを左に、より新しいページへのリンクを右に表示" -#: xpressme_class.php:410 +#: xpressme_class.php:444 msgid "'Newer Page Link' is displayed in the left, and 'Old Page Link' is displayed in the right" msgstr "より新しいページへのリンクを左に、古いページへのリンクを右に表示" -#: xpressme_class.php:416 +#: xpressme_class.php:450 msgid "Display Navi Title of Old Page Link" msgstr "古いページへのナビタイトルを設定" -#: xpressme_class.php:423 +#: xpressme_class.php:457 msgid "Display Navi Title of Newer Page Link" msgstr "より新しいページへのナビタイトルを設定" -#: xpressme_class.php:436 +#: xpressme_class.php:470 msgid "Dashboard feed Display Setting" msgstr "ダッシュボード　フィード表示設定" -#: xpressme_class.php:442 +#: xpressme_class.php:476 msgid "Display XPressMe Integration Kit Blog" msgstr "XPressME Integration Kit ブログを表示する。" -#: xpressme_class.php:453 +#: xpressme_class.php:487 msgid "Display XPressMe Integration Kit Forum" msgstr "XPressME Integration Kit フォーラムを表示する。" -#: xpressme_class.php:471 +#: xpressme_class.php:505 msgid "Role Setting at Login" msgstr "ログイン時の権限設定" -#: xpressme_class.php:474 +#: xpressme_class.php:508 msgid "XOOPS Groupe" msgstr "XOOPSグループ名" -#: xpressme_class.php:474 +#: xpressme_class.php:508 msgid "WordPress Role" msgstr "WordPressでの権限" -#: xpressme_class.php:474 +#: xpressme_class.php:508 msgid "Role is set at each login" msgstr "ログイン時、常に権限を更新する" -#: xpressme_class.php:500 -#: xpressme_class.php:504 -#: xpressme_class.php:507 +#: xpressme_class.php:513 +msgid "module cannot be read" +msgstr "モジュールアクセス権限なし" + +#: xpressme_class.php:545 +#: xpressme_class.php:549 +#: xpressme_class.php:552 msgid "Default Role of WordPress" msgstr "WordPressのデフォルト権限" -#: xpressme_class.php:501 -#: xpressme_class.php:505 -#: xpressme_class.php:508 +#: xpressme_class.php:546 +#: xpressme_class.php:550 +#: xpressme_class.php:553 msgid "Group User Doesn't Register" msgstr "ユーザ登録しない" -#: xpressme_class.php:521 +#: xpressme_class.php:566 msgid "Only the Admin can set Group Role Setting" msgstr "管理者だけがグループ権限を設定できます。" -#: xpressme_class.php:541 +#: xpressme_class.php:586 msgid "WordPress MU cannot integrate the comments." msgstr "WordPress MUはコメント統合できません。" -#: xpressme_class.php:543 +#: xpressme_class.php:588 msgid "Do Not Comment Integration." msgstr "コメント統合しません。" -#: xpressme_class.php:578 +#: xpressme_class.php:623 msgid "Comment integration with D3Forum" msgstr "D3Forumとのコメント統合" -#: xpressme_class.php:580 +#: xpressme_class.php:625 msgid "Select the forum of D3Forum that does the comment integration from the following lists." msgstr "以下のリストからコメント統合をするD3Forumのフォーラムを選択してください。" -#: xpressme_class.php:585 +#: xpressme_class.php:630 msgid "Select the Type of display of D3Forum comment." msgstr "D3Forumの表示タイプを選択" -#: xpressme_class.php:587 -#: xpressme_class.php:590 +#: xpressme_class.php:632 +#: xpressme_class.php:635 msgid "Flat" msgstr "フラット" -#: xpressme_class.php:588 -#: xpressme_class.php:591 +#: xpressme_class.php:633 +#: xpressme_class.php:636 msgid "Threaded" msgstr "スレッド" -#: xpressme_class.php:594 +#: xpressme_class.php:639 msgid "Select the order of display of D3Forum comment." msgstr "D3Forumコメントの表示順を選択" -#: xpressme_class.php:596 -#: xpressme_class.php:599 +#: xpressme_class.php:641 +#: xpressme_class.php:644 msgid "DESC" msgstr "降順" -#: xpressme_class.php:597 -#: xpressme_class.php:600 +#: xpressme_class.php:642 +#: xpressme_class.php:645 msgid "ASC" msgstr "昇順" -#: xpressme_class.php:603 +#: xpressme_class.php:648 msgid "Number of displays of D3Forum comments." msgstr "D3Forumのコメント表示数" -#: xpressme_class.php:606 +#: xpressme_class.php:651 msgid "The import and the export between Wordpress Comments and the D3Forum Posts can be done. " msgstr "WordPressコメントとD3Forumポスト間の一括転送（エクスポート・インポート）" -#: xpressme_class.php:607 +#: xpressme_class.php:652 msgid "Export to D3Forum" msgstr "D3Forumへ一括エクスポート" -#: xpressme_class.php:608 +#: xpressme_class.php:653 msgid "Import from D3Forum" msgstr "D3Forumから一括インポート" -#: xpressme_class.php:621 +#: xpressme_class.php:666 msgid "Contents Excerpt Setting" msgstr "記事抜粋の設定" -#: xpressme_class.php:626 +#: xpressme_class.php:671 msgid "Is the excerpt display done with the archive of contents?" msgstr "記事のアーカイブで抜粋表示を行いますか？" -#: xpressme_class.php:633 +#: xpressme_class.php:678 msgid "When ASCII character more than the set ratio is included, it is judged ASCII contents. " msgstr "ASCII文字が含まれる比率が設定された値より大きい場合、ASCII文字コンテンツと判断します。" -#: xpressme_class.php:640 +#: xpressme_class.php:685 msgid "Excerpt length of word for ASCII contents" msgstr "ASCIIコンテンツの抜粋単語数" -#: xpressme_class.php:647 +#: xpressme_class.php:692 msgid "Excerpt length of character for multibyte contents" msgstr "マルチバイトコンテンツの抜粋文字数" -#: xpressme_class.php:654 +#: xpressme_class.php:699 msgid "This text is displayed in the link that reads contents not excerpted.(Is not displayed for the blank.)" msgstr "抜粋されていないコンテンツを読むためのリンクに表示されるテキスト(空白の場合リンクを表示しません)" -#: xpressme_class.php:661 +#: xpressme_class.php:706 msgid "This text is displayed in the link that more tag (<!--more-->). " msgstr "more タグ (<!--more-->)のリンクに表示されるテキスト" -#: xpressme_class.php:673 +#: xpressme_class.php:718 msgid "Display Mode Setting" msgstr "表示モード設定" -#: xpressme_class.php:676 +#: xpressme_class.php:721 msgid "Select the XPressME Display Mode." msgstr "XPressMEの表示モードの選択" -#: xpressme_class.php:681 +#: xpressme_class.php:726 msgid "Xoops Mode" msgstr "XOOPSモード" -#: xpressme_class.php:685 +#: xpressme_class.php:730 msgid "WordPress Mode" msgstr "WordPressモード" -#: xpressme_class.php:689 +#: xpressme_class.php:734 msgid "User select" msgstr "ユーザによる選択" -#: xpressme_class.php:694 +#: xpressme_class.php:739 msgid "Select the theme used in the XOOPS Mode." msgstr "XOOPSモードで使用するテーマを選択" -#: xpressme_class.php:699 +#: xpressme_class.php:744 msgid "Use WordPress Selected Themes" msgstr "WordPressで選択したテーマを使う" -#: xpressme_class.php:717 +#: xpressme_class.php:762 msgid "Header Meta Option" msgstr "ヘッダメタ　オプション" -#: xpressme_class.php:722 +#: xpressme_class.php:767 msgid "Select the Header keyword." msgstr "ヘッダで使用するキーワードの選択" -#: xpressme_class.php:727 +#: xpressme_class.php:772 msgid "Xoops KeyWord" msgstr "XOOPSのキーワード" -#: xpressme_class.php:730 +#: xpressme_class.php:775 msgid "WordPress KeyWord" msgstr "WordPressのキーワード" -#: xpressme_class.php:733 +#: xpressme_class.php:778 msgid "WordPress & Xoops KeyWord" msgstr "WordPressｊとXOOPSのキーワード" -#: xpressme_class.php:739 +#: xpressme_class.php:784 msgid "Select the Header Description." msgstr "ヘッダで使用するディスクリプション（説明）の選択" -#: xpressme_class.php:744 +#: xpressme_class.php:789 msgid "Xoops Description" msgstr "XOOPSのディスクリプション" -#: xpressme_class.php:747 +#: xpressme_class.php:792 msgid "WordPress Description" msgstr "WordPressのディスクリプション" -#: xpressme_class.php:750 +#: xpressme_class.php:795 msgid "WordPress & Xoops Description" msgstr "WordPressとXOOPSのディスクリプション" -#: xpressme_class.php:756 +#: xpressme_class.php:801 msgid "Select the Header Robots Index." msgstr "ヘッダで使用するロボットインデックスの選択" -#: xpressme_class.php:761 +#: xpressme_class.php:806 msgid "Xoops Robots Index" msgstr "XOOPSのロボットインデックス" -#: xpressme_class.php:764 +#: xpressme_class.php:809 msgid "WordPress Robots Index" msgstr "WordPressのロボットインデックス" -#: xpressme_class.php:793 +#: xpressme_class.php:838 #, php-format msgid "Unable to create directory %s. Is its parent directory writable by the server?" @@ -498,81 +502,81 @@ msgstr "%sのパーマリンク" -#: include/custom_functions.php:429 -#: include/custom_functions.php:459 +#: include/custom_functions.php:431 +#: include/custom_functions.php:461 #, php-format msgid "views :%d" msgstr "閲覧数 :%d" -#: include/custom_functions.php:623 +#: include/custom_functions.php:625 msgid "Main" msgstr "メイン" -#: include/custom_functions.php:626 +#: include/custom_functions.php:628 #, php-format msgid "Archive for the ‘%s’ Category" msgstr "カテゴリー ‘%s’ のアーカイブ" -#: include/custom_functions.php:629 +#: include/custom_functions.php:631 #, php-format msgid "Posts Tagged ‘%s’" msgstr "‘%s’ タグのついている投稿" -#: include/custom_functions.php:632 +#: include/custom_functions.php:634 #, php-format msgid "Archive for %s|Daily archive page" msgstr "%sの日別アーカイブ" -#: include/custom_functions.php:632 +#: include/custom_functions.php:634 msgid "F jS, Y" msgstr "Y年n月j日" -#: include/custom_functions.php:634 +#: include/custom_functions.php:636 #, php-format msgid "Archive for %s|Monthly archive page" msgstr "%sの月別アーカイブ" -#: include/custom_functions.php:634 +#: include/custom_functions.php:636 msgid "F, Y" msgstr "Y年n月" -#: include/custom_functions.php:636 +#: include/custom_functions.php:638 #, php-format msgid "Archive for %s|Yearly archive page" msgstr "%sの年別アーカイブ " -#: include/custom_functions.php:636 +#: include/custom_functions.php:638 msgid "Y" msgstr "Y年" -#: include/custom_functions.php:639 +#: include/custom_functions.php:641 #, php-format msgid "Archive for the ‘%s’ Author" msgstr "投稿者 ‘%s’ のアーカイブ" -#: include/custom_functions.php:642 +#: include/custom_functions.php:644 #, php-format msgid "Search Results of word ‘%s’" msgstr "‘%s’ の検索結果" -#: include/custom_functions.php:648 #: include/custom_functions.php:650 +#: include/custom_functions.php:652 #, php-format msgid "Article of %s" msgstr "%sの記事" -#: include/custom_functions.php:672 +#: include/custom_functions.php:674 #, php-format msgid "From %1$s on site %2$s" msgstr "サイト %2$s の %1$s より" -#: include/custom_functions.php:693 +#: include/custom_functions.php:695 msgid "No Trackback/Pingback" msgstr "トラックバック・ピンバックはありません" -#: include/custom_functions.php:694 +#: include/custom_functions.php:696 msgid "One Trackback/Pingback" msgstr "トラックバック・ピンバック 1 件" -#: include/custom_functions.php:695 +#: include/custom_functions.php:697 msgid "% TrackBack/Pingback" msgstr "トラックバック・ピンバック % 件" @@ -620,5 +624,5 @@ msgstr "WordPressモードへ切替" -#: include/xpress_common_functions.php:390 +#: include/xpress_common_functions.php:382 #, php-format msgid "Block file %1$s is an old version %2$s.
used block file %3$s of new version %4$s." @@ -629,54 +633,56 @@ msgstr "XPressME アップグレード" -#: include/xpress_upgrade.php:28 +#: include/xpress_upgrade.php:27 #, php-format msgid "You are using a XPressME Integration Kit development version (%1$s). Cool! Please stay updated." msgstr "お使いの XPressME Integration Kit は開発版 (%1$s) です。すばらしい ! どうぞ最新版を使い続けてください。" -#: include/xpress_upgrade.php:32 +#: include/xpress_upgrade.php:31 msgid "There is a new version of XPressME Integration Kit available for upgrade" msgstr "新しいバージョンの XPressME Integration Kit にアップグレードが可能です" -#: include/xpress_upgrade.php:35 +#: include/xpress_upgrade.php:33 #, php-format msgid "You can upgrade to version %s download the package and install it manually:" msgstr "バージョン %s のパッケージを手動でダウンロードしてインストールすることができます。" -#: include/xpress_upgrade.php:38 -#: include/xpress_upgrade.php:61 +#: include/xpress_upgrade.php:36 +#: include/xpress_upgrade.php:60 #, php-format msgid "Download %s" msgstr "%s をダウンロード" -#: include/xpress_upgrade.php:43 +#: include/xpress_upgrade.php:41 +#: include/xpress_upgrade.php:68 #, php-format msgid "You can download the differential file from version %s to %s and upgrade it manually:" msgstr "バージョン%sから%sへの差分ファイルをダウンロードし、手動でアップグレードすることができます：" -#: include/xpress_upgrade.php:46 +#: include/xpress_upgrade.php:44 +#: include/xpress_upgrade.php:71 #, php-format msgid "Download differential file for %s" msgstr "%sの差分ファイルをダウンロード" -#: include/xpress_upgrade.php:50 +#: include/xpress_upgrade.php:48 msgid "You have the latest version of XPressME Integration Kit. You do not need to upgrade" msgstr "最新バージョンの XPressME Integration Kit をご利用中です。アップグレードの必要はありません。" -#: include/xpress_upgrade.php:58 +#: include/xpress_upgrade.php:57 #, php-format msgid "You can use the development version %s download the package and install it manually:" msgstr "開発バージョン %s のパッケージを手動でダウンロードしてインストールすることができます。" -#: include/xpress_upgrade.php:67 +#: include/xpress_upgrade.php:78 #, php-format msgid "There is no response from version check API now. sorry, please confirm it after." msgstr "現在、version check APIからのレスポンスがありません。　申し訳ありませんが、しばらく後で確認してください。" -#: include/xpress_upgrade.php:212 +#: include/xpress_upgrade.php:235 #, php-format msgid "XPressME Integration Kit Version %1$s is available! Please update now." msgstr "XPressME Integration Kit Version %1$s が利用可能です ! アップデートしてください。" -#: include/xpress_upgrade.php:214 +#: include/xpress_upgrade.php:237 #, php-format msgid "XPressME Integration Kit Version %1$s is available! Please notify the site administrator." Index: /branches/Ver2.2/extras/xpress_i18n/portuguese-br/xpressme_modules_root/language/pt-br_utf8/admin.php =================================================================== --- /branches/Ver2.2/extras/xpress_i18n/portuguese-br/xpressme_modules_root/language/pt-br_utf8/admin.php (revision 527) +++ /branches/Ver2.2/extras/xpress_i18n/portuguese-br/xpressme_modules_root/language/pt-br_utf8/admin.php (revision 528) @@ -19,4 +19,6 @@ define("_AM_XP2_SYS_REPORT","Exibir em forma de relatório"); define("_AM_XP2_SYS_NORMAL","Exibir em formato normal"); + define("_AM_XP2_BLOCK_OPTIONS","Bloqueie Opções"); + define("_AM_XP2_GROUP_ROLE","Se agrupe Papel"); // Block Check Index: /branches/Ver2.2/extras/xpress_i18n/portuguese-br/xpressme_modules_root/language/pt-br_utf8/blocks.php =================================================================== --- /branches/Ver2.2/extras/xpress_i18n/portuguese-br/xpressme_modules_root/language/pt-br_utf8/blocks.php (revision 527) +++ /branches/Ver2.2/extras/xpress_i18n/portuguese-br/xpressme_modules_root/language/pt-br_utf8/blocks.php (revision 528) @@ -27,4 +27,5 @@ define("_MB_XP2_FILE_NAME","Nome do arquivo"); define("_MB_XP2_THISTEMPLATE","Modelo"); + define("_MB_XP2_NO_JSCRIPT","Javascript deveria ser habilite por um browser."); // recent comment block @@ -48,4 +49,5 @@ define("_MB_XP2_DAYS_AND","e"); define("_MB_XP2_DAYS_AGO","dias atrás"); + define("_MB_XP2_CATS_DIRECT_SELECT","Contribuição direta de ID(Vírgula separou lista de categorie ID)"); // recent posts list Index: /branches/Ver2.2/extras/xpress_i18n/portuguese-br/xpressme_modules_root/wp-content/plugins/xpressme/language/xpressme-pt_BR.po =================================================================== --- /branches/Ver2.2/extras/xpress_i18n/portuguese-br/xpressme_modules_root/wp-content/plugins/xpressme/language/xpressme-pt_BR.po (revision 527) +++ /branches/Ver2.2/extras/xpress_i18n/portuguese-br/xpressme_modules_root/wp-content/plugins/xpressme/language/xpressme-pt_BR.po (revision 528) @@ -7,6 +7,6 @@ "Project-Id-Version: XPressME Plugin\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-20 12:51+0900\n" -"PO-Revision-Date: 2009-11-20 13:01+0900\n" +"POT-Creation-Date: 2010-02-26 16:00+0900\n" +"PO-Revision-Date: 2010-02-26 16:21+0900\n" "Last-Translator: toemon \n" "Language-Team: Marcelo Yuji Himoro \n" @@ -41,113 +41,113 @@ msgstr "Ir para a administração do Modules" -#: xpressme.php:164 +#: xpressme.php:159 msgid "XPressME Display Setting" msgstr "Configurações de exibição do XPressME" -#: xpressme.php:170 +#: xpressme.php:165 msgid "Thema Sidebar Display" msgstr "Exibir barra lateral no tema?" -#: xpressme.php:171 -#: xpressme.php:263 -#: xpressme.php:269 -#: xpressme.php:274 -#: xpressme.php:280 -#: xpressme_class.php:296 -#: xpressme_class.php:314 -#: xpressme_class.php:445 -#: xpressme_class.php:456 +#: xpressme.php:166 +#: xpressme.php:259 +#: xpressme.php:265 +#: xpressme.php:270 +#: xpressme.php:276 +#: xpressme_class.php:330 +#: xpressme_class.php:348 +#: xpressme_class.php:479 +#: xpressme_class.php:490 msgid "YES" msgstr "Sim" -#: xpressme.php:172 -#: xpressme.php:264 -#: xpressme.php:270 -#: xpressme.php:275 -#: xpressme.php:281 -#: xpressme_class.php:297 -#: xpressme_class.php:315 -#: xpressme_class.php:446 -#: xpressme_class.php:457 +#: xpressme.php:167 +#: xpressme.php:260 +#: xpressme.php:266 +#: xpressme.php:271 +#: xpressme.php:277 +#: xpressme_class.php:331 +#: xpressme_class.php:349 +#: xpressme_class.php:480 +#: xpressme_class.php:491 msgid "NO" msgstr "Não" -#: xpressme.php:181 -#: xpressme.php:232 -#: xpressme.php:291 +#: xpressme.php:176 +#: xpressme.php:228 +#: xpressme.php:287 msgid "Update Config" msgstr "Atualizar" -#: xpressme.php:182 -#: xpressme.php:233 -#: xpressme.php:292 +#: xpressme.php:177 +#: xpressme.php:229 +#: xpressme.php:288 msgid "Preset Config" msgstr "Padrão" -#: xpressme.php:214 +#: xpressme.php:210 msgid "XPressME Integration Setting" msgstr "Configurações de integração do XPressME" -#: xpressme.php:218 +#: xpressme.php:214 msgid "Media Upload Base Path" msgstr "Caminho base para uploads" -#: xpressme.php:222 +#: xpressme.php:218 msgid "Use XOOPS UPLOAD PATH" msgstr "Utilizar o diretório do XOOPS" -#: xpressme.php:223 +#: xpressme.php:219 msgid "USE WordPress BASE_PATH" msgstr "Utilizar o diretório do WordPress" -#: xpressme.php:257 +#: xpressme.php:253 msgid "XPressME Other Setting" msgstr "Outras configurações do XPressME" -#: xpressme.php:262 +#: xpressme.php:258 msgid "The change tracking of the post is preserved" msgstr "Ativar revisões dos posts?" -#: xpressme.php:268 +#: xpressme.php:264 msgid "Select Multi user mode" msgstr "Ativar modo multi-usuário?" -#: xpressme.php:273 +#: xpressme.php:269 msgid "Is the posts author views counted?" msgstr "Contar leituras do autor?" -#: xpressme.php:279 +#: xpressme.php:275 msgid "Is SQL debugging window displayed?" msgstr "Exibir janela de debug do SQL?" -#: xpressme.php:284 +#: xpressme.php:280 msgid "Select warning display of block file version check" msgstr "Exibição de advertência seleta de bloco cheque de versão de arquivo" -#: xpressme.php:285 +#: xpressme.php:281 msgid "Do display" msgstr "Exiba" -#: xpressme.php:286 +#: xpressme.php:282 msgid "Do not display" msgstr "Não exiba" #: xpressme_class.php:61 -#: xpressme_class.php:243 +#: xpressme_class.php:277 msgid "Older Post" msgstr "Ir para o post anterior" #: xpressme_class.php:62 -#: xpressme_class.php:246 +#: xpressme_class.php:280 msgid "Newer Post" msgstr "Ir para o post seguinte" #: xpressme_class.php:64 -#: xpressme_class.php:249 +#: xpressme_class.php:283 msgid "Older Entries" msgstr "Ir para a página anterior" #: xpressme_class.php:65 -#: xpressme_class.php:252 +#: xpressme_class.php:286 msgid "Newer Entries" msgstr "Ir para a página seguinte" @@ -155,274 +155,278 @@ #: xpressme_class.php:79 #: xpressme_class.php:80 -#: xpressme_class.php:255 +#: xpressme_class.php:289 msgid "Read the rest of this entry »" msgstr "Continuar lendo este post »" -#: xpressme_class.php:356 +#: xpressme_class.php:390 msgid "Single Post Navi Setting" msgstr "Post individual" -#: xpressme_class.php:361 -#: xpressme_class.php:406 +#: xpressme_class.php:395 +#: xpressme_class.php:440 msgid "Adjustment of Navi link display position" msgstr "Posicionamento de links" -#: xpressme_class.php:364 +#: xpressme_class.php:398 msgid "'Old Post Link' is displayed in the left, and 'Newer Post Link' is displayed in the right" msgstr "Exibir link para o post anterior à esquerda, e para o seguinte à direita" -#: xpressme_class.php:365 +#: xpressme_class.php:399 msgid "'Newer Post Link' is displayed in the left, and 'Old Post Link' is displayed in the right" msgstr "Exibir link para o post seguinte à esquerda, e para o anterior à direita" -#: xpressme_class.php:371 +#: xpressme_class.php:405 msgid "Select Display name of PostNavi Link" msgstr "Selecione o texto do link a ser exibido" -#: xpressme_class.php:374 +#: xpressme_class.php:408 msgid "Title of post" msgstr "Título do post" -#: xpressme_class.php:375 +#: xpressme_class.php:409 msgid "Title of Navi" msgstr "Personalizado" -#: xpressme_class.php:381 +#: xpressme_class.php:415 msgid "Display Navi Title of Old Post Link" msgstr "Texto do link para o post anterior" -#: xpressme_class.php:388 +#: xpressme_class.php:422 msgid "Display Navi Title of Newer Post Link" msgstr "Texto do link para o post seguinte" -#: xpressme_class.php:401 +#: xpressme_class.php:435 msgid "Posts List Page Navi Setting" msgstr "Lista de posts" -#: xpressme_class.php:409 +#: xpressme_class.php:443 msgid "'Old Page Link' is displayed in the left, and 'Newer Page Link' is displayed in the right" msgstr "Exibir link para o página anterior à esquerda, e para o seguinte à direita" -#: xpressme_class.php:410 +#: xpressme_class.php:444 msgid "'Newer Page Link' is displayed in the left, and 'Old Page Link' is displayed in the right" msgstr "Exibir link para o página seguinte à esquerda, e para o anterior à direita" -#: xpressme_class.php:416 +#: xpressme_class.php:450 msgid "Display Navi Title of Old Page Link" msgstr "Texto do link para o página anterior" -#: xpressme_class.php:423 +#: xpressme_class.php:457 msgid "Display Navi Title of Newer Page Link" msgstr "Texto do link para o página seguinte anterior" -#: xpressme_class.php:436 +#: xpressme_class.php:470 msgid "Dashboard feed Display Setting" msgstr "Painel feed Exibição Colocação" -#: xpressme_class.php:442 +#: xpressme_class.php:476 msgid "Display XPressMe Integration Kit Blog" msgstr "Exibição XPressME Integration Kit Blog" -#: xpressme_class.php:453 +#: xpressme_class.php:487 msgid "Display XPressMe Integration Kit Forum" msgstr "Exibição XPressME Integration Kit Folum" -#: xpressme_class.php:471 +#: xpressme_class.php:505 msgid "Role Setting at Login" msgstr "Permissões" -#: xpressme_class.php:474 +#: xpressme_class.php:508 msgid "XOOPS Groupe" msgstr "Grupo do XOOPS" -#: xpressme_class.php:474 +#: xpressme_class.php:508 msgid "WordPress Role" msgstr "Permissão do WordPress" -#: xpressme_class.php:474 +#: xpressme_class.php:508 msgid "Role is set at each login" msgstr "Atualizar permissões ao fazer login" -#: xpressme_class.php:500 -#: xpressme_class.php:504 -#: xpressme_class.php:507 +#: xpressme_class.php:513 +msgid "module cannot be read" +msgstr "módulo não pode ser lido" + +#: xpressme_class.php:545 +#: xpressme_class.php:549 +#: xpressme_class.php:552 msgid "Default Role of WordPress" msgstr "Permissão padrão do WordPress" -#: xpressme_class.php:501 -#: xpressme_class.php:505 -#: xpressme_class.php:508 +#: xpressme_class.php:546 +#: xpressme_class.php:550 +#: xpressme_class.php:553 msgid "Group User Doesn't Register" msgstr "Não cadastrar usuários" -#: xpressme_class.php:521 +#: xpressme_class.php:566 msgid "Only the Admin can set Group Role Setting" msgstr "Only the Admin can set Group Role Setting" -#: xpressme_class.php:541 +#: xpressme_class.php:586 msgid "WordPress MU cannot integrate the comments." msgstr "Não é possível integrar comentários no WordPress MU." -#: xpressme_class.php:543 +#: xpressme_class.php:588 msgid "Do Not Comment Integration." msgstr "Não integrar comentários" -#: xpressme_class.php:578 +#: xpressme_class.php:623 msgid "Comment integration with D3Forum" msgstr "Integração de comentários com o D3Forum" -#: xpressme_class.php:580 +#: xpressme_class.php:625 msgid "Select the forum of D3Forum that does the comment integration from the following lists." msgstr "Selecione o fórum do D3Forum com o qual os comentários serão integrados:" -#: xpressme_class.php:585 +#: xpressme_class.php:630 msgid "Select the Type of display of D3Forum comment." msgstr "Selecione o tipo de exibição dos comentários do D3Forum:" -#: xpressme_class.php:587 -#: xpressme_class.php:590 +#: xpressme_class.php:632 +#: xpressme_class.php:635 msgid "Flat" msgstr "Plano" -#: xpressme_class.php:588 -#: xpressme_class.php:591 +#: xpressme_class.php:633 +#: xpressme_class.php:636 msgid "Threaded" msgstr "Aninhado" -#: xpressme_class.php:594 +#: xpressme_class.php:639 msgid "Select the order of display of D3Forum comment." msgstr "Selecione a ordem de exibição dos comentários do D3Forum:" -#: xpressme_class.php:596 -#: xpressme_class.php:599 +#: xpressme_class.php:641 +#: xpressme_class.php:644 msgid "DESC" msgstr "Crescente" -#: xpressme_class.php:597 -#: xpressme_class.php:600 +#: xpressme_class.php:642 +#: xpressme_class.php:645 msgid "ASC" msgstr "Decrescente" -#: xpressme_class.php:603 +#: xpressme_class.php:648 msgid "Number of displays of D3Forum comments." msgstr "Número de comentários do D3Fórum a serem exibidos:" -#: xpressme_class.php:606 +#: xpressme_class.php:651 msgid "The import and the export between Wordpress Comments and the D3Forum Posts can be done. " msgstr "Importar/exportar comentários entre o WordPress e o D3Forum" -#: xpressme_class.php:607 +#: xpressme_class.php:652 msgid "Export to D3Forum" msgstr "Exportar para o D3Forum" -#: xpressme_class.php:608 +#: xpressme_class.php:653 msgid "Import from D3Forum" msgstr "Importar para o D3Forum" -#: xpressme_class.php:621 +#: xpressme_class.php:666 msgid "Contents Excerpt Setting" msgstr "Excerto" -#: xpressme_class.php:626 +#: xpressme_class.php:671 msgid "Is the excerpt display done with the archive of contents?" msgstr "Exibir excertos nos arquivos?" -#: xpressme_class.php:633 +#: xpressme_class.php:678 msgid "When ASCII character more than the set ratio is included, it is judged ASCII contents. " msgstr "Quando um excerto contiver mais caracteres ASCII do que o valor definido, ele será tratado como ASCII." -#: xpressme_class.php:640 +#: xpressme_class.php:685 msgid "Excerpt length of word for ASCII contents" msgstr "N° de caracteres para excerto de conteúdo ASCII" -#: xpressme_class.php:647 +#: xpressme_class.php:692 msgid "Excerpt length of character for multibyte contents" msgstr "N° de caracteres para excerto de conteúdo multi-byte" -#: xpressme_class.php:654 +#: xpressme_class.php:699 msgid "This text is displayed in the link that reads contents not excerpted.(Is not displayed for the blank.)" msgstr "Texto do link para o texto completo do post (deixe em branco para não exibir)" -#: xpressme_class.php:661 +#: xpressme_class.php:706 msgid "This text is displayed in the link that more tag (<!--more-->). " msgstr "Texto do link para posts com a tag <!--more-->:" -#: xpressme_class.php:673 +#: xpressme_class.php:718 msgid "Display Mode Setting" msgstr "Modo de exibição" -#: xpressme_class.php:676 +#: xpressme_class.php:721 msgid "Select the XPressME Display Mode." msgstr "Selecione o modo de exibição do XPressME" -#: xpressme_class.php:681 +#: xpressme_class.php:726 msgid "Xoops Mode" msgstr "XOOPS" -#: xpressme_class.php:685 +#: xpressme_class.php:730 msgid "WordPress Mode" msgstr "WordPress" -#: xpressme_class.php:689 +#: xpressme_class.php:734 msgid "User select" msgstr "Selecionar usuário" -#: xpressme_class.php:694 +#: xpressme_class.php:739 msgid "Select the theme used in the XOOPS Mode." msgstr "Selecione o tema usado no Modo de XOOPS." -#: xpressme_class.php:699 +#: xpressme_class.php:744 msgid "Use WordPress Selected Themes" msgstr "Uso WordPress Selected Temas" -#: xpressme_class.php:717 +#: xpressme_class.php:762 msgid "Header Meta Option" msgstr "Meta Header" -#: xpressme_class.php:722 +#: xpressme_class.php:767 msgid "Select the Header keyword." msgstr "Selecione as palavras-chave a serem utilizadas:" -#: xpressme_class.php:727 +#: xpressme_class.php:772 msgid "Xoops KeyWord" msgstr "XOOPS" -#: xpressme_class.php:730 +#: xpressme_class.php:775 msgid "WordPress KeyWord" msgstr "WordPress" -#: xpressme_class.php:733 +#: xpressme_class.php:778 msgid "WordPress & Xoops KeyWord" msgstr "WordPress e XOOPS" -#: xpressme_class.php:739 +#: xpressme_class.php:784 msgid "Select the Header Description." msgstr "Selecione a descrição a ser utilizada:" -#: xpressme_class.php:744 +#: xpressme_class.php:789 msgid "Xoops Description" msgstr "XOOPS" -#: xpressme_class.php:747 +#: xpressme_class.php:792 msgid "WordPress Description" msgstr "WordPress" -#: xpressme_class.php:750 +#: xpressme_class.php:795 msgid "WordPress & Xoops Description" msgstr "WordPress e XOOPS" -#: xpressme_class.php:756 +#: xpressme_class.php:801 msgid "Select the Header Robots Index." msgstr "Selecione o robô de indexação a ser utilizado no cabeçalho:" -#: xpressme_class.php:761 +#: xpressme_class.php:806 msgid "Xoops Robots Index" msgstr "XOOPS" -#: xpressme_class.php:764 +#: xpressme_class.php:809 msgid "WordPress Robots Index" msgstr "WordPress" -#: xpressme_class.php:793 +#: xpressme_class.php:838 #, php-format msgid "Unable to create directory %s. Is its parent directory writable by the server?" @@ -496,81 +500,81 @@ msgstr "Link permanente para %s" -#: include/custom_functions.php:429 -#: include/custom_functions.php:459 +#: include/custom_functions.php:431 +#: include/custom_functions.php:461 #, php-format msgid "views :%d" msgstr "Leituras: %d" -#: include/custom_functions.php:623 +#: include/custom_functions.php:625 msgid "Main" msgstr "Principal" -#: include/custom_functions.php:626 +#: include/custom_functions.php:628 #, php-format msgid "Archive for the ‘%s’ Category" msgstr "Arquivo da categoria ‘%s’" -#: include/custom_functions.php:629 +#: include/custom_functions.php:631 #, php-format msgid "Posts Tagged ‘%s’" msgstr "Posts com a tag ‘%s’ " -#: include/custom_functions.php:632 +#: include/custom_functions.php:634 #, php-format msgid "Archive for %s|Daily archive page" msgstr "Arquivo de %s|Arquivo por dia" -#: include/custom_functions.php:632 +#: include/custom_functions.php:634 msgid "F jS, Y" msgstr "j \\d\\e F \\d\\e Y" -#: include/custom_functions.php:634 +#: include/custom_functions.php:636 #, php-format msgid "Archive for %s|Monthly archive page" msgstr "Arquivo de %s|Arquivo por mês" -#: include/custom_functions.php:634 +#: include/custom_functions.php:636 msgid "F, Y" msgstr "F \\d\\e Y" -#: include/custom_functions.php:636 +#: include/custom_functions.php:638 #, php-format msgid "Archive for %s|Yearly archive page" msgstr "Arquivo de %s|Arquivo por ano" -#: include/custom_functions.php:636 +#: include/custom_functions.php:638 msgid "Y" msgstr "Y" -#: include/custom_functions.php:639 +#: include/custom_functions.php:641 #, php-format msgid "Archive for the ‘%s’ Author" msgstr "Arquivo do autor ‘%s’" -#: include/custom_functions.php:642 +#: include/custom_functions.php:644 #, php-format msgid "Search Results of word ‘%s’" msgstr "Resultados da pesquisa por ‘%s’" -#: include/custom_functions.php:648 #: include/custom_functions.php:650 +#: include/custom_functions.php:652 #, php-format msgid "Article of %s" msgstr "Posts de %s" -#: include/custom_functions.php:672 +#: include/custom_functions.php:674 #, php-format msgid "From %1$s on site %2$s" msgstr "De %2$s em %1$s" -#: include/custom_functions.php:693 +#: include/custom_functions.php:695 msgid "No Trackback/Pingback" msgstr "Nenhum trackback/pingback" -#: include/custom_functions.php:694 +#: include/custom_functions.php:696 msgid "One Trackback/Pingback" msgstr "1 trackback/pingback" -#: include/custom_functions.php:695 +#: include/custom_functions.php:697 msgid "% TrackBack/Pingback" msgstr "% trackbacks/pingbacks" @@ -618,5 +622,5 @@ msgstr "Mudar para o WordPress" -#: include/xpress_common_functions.php:390 +#: include/xpress_common_functions.php:382 #, php-format msgid "Block file %1$s is an old version %2$s.
used block file %3$s of new version %4$s." @@ -627,54 +631,56 @@ msgstr "XPressME Atualizar" -#: include/xpress_upgrade.php:28 +#: include/xpress_upgrade.php:27 #, php-format msgid "You are using a XPressME Integration Kit development version (%1$s). Cool! Please stay updated." msgstr "Você está usando uma versão para XPressME Integration Kit desenvolvedores (%1$s). Legal! Por favor, mantenha-se atualizado." -#: include/xpress_upgrade.php:32 +#: include/xpress_upgrade.php:31 msgid "There is a new version of XPressME Integration Kit available for upgrade" msgstr "Há uma versão nova do XPressME Integration Kit disponível para atualização" -#: include/xpress_upgrade.php:35 +#: include/xpress_upgrade.php:33 #, php-format msgid "You can upgrade to version %s download the package and install it manually:" msgstr "Você pode atualizar para a versão %s fazer o download e instalar manualmente:" -#: include/xpress_upgrade.php:38 -#: include/xpress_upgrade.php:61 +#: include/xpress_upgrade.php:36 +#: include/xpress_upgrade.php:60 #, php-format msgid "Download %s" msgstr "Download %s" -#: include/xpress_upgrade.php:43 +#: include/xpress_upgrade.php:41 +#: include/xpress_upgrade.php:68 #, php-format msgid "You can download the differential file from version %s to %s and upgrade it manually:" msgstr "You can download the differential file from version %s to %s and upgrade it manually:" -#: include/xpress_upgrade.php:46 +#: include/xpress_upgrade.php:44 +#: include/xpress_upgrade.php:71 #, php-format msgid "Download differential file for %s" msgstr "Download differential file for %s" -#: include/xpress_upgrade.php:50 +#: include/xpress_upgrade.php:48 msgid "You have the latest version of XPressME Integration Kit. You do not need to upgrade" msgstr "Sua versão do XPressME Integration Kit é a mais recente. Não é necessário atualizá-la." -#: include/xpress_upgrade.php:58 +#: include/xpress_upgrade.php:57 #, php-format msgid "You can use the development version %s download the package and install it manually:" msgstr "You can use the development version %s download the package and install it manually:" -#: include/xpress_upgrade.php:67 +#: include/xpress_upgrade.php:78 #, php-format msgid "There is no response from version check API now. sorry, please confirm it after." msgstr "Não há nenhuma resposta de cheque de versão API agora. arrependido, por favor confirme depois de." -#: include/xpress_upgrade.php:212 +#: include/xpress_upgrade.php:235 #, php-format msgid "XPressME Integration Kit Version %1$s is available! Please update now." msgstr "O XPressME Integration Kit %1$s está disponível! Por favor, atualize agora." -#: include/xpress_upgrade.php:214 +#: include/xpress_upgrade.php:237 #, php-format msgid "XPressME Integration Kit Version %1$s is available! Please notify the site administrator." Index: /branches/Ver2.2/extras/xpress_i18n/template/xpressme_modules_root/language/english/admin.php =================================================================== --- /branches/Ver2.2/extras/xpress_i18n/template/xpressme_modules_root/language/english/admin.php (revision 527) +++ /branches/Ver2.2/extras/xpress_i18n/template/xpressme_modules_root/language/english/admin.php (revision 528) @@ -19,4 +19,6 @@ define("_AM_XP2_SYS_REPORT","Show Report Mode"); define("_AM_XP2_SYS_NORMAL","Show Normal Mode"); + define("_AM_XP2_BLOCK_OPTIONS","Block Options"); + define("_AM_XP2_GROUP_ROLE","Group Role"); // Block Check Index: /branches/Ver2.2/extras/xpress_i18n/template/xpressme_modules_root/language/english/blocks.php =================================================================== --- /branches/Ver2.2/extras/xpress_i18n/template/xpressme_modules_root/language/english/blocks.php (revision 527) +++ /branches/Ver2.2/extras/xpress_i18n/template/xpressme_modules_root/language/english/blocks.php (revision 528) @@ -27,4 +27,5 @@ define("_MB_XP2_FILE_NAME","Files Name"); define("_MB_XP2_THISTEMPLATE","Template"); + define("_MB_XP2_NO_JSCRIPT","Javascript should be enable by a browser."); // recent comment block @@ -48,4 +49,5 @@ define("_MB_XP2_DAYS_AND","and"); define("_MB_XP2_DAYS_AGO","days ago"); + define("_MB_XP2_CATS_DIRECT_SELECT","Direct input of ID(Comma separated list of categorie ID)"); // recent posts list Index: /branches/Ver2.2/extras/xpress_i18n/template/xpressme_modules_root/wp-content/plugins/xpressme/language/xpressme-lang.pot =================================================================== --- /branches/Ver2.2/extras/xpress_i18n/template/xpressme_modules_root/wp-content/plugins/xpressme/language/xpressme-lang.pot (revision 527) +++ /branches/Ver2.2/extras/xpress_i18n/template/xpressme_modules_root/wp-content/plugins/xpressme/language/xpressme-lang.pot (revision 528) @@ -8,5 +8,5 @@ "Project-Id-Version: XPressME Plugin\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-20 12:51+0900\n" +"POT-Creation-Date: 2010-02-26 16:00+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" @@ -37,113 +37,113 @@ msgstr "" -#: xpressme.php:164 +#: xpressme.php:159 msgid "XPressME Display Setting" msgstr "" -#: xpressme.php:170 +#: xpressme.php:165 msgid "Thema Sidebar Display" msgstr "" -#: xpressme.php:171 -#: xpressme.php:263 +#: xpressme.php:166 +#: xpressme.php:259 +#: xpressme.php:265 +#: xpressme.php:270 +#: xpressme.php:276 +#: xpressme_class.php:330 +#: xpressme_class.php:348 +#: xpressme_class.php:479 +#: xpressme_class.php:490 +msgid "YES" +msgstr "" + +#: xpressme.php:167 +#: xpressme.php:260 +#: xpressme.php:266 +#: xpressme.php:271 +#: xpressme.php:277 +#: xpressme_class.php:331 +#: xpressme_class.php:349 +#: xpressme_class.php:480 +#: xpressme_class.php:491 +msgid "NO" +msgstr "" + +#: xpressme.php:176 +#: xpressme.php:228 +#: xpressme.php:287 +msgid "Update Config" +msgstr "" + +#: xpressme.php:177 +#: xpressme.php:229 +#: xpressme.php:288 +msgid "Preset Config" +msgstr "" + +#: xpressme.php:210 +msgid "XPressME Integration Setting" +msgstr "" + +#: xpressme.php:214 +msgid "Media Upload Base Path" +msgstr "" + +#: xpressme.php:218 +msgid "Use XOOPS UPLOAD PATH" +msgstr "" + +#: xpressme.php:219 +msgid "USE WordPress BASE_PATH" +msgstr "" + +#: xpressme.php:253 +msgid "XPressME Other Setting" +msgstr "" + +#: xpressme.php:258 +msgid "The change tracking of the post is preserved" +msgstr "" + +#: xpressme.php:264 +msgid "Select Multi user mode" +msgstr "" + #: xpressme.php:269 -#: xpressme.php:274 +msgid "Is the posts author views counted?" +msgstr "" + +#: xpressme.php:275 +msgid "Is SQL debugging window displayed?" +msgstr "" + #: xpressme.php:280 -#: xpressme_class.php:296 -#: xpressme_class.php:314 -#: xpressme_class.php:445 -#: xpressme_class.php:456 -msgid "YES" -msgstr "" - -#: xpressme.php:172 -#: xpressme.php:264 -#: xpressme.php:270 -#: xpressme.php:275 +msgid "Select warning display of block file version check" +msgstr "" + #: xpressme.php:281 -#: xpressme_class.php:297 -#: xpressme_class.php:315 -#: xpressme_class.php:446 -#: xpressme_class.php:457 -msgid "NO" -msgstr "" - -#: xpressme.php:181 -#: xpressme.php:232 -#: xpressme.php:291 -msgid "Update Config" -msgstr "" - -#: xpressme.php:182 -#: xpressme.php:233 -#: xpressme.php:292 -msgid "Preset Config" -msgstr "" - -#: xpressme.php:214 -msgid "XPressME Integration Setting" -msgstr "" - -#: xpressme.php:218 -msgid "Media Upload Base Path" -msgstr "" - -#: xpressme.php:222 -msgid "Use XOOPS UPLOAD PATH" -msgstr "" - -#: xpressme.php:223 -msgid "USE WordPress BASE_PATH" -msgstr "" - -#: xpressme.php:257 -msgid "XPressME Other Setting" -msgstr "" - -#: xpressme.php:262 -msgid "The change tracking of the post is preserved" -msgstr "" - -#: xpressme.php:268 -msgid "Select Multi user mode" -msgstr "" - -#: xpressme.php:273 -msgid "Is the posts author views counted?" -msgstr "" - -#: xpressme.php:279 -msgid "Is SQL debugging window displayed?" -msgstr "" - -#: xpressme.php:284 -msgid "Select warning display of block file version check" -msgstr "" - -#: xpressme.php:285 msgid "Do display" msgstr "" -#: xpressme.php:286 +#: xpressme.php:282 msgid "Do not display" msgstr "" #: xpressme_class.php:61 -#: xpressme_class.php:243 +#: xpressme_class.php:277 msgid "Older Post" msgstr "" #: xpressme_class.php:62 -#: xpressme_class.php:246 +#: xpressme_class.php:280 msgid "Newer Post" msgstr "" #: xpressme_class.php:64 -#: xpressme_class.php:249 +#: xpressme_class.php:283 msgid "Older Entries" msgstr "" #: xpressme_class.php:65 -#: xpressme_class.php:252 +#: xpressme_class.php:286 msgid "Newer Entries" msgstr "" @@ -151,274 +151,278 @@ #: xpressme_class.php:79 #: xpressme_class.php:80 -#: xpressme_class.php:255 +#: xpressme_class.php:289 msgid "Read the rest of this entry »" msgstr "" -#: xpressme_class.php:356 +#: xpressme_class.php:390 msgid "Single Post Navi Setting" msgstr "" -#: xpressme_class.php:361 -#: xpressme_class.php:406 +#: xpressme_class.php:395 +#: xpressme_class.php:440 msgid "Adjustment of Navi link display position" msgstr "" -#: xpressme_class.php:364 +#: xpressme_class.php:398 msgid "'Old Post Link' is displayed in the left, and 'Newer Post Link' is displayed in the right" msgstr "" -#: xpressme_class.php:365 +#: xpressme_class.php:399 msgid "'Newer Post Link' is displayed in the left, and 'Old Post Link' is displayed in the right" msgstr "" -#: xpressme_class.php:371 +#: xpressme_class.php:405 msgid "Select Display name of PostNavi Link" msgstr "" -#: xpressme_class.php:374 +#: xpressme_class.php:408 msgid "Title of post" msgstr "" -#: xpressme_class.php:375 +#: xpressme_class.php:409 msgid "Title of Navi" msgstr "" -#: xpressme_class.php:381 +#: xpressme_class.php:415 msgid "Display Navi Title of Old Post Link" msgstr "" -#: xpressme_class.php:388 +#: xpressme_class.php:422 msgid "Display Navi Title of Newer Post Link" msgstr "" -#: xpressme_class.php:401 +#: xpressme_class.php:435 msgid "Posts List Page Navi Setting" msgstr "" -#: xpressme_class.php:409 +#: xpressme_class.php:443 msgid "'Old Page Link' is displayed in the left, and 'Newer Page Link' is displayed in the right" msgstr "" -#: xpressme_class.php:410 +#: xpressme_class.php:444 msgid "'Newer Page Link' is displayed in the left, and 'Old Page Link' is displayed in the right" msgstr "" -#: xpressme_class.php:416 +#: xpressme_class.php:450 msgid "Display Navi Title of Old Page Link" msgstr "" -#: xpressme_class.php:423 +#: xpressme_class.php:457 msgid "Display Navi Title of Newer Page Link" msgstr "" -#: xpressme_class.php:436 +#: xpressme_class.php:470 msgid "Dashboard feed Display Setting" msgstr "" -#: xpressme_class.php:442 +#: xpressme_class.php:476 msgid "Display XPressMe Integration Kit Blog" msgstr "" -#: xpressme_class.php:453 +#: xpressme_class.php:487 msgid "Display XPressMe Integration Kit Forum" msgstr "" -#: xpressme_class.php:471 +#: xpressme_class.php:505 msgid "Role Setting at Login" msgstr "" -#: xpressme_class.php:474 +#: xpressme_class.php:508 msgid "XOOPS Groupe" msgstr "" -#: xpressme_class.php:474 +#: xpressme_class.php:508 msgid "WordPress Role" msgstr "" -#: xpressme_class.php:474 +#: xpressme_class.php:508 msgid "Role is set at each login" msgstr "" -#: xpressme_class.php:500 -#: xpressme_class.php:504 -#: xpressme_class.php:507 +#: xpressme_class.php:513 +msgid "module cannot be read" +msgstr "" + +#: xpressme_class.php:545 +#: xpressme_class.php:549 +#: xpressme_class.php:552 msgid "Default Role of WordPress" msgstr "" -#: xpressme_class.php:501 -#: xpressme_class.php:505 -#: xpressme_class.php:508 +#: xpressme_class.php:546 +#: xpressme_class.php:550 +#: xpressme_class.php:553 msgid "Group User Doesn't Register" msgstr "" -#: xpressme_class.php:521 +#: xpressme_class.php:566 msgid "Only the Admin can set Group Role Setting" msgstr "" -#: xpressme_class.php:541 +#: xpressme_class.php:586 msgid "WordPress MU cannot integrate the comments." msgstr "" -#: xpressme_class.php:543 +#: xpressme_class.php:588 msgid "Do Not Comment Integration." msgstr "" -#: xpressme_class.php:578 +#: xpressme_class.php:623 msgid "Comment integration with D3Forum" msgstr "" -#: xpressme_class.php:580 +#: xpressme_class.php:625 msgid "Select the forum of D3Forum that does the comment integration from the following lists." msgstr "" -#: xpressme_class.php:585 +#: xpressme_class.php:630 msgid "Select the Type of display of D3Forum comment." msgstr "" -#: xpressme_class.php:587 -#: xpressme_class.php:590 +#: xpressme_class.php:632 +#: xpressme_class.php:635 msgid "Flat" msgstr "" -#: xpressme_class.php:588 -#: xpressme_class.php:591 +#: xpressme_class.php:633 +#: xpressme_class.php:636 msgid "Threaded" msgstr "" -#: xpressme_class.php:594 +#: xpressme_class.php:639 msgid "Select the order of display of D3Forum comment." msgstr "" -#: xpressme_class.php:596 -#: xpressme_class.php:599 +#: xpressme_class.php:641 +#: xpressme_class.php:644 msgid "DESC" msgstr "" -#: xpressme_class.php:597 -#: xpressme_class.php:600 +#: xpressme_class.php:642 +#: xpressme_class.php:645 msgid "ASC" msgstr "" -#: xpressme_class.php:603 +#: xpressme_class.php:648 msgid "Number of displays of D3Forum comments." msgstr "" -#: xpressme_class.php:606 +#: xpressme_class.php:651 msgid "The import and the export between Wordpress Comments and the D3Forum Posts can be done. " msgstr "" -#: xpressme_class.php:607 +#: xpressme_class.php:652 msgid "Export to D3Forum" msgstr "" -#: xpressme_class.php:608 +#: xpressme_class.php:653 msgid "Import from D3Forum" msgstr "" -#: xpressme_class.php:621 +#: xpressme_class.php:666 msgid "Contents Excerpt Setting" msgstr "" -#: xpressme_class.php:626 +#: xpressme_class.php:671 msgid "Is the excerpt display done with the archive of contents?" msgstr "" -#: xpressme_class.php:633 +#: xpressme_class.php:678 msgid "When ASCII character more than the set ratio is included, it is judged ASCII contents. " msgstr "" -#: xpressme_class.php:640 +#: xpressme_class.php:685 msgid "Excerpt length of word for ASCII contents" msgstr "" -#: xpressme_class.php:647 +#: xpressme_class.php:692 msgid "Excerpt length of character for multibyte contents" msgstr "" -#: xpressme_class.php:654 +#: xpressme_class.php:699 msgid "This text is displayed in the link that reads contents not excerpted.(Is not displayed for the blank.)" msgstr "" -#: xpressme_class.php:661 +#: xpressme_class.php:706 msgid "This text is displayed in the link that more tag (<!--more-->). " msgstr "" -#: xpressme_class.php:673 +#: xpressme_class.php:718 msgid "Display Mode Setting" msgstr "" -#: xpressme_class.php:676 +#: xpressme_class.php:721 msgid "Select the XPressME Display Mode." msgstr "" -#: xpressme_class.php:681 +#: xpressme_class.php:726 msgid "Xoops Mode" msgstr "" -#: xpressme_class.php:685 +#: xpressme_class.php:730 msgid "WordPress Mode" msgstr "" -#: xpressme_class.php:689 +#: xpressme_class.php:734 msgid "User select" msgstr "" -#: xpressme_class.php:694 +#: xpressme_class.php:739 msgid "Select the theme used in the XOOPS Mode." msgstr "" -#: xpressme_class.php:699 +#: xpressme_class.php:744 msgid "Use WordPress Selected Themes" msgstr "" -#: xpressme_class.php:717 +#: xpressme_class.php:762 msgid "Header Meta Option" msgstr "" -#: xpressme_class.php:722 +#: xpressme_class.php:767 msgid "Select the Header keyword." msgstr "" -#: xpressme_class.php:727 +#: xpressme_class.php:772 msgid "Xoops KeyWord" msgstr "" -#: xpressme_class.php:730 +#: xpressme_class.php:775 msgid "WordPress KeyWord" msgstr "" -#: xpressme_class.php:733 +#: xpressme_class.php:778 msgid "WordPress & Xoops KeyWord" msgstr "" -#: xpressme_class.php:739 +#: xpressme_class.php:784 msgid "Select the Header Description." msgstr "" -#: xpressme_class.php:744 +#: xpressme_class.php:789 msgid "Xoops Description" msgstr "" -#: xpressme_class.php:747 +#: xpressme_class.php:792 msgid "WordPress Description" msgstr "" -#: xpressme_class.php:750 +#: xpressme_class.php:795 msgid "WordPress & Xoops Description" msgstr "" -#: xpressme_class.php:756 +#: xpressme_class.php:801 msgid "Select the Header Robots Index." msgstr "" -#: xpressme_class.php:761 +#: xpressme_class.php:806 msgid "Xoops Robots Index" msgstr "" -#: xpressme_class.php:764 +#: xpressme_class.php:809 msgid "WordPress Robots Index" msgstr "" -#: xpressme_class.php:793 +#: xpressme_class.php:838 #, php-format msgid "Unable to create directory %s. Is its parent directory writable by the server?" @@ -492,81 +496,81 @@ msgstr "" -#: include/custom_functions.php:429 -#: include/custom_functions.php:459 +#: include/custom_functions.php:431 +#: include/custom_functions.php:461 #, php-format msgid "views :%d" msgstr "" -#: include/custom_functions.php:623 +#: include/custom_functions.php:625 msgid "Main" msgstr "" -#: include/custom_functions.php:626 +#: include/custom_functions.php:628 #, php-format msgid "Archive for the ‘%s’ Category" msgstr "" -#: include/custom_functions.php:629 +#: include/custom_functions.php:631 #, php-format msgid "Posts Tagged ‘%s’" msgstr "" -#: include/custom_functions.php:632 +#: include/custom_functions.php:634 #, php-format msgid "Archive for %s|Daily archive page" msgstr "" -#: include/custom_functions.php:632 +#: include/custom_functions.php:634 msgid "F jS, Y" msgstr "" -#: include/custom_functions.php:634 +#: include/custom_functions.php:636 #, php-format msgid "Archive for %s|Monthly archive page" msgstr "" -#: include/custom_functions.php:634 +#: include/custom_functions.php:636 msgid "F, Y" msgstr "" -#: include/custom_functions.php:636 +#: include/custom_functions.php:638 #, php-format msgid "Archive for %s|Yearly archive page" msgstr "" -#: include/custom_functions.php:636 +#: include/custom_functions.php:638 msgid "Y" msgstr "" -#: include/custom_functions.php:639 +#: include/custom_functions.php:641 #, php-format msgid "Archive for the ‘%s’ Author" msgstr "" -#: include/custom_functions.php:642 +#: include/custom_functions.php:644 #, php-format msgid "Search Results of word ‘%s’" msgstr "" -#: include/custom_functions.php:648 #: include/custom_functions.php:650 +#: include/custom_functions.php:652 #, php-format msgid "Article of %s" msgstr "" -#: include/custom_functions.php:672 +#: include/custom_functions.php:674 #, php-format msgid "From %1$s on site %2$s" msgstr "" -#: include/custom_functions.php:693 +#: include/custom_functions.php:695 msgid "No Trackback/Pingback" msgstr "" -#: include/custom_functions.php:694 +#: include/custom_functions.php:696 msgid "One Trackback/Pingback" msgstr "" -#: include/custom_functions.php:695 +#: include/custom_functions.php:697 msgid "% TrackBack/Pingback" msgstr "" @@ -614,5 +618,5 @@ msgstr "" -#: include/xpress_common_functions.php:390 +#: include/xpress_common_functions.php:382 #, php-format msgid "Block file %1$s is an old version %2$s.
used block file %3$s of new version %4$s." @@ -623,54 +627,56 @@ msgstr "" -#: include/xpress_upgrade.php:28 +#: include/xpress_upgrade.php:27 #, php-format msgid "You are using a XPressME Integration Kit development version (%1$s). Cool! Please stay updated." msgstr "" -#: include/xpress_upgrade.php:32 +#: include/xpress_upgrade.php:31 msgid "There is a new version of XPressME Integration Kit available for upgrade" msgstr "" -#: include/xpress_upgrade.php:35 +#: include/xpress_upgrade.php:33 #, php-format msgid "You can upgrade to version %s download the package and install it manually:" msgstr "" -#: include/xpress_upgrade.php:38 -#: include/xpress_upgrade.php:61 +#: include/xpress_upgrade.php:36 +#: include/xpress_upgrade.php:60 #, php-format msgid "Download %s" msgstr "" -#: include/xpress_upgrade.php:43 +#: include/xpress_upgrade.php:41 +#: include/xpress_upgrade.php:68 #, php-format msgid "You can download the differential file from version %s to %s and upgrade it manually:" msgstr "" -#: include/xpress_upgrade.php:46 +#: include/xpress_upgrade.php:44 +#: include/xpress_upgrade.php:71 #, php-format msgid "Download differential file for %s" msgstr "" -#: include/xpress_upgrade.php:50 +#: include/xpress_upgrade.php:48 msgid "You have the latest version of XPressME Integration Kit. You do not need to upgrade" msgstr "" -#: include/xpress_upgrade.php:58 +#: include/xpress_upgrade.php:57 #, php-format msgid "You can use the development version %s download the package and install it manually:" msgstr "" -#: include/xpress_upgrade.php:67 +#: include/xpress_upgrade.php:78 #, php-format msgid "There is no response from version check API now. sorry, please confirm it after." msgstr "" -#: include/xpress_upgrade.php:212 +#: include/xpress_upgrade.php:235 #, php-format msgid "XPressME Integration Kit Version %1$s is available! Please update now." msgstr "" -#: include/xpress_upgrade.php:214 +#: include/xpress_upgrade.php:237 #, php-format msgid "XPressME Integration Kit Version %1$s is available! Please notify the site administrator." Index: /branches/Ver2.2/xpressme_integration_kit/admin/index.php =================================================================== --- /branches/Ver2.2/xpressme_integration_kit/admin/index.php (revision 527) +++ /branches/Ver2.2/xpressme_integration_kit/admin/index.php (revision 528) @@ -70,5 +70,6 @@ echo $check_str; echo ""; - echo ""; + echo ''; + echo "
"; } @@ -156,5 +157,6 @@ echo get_xpress_active_plugin_list(); echo ""; - echo ""; + echo ''; + echo "
"; } } @@ -311,195 +313,220 @@ echo "
"; echo ""; + echo ''; echo "
"; } } + +function xpress_config_report_view() +{ + require_once dirname(dirname( __FILE__ )).'/class/config_from_xoops.class.php' ; + $xoops_config = new ConfigFromXoops; + echo 'XOOPS_ROOT_PATH: ' ; + if(XOOPS_ROOT_PATH !== $xoops_config->xoops_root_path) + echo 'ERROR '; + else + echo 'OK '; + echo "
\n"; + + echo 'XOOPS_TRUST_PATH: ' ; + if(XOOPS_TRUST_PATH !== $xoops_config->xoops_trust_path) + echo 'ERROR '; + else + echo 'OK '; + echo "
\n"; + + echo 'XOOPS_URL: ' ; + if(XOOPS_URL !== $xoops_config->xoops_url) + echo 'ERROR '; + else + echo 'OK '; + echo "
\n"; + + if (defined('XOOPS_SALT')){ + echo 'XOOPS_SALT: ' ; + if(XOOPS_SALT !== $xoops_config->xoops_salt) + echo 'ERROR '; + else + echo 'OK '; + echo "
\n"; + } + + if (defined('XOOPS_DB_SALT')){ + echo 'XOOPS_DB_SALT: ' ; + if(XOOPS_DB_SALT !== $xoops_config->xoops_db_salt) + echo 'ERROR '; + else + echo 'OK '; + echo "
\n"; + } + + echo 'XOOPS_DB_HOST: ' ; + if(XOOPS_DB_HOST !== $xoops_config->xoops_db_host) + echo 'ERROR '; + else + echo 'OK '; + echo "
\n"; + + echo 'XOOPS_DB_USER: ' ; + if(XOOPS_DB_USER !== $xoops_config->xoops_db_user) + echo 'ERROR '; + else + echo 'OK '; + echo "
\n"; + + echo 'XOOPS_DB_PASS: ' ; + if(XOOPS_DB_PASS !== $xoops_config->xoops_db_pass) + echo 'ERROR '; + else + echo 'OK '; + echo "
\n"; + + echo 'XOOPS_DB_NAME: ' ; + if(XOOPS_DB_NAME !== $xoops_config->xoops_db_name) + echo 'ERROR '; + else + echo 'OK '; + echo "
\n"; + + echo 'XOOPS_DB_PREFIX: ' ; + if(XOOPS_DB_PREFIX !== $xoops_config->xoops_db_prefix) + echo 'ERROR '; + else + echo 'OK '; + echo "
\n"; +} + +function xpress_config_nomal_view() +{ + require_once dirname(dirname( __FILE__ )).'/class/config_from_xoops.class.php' ; + $xoops_config = new ConfigFromXoops; + + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + if(XOOPS_ROOT_PATH !== $xoops_config->xoops_root_path) + echo ''; + else + echo ''; + echo ''; + echo ''; + echo ''; + + echo ''; + if(XOOPS_TRUST_PATH !== $xoops_config->xoops_trust_path) + echo ''; + else + echo ''; + echo ''; + echo ''; + echo ''; + + echo ''; + if(XOOPS_URL !== $xoops_config->xoops_url) + echo ''; + else + echo ''; + echo ''; + echo ''; + echo ''; + + if (defined('XOOPS_SALT')){ + echo ''; + if(XOOPS_SALT !== $xoops_config->xoops_salt) + echo ''; + else + echo ''; + echo ''; + echo ''; + echo ''; + } + + if (defined('XOOPS_DB_SALT')){ + echo ''; + if(XOOPS_DB_SALT !== $xoops_config->xoops_db_salt) + echo ''; + else + echo ''; + echo ''; + echo ''; + echo ''; + } + + echo ''; + if(XOOPS_DB_HOST !== $xoops_config->xoops_db_host) + echo ''; + else + echo ''; + echo ''; + echo ''; + echo ''; + + echo ''; + if(XOOPS_DB_USER !== $xoops_config->xoops_db_user) + echo ''; + else + echo ''; + echo ''; + echo ''; + echo ''; + + echo ''; + if(XOOPS_DB_PASS !== $xoops_config->xoops_db_pass) + echo ''; + else + echo ''; + echo ''; + echo ''; + echo ''; + + echo ''; + if(XOOPS_DB_NAME !== $xoops_config->xoops_db_name) + echo ''; + else + echo ''; + echo ''; + echo ''; + echo ''; + + echo ''; + if(XOOPS_DB_PREFIX !== $xoops_config->xoops_db_prefix) + echo ''; + else + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo '
Define itemXOOPS setting valuexoops_config get value
XOOPS_ROOT_PATHXOOPS_ROOT_PATH' . XOOPS_ROOT_PATH . '' . $xoops_config->xoops_root_path . '
XOOPS_TRUST_PATHXOOPS_TRUST_PATH' . XOOPS_TRUST_PATH . '' . $xoops_config->xoops_trust_path . '
XOOPS_URLXOOPS_URL' . XOOPS_URL . '' . $xoops_config->xoops_url . '
XOOPS_SALTXOOPS_SALT' . XOOPS_SALT . '' . $xoops_config->xoops_salt . '
XOOPS_DB_SALTXOOPS_DB_SALT' . XOOPS_DB_SALT . '' . $xoops_config->xoops_db_salt . '
XOOPS_DB_HOSTXOOPS_DB_HOST' . XOOPS_DB_HOST . '' . $xoops_config->xoops_db_host . '
XOOPS_DB_USERXOOPS_DB_USER' . XOOPS_DB_USER . '' . $xoops_config->xoops_db_user . '
XOOPS_DB_PASSXOOPS_DB_PASS' . XOOPS_DB_PASS . '' . $xoops_config->xoops_db_pass . '
XOOPS_DB_NAMEXOOPS_DB_NAME' . XOOPS_DB_NAME . '' . $xoops_config->xoops_db_name . '
XOOPS_DB_PREFIXXOOPS_DB_PREFIX' . XOOPS_DB_PREFIX . '' . $xoops_config->xoops_db_prefix . '
'; +} function xpress_config_from_xoops_view($is_report = false) { + global $xoopsUserIsAdmin,$xoopsUser; + + $user_groups = $xoopsUser->_groups; + $is_admin_group = in_array('1',$user_groups); + require_once dirname(dirname( __FILE__ )).'/class/config_from_xoops.class.php' ; $xoops_config = new ConfigFromXoops; if ($is_report) { echo "******** " . _AM_XP2_XOOPS_CONFIG_INFO . "********" . "
\n"; - echo 'XOOPS_ROOT_PATH: ' ; - if(XOOPS_ROOT_PATH !== $xoops_config->xoops_root_path) - echo 'ERROR '; - else - echo 'OK '; - echo "
\n"; - - echo 'XOOPS_TRUST_PATH: ' ; - if(XOOPS_TRUST_PATH !== $xoops_config->xoops_trust_path) - echo 'ERROR '; - else - echo 'OK '; - echo "
\n"; - - echo 'XOOPS_URL: ' ; - if(XOOPS_URL !== $xoops_config->xoops_url) - echo 'ERROR '; - else - echo 'OK '; - echo "
\n"; - - if (defined('XOOPS_SALT')){ - echo 'XOOPS_SALT: ' ; - if(XOOPS_SALT !== $xoops_config->xoops_salt) - echo 'ERROR '; - else - echo 'OK '; - echo "
\n"; - } - - if (defined('XOOPS_DB_SALT')){ - echo 'XOOPS_DB_SALT: ' ; - if(XOOPS_DB_SALT !== $xoops_config->xoops_db_salt) - echo 'ERROR '; - else - echo 'OK '; - echo "
\n"; - } - - echo 'XOOPS_DB_HOST: ' ; - if(XOOPS_DB_HOST !== $xoops_config->xoops_db_host) - echo 'ERROR '; - else - echo 'OK '; - echo "
\n"; - - echo 'XOOPS_DB_USER: ' ; - if(XOOPS_DB_USER !== $xoops_config->xoops_db_user) - echo 'ERROR '; - else - echo 'OK '; - echo "
\n"; - - echo 'XOOPS_DB_PASS: ' ; - if(XOOPS_DB_PASS !== $xoops_config->xoops_db_pass) - echo 'ERROR '; - else - echo 'OK '; - echo "
\n"; - - echo 'XOOPS_DB_NAME: ' ; - if(XOOPS_DB_NAME !== $xoops_config->xoops_db_name) - echo 'ERROR '; - else - echo 'OK '; - echo "
\n"; - - echo 'XOOPS_DB_PREFIX: ' ; - if(XOOPS_DB_PREFIX !== $xoops_config->xoops_db_prefix) - echo 'ERROR '; - else - echo 'OK '; - echo "
\n"; - echo "
\n"; - + xpress_config_report_view(); + echo "
\n"; } else { echo "
" . _AM_XP2_XOOPS_CONFIG_INFO . ""; echo "
"; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - if(XOOPS_ROOT_PATH !== $xoops_config->xoops_root_path) - echo ''; - else - echo ''; - echo ''; - echo ''; - echo ''; - - echo ''; - if(XOOPS_TRUST_PATH !== $xoops_config->xoops_trust_path) - echo ''; - else - echo ''; - echo ''; - echo ''; - echo ''; - - echo ''; - if(XOOPS_URL !== $xoops_config->xoops_url) - echo ''; - else - echo ''; - echo ''; - echo ''; - echo ''; - - if (defined('XOOPS_SALT')){ - echo ''; - if(XOOPS_SALT !== $xoops_config->xoops_salt) - echo ''; - else - echo ''; - echo ''; - echo ''; - echo ''; - } - - if (defined('XOOPS_DB_SALT')){ - echo ''; - if(XOOPS_DB_SALT !== $xoops_config->xoops_db_salt) - echo ''; - else - echo ''; - echo ''; - echo ''; - echo ''; - } - - echo ''; - if(XOOPS_DB_HOST !== $xoops_config->xoops_db_host) - echo ''; - else - echo ''; - echo ''; - echo ''; - echo ''; - - echo ''; - if(XOOPS_DB_USER !== $xoops_config->xoops_db_user) - echo ''; - else - echo ''; - echo ''; - echo ''; - echo ''; - - echo ''; - if(XOOPS_DB_PASS !== $xoops_config->xoops_db_pass) - echo ''; - else - echo ''; - echo ''; - echo ''; - echo ''; - - echo ''; - if(XOOPS_DB_NAME !== $xoops_config->xoops_db_name) - echo ''; - else - echo ''; - echo ''; - echo ''; - echo ''; - - echo ''; - if(XOOPS_DB_PREFIX !== $xoops_config->xoops_db_prefix) - echo ''; - else - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo '
Define itemXOOPS setting valuexoops_config get value
XOOPS_ROOT_PATHXOOPS_ROOT_PATH' . XOOPS_ROOT_PATH . '' . $xoops_config->xoops_root_path . '
XOOPS_TRUST_PATHXOOPS_TRUST_PATH' . XOOPS_TRUST_PATH . '' . $xoops_config->xoops_trust_path . '
XOOPS_URLXOOPS_URL' . XOOPS_URL . '' . $xoops_config->xoops_url . '
XOOPS_SALTXOOPS_SALT' . XOOPS_SALT . '' . $xoops_config->xoops_salt . '
XOOPS_DB_SALTXOOPS_DB_SALT' . XOOPS_DB_SALT . '' . $xoops_config->xoops_db_salt . '
XOOPS_DB_HOSTXOOPS_DB_HOST' . XOOPS_DB_HOST . '' . $xoops_config->xoops_db_host . '
XOOPS_DB_USERXOOPS_DB_USER' . XOOPS_DB_USER . '' . $xoops_config->xoops_db_user . '
XOOPS_DB_PASSXOOPS_DB_PASS' . XOOPS_DB_PASS . '' . $xoops_config->xoops_db_pass . '
XOOPS_DB_NAMEXOOPS_DB_NAME' . XOOPS_DB_NAME . '' . $xoops_config->xoops_db_name . '
XOOPS_DB_PREFIXXOOPS_DB_PREFIX' . XOOPS_DB_PREFIX . '' . $xoops_config->xoops_db_prefix . '
'; + if ($xoopsUserIsAdmin && $is_admin_group){ + xpress_config_nomal_view(); + } else { + xpress_config_report_view(); + } echo "
"; + echo ''; echo "

"; } @@ -578,6 +605,67 @@ echo ""; echo ""; + echo ''; echo ""; } + } +} + +function xpress_group_role_state($is_report = false) +{ + global $xoopsModule; + $xoopsDB =& Database::getInstance(); + $xp_prefix = $GLOBALS['xoopsModule']->getInfo('dirname'); + if ($xp_prefix == 'wordpress'){ + $xp_prefix = 'wp'; + } + $prefix = $xoopsDB->prefix($xp_prefix . '_'); + $group_role_tables = $prefix.'group_role'; + $sql = "SELECT groupid , name AS xoops_groupe ,group_type, role , login_all FROM ". $group_role_tables; + $result = $xoopsDB->query($sql); + if ($is_report){ + echo "******** " . _AM_XP2_GROUP_ROLE . "********" . "
\n"; + } else { + echo "
" . _AM_XP2_GROUP_ROLE . ""; + echo "
"; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + } + $groupe_list = ''; + while ($myrow = $xoopsDB->fetchArray($result)){ + $xoops_groupe = $myrow["xoops_groupe"] ; + $group_type = empty($myrow["group_type"]) ? "None" : $myrow["group_type"] ; + $role = empty($myrow["role"]) ? "inhibit register" : $myrow["role"] ; + $login_all = empty($myrow["login_all"]) ? 'No' : 'Yes' ; + if (!empty($groupe_list)) $groupe_list .= ','; + $groupe_list .= $myrow["groupid"]; + if ($is_report){ + echo $xoops_groupe . ' : '; + echo '(' . $group_type. ') : '; + echo $role; + echo '(' . $login_all. ') : '; + echo '
'; + } else { + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + } + } + if ($is_report){ + echo "
"; + } else { + echo ''; + echo '
GROUPGROUPE TYPEROLEAllways Check
' . $xoops_groupe . '' . $group_type . '' . $role . '' . $login_all . '
'; + echo "
"; + echo ''; + echo "

"; } } @@ -599,8 +687,90 @@ echo $xoops_block_check->get_message(); echo ""; - echo ""; + echo ''; + echo "
"; } } - + +function xpress_block_options($is_report = false) +{ + $mydirname = basename( dirname( dirname( __FILE__ ) ) ) ; + + $module_objs = & get_module_objects($mydirname); + $module_obj = $module_objs[0]; + $mod_id = $module_obj->getVar('mid', 'n'); + $blocks = & get_block_object_orber_num_bymodule_id( $mod_id ); + $infos =& $module_obj->getInfo('blocks'); + if ($is_report){ + echo "******** " . _AM_XP2_BLOCK_OPTIONS . "********" . "
\n"; + foreach ( $blocks as $block ) + { + echo $block->getVar('title') . ' : ' . $block->getVar('options') . '
'; + } + echo "
\n"; + } else { + echo "
" . _AM_XP2_BLOCK_OPTIONS . ""; + echo "
"; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + foreach ( $blocks as $block ) + { + echo ''; + echo ''; + echo ''; + echo ''; + } + echo ''; + echo '
TitleOptions
' . $block->getVar('title') . '' . $block->getVar('options') . '
'; + echo '
'; + echo ''; + echo "

"; + } + +} +//-------------------------------------------------------- +// module handler +//-------------------------------------------------------- +function &get_module_objects($module_dir) +{ + $criteria = new CriteriaCompo(); + $criteria->add( new Criteria('isactive', '1', '=') ); + $criteria->add( new Criteria('dirname', $module_dir, '=') ); + + $module_handler =& xoops_gethandler('module'); + $objs =& $module_handler->getObjects( $criteria ); + return $objs; +} + +//-------------------------------------------------------- +// block handler +//-------------------------------------------------------- +function &get_block_object_orber_num_bymodule_id( $mid ) +{ + $arr = array(); + $objs =& get_block_object_bymodule_id( $mid ); + foreach ( $objs as $obj ) + { + $arr[ $obj->getVar('func_num', 'n') ] = $obj; + } + return $arr; +} + +function &get_block_object_bymodule_id( $mid, $asobject=true ) +{ + if ( defined('ICMS_VERSION_BUILD') && ICMS_VERSION_BUILD > 27 ) { /* ImpressCMS 1.2+ */ + $block_handler =& xoops_gethandler ('block'); + $objs =& $block_handler->getByModule( $mid, $asobject ); + } else { /* legacy support */ + $objs =& XoopsBlock::getByModule( $mid, $asobject ) ; /* from class/xoopsblock.php */ + } + return $objs; +} + + + $mydirname = basename( dirname( dirname( __FILE__ ) ) ) ; $mydirpath = dirname( dirname( __FILE__ ) ) ; @@ -655,4 +825,6 @@ xpress_active_plugin_list($report); xpress_block_state($report); +xpress_block_options($report); +xpress_group_role_state($report); admin_check_user_meta_prefix($report); xpress_state($report); Index: /branches/Ver2.2/xpressme_integration_kit/blocks/archives_block.php =================================================================== --- /branches/Ver2.2/xpressme_integration_kit/blocks/archives_block.php (revision 527) +++ /branches/Ver2.2/xpressme_integration_kit/blocks/archives_block.php (revision 528) @@ -27,5 +27,6 @@ require_once(XOOPS_ROOT_PATH.'/modules/'.$mydirname.'/blocks/block_common.php'); - $form = "MyDirectory
"; + $form = javascript_check(); + $form .= "MyDirectory
\n"; $form .= block_template_setting($mydirname,'options[1]',htmlspecialchars($this_template,ENT_QUOTES)); $form .= "
"; Index: /branches/Ver2.2/xpressme_integration_kit/blocks/authors_block.php =================================================================== --- /branches/Ver2.2/xpressme_integration_kit/blocks/authors_block.php (revision 527) +++ /branches/Ver2.2/xpressme_integration_kit/blocks/authors_block.php (revision 528) @@ -27,5 +27,6 @@ require_once(XOOPS_ROOT_PATH.'/modules/'.$mydirname.'/blocks/block_common.php'); - $form = "MyDirectory
"; + $form = javascript_check(); + $form .= "MyDirectory
\n"; $form .= block_template_setting($mydirname,'options[1]',htmlspecialchars($this_template,ENT_QUOTES)); $form .= "
"; Index: /branches/Ver2.2/xpressme_integration_kit/blocks/block_common.php =================================================================== --- /branches/Ver2.2/xpressme_integration_kit/blocks/block_common.php (revision 527) +++ /branches/Ver2.2/xpressme_integration_kit/blocks/block_common.php (revision 528) @@ -72,18 +72,18 @@ } $output = _MB_XP2_CATS_SELECT ."
\n"; - $output .= "\n"; - $output .= '  ' ."\n"; $output .= $option; - $output .= '
'; + $output .= ''; + $output .= ' ' . _MB_XP2_CATS_DIRECT_SELECT . "
\n"; $output .= ' '; + return $out; +} +endif; ?> Index: /branches/Ver2.2/xpressme_integration_kit/blocks/calender_block.php =================================================================== --- /branches/Ver2.2/xpressme_integration_kit/blocks/calender_block.php (revision 527) +++ /branches/Ver2.2/xpressme_integration_kit/blocks/calender_block.php (revision 528) @@ -25,5 +25,6 @@ require_once(XOOPS_ROOT_PATH.'/modules/'.$mydirname.'/blocks/block_common.php'); - $form = "MyDirectory
\n"; + $form = javascript_check(); + $form .= "MyDirectory
\n"; $form .= block_template_setting($mydirname,'options[1]',htmlspecialchars($this_template,ENT_QUOTES)); $form .= "
"; Index: /branches/Ver2.2/xpressme_integration_kit/blocks/category_block.php =================================================================== --- /branches/Ver2.2/xpressme_integration_kit/blocks/category_block.php (revision 527) +++ /branches/Ver2.2/xpressme_integration_kit/blocks/category_block.php (revision 528) @@ -34,5 +34,6 @@ require_once(XOOPS_ROOT_PATH.'/modules/'.$mydirname.'/blocks/block_common.php'); - $form = "MyDirectory
"; + $form = javascript_check(); + $form .= "MyDirectory
\n"; $form .= block_template_setting($mydirname,'options[1]',htmlspecialchars($this_template,ENT_QUOTES)); $form .= "
"; Index: /branches/Ver2.2/xpressme_integration_kit/blocks/enhanced_block.php =================================================================== --- /branches/Ver2.2/xpressme_integration_kit/blocks/enhanced_block.php (revision 527) +++ /branches/Ver2.2/xpressme_integration_kit/blocks/enhanced_block.php (revision 528) @@ -19,10 +19,10 @@ $mydirname = empty( $options[0] ) ? 'xpress' : $options[0] ; $this_template = empty( $options[1] ) ? 'db:'.$mydirname.'_enhanced_block.html' : trim( $options[1] ); - $form .= _MB_XP2_THISTEMPLATE . "
"; $include_file = empty( $options[2] ) ? '' : $options[2] ; require_once(XOOPS_ROOT_PATH.'/modules/'.$mydirname.'/blocks/block_common.php'); - $form = "MyDirectory
"; + $form = javascript_check(); + $form .= "MyDirectory
\n"; $form .= block_template_setting($mydirname,'options[1]',htmlspecialchars($this_template,ENT_QUOTES)); $form .= "
"; Index: /branches/Ver2.2/xpressme_integration_kit/blocks/meta_block.php =================================================================== --- /branches/Ver2.2/xpressme_integration_kit/blocks/meta_block.php (revision 527) +++ /branches/Ver2.2/xpressme_integration_kit/blocks/meta_block.php (revision 528) @@ -30,5 +30,6 @@ require_once(XOOPS_ROOT_PATH.'/modules/'.$mydirname.'/blocks/block_common.php'); - $form = "MyDirectory
"; + $form = javascript_check(); + $form .= "MyDirectory
\n"; $form .= block_template_setting($mydirname,'options[1]',htmlspecialchars($this_template,ENT_QUOTES)); $form .= "
"; Index: /branches/Ver2.2/xpressme_integration_kit/blocks/page_block.php =================================================================== --- /branches/Ver2.2/xpressme_integration_kit/blocks/page_block.php (revision 527) +++ /branches/Ver2.2/xpressme_integration_kit/blocks/page_block.php (revision 528) @@ -34,5 +34,6 @@ require_once(XOOPS_ROOT_PATH.'/modules/'.$mydirname.'/blocks/block_common.php'); - $form = "MyDirectory
"; + $form = javascript_check(); + $form .= "MyDirectory
\n"; $form .= block_template_setting($mydirname,'options[1]',htmlspecialchars($this_template,ENT_QUOTES)); $form .= "
"; Index: /branches/Ver2.2/xpressme_integration_kit/blocks/popular_posts_block.php =================================================================== --- /branches/Ver2.2/xpressme_integration_kit/blocks/popular_posts_block.php (revision 527) +++ /branches/Ver2.2/xpressme_integration_kit/blocks/popular_posts_block.php (revision 528) @@ -28,5 +28,6 @@ require_once(XOOPS_ROOT_PATH.'/modules/'.$mydirname.'/blocks/block_common.php'); - $form = "MyDirectory
\n"; + $form = javascript_check(); + $form .= "MyDirectory
\n"; $form .= block_template_setting($mydirname,'options[1]',htmlspecialchars($this_template,ENT_QUOTES)); $form .= "
\n"; Index: /branches/Ver2.2/xpressme_integration_kit/blocks/recent_comments_block.php =================================================================== --- /branches/Ver2.2/xpressme_integration_kit/blocks/recent_comments_block.php (revision 527) +++ /branches/Ver2.2/xpressme_integration_kit/blocks/recent_comments_block.php (revision 528) @@ -29,5 +29,6 @@ require_once(XOOPS_ROOT_PATH.'/modules/'.$mydirname.'/blocks/block_common.php'); - $form = "MyDirectory
\n"; + $form = javascript_check(); + $form .= "MyDirectory
\n"; $form .= block_template_setting($mydirname,'options[1]',htmlspecialchars($this_template,ENT_QUOTES)); $form .= "
"; Index: /branches/Ver2.2/xpressme_integration_kit/blocks/recent_posts_content_block.php =================================================================== --- /branches/Ver2.2/xpressme_integration_kit/blocks/recent_posts_content_block.php (revision 527) +++ /branches/Ver2.2/xpressme_integration_kit/blocks/recent_posts_content_block.php (revision 528) @@ -33,5 +33,6 @@ require_once(XOOPS_ROOT_PATH.'/modules/'.$mydirname.'/blocks/block_common.php'); - $form = "MyDirectory
\n"; + $form = javascript_check(); + $form .= "MyDirectory
\n"; $form .= block_template_setting($mydirname,'options[1]',htmlspecialchars($this_template,ENT_QUOTES)); $form .= "
"; Index: /branches/Ver2.2/xpressme_integration_kit/blocks/recent_posts_list_block.php =================================================================== --- /branches/Ver2.2/xpressme_integration_kit/blocks/recent_posts_list_block.php (revision 527) +++ /branches/Ver2.2/xpressme_integration_kit/blocks/recent_posts_list_block.php (revision 528) @@ -30,5 +30,6 @@ require_once(XOOPS_ROOT_PATH.'/modules/'.$mydirname.'/blocks/block_common.php'); - $form = "MyDirectory
\n"; + $form = javascript_check(); + $form .= "MyDirectory
\n"; $form .= block_template_setting($mydirname,'options[1]',htmlspecialchars($this_template,ENT_QUOTES)); $form .= "
\n"; Index: /branches/Ver2.2/xpressme_integration_kit/blocks/search_block.php =================================================================== --- /branches/Ver2.2/xpressme_integration_kit/blocks/search_block.php (revision 527) +++ /branches/Ver2.2/xpressme_integration_kit/blocks/search_block.php (revision 528) @@ -24,5 +24,6 @@ require_once(XOOPS_ROOT_PATH.'/modules/'.$mydirname.'/blocks/block_common.php') ; - $form = "MyDirectory
"; + $form = javascript_check(); + $form .= "MyDirectory
\n"; $form .= block_template_setting($mydirname,'options[1]',htmlspecialchars($this_template,ENT_QUOTES)); $form .= "
"; Index: /branches/Ver2.2/xpressme_integration_kit/blocks/tag_cloud_block.php =================================================================== --- /branches/Ver2.2/xpressme_integration_kit/blocks/tag_cloud_block.php (revision 527) +++ /branches/Ver2.2/xpressme_integration_kit/blocks/tag_cloud_block.php (revision 528) @@ -31,5 +31,6 @@ require_once(XOOPS_ROOT_PATH.'/modules/'.$mydirname.'/blocks/block_common.php'); - $form = "MyDirectory
"; + $form = javascript_check(); + $form .= "MyDirectory
\n"; $form .= block_template_setting($mydirname,'options[1]',htmlspecialchars($this_template,ENT_QUOTES)); $form .= "
"; Index: /branches/Ver2.2/xpressme_integration_kit/blocks/widget_block.php =================================================================== --- /branches/Ver2.2/xpressme_integration_kit/blocks/widget_block.php (revision 527) +++ /branches/Ver2.2/xpressme_integration_kit/blocks/widget_block.php (revision 528) @@ -45,5 +45,6 @@ require_once(XOOPS_ROOT_PATH.'/modules/'.$mydirname.'/blocks/block_common.php'); - $form = "MyDirectory
"; + $form = javascript_check(); + $form .= "MyDirectory
\n"; $form .= block_template_setting($mydirname,'options[1]',htmlspecialchars($this_template,ENT_QUOTES)); $form .= "
" . yes_no_radio_option('options[2]', _MB_XP2_WIDGET_TITLE_SHOW , $title_show); Index: /branches/Ver2.2/xpressme_integration_kit/class/check_blocks_class.php =================================================================== --- /branches/Ver2.2/xpressme_integration_kit/class/check_blocks_class.php (revision 527) +++ /branches/Ver2.2/xpressme_integration_kit/class/check_blocks_class.php (revision 528) @@ -344,5 +344,10 @@ function &_get_block_object_bymodule_id( $mid, $asobject=true ) { - $objs =& xoopsBlock::getByModule( $mid, $asobject ); + if ( defined('ICMS_VERSION_BUILD') && ICMS_VERSION_BUILD > 27 ) { /* ImpressCMS 1.2+ */ + $block_handler =& xoops_gethandler ('block'); + $objs =& $block_handler->getByModule( $mid, $asobject ); + } else { /* legacy support */ + $objs =& XoopsBlock::getByModule( $mid, $asobject ) ; /* from class/xoopsblock.php */ + } return $objs; } Index: /branches/Ver2.2/xpressme_integration_kit/include/search.php =================================================================== --- /branches/Ver2.2/xpressme_integration_kit/include/search.php (revision 527) +++ /branches/Ver2.2/xpressme_integration_kit/include/search.php (revision 528) @@ -25,5 +25,5 @@ } if ($userid) { - $userid = xoops_uid_to_wp_uid(intval($userid),$mydirname); + $wp_uid = xoops_uid_to_wp_uid(intval($userid),$mydirname); } @@ -56,5 +56,9 @@ } if ($userid) { - $where .= " AND (post_author=".$userid.")"; + if ($wp_uid){ + $where .= " AND (post_author=".$wp_uid.")"; + } else { + $where .= " AND 0 "; + } } Index: /branches/Ver2.2/xpressme_integration_kit/include/xpress_block_render.php =================================================================== --- /branches/Ver2.2/xpressme_integration_kit/include/xpress_block_render.php (revision 527) +++ /branches/Ver2.2/xpressme_integration_kit/include/xpress_block_render.php (revision 528) @@ -22,16 +22,24 @@ function xpress_block_cache_read($mydirname,$block_name) { - $xml_name = $block_name . '.xml'; - $xml_data = xpress_cache_read($mydirname,$xml_name); - - $GLOBALS['DO_LIBXML_PATCH'] = get_xpress_mod_config($mydirname,'libxml_patch'); - + $xml_name = $block_name . '.xml'; + $xml_data = xpress_cache_read($mydirname,$xml_name); + + $GLOBALS['DO_LIBXML_PATCH'] = get_xpress_mod_config($mydirname,'libxml_patch'); + + // The character-code not treatable exists when 'XML_unserialize' of PHP5 processes EUC-JP. + // And, the result is returned by character-code UTF-8. + // Measures + // After the character-code is converted into UTF-8, XML_unserialize will be processed. + if ( strstr($xml_data, '') !== false + && version_compare(PHP_VERSION, '5.0.0', '>') ) + { + $xml_data = str_replace('', '', $xml_data); + $ans = mb_convert_variables('UTF-8' , 'EUC-JP', &$xml_data); //EUC-JP to UTF-8 $ret = @xpress_XML_unserialize($xml_data); - if (strstr($xml_data, '') !== false){ - if (version_compare(PHP_VERSION, '5.0.0', '>')) { - $ans = mb_convert_variables('EUC-JP' , 'UTF-8', &$ret); //xpress_XML_unserialize() Return UTF-8 at PHP5 - } - } - return $ret; + $ans = mb_convert_variables('EUC-JP' , 'UTF-8', &$ret); //UTF-8 to EUC-JP + } else { + $ret = xpress_XML_unserialize($xml_data); + } + return $ret; } @@ -187,5 +195,5 @@ xpress_block_css_set($mydirname); - if (strstr($call_url , $this_block_url) !== false){ + if (strstr($call_url , $this_block_url) !== false && strstr($call_url , $this_block_url . 'admin/') === false){ $block_theme_file = get_block_file_path($mydirname,$inc_theme_file_name); require_once $block_theme_file['file_path']; @@ -204,5 +212,5 @@ if (isset($temp_option[1])) { - $templates_file = $temp_option[1]; + $templates_file = $options[1]; } else { $templates_file = 'db:'.$mydirname. '_' . str_replace(".php", ".html", $block_function_name); Index: /branches/Ver2.2/xpressme_integration_kit/language/english/admin.php =================================================================== --- /branches/Ver2.2/xpressme_integration_kit/language/english/admin.php (revision 527) +++ /branches/Ver2.2/xpressme_integration_kit/language/english/admin.php (revision 528) @@ -19,4 +19,6 @@ define("_AM_XP2_SYS_REPORT","Show Report Mode"); define("_AM_XP2_SYS_NORMAL","Show Normal Mode"); + define("_AM_XP2_BLOCK_OPTIONS","Block Options"); + define("_AM_XP2_GROUP_ROLE","Group Role"); // Block Check Index: /branches/Ver2.2/xpressme_integration_kit/language/english/blocks.php =================================================================== --- /branches/Ver2.2/xpressme_integration_kit/language/english/blocks.php (revision 527) +++ /branches/Ver2.2/xpressme_integration_kit/language/english/blocks.php (revision 528) @@ -27,4 +27,5 @@ define("_MB_XP2_FILE_NAME","Files Name"); define("_MB_XP2_THISTEMPLATE","Template"); + define("_MB_XP2_NO_JSCRIPT","Javascript should be enable by a browser."); // recent comment block @@ -48,4 +49,5 @@ define("_MB_XP2_DAYS_AND","and"); define("_MB_XP2_DAYS_AGO","days ago"); + define("_MB_XP2_CATS_DIRECT_SELECT","Direct input of ID(Comma separated list of categorie ID)"); // recent posts list Index: /branches/Ver2.2/xpressme_integration_kit/language/ja_utf8/admin.php =================================================================== --- /branches/Ver2.2/xpressme_integration_kit/language/ja_utf8/admin.php (revision 527) +++ /branches/Ver2.2/xpressme_integration_kit/language/ja_utf8/admin.php (revision 528) @@ -19,4 +19,6 @@ define("_AM_XP2_SYS_REPORT","レポート形式で表示"); define("_AM_XP2_SYS_NORMAL","ノーマル形式で表示"); + define("_AM_XP2_BLOCK_OPTIONS","ブロックオプション"); + define("_AM_XP2_GROUP_ROLE","グループ権限"); // Block Check Index: /branches/Ver2.2/xpressme_integration_kit/language/ja_utf8/blocks.php =================================================================== --- /branches/Ver2.2/xpressme_integration_kit/language/ja_utf8/blocks.php (revision 527) +++ /branches/Ver2.2/xpressme_integration_kit/language/ja_utf8/blocks.php (revision 528) @@ -27,4 +27,5 @@ define("_MB_XP2_FILE_NAME","ファイル名"); define("_MB_XP2_THISTEMPLATE","このブロックのテンプレート"); + define("_MB_XP2_NO_JSCRIPT","ブラウザでJavascriptを有効にする必要があります。"); // recent comment block @@ -48,4 +49,5 @@ define("_MB_XP2_DAYS_AND","から"); define("_MB_XP2_DAYS_AGO","日前までの間"); + define("_MB_XP2_CATS_DIRECT_SELECT","IDを直接指定(複数ある場合はカンマ区切りで入力)"); // recent posts list Index: /branches/Ver2.2/xpressme_integration_kit/wp-content/plugins/xpressme/include/xpress_upgrade.php =================================================================== --- /branches/Ver2.2/xpressme_integration_kit/wp-content/plugins/xpressme/include/xpress_upgrade.php (revision 527) +++ /branches/Ver2.2/xpressme_integration_kit/wp-content/plugins/xpressme/include/xpress_upgrade.php (revision 528) @@ -15,5 +15,4 @@ if(get_xpress_latest_version()){ $latest = get_option('xpressme_latest_version'); -//print_r($latest); if ($latest) { $site_url=$latest['url']; @@ -32,5 +31,4 @@ echo '

'. __('There is a new version of XPressME Integration Kit available for upgrade', 'xpressme') . '

'; echo '

'; - // printf(__('You can upgrade to version %s automatically or download the package and install it manually:'),$latest_version); printf(__('You can upgrade to version %s download the package and install it manually:', 'xpressme'),$latest_version); echo '

'; @@ -51,4 +49,5 @@ } + // develop if ($latest['develop_response'] == 'development_exists' && !empty($latest['develop_package']) @@ -61,4 +60,16 @@ printf(__('Download %s', 'xpressme') , $latest['develop_latest_version']); echo ''; + // develop diff + if ($latest['diff_develop_response'] == 'diff_develop_exists' + && !empty($latest['diff_develop_package']) + ) + { + echo '

'; + printf(__('You can download the differential file from version %s to %s and upgrade it manually:', 'xpressme'),$xpress_version,$latest['diff_develop_latest_version']); + echo '

'; + echo ''; + printf(__('Download differential file for %s', 'xpressme') , $latest['diff_develop_latest_version']); + echo ''; + } } @@ -141,4 +152,11 @@ if ( isset( $returns[15] ) ) $develop_latest_version = $returns[15]; else $develop_latest_version = ''; if ( isset( $returns[16] ) ) $develop_lang = $returns[16]; else $develop_lang = ''; + + // developer diff + if ( isset( $returns[18] ) ) $diff_develop_response = $returns[18]; else $diff_develop_response = ''; + if ( isset( $returns[19] ) ) $diff_develop_url = clean_url( $returns[19] ); else $diff_develop_url = ''; + if ( isset( $returns[20] ) ) $diff_develop_package = clean_url( $returns[20] ); else $diff_develop_package = ''; + if ( isset( $returns[21] ) ) $diff_develop_latest_version = $returns[21]; else $diff_develop_latest_version = ''; + if ( isset( $returns[22] ) ) $diff_develop_lang = $returns[22]; else $diff_develop_lang = ''; $write_options = array ( @@ -158,4 +176,9 @@ 'develop_latest_version' => $develop_latest_version , 'develop_lang' => $develop_lang , + 'diff_develop_response' => $diff_develop_response , + 'diff_develop_url' => $diff_develop_url , + 'diff_develop_package' => $diff_develop_package , + 'diff_develop_latest_version' => $diff_develop_latest_version , + 'diff_develop_lang' => $diff_develop_lang , 'check_time' => time() ); Index: /branches/Ver2.2/xpressme_integration_kit/wp-content/plugins/xpressme/language/xpressme-ja.po =================================================================== --- /branches/Ver2.2/xpressme_integration_kit/wp-content/plugins/xpressme/language/xpressme-ja.po (revision 527) +++ /branches/Ver2.2/xpressme_integration_kit/wp-content/plugins/xpressme/language/xpressme-ja.po (revision 528) @@ -8,6 +8,6 @@ "Project-Id-Version: XPressME Plugin\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-20 12:51+0900\n" -"PO-Revision-Date: 2009-11-20 12:51+0900\n" +"POT-Creation-Date: 2010-02-26 16:00+0900\n" +"PO-Revision-Date: 2010-02-26 16:01+0900\n" "Last-Translator: toemon \n" "Language-Team: toemon \n" @@ -43,113 +43,113 @@ msgstr "モジュール管理へ" -#: xpressme.php:164 +#: xpressme.php:159 msgid "XPressME Display Setting" msgstr "XPressME 表示設定" -#: xpressme.php:170 +#: xpressme.php:165 msgid "Thema Sidebar Display" msgstr "テーマ表示時にサイドバー表示する。" -#: xpressme.php:171 -#: xpressme.php:263 -#: xpressme.php:269 -#: xpressme.php:274 -#: xpressme.php:280 -#: xpressme_class.php:296 -#: xpressme_class.php:314 -#: xpressme_class.php:445 -#: xpressme_class.php:456 +#: xpressme.php:166 +#: xpressme.php:259 +#: xpressme.php:265 +#: xpressme.php:270 +#: xpressme.php:276 +#: xpressme_class.php:330 +#: xpressme_class.php:348 +#: xpressme_class.php:479 +#: xpressme_class.php:490 msgid "YES" msgstr "はい" -#: xpressme.php:172 -#: xpressme.php:264 -#: xpressme.php:270 -#: xpressme.php:275 -#: xpressme.php:281 -#: xpressme_class.php:297 -#: xpressme_class.php:315 -#: xpressme_class.php:446 -#: xpressme_class.php:457 +#: xpressme.php:167 +#: xpressme.php:260 +#: xpressme.php:266 +#: xpressme.php:271 +#: xpressme.php:277 +#: xpressme_class.php:331 +#: xpressme_class.php:349 +#: xpressme_class.php:480 +#: xpressme_class.php:491 msgid "NO" msgstr "いいえ" -#: xpressme.php:181 -#: xpressme.php:232 -#: xpressme.php:291 +#: xpressme.php:176 +#: xpressme.php:228 +#: xpressme.php:287 msgid "Update Config" msgstr "更新" -#: xpressme.php:182 -#: xpressme.php:233 -#: xpressme.php:292 +#: xpressme.php:177 +#: xpressme.php:229 +#: xpressme.php:288 msgid "Preset Config" msgstr "プリセット" -#: xpressme.php:214 +#: xpressme.php:210 msgid "XPressME Integration Setting" msgstr "XPressME 統合設定" -#: xpressme.php:218 +#: xpressme.php:214 msgid "Media Upload Base Path" msgstr "メディアアップロードのベースパス設定" -#: xpressme.php:222 +#: xpressme.php:218 msgid "Use XOOPS UPLOAD PATH" msgstr "XOOPSのアップロードパスを使用する。" -#: xpressme.php:223 +#: xpressme.php:219 msgid "USE WordPress BASE_PATH" msgstr "WordPressのベースパスを使用する。" -#: xpressme.php:257 +#: xpressme.php:253 msgid "XPressME Other Setting" msgstr "XPressME その他の設定" -#: xpressme.php:262 +#: xpressme.php:258 msgid "The change tracking of the post is preserved" msgstr "投稿の変更履歴を有効にする。" -#: xpressme.php:268 +#: xpressme.php:264 msgid "Select Multi user mode" msgstr "マルチユーザーモードを選択" -#: xpressme.php:273 +#: xpressme.php:269 msgid "Is the posts author views counted?" msgstr "投稿者の閲覧をカウントしますか？" -#: xpressme.php:279 +#: xpressme.php:275 msgid "Is SQL debugging window displayed?" msgstr "SQLデバッグウィンドを表示しますか？" -#: xpressme.php:284 +#: xpressme.php:280 msgid "Select warning display of block file version check" msgstr "ブロックファイルのバージョンチェック時における警告表示" -#: xpressme.php:285 +#: xpressme.php:281 msgid "Do display" msgstr "表示する" -#: xpressme.php:286 +#: xpressme.php:282 msgid "Do not display" msgstr "表示しない" #: xpressme_class.php:61 -#: xpressme_class.php:243 +#: xpressme_class.php:277 msgid "Older Post" msgstr "前の投稿へ" #: xpressme_class.php:62 -#: xpressme_class.php:246 +#: xpressme_class.php:280 msgid "Newer Post" msgstr "次の投稿へ" #: xpressme_class.php:64 -#: xpressme_class.php:249 +#: xpressme_class.php:283 msgid "Older Entries" msgstr "前ページへ" #: xpressme_class.php:65 -#: xpressme_class.php:252 +#: xpressme_class.php:286 msgid "Newer Entries" msgstr "次ページへ" @@ -157,274 +157,278 @@ #: xpressme_class.php:79 #: xpressme_class.php:80 -#: xpressme_class.php:255 +#: xpressme_class.php:289 msgid "Read the rest of this entry »" msgstr "この投稿の続きを読む »" -#: xpressme_class.php:356 +#: xpressme_class.php:390 msgid "Single Post Navi Setting" msgstr "シングルポストナビの設定" -#: xpressme_class.php:361 -#: xpressme_class.php:406 +#: xpressme_class.php:395 +#: xpressme_class.php:440 msgid "Adjustment of Navi link display position" msgstr "リンクの表示位置設定" -#: xpressme_class.php:364 +#: xpressme_class.php:398 msgid "'Old Post Link' is displayed in the left, and 'Newer Post Link' is displayed in the right" msgstr "以前の記事へのリンクを左に、より新しい記事へのリンクを右に表示" -#: xpressme_class.php:365 +#: xpressme_class.php:399 msgid "'Newer Post Link' is displayed in the left, and 'Old Post Link' is displayed in the right" msgstr "より新しい記事へのリンクを左に、古い記事へのリンクを右に表示" -#: xpressme_class.php:371 +#: xpressme_class.php:405 msgid "Select Display name of PostNavi Link" msgstr "表示するリンクテキストを選択" -#: xpressme_class.php:374 +#: xpressme_class.php:408 msgid "Title of post" msgstr "投稿記事のタイトルを表示" -#: xpressme_class.php:375 +#: xpressme_class.php:409 msgid "Title of Navi" msgstr "ナビタイトルを表示" -#: xpressme_class.php:381 +#: xpressme_class.php:415 msgid "Display Navi Title of Old Post Link" msgstr "古い記事へのナビタイトルを設定" -#: xpressme_class.php:388 +#: xpressme_class.php:422 msgid "Display Navi Title of Newer Post Link" msgstr "より新しい記事へのナビタイトルを設定" -#: xpressme_class.php:401 +#: xpressme_class.php:435 msgid "Posts List Page Navi Setting" msgstr "ポストリストページナビの設定" -#: xpressme_class.php:409 +#: xpressme_class.php:443 msgid "'Old Page Link' is displayed in the left, and 'Newer Page Link' is displayed in the right" msgstr "古いページへのリンクを左に、より新しいページへのリンクを右に表示" -#: xpressme_class.php:410 +#: xpressme_class.php:444 msgid "'Newer Page Link' is displayed in the left, and 'Old Page Link' is displayed in the right" msgstr "より新しいページへのリンクを左に、古いページへのリンクを右に表示" -#: xpressme_class.php:416 +#: xpressme_class.php:450 msgid "Display Navi Title of Old Page Link" msgstr "古いページへのナビタイトルを設定" -#: xpressme_class.php:423 +#: xpressme_class.php:457 msgid "Display Navi Title of Newer Page Link" msgstr "より新しいページへのナビタイトルを設定" -#: xpressme_class.php:436 +#: xpressme_class.php:470 msgid "Dashboard feed Display Setting" msgstr "ダッシュボード　フィード表示設定" -#: xpressme_class.php:442 +#: xpressme_class.php:476 msgid "Display XPressMe Integration Kit Blog" msgstr "XPressME Integration Kit ブログを表示する。" -#: xpressme_class.php:453 +#: xpressme_class.php:487 msgid "Display XPressMe Integration Kit Forum" msgstr "XPressME Integration Kit フォーラムを表示する。" -#: xpressme_class.php:471 +#: xpressme_class.php:505 msgid "Role Setting at Login" msgstr "ログイン時の権限設定" -#: xpressme_class.php:474 +#: xpressme_class.php:508 msgid "XOOPS Groupe" msgstr "XOOPSグループ名" -#: xpressme_class.php:474 +#: xpressme_class.php:508 msgid "WordPress Role" msgstr "WordPressでの権限" -#: xpressme_class.php:474 +#: xpressme_class.php:508 msgid "Role is set at each login" msgstr "ログイン時、常に権限を更新する" -#: xpressme_class.php:500 -#: xpressme_class.php:504 -#: xpressme_class.php:507 +#: xpressme_class.php:513 +msgid "module cannot be read" +msgstr "モジュールアクセス権限なし" + +#: xpressme_class.php:545 +#: xpressme_class.php:549 +#: xpressme_class.php:552 msgid "Default Role of WordPress" msgstr "WordPressのデフォルト権限" -#: xpressme_class.php:501 -#: xpressme_class.php:505 -#: xpressme_class.php:508 +#: xpressme_class.php:546 +#: xpressme_class.php:550 +#: xpressme_class.php:553 msgid "Group User Doesn't Register" msgstr "ユーザ登録しない" -#: xpressme_class.php:521 +#: xpressme_class.php:566 msgid "Only the Admin can set Group Role Setting" msgstr "管理者だけがグループ権限を設定できます。" -#: xpressme_class.php:541 +#: xpressme_class.php:586 msgid "WordPress MU cannot integrate the comments." msgstr "WordPress MUはコメント統合できません。" -#: xpressme_class.php:543 +#: xpressme_class.php:588 msgid "Do Not Comment Integration." msgstr "コメント統合しません。" -#: xpressme_class.php:578 +#: xpressme_class.php:623 msgid "Comment integration with D3Forum" msgstr "D3Forumとのコメント統合" -#: xpressme_class.php:580 +#: xpressme_class.php:625 msgid "Select the forum of D3Forum that does the comment integration from the following lists." msgstr "以下のリストからコメント統合をするD3Forumのフォーラムを選択してください。" -#: xpressme_class.php:585 +#: xpressme_class.php:630 msgid "Select the Type of display of D3Forum comment." msgstr "D3Forumの表示タイプを選択" -#: xpressme_class.php:587 -#: xpressme_class.php:590 +#: xpressme_class.php:632 +#: xpressme_class.php:635 msgid "Flat" msgstr "フラット" -#: xpressme_class.php:588 -#: xpressme_class.php:591 +#: xpressme_class.php:633 +#: xpressme_class.php:636 msgid "Threaded" msgstr "スレッド" -#: xpressme_class.php:594 +#: xpressme_class.php:639 msgid "Select the order of display of D3Forum comment." msgstr "D3Forumコメントの表示順を選択" -#: xpressme_class.php:596 -#: xpressme_class.php:599 +#: xpressme_class.php:641 +#: xpressme_class.php:644 msgid "DESC" msgstr "降順" -#: xpressme_class.php:597 -#: xpressme_class.php:600 +#: xpressme_class.php:642 +#: xpressme_class.php:645 msgid "ASC" msgstr "昇順" -#: xpressme_class.php:603 +#: xpressme_class.php:648 msgid "Number of displays of D3Forum comments." msgstr "D3Forumのコメント表示数" -#: xpressme_class.php:606 +#: xpressme_class.php:651 msgid "The import and the export between Wordpress Comments and the D3Forum Posts can be done. " msgstr "WordPressコメントとD3Forumポスト間の一括転送（エクスポート・インポート）" -#: xpressme_class.php:607 +#: xpressme_class.php:652 msgid "Export to D3Forum" msgstr "D3Forumへ一括エクスポート" -#: xpressme_class.php:608 +#: xpressme_class.php:653 msgid "Import from D3Forum" msgstr "D3Forumから一括インポート" -#: xpressme_class.php:621 +#: xpressme_class.php:666 msgid "Contents Excerpt Setting" msgstr "記事抜粋の設定" -#: xpressme_class.php:626 +#: xpressme_class.php:671 msgid "Is the excerpt display done with the archive of contents?" msgstr "記事のアーカイブで抜粋表示を行いますか？" -#: xpressme_class.php:633 +#: xpressme_class.php:678 msgid "When ASCII character more than the set ratio is included, it is judged ASCII contents. " msgstr "ASCII文字が含まれる比率が設定された値より大きい場合、ASCII文字コンテンツと判断します。" -#: xpressme_class.php:640 +#: xpressme_class.php:685 msgid "Excerpt length of word for ASCII contents" msgstr "ASCIIコンテンツの抜粋単語数" -#: xpressme_class.php:647 +#: xpressme_class.php:692 msgid "Excerpt length of character for multibyte contents" msgstr "マルチバイトコンテンツの抜粋文字数" -#: xpressme_class.php:654 +#: xpressme_class.php:699 msgid "This text is displayed in the link that reads contents not excerpted.(Is not displayed for the blank.)" msgstr "抜粋されていないコンテンツを読むためのリンクに表示されるテキスト(空白の場合リンクを表示しません)" -#: xpressme_class.php:661 +#: xpressme_class.php:706 msgid "This text is displayed in the link that more tag (<!--more-->). " msgstr "more タグ (<!--more-->)のリンクに表示されるテキスト" -#: xpressme_class.php:673 +#: xpressme_class.php:718 msgid "Display Mode Setting" msgstr "表示モード設定" -#: xpressme_class.php:676 +#: xpressme_class.php:721 msgid "Select the XPressME Display Mode." msgstr "XPressMEの表示モードの選択" -#: xpressme_class.php:681 +#: xpressme_class.php:726 msgid "Xoops Mode" msgstr "XOOPSモード" -#: xpressme_class.php:685 +#: xpressme_class.php:730 msgid "WordPress Mode" msgstr "WordPressモード" -#: xpressme_class.php:689 +#: xpressme_class.php:734 msgid "User select" msgstr "ユーザによる選択" -#: xpressme_class.php:694 +#: xpressme_class.php:739 msgid "Select the theme used in the XOOPS Mode." msgstr "XOOPSモードで使用するテーマを選択" -#: xpressme_class.php:699 +#: xpressme_class.php:744 msgid "Use WordPress Selected Themes" msgstr "WordPressで選択したテーマを使う" -#: xpressme_class.php:717 +#: xpressme_class.php:762 msgid "Header Meta Option" msgstr "ヘッダメタ　オプション" -#: xpressme_class.php:722 +#: xpressme_class.php:767 msgid "Select the Header keyword." msgstr "ヘッダで使用するキーワードの選択" -#: xpressme_class.php:727 +#: xpressme_class.php:772 msgid "Xoops KeyWord" msgstr "XOOPSのキーワード" -#: xpressme_class.php:730 +#: xpressme_class.php:775 msgid "WordPress KeyWord" msgstr "WordPressのキーワード" -#: xpressme_class.php:733 +#: xpressme_class.php:778 msgid "WordPress & Xoops KeyWord" msgstr "WordPressｊとXOOPSのキーワード" -#: xpressme_class.php:739 +#: xpressme_class.php:784 msgid "Select the Header Description." msgstr "ヘッダで使用するディスクリプション（説明）の選択" -#: xpressme_class.php:744 +#: xpressme_class.php:789 msgid "Xoops Description" msgstr "XOOPSのディスクリプション" -#: xpressme_class.php:747 +#: xpressme_class.php:792 msgid "WordPress Description" msgstr "WordPressのディスクリプション" -#: xpressme_class.php:750 +#: xpressme_class.php:795 msgid "WordPress & Xoops Description" msgstr "WordPressとXOOPSのディスクリプション" -#: xpressme_class.php:756 +#: xpressme_class.php:801 msgid "Select the Header Robots Index." msgstr "ヘッダで使用するロボットインデックスの選択" -#: xpressme_class.php:761 +#: xpressme_class.php:806 msgid "Xoops Robots Index" msgstr "XOOPSのロボットインデックス" -#: xpressme_class.php:764 +#: xpressme_class.php:809 msgid "WordPress Robots Index" msgstr "WordPressのロボットインデックス" -#: xpressme_class.php:793 +#: xpressme_class.php:838 #, php-format msgid "Unable to create directory %s. Is its parent directory writable by the server?" @@ -498,81 +502,81 @@ msgstr "%sのパーマリンク" -#: include/custom_functions.php:429 -#: include/custom_functions.php:459 +#: include/custom_functions.php:431 +#: include/custom_functions.php:461 #, php-format msgid "views :%d" msgstr "閲覧数 :%d" -#: include/custom_functions.php:623 +#: include/custom_functions.php:625 msgid "Main" msgstr "メイン" -#: include/custom_functions.php:626 +#: include/custom_functions.php:628 #, php-format msgid "Archive for the ‘%s’ Category" msgstr "カテゴリー ‘%s’ のアーカイブ" -#: include/custom_functions.php:629 +#: include/custom_functions.php:631 #, php-format msgid "Posts Tagged ‘%s’" msgstr "‘%s’ タグのついている投稿" -#: include/custom_functions.php:632 +#: include/custom_functions.php:634 #, php-format msgid "Archive for %s|Daily archive page" msgstr "%sの日別アーカイブ" -#: include/custom_functions.php:632 +#: include/custom_functions.php:634 msgid "F jS, Y" msgstr "Y年n月j日" -#: include/custom_functions.php:634 +#: include/custom_functions.php:636 #, php-format msgid "Archive for %s|Monthly archive page" msgstr "%sの月別アーカイブ" -#: include/custom_functions.php:634 +#: include/custom_functions.php:636 msgid "F, Y" msgstr "Y年n月" -#: include/custom_functions.php:636 +#: include/custom_functions.php:638 #, php-format msgid "Archive for %s|Yearly archive page" msgstr "%sの年別アーカイブ " -#: include/custom_functions.php:636 +#: include/custom_functions.php:638 msgid "Y" msgstr "Y年" -#: include/custom_functions.php:639 +#: include/custom_functions.php:641 #, php-format msgid "Archive for the ‘%s’ Author" msgstr "投稿者 ‘%s’ のアーカイブ" -#: include/custom_functions.php:642 +#: include/custom_functions.php:644 #, php-format msgid "Search Results of word ‘%s’" msgstr "‘%s’ の検索結果" -#: include/custom_functions.php:648 #: include/custom_functions.php:650 +#: include/custom_functions.php:652 #, php-format msgid "Article of %s" msgstr "%sの記事" -#: include/custom_functions.php:672 +#: include/custom_functions.php:674 #, php-format msgid "From %1$s on site %2$s" msgstr "サイト %2$s の %1$s より" -#: include/custom_functions.php:693 +#: include/custom_functions.php:695 msgid "No Trackback/Pingback" msgstr "トラックバック・ピンバックはありません" -#: include/custom_functions.php:694 +#: include/custom_functions.php:696 msgid "One Trackback/Pingback" msgstr "トラックバック・ピンバック 1 件" -#: include/custom_functions.php:695 +#: include/custom_functions.php:697 msgid "% TrackBack/Pingback" msgstr "トラックバック・ピンバック % 件" @@ -620,5 +624,5 @@ msgstr "WordPressモードへ切替" -#: include/xpress_common_functions.php:390 +#: include/xpress_common_functions.php:382 #, php-format msgid "Block file %1$s is an old version %2$s.
used block file %3$s of new version %4$s." @@ -629,54 +633,56 @@ msgstr "XPressME アップグレード" -#: include/xpress_upgrade.php:28 +#: include/xpress_upgrade.php:27 #, php-format msgid "You are using a XPressME Integration Kit development version (%1$s). Cool! Please stay updated." msgstr "お使いの XPressME Integration Kit は開発版 (%1$s) です。すばらしい ! どうぞ最新版を使い続けてください。" -#: include/xpress_upgrade.php:32 +#: include/xpress_upgrade.php:31 msgid "There is a new version of XPressME Integration Kit available for upgrade" msgstr "新しいバージョンの XPressME Integration Kit にアップグレードが可能です" -#: include/xpress_upgrade.php:35 +#: include/xpress_upgrade.php:33 #, php-format msgid "You can upgrade to version %s download the package and install it manually:" msgstr "バージョン %s のパッケージを手動でダウンロードしてインストールすることができます。" -#: include/xpress_upgrade.php:38 -#: include/xpress_upgrade.php:61 +#: include/xpress_upgrade.php:36 +#: include/xpress_upgrade.php:60 #, php-format msgid "Download %s" msgstr "%s をダウンロード" -#: include/xpress_upgrade.php:43 +#: include/xpress_upgrade.php:41 +#: include/xpress_upgrade.php:68 #, php-format msgid "You can download the differential file from version %s to %s and upgrade it manually:" msgstr "バージョン%sから%sへの差分ファイルをダウンロードし、手動でアップグレードすることができます：" -#: include/xpress_upgrade.php:46 +#: include/xpress_upgrade.php:44 +#: include/xpress_upgrade.php:71 #, php-format msgid "Download differential file for %s" msgstr "%sの差分ファイルをダウンロード" -#: include/xpress_upgrade.php:50 +#: include/xpress_upgrade.php:48 msgid "You have the latest version of XPressME Integration Kit. You do not need to upgrade" msgstr "最新バージョンの XPressME Integration Kit をご利用中です。アップグレードの必要はありません。" -#: include/xpress_upgrade.php:58 +#: include/xpress_upgrade.php:57 #, php-format msgid "You can use the development version %s download the package and install it manually:" msgstr "開発バージョン %s のパッケージを手動でダウンロードしてインストールすることができます。" -#: include/xpress_upgrade.php:67 +#: include/xpress_upgrade.php:78 #, php-format msgid "There is no response from version check API now. sorry, please confirm it after." msgstr "現在、version check APIからのレスポンスがありません。　申し訳ありませんが、しばらく後で確認してください。" -#: include/xpress_upgrade.php:212 +#: include/xpress_upgrade.php:235 #, php-format msgid "XPressME Integration Kit Version %1$s is available! Please update now." msgstr "XPressME Integration Kit Version %1$s が利用可能です ! アップデートしてください。" -#: include/xpress_upgrade.php:214 +#: include/xpress_upgrade.php:237 #, php-format msgid "XPressME Integration Kit Version %1$s is available! Please notify the site administrator." Index: /branches/Ver2.2/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme.php =================================================================== --- /branches/Ver2.2/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme.php (revision 527) +++ /branches/Ver2.2/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme.php (revision 528) @@ -205,4 +205,5 @@ } + $xpress_config->GroupeRoleCheck(); echo '
'."\n"; echo '

'."\n"; Index: /branches/Ver2.2/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme_class.php =================================================================== --- /branches/Ver2.2/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme_class.php (revision 527) +++ /branches/Ver2.2/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme_class.php (revision 528) @@ -158,59 +158,94 @@ global $xoops_db; - // table sync $table = get_wp_prefix() . 'group_role'; - $xoops_group = get_xoops_prefix() . 'groups'; - $xoops_group_permission = get_xoops_prefix() . 'group_permission'; + + $sql= "SELECT * FROM $table"; + $this->groupe_role = $xoops_db->get_results($sql); + } + + function GroupeRoleCheck() { + global $xoops_db; $module_id = get_xpress_modid(); - $sql= "SELECT * FROM $table"; - $before_groupes = $xoops_db->get_results($sql); - - $sql = "DELETE FROM $table"; - $xoops_db->query($sql); - - $sql = "SELECT * FROM $xoops_group_permission WHERE gperm_itemid = $module_id"; + $group_role_table = get_wp_prefix() . 'group_role'; + $xoops_group_table = get_xoops_prefix() . 'groups'; + $xoops_group_permission_table = get_xoops_prefix() . 'group_permission'; + + + + $sql = "SELECT * FROM $xoops_group_permission_table WHERE gperm_itemid = $module_id"; $gperms = $xoops_db->get_results($sql); - $sql = "SELECT * FROM $xoops_group WHERE group_type <> 'Anonymous'"; + $sql = "SELECT * FROM $xoops_group_table WHERE group_type <> 'Anonymous'"; $groupes = $xoops_db->get_results($sql); - $insert_sql = ''; + + // list of groups registered with XOOPS + $xoops_groupid_list = ''; foreach ($groupes as $groupe) { - $parmsql = "SELECT * FROM $xoops_group_permission WHERE gperm_itemid = $module_id AND gperm_groupid = $groupe->groupid"; - $gperms = $xoops_db->get_results($parmsql); - $parmission = ''; + if (!empty($xoops_groupid_list)) $xoops_groupid_list .= ','; + $xoops_groupid_list .= $groupe->groupid; + } + + // delete the group deleted by the XOOPS group from a group role database + if (!empty($xoops_groupid_list)){ + $del_sql = "DELETE FROM $group_role_table WHERE groupid NOT IN ($xoops_groupid_list)"; + $xoops_db->query($del_sql); + } + + $sql = "SELECT * FROM $group_role_table"; + $groupes_role = $xoops_db->get_results($sql); + + foreach ($groupes as $groupe) { + //get group parmission + $group_type = ''; foreach ($gperms as $gperm) { + if ($gperm->gperm_groupid == $groupe->groupid){ + $group_type = $gperm->gperm_name; + if ($group_type == 'module_admin') break; + } + } + if (empty($group_type)) $group_type = 'module_inhibit'; + + $found = false; + foreach ($groupes_role as $groupe_role) { + if ($groupe_role->groupid == $groupe->groupid){ + $role = $groupe_role->role; + if ($group_type == 'module_admin') $role = 'administrator'; + if ($group_type == 'module_inhibit') $role = ''; + $edit_sql = "UPDATE $group_role_table SET group_type='$group_type',role='$role' WHERE groupid = $groupe->groupid"; + $found = true; + break; + } + } + if(!$found){ + $role = ''; + if ($group_type == 'module_admin') $role = 'administrator'; + + $edit_sql = "INSERT INTO $group_role_table "; + $edit_sql .= "(groupid , name , description , group_type , role , login_all) "; + $edit_sql .= "VALUES ("; + $edit_sql .= $groupe->groupid . ', '; + $edit_sql .= "'" . $groupe->name . "' , "; + $edit_sql .= "'" . $groupe->description . "' , "; + $edit_sql .= "'" . $parmission . "' , "; + $edit_sql .= "'" . $role . "' , '"; + $edit_sql .= $login_all . "')"; + } + $xoops_db->query($edit_sql); + } + $this->GroupeRoleRead(); + } + + function get_groupe_perm_for_modules($module_id ,$group_id) + { + $parmsql = "SELECT * FROM $xoops_group_permission WHERE gperm_itemid = $module_id AND gperm_groupid = $group_id"; + $gperms = $xoops_db->get_results($parmsql); + $parmission = ''; + foreach ($gperms as $gperm) { $parmission = $gperm->gperm_name; if ($parmission == 'module_admin') break; - } - - if (!empty($parmission)){ - $role = ''; - foreach ($before_groupes as $before_groupe) { - if ($groupe->groupid == $before_groupe->groupid) { - $role = $before_groupe->role; - $login_all = $before_groupe->login_all; - } - } - if ($parmission == 'module_admin') $role = 'administrator'; - - $insert_sql = "INSERT INTO $table "; - $insert_sql .= "(groupid , name , description , group_type , role , login_all) "; - $insert_sql .= "VALUES ("; - $insert_sql .= $groupe->groupid . ', '; - $insert_sql .= "'" . $groupe->name . "' , "; - $insert_sql .= "'" . $groupe->description . "' , "; - $insert_sql .= "'" . $parmission . "' , "; - $insert_sql .= "'" . $role . "' , '"; - $insert_sql .= $login_all . "')"; - $xoops_db->query($insert_sql); - } - } - - $sql= "SELECT * FROM $table"; - - $this->groupe_role = $xoops_db->get_results($sql); - $sql= "SELECT * FROM $table"; + } + return $parmission; } @@ -474,4 +509,11 @@ $form .= '' . __('XOOPS Groupe', 'xpressme') . '' . __('WordPress Role', 'xpressme') . '' . __('Role is set at each login', 'xpressme') . "\n"; foreach ($this->groupe_role as $groupe) { + if ($groupe->group_type == 'module_inhibit'){ + $form .= ""; + $form .= " $groupe->name "; + $form .= "" . __('module cannot be read', 'xpressme') . ""; + $form .= "\n"; + continue; + } $form .= ""; $form .= " $groupe->name "; @@ -485,5 +527,9 @@ foreach($wp_roles->role_names as $role => $name) { - $name = translate_with_context($name); + if(function_exists('translate_user_role')){ + $name = translate_user_role($name); + } else { + $name = translate_with_context($name); + } if ( $role == $select_value) { $selected = ' selected="selected"'; Index: /branches/Ver2.2/xpressme_integration_kit/xoops_version.php =================================================================== --- /branches/Ver2.2/xpressme_integration_kit/xoops_version.php (revision 527) +++ /branches/Ver2.2/xpressme_integration_kit/xoops_version.php (revision 528) @@ -38,5 +38,5 @@ $modversion['name'] = ucfirst($mydirname) . ' ' . constant('_MI_XP2_NAME') ; $modversion['description'] = constant( '_MI_XP2_DESC'); -$modversion['version'] = "2.20"; +$modversion['version'] = "2.25"; $modversion['credits'] = "Wordpress DEV (http://wordpress.org/) XPressME DEV Toemon) (http://ja.xpressme.info) ;"; $modversion['author'] = "toemon (http://ja.xpressme.info)"; @@ -256,6 +256,6 @@ 'func_num' => $b_no, ); -$b_no++; if (wp_version_compare($wp_version, '>=','2.3')){ + $b_no++; $modversion['blocks'][$b_no] = array( 'file' => 'tag_cloud_block.php' , @@ -291,6 +291,6 @@ 'func_num' => $b_no, ); -$b_no++; if (wp_version_compare($wp_version, '>=','2.7')){ + $b_no++; $modversion['blocks'][$b_no] = array( 'file' => 'widget_block.php' ,