Update branch for 0.5-rc release

thomascube

2010-12-17 db1a87cd6c506f2afbd1a37c64cb56ae11120b49

 program/localization/nn_NO/labels.inc

@@ -5,8 +5,8 @@
+-----------------------------------------------------------------------+
| language/nn_NO/labels.inc                                             |
|                                                                       |
| Language file of the RoundCube Webmail client                         |
| Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
| Language file of the Roundcube Webmail client                         |
| Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
| Licensed under the GNU GPL                                            |
|                                                                       |
+-----------------------------------------------------------------------+
@@ -310,9 +310,6 @@
$labels['messagecount'] = 'Meldingar';
$labels['create'] = 'Opprette';
$labels['createfolder'] = 'Opprett ny mappe';
$labels['rename'] = 'Gje nytt namn';
$labels['renamefolder'] = 'Gje nytt namn til mappe';
$labels['deletefolder'] = 'Slett mappe';
$labels['managefolders'] = 'Mappehandsaming';
$labels['specialfolders'] = 'Spesialmapper';
$labels['sortby'] = 'Sorter etter';