diff options
| author | Martin Wimpress <[email protected]> | 2015-06-27 22:14:24 +0100 |
|---|---|---|
| committer | Martin Wimpress <[email protected]> | 2015-06-27 22:14:24 +0100 |
| commit | e64c0d6d99fe6aef817af0b18e53d9813cb2c11f (patch) | |
| tree | ea972a0ed2ab0677aa1578eef5809d8730af21e9 /help/mate-clock/da | |
| parent | 9978fdd46962be0acfcfddfb489b19f949f88bb4 (diff) | |
| parent | bcc8a11e05c9e1479e71d1696084e9e509fe2e92 (diff) | |
| download | mate-panel-e64c0d6d99fe6aef817af0b18e53d9813cb2c11f.tar.bz2 mate-panel-e64c0d6d99fe6aef817af0b18e53d9813cb2c11f.tar.xz | |
Merge pull request #315 from NiceandGently/master
help: clock and fish: fix merge conflicts during build
Diffstat (limited to 'help/mate-clock/da')
| -rw-r--r-- | help/mate-clock/da/da.po | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/help/mate-clock/da/da.po b/help/mate-clock/da/da.po index 904433e1..4c5bc98b 100644 --- a/help/mate-clock/da/da.po +++ b/help/mate-clock/da/da.po @@ -487,7 +487,7 @@ msgstr "" "For at konfigurere <application>Uret</application>, højreklikkes på " "panelprogrammet, og der vælges <guimenuitem>Indstillinger</guimenuitem>. Du " "vil blive præsenteret for tre faneblade hvor du kan ændre indstillinger for " -"<guimenuitem>Generelt</guimenuitem>, <guimenuitem>Lokationer</guimenutiem> " +"<guimenuitem>Generelt</guimenuitem>, <guimenuitem>Lokationer</guimenuitem> " "eller <guimenuitem>Vejret</guimenuitem>." #: ../C/clock.xml:331(title) |