From f0362207ea24ee91f2ca4cc324b0d905a1235656 Mon Sep 17 00:00:00 2001
From: Monsta <monsta@inbox.ru>
Date: Wed, 8 Jul 2015 14:20:54 +0300
Subject: fixed almost all merge conflicts in help translations

---
 cpufreq/help/fi/fi.po | 2 +-
 cpufreq/help/nl/nl.po | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'cpufreq')

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 <application>Prosessorin kellotaajuuden ilmaisin</applicati
 
 #: C/cpufreq-applet.xml:276(para) 
 msgid "The <guimenuitem>Preferences</guimenuitem> dialog contains the following components:"
-msgstr "<guimenuitem>Asetukset<guimenuitem> -valintaikkunasta löydät seuraavat osiot:"
+msgstr "<guimenuitem>Asetukset</guimenuitem> -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 <guimenuitem>Preferences</guimenuitem> dialog contains the following "
 "components:"
 msgstr ""
-"De <guimenuitem>Voorkeuren</guimenuiem> dialoog bevat de volgende onderdelen:"
+"De <guimenuitem>Voorkeuren</guimenuitem> dialoog bevat de volgende onderdelen:"
 
 #: ../C/cpufreq-applet.xml:278(title)
 msgid "CPU Frequency Scaling Monitor Preferences Dialog"
-- 
cgit v1.2.1