summaryrefslogtreecommitdiff
path: root/cpufreq/help
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 /cpufreq/help
parent9a4c2f01d0824db2b5ee121eb52262ea554c6dc8 (diff)
downloadmate-applets-f0362207ea24ee91f2ca4cc324b0d905a1235656.tar.bz2
mate-applets-f0362207ea24ee91f2ca4cc324b0d905a1235656.tar.xz
fixed almost all merge conflicts in help translations
Diffstat (limited to 'cpufreq/help')
-rw-r--r--cpufreq/help/fi/fi.po2
-rw-r--r--cpufreq/help/nl/nl.po2
2 files changed, 2 insertions, 2 deletions
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"