diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-24 12:18:06 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-24 12:18:06 -0400 |
| commit | ee1b49f87e4b8e6406c059f29371892872d3fb85 (patch) | |
| tree | 107f163d9f707c97a0b8179a5f2afd9995d616ec /libs/gtkmm2ext/po/nn.po | |
| parent | 8cd71108c1d153f84f25c3b9e5153a110826c130 (diff) | |
| parent | 1421a34e52862b614f280c751a12893e4abecf88 (diff) | |
fix merge conflicts from master
Diffstat (limited to 'libs/gtkmm2ext/po/nn.po')
| -rw-r--r-- | libs/gtkmm2ext/po/nn.po | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/gtkmm2ext/po/nn.po b/libs/gtkmm2ext/po/nn.po index 43907a4525..7e3d72bed1 100644 --- a/libs/gtkmm2ext/po/nn.po +++ b/libs/gtkmm2ext/po/nn.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: libardour\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-03 11:35-0500\n" +"POT-Creation-Date: 2013-08-15 15:09-0400\n" "PO-Revision-Date: 2013-01-01 20:30+0100\n" "Last-Translator: Eivind Ødegård <meinmycell-lists@yahoo.no>\n" "Language-Team: Nynorsk <i18n-nn@lister.ping.uio.no>\n" @@ -76,11 +76,11 @@ msgstr "" msgid "Meta" msgstr "" -#: keyboard.cc:134 keyboard.cc:523 +#: keyboard.cc:139 keyboard.cc:531 msgid "Unknown" msgstr "Ukjend" -#: keyboard.cc:534 +#: keyboard.cc:542 msgid "key bindings file not found at \"%2\" or contains errors." msgstr "" |