summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonsta <[email protected]>2015-07-09 14:47:57 +0300
committerMonsta <[email protected]>2015-07-09 14:47:57 +0300
commit1ebc0ca2b3699a1be74843277e685363a920b05b (patch)
tree229d63865bd54b235e6621ea59403c1e65f694c5
parent180d05e38941913cce75c66c8a2619e99367e11b (diff)
downloadmate-applets-1ebc0ca2b3699a1be74843277e685363a920b05b.tar.bz2
mate-applets-1ebc0ca2b3699a1be74843277e685363a920b05b.tar.xz
fixed remaining merge conflicts in help translations
-rw-r--r--charpick/help/ko/ko.po2
-rw-r--r--invest-applet/docs/es/es.po4
2 files changed, 3 insertions, 3 deletions
diff --git a/charpick/help/ko/ko.po b/charpick/help/ko/ko.po
index a44f9336..f7e6fc62 100644
--- a/charpick/help/ko/ko.po
+++ b/charpick/help/ko/ko.po
@@ -270,7 +270,7 @@ msgstr "문자 팔레트를 패널에 추가하려면"
#: ../C/char-palette.xml:210(para)
msgid "To add <application>Character Palette</application> to a panel, right-click on the panel, then choose <guimenuitem>Add to Panel</guimenuitem>. Select <application>Character Palette</application> in the <application>Add to the panel</application> dialog, then click <guibutton>OK</guibutton>."
-msgstr "<application>문자 팔레트</application>를 패널에 추가하려면 패널을 마우스 오른쪽 버튼으로 누르고 <guimenuitem>패널에 추가</guimenuitem>를 선택합니다. <application>패널에 추가</application> 대화 창에서 <application>문자표</guimenuitem>를 선택하고 <guibutton>확인</guibutton>을 누릅니다."
+msgstr "<application>문자 팔레트</application>를 패널에 추가하려면 패널을 마우스 오른쪽 버튼으로 누르고 <guimenuitem>패널에 추가</guimenuitem>를 선택합니다. <application>패널에 추가</application> 대화 창에서 <application>문자표</application>를 선택하고 <guibutton>확인</guibutton>을 누릅니다."
#: ../C/char-palette.xml:219(title)
msgid "Getting Characters"
diff --git a/invest-applet/docs/es/es.po b/invest-applet/docs/es/es.po
index 84c3f946..31dc96c1 100644
--- a/invest-applet/docs/es/es.po
+++ b/invest-applet/docs/es/es.po
@@ -73,8 +73,8 @@ msgstr ""
"según los términos de la GFDL (GNU Free Documentation License), Versión 1.1, "
"o cualquier otra versión posterior publicada por Free Software Foundation "
"sin secciones invariables, textos de portada ni textos de contraportada. "
-"Podrá encontrar una copia de la GFDL en este <ulink type=\\\"help\\\" url=\\"
-"\"help:fdl\\\">enlace</ulink> o en el archivo COPYING-DOCS distribuido con "
+"Podrá encontrar una copia de la GFDL en este <ulink type=\"help\" url=\"help:fdl\""
+">enlace</ulink> o en el archivo COPYING-DOCS distribuido con "
"este manual."
#: C/invest-applet.xml:12(para)