From f0362207ea24ee91f2ca4cc324b0d905a1235656 Mon Sep 17 00:00:00 2001 From: Monsta Date: Wed, 8 Jul 2015 14:20:54 +0300 Subject: fixed almost all merge conflicts in help translations --- accessx-status/docs/fi/fi.po | 2 +- charpick/help/ko/ko.po | 2 +- cpufreq/help/fi/fi.po | 2 +- cpufreq/help/nl/nl.po | 2 +- drivemount/help/fi/fi.po | 2 +- drivemount/help/ru/ru.po | 2 +- mateweather/docs/zh_CN/zh_CN.po | 2 +- stickynotes/docs/fr/fr.po | 4 ++-- stickynotes/docs/zh_HK/zh_HK.po | 2 +- stickynotes/docs/zh_TW/zh_TW.po | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/accessx-status/docs/fi/fi.po b/accessx-status/docs/fi/fi.po index d2b5af59..d7074f20 100644 --- a/accessx-status/docs/fi/fi.po +++ b/accessx-status/docs/fi/fi.po @@ -278,7 +278,7 @@ msgstr " Näppäinsymboli" #: C/accessx-status.xml:252(para) msgid "AltGr key pushed once." -msgstr "AltGr -näppäintä painettu kerran" +msgstr "AltGr -näppäintä painettu kerran" #: C/accessx-status.xml:262(keycap) msgid "Meta" diff --git a/charpick/help/ko/ko.po b/charpick/help/ko/ko.po index 0a9b9c3a..a44f9336 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 Character Palette to a panel, right-click on the panel, then choose Add to Panel. Select Character Palette in the Add to the panel dialog, then click OK." -msgstr "문자 팔레트를 패널에 추가하려면 패널을 마우스 오른쪽 버튼으로 누르고 패널에 추가를 선택합니다. 패널에 추가 대화 창에서 문자표를 선택하고 확인을 누릅니다." +msgstr "문자 팔레트를 패널에 추가하려면 패널을 마우스 오른쪽 버튼으로 누르고 패널에 추가를 선택합니다. 패널에 추가 대화 창에서 문자표를 선택하고 확인을 누릅니다." #: ../C/char-palette.xml:219(title) msgid "Getting Characters" diff --git a/cpufreq/help/fi/fi.po b/cpufreq/help/fi/fi.po index 77d5c74e..163201a0 100644 --- a/cpufreq/help/fi/fi.po +++ b/cpufreq/help/fi/fi.po @@ -309,7 +309,7 @@ msgstr "Muokataksesi Prosessorin kellotaajuuden ilmaisinPreferences dialog contains the following components:" -msgstr "Asetukset -valintaikkunasta löydät seuraavat osiot:" +msgstr "Asetukset -valintaikkunasta löydät seuraavat osiot:" #: C/cpufreq-applet.xml:278(title) msgid "CPU Frequency Scaling Monitor Preferences Dialog" diff --git a/cpufreq/help/nl/nl.po b/cpufreq/help/nl/nl.po index b7534d12..e57993a6 100644 --- a/cpufreq/help/nl/nl.po +++ b/cpufreq/help/nl/nl.po @@ -484,7 +484,7 @@ msgid "" "The Preferences dialog contains the following " "components:" msgstr "" -"De Voorkeuren dialoog bevat de volgende onderdelen:" +"De Voorkeuren dialoog bevat de volgende onderdelen:" #: ../C/cpufreq-applet.xml:278(title) msgid "CPU Frequency Scaling Monitor Preferences Dialog" diff --git a/drivemount/help/fi/fi.po b/drivemount/help/fi/fi.po index 5af64a4e..56c949a6 100644 --- a/drivemount/help/fi/fi.po +++ b/drivemount/help/fi/fi.po @@ -270,7 +270,7 @@ msgstr "Levynliitin -sovellus mahdollistaa monille as #: C/drivemount.xml:184(para) msgid "For the Disk Mounter to work properly, your system administrator must configure your system appropriately. For more information about the necessary system administration tasks, see fstab5." -msgstr "Jotta Levynliitin -sovellus toimisi kunnolla, järjestelmäsi pääkäyttäjän on asetettava järjestelmäsi asetukset sopiviksi. Saadaksesi lisätietoja tärkeimmistä pääkäyttäjän tehtävistä, katso fstab5." +msgstr "Jotta Levynliitin -sovellus toimisi kunnolla, järjestelmäsi pääkäyttäjän on asetettava järjestelmäsi asetukset sopiviksi. Saadaksesi lisätietoja tärkeimmistä pääkäyttäjän tehtävistä, katso fstab5." #: C/drivemount.xml:189(title) msgid "To Add Disk Mounter to a Panel" diff --git a/drivemount/help/ru/ru.po b/drivemount/help/ru/ru.po index 89cef5e8..eabae2ee 100644 --- a/drivemount/help/ru/ru.po +++ b/drivemount/help/ru/ru.po @@ -94,7 +94,7 @@ msgstr "Проект документации MATE" #: C/drivemount.xml:2(para) msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any later version published by the Free Software Foundation with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy of the GFDL at this link or in the file COPYING-DOCS distributed with this manual." -msgstr "Следующим разрешается копировать и/или модифицировать этот документ при условии соблюдения GNU Free Documentation License (GFDL), версии 1.1 или любой более поздней опубликованной ассоциацией свободного программного обеспечения версией без неизменяемых частей, без текстов на обложках. Вы можете найти копию лицензии по этой ссылке или в файле COPYING-DOCS, распространяемом с этим документом." +msgstr "Следующим разрешается копировать и/или модифицировать этот документ при условии соблюдения GNU Free Documentation License (GFDL), версии 1.1 или любой более поздней опубликованной ассоциацией свободного программного обеспечения версией без неизменяемых частей, без текстов на обложках. Вы можете найти копию лицензии по этой ссылке или в файле COPYING-DOCS, распространяемом с этим документом." #: C/drivemount.xml:12(para) msgid "This manual is part of a collection of MATE manuals distributed under the GFDL. If you want to distribute this manual separately from the collection, you can do so by adding a copy of the license to the manual, as described in section 6 of the license." diff --git a/mateweather/docs/zh_CN/zh_CN.po b/mateweather/docs/zh_CN/zh_CN.po index 9cdd9053..5b3e2a15 100644 --- a/mateweather/docs/zh_CN/zh_CN.po +++ b/mateweather/docs/zh_CN/zh_CN.po @@ -506,7 +506,7 @@ msgid "" "A weather icon that represents the general weather conditions. See ." msgstr "" -"一个天气图标显示了天气的整体状况。详情请查看：。" #: C/mateweather.xml:272(para) 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 Pense-bêtes, ouvrez le menu contextuel de l'applet et choisissez " -"Préférences. La boîte de dialogue s'affiche." +"Préférences. La boîte de dialogue Préférences " +"des pense-bêtes 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 " "Sticky Notes applet and choose Hide " "Notes." -msgstr "要隱藏你全部的便條，你可以再按桌面一下，或是在便條程式上按右鍵並選擇guimenuitem>隱藏便條" +msgstr "要隱藏你全部的便條，你可以再按桌面一下，或是在便條程式上按右鍵並選擇隱藏便條" #: 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." msgstr "" "要隱藏您全部的便條，您可以再按桌面一下，或是在便條" -"程式上按右鍵並選擇guimenuitem>隱藏便條" +"程式上按右鍵並選擇隱藏便條" #: C/stickynotes_applet.xml:214(para) msgid "" -- cgit v1.2.1