|
svn commit: r13061 - in branches/ruby: . contrib/client-side doc/book/book : msg#00194version-control.subversion.svn
Author: kou Date: Sat Feb 19 03:19:08 2005 New Revision: 13061 Modified: branches/ruby/COMMITTERS branches/ruby/contrib/client-side/svn-clean branches/ruby/doc/book/book/ch07.xml branches/ruby/doc/book/book/ch09.xml branches/ruby/doc/translations/spanish/TODO branches/ruby/doc/translations/spanish/TRABAJO branches/ruby/doc/translations/spanish/book/appa.xml branches/ruby/doc/translations/spanish/book/appb.xml branches/ruby/doc/translations/spanish/book/ch07.xml branches/ruby/notes/locking/TODO.txt branches/ruby/packages/win32-innosetup/Readme.txt branches/ruby/packages/win32-innosetup/is_main.pas branches/ruby/packages/win32-innosetup/svn.iss branches/ruby/subversion/bindings/swig/perl/native/t/6ra.t branches/ruby/subversion/libsvn_delta/xdelta.c branches/ruby/subversion/libsvn_fs_base/fs.c branches/ruby/subversion/libsvn_subr/io.c branches/ruby/subversion/po/ja.po branches/ruby/subversion/po/ko.po branches/ruby/subversion/tests/clients/cmdline/trans_tests.py Log: Conformed to trunk. Modified: branches/ruby/COMMITTERS Url: http://svn.collab.net/viewcvs/svn/branches/ruby/COMMITTERS?view=diff&rev=13061&p1=branches/ruby/COMMITTERS&r1=13060&p2=branches/ruby/COMMITTERS&r2=13061 ============================================================================== --- branches/ruby/COMMITTERS (original) +++ branches/ruby/COMMITTERS Sat Feb 19 03:19:08 2005 @@ -96,7 +96,7 @@ plasma Wei-Hon Chen <plasma-W4Dscdsl/nMeIZ0/mPfg9Q@xxxxxxxxxxxxxxxx> (po: zh_TW) jihuang June-Yen Huang <jihuang-3pA+98l8zA9MZQ+1UWixwQIxwlB7+PcL@xxxxxxxxxxxxxxxx> (po: zh_TW) marcosc Marcos Chaves <mchvs-PkbjNfxxIARBDgjK7y7TUQ@xxxxxxxxxxxxxxxx> (po: pt_BR) - pynoos Hojin Choi <pynoos-YgIM44OuCV3nfZDkZ+kngA@xxxxxxxxxxxxxxxx> (po: ko) + pynoos Hojin Choi <hojin.choi-Re5JQEeQqe8AvxtiuMwx3w@xxxxxxxxxxxxxxxx> (po: ko) blueboh Jeong Seolin <blueboh-+FPoP1HoGtjQT0dZR+AlfA@xxxxxxxxxxxxxxxx> (po: ko) hynnet YingNing Huang <hyn-6Pgp33DKpfZt1OO0OYaSVA@xxxxxxxxxxxxxxxx> (po: zh_CN) lark Wang Jian <lark-9v/Yh3O1LlyAEQpPw39QHA@xxxxxxxxxxxxxxxx> (po: zh_CN) Modified: branches/ruby/contrib/client-side/svn-clean Url: http://svn.collab.net/viewcvs/svn/branches/ruby/contrib/client-side/svn-clean?view=diff&rev=13061&p1=branches/ruby/contrib/client-side/svn-clean&r1=13060&p2=branches/ruby/contrib/client-side/svn-clean&r2=13061 ============================================================================== --- branches/ruby/contrib/client-side/svn-clean (original) +++ branches/ruby/contrib/client-side/svn-clean Sat Feb 19 03:19:08 2005 @@ -1,7 +1,7 @@ #!/usr/bin/perl # svn-clean - Wipes out unversioned files from SVN working copy. -# Copyright (C) 2004 Simon Perreault +# Copyright (C) 2004, 2005 Simon Perreault # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -16,18 +16,27 @@ # 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# To contact the author, send email to nomis80-jvthDjwiBj5AfugRpC6u6w@xxxxxxxxxxxxxxxx or send -# paper mail to: -# -# Simon Perreault -# 2955 de la Verdure, #303 -# Ste-Foy, QC, Canada -# G1X 4R5 use strict; -use warnings; use File::Path; +use Getopt::Long; +use Pod::Usage; + +my $force = 0; +my $quiet = 0; +my $print = 0; +my $help = 0; +my $man = 0; +GetOptions( + "force" => \$force, + "quiet" => \$quiet, + "print" => \$print, + "help|?" => \$help, + "man" => \$man + ) + or pod2usage(2); +pod2usage(1) if $help; +pod2usage( -exitstatus => 0, -verbose => 2 ) if $man; # Default target is the current directory. @ARGV = (".") if not @ARGV; @@ -38,7 +47,69 @@ or die "Can't call program \"svn\": $!\n"; while (<SVN>) { if (/^[\?I]\s+(.+)$/) { - rmtree( $1, 1, 1 ); + if ($print) { + print "$1\n"; + } + else { + rmtree( $1, !$quiet, !$force ); + } } } } + +__END__ + +=head1 NAME + +svn-clean - Wipes out unversioned files from Subversion working copy + +=head1 SYNOPSIS + +svn-clean [options] [directory or file ...] + +=head1 DESCRIPTION + +B<svn-clean> will scan the given files and directories recursively and find +unversioned files and directories (files and directories that are not present in +the Subversion repository). After the scan is done, these files and directories +will be deleted. + +If no file or directory is given, B<svn-clean> defaults to the current directory +("."). + +=head1 OPTIONS + +=over 8 + +=item B<-f>, B<--force> + +Files to which you do not have delete access (if running under VMS) or write +access (if running under another OS) will not be deleted unless you use this +option. + +=item B<-q>, B<--quiet> + +Do not print progress info. In particular, do not print a message each time a +file is examined, giving the name of the file, and indicating whether "rmdir" or +"unlink" is used to remove it, or that it’s skipped. + +=item B<-p>, B<--print> + +Do not delete anything. Instead, print the name of every file and directory that +would have been deleted. + +=item B<-?>, B<-h>, B<--help> + +Prints a brief help message and exits. + +=item B<--man> + +Prints the manual page and exits. + +=back + +=head1 AUTHOR + +Simon Perreault <nomis80-jvthDjwiBj5AfugRpC6u6w@xxxxxxxxxxxxxxxx> + +=cut Modified: branches/ruby/doc/book/book/ch07.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/book/book/ch07.xml?view=diff&rev=13061&p1=branches/ruby/doc/book/book/ch07.xml&r1=13060&p2=branches/ruby/doc/book/book/ch07.xml&r2=13061 ============================================================================== --- branches/ruby/doc/book/book/ch07.xml (original) +++ branches/ruby/doc/book/book/ch07.xml Sat Feb 19 03:19:08 2005 @@ -97,13 +97,14 @@ configuration area override those in the system-wide one, and command-line arguments supplied to the <command>svn</command> program have the final word on behavior. On Unix-like - platforms, the system-wide configuration area is expected to be - the <filename>/etc/subversion</filename> directory; on Windows - machines, it looks for a <filename>Subversion</filename> - directory inside the common Application Data location (again, - as specified by the Windows Registry). Unlike the per-user - case, the <command>svn</command> program does not attempt to - create the system-wide configuration area.</para> + platforms, the system-wide configuration area is + expected to be the <filename>/etc/subversion</filename> + directory; on Windows machines, it looks for a + <filename>Subversion</filename> directory inside the common + <filename>Application Data</filename> location (again, as + specified by the Windows Registry). Unlike the per-user + case, the <command>svn</command> program does not attempt + to create the system-wide configuration area.</para> <para>The configuration area currently contains three files—two configuration files (<filename>config</filename> and Modified: branches/ruby/doc/book/book/ch09.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/book/book/ch09.xml?view=diff&rev=13061&p1=branches/ruby/doc/book/book/ch09.xml&r1=13060&p2=branches/ruby/doc/book/book/ch09.xml&r2=13061 ============================================================================== --- branches/ruby/doc/book/book/ch09.xml (original) +++ branches/ruby/doc/book/book/ch09.xml Sat Feb 19 03:19:08 2005 @@ -5110,7 +5110,7 @@ but this time showing the property values as well:</para> <screen> -$ svnlook proplist /usr/local/svn/repos /trunk/README +$ svnlook --verbose proplist /usr/local/svn/repos /trunk/README original-author : fitz svn:mime-type : text/plain </screen> Modified: branches/ruby/doc/translations/spanish/TODO Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/spanish/TODO?view=diff&rev=13061&p1=branches/ruby/doc/translations/spanish/TODO&r1=13060&p2=branches/ruby/doc/translations/spanish/TODO&r2=13061 ============================================================================== --- branches/ruby/doc/translations/spanish/TODO (original) +++ branches/ruby/doc/translations/spanish/TODO Sat Feb 19 03:19:08 2005 @@ -1,7 +1,3 @@ -Mejorar el script que env�a un informe de estado con un porcentaje -estimado para completar la traducci�n. Automatizar env�o del mismo -una vez se verifique que funciona relativamente bien. - Averiguar qu� versi�n estamos traduciendo realmente (1.0 o 1.1) y modificar la p�gina web. Aparentemente estamos con la 1.1. Revisar si esto representa alg�n problema comprobando cu�ntos cambios se @@ -10,6 +6,8 @@ Integrar el fichero TRABAJO como cap�tulo del libro, posiblemente como un ap�ndice. + +Validar el HTML generado del libro. Investigar la traducci�n de im�genes del libro. En principio observar respuestas de Modified: branches/ruby/doc/translations/spanish/TRABAJO Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/spanish/TRABAJO?view=diff&rev=13061&p1=branches/ruby/doc/translations/spanish/TRABAJO&r1=13060&p2=branches/ruby/doc/translations/spanish/TRABAJO&r2=13061 ============================================================================== --- branches/ruby/doc/translations/spanish/TRABAJO (original) +++ branches/ruby/doc/translations/spanish/TRABAJO Sat Feb 19 03:19:08 2005 @@ -50,11 +50,11 @@ ch05.xml: dbrouard ch06.xml: Federico Edelman ch07.xml: gradha -appa.xml: ruben - +appb.xml: ruben Ficheros que han completado al menos una traducci�n b�sica: ----------------------------------------------------------- +appa.xml: ruben book.xml: gradha foreword.xml: gradha ch00.xml: gradha Modified: branches/ruby/doc/translations/spanish/book/appa.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/spanish/book/appa.xml?view=diff&rev=13061&p1=branches/ruby/doc/translations/spanish/book/appa.xml&r1=13060&p2=branches/ruby/doc/translations/spanish/book/appa.xml&r2=13061 ============================================================================== --- branches/ruby/doc/translations/spanish/book/appa.xml (original) +++ branches/ruby/doc/translations/spanish/book/appa.xml Sat Feb 19 03:19:08 2005 @@ -587,8 +587,9 @@ conversion results-->—�despu�s de todo, usted ha trabajado duro para construir esa historia!</para> - <para>For an updated collection of links to known converter tools, - visit the Links page of the Subversion website (<systemitem + <para>Para una colecci�n actualizada de enlaces a herramientas + <!--TODO:links to known converter tools-->conversoras conocidas, + visite la p�gina de enlaces del website de Subversion (<systemitem class="url">http://subversion.tigris.org/project_links.html</systemitem>).</para> </sect1> Modified: branches/ruby/doc/translations/spanish/book/appb.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/spanish/book/appb.xml?view=diff&rev=13061&p1=branches/ruby/doc/translations/spanish/book/appb.xml&r1=13060&p2=branches/ruby/doc/translations/spanish/book/appb.xml&r2=13061 ============================================================================== --- branches/ruby/doc/translations/spanish/book/appb.xml (original) +++ branches/ruby/doc/translations/spanish/book/appb.xml Sat Feb 19 03:19:08 2005 @@ -1,32 +1,39 @@ <!-- originated from English revision 10817 --> <appendix id="svn-ap-b"> - <title>Troubleshooting</title> + <title>Soluci�n de problemas</title> <!-- ================================================================= --> <!-- ======================== SECTION 1 ============================== --> <!-- ================================================================= --> <sect1 id="svn-ap-b-sect-1"> - <title>Common Problems</title> + <title>Problemas comunes</title> - <para>There are a number of problems you may run into in the - course of installing and using Subversion. Some of these will - be resolved once you get a better idea of how Subversion does - things, while others are caused because you're used to the way - that other version control systems work. Still other problems - might be unsolvable due to bugs in some of the operating systems - that Subversion runs on (considering the wide array of OS'es - that Subversion runs on, it's amazing that we don't encounter - many more of these).</para> + <para>Hay un n�mero de problemas que usted puede encontrar<!--TODO: + you may run into--> en el transcurso de instalar y usar Subversion. + �lgunos de estos ser�n resueltos una vez que usted tenga una mejor + idea de c�mo hace las cosas Subversion, mientras que otros son + <!--TODO:you're used to the way that other version control systems + work--> causados porque usted est� acostumbrado a la manera de + funcionar de otros sistemas de control de versiones. <!--TODO: + Still-->Otros problemas pueden ser insalvables<!--TODO:unsolvable--> + debido a fallos en alguno de los sistemas operativos donde + Subversion funciona (considerando la amplia gama de SO donde + Subversion funciona, es asombroso que no encontramos + demasiados<!--TODO:many more--> de �stos).</para> + + + <para>La siguiente lista ha sido completada en el transcurso de a�os + <!--TODO:has been compiled over the course of years-->de usar + Subversion. Si no puede encontrar aqui el problema que est� teniendo, + mire la versi�n m�s actualizada del FAQ en el website principal de + Subversion. Si todav�a est� atascado<!--TODO:if you're still stuck-->, + entonces env�e un mail a <email>users-lmwclWVctOZK/UuDQWWi7iCwEArCW2h5@xxxxxxxxxxxxxxxx</email> + con una descripci�n detallada del problema que est� teniendo. + <footnote><para>Recuerde que la cantidad de detalle que provea sobre + su configuraci�n<!--TODO:setup--> y su problema es directamente + proporcional a la probabilidad de conseguir una respuesta de la + lista de correo<!--TODO:mailing list-->. - <para>The following list has been compiled over the course of - years of Subversion usage. If you can't find the problem you're - having here, look at the most up-to-date version of the FAQ on - Subversion's main website. If you're still stuck, then send - mail to <email>users-lmwclWVctOZK/UuDQWWi7iCwEArCW2h5@xxxxxxxxxxxxxxxx</email> with a - detailed description of the problem you're having. - <footnote><para>Remember that the amount of detail you provide - about your setup and your problem is directly proportional to - the likelihood of getting an answer from the mailing list. You're encouraged to include everything short of what you had for breakfast and your mother's maiden name. </para> </footnote> </para> Modified: branches/ruby/doc/translations/spanish/book/ch07.xml Url: http://svn.collab.net/viewcvs/svn/branches/ruby/doc/translations/spanish/book/ch07.xml?view=diff&rev=13061&p1=branches/ruby/doc/translations/spanish/book/ch07.xml&r1=13060&p2=branches/ruby/doc/translations/spanish/book/ch07.xml&r2=13061 ============================================================================== --- branches/ruby/doc/translations/spanish/book/ch07.xml (original) +++ branches/ruby/doc/translations/spanish/book/ch07.xml Sat Feb 19 03:19:08 2005 @@ -123,88 +123,100 @@ usuario, el programa <command>svn</command> no intentan crear un �rea de configuraci�n global de sistema.</para> - <para>The configuration area currently contains three - files—two configuration files (<filename>config</filename> and - <filename>servers</filename>), and a <filename>README.txt</filename> - file which describes the INI format. At the time of their - creation, the files contain default values for each of the - supported Subversion options, mostly commented out and grouped - with textual descriptions about how the values for the key - affect Subversion's behavior. To change a certain behavior, - you need only to load the appropriate configuration file into - a text editor, and modify the desired option's value. If at - any time you wish to have the default configuration settings - restored, you can simply remove (or rename) your configuration - directory and then run some innocuous <command>svn</command> - command, such as <command>svn --version</command>. A new - configuration directory with the default contents will be - created.</para> - - <para>The per-user configuration area also contains a cache of - authentication data. The <filename>auth</filename> directory - holds a set of subdirectories that contain pieces of cached - information used by Subversion's various supported - authentication methods. This directory is created in such a - way that only the user herself has permission to read its - contents.</para> + <para>El �rea de configuraci�n actualmente contiene tres + ficheros—dos ficheros de configuraci�n + (<filename>config</filename> y <filename>servers</filename>), + y un fichero <filename>README.txt</filename> que describe el + formato INI. En el momento de su creaci�n, los ficheros + contienen los valores por defecto para cada una de las + opciones soportadas por Subversion, en su mayor�a con + comentarios y agrupadas con descripciones textuales + que indican c�mo los valores de cada opci�n afectan al + comportamiento de Subversion. Para cambiar un comportamiento + dado, s�lo necesita cargar el fichero de configuraci�n + adecuado en su editor de texto, y modificar el valor de la + opci�n deseada. Si en alg�n momento desea recuperar los + valores de configuraci�n por defecto, puede simplemente + borrar (o renombrar) su directorio de configuraci�n y + entonces ejecutar alg�n comando <command>svn</command> + inocuo, como <command>svn --version</command>. Entonces se + crear� un nuevo directorio de configuraci�n con el contenido + por defecto.</para> + + <para>El �rea de configuraci�n de cada usuario tambi�n contiene + una cache de datos de autenticaci�n. El directorio + <filename>auth</filename> agrupa un conjunto de + subdirectorios que contienen trozos de informaci�n guardada + <!-- TODO revisar traducci�n de cached != guardada --> + usada por los varios m�todos de autenticaci�n soportados + por Subversion. Este directorio es creado de tal manera que + s�lo su usuario tiene permiso para leer su contenido.</para> </sect2> <!-- ***************************************************************** --> <sect2 id="svn-ch-7-sect-1.2"> - <title>Configuration and the Windows Registry</title> + <title>La configuraci�n y el registro de Windows</title> - <para>In addition to the usual INI-based configuration area, - Subversion clients running on Windows platforms may also use - the Windows registry to hold the configuration data. The - option names and their values are the same as in the INI - files. The <quote>file/section</quote> hierarchy is - preserved as well, though addressed in a slightly different - fashion—in this schema, files and sections are just - levels in the registry key tree.</para> - - <para>Subversion looks for system-wide configuration values - under the - <literal>HKEY_LOCAL_MACHINE\Software\Tigris.org\Subversion</literal> - key. For example, the <literal>global-ignores</literal> option, - which is in the <literal>miscellany</literal> section of the - <filename>config</filename> file, would be found at + <para>Adem�s del �rea de configuraci�n habitual basada en + ficheros INI, los clientes de Subversion ejecutados en + plataformas Windows tambi�n pueden usar el registro de + Windows para almacenar datos de configuraci�n. Los nombres + de las opciones y sus valores son iguales que en los + ficheros INI. La jerarqu�a <quote>fichero/secci�n</quote> + tambi�n se mantiene, aunque especificada de una manera + ligeramente diferente—en este esquema, los ficheros y + las secciones son simples niveles del �rbol del registro de + claves.</para><!-- TODO buscar en documentaci�n en castellano + u opciones de menu del editor de registro de Windows c�mo se + denomina a los nombres de las opciones: llaves o claves? --> + + <para>Subversion busca valores de configuraci�n global de + sistema bajo la clave + <literal>HKEY_LOCAL_MACHINE\Software\Tigris.org\Subversion</literal>. + Por ejemplo, la opci�n <literal>global-ignores</literal>, + que pertenece a la secci�n <literal>miscellany</literal> + del fichero <filename>config</filename>, se encontrar�a en <literal>HKEY_LOCAL_MACHINE\Software\Tigris.org\Subversion\Config\Miscellany\global-ignores</literal>. - Per-user configuration values should be stored under + Los valores de configuraci�n de cada usuario deber�a poder + encontrarlos en <literal>HKEY_CURRENT_USER\Software\Tigris.org\Subversion</literal>. </para> - <para>Registry-based configuration options are parsed - <emphasis>before</emphasis> their file-based counterparts, - so are overridden by values found in the configuration - files. In other words, configuration priority is granted in - the following order on a Windows system:</para> + <para>Las opciones de configuraci�n almacenadas en el registro + son procesadas <emphasis>antes</emphasis> que sus + versiones en ficheros de texto, por lo que sus valores + son sobreescritos por lo que contengan los ficheros de + configuraci�n. En otras palabras, en un sistema Windows, la + prioridad de configuraci�n sigue el siguiente orden:</para> <orderedlist> <listitem> - <para>Command-line options</para> + <para>Opciones de l�nea de comando</para> </listitem> <listitem> - <para>The per-user INI files</para> + <para>Ficheros INI de cada usuario</para> </listitem> <listitem> - <para>The per-user Registry values</para> + <para>Valores de registro de cada usuario</para> </listitem> <listitem> - <para>The system-wide INI files</para> + <para>Ficheros INI globales de sistema</para> </listitem> <listitem> - <para>The system-wide Registry values</para> + <para>Valores de registro globales de sistema</para> </listitem> </orderedlist> - <para>Also, the Windows Registry doesn't really support the - notion of something being <quote>commented out</quote>. - However, Subversion will ignore any option key whose name - begins with a hash (<literal>#</literal>) character. This - allows you to effectively comment out a Subversion option - without deleting the entire key from the Registry, obviously - simplifying the process of restoring that option.</para> + <para>Adem�s, el registro de Windows no soporta el concepto + de que algo est� <quote>comentado</quote>. No obstante, + Subversion ignorar� cualquier opci�n cuyo nombre comience + con el car�cter sostenido o cruz doble <!-- TODO buscar + nombre real del car�cter--> (<literal>#</literal>). Esto le + permite comentar de forma efectiva una opci�n de Subversion + sin tener que borrar la clave completa del registro, + obviamente simplificando el proceso de recuperaci�n de + esta opci�n.</para> <para>The <command>svn</command> command-line client never attempts to write to the Windows Registry, and will not Modified: branches/ruby/notes/locking/TODO.txt Url: http://svn.collab.net/viewcvs/svn/branches/ruby/notes/locking/TODO.txt?view=diff&rev=13061&p1=branches/ruby/notes/locking/TODO.txt&r1=13060&p2=branches/ruby/notes/locking/TODO.txt&r2=13061 ============================================================================== --- branches/ruby/notes/locking/TODO.txt (original) +++ branches/ruby/notes/locking/TODO.txt Sat Feb 19 03:19:08 2005 @@ -23,9 +23,6 @@ * Decide what should happen when unlocking in commit operation if an error happens. -* mod_authz_svn needs to learn to deal with LOCK/UNLOCK requests - - LIST DISCUSSIONS TO HAVE: @@ -42,9 +39,8 @@ DAV bugs: - -- BUG: http lock comments have tag junk in them - SOLUTION: mod_dav_svn looks for attributes in <D:author>. - then stores either just CDATA or whole value. + -- Make ra_dav error on non-xml-safe lock comments, + and make mod_dav_svn fuzzily-escape lock-comments coming out of repos. -- BUG: header length limits in MERGE request. SOLUTION: Modified: branches/ruby/packages/win32-innosetup/Readme.txt Url: http://svn.collab.net/viewcvs/svn/branches/ruby/packages/win32-innosetup/Readme.txt?view=diff&rev=13061&p1=branches/ruby/packages/win32-innosetup/Readme.txt&r1=13060&p2=branches/ruby/packages/win32-innosetup/Readme.txt&r2=13061 ============================================================================== --- branches/ruby/packages/win32-innosetup/Readme.txt (original) +++ branches/ruby/packages/win32-innosetup/Readme.txt Sat Feb 19 03:19:08 2005 @@ -33,9 +33,8 @@ Inno Setup ---------- - Inno Setup QuickStart Pack 4.2.5. This package gives you Inno Setup (IS) - 4.2.5 and "Inno Setup Pre Processor" (ISPP) which works with your downloaded - version of IS: + Inno Setup QuickStart Pack 5.0.7. This package gives you Inno Setup (IS) + and a sutable version of "Inno Setup Pre Processor" (ISPP): http://www.jrsoftware.org/isdl.php UninsHs @@ -56,10 +55,10 @@ Point your browser to: http://www.zlatkovic.com/pub/libxml/ and grab the following packages: - - libxml2-2.6.4 - - libxslt-1.1.2 + - libxml2-2.6.17 + - libxslt-1.1.12+ - iconv-1.9.1 - - zlib-1.1.4 + - zlib-1.2.1 docbook-xsl ----------- Modified: branches/ruby/packages/win32-innosetup/is_main.pas Url: http://svn.collab.net/viewcvs/svn/branches/ruby/packages/win32-innosetup/is_main.pas?view=diff&rev=13061&p1=branches/ruby/packages/win32-innosetup/is_main.pas&r1=13060&p2=branches/ruby/packages/win32-innosetup/is_main.pas&r2=13061 ============================================================================== --- branches/ruby/packages/win32-innosetup/is_main.pas (original) +++ branches/ruby/packages/win32-innosetup/is_main.pas Sat Feb 19 03:19:08 2005 @@ -53,14 +53,14 @@ Result := WizardSelectedComponents(False); end; -function SkipCurPage(CurPage: Integer): Boolean; +function ShouldSkipPage(CurPage: Integer): Boolean; begin if Pos('/SP-', UpperCase(GetCmdTail)) > 0 then case CurPage of - wpWelcome, wpLicense, wpPassword, wpInfoBefore, wpUserInfo, - wpSelectDir, wpSelectProgramGroup, wpInfoAfter: + wpWelcome, wpLicense, wpPassword, wpInfoBefore, wpUserInfo, + wpSelectDir, wpSelectProgramGroup, wpInfoAfter: Result := True; - end; + end; end; // **************************************************************************** @@ -129,10 +129,10 @@ ErrorCode: Integer; begin // Stop and uninstall the Apache service - bRetVal := InstExec('cmd.exe', '/C apache -k stop', g_sApachePathBin, - True, False, SW_HIDE, ErrorCode); - bRetVal := InstExec('cmd.exe', '/C apache -k uninstall', g_sApachePathBin, - True, False, SW_HIDE, ErrorCode); + bRetVal := Exec('cmd.exe', '/C apache -k stop', g_sApachePathBin, + SW_HIDE, ewWaitUntilTerminated, ErrorCode); + bRetVal := Exec('cmd.exe', '/C apache -k uninstall', g_sApachePathBin, + SW_HIDE, ewWaitUntilTerminated, ErrorCode); end; // **************************************************************************** @@ -144,11 +144,11 @@ ErrorCode: Integer; begin // Install and start the Apache service - bRetVal := InstExec('cmd.exe', '/C apache -k install', g_sApachePathBin, - True, False, SW_HIDE, ErrorCode); + bRetVal := Exec('cmd.exe', '/C apache -k install', g_sApachePathBin, + SW_HIDE, ewWaitUntilTerminated, ErrorCode); - bRetVal := InstExec('cmd.exe', '/C apache -k start', g_sApachePathBin, - True, False, SW_HIDE, ErrorCode); + bRetVal := Exec('cmd.exe', '/C apache -k start', g_sApachePathBin, + SW_HIDE, ewWaitUntilTerminated, ErrorCode); end; @@ -542,9 +542,8 @@ begin case CurStep of wpReady: // Event after selected tasks - if (ShouldProcessEntry('', 'apachehandler') = srYes) then + if IsTaskSelected('apachehandler') then VerifyApache; - wpInstalling: // Event before setup is copying destination files if g_bHandleApache then begin @@ -554,10 +553,10 @@ end; end; -procedure CurStepChanged(CurStep: Integer); +procedure CurStepChanged(CurStep: TSetupStep); begin // Event after setup has copyed destination files - if (CurStep = wpInfoBefore) and g_bHandleApache then + if (CurStep = ssPostInstall) and g_bHandleApache then begin; ApacheConfFileHandle; ApacheServiceInstall; @@ -572,4 +571,3 @@ Result := True; end; - Modified: branches/ruby/packages/win32-innosetup/svn.iss Url: http://svn.collab.net/viewcvs/svn/branches/ruby/packages/win32-innosetup/svn.iss?view=diff&rev=13061&p1=branches/ruby/packages/win32-innosetup/svn.iss&r1=13060&p2=branches/ruby/packages/win32-innosetup/svn.iss&r2=13061 ============================================================================== --- branches/ruby/packages/win32-innosetup/svn.iss (original) +++ branches/ruby/packages/win32-innosetup/svn.iss Sat Feb 19 03:19:08 2005 @@ -1,6 +1,6 @@ [Setup] ;# Version parameters ######################################################### -#define svn_cpr "Copyright �2000-2004 CollabNet" +#define svn_cpr "Copyright �2000-2005 CollabNet" ; Version and release info: #include "svn_version.iss" @@ -46,6 +46,7 @@ ShowTasksTreeLines=true AllowNoIcons=true ShowLanguageDialog=no +ChangesEnvironment=true [Tasks] Name: desktopicon; Description: Create &desktop icon for the Subversion documentation; GroupDescription: Desktop icons: @@ -157,13 +158,13 @@ #endif [Registry] -Root: HKCU; Subkey: SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\svn.exe; ValueType: string; ValueData: {app}\svn.exe; Flags: uninsdeletekeyifempty uninsdeletevalue +Root: HKCU; Subkey: SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\svn.exe; ValueType: string; ValueData: {app}\bin\svn.exe; Flags: uninsdeletekeyifempty uninsdeletevalue Root: HKCU; Subkey: SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\svn.exe; ValueType: string; ValueName: Path; ValueData: {app}; Flags: uninsdeletekeyifempty uninsdeletevalue Root: HKCU; SubKey: SOFTWARE\Tigris.org\Subversion; ValueType: string; ValueName: Version; ValueData: {#= svn_version}; Flags: uninsdeletekeyifempty uninsdeletevalue Root: HKCU; SubKey: SOFTWARE\Tigris.org\Subversion; ValueType: string; ValueName: Revision; ValueData: {#= svn_revision}; Flags: uninsdeletekeyifempty uninsdeletevalue Root: HKCU; Subkey: Environment; ValueType: string; ValueName: APR_ICONV_PATH; ValueData: {app}\iconv; Flags: uninsdeletevalue noerror -Root: HKLM; Subkey: SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\svn.exe; ValueType: string; ValueData: {app}\svn.exe; Flags: noerror uninsdeletekeyifempty uninsdeletevalue +Root: HKLM; Subkey: SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\svn.exe; ValueType: string; ValueData: {app}\bin\svn.exe; Flags: noerror uninsdeletekeyifempty uninsdeletevalue Root: HKLM; Subkey: SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\svn.exe; ValueType: string; ValueName: Path; ValueData: {app}; Flags: uninsdeletekeyifempty uninsdeletevalue noerror Root: HKLM; SubKey: SOFTWARE\Tigris.org\Subversion; ValueType: string; ValueName: Version; ValueData: {#= svn_version}; Flags: noerror uninsdeletekey Root: HKLM; SubKey: SOFTWARE\Tigris.org\Subversion; ValueType: string; ValueName: Revision; ValueData: {#= svn_revision}; Flags: uninsdeletevalue noerror uninsdeletekeyifempty Modified: branches/ruby/subversion/bindings/swig/perl/native/t/6ra.t Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/bindings/swig/perl/native/t/6ra.t?view=diff&rev=13061&p1=branches/ruby/subversion/bindings/swig/perl/native/t/6ra.t&r1=13060&p2=branches/ruby/subversion/bindings/swig/perl/native/t/6ra.t&r2=13061 ============================================================================== --- branches/ruby/subversion/bindings/swig/perl/native/t/6ra.t (original) +++ branches/ruby/subversion/bindings/swig/perl/native/t/6ra.t Sat Feb 19 03:19:08 2005 @@ -37,3 +37,8 @@ my $reporter = $ra->do_update (1, '', 1, SVN::Delta::Editor->new); isa_ok ($reporter, 'SVN::Ra::Reporter'); $reporter->abort_report; + +END { +diag "cleanup"; +rmtree($repospath); +} Modified: branches/ruby/subversion/libsvn_delta/xdelta.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_delta/xdelta.c?view=diff&rev=13061&p1=branches/ruby/subversion/libsvn_delta/xdelta.c&r1=13060&p2=branches/ruby/subversion/libsvn_delta/xdelta.c&r2=13061 ============================================================================== --- branches/ruby/subversion/libsvn_delta/xdelta.c (original) +++ branches/ruby/subversion/libsvn_delta/xdelta.c Sat Feb 19 03:19:08 2005 @@ -105,12 +105,12 @@ static void init_matches_table (const char *data, - apr_uint32_t datalen, - apr_uint32_t blocksize, + apr_size_t datalen, + apr_size_t blocksize, apr_hash_t *matches, apr_pool_t *pool) { - apr_uint32_t i = 0; + apr_size_t i = 0; struct adler32 adler; for (i = 0; i < datalen; i += blocksize) { @@ -138,30 +138,32 @@ BADVANCEP. PENDING_INSERT is a pointer to a stringbuf pointer that is the last insert operation that has not been committed yet to the delta stream, if any. This is used when extending the matches backwards, possibly - alleviating the need for the insert entirely. */ + alleviating the need for the insert entirely. + Return TRUE if the lookup found a match, regardless of length. + Return FALSE otherwise. */ -static void +static svn_boolean_t find_match (apr_hash_t *matches, const struct adler32 *rolling, const char *a, - apr_uint32_t asize, + apr_size_t asize, const char *b, - apr_uint32_t bsize, - apr_uint32_t bpos, - apr_uint32_t *aposp, - apr_uint32_t *alenp, - apr_uint32_t *badvancep, + apr_size_t bsize, + apr_size_t bpos, + apr_size_t *aposp, + apr_size_t *alenp, + apr_size_t *badvancep, svn_stringbuf_t **pending_insert) { apr_uint32_t sum = adler32_sum (rolling); - apr_uint32_t alen, badvance, apos; + apr_size_t alen, badvance, apos; struct match *match; - apr_uint32_t tpos, tlen; + apr_size_t tpos, tlen; /* See if we have a match. */ match = apr_hash_get (matches, &sum, sizeof (sum)); if (match == NULL) - return; + return FALSE; /* See where our match started. */ tpos = match->pos; @@ -169,12 +171,11 @@ /* Make sure it's not a false match. */ if (memcmp (a + tpos, b + bpos, tlen) != 0) - return; + return FALSE; apos = tpos; alen = tlen; badvance = tlen; - /* Extend the match forward as far as possible */ while ((apos + alen < asize) && (bpos + badvance < bsize) @@ -205,6 +206,7 @@ *aposp = apos; *alenp = alen; *badvancep = badvance; + return TRUE; } /* Size of the blocks we compute checksums for. This was chosen out of @@ -246,7 +248,7 @@ { apr_hash_t *matches = apr_hash_make(pool); struct adler32 rolling; - apr_uint32_t sz, lo, hi; + apr_size_t sz, lo, hi; svn_stringbuf_t *pending_insert = NULL; /* Initialize the matches table. */ @@ -265,19 +267,20 @@ init_adler32 (&rolling, b, MATCH_BLOCKSIZE); for (sz = bsize, lo = 0, hi = MATCH_BLOCKSIZE; lo < sz;) { - apr_uint32_t apos = 0; - apr_uint32_t alen = 1; - apr_uint32_t badvance = 1; - apr_uint32_t next; + apr_size_t apos = 0; + apr_size_t alen = 1; + apr_size_t badvance = 1; + apr_size_t next; + svn_boolean_t match; - find_match (matches, &rolling, a, asize, b, bsize, lo, &apos, &alen, - &badvance, &pending_insert); + match = find_match (matches, &rolling, a, asize, b, bsize, lo, &apos, + &alen, &badvance, &pending_insert); /* If we didn't find a real match, insert the byte at the target position into the pending insert. */ - if (alen < MATCH_BLOCKSIZE && - (apos + alen < asize)) + if (match == FALSE) { + if (pending_insert != NULL) svn_stringbuf_appendbytes (pending_insert, b + lo, 1); else @@ -285,6 +288,12 @@ } else { + /* The only legal way to end up here is to find a match. If we + didn't find a match, we are going to generate a copy instruction + when we should have generated an insert, so something about the + condition above, or what the match routine did, is wrong. */ + assert (match == TRUE); + if (pending_insert) { svn_txdelta__insert_op (build_baton, svn_txdelta_new, Modified: branches/ruby/subversion/libsvn_fs_base/fs.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_fs_base/fs.c?view=diff&rev=13061&p1=branches/ruby/subversion/libsvn_fs_base/fs.c&r1=13060&p2=branches/ruby/subversion/libsvn_fs_base/fs.c&r2=13061 ============================================================================== --- branches/ruby/subversion/libsvn_fs_base/fs.c (original) +++ branches/ruby/subversion/libsvn_fs_base/fs.c Sat Feb 19 03:19:08 2005 @@ -421,7 +421,7 @@ "set_lg_regionmax 131072\n" "#\n" /* ### Configure this with "svnadmin create --bdb-cache-size" */ - "# The default cache size in BDB os only 256k. As explained in\n" + "# The default cache size in BDB is only 256k. As explained in\n" "# http://svn.haxx.se/dev/archive-2004-12/0369.shtml, this is too\n" "# small for most applications. Bump this number if \"db_stat -m\"\n" "# shows too many cache misses.\n" Modified: branches/ruby/subversion/libsvn_subr/io.c Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/libsvn_subr/io.c?view=diff&rev=13061&p1=branches/ruby/subversion/libsvn_subr/io.c&r1=13060&p2=branches/ruby/subversion/libsvn_subr/io.c&r2=13061 ============================================================================== --- branches/ruby/subversion/libsvn_subr/io.c (original) +++ branches/ruby/subversion/libsvn_subr/io.c Sat Feb 19 03:19:08 2005 @@ -2119,6 +2119,8 @@ svn_io_read_length_line (apr_file_t *file, char *buf, apr_size_t *limit, apr_pool_t *pool) { + const char *name; + svn_error_t *err; apr_size_t i; char c; @@ -2141,8 +2143,18 @@ } } - /* todo: make a custom error "SVN_LENGTH_TOO_LONG" or something? */ - return svn_error_create (SVN_WARNING, NULL, NULL); + err = file_name_get (&name, file, pool); + if (err) + name = NULL; + svn_error_clear (err); + + if (name) + return svn_error_createf (SVN_ERR_MALFORMED_FILE, NULL, + _("Can't read length line in file '%s'"), + svn_path_local_style (name, pool)); + else + return svn_error_create (SVN_ERR_MALFORMED_FILE, NULL, + _("Can't read length line in stream")); } Modified: branches/ruby/subversion/po/ja.po Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/po/ja.po?view=diff&rev=13061&p1=branches/ruby/subversion/po/ja.po&r1=13060&p2=branches/ruby/subversion/po/ja.po&r2=13061 ============================================================================== --- branches/ruby/subversion/po/ja.po (original) +++ branches/ruby/subversion/po/ja.po Sat Feb 19 03:19:08 2005 @@ -16,53 +16,76 @@ # cleanup 掃除 # commit コミット # conflict 衝突 +# contents 内容 # copyfrom コピー元 +# creating ... 〜を作成しています # datestamp タイムスタンプ # delta 差分 # deltification 差分化 # destination コピー先 / 移動先 +# dumpstream ダンプストリーム +# end 途切れる # end revision 終了リビジョン # entry エントリ +# error ...ing 〜する際にエラーが発生しました / 〜中にエラーが +# 発生しました +# expected 予想される # export エクスポート # external item 外部項目 +# ... failed 〜に失敗しました / 〜が失敗しました # HEAD HEAD # help ヘルプ # import インポート # in the way 妨害して +# insn インストラクション # item 項目 # last changed 最終変更 # last updated 最終更新 # local ローカル +# malformed 不正な # merge マージ # MIME type MIME タイプ # modified 修正された # node kind ノード種別 # node revision id ノードリビジョン識別番号 +# null 空の # out of date リポジトリ側と比べて古くなった +# overflow 溢れる +# post-commit hook post-commit フック +# post-revprop-change hook post-revprop-change フック +# pre-commit hook pre-commit フック +# pre-revprop-change hook pre-revprop-change フック # property 属性 # RA layer RA 層 # RA plugin ABI version RA プラグイン ABI バージョン +# read-only 読み取り専用 +# recode 再エンコードする +# recovery 復旧 # remote リモート # remove lock ロックを解除する # representation 表現 # revision リビジョン +# root of edit 編集用ルートパス # scheduled for ... 〜準備中の # source コピー元 / 移動元 / マージ元 +# start-commit hook start-commit フック # start revision 開始リビジョン # stderr 標準エラー出力 # stdin 標準入力 # stdout 標準出力 +# store 格納する # text-base テキストベース # transaction トランザクション # unversioned バージョン管理されていない # versioned バージョン管理された +# view ビュー # working copy 作業コピー msgid "" msgstr "" "Project-Id-Version: subversion trunk\n" "Report-Msgid-Bugs-To: dev-lmwclWVctOZK/UuDQWWi7iCwEArCW2h5@xxxxxxxxxxxxxxxx\n" -"POT-Creation-Date: 2004-12-22 17:38+0900\n" -"PO-Revision-Date: 2004-12-23 01:30+0900\n" +"POT-Creation-Date: 2005-02-19 16:58+0900\n" +"PO-Revision-Date: 2005-02-19 16:55+0900\n" "Last-Translator: Subversion <dev-lmwclWVctOZK/UuDQWWi7iCwEArCW2h5@xxxxxxxxxxxxxxxx>\n" "Language-Team: Japanese <dev-lmwclWVctOZK/UuDQWWi7iCwEArCW2h5@xxxxxxxxxxxxxxxx>\n" "MIME-Version: 1.0\n" @@ -286,7 +309,7 @@ "%s: (バージョン管理されていないリソースです)\n" "\n" -#: clients/cmdline/log-cmd.c:91 include/svn_error_codes.h:220 +#: clients/cmdline/log-cmd.c:91 include/svn_error_codes.h:223 #: libsvn_subr/cmdline.c:335 libsvn_subr/cmdline.c:352 msgid "Write error" msgstr "書き込みエラーです" @@ -455,7 +478,7 @@ # * 29 one-byte characters are displayed on the left. #: clients/cmdline/main.c:100 msgid "pass contents of file ARG as additional args" -msgstr "ファイル ARG の中身を引数に追加して渡します" +msgstr "ファイル ARG の内容を引数に追加して渡します" # * Description for 'svn --xml'. # * 29 one-byte characters are displayed on the left. @@ -909,7 +932,7 @@ "リポジトリ内のディレクトリのエントリを一覧表示します。\n" "使用方法: list [<対象>[@<REV>]...]\n" "\n" -" 各 <対象> ファイルおよび各 <対象> ディレクトリの中身を、ディレクトリにあ" +" 各 <対象> ファイルおよび各 <対象> ディレクトリの内容を、ディレクトリにあ" "る\n" " とおり一覧表示します。<対象> が作業コピーのパスである場合は、対応する\n" " リポジトリ URL が処理に用いられます。\n" @@ -2074,663 +2097,663 @@ msgid "Unrecognized line ending style" msgstr "改行文字形式を認識できません" -#: include/svn_error_codes.h:204 +#: include/svn_error_codes.h:205 msgid "Line endings other than expected" -msgstr "改行文字が期待したものと異なります" +msgstr "改行文字が予想したものと異なります" -#: include/svn_error_codes.h:208 +#: include/svn_error_codes.h:209 msgid "Ran out of unique names" msgstr "固有の名称を使い果たしました" -#: include/svn_error_codes.h:212 +#: include/svn_error_codes.h:214 msgid "Framing error in pipe protocol" msgstr "パイププロトコルのフレーミングエラーです" -#: include/svn_error_codes.h:216 +#: include/svn_error_codes.h:219 msgid "Read error in pipe" msgstr "パイプの読み込みエラーです" -#: include/svn_error_codes.h:226 +#: include/svn_error_codes.h:229 msgid "Unexpected EOF on stream" msgstr "予想外の EOF がストリーム中にあります" -#: include/svn_error_codes.h:230 +#: include/svn_error_codes.h:233 msgid "Malformed stream data" msgstr "異常なストリームデータです" -#: include/svn_error_codes.h:234 +#: include/svn_error_codes.h:237 msgid "Unrecognized stream data" msgstr "認識できないストリームデータです" -#: include/svn_error_codes.h:240 +#: include/svn_error_codes.h:243 msgid "Unknown svn_node_kind" msgstr "未知の svn_node_kind です" -#: include/svn_error_codes.h:244 +#: include/svn_error_codes.h:247 msgid "Unexpected node kind found" msgstr "予想外のノード種別が見つかりました" -#: include/svn_error_codes.h:250 +#: include/svn_error_codes.h:253 msgid "Can't find an entry" msgstr "エントリが見つかりません" -#: include/svn_error_codes.h:256 +#: include/svn_error_codes.h:259 msgid "Entry already exists" msgstr "エントリが既に存在します" -#: include/svn_error_codes.h:260 +#: include/svn_error_codes.h:263 msgid "Entry has no revision" msgstr "エントリにリビジョンがありません" -#: include/svn_error_codes.h:264 +#: include/svn_error_codes.h:267 msgid "Entry has no URL" msgstr "エントリに URL がありません" -#: include/svn_error_codes.h:268 +#: include/svn_error_codes.h:271 msgid "Entry has an invalid attribute" msgstr "エントリが不正な属性をもっています" -#: include/svn_error_codes.h:274 +#: include/svn_error_codes.h:277 msgid "Obstructed update" msgstr "更新が妨害されました" -#: include/svn_error_codes.h:278 +#: include/svn_error_codes.h:282 msgid "Mismatch popping the WC unwind stack" msgstr "作業コピーアンワインドスタックに対してポップする際に不一致があります" -#: include/svn_error_codes.h:282 +#: include/svn_error_codes.h:287 msgid "Attempt to pop empty WC unwind stack" msgstr "空の作業コピーアンワインドスタックに対してポップしようとしています" -#: include/svn_error_codes.h:286 +#: include/svn_error_codes.h:292 msgid "Attempt to unlock with non-empty unwind stack" msgstr "空でないアンワインドスタックのロックを解除しようとしています" -#: include/svn_error_codes.h:290 +#: include/svn_error_codes.h:296 msgid "Attempted to lock an already-locked dir" msgstr "既にロックされたディレクトリをロックしようとしました" -#: include/svn_error_codes.h:294 +#: include/svn_error_codes.h:300 msgid "Working copy not locked" msgstr "作業コピーがロックされていません" -#: include/svn_error_codes.h:298 +#: include/svn_error_codes.h:305 msgid "Invalid lock" msgstr "ロックが不正です" -#: include/svn_error_codes.h:302 +#: include/svn_error_codes.h:309 msgid "Path is not a working copy directory" msgstr "パスは作業コピーのディレクトリではありません" -#: include/svn_error_codes.h:306 +#: include/svn_error_codes.h:313 msgid "Path is not a working copy file" msgstr "パスは作業コピーのファイルではありません" -#: include/svn_error_codes.h:310 +#: include/svn_error_codes.h:317 msgid "Problem running log" msgstr "ログの実行中に問題が起きました" -#: include/svn_error_codes.h:314 +#: include/svn_error_codes.h:321 msgid "Can't find a working copy path" msgstr "作業コピーパスが見つかりません" -#: include/svn_error_codes.h:318 +#: include/svn_error_codes.h:325 msgid "Working copy is not up-to-date" msgstr "作業コピーが最新ではありません" -#: include/svn_error_codes.h:322 +#: include/svn_error_codes.h:329 msgid "Left locally modified or unversioned files" msgstr "" "ローカルで修正されたファイルやバージョン管理下にないファイルを残しました" -#: include/svn_error_codes.h:326 +#: include/svn_error_codes.h:333 msgid "Unmergeable scheduling requested on an entry" msgstr "エントリに対してマージできない準備をするよう要求されました" -#: include/svn_error_codes.h:330 +#: include/svn_error_codes.h:337 msgid "Found a working copy path" msgstr "作業コピーのパスが見つかりました" -#: include/svn_error_codes.h:334 +#: include/svn_error_codes.h:341 msgid "A conflict in the working copy obstructs the current operation" msgstr "作業ディレクトリ内に衝突があり、実行中の操作が妨害されました" -#: include/svn_error_codes.h:338 +#: include/svn_error_codes.h:345 msgid "Working copy is corrupt" msgstr "作業コピーが壊れています" # ? text base -#: include/svn_error_codes.h:342 +#: include/svn_error_codes.h:349 msgid "Working copy text base is corrupt" msgstr "作業コピーのテキストベースが壊れています" -#: include/svn_error_codes.h:346 +#: include/svn_error_codes.h:353 msgid "Cannot change node kind" msgstr "ノード種別を変更できません" -#: include/svn_error_codes.h:350 +#: include/svn_error_codes.h:357 msgid "Invalid operation on the current working directory" msgstr "現在の作業ディレクトリに対する不正な操作です" -#: include/svn_error_codes.h:354 +#: include/svn_error_codes.h:361 msgid "Problem on first log entry in a working copy" msgstr "作業コピー中の最初のログエントリに問題があります" -#: include/svn_error_codes.h:358 +#: include/svn_error_codes.h:365 msgid "Unsupported working copy format" msgstr "サポートされていない作業コピーの形式です" # ? in this context -#: include/svn_error_codes.h:362 +#: include/svn_error_codes.h:369 msgid "Path syntax not supported in this context" msgstr "この操作ではパスの構文はサポートされていません" -#: include/svn_error_codes.h:367 +#: include/svn_error_codes.h:374 msgid "Invalid schedule" msgstr "準備内容が不正です" -#: include/svn_error_codes.h:373 +#: include/svn_error_codes.h:380 msgid "General filesystem error" msgstr "一般的なファイルシステムエラーです" -#: include/svn_error_codes.h:377 +#: include/svn_error_codes.h:384 msgid "Error closing filesystem" msgstr "ファイルシステムを閉じる際にエラーがありました" -#: include/svn_error_codes.h:381 +#: include/svn_error_codes.h:388 msgid "Filesystem is already open" msgstr "ファイルシステムが既に開いています" -#: include/svn_error_codes.h:385 +#: include/svn_error_codes.h:392 msgid "Filesystem is not open" msgstr "ファイルシステムが開いていません" -#: include/svn_error_codes.h:389 +#: include/svn_error_codes.h:396 msgid "Filesystem is corrupt" msgstr "ファイルシステムが壊れています" -#: include/svn_error_codes.h:393 +#: include/svn_error_codes.h:400 msgid "Invalid filesystem path syntax" msgstr "ファイルシステムのパスの構文が不正です。" -#: include/svn_error_codes.h:397 +#: include/svn_error_codes.h:404 msgid "Invalid filesystem revision number" msgstr "ファイルシステムのリビジョン番号が不正です。" -#: include/svn_error_codes.h:401 +#: include/svn_error_codes.h:408 msgid "Invalid filesystem transaction name" msgstr "ファイルシステムのトランザクション名が不正です。" -#: include/svn_error_codes.h:405 +#: include/svn_error_codes.h:412 msgid "Filesystem directory has no such entry" msgstr "ファイルシステムのディレクトリにはそのようなエントリはありません" -#: include/svn_error_codes.h:409 +#: include/svn_error_codes.h:416 msgid "Filesystem has no such representation" msgstr "そのような表現はファイルシステムにありません" -#: include/svn_error_codes.h:413 +#: include/svn_error_codes.h:420 msgid "Filesystem has no such string" msgstr "そのような文字列はファイルシステムにありません" -#: include/svn_error_codes.h:417 +#: include/svn_error_codes.h:424 msgid "Filesystem has no such copy" msgstr "そのようなコピーはファイルシステムにありません" -#: include/svn_error_codes.h:421 +#: include/svn_error_codes.h:428 msgid "The specified transaction is not mutable" msgstr "指定されたトランザクションは変更できません" -#: include/svn_error_codes.h:425 +#: include/svn_error_codes.h:432 msgid "Filesystem has no item" msgstr "ファイルシステムに項目がありません" -#: include/svn_error_codes.h:429 +#: include/svn_error_codes.h:436 msgid "Filesystem has no such node-rev-id" msgstr "ファイルシステムにそのようなノードリビジョン識別番号はありません" -#: include/svn_error_codes.h:433 +#: include/svn_error_codes.h:440 msgid "String does not represent a node or node-rev-id" msgstr "文字列がノードやノードリビジョン識別番号を表していません" -#: include/svn_error_codes.h:437 +#: include/svn_error_codes.h:444 msgid "Name does not refer to a filesystem directory" msgstr "名前がファイルシステムのディレクトリを参照していません" -#: include/svn_error_codes.h:441 +#: include/svn_error_codes.h:448 msgid "Name does not refer to a filesystem file" msgstr "名前がファイルシステムのファイルを参照していません" # ? single path component -#: include/svn_error_codes.h:445 +#: include/svn_error_codes.h:452 msgid "Name is not a single path component" msgstr "名前は一階層のパス成分ではありません" -#: include/svn_error_codes.h:449 +#: include/svn_error_codes.h:456 msgid "Attempt to change immutable filesystem node" msgstr "ファイルシステムの、変更できないノードを変更しようとしました" -#: include/svn_error_codes.h:453 +#: include/svn_error_codes.h:460 msgid "Item already exists in filesystem" msgstr "項目は既にファイルシステムに存在しています" -#: include/svn_error_codes.h:457 +#: include/svn_error_codes.h:464 msgid "Attempt to remove or recreate fs root dir" msgstr "" "ファイルシステムのルートディレクトリを削除または再作成しようとしています" # ? transaction root -#: include/svn_error_codes.h:461 +#: include/svn_error_codes.h:468 msgid "Object is not a transaction root" msgstr "対象はトランザクションルートではありません" # ? revision root -#: include/svn_error_codes.h:465 +#: include/svn_error_codes.h:472 msgid "Object is not a revision root" msgstr "対象はリビジョンルートではありません" -#: include/svn_error_codes.h:469 +#: include/svn_error_codes.h:476 msgid "Merge conflict during commit" msgstr "コミット中にマージの衝突がありました" -#: include/svn_error_codes.h:473 +#: include/svn_error_codes.h:480 msgid "A representation vanished or changed between reads" msgstr "読んでいる際に表現が消えたか変更されたかしています" -#: include/svn_error_codes.h:477 +#: include/svn_error_codes.h:484 msgid "Tried to change an immutable representation" msgstr "変更できない表現を変更しようとしました" -#: include/svn_error_codes.h:481 +#: include/svn_error_codes.h:488 msgid "Malformed skeleton data" msgstr "不正なスケルトンデータです" -#: include/svn_error_codes.h:485 +#: include/svn_error_codes.h:492 msgid "Transaction is out of date" msgstr "トランザクションはリポジトリ側と比べて古くなっています" -#: include/svn_error_codes.h:489 +#: include/svn_error_codes.h:496 msgid "Berkeley DB error" msgstr "Berkeley DB のエラーです" -#: include/svn_error_codes.h:493 +#: include/svn_error_codes.h:500 msgid "Berkeley DB deadlock error" msgstr "Berkeley DB のデッドロックエラーです" -#: include/svn_error_codes.h:497 +#: include/svn_error_codes.h:504 msgid "Transaction is dead" msgstr "トランザクションが死んでいます" -#: include/svn_error_codes.h:501 +#: include/svn_error_codes.h:508 msgid "Transaction is not dead" msgstr "トランザクションは死んでいません" -#: include/svn_error_codes.h:506 +#: include/svn_error_codes.h:513 msgid "Unknown FS type" msgstr "未知のファイルシステム形式です" -#: include/svn_error_codes.h:512 +#: include/svn_error_codes.h:519 msgid "The repository is locked, perhaps for db recovery" msgstr "リポジトリはロックされています。おそらく DB の復旧中です" -#: include/svn_error_codes.h:516 +#: include/svn_error_codes.h:523 msgid "A repository hook failed" msgstr "リポジトリフックの実行が失敗しました" -#: include/svn_error_codes.h:520 +#: include/svn_error_codes.h:527 msgid "Incorrect arguments supplied" msgstr "不正な変数が入力されました" -#: include/svn_error_codes.h:524 +#: include/svn_error_codes.h:531 msgid "A report cannot be generated because no data was supplied" msgstr "データが入力されなかったので報告を作成できませんでした" -#: include/svn_error_codes.h:528 +#: include/svn_error_codes.h:535 msgid "Bogus revision report" msgstr "不正なリビジョン報告です" -#: include/svn_error_codes.h:532 +#: include/svn_error_codes.h:539 msgid "Unsupported repository version" msgstr "サポートされていないリポジトリのバージョンです" -#: include/svn_error_codes.h:536 +#: include/svn_error_codes.h:543 msgid "Disabled repository feature" msgstr "このリポジトリ機能は無効になりました" -#: include/svn_error_codes.h:540 +#: include/svn_error_codes.h:547 msgid "Error running post-commit hook" -msgstr "コミット後、フックの実行中にエラーが発生しました" +msgstr "post-commit フックの実行中にエラーが発生しました" -#: include/svn_error_codes.h:546 +#: include/svn_error_codes.h:553 msgid "Bad URL passed to RA layer" msgstr "不正な URL が RA 層に渡されました" -#: include/svn_error_codes.h:550 +#: include/svn_error_codes.h:557 msgid "Authorization failed" msgstr "認証に失敗しました" -#: include/svn_error_codes.h:554 +#: include/svn_error_codes.h:561 msgid "Unknown authorization method" msgstr "未知の認証方法です" -#: include/svn_error_codes.h:558 +#: include/svn_error_codes.h:565 msgid "Repository access method not implemented" msgstr "リポジトリアクセス方法が実装されていません" -#: include/svn_error_codes.h:562 +#: include/svn_error_codes.h:569 msgid "Item is out-of-date" msgstr "項目はリポジトリ側と比べて古くなっています" -#: include/svn_error_codes.h:566 +#: include/svn_error_codes.h:573 msgid "Repository has no UUID" msgstr "リポジトリに UUID がありません" -#: include/svn_error_codes.h:570 +#: include/svn_error_codes.h:577 msgid "Unsupported RA plugin ABI version" msgstr "RA プラグイン ABI バージョンはサポートされていません" -#: include/svn_error_codes.h:576 +#: include/svn_error_codes.h:583 msgid "RA layer failed to init socket layer" msgstr "RA 層はソケット層を開始できませんでした" -#: include/svn_error_codes.h:580 +#: include/svn_error_codes.h:587 msgid "RA layer failed to create HTTP request" msgstr "RA 層は HTTP リクエストの作成できませんでした" -#: include/svn_error_codes.h:584 +#: include/svn_error_codes.h:591 msgid "RA layer request failed" msgstr "RA 層のリクエストは失敗しました" -#: include/svn_error_codes.h:588 +#: include/svn_error_codes.h:595 msgid "RA layer didn't receive requested OPTIONS info" msgstr "RA 層は、リクエストした OPTIONS 情報を受け取ることができませんでした" -#: include/svn_error_codes.h:592 +#: include/svn_error_codes.h:599 msgid "RA layer failed to fetch properties" msgstr "RA 層は属性を取得できませんでした" -#: include/svn_error_codes.h:596 +#: include/svn_error_codes.h:603 msgid "RA layer file already exists" msgstr "RA 層のファイルは既にあります" -#: include/svn_error_codes.h:600 +#: include/svn_error_codes.h:607 msgid "Invalid configuration value" msgstr "不正な設定値です" -#: include/svn_error_codes.h:604 +#: include/svn_error_codes.h:611 msgid "HTTP Path Not Found" msgstr "HTTP パスが見つかりません" -#: include/svn_error_codes.h:608 +#: include/svn_error_codes.h:615 msgid "Failed to excute WebDAV PROPPATCH" msgstr "WebDAV PROPPATCH を実行できませんでした" -#: include/svn_error_codes.h:615 include/svn_error_codes.h:644 +#: include/svn_error_codes.h:622 include/svn_error_codes.h:651 msgid "Couldn't find a repository" msgstr "リポジトリが見つかりません" -#: include/svn_error_codes.h:619 +#: include/svn_error_codes.h:626 msgid "Couldn't open a repository" msgstr "リポジトリを開けません" -#: include/svn_error_codes.h:624 +#: include/svn_error_codes.h:631 msgid "Special code for wrapping server errors to report to client" msgstr "クライアントに報告するサーバのエラーを包み込むための特殊なコードです" -#: include/svn_error_codes.h:628 +#: include/svn_error_codes.h:635 msgid "Unknown svn protocol command" msgstr "未知の svn プロトコルコマンドです" -#: include/svn_error_codes.h:632 +#: include/svn_error_codes.h:639 msgid "Network connection closed unexpectedly" msgstr "ネットワーク接続が突然切られました" -#: include/svn_error_codes.h:636 +#: include/svn_error_codes.h:643 msgid "Network read/write error" msgstr "ネットワークの読み込み / 書き込みエラーです" -#: include/svn_error_codes.h:640 libsvn_ra_svn/marshal.c:592 +#: include/svn_error_codes.h:647 libsvn_ra_svn/marshal.c:592 #: libsvn_ra_svn/marshal.c:700 libsvn_ra_svn/marshal.c:727 msgid "Malformed network data" msgstr "不正なネットワークデータです" -#: include/svn_error_codes.h:648 +#: include/svn_error_codes.h:655 msgid "Client/server version mismatch" msgstr "クライアントとサーバーのバージョンが一致しません" -#: include/svn_error_codes.h:656 +#: include/svn_error_codes.h:663 msgid "Credential data unavailable" msgstr "利用できる信任データがありません" -#: include/svn_error_codes.h:660 +#: include/svn_error_codes.h:667 msgid "No authentication provider available" msgstr "利用できる認証供給者がありません" -#: include/svn_error_codes.h:664 include/svn_error_codes.h:668 +#: include/svn_error_codes.h:671 include/svn_error_codes.h:675 msgid "All authentication providers exhausted" msgstr "認証供給者はすべて使い果たされています" -#: include/svn_error_codes.h:674 +#: include/svn_error_codes.h:681 msgid "Read access denied for root of edit" -msgstr "編集のルートへの読み込みアクセスが拒否されました" +msgstr "編集用ルートパスへの読み込みアクセスが拒否されました" -#: include/svn_error_codes.h:679 +#: include/svn_error_codes.h:686 msgid "Item is not readable." msgstr "項目が読み込み可能でありません。" -#: include/svn_error_codes.h:684 +#: include/svn_error_codes.h:691 msgid "Item is partially readable." msgstr "項目の一部だけが読み込み可能です。" -#: include/svn_error_codes.h:691 +#: include/svn_error_codes.h:698 msgid "Svndiff data has invalid header" msgstr "svndiff データに不正なヘッダがあります" # ? corrupt window -#: include/svn_error_codes.h:695 +#: include/svn_error_codes.h:702 msgid "Svndiff data contains corrupt window" -msgstr "snvdiff データに壊れた window が含まれています" +msgstr "svndiff データに壊れた window が含まれています" -#: include/svn_error_codes.h:699 +#: include/svn_error_codes.h:706 msgid "Svndiff data contains backward-sliding source view" msgstr "svndiff データに、逆方向にスライドするソースビューが含まれています" -#: include/svn_error_codes.h:703 +#: include/svn_error_codes.h:710 msgid "Svndiff data contains invalid instruction" msgstr "svndiff データに不正な命令が含まれています" -#: include/svn_error_codes.h:707 +#: include/svn_error_codes.h:714 msgid "Svndiff data ends unexpectedly" -msgstr "svndiff データが突然終わりました" +msgstr "svndiff データが予想外に途切れました" -#: include/svn_error_codes.h:713 +#: include/svn_error_codes.h:720 msgid "Apache has no path to an SVN filesystem" msgstr "Apache に SVN ファイルシステムへのパスがありません" -#: include/svn_error_codes.h:717 +#: include/svn_error_codes.h:724 msgid "Apache got a malformed URI" msgstr "Apache が不正な URI を受け取りました" -#: include/svn_error_codes.h:721 +#: include/svn_error_codes.h:728 msgid "Activity not found" msgstr "作業が見つかりません" -#: include/svn_error_codes.h:725 +#: include/svn_error_codes.h:732 msgid "Baseline incorrect" msgstr "ベースラインが不正です" -#: include/svn_error_codes.h:729 +#: include/svn_error_codes.h:736 msgid "Input/output error" msgstr "入出力エラーです" -#: include/svn_error_codes.h:735 +#: include/svn_error_codes.h:742 msgid "A path under version control is needed for this operation" msgstr "この操作ではバージョン管理下にあるパスが必要です" -#: include/svn_error_codes.h:739 +#: include/svn_error_codes.h:746 msgid "Repository access is needed for this operation" msgstr "この操作ではリポジトリへのアクセスが必要です。" -#: include/svn_error_codes.h:743 +#: include/svn_error_codes.h:750 msgid "Bogus revision information given" msgstr "不正なリビジョン情報を指定されました" -#: include/svn_error_codes.h:747 +#: include/svn_error_codes.h:754 msgid "Attempting to commit to a URL more than once" msgstr "URL に複数回コミットしようとしています" -#: include/svn_error_codes.h:751 +#: include/svn_error_codes.h:758 msgid "Operation does not apply to binary file" msgstr "バイナリファイルには適用できない操作です" -#: include/svn_error_codes.h:757 +#: include/svn_error_codes.h:764 msgid "Format of an svn:externals property was invalid" msgstr "属性 svn:external の形式が不正です" -#: include/svn_error_codes.h:761 +#: include/svn_error_codes.h:768 msgid "Attempting restricted operation for modified resource" msgstr "修正されているリソースに対し、制限のある操作をしようとしています" -#: include/svn_error_codes.h:765 +#: include/svn_error_codes.h:772 msgid "Operation does not apply to directory" msgstr "ディレクトリに対しては操作を適用できません" -#: include/svn_error_codes.h:769 +#: include/svn_error_codes.h:776 msgid "Revision range is not allowed" msgstr "リビジョン範囲は適用できません" -#: include/svn_error_codes.h:773 +#: include/svn_error_codes.h:780 msgid "Inter-repository relocation not allowed" msgstr "参照リポジトリの変更は、異なるリポジトリの間ではできません" -#: include/svn_error_codes.h:777 +#: include/svn_error_codes.h:784 msgid "Author name cannot contain a newline" msgstr "変更者の名前に改行文字を入れてはいけません" -#: include/svn_error_codes.h:781 +#: include/svn_error_codes.h:788 msgid "Bad property name" msgstr "不正な属性名です" -#: include/svn_error_codes.h:786 +#: include/svn_error_codes.h:793 msgid "Two versioned resources are unrelated" msgstr "バージョン管理下にある 2 つのリソースは関係がありません" -#: include/svn_error_codes.h:793 +#: include/svn_error_codes.h:800 msgid "A problem occurred; see later errors for details" msgstr "エラーが発生しました。詳しくは次のエラーメッセージを参照してください" -#: include/svn_error_codes.h:797 +#: include/svn_error_codes.h:804 msgid "Failure loading plugin" msgstr "プラグインをロードできませんでした" -#: include/svn_error_codes.h:801 +#: include/svn_error_codes.h:808 msgid "Malformed file" msgstr "不正なファイルです" -#: include/svn_error_codes.h:805 +#: include/svn_error_codes.h:812 msgid "Incomplete data" msgstr "不完全なデータです" -#: include/svn_error_codes.h:809 +#: include/svn_error_codes.h:816 msgid "Incorrect parameters given" msgstr "不正なパラメータを指定しました" -#: include/svn_error_codes.h:813 +#: include/svn_error_codes.h:820 msgid "Tried a versioning operation on an unversioned resource" msgstr "" "バージョン管理下にないリソースにバージョン管理操作を実行しようとしました" -#: include/svn_error_codes.h:817 +#: include/svn_error_codes.h:824 msgid "Test failed" msgstr "テストが失敗しました" -#: include/svn_error_codes.h:821 +#: include/svn_error_codes.h:828 msgid "Trying to use an unsupported feature" msgstr "サポートされていない機能を使おうとしています" -#: include/svn_error_codes.h:825 +#: include/svn_error_codes.h:832 msgid "Unexpected or unknown property kind" msgstr "予想外または未知の属性種別です" -#: include/svn_error_codes.h:829 +#: include/svn_error_codes.h:836 msgid "Illegal target for the requested operation" msgstr "要求された操作の対象としては不正です" -#: include/svn_error_codes.h:833 +#: include/svn_error_codes.h:840 msgid "MD5 checksum is missing" msgstr "MD5 チェックサムがありません" -#: include/svn_error_codes.h:837 +#: include/svn_error_codes.h:844 msgid "Directory needs to be empty but is not" msgstr "ディレクトリは空でなければなりませんが、そうではありません" -#: include/svn_error_codes.h:841 +#: include/svn_error_codes.h:848 msgid "Error calling external program" msgstr "外部プログラムの呼び出し中にエラーが発生しました" -#: include/svn_error_codes.h:845 +#: include/svn_error_codes.h:852 msgid "Python exception has been set with the error" msgstr "エラーに対して Python の例外が設定されました" -#: include/svn_error_codes.h:849 +#: include/svn_error_codes.h:856 msgid "A checksum mismatch occurred" msgstr "チェックサムの不一致が生じました" -#: include/svn_error_codes.h:853 +#: include/svn_error_codes.h:860 msgid "The operation was interrupted" msgstr "操作が中断されました" -#: include/svn_error_codes.h:857 +#: include/svn_error_codes.h:864 msgid "The specified diff option is not supported" msgstr "指定された差分表示 (diff) オプションはサポートされていません" -#: include/svn_error_codes.h:861 +#: include/svn_error_codes.h:868 msgid "Property not found" msgstr "属性が見つかりません" -#: include/svn_error_codes.h:865 +#: include/svn_error_codes.h:872 msgid "No auth file path available" msgstr "利用できる認証ファイルパスがありません" -#: include/svn_error_codes.h:870 +#: include/svn_error_codes.h:877 msgid "Incompatible library version" msgstr "ライブラリのバージョンは互換性がありません" -#: include/svn_error_codes.h:876 +#: include/svn_error_codes.h:883 msgid "Client error in parsing arguments" msgstr "クライアントが引数を解析しているときにエラーが生じました" -#: include/svn_error_codes.h:880 +#: include/svn_error_codes.h:887 msgid "Not enough args provided" msgstr "指定する引数が不十分です" -#: include/svn_error_codes.h:884 +#: include/svn_error_codes.h:891 msgid "Mutually exclusive arguments specified" msgstr "互いに排他的な引数が指定されています" -#: include/svn_error_codes.h:888 +#: include/svn_error_codes.h:895 msgid "Attempted command in administrative dir" msgstr "管理用ディレクトリでコマンドを実行しようとしました" -#: include/svn_error_codes.h:892 +#: include/svn_error_codes.h:899 msgid "The log message file is under version control" msgstr "ログメッセージファイルはバージョン管理下にあります" -#: include/svn_error_codes.h:896 +#: include/svn_error_codes.h:903 msgid "The log message is a pathname" msgstr "ログメッセージはパス名です" -#: include/svn_error_codes.h:900 +#: include/svn_error_codes.h:907 msgid "Committing in directory scheduled for addition" msgstr "追加準備状態にあるディレクトリにコミットしています" -#: include/svn_error_codes.h:904 +#: include/svn_error_codes.h:911 msgid "No external editor available" msgstr "利用できる外部エディタがありません" -#: include/svn_error_codes.h:908 +#: include/svn_error_codes.h:915 msgid "Something is wrong with the log message's contents" -msgstr "ログメッセージの中身に不正な箇所があります" +msgstr "ログメッセージの内容に不正な箇所があります" #: libsvn_client/add.c:354 #, c-format @@ -3283,6 +3306,77 @@ msgid "Unrecognized revision type requested for '%s'" msgstr "'%s' に要求されたリビジョン形式を認識できません" +#: libsvn_delta/svndiff.c:350 +#, c-format +msgid "Invalid diff stream: insn %d cannot be decoded" +msgstr "diff ストリームが不正です: インストラクション %d をデコードできません" + +#: libsvn_delta/svndiff.c:354 +#, c-format +msgid "Invalid diff stream: insn %d has non-positive length" +msgstr "" +"diff ストリームが不正です: インストラクション %d の長さが正でありません" + +#: libsvn_delta/svndiff.c:358 +#, c-format +msgid "Invalid diff stream: insn %d overflows the target view" +msgstr "" +"diff ストリームが不正です: インストラクション %d が対象のビューから溢れていま" +"す" + +#: libsvn_delta/svndiff.c:367 +#, c-format +msgid "Invalid diff stream: [src] insn %d overflows the source view" +msgstr "" +"diff ストリームが不正です: [ソース] インストラクション %d がソースビューから" +"溢れています" + +#: libsvn_delta/svndiff.c:374 +#, c-format +msgid "" +"Invalid diff stream: [tgt] insn %d starts beyond the target view position" +msgstr "" +"diff ストリームが不正です: [対象] インストラクション %d が対象ビューの位置を" +"超えています" + +#: libsvn_delta/svndiff.c:381 +#, c-format +msgid "Invalid diff stream: [new] insn %d overflows the new data section" +msgstr "" +"diff ストリームが不正です: [新規] インストラクション %d が新規データセクショ" +"ンから溢れています" + +#: libsvn_delta/svndiff.c:391 +msgid "Delta does not fill the target window" +msgstr "delta が対象の window を満たしていません" + +#: libsvn_delta/svndiff.c:394 +msgid "Delta does not contain enough new data" +msgstr "delta が新しいデータを十分に含んでいません" + +#: libsvn_delta/svndiff.c:471 +msgid "Svndiff has invalid header" +msgstr "svndiff に不正なヘッダがあります" + +# ? corrupt window +#: libsvn_delta/svndiff.c:526 libsvn_delta/svndiff.c:681 +msgid "Svndiff contains corrupt window header" +msgstr "svndiff に壊れた window ヘッダが含まれています" + +#: libsvn_delta/svndiff.c:535 +msgid "Svndiff has backwards-sliding source views" +msgstr "svndiff に、逆方向にスライドするソースビューが含まれています" + +#: libsvn_delta/svndiff.c:583 libsvn_delta/svndiff.c:630 +#: libsvn_delta/svndiff.c:703 +msgid "Unexpected end of svndiff input" +msgstr "svndiff 入力が予想外に途切れました" + +#: libsvn_diff/diff_file.c:1169 +#, c-format +msgid "Failed to delete mmap '%s'" +msgstr "メモリへのマップ '%s' を削除できませんでした" + #: libsvn_fs/fs-loader.c:99 libsvn_ra/ra_loader.c:122 #, c-format msgid "'%s' does not define '%s()'" @@ -3589,11 +3683,11 @@ msgid "Can't chmod '%s'" msgstr "chmod '%s' はできません" -#: libsvn_fs_fs/fs_fs.c:3483 +#: libsvn_fs_fs/fs_fs.c:3486 msgid "Transaction out of date" msgstr "トランザクションはリポジトリ側と比べて古くなっています" -#: libsvn_fs_fs/fs_fs.c:3722 +#: libsvn_fs_fs/fs_fs.c:3726 msgid "No such transaction" msgstr "そのようなトランザクションはありません" @@ -4136,6 +4230,51 @@ msgid "Unknown status '%s' in command response" msgstr "コマンドへのレスポンス内に未知のステータス '%s' があります" +#: libsvn_repos/commit.c:117 +#, c-format +msgid "Out of date: '%s' in transaction '%s'" +msgstr "'%s' (トランザクション '%s' 中) はリポジトリ側と比べて古くなっています" + +#: libsvn_repos/commit.c:224 libsvn_repos/commit.c:356 +#, c-format +msgid "Got source path but no source revision for '%s'" +msgstr "'%s' は、ソースパスはありますがソースリビジョンがありません" + +#: libsvn_repos/commit.c:248 libsvn_repos/commit.c:380 +#, c-format +msgid "Source url '%s' is from different repository" +msgstr "" +"コピー元 (もしくは移動元) の URL '%s' は異なるリポジトリに由来するものです" + +#: libsvn_repos/commit.c:486 +#, c-format +msgid "" +"Checksum mismatch for resulting fulltext\n" +"(%s):\n" +" expected checksum: %s\n" +" actual checksum: %s\n" +msgstr "" +"結果として得られるフルテキスト (%s) のチェックサムが一致しませんでした:\n" +" 予想されるチェックサム: %s\n" +" 実際のチェックサム: %s\n" + +#: libsvn_repos/delta.c:179 +msgid "Unable to open root of edit" +msgstr "編集用ルートパスを開けませんでした" + +#: libsvn_repos/delta.c:230 +msgid "Invalid target path" +msgstr "対象のパスが不正です" + +#: libsvn_repos/delta.c:256 +msgid "" +"Invalid editor anchoring; at least one of the input paths is not a directory " +"and there was no source entry" +msgstr "" +"エディタのアンカリングが不正です。\n" +"入力パスのうち少なくとも一つがディレクトリではなく、ソースエントリがありませ" +"ん" + #: libsvn_repos/dump.c:416 #, c-format msgid "" @@ -4164,19 +4303,133 @@ msgid "* %s revision %ld.\n" msgstr "* %s リビジョン %ld。\n" -#: libsvn_repos/load.c:826 +#: libsvn_repos/fs-wrap.c:56 +msgid "Commit succeeded, but post-commit hook failed" +msgstr "コミットには成功しましたが、post-commit フックに失敗しました" + +#: libsvn_repos/fs-wrap.c:155 +#, c-format +msgid "" +"Storage of non-regular property '%s' is disallowed through the repository " +"interface, and could indicate a bug in your client" +msgstr "" +"標準外の属性 '%s' を格納するのをリポジトリインタフェースが拒否しました。\n" +"おそらくこれは、使用しているクライアントにバグがあることを意味しています。" + +#: libsvn_repos/fs-wrap.c:294 +#, c-format +msgid "Write denied: not authorized to read all of revision %ld." +msgstr "" +"書き込みが拒否されました。リビジョン %ld のすべてを読めるようには認証されてい" +"ません" + +#: libsvn_repos/hooks.c:65 +#, c-format +msgid "Can't create pipe for hook '%s'" +msgstr "フック '%s' 用のパイプを作成できません" + +# ? null stdout +#: libsvn_repos/hooks.c:72 +#, c-format +msgid "Can't create null stdout for hook '%s'" +msgstr "フック '%s' 用の空の標準出力を作成できません" + +#: libsvn_repos/hooks.c:84 +msgid "Error closing write end of stderr pipe" +msgstr "標準エラー出力パイプの書き込みの終点を閉じる際にエラーが発生しました" + +#: libsvn_repos/hooks.c:90 +#, c-format +msgid "Failed to run '%s' hook" +msgstr "'%s' フックの実行に失敗しました" + +#: libsvn_repos/hooks.c:105 +#, c-format +msgid "" +"'%s' hook failed with error output:\n" +"%s" +msgstr "" +"'%s' フックが次のようなエラーを出力して失敗しました:\n" +"%s" + +#: libsvn_repos/hooks.c:116 +msgid "Error closing read end of stderr pipe" +msgstr "標準エラー出力パイプの読み込みの終点を閉じる際にエラーが発生しました" + +#: libsvn_repos/hooks.c:120 +msgid "Error closing null file" +msgstr "空のファイルを閉じる際にエラーが発生しました" + +#: libsvn_repos/hooks.c:202 +#, c-format +msgid "Failed to run '%s' hook; broken symlink" +msgstr "'%s' フックを実行できませんでした。シンボリックリンクが壊れています" + +#: libsvn_repos/hooks.c:343 +msgid "" +"Repository has not been enabled to accept revision propchanges;\n" +"ask the administrator to create a pre-revprop-change hook" +msgstr "" +"リポジトリが、リビジョン属性を変更できるようにはなっていません。\n" +"管理者に pre-revprop-change フックを作成するよう頼んでください" + +#: libsvn_repos/load.c:155 libsvn_repos/load.c:167 +msgid "Found malformed header block in dumpfile stream" +msgstr "ダンプストリーム中に不正なヘッダブロックが見つかりました" + +#: libsvn_repos/load.c:185 +msgid "Premature end of content data in dumpstream" +msgstr "ダンプストリーム中のデータが途中で途切れています" + +#: libsvn_repos/load.c:192 +msgid "Dumpstream data appears to be malformed" +msgstr "ダンプストリームデータが不正なようです" + +#: libsvn_repos/load.c:227 +msgid "Incomplete or unterminated property block" +msgstr "不完全または未終了の属性ブロックです" + +#: libsvn_repos/load.c:420 +msgid "Unexpected EOF writing contents" +msgstr "内容を書き込む際に予想外の EOF がありました" + +#: libsvn_repos/load.c:449 +msgid "Malformed dumpfile header" +msgstr "不正なダンプファイルヘッダです" + +#: libsvn_repos/load.c:455 libsvn_repos/load.c:497 +#, c-format +msgid "Unsupported dumpfile version: %d" +msgstr "ダンプファイルのバージョン %d はサポートされていません" + +#: libsvn_repos/load.c:595 +msgid "Unrecognized record type in stream" +msgstr "ストリーム中の記録形式を認識できません" + +#: libsvn_repos/load.c:827 #, c-format msgid "<<< Started new transaction, based on original revision %ld\n" msgstr "" "<<< オリジナルのリビジョン %ld に基づき、新しいトランザクションを開始しまし" "た\n" -#: libsvn_repos/load.c:871 +#: libsvn_repos/load.c:872 #, c-format msgid "Relative source revision %ld is not available in current repository" msgstr "現在のリポジトリでは、相対ソースリビジョン %ld は利用できません" -#: libsvn_repos/load.c:1143 +#: libsvn_repos/load.c:921 +msgid "Malformed dumpstream: Revision 0 must not contain node records" +msgstr "" +"ダンプストリームが不正です。リビジョン 0 にはノードの記録が含まれていてはいけ" +"ません" + +#: libsvn_repos/load.c:965 +#, c-format +msgid "Unrecognized node-action on node '%s'" +msgstr "ノード '%s' におけるノードアクションを認識できません" + +#: libsvn_repos/load.c:1144 #, c-format msgid "" "\n" @@ -4187,7 +4440,7 @@ "------- リビジョン %ld をコミットしました >>>\n" "\n" -#: libsvn_repos/load.c:1149 +#: libsvn_repos/load.c:1150 #, c-format msgid "" "\n" @@ -4200,6 +4453,116 @@ " をコミットしました >>>\n" "\n" +#: libsvn_repos/node_tree.c:238 +#, c-format +msgid "'%s' not found in filesystem" +msgstr "'%s' はファイルシステムに見つかりません" + +#: libsvn_repos/replay.c:159 +#, c-format +msgid "Filesystem path '%s' is neither a file nor a directory" +msgstr "ファイルシステムのパス '%s' はファイルでもディレクトリでもありません" + +#: libsvn_repos/reporter.c:624 +#, c-format +msgid "Working copy path '%s' does not exist in repository" +msgstr "作業コピーパス '%s' がリポジトリに存在しません" + +#: libsvn_repos/reporter.c:827 +msgid "Not authorized to open root of edit operation" +msgstr "編集用ルートパスを開く操作が認証されていません" + +#: libsvn_repos/reporter.c:848 +msgid "Cannot replace a directory from within" +msgstr "ディレクトリを内側から置換することはできません" + +#: libsvn_repos/reporter.c:891 +msgid "Invalid report for top level of working copy" +msgstr "作業コピーのトップレベルについての報告が不正です" + +#: libsvn_repos/reporter.c:906 +msgid "Two top-level reports with no target" +msgstr "対象がないのにトップレベルの報告が 2 つあります" + +#: libsvn_repos/repos.c:148 +#, c-format +msgid "'%s' exists and is non-empty" +msgstr "'%s' は存在します。そして空ではありません" + +#: libsvn_repos/repos.c:172 +msgid "Creating db logs lock file" +msgstr "DB ログロックファイルを作成しています" + +#: libsvn_repos/repos.c:197 +msgid "Creating db lock file" +msgstr "DB ロックファイルを作成しています" + +#: libsvn_repos/repos.c:207 +msgid "Creating lock dir" +msgstr "ロック用のディレクトリを作成しています" + +#: libsvn_repos/repos.c:223 +msgid "Creating hook directory" +msgstr "フック用のディレクトリを作成しています" + +#: libsvn_repos/repos.c:324 +msgid "Creating start-commit hook" +msgstr "start-commit フックを作成しています" + +#: libsvn_repos/repos.c:456 +msgid "Creating pre-commit hook" +msgstr "pre-commit フックを作成しています" + +#: libsvn_repos/repos.c:583 +msgid "Creating pre-revprop-change hook" +msgstr "pre-revprop-change フックを作成しています" + +#: libsvn_repos/repos.c:679 +msgid "Creating post-commit hook" +msgstr "post-commit フックを作成しています" + +#: libsvn_repos/repos.c:786 +msgid "Creating post-revprop-change hook" +msgstr "post-revprop-change フックを作成しています" + +#: libsvn_repos/repos.c:796 +msgid "Creating conf directory" +msgstr "設定用のディレクトリを作成しています" + +#: libsvn_repos/repos.c:848 +msgid "Creating svnserve.conf file" +msgstr "svnserve.conf ファイルを作成しています" + +#: libsvn_repos/repos.c:873 +msgid "Creating passwd file" +msgstr "パスワードファイルを作成しています" + +#: libsvn_repos/repos.c:899 +msgid "Could not create top-level directory" +msgstr "トップレベルのディレクトリを作成できませんでした" + +#: libsvn_repos/repos.c:903 +msgid "Creating DAV sandbox dir" +msgstr "DAV サンドボックスディレクトリを作成しています" + +#: libsvn_repos/repos.c:946 +msgid "Creating readme file" +msgstr "readme ファイルを作成しています" + +#: libsvn_repos/repos.c:977 +msgid "Repository creation failed" +msgstr "リポジトリの作成に失敗しました" + +#: libsvn_repos/repos.c:1039 +#, c-format +msgid "Expected version '%d' of repository; found version '%d'" +msgstr "" +"リポジトリの予想されるバージョンは '%d' ですが、実際のバージョンは '%d' です" + +#: libsvn_repos/repos.c:1084 +msgid "Error opening db lockfile" +msgstr "DB ロックファイルを開く際にエラーが発生しました" + #: libsvn_repos/rev_hunt.c:63 #, c-format msgid "Failed to find time on revision %ld" @@ -4275,7 +4638,7 @@ msgid "Can't expand time" msgstr "時刻を人間の読める形に変換できません" -#: libsvn_subr/error.c:290 +#: libsvn_subr/error.c:292 msgid "Can't recode error string from APR" msgstr "APR からのエラー文字列を再エンコードできません" @@ -4300,7 +4663,7 @@ #: libsvn_subr/io.c:375 msgid "Can't read contents of link" -msgstr "リンクの中身を読めません" +msgstr "リンクの内容を読めません" #: libsvn_subr/io.c:517 libsvn_subr/io.c:527 msgid "Can't find a temporary directory" @@ -4705,10 +5068,12 @@ msgid "File '%s' has inconsistent newlines" msgstr "ファイル '%s' は改行文字が一貫していません" +# ? charset translation mutex #: libsvn_subr/utf.c:147 msgid "Can't lock charset translation mutex" msgstr "文字コード変換ミューテックスにロックをかけられません" +# ? charset translation mutex #: libsvn_subr/utf.c:165 libsvn_subr/utf.c:215 msgid "Can't unlock charset translation mutex" msgstr "文字コード変換ミューテックスのロックを解除できません" @@ -4752,28 +5117,18 @@ "ASCII 以外の文字 (コード %d) が検出されました。この文字は UTF-8 へは、\n" "あるいは UTF-8 からは、変換できません" -#: libsvn_subr/utf.c:432 +#: libsvn_subr/utf.c:455 +#, c-format msgid "" "Valid UTF-8 data\n" -"(hex:" -msgstr "" -"正しい UTF-8 のデータ\n" -"(16 進数:" - -#: libsvn_subr/utf.c:445 -msgid "" -")\n" +"(hex:%s)\n" "followed by invalid UTF-8 sequence\n" -"(hex:" +"(hex:%s)" msgstr "" -")\n" +"正しい UTF-8 のデータ\n" +"(16 進数:%s)\n" "の後に不正な UTF-8 文字列\n" -"(16 進数:" - -#: libsvn_subr/utf.c:454 -msgid ")" -msgstr "" -")\n" +"(16 進数:%s)\n" "があります" #: libsvn_subr/validate.c:48 @@ -5670,7 +6025,7 @@ "使用方法: svnadmin dump <リポジトリパス> [-r <下限>[:<上限>]] [--" "incremental]\n" "\n" -"ファイルシステムの中身を「ダンプファイル」可搬形式で標準出力にダンプし、\n" +"ファイルシステムの内容を「ダンプファイル」可搬形式で標準出力にダンプし、\n" "その際フィードバックを標準エラー出力に送信します。ダンプは、リビジョン <下限" ">\n" "からリビジョン <上限> まで行います。リビジョンの指定がないときは、リビジョ" @@ -5798,7 +6153,7 @@ msgstr "" "使用方法: svnadmin setlog <リポジトリパス> -r <リビジョン> <ファイル>\n" "\n" -"<ファイル> の中身を、リビジョン <リビジョン> のログメッセージに設定します。\n" +"<ファイル> の内容を、リビジョン <リビジョン> のログメッセージに設定します。\n" "リビジョン属性に関連したフックを動作させないためには、--bypass-hooks を用い" "て\n" "ください (例えば、post-revprop-change フックからのメールによる通知を必要と\n" @@ -6110,7 +6465,7 @@ msgstr "" "使用方法: svnlook cat <リポジトリパス> <ファイルパス>\n" "\n" -"ファイルの中身を表示します。<ファイルパス> を '/' で始めるかは任意です。\n" +"ファイルの内容を表示します。<ファイルパス> を '/' で始めるかは任意です。\n" #: svnlook/main.c:131 msgid "" @@ -6613,6 +6968,27 @@ msgid "'%s' not versioned, and not exported\n" msgstr "'%s' はバージョン管理下になく、エクスポートされたものでもありません\n" +#~ msgid ")" +#~ msgstr "" +#~ ")\n" +#~ "があります" + +#~ msgid "" +#~ ")\n" +#~ "followed by invalid UTF-8 sequence\n" +#~ "(hex:" +#~ msgstr "" +#~ ")\n" +#~ "の後に不正な UTF-8 文字列\n" +#~ "(16 進数:" + +#~ msgid "" +#~ "Valid UTF-8 data\n" +#~ "(hex:" +#~ msgstr "" +#~ "正しい UTF-8 のデータ\n" +#~ "(16 進数:" + #~ msgid "Sorry, svn_client_diff was called in a way that is not yet supported" #~ msgstr "" #~ "すみません。まだサポートされていないやり方で svn_client_diff が呼び出され" @@ -6702,7 +7078,7 @@ #~ "リポジトリ内のディレクトリのエントリを一覧表示します。\n" #~ "使用方法: list [<対象>...]\n" #~ "\n" -#~ " 各 <対象> ファイルおよび各 <対象> ディレクトリの中身を、ディレクトリにあ" +#~ " 各 <対象> ファイルおよび各 <対象> ディレクトリの内容を、ディレクトリにあ" #~ "る\n" #~ " とおり一覧表示します。<対象> が作業コピーのパスである場合は、対応する\n" #~ " リポジトリ URL が処理に用いられます。\n" Modified: branches/ruby/subversion/po/ko.po Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/po/ko.po?view=diff&rev=13061&p1=branches/ruby/subversion/po/ko.po&r1=13060&p2=branches/ruby/subversion/po/ko.po&r2=13061 ============================================================================== --- branches/ruby/subversion/po/ko.po (original) +++ branches/ruby/subversion/po/ko.po Sat Feb 19 03:19:08 2005 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: subversion\n" "Report-Msgid-Bugs-To: dev-lmwclWVctOZK/UuDQWWi7iCwEArCW2h5@xxxxxxxxxxxxxxxx\n" -"POT-Creation-Date: 2005-01-29 14:19+0900\n" +"POT-Creation-Date: 2005-02-16 20:15+0900\n" "PO-Revision-Date: 2004-10-28 16:10+0900\n" "Last-Translator: Subversion <dev-lmwclWVctOZK/UuDQWWi7iCwEArCW2h5@xxxxxxxxxxxxxxxx>\n" "Language-Team: Korean <dev-lmwclWVctOZK/UuDQWWi7iCwEArCW2h5@xxxxxxxxxxxxxxxx>\n" @@ -22,7 +22,7 @@ msgid "Skipping binary file: '%s'\n" msgstr "바이너리 파일을 무시합니다: '%s'\n" -#: clients/cmdline/checkout-cmd.c:122 clients/cmdline/switch-cmd.c:125 +#: clients/cmdline/checkout-cmd.c:124 clients/cmdline/switch-cmd.c:125 #, c-format msgid "'%s' does not appear to be a URL" msgstr "'%s' 은 URL 같아 보이지 않습니다." @@ -47,7 +47,7 @@ "대상 디렉토리가 존재합니다; 디렉토리를 제거하거나 --force 옵션을 사용하여 덮" "어 쓰십시오." -#: clients/cmdline/help-cmd.c:48 +#: clients/cmdline/help-cmd.c:46 #, c-format msgid "" "usage: svn <subcommand> [options] [args]\n" @@ -71,7 +71,7 @@ "\n" "가능한 명령:\n" -#: clients/cmdline/help-cmd.c:59 +#: clients/cmdline/help-cmd.c:57 msgid "" "Subversion is a tool for version control.\n" "For additional information, see http://subversion.tigris.org/\n" @@ -79,7 +79,7 @@ "Subversion은 형상관리를 위한 도구입니다.\n" "더 상세한 정보를 위해서는 http://subversion.tigris.org/ 를 방문하세요.\n" -#: clients/cmdline/help-cmd.c:66 +#: clients/cmdline/help-cmd.c:64 msgid "" "The following repository access (RA) modules are available:\n" "\n" @@ -243,7 +243,7 @@ #: clients/cmdline/log-cmd.c:235 msgid "Changed paths:\n" -msgstr "전환된 경로:\n" +msgstr "변경된 경로:\n" #: clients/cmdline/log-cmd.c:250 #, c-format @@ -274,8 +274,8 @@ msgid "force validity of log message source" msgstr "로그 메시지의 유효성을 확인하지 않습니다." -#: clients/cmdline/main.c:65 clients/cmdline/main.c:66 svnadmin/main.c:222 -#: svnadmin/main.c:225 svndumpfilter/main.c:755 svndumpfilter/main.c:758 +#: clients/cmdline/main.c:65 clients/cmdline/main.c:66 svnadmin/main.c:224 +#: svnadmin/main.c:227 svndumpfilter/main.c:755 svndumpfilter/main.c:758 #: svnlook/main.c:89 svnlook/main.c:92 msgid "show help on a subcommand" msgstr "명령에 대한 도움말 보기" @@ -370,7 +370,7 @@ #: clients/cmdline/main.c:104 msgid "do not cross copies while traversing history" -msgstr "과거에 copy 명령이 일어난 지점까지만 로그를 검색함" +msgstr "과거에 copy 명령이 일어난 지점까지만 로그를 검색합니다." #: clients/cmdline/main.c:106 msgid "disregard default and svn:ignore property ignores" @@ -390,7 +390,7 @@ #: clients/cmdline/main.c:114 svnlook/main.c:110 msgid "do not print differences for deleted files" -msgstr "삭제된 파일에 대해서는 차이를 출력하지 않음" +msgstr "삭제된 파일에 대해서는 차이를 출력하지 않습니다." #: clients/cmdline/main.c:116 msgid "notice ancestry when calculating differences" @@ -432,7 +432,7 @@ msgid "relocate via URL-rewriting" msgstr "URL-rewriting을 통하여 저장소 URL을 변경합니다." -#: clients/cmdline/main.c:136 svnadmin/main.c:264 +#: clients/cmdline/main.c:136 svnadmin/main.c:266 msgid "read user configuration files from directory ARG" msgstr "arg로 지정된 디렉토리에서 사용자 구성화일을 읽습니다." @@ -567,7 +567,7 @@ " WC -> WC: 바로 복사하고 저장소에 이전 로그와 함께 추가하도록 스케쥴\n" " WC -> URL: 작업사본을 URL에 복사하고 바로 커밋함\n" " URL -> WC: URL로부터 체크아웃해서 현 작업 사본에 추가하도록 스케쥴\n" -" URL -> URL: 서버상에서 바로 복사함, 브랜치나 태그를 만들 때 사용됨\n" +" URL -> URL: 서버상에서 바로 복사함, 브랜치 & 태그를 만들 때 사용됨\n" #: clients/cmdline/main.c:245 msgid "" @@ -913,15 +913,15 @@ " WC -> WC: move and schedule for addition (with history)\n" " URL -> URL: complete server-side rename.\n" msgstr "" -"작업 사본내 혹은 저장소 안의 파일이나 디렉토리를 이동하거나, 이름을 바꿉" -"니다.\n" +"작업 사본내 혹은 저장소 안의 파일이나 디렉토리를 이동하거나, 이름을 바꿉니" +"다.\n" "사용법: move SRC DST\n" "\n" " 주의: 이 명령은 'copy' 후 'delete'한 것과 동일합니다.\n" "\n" " SRC와 DST 는 둘다 작업사본 혹은 URL이어햐합니다.\n" -" WC -> WC: 작업 사본내에서 바로 이동 후, 추가하도록 스케쥴링하며, 로그 메" -"시지도 복사됩니다.\n" +" WC -> WC: 작업 사본내에서 바로 이동 후, 추가하도록 스케쥴링하며, 로그 " +"메시지도 복사됩니다.\n" " URL -> URL: 서버 상에서만 이름을 바꾸며, 바로 커밋됩니다.\n" #: clients/cmdline/main.c:474 @@ -1051,8 +1051,10 @@ "\n" " 참고: svn은 다음과 같은 특별한 '버전관리' 속성을 인식합니다.\n" " 이 외에도 임의의 원하는 속성을 설정할 수 있습니다.\n" -" svn:ignore - 한 줄에 하나씩 값을 주어 커밋, 업데이트 등에서 무시하는 목록을 지정합니다.\n" -" svn:keywords - 본문 내에 치환될 키워드 목록을 지정합니다. 다음은 가능한 값들입니다.\n" +" svn:ignore - 한 줄에 하나씩 값을 주어 커밋, 업데이트 등에서 무시하는 " +"목록을 지정합니다.\n" +" svn:keywords - 본문 내에 치환될 키워드 목록을 지정합니다. 다음은 가능" +"한 값들입니다.\n" " URL, HeadURL - 개체의 최신 버전의 URL.\n" " Author, LastChangedBy - 최종 파일 수정 작업자.\n" " Date, LastChangedDate - 최종 파일 수정 날짜/시각.\n" @@ -1060,17 +1062,20 @@ " LastChangedRevision\n" " Id - 위 네가지 키워드를 종합한 포맷\n" " \n" -" svn:executable - 속성이 존재하면, 체크아웃, 업데이트 후에 파일을 실행가능 하도록 만듭니다.\n" +" svn:executable - 속성이 존재하면, 체크아웃, 업데이트 후에 파일을 실행가" +"능 하도록 만듭니다.\n" " 이 속성은 디렉토리에는 지정할 수 없으며, 설정시 디렉토리에 대해서\n" " 재귀적 호출이 일어나지 않는 경우 실패합니다. 재귀적으로 수행시에\n" " 파일에 대해서만 설정함.\n" -" svn:eol-style - 행의 끝을 나타내는 형식을 지정합니다. 다음 중 하나 'native', 'LF', 'CR', 'CRLF'.\n" +" svn:eol-style - 행의 끝을 나타내는 형식을 지정합니다. 다음 중 하나 " +"'native', 'LF', 'CR', 'CRLF'.\n" " svn:mime-type - 파일의 MIME 형식을 지정합니다. \n" " 이 속성은 병합하는데 사용되며, Apache 웹서버가 사용합니다.\n" " 'text/' 로 시작하는 MIME 형식은 텍스트로 취급하며,\n" " 그외의 것은 바이너리로 취급됩니다.\n" " svn:externals - 한 줄에 하나씩 지정하는 외부 모듈 리스트입니다.\n" -" 각각은 현재 디렉토리에 대해 체크아웃, 업데이트시에 상대 디렉토리 경로로 만들어 지며,\n" +" 각각은 현재 디렉토리에 대해 체크아웃, 업데이트시에 상대 디렉토리 경로" +"로 만들어 지며,\n" " URL을 하나 지정해야하며, 추가적으로 리비전 플래그를 넣을 수 있습니다.\n" " foo http://example.com/repos/zig\n" " foo/bar -r 1234 http://example.com/repos/zag\n" @@ -1204,7 +1209,8 @@ " 네번째컬럼: 과거의 커밋로그를 포함하도록 스케쥴링하는지를 나타냅니다..\n" " ' ' 과거의 커밋로그 포함하지 않음\n" " '+' 과거의 커밋로그 포함함\n" -" 다섯번째컬럼: 아이템이 상위 경로에 대하여 전환(switch)되었는지를 나타냅니다.\n" +" 다섯번째컬럼: 아이템이 상위 경로에 대하여 전환(switch)되었는지를 나타냅니" +"다.\n" " ' ' 정상임\n" " 'S' 전환됨\n" "\n" @@ -1312,12 +1318,12 @@ msgid "Caught signal" msgstr "시그널 수신" -#: clients/cmdline/main.c:853 svnadmin/main.c:1042 +#: clients/cmdline/main.c:853 svnadmin/main.c:1057 msgid "" "Multiple revision arguments encountered; try '-r M:N' instead of '-r M -r N'" msgstr "복수의 리비전 인자를 받았습니다. -r M -r N 대신 -r M:N 을 사용하세요." -#: clients/cmdline/main.c:865 svnadmin/main.c:1059 +#: clients/cmdline/main.c:865 svnadmin/main.c:1074 #, c-format msgid "Syntax error in revision argument '%s'" msgstr "리비전 인자 '%s'안에 구문오류가 있습니다." @@ -1335,7 +1341,7 @@ msgid "Subcommand argument required\n" msgstr "인자가 필요한 명령입니다.\n" -#: clients/cmdline/main.c:1100 svnadmin/main.c:1179 svnlook/main.c:2016 +#: clients/cmdline/main.c:1100 svnadmin/main.c:1200 svnlook/main.c:2016 #, c-format msgid "Unknown command: '%s'\n" msgstr "알 수 없는 명령: '%s'\n" @@ -1501,7 +1507,7 @@ "Performing status on external item at '%s'\n" msgstr "" "\n" -"status 보기중, 외부 경로 '%s'\n" +"외부경로에 대해 상태확인 중..: '%s'\n" #: clients/cmdline/notify.c:300 #, c-format @@ -1516,22 +1522,22 @@ #: clients/cmdline/notify.c:317 #, c-format msgid "Adding (bin) %s\n" -msgstr "추가중 (bin) %s\n" +msgstr "추가 (bin) %s\n" #: clients/cmdline/notify.c:324 #, c-format msgid "Adding %s\n" -msgstr "추가중 %s\n" +msgstr "추가 %s\n" #: clients/cmdline/notify.c:331 #, c-format msgid "Deleting %s\n" -msgstr "삭제중 %s\n" +msgstr "삭제 %s\n" #: clients/cmdline/notify.c:338 #, c-format msgid "Replacing %s\n" -msgstr "치환중 %s\n" +msgstr "치환 %s\n" #: clients/cmdline/notify.c:348 msgid "Transmitting file data " @@ -1539,15 +1545,15 @@ #: clients/cmdline/prompt.c:94 msgid "Can't open stdin" -msgstr "stdin 열 수 없음" +msgstr "표준입력을 열 수 없습니다." #: clients/cmdline/prompt.c:112 clients/cmdline/prompt.c:116 msgid "Can't read stdin" -msgstr "stdin 읽을 수 없음" +msgstr "표준입력에서 읽을 수 없습니다." #: clients/cmdline/prompt.c:153 libsvn_ra_svn/client.c:306 msgid "Can't get password" -msgstr "암호를 입력 실패" +msgstr "암호를 얻는데 실패하였습니다." #: clients/cmdline/prompt.c:175 #, c-format @@ -1701,7 +1707,7 @@ #: clients/cmdline/proplist-cmd.c:87 #, c-format msgid "Unversioned properties on revision %ld:\n" -msgstr "리비전 %ld의 관리되지 않는 속성:\n" +msgstr "리비전 속성(%ld):\n" #: clients/cmdline/props.c:42 msgid "Must specify revision explicitly when operating on a revision property" @@ -1738,6 +1744,7 @@ msgstr "'svn revert --recursive' 를 사용하세요." #: clients/cmdline/switch-cmd.c:58 +#, c-format msgid "'%s' to '%s' is not a valid relocation" msgstr "'%s'에서 '%s'로 재배치 할 수 없습니다." @@ -1773,7 +1780,7 @@ msgstr "'%s' 에 쓸 수 없습니다." #: clients/cmdline/util.c:204 clients/cmdline/util.c:228 -#: libsvn_fs_fs/fs_fs.c:989 libsvn_subr/io.c:2162 +#: libsvn_fs_fs/fs_fs.c:990 libsvn_subr/io.c:2164 #, c-format msgid "Can't stat '%s'" msgstr "'%s' 의 stat을 볼 수 없습니다." @@ -2566,7 +2573,7 @@ #: libsvn_client/checkout.c:92 #, c-format msgid "URL '%s' refers to a file, not a directory" -msgstr "URL '%s' 는 디렉토리가 아닌 파일입니다." +msgstr "URL('%s')은 파일입니다. 디렉토리를 지정하세요." #: libsvn_client/checkout.c:149 #, c-format @@ -2583,6 +2590,7 @@ msgstr "'%s' 는 이미 파일 혹은 다른 무언가입니다." #: libsvn_client/commit.c:187 +#, c-format msgid "Unknown or unversionable type for '%s'" msgstr "경로 '%s'은 알수 없거나 버전관리 할 수 없는 것입니다." @@ -2669,7 +2677,7 @@ msgid "Commit item '%s' has copy flag but no copyfrom URL\n" msgstr "커밋 아이템 '%s' 은(는) 복사표시가 되어있지만 원본 URL이 없습니다.\n" -#: libsvn_client/commit_util.c:612 libsvn_client/commit_util.c:741 +#: libsvn_client/commit_util.c:612 libsvn_client/commit_util.c:740 #: libsvn_client/copy.c:1063 libsvn_client/delete.c:67 #: libsvn_client/diff.c:1380 libsvn_client/diff.c:1973 #: libsvn_client/diff.c:2446 libsvn_client/diff.c:2553 libsvn_client/log.c:128 @@ -2677,8 +2685,8 @@ #: libsvn_client/prop_commands.c:588 libsvn_client/prop_commands.c:940 #: libsvn_client/ra.c:180 libsvn_client/revisions.c:89 #: libsvn_client/status.c:129 libsvn_client/switch.c:103 -#: libsvn_wc/adm_ops.c:2106 libsvn_wc/copy.c:386 libsvn_wc/entries.c:1382 -#: libsvn_wc/entries.c:1801 libsvn_wc/props.c:281 libsvn_wc/questions.c:171 +#: libsvn_wc/adm_ops.c:2107 libsvn_wc/copy.c:386 libsvn_wc/entries.c:1383 +#: libsvn_wc/entries.c:1802 libsvn_wc/props.c:281 libsvn_wc/questions.c:171 #, c-format msgid "'%s' is not under version control" msgstr "'%s' 은(는) 버전 컨트롤 대상이 아닙니다." @@ -2704,7 +2712,7 @@ "아마, 지금 버전관리되고 있지 않은 (혹은 아직 버전이 없는) 디렉토리\n" "안에서 대상을 커밋하고 있는 중인 것 같습니다." -#: libsvn_client/commit_util.c:707 +#: libsvn_client/commit_util.c:706 #, c-format msgid "" "'%s' is not under version control and is not part of the commit, yet its " @@ -2713,17 +2721,17 @@ "버전관리 대상도 아니며 커밋 대상도 아닌 '%s' 이지만, 그 하위인 '%s'는 커밋 대" "상입니다." -#: libsvn_client/commit_util.c:790 +#: libsvn_client/commit_util.c:789 #, c-format msgid "Cannot commit both '%s' and '%s' as they refer to the same URL" msgstr "'%s', '%s' 는 둘다 같은 URL을 참조하므로 커밋할 수 없습니다." -#: libsvn_client/commit_util.c:935 +#: libsvn_client/commit_util.c:934 #, c-format msgid "Commit item '%s' has copy flag but no copyfrom URL" msgstr "커밋 아이템 '%s' 은(는) 복사표시가 되어있지만 원본 URL이 없습니다." -#: libsvn_client/commit_util.c:940 +#: libsvn_client/commit_util.c:939 #, c-format msgid "Commit item '%s' has copy flag but an invalid revision" msgstr "" @@ -2845,12 +2853,12 @@ #: libsvn_client/diff.c:273 #, c-format msgid "%s\t(revision %ld)" -msgstr "%s\t(리비전 %ld)" +msgstr "%s\t(revision %ld)" #: libsvn_client/diff.c:275 #, c-format msgid "%s\t(working copy)" -msgstr "%s\t(작업 사본)" +msgstr "%s\t(working copy)" #: libsvn_client/diff.c:418 #, c-format @@ -2937,8 +2945,8 @@ msgid "'%s' already exists" msgstr "'%s'은(는) 이미 존재합니다." -#: libsvn_client/export.c:679 libsvn_wc/update_editor.c:1592 -#: libsvn_wc/update_editor.c:2339 +#: libsvn_client/export.c:679 libsvn_wc/update_editor.c:1594 +#: libsvn_wc/update_editor.c:2340 #, c-format msgid "Checksum mismatch for '%s'; expected: '%s', actual: '%s'" msgstr "'%s'의 체크섬값이 일치하지 않습니다. 기대값:'%s', 실제값: '%s'" @@ -2965,7 +2973,7 @@ #: libsvn_client/prop_commands.c:104 #, c-format msgid "'%s' is a wcprop, thus not accessible to clients" -msgstr "" +msgstr "'%s'은/는 저장소상의 속성이며, 클라이언트에서는 접근 불가능합니다." #: libsvn_client/prop_commands.c:182 #, c-format @@ -2973,6 +2981,7 @@ msgstr "리비전 속성 '%s'는 본 문맥에서 허용되지 않습니다" #: libsvn_client/prop_commands.c:198 +#, c-format msgid "Setting property on non-local target '%s' is not supported" msgstr "작업중이 아닌 대상 '%s'에 대한 속성 설정은 지원하지 않습니다." @@ -3043,41 +3052,41 @@ #: libsvn_delta/svndiff.c:350 #, c-format msgid "Invalid diff stream: insn %d cannot be decoded" -msgstr "" +msgstr "잘못된 diff 스트림: insn %d 를 디코딩할 수 없습니다." #: libsvn_delta/svndiff.c:354 #, c-format msgid "Invalid diff stream: insn %d has non-positive length" -msgstr "" +msgstr "잘못된 diff 스트림: insn %d 의 길이가 양수가 아닙니다" #: libsvn_delta/svndiff.c:358 #, c-format msgid "Invalid diff stream: insn %d overflows the target view" -msgstr "" +msgstr "잘못된 diff 스트림: insn %d이 대상뷰의 크기를 넘었습니다." #: libsvn_delta/svndiff.c:367 #, c-format msgid "Invalid diff stream: [src] insn %d overflows the source view" -msgstr "" +msgstr "잘못된 diff 스트림: [src] insn %d이 원본뷰의 크기를 넘었습니다." #: libsvn_delta/svndiff.c:374 #, c-format msgid "" "Invalid diff stream: [tgt] insn %d starts beyond the target view position" -msgstr "" +msgstr "잘못된 diff 스트림: [tgt] insn %d이 뷰의 시작 위치를 넘었습니다." #: libsvn_delta/svndiff.c:381 #, c-format msgid "Invalid diff stream: [new] insn %d overflows the new data section" -msgstr "" +msgstr "잘못된 diff 스트림: [tgt] insn %d이 새 데이터 영역을 넘었습니다." #: libsvn_delta/svndiff.c:391 msgid "Delta does not fill the target window" -msgstr "" +msgstr "차이점이 대상 화면에 채워지지 않았습니다." #: libsvn_delta/svndiff.c:394 msgid "Delta does not contain enough new data" -msgstr "" +msgstr "차이점이 충분한 데이터를 포함하고 있지 않습니다." #: libsvn_delta/svndiff.c:471 msgid "Svndiff has invalid header" @@ -3099,10 +3108,10 @@ #: libsvn_diff/diff_file.c:1169 #, c-format msgid "Failed to delete mmap '%s'" -msgstr "" +msgstr "mmap '%s'의 제거에 실패하였습니다." -#: libsvn_fs/fs-loader.c:99 libsvn_ra/ra_loader.c:147 -#: libsvn_ra/ra_loader.c:160 +#: libsvn_fs/fs-loader.c:99 libsvn_ra/ra_loader.c:156 +#: libsvn_ra/ra_loader.c:169 #, c-format msgid "'%s' does not define '%s()'" msgstr "'%s'는 '%s()'를 정의하지 않습니다." @@ -3133,7 +3142,7 @@ msgid "File is not mutable: filesystem '%s', revision %ld, path '%s'" msgstr "파일은 변경될 수 없습니다: 파일시스템 '%s', 리비전 %ld, 경로 '%s'" -#: libsvn_fs_base/fs.c:1122 +#: libsvn_fs_base/fs.c:1129 msgid "" "Error copying logfile; the DB_LOG_AUTOREMOVE feature \n" "may be interfering with the hotcopy algorithm. If \n" @@ -3145,7 +3154,7 @@ "만약 문제가 지속되면, DB_CONFIG 내에서 본 속성을\n" "끄십시오." -#: libsvn_fs_base/fs.c:1141 +#: libsvn_fs_base/fs.c:1148 msgid "" "Error running catastrophic recovery on hotcopy; the \n" "DB_LOG_AUTOREMOVE feature may be interfering with the \n" @@ -3157,7 +3166,7 @@ "만약 문제가 지속되면, DB_CONFIG 내에서 본 속성을\n" "끄십시오." -#: libsvn_fs_base/fs.c:1278 +#: libsvn_fs_base/fs.c:1285 #, c-format msgid "Unsupported FS loader version (%d) for bdb" msgstr "BDB의 지원하지 않는 FS 로더 버전 (%d)" @@ -3250,177 +3259,172 @@ msgid "Unsupported FS loader version (%d) for fsfs" msgstr "fsfs에 대한 지원하지 않는 파일시스템 로더 버전(%d)입니다." -#: libsvn_fs_fs/fs_fs.c:363 libsvn_fs_fs/fs_fs.c:377 +#: libsvn_fs_fs/fs_fs.c:364 libsvn_fs_fs/fs_fs.c:378 msgid "Found malformed header in revision file" msgstr "리비전 파일내에 잘못된 형식의 헤더가 있습니다." -#: libsvn_fs_fs/fs_fs.c:479 libsvn_fs_fs/fs_fs.c:493 libsvn_fs_fs/fs_fs.c:500 -#: libsvn_fs_fs/fs_fs.c:507 libsvn_fs_fs/fs_fs.c:515 libsvn_fs_fs/fs_fs.c:523 +#: libsvn_fs_fs/fs_fs.c:480 libsvn_fs_fs/fs_fs.c:494 libsvn_fs_fs/fs_fs.c:501 +#: libsvn_fs_fs/fs_fs.c:508 libsvn_fs_fs/fs_fs.c:516 libsvn_fs_fs/fs_fs.c:524 msgid "Malformed text rep offset line in node-rev" msgstr "node-rev 에 잘못된 텍스트 rep 옵셋 라인" -#: libsvn_fs_fs/fs_fs.c:592 +#: libsvn_fs_fs/fs_fs.c:593 msgid "Missing kind field in node-rev" msgstr "node-rev 내에 kind 필드가 없습니다." -#: libsvn_fs_fs/fs_fs.c:623 +#: libsvn_fs_fs/fs_fs.c:624 msgid "Missing cpath in node-rev" msgstr "node-rev 내에 cpath가 없습니다" -#: libsvn_fs_fs/fs_fs.c:650 libsvn_fs_fs/fs_fs.c:656 +#: libsvn_fs_fs/fs_fs.c:651 libsvn_fs_fs/fs_fs.c:657 msgid "Malformed copyroot line in node-rev" msgstr "node-rev 내에 copyroot 형식이 잘못되었습니다." -#: libsvn_fs_fs/fs_fs.c:674 libsvn_fs_fs/fs_fs.c:680 +#: libsvn_fs_fs/fs_fs.c:675 libsvn_fs_fs/fs_fs.c:681 msgid "Malformed copyfrom line in node-rev" msgstr "node-rev 내에 copyfrom 행에 오류가 있습니다." -#: libsvn_fs_fs/fs_fs.c:778 libsvn_fs_fs/fs_fs.c:3002 +#: libsvn_fs_fs/fs_fs.c:779 libsvn_fs_fs/fs_fs.c:3063 msgid "Attempted to write to non-transaction" msgstr "트랜잭션이 아닌 것에 쓰기 시도를 하였습니다." -#: libsvn_fs_fs/fs_fs.c:862 +#: libsvn_fs_fs/fs_fs.c:863 msgid "Malformed representation header" msgstr "보여질 내용의 헤더 형식이 잘못되었습니다." -#: libsvn_fs_fs/fs_fs.c:886 +#: libsvn_fs_fs/fs_fs.c:887 msgid "Missing node-id in node-rev" msgstr "node-rev 내에 node-id가 없습니다." -#: libsvn_fs_fs/fs_fs.c:892 +#: libsvn_fs_fs/fs_fs.c:893 msgid "Corrupt node-id in node-rev" msgstr "node-rev 내에 손상된 node-id가 있습니다." -#: libsvn_fs_fs/fs_fs.c:937 +#: libsvn_fs_fs/fs_fs.c:938 msgid "Revision file lacks trailing newline" msgstr "리비전 파일 내에 마지막 개행문자가 없습니다." -#: libsvn_fs_fs/fs_fs.c:949 +#: libsvn_fs_fs/fs_fs.c:950 msgid "Final line in revision file longer than 64 characters" msgstr "리비전 파일 마지막 행의 길이가 64 문자를 넘습니다." -#: libsvn_fs_fs/fs_fs.c:962 +#: libsvn_fs_fs/fs_fs.c:963 msgid "Final line in revision file missing space" msgstr "리비전 파일의 마지막 행에 스페이스가 없습니다." -#: libsvn_fs_fs/fs_fs.c:992 +#: libsvn_fs_fs/fs_fs.c:993 #, c-format msgid "Can't chmod '%s'" msgstr "chmod '%s' 할 수 없음" -#: libsvn_fs_fs/fs_fs.c:1050 libsvn_fs_fs/fs_fs.c:1107 libsvn_repos/log.c:239 +#: libsvn_fs_fs/fs_fs.c:1051 libsvn_fs_fs/fs_fs.c:1108 libsvn_repos/log.c:239 #: libsvn_repos/log.c:243 #, c-format msgid "No such revision %ld" msgstr "없는 리비전 %ld 입니다." -#: libsvn_fs_fs/fs_fs.c:1182 +#: libsvn_fs_fs/fs_fs.c:1183 msgid "Malformed svndiff data in representation" msgstr "보여질 내용에 잘못된 svndiff 데이터가 있습니다." -#: libsvn_fs_fs/fs_fs.c:1298 libsvn_fs_fs/fs_fs.c:1318 -#: libsvn_fs_fs/fs_fs.c:1331 +#: libsvn_fs_fs/fs_fs.c:1294 libsvn_fs_fs/fs_fs.c:1307 +#: libsvn_fs_fs/fs_fs.c:1338 msgid "Reading one svndiff window read beyond the end of the representation" msgstr "표시될 내용의 끝부분을 넘어 읽은 svndiff 창을 읽고 있습니다." -#: libsvn_fs_fs/fs_fs.c:1420 +#: libsvn_fs_fs/fs_fs.c:1451 msgid "svndiff data requested non-existent source" msgstr "존재하지않는 소스에 대하여 svndiff 데이터를 요청하였습니다." -#: libsvn_fs_fs/fs_fs.c:1426 +#: libsvn_fs_fs/fs_fs.c:1457 msgid "svndiff requested position beyond end of stream" msgstr "스트림의 마지막을 지난 위치에 대한 svndiff 요청을 받았습니다." -#: libsvn_fs_fs/fs_fs.c:1448 +#: libsvn_fs_fs/fs_fs.c:1480 libsvn_fs_fs/fs_fs.c:1497 msgid "svndiff window length is corrupt" msgstr "svndiff 창 길이가 손상되었습니다." -#: libsvn_fs_fs/fs_fs.c:1623 libsvn_fs_fs/fs_fs.c:1636 -#: libsvn_fs_fs/fs_fs.c:1642 +#: libsvn_fs_fs/fs_fs.c:1680 libsvn_fs_fs/fs_fs.c:1693 +#: libsvn_fs_fs/fs_fs.c:1699 msgid "Directory entry corrupt" msgstr "디렉토리 등록정보가 손상되었습니다." -#: libsvn_fs_fs/fs_fs.c:1809 +#: libsvn_fs_fs/fs_fs.c:1866 msgid "Missing required node revision ID" msgstr "필요한 노드 리비전 ID가 누락되었습니다." -#: libsvn_fs_fs/fs_fs.c:1819 +#: libsvn_fs_fs/fs_fs.c:1876 msgid "Invalid change ordering: new node revision ID without delete" msgstr "변경 순서 오류: 삭제 없는 새 노드 리비전 ID" -#: libsvn_fs_fs/fs_fs.c:1830 +#: libsvn_fs_fs/fs_fs.c:1887 msgid "Invalid change ordering: non-add change on deleted path" msgstr "변경 순서 오류: 삭제된 경로상에는 추가할 수 없습니다." -#: libsvn_fs_fs/fs_fs.c:1975 libsvn_fs_fs/fs_fs.c:1983 -#: libsvn_fs_fs/fs_fs.c:2015 libsvn_fs_fs/fs_fs.c:2035 -#: libsvn_fs_fs/fs_fs.c:2069 libsvn_fs_fs/fs_fs.c:2074 +#: libsvn_fs_fs/fs_fs.c:2032 libsvn_fs_fs/fs_fs.c:2040 +#: libsvn_fs_fs/fs_fs.c:2072 libsvn_fs_fs/fs_fs.c:2092 +#: libsvn_fs_fs/fs_fs.c:2126 libsvn_fs_fs/fs_fs.c:2131 msgid "Invalid changes line in rev-file" msgstr "rev-file 안에 변경된 줄 수 잘못됨" -#: libsvn_fs_fs/fs_fs.c:2008 +#: libsvn_fs_fs/fs_fs.c:2065 msgid "Invalid change kind in rev file" msgstr "rev-file 안에 종류값이 잘못됨" -#: libsvn_fs_fs/fs_fs.c:2028 +#: libsvn_fs_fs/fs_fs.c:2085 msgid "Invalid text-mod flag in rev-file" msgstr "rev-file 안에 text-mod 플래그 잘못됨" -#: libsvn_fs_fs/fs_fs.c:2048 +#: libsvn_fs_fs/fs_fs.c:2105 msgid "Invalid prop-mod flag in rev-file" msgstr "rev-file 안에 prop-mod 값 잘못됨" -#: libsvn_fs_fs/fs_fs.c:2231 +#: libsvn_fs_fs/fs_fs.c:2288 msgid "Copying from transactions not allowed" msgstr "트랜잭션으로부터의 복사는 허용되지 않습니다." -#: libsvn_fs_fs/fs_fs.c:2473 libsvn_fs_fs/fs_fs.c:2480 +#: libsvn_fs_fs/fs_fs.c:2533 libsvn_fs_fs/fs_fs.c:2540 msgid "next-id file corrupt" msgstr "next-id 파일 손상됨" -#: libsvn_fs_fs/fs_fs.c:2706 +#: libsvn_fs_fs/fs_fs.c:2766 msgid "Invalid change type" msgstr "변경 형식이 잘못됨" -#: libsvn_fs_fs/fs_fs.c:3021 +#: libsvn_fs_fs/fs_fs.c:3082 msgid "Can't set text contents of a directory" msgstr "디렉토리의 텍스트 내용을 설정할 수 없음" -#: libsvn_fs_fs/fs_fs.c:3111 libsvn_fs_fs/fs_fs.c:3116 -#: libsvn_fs_fs/fs_fs.c:3123 +#: libsvn_fs_fs/fs_fs.c:3172 libsvn_fs_fs/fs_fs.c:3177 +#: libsvn_fs_fs/fs_fs.c:3184 msgid "Corrupt current file" msgstr "현재파일 손상됨" -#: libsvn_fs_fs/fs_fs.c:3491 +#: libsvn_fs_fs/fs_fs.c:3552 msgid "Transaction out of date" msgstr "트랜잭션이 오래된 것임" -#: libsvn_fs_fs/fs_fs.c:3731 +#: libsvn_fs_fs/fs_fs.c:3792 msgid "No such transaction" msgstr "그런 트랜잭션이 없습니다." -#: libsvn_ra/ra_loader.c:232 +#: libsvn_ra/ra_loader.c:211 +#, c-format msgid "Mismatched RA version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s" msgstr "" "RA 플러그인 버전이 다릅니다. '%s': 발견된 것 %d.%d.%d%s, 예상한 것 %d.%d.%d%s" -#: libsvn_ra/ra_loader.c:246 +#: libsvn_ra/ra_loader.c:261 +#, c-format msgid "Unrecognized URL scheme for '%s'" msgstr "알 수 없는 URL 스키마입니다. '%s'" -#: libsvn_ra/ra_loader.c:505 +#: libsvn_ra/ra_loader.c:519 #, c-format msgid " - handles '%s' schema\n" msgstr " - '%s' 스키마를 처리합니다.\n" -#: libsvn_ra/ra_loader.c:574 -#, c-format -msgid "" -"Mismatched RA plugin version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s" -msgstr "" -"RA 플러그인 버전이 다릅니다. '%s': 발견된 것 %d.%d.%d%s, 예상한 것 %d.%d.%d%s" - -#: libsvn_ra/ra_loader.c:590 +#: libsvn_ra/ra_loader.c:604 #, c-format msgid "Unrecognized URL scheme '%s'" msgstr "알 수 없는 URL 스키마입니다. '%s'" @@ -3466,7 +3470,7 @@ msgid "Error writing to stream: unexpected EOF" msgstr "스트림에 쓰기 오류: 예상치 않은 EOF" -#: libsvn_ra_dav/fetch.c:830 libsvn_ra_svn/client.c:872 +#: libsvn_ra_dav/fetch.c:830 libsvn_ra_svn/client.c:873 #, c-format msgid "" "Checksum mismatch for '%s':\n" @@ -3494,8 +3498,8 @@ "DAV request failed; it's possible that the repository's pre-revprop-change " "hook either failed or is non-existent" msgstr "" -"DAV 요청 실패: 아마, pre-revprop-change 훅이 실패하였거나 존재하지 않는 저장" -"소일 것입니다." +"DAV 요청 실패: pre-revprop-change 훅이 실패하였거나 존재하지 않을 수 있습니" +"다." #: libsvn_ra_dav/fetch.c:2027 #, c-format @@ -3573,33 +3577,38 @@ msgid "'%s' was not present on the resource" msgstr "'%s'는 소스내에 존재 하지 않습니다." -#: libsvn_ra_dav/props.c:674 +#: libsvn_ra_dav/props.c:651 +#, c-format +msgid "Neon was unable to parse URL '%s'" +msgstr "Neon이 이해할 수 없는 URL 입니다: '%s'" + +#: libsvn_ra_dav/props.c:680 msgid "The path was not part of a repository" msgstr "경로는 저장소의 일부가 아닙니다." -#: libsvn_ra_dav/props.c:685 +#: libsvn_ra_dav/props.c:691 #, c-format msgid "No part of path '%s' was found in repository HEAD" msgstr "'%s'의 경로가 저장소의 HEAD 에서 발견되지 않았습니다." -#: libsvn_ra_dav/props.c:719 libsvn_ra_dav/props.c:774 +#: libsvn_ra_dav/props.c:725 libsvn_ra_dav/props.c:780 msgid "The VCC property was not found on the resource" msgstr "VCC 속성이 리소스내에서 발견되지 않았습니다." -#: libsvn_ra_dav/props.c:787 +#: libsvn_ra_dav/props.c:793 msgid "The relative-path property was not found on the resource" msgstr "relative-path 속성이 리소스에서 발견되지 않았습니다." -#: libsvn_ra_dav/props.c:908 +#: libsvn_ra_dav/props.c:914 msgid "'DAV:baseline-collection' was not present on the baseline resource" msgstr "" "'DAV:baseline-collection' 은 꺼내온(baseline) 리소스에 존재하지 않습니다." -#: libsvn_ra_dav/props.c:927 +#: libsvn_ra_dav/props.c:933 msgid "'DAV:version-name' was not present on the baseline resource" msgstr "'DAV:version-name' 은 꺼내온(baseline) 리소스에 존재하지 않습니다." -#: libsvn_ra_dav/props.c:1080 +#: libsvn_ra_dav/props.c:1086 msgid "At least one property change failed; repository is unchanged" msgstr "" "적어도 하나의 속성이 변경에 실패하였습니다.: 저장소는 변경되지 않습니다." @@ -3659,13 +3668,14 @@ msgid "Please upgrade the server to 0.19 or later" msgstr "서버를 0.19 버전 이상으로 업그레이드 하세요." -#: libsvn_ra_dav/session.c:896 +#: libsvn_ra_dav/session.c:898 +#, c-format msgid "Unsupported RA loader version (%d) for ra_dav" msgstr "ra_dav의 지원하지 않는 RA 로더 버전 (%d)입니다." #: libsvn_ra_dav/util.c:271 msgid "authorization failed" -msgstr "인증 실패" +msgstr "인증에 실패하였습니다." #: libsvn_ra_dav/util.c:275 msgid "could not connect to server" @@ -3673,7 +3683,7 @@ #: libsvn_ra_dav/util.c:279 msgid "timed out waiting for server" -msgstr "서버 응답시간 초과" +msgstr "서버의 응답시간이 초과하였습니다." #: libsvn_ra_dav/util.c:465 msgid "Can't calculate the request body size" @@ -3682,7 +3692,7 @@ #: libsvn_ra_dav/util.c:652 #, c-format msgid "'%s' path not found" -msgstr "'%s' 경로 발견할 수 없음" +msgstr "'%s': 경로가 존재하지 않습니다." #. We either have a neon error, or some other error #. that we didn't expect. @@ -3701,7 +3711,7 @@ msgid "%s request failed on '%s'" msgstr "%s 요청이 '%s'에 대해 실패하였습니다." -#: libsvn_ra_local/ra_plugin.c:101 libsvn_ra_local/ra_plugin.c:478 +#: libsvn_ra_local/ra_plugin.c:101 libsvn_ra_local/ra_plugin.c:477 #, c-format msgid "" "'%s'\n" @@ -3718,11 +3728,12 @@ msgid "Module for accessing a repository on local disk." msgstr "로컬 디스크에 있는 저장소를 접근하기 위한 모듈" -#: libsvn_ra_local/ra_plugin.c:248 +#: libsvn_ra_local/ra_plugin.c:247 msgid "Unable to open an ra_local session to URL" msgstr "URL에 대해 ra_local 세션을 열수 없습니다." #: libsvn_ra_local/ra_plugin.c:989 +#, c-format msgid "Unsupported RA loader version (%d) for ra_local" msgstr "ra_local에 대한 지원하지 않는 RA 로더 버전(%d)입니다." @@ -3787,93 +3798,94 @@ msgid "Cannot negotiate authentication mechanism" msgstr "인증 방법 협상 불가능" -#: libsvn_ra_svn/client.c:453 +#: libsvn_ra_svn/client.c:454 #, c-format msgid "Undefined tunnel scheme '%s'" msgstr "정의되지 않은 터널 스킴 '%s'" -#: libsvn_ra_svn/client.c:470 +#: libsvn_ra_svn/client.c:471 #, c-format msgid "Tunnel scheme %s requires environment variable %s to be defined" msgstr "터널 스킴 %s 는 %s라는 환경 변수의 정의를 필요로 합니다." -#: libsvn_ra_svn/client.c:481 +#: libsvn_ra_svn/client.c:482 #, c-format msgid "Can't tokenize command '%s'" msgstr "토큰 분리할 수 없는 명령 '%s'" -#: libsvn_ra_svn/client.c:510 +#: libsvn_ra_svn/client.c:511 #, c-format msgid "Error in child process: %s" msgstr "자식 프로세스 오류: %s" -#: libsvn_ra_svn/client.c:533 +#: libsvn_ra_svn/client.c:534 msgid "Can't create tunnel" msgstr "터널 생성 불가능" -#: libsvn_ra_svn/client.c:562 +#: libsvn_ra_svn/client.c:563 msgid "Module for accessing a repository using the svn network protocol." msgstr "svn 네트워크 프로토콜을 사용하여 저장소에 접근하는 모듈" -#: libsvn_ra_svn/client.c:595 +#: libsvn_ra_svn/client.c:596 #, c-format msgid "Illegal svn repository URL '%s'" msgstr "잘못된 svn 저장소 URL '%s'" -#: libsvn_ra_svn/client.c:614 +#: libsvn_ra_svn/client.c:615 #, c-format msgid "Server requires minimum version %d" msgstr "서버는 적어도 버전 %d 을/를 요구합니다" -#: libsvn_ra_svn/client.c:664 +#: libsvn_ra_svn/client.c:665 msgid "Impossibly long repository root from server" msgstr "너무 긴 저장소 루트가 지정되었습니다." -#: libsvn_ra_svn/client.c:731 +#: libsvn_ra_svn/client.c:732 msgid "Server did not send repository root" msgstr "서버가 저장소 루트를 전송하지 않았습니다." -#: libsvn_ra_svn/client.c:852 +#: libsvn_ra_svn/client.c:853 msgid "Non-string as part of file contents" msgstr "파일 내용이 부분적으로 문자열이 아닙니다." -#: libsvn_ra_svn/client.c:921 +#: libsvn_ra_svn/client.c:922 msgid "Dirlist element not a list" msgstr "Dirlist 요소가 리스트 구조체가 아닙니다." -#: libsvn_ra_svn/client.c:1077 +#: libsvn_ra_svn/client.c:1078 msgid "Log entry not a list" msgstr "로그 엔트리가 리스트 구조체가 아닙니다." -#: libsvn_ra_svn/client.c:1090 +#: libsvn_ra_svn/client.c:1091 msgid "Changed-path entry not a list" msgstr "바뀐 경로 엔트리가 리스트 구조체가 아닙니다." -#: libsvn_ra_svn/client.c:1173 +#: libsvn_ra_svn/client.c:1174 msgid "get-locations not implemented" msgstr "get-locations는 구현되지 않았습니다" -#: libsvn_ra_svn/client.c:1186 +#: libsvn_ra_svn/client.c:1187 msgid "Location entry not a list" msgstr "Location 엔트리가 리스트 구조체가 아닙니다" -#: libsvn_ra_svn/client.c:1240 +#: libsvn_ra_svn/client.c:1241 msgid "get-file-revs not implemented" msgstr "get-file-revs는 구현되지 않았습니다." -#: libsvn_ra_svn/client.c:1254 +#: libsvn_ra_svn/client.c:1255 msgid "Revision entry not a list" msgstr "리비전 엔트리가 리스트 구조체가 아닙니다." -#: libsvn_ra_svn/client.c:1267 libsvn_ra_svn/client.c:1292 +#: libsvn_ra_svn/client.c:1268 libsvn_ra_svn/client.c:1293 msgid "Text delta chunk not a string" msgstr "문서의 차이 조각(text delta chunk)이 문자열이 아닙니다." -#: libsvn_ra_svn/client.c:1304 +#: libsvn_ra_svn/client.c:1305 msgid "The get-file-revs command didn't return any revisions" msgstr "get-file-revs 명령이 어떠한 리비전도 반환하지 않았습니다." -#: libsvn_ra_svn/client.c:1356 +#: libsvn_ra_svn/client.c:1359 +#, c-format msgid "Unsupported RA loader version (%d) for ra_svn" msgstr "ra_svn에 대한 지원하지 않는 RA 로더 버전(%d)입니다." @@ -3942,19 +3954,20 @@ #: libsvn_repos/commit.c:117 #, c-format msgid "Out of date: '%s' in transaction '%s'" -msgstr "" +msgstr "시간이 오래되었습니다.: '%s' (트랜잭션 '%s')" #: libsvn_repos/commit.c:224 libsvn_repos/commit.c:356 #, c-format msgid "Got source path but no source revision for '%s'" -msgstr "" +msgstr "소스 경로는 얻었으나 리비전을 얻을 수 없습니다. '%s'" #: libsvn_repos/commit.c:248 libsvn_repos/commit.c:380 +#, c-format msgid "Source url '%s' is from different repository" -msgstr "" -"원본 URL '%s'은(는) 외부 저장소와 연결되어 있습니다." +msgstr "원본 URL '%s'은(는) 외부 저장소와 연결되어 있습니다." #: libsvn_repos/commit.c:486 +#, c-format msgid "" "Checksum mismatch for resulting fulltext\n" "(%s):\n" @@ -3979,6 +3992,8 @@ "Invalid editor anchoring; at least one of the input paths is not a directory " "and there was no source entry" msgstr "" +"잘못된 편집 오류; 적어도 하나의 경로가 디렉토리가 아니거나 소스가 존재하지않" +"습니다." #: libsvn_repos/dump.c:416 #, c-format @@ -4007,7 +4022,7 @@ msgid "* %s revision %ld.\n" msgstr "* %s 리비전 %ld.\n" -#: libsvn_repos/fs-wrap.c:56 +#: libsvn_repos/fs-wrap.c:56 libsvn_repos/load.c:1218 msgid "Commit succeeded, but post-commit hook failed" msgstr "커밋은 성공하였습니다만 post-commit 훅이 실패하였습니다." @@ -4017,17 +4032,21 @@ "Storage of non-regular property '%s' is disallowed through the repository " "interface, and could indicate a bug in your client" msgstr "" +"정상적인 속성 '%s'에 대한 저장공간이 저장소 인터페이스를 통해 접근할 수 없습" +"니다.이는 클라이언트 버그일 수 있습니다." #: libsvn_repos/fs-wrap.c:294 #, c-format msgid "Write denied: not authorized to read all of revision %ld." -msgstr "" +msgstr "쓰기 금지됨: 리비전 %ld에 대해서 전체를 읽을 수 있는 권한이 없습니다." #: libsvn_repos/hooks.c:65 +#, c-format msgid "Can't create pipe for hook '%s'" msgstr "훅 '%s'에 대한 파이프를 생성할 수 없습니다." #: libsvn_repos/hooks.c:72 +#, c-format msgid "Can't create null stdout for hook '%s'" msgstr "훅 '%s'에 대해 null stdout을 생성할 수 없습니다." @@ -4038,89 +4057,101 @@ #: libsvn_repos/hooks.c:90 #, c-format msgid "Failed to run '%s' hook" -msgstr "" +msgstr "'%s' 훅을 수행하는데 실패하였습니다." -#: libsvn_repos/hooks.c:105 +#: libsvn_repos/hooks.c:108 #, c-format msgid "" "'%s' hook failed with error output:\n" "%s" msgstr "" +"'%s' 훅이 다음 오류를 내고 실패하였습니다:\n" +"%s" + +#: libsvn_repos/hooks.c:115 +msgid "'%s' hook failed; no error output available" +msgstr "'%s' 훅이 출력메시지를 내지 않고 실패하였습니다." -#: libsvn_repos/hooks.c:116 +#: libsvn_repos/hooks.c:126 msgid "Error closing read end of stderr pipe" -msgstr "" +msgstr "표준 에러 파이프를 닫는데 오류가 발생하였습니다." -#: libsvn_repos/hooks.c:120 +#: libsvn_repos/hooks.c:130 msgid "Error closing null file" msgstr "null 파일 닫기 오류가 발생하였습니다" -#: libsvn_repos/hooks.c:202 +#: libsvn_repos/hooks.c:212 #, c-format msgid "Failed to run '%s' hook; broken symlink" -msgstr "" +msgstr "'%s' 훅을 수행하는데 실패하였습니다; 심볼릭 링크가 깨졌습니다." -#: libsvn_repos/hooks.c:343 +#: libsvn_repos/hooks.c:353 msgid "" "Repository has not been enabled to accept revision propchanges;\n" "ask the administrator to create a pre-revprop-change hook" msgstr "" +"저장소가 리비전 속성을 바꿀 수 있지 못하도록 설정되었습니다.\n" +"pre-revprop-change 훅을 생성해달라고 관리자에게 문의 하십시오" -#: libsvn_repos/load.c:155 libsvn_repos/load.c:167 +#: libsvn_repos/load.c:157 libsvn_repos/load.c:169 msgid "Found malformed header block in dumpfile stream" msgstr "덤프 파일 스트림에 잘못된 형식의 헤더가 있습니다." -#: libsvn_repos/load.c:185 +#: libsvn_repos/load.c:187 msgid "Premature end of content data in dumpstream" -msgstr "" +msgstr "덤프 스트림에서 데이터가 정상적으로 끝나지 않았습니다." -#: libsvn_repos/load.c:192 +#: libsvn_repos/load.c:194 msgid "Dumpstream data appears to be malformed" -msgstr "" +msgstr "덤프 스트림의 포맷에 오류가 있습니다." -#: libsvn_repos/load.c:230 +#: libsvn_repos/load.c:232 msgid "Incomplete or unterminated property block" msgstr "불완전한 혹은 종료되지 않은 속성 블럭" -#: libsvn_repos/load.c:423 +#: libsvn_repos/load.c:425 msgid "Unexpected EOF writing contents" msgstr "쓰기 스트림의 비정상 종료가 발생하였습니다." -#: libsvn_repos/load.c:452 +#: libsvn_repos/load.c:454 msgid "Malformed dumpfile header" msgstr "잘못된 덤프 파일 헤더" -#: libsvn_repos/load.c:458 libsvn_repos/load.c:500 +#: libsvn_repos/load.c:460 libsvn_repos/load.c:502 +#, c-format msgid "Unsupported dumpfile version: %d" msgstr "지원되지 않는 덤프파일 버전: %d" -#: libsvn_repos/load.c:598 +#: libsvn_repos/load.c:600 msgid "Unrecognized record type in stream" msgstr "알 수 없는 레코드 타입이 발견되었습니다." -#: libsvn_repos/load.c:710 +#: libsvn_repos/load.c:712 msgid "Sum of subblock sizes larger than total block content length" -msgstr "" +msgstr "하위 블럭의 크기의 합이 전체 크기보다 큽니다." -#: libsvn_repos/load.c:889 +#: libsvn_repos/load.c:891 #, c-format msgid "<<< Started new transaction, based on original revision %ld\n" msgstr "<<< 새로운 트랜잭션 시작, 리비전 %ld에 기반함.\n" -#: libsvn_repos/load.c:934 +#: libsvn_repos/load.c:936 #, c-format msgid "Relative source revision %ld is not available in current repository" msgstr "상대 소스 리비전 %ld 는 현재 저장소안에서 유효하지 않습니다." -#: libsvn_repos/load.c:983 +#: libsvn_repos/load.c:985 msgid "Malformed dumpstream: Revision 0 must not contain node records" msgstr "" +"포맷오류가 있는 덤프 스트림: 0번 리비전이 노드 레코드를 포함하고 있지 않아야" +"합니다" -#: libsvn_repos/load.c:1027 +#: libsvn_repos/load.c:1029 +#, c-format msgid "Unrecognized node-action on node '%s'" msgstr "'%s'의 노드에 대해 알 수 없는 명령입니다." -#: libsvn_repos/load.c:1216 +#: libsvn_repos/load.c:1240 #, c-format msgid "" "\n" @@ -4131,7 +4162,7 @@ "------- 커밋한 리비전 %ld >>>\n" "\n" -#: libsvn_repos/load.c:1222 +#: libsvn_repos/load.c:1246 #, c-format msgid "" "\n" @@ -4143,20 +4174,23 @@ "\n" #: libsvn_repos/node_tree.c:238 +#, c-format msgid "'%s' not found in filesystem" msgstr "'%s'는 파일 시스템에 없습니다" #: libsvn_repos/replay.c:159 +#, c-format msgid "Filesystem path '%s' is neither a file nor a directory" msgstr "파일 시스템내의 '%s'는 파일이나 디렉토리가 아닙니다" #: libsvn_repos/reporter.c:637 +#, c-format msgid "Working copy path '%s' does not exist in repository" msgstr "경로 '%s'은(는) 저장소에 없습니다." #: libsvn_repos/reporter.c:855 msgid "Not authorized to open root of edit operation" -msgstr "" +msgstr "수정 명령의 루트를 열 수 있는 권한을 얻지 못하였습니다." #: libsvn_repos/reporter.c:876 msgid "Cannot replace a directory from within" @@ -4168,15 +4202,16 @@ #: libsvn_repos/reporter.c:934 msgid "Two top-level reports with no target" -msgstr "" +msgstr "대상이 없는 두 개의 최상의 보고서" #: libsvn_repos/repos.c:148 +#, c-format msgid "'%s' exists and is non-empty" msgstr "'%s'은(는) 존재하며, 비어 있지 않습니다." #: libsvn_repos/repos.c:172 msgid "Creating db logs lock file" -msgstr "" +msgstr "DB 로그의 잠금 파일 생성중" #: libsvn_repos/repos.c:197 msgid "Creating db lock file" @@ -4184,7 +4219,7 @@ #: libsvn_repos/repos.c:207 msgid "Creating lock dir" -msgstr "" +msgstr "잠금 파일용 디렉토리 생성중" #: libsvn_repos/repos.c:237 msgid "Creating hook directory" @@ -4200,7 +4235,7 @@ #: libsvn_repos/repos.c:606 msgid "Creating pre-revprop-change hook" -msgstr "" +msgstr "pre-revprop-change 훅을 생성하는 중" #: libsvn_repos/repos.c:705 msgid "Creating post-commit hook" @@ -4208,7 +4243,7 @@ #: libsvn_repos/repos.c:815 msgid "Creating post-revprop-change hook" -msgstr "" +msgstr "post-revprop-change 훅을 생성하는 중" #: libsvn_repos/repos.c:825 msgid "Creating conf directory" @@ -4216,11 +4251,11 @@ #: libsvn_repos/repos.c:877 msgid "Creating svnserve.conf file" -msgstr "" +msgstr "svnserve.conf 파일 생성하는 중" #: libsvn_repos/repos.c:902 msgid "Creating passwd file" -msgstr "" +msgstr "passwd 파일 생성하는 중" #: libsvn_repos/repos.c:928 msgid "Could not create top-level directory" @@ -4228,7 +4263,7 @@ #: libsvn_repos/repos.c:932 msgid "Creating DAV sandbox dir" -msgstr "" +msgstr "DAV 샌드박스 디렉토리 생성하는 중" #: libsvn_repos/repos.c:975 msgid "Creating readme file" @@ -4241,7 +4276,7 @@ #: libsvn_repos/repos.c:1068 #, c-format msgid "Expected version '%d' of repository; found version '%d'" -msgstr "" +msgstr "예상되는 저장소의 버전 '%d', 발견된 버전 '%d'" #: libsvn_repos/repos.c:1113 msgid "Error opening db lockfile" @@ -4264,23 +4299,24 @@ #: libsvn_repos/rev_hunt.c:314 msgid "Unreadable path encountered; access denied." -msgstr "읽을 수 없는 경로 발생: 접근 거부됨." +msgstr "읽을 수 없는 경로 발생: 접근 거부되었습니다." #: libsvn_subr/config.c:632 #, c-format msgid "Config error: invalid boolean value '%s'" -msgstr "" +msgstr "구성 오류: 잘못된 부울리안 값입니다. '%s'" #: libsvn_subr/config.c:807 #, c-format msgid "Config error: invalid integer value '%s'" -msgstr "" +msgstr "구성 오류: 잘못된 정수 값입니다. '%s'" #: libsvn_subr/config_auth.c:94 msgid "Unable to open auth file for reading" -msgstr "" +msgstr "인증 파일을 읽는데 실패하였습니다." #: libsvn_subr/config_auth.c:99 +#, c-format msgid "Error parsing '%s'" msgstr "'%s'의 구문 분석 실패" @@ -4290,23 +4326,26 @@ #: libsvn_subr/config_auth.c:134 msgid "Unable to open auth file for writing" -msgstr "" +msgstr "인증 파일을 기록하는데 실패하였습니다." #: libsvn_subr/config_auth.c:137 +#, c-format msgid "Error writing hash to '%s'" msgstr "'%s'에 해시 쓰기 오류" #: libsvn_subr/config_file.c:393 +#, c-format msgid "Can't open config file '%s'" msgstr "구성파일 '%s' 를 열 수 없습니다." #: libsvn_subr/config_file.c:397 +#, c-format msgid "Can't find config file '%s'" msgstr "구성파일 '%s' 를 열 수 없습니다." #: libsvn_subr/date.c:204 msgid "Can't manipulate current date" -msgstr "" +msgstr "현재 날짜를 조작할 수 없습니다." #: libsvn_subr/date.c:274 libsvn_subr/date.c:282 msgid "Can't calculate requested date" @@ -4320,199 +4359,210 @@ msgid "Can't recode error string from APR" msgstr "APR로부터 문자열을 재조합할 수 없습니다." -#: libsvn_subr/io.c:127 +#: libsvn_subr/io.c:129 #, c-format msgid "Can't check path '%s'" msgstr "경로를 확인할 수 없습니다. '%s'" -#: libsvn_subr/io.c:246 libsvn_subr/io.c:335 +#: libsvn_subr/io.c:248 libsvn_subr/io.c:337 #, c-format msgid "Can't open '%s'" msgstr "열 수 없습니다. '%s'" -#: libsvn_subr/io.c:260 libsvn_subr/io.c:348 +#: libsvn_subr/io.c:262 libsvn_subr/io.c:350 #, c-format msgid "Unable to make name for '%s'" msgstr "이름을 만들 수 없습니다. '%s'" -#: libsvn_subr/io.c:352 libsvn_subr/io.c:388 libsvn_subr/io.c:416 +#: libsvn_subr/io.c:354 libsvn_subr/io.c:390 libsvn_subr/io.c:418 msgid "Symbolic links are not supported on this platform" msgstr "이 플랫폼에서는 심볼릭 링크가 지원되지 않습니다." -#: libsvn_subr/io.c:375 +#: libsvn_subr/io.c:377 msgid "Can't read contents of link" msgstr "링크의 내용을 읽을 수 없습니다." -#: libsvn_subr/io.c:517 libsvn_subr/io.c:527 +#: libsvn_subr/io.c:519 libsvn_subr/io.c:529 msgid "Can't find a temporary directory" msgstr "임시 디렉토리를 찾을 수 없습니다." -#: libsvn_subr/io.c:564 +#: libsvn_subr/io.c:566 +#, c-format msgid "Can't copy '%s' to '%s'" msgstr "'%s'을/를 '%s' 로 복사할 수 없습니다." -#: libsvn_subr/io.c:597 +#: libsvn_subr/io.c:599 +#, c-format msgid "Can't set permissions on '%s'" msgstr "'%s'에 권한을 설정할 수 없습니다." -#: libsvn_subr/io.c:619 +#: libsvn_subr/io.c:621 +#, c-format msgid "Can't append '%s' to '%s'" msgstr "'%s'을/를 '%s'에 추가할 수 없습니다." -#: libsvn_subr/io.c:653 +#: libsvn_subr/io.c:655 +#, c-format msgid "Source '%s' is not a directory" msgstr "원본 '%s'은 디렉토리가 아닙니다" -#: libsvn_subr/io.c:659 +#: libsvn_subr/io.c:661 +#, c-format msgid "Destination '%s' is not a directory" msgstr "대상 '%s'은 디렉토리가 아닙니다" -#: libsvn_subr/io.c:665 +#: libsvn_subr/io.c:667 +#, c-format msgid "Destination '%s' already exists" msgstr "대상 '%s' 는 이미 존재합니다." -#: libsvn_subr/io.c:738 libsvn_subr/io.c:1498 libsvn_subr/io.c:1567 +#: libsvn_subr/io.c:740 libsvn_subr/io.c:1500 libsvn_subr/io.c:1569 #, c-format msgid "Can't read directory '%s'" msgstr "디렉토리를 읽을 수 없습니다 '%s'" -#: libsvn_subr/io.c:743 libsvn_subr/io.c:1503 libsvn_subr/io.c:1572 -#: libsvn_subr/io.c:2457 +#: libsvn_subr/io.c:745 libsvn_subr/io.c:1505 libsvn_subr/io.c:1574 +#: libsvn_subr/io.c:2461 #, c-format msgid "Error closing directory '%s'" msgstr "디렉토리를 닫을 수 없습니다. '%s'" -#: libsvn_subr/io.c:769 +#: libsvn_subr/io.c:771 +#, c-format msgid "Can't make directory '%s'" msgstr "디렉토리 '%s'을/를 생성할 수 없습니다." -#: libsvn_subr/io.c:837 +#: libsvn_subr/io.c:839 +#, c-format msgid "Can't set access time of '%s'" msgstr "'%s' 에 접근 시각 설정을 할 수 없습니다." -#: libsvn_subr/io.c:953 +#: libsvn_subr/io.c:955 +#, c-format msgid "Can't set file '%s' read-only" msgstr "파일 '%s'에 읽기 전용 속성을 설정할 수 없습니다." -#: libsvn_subr/io.c:978 +#: libsvn_subr/io.c:980 +#, c-format msgid "Can't set file '%s' read-write" msgstr "파일 '%s'에 읽기/쓰기 속성을 설정할 수 없습니다." -#: libsvn_subr/io.c:1033 libsvn_subr/io.c:1077 libsvn_subr/io.c:1101 +#: libsvn_subr/io.c:1035 libsvn_subr/io.c:1079 libsvn_subr/io.c:1103 +#, c-format msgid "Can't change executability of file '%s'" msgstr "파일 '%s'에 대해 실행 속성 변경을 할 수 없습니다" -#: libsvn_subr/io.c:1128 +#: libsvn_subr/io.c:1130 msgid "Error getting UID of process" msgstr "프로세스의 UID를 얻을 수 없습니다." -#: libsvn_subr/io.c:1209 +#: libsvn_subr/io.c:1211 #, c-format msgid "Can't get shared lock on file '%s'" msgstr "파일 '%s' 에 대한 공유 잠금기능을 걸 수 없습니다." -#: libsvn_subr/io.c:1213 +#: libsvn_subr/io.c:1215 #, c-format msgid "Can't get exclusive lock on file '%s'" msgstr "파일 '%s'에 대해 배타적 잠금기능을 걸 수 없습니다." -#: libsvn_subr/io.c:1244 +#: libsvn_subr/io.c:1246 #, c-format msgid "Can't flush file '%s'" msgstr "파일을 플러시할 수 없습니다. '%s'" -#: libsvn_subr/io.c:1245 +#: libsvn_subr/io.c:1247 msgid "Can't flush stream" msgstr "스트림을 플러시 할 수 없습니다." -#: libsvn_subr/io.c:1257 libsvn_subr/io.c:1274 +#: libsvn_subr/io.c:1259 libsvn_subr/io.c:1276 msgid "Can't flush file to disk" msgstr "디스크에 파일을 플러시할 수 없습니다." -#: libsvn_subr/io.c:1295 +#: libsvn_subr/io.c:1297 msgid "Reading from stdin is currently broken, so disabled" msgstr "표준 입력으로부터 읽는 것은 현재 지원하지 않습니다." -#: libsvn_subr/io.c:1316 +#: libsvn_subr/io.c:1318 msgid "Can't get file name" msgstr "파일 이름을 얻을 수 없습니다." -#: libsvn_subr/io.c:1384 +#: libsvn_subr/io.c:1386 #, c-format msgid "Can't remove file '%s'" msgstr "파일을 제거할 수 없습니다. '%s'" -#: libsvn_subr/io.c:1413 +#: libsvn_subr/io.c:1415 #, c-format msgid "Can't rewind directory '%s'" msgstr "디렉토리를 되감을 수 없습니다. '%s'" -#: libsvn_subr/io.c:1448 libsvn_subr/io.c:2308 libsvn_subr/io.c:2396 +#: libsvn_subr/io.c:1450 libsvn_subr/io.c:2310 libsvn_subr/io.c:2398 #, c-format msgid "Can't open directory '%s'" msgstr "디렉토리를 열 수 없습니다. '%s'" -#: libsvn_subr/io.c:1487 libsvn_subr/io.c:1509 +#: libsvn_subr/io.c:1489 libsvn_subr/io.c:1511 #, c-format msgid "Can't remove '%s'" msgstr "제거할 수 없습니다. '%s'" -#: libsvn_subr/io.c:1603 +#: libsvn_subr/io.c:1605 #, c-format msgid "Can't create process '%s' attributes" msgstr "프로세스 속성을 생성할 수 없습니다. %s'" -#: libsvn_subr/io.c:1609 +#: libsvn_subr/io.c:1611 #, c-format msgid "Can't set process '%s' cmdtype" msgstr "'%s' cmdtype을 처리할 수 없습니다." -#: libsvn_subr/io.c:1621 +#: libsvn_subr/io.c:1623 #, c-format msgid "Can't set process '%s' directory" msgstr "프로세스에 디렉토리를 설정할 수 없습니다. '%s'" -#: libsvn_subr/io.c:1634 +#: libsvn_subr/io.c:1636 #, c-format msgid "Can't set process '%s' child input" msgstr "자식 프로세스의 입력파일 경로를 설정할 수 없습니다. '%s'" -#: libsvn_subr/io.c:1641 +#: libsvn_subr/io.c:1643 #, c-format msgid "Can't set process '%s' child outfile" msgstr "자식 프로세스의 출력파일 경로를 설정할 수 없습니다. '%s'" -#: libsvn_subr/io.c:1648 +#: libsvn_subr/io.c:1650 #, c-format msgid "Can't set process '%s' child errfile" msgstr "자식 프로세스의 오류파일 경로를 설정할 수 없습니다. '%s'" -#: libsvn_subr/io.c:1672 +#: libsvn_subr/io.c:1674 #, c-format msgid "Can't start process '%s'" msgstr "프로세스 '%s'을/를 시작할 수 없습니다." -#: libsvn_subr/io.c:1680 +#: libsvn_subr/io.c:1682 #, c-format msgid "Error waiting for process '%s'" msgstr "프로세스 '%s'을/를 기다리던 중 에러 발생" -#: libsvn_subr/io.c:1688 +#: libsvn_subr/io.c:1690 #, c-format msgid "Process '%s' failed (exitwhy %d)" msgstr "프로세스 '%s' 실패함 (종료이유 %d)" -#: libsvn_subr/io.c:1695 +#: libsvn_subr/io.c:1697 #, c-format msgid "Process '%s' returned error exitcode %d" msgstr "프로세스 '%s' 오류 종료 코드 %d 반환함." -#: libsvn_subr/io.c:1783 +#: libsvn_subr/io.c:1785 #, c-format msgid "'%s' returned %d" msgstr "'%s' 가 %d 을/를 반환합니다." -#: libsvn_subr/io.c:1886 +#: libsvn_subr/io.c:1888 #, c-format msgid "" "Error running '%s': exitcode was %d, args were:\n" @@ -4527,116 +4577,116 @@ "%s\n" "%s" -#: libsvn_subr/io.c:1922 +#: libsvn_subr/io.c:1924 #, c-format msgid "Can't detect MIME type of non-file '%s'" msgstr "non-file '%s'의 MIME 타입을 탐지할 수 없습니다." -#: libsvn_subr/io.c:1989 +#: libsvn_subr/io.c:1991 #, c-format msgid "Can't open file '%s'" msgstr "file '%s' 를 열 수 없습니다." -#: libsvn_subr/io.c:2025 +#: libsvn_subr/io.c:2027 #, c-format msgid "Can't close file '%s'" msgstr "파일 '%s'를 닫을 수 없습니다." -#: libsvn_subr/io.c:2026 +#: libsvn_subr/io.c:2028 msgid "Can't close stream" msgstr "스트림을 닫을 수 없습니다." -#: libsvn_subr/io.c:2036 libsvn_subr/io.c:2060 libsvn_subr/io.c:2073 +#: libsvn_subr/io.c:2038 libsvn_subr/io.c:2062 libsvn_subr/io.c:2075 #, c-format msgid "Can't read file '%s'" msgstr "파일 '%s'를 읽을 수 없습니다." -#: libsvn_subr/io.c:2037 libsvn_subr/io.c:2061 libsvn_subr/io.c:2074 +#: libsvn_subr/io.c:2039 libsvn_subr/io.c:2063 libsvn_subr/io.c:2076 msgid "Can't read stream" msgstr "스트림을 읽을 수 없습니다." -#: libsvn_subr/io.c:2048 +#: libsvn_subr/io.c:2050 #, c-format msgid "Can't get attribute information from file '%s'" msgstr "파일 '%s' 로부터 속성 정보를 얻을 수 없습니다." -#: libsvn_subr/io.c:2049 +#: libsvn_subr/io.c:2051 msgid "Can't get attribute information from stream" msgstr "스트림으로부터 속성 정보를 얻을 수 없습니다." -#: libsvn_subr/io.c:2085 +#: libsvn_subr/io.c:2087 #, c-format msgid "Can't set position pointer in file '%s'" msgstr "파일 '%s'에 위치 포이터를 설정 할 수 없습니다." -#: libsvn_subr/io.c:2086 +#: libsvn_subr/io.c:2088 msgid "Can't set position pointer in stream" msgstr "스트림에 위치 포인터를 설정 할 수 없습니다." -#: libsvn_subr/io.c:2097 libsvn_subr/io.c:2110 +#: libsvn_subr/io.c:2099 libsvn_subr/io.c:2112 #, c-format msgid "Can't write to file '%s'" msgstr "파일 '%s'에 쓸 수 없습니다." -#: libsvn_subr/io.c:2098 libsvn_subr/io.c:2111 +#: libsvn_subr/io.c:2100 libsvn_subr/io.c:2113 msgid "Can't write to stream" msgstr "스트림에 쓸 수 없습니다." -#: libsvn_subr/io.c:2184 +#: libsvn_subr/io.c:2186 #, c-format msgid "Can't move '%s' to '%s'" msgstr "'%s'을/를 '%s' 로 이동 할 수 없습니다." -#: libsvn_subr/io.c:2224 +#: libsvn_subr/io.c:2226 #, c-format msgid "Can't create directory '%s'" msgstr "디렉토리 '%s'을/를 생성할 수 없습니다." -#: libsvn_subr/io.c:2235 +#: libsvn_subr/io.c:2237 #, c-format msgid "Can't hide directory '%s'" msgstr "디렉토리 '%s'을/를 숨길 수 없습니다." -#: libsvn_subr/io.c:2248 +#: libsvn_subr/io.c:2250 #, c-format msgid "Can't stat directory '%s'" msgstr "디렉토리 '%s'의 상태를 알 수 없습니다." -#: libsvn_subr/io.c:2264 +#: libsvn_subr/io.c:2266 #, c-format msgid "Can't stat new directory '%s'" msgstr "새 디렉토리 '%s'의 상태를 알 수 없습니다." -#: libsvn_subr/io.c:2326 +#: libsvn_subr/io.c:2328 #, c-format msgid "Can't remove directory '%s'" msgstr "디렉토리 '%s'을/를 제거할 수 없습니다." -#: libsvn_subr/io.c:2344 +#: libsvn_subr/io.c:2346 msgid "Can't read directory" msgstr "디렉토리를 읽을 수 없습니다." -#: libsvn_subr/io.c:2413 +#: libsvn_subr/io.c:2417 #, c-format msgid "Can't read directory entry in '%s'" msgstr "'%s'에서 디렉토리 엔트리를 읽을 수 없습니다." -#: libsvn_subr/io.c:2538 +#: libsvn_subr/io.c:2542 #, c-format msgid "Can't check directory '%s'" msgstr "디렉토리 '%s'를 체크할 수 없습니다." -#: libsvn_subr/io.c:2560 +#: libsvn_subr/io.c:2564 #, c-format msgid "Version %d is not non-negative" msgstr "버젼 %d은/는 non-negative가 아닙니다." -#: libsvn_subr/io.c:2607 +#: libsvn_subr/io.c:2611 #, c-format msgid "Reading '%s'" msgstr "'%s'을/를 읽습니다" -#: libsvn_subr/io.c:2623 +#: libsvn_subr/io.c:2627 #, c-format msgid "First line of '%s' contains non-digit" msgstr "'%s'의 첫번째 줄은 숫자가 아닌 것을 포함하고 있습니다." @@ -4713,20 +4763,22 @@ msgid "Type '%s help' for usage.\n" msgstr "사용법은 '%s help'를 통해 볼 수 있습니다.\n" -#: libsvn_subr/path.c:1070 +#: libsvn_subr/path.c:1065 #, c-format msgid "Couldn't determine absolute path of '%s'" -msgstr "" +msgstr "절대 경로를 결정할 수 없습니다. '%s'" -#: libsvn_subr/path.c:1109 +#: libsvn_subr/path.c:1104 +#, c-format msgid "'%s' is neither a file nor a directory name" msgstr "'%s'는 파일이나 디렉토리가 아닙니다" -#: libsvn_subr/path.c:1215 +#: libsvn_subr/path.c:1210 msgid "Can't determine the native path encoding" -msgstr "" +msgstr "경로에 대한 기본 인코딩을 결정할 수 없습니다." -#: libsvn_subr/path.c:1269 +#: libsvn_subr/path.c:1264 +#, c-format msgid "Invalid control character '0x%02x' in path '%s'" msgstr "잘못된 제어 문자 '0x%02x'가 경로 '%s'에 있습니다." @@ -4735,29 +4787,45 @@ msgid "File '%s' has inconsistent newlines" msgstr "파일 '%s' 은 일치하지 않는 개행문자를 포함하고 있습니다" -#: libsvn_subr/utf.c:147 +#: libsvn_subr/utf.c:149 msgid "Can't lock charset translation mutex" -msgstr "" +msgstr "문자변환용 뮤텍스를 잠글 수 없습니다." -#: libsvn_subr/utf.c:165 libsvn_subr/utf.c:215 +#: libsvn_subr/utf.c:167 libsvn_subr/utf.c:226 msgid "Can't unlock charset translation mutex" -msgstr "" +msgstr "문자변환용 뮤텍스를 해제할 수 없습니다." -#: libsvn_subr/utf.c:228 -msgid "Can't create a converter from '%s' to '%s'" -msgstr "'%s'을/를 '%s'(으)로 변활할 수 있는 모듈이 없습니다." +#: libsvn_subr/utf.c:242 +#, c-format +msgid "Can't create a character converter from native encoding to '%s'" +msgstr "기본 인코딩에서 '%s'(으)로 변환할 수 있는 컨버터를 만들 수 없습니다." -#: libsvn_subr/utf.c:229 libsvn_subr/utf.c:230 -msgid "native" -msgstr "" +#: libsvn_subr/utf.c:246 +#, c-format +msgid "Can't create a character converter from '%s' to native encoding" +msgstr "'%s'에서 기본 인코딩으로 변환할 수 있는 컨버터를 만들 수 없습니다." -#. Can't use svn_error_wrap_apr here because it calls functions in -#. this file, leading to infinite recursion. -#: libsvn_subr/utf.c:361 -msgid "Can't recode string" -msgstr "문자열을 UTF8으로 변환에 실패하였습니다" +#: libsvn_subr/utf.c:250 +#, c-format +msgid "Can't create a character converter from '%s' to '%s'" +msgstr "'%s'을/를 '%s'(으)로 변환할 수 있는 컨버터를 만들 수 없습니다." -#: libsvn_subr/utf.c:401 +#: libsvn_subr/utf.c:441 +#, c-format +msgid "Can't convert string from native encoding to '%s':" +msgstr "기본 인코딩에서 '%s'(으)로 문자열을 변환할 수 없습니다:" + +#: libsvn_subr/utf.c:445 +#, c-format +msgid "Can't convert string from '%s' to native encoding:" +msgstr "'%s'에서 기본 인코딩으로 문자열을 변환할 수 없습니다:" + +#: libsvn_subr/utf.c:449 +#, c-format +msgid "Can't convert string from '%s' to '%s':" +msgstr "'%s'에서 '%s'(으)로 문자열을 변환할 수 없습니다:" + +#: libsvn_subr/utf.c:493 #, c-format msgid "" "Safe data:\n" @@ -4766,14 +4834,19 @@ "\n" "Non-ASCII character detected (see above), and unable to convert to/from UTF-8" msgstr "" +"안전한 데이터:\n" +"\"%s\"\n" +"... 아스키 아닌 값(%d)이 따라 왔습니다.\n" +"\n" +"위와 같이 ASCII가 아닌 문자가 발견되었으며, UTF-8과 상호 변환이 불가능합니다." -#: libsvn_subr/utf.c:413 +#: libsvn_subr/utf.c:505 #, c-format msgid "" "Non-ASCII character (code %d) detected, and unable to convert to/from UTF-8" -msgstr "" +msgstr "ASCII가 아닌 (코드 %d) 문자가 발견되었으며, UTF-8과 상호 변환이 불가능합니다." -#: libsvn_subr/utf.c:455 +#: libsvn_subr/utf.c:547 #, c-format msgid "" "Valid UTF-8 data\n" @@ -4781,6 +4854,10 @@ "followed by invalid UTF-8 sequence\n" "(hex:%s)" msgstr "" +"유효한 UTF-8 데이터\n" +"(hex:%s)\n" +"뒤에 잘못된 UTF-8 문자열이 발견되었습니다.\n" +"(hex:%s)" #: libsvn_subr/validate.c:48 #, c-format @@ -4803,7 +4880,8 @@ msgstr "" "'%s'의 버젼이 일치하지 않습니다: 발견된 버젼 %d.%d.%d%s, 기대 버젼 %d.%d.%d%s" -#: libsvn_subr/xml.c:367 +#: libsvn_subr/xml.c:420 +#, c-format msgid "Malformed XML: %s at line %d" msgstr "잘못된 XML: %s (줄 번호 %d)" @@ -4880,8 +4958,8 @@ msgid "Unrecognized node kind: '%s'" msgstr "인실할 수 없는 노드 종류: '%s'" -#: libsvn_wc/adm_ops.c:378 libsvn_wc/update_editor.c:915 -#: libsvn_wc/update_editor.c:1305 +#: libsvn_wc/adm_ops.c:378 libsvn_wc/update_editor.c:917 +#: libsvn_wc/update_editor.c:1307 #, c-format msgid "Error writing log file for '%s'" msgstr "'%s'에 대한 로그 파일 쓰기 오류" @@ -5096,12 +5174,12 @@ msgid "No default entry in directory '%s'" msgstr "디릭토리 '%s'에 기본 엔트리가 없습니다" -#: libsvn_wc/entries.c:1169 +#: libsvn_wc/entries.c:1170 #, c-format msgid "Error writing to '%s'" msgstr "'%s'에 쓰기 오류" -#: libsvn_wc/entries.c:1409 +#: libsvn_wc/entries.c:1410 #, c-format msgid "" "Can't add '%s' to deleted directory; try undeleting its parent directory " @@ -5110,7 +5188,7 @@ "삭제된 디렉토리에 '%s'를 추가 할 수 없습니다; 상위 디렉토리를 먼저 복원하십시" "오" -#: libsvn_wc/entries.c:1415 +#: libsvn_wc/entries.c:1416 #, c-format msgid "" "Can't replace '%s' in deleted directory; try undeleting its parent directory " @@ -5119,37 +5197,37 @@ "삭제된 디렉토리에서 '%s'를 교체 할 수 없습니다; 상위 디렉토리를 먼저 복원하십" "시오" -#: libsvn_wc/entries.c:1424 +#: libsvn_wc/entries.c:1425 #, c-format msgid "'%s' is marked as absent, so it cannot be scheduled for addition" msgstr "'%s'는 없는 것으로 표시되어 있어서 추가 작업을 스케쥴할 수 없습니다" -#: libsvn_wc/entries.c:1453 +#: libsvn_wc/entries.c:1454 #, c-format msgid "Entry '%s' is already under version control" msgstr "'%s' 항목은 이미 관리 대상입니다." -#: libsvn_wc/entries.c:1545 +#: libsvn_wc/entries.c:1546 #, c-format msgid "Entry '%s' has illegal schedule" msgstr "'%s' 항목은 잘못된 스케쥴을 가지고 있습니다." -#: libsvn_wc/entries.c:1678 +#: libsvn_wc/entries.c:1679 #, c-format msgid "No such entry: '%s'" msgstr "없는 항목: '%s'" -#: libsvn_wc/entries.c:1744 +#: libsvn_wc/entries.c:1745 #, c-format msgid "Directory '%s' has no THIS_DIR entry" msgstr "'%s' 디렉토리는 THIS_DIR 항목이 없습니다." -#: libsvn_wc/entries.c:1813 +#: libsvn_wc/entries.c:1814 #, c-format msgid "'%s' has an unrecognized node kind" msgstr "'%s' 은/는 인식 불가능한 노드 종류입니다." -#: libsvn_wc/entries.c:1849 +#: libsvn_wc/entries.c:1850 #, c-format msgid "Unexpectedly found '%s': path is marked 'missing'" msgstr "예기치 않은 발견 '%s': 경로는 'missing' 표시가 되어 있습니다." @@ -5165,6 +5243,7 @@ msgstr "경로 '%s'는 '%s'에서 끝나며, 이는 지원하지 않은 동작입니다." #: libsvn_wc/lock.c:643 +#, c-format msgid "Working copy '%s' is missing or not locked" msgstr "작업사본 '%s'은/는 없거나 잠겨있지 않습니다." @@ -5291,7 +5370,7 @@ msgid "Error reading administrative log file in '%s'" msgstr "'%s'의 관리 로그 파일을 읽는 중 오류 발생" -#: libsvn_wc/log.c:1487 +#: libsvn_wc/log.c:1489 #, c-format msgid "'%s' is not a working copy directory" msgstr "'%s'는 작업 사본 디렉토리가 아닙니다" @@ -5331,7 +5410,7 @@ msgid "Can't find entry '%s' in '%s'" msgstr "'%s'에 엔트리 '%s'를 찾을 수 없습니다" -#: libsvn_wc/props.c:318 libsvn_wc/update_editor.c:2275 +#: libsvn_wc/props.c:318 libsvn_wc/update_editor.c:2276 #, c-format msgid "Error writing log for '%s'" msgstr "'%s'에 대한 로그 쓰기 오류" @@ -5357,10 +5436,12 @@ msgstr "속성 '%s'는 엔트리 속성입니다" #: libsvn_wc/props.c:920 +#, c-format msgid "Cannot set '%s' on a directory ('%s')" msgstr "속성('%s')을 디렉토리('%s')에 설정할 수 없습니다" #: libsvn_wc/props.c:928 +#, c-format msgid "Cannot set '%s' on a file ('%s')" msgstr "속성('%s')을 파일('%s')에 설정할 수 없습니다" @@ -5427,29 +5508,29 @@ msgid "No '.' entry in: '%s'" msgstr "'.' 이 등록되어 있지 않습니다: '%s'" -#: libsvn_wc/update_editor.c:832 +#: libsvn_wc/update_editor.c:834 #, c-format msgid "Won't delete locally modified directory '%s'" msgstr "수정한 디렉토리는 지우지 않을 것입니다. '%s'" -#: libsvn_wc/update_editor.c:1022 +#: libsvn_wc/update_editor.c:1024 #, c-format msgid "Failed to add directory '%s': object of the same name already exists" msgstr "디렉토리 추가 실패 '%s': 같은 이름의 개체가 이미 존재합니다." -#: libsvn_wc/update_editor.c:1030 +#: libsvn_wc/update_editor.c:1032 #, c-format msgid "" "Failed to add directory '%s': object of the same name as the administrative " "directory" msgstr "디렉토리 추가 실패 '%s': 같은 이름의 개체가 관리용도로 사용됩니다." -#: libsvn_wc/update_editor.c:1044 +#: libsvn_wc/update_editor.c:1046 #, c-format msgid "Failed to add directory '%s': copyfrom arguments not yet supported" msgstr "디렉토리 추가 실패 '%s': copyfrom 인자는 아직 지원되지 않습니다." -#: libsvn_wc/update_editor.c:1065 +#: libsvn_wc/update_editor.c:1067 #, c-format msgid "" "Failed to add directory '%s': object of the same name is already scheduled " @@ -5457,11 +5538,11 @@ msgstr "" "디렉토리 추가 실패 '%s': 같은 이름의 개체를 이미 추가 요청을 하였습니다." -#: libsvn_wc/update_editor.c:1274 +#: libsvn_wc/update_editor.c:1276 msgid "Couldn't do property merge" msgstr "속성을 병합할 수 없습니다" -#: libsvn_wc/update_editor.c:1367 +#: libsvn_wc/update_editor.c:1369 #, c-format msgid "" "Failed to mark '%s' absent: item of the same name is already scheduled for " @@ -5470,12 +5551,12 @@ "'%s' 를 없는 것으로 표시할 수 없습니다: 이미 같은 이름의 항목이 추가되도록 스" "케쥴되어 있습니다" -#: libsvn_wc/update_editor.c:1459 +#: libsvn_wc/update_editor.c:1461 #, c-format msgid "Failed to add file '%s': object of the same name already exists" msgstr "파일 '%s'를 추가할 수 없습니다: 같은 이름의 대상이 이미 존재합니다" -#: libsvn_wc/update_editor.c:1480 +#: libsvn_wc/update_editor.c:1482 #, c-format msgid "" "Failed to add file '%s': object of the same name is already scheduled for " @@ -5484,21 +5565,21 @@ "파일 '%s'를 추가 할수 없습니다: 이미 같은 이름의 대상이 추가되도록 스케쥴되" "어 있습니다" -#: libsvn_wc/update_editor.c:1488 +#: libsvn_wc/update_editor.c:1490 #, c-format msgid "File '%s' in directory '%s' is not a versioned resource" msgstr "디렉토리 '%s' 의 파일 '%s'는 버젼 관리 대상이 아닙니다" -#: libsvn_wc/update_editor.c:1609 +#: libsvn_wc/update_editor.c:1611 #, c-format msgid "Checksum mismatch for '%s'; recorded: '%s', actual: '%s'" msgstr "'%s' 에 대한 체크섬이 일치하지 않습니다; 기록된 것:'%s', 실제:'%s'" -#: libsvn_wc/update_editor.c:1905 +#: libsvn_wc/update_editor.c:1907 msgid "Move failed" msgstr "이동 실패" -#: libsvn_wc/update_editor.c:2751 +#: libsvn_wc/update_editor.c:2752 #, c-format msgid "'%s' has no ancestry information" msgstr "'%s'가 히스토리를 갖고 있시 않습니다" @@ -5520,60 +5601,68 @@ msgid "'%s' is an URL when it should be a path" msgstr "'%s'는 그것이 경로로 존재할 때만 URL 입니다" -#: svnadmin/main.c:228 svndumpfilter/main.c:761 svnlook/main.c:95 +#: svnadmin/main.c:230 svndumpfilter/main.c:761 svnlook/main.c:95 #: svnserve/main.c:111 svnversion/main.c:200 msgid "show version information" msgstr "버젼 정보를 보여줍니다" -#: svnadmin/main.c:231 +#: svnadmin/main.c:233 msgid "specify revision number ARG (or X:Y range)" msgstr "리비젼 넘버 ARG ( 또는 X:Y 범위 )를 지정합니다" -#: svnadmin/main.c:234 +#: svnadmin/main.c:236 msgid "dump incrementally" msgstr "incremental 적재를 합니다." -#: svnadmin/main.c:237 +#: svnadmin/main.c:239 msgid "use deltas in dump output" msgstr "적재된 결과물에 deltas를 사용합니다" -#: svnadmin/main.c:240 +#: svnadmin/main.c:242 msgid "bypass the repository hook system" msgstr "저장소 훅 시스템을 처리하지 않습니다" -#: svnadmin/main.c:243 +#: svnadmin/main.c:245 msgid "no progress (only errors) to stderr" msgstr "stderr 에 대한 진행사항이 (오류에 한해서) 없습니다" -#: svnadmin/main.c:246 +#: svnadmin/main.c:248 msgid "ignore any repos UUID found in the stream" msgstr "스트림에 어떤 repos UUID가 발견되어도 무시합니다" -#: svnadmin/main.c:249 +#: svnadmin/main.c:251 msgid "set repos UUID to that found in stream, if any" msgstr "만약 있다면, repos UUID 를 스트림에서 발견된 것에 설정합니다," -#: svnadmin/main.c:252 +#: svnadmin/main.c:254 msgid "type of repository: 'bdb' or 'fsfs'" msgstr "저장소 타입: 'bdb' 또는 'fsfs'" -#: svnadmin/main.c:255 +#: svnadmin/main.c:257 msgid "load at specified directory in repository" msgstr "저장소의 지정된 디렉토리에 로드합니다" -#: svnadmin/main.c:258 +#: svnadmin/main.c:260 msgid "disable fsync at transaction commit [Berkeley DB]" msgstr "트랜잭션을 커밋에서 fsync를 비활성화합니다[Berkeley DB] " -#: svnadmin/main.c:261 +#: svnadmin/main.c:263 msgid "disable automatic log file removal [Berkeley DB]" msgstr "자동 로그 파일 삭제를 비활성화 합니다 [Berkeley DB]" -#: svnadmin/main.c:267 +#: svnadmin/main.c:269 msgid "remove redundant log files from source repository" msgstr "원본 저장소로 부터 중복된 로그 파일을 제거합니다" -#: svnadmin/main.c:270 +#: svnadmin/main.c:272 +msgid "call pre-commit hook before committing revisions" +msgstr "리비전을 새로이 커밋하기 전 post-commit 훅을 호출합니다." + +#: svnadmin/main.c:275 +msgid "call post-commit hook after committing revisions" +msgstr "리비전을 새로이 커밋한 뒤 post-commit 훅을 호출합니다." + +#: svnadmin/main.c:278 msgid "" "wait instead of exit if the repository is in\n" " use by another process" @@ -5581,7 +5670,7 @@ "만약 저장소가 다른 프로세스에 의해 사용되고 있다면\n" "빠져나가지 않고 기다립니다" -#: svnadmin/main.c:283 +#: svnadmin/main.c:291 msgid "" "usage: svnadmin create REPOS_PATH\n" "\n" @@ -5591,7 +5680,7 @@ "\n" "REPOS_PATH 에 새로운 빈 저장소를 생성합니다.\n" -#: svnadmin/main.c:289 +#: svnadmin/main.c:297 msgid "" "usage: svnadmin deltify [-r LOWER[:UPPER]] REPOS_PATH\n" "\n" @@ -5609,7 +5698,7 @@ "리비젼이 지정되지 않았다면,\n" "단순히 HEAD 리비젼에서 수행됩니다.\n" -#: svnadmin/main.c:298 +#: svnadmin/main.c:306 msgid "" "usage: svnadmin dump REPOS_PATH [-r LOWER[:UPPER]] [--incremental]\n" "\n" @@ -5628,7 +5717,7 @@ "--incremental 옵션을 사용한다면, 모든 내용이 아닌 \n" "이전 버젼과의 차이만 적재됩니다.\n" -#: svnadmin/main.c:309 +#: svnadmin/main.c:317 msgid "" "usage: svnadmin help [SUBCOMMAND...]\n" "\n" @@ -5638,7 +5727,7 @@ "\n" "이 프로그램이나 그것의 subcommand 의 사용법을 보여줍니다.\n" -#: svnadmin/main.c:314 +#: svnadmin/main.c:322 msgid "" "usage: svnadmin hotcopy REPOS_PATH NEW_REPOS_PATH\n" "\n" @@ -5648,7 +5737,7 @@ "\n" "저장소를 강제로 복제합니다.\n" -#: svnadmin/main.c:319 +#: svnadmin/main.c:327 msgid "" "usage: svnadmin list-dblogs REPOS_PATH\n" "\n" @@ -5664,7 +5753,7 @@ "경고: 아직 사용중인 로그 파일들을 수정하거나 삭제하는 것은\n" "저장소를 손상시키는 원인이 될 수 있습니다.\n" -#: svnadmin/main.c:326 +#: svnadmin/main.c:334 msgid "" "usage: svnadmin list-unused-dblogs REPOS_PATH\n" "\n" @@ -5676,7 +5765,7 @@ "사용하지 않는 버클리 디비 로그 파일의 리스트를 보여줍니다.\n" "\n" -#: svnadmin/main.c:331 +#: svnadmin/main.c:339 msgid "" "usage: svnadmin load REPOS_PATH\n" "\n" @@ -5692,7 +5781,7 @@ "비어있었다면, 기본적으로 그것의 UUID 가 스트림에 지정된\n" "한가지로 변경될것입니다. 진행 피드백은 stdout 으로 전송됩니다.\n" -#: svnadmin/main.c:341 +#: svnadmin/main.c:350 msgid "" "usage: svnadmin lstxns REPOS_PATH\n" "\n" @@ -5702,7 +5791,7 @@ "\n" "모든 커밋안된 트랜잭션의 이름을 출력해줍니다.\n" -#: svnadmin/main.c:346 +#: svnadmin/main.c:355 msgid "" "usage: svnadmin recover REPOS_PATH\n" "\n" @@ -5718,7 +5807,7 @@ "복구는 배타적 접근을 필요로하며 저장소가 다른 프로세스에 의해\n" "사용되고 있다면 종료됩니다.\n" -#: svnadmin/main.c:354 +#: svnadmin/main.c:363 msgid "" "usage: svnadmin rmtxns REPOS_PATH TXN_NAME...\n" "\n" @@ -5728,7 +5817,7 @@ "\n" "명명된 트랜잭션(들)을 삭제합니다.\n" -#: svnadmin/main.c:359 +#: svnadmin/main.c:368 msgid "" "usage: svnadmin setlog REPOS_PATH -r REVISION FILE\n" "\n" @@ -5754,7 +5843,7 @@ "주의: 리비젼 속성은 히스토리가 없으며, 이 명령은\n" "이전 로그 메시지에 영원히 덮어써집니다.\n" -#: svnadmin/main.c:373 +#: svnadmin/main.c:382 msgid "" "usage: svnadmin verify REPOS_PATH\n" "\n" @@ -5764,20 +5853,20 @@ "\n" "저장소에 저장된 데이타를 검증합니다.\n" -#: svnadmin/main.c:497 svnadmin/main.c:578 +#: svnadmin/main.c:508 svnadmin/main.c:589 msgid "First revision cannot be higher than second" msgstr "첫번 째 리비젼이 두번째 보다 더 높을 수 없습니다." -#: svnadmin/main.c:506 +#: svnadmin/main.c:517 #, c-format msgid "Deltifying revision %ld..." msgstr "리비젼 %ld 를 deltifying 합니다" -#: svnadmin/main.c:510 +#: svnadmin/main.c:521 msgid "done.\n" msgstr "처리되었습니다.\n" -#: svnadmin/main.c:609 +#: svnadmin/main.c:620 msgid "" "general usage: svnadmin SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n" "Type 'svnadmin help <subcommand>' for help on a specific subcommand.\n" @@ -5790,7 +5879,7 @@ "\n" "가능한 하위 명령 목록:\n" -#: svnadmin/main.c:689 +#: svnadmin/main.c:702 msgid "" "Repository lock acquired.\n" "Please wait; recovering the repository may take some time...\n" @@ -5798,7 +5887,7 @@ "저장소 잠금을 획득했습니다.\n" "기다려 주십시오; 저장소 복구는 시간이 소요될 수 있습니다...\n" -#: svnadmin/main.c:724 +#: svnadmin/main.c:737 msgid "" "Failed to get exclusive repository access; perhaps another process\n" "such as httpd, svnserve or svn has it open?" @@ -5806,13 +5895,13 @@ "배타적인 저장소 접근을 얻을 수 없습니다; 혹시 httpd, \n" "svnserve 나 svn 같은 다른 프로세스들에 의해 열려있습니까?" -#: svnadmin/main.c:729 +#: svnadmin/main.c:742 msgid "Waiting on repository lock; perhaps another process has it open?\n" msgstr "" "저장소 잠금을 기다리고 있습니다: 혹시 다른 프로세스에 의해 열려 있지 않습니" "까?\n" -#: svnadmin/main.c:736 +#: svnadmin/main.c:749 msgid "" "\n" "Recovery completed.\n" @@ -5820,33 +5909,33 @@ "\n" "복구가 완료되었습니다.\n" -#: svnadmin/main.c:743 +#: svnadmin/main.c:756 #, c-format msgid "The latest repos revision is %ld.\n" msgstr "가장 최근의 repos 리비젼은 %ld 입니다.\n" -#: svnadmin/main.c:851 +#: svnadmin/main.c:866 #, c-format msgid "Transaction '%s' removed.\n" msgstr "트랜잭션 '%s' 가 제거되었습니다.\n" -#: svnadmin/main.c:875 +#: svnadmin/main.c:890 msgid "Missing revision" msgstr "리비젼이 누락되었습니다" -#: svnadmin/main.c:878 +#: svnadmin/main.c:893 msgid "Only one revision allowed" msgstr "오직 하나의 리비젼만이 허용됩니다" -#: svnadmin/main.c:884 +#: svnadmin/main.c:899 msgid "Exactly one file argument required" msgstr "정확하게 하나의 파일 인자만 필요합니다" -#: svnadmin/main.c:1157 svndumpfilter/main.c:1166 svnlook/main.c:1993 +#: svnadmin/main.c:1178 svndumpfilter/main.c:1166 svnlook/main.c:1993 msgid "subcommand argument required\n" msgstr "subcommand 인자가 필요합니다\n" -#: svnadmin/main.c:1247 +#: svnadmin/main.c:1268 #, c-format msgid "" "subcommand '%s' doesn't accept option '%s'\n" @@ -5880,7 +5969,7 @@ #: svndumpfilter/main.c:637 msgid "Delta property block detected - not supported by svndumpfilter" -msgstr "" +msgstr "svndumpfilter는 지원하지 않는 변경사항 블럭이 발견되었습니다." #: svndumpfilter/main.c:763 msgid "Do not display filtering statistics." @@ -6244,10 +6333,12 @@ "-------- ----\n" #: svnlook/main.c:1464 +#, c-format msgid "Property '%s' not found on revision %ld" msgstr "속성 '%s'는 리비전 %ld에 없습니다." #: svnlook/main.c:1468 +#, c-format msgid "Property '%s' not found on path '%s' in revision %ld" msgstr "속성('%s')이 경로('%s')상에서 발견되지 않았습니다. (리비전 %ld)" @@ -6359,9 +6450,10 @@ #: svnserve/main.c:121 msgid "listen once (useful for debugging)" -msgstr "" +msgstr "1 회만 listen 합니다. (디버깅에 사용됩니다.)" #: svnserve/main.c:132 +#, c-format msgid "Type '%s --help' for usage.\n" msgstr "사용법은 보시려면, '%s --help' 을 이용하세요.\n" @@ -6371,6 +6463,9 @@ "\n" "Valid options:\n" msgstr "" +"Usage: svnserve [options]\n" +"\n" +"옵션 목록:\n" #: svnserve/main.c:334 msgid "" @@ -6382,24 +6477,34 @@ " auth-access = read|write|none (default write)\n" "Forcing all access to read-only for now\n" msgstr "" +"주의: -R 은 더 이상 사용하지 않습니다.\n" +"인증 받지 않은 접근은 이제 읽기 전용으로 취급됩니다.\n" +"변경하려면 저장소상의 conf/svnserve.conf를 고치십시오.:\n" +" [general]\n" +" anon-access = read|write|none (default read)\n" +" auth-access = read|write|none (default write)\n" +"이제부터는 모든 접근은 읽기 전용으로 되었습니다.\n" #: svnserve/main.c:356 msgid "Option --tunnel-user is only valid in tunnel mode.\n" -msgstr "" +msgstr "옵션 --tunnel-user는 터널 모드에서만 유효합니다.\n" #: svnserve/main.c:364 msgid "You must specify one of -d, -i, -t or -X.\n" -msgstr "" +msgstr "-d, -i, -t, -X 중 한가지만 지정하십시오.\n" #: svnserve/main.c:391 +#, c-format msgid "Can't create server socket: %s\n" msgstr "'%s'의 소켓을 생성 할 수 없습니다.\n" #: svnserve/main.c:405 +#, c-format msgid "Can't get address info: %s\n" msgstr "'%s'에 대한 정보를 찾을 수 없습니다.\n" #: svnserve/main.c:415 +#, c-format msgid "Can't bind server socket: %s\n" msgstr "'%s'에 서버를 바인드 할 수 없습니다.\n" @@ -6474,3 +6579,5 @@ msgid "'%s' not versioned, and not exported\n" msgstr "'%s' 는 관리대상이 아니며, 익스포트 되지 않았습니다\n" +# vim: tenc=euc-kr +# vim: enc=utf-8 Modified: branches/ruby/subversion/tests/clients/cmdline/trans_tests.py Url: http://svn.collab.net/viewcvs/svn/branches/ruby/subversion/tests/clients/cmdline/trans_tests.py?view=diff&rev=13061&p1=branches/ruby/subversion/tests/clients/cmdline/trans_tests.py&r1=13060&p2=branches/ruby/subversion/tests/clients/cmdline/trans_tests.py&r2=13061 ============================================================================== --- branches/ruby/subversion/tests/clients/cmdline/trans_tests.py (original) +++ branches/ruby/subversion/tests/clients/cmdline/trans_tests.py Sat Feb 19 03:19:08 2005 @@ -705,9 +705,15 @@ # set/del all svn:keywords svntest.actions.run_and_verify_svn(None, None, [], 'propset', 'svn:keywords', 'Rev', mu_path) + expected_status = svntest.actions.get_virginal_state(wc_dir, 1) + expected_status.tweak('A/mu', status=' M') + svntest.actions.run_and_verify_status(wc_dir, expected_status) # Revert the propset svntest.actions.run_and_verify_svn(None, None, [], 'revert', mu_path) + expected_status = svntest.actions.get_virginal_state(wc_dir, 1) + svntest.actions.run_and_verify_status(wc_dir, expected_status) + ######################################################################## # Run the tests |
|
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| Previous by Date: | svn commit: r13060 - trunk/subversion/po: 00194, nori-jqHnx1hy4Dsdnm+yROfE0A |
|---|---|
| Next by Date: | svn commit: r13062 - trunk/doc/translations/spanish/book: 00194, gradha-jqHnx1hy4Dsdnm+yROfE0A |
| Previous by Thread: | svn commit: r13060 - trunk/subversion/poi: 00194, nori-jqHnx1hy4Dsdnm+yROfE0A |
| Next by Thread: | svn commit: r13062 - trunk/doc/translations/spanish/book: 00194, gradha-jqHnx1hy4Dsdnm+yROfE0A |
| Indexes: | [Date] [Thread] [Top] [All Lists] |
| News | FAQ | advertise |