sync with code

1 files changed, 79 insertions, 71 deletions

diff --git a/po/bn.po b/po/bn.po
index 6404b33d..4612aedb 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -25,7 +25,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
 "PO-Revision-Date: 2005-02-13 13:39+0600\n"
 "Last-Translator: Jamil Ahmed <jamil@bengalinux.org>\n"
 "Language-Team: Bangla <mdk-translation@bengalinux.org>\n"
@@ -75,7 +75,7 @@ msgstr "`%s' প্যাকেজ ইনস্টল করা হচ্ছে
 msgid "Downloading package `%s'..."
 msgstr "`%s' প্যাকেজ ডাউনলোড করা হচ্ছে..."
 
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
 #, c-format
 msgid "Cancel"
 msgstr "বাতিল"
@@ -87,22 +87,22 @@ msgstr "বাতিল"
 msgid "...retrieving failed: %s"
 msgstr "...আনতে ব্যর্থ হয়েছি: %s"
 
-#: ../gurpmi:45
+#: ../gurpmi:49
 #, c-format
 msgid "RPM installation"
 msgstr "আরপিএম ইনস্টলেশন"
 
-#: ../gurpmi:59
+#: ../gurpmi:63
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
 #, c-format
 msgid "_Ok"
 msgstr "ঠিক আছে (_ঠ)"
 
-#: ../gurpmi:80
+#: ../gurpmi:84
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -123,7 +123,7 @@ msgstr ""
 "\n"
 "আপনি কি করতে চান?"
 
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -138,7 +138,7 @@ msgstr ""
 "\n"
 "এগিয়ে যাবো?"
 
-#: ../gurpmi:94
+#: ../gurpmi:98
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -153,26 +153,31 @@ msgstr ""
 "\n"
 "আপনি হয়তো এটা সেভ করে রাখতে চাইবেন। আপনার পছন্দ কি?"
 
-#: ../gurpmi:112
+#: ../gurpmi:116
 #, c-format
 msgid "_Install"
 msgstr "_ইনস্টল"
 
-#: ../gurpmi:113
+#: ../gurpmi:117
 #, c-format
 msgid "_Save"
 msgstr "_সংরক্ষণ"
 
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
 #, c-format
 msgid "_Cancel"
 msgstr "বাতিল (_ত)"
 
-#: ../gurpmi:122
+#: ../gurpmi:126
 #, c-format
 msgid "Choose location to save file"
 msgstr "ফাইল সংরক্ষণ করার অবস্থান বেছে নিন"
 
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "ঠিক আছে"
+
 #: ../gurpmi.pm:56
 #, c-format
 msgid "Options:"
@@ -253,17 +258,17 @@ msgstr ""
 msgid "No packages specified"
 msgstr "কোন নির্দেশ পাওয়া যায় নি"
 
-#: ../gurpmi2:42
+#: ../gurpmi2:46
 #, c-format
 msgid "Must be root"
 msgstr "অবশ্যই root হতে হবে"
 
-#: ../gurpmi2:72
+#: ../gurpmi2:76
 #, c-format
 msgid "Preparing packages installation..."
 msgstr "প্যাকেজ ইনস্টলেশন প্রক্রিয়ার জন্য প্রস্তুতি নেওয়া হচ্ছে..."
 
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -272,7 +277,7 @@ msgstr ""
 "আবেদনকৃত কিছু প্যাকেজ ইনস্টল করা যায়নি:\n"
 "%s"
 
-#: ../gurpmi2:95
+#: ../gurpmi2:99
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -283,42 +288,37 @@ msgstr ""
 "%s\n"
 "এগিয়ে যাবো?"
 
-#: ../gurpmi2:115
+#: ../gurpmi2:119
 #, c-format
 msgid "Warning"
 msgstr "নোটিশ"
 
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "ঠিক আছে"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
 #, c-format
 msgid " (to upgrade)"
 msgstr " (আপগ্রেডের জন্য)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:170
 #, c-format
 msgid " (to install)"
 msgstr " (ইনস্টলের জন্য)"
 
-#: ../gurpmi2:169
+#: ../gurpmi2:173
 #, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:170
+#: ../gurpmi2:174
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "নিম্নলিখিত প্যাকেজসমুহের মধ্যে একটির প্রয়োজন আছে:"
 
-#: ../gurpmi2:200
+#: ../gurpmi2:204
 #, c-format
 msgid "_Abort"
 msgstr "_বাতিল"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:239
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -329,36 +329,36 @@ msgstr ""
 "%s\n"
 "এগিয়ে যাবো?"
 
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr ""
 
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr ""
 
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr ""
 
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr ""
 "নিম্নলিখিত প্যাকেজগুলি ইনস্টল হতে যাচ্ছে, ডিপেন্ডেন্সিদের সন্তুষ্ট করতে (%d এমবি)"
 
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
@@ -366,34 +366,34 @@ msgstr ""
 "ডিপেন্ডেন্সি সন্তুষ্ট করতে নিম্নলিখিত %d প্যাকেজগুলো ইনস্টল হতে যাচ্ছে:\n"
 "%s\n"
 
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "সোর্স প্যাকেজ গুলি পাওয়া যায়নি, থামানো হচ্ছে"
 
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "অনুগ্রহ করে \"%s\" নামের মাধ্যম [%s] নামের ডিভাইসে প্রবেশ করান"
 
-#: ../gurpmi2:303
+#: ../gurpmi2:307
 #, c-format
 msgid "An error occurred:"
 msgstr ""
 
-#: ../gurpmi2:315
+#: ../gurpmi2:319
 #, c-format
 msgid "_Done"
 msgstr "_সম্পন্ন"
 
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
 #, fuzzy, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s"
 msgstr "ইনস্টলেশন ব্যর্থ"
 
-#: ../gurpmi2:335
+#: ../gurpmi2:339
 #, fuzzy, c-format
 msgid "You may want to update your urpmi database."
 msgstr ""
@@ -401,22 +401,22 @@ msgstr ""
 "%s\n"
 "আপনি হয়তো আপনার urpmi ডাটাবেস আপডেট করতে চাইবেন"
 
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "ইনস্টলেশন ব্যর্থ"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:348
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "সবকিছু আগে থেকেই ইনস্টল করা আছে"
 
-#: ../gurpmi2:346
+#: ../gurpmi2:350
 #, c-format
 msgid "Installation finished"
 msgstr "ইনস্টলেশন প্রক্রিয়া সম্পূর্ণ হয়েছে"
 
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
 #, c-format
 msgid "restarting urpmi"
 msgstr "urpmi আবার শুরু করা হচ্ছে"
@@ -490,7 +490,7 @@ msgstr "`%s' প্যাকেজ ডাউনলোড করা হচ্ছ�
 msgid "Environment directory %s does not exist"
 msgstr ""
 
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "%s-এর ওপর সুনির্দিষ্ট পরিবেশ ব্যবহার করো\n"
@@ -545,62 +545,62 @@ msgstr "স্থানীয় প্যাকেজসমূহ রেজিস�
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
 
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
 #, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "কমান্ড লাইনের ওপর বাজে প্রক্সি ঘোষণা\n"
 
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: \"%s\" rpm ফাইল পড়া যাচ্ছেনা\n"
 
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
 #, c-format
 msgid "unexpected expression %s"
 msgstr ""
 
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "(%s) স্বাক্ষর পাওয়া যাচ্ছে না"
 
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
 #, c-format
 msgid "no expression to close"
 msgstr ""
 
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
 
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
 #, c-format
 msgid ""
 "%s version %s\n"
@@ -616,7 +616,7 @@ msgstr ""
 "\n"
 "ব্যবহার:\n"
 
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
 #, fuzzy, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "কপিরাইট (C) ১৯৯৯-২০০৬ ম্যান্ড্রিব।"
@@ -663,7 +663,7 @@ msgstr "কনফিগ ফাইল [%s]-এ লেখা সম্ভব হ�
 msgid "medium `%s' is defined twice, aborting"
 msgstr ""
 
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "কনফিগ ফাইল [%s]-এ লেখা সম্ভব হয়নি"
@@ -1353,7 +1353,7 @@ msgstr "অনুসন্ধান"
 
 #: ../urpm/msg.pm:170
 #, c-format
-msgid "(suggested)"
+msgid "(recommended)"
 msgstr ""
 
 #: ../urpm/msg.pm:185
@@ -2008,8 +2008,8 @@ msgstr "  --sourcerpm    - source rpm: sourcerpm ট্যাগ ছাপাও
 
 #: ../urpmf:75
 #, fuzzy, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --obsoletes    - all obsoletes: obsoletes ট্যাগ ছাপাও।\n"
+msgid "  --recommends   - recommends tags\n"
+msgstr "  --requires     - all requires: requires ট্যাগ ছাপাও।\n"
 
 #: ../urpmf:76
 #, fuzzy, c-format
@@ -2036,27 +2036,27 @@ msgstr "  -l             - প্যাকেজে ফাইলের তাল
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - ভার্সন, প্রকাশ এবং আর্ক এর সঙ্গে নাম ছাপাও।\n"
 
-#: ../urpmf:148
+#: ../urpmf:149
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr ""
 
-#: ../urpmf:193
+#: ../urpmf:194
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:286
+#: ../urpmf:287
 #, fuzzy, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "\"%s\" মাধ্যমের জন্য কোন hdlist ফাইল পাওয়া যায়নি"
 
-#: ../urpmf:293
+#: ../urpmf:294
 #, fuzzy, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "\"%s\" মাধ্যমের জন্য hdlist synthesis ফাইল তৈরি করা হচ্ছে"
 
-#: ../urpmf:302
+#: ../urpmf:303
 #, fuzzy, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "\"%s\"-এর তালিকা ফাইল লিখছি..."
@@ -2084,7 +2084,7 @@ msgstr ""
 
 #: ../urpmi:80 ../urpmq:52
 #, fuzzy, c-format
-msgid "  --no-suggests  - do not auto select \"suggested\" packages.\n"
+msgid "  --no-recommends - do not auto select \"recommended\" packages.\n"
 msgstr "  --obsoletes    - all obsoletes: obsoletes ট্যাগ ছাপাও।\n"
 
 #: ../urpmi:81
@@ -2186,7 +2186,7 @@ msgstr ""
 
 #: ../urpmi:105
 #, fuzzy, c-format
-msgid "  --allow-suggests - auto select \"suggested\" packages.\n"
+msgid "  --allow-recommends - auto select \"recommended\" packages.\n"
 msgstr "  --obsoletes    - all obsoletes: obsoletes ট্যাগ ছাপাও।\n"
 
 #: ../urpmi:109
@@ -2990,8 +2990,8 @@ msgstr "  --requires     - all requires: requires ট্যাগ ছাপা�
 
 #: ../urpmq:84
 #, fuzzy, c-format
-msgid "  --suggests     - print suggests.\n"
-msgstr "  --obsoletes    - all obsoletes: obsoletes ট্যাগ ছাপাও।\n"
+msgid "  --recommends   - print recommends.\n"
+msgstr "  --requires     - all requires: requires ট্যাগ ছাপাও।\n"
 
 #: ../urpmq:85
 #, fuzzy, c-format
@@ -3155,6 +3155,14 @@ msgid "Authentication is required to run Mageia Package Installer"
 msgstr ""
 
 #, fuzzy
+#~ msgid "  --suggests     - suggests tags\n"
+#~ msgstr "  --obsoletes    - all obsoletes: obsoletes ট্যাগ ছাপাও।\n"
+
+#, fuzzy
+#~ msgid "  --suggests     - print suggests.\n"
+#~ msgstr "  --obsoletes    - all obsoletes: obsoletes ট্যাগ ছাপাও।\n"
+
+#, fuzzy
 #~ msgid "(%d package, %d MB)"
 #~ msgid_plural "(%d packages, %d MB)"
 #~ msgstr[0] "%d প্যাকেজ সমূহ"