null+****@clear*****
null+****@clear*****
2012年 6月 28日 (木) 11:47:10 JST
HAYASHI Kentaro 2012-06-28 11:47:10 +0900 (Thu, 28 Jun 2012) New Revision: eed349d3de1c36dcdab8ed0ea4cd11768c2b6241 https://github.com/groonga/groonga/commit/eed349d3de1c36dcdab8ed0ea4cd11768c2b6241 Log: doc: update po Modified files: doc/locale/en/LC_MESSAGES/commands.po doc/locale/en/LC_MESSAGES/executables.po doc/locale/en/LC_MESSAGES/tutorial.po Modified: doc/locale/en/LC_MESSAGES/commands.po (+15 -15) =================================================================== --- doc/locale/en/LC_MESSAGES/commands.po 2012-06-28 11:44:23 +0900 (2a8a97d) +++ doc/locale/en/LC_MESSAGES/commands.po 2012-06-28 11:47:10 +0900 (3a6f44f) @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 2.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-22 10:48\n" +"POT-Creation-Date: 2012-06-28 11:41\n" "PO-Revision-Date: 2012-04-28 11:36+0900\n" "Last-Translator: Kouhei Sutou <kou****@clear*****>\n" "Language-Team: English\n" @@ -70,7 +70,7 @@ msgstr "cache_limit" #: ../../../source/commands/log_put.txt:9 #: ../../../source/commands/log_reopen.txt:9 #: ../../../source/commands/quit.txt:9 ../../../source/commands/shutdown.txt:9 -#: ../../../source/commands/status.txt:9 +#: ../../../source/commands/status.txt:11 #: ../../../source/commands/table_create.txt:9 #: ../../../source/commands/table_list.txt:9 #: ../../../source/commands/table_remove.txt:9 @@ -119,7 +119,7 @@ msgstr "cache_limit - cacheサイズの設定・取得" #: ../../../source/commands/log_reopen.txt:14 #: ../../../source/commands/quit.txt:14 #: ../../../source/commands/shutdown.txt:14 -#: ../../../source/commands/status.txt:14 +#: ../../../source/commands/status.txt:16 #: ../../../source/commands/table_create.txt:14 #: ../../../source/commands/table_list.txt:14 #: ../../../source/commands/table_remove.txt:14 @@ -163,7 +163,7 @@ msgstr "書式" #: ../../../source/commands/log_reopen.txt:20 #: ../../../source/commands/quit.txt:20 #: ../../../source/commands/shutdown.txt:20 -#: ../../../source/commands/status.txt:20 +#: ../../../source/commands/status.txt:22 #: ../../../source/commands/table_create.txt:20 #: ../../../source/commands/table_list.txt:20 #: ../../../source/commands/table_remove.txt:20 @@ -224,7 +224,7 @@ msgstr "" #: ../../../source/commands/log_reopen.txt:29 #: ../../../source/commands/quit.txt:27 #: ../../../source/commands/shutdown.txt:27 -#: ../../../source/commands/status.txt:27 +#: ../../../source/commands/status.txt:29 #: ../../../source/commands/table_create.txt:29 #: ../../../source/commands/table_list.txt:27 #: ../../../source/commands/table_remove.txt:27 @@ -280,7 +280,7 @@ msgstr "" #: ../../../source/commands/quit.txt:32 #: ../../../source/commands/select.txt:728 #: ../../../source/commands/shutdown.txt:32 -#: ../../../source/commands/status.txt:32 +#: ../../../source/commands/status.txt:34 #: ../../../source/commands/table_create.txt:92 #: ../../../source/commands/table_list.txt:32 #: ../../../source/commands/table_remove.txt:33 @@ -329,9 +329,8 @@ msgstr "json" #: ../../../source/commands/log_reopen.txt:48 #: ../../../source/commands/quit.txt:37 #: ../../../source/commands/shutdown.txt:37 -#: ../../../source/commands/status.txt:54 +#: ../../../source/commands/status.txt:56 #: ../../../source/commands/table_create.txt:106 -#: ../../../source/commands/table_list.txt:80 #: ../../../source/commands/table_remove.txt:47 #: ../../../source/commands/view_add.txt:52 msgid "例" @@ -408,7 +407,7 @@ msgstr "状態を表示するオブジェクトの名前を指定します。" #: ../../../source/commands/log_level.txt:46 #: ../../../source/commands/log_put.txt:50 #: ../../../source/commands/log_reopen.txt:37 -#: ../../../source/commands/status.txt:35 +#: ../../../source/commands/status.txt:37 #: ../../../source/commands/table_create.txt:95 #: ../../../source/commands/table_list.txt:35 #: ../../../source/commands/table_remove.txt:36 @@ -853,7 +852,6 @@ msgstr "" # 33783e74f70143dc98f3351c4565d1f3 # 649b8244b0944a0fa8bf129046e5245b #: ../../../source/commands/column_list.txt:111 -#: ../../../source/commands/table_list.txt:104 msgid "注: 実際は改行が入りません。" msgstr "注: 実際は改行が入りません。" @@ -1627,7 +1625,7 @@ msgstr "現在、デフォルトのログ関数を用いている場合のみに #: ../../../source/commands/quit.txt:29 ../../../source/commands/quit.txt:34 #: ../../../source/commands/shutdown.txt:29 #: ../../../source/commands/shutdown.txt:34 -#: ../../../source/commands/status.txt:29 +#: ../../../source/commands/status.txt:31 #: ../../../source/commands/table_list.txt:29 msgid "ありません。" msgstr "ありません。" @@ -3002,17 +3000,17 @@ msgid "shutdownは、接続しているgroongaサーバプロセスを停止し msgstr "shutdownは、接続しているgroongaサーバプロセスを停止します。" # 97b0288aef734c82b5fd040963125552 -#: ../../../source/commands/status.txt:6 +#: ../../../source/commands/status.txt:8 msgid "status" msgstr "status" # 1defe3e2e16f452cab0ba222ce3d5481 -#: ../../../source/commands/status.txt:11 +#: ../../../source/commands/status.txt:13 msgid "status - groongaプロセスの状態表示" msgstr "status - groongaプロセスの状態表示" # 66b72147c636423a8a298e989ae8fba7 -#: ../../../source/commands/status.txt:22 +#: ../../../source/commands/status.txt:24 msgid "" "groonga組込コマンドの一つであるstatusについて説明します。組込コマンドは、" "groonga実行ファイルの引数、標準入力、またはソケット経由でgroongaサーバにリク" @@ -3023,7 +3021,7 @@ msgstr "" "エストを送信することによって実行します。" # 1c35e7a414cc41ba9a78d43783002814 -#: ../../../source/commands/status.txt:24 +#: ../../../source/commands/status.txt:26 msgid "" "statusコマンドは、groongaプロセスの状態を表示します。主にgroongaサーバプロセ" "スに対して使用することを想定しています。" @@ -3865,6 +3863,7 @@ msgstr "view_add Ventry Entry [true]" #: ../../../source/example/commands/select/sortby_simple.log:1 #: ../../../source/example/commands/select/table_nonexistent.log:1 #: ../../../source/example/commands/select/usage_setup.log:1 +#: ../../../source/example/commands/status.log:1 #: ../../../source/example/commands/suggest-completion.log:1 #: ../../../source/example/commands/suggest-correction.log:1 #: ../../../source/example/commands/suggest-learn-completion.log:1 @@ -3872,5 +3871,6 @@ msgstr "view_add Ventry Entry [true]" #: ../../../source/example/commands/suggest-learn-suggestion.log:1 #: ../../../source/example/commands/suggest-mixed.log:1 #: ../../../source/example/commands/suggest-suggestion.log:1 +#: ../../../source/example/commands/table_list.log:1 msgid "Execution example::" msgstr "Execution example::" Modified: doc/locale/en/LC_MESSAGES/executables.po (+89 -41) =================================================================== --- doc/locale/en/LC_MESSAGES/executables.po 2012-06-28 11:44:23 +0900 (89ef7c6) +++ doc/locale/en/LC_MESSAGES/executables.po 2012-06-28 11:47:10 +0900 (d275332) @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 2.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-22 19:03\n" +"POT-Creation-Date: 2012-06-28 11:41\n" "PO-Revision-Date: 2012-04-28 11:37+0900\n" "Last-Translator: Kouhei Sutou <kou****@clear*****>\n" "Language-Team: English\n" @@ -17,6 +17,11 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +# 7144dae3b81a4bf5b05d8cc73a19ac4d +#: ../../../source/example/executables/groonga-httpd.log:1 +msgid "Execution example::" +msgstr "" + # fa7d4cf75dab4d01ab03efb916793987 #: ../../../source/executables.txt:6 msgid "実行ファイル" @@ -697,8 +702,8 @@ msgstr "" # 19066ee58ea449e68b2bb1ab96c58ab8 #: ../../../source/executables/groonga-http.txt:8 #: ../../../source/executables/groonga-http.txt:13 -msgid "groonga HTTPサービス" -msgstr "groonga HTTPサービス" +msgid "groonga HTTPサーバー" +msgstr "groonga HTTPサーバー" # 0b32cbe867d64673acfbac9c2a5affba #: ../../../source/executables/groonga-http.txt:24 @@ -835,114 +840,143 @@ msgstr "" # f5c76b95ff394b42a3e158d955462b82 #: ../../../source/executables/groonga-httpd.txt:11 msgid "" -"groonga-httpd is an HTTP groonga server. It functions as same as :ref:" -"`groonga-http-service`. The difference is that groonga-httpd processes HTTP " -"requests by embedded nginx. On the other hand, groonga-http does by a " -"minimal built-in HTTP server. All standards-compilicance and features " -"provided by nginx is also available in groonga-httpd. For details about " -"nginx, see http://www.nginx.org/" +"groonga-httpd is a program to communicate with a groonga server using the " +"HTTP protocol. It functions as same as :ref:`groonga-server-http`. Although :" +"ref:`groonga-server-http` has limited support for HTTP with a minimal built-" +"in HTTP server, :ref:`groonga-httpd` has full support for HTTP with an " +"embedded nginx. All standards-compliance and features provided by nginx is " +"also available in groonga-httpd. For details about nginx, see http://www." +"nginx.org/" msgstr "" # b085557ae05d4732a44e248731a805df -#: ../../../source/executables/groonga-httpd.txt:17 +#: ../../../source/executables/groonga-httpd.txt:18 msgid "" -"groonga-httpd has an Web-based adiministration tool implemented with HTML " -"and JavaScript. You can access to it via http://hostname:port/." +"groonga-httpd has an Web-based administration tool implemented with HTML and " +"JavaScript. You can access to it from http://hostname:port/." msgstr "" # 87e405213c4b464f92bc435ca609e48f -#: ../../../source/executables/groonga-httpd.txt:20 +#: ../../../source/executables/groonga-httpd.txt:22 msgid "Synopsis" msgstr "" # 2af4c2b0040d471c8225ea05ee55d931 -#: ../../../source/executables/groonga-httpd.txt:27 +#: ../../../source/executables/groonga-httpd.txt:29 msgid "Usage" msgstr "" +# aeb001830ccb4f408bc06f2387447296 +#: ../../../source/executables/groonga-httpd.txt:32 +msgid "Set up" +msgstr "" + # 5836c1cb5d174961afff30dd59702c75 -#: ../../../source/executables/groonga-httpd.txt:29 +#: ../../../source/executables/groonga-httpd.txt:34 msgid "" -"First, you'll need to edit the configuration file for groonga-httpd to " -"specify database. Edit /etc/groonga/httpd/groonga-httpd.conf to enable " +"First, you'll need to edit the groonga-httpd configuration file to specify a " +"database. Edit /etc/groonga/httpd/groonga-httpd.conf to enable the " "groonga_database directive like this::" msgstr "" # 543d77f20d864bd08c5ef8eae396fc8d -#: ../../../source/executables/groonga-httpd.txt:39 +#: ../../../source/executables/groonga-httpd.txt:44 msgid "" "Then, run groonga-httpd. Note that the control immediately returns back to " "the console because groonga-httpd runs as a daemon process by default.::" msgstr "" -# 2a85473cd1de4f34975f4992c35b96c1 -#: ../../../source/executables/groonga-httpd.txt:44 -msgid "To check, request a simple query.::" +# 58fa0beee0ad40939b3c5c622360e104 +#: ../../../source/executables/groonga-httpd.txt:50 +msgid "Request queries" +msgstr "" + +# 1aeae1042a9e42f9aba4c0db9d44b28c +#: ../../../source/executables/groonga-httpd.txt:52 +msgid "To check, request a simple query (:ref:`command-status`)." +msgstr "" + +# 8b1c16ecf197417bb0ab5d326bdd24f4 +#: ../../../source/executables/groonga-httpd.txt:60 +msgid "Browse the administration tool" msgstr "" # 0e4d0ad628da48ce8745e5a0c513f00a -#: ../../../source/executables/groonga-httpd.txt:67 +#: ../../../source/executables/groonga-httpd.txt:62 msgid "" -"Also, you can browse Web-based adiministration tool at http://" +"Also, you can browse Web-based administration tool at http://" "localhost:10041/." msgstr "" +# 16930a665ff7421888d654594f82a1d4 +#: ../../../source/executables/groonga-httpd.txt:65 +msgid "Shut down" +msgstr "" + # 2da098e2c07a4e0092fc103af36568af -#: ../../../source/executables/groonga-httpd.txt:69 +#: ../../../source/executables/groonga-httpd.txt:67 msgid "Finally, to terminate the running groonga-httpd daemon, run this::" msgstr "" # 2bd510014cc74c24968f5b9012302b29 -#: ../../../source/executables/groonga-httpd.txt:74 +#: ../../../source/executables/groonga-httpd.txt:72 msgid "Configuration directives" msgstr "" +# e6f40f4eb6ab42ae8006bcf0c556b9f9 +#: ../../../source/executables/groonga-httpd.txt:74 +msgid "" +"There are two kinds of configuration directives. One is provided by nginx, " +"the other is by groonga-httpd." +msgstr "" + # f98d2b2ca9f449cc8381692916847998 -#: ../../../source/executables/groonga-httpd.txt:76 +#: ../../../source/executables/groonga-httpd.txt:77 msgid "" -"The following directives can be used in the configuration file of groonga-" -"httpd. By default, it's located at /etc/groonga/httpd/groonga-httpd.conf." +"The following directives can be used in the groonga-httpd configuration " +"file. By default, it's located at /etc/groonga/httpd/groonga-httpd.conf." msgstr "" # 4e64011d8ee8469287405ee6bed0491d -#: ../../../source/executables/groonga-httpd.txt:80 +#: ../../../source/executables/groonga-httpd.txt:81 msgid "Groonga-specific directives" msgstr "" # 324d7aaf03ff492790410b73e4d51bac -#: ../../../source/executables/groonga-httpd.txt:82 +#: ../../../source/executables/groonga-httpd.txt:83 msgid "" "The following directives aren't provided by nginx. They are provided by " -"groonga-httpd to configure groonga-httpd-specific directives." +"groonga-httpd to configure groonga-httpd-specific configurations." msgstr "" # 2e00f8536608498ebcfb5af2cc2435d5 -#: ../../../source/executables/groonga-httpd.txt:86 +#: ../../../source/executables/groonga-httpd.txt:87 msgid "``groonga_database``" msgstr "" # 3e34279c096c4eac8d7665ea8283885b -#: ../../../source/executables/groonga-httpd.txt:88 +#: ../../../source/executables/groonga-httpd.txt:89 msgid "Specifies the path to a groonga database." msgstr "" # d44422ef36864f79b71f30ec0a495549 -#: ../../../source/executables/groonga-httpd.txt:91 +#: ../../../source/executables/groonga-httpd.txt:92 msgid "Performance-related directives" msgstr "" # 90ede796e1d64ae79b1974767947e998 -#: ../../../source/executables/groonga-httpd.txt:93 -msgid "The following directives are related to performance." +#: ../../../source/executables/groonga-httpd.txt:94 +msgid "" +"The following directives are related to the performance of groonga-httpd." msgstr "" # 37fb65cfc27f46ac9f4ef0f5e8d71690 -#: ../../../source/executables/groonga-httpd.txt:96 -msgid "``worker_processess``" +#: ../../../source/executables/groonga-httpd.txt:97 +msgid "``worker_processes``" msgstr "" # 8a4d9b2801af4557b1adb89113d700e4 -#: ../../../source/executables/groonga-httpd.txt:98 +#: ../../../source/executables/groonga-httpd.txt:99 msgid "" "For optimum performance, set this to be equal to the number of CPUs or " "cores. In many cases, groonga queries may be CPU-intensive work, so to fully " @@ -950,17 +984,31 @@ msgid "" msgstr "" # 0cd3ccc9a09a44b4a8d07680e1d4a061 -#: ../../../source/executables/groonga-httpd.txt:102 +#: ../../../source/executables/groonga-httpd.txt:103 msgid "" "This isn't a groonga-httpd specific directive, but an nginx's one. For " "details, see http://wiki.nginx.org/CoreModule#worker_processes." msgstr "" # c24225099c4a4211acc82e9b94776374 -#: ../../../source/executables/groonga-httpd.txt:105 +#: ../../../source/executables/groonga-httpd.txt:106 msgid "By default, this is set to 1. It is nginx's default." msgstr "" +# 65b540435df44be98f909472f38199e2 +#: ../../../source/executables/groonga-httpd.txt:109 +msgid "Available nginx modules" +msgstr "" + +# 6db5c5ce1d314da1bd585393b6747f52 +#: ../../../source/executables/groonga-httpd.txt:111 +msgid "" +"All standard HTTP modules except HttpRewriteModule is available. " +"HttpRewriteModule is disabled to avoid to depend on PCRE (Perl Compatible " +"Regular Expressions). For the list of other standard HTTP modules, see " +"http://wiki.nginx.org/Modules." +msgstr "" + # be204128f4414d8b936c3d8b807f5bc0 #: ../../../source/executables/groonga-suggest-create-dataset.txt:6 msgid "groonga-suggest-create-dataset" Modified: doc/locale/en/LC_MESSAGES/tutorial.po (+7 -7) =================================================================== --- doc/locale/en/LC_MESSAGES/tutorial.po 2012-06-28 11:44:23 +0900 (e56f1b9) +++ doc/locale/en/LC_MESSAGES/tutorial.po 2012-06-28 11:47:10 +0900 (60a1150) @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 2.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-26 14:33\n" +"POT-Creation-Date: 2012-06-28 11:41\n" "PO-Revision-Date: 2012-04-28 11:38+0900\n" "Last-Translator: Kouhei Sutou <kou****@clear*****>\n" "Language-Team: English\n" @@ -1858,16 +1858,16 @@ msgstr "" "Usersテーブルのlocationカラムと、Commentsテーブルのlocationカラムは、GeoPoint" "型です。この型での値の指定は、\"[緯度]x[経度]\"と記述して指定します。" -# a1486122abcb45c08c9f34aeffa67fa5 +# ab3e1aac2df4481c9923ab2baac8390c #: ../../../source/tutorial/micro_blog.txt:242 msgid "" "Commentsテーブルのlast_modifiedカラムは、Time型です。この型での値を指定する方" "法は2つあります。 1つ目の方法は、1970年1月1日0時0分0秒からの経過秒数の値を直" -"接指定する方法です。小数部分を指定することで秒よりも細かい値の指定が可能で" -"す。指定した秒数はデータのロードの際にマイクロ秒数に変換後、格納されます。 2" -"つ目の方法は、文字列で日時と時刻を指定する方法です。\"年/月/日 時:分:秒\"とい" -"うフォーマットで記述することで、データロードの際に文字列からキャストされ、マ" -"イクロ秒数の値が格納されます。" +"接指定する方法です。このとき、小数部分を指定することでマイクロ秒数での指定が" +"可能です。指定した値は、データのロードの際にマイクロ秒を単位とする整数値に変" +"換後、格納されます。 2つ目の方法は、文字列で日時と時刻を指定する方法で" +"す。\"年/月/日 時:分:秒\"というフォーマットで記述することで、データロードの際" +"に文字列からキャストされ、マイクロ秒数の値が格納されます。" msgstr "" # 2e98f1fd30a8423fa68abcfb68bee579 -------------- next part -------------- HTML$B$NE:IU%U%!%$%k$rJ]4I$7$^$7$?(B...다운로드
