diff options
author | William Hua <william.hua@canonical.com> | 2014-04-09 07:40:17 +1200 |
---|---|---|
committer | William Hua <william.hua@canonical.com> | 2014-04-09 07:40:17 +1200 |
commit | 0e4cbba14d910e40cafb37199730f3387c9ce279 (patch) | |
tree | f7dd1872184e01aed644b4afebe367f31c98615e /po/ko.po | |
parent | 26afec3a316a0f7c2e62ae8d574a5d354ebcdde4 (diff) | |
parent | e8c1f8e82148dd928b37d9e5a0750b356fb0e156 (diff) | |
download | ayatana-indicator-keyboard-0e4cbba14d910e40cafb37199730f3387c9ce279.tar.gz ayatana-indicator-keyboard-0e4cbba14d910e40cafb37199730f3387c9ce279.tar.bz2 ayatana-indicator-keyboard-0e4cbba14d910e40cafb37199730f3387c9ce279.zip |
Merge trunk fixing conflicts.
Diffstat (limited to 'po/ko.po')
-rw-r--r-- | po/ko.po | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -7,29 +7,29 @@ msgid "" msgstr "" "Project-Id-Version: indicator-keyboard\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2014-03-27 08:18+0000\n" +"POT-Creation-Date: 2014-04-07 06:57+0000\n" "PO-Revision-Date: 2013-10-01 10:55+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: Korean <ko@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-28 06:45+0000\n" -"X-Generator: Launchpad (build 16967)\n" +"X-Launchpad-Export-Date: 2014-04-08 07:10+0000\n" +"X-Generator: Launchpad (build 16976)\n" -#: ../lib/main.vala:628 +#: ../lib/main.vala:676 #, c-format msgid "%s input source" msgstr "입력 소스 %s" -#: ../lib/main.vala:770 +#: ../lib/main.vala:824 msgid "Character Map" msgstr "문자 표" -#: ../lib/main.vala:771 +#: ../lib/main.vala:825 msgid "Keyboard Layout Chart" msgstr "키보드 배치 표" -#: ../lib/main.vala:772 +#: ../lib/main.vala:826 msgid "Text Entry Settings..." msgstr "텍스트 입력창 설정..." |