summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorraveit65 <[email protected]>2015-06-27 22:35:36 +0200
committerraveit65 <[email protected]>2015-06-27 22:35:36 +0200
commitbcc8a11e05c9e1479e71d1696084e9e509fe2e92 (patch)
treeea972a0ed2ab0677aa1578eef5809d8730af21e9
parent9978fdd46962be0acfcfddfb489b19f949f88bb4 (diff)
downloadmate-panel-bcc8a11e05c9e1479e71d1696084e9e509fe2e92.tar.bz2
mate-panel-bcc8a11e05c9e1479e71d1696084e9e509fe2e92.tar.xz
help: clock and fish: fix merge conflicts during build
-rw-r--r--help/mate-clock/da/da.po2
-rw-r--r--help/mate-clock/ko/ko.po2
-rw-r--r--help/mate-clock/sr/sr.po2
-rw-r--r--help/mate-clock/zh_CN/zh_CN.po2
-rw-r--r--help/mate-fish/ko/ko.po2
5 files changed, 5 insertions, 5 deletions
diff --git a/help/mate-clock/da/da.po b/help/mate-clock/da/da.po
index 904433e1..4c5bc98b 100644
--- a/help/mate-clock/da/da.po
+++ b/help/mate-clock/da/da.po
@@ -487,7 +487,7 @@ msgstr ""
"For at konfigurere <application>Uret</application>, højreklikkes på "
"panelprogrammet, og der vælges <guimenuitem>Indstillinger</guimenuitem>. Du "
"vil blive præsenteret for tre faneblade hvor du kan ændre indstillinger for "
-"<guimenuitem>Generelt</guimenuitem>, <guimenuitem>Lokationer</guimenutiem> "
+"<guimenuitem>Generelt</guimenuitem>, <guimenuitem>Lokationer</guimenuitem> "
"eller <guimenuitem>Vejret</guimenuitem>."
#: ../C/clock.xml:331(title)
diff --git a/help/mate-clock/ko/ko.po b/help/mate-clock/ko/ko.po
index 7511d2ab..f0177d26 100644
--- a/help/mate-clock/ko/ko.po
+++ b/help/mate-clock/ko/ko.po
@@ -298,7 +298,7 @@ msgid ""
"Scroll down the list of items in the <guilabel>Add to Panel</guilabel> "
"dialog, then select <guilabel>Clock</guilabel>."
msgstr ""
-"<guilabel>패널에 더하기</guimenuitem> 대화 상자의 목록에서 스크롤창을 내려 "
+"<guilabel>패널에 더하기</guilabel> 대화 상자의 목록에서 스크롤창을 내려 "
"<guilabel>시계</guilabel>를 선택하십시오."
#: C/clock.xml:204(para)
diff --git a/help/mate-clock/sr/sr.po b/help/mate-clock/sr/sr.po
index 1216e30d..07a66a21 100644
--- a/help/mate-clock/sr/sr.po
+++ b/help/mate-clock/sr/sr.po
@@ -405,7 +405,7 @@ msgid ""
"applet displays, perform the following steps:"
msgstr ""
"Да подесите датум и време на систему које приказује програмче "
-"<application>часовника</application, пратите следеће кораке:"
+"<application>часовника</application>, пратите следеће кораке:"
#: ../C/clock.xml:271(para)
msgid ""
diff --git a/help/mate-clock/zh_CN/zh_CN.po b/help/mate-clock/zh_CN/zh_CN.po
index 7b16dc61..8c3ab67d 100644
--- a/help/mate-clock/zh_CN/zh_CN.po
+++ b/help/mate-clock/zh_CN/zh_CN.po
@@ -459,7 +459,7 @@ msgid ""
"guimenuitem>."
msgstr ""
"要配置 <application>时钟</application>,在它上面点右键,然后选 <guimenuitem>"
-"首选项</guimenuitem> 菜单,弹出一个对话框,包括三个标签:guimenuitem>常规</"
+"首选项</guimenuitem> 菜单,弹出一个对话框,包括三个标签:<guimenuitem>常规</"
"guimenuitem>、<guimenuitem>位置</guimenuitem> 和 <guimenuitem>天气</"
"guimenuitem>。"
diff --git a/help/mate-fish/ko/ko.po b/help/mate-fish/ko/ko.po
index 9d044521..4a3a7272 100644
--- a/help/mate-fish/ko/ko.po
+++ b/help/mate-fish/ko/ko.po
@@ -286,7 +286,7 @@ msgid ""
"Scroll down the list of items in the <guilabel>Add to Panel</guilabel> "
"dialog, then select <guilabel>Fish</guilabel>."
msgstr ""
-"<guilabel>패널에 더하기</guimenuitem> 대화 상자의 목록에서 스크롤창을 내려 "
+"<guilabel>패널에 더하기</guilabel> 대화 상자의 목록에서 스크롤창을 내려 "
"<guilabel>물고기</guilabel>를 선택하십시오."
#: C/fish.xml:183(para)