merge two more strings

1 files changed, 156 insertions, 144 deletions

diff --git a/po/ga.po b/po/ga.po
index aa3e1325..5820bdf5 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2002-09-05 18:22+0200\n"
+"POT-Creation-Date: 2002-09-11 15:17+0200\n"
 "PO-Revision-Date: 2000-08-24 12:00-0000\n"
 "Last-Translator: Alastair McKinstry <mckinstry@computer.org>\n"
 "Language-Team: Irish <ga@li.org>\n"
@@ -54,7 +54,7 @@ msgstr ""
 msgid "Removable device"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:58 ../rpmdrake_.c:484
+#: ../edit-urpm-sources.pl_.c:58 ../rpmdrake_.c:487
 msgid "Security updates"
 msgstr ""
 
@@ -105,15 +105,15 @@ msgstr ""
 
 #: ../edit-urpm-sources.pl_.c:123 ../edit-urpm-sources.pl_.c:182
 #: ../edit-urpm-sources.pl_.c:214 ../rpmdrake.pm_.c:85 ../rpmdrake.pm_.c:105
-#: ../rpmdrake.pm_.c:277 ../rpmdrake_.c:338 ../rpmdrake_.c:862
-#: ../rpmdrake_.c:888
+#: ../rpmdrake.pm_.c:277 ../rpmdrake_.c:340 ../rpmdrake_.c:868
+#: ../rpmdrake_.c:899
 msgid "Ok"
 msgstr "Ceart go Leor"
 
 #: ../edit-urpm-sources.pl_.c:126 ../edit-urpm-sources.pl_.c:174
 #: ../edit-urpm-sources.pl_.c:182 ../edit-urpm-sources.pl_.c:215
-#: ../rpmdrake.pm_.c:277 ../rpmdrake.pm_.c:301 ../rpmdrake_.c:338
-#: ../rpmdrake_.c:888
+#: ../rpmdrake.pm_.c:277 ../rpmdrake.pm_.c:301 ../rpmdrake_.c:340
+#: ../rpmdrake_.c:899
 msgid "Cancel"
 msgstr "Cealaigh"
 
@@ -191,7 +191,7 @@ msgstr ""
 msgid "Source"
 msgstr "Bún"
 
-#: ../edit-urpm-sources.pl_.c:261 ../rpmdrake_.c:658
+#: ../edit-urpm-sources.pl_.c:261 ../rpmdrake_.c:663
 msgid "Remove"
 msgstr ""
 
@@ -216,11 +216,11 @@ msgstr "Earraidh..."
 msgid "Save and quit"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:272 ../rpmdrake_.c:661
+#: ../edit-urpm-sources.pl_.c:272 ../rpmdrake_.c:666
 msgid "Quit"
 msgstr "Éirigh"
 
-#: ../edit-urpm-sources.pl_.c:282 ../rpmdrake_.c:988
+#: ../edit-urpm-sources.pl_.c:282 ../rpmdrake_.c:1014
 #, c-format
 msgid ""
 "%s\n"
@@ -407,7 +407,7 @@ msgstr ""
 msgid "Please choose the desired mirror."
 msgstr ""
 
-#: ../rpmdrake.pm_.c:293 ../rpmdrake_.c:563
+#: ../rpmdrake.pm_.c:293 ../rpmdrake_.c:566
 msgid "Update source(s)"
 msgstr ""
 
@@ -427,287 +427,287 @@ msgstr ""
 "Fan tamall\n"
 "Checking dependencies"
 
-#: ../rpmdrake_.c:94
+#: ../rpmdrake_.c:96
 msgid "Other"
 msgstr ""
 
-#: ../rpmdrake_.c:131 ../rpmdrake_.c:443 ../rpmdrake_.c:444
+#: ../rpmdrake_.c:133 ../rpmdrake_.c:441 ../rpmdrake_.c:442
 msgid "(Not available)"
 msgstr ""
 
-#: ../rpmdrake_.c:141 ../rpmdrake_.c:198
+#: ../rpmdrake_.c:143 ../rpmdrake_.c:200
 #, fuzzy
 msgid "Search results"
 msgstr "Cuardaigh"
 
-#: ../rpmdrake_.c:141
+#: ../rpmdrake_.c:143
 #, fuzzy
 msgid "Search results (none)"
 msgstr "Cuardaigh"
 
-#: ../rpmdrake_.c:151 ../rpmdrake_.c:162
+#: ../rpmdrake_.c:153 ../rpmdrake_.c:164
 #, fuzzy
 msgid "Please wait, searching..."
 msgstr ""
 "Fan tamall\n"
 "Ag scrios pacáistí"
 
-#: ../rpmdrake_.c:165
+#: ../rpmdrake_.c:167
 msgid "Stop"
 msgstr ""
 
-#: ../rpmdrake_.c:199 ../rpmdrake_.c:305
+#: ../rpmdrake_.c:201 ../rpmdrake_.c:307
 #, fuzzy
 msgid "Addable"
 msgstr "Ag Feistiú"
 
-#: ../rpmdrake_.c:199 ../rpmdrake_.c:305
+#: ../rpmdrake_.c:201 ../rpmdrake_.c:307
 msgid "Upgradable"
 msgstr ""
 
-#: ../rpmdrake_.c:201
+#: ../rpmdrake_.c:203
 #, fuzzy
 msgid "Not selected"
 msgstr "Tóg gach rud"
 
-#: ../rpmdrake_.c:201
+#: ../rpmdrake_.c:203
 #, fuzzy
 msgid "Selected"
 msgstr "Tóg gach rud"
 
-#: ../rpmdrake_.c:214 ../rpmdrake_.c:284
+#: ../rpmdrake_.c:216 ../rpmdrake_.c:286
 msgid "(none)"
 msgstr "(ar bith)"
 
-#: ../rpmdrake_.c:242
+#: ../rpmdrake_.c:244
 msgid "More information on package..."
 msgstr ""
 
-#: ../rpmdrake_.c:244
+#: ../rpmdrake_.c:246
 msgid "One of the following packages is needed:"
 msgstr ""
 
-#: ../rpmdrake_.c:244
+#: ../rpmdrake_.c:246
 #, fuzzy
 msgid "Please choose"
 msgstr "Cinntigh, le do thoil"
 
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:262
 #, fuzzy
 msgid "unknown package "
 msgstr "Gan aithne"
 
-#: ../rpmdrake_.c:270
+#: ../rpmdrake_.c:272
 #, fuzzy
 msgid "Please wait, listing packages..."
 msgstr ""
 "Fan tamall\n"
 "Ag scrios pacáistí"
 
-#: ../rpmdrake_.c:286
+#: ../rpmdrake_.c:288
 #, fuzzy
 msgid "No update"
 msgstr "slí"
 
-#: ../rpmdrake_.c:287
+#: ../rpmdrake_.c:289
 msgid ""
 "The list of updates is void. This means that either there is\n"
 "no available update for the packages installed on your computer,\n"
 "or you already installed all of them."
 msgstr ""
 
-#: ../rpmdrake_.c:344
+#: ../rpmdrake_.c:346
 msgid "Some additional packages need to be removed"
 msgstr ""
 
-#: ../rpmdrake_.c:345
+#: ../rpmdrake_.c:347
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake_.c:351
+#: ../rpmdrake_.c:353
 msgid "Some packages can't be removed"
 msgstr ""
 
-#: ../rpmdrake_.c:352 ../rpmdrake_.c:410
+#: ../rpmdrake_.c:354 ../rpmdrake_.c:412
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake_.c:380
+#: ../rpmdrake_.c:382
 msgid "Additional packages needed"
 msgstr ""
 
-#: ../rpmdrake_.c:381
+#: ../rpmdrake_.c:383
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake_.c:394
+#: ../rpmdrake_.c:396
 msgid "Some packages can't be installed"
 msgstr ""
 
-#: ../rpmdrake_.c:395
+#: ../rpmdrake_.c:397
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake_.c:409 ../rpmdrake_.c:619
+#: ../rpmdrake_.c:411 ../rpmdrake_.c:624
 msgid "Some packages need to be removed"
 msgstr ""
 
-#: ../rpmdrake_.c:431
+#: ../rpmdrake_.c:433
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr ""
 
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:435
 #, c-format
 msgid "Selected size: %d MB"
 msgstr ""
 
 #: ../rpmdrake_.c:441
-msgid "Source: "
-msgstr "Bún: "
-
-#: ../rpmdrake_.c:442
-msgid "Currently installed version: "
-msgstr ""
-
-#: ../rpmdrake_.c:443
 #, fuzzy
 msgid "Files:\n"
 msgstr "/_Comhad"
 
-#: ../rpmdrake_.c:444
+#: ../rpmdrake_.c:442
 msgid "Changelog:\n"
 msgstr ""
 
-#: ../rpmdrake_.c:447
+#: ../rpmdrake_.c:445
+msgid "Source: "
+msgstr "Bún: "
+
+#: ../rpmdrake_.c:446
+msgid "Currently installed version: "
+msgstr ""
+
+#: ../rpmdrake_.c:450
 msgid "Reason for update: "
 msgstr ""
 
-#: ../rpmdrake_.c:449
+#: ../rpmdrake_.c:452
 msgid "Name: "
 msgstr "Ainm: "
 
-#: ../rpmdrake_.c:450
+#: ../rpmdrake_.c:453
 #, fuzzy
 msgid "Version: "
 msgstr "Leagan:"
 
-#: ../rpmdrake_.c:451
+#: ../rpmdrake_.c:454
 #, fuzzy, c-format
 msgid "%s KB"
 msgstr "%.1f KB"
 
-#: ../rpmdrake_.c:451
+#: ../rpmdrake_.c:454
 msgid "Size: "
 msgstr "Meid: "
 
-#: ../rpmdrake_.c:452
+#: ../rpmdrake_.c:455
 msgid "Importance: "
 msgstr ""
 
-#: ../rpmdrake_.c:453
+#: ../rpmdrake_.c:456
 #, fuzzy
 msgid "Summary: "
 msgstr "Coimriú"
 
-#: ../rpmdrake_.c:454
+#: ../rpmdrake_.c:457
 #, fuzzy
 msgid "Description: "
 msgstr "Cuntasaí"
 
-#: ../rpmdrake_.c:463
+#: ../rpmdrake_.c:466
 msgid "rpmdrake"
 msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:487
 msgid "Bugfixes updates"
 msgstr ""
 
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:487
 msgid "Normal updates"
 msgstr ""
 
-#: ../rpmdrake_.c:503
+#: ../rpmdrake_.c:506
 msgid "Mandrake choices"
 msgstr ""
 
-#: ../rpmdrake_.c:504
+#: ../rpmdrake_.c:507
 msgid "All packages, alphabetical"
 msgstr ""
 
-#: ../rpmdrake_.c:505
+#: ../rpmdrake_.c:508
 #, fuzzy
 msgid "All packages,"
 msgstr ""
 "Fan tamall\n"
 "Ag scrios pacáistí"
 
-#: ../rpmdrake_.c:528
+#: ../rpmdrake_.c:531
 msgid "by group"
 msgstr ""
 
-#: ../rpmdrake_.c:528
+#: ../rpmdrake_.c:531
 msgid "by size"
 msgstr ""
 
-#: ../rpmdrake_.c:529
+#: ../rpmdrake_.c:532
 msgid "by selection state"
 msgstr ""
 
-#: ../rpmdrake_.c:530
+#: ../rpmdrake_.c:533
 msgid "by source repository"
 msgstr ""
 
-#: ../rpmdrake_.c:530
+#: ../rpmdrake_.c:533
 msgid "by update availability"
 msgstr ""
 
-#: ../rpmdrake_.c:551
+#: ../rpmdrake_.c:554
 #, fuzzy
 msgid "in descriptions"
 msgstr "Cuntasaí"
 
-#: ../rpmdrake_.c:551
+#: ../rpmdrake_.c:554
 #, fuzzy
 msgid "in files"
 msgstr "Áit"
 
-#: ../rpmdrake_.c:551
+#: ../rpmdrake_.c:554
 msgid "in names"
 msgstr ""
 
-#: ../rpmdrake_.c:562
+#: ../rpmdrake_.c:565
 msgid "Reload the packages list"
 msgstr ""
 
-#: ../rpmdrake_.c:562
+#: ../rpmdrake_.c:565
 msgid "Reset the selection"
 msgstr ""
 
-#: ../rpmdrake_.c:587
+#: ../rpmdrake_.c:592
 msgid "Maximum information"
 msgstr ""
 
-#: ../rpmdrake_.c:587
+#: ../rpmdrake_.c:592
 msgid "Normal information"
 msgstr ""
 
-#: ../rpmdrake_.c:609
+#: ../rpmdrake_.c:614
 msgid "Too many packages are selected"
 msgstr ""
 
-#: ../rpmdrake_.c:610
+#: ../rpmdrake_.c:615
 msgid ""
 "Warning: it seems that you are attempting to add so much\n"
 "packages that your filesystem may run out of free diskspace,\n"
@@ -717,7 +717,7 @@ msgid ""
 "Do you really want to install all the selected packages?"
 msgstr ""
 
-#: ../rpmdrake_.c:620
+#: ../rpmdrake_.c:625
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -727,37 +727,37 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake_.c:642
+#: ../rpmdrake_.c:647
 msgid "Find:"
 msgstr "Faigh:"
 
-#: ../rpmdrake_.c:647
+#: ../rpmdrake_.c:652
 msgid "Search"
 msgstr "Cuardaigh"
 
-#: ../rpmdrake_.c:659
+#: ../rpmdrake_.c:664
 msgid "Install"
 msgstr "Ag Feistiú:"
 
-#: ../rpmdrake_.c:685
+#: ../rpmdrake_.c:691
 msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
 msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
 
-#: ../rpmdrake_.c:686 data/mandrakeupdate.desktop.in.h:1
+#: ../rpmdrake_.c:692 data/mandrakeupdate.desktop.in.h:1
 msgid "Mandrake Update"
 msgstr ""
 
-#: ../rpmdrake_.c:686
+#: ../rpmdrake_.c:692
 #, fuzzy
 msgid "Software Packages Removal"
 msgstr "Bainisteoir Bog-Earraí"
 
-#: ../rpmdrake_.c:687
+#: ../rpmdrake_.c:693
 #, fuzzy
 msgid "Software Packages Installation"
 msgstr "Bainisteoir Bog-Earraí"
 
-#: ../rpmdrake_.c:720
+#: ../rpmdrake_.c:726
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -765,23 +765,23 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:730
 msgid "Please wait, contacting mirror to update packages information."
 msgstr ""
 
-#: ../rpmdrake_.c:726
+#: ../rpmdrake_.c:732
 msgid "Error updating medium"
 msgstr ""
 
-#: ../rpmdrake_.c:727
+#: ../rpmdrake_.c:733
 msgid "There was an unrecoverable error while updating packages information."
 msgstr ""
 
-#: ../rpmdrake_.c:733
+#: ../rpmdrake_.c:739
 msgid "How to choose manually your mirror"
 msgstr ""
 
-#: ../rpmdrake_.c:734
+#: ../rpmdrake_.c:740
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
 "launch the Software Sources Manager, and then add a `Security\n"
@@ -790,15 +790,15 @@ msgid ""
 "Then, restart MandrakeUpdate."
 msgstr ""
 
-#: ../rpmdrake_.c:740
+#: ../rpmdrake_.c:746
 msgid "Please wait, contacting mirror to initialize updates packages."
 msgstr ""
 
-#: ../rpmdrake_.c:744
+#: ../rpmdrake_.c:750
 msgid "Error adding update medium"
 msgstr ""
 
-#: ../rpmdrake_.c:745
+#: ../rpmdrake_.c:751
 #, c-format
 msgid ""
 "There was an error while adding the update medium via urpmi.\n"
@@ -811,138 +811,150 @@ msgid ""
 "Do you want to try another mirror?"
 msgstr ""
 
-#: ../rpmdrake_.c:774
+#: ../rpmdrake_.c:780
 #, fuzzy
 msgid "Please wait, finding available packages..."
 msgstr ""
 "Fan tamall\n"
 "Ag scrios pacáistí"
 
-#: ../rpmdrake_.c:798
-msgid "All requested packages were installed successfully."
-msgstr ""
-
-#: ../rpmdrake_.c:798
-msgid "Everything installed successfully"
-msgstr ""
-
-#: ../rpmdrake_.c:801
+#: ../rpmdrake_.c:809
 #, fuzzy
 msgid "Installation finished"
 msgstr "Ag Feistiú"
 
-#: ../rpmdrake_.c:804
+#: ../rpmdrake_.c:812
 #, c-format
 msgid "Inspecting %s"
 msgstr ""
 
-#: ../rpmdrake_.c:820
+#: ../rpmdrake_.c:828
 #, c-format
 msgid "Remove .%s"
 msgstr ""
 
-#: ../rpmdrake_.c:822
+#: ../rpmdrake_.c:830
 #, c-format
 msgid "Use .%s as main file"
 msgstr ""
 
-#: ../rpmdrake_.c:824
+#: ../rpmdrake_.c:832
 msgid "Do nothing"
 msgstr ""
 
-#: ../rpmdrake_.c:827
+#: ../rpmdrake_.c:835
 msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
 msgstr ""
 
-#: ../rpmdrake_.c:844
+#: ../rpmdrake_.c:852
 msgid "Inspect..."
 msgstr ""
 
-#: ../rpmdrake_.c:857
-#, c-format
-msgid ""
-"The installation is finished; %s.\n"
-"\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
-msgstr ""
-
-#: ../rpmdrake_.c:858
-msgid ""
-"some packages failed to install\n"
-"correctly"
-msgstr ""
-
-#: ../rpmdrake_.c:859
-msgid "everything was installed correctly"
-msgstr ""
-
-#: ../rpmdrake_.c:878
+#: ../rpmdrake_.c:889
 msgid "Unable to get source packages."
 msgstr ""
 
-#: ../rpmdrake_.c:879
+#: ../rpmdrake_.c:890
 msgid "Unable to get source packages, sorry."
 msgstr ""
 
-#: ../rpmdrake_.c:886
+#: ../rpmdrake_.c:897
 msgid "Change medium"
 msgstr ""
 
-#: ../rpmdrake_.c:887
+#: ../rpmdrake_.c:898
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
 
-#: ../rpmdrake_.c:895
+#: ../rpmdrake_.c:906
 #, fuzzy
 msgid "Installation failed"
 msgstr "Ag Feistiú"
 
-#: ../rpmdrake_.c:896
+#: ../rpmdrake_.c:907
 msgid ""
 "Installation failed, some files are missing.\n"
 "You may want to update your sources database."
 msgstr ""
 
-#: ../rpmdrake_.c:899
+#: ../rpmdrake_.c:910
 #, fuzzy
 msgid "Please wait, removing packages to allow others to be upgraded..."
 msgstr ""
 "Fan tamall\n"
 "Ag scrios pacáistí"
 
-#: ../rpmdrake_.c:910
+#: ../rpmdrake_.c:921
 msgid "Program missing"
 msgstr ""
 
-#: ../rpmdrake_.c:911
+#: ../rpmdrake_.c:922
 msgid "A required program is missing (grpmi). Check your installation."
 msgstr ""
 
-#: ../rpmdrake_.c:928
+#: ../rpmdrake_.c:932
+#, c-format
+msgid ""
+"The installation is finished; %s.\n"
+"\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
+msgstr ""
+
+#: ../rpmdrake_.c:932
+msgid ""
+"some packages failed to install\n"
+"correctly"
+msgstr ""
+
+#: ../rpmdrake_.c:933
+msgid "everything was installed correctly"
+msgstr ""
+
+#: ../rpmdrake_.c:935
+msgid "Everything installed successfully"
+msgstr ""
+
+#: ../rpmdrake_.c:936
+msgid "All requested packages were installed successfully."
+msgstr ""
+
+#: ../rpmdrake_.c:938
 msgid "Everything already installed."
 msgstr ""
 
-#: ../rpmdrake_.c:929
+#: ../rpmdrake_.c:939
 msgid "Everything already installed (is this supposed to happen at all?)."
 msgstr ""
 
-#: ../rpmdrake_.c:939
+#: ../rpmdrake_.c:942
+msgid "Problem during installation"
+msgstr ""
+
+#: ../rpmdrake_.c:943
+#, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: ../rpmdrake_.c:953
 #, fuzzy
 msgid "Please wait, reading packages database..."
 msgstr ""
 "Fan tamall\n"
 "Ag scrios pacáistí"
 
-#: ../rpmdrake_.c:977
+#: ../rpmdrake_.c:991
 #, fuzzy
 msgid "Please wait, removing packages..."
 msgstr ""
 "Fan tamall\n"
 "Ag scrios pacáistí"
 
-#: ../rpmdrake_.c:992
+#: ../rpmdrake_.c:1018
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -950,7 +962,7 @@ msgid ""
 "your computer."
 msgstr ""
 
-#: ../rpmdrake_.c:997
+#: ../rpmdrake_.c:1023
 msgid ""
 "Welcome to MandrakeUpdate!\n"
 "\n"
@@ -958,7 +970,7 @@ msgid ""
 "computer."
 msgstr ""
 
-#: ../rpmdrake_.c:1002
+#: ../rpmdrake_.c:1028
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"