summaryrefslogtreecommitdiffstats
path: root/mdk-stage1/dietlibc/libcrypt/crypt.c
diff options
context:
space:
mode:
Diffstat (limited to 'mdk-stage1/dietlibc/libcrypt/crypt.c')
-rw-r--r--mdk-stage1/dietlibc/libcrypt/crypt.c309
1 files changed, 0 insertions, 309 deletions
diff --git a/mdk-stage1/dietlibc/libcrypt/crypt.c b/mdk-stage1/dietlibc/libcrypt/crypt.c
deleted file mode 100644
index 933397f5f..000000000
--- a/mdk-stage1/dietlibc/libcrypt/crypt.c
+++ /dev/null
@@ -1,309 +0,0 @@
-#include "dietfeatures.h"
-#include <unistd.h>
-
-/* Initial permutation, */
-static char IP[] = {
- 57,49,41,33,25,17, 9, 1,
- 59,51,43,35,27,19,11, 3,
- 61,53,45,37,29,21,13, 5,
- 63,55,47,39,31,23,15, 7,
- 56,48,40,32,24,16, 8, 0,
- 58,50,42,34,26,18,10, 2,
- 60,52,44,36,28,20,12, 4,
- 62,54,46,38,30,22,14, 6
-};
-
-/* Final permutation, FP = IP^(-1) */
-static char FP[] = {
- 39, 7,47,15,55,23,63,31,
- 38, 6,46,14,54,22,62,30,
- 37, 5,45,13,53,21,61,29,
- 36, 4,44,12,52,20,60,28,
- 35, 3,43,11,51,19,59,27,
- 34, 2,42,10,50,18,58,26,
- 33, 1,41, 9,49,17,57,25,
- 32, 0,40, 8,48,16,56,24
-};
-
-/* Permuted-choice 1 from the key bits to yield C and D.
- * Note that bits 8,16... are left out: They are intended for a parity check.
- */
-static char PC1_C[] = {
- 56,48,40,32,24,16, 8,
- 0,57,49,41,33,25,17,
- 9, 1,58,50,42,34,26,
- 18,10, 2,59,51,43,35
-};
-
-static char PC1_D[] = {
- 62,54,46,38,30,22,14,
- 6,61,53,45,37,29,21,
- 13, 5,60,52,44,36,28,
- 20,12, 4,27,19,11, 3
-};
-
-/* Sequence of shifts used for the key schedule. */
-static char shifts[] = { 1,1,2,2,2,2,2,2,1,2,2,2,2,2,2,1 };
-
-/*
- * Permuted-choice 2, to pick out the bits from the CD array that generate
- * the key schedule.
- */
-static char PC2_C[] = {
- 13, 16, 10, 23, 0, 4, 2, 27, 14, 5, 20, 9,
- 22, 18, 11, 3, 25, 7, 15, 6, 26, 19, 12, 1
-};
-
-static char PC2_D[] = {
- 12, 23, 2, 8, 18, 26, 1, 11, 22, 16, 4, 19,
- 15, 20, 10, 27, 5, 24, 17, 13, 21, 7, 0, 3
-};
-
-/* The C and D arrays used to calculate the key schedule. */
-
-static char C[28];
-static char D[28];
-/* The key schedule. Generated from the key. */
-static char KS[16][48];
-
-/* The E bit-selection table. */
-static char E[48];
-static char e2[] = {
- 32, 1, 2, 3, 4, 5, 4, 5, 6, 7, 8, 9,
- 8, 9, 10, 11, 12, 13, 12, 13, 14, 15, 16, 17,
- 16, 17, 18, 19, 20, 21, 20, 21, 22, 23, 24, 25,
- 24, 25, 26, 27, 28, 29, 28, 29, 30, 31, 32, 1
-};
-
-/* Set up the key schedule from the key. */
-void setkey(const char *key)
-{
- register int i, j, k;
- int t;
- int s;
-
- /* First, generate C and D by permuting the key. The low order bit of each
- * 8-bit char is not used, so C and D are only 28 bits apiece.
- */
- for(i=0; i < 28; i++) {
- C[i] = key[(int)PC1_C[i]];
- D[i] = key[(int)PC1_D[i]];
- }
- /* To generate Ki, rotate C and D according to schedule and pick up a
- * permutation using PC2.
- */
- for(i=0; i < 16; i++) {
- /* rotate. */
- s = shifts[i];
- for(k=0; k < s; k++) {
- t = C[0];
- for(j=0; j < 27; j++)
- C[j] = C[j+1];
- C[27] = t;
- t = D[0];
- for(j=0; j < 27; j++)
- D[j] = D[j+1];
- D[27] = t;
- }
- /* get Ki. Note C and D are concatenated. */
- for(j=0; j < 24; j++) {
- KS[i][j] = C[(int)PC2_C[j]];
- KS[i][j+24] = D[(int)PC2_D[j]];
- }
- }
-
- for(i=0; i < 48; i++)
- E[i] = e2[i];
-}
-
-/* The 8 selection functions. For some reason, they give a 0-origin index,
- * unlike everything else.
- */
-static char S[8][64] = {
- {
- 14, 4,13, 1, 2,15,11, 8, 3,10, 6,12, 5, 9, 0, 7,
- 0,15, 7, 4,14, 2,13, 1,10, 6,12,11, 9, 5, 3, 8,
- 4, 1,14, 8,13, 6, 2,11,15,12, 9, 7, 3,10, 5, 0,
- 15,12, 8, 2, 4, 9, 1, 7, 5,11, 3,14,10, 0, 6,13
- },
-
- {
- 15, 1, 8,14, 6,11, 3, 4, 9, 7, 2,13,12, 0, 5,10,
- 3,13, 4, 7,15, 2, 8,14,12, 0, 1,10, 6, 9,11, 5,
- 0,14, 7,11,10, 4,13, 1, 5, 8,12, 6, 9, 3, 2,15,
- 13, 8,10, 1, 3,15, 4, 2,11, 6, 7,12, 0, 5,14, 9
- },
-
- {
- 10, 0, 9,14, 6, 3,15, 5, 1,13,12, 7,11, 4, 2, 8,
- 13, 7, 0, 9, 3, 4, 6,10, 2, 8, 5,14,12,11,15, 1,
- 13, 6, 4, 9, 8,15, 3, 0,11, 1, 2,12, 5,10,14, 7,
- 1,10,13, 0, 6, 9, 8, 7, 4,15,14, 3,11, 5, 2,12
- },
-
- {
- 7,13,14, 3, 0, 6, 9,10, 1, 2, 8, 5,11,12, 4,15,
- 13, 8,11, 5, 6,15, 0, 3, 4, 7, 2,12, 1,10,14, 9,
- 10, 6, 9, 0,12,11, 7,13,15, 1, 3,14, 5, 2, 8, 4,
- 3,15, 0, 6,10, 1,13, 8, 9, 4, 5,11,12, 7, 2,14
- },
-
- {
- 2,12, 4, 1, 7,10,11, 6, 8, 5, 3,15,13, 0,14, 9,
- 14,11, 2,12, 4, 7,13, 1, 5, 0,15,10, 3, 9, 8, 6,
- 4, 2, 1,11,10,13, 7, 8,15, 9,12, 5, 6, 3, 0,14,
- 11, 8,12, 7, 1,14, 2,13, 6,15, 0, 9,10, 4, 5, 3
- },
-
- {
- 12, 1,10,15, 9, 2, 6, 8, 0,13, 3, 4,14, 7, 5,11,
- 10,15, 4, 2, 7,12, 9, 5, 6, 1,13,14, 0,11, 3, 8,
- 9,14,15, 5, 2, 8,12, 3, 7, 0, 4,10, 1,13,11, 6,
- 4, 3, 2,12, 9, 5,15,10,11,14, 1, 7, 6, 0, 8,13
- },
-
- {
- 4,11, 2,14,15, 0, 8,13, 3,12, 9, 7, 5,10, 6, 1,
- 13, 0,11, 7, 4, 9, 1,10,14, 3, 5,12, 2,15, 8, 6,
- 1, 4,11,13,12, 3, 7,14,10,15, 6, 8, 0, 5, 9, 2,
- 6,11,13, 8, 1, 4,10, 7, 9, 5, 0,15,14, 2, 3,12
- },
-
- {
- 13, 2, 8, 4, 6,15,11, 1,10, 9, 3,14, 5, 0,12, 7,
- 1,15,13, 8,10, 3, 7, 4,12, 5, 6,11, 0,14, 9, 2,
- 7,11, 4, 1, 9,12,14, 2, 0, 6,10,13,15, 3, 5, 8,
- 2, 1,14, 7, 4,10, 8,13,15,12, 9, 0, 3, 5, 6,11
- }
-};
-
-/* P is a permutation on the selected combination of the current L and key. */
-static char P[] = {
- 15, 6,19,20, 28,11,27,16, 0,14,22,25, 4,17,30, 9,
- 1, 7,23,13, 31,26, 2, 8, 18,12,29, 5, 21,10, 3,24
-};
-
-/* The current block, divided into 2 halves. */
-static char L[32], R[32];
-static char tempL[32];
-static char f[32];
-
-/* The combination of the key and the input, before selection. */
-static char preS[48];
-
-/* The payoff: encrypt a block. */
-void encrypt(char block[64], int edflag)
-{
- int i, ii;
- register int t, j, k;
-
- /* First, permute the bits in the input */
- for(j=0; j < 64; j++)
- L[j] = block[(int)IP[j]];
- /* Perform an encryption operation 16 times. */
- for(ii=0; ii < 16; ii++) {
- i = ii;
- /* Save the R array, which will be the new L. */
- for(j=0; j < 32; j++)
- tempL[j] = R[j];
- /* Expand R to 48 bits using the E selector;
- * exclusive-or with the current key bits.
- */
- for(j=0; j < 48; j++)
- preS[j] = R[E[j]-1] ^ KS[i][j];
- /* The pre-select bits are now considered in 8 groups of 6 bits each.
- * The 8 selection functions map these 6-bit quantities into 4-bit
- * quantities and the results permuted to make an f(R, K).
- * The indexing into the selection functions is peculiar;
- * it could be simplified by rewriting the tables.
- */
- for(j=0; j < 8; j++) {
- t = ((j<<1)+j)<<1;
- k = S[j][(preS[t]<<5)+
- (preS[t+1]<<3)+
- (preS[t+2]<<2)+
- (preS[t+3]<<1)+
- (preS[t+4] )+
- (preS[t+5]<<4)];
- t = j << 2;
- f[t ] = (k>>3)&01;
- f[t+1] = (k>>2)&01;
- f[t+2] = (k>>1)&01;
- f[t+3] = (k )&01;
- }
- /* The new R is L ^ f(R, K). The f here has to be permuted first, though. */
- for(j=0; j < 32; j++)
- R[j] = L[j] ^ f[(int)P[j]];
- /* Finally, the new L (the original R) is copied back. */
- for(j=0; j < 32; j++)
- L[j] = tempL[j];
- }
- /* The output L and R are reversed. */
- for(j=0; j < 32; j++) {
- L[j] ^= R[j];
- R[j] ^= L[j];
- L[j] ^= R[j];
- }
- /* The final output gets the inverse permutation of the very original. */
- for(j=0; j < 64; j++)
- block[j] = L[(int)FP[j]];
-}
-
-char * crypt(const char *pw, const char *salt)
-{
- register int i, j, c;
- static char block[66], iobuf[16];
-
- for(i=0; i < 66; i++)
- block[i] = 0;
- for(i=0; (c= *pw) && i < 64; pw++) {
- for(j=0; j < 7; j++, i++)
- block[i] = (c>>(6-j)) & 01;
- i++;
- }
-
- setkey(block);
-
- for(i=0; i < 66; i++)
- block[i] = 0;
-
- for(i=0; i < 2; i++) {
- c = *salt++;
- iobuf[i] = c;
- if(c > 'Z')
- c -= 6;
- if(c > '9')
- c -= 7;
- c -= '.';
- for(j=0; j < 6; j++) {
- if((c>>j) & 01) {
- int ind1 = (((i<<1)+i)<< 1) + j;
- int ind2 = ind1 + 24;
- E[ind1] ^= E[ind2];
- E[ind2] ^= E[ind1];
- E[ind1] ^= E[ind2];
- }
- }
- }
-
- for(i=0; i < 25; i++)
- encrypt(block, 0);
-
- for(i=0; i < 11; i++) {
- c = 0;
- for(j=0; j < 6; j++) {
- c <<= 1;
- c |= block[(((i<<1)+i)<<1)+j];
- }
- c += '.';
- if(c > '9')
- c += 7;
- if(c > 'Z')
- c += 6;
- iobuf[i+2] = c;
- }
- iobuf[i+2] = 0;
- if(iobuf[1] == 0)
- iobuf[1] = iobuf[0];
- return(iobuf);
-}
m.pm:409
+#: ../urpm.pm:421
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:413
+#: ../urpm.pm:425
#, c-format
msgid "error registering local packages"
msgstr "greška pri registrovanju lokalnih paketa"
-#: ../urpm.pm:525
+#: ../urpm.pm:537
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:149 ../urpm/args.pm:158
+#: ../urpm/args.pm:150 ../urpm/args.pm:159
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "loša proxy-deklaracija u komandnoj liniji\n"
-#: ../urpm/args.pm:303
+#: ../urpm/args.pm:309
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: ne mogu da pročitam rpm datoteku \"%s\"\n"
-#: ../urpm/args.pm:371
+#: ../urpm/args.pm:377
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:372
+#: ../urpm/args.pm:378
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Nedostaje potpis (%s)"
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:384
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:388
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:391
+#: ../urpm/args.pm:397
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:465
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:488
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:491 ../urpm/args.pm:494 ../urpmq:155
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:155
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:502
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/args.pm:510
+#: ../urpm/args.pm:516
#, c-format
msgid ""
"%s version %s\n"
@@ -559,12 +559,12 @@ msgstr ""
"\n"
"upotreba:\n"
-#: ../urpm/args.pm:516
+#: ../urpm/args.pm:522
#, c-format
msgid "Copyright (C) %s by %s"
msgstr "Sva prava (C) %s zadržava %s"
-#: ../urpm/bug_report.pm:67 ../urpmi:254
+#: ../urpm/bug_report.pm:67 ../urpmi:256
#, c-format
msgid "Copying failed"
msgstr "Kopiranje nije uspelo"
@@ -591,22 +591,22 @@ msgstr "medij \"%s\" nije izabran"
msgid "unable to read rpm file [%s] from medium \"%s\""
msgstr "ne mogu da pročitam rpm datoteku [%s] sa medija \"%s\""
-#: ../urpm/cfg.pm:80
+#: ../urpm/cfg.pm:74
#, fuzzy, c-format
msgid "syntax error in config file at line %s"
msgstr "ne mogu da izvršim upis u konfiguracionu datoteku [%s]"
-#: ../urpm/cfg.pm:113
+#: ../urpm/cfg.pm:107
#, fuzzy, c-format
msgid "unable to read config file [%s]"
msgstr "ne mogu da izvršim upis u konfiguracionu datoteku [%s]"
-#: ../urpm/cfg.pm:139
+#: ../urpm/cfg.pm:133
#, c-format
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:251 ../urpm/media.pm:553
+#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
#, c-format
msgid "unable to write config file [%s]"
msgstr "ne mogu da izvršim upis u konfiguracionu datoteku [%s]"
@@ -616,122 +616,122 @@ msgstr "ne mogu da izvršim upis u konfiguracionu datoteku [%s]"
msgid "%s is not available, falling back on %s"
msgstr ""
-#: ../urpm/download.pm:176
+#: ../urpm/download.pm:169
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr ""
-#: ../urpm/download.pm:206
+#: ../urpm/download.pm:199
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr "Molimo unesite Vaša ovlašćenja za pristup proksiju\n"
-#: ../urpm/download.pm:207
+#: ../urpm/download.pm:200
#, c-format
msgid "User name:"
msgstr "Korisničko ime:"
-#: ../urpm/download.pm:207
+#: ../urpm/download.pm:200
#, c-format
msgid "Password:"
msgstr "Lozinka:"
-#: ../urpm/download.pm:293
+#: ../urpm/download.pm:286
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr ""
-#: ../urpm/download.pm:301
+#: ../urpm/download.pm:294
#, c-format
msgid "%s failed: exited with signal %d"
msgstr ""
-#: ../urpm/download.pm:302
+#: ../urpm/download.pm:295
#, c-format
msgid "%s failed: exited with %d"
msgstr ""
-#: ../urpm/download.pm:336
+#: ../urpm/download.pm:329
#, fuzzy, c-format
msgid "copy failed"
msgstr "Kopiranje nije uspelo"
-#: ../urpm/download.pm:342
+#: ../urpm/download.pm:335
#, fuzzy, c-format
msgid "wget is missing\n"
msgstr "zbog ne postojanja %s"
-#: ../urpm/download.pm:409
+#: ../urpm/download.pm:402
#, fuzzy, c-format
msgid "curl is missing\n"
msgstr "zbog ne postojanja %s"
-#: ../urpm/download.pm:544
+#: ../urpm/download.pm:537
#, c-format
msgid "curl failed: download canceled\n"
msgstr ""
-#: ../urpm/download.pm:579
+#: ../urpm/download.pm:572
#, c-format
msgid "rsync is missing\n"
msgstr ""
-#: ../urpm/download.pm:647
+#: ../urpm/download.pm:640
#, c-format
msgid "ssh is missing\n"
msgstr ""
-#: ../urpm/download.pm:666
+#: ../urpm/download.pm:659
#, c-format
msgid "prozilla is missing\n"
msgstr ""
-#: ../urpm/download.pm:682
+#: ../urpm/download.pm:675
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr ""
-#: ../urpm/download.pm:692
+#: ../urpm/download.pm:685
#, fuzzy, c-format
msgid "aria2 is missing\n"
msgstr "zbog ne postojanja %s"
-#: ../urpm/download.pm:736
+#: ../urpm/download.pm:734
#, c-format
msgid "Failed to download %s"
msgstr ""
-#: ../urpm/download.pm:831
+#: ../urpm/download.pm:829
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr ""
-#: ../urpm/download.pm:832
+#: ../urpm/download.pm:830
#, c-format
msgid " %s%% completed, speed = %s"
msgstr ""
-#: ../urpm/download.pm:917
+#: ../urpm/download.pm:915
#, fuzzy, c-format
msgid "retrieving %s"
msgstr "uklanjam %s"
-#: ../urpm/download.pm:928
+#: ../urpm/download.pm:926
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "...povraćaj neuspeo: %s"
-#: ../urpm/download.pm:990
+#: ../urpm/download.pm:988
#, c-format
msgid "unknown protocol defined for %s"
msgstr "nepoznati protokol definisan za %s"
-#: ../urpm/download.pm:1004
+#: ../urpm/download.pm:1002
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "webfetch nije pronađen, podržani webfetch-ovi su: %s\n"
-#: ../urpm/download.pm:1019
+#: ../urpm/download.pm:1017
#, c-format
msgid "unable to handle protocol: %s"
msgstr "ne mogu da podržim protokol: %s"
@@ -751,60 +751,55 @@ msgstr "paket %s nije pronađen."
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "dobavljam rpm fajlove dza medij \"%s\"..."
-#: ../urpm/install.pm:110
-#, c-format
-msgid "[repackaging]"
-msgstr ""
-
-#: ../urpm/install.pm:200
-#, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr ""
-"kreirana transakcija za instaliranje na %s (ukloni=%d, instaliraj=%d, "
-"ažuriraj=%d)"
-
-#: ../urpm/install.pm:203
-#, c-format
-msgid "unable to create transaction"
-msgstr "ne mogu da kreiram transakciju"
-
-#: ../urpm/install.pm:228
+#: ../urpm/install.pm:213
#, fuzzy, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "ne mogu da uklonim paket %s"
-#: ../urpm/install.pm:241
+#: ../urpm/install.pm:240
#, c-format
msgid "unable to install package %s"
msgstr "ne mogu da instaliram paket %s"
-#: ../urpm/install.pm:244
+#: ../urpm/install.pm:243
#, fuzzy, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "Instaliram %s"
-#: ../urpm/install.pm:245 ../urpm/install.pm:310
+#: ../urpm/install.pm:244 ../urpm/install.pm:370
#, fuzzy, c-format
msgid "removing %s failed: %s"
msgstr "...povraćaj neuspeo: %s"
-#: ../urpm/install.pm:291
+#: ../urpm/install.pm:294
#, fuzzy, c-format
msgid "Removing package %s"
msgstr "uklanjam paket %s"
-#: ../urpm/install.pm:292
+#: ../urpm/install.pm:295
#, c-format
msgid "removing package %s"
msgstr "uklanjam paket %s"
-#: ../urpm/install.pm:308
+#: ../urpm/install.pm:338
+#, c-format
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr ""
+"kreirana transakcija za instaliranje na %s (ukloni=%d, instaliraj=%d, "
+"ažuriraj=%d)"
+
+#: ../urpm/install.pm:341
+#, c-format
+msgid "unable to create transaction"
+msgstr "ne mogu da kreiram transakciju"
+
+#: ../urpm/install.pm:368
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "Instaliram %s"
-#: ../urpm/install.pm:317
+#: ../urpm/install.pm:377
#, fuzzy, c-format
msgid "More information on package %s"
msgstr "Dodatne informacije o paketu..."
@@ -814,22 +809,22 @@ msgstr "Dodatne informacije o paketu..."
msgid "Cannot create ldap cache directory"
msgstr ""
-#: ../urpm/ldap.pm:44
+#: ../urpm/ldap.pm:48
#, c-format
msgid "Cannot write cache file for ldap\n"
msgstr ""
-#: ../urpm/ldap.pm:179
+#: ../urpm/ldap.pm:177
#, c-format
msgid "No server defined, missing uri or host"
msgstr ""
-#: ../urpm/ldap.pm:180
+#: ../urpm/ldap.pm:178
#, fuzzy, c-format
msgid "No base defined"
msgstr "Nije određena komanda"
-#: ../urpm/ldap.pm:190 ../urpm/ldap.pm:193
+#: ../urpm/ldap.pm:188 ../urpm/ldap.pm:191
#, c-format
msgid "Cannot connect to ldap uri:"
msgstr ""
@@ -953,47 +948,47 @@ msgstr "Instalacija je moguća"
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr ""
-#: ../urpm/media.pm:270
+#: ../urpm/media.pm:268
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr "virtuleni medij \"%s\" bi trebao da ima čist url, ignorišem medij"
-#: ../urpm/media.pm:272
+#: ../urpm/media.pm:270
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "ne mogu da pristupim fajlu liste za \"%s\", medij ignorisan"
-#: ../urpm/media.pm:275
+#: ../urpm/media.pm:273
#, fuzzy, c-format
msgid "unable to access synthesis file of \"%s\", medium ignored"
msgstr "ne mogu da pristupim hdlist fajlu za \"%s\", medij je ignorisan"
-#: ../urpm/media.pm:301
+#: ../urpm/media.pm:299
#, fuzzy, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "pokušavam da premostim postojeći medij \"%s\", izbegavam"
-#: ../urpm/media.pm:517
+#: ../urpm/media.pm:515
#, c-format
msgid "failed to migrate removable device, ignoring media"
msgstr ""
-#: ../urpm/media.pm:555
+#: ../urpm/media.pm:558
#, c-format
msgid "wrote config file [%s]"
msgstr "upisujem u konfiguracionu datoteku [%s]"
-#: ../urpm/media.pm:598
+#: ../urpm/media.pm:649
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr "Ne mogu da koristim paralelni mod sa use-distrib modom"
-#: ../urpm/media.pm:606
+#: ../urpm/media.pm:657
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr "koristim dodeljeni medij za paralelni mod: %s"
-#: ../urpm/media.pm:622
+#: ../urpm/media.pm:673
#, fuzzy, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -1002,228 +997,228 @@ msgstr ""
"--synthesis se ne može koristiti sa --media, --excludemedia, --sortmedia, --"
"update ili --parallel"
-#: ../urpm/media.pm:731
+#: ../urpm/media.pm:782
#, fuzzy, c-format
msgid "Search start: %s end: %s"
msgstr "Traži instalirane fontove"
-#: ../urpm/media.pm:748
+#: ../urpm/media.pm:799
#, c-format
msgid "skipping package %s"
msgstr "preskačem paket %s"
-#: ../urpm/media.pm:764
+#: ../urpm/media.pm:815
#, c-format
msgid "would install instead of upgrade package %s"
msgstr "će instalirati umesto ažurirati paket %s"
-#: ../urpm/media.pm:840
+#: ../urpm/media.pm:898
#, c-format
msgid "medium \"%s\" already exists"
msgstr "medij \"%s\" već postoji"
-#: ../urpm/media.pm:882
+#: ../urpm/media.pm:940
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:888
+#: ../urpm/media.pm:946
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "čitam hedere sa medija \"%s\""
-#: ../urpm/media.pm:894
+#: ../urpm/media.pm:952
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "uklanjam medij \"%s\""
-#: ../urpm/media.pm:918
+#: ../urpm/media.pm:976
#, fuzzy, c-format
msgid "failed to copy media.cfg to %s (%d)"
msgstr "ne mogu da otvorim rpmdb"
-#: ../urpm/media.pm:960
+#: ../urpm/media.pm:1047
#, c-format
msgid "directory %s does not exist"
msgstr ""
-#: ../urpm/media.pm:968
+#: ../urpm/media.pm:1055
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:992
+#: ../urpm/media.pm:1079
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "ne mogu da otvorim rpmdb"
-#: ../urpm/media.pm:995
+#: ../urpm/media.pm:1082
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"ne mogu da pristupim prvom instalacionom mediju (nije pronađen hdlists fajl)"
-#: ../urpm/media.pm:1016
+#: ../urpm/media.pm:1103
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr ""
-#: ../urpm/media.pm:1031
+#: ../urpm/media.pm:1118
#, fuzzy, c-format
msgid "ignoring non-free medium `%s'"
msgstr "Menjam medij \"%s\":"
-#: ../urpm/media.pm:1074
+#: ../urpm/media.pm:1167
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "dobavljam hdlists fajl..."
-#: ../urpm/media.pm:1117
+#: ../urpm/media.pm:1210
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "pokušavam da selektujem nepostojeći medij \"%s\""
-#: ../urpm/media.pm:1120
+#: ../urpm/media.pm:1213
#, c-format
msgid "selecting multiple media: %s"
msgstr "pokušavam da selektujem višestruki medij: %s"
-#: ../urpm/media.pm:1179
+#: ../urpm/media.pm:1272
#, c-format
msgid "removing medium \"%s\""
msgstr "uklanjam medij \"%s\""
-#: ../urpm/media.pm:1262
+#: ../urpm/media.pm:1363
#, fuzzy, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "dobavljam rpm fajlove dza medij \"%s\"..."
-#: ../urpm/media.pm:1296
+#: ../urpm/media.pm:1397
#, fuzzy, c-format
msgid "...reconfiguration failed"
msgstr "Konfiguracija menija sačuvana"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1403
#, fuzzy, c-format
msgid "reconfiguration done"
msgstr "Podešavanje servera"
-#: ../urpm/media.pm:1318
+#: ../urpm/media.pm:1419
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1339
+#: ../urpm/media.pm:1440
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "medij \"%s\" nije izabran"
-#: ../urpm/media.pm:1350
+#: ../urpm/media.pm:1451
#, c-format
msgid "examining synthesis file [%s]"
msgstr "ispitujem synthesis fajl [%s]"
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1471
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "problem sa čitanjem synthesis fajla za medij \"%s\""
-#: ../urpm/media.pm:1383 ../urpm/media.pm:1478
+#: ../urpm/media.pm:1484 ../urpm/media.pm:1579
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "upisujem listu fajlova za medij \"%s\""
-#: ../urpm/media.pm:1385 ../urpm/media.pm:1455 ../urpm/media.pm:1708
+#: ../urpm/media.pm:1486 ../urpm/media.pm:1556 ../urpm/media.pm:1809
#, c-format
msgid "...copying failed"
msgstr "...kopiranje nije uspelo"
-#: ../urpm/media.pm:1451
+#: ../urpm/media.pm:1552
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "kopiram opisni fajl za \"%s\"..."
-#: ../urpm/media.pm:1453 ../urpm/media.pm:1482
+#: ../urpm/media.pm:1554 ../urpm/media.pm:1583
#, c-format
msgid "...copying done"
msgstr "...kopiranje završeno"
-#: ../urpm/media.pm:1484
+#: ../urpm/media.pm:1585
#, fuzzy, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "kopiranje [%s] neuspelo"
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1633
#, fuzzy, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr "proračunavam md5sum kopirane source hdlist (ili synthesis)"
-#: ../urpm/media.pm:1534 ../urpm/media.pm:1974
+#: ../urpm/media.pm:1635 ../urpm/media.pm:2118
#, fuzzy, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "kopiranje [%s] neuspelo"
-#: ../urpm/media.pm:1549
+#: ../urpm/media.pm:1650
#, fuzzy, c-format
msgid "genhdlist2 failed on %s"
msgstr "ispitujem hdlist fajl [%s]"
-#: ../urpm/media.pm:1559
+#: ../urpm/media.pm:1660
#, fuzzy, c-format
msgid "comparing %s and %s"
msgstr "Instaliram %s"
-#: ../urpm/media.pm:1589
+#: ../urpm/media.pm:1690
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "nije pronađena hdlist datoteka za medij \"%s\""
-#: ../urpm/media.pm:1615
+#: ../urpm/media.pm:1716
#, fuzzy, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "kopiram opisni fajl za \"%s\"..."
-#: ../urpm/media.pm:1655
+#: ../urpm/media.pm:1756
#, fuzzy, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "pogrešno ime rpm datoteke [%s]"
-#: ../urpm/media.pm:1658
+#: ../urpm/media.pm:1759
#, fuzzy, c-format
msgid "no metadata found for medium \"%s\""
msgstr "nije pronađena hdlist datoteka za medij \"%s\""
-#: ../urpm/media.pm:1690
+#: ../urpm/media.pm:1791
#, fuzzy, c-format
msgid "retrieving source synthesis of \"%s\"..."
msgstr "dobavljam izorni hdlist (ili synthesis) za \"%s\"..."
-#: ../urpm/media.pm:1756
+#: ../urpm/media.pm:1857
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "ispitukem fajl sa javnim ključem za \"%s\"..."
-#: ../urpm/media.pm:1768
+#: ../urpm/media.pm:1869
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "..importovani ključ %s od javnog ključa za \"%s\""
-#: ../urpm/media.pm:1772
+#: ../urpm/media.pm:1873
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "ne mogu da importujem javni ključ za \"%s\""
-#: ../urpm/media.pm:1813
+#: ../urpm/media.pm:1914
#, fuzzy, c-format
msgid "no synthesis file found for medium \"%s\""
msgstr "nije pronađena hdlist datoteka za medij \"%s\""
-#: ../urpm/media.pm:1846
+#: ../urpm/media.pm:1947
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "dodani medij %s"
-#: ../urpm/media.pm:1968
+#: ../urpm/media.pm:2112
#, c-format
msgid "retrieval of [%s] failed"
msgstr ""
@@ -1248,83 +1243,83 @@ msgstr ""
msgid "getting mirror list from %s"
msgstr "čitam rpm fajlove sa [%s]"
-#: ../urpm/msg.pm:74 ../urpmi:490 ../urpmi:508 ../urpmi:624
+#: ../urpm/msg.pm:75 ../urpmi:492 ../urpmi:510 ../urpmi:626
#, c-format
msgid "Nn"
msgstr "NnNn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:75 ../urpme:38 ../urpmi.addmedia:133
+#: ../urpm/msg.pm:76 ../urpme:38 ../urpmi.addmedia:133
#, c-format
msgid "Yy"
msgstr "DdDdYy"
-#: ../urpm/msg.pm:105 ../urpme:158 ../urpmi.addmedia:136
+#: ../urpm/msg.pm:101 ../urpme:158 ../urpmi.addmedia:136
#, c-format
msgid " (y/N) "
msgstr " (d/N) "
-#: ../urpm/msg.pm:134
+#: ../urpm/msg.pm:130
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "Pogrešan izbor, probajte ponovo\n"
-#: ../urpm/msg.pm:165
+#: ../urpm/msg.pm:161
#, c-format
msgid "Package"
msgstr ""
-#: ../urpm/msg.pm:165
+#: ../urpm/msg.pm:161
#, c-format
msgid "Version"
msgstr ""
-#: ../urpm/msg.pm:165
+#: ../urpm/msg.pm:161
#, c-format
msgid "Release"
msgstr ""
-#: ../urpm/msg.pm:165
+#: ../urpm/msg.pm:161
#, fuzzy, c-format
msgid "Arch"
msgstr "Traži"
-#: ../urpm/msg.pm:174
+#: ../urpm/msg.pm:170
#, c-format
msgid "(suggested)"
msgstr ""
-#: ../urpm/msg.pm:189
+#: ../urpm/msg.pm:185
#, fuzzy, c-format
msgid "medium \"%s\""
msgstr "uklanjam medij \"%s\""
-#: ../urpm/msg.pm:189
+#: ../urpm/msg.pm:185
#, c-format
msgid "command line"
msgstr ""
-#: ../urpm/msg.pm:203
+#: ../urpm/msg.pm:199
#, c-format
msgid "B"
msgstr ""
-#: ../urpm/msg.pm:203
+#: ../urpm/msg.pm:199
#, c-format
msgid "KB"
msgstr "KB"
-#: ../urpm/msg.pm:203
+#: ../urpm/msg.pm:199
#, c-format
msgid "MB"
msgstr "MB"
-#: ../urpm/msg.pm:203
+#: ../urpm/msg.pm:199
#, c-format
msgid "GB"
msgstr "GB"
-#: ../urpm/msg.pm:203 ../urpm/msg.pm:212
+#: ../urpm/msg.pm:199 ../urpm/msg.pm:208
#, c-format
msgid "TB"
msgstr "TB"
@@ -1334,7 +1329,7 @@ msgstr "TB"
msgid "Marking %s as manually installed, it won't be auto-orphaned"
msgstr ""
-#: ../urpm/orphans.pm:522
+#: ../urpm/orphans.pm:523
#, fuzzy, c-format
msgid ""
"The following package:\n"
@@ -1348,7 +1343,7 @@ msgstr[0] "Potreban(i) su sledeći paket(i):"
msgstr[1] "Potreban(i) su sledeći paket(i):"
msgstr[2] "Potreban(i) su sledeći paket(i):"
-#: ../urpm/orphans.pm:525
+#: ../urpm/orphans.pm:526
#, fuzzy, c-format
msgid "You may wish to remove it."
msgid_plural "You may wish to remove them."
@@ -1356,7 +1351,7 @@ msgstr[0] "Nema ničega što bi se moglo ukloniti"
msgstr[1] "Nema ničega što bi se moglo ukloniti"
msgstr[2] "Nema ničega što bi se moglo ukloniti"
-#: ../urpm/orphans.pm:542
+#: ../urpm/orphans.pm:543
#, c-format
msgid ""
"The following package:\n"
@@ -1455,57 +1450,57 @@ msgid ""
"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
-#: ../urpm/select.pm:217
+#: ../urpm/select.pm:220
#, c-format
msgid "No package named %s"
msgstr "Nema paketa sa imenom %s"
-#: ../urpm/select.pm:219 ../urpme:112
+#: ../urpm/select.pm:222 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Sledeći paketi sadrže %s: %s"
-#: ../urpm/select.pm:221
+#: ../urpm/select.pm:224
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr ""
-#: ../urpm/select.pm:368
+#: ../urpm/select.pm:371
#, fuzzy, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "sve je već instalirano"
-#: ../urpm/select.pm:600
+#: ../urpm/select.pm:606
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "sve je već instalirano"
-#: ../urpm/select.pm:601
+#: ../urpm/select.pm:607
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "sve je već instalirano"
-#: ../urpm/select.pm:618 ../urpm/select.pm:705
+#: ../urpm/select.pm:624 ../urpm/select.pm:711
#, c-format
msgid "due to conflicts with %s"
msgstr "zbog konflikta sa %s"
-#: ../urpm/select.pm:619 ../urpm/select.pm:699
+#: ../urpm/select.pm:625 ../urpm/select.pm:705
#, c-format
msgid "due to unsatisfied %s"
msgstr "zbog ne zadovoljenog %s"
-#: ../urpm/select.pm:625
+#: ../urpm/select.pm:631
#, c-format
msgid "trying to promote %s"
msgstr "pokušavam da prikažem %s"
-#: ../urpm/select.pm:626
+#: ../urpm/select.pm:632
#, c-format
msgid "in order to keep %s"
msgstr "da bih zadržao %s"
-#: ../urpm/select.pm:667
+#: ../urpm/select.pm:673
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -1514,7 +1509,7 @@ msgstr ""
"Sledeći paketi se moraju ukloniti da bi drugi mogli da budu ažurirani:\n"
"%s"
-#: ../urpm/select.pm:668
+#: ../urpm/select.pm:674
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1523,12 +1518,12 @@ msgstr ""
"Sledeći paketi se moraju ukloniti da bi drugi mogli da budu ažurirani:\n"
"%s"
-#: ../urpm/select.pm:695
+#: ../urpm/select.pm:701
#, c-format
msgid "in order to install %s"
msgstr "da bi instalirao %s"
-#: ../urpm/select.pm:701
+#: ../urpm/select.pm:707
#, c-format
msgid "due to missing %s"
msgstr "zbog ne postojanja %s"
@@ -1568,37 +1563,37 @@ msgstr ""
msgid "Medium without key (%s)"
msgstr ""
-#: ../urpm/sys.pm:213
+#: ../urpm/sys.pm:211
#, c-format
msgid "system"
msgstr ""
-#: ../urpm/sys.pm:250
+#: ../urpm/sys.pm:248
#, c-format
msgid "You should restart your computer for %s"
msgstr ""
-#: ../urpm/sys.pm:252
+#: ../urpm/sys.pm:250
#, c-format
msgid "You should restart your session for %s"
msgstr ""
-#: ../urpm/sys.pm:254
+#: ../urpm/sys.pm:252
#, c-format
msgid "You should restart %s for %s"
msgstr ""
-#: ../urpm/sys.pm:392
+#: ../urpm/sys.pm:390
#, fuzzy, c-format
msgid "Can't write file"
msgstr "ne mogu da izvršim upis u konfiguracionu datoteku [%s]"
-#: ../urpm/sys.pm:392
+#: ../urpm/sys.pm:390
#, fuzzy, c-format
msgid "Can't open file"
msgstr "Kopiranje nije uspelo"
-#: ../urpm/sys.pm:405
+#: ../urpm/sys.pm:403
#, fuzzy, c-format
msgid "Can't move file %s to %s"
msgstr "Kopiranje nije uspelo"
@@ -1619,7 +1614,7 @@ msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
" --test - proverava da li se može izvesti ispravna instalacija.\n"
-#: ../urpme:47 ../urpmi:104 ../urpmq:66
+#: ../urpme:47 ../urpmi:106 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr " --parallel - distribuirani urpmi preko mašina sa nadimkom.\n"
@@ -1629,7 +1624,7 @@ msgstr " --parallel - distribuirani urpmi preko mašina sa nadimkom.\n"
msgid " --root - use another root for rpm removal.\n"
msgstr " --curl - koristi još jedan root za rpm instalaciju.\n"
-#: ../urpme:49 ../urpmf:35 ../urpmi:106 ../urpmi.addmedia:73
+#: ../urpme:49 ../urpmf:35 ../urpmi:108 ../urpmi.addmedia:73
#: ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:68
#, fuzzy, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
@@ -1654,7 +1649,7 @@ msgstr ""
" --use-distrib - podešava urpmi u letu sa distrib stabla.\n"
" Ova opcija dozvoljava ispitivanje distribucije.\n"
-#: ../urpme:54 ../urpmi:148 ../urpmq:87
+#: ../urpme:54 ../urpmi:150 ../urpmq:87
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " -verbose - verbose režim.\n"
@@ -1745,7 +1740,7 @@ msgstr "Uklanjanje nije uspelo"
msgid " --version - print this tool's version number.\n"
msgstr " --help - prikazuje ovaj ekran o pomoći.\n"
-#: ../urpmf:32 ../urpmi:128 ../urpmq:78
+#: ../urpmf:32 ../urpmi:130 ../urpmq:78
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
@@ -2109,12 +2104,19 @@ msgstr " --noclean - čuva rpm koji nisu korišćeni u kešu.\n"
#: ../urpmi:97
#, c-format
msgid ""
-" --replacepkgs - force installing packages which are already installed.\n"
+" --downgrade - dowgrade a package from the version currently installed\n"
+" to the previously highest version\n"
msgstr ""
#: ../urpmi:99
#, c-format
msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:101
+#, c-format
+msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
" dependencies checking.\n"
msgstr ""
@@ -2122,7 +2124,7 @@ msgstr ""
"bez\n"
" provere međuzavisnosti paketa.\n"
-#: ../urpmi:101
+#: ../urpmi:103
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -2132,12 +2134,12 @@ msgstr ""
"bez\n"
" provere međuzavisnosti i integriteta.\n"
-#: ../urpmi:103
+#: ../urpmi:105
#, fuzzy, c-format
msgid " --allow-suggests - auto select \"suggested\" packages.\n"
msgstr " --obsoletes - prikazuje tag višak: svi viškovi (u više reda).\n"
-#: ../urpmi:107
+#: ../urpmi:109
#, fuzzy, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
@@ -2146,56 +2148,56 @@ msgstr ""
" --use-distrib - podešava urpmi u letu sa distrib stabla.\n"
" Ova opcija dozvoljava ispitivanje distribucije.\n"
-#: ../urpmi:109 ../urpmi.addmedia:60 ../urpmi.update:37
+#: ../urpmi:111 ../urpmi.addmedia:60 ../urpmi.update:37
#, c-format
msgid " --metalink - generate and use a local metalink.\n"
msgstr ""
-#: ../urpmi:110
+#: ../urpmi:112
#, c-format
msgid ""
" --download-all - download all needed packages before trying to install "
"them\n"
msgstr ""
-#: ../urpmi:111
+#: ../urpmi:113
#, c-format
msgid ""
" --downloader - program to use to retrieve distant files. \n"
" known programs: %s\n"
msgstr ""
-#: ../urpmi:114
+#: ../urpmi:116
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr ""
-#: ../urpmi:115
+#: ../urpmi:117
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr ""
-#: ../urpmi:116
+#: ../urpmi:118
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr ""
-#: ../urpmi:117
+#: ../urpmi:119
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr ""
-#: ../urpmi:118
+#: ../urpmi:120
#, c-format
msgid " --aria2-options - additional options to pass to aria2\n"
msgstr ""
-#: ../urpmi:119 ../urpmi.addmedia:61 ../urpmi.update:38
+#: ../urpmi:121 ../urpmi.addmedia:61 ../urpmi.update:38
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - limitira brzinu download-a.\n"
-#: ../urpmi:120
+#: ../urpmi:122
#, fuzzy, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -2205,7 +2207,7 @@ msgstr ""
" (--no-verify-rpm ne verigikuje, standardna je "
"verifikacija).\n"
-#: ../urpmi:122 ../urpmi.addmedia:62 ../urpmi.update:39 ../urpmq:74
+#: ../urpmi:124 ../urpmi.addmedia:62 ../urpmi.update:39 ../urpmq:74
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -2215,7 +2217,7 @@ msgstr ""
"pretpostavlja\n"
" da je 1080 po default-u (format je <proxyhost[:port]>).\n"
-#: ../urpmi:124 ../urpmi.addmedia:64 ../urpmi.update:41 ../urpmq:76
+#: ../urpmi:126 ../urpmi.addmedia:64 ../urpmi.update:41 ../urpmq:76
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -2224,7 +2226,7 @@ msgstr ""
" --proxy-user - određuje korisnika i lozinku koji se koriste za proxy\n"
" autentifikaciju (format je <user:password>).\n"
-#: ../urpmi:126
+#: ../urpmi:128
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -2233,123 +2235,123 @@ msgstr ""
" --bug - pravi izveštaj o grešci u direktorijumu prosleđenom\n"
" kao sledeći argument.\n"
-#: ../urpmi:132
+#: ../urpmi:134
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - isključuje putanju razdvojenu zarezom.\n"
-#: ../urpmi:133
+#: ../urpmi:135
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - isključuje docs fajlove.\n"
-#: ../urpmi:134
+#: ../urpmi:136
#, fuzzy, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr ""
" --no-uninstall - nikada ne traži deinstalaciju paketa, obustavi "
"instalaciju.\n"
-#: ../urpmi:135
+#: ../urpmi:137
#, fuzzy, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr " --url - prikazuje tag url: url.\n"
-#: ../urpmi:136
+#: ../urpmi:138
#, fuzzy, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --description - prikazuje tag opisa: opis.\n"
-#: ../urpmi:137
+#: ../urpmi:139
#, fuzzy, c-format
msgid " --replacefiles - ignore file conflicts\n"
msgstr " --conflicts - prikazuje tag konflikata: svi konflikti.\n"
-#: ../urpmi:138
+#: ../urpmi:140
#, fuzzy, c-format
msgid " --skip - packages which installation should be skipped\n"