summaryrefslogtreecommitdiff
path: root/stickynotes
diff options
context:
space:
mode:
authorMonsta <[email protected]>2015-07-08 14:20:54 +0300
committerMonsta <[email protected]>2015-07-08 14:40:36 +0300
commitf0362207ea24ee91f2ca4cc324b0d905a1235656 (patch)
treeb7ecd070d0f56bede66ca79dc3b715e23e1ec107 /stickynotes
parent9a4c2f01d0824db2b5ee121eb52262ea554c6dc8 (diff)
downloadmate-applets-f0362207ea24ee91f2ca4cc324b0d905a1235656.tar.bz2
mate-applets-f0362207ea24ee91f2ca4cc324b0d905a1235656.tar.xz
fixed almost all merge conflicts in help translations
Diffstat (limited to 'stickynotes')
-rw-r--r--stickynotes/docs/fr/fr.po4
-rw-r--r--stickynotes/docs/zh_HK/zh_HK.po2
-rw-r--r--stickynotes/docs/zh_TW/zh_TW.po2
3 files changed, 4 insertions, 4 deletions
diff --git a/stickynotes/docs/fr/fr.po b/stickynotes/docs/fr/fr.po
index 849b2dff..801a53eb 100644
--- a/stickynotes/docs/fr/fr.po
+++ b/stickynotes/docs/fr/fr.po
@@ -724,8 +724,8 @@ msgid ""
msgstr ""
"Pour personnaliser le comportement de <application>Pense-bêtes</"
"application>, ouvrez le menu contextuel de l'applet et choisissez "
-"<guimenu>Préférences</guimenu>. La boîte de dialogue <Préférences des pense-"
-"bêtes</application> s'affiche."
+"<guimenu>Préférences</guimenu>. La boîte de dialogue <application>Préférences "
+"des pense-bêtes</application> s'affiche."
#: ../C/stickynotes_applet.xml:396(para)
msgid ""
diff --git a/stickynotes/docs/zh_HK/zh_HK.po b/stickynotes/docs/zh_HK/zh_HK.po
index 4fe4c8a7..6a8ed610 100644
--- a/stickynotes/docs/zh_HK/zh_HK.po
+++ b/stickynotes/docs/zh_HK/zh_HK.po
@@ -344,7 +344,7 @@ msgid ""
"To hide all your notes, either click on the desktop, or right-click the "
"<application>Sticky Notes</application> applet and choose <guimenuitem>Hide "
"Notes</guimenuitem>."
-msgstr "要隱藏你全部的便條,你可以再按桌面一下,或是在<application>便條</application>程式上按右鍵並選擇guimenuitem>隱藏便條</guimenuitem>"
+msgstr "要隱藏你全部的便條,你可以再按桌面一下,或是在<application>便條</application>程式上按右鍵並選擇<guimenuitem>隱藏便條</guimenuitem>"
#: C/stickynotes_applet.xml:214(para)
msgid ""
diff --git a/stickynotes/docs/zh_TW/zh_TW.po b/stickynotes/docs/zh_TW/zh_TW.po
index 05c4d311..949ae29f 100644
--- a/stickynotes/docs/zh_TW/zh_TW.po
+++ b/stickynotes/docs/zh_TW/zh_TW.po
@@ -391,7 +391,7 @@ msgid ""
"Notes</guimenuitem>."
msgstr ""
"要隱藏您全部的便條,您可以再按桌面一下,或是在<application>便條</application>"
-"程式上按右鍵並選擇guimenuitem>隱藏便條</guimenuitem>"
+"程式上按右鍵並選擇<guimenuitem>隱藏便條</guimenuitem>"
#: C/stickynotes_applet.xml:214(para)
msgid ""