SCM

SCM Repository

[ihelp] Diff of /src/msg/base/po/ko.po
ViewVC logotype

Diff of /src/msg/base/po/ko.po

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2710, Mon Apr 11 19:08:19 2016 UTC revision 2711, Mon Aug 8 05:32:03 2016 UTC
# Line 22  Line 22 
22  msgstr ""  msgstr ""
23  "Project-Id-Version: R-3.3.0\n"  "Project-Id-Version: R-3.3.0\n"
24  "Report-Msgid-Bugs-To: bugs.r-project.org\n"  "Report-Msgid-Bugs-To: bugs.r-project.org\n"
25    <<<<<<< .mine
26    "POT-Creation-Date: 2015-06-06 13:51+0100\n"
27    "PO-Revision-Date: 2016-08-08 14:30+0900\n"
28    ||||||| .r2649
29    "POT-Creation-Date: 2015-06-06 13:51+0100\n"
30    "PO-Revision-Date: 2015-12-10 03:14+0900\n"
31    =======
32  "POT-Creation-Date: 2016-04-01 10:28-0700\n"  "POT-Creation-Date: 2016-04-01 10:28-0700\n"
33  "PO-Revision-Date: 2016-04-11 13:08-0600\n"  "PO-Revision-Date: 2016-04-11 13:08-0600\n"
34    >>>>>>> .r2710
35  "Last-Translator: Chel Hee Lee <chl948@mail.usask.ca>\n"  "Last-Translator: Chel Hee Lee <chl948@mail.usask.ca>\n"
36  "Language-Team: Chel Hee Lee <chl948@mail.usask.ca>\n"  "Language-Team: Chel Hee Lee <chl948@mail.usask.ca>\n"
37  "Language: ko\n"  "Language: ko\n"
# Line 31  Line 39 
39  "Content-Type: text/plain; charset=UTF-8\n"  "Content-Type: text/plain; charset=UTF-8\n"
40  "Content-Transfer-Encoding: 8bit\n"  "Content-Transfer-Encoding: 8bit\n"
41  "Plural-Forms: nplurals=1; plural=0;\n"  "Plural-Forms: nplurals=1; plural=0;\n"
42    <<<<<<< .mine
43    "X-Generator: Poedit 1.8.8\n"
44    ||||||| .r2649
45    "X-Generator: Poedit 1.8.6\n"
46    =======
47    >>>>>>> .r2710
48    
49  #: src/appl/optim.c:60  #: src/appl/optim.c:60
50  msgid "non-finite value supplied by 'optim'"  msgid "non-finite value supplied by 'optim'"
# Line 1128  Line 1142 
1142  #: src/main/attrib.c:1040 src/main/coerce.c:2471  #: src/main/attrib.c:1040 src/main/coerce.c:2471
1143  #, c-format  #, c-format
1144  msgid "'%s' must be a list"  msgid "'%s' must be a list"
1145    <<<<<<< .mine
1146    msgstr "'%s' 리스트 이어야 합니다."
1147    ||||||| .r2649
1148    msgstr ""
1149    =======
1150  msgstr "'%s'는 반드시 리스트(list)이어야 합니다. "  msgstr "'%s'는 반드시 리스트(list)이어야 합니다. "
1151    >>>>>>> .r2710
1152    
1153  #: src/main/attrib.c:1043 src/main/attrib.c:1071  #: src/main/attrib.c:1043 src/main/attrib.c:1071
1154  #, c-format  #, c-format
# Line 1346  Line 1366 
1366    
1367  #: src/main/builtin.c:403  #: src/main/builtin.c:403
1368  msgid "can not set the parent environment of a namespace"  msgid "can not set the parent environment of a namespace"
1369  msgstr ""  msgstr "네임 스페이스의 부모 환경을 설정 할 수 없습니다."
1370    
1371  #: src/main/builtin.c:405  #: src/main/builtin.c:405
1372  msgid "can not set the parent environment of package imports"  msgid "can not set the parent environment of package imports"
1373  msgstr ""  msgstr "패키지 임포트의 부모 환경을 설정 ㅎ 수 없습니다."
1374    
1375  #: src/main/builtin.c:413  #: src/main/builtin.c:413
1376  msgid "'parent' is not an environment"  msgid "'parent' is not an environment"
1377  msgstr "'parent'는 인바이런먼트가 아닙니다"  msgstr "'parent'는 환경ㅇ 아닙니다"
1378    
1379  #: src/main/builtin.c:556 src/main/connections.c:3687  #: src/main/builtin.c:556 src/main/connections.c:3687
1380  #: src/main/connections.c:4079 src/main/connections.c:4113  #: src/main/connections.c:4079 src/main/connections.c:4113
# Line 1363  Line 1383 
1383  #: src/main/connections.c:5199 src/main/deparse.c:369 src/main/deparse.c:458  #: src/main/connections.c:5199 src/main/deparse.c:369 src/main/deparse.c:458
1384  #: src/main/serialize.c:2045  #: src/main/serialize.c:2045
1385  msgid "cannot write to this connection"  msgid "cannot write to this connection"
1386  msgstr "이 연결에 쓰기를 할 수 없습니다"  msgstr "이 연결에 쓸 수 없습니다"
1387    
1388  #: src/main/builtin.c:561 src/main/builtin.c:591  #: src/main/builtin.c:561 src/main/builtin.c:591
1389  #, c-format  #, c-format
# Line 1426  Line 1446 
1446  "EXPR는 정수로서 다루어지는 \"factor\"입니다.\n"  "EXPR는 정수로서 다루어지는 \"factor\"입니다.\n"
1447  " 대신 '%s'을 사용해보세요."  " 대신 '%s'을 사용해보세요."
1448    
1449    <<<<<<< .mine
1450    # 이게 왜 이런가 오류가 나는데 이유를 잘 모르겠네..
1451    #: src/main/character.c:104 src/main/character.c:146
1452    ||||||| .r2649
1453    #: src/main/character.c:104 src/main/character.c:146
1454    =======
1455  #: src/main/builtin.c:1095 src/main/eval.c:6069 src/main/eval.c:6098  #: src/main/builtin.c:1095 src/main/eval.c:6069 src/main/eval.c:6098
1456  msgid "'switch' with no alternatives"  msgid "'switch' with no alternatives"
1457  msgstr ""  msgstr ""
1458    
1459  #: src/main/character.c:103 src/main/character.c:224  #: src/main/character.c:103 src/main/character.c:224
1460    >>>>>>> .r2710
1461  #, c-format  #, c-format
1462  msgid "%d argument passed to '%s' which requires %d to %d"  msgid "%d argument passed to '%s' which requires %d to %d"
1463  msgid_plural "%d arguments passed to '%s' which requires %d to %d"  msgid_plural "%d arguments passed to '%s' which requires %d to %d"
1464  msgstr[0] ""  msgstr[0] "%d 인자가 %d가 %d 하는데 필요한 '%s'로 전달됩니다."
1465    
1466  #: src/main/character.c:110 src/main/character.c:113 src/main/character.c:232  #: src/main/character.c:110 src/main/character.c:113 src/main/character.c:232
1467  #: src/main/character.c:235  #: src/main/character.c:235
# Line 1548  Line 1575 
1575    
1576  #: src/main/coerce.c:79  #: src/main/coerce.c:79
1577  msgid "NAs introduced by coercion to integer range"  msgid "NAs introduced by coercion to integer range"
1578  msgstr ""  msgstr "강제형변환에 의해 NA가 정수 범위로 생성됩니다."
1579    
1580  #: src/main/coerce.c:81 src/main/errors.c:1196  #: src/main/coerce.c:81 src/main/errors.c:1196
1581  msgid "imaginary parts discarded in coercion"  msgid "imaginary parts discarded in coercion"

Legend:
Removed from v.2710  
changed lines
  Added in v.2711

R-Forge@R-project.org
ViewVC Help
Powered by ViewVC 1.0.0  
Thanks to:
Vienna University of Economics and Business University of Wisconsin - Madison Powered By FusionForge