[Pkg-shadow-commits] r152 - trunk/debian/patches

Christian Perrier pkg-shadow-devel@lists.alioth.debian.org
Wed, 18 May 2005 08:56:40 +0000 

Author: bubulle
Date: 2005-05-18 08:56:39 +0000 (Wed, 18 May 2005)
New Revision: 152

Modified:
   trunk/debian/patches/108_sv.dpatch
Log:
Really correct version of the Swedish translation patch


Modified: trunk/debian/patches/108_sv.dpatch
===================================================================
--- trunk/debian/patches/108_sv.dpatch	2005-05-17 21:28:19 UTC (rev 151)
+++ trunk/debian/patches/108_sv.dpatch	2005-05-18 08:56:39 UTC (rev 152)
@@ -24,11 +24,11 @@
 
 @DPATCH@
 
-Index: shadow-4.0.3/po/sv.po
+Index: shadow-4.0.3.my/po/sv.po
 ===================================================================
---- shadow-4.0.3.orig/po/sv.po	2005-05-13 23:19:17.000000000 +0200
-+++ shadow-4.0.3/po/sv.po	2005-05-17 11:34:32.275019400 +0200
-@@ -1,58 +1,94 @@
+--- shadow-4.0.3.my.orig/po/sv.po	2005-05-13 23:19:17.000000000 +0200
++++ shadow-4.0.3.my/po/sv.po	2005-05-17 11:37:40.000000000 +0200
+@@ -1,58 +1,95 @@
  # Swedish messages for Shadow Copyright (C) 1999 Free Software Foundation,
 -# Inc. Kristoffer Brćnemyr <ztion@swipnet.se>, 1999.
 +# Inc. Kristoffer BrÄnemyr <ztion@swipnet.se>, 1999.
@@ -42,7 +42,7 @@
 -"Last-Translator: Kristoffer Brćnemyr <ztion@swipnet.se>\n"
 +"Report-Msgid-Bugs-To: \n"
 +"POT-Creation-Date: 2004-07-26 06:02-0600\n"
-+"PO-Revision-Date: 2004-12-14 18:21+0100\n"
++"PO-Revision-Date: 2005-05-17 11:37+0200\n"
 +"Last-Translator: Per Olofsson <pelle@dsv.su.se>\n"
  "Language-Team: sv <sv@li.org>\n"
  "MIME-Version: 1.0\n"
@@ -50,6 +50,7 @@
 +"Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
 +"Plural-Forms: nplurals=2; plural=n != 1;\n"
++"X-Generator: KBabel 1.9.1\n"
 +
 +#: lib/dialchk.c:71
 +msgid "Dialup Password: "
@@ -138,7 +139,7 @@
  
  #: libmisc/chowntty.c:113
  #, c-format
-@@ -60,41 +96,37 @@
+@@ -60,41 +97,36 @@
  msgstr "Kunde inte byta tty %s"
  
  #: libmisc/env.c:160
@@ -186,9 +187,9 @@
  #: libmisc/login_desrpc.c:69
  #, c-format
  msgid "Could not set %s's secret key: is the keyserv daemon running?\n"
- msgstr ""
+-msgstr ""
 -"Kunde inte sätta den hemliga nyckeln för %s: är keyserv demonen igćng?\n"
-+"Kunde inte sÀtta den hemliga nyckeln för %s: Àr keyserv demonen igÄng?\n"
++msgstr "Kunde inte sÀtta den hemliga nyckeln för %s: Àr keyserv demonen igÄng?\n"
  
  #: libmisc/mail.c:62 libmisc/mail.c:77
  msgid "You have new mail."
@@ -213,7 +214,7 @@
  #: libmisc/setupenv.c:211
  #, c-format
  msgid "Unable to cd to \"%s\"\n"
-@@ -157,105 +194,76 @@
+@@ -157,105 +194,74 @@
  msgid "Can't change root directory to \"%s\"\n"
  msgstr "Kan inte byta rotkatalog till \"%s\"\n"
  
@@ -290,11 +291,10 @@
 +#: src/chage.c:124
  #, c-format
  msgid "Usage: %s [-l] [-m min_days] [-M max_days] [-d last_day] user\n"
- msgstr ""
+-msgstr ""
 -"Användning: %s [-l] [-m min_dagar] [-M max_dagar] [-d senaste_dag] "
 -"användare\n"
-+"AnvĂ€ndning: %s [-l] [-m min_dagar] [-M max_dagar] [-d senaste_dag] anvĂ"
-+"€ndare\n"
++msgstr "AnvÀndning: %s [-l] [-m min_dagar] [-M max_dagar] [-d senaste_dag] anvÀndare\n"
  
 -#: src/chage.c:157
 -#, fuzzy
@@ -346,7 +346,7 @@
  
  #.
  #. * Start with the easy numbers - the number of days before the
-@@ -264,22 +272,22 @@
+@@ -264,22 +270,22 @@
  #. * expires that the user is told, and the number of days after the
  #. * password expires that the account becomes unusable.
  #.
@@ -374,7 +374,7 @@
  #, c-format
  msgid "Inactive:\t%ld\n"
  msgstr "Inaktivt:\t%ld\n"
-@@ -288,11 +296,13 @@
+@@ -288,11 +294,13 @@
  #. * The "last change" date is either "Never" or the date the password
  #. * was last modified. The date is the number of days since 1/1/1970.
  #.
@@ -391,7 +391,7 @@
  msgid "Never\n"
  msgstr "Aldrig\n"
  
-@@ -300,9 +310,10 @@
+@@ -300,9 +308,10 @@
  #. * The password expiration date is determined from the last change
  #. * date plus the number of days the password is valid for.
  #.
@@ -404,7 +404,7 @@
  
  #.
  #. * The account becomes inactive if the password is expired for more
-@@ -310,101 +321,104 @@
+@@ -310,101 +319,104 @@
  #. * number of inactive days is added. The resulting date is when the
  #. * active will be disabled.
  #.
@@ -550,7 +550,7 @@
  
  #: src/chfn.c:83
  #, c-format
-@@ -413,18 +427,19 @@
+@@ -413,18 +425,19 @@
  "\t[-h home_ph] [-o other] [user]\n"
  msgstr ""
  "%s [-f hela_namnet] [-r rumsnummer] [-w arbetstele]\n"
@@ -573,7 +573,7 @@
  
  #: src/chfn.c:142
  msgid "Full Name"
-@@ -464,38 +479,38 @@
+@@ -464,38 +477,38 @@
  
  #: src/chfn.c:162
  msgid "Other"
@@ -619,7 +619,7 @@
  
  #: src/chfn.c:450
  #, c-format
-@@ -520,101 +535,108 @@
+@@ -520,101 +533,108 @@
  #: src/chfn.c:475
  #, c-format
  msgid "%s: \"%s\" contains illegal characters\n"
@@ -758,7 +758,7 @@
  
  #: src/chsh.c:90
  msgid "Login Shell"
-@@ -623,12 +645,12 @@
+@@ -623,12 +643,12 @@
  #: src/chsh.c:239 src/chsh.c:253
  #, c-format
  msgid "You may not change the shell for %s.\n"
@@ -773,7 +773,7 @@
  
  #: src/chsh.c:294
  #, c-format
-@@ -638,25 +660,25 @@
+@@ -638,25 +658,25 @@
  #: src/chsh.c:301
  #, c-format
  msgid "%s is an invalid shell.\n"
@@ -804,7 +804,7 @@
  
  #: src/dpasswd.c:149
  #, c-format
-@@ -666,7 +688,7 @@
+@@ -666,7 +686,7 @@
  #: src/dpasswd.c:155
  #, c-format
  msgid "%s: can't open %s"
@@ -813,7 +813,7 @@
  
  #: src/dpasswd.c:183
  #, c-format
-@@ -674,38 +696,40 @@
+@@ -674,38 +694,39 @@
  msgstr "%s: Hittade inte skalet %s.\n"
  
  #: src/expiry.c:59
@@ -837,9 +837,9 @@
  #: src/faillog.c:77
  #, c-format
  msgid "usage: %s [-a|-u user] [-m max] [-r] [-t days] [-l locksecs]\n"
- msgstr ""
+-msgstr ""
 -"Användning: %s [-a|-u användare] [-m högst] [-r] [-t dagar] [-l lćssek]\n"
-+"AnvÀndning: %s [-a|-u anvÀndare] [-m högst] [-r] [-t dagar] [-l lÄssek]\n"
++msgstr "AnvÀndning: %s [-a|-u anvÀndare] [-m högst] [-r] [-t dagar] [-l lÄssek]\n"
  
  #: src/faillog.c:131 src/lastlog.c:96
  #, c-format
@@ -861,7 +861,7 @@
  
  #: src/faillog.c:233
  #, c-format
-@@ -715,70 +739,72 @@
+@@ -715,70 +736,72 @@
  #: src/faillog.c:237
  #, c-format
  msgid " [%lds lock]"
@@ -948,7 +948,7 @@
  
  #: src/gpasswd.c:501
  #, c-format
-@@ -794,39 +820,39 @@
+@@ -794,39 +817,39 @@
  #: src/gpasswd.c:522
  #, c-format
  msgid "Changing the password for group %s\n"
@@ -996,7 +996,7 @@
  
  #: src/gpasswd.c:602
  #, c-format
-@@ -851,7 +877,7 @@
+@@ -851,7 +874,7 @@
  #: src/gpasswd.c:630
  #, c-format
  msgid "%s: can't unlock file\n"
@@ -1005,7 +1005,7 @@
  
  #: src/gpasswd.c:635
  #, c-format
-@@ -863,33 +889,34 @@
+@@ -863,33 +886,34 @@
  msgid "%s: can't update DBM shadow files\n"
  msgstr "%s: kan inte uppdatera DBM-skuggfiler\n"
  
@@ -1053,7 +1053,7 @@
  #, c-format
  msgid "%s: can't get unique gid\n"
  msgstr "%s: kan inte hitta ett unikt gid\n"
-@@ -897,78 +924,79 @@
+@@ -897,78 +921,79 @@
  #.
  #. * All invalid group names land here.
  #.
@@ -1157,7 +1157,7 @@
  #, c-format
  msgid "%s: error removing shadow group dbm entry\n"
  msgstr "%s: fel under borttagning av dbm-skuggruppnotering\n"
-@@ -976,131 +1004,97 @@
+@@ -976,131 +1001,97 @@
  #.
  #. * Can't remove the group.
  #.
@@ -1190,7 +1190,8 @@
 -#: src/groupmems.c:95
 -msgid "Member already exists\n"
 -msgstr ""
--
++msgstr "%s: %s Àr NIS-mÀsteren\n"
+ 
 -#: src/groupmems.c:125
 -msgid "Member to remove could not be found\n"
 -msgstr ""
@@ -1202,8 +1203,7 @@
 -#: src/groupmems.c:201
 -msgid "Only root can add members to different groups\n"
 -msgstr ""
-+msgstr "%s: %s Àr NIS-mÀsteren\n"
- 
+-
 -#: src/groupmems.c:206
 -msgid "Group access is required\n"
 -msgstr ""
@@ -1319,7 +1319,7 @@
  #: src/pwck.c:543
  #, c-format
  msgid "delete line `%s'? "
-@@ -1110,21 +1104,21 @@
+@@ -1110,21 +1101,21 @@
  #. * Tell the user this entry is a duplicate of
  #. * another and ask them to delete it.
  #.
@@ -1346,7 +1346,7 @@
  #, c-format
  msgid "delete member `%s'? "
  msgstr "ta bort medlem \"%s\"? "
-@@ -1133,7 +1127,8 @@
+@@ -1133,7 +1124,8 @@
  #. * Tell the user this entire line is bogus and ask
  #. * them to delete it.
  #.
@@ -1356,7 +1356,7 @@
  msgid "invalid shadow group file entry\n"
  msgstr "felaktig skuggruppfilsnotering\n"
  
-@@ -1141,68 +1136,68 @@
+@@ -1141,68 +1133,68 @@
  #. * Tell the user this entry is a duplicate of
  #. * another and ask them to delete it.
  #.
@@ -1443,7 +1443,7 @@
  
  #: src/grpconv.c:94
  #, c-format
-@@ -1212,12 +1207,12 @@
+@@ -1212,12 +1204,12 @@
  #: src/grpconv.c:138 src/pwconv.c:153
  #, c-format
  msgid "%s: can't update shadow entry for %s\n"
@@ -1458,7 +1458,7 @@
  
  #: src/grpconv.c:155 src/grpunconv.c:99
  #, c-format
-@@ -1232,7 +1227,7 @@
+@@ -1232,7 +1224,7 @@
  #: src/grpconv.c:175 src/grpunconv.c:127
  #, c-format
  msgid "%s: not configured for shadow group support.\n"
@@ -1467,7 +1467,7 @@
  
  #: src/grpunconv.c:110
  #, c-format
-@@ -1240,12 +1235,14 @@
+@@ -1240,12 +1232,14 @@
  msgstr "%s: kan inte ta bort skuggruppfilen\n"
  
  #: src/id.c:53
@@ -1484,7 +1484,7 @@
  
  #.
  #. * Start off the group message. It will be of the format
-@@ -1256,6 +1253,7 @@
+@@ -1256,6 +1250,7 @@
  #. * corresponding name for each respective numerical value.
  #.
  #: src/id.c:169
@@ -1492,7 +1492,7 @@
  msgid " groups="
  msgstr " grupper="
  
-@@ -1263,136 +1261,171 @@
+@@ -1263,136 +1258,170 @@
  #, c-format
  msgid "Usage: %s [<-u|--login> login-name] [<-t|--time> days] [<-h|--help>]\n"
  msgstr ""
@@ -1605,8 +1605,7 @@
 +#, c-format
 +msgid "login: abort requested by PAM\n"
 +msgstr "login: avbryter pÄ begÀran av PAM\n"
- 
--#: src/login.c:852
++
 +#: src/login.c:824
 +msgid "PAM_ABORT returned from pam_authenticate()"
 +msgstr "pam_authenticate() returnerade PAM_ABORT"
@@ -1615,7 +1614,8 @@
 +#, c-format
 +msgid "FAILED LOGIN (%d)%s FOR `%s', %s"
 +msgstr "MISSLYCKAD INLOGGNING (%d)%s FÖR `%s', %s"
-+
+ 
+-#: src/login.c:852
 +#: src/login.c:924
  #, c-format
  msgid ""
@@ -1641,8 +1641,7 @@
 +#: src/login.c:1382
  msgid "Warning: login re-enabled after temporary lockout.\n"
 -msgstr "Varning: inloggning pć nytt aktiv efter den temporära utelćsningen.\n"
-+msgstr ""
-+"Varning: inloggning pÄ nytt aktiv efter den temporÀra utelÄsningen.\n"
++msgstr "Varning: inloggning pÄ nytt aktiv efter den temporÀra utelÄsningen.\n"
  
 -#: src/login.c:1278
 +#: src/login.c:1396
@@ -1703,7 +1702,7 @@
  
  #: src/mkpasswd.c:315
  #, c-format
-@@ -1400,126 +1433,131 @@
+@@ -1400,126 +1429,131 @@
  msgstr "%s: fel under analysering av rad \"%s\"\n"
  
  #: src/mkpasswd.c:323 src/mkpasswd.c:328 src/mkpasswd.c:333 src/mkpasswd.c:338
@@ -1868,7 +1867,7 @@
  #, c-format
  msgid "%s: error updating files\n"
  msgstr "%s: kunde inte uppdatera filerna\n"
-@@ -1527,12 +1565,12 @@
+@@ -1527,12 +1561,12 @@
  #: src/passwd.c:174
  #, c-format
  msgid "usage: %s [-f|-s] [name]\n"
@@ -1883,7 +1882,7 @@
  
  #: src/passwd.c:180
  #, c-format
-@@ -1542,25 +1580,26 @@
+@@ -1542,25 +1576,26 @@
  #: src/passwd.c:283
  #, c-format
  msgid "User %s has a TCFS key, his old password is required.\n"
@@ -1915,7 +1914,7 @@
  
  #: src/passwd.c:333
  #, c-format
-@@ -1568,59 +1607,66 @@
+@@ -1568,59 +1603,66 @@
  "Enter the new password (minimum of %d, maximum of %d characters)\n"
  "Please use a combination of upper and lower case letters and numbers.\n"
  msgstr ""
@@ -1994,7 +1993,7 @@
  
  #: src/passwd.c:975
  #, c-format
-@@ -1630,49 +1676,51 @@
+@@ -1630,49 +1672,51 @@
  #: src/passwd.c:1077
  #, c-format
  msgid "%s: repository %s not supported\n"
@@ -2056,7 +2055,7 @@
  
  #.
  #. * Tell the user this entry is a duplicate of
-@@ -1680,12 +1728,12 @@
+@@ -1680,12 +1724,12 @@
  #.
  #: src/pwck.c:357
  msgid "duplicate password entry\n"
@@ -2071,7 +2070,7 @@
  
  #.
  #. * No primary group, just give a warning
-@@ -1693,12 +1741,12 @@
+@@ -1693,12 +1737,12 @@
  #: src/pwck.c:388
  #, c-format
  msgid "user %s: no group %u\n"
@@ -2086,7 +2085,7 @@
  
  #.
  #. * Login shell doesn't exist, give a warning
-@@ -1706,15 +1754,16 @@
+@@ -1706,15 +1750,16 @@
  #: src/pwck.c:420
  #, c-format
  msgid "user %s: program %s does not exist\n"
@@ -2105,7 +2104,7 @@
  
  #.
  #. * Tell the user this entry is a duplicate of
-@@ -1722,7 +1771,7 @@
+@@ -1722,7 +1767,7 @@
  #.
  #: src/pwck.c:518
  msgid "duplicate shadow password entry\n"
@@ -2114,7 +2113,7 @@
  
  #.
  #. * Tell the user this entry has no matching
-@@ -1730,32 +1779,32 @@
+@@ -1730,32 +1775,32 @@
  #.
  #: src/pwck.c:542
  msgid "no matching password file entry\n"
@@ -2153,7 +2152,7 @@
  
  #: src/pwconv.c:170
  #, c-format
-@@ -1765,53 +1814,104 @@
+@@ -1765,53 +1810,104 @@
  #: src/pwconv.c:175
  #, c-format
  msgid "%s: can't update passwd file\n"
@@ -2274,7 +2273,7 @@
  #, c-format
  msgid ""
  "%s: %s\n"
-@@ -1820,33 +1920,19 @@
+@@ -1820,33 +1916,19 @@
  "%s: %s\n"
  "(Ignorerad)\n"
  
@@ -2312,7 +2311,7 @@
  
  #: src/sulogin.c:190
  msgid ""
-@@ -1855,520 +1941,531 @@
+@@ -1855,520 +1937,529 @@
  "(or give root password for system maintenance):"
  msgstr ""
  "\n"
@@ -2693,10 +2692,11 @@
 -#: src/useradd.c:1821
 +#: src/useradd.c:1823
  #, c-format
- msgid ""
- "%s: group %s exists - if you want to add this user to that group, use -g.\n"
- msgstr ""
-+"%s: gruppen %s finns redan - vill du lÀgga till en anvÀndare, anvÀnd -g.\n"
+-msgid ""
+-"%s: group %s exists - if you want to add this user to that group, use -g.\n"
+-msgstr ""
++msgid "%s: group %s exists - if you want to add this user to that group, use -g.\n"
++msgstr "%s: gruppen %s finns redan - vill du lÀgga till en anvÀndare, anvÀnd -g.\n"
  
 -#: src/useradd.c:1854
 +#: src/useradd.c:1856
@@ -3024,7 +3024,7 @@
  
  #: src/vipw.c:104
  #, c-format
-@@ -2377,49 +2474,45 @@
+@@ -2377,49 +2468,46 @@
  "%s: %s is unchanged\n"
  msgstr ""
  "\n"
@@ -3076,9 +3076,6 @@
 -
 -#~ msgid "group %s: bad GID (%d)\n"
 -#~ msgstr "grupp %s: felaktigt GID (%d)\n"
--
--#~ msgid "%s: permission denied (shell).\n"
--#~ msgstr "%s: tillćtelse nekas (skal).\n"
 +"AnvÀndning:\n"
 +"\"vipw\" redigerar /etc/passwd   \"vipw -w\" redigerar /etc/shadow\n"
 +"\"vipg\" redigerar /etc/group    \"vipg -w\" redigerar /etc/gshadow\n"
@@ -3099,3 +3096,6 @@
 +#~ "  -h, --help\t\tvisa det hÀr meddelandet och avsluta\n"
 +#~ "  -m, --md5\t\tanvÀnd MD5-kryptering i stÀllet för DES nÀr\n"
 +#~ "\t\t\tde angivna lösenorden inte Àr krypterade\n"
+ 
+-#~ msgid "%s: permission denied (shell).\n"
+-#~ msgstr "%s: tillćtelse nekas (skal).\n"