Merge branch 'upstream'

6 files changed, 70 insertions, 312 deletions

diff --git a/po/.cvsignore b/po/.cvsignore
new file mode 100644
index 0000000..216b8fc
--- /dev/null
+++ b/po/.cvsignore
@@ -0,0 +1,10 @@
+*.gmo
+*.mo
+*.pot
+Makefile
+Makefile.in
+Makefile.in.in
+POTFILES
+messages
+missing
+notexist
diff --git a/po/ChangeLog b/po/ChangeLog
index 51e6cbf..4feec1f 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-02  Kjartan Maraas,,23491770  <kmaraas@gnome.org>
+
+	* POTFILES.in: Add .desktop.in file.
+	* nb.po: Updated Norwegian bokmål translation.
+
 2005-10-29  Christopher Aillon  <caillon@redhat.com>
 
 	* Makefile.in.in: this is generated, no need to live in repository
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
deleted file mode 100644
index 1a6961e..0000000
--- a/po/Makefile.in.in
+++ /dev/null
@@ -1,263 +0,0 @@
-# Makefile for program source directory in GNU NLS utilities package.
-# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
-#
-# This file file be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
-#
-# - Modified by Owen Taylor <otaylor@redhat.com> to use GETTEXT_PACKAGE
-#   instead of PACKAGE and to look for po2tbl in ./ not in intl/
-#
-# - Modified by jacob berkman <jacob@ximian.com> to install
-#   Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
-#
-# - Modified by Rodney Dawes <dobey@novell.com> for use with intltool
-#
-# We have the following line for use by intltoolize:
-# INTLTOOL_MAKEFILE
-
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-PACKAGE = @PACKAGE@
-VERSION = @VERSION@
-
-SHELL = /bin/sh
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ..
-VPATH = @srcdir@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-datadir = @datadir@
-datarootdir = @datarootdir@
-libdir = @libdir@
-localedir = $(libdir)/locale
-gnulocaledir = $(datadir)/locale
-gettextsrcdir = $(datadir)/glib-2.0/gettext/po
-subdir = po
-install_sh = @install_sh@
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-
-CC = @CC@
-GENCAT = @GENCAT@
-GMSGFMT = @GMSGFMT@
-MSGFMT = @MSGFMT@
-XGETTEXT = @XGETTEXT@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
-GENPOT   = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
-
-DEFS = @DEFS@
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
-
-INCLUDES = -I.. -I$(top_srcdir)/intl
-
-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
-
-SOURCES = 
-POFILES = @POFILES@
-GMOFILES = @GMOFILES@
-DISTFILES = ChangeLog Makefile.in.in POTFILES.in \
-$(POFILES) $(SOURCES)
-EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS
-
-POTFILES = \
-
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-INSTOBJEXT = @INSTOBJEXT@
-
-.SUFFIXES:
-.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
-
-.c.o:
-	$(COMPILE) $<
-
-.po.pox:
-	$(MAKE) $(GETTEXT_PACKAGE).pot
-	$(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
-
-.po.mo:
-	$(MSGFMT) -o $@ $<
-
-.po.gmo:
-	file=`echo $* | sed 's,.*/,,'`.gmo \
-	  && rm -f $$file && $(GMSGFMT) -o $$file $<
-
-.po.cat:
-	sed -f ../intl/po2msg.sed < $< > $*.msg \
-	  && rm -f $@ && $(GENCAT) $@ $*.msg
-
-
-all: all-@USE_NLS@
-
-all-yes: $(CATALOGS)
-all-no:
-
-$(GETTEXT_PACKAGE).pot: $(POTFILES)
-	$(GENPOT)
-
-install: install-exec install-data
-install-exec:
-install-data: install-data-@USE_NLS@
-install-data-no: all
-install-data-yes: all
-	if test -n "$(MKINSTALLDIRS)"; then \
-	  $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
-	else \
-	  $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
-	fi
-	@catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  cat=`basename $$cat`; \
-	  case "$$cat" in \
-	    *.gmo) destdir=$(gnulocaledir);; \
-	    *)     destdir=$(localedir);; \
-	  esac; \
-	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-	  dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
-	  if test -n "$(MKINSTALLDIRS)"; then \
-	    $(MKINSTALLDIRS) $$dir; \
-	  else \
-	    $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
-	  fi; \
-	  if test -r $$cat; then \
-	    $(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
-	    echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
-	  else \
-	    $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
-	    echo "installing $(srcdir)/$$cat as" \
-		 "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
-	  fi; \
-	  if test -r $$cat.m; then \
-	    $(INSTALL_DATA) $$cat.m $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
-	    echo "installing $$cat.m as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
-	  else \
-	    if test -r $(srcdir)/$$cat.m ; then \
-	      $(INSTALL_DATA) $(srcdir)/$$cat.m \
-		$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
-	      echo "installing $(srcdir)/$$cat as" \
-		   "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
-	    else \
-	      true; \
-	    fi; \
-	  fi; \
-	done
-	if test "$(PACKAGE)" = "glib"; then \
-	  if test -n "$(MKINSTALLDIRS)"; then \
-	    $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
-	  else \
-	    $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
-	  fi; \
-	  $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
-			  $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
-	else \
-	  : ; \
-	fi
-
-# Define this as empty until I found a useful application.
-installcheck:
-
-uninstall:
-	catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
-	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
-	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
-	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
-	done
-	if test "$(PACKAGE)" = "glib"; then \
-	  rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
-	fi
-
-check: all $(GETTEXT_PACKAGE).pot
-
-dvi info tags TAGS ID:
-
-mostlyclean:
-	rm -f core core.* *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
-	rm -fr *.o
-	rm -f .intltool-merge-cache
-
-clean: mostlyclean
-
-distclean: clean
-	rm -f Makefile Makefile.in POTFILES
-	rm -f *.mo *.msg *.cat *.cat.m $(GMOFILES)
-
-maintainer-clean: distclean
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-	rm -f Makefile.in.in
-
-distdir = ../$(GETTEXT_PACKAGE)-$(VERSION)/$(subdir)
-dist distdir: $(DISTFILES)
-	dists="$(DISTFILES)"; \
-	extra_dists="$(EXTRA_DISTFILES)"; \
-	for file in $$extra_dists; do \
-	  test -f $$file && dists="$$dists $$file"; \
-	done; \
-	for file in $$dists; do \
-	  ln $(srcdir)/$$file $(distdir) 2> /dev/null \
-	    || cp -p $(srcdir)/$$file $(distdir); \
-	done
-
-update-po: Makefile
-	$(MAKE) $(GETTEXT_PACKAGE).pot
-	tmpdir=`pwd`; \
-	catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-	  echo "$$lang:"; \
-	  result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
-	  if $$result; then \
-	    if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
-	      rm -f $$tmpdir/$$lang.new.po; \
-            else \
-	      if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
-	        :; \
-	      else \
-	        echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
-	        rm -f $$tmpdir/$$lang.new.po; \
-	        exit 1; \
-	      fi; \
-	    fi; \
-	  else \
-	    echo "msgmerge for $$cat failed!"; \
-	    rm -f $$tmpdir/$$lang.new.po; \
-	  fi; \
-	done
-
-# POTFILES is created from POTFILES.in by stripping comments, empty lines
-# and Intltool tags (enclosed in square brackets), and appending a full
-# relative path to them
-POTFILES: POTFILES.in
-	( posrcprefix='$(top_srcdir)/'; \
-	  rm -f $@-t $@ \
-	    && (sed -e '/^#/d' 					\
-		    -e 's/^[[].*] *//' 				\
-		    -e '/^[ 	]*$$/d' 			\
-		    -e "s@^@	$$posrcprefix@" $(srcdir)/$@.in	\
-		| sed -e '$$!s/$$/ \\/') > $@-t \
-	    && chmod a-w $@-t \
-	    && mv $@-t $@ )
-
-Makefile: Makefile.in.in ../config.status POTFILES
-	cd .. \
-	  && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
-	       $(SHELL) ./config.status
-
-# Tell versions [3.59,3.63) of GNU make not to export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 345dca3..d733f1c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,3 +1,4 @@
 src/krb5-auth-dialog.glade
 src/krb5-auth-dialog.c
 src/dummy-strings.c
+src/krb5-auth-dialog.desktop.in
diff --git a/po/no.po b/po/krb5-auth-dialog.pot
index e465a95..e45f187 100644
--- a/po/no.po
+++ b/po/krb5-auth-dialog.pot
@@ -3,25 +3,26 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: krb5-auth-dialog 0.1\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-08-18 17:20-0400\n"
-"PO-Revision-Date: 2004-08-19 17:18+0200\n"
-"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
-"Language-Team: Norsk bokmål <i18n-nb@lister.ping.uio.no>\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/krb5-auth-dialog.glade.h:1
 msgid "Network Authentication"
-msgstr "Nettverksautentisering"
+msgstr ""
 
 #: src/krb5-auth-dialog.glade.h:2
 msgid "_Password:"
-msgstr "_Passord:"
+msgstr ""
 
 #: src/krb5-auth-dialog.glade.h:3
 msgid "_Renew Ticket"
@@ -29,7 +30,7 @@ msgstr ""
 
 #: src/krb5-auth-dialog.c:76 src/krb5-auth-dialog.c:84
 msgid "Password:"
-msgstr "Passord:"
+msgstr ""
 
 #: src/krb5-auth-dialog.c:96
 msgid "The password you entered is invalid"
@@ -158,7 +159,7 @@ msgstr ""
 #. test1.et:krb:KRB_SKDC_RETRY
 #: src/dummy-strings.c:31
 msgid "Can't send request"
-msgstr "Kan ikke sende forespørsel"
+msgstr ""
 
 #. test1.et:krb:KRB_SKDC_CANT
 #: src/dummy-strings.c:32
@@ -183,7 +184,7 @@ msgstr ""
 #. ss_err.et:ss:SS_ET_NO_INFO_DIR
 #: src/dummy-strings.c:36
 msgid "Command not found"
-msgstr "Kommando ikke funnet"
+msgstr ""
 
 #. ss_err.et:ss:SS_ET_COMMAND_NOT_FOUND
 #: src/dummy-strings.c:37
@@ -208,7 +209,7 @@ msgstr ""
 #. ss_err.et:ss:SS_ET_TABLE_NOT_FOUND
 #: src/dummy-strings.c:41
 msgid "No info available"
-msgstr "Ingen informasjon tilgjengelig"
+msgstr ""
 
 #. ss_err.et:ss:SS_ET_NO_HELP_FILE
 #: src/dummy-strings.c:42
@@ -442,9 +443,8 @@ msgstr ""
 
 #. pty_err.et:pty:PTY_OPEN_SLAVE_TOOSHORT
 #: src/dummy-strings.c:88
-#, fuzzy
 msgid "Usage: kpasswd [principal_name]."
-msgstr "Bruk: kpasswd [...]"
+msgstr ""
 
 #. kpasswd_strings.et:kpws:KPW_STR_USAGE
 #: src/dummy-strings.c:89
@@ -460,7 +460,7 @@ msgstr ""
 #. kpasswd_strings.et:kpws:KPW_STR_WHILE_LOOKING_AT_CC
 #: src/dummy-strings.c:91
 msgid "Old Kerberos password is incorrect. Please try again."
-msgstr "Gammelt Kerberos-passord er ugyldig. Vennligst prøv igjen."
+msgstr ""
 
 #. kpasswd_strings.et:kpws:KPW_STR_OLD_PASSWORD_INCORRECT
 #: src/dummy-strings.c:92
@@ -474,18 +474,18 @@ msgstr ""
 #. chpass_util_strings.et:ovku:CHPASS_UTIL_GET_PRINC_INFO
 #: src/dummy-strings.c:94 src/dummy-strings.c:485
 msgid "New passwords do not match - password not changed.\n"
-msgstr "Nye passord er ikke like - passord ikke endret.\n"
+msgstr ""
 
 #. kpasswd_strings.et:kpws:KPW_STR_NEW_PASSWORD_MISMATCH
 #: src/dummy-strings.c:95
 msgid "Kerberos password changed.\n"
-msgstr "Kerberos-passord endret.\n"
+msgstr ""
 
 #. kpasswd_strings.et:kpws:KPW_STR_PASSWORD_CHANGED
 #. chpass_util_strings.et:ovku:CHPASS_UTIL_PASSWORD_IN_DICTIONARY
 #: src/dummy-strings.c:96 src/dummy-strings.c:494
 msgid "Password not changed."
-msgstr "Passord ikke endret."
+msgstr ""
 
 #. kpasswd_strings.et:kpws:KPW_STR_PASSWORD_NOT_CHANGED
 #: src/dummy-strings.c:97
@@ -501,18 +501,18 @@ msgstr ""
 #. kpasswd_strings.et:kpws:KPW_STR_UNPARSE_NAME
 #: src/dummy-strings.c:99
 msgid "Unable to identify user from password file."
-msgstr "Kan ikke identifisere bruker fra passordfil."
+msgstr ""
 
 #. kpasswd_strings.et:kpws:KPW_STR_NOT_IN_PASSWD_FILE
 #: src/dummy-strings.c:100
 #, c-format
 msgid "Changing password for %s."
-msgstr "Endrer passord for %s."
+msgstr ""
 
 #. kpasswd_strings.et:kpws:KPW_STR_CHANGING_PW_FOR
 #: src/dummy-strings.c:101
 msgid "Old password"
-msgstr "Gammelt passord"
+msgstr ""
 
 #. kpasswd_strings.et:kpws:KPW_STR_OLD_PASSWORD_PROMPT
 #. chpass_util_strings.et:ovku:CHPASS_UTIL_WHILE_TRYING_TO_CHANGE
@@ -635,7 +635,7 @@ msgstr ""
 #. import_err.et:imp:IMPORT_EXTRA_DATA
 #: src/dummy-strings.c:123
 msgid "Proceed <y|n>?"
-msgstr "Fortsett <j/n>?"
+msgstr ""
 
 #. import_err.et:imp:IMPORT_CONFIRM
 #: src/dummy-strings.c:124
@@ -650,7 +650,7 @@ msgstr ""
 #. import_err.et:imp:IMPORT_IMPORT
 #: src/dummy-strings.c:126
 msgid "cannot open /dev/tty!!"
-msgstr "kan ikke åpne /dev/tty!!"
+msgstr ""
 
 #. import_err.et:imp:IMPORT_TTY
 #: src/dummy-strings.c:127
@@ -680,7 +680,7 @@ msgstr ""
 #. import_err.et:imp:IMPORT_GET_PARAMS
 #. kv5m_err.et:kv5m:KV5M_GSS_QUEUE
 #: src/dummy-strings.c:132 src/dummy-strings.c:385
-msgid "$Id: no.po,v 1.1 2004/08/19 15:19:47 kmaraas Exp $"
+msgid "$Id$"
 msgstr ""
 
 #. kdc5_err.et:kdc5:KDC5_RCSID
@@ -2410,12 +2410,12 @@ msgstr ""
 #. chpass_util_strings.et:ovku:CHPASS_UTIL_NEW_PASSWORD_MISMATCH
 #: src/dummy-strings.c:486
 msgid "New password"
-msgstr "Nytt passord"
+msgstr ""
 
 #. chpass_util_strings.et:ovku:CHPASS_UTIL_NEW_PASSWORD_PROMPT
 #: src/dummy-strings.c:487
 msgid "New password (again)"
-msgstr "Nytt passord (igjen)"
+msgstr ""
 
 #. chpass_util_strings.et:ovku:CHPASS_UTIL_NEW_PASSWORD_AGAIN_PROMPT
 #: src/dummy-strings.c:488
@@ -2431,7 +2431,7 @@ msgstr ""
 #. chpass_util_strings.et:ovku:CHPASS_UTIL_NO_POLICY_YET_Q_ERROR
 #: src/dummy-strings.c:490
 msgid "Password changed.\n"
-msgstr "Passord endret.\n"
+msgstr ""
 
 #. chpass_util_strings.et:ovku:CHPASS_UTIL_PASSWORD_CHANGED
 #: src/dummy-strings.c:491
diff --git a/po/nb.po b/po/nb.po
index 391ec33..65ca62f 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,21 +1,22 @@
 # Norwegian bokmål translation of krb5-auth-dialog
 # Copyright (C) 2005 Red Hat, Inc.
 # This file is distributed under the same license as the krb5-auth-dialog package.
-# Kjartan Maraas <kmaraas@gnome.org>, 2005.
+# Kjartan Maraas <kmaraas@gnome.org>, 2005-2007.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: krb5-auth-dialog 0.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-02 10:33+0100\n"
-"PO-Revision-Date: 2005-11-02 10:36+0100\n"
+"POT-Creation-Date: 2007-11-02 13:28+0100\n"
+"PO-Revision-Date: 2007-11-02 13:30+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
-"Language-Team: Norsk bokmål <i18n-nb@lister.ping.uio.no>\n"
+"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/krb5-auth-dialog.glade.h:1 ../src/krb5-auth-dialog.c:465
+#: ../src/krb5-auth-dialog.glade.h:1 ../src/krb5-auth-dialog.c:601
+#: ../src/krb5-auth-dialog.desktop.in.h:2
 msgid "Network Authentication"
 msgstr "Nettverksautentisering"
 
@@ -27,25 +28,27 @@ msgstr "_Passord:"
 msgid "_Renew Ticket"
 msgstr "Fo_rny billett"
 
-#: ../src/krb5-auth-dialog.c:63 ../src/krb5-auth-dialog.c:129
+#: ../src/krb5-auth-dialog.c:129
 #, c-format
-msgid "Your credentials expire in %d minutes"
-msgstr ""
+msgid "Your credentials expire in %d minute"
+msgid_plural "Your credentials expire in %d minutes"
+msgstr[0] "Påloggingsinformasjonen utløper om %d minutt"
+msgstr[1] "Påloggingsinformasjonen utløper om %d minutter"
 
-#: ../src/krb5-auth-dialog.c:65 ../src/krb5-auth-dialog.c:131
+#: ../src/krb5-auth-dialog.c:134
 msgid "Your credentials have expired"
-msgstr ""
+msgstr "Påloggingsinformasjonen har gått ut"
 
-#: ../src/krb5-auth-dialog.c:89
+#: ../src/krb5-auth-dialog.c:183
 msgid "Please enter your Kerberos password."
 msgstr "Vennligst skriv inn ditt Kerberos-passord."
 
-#: ../src/krb5-auth-dialog.c:102
+#: ../src/krb5-auth-dialog.c:194
 #, c-format
 msgid "Please enter the password for '%s'"
 msgstr "Vennligst oppgi passord for «%s»"
 
-#: ../src/krb5-auth-dialog.c:124
+#: ../src/krb5-auth-dialog.c:215
 msgid "The password you entered is invalid"
 msgstr "Passordet du oppga er ugyldig"
 
@@ -77,7 +80,7 @@ msgstr ""
 #. test1.et:krb:KRB_RD_AP_EXP
 #: ../src/dummy-strings.c:18
 msgid "Repeated request"
-msgstr ""
+msgstr "Gjentatt forespørsel"
 
 #. test1.et:krb:KRB_RD_AP_REPEAT
 #. krb5_err.et:krb5:KRB5KRB_AP_ERR_REPEAT
@@ -88,12 +91,12 @@ msgstr ""
 #. test1.et:krb:KRB_RD_AP_NOT_US
 #: ../src/dummy-strings.c:20
 msgid "Request is inconsistent"
-msgstr ""
+msgstr "Forespørselen er inkonsistent"
 
 #. test1.et:krb:KRB_RD_AP_INCON
 #: ../src/dummy-strings.c:21
 msgid "Delta-T too big"
-msgstr ""
+msgstr "Delta-T for stor"
 
 #. test1.et:krb:KRB_RD_AP_TIME
 #. krb5_err.et:krb5:KRB5KRB_AP_ERR_SKEW
@@ -111,7 +114,7 @@ msgstr ""
 #. krb5_err.et:krb5:KRB5KRB_AP_ERR_BADVERSION
 #: ../src/dummy-strings.c:24 ../src/dummy-strings.c:184
 msgid "Invalid message type"
-msgstr ""
+msgstr "Ugyldig meldingstype"
 
 #. test1.et:krb:KRB_RD_AP_MSG_TYPE
 #. krb5_err.et:krb5:KRB5KRB_AP_ERR_MSG_TYPE
@@ -128,7 +131,7 @@ msgstr ""
 #. test1.et:krb:KRB_RD_AP_ORDER
 #: ../src/dummy-strings.c:27
 msgid "Unauthorized request"
-msgstr ""
+msgstr "Uautorisert forespørsel"
 
 #. test1.et:krb:KRB_RD_AP_UNAUTHOR
 #: ../src/dummy-strings.c:28
@@ -143,7 +146,7 @@ msgstr ""
 #. test1.et:krb:KRB_GT_PW_BADPW
 #: ../src/dummy-strings.c:30
 msgid "Protocol error"
-msgstr ""
+msgstr "Protokollfeil"
 
 #. test1.et:krb:KRB_GT_PW_PROT
 #: ../src/dummy-strings.c:31
@@ -684,7 +687,7 @@ msgstr ""
 #. import_err.et:imp:IMPORT_GET_PARAMS
 #. kv5m_err.et:kv5m:KV5M_GSS_QUEUE
 #: ../src/dummy-strings.c:135 ../src/dummy-strings.c:388
-msgid "$Id: nb.po,v 1.2 2005/11/02 09:37:10 kmaraas Exp $"
+msgid "$Id: dummy-strings.c 35 2005-10-31 21:55:46Z caillon $"
 msgstr ""
 
 #. kdc5_err.et:kdc5:KDC5_RCSID
@@ -2484,9 +2487,7 @@ msgstr ""
 
 #. chpass_util_strings.et:ovku:CHPASS_UTIL_WHILE_READING_PASSWORD
 #: ../src/dummy-strings.c:515
-msgid ""
-"$Header: /cvs/gnome/krb5-auth-dialog/src/dummy-strings.c,v 1.2 2005/10/31 "
-"21:55:46 caillon Exp $"
+msgid "$Header$"
 msgstr ""
 
 #. kadm_err.et:kadm:KADM_RCSID
@@ -3118,3 +3119,7 @@ msgstr ""
 #: ../src/dummy-strings.c:647
 msgid "Received token ID does not match expected token ID"
 msgstr ""
+
+#: ../src/krb5-auth-dialog.desktop.in.h:1
+msgid "Kerberos Network Authentication Dialog"
+msgstr "Dialog for nettverksautentisering via Kerberos"