[Xfce4-commits] <xfce4-wavelan-plugin:master> oops, fix conflict

[Landry Breuil]

Updating branch refs/heads/master
         to 99df4adb72c20c38b02c5799a99353cdf07cb2e1 (commit)
       from 134d2477499160034c781571ff86cd2f26333b3e (commit)

commit 99df4adb72c20c38b02c5799a99353cdf07cb2e1
Merge: 134d247 7d6d50d
Author: Landry Breuil <landry at xfce.org>
Date:   Mon Apr 9 19:04:46 2012 +0200

    oops, fix conflict

commit 7d6d50d5d90f288f295c0e0e3d2fef09149a18aa
Author: Seong-ho Cho <darkcircle.0426 at gmail.com>
Date:   Thu Apr 5 10:39:41 2012 +0200

    l10n: Updated Korean (ko) translation to 100%
    
    New status: 11 messages complete with 0 fuzzies and 0 untranslated.
    
    Transmitted-via: Transifex (translations.xfce.org).

 po/ko.po |   19 +++++++------------
 1 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/po/ko.po b/po/ko.po
index 40deffa..601e494 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -8,12 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-wavelan-plugin.master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-09 18:46+0200\n"
+"Report-Msgid-Bugs-To: xfce-i18n <xfce-i18n at xfce.org>\n"
+"POT-Creation-Date: 2012-02-25 13:33+0000\n"
 "PO-Revision-Date: 2012-02-26 00:55+0900\n"
-"Last-Translator: Sung Jin Gang <ujuc at ujuc.kr>\n"
-"Language-Team: xfce4-users-kr-i18n <xfce4-users-kr-i18n at lists.sourceforge."
-"net>\n"
+"Last-Translator: Seong-ho Cho <darkcircle.0426 at gmail.com>\n"
+"Language-Team: xfce-i18n <xfce-i18n at xfce.org>\n"
 "Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -48,13 +47,9 @@ msgstr "연결이 없으면 자동으로 숨기기(_A)"
 msgid "Autohide when no hardware present"
 msgstr "장치가 없으면 자동으로 숨기기"
 
-#: ../panel-plugin/wavelan.c:570
-msgid ""
-"Note: This will make it difficult to remove or configure the plugin if there "
-"is no device detected."
-msgstr ""
-"참고: 장치가 감지되지 않은 경우에는 플러그인을 없애거나 설정하기 어렵게 되는 "
-"경우가 있습니다."
+#: ../panel-plugin/wavelan.c:565
+msgid "Note: This will make it difficult to remove or configure the plugin if there is no device detected."
+msgstr "참고: 장치를 감지하지 못한 경우에는 플러그인 제거나 설정이 어려워질 수 있습니다."
 
 #: ../panel-plugin/wavelan.c:578
 msgid "Enable signal quality colors"