Merge branch 'sbb' of gitlab.agentec.jp:abook_web/web-viewer into bug/sbb

abvw/common/json/lang/lang-en.json

@@ -50,7 +50,7 @@
 "txtPubDt":"Released Date",
 "txtPubDt":"Released Date",
 "txtRecordNum":" ",
 "txtRecordNum":" ",
 "txtRecordTotal":"    ",
 "txtRecordTotal":"    ",
-"dspViewMore":">> Next {0} contents",
+"dspViewMore":">> Next",
 "txtGen":"Genre",
 "txtGen":"Genre",
 "txtGr":"Group",
 "txtGr":"Group",
 "txtViewDt":"Accessed Date",
 "txtViewDt":"Accessed Date",
@@ -64,7 +64,7 @@
 "dspBkCancel":"Logout",
 "dspBkCancel":"Logout",
 "txtSearchResult":"Result",
 "txtSearchResult":"Result",
 "dspHome":"Home",
 "dspHome":"Home",
-"txtLoginUser":"(Ver.20130517_01):",
+"txtLoginUser":"(Ver.20130521_01):",
 "txtAll":"All",
 "txtAll":"All",
 "txtMkgSize":"Size",
 "txtMkgSize":"Size",
 "txtMkgS":"S",
 "txtMkgS":"S",

abvw/common/json/lang/lang-in.json

@@ -41,16 +41,16 @@
 "txtPwdRemind":"※※Apabila Anda memilih lewatkan, pesan ini tidak akan ditampilkan dalam 30 hari",
 "txtPwdRemind":"※※Apabila Anda memilih lewatkan, pesan ini tidak akan ditampilkan dalam 30 hari",
 "txtSearch":"Pencarian",
 "txtSearch":"Pencarian",
 "dspShiori":"Tanda",
 "dspShiori":"Tanda",
-"dspSetting":"Ubah pengaturan",
+"dspSetting":"Mengatur",
 "dspLogout":"Logout",
 "dspLogout":"Logout",
 "txtRead":"Baca",
 "txtRead":"Baca",
 "txtSort":"Susun ulang",
 "txtSort":"Susun ulang",
 "dspTitleNm":"Judul",
 "dspTitleNm":"Judul",
-"dspTitleNmKn":"Judul (dalam huruf Jepang)",
+"dspTitleNmKn":"",
 "txtPubDt":"Tanggal dibuka",
 "txtPubDt":"Tanggal dibuka",
 "txtRecordNum":"Jumlah pencarian",
 "txtRecordNum":"Jumlah pencarian",
 "txtRecordTotal":"Tampilkan jumlah pencarian",
 "txtRecordTotal":"Tampilkan jumlah pencarian",
-"dspViewMore":">>Tampilkan{0}jumlah pencarian berikutnya",
+"dspViewMore":">>berikutnya",
 "txtGen":"Aliran",
 "txtGen":"Aliran",
 "txtGr":"Kelompok",
 "txtGr":"Kelompok",
 "txtViewDt":"Tanggal dilihat",
 "txtViewDt":"Tanggal dilihat",
@@ -64,7 +64,7 @@
 "dspBkCancel":"Logout tanpa back-up",
 "dspBkCancel":"Logout tanpa back-up",
 "txtSearchResult":"Hasil pencarian",
 "txtSearchResult":"Hasil pencarian",
 "dspHome":"Beranda",
 "dspHome":"Beranda",
-"txtLoginUser":"(Ver.20130517_01):",
+"txtLoginUser":"(Ver.20130521_01):",
 "txtAll":"Semua",
 "txtAll":"Semua",
 "txtMkgSize":"Ukuran",
 "txtMkgSize":"Ukuran",
 "txtMkgS":"Kecil",
 "txtMkgS":"Kecil",
@@ -92,7 +92,7 @@
 "txtTooltipShowMarking":"Tampilkan/sembunyikan penandaan",
 "txtTooltipShowMarking":"Tampilkan/sembunyikan penandaan",
 "txtTooltipShowMarkingTool":"Tampilkan/sembunyikan tanda tool bar",
 "txtTooltipShowMarkingTool":"Tampilkan/sembunyikan tanda tool bar",
 "msgShioriDeleted":"Halaman dihapus.",
 "msgShioriDeleted":"Halaman dihapus.",
-"dspViewHistory":"Catatan akses",
+"dspViewHistory":"History",
 "msgLoginEmpty":"Masukkan informasi login",
 "msgLoginEmpty":"Masukkan informasi login",
 "msgSaveOk":"Telah disimpan",
 "msgSaveOk":"Telah disimpan",
 "msgPlaceHolder":"Masukkan kata kunci",
 "msgPlaceHolder":"Masukkan kata kunci",

abvw/common/json/lang/lang-ja.json

@@ -41,7 +41,7 @@
 "txtPwdRemind":"※スキップを選択すると、30日間はこのメッセージが表示されません",
 "txtPwdRemind":"※スキップを選択すると、30日間はこのメッセージが表示されません",
 "txtSearch":"検索",
 "txtSearch":"検索",
 "dspShiori":"しおり",
 "dspShiori":"しおり",
-"dspSetting":"設定変更",
+"dspSetting":"設定",
 "dspLogout":"ログアウト",
 "dspLogout":"ログアウト",
 "txtRead":"読む",
 "txtRead":"読む",
 "txtSort":"並べ替え",
 "txtSort":"並べ替え",
@@ -50,7 +50,7 @@
 "txtPubDt":"公開日",
 "txtPubDt":"公開日",
 "txtRecordNum":"件",
 "txtRecordNum":"件",
 "txtRecordTotal":"件 表示",
 "txtRecordTotal":"件 表示",
-"dspViewMore":">> 次の{0}件を表示",
+"dspViewMore":">> 次へ",
 "txtGen":"ジャンル",
 "txtGen":"ジャンル",
 "txtGr":"グループ",
 "txtGr":"グループ",
 "txtViewDt":"閲覧日",
 "txtViewDt":"閲覧日",
@@ -64,7 +64,7 @@
 "dspBkCancel":"バックアップせずにログアウト",
 "dspBkCancel":"バックアップせずにログアウト",
 "txtSearchResult":"検索結果",
 "txtSearchResult":"検索結果",
 "dspHome":"ホーム",
 "dspHome":"ホーム",
-"txtLoginUser":"(Ver.20130517_01):",
+"txtLoginUser":"(Ver.20130521_01):",
 "txtAll":"すべて",
 "txtAll":"すべて",
 "txtMkgSize":"太さ",
 "txtMkgSize":"太さ",
 "txtMkgS":"小",
 "txtMkgS":"小",
@@ -92,7 +92,7 @@
 "txtTooltipShowMarking":"マーキング表示・非表示",
 "txtTooltipShowMarking":"マーキング表示・非表示",
 "txtTooltipShowMarkingTool":"マーキングツールバーを表示・非表示",
 "txtTooltipShowMarkingTool":"マーキングツールバーを表示・非表示",
 "msgShioriDeleted":"ページが削除しました。",
 "msgShioriDeleted":"ページが削除しました。",
-"dspViewHistory":"閲覧履歴",
+"dspViewHistory":"閲覧",
 "msgLoginEmpty":"ログイン情報を入力してください",
 "msgLoginEmpty":"ログイン情報を入力してください",
 "msgSaveOk":"保存しました",
 "msgSaveOk":"保存しました",
 "msgPlaceHolder":"キーワードを入力してください",
 "msgPlaceHolder":"キーワードを入力してください",

abvw/common/json/lang/lang-ko.json

@@ -41,7 +41,7 @@
 "txtPwdRemind":"스킵을 선택하면 30일간 이 메세지를 표시하지 않",
 "txtPwdRemind":"스킵을 선택하면 30일간 이 메세지를 표시하지 않",
 "txtSearch":"검색",
 "txtSearch":"검색",
 "dspShiori":"북마크",
 "dspShiori":"북마크",
-"dspSetting":"환경설정",
+"dspSetting":"설정",
 "dspLogout":"로그아웃",
 "dspLogout":"로그아웃",
 "txtRead":"열람",
 "txtRead":"열람",
 "txtSort":"정렬",
 "txtSort":"정렬",
@@ -50,7 +50,7 @@
 "txtPubDt":"공개일",
 "txtPubDt":"공개일",
 "txtRecordNum":"건",
 "txtRecordNum":"건",
 "txtRecordTotal":"건 표시",
 "txtRecordTotal":"건 표시",
-"dspViewMore":">> 다음 {0}건 표시",
+"dspViewMore":">> 다음",
 "txtGen":"분류",
 "txtGen":"분류",
 "txtGr":"그룹",
 "txtGr":"그룹",
 "txtViewDt":"열람일",
 "txtViewDt":"열람일",
@@ -64,7 +64,7 @@
 "dspBkCancel":"로그아웃",
 "dspBkCancel":"로그아웃",
 "txtSearchResult":"검색 결과",
 "txtSearchResult":"검색 결과",
 "dspHome":"홈",
 "dspHome":"홈",
-"txtLoginUser":"(Ver.20130517_01):",
+"txtLoginUser":"(Ver.20130521_01):",
 "txtAll":"전체",
 "txtAll":"전체",
 "txtMkgSize":"두께",
 "txtMkgSize":"두께",
 "txtMkgS":"소",
 "txtMkgS":"소",
@@ -92,7 +92,7 @@
 "txtTooltipShowMarking":"마킹 표시/비표시",
 "txtTooltipShowMarking":"마킹 표시/비표시",
 "txtTooltipShowMarkingTool":"마킹 툴바 표시/비표시",
 "txtTooltipShowMarkingTool":"마킹 툴바 표시/비표시",
 "msgShioriDeleted":"북마크한 페이지가 삭제되었습니다.",
 "msgShioriDeleted":"북마크한 페이지가 삭제되었습니다.",
-"dspViewHistory":"열람 이력",
+"dspViewHistory":"이력",
 "msgLoginEmpty":"로그인 정보를 입력해 주십시오.",
 "msgLoginEmpty":"로그인 정보를 입력해 주십시오.",
 "msgSaveOk":"저장했습니다.",
 "msgSaveOk":"저장했습니다.",
 "msgPlaceHolder":"키워드를 입력해 주십시오.",
 "msgPlaceHolder":"키워드를 입력해 주십시오.",

abvw/common/json/lang/lang-th.json

@@ -41,16 +41,16 @@
 "txtPwdRemind":"※เมื่อเลือกSkip จะไม่แสดงข้อความนี้เป็นเวลา30วัน",
 "txtPwdRemind":"※เมื่อเลือกSkip จะไม่แสดงข้อความนี้เป็นเวลา30วัน",
 "txtSearch":"ค้นหา",
 "txtSearch":"ค้นหา",
 "dspShiori":"บุ๊คมาร์ก",
 "dspShiori":"บุ๊คมาร์ก",
-"dspSetting":"เปลี่ยนแปลงการตั้งค่า",
+"dspSetting":"ตั้งค่า",
 "dspLogout":"Log out",
 "dspLogout":"Log out",
 "txtRead":"อ่าน",
 "txtRead":"อ่าน",
 "txtSort":"เรียงใหม่",
 "txtSort":"เรียงใหม่",
 "dspTitleNm":"หัวข้อ",
 "dspTitleNm":"หัวข้อ",
-"dspTitleNmKn":"หัวข้อ(อักษรคานะ)",
+"dspTitleNmKn":"",
 "txtPubDt":"วันเปิดเผย",
 "txtPubDt":"วันเปิดเผย",
 "txtRecordNum":"เรื่อง",
 "txtRecordNum":"เรื่อง",
 "txtRecordTotal":"แสดง{0} เรื่อง",
 "txtRecordTotal":"แสดง{0} เรื่อง",
-"dspViewMore":">> แสดง{0}เรื่องต่อไป",
+"dspViewMore":">> ต่อไป",
 "txtGen":"หมวด",
 "txtGen":"หมวด",
 "txtGr":"กลุ่ม",
 "txtGr":"กลุ่ม",
 "txtViewDt":"วันที่เข้าชม",
 "txtViewDt":"วันที่เข้าชม",
@@ -64,7 +64,7 @@
 "dspBkCancel":"ล็อกเอ้าท์โดยไม่สำรองข้อมูล",
 "dspBkCancel":"ล็อกเอ้าท์โดยไม่สำรองข้อมูล",
 "txtSearchResult":"ผลการค้นหา",
 "txtSearchResult":"ผลการค้นหา",
 "dspHome":"หน้าหลัก",
 "dspHome":"หน้าหลัก",
-"txtLoginUser":"(Ver.20130517_01):",
+"txtLoginUser":"(Ver.20130521_01):",
 "txtAll":"ทั้งหมด",
 "txtAll":"ทั้งหมด",
 "txtMkgSize":"ขนาด",
 "txtMkgSize":"ขนาด",
 "txtMkgS":"เล็ก",
 "txtMkgS":"เล็ก",

release_nonobfuscate.sh

@@ -3,4 +3,4 @@ GIT_BRANCH=`git branch | grep '^\*' | awk '{print $2}'`
 GIT_HASH=`git log --pretty="%h" -n 1`
 GIT_HASH=`git log --pretty="%h" -n 1`
 DATE=`date +%Y%m%d%H%M%S`
 DATE=`date +%Y%m%d%H%M%S`
 
 
-tar zcvf webviewer_nonobfuscate_${GIT_BRANCH}_${GIT_HASH}_${DATE}.tar.gz *.ico *.html usermanual.files abvw
+tar zcvf webviewer_nonobfuscate_${GIT_BRANCH}_${GIT_HASH}_${DATE}.tar.gz *.ico *.html usermanual.files abvw .git