Skip to content

Commit 075923f

Browse files
committed
Merge remote-tracking branch 'weblate/master'
2 parents 57cc8df + be7f2f1 commit 075923f

3 files changed

Lines changed: 35 additions & 19 deletions

File tree

SOURCE_DOCS/locale/en_US/LC_MESSAGES/contour_and_profile.po

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ msgstr ""
66
"POT-Creation-Date: 2021-02-23 11:56-0500\n"
77
"PO-Revision-Date: 2021-02-20 08:50+0000\n"
88
"Last-Translator: Yukun Zhou <zyk79109@gmail.com>\n"
9+
"Language-Team: English (United States) <https://hosted.weblate.org/projects/"
10+
"gmt-tutorials/contour-and-profile/en_US/>\n"
911
"Language: en_US\n"
1012
"Language-Team: English (United States) "
1113
"<https://hosted.weblate.org/projects/gmt-tutorials/contour-and-"
@@ -78,7 +80,7 @@ msgstr ""
7880

7981
#: ../../SOURCE_DOCS/contour_and_profile.rst:38
8082
msgid "``grdimage`` - 繪製暈渲圖"
81-
msgstr "'grdimage' - draw rendering"
83+
msgstr "``grdimage`` - draw hillshade"
8284

8385
#: ../../SOURCE_DOCS/contour_and_profile.rst:39
8486
msgid "``pscoast`` - 繪製海岸線與海域填色"
@@ -98,7 +100,7 @@ msgstr ""
98100

99101
#: ../../SOURCE_DOCS/contour_and_profile.rst:43
100102
msgid "``pstext`` - 在地圖上加入文字"
101-
msgstr "pstext - add text on the map"
103+
msgstr "``pstext`` - add text on the map"
102104

103105
#: ../../SOURCE_DOCS/contour_and_profile.rst:44
104106
msgid "``psbasemap`` - 設定繪圖區、座標軸與邊框"

SOURCE_DOCS/locale/en_US/LC_MESSAGES/layout_design.po

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,17 @@ msgid ""
44
msgstr ""
55
"Project-Id-Version: GMT 教學手冊 1.2\n"
66
"Report-Msgid-Bugs-To: \n"
7-
"POT-Creation-Date: 2021-02-23 11:56-0500\n"
8-
"PO-Revision-Date: 2020-06-25 12:28-0400\n"
9-
"Last-Translator: Whyjay Zheng <jhsttshj@gmail.com>\n"
7+
"POT-Creation-Date: 2021-02-08 21:58-0500\n"
8+
"PO-Revision-Date: 2021-02-23 17:01+0000\n"
9+
"Last-Translator: Whyjay Zheng <wz278@cornell.edu>\n"
10+
"Language-Team: English (United States) <https://hosted.weblate.org/projects/"
11+
"gmt-tutorials/layout-design/en_US/>\n"
1012
"Language: en_US\n"
11-
"Language-Team: English (United States)\n"
12-
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
1313
"MIME-Version: 1.0\n"
1414
"Content-Type: text/plain; charset=utf-8\n"
1515
"Content-Transfer-Encoding: 8bit\n"
16+
"Plural-Forms: nplurals=2; plural=n != 1;\n"
17+
"X-Generator: Weblate 4.5\n"
1618
"Generated-By: Babel 2.9.0\n"
1719

1820
#: ../../SOURCE_DOCS/layout_design.rst:3
@@ -225,9 +227,9 @@ msgid ""
225227
"為了方便使用這些資料,我們可以建立一個純文字文件 ``coord.txt``,再把兩地的座標資訊複製到文件中存檔,如此一來供 GMT "
226228
"使用的資料表就建立完成。以下是使用十進位制座標的 ``coord.txt`` 內容:"
227229
msgstr ""
228-
"We can create a text file ``coord.txt`` and save the coordinate "
229-
"information to the file to easily access them later with GMT. Here's the "
230-
"content of ``coord.txt`` with the decimal formatted coordinates."
230+
"We can create a text file ``coord.txt`` and save the coordinate information "
231+
"to the file to easily access them later with GMT. Here's the content of "
232+
"``coord.txt`` with the decimal formatted coordinates:"
231233

232234
#: ../../SOURCE_DOCS/layout_design.rst:66
233235
#, fuzzy
@@ -242,16 +244,16 @@ msgid ""
242244
"」一章中所使用的 xy 順序相反,不過只要適當的指定欄位意義,GMT 仍然可以讀取。另外,兩個欄位中間使用了「逗號」分隔,在 GMT "
243245
"中也是可以接受的。"
244246
msgstr ""
245-
"Let me emphasize that the first column is latitude (y) and the second "
246-
"column is longitude (x). This is opposite to the x-y order we used in the"
247-
" chapter :doc:`scatter_plot`. However, you'll see there is a way to "
248-
"specify the meaning of each column so that GMT can still recognize them "
249-
"correctly. In addition, we use commas to separate the columns here, which"
250-
" is acceptable for GMT too. "
247+
"Let me emphasize that the first column is latitude (y) and the second column "
248+
"is longitude (x). This is opposite to the x-y order we used in the chapter "
249+
":doc:`scatter_plot`. However, you'll see there is a way to specify the "
250+
"meaning of each column so that GMT can still recognize them correctly. In "
251+
"addition, we use commas to separate the columns here, which is acceptable "
252+
"for GMT too."
251253

252254
#: ../../SOURCE_DOCS/layout_design.rst:73
253255
msgid "以下是使用度分秒制座標的 ``coord.txt`` 內容:"
254-
msgstr "Here's the content of ``coord.txt`` with the d/m/s coordinates."
256+
msgstr "Here's the content of ``coord.txt`` with the d/m/s coordinates:"
255257

256258
#: ../../SOURCE_DOCS/layout_design.rst:75
257259
msgid ""
@@ -264,16 +266,27 @@ msgid ""
264266
"注意我把所有的度分秒符號都統一成「冒號」,而且座標字串中間的空白都被移除了。這種格式是 GMT 接受的標準地理座標 (度分秒) "
265267
"格式,如果你有一串地理座標資料是以度分秒格式儲存,記得在輸入 GMT 之前,把所有的度分秒符號都改為冒號,如上所示。"
266268
msgstr ""
269+
"Note that I have changed all the degree, minute, and second symbols to "
270+
"colons and removed the space between the numbers. This is one of the "
271+
"standard longitude and latitude formats for GMT. If your geographical "
272+
"coordinates adopt this format, remember to check whether all the special "
273+
"symbols have been converted into colons before feeding it to GMT, as this "
274+
"example shows."
267275

268276
#: ../../SOURCE_DOCS/layout_design.rst:82
269277
msgid ""
270278
"你也可以從這裡下載資料檔:\\ :download:`coord.txt "
271279
"<layout_design/coord.txt>`\\,這個版本使用度分秒制座標。"
272280
msgstr ""
281+
"You can also download the data from here: :download:`coord.txt <"
282+
"layout_design/coord.txt>`. This file uses degrees, minutes, and seconds "
283+
"coordinates."
273284

274285
#: ../../SOURCE_DOCS/layout_design.rst:86
275286
msgid "簡單小結 GMT 對於文字輸入檔與地理座標格式的要求:"
276287
msgstr ""
288+
"To summarize the requirements of data files and longitude and latitude "
289+
"format for GMT:"
277290

278291
#: ../../SOURCE_DOCS/layout_design.rst:88
279292
msgid ""
@@ -1136,4 +1149,3 @@ msgstr "`Public domain country maps <http://ian.macky.net/pat/map/gq/gq.html>`_.
11361149
#~ "gmt end\n"
11371150
#~ "\n"
11381151
#~ "# rm -rf gmt.conf # Remove the old GMT parameter file"
1139-

SOURCE_DOCS/locale/en_US/LC_MESSAGES/map_elements.po

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ msgstr ""
66
"POT-Creation-Date: 2021-02-23 11:56-0500\n"
77
"PO-Revision-Date: 2021-02-20 08:50+0000\n"
88
"Last-Translator: Yukun Zhou <zyk79109@gmail.com>\n"
9+
"Language-Team: English (United States) <https://hosted.weblate.org/projects/"
10+
"gmt-tutorials/map-elements/en_US/>\n"
911
"Language: en_US\n"
1012
"Language-Team: English (United States) "
1113
"<https://hosted.weblate.org/projects/gmt-tutorials/map-elements/en_US/>\n"
@@ -81,7 +83,7 @@ msgstr ""
8183

8284
#: ../../SOURCE_DOCS/map_elements.rst:36
8385
msgid "``pstext`` - 在地圖上加入文字"
84-
msgstr "pstext - add text on the map"
86+
msgstr "``pstext`` - add text on the map"
8587

8688
#: ../../SOURCE_DOCS/map_elements.rst:37
8789
msgid "``psxy`` - 輸出檔尾"

0 commit comments

Comments
 (0)