diff -urN cadaver-0.22.3-1-orig/src/cadaver-0.22.3/Makefile.in cadaver-0.22.3-1-i18n/src/cadaver-0.22.3/Makefile.in
--- cadaver-0.22.3-1-orig/src/cadaver-0.22.3/Makefile.in	2006-07-31 22:54:40.617395200 +0900
+++ cadaver-0.22.3-1-i18n/src/cadaver-0.22.3/Makefile.in	2006-08-01 02:06:51.837080000 +0900
@@ -39,7 +39,7 @@
 SUBDIRS = lib/neon lib/intl
 OBJECTS = src/cadaver.o src/common.o src/commands.o src/ls.o	\
 	 src/cmdline.o src/options.o src/utils.o src/edit.o \
-	src/version.o src/search.o 
+	src/version.o src/search.o src/codeconv.o
 LIBOBJS = lib/basename.o lib/dirname.o lib/rpmatch.o lib/yesno.o	\
 	lib/glob.o lib/getpass.o lib/tempname.o lib/mkstemp.o \
 	@LIBOBJS@
@@ -52,7 +52,7 @@
 
 all: $(TARGET)
 
-.PHONY: subdirs install again clean
+.PHONY: subdirs install again clean distclean
 
 $(TARGET): $(ALLOBJS) subdirs
 	$(CC) $(LDFLAGS) -o $(TARGET) $(ALLOBJS) $(LIBS)
@@ -67,6 +67,11 @@
 	rm -f $(OBJECTS) $(LIBOBJS) $(TARGET) *~
 	for d in $(SUBDIRS); do (cd $$d; $(MAKE) clean); done
 
+distclean: clean
+	rm -f Makefile config.h config.log config.status
+	for d in $(SUBDIRS); do (cd $$d; $(MAKE) distclean); done
+	find . -name \*~ -exec rm -f {} \;
+
 again: clean $(TARGET)
 
 install: $(TARGET) install-nls
diff -urN cadaver-0.22.3-1-orig/src/cadaver-0.22.3/configure cadaver-0.22.3-1-i18n/src/cadaver-0.22.3/configure
--- cadaver-0.22.3-1-orig/src/cadaver-0.22.3/configure	2005-12-31 22:18:31.000000000 +0900
+++ cadaver-0.22.3-1-i18n/src/cadaver-0.22.3/configure	2006-08-18 00:24:17.244078400 +0900
@@ -23876,12 +23876,14 @@
     else
 	nls_msg="Built using native support"
     fi
-    LIBS="$LIBS $LIBINTL"
+# fake for shared linking with libiconv and libintl
+#    LIBS="$LIBS $LIBINTL"
+    LIBS="$LIBS $LTLIBINTL"
 else
     nls_msg="Not built"
 fi
 
-nls_msg="Not built"
+#nls_msg="Not built"
 
 
 
diff -urN cadaver-0.22.3-1-orig/src/cadaver-0.22.3/configure.ac cadaver-0.22.3-1-i18n/src/cadaver-0.22.3/configure.ac
--- cadaver-0.22.3-1-orig/src/cadaver-0.22.3/configure.ac	2005-12-31 21:57:37.000000000 +0900
+++ cadaver-0.22.3-1-i18n/src/cadaver-0.22.3/configure.ac	2006-08-18 00:24:08.371320000 +0900
@@ -97,12 +97,14 @@
     else
 	nls_msg="Built using native support"
     fi
-    LIBS="$LIBS $LIBINTL"
+# fake for shared linking with libiconv and libintl
+#    LIBS="$LIBS $LIBINTL"
+    LIBS="$LIBS $LTLIBINTL"
 else
     nls_msg="Not built"
 fi
 
-nls_msg="Not built"
+#nls_msg="Not built"
 
 NEON_WARNINGS
 
diff -urN cadaver-0.22.3-1-orig/src/cadaver-0.22.3/lib/neon/Makefile.in cadaver-0.22.3-1-i18n/src/cadaver-0.22.3/lib/neon/Makefile.in
--- cadaver-0.22.3-1-orig/src/cadaver-0.22.3/lib/neon/Makefile.in	2005-04-24 17:16:26.000000000 +0900
+++ cadaver-0.22.3-1-i18n/src/cadaver-0.22.3/lib/neon/Makefile.in	2006-07-31 23:31:34.911393000 +0900
@@ -78,6 +78,9 @@
 	rm -f $(NEON_TARGET) *.o *.lo *.bbg *.bb *.gc*
 	rm -rf .libs
 
+distclean: clean
+	rm -f Makefile
+
 c++.c:
 	find . -name ne_\*.h -print | sed 's/.*/#include "&"/;/ne_priv/d' > $@
 	echo "int main(void) {}" >> $@
diff -urN cadaver-0.22.3-1-orig/src/cadaver-0.22.3/po/LINGUAS cadaver-0.22.3-1-i18n/src/cadaver-0.22.3/po/LINGUAS
--- cadaver-0.22.3-1-orig/src/cadaver-0.22.3/po/LINGUAS	2005-12-31 20:35:51.000000000 +0900
+++ cadaver-0.22.3-1-i18n/src/cadaver-0.22.3/po/LINGUAS	2006-08-06 14:46:57.979537600 +0900
@@ -1,3 +1,4 @@
 es
 it
+ja
 en@quot
diff -urN cadaver-0.22.3-1-orig/src/cadaver-0.22.3/po/cadaver.pot cadaver-0.22.3-1-i18n/src/cadaver-0.22.3/po/cadaver.pot
--- cadaver-0.22.3-1-orig/src/cadaver-0.22.3/po/cadaver.pot	2005-12-31 20:47:29.000000000 +0900
+++ cadaver-0.22.3-1-i18n/src/cadaver-0.22.3/po/cadaver.pot	2006-08-18 01:27:01.517145600 +0900
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: cadaver@webdav.org\n"
-"POT-Creation-Date: 2005-12-31 11:46+0000\n"
+"POT-Creation-Date: 2006-08-18 01:27+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -303,7 +303,7 @@
 msgid "Invalid Content-Length in response"
 msgstr ""
 
-#: lib/neon/ne_request.c:1385 src/commands.c:975
+#: lib/neon/ne_request.c:1385 src/commands.c:918
 #, c-format
 msgid "Could not write to file: %s"
 msgstr ""
@@ -397,7 +397,7 @@
 msgid "^[nN]"
 msgstr ""
 
-#: src/cadaver.c:126
+#: src/cadaver.c:135
 #, c-format
 msgid ""
 "Usage: %s [OPTIONS] http://hostname[:port]/path\n"
@@ -409,334 +409,367 @@
 "Please send bug reports and feature requests to <cadaver@webdav.org>\n"
 msgstr ""
 
-#: src/cadaver.c:151
+#: src/cadaver.c:160
 #, c-format
 msgid "Connection to `%s' closed.\n"
 msgstr ""
 
-#: src/cadaver.c:167
+#: src/cadaver.c:181
 #, c-format
 msgid ""
 "Ignored error: %s not WebDAV-enabled:\n"
 "%s\n"
 msgstr ""
 
-#: src/cadaver.c:174
+#: src/cadaver.c:189
 #, c-format
 msgid ""
 "Could not access %s (not WebDAV-enabled?):\n"
 "%s\n"
 msgstr ""
 
-#: src/cadaver.c:188
+#: src/cadaver.c:204
 #, c-format
 msgid "WARNING: Untrusted server certificate presented for `%s':\n"
 msgstr ""
 
-#: src/cadaver.c:191
+#: src/cadaver.c:207
 msgid "WARNING: Untrusted server certificate presented:\n"
 msgstr ""
 
-#: src/cadaver.c:194
+#: src/cadaver.c:210
 #, c-format
 msgid "Certificate was issued to hostname `%s' rather than `%s'\n"
 msgstr ""
 
-#: src/cadaver.c:196
+#: src/cadaver.c:212
 #, c-format
 msgid "This connection could have been intercepted.\n"
 msgstr ""
 
-#: src/cadaver.c:202
+#: src/cadaver.c:218
 #, c-format
 msgid "Issued to: %s\n"
 msgstr ""
 
-#: src/cadaver.c:203
+#: src/cadaver.c:219
 #, c-format
 msgid "Issued by: %s\n"
 msgstr ""
 
-#: src/cadaver.c:206
+#: src/cadaver.c:222
 #, c-format
 msgid "Certificate is valid from %s to %s\n"
 msgstr ""
 
-#: src/cadaver.c:209
+#: src/cadaver.c:225
 #, c-format
 msgid "Do you wish to accept the certificate? (y/n) "
 msgstr ""
 
-#: src/cadaver.c:212
+#: src/cadaver.c:228
 #, c-format
 msgid "Certificate rejected.\n"
 msgstr ""
 
-#: src/cadaver.c:243
+#: src/cadaver.c:239
+#, c-format
+msgid "The server has requested a client certificate.\n"
+msgstr ""
+
+#: src/cadaver.c:256
+#, c-format
+msgid "Client certificate `%s' is encrypted.\n"
+msgstr ""
+
+#: src/cadaver.c:259
 msgid "Decryption password: "
 msgstr ""
 
-#: src/cadaver.c:315
+#: src/cadaver.c:262
+#, c-format
+msgid "Password incorrect, try again.\n"
+msgstr ""
+
+#: src/cadaver.c:270
+#, c-format
+msgid "Using client certificate.\n"
+msgstr ""
+
+#: src/cadaver.c:289
+#, c-format
+msgid "Could not load client certificate from `%s'.\n"
+msgstr ""
+
+#: src/cadaver.c:331
 #, c-format
 msgid "Could not parse URL `%s'\n"
 msgstr ""
 
-#: src/cadaver.c:327
+#: src/cadaver.c:343
 #, c-format
 msgid "SSL is not enabled.\n"
 msgstr ""
 
-#: src/cadaver.c:400 src/cadaver.c:403
+#: src/cadaver.c:416 src/cadaver.c:419
 #, c-format
 msgid ""
 "Could not connect to `%s' on port %d:\n"
 "%s\n"
 msgstr ""
 
-#: src/cadaver.c:411
+#: src/cadaver.c:427
 #, c-format
 msgid ""
 "Could not open collection:\n"
 "%s\n"
 msgstr ""
 
-#: src/cadaver.c:449
+#: src/cadaver.c:465
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/cadaver.c:498
+#: src/cadaver.c:516
 #, c-format
 msgid "Unrecognised command. Type 'help' for a list of commands.\n"
 msgstr ""
 
-#: src/cadaver.c:500
+#: src/cadaver.c:518
 #, c-format
 msgid "The `%s' command requires %d argument%s"
 msgstr ""
 
-#: src/cadaver.c:503 src/cadaver.c:515
+#: src/cadaver.c:521 src/cadaver.c:533
 #, c-format
 msgid ""
 ":\n"
 "  %s : %s\n"
 msgstr ""
 
-#: src/cadaver.c:509
+#: src/cadaver.c:527
 #, c-format
 msgid "The `%s' command takes at most %d argument%s"
 msgstr ""
 
-#: src/cadaver.c:512
+#: src/cadaver.c:530
 #, c-format
 msgid "The `%s' command takes no arguments"
 msgstr ""
 
-#: src/cadaver.c:520
+#: src/cadaver.c:538
 #, c-format
 msgid ""
 "The `%s' command can only be used when connected to the server.\n"
 "Try running `open' first (see `help open' for more details).\n"
 msgstr ""
 
-#: src/cadaver.c:565
+#: src/cadaver.c:583
 #, c-format
 msgid "Terminated by signal %d.\n"
 msgstr ""
 
-#: src/cadaver.c:600
+#: src/cadaver.c:618
 #, c-format
 msgid "Could not read rcfile %s: %s\n"
 msgstr ""
 
-#: src/cadaver.c:850
+#: src/cadaver.c:862
+msgid "LOCALCHARSET"
+msgstr ""
+
+#: src/cadaver.c:890
 #, c-format
 msgid "Environment variable $HOME needs to be set!\n"
 msgstr ""
 
-#: src/cadaver.c:910
+#: src/cadaver.c:950
 #, c-format
 msgid "Looking up hostname... "
 msgstr ""
 
-#: src/cadaver.c:913
+#: src/cadaver.c:953
 #, c-format
 msgid "Connecting to server... "
 msgstr ""
 
-#: src/cadaver.c:916
+#: src/cadaver.c:956
 #, c-format
 msgid "connected.\n"
 msgstr ""
 
-#: src/cadaver.c:919
+#: src/cadaver.c:959
 #, c-format
 msgid "Using secure connection: %s\n"
 msgstr ""
 
-#: src/cadaver.c:932
+#: src/cadaver.c:972
 #, c-format
 msgid " (reconnecting..."
 msgstr ""
 
-#: src/cadaver.c:935
+#: src/cadaver.c:975
 #, c-format
 msgid "done)"
 msgstr ""
 
-#: src/cadaver.c:945
+#: src/cadaver.c:985
 #, c-format
 msgid "] reconnecting: "
 msgstr ""
 
-#: src/cadaver.c:948
+#: src/cadaver.c:988
 #, c-format
 msgid "okay ["
 msgstr ""
 
-#: src/cadaver.c:958
+#: src/cadaver.c:998
 #, c-format
 msgid "\rTransfer timed out, reconnecting... "
 msgstr ""
 
-#: src/cadaver.c:961
+#: src/cadaver.c:1001
 #, c-format
 msgid "okay."
 msgstr ""
 
-#: src/cadaver.c:1012
+#: src/cadaver.c:1052
 #, c-format
 msgid "\rProgress: ["
 msgstr ""
 
-#: src/cadaver.c:1017
+#: src/cadaver.c:1057
+msgid "] %5.1f%% of %"
+msgstr ""
+
+#: src/cadaver.c:1057
 #, c-format
-msgid "] %5.1f%% of %ld bytes"
+msgid " bytes"
 msgstr ""
 
-#: src/cadaver.c:1072
+#: src/cadaver.c:1112
 msgid "Username: "
 msgstr ""
 
-#: src/cadaver.c:1074
+#: src/cadaver.c:1114
 #, c-format
 msgid "\rAuthentication aborted!\n"
 msgstr ""
 
-#: src/cadaver.c:1077
+#: src/cadaver.c:1117
 #, c-format
 msgid "\rUsername too long (>%d)\n"
 msgstr ""
 
-#: src/cadaver.c:1085
+#: src/cadaver.c:1125
 msgid "Password: "
 msgstr ""
 
-#: src/cadaver.c:1087
+#: src/cadaver.c:1127
 #, c-format
 msgid "Authentication aborted!\n"
 msgstr ""
 
-#: src/cadaver.c:1090
+#: src/cadaver.c:1130
 #, c-format
 msgid "\rPassword too long (>%d)\n"
 msgstr ""
 
-#: src/cadaver.c:1099
+#: src/cadaver.c:1139
 #, c-format
 msgid "Retrying:"
 msgstr ""
 
-#: src/cadaver.c:1103
+#: src/cadaver.c:1143
 #, c-format
 msgid "Retrying ["
 msgstr ""
 
-#: src/cadaver.c:1126
+#: src/cadaver.c:1166
 #, c-format
 msgid "Authentication required for %s on server `%s':\n"
 msgstr ""
 
-#: src/cadaver.c:1137
+#: src/cadaver.c:1177
 #, c-format
 msgid "Authentication required for %s on proxy server `%s':\n"
 msgstr ""
 
-#: src/cmdline.c:286
+#: src/cmdline.c:295
 msgid "[Matching..."
 msgstr ""
 
-#: src/cmdline.c:313
+#: src/cmdline.c:322
 #, c-format
 msgid "%d matches.]\n"
 msgstr ""
 
-#: src/cmdline.c:315
+#: src/cmdline.c:324
 msgid "1 match.]\n"
 msgstr ""
 
-#: src/commands.c:122
+#: src/commands.c:126
 msgid "succeeded.\n"
 msgstr ""
 
-#: src/commands.c:133
+#: src/commands.c:137
 msgid "authentication failed.\n"
 msgstr ""
 
-#: src/commands.c:136
+#: src/commands.c:140
 msgid "could not connect to server.\n"
 msgstr ""
 
-#: src/commands.c:139
+#: src/commands.c:143
 msgid "connection timed out.\n"
 msgstr ""
 
-#: src/commands.c:146
+#: src/commands.c:150
 #, c-format
 msgid "redirect to %s\n"
 msgstr ""
 
-#: src/commands.c:151 src/commands.c:969
+#: src/commands.c:155 src/commands.c:912
 #, c-format
 msgid ""
 "failed:\n"
 "%s\n"
 msgstr ""
 
-#: src/commands.c:328
+#: src/commands.c:250
 msgid "exclusive"
 msgstr ""
 
-#: src/commands.c:329
+#: src/commands.c:251
 msgid "shared"
 msgstr ""
 
-#: src/commands.c:330 src/commands.c:339 src/ls.c:119
+#: src/commands.c:252 src/commands.c:261 src/ls.c:120
 msgid "unknown"
 msgstr ""
 
-#: src/commands.c:337
+#: src/commands.c:259
 msgid "write"
 msgstr ""
 
-#: src/commands.c:347
+#: src/commands.c:269
 msgid "infinite"
 msgstr ""
 
-#: src/commands.c:348 src/commands.c:366
+#: src/commands.c:270 src/commands.c:288
 msgid "invalid"
 msgstr ""
 
-#: src/commands.c:350
+#: src/commands.c:272
 #, c-format
 msgid "%ld seconds"
 msgstr ""
 
-#: src/commands.c:359
+#: src/commands.c:281
 msgid "infinity"
 msgstr ""
 
-#: src/commands.c:380
+#: src/commands.c:302
 #, c-format
 msgid ""
 "Lock token <%s>:\n"
@@ -745,89 +778,89 @@
 "  Owner: %s\n"
 msgstr ""
 
-#: src/commands.c:387
+#: src/commands.c:309
 msgid "(none)"
 msgstr ""
 
-#: src/commands.c:402 src/commands.c:420
+#: src/commands.c:324 src/commands.c:342
 #, c-format
 msgid "Failed on %s: %d %s\n"
 msgstr ""
 
-#: src/commands.c:448
+#: src/commands.c:371
 msgid "Discovering locks on"
 msgstr ""
 
-#: src/commands.c:453
+#: src/commands.c:376
 msgid "Stealing locks on"
 msgstr ""
 
-#: src/commands.c:467
+#: src/commands.c:390
 #, c-format
 msgid "No owned locks.\n"
 msgstr ""
 
-#: src/commands.c:485
+#: src/commands.c:409
 msgid "Locking collection"
 msgstr ""
 
-#: src/commands.c:487
+#: src/commands.c:411
 msgid "Locking"
 msgstr ""
 
-#: src/commands.c:519
+#: src/commands.c:445
 msgid "Unlocking"
 msgstr ""
 
-#: src/commands.c:523
+#: src/commands.c:449
 msgid "Enter locktoken: "
 msgstr ""
 
-#: src/commands.c:544
+#: src/commands.c:472
 msgid "Creating"
 msgstr ""
 
-#: src/commands.c:557
+#: src/commands.c:485
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
 
-#: src/commands.c:583
+#: src/commands.c:511
 #, c-format
 msgid "Value of %s is: %s\n"
 msgstr ""
 
-#: src/commands.c:589
+#: src/commands.c:517
 #, c-format
 msgid "Could not fetch property: %d %s\n"
 msgstr ""
 
-#: src/commands.c:592
+#: src/commands.c:520
 #, c-format
 msgid "Server did not return result for %s\n"
 msgstr ""
 
-#: src/commands.c:633
+#: src/commands.c:561
 msgid "Setting property on"
 msgstr ""
 
-#: src/commands.c:638
+#: src/commands.c:566
 msgid "Deleting property on"
 msgstr ""
 
-#: src/commands.c:656
+#: src/commands.c:587
 msgid "Fetching properties for"
 msgstr ""
 
-#: src/commands.c:687
+#: src/commands.c:617
 msgid "Fetching property names"
 msgstr ""
 
-#: src/commands.c:716
+#: src/commands.c:648
 msgid "Deleting"
 msgstr ""
 
-#: src/commands.c:719
+#: src/commands.c:651
 #, c-format
 msgid ""
 "is a collection resource.\n"
@@ -835,11 +868,11 @@
 "Use `rmcol %s' to delete this collection and ALL its contents.\n"
 msgstr ""
 
-#: src/commands.c:735
+#: src/commands.c:668
 msgid "Deleting collection"
 msgstr ""
 
-#: src/commands.c:738
+#: src/commands.c:671
 #, c-format
 msgid ""
 "is not a collection.\n"
@@ -847,85 +880,85 @@
 "Use `rm %s' to delete this resource.\n"
 msgstr ""
 
-#: src/commands.c:822 src/commands.c:839
+#: src/commands.c:756 src/commands.c:775
 #, c-format
 msgid "Displaying `%s':\n"
 msgstr ""
 
-#: src/commands.c:825
+#: src/commands.c:759
 #, c-format
 msgid ""
 "Error! Could not spawn pager `%s':\n"
 "%s\n"
 msgstr ""
 
-#: src/commands.c:841
+#: src/commands.c:777
 #, c-format
 msgid "Failed: %s\n"
 msgstr ""
 
-#: src/commands.c:860
+#: src/commands.c:798
 #, c-format
 msgid "%s: %s and %s are the same resource.\n"
 msgstr ""
 
-#: src/commands.c:869
+#: src/commands.c:807
 #, c-format
 msgid "When %s multiple resources, the last argument must be a collection.\n"
 msgstr ""
 
-#: src/commands.c:885
+#: src/commands.c:825
 #, c-format
 msgid "Moving `%s' to `%s': "
 msgstr ""
 
-#: src/commands.c:891
+#: src/commands.c:831
 #, c-format
 msgid "Copying `%s' to `%s': "
 msgstr ""
 
-#: src/commands.c:951
+#: src/commands.c:892
 #, c-format
 msgid "Enter local filename for `%s': "
 msgstr ""
 
-#: src/commands.c:956
+#: src/commands.c:898
 #, c-format
 msgid "cancelled.\n"
 msgstr ""
 
-#: src/commands.c:967
+#: src/commands.c:909
 #, c-format
 msgid "Downloading `%s' to %s:"
 msgstr ""
 
-#: src/commands.c:988
+#: src/commands.c:932
 #, c-format
 msgid "Uploading %s to `%s':"
 msgstr ""
 
-#: src/commands.c:990
+#: src/commands.c:935
 #, c-format
 msgid "Could not open file: %s\n"
 msgstr ""
 
-#: src/commands.c:1022
+#: src/commands.c:969
 msgid "copying"
 msgstr ""
 
-#: src/commands.c:1022
+#: src/commands.c:969
 msgid "copy"
 msgstr ""
 
-#: src/commands.c:1027
+#: src/commands.c:974
 msgid "moving"
 msgstr ""
 
-#: src/commands.c:1027
+#: src/commands.c:974
 msgid "move"
 msgstr ""
 
-#: src/commands.c:1088
+#: src/commands.c:1037
 #, c-format
 msgid ""
 "Use:\n"
@@ -933,313 +966,317 @@
 "or chexec - %s   to make the resource unexecutable\n"
 msgstr ""
 
-#: src/commands.c:1097
+#: src/commands.c:1047
 msgid "Setting isexecutable"
 msgstr ""
 
-#: src/commands.c:1103
+#: src/commands.c:1053
 msgid "The server does not support the 'isexecutable' property."
 msgstr ""
 
-#: src/commands.c:1118
+#: src/commands.c:1068
 #, c-format
 msgid "Local directory: %s\n"
 msgstr ""
 
-#: src/commands.c:1134
+#: src/commands.c:1084
 #, c-format
 msgid "Error executing ls: %s\n"
 msgstr ""
 
-#: src/commands.c:1138
+#: src/commands.c:1088
 #, c-format
 msgid "Error forking ls: %s\n"
 msgstr ""
 
-#: src/commands.c:1155
+#: src/commands.c:1105
 #, c-format
 msgid "Could not determine home directory from environment.\n"
 msgstr ""
 
-#: src/commands.c:1160
+#: src/commands.c:1110
 #, c-format
 msgid ""
 "Could not change local directory:\n"
 "chdir: %s\n"
 msgstr ""
 
-#: src/commands.c:1168
+#: src/commands.c:1119
 #, c-format
 msgid "Current collection is `%s'.\n"
 msgstr ""
 
-#: src/commands.c:1178
+#: src/commands.c:1130
 #, c-format
 msgid "No previous collection.\n"
 msgstr ""
 
-#: src/commands.c:1220
+#: src/commands.c:1173
 #, c-format
 msgid ""
 "Aliases: rm=delete, mkdir=mkcol, mv=move, cp=copy, more=less, quit=exit=bye\n"
 msgstr ""
 
-#: src/commands.c:1232
+#: src/commands.c:1185
 #, c-format
 msgid " `%s'   %s\n"
 msgstr ""
 
-#: src/commands.c:1234
+#: src/commands.c:1187
 #, c-format
 msgid "This command can only be used when connected to a server.\n"
 msgstr ""
 
-#: src/commands.c:1237
+#: src/commands.c:1190
 #, c-format
 msgid "Command name not known: %s\n"
 msgstr ""
 
-#: src/commands.c:1294
+#: src/commands.c:1247
 msgid "ls [path]"
 msgstr ""
 
-#: src/commands.c:1294
+#: src/commands.c:1247
 msgid "List contents of current [or other] collection"
 msgstr ""
 
-#: src/commands.c:1295
+#: src/commands.c:1248
 msgid "cd path"
 msgstr ""
 
-#: src/commands.c:1295
+#: src/commands.c:1248
 msgid "Change to specified collection"
 msgstr ""
 
-#: src/commands.c:1297
+#: src/commands.c:1250
 msgid "Display name of current collection"
 msgstr ""
 
-#: src/commands.c:1299
+#: src/commands.c:1252
 msgid "put local [remote]"
 msgstr ""
 
-#: src/commands.c:1299
+#: src/commands.c:1252
 msgid "Upload local file"
 msgstr ""
 
-#: src/commands.c:1301
+#: src/commands.c:1254
 msgid "get remote [local]"
 msgstr ""
 
-#: src/commands.c:1301
+#: src/commands.c:1254
 msgid "Download remote resource"
 msgstr ""
 
-#: src/commands.c:1302
+#: src/commands.c:1255
 msgid "mget remote..."
 msgstr ""
 
-#: src/commands.c:1302
+#: src/commands.c:1255
 msgid "Download many remote resources"
 msgstr ""
 
-#: src/commands.c:1304
+#: src/commands.c:1257
 msgid "mput local..."
 msgstr ""
 
-#: src/commands.c:1304
+#: src/commands.c:1257
 msgid "Upload many local files"
 msgstr ""
 
-#: src/commands.c:1305
+#: src/commands.c:1258
 msgid "edit resource"
 msgstr ""
 
-#: src/commands.c:1305
+#: src/commands.c:1258
 msgid "Edit given resource"
 msgstr ""
 
-#: src/commands.c:1306
+#: src/commands.c:1259
 msgid "less remote..."
 msgstr ""
 
-#: src/commands.c:1306
+#: src/commands.c:1259
 msgid "Display remote resource through pager"
 msgstr ""
 
-#: src/commands.c:1307
+#: src/commands.c:1260
 msgid "mkcol remote..."
 msgstr ""
 
-#: src/commands.c:1307
+#: src/commands.c:1260
 msgid "Create remote collection(s)"
 msgstr ""
 
-#: src/commands.c:1308
+#: src/commands.c:1261
 msgid "cat remote..."
 msgstr ""
 
-#: src/commands.c:1308
+#: src/commands.c:1261
 msgid "Display remote resource(s)"
 msgstr ""
 
-#: src/commands.c:1309
+#: src/commands.c:1262
 msgid "delete remote..."
 msgstr ""
 
-#: src/commands.c:1309
+#: src/commands.c:1262
 msgid "Delete non-collection resource(s)"
 msgstr ""
 
-#: src/commands.c:1310
+#: src/commands.c:1263
 msgid "rmcol remote..."
 msgstr ""
 
-#: src/commands.c:1310
+#: src/commands.c:1263
 msgid "Delete remote collections and ALL contents"
 msgstr ""
 
-#: src/commands.c:1311
+#: src/commands.c:1264
 msgid "copy source... dest"
 msgstr ""
 
-#: src/commands.c:1311
+#: src/commands.c:1264
 msgid "Copy resource(s) from source to dest"
 msgstr ""
 
-#: src/commands.c:1312
+#: src/commands.c:1265
 msgid "move source... dest"
 msgstr ""
 
-#: src/commands.c:1312
+#: src/commands.c:1265
 msgid "Move resource(s) from source to dest"
 msgstr ""
 
-#: src/commands.c:1318
+#: src/commands.c:1271
 msgid "lock resource"
 msgstr ""
 
-#: src/commands.c:1318
+#: src/commands.c:1271
 msgid "Lock given resource"
 msgstr ""
 
-#: src/commands.c:1319
+#: src/commands.c:1272
 msgid "unlock resource"
 msgstr ""
 
-#: src/commands.c:1319
+#: src/commands.c:1272
 msgid "Unlock given resource"
 msgstr ""
 
-#: src/commands.c:1320
+#: src/commands.c:1273
 msgid "discover resource"
 msgstr ""
 
-#: src/commands.c:1320
+#: src/commands.c:1273
 msgid "Display lock information for resource"
 msgstr ""
 
-#: src/commands.c:1321
+#: src/commands.c:1274
 msgid "steal resource"
 msgstr ""
 
-#: src/commands.c:1321
+#: src/commands.c:1274
 msgid "Steal lock token for resource"
 msgstr ""
 
-#: src/commands.c:1323
+#: src/commands.c:1276
 msgid "Display list of owned locks"
 msgstr ""
 
-#: src/commands.c:1327
+#: src/commands.c:1279
 msgid "verrsion resource"
 msgstr ""
 
-#: src/commands.c:1327
+#: src/commands.c:1279
 msgid "Place given resource under version control"
 msgstr ""
 
-#: src/commands.c:1328
+#: src/commands.c:1280
 msgid "checkin resource"
 msgstr ""
 
-#: src/commands.c:1328
+#: src/commands.c:1280
 msgid "Checkin given resource"
 msgstr ""
 
-#: src/commands.c:1329
+#: src/commands.c:1281
 msgid "checkout resource"
 msgstr ""
 
-#: src/commands.c:1329
+#: src/commands.c:1281
 msgid "Checkout given resource"
 msgstr ""
 
-#: src/commands.c:1330
+#: src/commands.c:1282
 msgid "uncheckin resource"
 msgstr ""
 
-#: src/commands.c:1330
+#: src/commands.c:1282
 msgid "Uncheckout given resource"
 msgstr ""
 
-#: src/commands.c:1331
+#: src/commands.c:1283
 msgid "history resource"
 msgstr ""
 
-#: src/commands.c:1331
+#: src/commands.c:1283
 msgid "Show version history of resource"
 msgstr ""
 
-#: src/commands.c:1334
+#: src/commands.c:1286
 msgid "label res [add|set|remove] labelname"
 msgstr ""
 
-#: src/commands.c:1335
+#: src/commands.c:1287
 msgid "Set/Del/Edit label on resource"
 msgstr ""
 
-#: src/commands.c:1339
+#: src/commands.c:1291
+msgid "propnames res"
+msgstr ""
+
+#: src/commands.c:1291
 msgid "Names of properties defined on resource"
 msgstr ""
 
-#: src/commands.c:1342
+#: src/commands.c:1294
 msgid "chexec [+|-] remote"
 msgstr ""
 
-#: src/commands.c:1342
+#: src/commands.c:1294
 msgid "Change isexecutable property of resource"
 msgstr ""
 
-#: src/commands.c:1345
+#: src/commands.c:1297
 msgid "propget res [propname]"
 msgstr ""
 
-#: src/commands.c:1346
+#: src/commands.c:1298
 msgid "Retrieve properties of resource"
 msgstr ""
 
-#: src/commands.c:1348
+#: src/commands.c:1300
 msgid "propdel res propname"
 msgstr ""
 
-#: src/commands.c:1349
+#: src/commands.c:1301
 msgid "Delete property from resource"
 msgstr ""
 
-#: src/commands.c:1351
+#: src/commands.c:1303
 msgid "propset res propname value"
 msgstr ""
 
-#: src/commands.c:1352
+#: src/commands.c:1304
 msgid "Set property on resource"
 msgstr ""
 
-#: src/commands.c:1356
+#: src/commands.c:1307
 msgid "search query"
 msgstr ""
 
-#: src/commands.c:1357
+#: src/commands.c:1308
 msgid ""
 "DASL Search resource in current collection\n"
 "\n"
@@ -1248,83 +1285,76 @@
 "      > search getcontentlength < 100\n"
 "   - search where author is Smith or Jones\n"
 "      > search author = Smith or author = Jones\n"
-msgstr ""
-
-#: src/commands.c:1363
-msgid ""
 " Available operators and keywords:\n"
 "     - and, or , (, ), =, <, >, <=, >=, like\n"
+" (See also variables searchdepth, searchorder, searchdorder)\n"
 msgstr ""
 
-#: src/commands.c:1365
-msgid " (See also variables searchdepth, searchorder, searchdorder)\n"
-msgstr ""
-
-#: src/commands.c:1369
+#: src/commands.c:1319
 msgid "set [option] [value]"
 msgstr ""
 
-#: src/commands.c:1369
+#: src/commands.c:1319
 msgid "Set an option, or display options"
 msgstr ""
 
-#: src/commands.c:1371
+#: src/commands.c:1321
 msgid "Open connection to given URL"
 msgstr ""
 
-#: src/commands.c:1373
+#: src/commands.c:1323
 msgid "Close current connection"
 msgstr ""
 
-#: src/commands.c:1377
+#: src/commands.c:1327
 msgid "Exit program"
 msgstr ""
 
-#: src/commands.c:1380
+#: src/commands.c:1330
 msgid "unset [option] [value]"
 msgstr ""
 
-#: src/commands.c:1380
+#: src/commands.c:1330
 msgid "Unsets or clears value from option."
 msgstr ""
 
-#: src/commands.c:1382
+#: src/commands.c:1332
 msgid "lcd [directory]"
 msgstr ""
 
-#: src/commands.c:1382
+#: src/commands.c:1332
 msgid "Change local working directory"
 msgstr ""
 
-#: src/commands.c:1384
+#: src/commands.c:1334
 msgid "lls [options]"
 msgstr ""
 
-#: src/commands.c:1384
+#: src/commands.c:1334
 msgid "Display local directory listing"
 msgstr ""
 
-#: src/commands.c:1385
+#: src/commands.c:1335
 msgid "Print local working directory"
 msgstr ""
 
-#: src/commands.c:1387
+#: src/commands.c:1337
 msgid "Logout of authentication session"
 msgstr ""
 
-#: src/commands.c:1388
+#: src/commands.c:1338
 msgid "help [command]"
 msgstr ""
 
-#: src/commands.c:1388
+#: src/commands.c:1338
 msgid "Display help message"
 msgstr ""
 
-#: src/commands.c:1390
+#: src/commands.c:1340
 msgid "Describe an option variable"
 msgstr ""
 
-#: src/commands.c:1391
+#: src/commands.c:1341
 msgid "Information about this version of cadaver"
 msgstr ""
 
@@ -1332,115 +1362,115 @@
 msgid "Unknown system error"
 msgstr ""
 
-#: src/edit.c:68
+#: src/edit.c:69
 #, c-format
 msgid "Could not stat file: %s\n"
 msgstr ""
 
-#: src/edit.c:74
+#: src/edit.c:75
 #, c-format
 msgid "Error! Could not examine temporary file: %s\n"
 msgstr ""
 
-#: src/edit.c:80
+#: src/edit.c:81
 #, c-format
 msgid "No changes were made.\n"
 msgstr ""
 
-#: src/edit.c:83
+#: src/edit.c:84
 #, c-format
 msgid "Changes were made.\n"
 msgstr ""
 
-#: src/edit.c:129
+#: src/edit.c:132
 #, c-format
 msgid "You cannot edit a collection resource (%s).\n"
 msgstr ""
 
-#: src/edit.c:146
+#: src/edit.c:149
 #, c-format
 msgid ""
 "Could not create temporary file %s:\n"
 "%s\n"
 msgstr ""
 
-#: src/edit.c:153
+#: src/edit.c:156
 #, c-format
 msgid ""
 "Could not set file permissions for %s:\n"
 "%s\n"
 msgstr ""
 
-#: src/edit.c:174
+#: src/edit.c:184
 #, c-format
 msgid "Downloading `%s' to %s"
 msgstr ""
 
-#: src/edit.c:180
+#: src/edit.c:190
 #, c-format
 msgid "Error writing to temporary file: %s\n"
 msgstr ""
 
-#: src/edit.c:189
+#: src/edit.c:199
 #, c-format
 msgid "Could not re-open temporary file: %s\n"
 msgstr ""
 
-#: src/edit.c:193
+#: src/edit.c:203
 #, c-format
 msgid "Uploading changes to `%s'"
 msgstr ""
 
-#: src/edit.c:201
+#: src/edit.c:211
 #, c-format
 msgid "Try uploading again (y/n)? "
 msgstr ""
 
-#: src/edit.c:212
+#: src/edit.c:222
 #, c-format
 msgid ""
 "Could not delete temporary file %s:\n"
 "%s\n"
 msgstr ""
 
-#: src/ls.c:99
+#: src/ls.c:100
 msgid "Ref:"
 msgstr ""
 
-#: src/ls.c:100
+#: src/ls.c:101
 msgid "Coll:"
 msgstr ""
 
-#: src/ls.c:118
+#: src/ls.c:119
 #, c-format
 msgid "Error: %-30s %d %s\n"
 msgstr ""
 
-#: src/ls.c:141
+#: src/ls.c:147
 msgid "Listing collection"
 msgstr ""
 
-#: src/ls.c:146
+#: src/ls.c:152
 msgid "collection is empty.\n"
 msgstr ""
 
-#: src/ls.c:218
+#: src/ls.c:224
 msgid "Authorization Required"
 msgstr ""
 
-#: src/ls.c:220
+#: src/ls.c:226
 msgid "Redirect"
 msgstr ""
 
-#: src/ls.c:222
+#: src/ls.c:228
 msgid "Server Error"
 msgstr ""
 
-#: src/ls.c:224
+#: src/ls.c:230
 msgid "Unknown Error"
 msgstr ""
 
-#: src/search.c:628
+#: src/search.c:666
 #, c-format
 msgid "Using query: "
 msgstr ""
@@ -1449,36 +1479,36 @@
 msgid "Did not find a collection resource."
 msgstr ""
 
-#: src/version.c:311
+#: src/version.c:339
 msgid "Versioning"
 msgstr ""
 
-#: src/version.c:316
+#: src/version.c:344
 msgid "Checking in"
 msgstr ""
 
-#: src/version.c:321
+#: src/version.c:349
 msgid "Checking out"
 msgstr ""
 
-#: src/version.c:326
+#: src/version.c:354
 msgid "Cancelling check out of"
 msgstr ""
 
-#: src/version.c:338
+#: src/version.c:366
 #, c-format
 msgid " %d version%s in history:\n"
 msgstr ""
 
-#: src/version.c:398
+#: src/version.c:430
 msgid "Version history of"
 msgstr ""
 
-#: src/version.c:424
+#: src/version.c:456
 #, c-format
 msgid "Invalid action `%s' given.\n"
 msgstr ""
 
-#: src/version.c:434
+#: src/version.c:466
 msgid "Labelling"
 msgstr ""
diff -urN cadaver-0.22.3-1-orig/src/cadaver-0.22.3/po/ja.po cadaver-0.22.3-1-i18n/src/cadaver-0.22.3/po/ja.po
--- cadaver-0.22.3-1-orig/src/cadaver-0.22.3/po/ja.po	1970-01-01 09:00:00.000000000 +0900
+++ cadaver-0.22.3-1-i18n/src/cadaver-0.22.3/po/ja.po	2006-08-18 04:14:49.302996800 +0900
@@ -0,0 +1,1575 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cadaver 0.22\n"
+"Report-Msgid-Bugs-To: cadaver@webdav.org\n"
+"POT-Creation-Date: 2006-08-18 01:27+0900\n"
+"PO-Revision-Date: 2006-08-18 04:14+0900\n"
+"Last-Translator: Yak! <yak_ex@mx.scn.tv>\n"
+"Language-Team: Japanese\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=EUC-JP\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: lib/getopt.c:680
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: ¥ª¥×¥·¥ç¥ó`%s'¤ÏÛ£Ëæ¤Ç¤¹\n"
+
+#: lib/getopt.c:704
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: ¥ª¥×¥·¥ç¥ó`--%s'¤Ë°ú¿ô¤ÏÍ¿¤¨¤é¤ì¤Þ¤»¤ó\n"
+
+#: lib/getopt.c:709
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: ¥ª¥×¥·¥ç¥ó`%c%s'¤Ë°ú¿ô¤ÏÍ¿¤¨¤é¤ì¤Þ¤»¤ó\n"
+
+#: lib/getopt.c:726 lib/getopt.c:899
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: ¥ª¥×¥·¥ç¥ó`%s'¤Ï 1 ¸Ä¤Î°ú¿ô¤¬É¬Í×¤Ç¤¹\n"
+
+#: lib/getopt.c:755
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: ¥ª¥×¥·¥ç¥ó`--%s'¤ÏÇ§¼±¤Ç¤­¤Ê¤¤¥ª¥×¥·¥ç¥ó¤Ç¤¹\n"
+
+#: lib/getopt.c:759
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: ¥ª¥×¥·¥ç¥ó`%c%s'¤ÏÇ§¼±¤Ç¤­¤Ê¤¤¥ª¥×¥·¥ç¥ó¤Ç¤¹\n"
+
+#: lib/getopt.c:785
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: Ìµ¸ú¤Ê¥ª¥×¥·¥ç¥ó -- %c\n"
+
+#: lib/getopt.c:788
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: Ìµ¸ú¤Ê¥ª¥×¥·¥ç¥ó -- %c\n"
+
+#: lib/getopt.c:818 lib/getopt.c:948
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: ¥ª¥×¥·¥ç¥ó`%c'¤Ï 1 ¸Ä¤Î°ú¿ô¤¬É¬Í×¤Ç¤¹\n"
+
+#: lib/getopt.c:865
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: ¥ª¥×¥·¥ç¥ó`-W %s'¤ÏÛ£Ëæ¤Ç¤¹\n"
+
+#: lib/getopt.c:883
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: ¥ª¥×¥·¥ç¥ó`-W %s'¤Ë¤Ï°ú¿ô¤òÍ¿¤¨¤é¤ì¤Þ¤»¤ó\n"
+
+#: lib/getpass.c:73
+msgid "ERROR: no support for getpassword() routine\n"
+msgstr "¥¨¥é¡¼: getpassword() ¥ë¡¼¥Á¥ó¤Î¥µ¥Ý¡¼¥È¤¬¤¢¤ê¤Þ¤»¤ó\n"
+
+#: lib/getpass.c:201
+#, c-format
+msgid ""
+"\n"
+"Caught SIGINT... bailing out.\n"
+msgstr ""
+"\n"
+"SIGINT ¤ò¥­¥ã¥Ã¥Á¤·¤Þ¤·¤¿¡Ä½ªÎ»¤·¤Þ¤¹\n"
+
+#: lib/neon/ne_207.c:188
+#, c-format
+msgid ""
+"Invalid HTTP status line in status element at line %d of response:\n"
+"Status line was: %s"
+msgstr ""
+"±þÅú¤Î %d ¹Ô¤ËÌµ¸ú¤Ê HTTP ¥¹¥Æ¡¼¥¿¥¹¹Ô¤¬¤¢¤ê¤Þ¤¹:\n"
+"¥¹¥Æ¡¼¥¿¥¹¹Ô: %s"
+
+#: lib/neon/ne_auth.c:124
+msgid "Server was not authenticated correctly."
+msgstr "¥µ¡¼¥Ð¤Ç¤ÎÇ§¾Ú¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
+
+#: lib/neon/ne_auth.c:128
+msgid "Proxy server was not authenticated correctly."
+msgstr "¥×¥í¥­¥·¡¼¥µ¡¼¥Ð¤Ç¤ÎÇ§¾Ú¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£"
+
+#: lib/neon/ne_auth.c:426
+#, c-format
+msgid "GSSAPI authentication error (%s)"
+msgstr "GSSAPIÇ§¾Ú¥¨¥é¡¼(%s)"
+
+#: lib/neon/ne_basic.c:86
+#, c-format
+msgid "Could not determine file size: %s"
+msgstr "¥Õ¥¡¥¤¥ë¥µ¥¤¥º¤¬·èÄê¤Ç¤­¤Þ¤»¤ó: %s"
+
+#: lib/neon/ne_basic.c:132
+msgid "Response did not include requested range"
+msgstr "±þÅú¤ËÍ×µáÈÏ°Ï¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤»¤ó¤Ç¤·¤¿"
+
+#: lib/neon/ne_basic.c:176
+msgid "Range is not satisfiable"
+msgstr "Í×µá¤µ¤ì¤¿ÈÏ°ÏÆâ¤Ë¤¢¤ê¤Þ¤»¤ó"
+
+#: lib/neon/ne_basic.c:181
+msgid "Resource does not support ranged GETs."
+msgstr "¥ê¥½¡¼¥¹¤ÏÈÏ°Ï»ØÄê¤Î GET ¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó¡£"
+
+#: lib/neon/ne_compress.c:175
+#, c-format
+msgid "%s: %s"
+msgstr "%s: %s"
+
+#: lib/neon/ne_compress.c:186
+#, c-format
+msgid "%s: %s (code %d)"
+msgstr "%s: %s (¥³¡¼¥É %d)"
+
+#: lib/neon/ne_compress.c:234
+msgid "Could not inflate data"
+msgstr "¥Ç¡¼¥¿¤òÅ¸³«¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
+
+#: lib/neon/ne_compress.c:295
+msgid "Could not initialize zlib"
+msgstr "zlib¤ò½é´ü²½¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
+
+#: lib/neon/ne_gnutls.c:434 lib/neon/ne_openssl.c:393
+msgid "Server certificate was missing commonName attribute in subject name"
+msgstr "¥µ¡¼¥Ð¤Î¾ÚÌÀ½ñ¤ÎÌ¾Á°¤Ë commonName Â°À­¤¬¤¢¤ê¤Þ¤»¤ó¤Ç¤·¤¿"
+
+#: lib/neon/ne_gnutls.c:471 lib/neon/ne_openssl.c:588
+#, c-format
+msgid "SSL negotiation failed: %s"
+msgstr "SSL ÀÜÂ³¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s"
+
+#: lib/neon/ne_gnutls.c:480
+msgid "Server did not send certificate chain"
+msgstr "¥µ¡¼¥Ð¤¬¾ÚÌÀ½ñ¥Á¥§¡¼¥ó¤òÁ÷¿®¤·¤Þ¤»¤ó¤Ç¤·¤¿"
+
+#: lib/neon/ne_locks.c:591
+msgid "LOCK response missing Lock-Token header"
+msgstr "LOCK ±þÅú¤Ë Lock-Token ¥Ø¥Ã¥À¤¬¤¢¤ê¤Þ¤»¤ó"
+
+#: lib/neon/ne_locks.c:744
+msgid "No Lock-Token header given"
+msgstr "Lock-Token ¥Ø¥Ã¥À¤¬Í¿¤¨¤é¤ì¤Þ¤»¤ó¤Ç¤·¤¿"
+
+#: lib/neon/ne_locks.c:772
+#, c-format
+msgid "Response missing activelock for %s"
+msgstr "±þÅú¤Ë %s ¤ÎÍ­¸ú¤Ê¥í¥Ã¥¯¤¬¤¢¤ê¤Þ¤»¤ó"
+
+#: lib/neon/ne_locks.c:816
+#, c-format
+msgid "No activelock for <%s> returned in LOCK refresh response"
+msgstr "LOCK ¥ê¥Õ¥ì¥Ã¥·¥å±þÅú¤Ç <%s> ¤ÎÍ­¸ú¤Ê¥í¥Ã¥¯¤¬¤¢¤ê¤Þ¤»¤ó"
+
+#: lib/neon/ne_openssl.c:176
+msgid "certificate is not yet valid"
+msgstr "¾ÚÌÀ½ñ¤Ï¤Þ¤ÀÍ­¸ú¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
+
+#: lib/neon/ne_openssl.c:177
+msgid "certificate has expired"
+msgstr "¾ÚÌÀ½ñ¤Ï¼º¸ú¤·¤Æ¤¤¤Þ¤¹"
+
+#: lib/neon/ne_openssl.c:178
+msgid "certificate issued for a different hostname"
+msgstr "¾ÚÌÀ½ñ¤ÏÊÌ¤Î¥Û¥¹¥ÈÌ¾¤ËÂÐ¤·¤ÆÈ¯¹Ô¤µ¤ì¤Æ¤¤¤Þ¤¹"
+
+#: lib/neon/ne_openssl.c:179
+msgid "issuer is not trusted"
+msgstr "È¯¹Ô¼Ô¤¬¿®Íê¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
+
+#: lib/neon/ne_openssl.c:184
+msgid "Server certificate verification failed: "
+msgstr "¥µ¡¼¥Ð¾ÚÌÀ½ñ¤Î¸¡¾Ú¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: "
+
+#: lib/neon/ne_openssl.c:202
+msgid "[invalid date]"
+msgstr "[ÉÔÀµ¤ÊÆüÉÕ]"
+
+#: lib/neon/ne_openssl.c:425
+#, c-format
+msgid "Certificate verification error: %s"
+msgstr "¾ÚÌÀ½ñ¤Î¸¡¾Ú¥¨¥é¡¼: %s"
+
+#: lib/neon/ne_openssl.c:607
+msgid "SSL server did not present certificate"
+msgstr "SSL ¥µ¡¼¥Ð¤¬¾ÚÌÀ½ñ¤òÄó¼¨¤·¤Þ¤»¤ó¤Ç¤·¤¿"
+
+#: lib/neon/ne_openssl.c:616
+msgid "Server certificate changed: connection intercepted?"
+msgstr "¥µ¡¼¥Ð¾ÚÌÀ½ñ¤¬ÊÑ¹¹¤µ¤ì¤Þ¤·¤¿: ÀÜÂ³¤¬²£¼è¤ê¤µ¤ì¤¿¤Î¤«¤â¤·¤ì¤Þ¤»¤ó"
+
+#: lib/neon/ne_props.c:372 lib/neon/ne_props.c:412
+msgid "Response exceeds maximum property count"
+msgstr "±þÅú¤¬ºÇÂç¥×¥í¥Ñ¥Æ¥£¿ô¤òÄ¶²á¤·¤Þ¤·¤¿"
+
+#: lib/neon/ne_redirect.c:92
+msgid "Could not parse redirect location."
+msgstr "¥ê¥À¥¤¥ì¥¯¥ÈÀè¤ò¥Ñ¡¼¥¹¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
+
+#: lib/neon/ne_request.c:233
+#, c-format
+msgid "%s: connection was closed by proxy server."
+msgstr "%s: ÀÜÂ³¤¬¥×¥í¥­¥·¥µ¡¼¥Ð¤Ë¤è¤Ã¤ÆÀÚÃÇ¤µ¤ì¤Þ¤·¤¿"
+
+#: lib/neon/ne_request.c:236
+#, c-format
+msgid "%s: connection was closed by server."
+msgstr "%s: ÀÜÂ³¤¬¥µ¡¼¥Ð¤Ë¤è¤Ã¤ÆÀÚÃÇ¤µ¤ì¤Þ¤·¤¿¡£"
+
+#: lib/neon/ne_request.c:241
+#, c-format
+msgid "%s: connection timed out."
+msgstr "%s: ÀÜÂ³¤¬¥¿¥¤¥à¥¢¥¦¥È¤·¤Þ¤·¤¿¡£"
+
+#: lib/neon/ne_request.c:395
+msgid "offset invalid"
+msgstr "ÉÔÀµ¤Ê¥ª¥Õ¥»¥Ã¥È¤Ç¤¹"
+
+#: lib/neon/ne_request.c:398
+#, fuzzy
+msgid "Could not seek to offset %"
+msgstr "¥ê¥¯¥¨¥¹¥ÈËÜÂÎ¥Õ¥¡¥¤¥ë¤Î¥ª¥Õ¥»¥Ã¥È"
+
+#: lib/neon/ne_request.c:399
+#, fuzzy, c-format
+msgid " of request body file: %s"
+msgstr "¤Ø¥·¡¼¥¯¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s"
+
+#: lib/neon/ne_request.c:443
+msgid "Could not send request body"
+msgstr "¥ê¥¯¥¨¥¹¥ÈËÜÂÎ¤òÁ÷¿®¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
+
+#: lib/neon/ne_request.c:791
+msgid "Could not read chunk size"
+msgstr "¥Á¥ã¥ó¥¯¥µ¥¤¥º¤¬ÆÉ¤ß¼è¤ì¤Þ¤»¤ó¤Ç¤·¤¿"
+
+#: lib/neon/ne_request.c:798
+msgid "Could not parse chunk size"
+msgstr "¥Á¥ã¥ó¥¯¥µ¥¤¥º¤ò¹½Ê¸²òÀÏ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
+
+#: lib/neon/ne_request.c:835
+msgid "Could not read response body"
+msgstr "±þÅúËÜÂÎ¤¬ÆÉ¤ß¼è¤ì¤Þ¤»¤ó¤Ç¤·¤¿"
+
+#: lib/neon/ne_request.c:851
+msgid "Could not read chunk delimiter"
+msgstr "¥Á¥ã¥ó¥¯¤Î¶èÀÚ¤ê¤¬ÆÉ¤ß¼è¤ì¤Þ¤»¤ó¤Ç¤·¤¿"
+
+#: lib/neon/ne_request.c:854
+msgid "Chunk delimiter was invalid"
+msgstr "¥Á¥ã¥ó¥¯¤Î¶èÀÚ¤ê¤¬ÉÔÀµ¤Ç¤·¤¿"
+
+#: lib/neon/ne_request.c:964
+msgid "Could not read status line"
+msgstr "¥¹¥Æ¡¼¥¿¥¹¹Ô¤¬ÆÉ¤ß¼è¤ì¤Þ¤»¤ó¤Ç¤·¤¿"
+
+#: lib/neon/ne_request.c:975
+msgid "Could not parse response status line."
+msgstr "±þÅú¤Î¥¹¥Æ¡¼¥¿¥¹¹Ô¤¬¹½Ê¸²òÀÏ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
+
+#: lib/neon/ne_request.c:986
+msgid "Could not read interim response headers"
+msgstr "Ãæ´Ö±þÅú¥Ø¥Ã¥À¤¬ÆÉ¤ß¼è¤ì¤Þ¤»¤ó¤Ç¤·¤¿"
+
+#: lib/neon/ne_request.c:1020
+msgid "Could not send request"
+msgstr "Í×µá¤òÁ÷¿®¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
+
+#: lib/neon/ne_request.c:1068 lib/neon/ne_request.c:1086
+#: lib/neon/ne_request.c:1096
+msgid "Error reading response headers"
+msgstr "±þÅú¥Ø¥Ã¥À¤ÎÆÉ¤ß¹þ¤ß¥¨¥é¡¼"
+
+#: lib/neon/ne_request.c:1114
+msgid "Response header too long"
+msgstr "±þÅú¥Ø¥Ã¥À¤¬Ä¹¤¹¤®¤Þ¤¹"
+
+#: lib/neon/ne_request.c:1196
+msgid "Response exceeded maximum number of header fields."
+msgstr "±þÅú¤¬¥Ø¥Ã¥ÀÍ×ÁÇ¤ÎºÇÂç¿ô¤òÄ¶²á¤·¤Æ¤¤¤Þ¤¹"
+
+#: lib/neon/ne_request.c:1213
+#, c-format
+msgid "Could not resolve hostname `%s': %s"
+msgstr "¥Û¥¹¥ÈÌ¾ `%s' ¤¬²ò·è¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s"
+
+#: lib/neon/ne_request.c:1323
+msgid "Invalid Content-Length in response"
+msgstr "±þÅúÃæ¤ÎÌµ¸ú¤Ê Content-Length"
+
+#: lib/neon/ne_request.c:1385 src/commands.c:918
+#, c-format
+msgid "Could not write to file: %s"
+msgstr "¥Õ¥¡¥¤¥ë %s ¤Ë½ñ¤­¹þ¤á¤Þ¤»¤ó¤Ç¤·¤¿"
+
+#: lib/neon/ne_request.c:1458
+msgid "Could not create SSL connection through proxy server"
+msgstr "¥×¥í¥­¥·¥µ¡¼¥Ð¤ò·ÐÍ³¤·¤Æ SSL ÀÜÂ³¤ò¹Ô¤¨¤Þ¤»¤ó¤Ç¤·¤¿"
+
+#: lib/neon/ne_request.c:1504
+msgid "Could not create socket"
+msgstr "¥½¥±¥Ã¥È¤òºîÀ®¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
+
+#: lib/neon/ne_request.c:1549
+msgid "Could not connect to server"
+msgstr "¥µ¡¼¥Ð¤ËÀÜÂ³¤Ç¤­¤Þ¤»¤ó"
+
+#: lib/neon/ne_request.c:1552
+msgid "Could not connect to proxy server"
+msgstr "¥×¥í¥­¥·¥µ¡¼¥Ð¤ËÀÜÂ³¤Ç¤­¤Þ¤»¤ó"
+
+#: lib/neon/ne_socket.c:490 lib/neon/ne_socket.c:538 lib/neon/ne_socket.c:641
+msgid "Connection closed"
+msgstr "ÀÜÂ³¤¬ÀÚÃÇ¤µ¤ì¤Þ¤·¤¿"
+
+#: lib/neon/ne_socket.c:548
+msgid "Secure connection truncated"
+msgstr "°ÂÁ´¤ÊÀÜÂ³¤¬ÀÚ¤êµÍ¤á¤é¤ì¤Þ¤·¤¿"
+
+#: lib/neon/ne_socket.c:560 lib/neon/ne_socket.c:645 lib/neon/ne_socket.c:650
+#, c-format
+msgid "SSL error: %s"
+msgstr "SSL¥¨¥é¡¼: %s"
+
+#: lib/neon/ne_socket.c:563
+#, c-format
+msgid "SSL error code %d/%d/%lu"
+msgstr "SSL ¥¨¥é¡¼¥³¡¼¥É %d/%d/%lu"
+
+#: lib/neon/ne_socket.c:745
+msgid "Line too long"
+msgstr "¹Ô¤¬Ä¹¤¹¤®¤Þ¤¹"
+
+#: lib/neon/ne_socket.c:885 lib/neon/ne_socket.c:891
+msgid "Host not found"
+msgstr "¥Û¥¹¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
+
+#: lib/neon/ne_socket.c:1001
+msgid "Socket descriptor number exceeds FD_SETSIZE"
+msgstr "¥½¥±¥Ã¥È¼±ÊÌ»Ò¤Î¿ô¤¬ FD_SETSIZE ¤òÄ¶¤¨¤Þ¤·¤¿"
+
+#: lib/neon/ne_socket.c:1161
+msgid "SSL disabled due to lack of entropy"
+msgstr "¥¨¥ó¥È¥í¥Ô¡¼ÉÔÂ­¤Î¤¿¤á SSL ¤ÏÌµ¸ú¤Ç¤¹"
+
+#: lib/neon/ne_socket.c:1168
+msgid "SSL disabled due to library version mismatch"
+msgstr "¥é¥¤¥Ö¥é¥ê¤Î¥Ð¡¼¥¸¥ç¥ó¤¬°ìÃ×¤·¤Ê¤¤¤¿¤á SSL ¤ÏÌµ¸ú¤Ç¤¹"
+
+#: lib/neon/ne_socket.c:1174
+msgid "Could not create SSL structure"
+msgstr "SSL ¹½Â¤ÂÎ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
+
+#: lib/neon/ne_xml.c:280
+#, c-format
+msgid "XML parse error at line %d: invalid element name"
+msgstr "XML ¹½Ê¸²òÀÏ¥¨¥é¡¼ %d ¹Ô: Ìµ¸ú¤ÊÍ×ÁÇÌ¾"
+
+#: lib/neon/ne_xml.c:436
+msgid "Unknown error"
+msgstr "ÉÔÌÀ¤Ê¥¨¥é¡¼"
+
+#: lib/neon/ne_xml.c:521
+msgid "Invalid Byte Order Mark"
+msgstr "Ìµ¸ú¤Ê Byte Order Mark"
+
+#: lib/neon/ne_xml.c:609
+#, c-format
+msgid "XML parse error at line %d: %s."
+msgstr "XML ¹½Ê¸²òÀÏ¥¨¥é¡¼ %d ¹Ô: %s¡£"
+
+#: lib/neon/ne_xmlreq.c:31
+#, c-format
+msgid "Could not parse response: %s"
+msgstr "±þÅú¤ò¤ò¹½Ê¸²òÀÏ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s"
+
+#: lib/rpmatch.c:75
+msgid "^[yY]"
+msgstr "^[yY]"
+
+#: lib/rpmatch.c:78
+msgid "^[nN]"
+msgstr "^[nN]"
+
+#: src/cadaver.c:135
+#, c-format
+msgid ""
+"Usage: %s [OPTIONS] http://hostname[:port]/path\n"
+"  Port defaults to 80, path defaults to '/'\n"
+"Options:\n"
+"  -t, --tolerant   Allow cd/open into non-WebDAV enabled collection.\n"
+"  -V, --version    Display version information.\n"
+"  -h, --help       Display this help message.\n"
+"Please send bug reports and feature requests to <cadaver@webdav.org>\n"
+msgstr ""
+"»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó] http://¥Û¥¹¥ÈÌ¾[:¥Ý¡¼¥È]/¥Ñ¥¹\n"
+"  ¥Ý¡¼¥È¤Î´ûÄêÃÍ¤Ï80, ¥Ñ¥¹¤Î´ûÄêÃÍ¤Ï '/'\n"
+"¥ª¥×¥·¥ç¥ó:\n"
+"  -t, --tolerant   ÈóWebDAV¤¬Í­¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤ë¥³¥ì¥¯¥·¥ç¥ó¤Ø¤Îcd/open¤òµö"
+"²Ä¡£\n"
+"  -V, --version    ¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤òÉ½¼¨¡£\n"
+"  -h, --help       ¤³¤Î¥Ø¥ë¥×¥á¥Ã¥»¡¼¥¸¤òÉ½¼¨¡£\n"
+"¥Ð¥°¥ì¥Ý¡¼¥È¤Èµ¡Ç½¶¯²½Í×µá¤Ï<cadaver@webdav.org>¤Þ¤Ç¡£\n"
+
+#: src/cadaver.c:160
+#, c-format
+msgid "Connection to `%s' closed.\n"
+msgstr "`%s'¤Ø¤ÎÀÜÂ³¤¬ÀÚÃÇ¤µ¤ì¤Þ¤·¤¿¡£\n"
+
+#: src/cadaver.c:181
+#, c-format
+msgid ""
+"Ignored error: %s not WebDAV-enabled:\n"
+"%s\n"
+msgstr ""
+"Ìµ»ë¤µ¤ì¤¿¥¨¥é¡¼:%s ¤Ï WebDAV ¤¬Ìµ¸ú¤Ç¤¹:\n"
+"%s\n"
+
+#: src/cadaver.c:189
+#, c-format
+msgid ""
+"Could not access %s (not WebDAV-enabled?):\n"
+"%s\n"
+msgstr ""
+"%s ¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤Þ¤»¤ó(WebDAV¤¬Í­¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤Ê¤¤?):\n"
+"%s\n"
+
+#: src/cadaver.c:204
+#, c-format
+msgid "WARNING: Untrusted server certificate presented for `%s':\n"
+msgstr "·Ù¹ð¡§`%s'¤ËÂÐ¤·¤Æ¿®Íê¤µ¤ì¤¤¤Æ¤¤¤Ê¤¤¥µ¡¼¥Ð¾ÚÌÀ¤¬Äó¼¨¤µ¤ì¤Þ¤·¤¿:\n"
+
+#: src/cadaver.c:207
+msgid "WARNING: Untrusted server certificate presented:\n"
+msgstr "·Ù¹ð¡§¿®Íê¤µ¤ì¤¤¤Æ¤¤¤Ê¤¤¥µ¡¼¥Ð¾ÚÌÀ¤¬Äó¼¨¤µ¤ì¤Þ¤·¤¿:\n"
+
+#: src/cadaver.c:210
+#, c-format
+msgid "Certificate was issued to hostname `%s' rather than `%s'\n"
+msgstr "¥Û¥¹¥È `%s' ¤Ç¤Ï¤Ê¤¯ `%s' ¤ËÈ¯¹Ô¤µ¤ì¤¿¾ÚÌÀ½ñ¤Ç¤¹\n"
+
+#: src/cadaver.c:212
+#, c-format
+msgid "This connection could have been intercepted.\n"
+msgstr "¤³¤ÎÀÜÂ³¤Ï²£¼è¤ê¤µ¤ì¤¿¤«¤â¤·¤ì¤Þ¤»¤ó¡£\n"
+
+#: src/cadaver.c:218
+#, c-format
+msgid "Issued to: %s\n"
+msgstr "È¯¹ÔÀè: %s\n"
+
+#: src/cadaver.c:219
+#, c-format
+msgid "Issued by: %s\n"
+msgstr "È¯¹Ô¸µ: %s\n"
+
+#: src/cadaver.c:222
+#, c-format
+msgid "Certificate is valid from %s to %s\n"
+msgstr " %s ¤è¤ê¥Û¥¹¥È %s ¤ÎÍ­¸ú¤Ê¾ÚÌÀ½ñ¤¬È¯¹Ô¤µ¤ì¤Þ¤·¤¿\n"
+
+#: src/cadaver.c:225
+#, c-format
+msgid "Do you wish to accept the certificate? (y/n) "
+msgstr "¤³¤Î¾ÚÌÀ½ñ¤òÇ§²Ä¤·¤Þ¤¹¤«¡©(y/n) "
+
+#: src/cadaver.c:228
+#, c-format
+msgid "Certificate rejected.\n"
+msgstr "¾ÚÌÀ½ñ¤ÏµñÈÝ¤µ¤ì¤Þ¤·¤¿¡£\n"
+
+#: src/cadaver.c:239
+#, c-format
+msgid "The server has requested a client certificate.\n"
+msgstr "¥µ¡¼¥Ð¤¬¥¯¥é¥¤¥¢¥ó¥È¾ÚÌÀ½ñ¤òÍ×µá¤·¤Þ¤·¤¿¡£\n"
+
+#: src/cadaver.c:256
+#, c-format
+msgid "Client certificate `%s' is encrypted.\n"
+msgstr "¥¯¥é¥¤¥¢¥ó¥È¾ÚÌÀ½ñ `%s' ¤Ï°Å¹æ²½¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n"
+
+#: src/cadaver.c:259
+msgid "Decryption password: "
+msgstr "Éü¹æ¥Ñ¥¹¥ï¡¼¥É: "
+
+#: src/cadaver.c:262
+#, c-format
+msgid "Password incorrect, try again.\n"
+msgstr "¥Ñ¥¹¥ï¡¼¥É¤¬Àµ¤·¤¯¤¢¤ê¤Þ¤»¤ó¡¢ºÆ»î¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
+
+#: src/cadaver.c:270
+#, c-format
+msgid "Using client certificate.\n"
+msgstr "¥¯¥é¥¤¥¢¥ó¥È¾ÚÌÀ½ñ¤ò»È¤¤¤Þ¤¹¡£\n"
+
+#: src/cadaver.c:289
+#, c-format
+msgid "Could not load client certificate from `%s'.\n"
+msgstr "`%s' ¤«¤é¥¯¥é¥¤¥¢¥ó¥È¾ÚÌÀ½ñ¤ò¥í¡¼¥É¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£\n"
+
+#: src/cadaver.c:331
+#, c-format
+msgid "Could not parse URL `%s'\n"
+msgstr "URL `%s' ¤ò¹½Ê¸²òÀÏ¤Ç¤­¤Ê¤¤\n"
+
+#: src/cadaver.c:343
+#, c-format
+msgid "SSL is not enabled.\n"
+msgstr "SSL ¤¬Í­¸ú¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n"
+
+#: src/cadaver.c:416 src/cadaver.c:419
+#, c-format
+msgid ""
+"Could not connect to `%s' on port %d:\n"
+"%s\n"
+msgstr ""
+"¥µ¡¼¥Ð `%s' ¤Î¥Ý¡¼¥È `%d' ¤ËÀÜÂ³¤Ç¤­¤Þ¤»¤ó:\n"
+"%s\n"
+
+#: src/cadaver.c:427
+#, c-format
+msgid ""
+"Could not open collection:\n"
+"%s\n"
+msgstr ""
+"¥³¥ì¥¯¥·¥ç¥ó¤ò³«¤±¤Þ¤»¤ó¤Ç¤·¤¿:\n"
+"%s\n"
+
+#: src/cadaver.c:465
+#, c-format
+msgid "Try `%s --help' for more information.\n"
+msgstr "`%s --help'¤Ç¤è¤ê¾ÜºÙ¤Ê¾ðÊó¤¬ÆÀ¤é¤ì¤Þ¤¹¡£\n"
+
+#: src/cadaver.c:516
+#, c-format
+msgid "Unrecognised command. Type 'help' for a list of commands.\n"
+msgstr "Íý²ò¤Ç¤­¤Ê¤¤¥³¥Þ¥ó¥É¡£¥³¥Þ¥ó¥É°ìÍ÷¤Ï 'help'¤ÇÆÀ¤é¤ì¤Þ¤¹¡£\n"
+
+#: src/cadaver.c:518
+#, c-format
+msgid "The `%s' command requires %d argument%s"
+msgstr "`%s'¥³¥Þ¥ó¥É¤Ï %d ¸Ä¤Î°ú¿ô%.0s¤¬É¬Í×¤Ç¤¹"
+
+#: src/cadaver.c:521 src/cadaver.c:533
+#, c-format
+msgid ""
+":\n"
+"  %s : %s\n"
+msgstr ""
+":\n"
+"  %s : %s\n"
+
+#: src/cadaver.c:527
+#, c-format
+msgid "The `%s' command takes at most %d argument%s"
+msgstr "`%s' ¥³¥Þ¥ó¥É¤Ï¾¯¤Ê¤¯¤È¤â %d¸Ä¤Î°ú¿ô%.0s¤¬É¬Í×¤Ç¤¹"
+
+#: src/cadaver.c:530
+#, c-format
+msgid "The `%s' command takes no arguments"
+msgstr "`%s'¥³¥Þ¥ó¥É¤Ï°ú¿ô¤¬ÉÔÍ×¤Ç¤¹"
+
+#: src/cadaver.c:538
+#, c-format
+msgid ""
+"The `%s' command can only be used when connected to the server.\n"
+"Try running `open' first (see `help open' for more details).\n"
+msgstr ""
+"`%s' ¥³¥Þ¥ó¥É¤Ï¡¢¥µ¡¼¥Ð¤ËÀÜÂ³Ãæ¤Ë¤Î¤ß»È¤¨¤Þ¤¹¡£\n"
+"ºÇ½é¤Ë`open'¥³¥Þ¥ó¥É¤ò»î¤·¤Æ²¼¤µ¤¤(¾ÜºÙ¤Ï`help open'¤Ç»²¾È¤Î¤³¤È)¡£\n"
+
+#: src/cadaver.c:583
+#, c-format
+msgid "Terminated by signal %d.\n"
+msgstr "¥·¥°¥Ê¥ë %d ¤Ç½ªÎ»¤·¤Þ¤·¤¿¡£\n"
+
+#: src/cadaver.c:618
+#, c-format
+msgid "Could not read rcfile %s: %s\n"
+msgstr "rc¥Õ¥¡¥¤¥ë %s¤¬ÆÉ¤á¤Þ¤»¤ó: %s\n"
+
+#: src/cadaver.c:862
+msgid "LOCALCHARSET"
+msgstr "EUC-JP"
+
+#: src/cadaver.c:890
+#, c-format
+msgid "Environment variable $HOME needs to be set!\n"
+msgstr "´Ä¶­ÊÑ¿ô $HOME¤ÎÀßÄê¤¬É¬Í×¤Ç¤¹!\n"
+
+#: src/cadaver.c:950
+#, c-format
+msgid "Looking up hostname... "
+msgstr "¥Û¥¹¥ÈÌ¾¤ò¸¡º÷Ãæ..."
+
+#: src/cadaver.c:953
+#, c-format
+msgid "Connecting to server... "
+msgstr "¥µ¡¼¥Ð¤ËÀÜÂ³Ãæ..."
+
+#: src/cadaver.c:956
+#, c-format
+msgid "connected.\n"
+msgstr "ÀÜÂ³´°Î»¡£\n"
+
+#: src/cadaver.c:959
+#, c-format
+msgid "Using secure connection: %s\n"
+msgstr "°Å¹æ²½ÀÜÂ³¤ò»ÈÍÑ¤·¤Þ¤¹: %s\n"
+
+#: src/cadaver.c:972
+#, c-format
+msgid " (reconnecting..."
+msgstr "(ºÆÀÜÂ³Ãæ..."
+
+#: src/cadaver.c:975
+#, c-format
+msgid "done)"
+msgstr "´°Î»)"
+
+#: src/cadaver.c:985
+#, c-format
+msgid "] reconnecting: "
+msgstr "] ºÆÀÜÂ³:"
+
+#: src/cadaver.c:988
+#, c-format
+msgid "okay ["
+msgstr "OK ["
+
+#: src/cadaver.c:998
+#, c-format
+msgid "\rTransfer timed out, reconnecting... "
+msgstr "\rÅ¾Á÷¥¿¥¤¥à¥¢¥¦¥È¡¢ºÆÀÜÂ³... "
+
+#: src/cadaver.c:1001
+#, c-format
+msgid "okay."
+msgstr "OK¡£"
+
+#: src/cadaver.c:1052
+#, c-format
+msgid "\rProgress: ["
+msgstr "\r·Ð²á: ["
+
+#: src/cadaver.c:1057
+#, fuzzy
+msgid "] %5.1f%% of %"
+msgstr "] %5.1f%% of %"
+
+#: src/cadaver.c:1057
+#, fuzzy, c-format
+msgid " bytes"
+msgstr " ¥Ð¥¤¥È"
+
+#: src/cadaver.c:1112
+msgid "Username: "
+msgstr "¥æ¡¼¥¶Ì¾:"
+
+#: src/cadaver.c:1114
+#, c-format
+msgid "\rAuthentication aborted!\n"
+msgstr "\rÇ§¾ÚÁàºî¤¬°Û¾ï½ªÎ»¤·¤Þ¤·¤¿!\n"
+
+#: src/cadaver.c:1117
+#, c-format
+msgid "\rUsername too long (>%d)\n"
+msgstr "\r¥æ¡¼¥¶Ì¾¤¬Ä¹¤¹¤®¤Þ¤¹ (>%d)\n"
+
+#: src/cadaver.c:1125
+msgid "Password: "
+msgstr "¥Ñ¥¹¥ï¡¼¥É: "
+
+#: src/cadaver.c:1127
+#, c-format
+msgid "Authentication aborted!\n"
+msgstr "Ç§¾ÚÁàºî¤¬°Û¾ï½ªÎ»¤·¤Þ¤·¤¿!\n"
+
+#: src/cadaver.c:1130
+#, c-format
+msgid "\rPassword too long (>%d)\n"
+msgstr "\r¥Ñ¥¹¥ï¡¼¥É¤¬Ä¹¤¹¤®¤Þ¤¹ (>%d)\n"
+
+#: src/cadaver.c:1139
+#, c-format
+msgid "Retrying:"
+msgstr "ºÆ»î¹Ô:"
+
+#: src/cadaver.c:1143
+#, c-format
+msgid "Retrying ["
+msgstr "ºÆ»î¹Ô ["
+
+#: src/cadaver.c:1166
+#, c-format
+msgid "Authentication required for %s on server `%s':\n"
+msgstr "%s ¤ò¥µ¡¼¥Ð`%s'¾å¤Ç¹Ô¤¦°Ù¤Ë¤ÏÇ§¾Ú¤¬É¬Í×¤Ç¤¹:\n"
+
+#: src/cadaver.c:1177
+#, c-format
+msgid "Authentication required for %s on proxy server `%s':\n"
+msgstr "%s ¤ò¥×¥í¥­¥·¥µ¡¼¥Ð`%s' ¾å¤Ç¹Ô¤¦°Ù¤Ë¤ÏÇ§¾Ú¤¬É¬Í×¤Ç¤¹:\n"
+
+#: src/cmdline.c:295
+msgid "[Matching..."
+msgstr "[°ìÃ×..."
+
+#: src/cmdline.c:322
+#, c-format
+msgid "%d matches.]\n"
+msgstr "%d·ï°ìÃ×¡£]\n"
+
+#: src/cmdline.c:324
+msgid "1 match.]\n"
+msgstr "1·ï°ìÃ×¡£]\n"
+
+#: src/commands.c:126
+msgid "succeeded.\n"
+msgstr "À®¸ù¤·¤Þ¤·¤¿¡£\n"
+
+#: src/commands.c:137
+msgid "authentication failed.\n"
+msgstr "Ç§¾Ú¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£\n"
+
+#: src/commands.c:140
+msgid "could not connect to server.\n"
+msgstr "¥µ¡¼¥Ð¤ËÀÜÂ³¤Ç¤­¤Þ¤»¤ó¡£\n"
+
+#: src/commands.c:143
+msgid "connection timed out.\n"
+msgstr "ÀÜÂ³¤¬¥¿¥¤¥à¥¢¥¦¥È¤·¤Þ¤·¤¿¡£\n"
+
+#: src/commands.c:150
+#, c-format
+msgid "redirect to %s\n"
+msgstr "%s ¤Ë¥ê¥À¥¤¥ì¥¯¥È¤·¤Þ¤¹\n"
+
+#: src/commands.c:155 src/commands.c:912
+#, c-format
+msgid ""
+"failed:\n"
+"%s\n"
+msgstr ""
+"¥¨¥é¡¼:\n"
+"%s\n"
+
+#: src/commands.c:250
+msgid "exclusive"
+msgstr "½ü³°"
+
+#: src/commands.c:251
+msgid "shared"
+msgstr "¶¦Í­"
+
+#: src/commands.c:252 src/commands.c:261 src/ls.c:120
+msgid "unknown"
+msgstr "ÉÔÌÀ"
+
+#: src/commands.c:259
+msgid "write"
+msgstr "½ñ¤­¹þ¤ß"
+
+#: src/commands.c:269
+msgid "infinite"
+msgstr "Ìµ¸ÂÂç"
+
+#: src/commands.c:270 src/commands.c:288
+msgid "invalid"
+msgstr "ÉÔÀµ"
+
+#: src/commands.c:272
+#, c-format
+msgid "%ld seconds"
+msgstr "%ld ÉÃ"
+
+#: src/commands.c:281
+msgid "infinity"
+msgstr "Ìµ¸Â"
+
+#: src/commands.c:302
+#, c-format
+msgid ""
+"Lock token <%s>:\n"
+"  Depth %s on `%s'\n"
+"  Scope: %s  Type: %s  Timeout: %s\n"
+"  Owner: %s\n"
+msgstr ""
+"¥í¥Ã¥¯¥È¡¼¥¯¥ó <%s>:\n"
+"  ¿¼¤µ %s (%s ¾å)\n"
+"  ¥¹¥³¡¼¥×: %s  ¥¿¥¤¥×: %s  ¥¿¥¤¥à¥¢¥¦¥È: %s\n"
+"  ½êÍ­¼Ô: %s\n"
+
+#: src/commands.c:309
+msgid "(none)"
+msgstr "(¤Ê¤·)"
+
+#: src/commands.c:324 src/commands.c:342
+#, c-format
+msgid "Failed on %s: %d %s\n"
+msgstr "%s ¾å¤Ç¼ºÇÔ: %d %s\n"
+
+#: src/commands.c:371
+msgid "Discovering locks on"
+msgstr "±¦µ­¤Ç¥í¥Ã¥¯¤òÁÜº÷"
+
+#: src/commands.c:376
+msgid "Stealing locks on"
+msgstr "±¦µ­¤Ç¥í¥Ã¥¯¤ò¶¯Ã¥"
+
+#: src/commands.c:390
+#, c-format
+msgid "No owned locks.\n"
+msgstr "½êÍ­¥í¥Ã¥¯¤¬¤¢¤ê¤Þ¤»¤ó¡£\n"
+
+#: src/commands.c:409
+msgid "Locking collection"
+msgstr "¥³¥ì¥¯¥·¥ç¥ó¤ò¥í¥Ã¥¯Ãæ"
+
+#: src/commands.c:411
+msgid "Locking"
+msgstr "¥í¥Ã¥¯Ãæ"
+
+#: src/commands.c:445
+msgid "Unlocking"
+msgstr "¥¢¥ó¥í¥Ã¥¯Ãæ"
+
+#: src/commands.c:449
+msgid "Enter locktoken: "
+msgstr "¥í¥Ã¥¯¥È¡¼¥¯¥ó¤ÎÆþÎÏ: "
+
+#: src/commands.c:472
+msgid "Creating"
+msgstr "ºîÀ®Ãæ"
+
+#: src/commands.c:485
+#, c-format
+msgid "%s failed: %s\n"
+msgstr "¥¨¥é¡¼ %s: %s\n"
+
+#: src/commands.c:511
+#, c-format
+msgid "Value of %s is: %s\n"
+msgstr "%s ¤ÎÃÍ: %s\n"
+
+#: src/commands.c:517
+#, c-format
+msgid "Could not fetch property: %d %s\n"
+msgstr "¥×¥í¥Ñ¥Æ¥£¤ò¼èÆÀ½ÐÍè¤Þ¤»¤ó: %d %s\n"
+
+#: src/commands.c:520
+#, c-format
+msgid "Server did not return result for %s\n"
+msgstr "¥µ¡¼¥Ð¤¬%s¤Î·ë²Ì¤òÊÖ¤·¤Þ¤»¤ó\n"
+
+#: src/commands.c:561
+msgid "Setting property on"
+msgstr "±¦µ­¤Î¥×¥í¥Ñ¥Æ¥£¤òÀßÄêÃæ"
+
+#: src/commands.c:566
+msgid "Deleting property on"
+msgstr "±¦µ­¤Î¥×¥í¥Ñ¥Æ¥£¤òºï½üÃæ"
+
+#: src/commands.c:587
+msgid "Fetching properties for"
+msgstr "±¦µ­¤Î¥×¥í¥Ñ¥Æ¥£¤ò¼èÆÀÃæ"
+
+#: src/commands.c:617
+msgid "Fetching property names"
+msgstr "±¦µ­¤Î¥×¥í¥Ñ¥Æ¥£Ì¾¤ò¼èÆÀÃæ"
+
+#: src/commands.c:648
+msgid "Deleting"
+msgstr "ºï½üÃæ"
+
+#: src/commands.c:651
+#, c-format
+msgid ""
+"is a collection resource.\n"
+"The `rm' command cannot be used to delete a collection.\n"
+"Use `rmcol %s' to delete this collection and ALL its contents.\n"
+msgstr ""
+"¤Ï¡¢¥³¥ì¥¯¥·¥ç¥ó¥ê¥½¡¼¥¹¤Ç¤¹¡£\n"
+"`rm' ¥³¥Þ¥ó¥É¤Ï¡¢¥³¥ì¥¯¥·¥ç¥ó¤Îºï½ü¤Ë»È¤¨¤Þ¤»¤ó¡£\n"
+"`rmcol %s' ¤ò¡¢¥³¥ì¥¯¥·¥ç¥ó¤È¤½¤ÎÆâÍÆÊªÁ´¤Æ¤Îºï½ü¤Ë»ÈÍÑ¤·¤Æ²¼¤µ¤¤¡£\n"
+
+#: src/commands.c:668
+msgid "Deleting collection"
+msgstr "¥³¥ì¥¯¥·¥ç¥ó¤òºï½üÃæ"
+
+#: src/commands.c:671
+#, c-format
+msgid ""
+"is not a collection.\n"
+"The `rmcol' command can only be used to delete collections.\n"
+"Use `rm %s' to delete this resource.\n"
+msgstr ""
+"¤Ï¥³¥ì¥¯¥·¥ç¥ó¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n"
+"`rmcol' ¥³¥Þ¥ó¥É¤Ï¥³¥ì¥¯¥·¥ç¥ó¤Îºï½ü¤Î¤ß¤Ë»È¤¨¤Þ¤¹¡£\n"
+"`rm %s' ¤ò¤³¤Î¥ê¥½¡¼¥¹¤Îºï½ü¤Ë»ÈÍÑ¤·¤Æ²¼¤µ¤¤¡£\n"
+
+#: src/commands.c:756 src/commands.c:775
+#, c-format
+msgid "Displaying `%s':\n"
+msgstr "`%s'¤òÉ½¼¨Ãæ:\n"
+
+#: src/commands.c:759
+#, c-format
+msgid ""
+"Error! Could not spawn pager `%s':\n"
+"%s\n"
+msgstr ""
+"¥¨¥é¡¼!¥Ú¡¼¥¸¥ã`%s'¤òµ¯Æ°¤Ç¤­¤Þ¤»¤ó:\n"
+"%s\n"
+
+#: src/commands.c:777
+#, c-format
+msgid "Failed: %s\n"
+msgstr "¼ºÇÔ: %s\n"
+
+#: src/commands.c:798
+#, c-format
+msgid "%s: %s and %s are the same resource.\n"
+msgstr "%s: %s¤È%s¤ÏÆ±¤¸¥ê¥½¡¼¥¹¤Ç¤¹¡£\n"
+
+#: src/commands.c:807
+#, c-format
+msgid "When %s multiple resources, the last argument must be a collection.\n"
+msgstr ""
+"%s ¤¬Ê£¿ô¤Î¥ê¥½¡¼¥¹¤Î»þ¡¢ºÇ¸å¤Î°ú¿ô¤Ï¥³¥ì¥¯¥·¥ç¥ó¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£\n"
+
+#: src/commands.c:825
+#, c-format
+msgid "Moving `%s' to `%s': "
+msgstr "`%s'¤ò`%s' ¤Ë°ÜÆ°Ãæ: "
+
+#: src/commands.c:831
+#, c-format
+msgid "Copying `%s' to `%s': "
+msgstr "`%s'¤ò`%s' ¤ËÊ£¼ÌÃæ: "
+
+#: src/commands.c:892
+#, c-format
+msgid "Enter local filename for `%s': "
+msgstr "`%s' ¤Î¥í¡¼¥«¥ë¥Õ¥¡¥¤¥ëÌ¾¤òÆþÎÏ¤·¤Æ²¼¤µ¤¤: "
+
+#: src/commands.c:898
+#, c-format
+msgid "cancelled.\n"
+msgstr "¥­¥ã¥ó¥»¥ë¤µ¤ì¤Þ¤·¤¿¡£\n"
+
+#: src/commands.c:909
+#, c-format
+msgid "Downloading `%s' to %s:"
+msgstr "`%s' ¤ò `%s' ¤Ë¥À¥¦¥ó¥í¡¼¥ÉÃæ:"
+
+#: src/commands.c:932
+#, c-format
+msgid "Uploading %s to `%s':"
+msgstr "%s ¤ò `%s' ¤Ë¥¢¥Ã¥×¥í¡¼¥ÉÃæ:"
+
+#: src/commands.c:935
+#, c-format
+msgid "Could not open file: %s\n"
+msgstr "¥Õ¥¡¥¤¥ë %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó\n"
+
+#: src/commands.c:969
+msgid "copying"
+msgstr "¥³¥Ô¡¼Ãæ"
+
+#: src/commands.c:969
+msgid "copy"
+msgstr "¥³¥Ô¡¼"
+
+#: src/commands.c:974
+msgid "moving"
+msgstr "°ÜÆ°Ãæ"
+
+#: src/commands.c:974
+msgid "move"
+msgstr "°ÜÆ°"
+
+#: src/commands.c:1037
+#, c-format
+msgid ""
+"Use:\n"
+"   chexec + %s   to make the resource executable\n"
+"or chexec - %s   to make the resource unexecutable\n"
+msgstr ""
+"°Ê²¼¤ò»ÈÍÑ:\n"
+"     chexec + %s ¥ê¥½¡¼¥¹¤ò¼Â¹Ô²ÄÇ½¤Ë¤·¤Þ¤¹\n"
+"Ëô¤Ï chexec - %s ¥ê¥½¡¼¥¹¤ò¼Â¹ÔÉÔ²ÄÇ½¤Ë¤·¤Þ¤¹\n"
+
+#: src/commands.c:1047
+msgid "Setting isexecutable"
+msgstr "isexecutable ¤òÀßÄêÃæ"
+
+#: src/commands.c:1053
+msgid "The server does not support the 'isexecutable' property."
+msgstr "¥µ¡¼¥Ð¤Ï 'isexecutable' ¥×¥í¥Ñ¥Æ¥£¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó¡£"
+
+#: src/commands.c:1068
+#, c-format
+msgid "Local directory: %s\n"
+msgstr "¥í¡¼¥«¥ë¥Ç¥£¥ì¥¯¥È¥ê: %s\n"
+
+#: src/commands.c:1084
+#, c-format
+msgid "Error executing ls: %s\n"
+msgstr "ls ¤Î¼Â¹Ô¥¨¥é¡¼: %s\n"
+
+#: src/commands.c:1088
+#, c-format
+msgid "Error forking ls: %s\n"
+msgstr "ls ¤Î¥Õ¥©¡¼¥¯¥¨¥é¡¼: %s\n"
+
+#: src/commands.c:1105
+#, c-format
+msgid "Could not determine home directory from environment.\n"
+msgstr "´Ä¶­ÊÑ¿ô¤«¤é¡¢¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤¬·èÄê¤Ç¤­¤Þ¤»¤ó¡£\n"
+
+#: src/commands.c:1110
+#, c-format
+msgid ""
+"Could not change local directory:\n"
+"chdir: %s\n"
+msgstr ""
+"¥í¡¼¥«¥ë¥Ç¥£¥ì¥¯¥È¥ê¤¬ÊÑ¹¹¤Ç¤­¤Þ¤»¤ó:\n"
+"chdir: %s\n"
+
+#: src/commands.c:1119
+#, c-format
+msgid "Current collection is `%s'.\n"
+msgstr "¸½ºß¤Î¥³¥ì¥¯¥·¥ç¥ó¤Ï %s ¤Ç¤¹¡£\n"
+
+#: src/commands.c:1130
+#, c-format
+msgid "No previous collection.\n"
+msgstr "°ÊÁ°¤Î¥³¥ì¥¯¥·¥ç¥ó¤¬¤¢¤ê¤Þ¤»¤ó¡£\n"
+
+#: src/commands.c:1173
+#, c-format
+msgid ""
+"Aliases: rm=delete, mkdir=mkcol, mv=move, cp=copy, more=less, quit=exit=bye\n"
+msgstr ""
+"ÊÌÌ¾: rm=delete, mkdir=mkcol, mv=move, cp=copy, more=less, quit=exit=bye\n"
+
+#: src/commands.c:1185
+#, c-format
+msgid " `%s'   %s\n"
+msgstr " `%s'   %s\n"
+
+#: src/commands.c:1187
+#, c-format
+msgid "This command can only be used when connected to a server.\n"
+msgstr "¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢¥µ¡¼¥Ð¤ËÀÜÂ³Ãæ¤Ë¤Î¤ß»ÈÍÑ¤Ç¤­¤Þ¤¹¡£\n"
+
+#: src/commands.c:1190
+#, c-format
+msgid "Command name not known: %s\n"
+msgstr "¥³¥Þ¥ó¥ÉÌ¾¤¬ÉÔÌÀ: %s\n"
+
+#: src/commands.c:1247
+msgid "ls [path]"
+msgstr "ls [¥Ñ¥¹]"
+
+#: src/commands.c:1247
+msgid "List contents of current [or other] collection"
+msgstr "¸½ºß[Ëô¤Ï¤½¤ÎÂ¾¤Î]¥³¥ì¥¯¥·¥ç¥ó¤ÎÆâÍÆ¤ò°ìÍ÷É½¼¨"
+
+#: src/commands.c:1248
+msgid "cd path"
+msgstr "cd ¥Ñ¥¹"
+
+#: src/commands.c:1248
+msgid "Change to specified collection"
+msgstr "»ØÄê¤µ¤ì¤¿¥³¥ì¥¯¥·¥ç¥ó¤ËÊÑ¹¹"
+
+#: src/commands.c:1250
+msgid "Display name of current collection"
+msgstr "¸½ºß¤Î¥³¥ì¥¯¥·¥ç¥óÌ¾¤òÉ½¼¨"
+
+#: src/commands.c:1252
+msgid "put local [remote]"
+msgstr "put ¥í¡¼¥«¥ë [¥ê¥â¡¼¥È]"
+
+#: src/commands.c:1252
+msgid "Upload local file"
+msgstr "¥í¡¼¥«¥ë¥Õ¥¡¥¤¥ë¤ò¥¢¥Ã¥×¥í¡¼¥É"
+
+#: src/commands.c:1254
+msgid "get remote [local]"
+msgstr "get ¥ê¥â¡¼¥È [¥í¡¼¥«¥ë]"
+
+#: src/commands.c:1254
+msgid "Download remote resource"
+msgstr "¥ê¥â¡¼¥È¥ê¥½¡¼¥¹¤ò¥À¥¦¥ó¥í¡¼¥É"
+
+#: src/commands.c:1255
+msgid "mget remote..."
+msgstr "mget ¥ê¥â¡¼¥È..."
+
+#: src/commands.c:1255
+msgid "Download many remote resources"
+msgstr "Ê£¿ô¤Î¥ê¥â¡¼¥È¥ê¥½¡¼¥¹¤ò¥À¥¦¥ó¥í¡¼¥É"
+
+#: src/commands.c:1257
+msgid "mput local..."
+msgstr "mput ¥í¡¼¥«¥ë..."
+
+#: src/commands.c:1257
+msgid "Upload many local files"
+msgstr "Ê£¿ô¤Î¥í¡¼¥«¥ë¥Õ¥¡¥¤¥ë¤ò¥¢¥Ã¥×¥í¡¼¥É"
+
+#: src/commands.c:1258
+msgid "edit resource"
+msgstr "edit ¥ê¥½¡¼¥¹"
+
+#: src/commands.c:1258
+msgid "Edit given resource"
+msgstr "Í¿¤¨¤é¤ì¤¿¥ê¥½¡¼¥¹¤òÊÔ½¸"
+
+#: src/commands.c:1259
+msgid "less remote..."
+msgstr "less ¥ê¥â¡¼¥È..."
+
+#: src/commands.c:1259
+msgid "Display remote resource through pager"
+msgstr "¥Ú¡¼¥¸¥ã¤òÄÌ¤·¤Æ¥ê¥â¡¼¥È¥ê¥½¡¼¥¹¤òÉ½¼¨"
+
+#: src/commands.c:1260
+msgid "mkcol remote..."
+msgstr "mkcol ¥ê¥â¡¼¥È..."
+
+#: src/commands.c:1260
+msgid "Create remote collection(s)"
+msgstr "¥ê¥â¡¼¥È¤Î¥³¥ì¥¯¥·¥ç¥ó¤òºîÀ®"
+
+#: src/commands.c:1261
+msgid "cat remote..."
+msgstr "cat ¥ê¥â¡¼¥È..."
+
+#: src/commands.c:1261
+msgid "Display remote resource(s)"
+msgstr "¥ê¥â¡¼¥È¥ê¥½¡¼¥¹¤òÉ½¼¨"
+
+#: src/commands.c:1262
+msgid "delete remote..."
+msgstr "delete ¥ê¥â¡¼¥È..."
+
+#: src/commands.c:1262
+msgid "Delete non-collection resource(s)"
+msgstr "Èó¥³¥ì¥¯¥·¥ç¥ó¥ê¥½¡¼¥¹¤òºï½ü"
+
+#: src/commands.c:1263
+msgid "rmcol remote..."
+msgstr "rmcol ¥ê¥â¡¼¥È..."
+
+#: src/commands.c:1263
+msgid "Delete remote collections and ALL contents"
+msgstr "¥ê¥â¡¼¥È¥³¥ì¥¯¥·¥ç¥ó¤È¤½¤ÎÁ´¥³¥ó¥Æ¥ó¥Ä¤òºï½ü"
+
+#: src/commands.c:1264
+msgid "copy source... dest"
+msgstr "copy ¥½¡¼¥¹... ÌÜÅªÃÏ"
+
+#: src/commands.c:1264
+msgid "Copy resource(s) from source to dest"
+msgstr "¥½¡¼¥¹¤Î¥ê¥½¡¼¥¹¤òÌÜÅªÃÏ¤Ë¥³¥Ô¡¼"
+
+#: src/commands.c:1265
+msgid "move source... dest"
+msgstr "move ¥½¡¼¥¹... ÌÜÅªÃÏ"
+
+#: src/commands.c:1265
+msgid "Move resource(s) from source to dest"
+msgstr "¥½¡¼¥¹¤Î¥ê¥½¡¼¥¹¤òÌÜÅªÃÏ¤Ë°ÜÆ°"
+
+#: src/commands.c:1271
+msgid "lock resource"
+msgstr "lock ¥ê¥½¡¼¥¹"
+
+#: src/commands.c:1271
+msgid "Lock given resource"
+msgstr "Í¿¤¨¤é¤ì¤¿¥ê¥½¡¼¥¹¤ò¥í¥Ã¥¯"
+
+#: src/commands.c:1272
+msgid "unlock resource"
+msgstr "unlock ¥ê¥½¡¼¥¹"
+
+#: src/commands.c:1272
+msgid "Unlock given resource"
+msgstr "Í¿¤¨¤é¤ì¤¿¥ê¥½¡¼¥¹¤Î¥í¥Ã¥¯¤ò²ò½ü"
+
+#: src/commands.c:1273
+msgid "discover resource"
+msgstr "discover ¥ê¥½¡¼¥¹"
+
+#: src/commands.c:1273
+msgid "Display lock information for resource"
+msgstr "¥ê¥½¡¼¥¹¤Î¥í¥Ã¥¯¾ðÊó¤òÉ½¼¨"
+
+#: src/commands.c:1274
+msgid "steal resource"
+msgstr "steal ¥ê¥½¡¼¥¹"
+
+#: src/commands.c:1274
+msgid "Steal lock token for resource"
+msgstr "¥ê¥½¡¼¥¹¤Î¥í¥Ã¥¯¥È¡¼¥¯¥ó¤ò¶¯Ã¥"
+
+#: src/commands.c:1276
+msgid "Display list of owned locks"
+msgstr "½êÍ­¤·¤Æ¤¤¤ë¥í¥Ã¥¯¤Î°ìÍ÷¤òÉ½¼¨"
+
+#: src/commands.c:1279
+msgid "verrsion resource"
+msgstr "version ¥ê¥½¡¼¥¹"
+
+#: src/commands.c:1279
+msgid "Place given resource under version control"
+msgstr "¥ê¥½¡¼¥¹¤ò¥Ð¡¼¥¸¥ç¥ó´ÉÍý²¼¤ËÃÖ¤¯"
+
+#: src/commands.c:1280
+msgid "checkin resource"
+msgstr "checkin ¥ê¥½¡¼¥¹"
+
+#: src/commands.c:1280
+msgid "Checkin given resource"
+msgstr "Í¿¤¨¤é¤ì¤¿¥ê¥½¡¼¥¹¤ò¥Á¥§¥Ã¥¯¥¤¥ó"
+
+#: src/commands.c:1281
+msgid "checkout resource"
+msgstr "checkout ¥ê¥½¡¼¥¹"
+
+#: src/commands.c:1281
+msgid "Checkout given resource"
+msgstr "Í¿¤¨¤é¤ì¤¿¥ê¥½¡¼¥¹¤ò¥Á¥§¥Ã¥¯¥¢¥¦¥È"
+
+#: src/commands.c:1282
+msgid "uncheckin resource"
+msgstr "uncheckout ¥ê¥½¡¼¥¹"
+
+#: src/commands.c:1282
+msgid "Uncheckout given resource"
+msgstr "Í¿¤¨¤é¤ì¤¿¥ê¥½¡¼¥¹¤Î¥Á¥§¥Ã¥¯¥¢¥¦¥È¤ò²ò½ü"
+
+#: src/commands.c:1283
+msgid "history resource"
+msgstr "history ¥ê¥½¡¼¥¹"
+
+#: src/commands.c:1283
+msgid "Show version history of resource"
+msgstr "¥ê¥½¡¼¥¹¤Î¥Ð¡¼¥¸¥ç¥óÍúÎò¤òÉ½¼¨"
+
+#: src/commands.c:1286
+msgid "label res [add|set|remove] labelname"
+msgstr "label ¥ê¥½¡¼¥¹ [add|set|remove] ¥é¥Ù¥ëÌ¾"
+
+#: src/commands.c:1287
+msgid "Set/Del/Edit label on resource"
+msgstr "¥ê¥½¡¼¥¹¤Î¥é¥Ù¥ë¤òÀßÄê/ºï½ü/ÊÔ½¸"
+
+#: src/commands.c:1291
+msgid "propnames res"
+msgstr "propnames ¥ê¥½¡¼¥¹"
+
+#: src/commands.c:1291
+msgid "Names of properties defined on resource"
+msgstr "¥ê¥½¡¼¥¹¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤ë¥×¥í¥Ñ¥Æ¥£Ì¾¤òÉ½¼¨"
+
+#: src/commands.c:1294
+msgid "chexec [+|-] remote"
+msgstr "chexec [+|-] ¥ê¥â¡¼¥È"
+
+#: src/commands.c:1294
+msgid "Change isexecutable property of resource"
+msgstr "¥ê¥½¡¼¥¹¤Î¼Â¹Ô²ÄÇ½¥×¥í¥Ñ¥Æ¥£¤ÎÊÑ¹¹"
+
+#: src/commands.c:1297
+msgid "propget res [propname]"
+msgstr "propget ¥ê¥½¡¼¥¹ [¥×¥í¥Ñ¥Æ¥£Ì¾]"
+
+#: src/commands.c:1298
+msgid "Retrieve properties of resource"
+msgstr "¥ê¥½¡¼¥¹¤Î¥×¥í¥Ñ¥Æ¥£¤Î¼èÆÀ"
+
+#: src/commands.c:1300
+msgid "propdel res propname"
+msgstr "propdel ¥ê¥½¡¼¥¹ ¥×¥í¥Ñ¥Æ¥£Ì¾"
+
+#: src/commands.c:1301
+msgid "Delete property from resource"
+msgstr "¥×¥í¥Ñ¥Æ¥£¤òºï½ü"
+
+#: src/commands.c:1303
+msgid "propset res propname value"
+msgstr "propset ¥ê¥½¡¼¥¹ ¥×¥í¥Ñ¥Æ¥£Ì¾ ÃÍ"
+
+#: src/commands.c:1304
+msgid "Set property on resource"
+msgstr "¥×¥í¥Ñ¥Æ¥£¤òÀßÄê"
+
+#: src/commands.c:1307
+msgid "search query"
+msgstr "search ¥¯¥¨¥ê¡¼"
+
+#: src/commands.c:1308
+msgid ""
+"DASL Search resource in current collection\n"
+"\n"
+" Examples:\n"
+"   - search where content length is smaller than 100:\n"
+"      > search getcontentlength < 100\n"
+"   - search where author is Smith or Jones\n"
+"      > search author = Smith or author = Jones\n"
+" Available operators and keywords:\n"
+"     - and, or , (, ), =, <, >, <=, >=, like\n"
+" (See also variables searchdepth, searchorder, searchdorder)\n"
+msgstr ""
+"¸½ºß¤Î¥³¥ì¥¯¥·¥ç¥óÃæ¤Ç¥ê¥½¡¼¥¹¤òDASL¸¡º÷¤¹¤ë\n"
+"\n"
+" Îã:\n"
+"   - ¥³¥ó¥Æ¥ó¥È¤ÎÄ¹¤µ¤¬100¤è¤ê¾®¤µ¤¤¤â¤Î¤ò¸¡º÷:\n"
+"      > search getcontentlength < 100\n"
+"   - author ¤¬ Smith ¤« Jones ¤Î¤â¤Î¤ò¸¡º÷\n"
+"      > search author = Smith or author = Jones\n"
+" ÍøÍÑ²ÄÇ½¤Ê±é»»»Ò¤È¥­¡¼¥ï¡¼¥É:\n"
+"     - and, or , (, ), =, <, >, <=, >=, like\n"
+" (ÊÑ¿ô searchdepth, searchorder, searchdorder ¤â»²¾È)\n"
+
+#: src/commands.c:1319
+msgid "set [option] [value]"
+msgstr "set [¥ª¥×¥·¥ç¥ó] [ÃÍ]"
+
+#: src/commands.c:1319
+msgid "Set an option, or display options"
+msgstr "¥ª¥×¥·¥ç¥óËô¤ÏÉ½¼¨¥ª¥×¥·¥ç¥ó¤òÀßÄê"
+
+#: src/commands.c:1321
+msgid "Open connection to given URL"
+msgstr "Í¿¤¨¤é¤ì¤¿URL¤Ø¤ÎÀÜÂ³¤ò¥ª¡¼¥×¥ó"
+
+#: src/commands.c:1323
+msgid "Close current connection"
+msgstr "¸½ºß¤ÎÀÜÂ³¤òÀÚÃÇ"
+
+#: src/commands.c:1327
+msgid "Exit program"
+msgstr "¥×¥í¥°¥é¥à¤ò½ªÎ»"
+
+#: src/commands.c:1330
+msgid "unset [option] [value]"
+msgstr "unset [¥ª¥×¥·¥ç¥ó] [ÃÍ]"
+
+#: src/commands.c:1330
+msgid "Unsets or clears value from option."
+msgstr "¥ª¥×¥·¥ç¥ó¤«¤é¤ÎÃÍ¤òÈó¥»¥Ã¥È¤Þ¤¿¤Ï¥¯¥ê¥¢"
+
+#: src/commands.c:1332
+msgid "lcd [directory]"
+msgstr "lcd [¥Ç¥£¥ì¥¯¥È¥ê]"
+
+#: src/commands.c:1332
+msgid "Change local working directory"
+msgstr "¥í¡¼¥«¥ëºî¶È¥Ç¥£¥ì¥¯¥È¥ê¤òÊÑ¹¹"
+
+#: src/commands.c:1334
+msgid "lls [options]"
+msgstr "lls [¥ª¥×¥·¥ç¥ó]"
+
+#: src/commands.c:1334
+msgid "Display local directory listing"
+msgstr "¥í¡¼¥«¥ë¥Ç¥£¥ì¥¯¥È¥ê¥ê¥¹¥È¤òÉ½¼¨"
+
+#: src/commands.c:1335
+msgid "Print local working directory"
+msgstr "¥í¡¼¥«¥ëºî¶È¥Ç¥£¥ì¥¯¥È¥ê¤òÉ½¼¨"
+
+#: src/commands.c:1337
+msgid "Logout of authentication session"
+msgstr "Ç§¾Ú¤µ¤ì¤¿¥»¥Ã¥·¥ç¥ó¤«¤é¥í¥°¥¢¥¦¥È"
+
+#: src/commands.c:1338
+msgid "help [command]"
+msgstr "help [¥³¥Þ¥ó¥É]"
+
+#: src/commands.c:1338
+msgid "Display help message"
+msgstr "¥Ø¥ë¥×¥á¥Ã¥»¡¼¥¸¤òÉ½¼¨"
+
+#: src/commands.c:1340
+msgid "Describe an option variable"
+msgstr "¥ª¥×¥·¥ç¥óÊÑ¿ô¤Îµ­½Ò"
+
+#: src/commands.c:1341
+msgid "Information about this version of cadaver"
+msgstr "cadaver¤Î¥Ð¡¼¥¸¥ç¥ó¾ðÊó"
+
+#: src/common.c:46
+msgid "Unknown system error"
+msgstr "ÉÔÌÀ¤Ê¥·¥¹¥Æ¥à¥¨¥é¡¼"
+
+#: src/edit.c:69
+#, c-format
+msgid "Could not stat file: %s\n"
+msgstr "¥Õ¥¡¥¤¥ë %s ¤Î¾ðÊó¤¬¼èÆÀ¤Ç¤­¤Þ¤»¤ó\n"
+
+#: src/edit.c:75
+#, c-format
+msgid "Error! Could not examine temporary file: %s\n"
+msgstr "¥¨¥é¡¼!°ì»þ¥Õ¥¡¥¤¥ë¤ò³ÎÇ§¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s\n"
+
+#: src/edit.c:81
+#, c-format
+msgid "No changes were made.\n"
+msgstr "ÊÑ¹¹¤¬¤¢¤ê¤Þ¤»¤ó¤Ç¤·¤¿¡£\n"
+
+#: src/edit.c:84
+#, c-format
+msgid "Changes were made.\n"
+msgstr "ÊÑ¹¹¤¬¤¢¤ê¤Þ¤·¤¿¡£\n"
+
+#: src/edit.c:132
+#, c-format
+msgid "You cannot edit a collection resource (%s).\n"
+msgstr "¥³¥ì¥¯¥·¥ç¥ó¥ê¥½¡¼¥¹(%s)¤ÏÊÔ½¸¤Ç¤­¤Þ¤»¤ó¡£\n"
+
+#: src/edit.c:149
+#, c-format
+msgid ""
+"Could not create temporary file %s:\n"
+"%s\n"
+msgstr ""
+"°ì»þ¥Õ¥¡¥¤¥ë %s ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿:\n"
+"%s\n"
+
+#: src/edit.c:156
+#, c-format
+msgid ""
+"Could not set file permissions for %s:\n"
+"%s\n"
+msgstr ""
+"%s ¤Î¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó¤òÀßÄê¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿:\n"
+"%s\n"
+
+#: src/edit.c:184
+#, c-format
+msgid "Downloading `%s' to %s"
+msgstr "`%s' ¤ò `%s' ¤Ë¥À¥¦¥ó¥í¡¼¥ÉÃæ:"
+
+#: src/edit.c:190
+#, c-format
+msgid "Error writing to temporary file: %s\n"
+msgstr "°ì»þ¥Õ¥¡¥¤¥ë¤Ø¤Î½ñ¤­¹þ¤ß¥¨¥é¡¼: %s\n"
+
+#: src/edit.c:199
+#, c-format
+msgid "Could not re-open temporary file: %s\n"
+msgstr "°ì»þ¥Õ¥¡¥¤¥ë¤òºÆ¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s\n"
+
+#: src/edit.c:203
+#, c-format
+msgid "Uploading changes to `%s'"
+msgstr "ÊÑ¹¹¤ò `%s' ¤Ë¥¢¥Ã¥×¥í¡¼¥ÉÃæ:"
+
+#: src/edit.c:211
+#, c-format
+msgid "Try uploading again (y/n)? "
+msgstr "¥¢¥Ã¥×¥í¡¼¥É¤òºÆ»î¹Ô¤·¤Þ¤¹¤« (y/n)?"
+
+#: src/edit.c:222
+#, c-format
+msgid ""
+"Could not delete temporary file %s:\n"
+"%s\n"
+msgstr ""
+"°ì»þ¥Õ¥¡¥¤¥ë %s ¤òºï½ü¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿:\n"
+"%s\n"
+
+#: src/ls.c:100
+msgid "Ref:"
+msgstr "»²¾È:"
+
+#: src/ls.c:101
+msgid "Coll:"
+msgstr "¥³¥ì¥¯¥·¥ç¥ó:"
+
+#: src/ls.c:119
+#, c-format
+msgid "Error: %-30s %d %s\n"
+msgstr "¥¨¥é¡¼:%-30s %d %s\n"
+
+#: src/ls.c:147
+msgid "Listing collection"
+msgstr "¥³¥ì¥¯¥·¥ç¥ó¤Î¥ê¥¹¥È"
+
+#: src/ls.c:152
+msgid "collection is empty.\n"
+msgstr "¥³¥ì¥¯¥·¥ç¥ó¤¬¶õ¤Ç¤¹¡£\n"
+
+#: src/ls.c:224
+msgid "Authorization Required"
+msgstr "Ç§¾Ú¤¬É¬Í×¤Ç¤¹"
+
+#: src/ls.c:226
+msgid "Redirect"
+msgstr "¥ê¥À¥¤¥ì¥¯¥È"
+
+#: src/ls.c:228
+msgid "Server Error"
+msgstr "¥µ¡¼¥Ð¥¨¥é¡¼"
+
+#: src/ls.c:230
+msgid "Unknown Error"
+msgstr "ÉÔÌÀ¤Ê¥¨¥é¡¼"
+
+#: src/search.c:666
+#, c-format
+msgid "Using query: "
+msgstr "°Ê²¼¤Î¥¯¥¨¥ê¡¼¤ò»ÈÍÑ: "
+
+#: src/utils.c:50
+msgid "Did not find a collection resource."
+msgstr "¥³¥ì¥¯¥·¥ç¥ó¥ê¥½¡¼¥¹¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿"
+
+#: src/version.c:339
+msgid "Versioning"
+msgstr "¥Ð¡¼¥¸¥ç¥ó²½"
+
+#: src/version.c:344
+msgid "Checking in"
+msgstr "¥Á¥§¥Ã¥¯¥¤¥ó"
+
+#: src/version.c:349
+msgid "Checking out"
+msgstr "¥Á¥§¥Ã¥¯¥¢¥¦¥È"
+
+#: src/version.c:354
+msgid "Cancelling check out of"
+msgstr "¥Á¥§¥Ã¥¯¥¢¥¦¥È¤ò²ò½ü"
+
+#: src/version.c:366
+#, c-format
+msgid " %d version%s in history:\n"
+msgstr "ÍúÎòÆâ¤Ë %d ¥Ð¡¼¥¸¥ç¥ó%.0sÍ­¤ê:\n"
+
+#: src/version.c:430
+msgid "Version history of"
+msgstr "¥Ð¡¼¥¸¥ç¥óÍúÎò"
+
+#: src/version.c:456
+#, c-format
+msgid "Invalid action `%s' given.\n"
+msgstr "Ìµ¸ú¤Ê¥¢¥¯¥·¥ç¥ó `%s' ¤¬Í¿¤¨¤é¤ì¤Þ¤·¤¿¡£\n"
+
+#: src/version.c:466
+msgid "Labelling"
+msgstr "¥é¥Ù¥ëÉÕ¤±"
diff -urN cadaver-0.22.3-1-orig/src/cadaver-0.22.3/src/cadaver.c cadaver-0.22.3-1-i18n/src/cadaver-0.22.3/src/cadaver.c
--- cadaver-0.22.3-1-orig/src/cadaver-0.22.3/src/cadaver.c	2005-12-31 21:57:37.000000000 +0900
+++ cadaver-0.22.3-1-i18n/src/cadaver-0.22.3/src/cadaver.c	2006-08-01 01:17:56.255238400 +0900
@@ -42,6 +42,13 @@
 #ifdef HAVE_LOCALE_H
 #include <locale.h>
 #endif
+#ifdef HAVE_LANGINFO_CODESET
+#include <langinfo.h>
+#endif
+#if defined(HAVE_ICONV) && defined(__CYGWIN__)
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#endif
 
 
 #include <errno.h>
@@ -76,6 +83,8 @@
 #include "options.h"
 #include "utils.h"
 
+#include "codeconv.h"
+
 #define DEFAULT_NAMESPACE "http://webdav.org/cadaver/custom-properties/"
 
 #ifdef ENABLE_NETRC
@@ -160,19 +169,26 @@
  * collection. */
 int set_path(const char *newpath)
 {
+    char *pt1, *pt2;
     int is_coll = (getrestype(newpath) == resr_collection);
+
+    pt1 = fromUTF8(pt2 = ne_path_unescape(newpath));
+    free(pt2);
+
     if (is_coll || tolerant) {
 	if (!is_coll) {
 	    session.isdav = 0;
-	    printf(_("Ignored error: %s not WebDAV-enabled:\n%s\n"), newpath,
+	    printf(_("Ignored error: %s not WebDAV-enabled:\n%s\n"), pt1,
 		   ne_get_error(session.sess));
 	} else {
 	    session.isdav = 1;
 	}
+	free(pt1);
 	return 0;
     } else {
-	printf(_("Could not access %s (not WebDAV-enabled?):\n%s\n"), newpath,
+	printf(_("Could not access %s (not WebDAV-enabled?):\n%s\n"), pt1,
 	       ne_get_error(session.sess));
+	free(pt1);
 	return 1;
     }
 }
@@ -220,7 +236,7 @@
     const char *ccfn = userdata;
     int n;
 
-    printf("The server has requested a client certificate.\n");
+    printf(_("The server has requested a client certificate.\n"));
 
 #if 0
     /* display CA names? */
@@ -237,13 +253,13 @@
         
         if (!name) name = ccfn;
         
-        printf("Client certificate `%s' is encrypted.\n", name);
+        printf(_("Client certificate `%s' is encrypted.\n"), name);
         
         for (n = 0; n < 3; n++) {
             pass = fm_getpassword(_("Decryption password: "));
             if (pass == NULL) break;
             if (ne_ssl_clicert_decrypt(client_cert, pass)) {
-                printf("Password incorrect, try again.\n");
+                printf(_("Password incorrect, try again.\n"));
             } else {
                 break;
             }
@@ -251,7 +267,7 @@
     }
     
     if (!ne_ssl_clicert_encrypted(client_cert)) {
-        printf("Using client certificate.\n");
+        printf(_("Using client certificate.\n"));
         ne_ssl_set_clicert(session.sess, client_cert);
     }
     
@@ -270,7 +286,7 @@
         if (client_cert) {
             ne_ssl_provide_clicert(session.sess, provide_clicert, ccfn);
         } else {
-            printf("Could not load client certificate from `%s'.\n",
+            printf(_("Could not load client certificate from `%s'.\n"),
                    ccfn);
         }
     }
@@ -471,10 +487,12 @@
     static char prompt[BUFSIZ];
 
     if (session.uri.path) {
-        char *p = ne_path_unescape(session.uri.path);
+	char *pt;
+        char *p = fromUTF8(pt = ne_path_unescape(session.uri.path));
 	ne_snprintf(prompt, BUFSIZ, "dav:%s%c ", p,
                     session.isdav ? '>' : '?');
         ne_free(p);
+        ne_free(pt);
     } else {
 	sprintf(prompt, "dav:!> ");
     }
@@ -631,7 +649,7 @@
     static time_t last_fetch;
     static char *last_path;
 
-    char *name;
+    char *name, *pt;
     
     if (state == 0) {
 	/* Check to see if we should refresh the dumb cache.
@@ -685,7 +703,8 @@
 	} else {
 	    name = current->uri;
 	}
-	name = ne_path_unescape(name);
+	name = fromUTF8(pt = ne_path_unescape(name));
+	free(pt);
 
 	if (strncmp(text, name, len) == 0) {
 	    current = current->next;
@@ -794,6 +813,22 @@
 }
 #endif
 
+#if defined(HAVE_ICONV) && defined(__CYGWIN__)
+/* Extract from APR implementation misc/win32/charset.c */
+static char* get_cp(void)
+{
+    static char cp[8]; // "CP" + "65535" + NUL
+    LCID locale = GetThreadLocale();
+    if(GetLocaleInfo(locale, LOCALE_IDEFAULTANSICODEPAGE, cp + 2, sizeof(cp) - 2) > 0) {
+	cp[0] = 'C';
+	cp[1] = 'P';
+	return cp;
+    }
+    sprintf(cp, "CP%u", (unsigned short)GetACP());
+    return cp;
+}
+#endif
+
 static void init_options(void)
 {
     char *lockowner, *tmp;
@@ -816,15 +851,20 @@
     lockscope = ne_lockscope_exclusive;
     searchdepth = NE_DEPTH_INFINITE;
 
-    /* This is what Markus Kahn says we should do. */
-    if ((tmp = getenv("LC_ALL")) ||
-	(tmp = getenv("LC_CTYPE")) ||
-	(tmp = getenv("LANG"))) {
-	if (strstr(tmp, "UTF-8")) {
-	    int val = 1;
-	    set_option(opt_utf8, &val);
-	}
-    }
+#ifdef HAVE_ICONV
+#ifdef __CYGWIN__
+    tmp = get_cp();
+    setenv("OUTPUT_CHARSET", tmp, 0); /* Currently, cygwin has no locale support */
+#else
+#ifdef HAVE_LANGINFO_CODESET
+    tmp = nl_langinfo(CODESET);
+#else
+    tmp = _("LOCALCHARSET");
+#endif
+#endif
+    if (strcmp(tmp, "LOCALCHARSET") != 0)
+	set_option(opt_localcharset, ne_strdup(tmp));
+#endif
 
 }
 
diff -urN cadaver-0.22.3-1-orig/src/cadaver-0.22.3/src/cmdline.c cadaver-0.22.3-1-i18n/src/cadaver-0.22.3/src/cmdline.c
--- cadaver-0.22.3-1-orig/src/cadaver-0.22.3/src/cmdline.c	2005-12-29 20:44:41.000000000 +0900
+++ cadaver-0.22.3-1-i18n/src/cadaver-0.22.3/src/cmdline.c	2006-08-01 01:42:37.315580800 +0900
@@ -45,6 +45,7 @@
 #include "cadaver.h"
 #include "cmdline.h"
 #include "utils.h"
+#include "codeconv.h"
 
 static int has_glob_pattern(const char *str) {
     const char *pnt;
@@ -182,7 +183,8 @@
 {
     struct dg_ctx *ctx = NULL;
     struct resource *files;
-    char *real_path = resolve_path(session.uri.path, dir, 1);
+    char *pt;
+    char *real_path = resolve_path(session.uri.path, pt = toUTF8(dir), 1);
     NE_DEBUG(DEBUG_FILES, "opendir: %s\n", dir);
     switch (fetch_resource_list(session.sess, real_path, 1, 0, &files)) {
     case NE_OK:
@@ -200,6 +202,7 @@
 	break;
     }	
     free(real_path);
+    free(pt);
     return (void *)ctx;
 }
 
@@ -213,8 +216,13 @@
 	NE_DEBUG(DEBUG_FILES, "none.\n");
 	return NULL;
     } else {
+	char *pt1, *pt2;
 	memset(&ent, 0, sizeof(struct dirent));
-	ne_strnzcpy(ent.d_name, ctx->current->uri + ctx->rootlen, 255);
+	pt1 = ne_path_unescape(ctx->current->uri + ctx->rootlen);
+	pt2 = fromUTF8(pt1);
+	ne_strnzcpy(ent.d_name, pt2, 255);
+	free(pt1);
+	free(pt2);
 	/* FIXME: non-portable, there's an autoconf 
 	 * test for this, "d-ino.m4" */
 	ent.d_ino = 1;
@@ -235,9 +243,10 @@
 static int davglob_stat(const char *filename, struct stat *st) {
     /* presumption: all glob needs to know is whether it's a directory
      * or not. I think this is true for the glob in glibc2 */
-    char *dir;
+    char *dir, *pt;
     NE_DEBUG(DEBUG_FILES, "stat %s\n", filename);
-    dir = resolve_path(session.uri.path, filename, 1);
+    dir = resolve_path(session.uri.path, pt = toUTF8(filename), 1);
+    free(pt);
     if (getrestype(dir) == resr_collection) {
 	st->st_mode = S_IFDIR;
     } else {
diff -urN cadaver-0.22.3-1-orig/src/cadaver-0.22.3/src/codeconv.c cadaver-0.22.3-1-i18n/src/cadaver-0.22.3/src/codeconv.c
--- cadaver-0.22.3-1-orig/src/cadaver-0.22.3/src/codeconv.c	1970-01-01 09:00:00.000000000 +0900
+++ cadaver-0.22.3-1-i18n/src/cadaver-0.22.3/src/codeconv.c	2006-08-01 00:55:13.412233000 +0900
@@ -0,0 +1,114 @@
+/* 
+   cadaver, command-line DAV client
+   Copyright (C) 1999-2001, Joe Orton <joe@orton.demon.co.uk>
+                                                                     
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+  
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+  
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "config.h"
+
+#include <string.h>
+#include <stdlib.h>
+
+#include "codeconv.h"
+
+#ifdef HAVE_ICONV
+#include <iconv.h>
+iconv_t toUTF8_cd = (iconv_t)-1, fromUTF8_cd = (iconv_t)-1;
+#endif
+
+void
+seticonv(const char *iocharset)
+{
+#ifdef HAVE_ICONV
+
+    const char *localcharset;
+
+    if (toUTF8_cd != (iconv_t)-1)
+	iconv_close(toUTF8_cd);
+
+    if (fromUTF8_cd != (iconv_t)-1)
+	iconv_close(fromUTF8_cd);
+
+    toUTF8_cd = (iconv_t)-1;
+    fromUTF8_cd = (iconv_t)-1;
+
+    localcharset = iocharset;
+
+    if (localcharset == NULL) return;
+    if (*localcharset == '\0') return;
+
+    toUTF8_cd = iconv_open("UTF-8", localcharset);
+    fromUTF8_cd = iconv_open(localcharset, "UTF-8");
+
+#endif
+    return ;
+}
+    
+
+char *
+toUTF8(const char *source)
+{
+#ifdef HAVE_ICONV
+
+    char *stmp = (char *)source, *res, *rtmp;
+    int slen, rlen;
+
+    if (source == NULL) return NULL;
+
+    if (toUTF8_cd == (iconv_t)-1)
+	return strdup(source);
+
+    slen = strlen(source) + 1;
+    rlen = slen * 4 + 1;
+    res = rtmp = (char *)malloc(rlen);
+
+    if (iconv(toUTF8_cd, &stmp, &slen, &rtmp, &rlen) != (size_t)-1)
+	if (slen == 0)
+	    return (char *)realloc(res, strlen(res) + 1);
+
+    free(res);
+
+#endif
+    return strdup(source);
+}
+
+char *
+fromUTF8(const char *source)
+{
+#ifdef HAVE_ICONV
+
+    char *stmp = (char *)source, *res, *rtmp;
+    int slen, rlen;
+
+    if (source == NULL) return NULL;
+
+    if (fromUTF8_cd == (iconv_t)-1)
+	return strdup(source);
+
+    slen = strlen(source) + 1;
+    rlen = slen + 1;
+    res = rtmp = (char *)malloc(rlen);
+
+    if (iconv(fromUTF8_cd, &stmp, &slen, &rtmp, &rlen) != (size_t)-1)
+	if (slen == 0)
+	    return (char *)realloc(res, strlen(res) + 1);
+
+    free(res);
+
+#endif
+    return strdup(source);
+}
+
diff -urN cadaver-0.22.3-1-orig/src/cadaver-0.22.3/src/codeconv.h cadaver-0.22.3-1-i18n/src/cadaver-0.22.3/src/codeconv.h
--- cadaver-0.22.3-1-orig/src/cadaver-0.22.3/src/codeconv.h	1970-01-01 09:00:00.000000000 +0900
+++ cadaver-0.22.3-1-i18n/src/cadaver-0.22.3/src/codeconv.h	2006-08-01 00:55:13.432262000 +0900
@@ -0,0 +1,29 @@
+/* 
+   cadaver, command-line DAV client
+   Copyright (C) 1999-2001, Joe Orton <joe@orton.demon.co.uk>
+                                                                     
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+  
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+  
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef CODECONV_H
+#define CODECONV_H
+
+extern char *toUTF8(const char *source);
+
+extern char *fromUTF8(const char *source);
+
+extern void seticonv(const char *iocharset);
+
+#endif
diff -urN cadaver-0.22.3-1-orig/src/cadaver-0.22.3/src/commands.c cadaver-0.22.3-1-i18n/src/cadaver-0.22.3/src/commands.c
--- cadaver-0.22.3-1-orig/src/cadaver-0.22.3/src/commands.c	2005-12-31 22:12:11.000000000 +0900
+++ cadaver-0.22.3-1-i18n/src/cadaver-0.22.3/src/commands.c	2006-08-01 01:18:52.746468800 +0900
@@ -76,6 +76,7 @@
 #include "commands.h"
 #include "options.h"
 #include "utils.h"
+#include "codeconv.h"
 
 /* Local variables */
 int child_running; /* true when we have a child running */
@@ -114,7 +115,10 @@
  * (really 'METHOD' to 'RESOURCE' but hey.) */
 void out_start(const char *verb, const char *noun)
 {
-    output(o_start, "%s `%s':", verb, noun);
+    char *pt1, *pt2;
+    output(o_start, "%s `%s':", verb, (pt1 = fromUTF8(pt2 = ne_path_unescape(noun))));
+    free(pt1);
+    free(pt2);
 }
 
 void out_success(void)
@@ -224,88 +228,6 @@
     }
 }
 
-/* FIXME: joe: these are really wrong and result from my lack of
- * understanding of character set issues.  I think this needs iconv(),
- * but iconv isn't really portable, so what's the fallback for
- * platforms without iconv? Reject any non-ASCII input?  And even if
- * iconv is present, how is the input charset encoding determined? */
-static char *cad_utf8_encode(const char *str)
-{
-    char *buffer = ne_malloc(strlen(str) * 2 + 1);
-    int in, len = strlen(str);
-    char *out;
-
-    for (in = 0, out = buffer; in < len; in++, out++) {
-	if ((unsigned char)str[in] <= 0x7D) {
-	    *out = str[in];
-	} else {
-	    *out++ = 0xC0 | ((str[in] & 0xFC) >> 6);
-	    *out = str[in] & 0xBF;
-	}
-    }
-
-    /* nul-terminate */
-    *out = '\0';
-    return buffer;
-}
-
-/* Single byte range 0x00 -> 0x7F */
-#define SINGLEBYTE_UTF8(ch) (((unsigned char) (ch)) < 0x80)
-
-static char *cad_utf8_decode(const char *str)
-{
-    int n, m, len = strlen(str);
-    char *dest = ne_malloc(len + 1);
-    
-    for (n = 0, m = 0; n < len; n++, m++) {
-	if (SINGLEBYTE_UTF8(str[n])) {
-	    dest[m] = str[n];
-	} else {
-	    /* This just deals with 8-bit data, which will be encoded
-	     * as two bytes of UTF-8 */
-	    if ((len - n < 2) || (str[n] & 0xFC) != 0xC0) {
-		free(dest);
-		return NULL;
-	    } else {
-		dest[m] = ((str[n] & 0x03) << 6) | (str[n+1] & 0x3F);
-		n++;
-	    }
-	}
-    }
-    
-    dest[m] = '\0';
-    return dest;
-}
-
-/* If in UTF-8 mode, simply duplicates 'str'.  When not in UTF-8 mode,
- * presume 'str' is ISO-8859-1, and UTF-8 encode it. */
-static char *utf8_encode(const char *str)
-{
-    if (get_bool_option(opt_utf8)) {
-	return ne_strdup(str);
-    } else {
-	return cad_utf8_encode(str);
-    }
-}
-
-/* If in UTF-8 mode, simply duplicates 'str'.
- * When not in UTF-8 mode, does a UTF-8 decode on 'str',
- * or at least, the least significant 8-bits of the Unicode
- * characters in 'str'.  Returns NULL if 'str' contains
- * >8-bit characters.
- *
- * TODO: yes, is this sensible? embedded NUL's?
- */
-static char *utf8_decode(const char *str)
-{
-    /* decoded version can be at most as long as encoded version. */
-    if (get_bool_option(opt_utf8)) {
-	return ne_strdup(str);
-    } else {
-	return cad_utf8_decode(str);
-    }
-}
-
 /* Resolve path, appending trailing slash if resource is a
  * collection. */
 static char *true_path(const char *res)
@@ -425,9 +347,10 @@
 static void do_discover(const char *res, const char *mesg,
 			ne_lock_result result_cb)
 {
-    char *real_remote;
+    char *real_remote, *pt;
     int ret, count = 0;
-    real_remote = resolve_path(session.uri.path, res, false);
+    real_remote = resolve_path(session.uri.path, pt = toUTF8(res), false);
+    free(pt);
     out_start(mesg, res);
     ret = ne_lock_discover(session.sess, real_remote, result_cb, &count);
     switch (ret) {
@@ -470,11 +393,12 @@
 
 static void execute_lock(const char *res)
 {
-    char *real_remote;
+    char *real_remote, *pt;
     struct ne_lock *lock;
     enum resource_type rtype;
 
-    real_remote = resolve_path(session.uri.path, res, false);
+    real_remote = resolve_path(session.uri.path, pt = toUTF8(res), false);
+    free(pt);
     rtype = getrestype(real_remote);
     if (rtype == resr_collection) {
 	if (!ne_path_has_trailing_slash(real_remote)) {
@@ -512,9 +436,11 @@
 {
     struct ne_lock *lock;
     ne_uri uri;
+    char *pt;
 
     uri = session.uri; /* shallow copy */
-    uri.path = true_path(res);
+    uri.path = true_path(pt = toUTF8(res));
+    free(pt);
 
     out_start(_("Unlocking"), res);
     lock = ne_lockstore_findbyuri(session.locks, &uri);
@@ -540,7 +466,9 @@
 
 static void execute_mkcol(const char *name)
 {
-    char *uri = resolve_path(session.uri.path, name, true);
+    char *pt;
+    char *uri = resolve_path(session.uri.path, pt = toUTF8(name), true);
+    free(pt);
     dispatch(_("Creating"), name, ne_mkcol, uri);
     free(uri);
 }
@@ -548,9 +476,9 @@
 static int all_iterator(void *userdata, const ne_propname *pname,
 			 const char *value, const ne_status *status)
 {
-    char *dname = utf8_decode(pname->name);
+    char *dname = fromUTF8(pname->name);
     if (value != NULL) {
-	char *dval = utf8_decode(value);
+	char *dval = fromUTF8(value);
 	printf("%s = %s\n", dname, dval);
 	free(dval);
     } else if (status != NULL) {
@@ -575,11 +503,11 @@
 	return;
     }
     
-    dname = utf8_decode(pname->name);
+    dname = fromUTF8(pname->name);
 
     value = ne_propset_value(set, pname);
     if (value != NULL) {
-	char *dval = utf8_decode(value);
+	char *dval = fromUTF8(value);
 	printf(_("Value of %s is: %s\n"), dname, dval);
 	free(dval);
     } else {
@@ -604,27 +532,27 @@
 {
     ne_proppatch_operation ops[2];
     ne_propname pname;
-    char *uri = resolve_path(session.uri.path, res, false);
-    char *val = NULL /* quieten gcc */, *encname = utf8_encode(name);
+    char *pt1, *pt2;
+    char *uri = resolve_path(session.uri.path, pt1 = toUTF8(res), false);
+    free(pt1);
 
     ops[0].name = &pname;
     if (value) {
 	ops[0].type = ne_propset;
-	ops[0].value = val = utf8_encode(value);
+	ops[0].value = pt1 = toUTF8(value);
     } else {
 	ops[0].type = ne_propremove;
     }
     ops[1].name = NULL;
     
     pname.nspace = (const char *)get_option(opt_namespace);
-    pname.name = encname;
+    pname.name = pt2 = toUTF8(name);
     out_start(descr, res);
     out_handle(ne_proppatch(session.sess, uri, ops));
 
-    if (value) 
-	free(val);
-    free(encname);
     free(uri);
+    free(pt1);
+    free(pt2);
 }    
 
 
@@ -641,15 +569,18 @@
 static void execute_propget(const char *res, const char *name)
 {
     ne_propname pnames[2] = {{NULL}, {NULL}};
-    char *remote = resolve_path(session.uri.path, res, false), *encname = NULL;
+    char *remote, *encname = NULL, *pt;
     ne_propname *props;
     int ret;
     
+    remote = resolve_path(session.uri.path, pt = toUTF8(res), false);
+    free(pt);
+
     if (name == NULL) {
 	props = NULL;
     } else {
 	pnames[0].nspace = (const char *)get_option(opt_namespace);
-	pnames[0].name = encname = utf8_encode(name);
+	pnames[0].name = encname = toUTF8(name);
 	props = pnames;
     }
 
@@ -661,9 +592,7 @@
 	out_result(ret);
     }
 
-    if (encname) {
-	free(encname);
-    }
+    free(encname);
     free(remote);
 }
 
@@ -682,8 +611,9 @@
 
 static void execute_propnames(const char *res)
 {
-    char *remote;
-    remote = resolve_path(session.uri.path, res, false);
+    char *remote, *pt;
+    remote = resolve_path(session.uri.path, pt = toUTF8(res), false);
+    free(pt);
     out_start(_("Fetching property names"), res);
     if (out_handle(ne_propnames(session.sess, remote, NE_DEPTH_ZERO,
 				 propname_results, NULL))) { 
@@ -712,7 +642,9 @@
 
 static void execute_delete(const char *filename)
 {
-    char *remote = resolve_path(session.uri.path, filename, false);
+    char *remote, *pt;
+    remote = resolve_path(session.uri.path, pt = toUTF8(filename), false);
+    free(pt);
     out_start(_("Deleting"), filename);
     if (getrestype(remote) == resr_collection) {
 	output(o_finish, 
@@ -730,8 +662,9 @@
 
 static void execute_rmcol(const char *filename)
 {
-    char *remote;
-    remote = resolve_path(session.uri.path, filename, true);
+    char *remote, *pt;
+    remote = resolve_path(session.uri.path, pt = toUTF8(filename), true);
+    free(pt);
     out_start(_("Deleting collection"), filename);
     if (getrestype(remote) != resr_collection) {
 	output(o_finish, 
@@ -755,28 +688,28 @@
 static char *clever_path(const char *p, const char *src, 
 			 const char *dest)
 {
-    char *ret;
+    char *ret, *utf8src;
     int src_is_coll, dest_is_coll;
     dest_is_coll = (dest[strlen(dest)-1] == '/');
     src_is_coll = (src[strlen(src)-1] == '/');
+    utf8src = toUTF8(base_name(src));
     if (strcmp(dest, ".") == 0) {
-	ret = resolve_path(p, base_name(src), false);
+	ret = resolve_path(p, utf8src, false);
     } else if (strcmp(dest, "..") == 0) {
 	char *parent;
 	parent = ne_path_parent(p);
-	ret = resolve_path(parent, base_name(src), false);
+	ret = resolve_path(parent, utf8src, false);
 	free(parent);
     } else if (!src_is_coll && dest_is_coll) {
 	/* Moving a file to a collection... the destination should
 	 * be the basename of file concated with the collection. */
 	char *tmp = resolve_path(p, dest, true);
-        char *enc = escape_path(base_name(src));
-	ret = ne_concat(tmp, enc, NULL);
-        free(enc);
+	ret = ne_concat(tmp, utf8src, NULL);
 	free(tmp);
     } else {
 	ret = resolve_path(p, dest, false);
     }
+    free(utf8src);
     return ret;
 }
 
@@ -814,10 +747,11 @@
 
 static void execute_less(const char *resource)
 {
-    char *real_res;
+    char *real_res, *pt;
     const char *pager;
     FILE *p;
-    real_res = resolve_path(session.uri.path, resource, false);
+    real_res = resolve_path(session.uri.path, pt = toUTF8(resource), false);
+    free(pt);
     pager = choose_pager();
     printf(_("Displaying `%s':\n"), real_res);
     p = spawn_pager(pager);
@@ -835,7 +769,9 @@
 
 static void execute_cat(const char *resource)
 {
-    char *real_res = resolve_path(session.uri.path, resource, false);
+    char *real_res, *pt;
+    real_res = resolve_path(session.uri.path, pt = toUTF8(resource), false);
+    free(pt);
     printf(_("Displaying `%s':\n"), real_res);
     if (ne_get(session.sess, real_res, STDOUT_FILENO) != NE_OK) {
 	printf(_("Failed: %s\n"), ne_get_error(session.sess));
@@ -847,14 +783,16 @@
 			void (*cb)(const char *, const char *))
 {
     /* We are guaranteed that argc > 2... */
-    char *dest;
+    char *dest, *pt;
 
-    dest = resolve_path(session.uri.path, argv[argc-1], true);
+    dest = resolve_path(session.uri.path, pt = toUTF8(argv[argc-1]), true);
+    free(pt);
     if (getrestype(dest) == resr_collection) {
 	int n;
 	char *real_src, *real_dest;
 	for(n = 0; n < argc-1; n++) {
-	    real_src = resolve_path(session.uri.path, argv[n], false);
+	    real_src = resolve_path(session.uri.path, pt = toUTF8(argv[n]), false);
+	    free(pt);
 	    real_dest = clever_path(session.uri.path, argv[n], dest);
 	    if (strcmp(real_src, real_dest) == 0) {
 		printf(_("%s: %s and %s are the same resource.\n"), v2,
@@ -870,8 +808,10 @@
                  "argument must be a collection.\n"), v1);
     } else {
 	char *rsrc, *rdest;
-	rsrc = resolve_path(session.uri.path, argv[0], false);
-	rdest = resolve_path(session.uri.path, argv[1], false);
+	rsrc = resolve_path(session.uri.path, pt = toUTF8(argv[0]), false);
+	free(pt);
+	rdest = resolve_path(session.uri.path, pt = toUTF8(argv[1]), false);
+	free(pt);
 	/* Simple */
 	(*cb) (rsrc, rdest);
 	free(rsrc);
@@ -940,8 +880,9 @@
 
 static void execute_get(const char *remote, const char *local)
 {
-    char *filename, *real_remote;
-    real_remote = resolve_path(session.uri.path, remote, false);
+    char *filename, *real_remote, *pt;
+    real_remote = resolve_path(session.uri.path, pt = toUTF8(remote), false);
+    free(pt);
     if (local == NULL) {
 	struct stat st;
 	/* Choose an appropriate local filename */
@@ -949,7 +890,8 @@
 	    char buf[BUFSIZ];
 	    /* File already exists... don't overwrite */
 	    snprintf(buf, BUFSIZ, _("Enter local filename for `%s': "),
-		     real_remote);
+		     pt = fromUTF8(real_remote));
+	    free(pt);
 	    filename = readline(buf);
 	    if (filename == NULL) {
 		free(real_remote);
@@ -964,7 +906,8 @@
     }
     {
 	int fd = open(filename, O_CREAT|O_WRONLY|O_TRUNC, 0644);
-	output(o_transfer, _("Downloading `%s' to %s:"), real_remote, filename);
+	output(o_transfer, _("Downloading `%s' to %s:"), pt = fromUTF8(real_remote), filename);
+	free(pt);
 	if (fd < 0) {
 	    output(o_finish, _("failed:\n%s\n"), strerror(errno));
 	} else {
@@ -984,8 +927,10 @@
 
 static void simple_put(const char *local, const char *remote)
 {
+    char *pt;
     int fd = open(local, O_RDONLY | OPEN_BINARY_FLAGS);
-    output(o_transfer, _("Uploading %s to `%s':"), local, remote);
+    output(o_transfer, _("Uploading %s to `%s':"), local, pt = fromUTF8(remote));
+    free(pt);
     if (fd < 0) {
 	output(o_finish, _("Could not open file: %s\n"), strerror(errno));
     } else {
@@ -996,11 +941,13 @@
 
 static void execute_put(const char *local, const char *remote)
 {
-    char *real_remote;
+    char *real_remote, *pt;
     if (remote == NULL) {
-	real_remote = resolve_path(session.uri.path, base_name(local), false);
+	real_remote = resolve_path(session.uri.path, pt = toUTF8(base_name(local)), false);
+	free(pt);
     } else {
-	real_remote = resolve_path(session.uri.path, remote, false);
+	real_remote = resolve_path(session.uri.path, pt = toUTF8(remote), false);
+	free(pt);
     }
     simple_put(local, real_remote);
     free(real_remote);
@@ -1056,9 +1003,11 @@
 static void multi_mput(int argc, const char *argv[])
 {
     for(; argv[0] != NULL; argv++) {
-	char *remote = resolve_path(session.uri.path, argv[0], false);
+	char *pt;
+	char *remote = resolve_path(session.uri.path, pt = toUTF8(argv[0]), false);
 	simple_put(argv[0], remote);
 	free(remote);
+	free(pt);
     }    
 }
 
@@ -1075,7 +1024,7 @@
     { "http://apache.org/dav/props/", "executable" };
     /* Use a single operation; set the executable property to... */
     ne_proppatch_operation ops[] = { { &execprop, ne_propset, NULL }, { NULL } };
-    char *uri;
+    char *uri, *pt;
     ne_server_capabilities caps = {0};
     int ret;
 
@@ -1092,7 +1041,8 @@
 	return;
     }
     
-    uri = resolve_path(session.uri.path, remote, false);
+    uri = resolve_path(session.uri.path, pt = toUTF8(remote), false);
+    free(pt);
 
     out_start(_("Setting isexecutable"), remote);
     ret = ne_options(session.sess, uri, &caps);
@@ -1164,14 +1114,16 @@
 
 static void execute_pwd(void)
 {
+    char *pt;
     char *uri = ne_uri_unparse(&session.uri);
-    printf(_("Current collection is `%s'.\n"), uri);
+    printf(_("Current collection is `%s'.\n"), (pt = fromUTF8(uri)));
     ne_free(uri);
+    ne_free(pt);
 }
 
 static void execute_cd(const char *newpath)
 {
-    char *real_path;
+    char *real_path, *pt;
     int is_swap = false;
     if (strcmp(newpath, "-") == 0) {
 	if (!session.lastwp) {
@@ -1181,7 +1133,8 @@
 	is_swap = true;
 	real_path = session.lastwp;
     } else {
-	real_path = resolve_path(session.uri.path, newpath, true);
+	real_path = resolve_path(session.uri.path, pt = toUTF8(newpath), true);
+	free(pt);
     }
     if (set_path(real_path)) {
 	/* Error */
@@ -1207,7 +1160,7 @@
         if (pos == 6) printf("\n ");
 #if 0        
 	if (commands[n].call && commands[n].short_help) {
-	    printf(" %-26s %s\n", commands[n].call, _(commands[n].short_help));
+	    printf(" %-26s %s\n", commands[n].call, commands[n].short_help);
 	}
 #endif
     }
@@ -1229,7 +1182,7 @@
 	const struct command *cmd = get_command(arg);
 
 	if (cmd) {
-	    printf(_(" `%s'   %s\n"), cmd->call, _(cmd->short_help));
+	    printf(_(" `%s'   %s\n"), cmd->call, cmd->short_help);
 	    if (cmd->needs_connection) {
 		printf(_("This command can only be used when connected to a server.\n"));
 	    }
@@ -1295,9 +1248,9 @@
     C1(cd, N_("cd path"), N_("Change to specified collection")),
     { cmd_pwd, "pwd", true, 0, 0, parmscope_none, T0(execute_pwd),
       "pwd", N_("Display name of current collection") },
-    { cmd_put, "put", true, 1, 2, parmscope_none, T2(execute_put),
+    { cmd_put, "put", true, 1, 2, parmscope_local, T2(execute_put),
       N_("put local [remote]"), N_("Upload local file") },
-    { cmd_get, "get", true, 1, 2, parmscope_none, T2(execute_get),
+    { cmd_get, "get", true, 1, 2, parmscope_remote, T2(execute_get),
       N_("get remote [local]"), N_("Download remote resource") },
     C1M(mget, N_("mget remote..."), N_("Download many remote resources")),
     { cmd_mput, "mput", true, 1, CMD_VARY, parmscope_local, TV(multi_mput), 
@@ -1319,7 +1272,7 @@
     C1(unlock, N_("unlock resource"), N_("Unlock given resource")),
     C1(discover, N_("discover resource"), N_("Display lock information for resource")),
     C1(steal, N_("steal resource"), N_("Steal lock token for resource")),
-    { cmd_showlocks, "showlocks", true, 0, 0, parmscope_none, T0(execute_showlocks),
+    { cmd_showlocks, "showlocks", true, 0, 0, parmscope_remote, T0(execute_showlocks),
       "showlocks", N_("Display list of owned locks") },
 
     /*** DeltaV commands ***/
@@ -1335,12 +1288,12 @@
 
 
     /*** Property handling ***/
-    C1(propnames, "propnames res", N_("Names of properties defined on resource")) ,
+    C1(propnames, N_("propnames res"), N_("Names of properties defined on resource")) ,
 
-    { cmd_chexec, "chexec", true, 2, 2, parmscope_none, T2(execute_chexec),
+    { cmd_chexec, "chexec", true, 2, 2, parmscope_remote, T2(execute_chexec),
       N_("chexec [+|-] remote"), N_("Change isexecutable property of resource") },
     
-    { cmd_propget, "propget", true, 1, 2, parmscope_none, T2(execute_propget),
+    { cmd_propget, "propget", true, 1, 2, parmscope_remote, T2(execute_propget),
       N_("propget res [propname]"), 
       N_("Retrieve properties of resource") },
     { cmd_propdel, "propdel", true, 2, 2, parmscope_none, T2(execute_propdel),
diff -urN cadaver-0.22.3-1-orig/src/cadaver-0.22.3/src/edit.c cadaver-0.22.3-1-i18n/src/cadaver-0.22.3/src/edit.c
--- cadaver-0.22.3-1-orig/src/cadaver-0.22.3/src/edit.c	2005-12-31 21:57:37.000000000 +0900
+++ cadaver-0.22.3-1-i18n/src/cadaver-0.22.3/src/edit.c	2006-08-01 00:44:37.507848000 +0900
@@ -50,6 +50,7 @@
 #include "utils.h"
 #include "options.h"
 #include "i18n.h"
+#include "codeconv.h"
 
 static int run_editor(const char *filename)
 {
@@ -111,7 +112,7 @@
    set O_BINARY, if that is allowed under cygwin? */
 void execute_edit(const char *remote)
 {
-    char *real_remote;
+    char *real_remote, *pt;
     unsigned int can_lock; /* can we LOCK it? */
     struct ne_lock *lock = NULL;
     char fname[_POSIX_PATH_MAX] = "/tmp/cadaver-edit-XXXXXX";
@@ -119,7 +120,8 @@
     int fd;
     int is_checkout, is_checkin;
     
-    real_remote = resolve_path(session.uri.path, remote, false);
+    real_remote = resolve_path(session.uri.path, pt = toUTF8(remote), false);
+    free(pt);
 
     /* Don't let them edit a collection, since PUT to a collection is
      * bogus. Really we want to be able to fetch a "DefaultDocument"
diff -urN cadaver-0.22.3-1-orig/src/cadaver-0.22.3/src/ls.c cadaver-0.22.3-1-i18n/src/cadaver-0.22.3/src/ls.c
--- cadaver-0.22.3-1-orig/src/cadaver-0.22.3/src/ls.c	2005-12-31 21:57:37.000000000 +0900
+++ cadaver-0.22.3-1-i18n/src/cadaver-0.22.3/src/ls.c	2006-08-01 00:46:41.796566000 +0900
@@ -41,6 +41,7 @@
 #include "cadaver.h"
 #include "basename.h"
 #include "utils.h"
+#include "codeconv.h"
 
 struct fetch_context {
     struct resource **list;
@@ -92,7 +93,7 @@
 static void display_ls_line(struct resource *res)
 {
     const char *restype;
-    char exec_char, vcr_char, *name;
+    char exec_char, vcr_char, *name, *pt;
 
     switch (res->type) {
     case resr_normal: restype = ""; break;
@@ -115,15 +116,17 @@
     name = ne_path_unescape(name);
 
     if (res->type == resr_error) {
-	printf(_("Error: %-30s %d %s\n"), name, res->error_status,
+	printf(_("Error: %-30s %d %s\n"), (pt = fromUTF8(name)), res->error_status,
 	       res->error_reason?res->error_reason:_("unknown"));
+	free(pt);
     } else {
 	exec_char = res->is_executable ? '*' : ' ';
 	/* 0: no vcr, 1: checkin, 2: checkout */
 	vcr_char = res->is_vcr==0 ? ' ' : (res->is_vcr==1? '>' : '<');
 	printf("%5s %c%c%-29s %10d  %s\n", 
-	       restype, vcr_char, exec_char, name,
+	       restype, vcr_char, exec_char, (pt = fromUTF8(name)),
 	       res->size, format_time(res->modtime));
+	free(pt);
     }
 
     free(name);
@@ -132,11 +135,12 @@
 void execute_ls(const char *remote)
 {
     int ret;
-    char *real_remote;
+    char *real_remote, *pt;
     struct resource *reslist = NULL, *current, *next;
 
     if (remote != NULL) {
-	real_remote = resolve_path(session.uri.path, remote, true);
+	real_remote = resolve_path(session.uri.path, pt = toUTF8(remote), true);
+	free(pt);
     } else {
 	real_remote = ne_strdup(session.uri.path);
     }
diff -urN cadaver-0.22.3-1-orig/src/cadaver-0.22.3/src/options.c cadaver-0.22.3-1-i18n/src/cadaver-0.22.3/src/options.c
--- cadaver-0.22.3-1-orig/src/cadaver-0.22.3/src/options.c	2004-10-11 05:53:02.000000000 +0900
+++ cadaver-0.22.3-1-i18n/src/cadaver-0.22.3/src/options.c	2006-08-01 00:53:37.263979000 +0900
@@ -39,6 +39,7 @@
 #include "common.h"
 #include "cadaver.h"
 #include "options.h"
+#include "codeconv.h"
 
 static void set_debug(const char *new);
 static void unset_debug(const char *new);
@@ -58,7 +59,7 @@
 
 /* Option holders */
 
-static int enable_expect, presume_utf8, overwrite, quiet, searchall;
+static int enable_expect, overwrite, quiet, searchall;
 
 enum ne_lock_scope lockscope;
 int lockdepth;
@@ -89,7 +90,6 @@
     B(tolerant, &tolerant, "Tolerate non-WebDAV collections"),
     B(overwrite, &overwrite, "Enable overwrite (e.g. on copy/move operations"),
     B(expect100, &enable_expect, "Enable use of 'Expect: 100-continue' header"),
-    B(utf8, &presume_utf8, "Presume filenames etc are UTF-8 encoded"),
     B(quiet, &quiet, "Whether to display connection status messages"),
     B(searchall, &searchall, "Whether to search and display all props including dead props"),
 #undef B
@@ -102,6 +102,9 @@
        "Client certificate to use for SSL connections."),
     S(namespace, "Namespace to use for propset/propget commands."),
     S(pager, "Command to run for less/more commands."),
+#ifdef HAVE_ICONV
+    S(localcharset, "Local characterset (remote: UTF-8)"),
+#endif
     S(proxy, "Hostname of proxy server"),
     S(searchorder,  "Search ascending props options"),
     S(searchdorder, "Search descending props options"),
@@ -358,6 +361,9 @@
 		    }
 		    break;
 		}
+#ifdef HAVE_ICONV
+		if (options[n].id == opt_localcharset) seticonv(newv);
+#endif
 		return;
 	    }
 	}
@@ -392,6 +398,9 @@
 		(*options[n].unset)(newv);
 		break;
 	    }
+#ifdef HAVE_ICONV
+	    if (options[n].id == opt_localcharset) seticonv(newv);
+#endif
 	    return;
 	}
     }
@@ -440,6 +449,7 @@
     for (n = 0; options[n].name != NULL; n++) {
 	if (options[n].id == id) {
 	    options[n].holder = newval;
+	    if (id == opt_localcharset) seticonv(newval);
 	    return;
 	}
     }
diff -urN cadaver-0.22.3-1-orig/src/cadaver-0.22.3/src/options.h cadaver-0.22.3-1-i18n/src/cadaver-0.22.3/src/options.h
--- cadaver-0.22.3-1-orig/src/cadaver-0.22.3/src/options.h	2004-10-11 05:53:02.000000000 +0900
+++ cadaver-0.22.3-1-i18n/src/cadaver-0.22.3/src/options.h	2006-08-01 00:54:19.474675000 +0900
@@ -32,7 +32,9 @@
     opt_proxy,
     opt_proxy_port,
     opt_debug,
-    opt_utf8,
+#ifdef HAVE_ICONV
+    opt_localcharset,
+#endif
     opt_overwrite,
     opt_lockowner,
     opt_lockstore,
