--- gnome-pim-1.4.9.orig/po/ja.po
+++ gnome-pim-1.4.9/po/ja.po
@@ -4,1133 +4,1168 @@
 # Takayuki KUSANO <AE5T-KSN@asahi-net.or.jp>, 2000.
 # Yukihiro Nakai <nakai@gnome.gr.jp>, 2000.
 # Taku YASUI <tach@debian.or.jp>, 2001.
+# Junichi Uekawa <dancer@debian.org>, 2002.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-pim HEAD\n"
-"POT-Creation-Date: 2002-12-20 17:18+0100\n"
-"PO-Revision-Date: 2001-02-19 17:27+09:00\n"
-"Last-Translator: Taku YASUI <tach@debian.or.jp>\n"
+"POT-Creation-Date: 2002-05-27 08:30+0900\n"
+"PO-Revision-Date: 2002-05-27 08:54+0900\n"
+"Last-Translator: Junichi Uekawa <dancer@debian.org>\n"
 "Language-Team: Japanese <translation@gnome.gr.jp>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=euc-jp\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. This array must be in the same order as enumerations
-#. in GnomePilotConduitSyncType as they are used as index.
-#. Custom type implies Disabled state.
-#.
-#: gncal/calendar-conduit-control-applet.c:53
-#: gnomecard/address-conduit-capplet.c:67
-msgid "Disabled"
-msgstr "不使用"
-
-#: gncal/calendar-conduit-control-applet.c:54
-#: gnomecard/address-conduit-capplet.c:68
-msgid "Synchronize"
-msgstr "同期"
-
-#: gncal/calendar-conduit-control-applet.c:55
-#: gnomecard/address-conduit-capplet.c:69
-msgid "Copy From Pilot"
-msgstr "Palm/Pilotからコピー"
-
-#: gncal/calendar-conduit-control-applet.c:56
-#: gnomecard/address-conduit-capplet.c:70
-msgid "Copy To Pilot"
-msgstr "Palm/Pilotへコピー"
-
-#: gncal/calendar-conduit-control-applet.c:57
-#: gnomecard/address-conduit-capplet.c:71
-msgid "Merge From Pilot"
-msgstr "Palm/Pilotからマージ"
-
-#: gncal/calendar-conduit-control-applet.c:58
-#: gnomecard/address-conduit-capplet.c:72
-msgid "Merge To Pilot"
-msgstr "Palm/Pilotへマージ"
-
-#: gncal/calendar-conduit-control-applet.c:147
-msgid "GnomeCalendar Conduit"
-msgstr "Gnomeカレンダー コンジット"
-
-#: gncal/calendar-conduit-control-applet.c:148
-msgid "(C) 1998"
-msgstr "(C) 1998"
-
-#: gncal/calendar-conduit-control-applet.c:150
-msgid "Configuration utility for the calendar conduit.\n"
-msgstr "カレンダー コンジットの設定ユーティリティ\n"
-
-#: gncal/calendar-conduit-control-applet.c:191
-#: gnomecard/address-conduit-capplet.c:201
-msgid "Synchronize Action"
-msgstr "同期の動作"
-
-#: gncal/calendar-conduit-control-applet.c:262
-#: gncal/todo-conduit-control-applet.c:194
-msgid "Conduit state"
-msgstr "コンジットの状態"
-
-#: gncal/calendar-conduit-control-applet.c:309
-#: gncal/calendar-conduit-control-applet.c:324
-#: gncal/todo-conduit-control-applet.c:235
-#: gncal/todo-conduit-control-applet.c:246
-#: gnomecard/address-conduit-capplet.c:399
-#: gnomecard/address-conduit-capplet.c:412
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
-msgstr ""
-"Palm/Pilot が一つも設定されてません。'パイロットリンク'\n"
-"キャプレットを最初に選んでください。"
+#: gnomecard/phonelist.c:30
+msgid "Preferred"
+msgstr "通常"
 
-#: gncal/calendar-conduit-control-applet.c:330
-#: gnomecard/address-conduit-capplet.c:418
-msgid "Not connected to the gnome-pilot daemon"
-msgstr "gnome-pilot デーモンに接続してません"
+#: gncal/modify-cats.c:425 gnomecard/deladdrlist.c:34 gnomecard/phonelist.c:30
+msgid "Work"
+msgstr "仕事先"
 
-#: gncal/calendar-conduit-control-applet.c:335
-#: gnomecard/address-conduit-capplet.c:423
-msgid ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
-msgstr ""
-"Palm/Pilot の一覧を gnome-pilot デーモンから\n"
-"取得する時にエラーが発生しました"
+#: gnomecard/deladdrlist.c:34 gnomecard/phonelist.c:30
+msgid "Home"
+msgstr "自宅"
 
-#: gncal/calendar-conduit-control-applet.c:364
-#: gnomecard/address-conduit-capplet.c:449
-msgid ""
-"Could not create object for conduit.\n"
-"Perhaps the conduit isn't properly installed ?"
-msgstr ""
-"コンジットのオブジェクトを作成できません。\n"
-"コンジットが正常にインストールされてますか?"
+#: gnomecard/phonelist.c:31
+msgid "Voice"
+msgstr "普通電話"
 
-#: gncal/calendar-conduit.c:183 gncal/calendar-conduit.c:223
-#: gncal/calendar-conduit.c:306 gncal/calendar-conduit.c:346
-#: gncal/calendar-conduit.c:578 gncal/calendar-conduit.c:619
-#: gncal/calendar-conduit.c:923 gncal/calendar-conduit.c:975
-#: gncal/calendar-conduit.c:1408
-msgid "Error while communicating with calendar server"
-msgstr "カレンダーサーバとのやりとりでエラーが発生しました"
+#: gnomecard/phonelist.c:31
+msgid "Fax"
+msgstr "FAX"
 
-#: gncal/calendar-conduit.c:623
-#, c-format
-msgid "Calendar holds %d entries"
-msgstr "カレンダーには%d個のエントリ"
+#: gnomecard/phonelist.c:31
+msgid "Message Recorder"
+msgstr "留守電"
 
-#: gncal/calendar-conduit.c:645 gncal/calendar-conduit.c:647
-msgid "Could not start gnomecal server"
-msgstr "gnomecal サーバを起動できません"
+#: gnomecard/phonelist.c:32
+msgid "Cellular"
+msgstr "携帯"
 
-#: gncal/calendar-conduit.c:675 gncal/calendar-conduit.c:678
-msgid "Could not read pilot's DateBook application block"
-msgstr "Palm/Pilot の DateBook アプリケーションブロックを読めません"
+#: gnomecard/phonelist.c:32
+msgid "Pager"
+msgstr "ポケベル"
 
-#: gncal/calendar-pilot-sync.c:60
-msgid "Specifies the port on which the Pilot is"
-msgstr "Palm/Pilot が接続されているポートを指定してください"
-
-#: gncal/calendar-pilot-sync.c:60
-msgid "PORT"
-msgstr "PORT"
-
-#: gncal/calendar-pilot-sync.c:62
-msgid "If you want to debug the attributes on records"
-msgstr "レコードの属性をデバッグしたい場合"
-
-#: gncal/calendar-pilot-sync.c:64
-msgid "Only syncs from desktop to pilot"
-msgstr "デスクトップからPalm/Pilotへのみ同期"
-
-#: gncal/calendar-pilot-sync.c:66
-msgid "Only syncs from pilot to desktop"
-msgstr "Palm/Pilotからデスクトップへのみ同期"
-
-#: gncal/calendar-pilot-sync.c:89
-msgid "Can not create Pilot socket\n"
-msgstr "Palm/Pilot ソケットを作成できません\n"
+#: gnomecard/phonelist.c:32
+msgid "Bulletin Board"
+msgstr "伝言ダイヤル"
 
-#: gncal/calendar-pilot-sync.c:96
-#, c-format
-msgid "Can not bind to device %s\n"
-msgstr "デバイス%sへバインドできません\n"
+#: gnomecard/phonelist.c:33
+msgid "Modem"
+msgstr "モデム"
 
-#: gncal/calendar-pilot-sync.c:99
-msgid "Failed to get a connection from the Pilot device"
-msgstr "Palm/Pilot デバイスからの接続の受信に失敗"
+#: gnomecard/phonelist.c:33
+msgid "Car"
+msgstr "自動車"
 
-#: gncal/calendar-pilot-sync.c:102
-msgid "pi_accept failed"
-msgstr "pi_accept に失敗"
+#: gnomecard/phonelist.c:33
+msgid "ISDN"
+msgstr "ISDN"
 
-#: gncal/calendar-pilot-sync.c:167
-msgid "\tObject did not exist, creating a new one\n"
-msgstr "\tオブジェクトが存在しません。新規に作成します\n"
+#: gnomecard/phonelist.c:33
+msgid "Video"
+msgstr "ビデオ電話"
 
-#: gncal/calendar-pilot-sync.c:174
-msgid ""
-"\tObject has been modified on desktop and on the pilot, desktop takes "
-"precedence\n"
-msgstr ""
-"\tオブジェクトがデスクトップとPalm/Pilot上の両方で 変更されてます。デスクトッ"
-"プを優先します\n"
+#: gnomecard/phonelist.c:391
+msgid "Telephone data:"
+msgstr "電話データ:"
 
-#: gncal/calendar-pilot-sync.c:475
-msgid "No description"
-msgstr "説明がありません"
-
-#: gncal/calendar-pilot-sync.c:547
-msgid "Syncing with the pilot..."
-msgstr "Palm/Pilotと同期中..."
-
-#: gncal/calendar-pilot-sync.c:554
-msgid "Could not open DatebookDB on the Pilot"
-msgstr "Palm/Pilot上のDatebookDBを開けません"
-
-#: gncal/calendar-pilot-sync.c:555
-msgid "Unable to open DatebookDB"
-msgstr "DatebookDB を開けません"
-
-#: gncal/calendar-pilot-sync.c:617
-msgid "Synced DateBook from Pilot to GnomeCal"
-msgstr "Palm/Pilot から GNOMEカレンダーへ同期しました"
+#: gnomecard/phonelist.c:397
+msgid "Number:"
+msgstr "番号:"
 
-#: gncal/calendar.c:429
-#, c-format
-msgid "Error while creating backup file: %s"
-msgstr ""
+#: gnomecard/deladdrlist.c:465 gnomecard/emaillist.c:416
+#: gnomecard/phonelist.c:401
+msgid "Type:"
+msgstr "種類:"
 
-#: gncal/calendar.c:452 gncal/calendar.c:456
-#, fuzzy, c-format
-msgid "Error writing the calendar file: %s"
-msgstr "カレンダーサーバとのやりとりでエラーが発生しました"
+#: gnomecard/deladdrlist.c:493 gnomecard/dialog.c:962
+#: gnomecard/emaillist.c:450 gnomecard/gnomecard.c:548
+#: gnomecard/gnomecard.c:658 gnomecard/phonelist.c:429
+msgid "Add"
+msgstr "追加"
 
-#: gncal/calobj.c:999
-msgid "Appointment"
-msgstr "アポイント"
+#: gncal/gncal-todo.c:223 gnomecard/deladdrlist.c:499
+#: gnomecard/emaillist.c:456 gnomecard/gnomecard.c:552
+#: gnomecard/gnomecard.c:662 gnomecard/phonelist.c:435
+msgid "Modify"
+msgstr "変更"
 
-#: gncal/eventedit.c:235
-msgid "Time"
-msgstr "時刻"
+#: gnomecard/deladdrlist.c:505 gnomecard/dialog.c:964
+#: gnomecard/emaillist.c:462 gnomecard/phonelist.c:441
+msgid "Remove"
+msgstr "削除"
 
-#: gncal/eventedit.c:253
-msgid "Start time:"
-msgstr "開始時刻:"
+#: gnomecard/phonelist.c:448
+msgid "Phone List:"
+msgstr "電話リスト:"
 
-#: gncal/eventedit.c:269
-msgid "End time:"
-msgstr "終了時刻:"
+#: gncal/gncal-todo.c:390 gnomecard/list.c:62
+msgid "Edit this item..."
+msgstr "この項目の編集..."
 
-#. 3. All day checkbox
-#: gncal/eventedit.c:279
-msgid "All day event"
-msgstr "終日のイベント"
+#: gncal/gncal-todo.c:391 gnomecard/list.c:64
+msgid "Delete this item"
+msgstr "この項目の削除..."
 
-#: gncal/eventedit.c:295 gncal/gncal-todo.c:821 gncal/gncal-todo.c:825
-msgid "Minutes"
-msgstr "分"
+#: gnomecard/list.c:212
+msgid "No Card Name"
+msgstr "名無しの名刺"
 
-#: gncal/eventedit.c:295 gncal/gncal-todo.c:816 gncal/gncal-todo.c:820
-msgid "Hours"
-msgstr "時間"
+#: gnomecard/gnomecard.c:327
+msgid ""
+"There are cards which are currently being modified.\n"
+"Finish any pending modifications and try again."
+msgstr ""
+"編集中の名刺があります。\n"
+"全ての編集作業を終えて、もう一度試して下さい。"
 
-#: gncal/eventedit.c:295 gncal/gncal-todo.c:811 gncal/gncal-todo.c:815
-msgid "Days"
-msgstr "日"
+#: gnomecard/gnomecard.c:342
+msgid "The default file"
+msgstr "デフォルトファイル"
 
-#: gncal/eventedit.c:372 gncal/eventedit.c:423
-msgid "Mail to:"
-msgstr "メイル:"
+#: gnomecard/gnomecard.c:346
+msgid " changed. Save?"
+msgstr "変更されました。保存しますか?"
 
-#: gncal/eventedit.c:386
-msgid "Run program:"
-msgstr "プログラム実行:"
+#: gnomecard/gnomecard.c:457
+msgid "A new Gnomecard could not be spawned. Maybe it is not in your path."
+msgstr "新たに Gnomecard を開けません。PATH に入っていないのでは。"
 
-#: gncal/eventedit.c:389
-msgid "Select program to run at alarm time"
-msgstr "アラーム時刻に実行するプログラムの選択"
+#: gncal/main.c:650 gnomecard/gnomecard.c:469
+msgid "New"
+msgstr "新規"
 
-#: gncal/eventedit.c:415 gncal/prop.c:821
-msgid "Alarms"
-msgstr "アラーム"
+#: gnomecard/gnomecard.c:469
+msgid "Create a new card file"
+msgstr "新しい名刺ファイルを作成"
 
-#: gncal/eventedit.c:426 gncal/prop.c:886
-msgid "Display"
-msgstr "表示"
+#: gnomecard/gnomecard.c:474
+msgid "Open _Default"
+msgstr "デフォルトを開く(_D)"
 
-#: gncal/eventedit.c:427 gncal/prop.c:889
-msgid "Audio"
-msgstr "オーディオ"
+#: gnomecard/gnomecard.c:475
+msgid "Open the default file"
+msgstr "デフォルトのファイルを開く"
 
-#: gncal/eventedit.c:428 gncal/prop.c:892
-msgid "Program"
-msgstr "プログラム"
+#: gnomecard/gnomecard.c:483
+msgid "_Append..."
+msgstr "追加...(_A)"
 
-#: gncal/eventedit.c:429 gncal/prop.c:895
-msgid "Mail"
-msgstr "メール"
+#: gnomecard/gnomecard.c:484
+msgid "Add the contents of another card file"
+msgstr "別の名刺ファイルの中身を追加"
 
-#: gncal/eventedit.c:440
-msgid "Classification"
-msgstr "分類"
+#: gnomecard/gnomecard.c:496 gnomecard/gnomecard.c:672
+msgid "First"
+msgstr "最初"
 
-#: gncal/eventedit.c:446
-msgid "Public"
-msgstr "パブリック"
+#: gnomecard/gnomecard.c:496 gnomecard/gnomecard.c:672
+msgid "First card"
+msgstr "最初の名刺"
 
-#: gncal/eventedit.c:447
-msgid "Private"
-msgstr "プライベート"
+#: gncal/main.c:654 gnomecard/gnomecard.c:500 gnomecard/gnomecard.c:676
+msgid "Prev"
+msgstr "前"
 
-#: gncal/eventedit.c:448
-msgid "Confidential"
-msgstr "機密"
+#: gnomecard/gnomecard.c:500 gnomecard/gnomecard.c:676
+msgid "Previous card"
+msgstr "前の名刺"
 
-#: gncal/eventedit.c:762
-msgid "An event's end time must be later than its start time."
-msgstr "イベントの終了時刻は開始時刻より後でなければなりません"
+#: gncal/main.c:656 gnomecard/gnomecard.c:504 gnomecard/gnomecard.c:680
+msgid "Next"
+msgstr "次"
 
-#: gncal/eventedit.c:850
-msgid "General"
-msgstr "一般"
+#: gnomecard/gnomecard.c:504 gnomecard/gnomecard.c:680
+msgid "Next card"
+msgstr "次の名刺"
 
-#: gncal/eventedit.c:859
-msgid "Owner:"
-msgstr "所有者:"
+#: gnomecard/gnomecard.c:508 gnomecard/gnomecard.c:684
+msgid "Last"
+msgstr "最後"
 
-#: gncal/eventedit.c:862
-msgid "?"
-msgstr "?"
+#: gnomecard/gnomecard.c:508 gnomecard/gnomecard.c:684
+msgid "Last card"
+msgstr "最後の名刺"
 
-#: gncal/eventedit.c:866 gncal/gncal-todo.c:194
-msgid "Summary:"
-msgstr "要約:"
+#: gnomecard/gnomecard.c:517
+msgid "By Card Name"
+msgstr "名刺の名前で"
 
-#: gncal/eventedit.c:916
-msgid "None"
-msgstr "なし"
+#: gnomecard/gnomecard.c:517
+msgid "Sorts the card list by the card name"
+msgstr "名刺の名前で名刺を並べる"
 
-#: gncal/eventedit.c:917
-msgid "Daily"
-msgstr "日毎"
+#: gnomecard/gnomecard.c:521
+msgid "By Name"
+msgstr "名前で"
 
-#: gncal/eventedit.c:918
-msgid "Weekly"
-msgstr "週毎"
+#: gnomecard/gnomecard.c:521
+msgid "Sorts the card list by the name of the person"
+msgstr "人の名前で名刺リストを並べる"
 
-#: gncal/eventedit.c:919
-msgid "Monthly"
-msgstr "月毎"
+#: gnomecard/gnomecard.c:525
+msgid "By Last Name"
+msgstr "名字で"
 
-#: gncal/eventedit.c:920
-msgid "Yearly"
-msgstr "年毎"
+#: gnomecard/gnomecard.c:525
+msgid "Sorts the card list by the last name of the person"
+msgstr "人の名字で名刺リストを並べる"
 
-#: gncal/eventedit.c:942
-msgid "1st"
-msgstr "第一"
+#: gnomecard/gnomecard.c:529
+msgid "By E-mail"
+msgstr "メイルで"
 
-#: gncal/eventedit.c:943
-msgid "2nd"
-msgstr "第二"
+#: gnomecard/gnomecard.c:529
+msgid "Sorts the card list by the e-mail address of the person"
+msgstr "名刺リストを人のメールアドレスで並べる"
 
-#: gncal/eventedit.c:944
-msgid "3rd"
-msgstr "第三"
+#: gnomecard/gnomecard.c:533
+msgid "By Organization"
+msgstr "組織で"
 
-#: gncal/eventedit.c:945
-msgid "4th"
-msgstr "第四"
+#: gnomecard/gnomecard.c:533
+msgid "Sorts the card list by the name of the organization"
+msgstr "組織の名前で名刺リストを並べる"
 
-#: gncal/eventedit.c:946
-msgid "5th"
-msgstr "第五"
+#: gnomecard/gnomecard.c:548 gnomecard/gnomecard.c:658
+msgid "Create new card"
+msgstr "新しい名刺を作成"
 
-#: gncal/eventedit.c:951 gncal/prop.c:367
-msgid "Monday"
-msgstr "月曜日"
+#: gnomecard/gnomecard.c:552 gnomecard/gnomecard.c:662
+msgid "Edit card"
+msgstr "名刺の編集"
 
-#: gncal/eventedit.c:952
-msgid "Tuesday"
-msgstr "火曜日"
+#. Delete
+#: gncal/gncal-todo.c:599 gnomecard/gnomecard.c:556
+msgid "Delete"
+msgstr "削除"
 
-#: gncal/eventedit.c:953
-msgid "Wednesday"
-msgstr "水曜日"
+#: gnomecard/gnomecard.c:556
+msgid "Erase card"
+msgstr "名刺を消す"
 
-#: gncal/eventedit.c:954
-msgid "Thursday"
-msgstr "木曜日"
+#: gnomecard/gnomecard.c:562
+msgid "Go"
+msgstr "飛ぶ"
 
-#: gncal/eventedit.c:955
-msgid "Friday"
-msgstr "金曜日"
+#: gnomecard/gnomecard.c:562
+msgid "Change current card"
+msgstr "現在の名刺を変更"
 
-#: gncal/eventedit.c:956
-msgid "Saturday"
-msgstr "土曜日"
+#: gnomecard/dialog.c:1413 gnomecard/gnomecard.c:567 gnomecard/gnomecard.c:690
+msgid "Find"
+msgstr "検索"
 
-#: gncal/eventedit.c:957 gncal/prop.c:366
-msgid "Sunday"
-msgstr "日曜日"
+#: gnomecard/gnomecard.c:567 gnomecard/gnomecard.c:690
+msgid "Search card"
+msgstr "名刺の検索"
 
-#: gncal/eventedit.c:1013 gncal/gnome-month-item.c:737
-msgid "Mon"
-msgstr "月"
+#: gnomecard/gnomecard.c:571
+msgid "Sort"
+msgstr "並べ替え"
 
-#: gncal/eventedit.c:1013 gncal/gnome-month-item.c:738
-msgid "Tue"
-msgstr "火"
+#: gnomecard/gnomecard.c:571
+msgid "Set sort criteria"
+msgstr "並び順を指定"
 
-#: gncal/eventedit.c:1013 gncal/gnome-month-item.c:739
-msgid "Wed"
-msgstr "水"
+#: gnomecard/gnomecard.c:605
+msgid "Card"
+msgstr "名刺"
 
-#: gncal/eventedit.c:1013 gncal/gnome-month-item.c:740
-msgid "Thu"
-msgstr "木"
+#: gnomecard/gnomecard.c:605
+msgid "Toggle Card View"
+msgstr "名刺の見え方を切替え"
 
-#: gncal/eventedit.c:1013 gncal/gnome-month-item.c:741
-msgid "Fri"
-msgstr "金"
+#: gnomecard/gnomecard.c:610
+msgid "Tree"
+msgstr "ツリー"
 
-#: gncal/eventedit.c:1013 gncal/gnome-month-item.c:742
-msgid "Sat"
-msgstr "土"
+#: gnomecard/gnomecard.c:610
+msgid "Toggle Tree View"
+msgstr "ツリー表示を切替え"
 
-#. Initialize by default to three-letter day names
-#: gncal/eventedit.c:1013 gncal/gnome-month-item.c:736
-msgid "Sun"
-msgstr "日"
+#: gnomecard/gnomecard.c:648
+msgid "Open"
+msgstr "開く"
 
-#: gncal/eventedit.c:1024
-msgid "Recurrence rule"
-msgstr "再発条件"
+#: gnomecard/gnomecard.c:648
+msgid "Open file"
+msgstr "ファイルを開く"
 
-#. in some languages "Every" can follow the gender of the word it
-#. refers to (here "day(s)"). leave the two leadin letter "d_"
-#. in the translation they are ther on purpose
-#: gncal/eventedit.c:1128
-msgid "d_Every"
-msgstr "d_"
+#: gnomecard/gnomecard.c:652
+msgid "Save"
+msgstr "保存"
 
-#: gncal/eventedit.c:1130
-msgid "day(s)"
-msgstr "日毎"
+#: gnomecard/gnomecard.c:652
+msgid "Save changes"
+msgstr "変更を保存"
 
-#. in some languages "Every" can follow the gender of the word it
-#. refers to (here "week(s)"). leave the two leadin letter "w_"
-#. in the translation they are ther on purpose
-#: gncal/eventedit.c:1145
-msgid "w_Every"
-msgstr "w_"
+#: gnomecard/gnomecard.c:666
+msgid "Del"
+msgstr "削除"
 
-#: gncal/eventedit.c:1147
-msgid "week(s)"
-msgstr "週毎"
+#: gnomecard/gnomecard.c:666
+msgid "Delete card"
+msgstr "名刺を削除"
 
-#: gncal/eventedit.c:1168 gncal/eventedit.c:1180
-msgid "Recur on the"
-msgstr "月の"
+#: gnomecard/gnomecard.c:839
+msgid "default file to load"
+msgstr "デフォルトで読み込むファイル"
 
-#: gncal/eventedit.c:1170
-msgid "th day of the month"
-msgstr "日に発生"
+#: gnomecard/gnomecard.c:839
+msgid "filename"
+msgstr "ファイル名"
 
-#. in some languages "Every" can follow the gender of the word it
-#. refers to (here "month(s)"). leave the two leadin letter "m_"
-#. in the translation they are ther on purpose
-#: gncal/eventedit.c:1193
-msgid "m_Every"
-msgstr "m_"
+#: gnomecard/emaillist.c:31
+msgid "America On-Line"
+msgstr "AOL"
 
-#: gncal/eventedit.c:1198
-msgid "month(s)"
-msgstr "月毎"
+#: gnomecard/emaillist.c:31
+msgid "Apple Link"
+msgstr "Apple Link"
 
-#. in some languages "Every" can follow the gender of the word it
-#. refers to (here "year(s)"). leave the two leadin letter "y_"
-#. in the translation they are ther on purpose
-#: gncal/eventedit.c:1218
-msgid "y_Every"
-msgstr "y_"
+#: gnomecard/emaillist.c:31
+msgid "AT&T"
+msgstr "AT&T"
 
-#: gncal/eventedit.c:1220
-msgid "year(s)"
-msgstr "年毎"
+#: gnomecard/emaillist.c:32
+msgid "CIS"
+msgstr "コンピュサーブ"
 
-#: gncal/eventedit.c:1259
-msgid "Ending date"
-msgstr "終了時期"
+#: gnomecard/emaillist.c:32
+msgid "e-World"
+msgstr "e-World"
 
-#: gncal/eventedit.c:1272
-msgid "Repeat forever"
-msgstr "世の果てるまで繰り返す"
+#: gnomecard/emaillist.c:32
+msgid "Internet"
+msgstr "インターネット"
 
-#: gncal/eventedit.c:1281
-msgid "End on"
-msgstr "終了日は"
+#: gnomecard/emaillist.c:32
+msgid "IBM"
+msgstr "IBM"
 
-#: gncal/eventedit.c:1307
-msgid "End after"
-msgstr "終了は"
+#: gnomecard/emaillist.c:33
+msgid "MCI"
+msgstr "MCI"
 
-#: gncal/eventedit.c:1323
-msgid "occurrence(s)"
-msgstr "回起きた後で"
+#: gnomecard/emaillist.c:33
+msgid "Power Share"
+msgstr "Power Share"
 
-#: gncal/eventedit.c:1359 gncal/gncal-day-panel.c:216
-#: gncal/gncal-day-panel.c:241 gncal/gncal-week-view.c:258
-#: gncal/month-view.c:88 gncal/year-view.c:312
-msgid "%a %b %d %Y"
-msgstr "%Y/%m/%d (%a)"
+#: gnomecard/emaillist.c:33
+msgid "Prodigy"
+msgstr "プロディジー"
 
-#: gncal/eventedit.c:1447
-msgid "Exceptions"
-msgstr "例外"
+#: gnomecard/emaillist.c:33
+msgid "TLX"
+msgstr "TLC"
 
-#: gncal/eventedit.c:1459
-msgid "Add exception"
-msgstr "例外の追加"
+#: gnomecard/emaillist.c:34
+msgid "X400"
+msgstr "X.400"
 
-#: gncal/eventedit.c:1469
-msgid "Change selected"
-msgstr "選択中のを変更"
+#: gnomecard/emaillist.c:393
+msgid "Web Page:"
+msgstr "Webページ:"
 
-#: gncal/eventedit.c:1475
-msgid "Delete selected"
-msgstr "選択中のを削除"
+#: gnomecard/emaillist.c:406
+msgid "E-mail data:"
+msgstr "電子メールデータ:"
 
-#: gncal/eventedit.c:1504
-msgid "Recurrence"
-msgstr "再発"
+#: gnomecard/emaillist.c:412
+msgid "Address:"
+msgstr "住所:"
 
-#: gncal/eventedit.c:1575
-msgid "Create new appointment"
-msgstr "新規アポイントの作成"
+#: gnomecard/emaillist.c:469
+msgid "Email List:"
+msgstr "電子メールリスト:"
 
-#: gncal/eventedit.c:1577
-msgid "Edit appointment"
-msgstr "アポイントを編集"
+#: gnomecard/dialog.c:319
+msgid "Identity"
+msgstr "身元"
 
-#: gncal/getdate.y:391
-msgid "january"
-msgstr "1月"
+#: gnomecard/dialog.c:323
+msgid "File As:"
+msgstr "名刺の名前:"
 
-#: gncal/getdate.y:392
-msgid "february"
-msgstr "2月"
+#: gnomecard/dialog.c:326
+msgid "Take from Name"
+msgstr "名前を使う"
 
-#: gncal/getdate.y:393
-msgid "march"
-msgstr "3月"
+#. create name frame
+#: gnomecard/dialog.c:339
+msgid "Name"
+msgstr "名前"
 
-#: gncal/getdate.y:394
-msgid "april"
-msgstr "4月"
+#. first name
+#: gnomecard/dialog.c:347
+msgid "First:"
+msgstr "ファーストネーム:"
 
-#: gncal/getdate.y:395
-msgid "may"
-msgstr "5月"
+#: gnomecard/dialog.c:359
+msgid "Middle:"
+msgstr "ミドルネーム:"
 
-#: gncal/getdate.y:396
-msgid "june"
-msgstr "6月"
+#: gnomecard/dialog.c:369
+msgid "Last:"
+msgstr "ラストネーム:"
 
-#: gncal/getdate.y:397
-msgid "july"
-msgstr "7月"
+#: gnomecard/dialog.c:383
+msgid "Prefix:"
+msgstr "敬称(前つけ):"
 
-#: gncal/getdate.y:398
-msgid "august"
-msgstr "8月"
+#: gnomecard/dialog.c:394
+msgid "Suffix:"
+msgstr "敬称(後つけ)"
 
-#: gncal/getdate.y:399
-msgid "september"
-msgstr "9月"
+#: gnomecard/columnhdrs.c:39 gnomecard/dialog.c:410
+msgid "Organization"
+msgstr "組織"
 
-#: gncal/getdate.y:400
-msgid "sept"
-msgstr "9月"
+#: gnomecard/dialog.c:416
+msgid "Name:"
+msgstr "名称:"
 
-#: gncal/getdate.y:401
-msgid "october"
-msgstr "10月"
+#: gnomecard/dialog.c:427
+msgid "Title:"
+msgstr "役職:"
 
-#: gncal/getdate.y:402
-msgid "november"
-msgstr "11月"
+#: gnomecard/dialog.c:439
+msgid "Network"
+msgstr "ネットワーク"
 
-#: gncal/getdate.y:403
-msgid "december"
-msgstr "12月"
+#: gnomecard/dialog.c:445
+msgid "Addresses"
+msgstr "住所"
 
-#: gncal/getdate.y:404
-msgid "sunday"
-msgstr "日曜日"
+#: gnomecard/columnhdrs.c:43 gnomecard/dialog.c:451
+msgid "Phone"
+msgstr "電話"
 
-#: gncal/getdate.y:405
-msgid "monday"
-msgstr "月曜日"
+#: gnomecard/dialog.c:462
+msgid "Birthdate:"
+msgstr "誕生日:"
 
-#: gncal/getdate.y:406
-msgid "tuesday"
-msgstr "火曜日"
+#: gnomecard/dialog.c:487
+msgid "Geographical"
+msgstr "地理情報"
 
-#: gncal/getdate.y:407
-msgid "tues"
-msgstr "火曜"
+#: gnomecard/dialog.c:495
+msgid "Time Zone"
+msgstr "タイムゾーン"
 
-#: gncal/getdate.y:408
-msgid "wednesday"
-msgstr "水曜日"
+#: gnomecard/dialog.c:502
+msgid "hrs."
+msgstr "時間"
 
-#: gncal/getdate.y:409
-msgid "wednes"
-msgstr "水曜"
+#: gnomecard/dialog.c:510
+msgid "mins."
+msgstr "分"
 
-#: gncal/getdate.y:410
-msgid "thursday"
-msgstr "木曜日"
+#: gnomecard/dialog.c:518
+msgid "Geographic Position"
+msgstr "経緯"
 
-#: gncal/getdate.y:411
-msgid "thur"
-msgstr "木曜"
+#: gnomecard/dialog.c:525
+msgid "lat, "
+msgstr "緯度"
 
-#: gncal/getdate.y:412
-msgid "thurs"
-msgstr "木曜"
+#: gnomecard/dialog.c:533
+msgid "lon."
+msgstr "経度"
 
-#: gncal/getdate.y:413
-msgid "friday"
-msgstr "金曜日"
+#: gnomecard/dialog.c:545
+msgid "Explanatory"
+msgstr "説明"
 
-#: gncal/getdate.y:414
-msgid "saturday"
-msgstr "土曜日"
+#: gncal/gncal-todo.c:219 gnomecard/dialog.c:549
+msgid "Categories:"
+msgstr "分類:"
 
-#: gncal/getdate.y:420
-msgid "year"
-msgstr "年"
+#: gnomecard/dialog.c:556
+msgid "Comment:"
+msgstr "コメント:"
 
-#: gncal/getdate.y:421
-msgid "month"
-msgstr "月"
+#: gnomecard/dialog.c:592
+msgid "Security"
+msgstr "セキュリティ"
 
-#: gncal/getdate.y:422
-msgid "fortnight"
-msgstr "2週間"
+#: gnomecard/dialog.c:595
+msgid "Public Key:"
+msgstr "公開鍵:"
 
-#: gncal/getdate.y:423
-msgid "week"
-msgstr "週"
+#: gnomecard/dialog.c:613
+msgid "PGP"
+msgstr "PGP"
 
-#: gncal/getdate.y:424
-msgid "day"
-msgstr "日"
+#: gnomecard/dialog.c:620
+msgid "X509"
+msgstr "X.509"
 
-#: gncal/getdate.y:425
-msgid "hour"
-msgstr "時間"
+#: gnomecard/dialog.c:924
+msgid "Layout"
+msgstr "レイアウト"
 
-#: gncal/getdate.y:426
-msgid "minute"
-msgstr "分"
+#: gnomecard/dialog.c:928
+msgid "Column Display"
+msgstr "表示項目"
 
-#: gncal/getdate.y:427
-msgid "min"
-msgstr "分"
+#. make list of possible columns to add
+#: gnomecard/dialog.c:937
+msgid "Possible Columns"
+msgstr "使える項目"
 
-#: gncal/getdate.y:428
-msgid "second"
-msgstr "秒"
+#. make list of currently displayed column types
+#: gnomecard/dialog.c:971
+msgid "Displayed Columns"
+msgstr "表示する項目"
 
-#: gncal/getdate.y:429
-msgid "sec"
-msgstr "秒"
+#: gnomecard/dialog.c:1076
+msgid "Default"
+msgstr "デフォルト"
 
-#: gncal/getdate.y:435
-msgid "tomorrow"
-msgstr "明日"
+#: gnomecard/dialog.c:1079
+#, c-format
+msgid "GnomeCard: %s"
+msgstr "GNOMEカード: %s"
 
-#: gncal/getdate.y:436
-msgid "yesterday"
-msgstr "昨日"
+#: gnomecard/dialog.c:1100
+msgid "the default file"
+msgstr "デフォルトファイル"
 
-#: gncal/getdate.y:437
-msgid "today"
-msgstr "今日"
+#: gnomecard/dialog.c:1104
+#, c-format
+msgid "Error %s %s."
+msgstr "エラー %s %s。"
 
-#: gncal/getdate.y:438
-msgid "now"
-msgstr "今"
+#: gnomecard/dialog.c:1144
+msgid "Append GnomeCard File"
+msgstr "名刺ファイルを追加"
 
-#: gncal/getdate.y:439 gnomecard/dialog.c:1356 gnomecard/dialog.c:1357
-msgid "last"
-msgstr "最後"
+#: gnomecard/dialog.c:1186
+msgid "Open GnomeCard File"
+msgstr "名刺ファイルを開く。"
 
-#: gncal/getdate.y:440
-msgid "this"
-msgstr "これ"
+#: gnomecard/dialog.c:1221
+msgid "Save GnomeCard File As..."
+msgstr "GnomeCardファイルを保存するファイル名..."
 
-#: gncal/getdate.y:441
-msgid "next"
-msgstr "次"
+#: gnomecard/dialog.c:1239
+msgid "GnomeCard"
+msgstr "GnomeCard"
+
+#: gnomecard/dialog.c:1242
+msgid "Electronic Business Card Manager"
+msgstr "電子名刺管理"
+
+#: gnomecard/dialog.c:1362
+msgid "No matching record found."
+msgstr "一致するものが見つかりません。"
 
-#: gncal/getdate.y:442 gnomecard/dialog.c:1356 gnomecard/dialog.c:1357
+#: getdate.y:442 gnomecard/dialog.c:1375 gnomecard/dialog.c:1376
 msgid "first"
 msgstr "最初"
 
-#. { N_("second"),		tUNUMBER,	2 },
-#: gncal/getdate.y:444
-msgid "third"
-msgstr "3回目"
+#: getdate.y:439 gnomecard/dialog.c:1375 gnomecard/dialog.c:1376
+msgid "last"
+msgstr "最後"
 
-#: gncal/getdate.y:445
-msgid "fourth"
-msgstr "4回目"
+#: gnomecard/dialog.c:1377
+#, c-format
+msgid ""
+"Reached %s record.\n"
+"Continue from the %s one?"
+msgstr ""
+"%sのレコードに到達しました。\n"
+"%sに戻って検索しますか?"
 
-#: gncal/getdate.y:446
-msgid "fifth"
-msgstr "5回目"
+#: gnomecard/dialog.c:1413
+msgid "Find Card"
+msgstr "最初の名刺"
 
-#: gncal/getdate.y:447
-msgid "sixth"
-msgstr "6回目"
+#: gnomecard/dialog.c:1422
+msgid "Find:"
+msgstr "検索:"
 
-#: gncal/getdate.y:448
-msgid "seventh"
-msgstr "7回目"
+#: gnomecard/dialog.c:1425
+msgid "Case Sensitive"
+msgstr "大/小文字を区別"
 
-#: gncal/getdate.y:449
-msgid "eighth"
-msgstr "8回目"
+#: gnomecard/dialog.c:1428
+msgid "Find Backwards"
+msgstr "後方検索"
 
-#: gncal/getdate.y:450
-msgid "ninth"
-msgstr "9回目"
+#: gnomecard/deladdrlist.c:30
+msgid "Post Office:"
+msgstr "郵便局:"
 
-#: gncal/getdate.y:451
-msgid "tenth"
-msgstr "10回目"
+#: gnomecard/deladdrlist.c:30
+msgid "Extended:"
+msgstr "追加:"
 
-#: gncal/getdate.y:452
-msgid "eleventh"
-msgstr "11回目"
+#: gnomecard/deladdrlist.c:30
+msgid "Street:"
+msgstr "区分(Street):"
 
-#: gncal/getdate.y:453
-msgid "twelfth"
-msgstr "12回目"
+#: gnomecard/deladdrlist.c:31
+msgid "City:"
+msgstr "市町村(City:)"
 
-#: gncal/getdate.y:454
-msgid "ago"
-msgstr "前"
+#: gnomecard/deladdrlist.c:31
+msgid "Region:"
+msgstr "都道府県:"
 
-#: gncal/gncal-day-view.c:135 gncal/gncal-full-day.c:542
-#: gncal/gncal-full-day.c:551 gncal/gncal-full-day.c:1740
-msgid "New appointment..."
-msgstr "新しいアポイント..."
+#: gnomecard/deladdrlist.c:31
+msgid "Postal Code:"
+msgstr "郵便番号:"
 
-#: gncal/gncal-full-day.c:539 gncal/gncal-full-day.c:547
-msgid "Edit this appointment..."
-msgstr "このアポイントを編集..."
+#: gnomecard/deladdrlist.c:32
+msgid "Country:"
+msgstr "国:"
 
-#: gncal/gncal-full-day.c:540
-msgid "Delete this appointment"
-msgstr "このアポイントを削除"
+#: gnomecard/deladdrlist.c:34
+msgid "Postal Box"
+msgstr "郵便"
 
-#: gncal/gncal-full-day.c:546
-msgid "Make this appointment movable"
-msgstr "このアポイントを動かせるようにする"
+#: gnomecard/deladdrlist.c:35
+msgid "Parcel"
+msgstr "宅急便"
 
-#: gncal/gncal-full-day.c:548
-msgid "Delete this occurance"
-msgstr "今回のみ削除"
+#: gnomecard/deladdrlist.c:35
+msgid "Domestic"
+msgstr "国内支社"
 
-#: gncal/gncal-full-day.c:549
-msgid "Delete all occurances"
-msgstr "全ての回を削除"
+#: gnomecard/deladdrlist.c:35
+msgid "International"
+msgstr "国際本社"
 
-#: gncal/gncal-todo.c:163
-msgid "Create to-do item"
-msgstr "ToDo 項目の作成"
+#: gnomecard/deladdrlist.c:440
+msgid "Address data:"
+msgstr "住所のデータ"
 
-#: gncal/gncal-todo.c:163
-msgid "Edit to-do item"
-msgstr "ToDoの編集"
+#: gnomecard/deladdrlist.c:512
+msgid "Address List:"
+msgstr "住所リスト:"
 
-#: gncal/gncal-todo.c:203
-msgid "Due Date:"
-msgstr "期日:"
+#: gnomecard/canvas.c:164
+msgid "No Card Name."
+msgstr "名無しの名刺。"
 
-#: gncal/gncal-todo.c:213
-msgid "Priority:"
-msgstr "優先度:"
+#: gnomecard/columnhdrs.c:32
+msgid "Full Name"
+msgstr "フルネーム"
 
-#: gncal/gncal-todo.c:219 gnomecard/dialog.c:535
-msgid "Categories:"
-msgstr "分類:"
+#: gnomecard/columnhdrs.c:33
+msgid "Card Name"
+msgstr "名刺の名前"
 
-#: gncal/gncal-todo.c:223 gnomecard/deladdrlist.c:499
-#: gnomecard/emaillist.c:456 gnomecard/gnomecard.c:554
-#: gnomecard/gnomecard.c:664 gnomecard/phonelist.c:435
-msgid "Modify"
-msgstr "変更"
+#: gnomecard/columnhdrs.c:34
+msgid "First Name"
+msgstr "ファーストネーム"
 
-#: gncal/gncal-todo.c:249
-msgid "Item Comments:"
-msgstr "コメント:"
+#: gnomecard/columnhdrs.c:35
+msgid "Middle Name"
+msgstr "ミドルネーム"
 
-#: gncal/gncal-todo.c:389
-msgid "Add to-do item..."
-msgstr "ToDoの追加..."
+#: gnomecard/columnhdrs.c:36
+msgid "Last Name"
+msgstr "ラストネーム"
 
-#: gncal/gncal-todo.c:390 gnomecard/list.c:65
-msgid "Edit this item..."
-msgstr "この項目の編集..."
+#: gnomecard/columnhdrs.c:37
+msgid "Prefix"
+msgstr "敬称(前つけ)"
 
-#: gncal/gncal-todo.c:391 gnomecard/list.c:67
-msgid "Delete this item"
-msgstr "この項目の削除..."
+#: gnomecard/columnhdrs.c:38
+msgid "Suffix"
+msgstr "敬称(後つけ)"
 
-#: gncal/gncal-todo.c:526
-msgid "Summary"
-msgstr "要約"
+#: gnomecard/columnhdrs.c:40
+msgid "Title"
+msgstr "役職"
 
-#: gncal/gncal-todo.c:527 gncal/prop.c:629
-msgid "Due Date"
-msgstr "期日"
+#: gnomecard/columnhdrs.c:41
+msgid "Email"
+msgstr "電子メール"
 
-#: gncal/gncal-todo.c:528 gncal/prop.c:630
-msgid "Priority"
-msgstr "優先度"
+#: gnomecard/columnhdrs.c:42
+msgid "Web Page"
+msgstr "Webページ"
 
-#: gncal/gncal-todo.c:529
-msgid "Time Left"
-msgstr "残り時間"
+#: gnomecard/address-conduit.c:462 gnomecard/address-conduit.c:464
+#, c-format
+msgid "Unable to open file: %s"
+msgstr "ファイルが開けません： %s"
 
-#: gncal/gncal-todo.c:530 gncal/prop.c:632
-msgid "Categories"
-msgstr "分類"
+#: gnomecard/address-conduit.c:949
+msgid "Open secret entries"
+msgstr "秘密のエントリーを開く"
 
-#. Label
-#: gncal/gncal-todo.c:536
-msgid "To-do list"
-msgstr "ToDo一覧"
+#: gnomecard/address-conduit.c:956
+msgid "Filename"
+msgstr "ファイル名"
 
-#. Add
-#: gncal/gncal-todo.c:579
-msgid "Add..."
-msgstr "追加..."
-
-#. Edit
-#: gncal/gncal-todo.c:588
-msgid "Edit..."
-msgstr "編集..."
-
-#. Delete
-#: gncal/gncal-todo.c:599 gnomecard/gnomecard.c:558
-msgid "Delete"
-msgstr "削除"
-
-#: gncal/gncal-todo.c:810
-msgid "Weeks"
-msgstr "週毎"
-
-#: gncal/gncal-todo.c:810
-msgid "Week"
-msgstr "週毎"
-
-#: gncal/gncal-todo.c:811 gncal/gncal-todo.c:815
-msgid "Day"
-msgstr "日"
+#: gnomecard/address-conduit.c:1062 gnomecard/address-conduit.c:1064
+msgid "No filename specified. Please run address conduit capplet first."
+msgstr "ファイル名が指定されていません．address conduit cappletを実行してください"
 
-#: gncal/gncal-todo.c:816 gncal/gncal-todo.c:820
-msgid "Hour"
-msgstr "時間"
+#: gnomecard/card.c:1677
+msgid "Card: "
+msgstr "名刺:"
 
-#: gncal/gncal-todo.c:821 gncal/gncal-todo.c:825
-msgid "Minute"
-msgstr "分"
+#: gnomecard/card.c:1679
+msgid ""
+"\n"
+"Name: "
+msgstr "\n名称:"
 
-#: gncal/gncal-todo.c:826 gncal/gncal-todo.c:830
-msgid "Seconds"
-msgstr "秒"
+#: gnomecard/card.c:1680
+msgid ""
+"\n"
+"  Prefix:     "
+msgstr "\n敬称(前つけ):     "
 
-#: gncal/gncal-todo.c:826 gncal/gncal-todo.c:830
-msgid "Second"
-msgstr "秒"
+#: gnomecard/card.c:1681
+msgid ""
+"\n"
+"  Given:      "
+msgstr "\n名前："
 
-#: gncal/gncal-week-view.c:261
-#, fuzzy
-msgid "%a %b %d %Y (Week %V)"
-msgstr "%Y/%m/%d (%a)"
+#: gnomecard/card.c:1682
+msgid ""
+"\n"
+"  Additional: "
+msgstr "\nその他の名前："
 
-#: gncal/gnome-cal.c:68
-msgid "Day View"
-msgstr "日間"
+#: gnomecard/card.c:1683
+msgid ""
+"\n"
+"  Family:     "
+msgstr "\n姓名："
 
-#: gncal/gnome-cal.c:69
-msgid "Week View"
-msgstr "週間"
+#: gnomecard/card.c:1684
+msgid ""
+"\n"
+"  Suffix:     "
+msgstr "\n敬称(後つけ):    "
 
-#: gncal/gnome-cal.c:70
-msgid "Month View"
-msgstr "月間"
+#: gnomecard/card.c:1698
+msgid ""
+"\n"
+"Birth Date: "
+msgstr "\n誕生日: "
 
-#: gncal/gnome-cal.c:71
-msgid "Year View"
-msgstr "年間"
+#: gnomecard/card.c:1709
+msgid ""
+"\n"
+"Address:"
+msgstr "\n住所:"
 
-#: gncal/gnome-cal.c:396 gncal/gnome-cal.c:490 gncal/gnome-cal.c:536
-msgid "Reminder of your appointment at "
-msgstr "アポイントの督促状を"
+#: gnomecard/card.c:1711
+msgid ""
+"\n"
+"  Postal Box:  "
+msgstr "\n郵便: "
 
-#: gncal/gnome-cal.c:483
-msgid "Snooze"
-msgstr "スヌーズ"
+#: gnomecard/card.c:1712
+msgid ""
+"\n"
+"  Ext:         "
+msgstr "\n拡張子："
 
-#. Idea: we need Snooze option :-)
-#: gncal/gnome-cal.c:495 gncal/gnome-cal.c:540
-msgid "Ok"
-msgstr "OK"
+#: gnomecard/card.c:1713
+msgid ""
+"\n"
+"  Street:      "
+msgstr "\n区分(Street):"
 
-#: gncal/gnome-month-item.c:15
-msgid "-*-helvetica-medium-r-normal--10-*-*-*-p-*-*-*"
-msgstr ""
+#: gnomecard/card.c:1714
+msgid ""
+"\n"
+"  City:        "
+msgstr "\n  市："
 
-#: gncal/goto.c:82
-msgid "Year:"
-msgstr "年:"
+#: gnomecard/card.c:1715
+msgid ""
+"\n"
+"  Region:      "
+msgstr "\n都道府県:"
 
-#: gncal/goto.c:266
-msgid "Go to date"
-msgstr "指定日へ"
+#: gnomecard/card.c:1716
+msgid ""
+"\n"
+"  Postal Code: "
+msgstr "\n郵便番号:"
 
-#. Instructions
-#: gncal/goto.c:275
+#: gnomecard/card.c:1717
 msgid ""
-"Please select the date you want to go to.\n"
-"When you click on a day, you will be taken\n"
-"to that date."
-msgstr ""
-"見たい日付を指定して下さい。\n"
-"日付をクリックすると、その\n"
-"日付に飛びます。"
+"\n"
+"  Country:     "
+msgstr "\n国:"
 
-#: gncal/goto.c:312
-msgid "Go to today"
-msgstr "本日へ飛ぶ"
+#: gnomecard/card.c:1730
+msgid ""
+"\n"
+"Delivery Label: "
+msgstr "\n配送ラベル："
 
-#: gncal/main.c:66
-msgid "Outline:"
-msgstr "罫線:"
+#: gnomecard/card.c:1742
+msgid ""
+"\n"
+"Telephones:\n"
+msgstr "\n電話データ:\n"
 
-#: gncal/main.c:67
-msgid "Headings:"
-msgstr "曜日:"
+#: gnomecard/card.c:1745
+msgid ""
+"\n"
+"Telephone:"
+msgstr "\n電話データ:"
 
-#: gncal/main.c:68
-msgid "Empty days:"
-msgstr "空き:"
+#: gnomecard/card.c:1769
+msgid ""
+"\n"
+"E-mail:\n"
+msgstr "\n電子メール:\n"
 
-#: gncal/main.c:69
-msgid "Appointments:"
-msgstr "アポイント"
+#: gnomecard/card.c:1772
+msgid ""
+"\n"
+"E-mail:"
+msgstr "\n電子メール:"
 
-#: gncal/main.c:70
-msgid "Highlighted day:"
-msgstr "強調:"
+#: gnomecard/card.c:1791
+msgid ""
+"\n"
+"Mailer: "
+msgstr "\nメーラ:"
 
-#: gncal/main.c:71
-msgid "Day numbers:"
-msgstr "日付:"
+#: gnomecard/card.c:1797
+msgid ""
+"\n"
+"Time Zone: "
+msgstr "\nタイムゾーン"
 
-#: gncal/main.c:72
-msgid "Current day's number:"
-msgstr "今日:"
+#: gnomecard/card.c:1805
+msgid ""
+"\n"
+"Geo Location: "
+msgstr "\n地理的場所： "
 
-#: gncal/main.c:73
-#, fuzzy
-msgid "Event day's number:"
-msgstr "今日:"
+#: gnomecard/card.c:1809
+msgid ""
+"\n"
+"Title: "
+msgstr "\n役職:"
 
-#: gncal/main.c:74
-msgid "To-Do item that is not yet due:"
-msgstr "期日前のToDo項目:"
+#: gnomecard/card.c:1810
+msgid ""
+"\n"
+"Business Role: "
+msgstr "\n職務："
 
-#: gncal/main.c:75
-msgid "To-Do item that is due today:"
-msgstr "今日が期日のToDo項目:"
+#: gnomecard/card.c:1822
+msgid ""
+"\n"
+"Org: "
+msgstr "\n組織："
 
-#: gncal/main.c:76
-msgid "To-Do item that is overdue:"
-msgstr "期日過ぎたToDo項目"
+#: gnomecard/card.c:1823
+msgid ""
+"\n"
+"  Name:  "
+msgstr "\n名称:"
 
-#: gncal/main.c:282
-msgid "Gnome Calendar"
-msgstr "Gnomeカレンダー"
+#: gnomecard/card.c:1824
+msgid ""
+"\n"
+"  Unit:  "
+msgstr "\n単位："
 
-#: gncal/main.c:285
-msgid "The GNOME personal calendar and schedule manager."
-msgstr "GNOME版プライベートカレンダーとスケジュール帳。"
+#: gnomecard/card.c:1825
+msgid ""
+"\n"
+"  Unit2: "
+msgstr "\n単位2："
 
-#: gncal/main.c:462
-msgid "File not found"
-msgstr "ファイルが見つかりません"
+#: gnomecard/card.c:1826
+msgid ""
+"\n"
+"  Unit3: "
+msgstr "\n単位3："
 
-#: gncal/main.c:481
-msgid "Open calendar"
-msgstr "カレンダーを開く"
+#: gnomecard/card.c:1827
+msgid ""
+"\n"
+"  Unit4: "
+msgstr "\n単位4："
 
-#: gncal/main.c:522
-msgid "Save calendar"
-msgstr "カレンダーを保存"
+#: gnomecard/card.c:1831
+msgid ""
+"\n"
+"Categories: "
+msgstr "\n分類:"
 
-#: gncal/main.c:564
-#, c-format
+#: gnomecard/card.c:1832
 msgid ""
-"File %s has changed since it was loaded\n"
-"Continue?"
-msgstr ""
-"%sファイルは読み込んだ後で更新されています。\n"
-"続けますか?"
+"\n"
+"Comment: "
+msgstr "\nコメント:"
 
-#: gncal/main.c:596
-msgid "_New calendar"
-msgstr "新しいカレンダー(_N)"
+#. if (crd->sound.prop.used) {
+#. if (crd->sound.type != SOUND_PHONETIC)
+#. addPropSizedValue(string, _("\nPronunciation: "),
+#. crd->sound.data, crd->sound.size);
+#. else
+#. add_strProp_to_string(string, _("\nPronunciation: "),
+#. crd->sound.data);
+#.
+#. add_SoundType(string, crd->sound.type);
+#. }
+#: gnomecard/card.c:1845
+msgid ""
+"\n"
+"URL: "
+msgstr "\nURL:"
 
-#: gncal/main.c:597
-msgid "Create a new calendar"
-msgstr "新しいカレンダーを作成"
+#: gnomecard/card.c:1846
+msgid ""
+"\n"
+"Unique String: "
+msgstr "\n固有の文字列："
 
-#: gncal/main.c:616
-msgid "_New appointment..."
-msgstr "新しいアポイント(_N)..."
+#: gnomecard/card.c:1849
+msgid ""
+"\n"
+"Public Key: "
+msgstr "\n公開鍵:"
 
-#: gncal/main.c:617 gncal/main.c:649
-msgid "Create a new appointment"
-msgstr "新たなアポイントの作成"
+#: gncal/gnome-cal.c:66
+msgid "Day View"
+msgstr "日間"
 
-#: gncal/main.c:619
-msgid "New appointment for _today..."
-msgstr "新たな今日のアポイント(_T)..."
+#: gncal/gnome-cal.c:67
+msgid "Week View"
+msgstr "週間"
 
-#: gncal/main.c:620
-msgid "Create a new appointment for today"
-msgstr "本日の新たなアポイントの作成"
+#: gncal/gnome-cal.c:68
+msgid "Month View"
+msgstr "月間"
 
-#: gncal/main.c:649 gnomecard/gnomecard.c:471
-msgid "New"
-msgstr "新規"
+#: gncal/gnome-cal.c:69
+msgid "Year View"
+msgstr "年間"
 
-#: gncal/main.c:653 gnomecard/gnomecard.c:502 gnomecard/gnomecard.c:678
-msgid "Prev"
-msgstr "前"
+#: gncal/gnome-cal.c:394 gncal/gnome-cal.c:488 gncal/gnome-cal.c:534
+msgid "Reminder of your appointment at "
+msgstr "アポイントの督促状を"
 
-#: gncal/main.c:653
-msgid "Go back in time"
-msgstr "過去へ遡る"
+#: gncal/gnome-cal.c:481
+msgid "Snooze"
+msgstr "スヌーズ"
 
-#: gncal/main.c:654
-msgid "Today"
-msgstr "今日"
+#. Idea: we need Snooze option :-)
+#: gncal/gnome-cal.c:493 gncal/gnome-cal.c:538
+msgid "Ok"
+msgstr "OK"
 
-#: gncal/main.c:654
-msgid "Go to present time"
-msgstr "現在時刻へ"
+#: gncal/month-view.c:157 gncal/year-view.c:235
+msgid "_New appointment in this day..."
+msgstr "この日の新しいアポイント(_N)..."
 
-#: gncal/main.c:655 gnomecard/gnomecard.c:506 gnomecard/gnomecard.c:682
-msgid "Next"
-msgstr "次"
+#: gncal/month-view.c:161 gncal/year-view.c:239
+msgid "Jump to this _day"
+msgstr "この日へ飛ぶ(_d)"
 
-#: gncal/main.c:655
-msgid "Go forward in time"
-msgstr "未来へ進む"
+#: gncal/month-view.c:162 gncal/year-view.c:240
+msgid "Jump to this _week"
+msgstr "この週へ飛ぶ(_w)"
 
-#: gncal/main.c:659
-msgid "Go to"
-msgstr "飛ぶ"
+#: gncal/year-view.c:241
+msgid "Jump to this _month"
+msgstr "この月へ飛ぶ(_m)"
 
-#: gncal/main.c:659
-msgid "Go to a specific date"
-msgstr "指定の日に飛ぶ"
+#: gncal/eventedit.c:1364 gncal/gncal-day-panel.c:216
+#: gncal/gncal-day-panel.c:241 gncal/gncal-week-view.c:254
+#: gncal/month-view.c:88 gncal/year-view.c:312
+msgid "%a %b %d %Y"
+msgstr "%Y/%m/%d (%a)"
 
-#: gncal/main.c:695
-#, fuzzy, c-format
-msgid "%s's calendar"
-msgstr "さんのカレンダー"
+#: gncal/quick-view.c:180
+msgid "No appointments for this day"
+msgstr "この日にアポイントはありません"
 
-#: gncal/main.c:801
-msgid "%H:%M"
-msgstr "%H:%M"
+#: gncal/prop.c:345
+msgid "Time display"
+msgstr "時刻表示"
 
-#: gncal/main.c:803 gncal/main.c:807
-msgid "%A %b %d, %H:%M"
-msgstr "%m/%d (%a) %H:%M"
+#. Time format
+#: gncal/prop.c:349
+msgid "Time format"
+msgstr "時刻の形式"
 
-#: gncal/main.c:908
-msgid "Show events and quit"
-msgstr "イベントを表示して終了"
+#: gncal/prop.c:350
+msgid "12-hour (AM/PM)"
+msgstr "12時間制 (AM/PM)"
 
-#: gncal/main.c:910
-msgid "Show TO-DO items and quit"
-msgstr "ToDo項目を表示して終了"
+#: gncal/prop.c:351
+msgid "24-hour"
+msgstr "24時間制"
 
-#: gncal/main.c:912
-msgid "Specifies start date [for --events]"
-msgstr "開始日を指定[ --events オプション用 ]"
+#. Weeks start on
+#: gncal/prop.c:361
+msgid "Weeks start on"
+msgstr "一週間のはじまり"
 
-#: gncal/main.c:912 gncal/main.c:917
-msgid "DATE"
-msgstr "日付"
+#: gncal/eventedit.c:962 gncal/prop.c:362
+msgid "Sunday"
+msgstr "日曜日"
 
-#: gncal/main.c:913
-msgid "File to load calendar from"
-msgstr "読み込むカレンダーファイル名を指定"
+#: gncal/eventedit.c:956 gncal/prop.c:363
+msgid "Monday"
+msgstr "月曜日"
 
-#: gncal/main.c:913
-msgid "FILE"
-msgstr "ファイル名"
+#. Day range
+#: gncal/prop.c:373
+msgid "Day range"
+msgstr "一日の範囲"
 
-#: gncal/main.c:914
-msgid "Load the user calendar"
-msgstr "ユーザのカレンダーを読み込む"
+#: gncal/prop.c:384
+msgid ""
+"Please select the start and end hours you want\n"
+"to be displayed in the day view and week view.\n"
+"Times outside this range will not be displayed\n"
+"by default."
+msgstr ""
+"日表示と週表示で表示して欲しい、一日の\n"
+"開始時刻と終了時刻を指定して下さい。\n"
+"範囲外の時刻を標準では表示しません。\n"
+" "
 
-#: gncal/main.c:915
-msgid "Geometry for starting up"
-msgstr "起動時の位置と大きさの指定"
+#: gncal/prop.c:400
+msgid "Day start:"
+msgstr "一日の始まり:"
 
-#: gncal/main.c:915
-msgid "GEOMETRY"
-msgstr "位置と大きさ"
+#: gncal/prop.c:411
+msgid "Day end:"
+msgstr "一日の終り:"
 
-#: gncal/main.c:916
-msgid "The startup view mode (dayview, weekview, monthview, yearview)"
-msgstr "起動時のビュー(日観、週観、月観、年観)"
+#. Roll over to next day on Midnight
+#: gncal/prop.c:418
+msgid "Roll calendar to next day on midnight"
+msgstr "夜中にカレンダーを次の日にめくる"
 
-#: gncal/main.c:916
-msgid "VIEW"
-msgstr "ビュー"
+#: gncal/prop.c:542
+msgid "Colors for display"
+msgstr "表示色"
 
-#: gncal/main.c:917
-msgid "Specifies ending date [for --events]"
-msgstr "終了日の指定 [ --events オプション用 ]"
+#: gncal/prop.c:545
+msgid "Colors"
+msgstr "色"
 
-#: gncal/main.c:918
-msgid "If used, starts in iconic mode"
-msgstr "指定した場合、アイコン状態で起動します"
+#: gncal/prop.c:620
+msgid "Show on TODO List:"
+msgstr "ToDo一覧に表示:"
 
-#: gncal/main.c:919
-msgid "Enable debugging output of TYPE (alarms)"
-msgstr "TYPE(アラーム)のデバッグ出力をする"
+#: gncal/gncal-todo.c:527 gncal/prop.c:625
+msgid "Due Date"
+msgstr "期日"
 
-#: gncal/main.c:919
-msgid "TYPE"
-msgstr "TYPE"
+#: gncal/gncal-todo.c:528 gncal/prop.c:626
+msgid "Priority"
+msgstr "優先度"
+
+#: gncal/prop.c:627
+msgid "Time Until Due"
+msgstr "期日までの時間"
+
+#: gncal/gncal-todo.c:530 gncal/prop.c:628
+msgid "Categories"
+msgstr "分類"
+
+#: gncal/prop.c:668
+msgid "To Do List style options:"
+msgstr "ToDo一覧の表示スタイル:"
+
+#: gncal/prop.c:673
+msgid "Highlight overdue items"
+msgstr "期日過ぎの項目を強調"
+
+#: gncal/prop.c:676
+msgid "Highlight not yet due items"
+msgstr "期日がまだの項目を強調"
+
+#: gncal/prop.c:679
+msgid "Highlight items due today"
+msgstr "今日が期日の項目を強調"
+
+#: gncal/prop.c:712
+msgid "To Do List Properties"
+msgstr "ToDo一覧設定"
+
+#: gncal/prop.c:715
+msgid "To Do List"
+msgstr "ToDo一覧"
+
+#: gncal/prop.c:751
+msgid "Preferences"
+msgstr "設定"
+
+#: gncal/eventedit.c:415 gncal/prop.c:817
+msgid "Alarms"
+msgstr "アラーム"
+
+#. build miscellaneous box
+#: gncal/prop.c:820
+msgid "Alarm Properties"
+msgstr "アラームの設定"
+
+#: gncal/prop.c:830
+msgid "Beep on display alarms"
+msgstr "アラーム表示の時にビープ音"
+
+#: gncal/prop.c:840
+msgid "Audio alarms timeout after"
+msgstr "音声アラームはタイムアウト後"
+
+#: gncal/prop.c:851 gncal/prop.c:868
+msgid " seconds"
+msgstr "秒"
+
+#: gncal/prop.c:857
+msgid "Enable snoozing for "
+msgstr "スヌージングは"
+
+#. populate default frame/box
+#: gncal/prop.c:873
+msgid "Defaults"
+msgstr "デフォルト"
+
+#: gncal/eventedit.c:426 gncal/prop.c:882
+msgid "Display"
+msgstr "表示"
+
+#: gncal/eventedit.c:427 gncal/prop.c:885
+msgid "Audio"
+msgstr "オーディオ"
+
+#: gncal/eventedit.c:428 gncal/prop.c:888
+msgid "Program"
+msgstr "プログラム"
+
+#: gncal/eventedit.c:429 gncal/prop.c:891
+msgid "Mail"
+msgstr "メール"
+
+#: gncal/month-view.c:163
+msgid "Jump to this _year"
+msgstr "この年へ飛ぶ(_y)"
+
+#: gncal/month-view.c:789
+msgid "%B %Y"
+msgstr "%Y年 %m月"
 
 #: gncal/modify-cats.c:63
 msgid "Done"
@@ -1228,1206 +1263,1020 @@
 msgid "Travel"
 msgstr "旅行"
 
-#: gncal/modify-cats.c:425 gnomecard/deladdrlist.c:34 gnomecard/phonelist.c:30
-msgid "Work"
-msgstr "仕事先"
-
-#: gncal/month-view.c:157 gncal/year-view.c:235
-msgid "_New appointment in this day..."
-msgstr "この日の新しいアポイント(_N)..."
-
-#: gncal/month-view.c:161 gncal/year-view.c:239
-msgid "Jump to this _day"
-msgstr "この日へ飛ぶ(_d)"
-
-#: gncal/month-view.c:162 gncal/year-view.c:240
-msgid "Jump to this _week"
-msgstr "この週へ飛ぶ(_w)"
-
-#: gncal/month-view.c:163
-msgid "Jump to this _year"
-msgstr "この年へ飛ぶ(_y)"
-
-#: gncal/month-view.c:789
-msgid "%B %Y"
-msgstr "%Y年 %m"
-
-#: gncal/prop.c:349
-msgid "Time display"
-msgstr "時刻表示"
-
-#. Time format
-#: gncal/prop.c:353
-msgid "Time format"
-msgstr "時刻の形式"
-
-#: gncal/prop.c:354
-msgid "12-hour (AM/PM)"
-msgstr "12時間制 (AM/PM)"
-
-#: gncal/prop.c:355
-msgid "24-hour"
-msgstr "24時間制"
-
-#. Weeks start on
-#: gncal/prop.c:365
-msgid "Weeks start on"
-msgstr "一週間のはじまり"
-
-#. Day range
-#: gncal/prop.c:377
-msgid "Day range"
-msgstr "一日の範囲"
+#: gncal/main.c:62
+msgid "Outline:"
+msgstr "罫線:"
 
-#: gncal/prop.c:388
-msgid ""
-"Please select the start and end hours you want\n"
-"to be displayed in the day view and week view.\n"
-"Times outside this range will not be displayed\n"
-"by default."
-msgstr ""
-"日表示と週表示で表示して欲しい、一日の\n"
-"開始時刻と終了時刻を指定して下さい。\n"
-"範囲外の時刻を標準では表示しません。\n"
-" "
+#: gncal/main.c:63
+msgid "Headings:"
+msgstr "曜日:"
 
-#: gncal/prop.c:404
-msgid "Day start:"
-msgstr "一日の始まり:"
+#: gncal/main.c:64
+msgid "Empty days:"
+msgstr "空き:"
 
-#: gncal/prop.c:415
-msgid "Day end:"
-msgstr "一日の終り:"
+#: gncal/main.c:65
+msgid "Appointments:"
+msgstr "アポイント"
 
-#. Roll over to next day on Midnight
-#: gncal/prop.c:422
-msgid "Roll calendar to next day on midnight"
-msgstr ""
+#: gncal/main.c:66
+msgid "Highlighted day:"
+msgstr "強調:"
 
-#: gncal/prop.c:546
-msgid "Colors for display"
-msgstr "表示色"
+#: gncal/main.c:67
+msgid "Day numbers:"
+msgstr "日付:"
 
-#: gncal/prop.c:549
-msgid "Colors"
-msgstr "色"
+#: gncal/main.c:68
+msgid "Current day's number:"
+msgstr "今日:"
 
-#: gncal/prop.c:624
-msgid "Show on TODO List:"
-msgstr "ToDo一覧に表示:"
+#: gncal/main.c:69
+msgid "Event day's number:"
+msgstr "イベント日の番号:"
 
-#: gncal/prop.c:631
-msgid "Time Until Due"
-msgstr "期日までの時間"
+#: gncal/main.c:70
+msgid "To-Do item that is not yet due:"
+msgstr "期日前のToDo項目:"
 
-#: gncal/prop.c:672
-msgid "To Do List style options:"
-msgstr "ToDo一覧の表示スタイル:"
+#: gncal/main.c:71
+msgid "To-Do item that is due today:"
+msgstr "今日が期日のToDo項目:"
 
-#: gncal/prop.c:677
-msgid "Highlight overdue items"
-msgstr "期日過ぎの項目を強調"
+#: gncal/main.c:72
+msgid "To-Do item that is overdue:"
+msgstr "期日過ぎたToDo項目"
 
-#: gncal/prop.c:680
-msgid "Highlight not yet due items"
-msgstr "期日がまだの項目を強調"
+#: gncal/main.c:283
+msgid "Gnome Calendar"
+msgstr "Gnomeカレンダー"
 
-#: gncal/prop.c:683
-msgid "Highlight items due today"
-msgstr "今日が期日の項目を強調"
+#: gncal/main.c:286
+msgid "The GNOME personal calendar and schedule manager."
+msgstr "GNOME版プライベートカレンダーとスケジュール帳。"
 
-#: gncal/prop.c:716
-msgid "To Do List Properties"
-msgstr "ToDo一覧設定"
+#: gncal/main.c:463
+msgid "File not found"
+msgstr "ファイルが見つかりません"
 
-#: gncal/prop.c:719
-msgid "To Do List"
-msgstr "ToDo一覧"
+#: gncal/main.c:482
+msgid "Open calendar"
+msgstr "カレンダーを開く"
 
-#: gncal/prop.c:755
-msgid "Preferences"
-msgstr "設定"
+#: gncal/main.c:523
+msgid "Save calendar"
+msgstr "カレンダーを保存"
 
-#. build miscellaneous box
-#: gncal/prop.c:824
-msgid "Alarm Properties"
-msgstr "アラームの設定"
+#: gncal/main.c:565
+#, c-format
+msgid ""
+"File %s has changed since it was loaded\n"
+"Continue?"
+msgstr ""
+"%sファイルは読み込んだ後で更新されています。\n"
+"続けますか?"
 
-#: gncal/prop.c:834
-msgid "Beep on display alarms"
-msgstr "アラーム表示の時にビープ音"
+#: gncal/main.c:597
+msgid "_New calendar"
+msgstr "新しいカレンダー(_N)"
 
-#: gncal/prop.c:844
-msgid "Audio alarms timeout after"
-msgstr "音声アラームはタイムアウト後"
+#: gncal/main.c:598
+msgid "Create a new calendar"
+msgstr "新しいカレンダーを作成"
 
-#: gncal/prop.c:855 gncal/prop.c:872
-msgid " seconds"
-msgstr "秒"
+#: gncal/main.c:617
+msgid "_New appointment..."
+msgstr "新しいアポイント(_N)..."
 
-#: gncal/prop.c:861
-msgid "Enable snoozing for "
-msgstr "スヌージングは"
+#: gncal/main.c:618 gncal/main.c:650
+msgid "Create a new appointment"
+msgstr "新たなアポイントの作成"
 
-#. populate default frame/box
-#: gncal/prop.c:877
-msgid "Defaults"
-msgstr "デフォルト"
+#: gncal/main.c:620
+msgid "New appointment for _today..."
+msgstr "新たな今日のアポイント(_T)..."
 
-#: gncal/quick-view.c:180
-msgid "No appointments for this day"
-msgstr "この日にアポイントはありません"
+#: gncal/main.c:621
+msgid "Create a new appointment for today"
+msgstr "本日の新たなアポイントの作成"
 
-#: gncal/timeutil.c:99
-msgid "am"
-msgstr "午前"
+#: gncal/main.c:654
+msgid "Go back in time"
+msgstr "過去へ遡る"
 
-#: gncal/timeutil.c:99
-msgid "pm"
-msgstr "午後"
+#: gncal/main.c:655
+msgid "Today"
+msgstr "今日"
 
-#: gncal/timeutil.c:101
-msgid "h"
-msgstr "時"
+#: gncal/main.c:655
+msgid "Go to present time"
+msgstr "現在時刻へ"
 
-#: gncal/todo-conduit-control-applet.c:110
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
+#: gncal/main.c:656
+msgid "Go forward in time"
+msgstr "未来へ進む"
 
-#: gncal/todo-conduit-control-applet.c:112
-msgid "Gpilotd todo conduit"
-msgstr ""
+#: gncal/main.c:660
+msgid "Go to"
+msgstr "飛ぶ"
 
-#: gncal/todo-conduit-control-applet.c:113
-#: gnomecard/address-conduit-capplet.c:157
-msgid "(C) 1998 the Free Software Foundation"
-msgstr ""
+#: gncal/main.c:660
+msgid "Go to a specific date"
+msgstr "指定の日に飛ぶ"
 
-#: gncal/todo-conduit-control-applet.c:115
-#, fuzzy
-msgid "Configuration utility for the todo conduit.\n"
-msgstr "カレンダー コンジットの設定ユーティリティ\n"
+#: gncal/main.c:696
+#, c-format
+msgid "%s's calendar"
+msgstr "%s さんのカレンダー"
 
-#: gncal/todo-conduit-control-applet.c:116
-#: gnomecard/address-conduit-capplet.c:162
-msgid "gnome-unknown.xpm"
-msgstr ""
+#: gncal/main.c:802
+msgid "%H:%M"
+msgstr "%H:%M"
 
-#: gncal/todo-conduit-control-applet.c:141
-#, fuzzy
-msgid "Enabled"
-msgstr "不使用"
+#: gncal/main.c:804 gncal/main.c:808
+msgid "%A %b %d, %H:%M"
+msgstr "%m/%d (%a) %H:%M"
 
-#: gncal/todo-conduit-control-applet.c:265
-#: gncal/todo-conduit-control-applet.c:266
-#, fuzzy
-msgid "Cannot initialise the GnomePilot Daemon"
-msgstr "gnome-pilot デーモンに接続してません"
+#: gncal/main.c:909
+msgid "Show events and quit"
+msgstr "イベントを表示して終了"
 
-#: gncal/todo-conduit-control-applet.c:272
-#: gncal/todo-conduit-control-applet.c:273
-#, fuzzy
-msgid "Cannot connect to the GnomePilot Daemon"
-msgstr "gnome-pilot デーモンに接続してません"
+#: gncal/main.c:911
+msgid "Show TO-DO items and quit"
+msgstr "ToDo項目を表示して終了"
 
-#: gncal/year-view.c:241
-msgid "Jump to this _month"
-msgstr "この月へ飛ぶ(_m)"
+#: gncal/main.c:913
+msgid "Specifies start date [for --events]"
+msgstr "開始日を指定[ --events オプション用 ]"
 
-#: gnomecard/address-conduit-capplet.c:154
-msgid "Vadim Strizhevsky <vadim@optonline.net>"
-msgstr ""
+#: gncal/main.c:913 gncal/main.c:918
+msgid "DATE"
+msgstr "日付"
 
-#: gnomecard/address-conduit-capplet.c:156
-msgid "Gpilotd address conduit"
-msgstr ""
+#: gncal/main.c:914
+msgid "File to load calendar from"
+msgstr "読み込むカレンダーファイル名を指定"
 
-#: gnomecard/address-conduit-capplet.c:159
-msgid ""
-"Configuration utility for the address conduit.\n"
-"The address conduit syncronizes addresses from the pilot with GnomeCard file "
-"on the local host"
-msgstr ""
+#: gncal/main.c:914
+msgid "FILE"
+msgstr "ファイル名"
 
-#: gnomecard/address-conduit-capplet.c:263
-#, fuzzy
-msgid "GnomeCard File:"
-msgstr "名刺ファイルを開く。"
+#: gncal/main.c:915
+msgid "Load the user calendar"
+msgstr "ユーザのカレンダーを読み込む"
 
-#: gnomecard/address-conduit-capplet.c:341
-#, fuzzy
-msgid "Address Conduit State"
-msgstr "コンジットの状態"
+#: gncal/main.c:916
+msgid "Geometry for starting up"
+msgstr "起動時の位置と大きさの指定"
 
-#: gnomecard/address-conduit-capplet.c:347
-msgid "Address Conduit Options"
-msgstr ""
+#: gncal/main.c:916
+msgid "GEOMETRY"
+msgstr "位置と大きさ"
 
-#: gnomecard/address-conduit.c:462 gnomecard/address-conduit.c:464
-#, fuzzy, c-format
-msgid "Unable to open file: %s"
-msgstr "DatebookDB を開けません"
+#: gncal/main.c:917
+msgid "The startup view mode (dayview, weekview, monthview, yearview)"
+msgstr "起動時のビュー(日観、週観、月観、年観)"
 
-#: gnomecard/address-conduit.c:949
-msgid "Open secret entries"
-msgstr ""
+#: gncal/main.c:917
+msgid "VIEW"
+msgstr "ビュー"
 
-#: gnomecard/address-conduit.c:956
-#, fuzzy
-msgid "Filename"
-msgstr "ミドルネーム"
+#: gncal/main.c:918
+msgid "Specifies ending date [for --events]"
+msgstr "終了日の指定 [ --events オプション用 ]"
 
-#: gnomecard/address-conduit.c:1062 gnomecard/address-conduit.c:1064
-msgid "No filename specified. Please run address conduit capplet first."
-msgstr ""
+#: gncal/main.c:919
+msgid "If used, starts in iconic mode"
+msgstr "指定した場合、アイコン状態で起動します"
 
-#: gnomecard/canvas.c:168
-msgid "No Card Name."
-msgstr "名無しの名刺。"
+#: gncal/main.c:920
+msgid "Enable debugging output of TYPE (alarms)"
+msgstr "TYPE(アラーム)のデバッグ出力をする"
 
-#: gnomecard/card.c:1677
-#, fuzzy
-msgid "Card: "
-msgstr "名刺"
+#: gncal/main.c:920
+msgid "TYPE"
+msgstr "TYPE"
 
-#: gnomecard/card.c:1679
-#, fuzzy
-msgid ""
-"\n"
-"Name: "
-msgstr "名称:"
+#: gncal/goto.c:82
+msgid "Year:"
+msgstr "年:"
 
-#: gnomecard/card.c:1680
-#, fuzzy
-msgid ""
-"\n"
-"  Prefix:     "
-msgstr "敬称(前つけ):"
+#: gncal/goto.c:266
+msgid "Go to date"
+msgstr "指定日へ"
 
-#: gnomecard/card.c:1681
+#. Instructions
+#: gncal/goto.c:275
 msgid ""
-"\n"
-"  Given:      "
+"Please select the date you want to go to.\n"
+"When you click on a day, you will be taken\n"
+"to that date."
 msgstr ""
+"見たい日付を指定して下さい。\n"
+"日付をクリックすると、その\n"
+"日付に飛びます。"
 
-#: gnomecard/card.c:1682
-msgid ""
-"\n"
-"  Additional: "
-msgstr ""
+#: gncal/goto.c:312
+msgid "Go to today"
+msgstr "本日へ飛ぶ"
 
-#: gnomecard/card.c:1683
-msgid ""
-"\n"
-"  Family:     "
-msgstr ""
+#: gncal/gnome-month-item.c:15
+msgid "-*-helvetica-medium-r-normal--10-*-*-*-p-*-*-*"
+msgstr "-*-fixed-medium-r-normal--10-*-*-*-p-*-*-*"
 
-#: gnomecard/card.c:1684
-#, fuzzy
-msgid ""
-"\n"
-"  Suffix:     "
-msgstr "敬称(後つけ)"
+#. Initialize by default to three-letter day names
+#: gncal/eventedit.c:1018 gncal/gnome-month-item.c:736
+msgid "Sun"
+msgstr "日"
 
-#: gnomecard/card.c:1698
-#, fuzzy
-msgid ""
-"\n"
-"Birth Date: "
-msgstr "誕生日:"
+#: gncal/eventedit.c:1018 gncal/gnome-month-item.c:737
+msgid "Mon"
+msgstr "月"
 
-#: gnomecard/card.c:1709
-#, fuzzy
-msgid ""
-"\n"
-"Address:"
-msgstr "住所"
+#: gncal/eventedit.c:1018 gncal/gnome-month-item.c:738
+msgid "Tue"
+msgstr "火"
 
-#: gnomecard/card.c:1711
-#, fuzzy
-msgid ""
-"\n"
-"  Postal Box:  "
-msgstr "郵便"
+#: gncal/eventedit.c:1018 gncal/gnome-month-item.c:739
+msgid "Wed"
+msgstr "水"
 
-#: gnomecard/card.c:1712
-msgid ""
-"\n"
-"  Ext:         "
-msgstr ""
+#: gncal/eventedit.c:1018 gncal/gnome-month-item.c:740
+msgid "Thu"
+msgstr "木"
 
-#: gnomecard/card.c:1713
-#, fuzzy
-msgid ""
-"\n"
-"  Street:      "
-msgstr "区分(Street):"
+#: gncal/eventedit.c:1018 gncal/gnome-month-item.c:741
+msgid "Fri"
+msgstr "金"
 
-#: gnomecard/card.c:1714
-msgid ""
-"\n"
-"  City:        "
-msgstr ""
+#: gncal/eventedit.c:1018 gncal/gnome-month-item.c:742
+msgid "Sat"
+msgstr "土"
 
-#: gnomecard/card.c:1715
-#, fuzzy
-msgid ""
-"\n"
-"  Region:      "
-msgstr "都道府県:"
+#: gncal/gncal-todo.c:163
+msgid "Create to-do item"
+msgstr "ToDo 項目の作成"
 
-#: gnomecard/card.c:1716
-#, fuzzy
-msgid ""
-"\n"
-"  Postal Code: "
-msgstr "郵便番号:"
+#: gncal/gncal-todo.c:163
+msgid "Edit to-do item"
+msgstr "ToDoの編集"
 
-#: gnomecard/card.c:1717
-#, fuzzy
-msgid ""
-"\n"
-"  Country:     "
-msgstr "国:"
+#: gncal/eventedit.c:871 gncal/gncal-todo.c:194
+msgid "Summary:"
+msgstr "要約:"
 
-#: gnomecard/card.c:1730
-msgid ""
-"\n"
-"Delivery Label: "
-msgstr ""
+#: gncal/gncal-todo.c:203
+msgid "Due Date:"
+msgstr "期日:"
 
-#: gnomecard/card.c:1742
-#, fuzzy
-msgid ""
-"\n"
-"Telephones:\n"
-msgstr "電話データ:"
+#: gncal/gncal-todo.c:213
+msgid "Priority:"
+msgstr "優先度:"
 
-#: gnomecard/card.c:1745
-#, fuzzy
-msgid ""
-"\n"
-"Telephone:"
-msgstr "電話データ:"
+#: gncal/gncal-todo.c:249
+msgid "Item Comments:"
+msgstr "コメント:"
 
-#: gnomecard/card.c:1769
-#, fuzzy
-msgid ""
-"\n"
-"E-mail:\n"
-msgstr "電子メール"
+#: gncal/gncal-todo.c:389
+msgid "Add to-do item..."
+msgstr "ToDoの追加..."
 
-#: gnomecard/card.c:1772
-#, fuzzy
-msgid ""
-"\n"
-"E-mail:"
-msgstr "電子メール"
+#: gncal/gncal-todo.c:526
+msgid "Summary"
+msgstr "要約"
 
-#: gnomecard/card.c:1791
-#, fuzzy
-msgid ""
-"\n"
-"Mailer: "
-msgstr "ミドルネーム:"
+#: gncal/gncal-todo.c:529
+msgid "Time Left"
+msgstr "残り時間"
 
-#: gnomecard/card.c:1797
-#, fuzzy
-msgid ""
-"\n"
-"Time Zone: "
-msgstr "タイムゾーン"
+#. Label
+#: gncal/gncal-todo.c:536
+msgid "To-do list"
+msgstr "ToDo一覧"
 
-#: gnomecard/card.c:1805
-msgid ""
-"\n"
-"Geo Location: "
-msgstr ""
+#. Add
+#: gncal/gncal-todo.c:579
+msgid "Add..."
+msgstr "追加..."
 
-#: gnomecard/card.c:1809
-#, fuzzy
-msgid ""
-"\n"
-"Title: "
-msgstr "役職:"
+#. Edit
+#: gncal/gncal-todo.c:588
+msgid "Edit..."
+msgstr "編集..."
 
-#: gnomecard/card.c:1810
-msgid ""
-"\n"
-"Business Role: "
-msgstr ""
+#: gncal/gncal-todo.c:810
+msgid "Weeks"
+msgstr "週毎"
 
-#: gnomecard/card.c:1822
-msgid ""
-"\n"
-"Org: "
-msgstr ""
+#: gncal/gncal-todo.c:810
+msgid "Week"
+msgstr "週毎"
 
-#: gnomecard/card.c:1823
-#, fuzzy
-msgid ""
-"\n"
-"  Name:  "
-msgstr "名称:"
+#: gncal/eventedit.c:296 gncal/gncal-todo.c:811 gncal/gncal-todo.c:815
+msgid "Days"
+msgstr "日"
 
-#: gnomecard/card.c:1824
-msgid ""
-"\n"
-"  Unit:  "
-msgstr ""
+#: gncal/gncal-todo.c:811 gncal/gncal-todo.c:815
+msgid "Day"
+msgstr "日"
 
-#: gnomecard/card.c:1825
-msgid ""
-"\n"
-"  Unit2: "
-msgstr ""
+#: gncal/eventedit.c:296 gncal/gncal-todo.c:816 gncal/gncal-todo.c:820
+msgid "Hours"
+msgstr "時間"
 
-#: gnomecard/card.c:1826
-msgid ""
-"\n"
-"  Unit3: "
-msgstr ""
+#: gncal/gncal-todo.c:816 gncal/gncal-todo.c:820
+msgid "Hour"
+msgstr "時間"
 
-#: gnomecard/card.c:1827
-msgid ""
-"\n"
-"  Unit4: "
-msgstr ""
+#: gncal/eventedit.c:296 gncal/gncal-todo.c:821 gncal/gncal-todo.c:825
+msgid "Minutes"
+msgstr "分"
 
-#: gnomecard/card.c:1831
-#, fuzzy
-msgid ""
-"\n"
-"Categories: "
-msgstr "分類:"
+#: gncal/gncal-todo.c:821 gncal/gncal-todo.c:825
+msgid "Minute"
+msgstr "分"
 
-#: gnomecard/card.c:1832
-#, fuzzy
-msgid ""
-"\n"
-"Comment: "
-msgstr "コメント:"
+#: gncal/gncal-todo.c:826 gncal/gncal-todo.c:830
+msgid "Seconds"
+msgstr "秒"
 
-#. if (crd->sound.prop.used) {
-#. if (crd->sound.type != SOUND_PHONETIC)
-#. addPropSizedValue(string, _("\nPronunciation: "),
-#. crd->sound.data, crd->sound.size);
-#. else
-#. add_strProp_to_string(string, _("\nPronunciation: "),
-#. crd->sound.data);
-#.
-#. add_SoundType(string, crd->sound.type);
-#. }
-#: gnomecard/card.c:1845
-msgid ""
-"\n"
-"URL: "
-msgstr ""
+#: gncal/gncal-todo.c:826 gncal/gncal-todo.c:830
+msgid "Second"
+msgstr "秒"
 
-#: gnomecard/card.c:1846
-msgid ""
-"\n"
-"Unique String: "
-msgstr ""
+#: gncal/gncal-week-view.c:257
+msgid "%a %b %d %Y (Week %V)"
+msgstr "%Y/%m/%d (%a) (第%V週)"
 
-#: gnomecard/card.c:1849
-#, fuzzy
-msgid ""
-"\n"
-"Public Key: "
-msgstr "公開鍵:"
+#: gncal/gncal-full-day.c:539 gncal/gncal-full-day.c:547
+msgid "Edit this appointment..."
+msgstr "このアポイントを編集..."
 
-#: gnomecard/columnhdrs.c:32
-msgid "Full Name"
-msgstr "フルネーム"
+#: gncal/gncal-full-day.c:540
+msgid "Delete this appointment"
+msgstr "このアポイントを削除"
 
-#: gnomecard/columnhdrs.c:33
-msgid "Card Name"
-msgstr "名刺の名前"
+#: gncal/gncal-day-view.c:135 gncal/gncal-full-day.c:542
+#: gncal/gncal-full-day.c:551 gncal/gncal-full-day.c:1740
+msgid "New appointment..."
+msgstr "新しいアポイント..."
 
-#: gnomecard/columnhdrs.c:34
-msgid "First Name"
-msgstr "ファーストネーム"
+#: gncal/gncal-full-day.c:546
+msgid "Make this appointment movable"
+msgstr "このアポイントを動かせるようにする"
 
-#: gnomecard/columnhdrs.c:35
-msgid "Middle Name"
-msgstr "ミドルネーム"
+#: gncal/gncal-full-day.c:548
+msgid "Delete this occurance"
+msgstr "今回のみ削除"
 
-#: gnomecard/columnhdrs.c:36
-msgid "Last Name"
-msgstr "ラストネーム"
+#: gncal/gncal-full-day.c:549
+msgid "Delete all occurances"
+msgstr "全ての回を削除"
 
-#: gnomecard/columnhdrs.c:37
-msgid "Prefix"
-msgstr "敬称(前つけ)"
+#: gncal/eventedit.c:236
+msgid "Time"
+msgstr "時刻"
 
-#: gnomecard/columnhdrs.c:38
-msgid "Suffix"
-msgstr "敬称(後つけ)"
+#: gncal/eventedit.c:254
+msgid "Start time:"
+msgstr "開始時刻:"
 
-#: gnomecard/columnhdrs.c:39 gnomecard/dialog.c:396 gnomecard/tree.c:196
-msgid "Organization"
-msgstr "組織"
+#: gncal/eventedit.c:270
+msgid "End time:"
+msgstr "終了時刻:"
 
-#: gnomecard/columnhdrs.c:40 gnomecard/tree.c:183
-msgid "Title"
-msgstr "役職"
+#. 3. All day checkbox
+#: gncal/eventedit.c:280
+msgid "All day event"
+msgstr "終日のイベント"
 
-#: gnomecard/columnhdrs.c:41
-msgid "Email"
-msgstr "電子メール"
+#: gncal/eventedit.c:372 gncal/eventedit.c:423
+msgid "Mail to:"
+msgstr "メイル:"
 
-#: gnomecard/columnhdrs.c:42
-msgid "Web Page"
-msgstr "Webページ"
+#: gncal/eventedit.c:386
+msgid "Run program:"
+msgstr "プログラム実行:"
 
-#: gnomecard/columnhdrs.c:43 gnomecard/dialog.c:437
-msgid "Phone"
-msgstr "電話"
+#: gncal/eventedit.c:389
+msgid "Select program to run at alarm time"
+msgstr "アラーム時刻に実行するプログラムの選択"
 
-#: gnomecard/deladdrlist.c:30
-msgid "Post Office:"
-msgstr "郵便局:"
+#: gncal/eventedit.c:440
+msgid "Classification"
+msgstr "分類"
 
-#: gnomecard/deladdrlist.c:30
-msgid "Extended:"
-msgstr "追加:"
+#: gncal/eventedit.c:446
+msgid "Public"
+msgstr "パブリック"
 
-#: gnomecard/deladdrlist.c:30
-msgid "Street:"
-msgstr "区分(Street):"
+#: gncal/eventedit.c:447
+msgid "Private"
+msgstr "プライベート"
 
-#: gnomecard/deladdrlist.c:31
-msgid "City:"
-msgstr "市町村(City:)"
+#: gncal/eventedit.c:448
+msgid "Confidential"
+msgstr "機密"
 
-#: gnomecard/deladdrlist.c:31
-msgid "Region:"
-msgstr "都道府県:"
+#: gncal/eventedit.c:767
+msgid "An event's end time must be later than its start time."
+msgstr "イベントの終了時刻は開始時刻より後でなければなりません"
 
-#: gnomecard/deladdrlist.c:31
-msgid "Postal Code:"
-msgstr "郵便番号:"
+#: gncal/eventedit.c:855
+msgid "General"
+msgstr "一般"
 
-#: gnomecard/deladdrlist.c:32
-msgid "Country:"
-msgstr "国:"
+#: gncal/eventedit.c:864
+msgid "Owner:"
+msgstr "所有者:"
 
-#: gnomecard/deladdrlist.c:34 gnomecard/phonelist.c:30
-msgid "Home"
-msgstr "自宅"
+#: gncal/eventedit.c:867
+msgid "?"
+msgstr "?"
 
-#: gnomecard/deladdrlist.c:34
-msgid "Postal Box"
-msgstr "郵便"
+#: gncal/eventedit.c:921
+msgid "None"
+msgstr "なし"
 
-#: gnomecard/deladdrlist.c:35
-msgid "Parcel"
-msgstr "宅急便"
+#: gncal/eventedit.c:922
+msgid "Daily"
+msgstr "日毎"
 
-#: gnomecard/deladdrlist.c:35
-msgid "Domestic"
-msgstr "国内支社"
+#: gncal/eventedit.c:923
+msgid "Weekly"
+msgstr "週毎"
 
-#: gnomecard/deladdrlist.c:35
-msgid "International"
-msgstr "国際本社"
+#: gncal/eventedit.c:924
+msgid "Monthly"
+msgstr "月毎"
 
-#: gnomecard/deladdrlist.c:440
-msgid "Address data:"
-msgstr "住所のデータ"
+#: gncal/eventedit.c:925
+msgid "Yearly"
+msgstr "年毎"
 
-#: gnomecard/deladdrlist.c:465 gnomecard/emaillist.c:416
-#: gnomecard/phonelist.c:401
-msgid "Type:"
-msgstr "種類:"
+#: gncal/eventedit.c:947
+msgid "1st"
+msgstr "第一"
 
-#: gnomecard/deladdrlist.c:493 gnomecard/dialog.c:943
-#: gnomecard/emaillist.c:450 gnomecard/gnomecard.c:550
-#: gnomecard/gnomecard.c:660 gnomecard/phonelist.c:429
-msgid "Add"
-msgstr "追加"
+#: gncal/eventedit.c:948
+msgid "2nd"
+msgstr "第二"
 
-#: gnomecard/deladdrlist.c:505 gnomecard/dialog.c:945
-#: gnomecard/emaillist.c:462 gnomecard/phonelist.c:441
-msgid "Remove"
-msgstr "削除"
+#: gncal/eventedit.c:949
+msgid "3rd"
+msgstr "第三"
 
-#: gnomecard/deladdrlist.c:512
-msgid "Address List:"
-msgstr "住所リスト:"
+#: gncal/eventedit.c:950
+msgid "4th"
+msgstr "第四"
+
+#: gncal/eventedit.c:951
+msgid "5th"
+msgstr "第五"
 
-#: gnomecard/dialog.c:305
-msgid "Identity"
-msgstr "身元"
+#: gncal/eventedit.c:957
+msgid "Tuesday"
+msgstr "火曜日"
 
-#: gnomecard/dialog.c:309
-msgid "File As:"
-msgstr "名刺の名前:"
+#: gncal/eventedit.c:958
+msgid "Wednesday"
+msgstr "水曜日"
 
-#: gnomecard/dialog.c:312
-msgid "Take from Name"
-msgstr "名前を使う"
+#: gncal/eventedit.c:959
+msgid "Thursday"
+msgstr "木曜日"
 
-#. create name frame
-#: gnomecard/dialog.c:325 gnomecard/tree.c:153
-msgid "Name"
-msgstr "名前"
+#: gncal/eventedit.c:960
+msgid "Friday"
+msgstr "金曜日"
 
-#. first name
-#: gnomecard/dialog.c:333
-msgid "First:"
-msgstr "ファーストネーム:"
+#: gncal/eventedit.c:961
+msgid "Saturday"
+msgstr "土曜日"
 
-#: gnomecard/dialog.c:345
-msgid "Middle:"
-msgstr "ミドルネーム:"
+#: gncal/eventedit.c:1029
+msgid "Recurrence rule"
+msgstr "再発条件"
 
-#: gnomecard/dialog.c:355
-msgid "Last:"
-msgstr "ラストネーム:"
+#. in some languages "Every" can follow the gender of the word it
+#. refers to (here "day(s)"). leave the two leadin letter "d_"
+#. in the translation they are ther on purpose
+#: gncal/eventedit.c:1133
+msgid "d_Every"
+msgstr "d_"
 
-#: gnomecard/dialog.c:369
-msgid "Prefix:"
-msgstr "敬称(前つけ):"
+#: gncal/eventedit.c:1135
+msgid "day(s)"
+msgstr "日毎"
 
-#: gnomecard/dialog.c:380
-msgid "Suffix:"
-msgstr "敬称(後つけ)"
+#. in some languages "Every" can follow the gender of the word it
+#. refers to (here "week(s)"). leave the two leadin letter "w_"
+#. in the translation they are ther on purpose
+#: gncal/eventedit.c:1150
+msgid "w_Every"
+msgstr "w_"
 
-#: gnomecard/dialog.c:402
-msgid "Name:"
-msgstr "名称:"
+#: gncal/eventedit.c:1152
+msgid "week(s)"
+msgstr "週毎"
 
-#: gnomecard/dialog.c:413
-msgid "Title:"
-msgstr "役職:"
+#: gncal/eventedit.c:1173 gncal/eventedit.c:1185
+msgid "Recur on the"
+msgstr "月の"
 
-#: gnomecard/dialog.c:425
-msgid "Network"
-msgstr "ネットワーク"
+#: gncal/eventedit.c:1175
+msgid "th day of the month"
+msgstr "日に発生"
 
-#: gnomecard/dialog.c:431
-msgid "Addresses"
-msgstr "住所"
+#. in some languages "Every" can follow the gender of the word it
+#. refers to (here "month(s)"). leave the two leadin letter "m_"
+#. in the translation they are ther on purpose
+#: gncal/eventedit.c:1198
+msgid "m_Every"
+msgstr "m_"
 
-#: gnomecard/dialog.c:448
-msgid "Birthdate:"
-msgstr "誕生日:"
+#: gncal/eventedit.c:1203
+msgid "month(s)"
+msgstr "月毎"
 
-#: gnomecard/dialog.c:473
-msgid "Geographical"
-msgstr "地理情報"
+#. in some languages "Every" can follow the gender of the word it
+#. refers to (here "year(s)"). leave the two leadin letter "y_"
+#. in the translation they are ther on purpose
+#: gncal/eventedit.c:1223
+msgid "y_Every"
+msgstr "y_"
 
-#: gnomecard/dialog.c:481 gnomecard/tree.c:169
-msgid "Time Zone"
-msgstr "タイムゾーン"
+#: gncal/eventedit.c:1225
+msgid "year(s)"
+msgstr "年毎"
 
-#: gnomecard/dialog.c:488
-msgid "hrs."
-msgstr "時間"
+#: gncal/eventedit.c:1264
+msgid "Ending date"
+msgstr "終了時期"
 
-#: gnomecard/dialog.c:496
-msgid "mins."
-msgstr "分"
+#: gncal/eventedit.c:1277
+msgid "Repeat forever"
+msgstr "世の果てるまで繰り返す"
 
-#: gnomecard/dialog.c:504
-msgid "Geographic Position"
-msgstr "経緯"
+#: gncal/eventedit.c:1286
+msgid "End on"
+msgstr "終了日は"
 
-#: gnomecard/dialog.c:511
-msgid "lat, "
-msgstr "緯度"
+#: gncal/eventedit.c:1312
+msgid "End after"
+msgstr "終了は"
 
-#: gnomecard/dialog.c:519
-msgid "lon."
-msgstr "経度"
+#: gncal/eventedit.c:1328
+msgid "occurrence(s)"
+msgstr "回起きた後で"
 
-#: gnomecard/dialog.c:531
-msgid "Explanatory"
-msgstr "説明"
+#: gncal/eventedit.c:1452
+msgid "Exceptions"
+msgstr "例外"
 
-#: gnomecard/dialog.c:542
-msgid "Comment:"
-msgstr "コメント:"
+#: gncal/eventedit.c:1464
+msgid "Add exception"
+msgstr "例外の追加"
 
-#: gnomecard/dialog.c:578 gnomecard/tree.c:261
-msgid "Security"
-msgstr "セキュリティ"
+#: gncal/eventedit.c:1474
+msgid "Change selected"
+msgstr "選択中のを変更"
 
-#: gnomecard/dialog.c:581
-msgid "Public Key:"
-msgstr "公開鍵:"
+#: gncal/eventedit.c:1480
+msgid "Delete selected"
+msgstr "選択中のを削除"
 
-#: gnomecard/dialog.c:599
-msgid "PGP"
-msgstr "PGP"
+#: gncal/eventedit.c:1509
+msgid "Recurrence"
+msgstr "再発"
 
-#: gnomecard/dialog.c:606
-msgid "X509"
-msgstr "X.509"
+#: gncal/eventedit.c:1580
+msgid "Create new appointment"
+msgstr "新規アポイントの作成"
 
-#: gnomecard/dialog.c:905
-msgid "Layout"
-msgstr "レイアウト"
+#: gncal/eventedit.c:1582
+msgid "Edit appointment"
+msgstr "アポイントを編集"
 
-#: gnomecard/dialog.c:909
-msgid "Column Display"
-msgstr "表示項目"
+#: gncal/timeutil.c:99
+msgid "am"
+msgstr "午前"
 
-#. make list of possible columns to add
-#: gnomecard/dialog.c:918
-msgid "Possible Columns"
-msgstr "使える項目"
+#: gncal/timeutil.c:99
+msgid "pm"
+msgstr "午後"
 
-#. make list of currently displayed column types
-#: gnomecard/dialog.c:952
-msgid "Displayed Columns"
-msgstr "表示する項目"
+#: gncal/timeutil.c:101
+msgid "h"
+msgstr "時"
 
-#: gnomecard/dialog.c:1057
-msgid "Default"
-msgstr "デフォルト"
+#: gncal/calendar.c:429
+#, c-format
+msgid "Error while creating backup file: %s"
+msgstr "バックアップファイル %s を生成するのに失敗しました"
 
-#: gnomecard/dialog.c:1060
+#: gncal/calendar.c:452 gncal/calendar.c:456
 #, c-format
-msgid "GnomeCard: %s"
-msgstr "GNOMEカード: %s"
+msgid "Error writing the calendar file: %s"
+msgstr "カレンダファイル%sに書き込むときにエラーがおきました"
 
-#: gnomecard/dialog.c:1081
-msgid "the default file"
-msgstr "デフォルトファイル"
+#: gncal/calobj.c:999
+msgid "Appointment"
+msgstr "アポイント"
 
-#: gnomecard/dialog.c:1085
-#, c-format
-msgid "Error %s %s."
-msgstr "エラー %s %s。"
+#: gncal/calendar-conduit.c:180 gncal/calendar-conduit.c:220
+#: gncal/calendar-conduit.c:303 gncal/calendar-conduit.c:343
+#: gncal/calendar-conduit.c:575 gncal/calendar-conduit.c:616
+#: gncal/calendar-conduit.c:920 gncal/calendar-conduit.c:972
+#: gncal/calendar-conduit.c:1405
+msgid "Error while communicating with calendar server"
+msgstr "カレンダーサーバとのやりとりでエラーが発生しました"
 
-#: gnomecard/dialog.c:1125
-msgid "Append GnomeCard File"
-msgstr "名刺ファイルを追加"
+#: gncal/calendar-conduit.c:620
+#, c-format
+msgid "Calendar holds %d entries"
+msgstr "カレンダーには%d個のエントリ"
 
-#: gnomecard/dialog.c:1167
-msgid "Open GnomeCard File"
-msgstr "名刺ファイルを開く。"
+#: gncal/calendar-conduit.c:642 gncal/calendar-conduit.c:644
+msgid "Could not start gnomecal server"
+msgstr "gnomecal サーバを起動できません"
 
-#: gnomecard/dialog.c:1202
-msgid "Save GnomeCard File As..."
-msgstr "GnomeCardファイルを保存するファイル名..."
+#: gncal/calendar-conduit.c:672 gncal/calendar-conduit.c:675
+msgid "Could not read pilot's DateBook application block"
+msgstr "Palm/Pilot の DateBook アプリケーションブロックを読めません"
 
-#: gnomecard/dialog.c:1220
-msgid "GnomeCard"
-msgstr "GnomeCard"
+#: getdate.y:391
+msgid "january"
+msgstr "1月"
 
-#: gnomecard/dialog.c:1223
-msgid "Electronic Business Card Manager"
-msgstr "電子名刺管理"
+#: getdate.y:392
+msgid "february"
+msgstr "2月"
 
-#: gnomecard/dialog.c:1343
-msgid "No matching record found."
-msgstr "一致するものが見つかりません。"
+#: getdate.y:393
+msgid "march"
+msgstr "3月"
 
-#: gnomecard/dialog.c:1358
-#, c-format
-msgid ""
-"Reached %s record.\n"
-"Continue from the %s one?"
-msgstr ""
-"%sのレコードに到達しました。\n"
-"%sに戻って検索しますか?"
+#: getdate.y:394
+msgid "april"
+msgstr "4月"
 
-#: gnomecard/dialog.c:1394
-msgid "Find Card"
-msgstr "最初の名刺"
+#: getdate.y:395
+msgid "may"
+msgstr "5月"
 
-#: gnomecard/dialog.c:1394 gnomecard/gnomecard.c:569 gnomecard/gnomecard.c:692
-msgid "Find"
-msgstr "検索"
+#: getdate.y:396
+msgid "june"
+msgstr "6月"
 
-#: gnomecard/dialog.c:1403
-msgid "Find:"
-msgstr "検索:"
+#: getdate.y:397
+msgid "july"
+msgstr "7月"
 
-#: gnomecard/dialog.c:1406
-msgid "Case Sensitive"
-msgstr "大/小文字を区別"
+#: getdate.y:398
+msgid "august"
+msgstr "8月"
 
-#: gnomecard/dialog.c:1409
-msgid "Find Backwards"
-msgstr "後方検索"
+#: getdate.y:399
+msgid "september"
+msgstr "9月"
 
-#: gnomecard/emaillist.c:31
-msgid "America On-Line"
-msgstr "AOL"
+#: getdate.y:400
+msgid "sept"
+msgstr "9月"
 
-#: gnomecard/emaillist.c:31
-msgid "Apple Link"
-msgstr "Apple Link"
+#: getdate.y:401
+msgid "october"
+msgstr "10月"
 
-#: gnomecard/emaillist.c:31
-msgid "AT&T"
-msgstr "AT&T"
+#: getdate.y:402
+msgid "november"
+msgstr "11月"
 
-#: gnomecard/emaillist.c:32
-msgid "CIS"
-msgstr "コンピュサーブ"
+#: getdate.y:403
+msgid "december"
+msgstr "12月"
 
-#: gnomecard/emaillist.c:32
-msgid "e-World"
-msgstr "e-World"
+#: getdate.y:404
+msgid "sunday"
+msgstr "日曜日"
 
-#: gnomecard/emaillist.c:32
-msgid "Internet"
-msgstr "インターネット"
+#: getdate.y:405
+msgid "monday"
+msgstr "月曜日"
 
-#: gnomecard/emaillist.c:32
-msgid "IBM"
-msgstr "IBM"
+#: getdate.y:406
+msgid "tuesday"
+msgstr "火曜日"
 
-#: gnomecard/emaillist.c:33
-msgid "MCI"
-msgstr "MCI"
+#: getdate.y:407
+msgid "tues"
+msgstr "火曜"
 
-#: gnomecard/emaillist.c:33
-msgid "Power Share"
-msgstr "Power Share"
+#: getdate.y:408
+msgid "wednesday"
+msgstr "水曜日"
 
-#: gnomecard/emaillist.c:33
-msgid "Prodigy"
-msgstr "プロディジー"
+#: getdate.y:409
+msgid "wednes"
+msgstr "水曜"
 
-#: gnomecard/emaillist.c:33
-msgid "TLX"
-msgstr "TLC"
+#: getdate.y:410
+msgid "thursday"
+msgstr "木曜日"
 
-#: gnomecard/emaillist.c:34
-msgid "X400"
-msgstr "X.400"
+#: getdate.y:411
+msgid "thur"
+msgstr "木曜"
 
-#: gnomecard/emaillist.c:393
-#, fuzzy
-msgid "Web Page:"
-msgstr "Webページ"
+#: getdate.y:412
+msgid "thurs"
+msgstr "木曜"
 
-#: gnomecard/emaillist.c:406
-msgid "E-mail data:"
-msgstr "電子メールデータ:"
+#: getdate.y:413
+msgid "friday"
+msgstr "金曜日"
 
-#: gnomecard/emaillist.c:412
-#, fuzzy
-msgid "Address:"
-msgstr "住所"
+#: getdate.y:414
+msgid "saturday"
+msgstr "土曜日"
 
-#: gnomecard/emaillist.c:469
-msgid "Email List:"
-msgstr "電子メールリスト:"
+#: getdate.y:420
+msgid "year"
+msgstr "年"
 
-#: gnomecard/gnomecard.c:329
-msgid ""
-"There are cards which are currently being modified.\n"
-"Finish any pending modifications and try again."
-msgstr ""
-"編集中の名刺があります。\n"
-"全ての編集作業を終えて、もう一度試して下さい。"
+#: getdate.y:421
+msgid "month"
+msgstr "月"
 
-#: gnomecard/gnomecard.c:344
-msgid "The default file"
-msgstr "デフォルトファイル"
+#: getdate.y:422
+msgid "fortnight"
+msgstr "2週間"
 
-#: gnomecard/gnomecard.c:348
-msgid " changed. Save?"
-msgstr "変更されました。保存しますか?"
+#: getdate.y:423
+msgid "week"
+msgstr "週"
 
-#: gnomecard/gnomecard.c:459
-msgid "A new Gnomecard could not be spawned. Maybe it is not in your path."
-msgstr "新たに Gnomecard を開けません。PATH に入っていないのでは。"
+#: getdate.y:424
+msgid "day"
+msgstr "日"
 
-#: gnomecard/gnomecard.c:471
-msgid "Create a new card file"
-msgstr "新しい名刺ファイルを作成"
+#: getdate.y:425
+msgid "hour"
+msgstr "時間"
 
-#: gnomecard/gnomecard.c:476
-msgid "Open _Default"
-msgstr "デフォルトを開く(_D)"
+#: getdate.y:426
+msgid "minute"
+msgstr "分"
 
-#: gnomecard/gnomecard.c:477
-msgid "Open the default file"
-msgstr "デフォルトのファイルを開く"
+#: getdate.y:427
+msgid "min"
+msgstr "分"
 
-#: gnomecard/gnomecard.c:485
-msgid "_Append..."
-msgstr "追加...(_A)"
+#: getdate.y:428
+msgid "second"
+msgstr "秒"
 
-#: gnomecard/gnomecard.c:486
-msgid "Add the contents of another card file"
-msgstr "別の名刺ファイルの中身を追加"
+#: getdate.y:429
+msgid "sec"
+msgstr "秒"
 
-#: gnomecard/gnomecard.c:498 gnomecard/gnomecard.c:674
-msgid "First"
-msgstr "最初"
+#: getdate.y:435
+msgid "tomorrow"
+msgstr "明日"
 
-#: gnomecard/gnomecard.c:498 gnomecard/gnomecard.c:674
-msgid "First card"
-msgstr "最初の名刺"
+#: getdate.y:436
+msgid "yesterday"
+msgstr "昨日"
 
-#: gnomecard/gnomecard.c:502 gnomecard/gnomecard.c:678
-msgid "Previous card"
-msgstr "前の名刺"
+#: getdate.y:437
+msgid "today"
+msgstr "今日"
 
-#: gnomecard/gnomecard.c:506 gnomecard/gnomecard.c:682
-msgid "Next card"
-msgstr "次の名刺"
+#: getdate.y:438
+msgid "now"
+msgstr "今"
 
-#: gnomecard/gnomecard.c:510 gnomecard/gnomecard.c:686
-msgid "Last"
-msgstr "最後"
+#: getdate.y:440
+msgid "this"
+msgstr "これ"
 
-#: gnomecard/gnomecard.c:510 gnomecard/gnomecard.c:686
-msgid "Last card"
-msgstr "最後の名刺"
+#: getdate.y:441
+msgid "next"
+msgstr "次"
 
-#: gnomecard/gnomecard.c:519
-msgid "By Card Name"
-msgstr "名刺の名前で"
+#. { N_("second"),		tUNUMBER,	2 },
+#: getdate.y:444
+msgid "third"
+msgstr "3回目"
 
-#: gnomecard/gnomecard.c:519
-msgid "Sorts the card list by the card name"
-msgstr ""
+#: getdate.y:445
+msgid "fourth"
+msgstr "4回目"
 
-#: gnomecard/gnomecard.c:523
-msgid "By Name"
-msgstr "名前で"
+#: getdate.y:446
+msgid "fifth"
+msgstr "5回目"
 
-#: gnomecard/gnomecard.c:523
-msgid "Sorts the card list by the name of the person"
-msgstr ""
+#: getdate.y:447
+msgid "sixth"
+msgstr "6回目"
 
-#: gnomecard/gnomecard.c:527
-msgid "By Last Name"
-msgstr "名字で"
+#: getdate.y:448
+msgid "seventh"
+msgstr "7回目"
 
-#: gnomecard/gnomecard.c:527
-msgid "Sorts the card list by the last name of the person"
-msgstr ""
+#: getdate.y:449
+msgid "eighth"
+msgstr "8回目"
 
-#: gnomecard/gnomecard.c:531
-msgid "By E-mail"
-msgstr "メイルで"
+#: getdate.y:450
+msgid "ninth"
+msgstr "9回目"
 
-#: gnomecard/gnomecard.c:531
-msgid "Sorts the card list by the e-mail address of the person"
-msgstr ""
+#: getdate.y:451
+msgid "tenth"
+msgstr "10回目"
 
-#: gnomecard/gnomecard.c:535
-msgid "By Organization"
-msgstr "組織で"
+#: getdate.y:452
+msgid "eleventh"
+msgstr "11回目"
 
-#: gnomecard/gnomecard.c:535
-msgid "Sorts the card list by the name of the organization"
-msgstr ""
+#: getdate.y:453
+msgid "twelfth"
+msgstr "12回目"
 
-#: gnomecard/gnomecard.c:550 gnomecard/gnomecard.c:660
-msgid "Create new card"
-msgstr "新しい名刺を作成"
+#: getdate.y:454
+msgid "ago"
+msgstr "前"
 
-#: gnomecard/gnomecard.c:554 gnomecard/gnomecard.c:664
-msgid "Edit card"
-msgstr "名刺の編集"
+#~ msgid "Disabled"
+#~ msgstr "不使用"
 
-#: gnomecard/gnomecard.c:558
-msgid "Erase card"
-msgstr "名刺を消す"
+#~ msgid "Synchronize"
+#~ msgstr "同期"
 
-#: gnomecard/gnomecard.c:564
-msgid "Go"
-msgstr "飛ぶ"
+#~ msgid "Copy From Pilot"
+#~ msgstr "Palm/Pilotからコピー"
 
-#: gnomecard/gnomecard.c:564
-msgid "Change current card"
-msgstr "現在の名刺を変更"
+#~ msgid "Copy To Pilot"
+#~ msgstr "Palm/Pilotへコピー"
 
-#: gnomecard/gnomecard.c:569 gnomecard/gnomecard.c:692
-msgid "Search card"
-msgstr "名刺の検索"
+#~ msgid "Merge From Pilot"
+#~ msgstr "Palm/Pilotからマージ"
 
-#: gnomecard/gnomecard.c:573
-msgid "Sort"
-msgstr "並べ替え"
+#~ msgid "Merge To Pilot"
+#~ msgstr "Palm/Pilotへマージ"
 
-#: gnomecard/gnomecard.c:573
-msgid "Set sort criteria"
-msgstr "並び順を指定"
+#~ msgid "GnomeCalendar Conduit"
+#~ msgstr "Gnomeカレンダー コンジット"
 
-#: gnomecard/gnomecard.c:607
-msgid "Card"
-msgstr "名刺"
+#~ msgid "(C) 1998"
+#~ msgstr "(C) 1998"
 
-#: gnomecard/gnomecard.c:607
-msgid "Toggle Card View"
-msgstr "名刺の見え方を切替え"
+#~ msgid "Configuration utility for the calendar conduit.\n"
+#~ msgstr "カレンダー コンジットの設定ユーティリティ\n"
 
-#: gnomecard/gnomecard.c:612
-msgid "Tree"
-msgstr "ツリー"
+#~ msgid "Synchronize Action"
+#~ msgstr "同期の動作"
 
-#: gnomecard/gnomecard.c:612
-msgid "Toggle Tree View"
-msgstr "ツリー表示を切替え"
+#~ msgid "Conduit state"
+#~ msgstr "コンジットの状態"
 
-#: gnomecard/gnomecard.c:650
-msgid "Open"
-msgstr "開く"
+#~ msgid ""
+#~ "No pilot configured, please choose the\n"
+#~ "'Pilot Link Properties' capplet first."
+#~ msgstr ""
+#~ "Palm/Pilot が一つも設定されてません。'パイロットリンク'\n"
+#~ "キャプレットを最初に選んでください。"
 
-#: gnomecard/gnomecard.c:650
-msgid "Open file"
-msgstr "ファイルを開く"
+#~ msgid "Not connected to the gnome-pilot daemon"
+#~ msgstr "gnome-pilot デーモンに接続してません"
 
-#: gnomecard/gnomecard.c:654
-msgid "Save"
-msgstr "保存"
+#~ msgid ""
+#~ "An error occured when trying to fetch\n"
+#~ "pilot list from the gnome-pilot daemon"
+#~ msgstr ""
+#~ "Palm/Pilot の一覧を gnome-pilot デーモンから\n"
+#~ "取得する時にエラーが発生しました"
 
-#: gnomecard/gnomecard.c:654
-msgid "Save changes"
-msgstr "変更を保存"
+#~ msgid ""
+#~ "Could not create object for conduit.\n"
+#~ "Perhaps the conduit isn't properly installed ?"
+#~ msgstr ""
+#~ "コンジットのオブジェクトを作成できません。\n"
+#~ "コンジットが正常にインストールされてますか?"
 
-#: gnomecard/gnomecard.c:668
-msgid "Del"
-msgstr "削除"
+#~ msgid "Specifies the port on which the Pilot is"
+#~ msgstr "Palm/Pilot が接続されているポートを指定してください"
 
-#: gnomecard/gnomecard.c:668
-msgid "Delete card"
-msgstr "名刺を削除"
+#~ msgid "PORT"
+#~ msgstr "PORT"
 
-#: gnomecard/gnomecard.c:841
-#, fuzzy
-msgid "default file to load"
-msgstr "デフォルトファイル"
+#~ msgid "If you want to debug the attributes on records"
+#~ msgstr "レコードの属性をデバッグしたい場合"
 
-#: gnomecard/gnomecard.c:841
-#, fuzzy
-msgid "filename"
-msgstr "ミドルネーム"
+#~ msgid "Only syncs from desktop to pilot"
+#~ msgstr "デスクトップからPalm/Pilotへのみ同期"
 
-#: gnomecard/list.c:215
-msgid "No Card Name"
-msgstr "名無しの名刺"
+#~ msgid "Only syncs from pilot to desktop"
+#~ msgstr "Palm/Pilotからデスクトップへのみ同期"
 
-#: gnomecard/phonelist.c:30
-msgid "Preferred"
-msgstr "通常"
+#~ msgid "Can not create Pilot socket\n"
+#~ msgstr "Palm/Pilot ソケットを作成できません\n"
 
-#: gnomecard/phonelist.c:31
-msgid "Voice"
-msgstr "普通電話"
+#~ msgid "Can not bind to device %s\n"
+#~ msgstr "デバイス%sへバインドできません\n"
 
-#: gnomecard/phonelist.c:31
-msgid "Fax"
-msgstr "FAX"
+#~ msgid "Failed to get a connection from the Pilot device"
+#~ msgstr "Palm/Pilot デバイスからの接続の受信に失敗"
 
-#: gnomecard/phonelist.c:31
-msgid "Message Recorder"
-msgstr "留守電"
+#~ msgid "pi_accept failed"
+#~ msgstr "pi_accept に失敗"
 
-#: gnomecard/phonelist.c:32
-msgid "Cellular"
-msgstr "携帯"
+#~ msgid "\tObject did not exist, creating a new one\n"
+#~ msgstr "\tオブジェクトが存在しません。新規に作成します\n"
 
-#: gnomecard/phonelist.c:32
-msgid "Pager"
-msgstr "ポケベル"
+#~ msgid ""
+#~ "\tObject has been modified on desktop and on the pilot, desktop takes "
+#~ "precedence\n"
+#~ msgstr ""
+#~ "\tオブジェクトがデスクトップとPalm/Pilot上の両方で 変更されてます。デスク"
+#~ "トップを優先します\n"
 
-#: gnomecard/phonelist.c:32
-msgid "Bulletin Board"
-msgstr "伝言ダイヤル"
+#~ msgid "No description"
+#~ msgstr "説明がありません"
 
-#: gnomecard/phonelist.c:33
-msgid "Modem"
-msgstr "モデム"
+#~ msgid "Syncing with the pilot..."
+#~ msgstr "Palm/Pilotと同期中..."
 
-#: gnomecard/phonelist.c:33
-msgid "Car"
-msgstr "自動車"
+#~ msgid "Could not open DatebookDB on the Pilot"
+#~ msgstr "Palm/Pilot上のDatebookDBを開けません"
 
-#: gnomecard/phonelist.c:33
-msgid "ISDN"
-msgstr "ISDN"
+#~ msgid "Unable to open DatebookDB"
+#~ msgstr "DatebookDB を開けません"
 
-#: gnomecard/phonelist.c:33
-msgid "Video"
-msgstr "ビデオ電話"
+#~ msgid "Synced DateBook from Pilot to GnomeCal"
+#~ msgstr "Palm/Pilot から GNOMEカレンダーへ同期しました"
 
-#: gnomecard/phonelist.c:391
-msgid "Telephone data:"
-msgstr "電話データ:"
+#~ msgid "Eskil Heyn Olsen <deity@eskil.dk>"
+#~ msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
 
-#: gnomecard/phonelist.c:397
 #, fuzzy
-msgid "Number:"
-msgstr "名称:"
-
-#: gnomecard/phonelist.c:448
-msgid "Phone List:"
-msgstr "電話リスト:"
+#~ msgid "Configuration utility for the todo conduit.\n"
+#~ msgstr "カレンダー コンジットの設定ユーティリティ\n"
 
-#: gnomecard/tree.c:106
 #, fuzzy
-msgid "No Card Name for this card."
-msgstr "名無しの名刺。"
+#~ msgid "Enabled"
+#~ msgstr "不使用"
 
-#: gnomecard/tree.c:162
 #, fuzzy
-msgid "Birth Date"
-msgstr "誕生日:"
+#~ msgid "Cannot initialise the GnomePilot Daemon"
+#~ msgstr "gnome-pilot デーモンに接続してません"
 
-#: gnomecard/tree.c:176
 #, fuzzy
-msgid "Geo. Position"
-msgstr "経緯"
+#~ msgid "Cannot connect to the GnomePilot Daemon"
+#~ msgstr "gnome-pilot デーモンに接続してません"
 
-#: gnomecard/tree.c:188
 #, fuzzy
-msgid "Role"
-msgstr "削除"
+#~ msgid "GnomeCard File:"
+#~ msgstr "名刺ファイルを開く。"
 
-#: gnomecard/tree.c:205
-msgid "Unit 1"
-msgstr ""
+#, fuzzy
+#~ msgid "Address Conduit State"
+#~ msgstr "コンジットの状態"
 
-#: gnomecard/tree.c:211
-msgid "Unit 2"
-msgstr ""
+#, fuzzy
+#~ msgid "No Card Name for this card."
+#~ msgstr "名無しの名刺。"
 
-#: gnomecard/tree.c:217
-msgid "Unit 3"
-msgstr ""
+#, fuzzy
+#~ msgid "Birth Date"
+#~ msgstr "誕生日:"
 
-#: gnomecard/tree.c:223
-msgid "Unit 4"
-msgstr ""
+#, fuzzy
+#~ msgid "Geo. Position"
+#~ msgstr "経緯"
 
-#: gnomecard/tree.c:233
 #, fuzzy
-msgid "Comment"
-msgstr "コメント:"
+#~ msgid "Role"
+#~ msgstr "削除"
 
-#: gnomecard/tree.c:255
-msgid "URL"
-msgstr ""
+#, fuzzy
+#~ msgid "Comment"
+#~ msgstr "コメント:"
 
-#: gnomecard/tree.c:271
 #, fuzzy
-msgid "Telephone Numbers"
-msgstr "電話データ:"
+#~ msgid "Telephone Numbers"
+#~ msgstr "電話データ:"
 
-#: gnomecard/tree.c:301
 #, fuzzy
-msgid "E-mail Addresses"
-msgstr "住所"
+#~ msgid "E-mail Addresses"
+#~ msgstr "住所"
 
-#: gnomecard/tree.c:324
 #, fuzzy
-msgid "Delivery Addresses"
-msgstr "住所"
+#~ msgid "Delivery Addresses"
+#~ msgstr "住所"
 
 #~ msgid "gnome-calendar-conduit.png"
 #~ msgstr "gnome-calendar-conduit.png"
--- gnome-pim-1.4.9.orig/gncal/calobj.c
+++ gnome-pim-1.4.9/gncal/calobj.c
@@ -15,6 +15,9 @@
 #include "timeutil.h"
 #include "../libversit/vcc.h"
 
+/* Whether weeks starts on Sunday or Monday */
+int week_starts_on_monday;
+
 extern CalendarAlarm alarm_defaults[4];
 
 static char *
--- gnome-pim-1.4.9.orig/gncal/calobj.h
+++ gnome-pim-1.4.9/gncal/calobj.h
@@ -13,6 +13,8 @@
 
 BEGIN_GNOME_DECLS
 
+extern int week_starts_on_monday;
+
 enum AlarmType {
 	ALARM_MAIL,
 	ALARM_PROGRAM,
--- gnome-pim-1.4.9.orig/gncal/Makefile.am
+++ gnome-pim-1.4.9/gncal/Makefile.am
@@ -129,7 +129,8 @@
 	calendar-conduit.c	\
 	calobj.c 		\
 	alarm.c			\
-	calendar.c 		\
+	calendar2.c 		\
+	calendar2.h 		\
 	timeutil.c
 
 calendar-conduit.c: idl.stamp
--- gnome-pim-1.4.9.orig/gncal/Makefile.in
+++ gnome-pim-1.4.9/gncal/Makefile.in
@@ -172,7 +172,7 @@
 @HAVE_GNOME_PILOT_TRUE@calendar_conduitsdir = $(libdir)/gnome-pilot/conduits
 @HAVE_GNOME_PILOT_TRUE@calendar_conduits_LTLIBRARIES = libcalendar_conduit.la
 
-libcalendar_conduit_la_SOURCES =  	GnomeCal-common.c		GnomeCal-stubs.c		calendar-conduit.c		calobj.c 			alarm.c				calendar.c 			timeutil.c
+libcalendar_conduit_la_SOURCES =  	GnomeCal-common.c		GnomeCal-stubs.c		calendar-conduit.c		calobj.c 			alarm.c				calendar2.c 			calendar2.h 			timeutil.c
 
 
 libcalendar_conduit_la_LDFLAGS =  	-module -avoid-version
@@ -216,7 +216,7 @@
 libcalendar_conduit_la_DEPENDENCIES =  \
 $(top_builddir)/libversit/libversit_lt.la
 libcalendar_conduit_la_OBJECTS =  GnomeCal-common.lo GnomeCal-stubs.lo \
-calendar-conduit.lo calobj.lo alarm.lo calendar.lo timeutil.lo
+calendar-conduit.lo calobj.lo alarm.lo calendar2.lo timeutil.lo
 bin_PROGRAMS =  gnomecal$(EXEEXT)
 PROGRAMS =  $(bin_PROGRAMS)
 
@@ -585,6 +585,9 @@
 calendar.lo calendar.o : calendar.c ../config.h alarm.h calobj.h \
 	../libversit/vcc.h ../libversit/vobject.h ../libversit/port.h \
 	calendar.h gnome-cal.h main.h timeutil.h
+calendar2.lo calendar2.o : calendar2.c ../config.h alarm.h calobj.h \
+	../libversit/vcc.h ../libversit/vobject.h ../libversit/port.h \
+	calendar2.h gnome-cal.h main.h timeutil.h
 calobj.lo calobj.o : calobj.c ../config.h calobj.h ../libversit/vcc.h \
 	../libversit/vobject.h ../libversit/port.h timeutil.h
 corba-cal-factory.o: corba-cal-factory.c ../config.h gnome-cal.h \
--- gnome-pim-1.4.9.orig/gncal/calendar-conduit.c
+++ gnome-pim-1.4.9/gncal/calendar-conduit.c
@@ -1006,7 +1006,7 @@
 
 	local->a->event = 0;
 	/* If all day event, set event to 1, otherwise, set begin/end */
-	if (&local->ical->allday) {
+	if (local->ical->allday) {
 		local->a->event = 1;
 	}
 	local->a->begin = *localtime(&local->ical->dtstart);
--- gnome-pim-1.4.9.orig/gncal/main.c
+++ gnome-pim-1.4.9/gncal/main.c
@@ -47,9 +47,6 @@
 /* Day begin, day end parameters */
 int day_begin, day_end;
 
-/* Whether weeks starts on Sunday or Monday */
-int week_starts_on_monday;
-
 /* If true, do not show our top level window */
 int startup_hidden = 0;
 
--- gnome-pim-1.4.9.orig/gncal/main.h
+++ gnome-pim-1.4.9/gncal/main.h
@@ -12,7 +12,6 @@
 extern int day_begin, day_end;
 extern char *user_name;
 extern int am_pm_flag;
-extern int week_starts_on_monday;
 extern gboolean roll_at_midnight;
 
 
--- gnome-pim-1.4.9.orig/gncal/calendar2.h
+++ gnome-pim-1.4.9/gncal/calendar2.h
@@ -0,0 +1,88 @@
+#ifndef CALENDAR_H
+#define CALENDAR_H
+
+#include "calobj.h"
+
+BEGIN_GNOME_DECLS
+
+typedef struct {
+	/* This calendar's title */
+	char    *title;
+
+	/* backing store for this calendar object */
+	char    *filename;
+
+	/* The list of events;  todo's and journal entries */
+	GList  	*events;
+	GList  	*todo;
+	GList  	*journal;
+
+	GHashTable *event_hash;
+	
+	/* Time at which the calendar was created */
+	time_t  created;
+
+	/* Timestamp in the filename */
+	time_t  file_time;
+	
+	/* If the calendar was last modified */
+	int     modified;
+	void    *temp;
+
+	void    *corba_server;
+} Calendar;
+
+/* This is only used by the calendar_get_events_in_range routine to get
+ * a list of objects that recur on a specific date
+ */
+typedef struct {
+	time_t     ev_start;
+	time_t     ev_end;
+	iCalObject *ico;
+} CalendarObject;
+
+typedef enum {
+	CALENDAR_INIT_NIL    = 0,
+	CALENDAR_INIT_ALARMS = 1 << 0
+} CalendarNewOptions;
+
+Calendar *calendar_new                  (char *title,CalendarNewOptions options);
+char     *calendar_get_as_vcal_string   (Calendar *cal);
+char     *calendar_string_from_object   (iCalObject *object);
+
+char     *calendar_load                 (Calendar *cal, char *fname);
+char     *calendar_load_from_memory     (Calendar *cal, const char *buffer);
+void      calendar_load_from_vobject    (Calendar *cal, VObject *vcal);
+void      calendar_save                 (Calendar *cal, const gchar *fname);
+void      calendar_add_object           (Calendar *cal, iCalObject *obj);
+void      calendar_remove_object        (Calendar *cal, iCalObject *obj);
+void      calendar_destroy              (Calendar *cal);
+GList    *calendar_get_objects_in_range (GList *objects, time_t start, time_t end, GCompareFunc sort_func);
+GList    *calendar_get_todo_in_range    (Calendar *cal, time_t start, time_t end, GCompareFunc sort_func);
+GList    *calendar_get_journal_in_range (Calendar *cal, time_t start, time_t end, GCompareFunc sort_func);
+gint      calendar_compare_by_dtstart   (gpointer a, gpointer b);
+
+void      calendar_iterate_on_objects   (GList *objects, time_t start, time_t end, calendarfn cb, void *closure);
+void      calendar_iterate              (Calendar *cal, time_t start, time_t end, calendarfn cb, void *closure);
+
+/* Returns a list of CalendarObject structures.  These represent the events in the calendar that are
+ * in the specified range.
+ */
+GList *calendar_get_events_in_range (Calendar *cal, time_t start, time_t end);
+
+/* Destroy list returned by calendar_get_events_in_range() with this function */
+void calendar_destroy_event_list (GList *l);
+
+/* Informs the calendar that obj information has changed */
+void      calendar_object_changed       (Calendar *cal, iCalObject *obj, int flags);
+
+void      calendar_notify (time_t time, CalendarAlarm *which, void *data);
+
+iCalObject *calendar_object_find_event    (Calendar *cal, const char *uid);
+iCalObject *calendar_object_find_todo     (Calendar *cal, const char *uid);
+iCalObject *calendar_object_find          (Calendar *cal, const char *uid);
+iCalObject *calendar_object_find_by_pilot (Calendar *cal, int pilot_id);
+
+END_GNOME_DECLS
+
+#endif
--- gnome-pim-1.4.9.orig/gncal/calendar2.c
+++ gnome-pim-1.4.9/gncal/calendar2.c
@@ -0,0 +1,665 @@
+/*
+ * Calendar manager object
+ *
+ * This keeps track of a given calendar.  Eventually this will abtract everything
+ * related to getting calendars/saving calendars locally or to a remote Calendar Service
+ *
+ * Copyright (C) 1998, 1999 the Free Software Foundation
+ *
+ * Authors:
+ *   Miguel de Icaza (miguel@gnu.org)
+ *   Federico Mena (quartic@gimp.org)
+ *
+ */
+
+#include <config.h>
+
+#include <stdio.h>
+#include <unistd.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include <glib.h>
+#include <gnome.h>
+
+#include "alarm.h"
+#include "calendar.h"
+#include "gnome-cal.h"
+#include "main.h"
+#include "timeutil.h"
+#include "../libversit/vcc.h"
+
+#ifdef HAVE_TZNAME
+extern char *tzname[2];
+#endif
+
+/* Our day range */
+time_t calendar_day_begin, calendar_day_end;
+
+static void calendar_set_day (void);
+
+Calendar *
+calendar_new (char *title,CalendarNewOptions options)
+{
+	Calendar *cal;
+
+	cal = g_new0 (Calendar, 1);
+
+	cal->title = g_strdup (title);
+
+	if ((calendar_day_begin == 0) || (calendar_day_end == 0))
+		calendar_set_day ();
+
+	cal->event_hash = g_hash_table_new (g_str_hash, g_str_equal);
+	
+	return cal;
+}
+
+static void
+try_add (iCalObject *ico, CalendarAlarm *alarm, time_t start, time_t end)
+{
+	alarm->trigger = start-alarm->offset;
+	
+	if (alarm->trigger < calendar_day_begin)
+		return;
+	if (alarm->trigger > calendar_day_end)
+		return;
+	alarm_add (alarm, &calendar_notify, ico);
+}
+
+static int
+add_object_alarms (iCalObject *obj, time_t start, time_t end, void *closure)
+{
+	if (obj->aalarm.enabled)
+		try_add (obj, &obj->aalarm, start, end);
+	if (obj->dalarm.enabled)
+		try_add (obj, &obj->dalarm, start, end);
+	if (obj->palarm.enabled)
+		try_add (obj,&obj->palarm, start, end);
+	if (obj->malarm.enabled)
+		try_add (obj, &obj->malarm, start, end);
+	
+	return TRUE;
+}
+
+#define max(a,b) ((a > b) ? a : b)
+
+static void
+ical_object_try_alarms (iCalObject *obj)
+{
+	int ao, po, od, mo;
+	int max_o;
+	
+	ao = alarm_compute_offset (&obj->aalarm);
+	po = alarm_compute_offset (&obj->palarm);
+	od = alarm_compute_offset (&obj->dalarm);
+	mo = alarm_compute_offset (&obj->malarm);
+	
+	max_o = max (ao, max (po, max (od, mo)));
+	if (max_o == -1)
+		return;
+	
+	ical_object_generate_events (obj, calendar_day_begin, calendar_day_end + max_o, add_object_alarms, obj);
+}
+
+void
+calendar_add_object (Calendar *cal, iCalObject *obj)
+{
+	g_return_if_fail (cal != NULL);
+	g_return_if_fail (obj != NULL);
+	g_return_if_fail (obj->uid != NULL);
+	
+	obj->new = 0;
+	switch (obj->type){
+	case ICAL_EVENT:
+		g_hash_table_insert (cal->event_hash, obj->uid, obj);
+		cal->events = g_list_prepend (cal->events, obj);
+		ical_object_try_alarms (obj);
+#ifdef DEBUGGING_MAIL_ALARM
+		obj->malarm.trigger = 0;
+		calendar_notify (0, obj);
+#endif
+		break;
+
+	case ICAL_TODO:
+		cal->todo = g_list_prepend (cal->todo, obj);
+		break;
+
+	case ICAL_JOURNAL:
+		cal->journal = g_list_prepend (cal->journal, obj);
+		break;
+	default:
+		g_assert_not_reached ();
+	}
+
+	if (!obj->uid){
+		char buffer [80];
+
+		snprintf (buffer, sizeof (buffer), "GnomeCalendar-%ld\n", time (NULL));
+		obj->uid = g_strdup (buffer);
+	}
+	
+	cal->modified = TRUE;
+
+	obj->last_mod = time (NULL);
+}
+
+void
+calendar_remove_object (Calendar *cal, iCalObject *obj)
+{
+	switch (obj->type){
+	case ICAL_EVENT:
+		cal->events = g_list_remove (cal->events, obj);
+		g_hash_table_remove (cal->event_hash, obj->uid);
+		break;
+
+	case ICAL_TODO:
+		cal->todo = g_list_remove (cal->todo, obj);
+		break;
+
+	case ICAL_JOURNAL:
+		cal->journal = g_list_remove (cal->journal, obj);
+		break;
+	default:
+		g_assert_not_reached ();
+	}
+
+	cal->modified = TRUE;
+}
+
+void
+calendar_destroy (Calendar *cal)
+{
+	g_list_foreach (cal->events, (GFunc) ical_object_destroy, NULL);
+	g_list_free (cal->events);
+	
+	g_list_foreach (cal->todo, (GFunc) ical_object_destroy, NULL);
+	g_list_free (cal->todo);
+	
+	g_list_foreach (cal->journal, (GFunc) ical_object_destroy, NULL);
+	g_list_free (cal->journal);
+
+	g_hash_table_destroy (cal->event_hash);
+	
+	if (cal->title)
+		g_free (cal->title);
+	if (cal->filename)
+		g_free (cal->filename);
+	
+	g_free (cal);
+}
+
+void
+calendar_iterate_on_objects (GList *objects, time_t start, time_t end, calendarfn cb, void *closure)
+{
+	for (; objects; objects = objects->next){
+		iCalObject *object = objects->data;
+
+		ical_object_generate_events (object, start, end, cb, closure);
+	}
+}
+
+void
+calendar_iterate (Calendar *cal, time_t start, time_t end, calendarfn cb, void *closure)
+{
+	calendar_iterate_on_objects (cal->events, start, end, cb, closure);
+}
+
+GList *
+calendar_get_objects_in_range (GList *objects, time_t start, time_t end, GCompareFunc sort_func)
+{
+	GList *new_events = 0;
+
+	for (; objects; objects = objects->next){
+		iCalObject *object = objects->data;
+
+		if ((start <= object->dtstart) && (object->dtend <= end)){
+			if (sort_func)
+				new_events = g_list_insert_sorted (new_events, object, sort_func);
+			else
+				new_events = g_list_prepend (new_events, object);
+		}
+	}
+
+	/* Put the list in increasing order if no sort function was specified */
+
+	if (!sort_func)
+		new_events = g_list_reverse (new_events);
+
+	return new_events;
+}
+
+GList *
+calendar_get_todo_in_range (Calendar *cal, time_t start, time_t end, GCompareFunc sort_func)
+{
+	return calendar_get_objects_in_range (cal->todo, start, end, sort_func);
+}
+
+GList *
+calendar_get_journal_in_range (Calendar *cal, time_t start, time_t end, GCompareFunc sort_func)
+{
+	return calendar_get_objects_in_range (cal->journal, start, end, sort_func);
+}
+
+gint
+calendar_compare_by_dtstart (gpointer a, gpointer b)
+{
+	iCalObject *obj1, *obj2;
+	time_t diff;
+
+	obj1 = a;
+	obj2 = b;
+
+	diff = obj1->dtstart - obj2->dtstart;
+
+	return (diff < 0) ? -1 : (diff > 0) ? 1 : 0;
+}
+
+#define str_val(obj) (char *) vObjectUStringZValue (obj)
+
+/* Loads our calendar contents from a vObject */
+void
+calendar_load_from_vobject (Calendar *cal, VObject *vcal)
+{
+	VObjectIterator i;
+	
+	initPropIterator (&i, vcal);
+
+	while (moreIteration (&i)){
+		VObject *this = nextVObject (&i);
+		iCalObject *ical;
+		const char *object_name = vObjectName (this);
+
+		if (strcmp (object_name, VCDCreatedProp) == 0){
+			cal->created = time_from_isodate (str_val (this));
+			continue;
+		}
+		
+		if (strcmp (object_name, VCLocationProp) == 0)
+			continue; /* FIXME: imlement */
+
+		if (strcmp (object_name, VCProdIdProp) == 0)
+			continue; /* FIXME: implement */
+
+		if (strcmp (object_name, VCVersionProp) == 0)
+			continue; /* FIXME: implement */
+
+		if (strcmp (object_name, VCTimeZoneProp) == 0)
+			continue; /* FIXME: implement */
+		
+		ical = ical_object_create_from_vobject (this, object_name);
+
+		if (ical)
+			calendar_add_object (cal, ical);
+	}
+}
+
+static void
+calendar_set_day (void)
+{
+	time_t calendar_today;
+	
+	calendar_today     = time (NULL);
+	calendar_day_begin = time_day_begin (calendar_today);
+	calendar_day_end   = time_day_end (calendar_today);
+}
+
+/* Loads a calendar from a file */
+char *
+calendar_load (Calendar *cal, char *fname)
+{
+	VObject *vcal;
+	struct stat s;
+	
+	if (cal->filename){
+		g_warning ("Calendar load called again\n");
+		return "Internal error";
+	}
+
+	cal->filename = g_strdup (fname);
+	vcal = Parse_MIME_FromFileName (fname);
+	if (!vcal)
+		return "Could not load the calendar";
+
+	stat (fname, &s);
+	cal->file_time = s.st_mtime;
+
+	calendar_set_day ();
+		
+	calendar_load_from_vobject (cal, vcal);
+	cleanVObject (vcal);
+	cleanStrTbl ();
+	return NULL;
+}
+
+/*
+ * calendar_load_from_memory:
+ * @cal: calendar on which we load the information
+ * @buffer: A buffer that contains a vCalendar file
+ *
+ * Loads the information from the vCalendar information in @buffer
+ * into the Calendar
+ */
+char *
+calendar_load_from_memory (Calendar *cal, const char *buffer)
+{
+	VObject *vcal;
+	
+	g_return_val_if_fail (buffer != NULL, NULL);
+	
+	cal->filename = g_strdup ("memory-based-calendar");
+	vcal = Parse_MIME (buffer, strlen (buffer));
+	if (!vcal)
+		return "Could not load the calendar";
+
+	cal->file_time = time (NULL);
+	calendar_load_from_vobject (cal, vcal);
+	cleanVObject (vcal);
+	cleanStrTbl ();
+
+	return NULL;
+}
+
+static VObject *
+vcalendar_create_from_calendar (Calendar *cal)
+{
+	VObject *vcal;
+	GList   *l;
+	time_t  now = time (NULL);
+	struct tm tm;
+	
+	/* WE call localtime for the side effect of setting tzname */
+	tm = *localtime (&now);
+	
+	vcal = newVObject (VCCalProp);
+	addPropValue (vcal, VCProdIdProp, "-//GNOME//NONSGML GnomeCalendar//EN");
+#if defined(HAVE_TM_ZONE)
+	addPropValue (vcal, VCTimeZoneProp, tm.tm_zone);
+#elif defined(HAVE_TZNAME)
+	addPropValue (vcal, VCTimeZoneProp, tzname[0]);
+#endif
+	addPropValue (vcal, VCVersionProp, "1.0");
+	cal->temp = vcal;
+
+	/* Events */
+
+	for (l = cal->events; l; l = l->next) {
+		VObject *obj;
+			
+		obj = ical_object_to_vobject ((iCalObject *) l->data);
+		addVObjectProp (vcal, obj);
+	}
+
+	/* To-do entries */
+
+	for (l = cal->todo; l; l = l->next) {
+		VObject *obj;
+
+		obj = ical_object_to_vobject ((iCalObject *) l->data);
+		addVObjectProp (vcal, obj);
+	}
+
+	return vcal;
+}
+
+void
+calendar_save (Calendar *cal, const gchar *fname)
+{
+	gchar *backup_name;
+	gchar *error_msg = NULL;
+	int my_errno;
+
+	g_return_if_fail (cal != NULL);
+	g_return_if_fail (fname != NULL || cal->filename != NULL);
+
+	/* file name setup */
+	if (fname == NULL)
+		fname = cal->filename;
+	backup_name = g_strconcat (fname, "~", NULL);
+
+	/* create backup file */
+	if (g_file_exists (fname)) {
+		if (rename (fname, backup_name) == -1) {
+			error_msg = _("Error while creating backup file: %s");
+			my_errno = errno;
+		}
+	}
+
+	if (!error_msg) {
+		FILE *fp;
+		VObject *vcal;
+
+		vcal = vcalendar_create_from_calendar (cal);
+
+		fp = fopen (fname, "wb");
+		if (fp) {
+			int e;
+
+			writeVObject(fp, vcal);
+			e = ferror (fp);
+			fclose(fp);
+
+			if (e) {
+				/* try to restore the backup file */
+				rename (backup_name, fname);
+
+				error_msg = _("Error writing the calendar file: %s");
+				my_errno = errno;
+			}
+		} else {
+			error_msg = _("Error writing the calendar file: %s");
+			my_errno = errno;
+		}
+
+		cleanVObject (vcal); 
+		cleanStrTbl ();
+	}
+
+	/* update calendar */
+	if (!error_msg) {
+		struct stat s;
+
+		if (fname != cal->filename) {
+			g_free (cal->filename);
+			cal->filename = g_strdup (fname);
+		}
+		stat (fname, &s);
+		cal->file_time = s.st_mtime;
+	}
+
+	/* error handling */
+	if (error_msg) {
+		GtkWidget *dialog;
+		gchar *s;
+
+		s = g_strdup_printf (error_msg, strerror (my_errno));
+
+		dialog = gnome_message_box_new (s,
+						GNOME_MESSAGE_BOX_ERROR,
+						GNOME_STOCK_BUTTON_OK,
+						NULL);
+		gtk_widget_show (dialog);
+
+		g_free (s);
+	}
+
+	/* clean up */	
+	g_free (backup_name);
+}
+
+char *
+calendar_get_as_vcal_string (Calendar *cal)
+{
+	VObject *vcal;
+	char *result;
+	
+	g_return_val_if_fail (cal != NULL, NULL);
+
+	vcal = vcalendar_create_from_calendar (cal);
+	result = writeMemVObject (NULL, 0, vcal);
+
+	cleanVObject (vcal);
+	cleanStrTbl ();
+
+	return result;
+}
+
+static gint
+calendar_object_compare_by_start (gconstpointer a, gconstpointer b)
+{
+	const CalendarObject *ca = a;
+	const CalendarObject *cb = b;
+	time_t diff;
+	
+	diff = ca->ev_start - cb->ev_start;
+	return (diff < 0) ? -1 : (diff > 0) ? 1 : 0;
+}
+
+static int
+assemble_event_list (iCalObject *obj, time_t start, time_t end, void *c)
+{
+	CalendarObject *co;
+	GList **l = c;
+	
+	co = g_new (CalendarObject, 1);
+
+	co->ev_start = start;
+	co->ev_end   = end;
+	co->ico      = obj;
+	*l = g_list_insert_sorted (*l, co, calendar_object_compare_by_start);
+
+	return 1;
+}
+
+void
+calendar_destroy_event_list (GList *l)
+{
+	GList *p;
+
+	for (p = l; p; p = p->next)
+		g_free (p->data);
+	g_list_free (l);
+}
+
+GList *
+calendar_get_events_in_range (Calendar *cal, time_t start, time_t end)
+{
+	GList *l = 0;
+	
+	calendar_iterate (cal, start, end, assemble_event_list, &l);
+	return l;
+}
+
+void
+calendar_object_changed (Calendar *cal, iCalObject *obj, int flags)
+{
+	obj->last_mod = time (NULL);
+	obj->pilot_status = ICAL_PILOT_SYNC_MOD;
+
+	if (!(flags & CHANGE_DATES))
+		return;
+	
+	/* Remove any alarms on the alarm list for this object */
+	while (alarm_kill (obj))
+		;
+
+	ical_object_try_alarms (obj);
+}
+
+static iCalObject *
+calendar_object_find_in_list (Calendar *cal, GList *list, const char *uid)
+{
+	GList *l;
+
+	for (l = list; l; l = l->next){
+		iCalObject *obj = l->data;
+
+		if (strcmp (obj->uid, uid) == 0)
+			return obj;
+	}
+
+	return NULL;
+}
+
+iCalObject *
+calendar_object_find_event (Calendar *cal, const char *uid)
+{
+	g_return_val_if_fail (cal != NULL, NULL);
+	g_return_val_if_fail (uid != NULL, NULL);
+
+	return g_hash_table_lookup (cal->event_hash, uid);
+}
+
+iCalObject *
+calendar_object_find_todo (Calendar *cal, const char *uid)
+{
+	g_return_val_if_fail (cal != NULL, NULL);
+	g_return_val_if_fail (uid != NULL, NULL);
+
+	return calendar_object_find_in_list (cal, cal->todo, uid);
+}
+
+iCalObject *
+calendar_object_find (Calendar *cal, const char *uid)
+{
+	iCalObject *obj;
+	
+	g_return_val_if_fail (cal != NULL, NULL);
+	g_return_val_if_fail (uid != NULL, NULL);
+
+	obj = calendar_object_find_in_list (cal, cal->todo, uid);
+
+	if (obj == NULL)
+		obj = calendar_object_find_in_list (cal, cal->events, uid);
+
+	return obj;
+}
+
+iCalObject *
+calendar_object_find_by_pilot (Calendar *cal, int pilot_id)
+{
+	GList *l;
+	
+	g_return_val_if_fail (cal != NULL, NULL);
+
+	for (l = cal->events; l; l = l->next){
+		iCalObject *obj = l->data;
+
+		if (obj->pilot_id == pilot_id)
+			return obj;
+	}
+
+	for (l = cal->todo; l; l = l->next){
+		iCalObject *obj = l->data;
+
+		if (obj->pilot_id == pilot_id)
+			return obj;
+	}
+
+	return NULL;
+}
+
+/*
+ * calendar_string_from_object:
+ *
+ * Returns the iCalObject @object armored around a vCalendar
+ * object as a string.
+ */
+char *
+calendar_string_from_object (iCalObject *object)
+{
+	Calendar *cal;
+	char *str;
+
+	g_return_val_if_fail (object != NULL, NULL);
+	
+	cal = calendar_new ("Temporal",CALENDAR_INIT_NIL);
+	calendar_add_object (cal, object);
+	str = calendar_get_as_vcal_string (cal);
+	calendar_remove_object (cal, object);
+
+	calendar_destroy (cal);
+	
+	return str;
+}
--- gnome-pim-1.4.9.orig/debian/control
+++ gnome-pim-1.4.9/debian/control
@@ -0,0 +1,31 @@
+Source: gnome-pim
+Section: utils
+Maintainer: Sebastian Rittau <srittau@debian.org>
+Standards-Version: 3.5.8
+Build-Depends: libgnome-pilot1-dev, gdk-imlib-dev, liborbit-dev, libart-dev, debhelper (>= 3.0.0), flex, libgnome-dev, gettext, libaudiofile-dev, libdb3-dev, libgnorba-dev, libpisock-dev (>= 0.9.5), libxml-dev, docbook-utils
+
+Package: gnome-pim
+Priority: optional
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Calendar and address book for GNOME.
+ This package contains a calendar tool with notifications and multiple
+ views, and an address book.
+ .
+ Gnome is the "GNU Network Object Model Environment"
+ .
+ It is a project to build a complete, user-friendly desktop based
+ entirely on free software.
+
+Package: gnome-pim-conduits
+Priority: extra
+Architecture: any
+Depends: gnome-pim, gnome-pilot, ${shlibs:Depends}
+Description: Palm synchronization for calendar and address book.
+ This package contains conduits to synchronize your address book and
+ calendar between your GNOME system and your Palm.
+ .
+ GNOME is the "GNU Network Object Model Environment"
+ .
+ It is a project to build a complete, user-friendly desktop based
+ entirely on free software.
--- gnome-pim-1.4.9.orig/debian/gnome-pim-conduits.overrides
+++ gnome-pim-1.4.9/debian/gnome-pim-conduits.overrides
@@ -0,0 +1,2 @@
+gnome-pim-conduits: non-dev-pkg-with-shlib-symlink usr/lib/gnome-pilot/conduits/libcalendar_conduit.so.0.0.0 usr/lib/gnome-pilot/conduits/libcalendar_conduit.so
+gnome-pim-conduits: non-dev-pkg-with-shlib-symlink usr/lib/gnome-pilot/conduits/libaddress_conduit.so.0.0.0 usr/lib/gnome-pilot/conduits/libaddress_conduit.so
--- gnome-pim-1.4.9.orig/debian/changelog
+++ gnome-pim-1.4.9/debian/changelog
@@ -0,0 +1,376 @@
+gnome-pim (1.4.9-1.woody.1) unstable; urgency=low
+
+  * Woody backport by Adam Powell.
+  * Changed gdk-imlib1-dev to gdk-imlib-dev in Build-Depends.
+  * Moved week_starts_on_monday from main.c to calobj.c, and created
+    calendar2.c and .h with needed functionality to make the conduit work.
+  * Patch from Dano Caroll (line 1009 of gncal/calendar-conduit.c) to get the
+    time right during pilot sync.
+
+ -- Adam C. Powell, IV <hazelsct@debian.org>  Thu, 13 Feb 2003 00:24:56 -0500
+
+gnome-pim (1.4.9-1) unstable; urgency=low
+
+  * New upstream version.
+  * Compile with -g by default and handle noopt build option.
+  * Standards-Version 3.5.8.
+
+ -- Sebastian Rittau <srittau@debian.org>  Fri, 20 Dec 2002 17:53:10 +0100
+
+gnome-pim (1.4.8-3) unstable; urgency=low
+
+  * Recompile against newer libpisock.
+    + Closes: #158254 "Some packages could not be installed"
+    + Closes: #160121 "When I install this package, apt show a dependencies
+      problem with libpisock5"
+  * calendar_conduit: define symbol week_starts_on_monday. (Stab at
+    #157030, hopefully this finally fixes the conduit problems.)
+  * Change build dependencies from gdk-imlib-dev to gdk-imlib1-dev.
+
+ -- Sebastian Rittau <srittau@debian.org>  Thu, 12 Sep 2002 20:29:20 +0200
+
+gnome-pim (1.4.8-2) unstable; urgency=low
+
+  * calendar_conduit: define symbol all_calendars. (Closes: #155636)
+  * Distribute the NEWS file.
+
+ -- Sebastian Rittau <srittau@debian.org>  Fri,  9 Aug 2002 00:36:34 +0200
+
+gnome-pim (1.4.8-1) unstable; urgency=low
+
+  * New upstream version.
+    + Closes: #143589 "Unable to enable gnomecal conduit"
+    + Closes: #151781 "Problem loading GnomeCal conduit" 
+
+ -- Sebastian Rittau <srittau@debian.org>  Sat,  3 Aug 2002 01:52:06 +0200
+
+gnome-pim (1.4.7-1) unstable; urgency=low
+
+  * New upstream version. Incorporates the patch from 1.4.6-2.
+  * Surround file name with quotation marks in the MIME description file.
+  * Updated Japanese translation by Junichi Uekawa. (Closes: #148255)
+  * Updated po/POTFILES.in, but didn't update all *.po files. (But did
+    that upstream, instead.) Added -rm -f po/*.gmo to debian/rules' clean
+    rule. (Closes: #148254)
+  * The main GNOME calendar manual page is called "index.html", not
+    "gnomecal.html". Patch gncal/doc/C/topic.dat to fix that.
+
+ -- Sebastian Rittau <srittau@debian.org>  Sun,  2 Jun 2002 21:05:47 +0200
+
+gnome-pim (1.4.6-2) unstable; urgency=medium
+
+  * Patch from CVS: Work around gnomecal's startup crash. (Closes: #145411)
+
+ -- Sebastian Rittau <srittau@debian.org>  Thu,  2 May 2002 02:20:08 +0200
+
+gnome-pim (1.4.6-1) unstable; urgency=HIGH
+
+  * New upstream version.
+  * This version fixes a serious problem that could cause data loss during
+    the save operation in GNOME Card.
+
+ -- Sebastian Rittau <srittau@debian.org>  Thu, 25 Apr 2002 22:10:07 +0200
+
+gnome-pim (1.4.5-2) unstable; urgency=low
+
+  * Recompile with newer libs and binutils. I hope this will fix segfault
+    problems on i386. No changes for other archs.
+
+ -- Sebastian Rittau <srittau@debian.org>  Sat,  6 Apr 2002 15:51:50 +0200
+
+gnome-pim (1.4.5-1) unstable; urgency=low
+
+  * New upstream version. All Debian patches are now integrated upstream.
+  * gnomecard is now registered as MIME handler for Netscape vcards
+    (type text/x-vcard). Thanks to Lee Maguire for suggesting this and
+    to Christian Biesinger for implementing this upstream. (Closes: #126007)
+
+ -- Sebastian Rittau <srittau@debian.org>  Sat, 30 Mar 2002 21:32:27 +0100
+
+gnome-pim (1.4.4-1) unstable; urgency=low
+
+  * New upstream version. This one was made by the Debian packager.
+    Changed debian/copyright accordingly. Most Debian patches were
+    integrated upstream.
+  * Recommend gnome-help so that the help menu works. (Closes: #136461)
+  * Removed build dependencies on libcapplet-dev and libpanel-applet-dev.
+  * Removed links to undocumented(7) from gnome-pim-conduits. There are
+    no binaries in that package.
+
+ -- Sebastian Rittau <srittau@debian.org>  Sat,  9 Mar 2002 17:34:32 +0100
+
+gnome-pim (1.4.3-3) unstable; urgency=low
+
+  * Fix path to gnomecal's help file so the Help/Manual menu item does
+    actually work. (Closes: #126272)
+
+ -- Sebastian Rittau <srittau@debian.org>  Mon, 31 Dec 2001 20:11:09 +0100
+
+gnome-pim (1.4.3-2) unstable; urgency=low
+
+  * Changed build-dependency from cygnus-stylesheets to docbook-utils.
+  * In the card editor, select the "Internet" e-mail address type by default
+    instead of AOL. (Closes: #118945)
+
+ -- Sebastian Rittau <srittau@debian.org>  Sat, 10 Nov 2001 18:21:11 +0100
+
+gnome-pim (1.4.3-1) unstable; urgency=low
+
+  * New upstream version.
+  * This version works with gnome-pilot 0.1.62. Thanks a lot to Mike Marley
+    for his hard work with gnome-pilot and gnome-pim.
+  * Removed some files from gnome-pim-conduits.files which aren't built
+    anymore.
+  * Build-Depend on libgnome-pilot1-dev instead of libgnome-pilot0-dev.
+
+ -- Sebastian Rittau <srittau@debian.org>  Sun, 14 Oct 2001 02:46:40 +0200
+
+gnome-pim (1.4.0-10) unstable; urgency=low
+
+  * gnome-pim-conduits is now priority extra.
+
+ -- Sebastian Rittau <srittau@debian.org>  Fri, 31 Aug 2001 22:23:51 +0200
+
+gnome-pim (1.4.0-9) unstable; urgency=low
+
+  * Added manpages. Thanks to Jan Schaumann <jschauma@netmeister.org>
+    and "The Missing Man Pages Project". (Closes: #99437)
+  * Use debhelper version 3. Changed Build-Depends: accordingly.
+  * Cleaned rules file.
+  * Fixed a Makefile that tried to install file in / instead of the
+    build directory.
+  * Slightly modified copyright file to shut-up lintian.
+  * Removed emacs stuff from changelog.
+  * Standards-Version 3.5.6.0 (no changes necessary).
+  * Prevent debhelper from adding ldconfig to postinst and postrm.
+
+ -- Sebastian Rittau <srittau@debian.org>  Mon, 27 Aug 2001 21:40:44 +0200
+
+gnome-pim (1.4.0-8) unstable; urgency=low
+
+  * Corrected date format in todo list. Thanks, Adrian van den Dries
+    (Closes: #110146)
+
+ -- Sebastian Rittau <srittau@debian.org>  Sun, 26 Aug 2001 17:54:04 +0200
+
+gnome-pim (1.4.0-7) unstable; urgency=low
+
+  * Removed superfluous space from overrides file.
+  * Build-Depend on cygnus-stylesheets.
+  * Corrected image links in documentation. (Closes: #107932)
+  * Applied another patch to fix regeneration of *.conduit files.
+
+ -- Sebastian Rittau <srittau@debian.org>  Wed,  8 Aug 2001 04:29:47 +0200
+
+gnome-pim (1.4.0-6) unstable; urgency=low
+
+  * Rebuilt against new libpisock package.
+
+ -- Sebastian Rittau <srittau@debian.org>  Wed, 27 Jun 2001 00:44:47 +0200
+
+gnome-pim (1.4.0-5) unstable; urgency=low
+
+  * Build-Depend on cygnus-stylesheets, needed to build HTML documentation.
+
+ -- Sebastian Rittau <srittau@debian.org>  Wed, 27 Jun 2001 00:04:18 +0200
+
+gnome-pim (1.4.0-4) unstable; urgency=low
+
+  * Removed /usr/share/doc/gnome-pim/ChangeLog.gz. (Closes: #102084)
+  * Conforms to Debian policy version 3.5.5.0.
+
+ -- Sebastian Rittau <srittau@debian.org>  Tue, 26 Jun 2001 22:55:08 +0200
+
+gnome-pim (1.4.0-3) unstable; urgency=low
+
+  * Added support for DEB_BUILD_OPTIONS when building the package.
+    Thanks to Joe Drew for pointing this out. (Closes: #99704)
+  * Depend on libpisock-dev >= 0.9.5. (Closes: #99715)
+
+ -- Sebastian Rittau <srittau@debian.org>  Sat,  2 Jun 2001 21:55:22 +0200
+
+gnome-pim (1.4.0-2) unstable; urgency=low
+
+  * gnome-pim-conduits does now depend on gnome-pilot, which provides
+    some infrastructure.
+  * Use newer gettext version. mo files are now included.
+  * Build against non-helix orbit (paper bag bug, sorry). (Closes: #99421)
+  * Remove empty directory /usr/share/control-center from gnome-pim
+    package.
+
+ -- Sebastian Rittau <srittau@debian.org>  Fri,  1 Jun 2001 01:01:36 +0200
+
+gnome-pim (1.4.0-1) unstable; urgency=low
+
+  * New maintainer. (Closes: #86113)
+  * New upstream version.
+  * Conforms to policy version 3.5.4.0. No changes necessary. Actually
+    a higher policy version was required since lintian complained about
+    the build dependencies.
+  * Build-Depend on libdb3-dev instead of libdb2-dev. (Closes: #96973)
+  * Make a link to undocumented(7) for each binary.
+  * Added lintian override for gnome-pim-conduits.
+  * Moved explanation of Gnome down in package descriptions. I think the
+    description of the actual packages is more important.
+  * Removed empty directories from package gnome-pim. This should also
+    remove the empty Gnome menu when package gnome-pim-conduits is not
+    installed.
+  * Added file macros/gnome-pilot.m4 that is missing from upstream
+    tar-ball.
+  * Cleanups.
+
+ -- Sebastian Rittau <srittau@debian.org>  Thu, 31 May 2001 01:34:15 +0200
+
+gnome-pim (1.2.0-4) unstable; urgency=low
+
+  * Apply patch from Matt Zimmerman to fix calendar emailing.  (Closes:
+    #83340) 
+  * Last patch fixed this bug.  Don't know why wasn't closed in bug
+    system.  (Closes: #82534)
+  * Create link gnomecal.html -> index.html (Closes: #80861)
+  * Remove /usr/sbin from dir and rmdir usr/share/gnome/help/cal (Closes:
+    #80860)
+
+ -- James LewisMoss <dres@debian.org>  Wed, 24 Jan 2001 02:26:06 -0500
+
+gnome-pim (1.2.0-3) unstable; urgency=low
+
+  * Fix arm/ppc bug with return value of lexGetc_ (this is like the third
+    time.  I apologize.  I don't know how I keep losing this fix.)
+    (Closes: #82534)
+
+ -- James LewisMoss <dres@debian.org>  Tue, 16 Jan 2001 12:09:34 -0500
+
+gnome-pim (1.2.0-2) unstable; urgency=low
+
+  * Add some build depends.
+
+ -- James LewisMoss <dres@debian.org>  Thu, 28 Dec 2000 13:27:36 -0500
+
+gnome-pim (1.2.0-1) frozen unstable; urgency=low
+
+  * Maintainer upload.
+  * Add clean rules to get rid of some files generated, but not cleaned up
+    by the source package.
+  * Upstream has todo list by date sort patch.  Remove from debian
+    package. 
+  * Merge helix changes in.
+
+ -- James LewisMoss <dres@debian.org>  Sat,  7 Oct 2000 12:00:15 -0400
+
+gnome-pim (1.2.0-helix1) frozen unstable; urgency=low
+
+  * New upstream release
+
+ -- Helix Code, Inc. <debian@helixcode.com>  Sun, 21 May 2000 13:31:58 -0400
+
+gnome-pim (1.1.90-helix2) frozen unstable; urgency=low
+
+  * lintian fixes
+
+ -- Helix Code, Inc. <debian@helixcode.com>  Wed, 17 May 2000 15:05:12 -0400
+
+gnome-pim (1.1.90-helix1) frozen unstable; urgency=low
+
+  * New upstream release
+
+ -- Helix Code, Inc. <distribution@helixcode.com>  Thu, 11 May 2000 18:56:30 -0400
+
+gnome-pim (1.1.5-helix1) frozen unstable; urgency=low
+
+  * New upstream release
+  * Split off a gnome-pim-conduits package
+
+ -- Joe Shaw <joe@helixcode.com>  Sun, 23 Apr 2000 18:06:58 -0400
+
+gnome-pim (1.0.55-4) frozen unstable; urgency=low
+
+  * Apply patch from Peter Samuelson again.  Fixes important bug with
+    Sparc and ARM.  (Closes: #66314)
+
+ -- James LewisMoss <dres@debian.org>  Wed, 28 Jun 2000 19:02:52 -0400
+
+gnome-pim (1.0.55-3) frozen unstable; urgency=low
+
+  * Apply patch from Peter Samuelson to fix compile on ARM and Sparc
+    (Closes: #65119) (important bug)
+  * Take changes from latest upstream and apply to libversit.  Libversit
+    was not allowing gnomecard to load it's save file making the program
+    completely unusable.
+
+ -- James LewisMoss <dres@debian.org>  Fri,  9 Jun 2000 23:37:36 -0400
+
+gnome-pim (1.0.55-2) frozen unstable; urgency=low
+
+  * Recompile to get libesd0|libesd0-alsa dependancy correct. important
+    bug (well grave, but that was mistake) (Closes: #56620)
+  * Fix license location in copyright file.
+
+ -- James LewisMoss <dres@debian.org>  Sun, 30 Jan 2000 01:59:48 -0500
+
+gnome-pim (1.0.55-1) unstable; urgency=low
+
+  * New upstream.
+
+ -- James LewisMoss <dres@debian.org>  Sun, 24 Oct 1999 23:33:29 -0400
+
+gnome-pim (1.0.50-1) unstable; urgency=low
+
+  * New upstream.
+
+ -- James LewisMoss <dres@debian.org>  Fri,  1 Oct 1999 00:46:50 -0400
+
+gnome-pim (1.0.42-1) unstable; urgency=low
+
+  * New upstream (Fixes bug #38019)
+
+ -- James LewisMoss <dres@debian.org>  Mon, 27 Sep 1999 22:22:00 -0400
+
+gnome-pim (1.0.10-1) unstable; urgency=low
+
+  * New upstream.
+  * Backed out phone listing patch (conflicts with upstream).
+
+ -- James LewisMoss <dres@debian.org>  Fri, 17 Sep 1999 21:42:13 -0400
+
+gnome-pim (1.0.9-3) unstable; urgency=low
+
+  * Fix phone listing in card to include all those listed rather than the
+    first six. (Including spliting the list in half to not change the size 
+    of the frame.)
+  * Update standards version.
+  * Removed links to undocumented man pages.
+
+ -- James LewisMoss <dres@debian.org>  Sat,  4 Sep 1999 10:37:32 -0400
+
+gnome-pim (1.0.9-2) unstable; urgency=low
+
+  * Fixed TODO list compare.
+
+ -- James LewisMoss <dres@debian.org>  Mon, 26 Jul 1999 19:02:48 -0400
+
+gnome-pim (1.0.9-1) unstable; urgency=low
+
+  * New upstream.
+
+ -- James LewisMoss <dres@debian.org>  Mon, 26 Jul 1999 18:12:14 -0400
+
+gnome-pim (1.0.8-1) unstable; urgency=low
+
+  * New upstream.
+
+ -- James LewisMoss <dres@debian.org>  Sun, 11 Jul 1999 13:19:02 -0400
+
+gnome-pim (1.0.7-1) unstable; urgency=low
+
+  * New upstream.
+  * Claiming ownership.  (One person said they planned on doing it.  If
+    that person wants it please speak up.)
+
+ -- James LewisMoss <dres@debian.org>  Tue, 13 Apr 1999 22:07:27 -0400
+
+gnome-pim (1.0.1-0.1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- James LewisMoss <dres@debian.org>  Sun, 14 Mar 1999 01:25:27 -0500
--- gnome-pim-1.4.9.orig/debian/rules
+++ gnome-pim-1.4.9/debian/rules
@@ -0,0 +1,94 @@
+#!/usr/bin/make -f
+# Made with the aid of dh_make, by Craig Small
+# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
+# Also some stuff taken from debmake scripts, by Cristopt Lameter.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This is the debhelper compatability version to use.
+export DH_COMPAT=3
+
+# support the DEB_BUILD_OPTIONS variable (partly stolen from gnome-utils)
+CFLAGS := -Wall -g
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+CFLAGS += -O0
+else
+CFLAGS += -O2
+endif
+export CFLAGS
+
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+	./configure --prefix=/usr --sysconfdir=/etc --mandir=\$${prefix}/share/man
+
+	touch configure-stamp
+
+build: configure-stamp build-stamp
+build-stamp:
+	dh_testdir
+
+	$(MAKE)
+
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp configure-stamp
+
+	-$(MAKE) distclean
+
+	# Clean up generated docs.
+	# FIXME: Should be integrated upstream.
+	-rm gncal/doc/C/gnomecal.html
+	-rm -r gncal/doc/C/gnomecal.junk
+	-rm -r gncal/doc/C/gnomecal/*
+	-rm gnomecard/help/C/index.html
+	-rm -r gnomecard/help/C/gnomecard.junk
+	-rm -r gnomecard/help/C/gnomecard/*
+	-rm -f po/*.gmo
+
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+	cp debian/gnome-pim-conduits.overrides debian/gnome-pim-conduits/usr/share/lintian/overrides/gnome-pim-conduits
+
+	rmdir debian/tmp/usr/share/gnome/help/cal/C
+	rmdir debian/tmp/usr/share/gnome/help/cal
+
+# Build architecture-independent files here.
+binary-indep: build install
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_movefiles
+
+	dh_installdocs
+	dh_installmenu
+	dh_installman
+	dh_installmime
+	dh_undocumented
+	dh_installchangelogs ChangeLog
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_makeshlibs -n
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
--- gnome-pim-1.4.9.orig/debian/gnome-pim.manpages
+++ gnome-pim-1.4.9/debian/gnome-pim.manpages
@@ -0,0 +1,2 @@
+debian/gnomecal.1
+debian/gnomecard.1
--- gnome-pim-1.4.9.orig/debian/gnomecal.1
+++ gnome-pim-1.4.9/debian/gnomecal.1
@@ -0,0 +1,224 @@
+.\"
+.\" This page was created on 2001-08-27 11:17:12 by makeman.pl
+.\" ``makeman.pl'' is part of the ``MakeMan'' project.
+.\" For more information, please see http://mama.sourceforge.net
+.\"
+.TH GNOMECAL 1 "August 25th, 2001" "gnome\-pim" "GNOME User's Manual" 
+
+.SH NAME
+gnomecal \- the GNOME calendar
+
+.SH SYNOPSIS
+\fBgnomecal\fR
+[ \fIOPTION\fR... ] 
+
+.SH "DESCRIPTION"
+
+.PP
+
+\fBgnomecal\fR, part of the
+\fIgnome\-pim\fR package, is a simple calendar
+applications which can be quite useful in your daily work. The
+Calendar, like much of GNOME, is in its infancy and while it is a
+very useful application, there is some very impressive
+functionality still to come like network shared calendar usage,
+and syncing capability with Palm Pilots and other hand held PDAs.
+The Calendar can be launched from the Applications submenu of the
+Main Menu.		
+
+.PP
+
+The Calendar is broken up into four main tabs: Day, Week, Month,
+and Year. Each view allows you to view the respective time
+period but will also allow you to schedule appointments from any
+one of the tabs.		
+
+.SH "OPTIONS"
+
+.PP
+
+This program follows the usual GNU command line syntax,
+with long options starting with two dashes (`\-\-'). A
+summary of the options supported by \fBgnomecal\fR
+is included below.		
+
+.SS "GNOME options"
+.\" Begin List
+.TP
+\fB\-\-disable\-sound\fR
+Disable sound server usage
+.TP
+\fB\-\-enable\-sound\fR
+Enable sound server usage
+.TP
+\fB\-\-espeaker=\fR\fIHOSTNAME:PORT\fR
+
+Host:port on which the sound server to use is running
+
+.TP
+\fB\-\-version\fR
+Display version information and exit
+.\" End List
+
+.SS "Help options"
+.\" Begin List
+.TP
+\fB\-?, \-\-help\fR
+Show help and exit
+.TP
+\fB\-\-usage\fR
+Display brief usage message
+.\" End List
+
+.SS "GTK options"
+.\" Begin List
+.TP
+\fB\-\-gdk\-debug=\fR\fIFLAGS\fR
+Gdk debugging flags to set
+.TP
+\fB\-\-gdk\-no\-debug=\fR\fIFLAGS\fR
+Gdk debugging flags to unset
+.TP
+\fB\-\-display=\fR\fIDISPLAY\fR
+X display to use
+.TP
+\fB\-\-sync\fR
+Make X calls synchronous
+.TP
+\fB\-\-no\-xshm\fR
+Don't use X shared memory extension
+.TP
+\fB\-\-name=\fR\fINAME\fR
+
+Program name as used by the window manager
+
+.TP
+\fB\-\-class=\fR\fICLASS\fR
+Program class as used by the window
+manager
+.TP
+\fB\-\-gxid_host=\fR\fIHOST\fR
+
+.TP
+\fB\-\-gxid_port=\fR\fIPORT\fR
+
+.TP
+\fB\-\-xim\-preedit=\fR\fISTYLE\fR
+
+.TP
+\fB\-\-xim\-status=\fR\fISTYLE\fR
+
+.TP
+\fB\-\-gtk\-debug=\fR\fIFLAGS\fR
+Gtk+ debugging flags to set
+.TP
+\fB\-\-gtk\-no\-debug=\fR\fIFLAGS\fR
+Gtk+ debugging flags to unset
+.TP
+\fB\-\-g\-fatal\-warnings\fR
+Make all warnings fatal
+.TP
+\fB\-\-gtk\-module=\fR\fIMODULE\fR
+Load an additional Gtk module
+.\" End List
+
+.SS "GNOME GUI options"
+.\" Begin List
+.TP
+\fB\-\-disable\-crash\-dialog\fR
+
+.\" End List
+
+.SS "Session management options"
+.\" Begin List
+.TP
+\fB\-\-sm\-client\-id=\fR\fIID\fR
+Specify session management ID
+.TP
+\fB\-\-sm\-config\-prefix=\fR\fIPREFIX\fR
+Specify prefix of saved configuration
+.TP
+\fB\-\-sm\-disable\fR
+Disable connection to session manager
+.\" End List
+
+.SS "gnomecal options"
+.\" Begin List
+.TP
+\fB\-e, \-\-events\fR
+Show events and quit
+.TP
+\fB\-\-todo\fR
+Show TO\-DO items and quit
+.TP
+\fB\-f, \-\-from=\fR\fIDATE\fR
+
+Specifies start \fIDATE\fR (for \fB\-\-events\fR)
+
+.TP
+\fB\-F, \-\-file=\fR\fIFILE\fR
+\fIFILE\fR to load calendar from
+.TP
+\fB\-\-userfile\fR
+Load the user calendar
+.TP
+\fB\-\-geometry=\fR\fIGEOMETRY\fR
+\fIGEOMETRY\fR for starting up
+.TP
+\fB\-\-view=\fR\fIVIEW\fR
+
+The startup view mode (dayview, weekview, monthview, yearview)
+
+.TP
+\fB\-\-hidden\fR
+
+If used, starts in iconic mode
+
+.TP
+\fB\-d, \-\-debug=\fR\fITYPE\fR
+
+Enable debugging output of \fITYPE\fR (alarms)
+
+.\" End List
+
+.SH "BUGS"
+
+.PP
+
+Please report bugs at http://bugs.gnome.org/ (Link to \fIhttp://bugs.gnome.org/\fR).		
+
+.SH "SEE ALSO"
+
+.PP
+
+\fBgnomecard(1)\fR		
+
+.PP
+
+The \fBgnomecal\fR manual:
+\fI/usr/share/gnome/help/gnomecal/C/index.html\fR		
+
+.PP
+
+GNOME PIM
+Homepage (Link to \fIwww.gnome.org/gnome-office/gnome-pim.shtml\fR)		
+
+.PP
+
+GNOME (Link to \fIhttp://www.gnome.org\fR)		
+
+.SH "AUTHOR"
+
+.PP
+
+Dave Mason <dcm@redhat.com>				
+
+.PP
+
+Miguel de Icaza Amozurrutia <miguel@gnu.org>		
+
+.PP
+
+This man\-page was written by Jan Schaumann
+<jschauma@netmeister.org> as part of "The Missing
+Man Pages Project (Link to \fIhttp://www.netmeister.org/misc/m2p2/index.html\fR)".		
--- gnome-pim-1.4.9.orig/debian/gnomecard.1
+++ gnome-pim-1.4.9/debian/gnomecard.1
@@ -0,0 +1,168 @@
+.\"
+.\" This page was created on 2001-08-27 11:15:10 by makeman.pl
+.\" ``makeman.pl'' is part of the ``MakeMan'' project.
+.\" For more information, please see http://mama.sourceforge.net
+.\"
+.TH GNOMECARD 1 "August 25th, 2001" "gnome\-pim" "GNOME User's Manual" 
+
+.SH NAME
+gnomecard \- the GNOME Addressbook
+
+.SH SYNOPSIS
+\fBgnomecard\fR
+[ \fIOPTION\fR... ] 
+
+.SH "DESCRIPTION"
+
+.PP
+
+\fBgnomecard\fR, part of the
+\fIgnome\-pim\fR package, is a GNOME addressbook
+which uses the industry standard vcalendar format for information
+exchange.		
+
+.SH "OPTIONS"
+
+.PP
+
+This program follows the usual GNU command line syntax,
+with long options starting with two dashes (`\-\-'). A
+summary of the options supported by \fBgnomecard\fR
+is included below.		
+
+.SS "GNOME options"
+.\" Begin List
+.TP
+\fB\-\-disable\-sound\fR
+Disable sound server usage
+.TP
+\fB\-\-enable\-sound\fR
+Enable sound server usage
+.TP
+\fB\-\-espeaker=\fR\fIHOSTNAME:PORT\fR
+
+Host:port on which the sound server to use is running
+
+.TP
+\fB\-\-version\fR
+Display version information and exit
+.\" End List
+
+.SS "Help options"
+.\" Begin List
+.TP
+\fB\-?, \-\-help\fR
+Show help and exit
+.TP
+\fB\-\-usage\fR
+Display brief usage message
+.\" End List
+
+.SS "GTK options"
+.\" Begin List
+.TP
+\fB\-\-gdk\-debug=\fR\fIFLAGS\fR
+Gdk debugging flags to set
+.TP
+\fB\-\-gdk\-no\-debug=\fR\fIFLAGS\fR
+Gdk debugging flags to unset
+.TP
+\fB\-\-display=\fR\fIDISPLAY\fR
+X display to use
+.TP
+\fB\-\-sync\fR
+Make X cardls synchronous
+.TP
+\fB\-\-no\-xshm\fR
+Don't use X shared memory extension
+.TP
+\fB\-\-name=\fR\fINAME\fR
+
+Program name as used by the window manager
+
+.TP
+\fB\-\-class=\fR\fICLASS\fR
+Program class as used by the window
+manager
+.TP
+\fB\-\-gxid_host=\fR\fIHOST\fR
+
+.TP
+\fB\-\-gxid_port=\fR\fIPORT\fR
+
+.TP
+\fB\-\-xim\-preedit=\fR\fISTYLE\fR
+
+.TP
+\fB\-\-xim\-status=\fR\fISTYLE\fR
+
+.TP
+\fB\-\-gtk\-debug=\fR\fIFLAGS\fR
+Gtk+ debugging flags to set
+.TP
+\fB\-\-gtk\-no\-debug=\fR\fIFLAGS\fR
+Gtk+ debugging flags to unset
+.TP
+\fB\-\-g\-fatal\-warnings\fR
+Make all warnings fatal
+.TP
+\fB\-\-gtk\-module=\fR\fIMODULE\fR
+Load an additional Gtk module
+.\" End List
+
+.SS "GNOME GUI options"
+.\" Begin List
+.TP
+\fB\-\-disable\-crash\-dialog\fR
+
+.\" End List
+
+.SS "Session management options"
+.\" Begin List
+.TP
+\fB\-\-sm\-client\-id=\fR\fIID\fR
+Specify session management ID
+.TP
+\fB\-\-sm\-config\-prefix=\fR\fIPREFIX\fR
+Specify prefix of saved configuration
+.TP
+\fB\-\-sm\-disable\fR
+Disable connection to session manager
+.\" End List
+
+.SH "BUGS"
+
+.PP
+
+Please report bugs at http://bugs.gnome.org/ (Link to \fIhttp://bugs.gnome.org/\fR).		
+
+.SH "SEE ALSO"
+
+.PP
+
+\fBgnomecal(1)\fR		
+
+.PP
+
+GNOME PIM
+Homepage (Link to \fIwww.gnome.org/gnome-office/gnome-pim.shtml\fR)		
+
+.PP
+
+GNOME (Link to \fIhttp://www.gnome.org\fR)		
+
+.SH "AUTHOR"
+
+.PP
+
+<arturo@nuclecu.unam.mx>				
+
+.PP
+
+<drmike@redhat.com>		
+
+.PP
+
+This man\-page was written by Jan Schaumann
+<jschauma@netmeister.org> as part of "The Missing
+Man Pages Project (Link to \fIhttp://www.netmeister.org/misc/m2p2/index.html\fR)".		
--- gnome-pim-1.4.9.orig/debian/gnome-pim-conduits.dirs
+++ gnome-pim-1.4.9/debian/gnome-pim-conduits.dirs
@@ -0,0 +1 @@
+usr/share/lintian/overrides
--- gnome-pim-1.4.9.orig/debian/gnome-pim.docs
+++ gnome-pim-1.4.9/debian/gnome-pim.docs
@@ -0,0 +1 @@
+NEWS
--- gnome-pim-1.4.9.orig/debian/gnome-pim.menu
+++ gnome-pim-1.4.9/debian/gnome-pim.menu
@@ -0,0 +1,5 @@
+?package(gnome-pim):needs=X11 section=Apps/Tools \
+  title="GNOME Calendar" command="/usr/bin/gnomecal"
+
+?package(gnome-pim):needs=X11 section=Apps/Tools \
+  title="GNOME Address Book" command="/usr/bin/gnomecard"
--- gnome-pim-1.4.9.orig/debian/gnome-pim.mime
+++ gnome-pim-1.4.9/debian/gnome-pim.mime
@@ -0,0 +1 @@
+text/x-vcard; gnomecard -f "%s"; edit=gnomecard -f "%s"; test=test -n "$DISPLAY"; description=Business Card; textualnewlines; priority=7
--- gnome-pim-1.4.9.orig/debian/gnome-pim-conduits.files
+++ gnome-pim-1.4.9/debian/gnome-pim-conduits.files
@@ -0,0 +1,3 @@
+usr/lib/gnome-pilot
+usr/share/gnome-pilot/conduits
+usr/share/pixmaps/gnome-calendar-conduit.png
--- gnome-pim-1.4.9.orig/debian/gnome-pim.files
+++ gnome-pim-1.4.9/debian/gnome-pim.files
@@ -0,0 +1,9 @@
+etc/CORBA/servers
+usr/bin/gnomecal
+usr/bin/gnomecard
+usr/share/gnome/apps/Applications
+usr/share/gnome/help
+usr/share/idl
+usr/share/locale
+usr/share/mime-info
+usr/share/pixmaps/gnome-gnomecard.png
--- gnome-pim-1.4.9.orig/debian/copyright
+++ gnome-pim-1.4.9/debian/copyright
@@ -0,0 +1,18 @@
+This package was debianized by James LewisMoss dres@debian.org on
+Sun, 14 Mar 1999 01:25:27 -0500.
+Current maintainer is Sebastian Rittau <srittau@jroger.in-berlin.de>.
+
+It was downloaded from <http://me.in-berlin.de/~jroger/gnome-pim/>.
+
+The authors for gncal are
+  Miguel de Icaza <miguel@kernel.org>
+  Federico Mena <quartic@gimp.org>
+  Arturo Esponosa <arturo@nuclecu.unam.mx>
+
+The AUTHORS file for gnomecard is missing, but the copyright is to the
+FSF.
+
+Copyright:
+
+This package is copyrighted under the GPL.  Please see
+/usr/share/common-licenses/GPL on a Debian system for the full text.