diff options
| author | Jinbuhm Kim <jinbuhm.kim@gmail.com> | 2014-11-14 14:46:15 +0300 |
|---|---|---|
| committer | Jinbuhm Kim <jinbuhm.kim@gmail.com> | 2014-11-14 14:46:15 +0300 |
| commit | bf37eedd4246396e9c2b38a23aa2fc83d309f2dd (patch) | |
| tree | 41234c65eec1510335ffde64abc59b64fe6c5c87 /resources | |
| parent | da6e116c3528d63f65a7656e55b09ac8b6f78c9e (diff) | |
| parent | 28b04d8867028cd2a590d8c69c01cc359da74e87 (diff) | |
Resolve the Conflict
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/locale/ko/LC_MESSAGES/Cura.mo | bin | 76251 -> 76251 bytes | |||
| -rw-r--r-- | resources/locale/ko/LC_MESSAGES/Cura.po | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/resources/locale/ko/LC_MESSAGES/Cura.mo b/resources/locale/ko/LC_MESSAGES/Cura.mo Binary files differindex 2934e04efc..2e102a49f0 100644 --- a/resources/locale/ko/LC_MESSAGES/Cura.mo +++ b/resources/locale/ko/LC_MESSAGES/Cura.mo diff --git a/resources/locale/ko/LC_MESSAGES/Cura.po b/resources/locale/ko/LC_MESSAGES/Cura.po index 46504a2210..3bb8b3c5c8 100644 --- a/resources/locale/ko/LC_MESSAGES/Cura.po +++ b/resources/locale/ko/LC_MESSAGES/Cura.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Cura Translation\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-10-22 10:17+0200\n" -"PO-Revision-Date: 2014-11-14 20:27+0900\n" +"PO-Revision-Date: 2014-11-14 20:43+0900\n" "Last-Translator: Jinbuhm Kim <Jinbuhm.Kim@gmail.com>\n" "Language-Team: Korean <Jinbuhm.Kim@gmail.com>\n" "MIME-Version: 1.0\n" |