* mergerd wirh michael

1 files changed, 25 insertions, 98 deletions

diff --git a/po/mk.po b/po/mk.po
index 46cfb031..a7199983 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mk\n"
 "Report-Msgid-Bugs-To: michael.vogt@canonical.com\n"
-"POT-Creation-Date: 2006-02-23 12:55+0100\n"
+"POT-Creation-Date: 2006-02-22 16:57+0100\n"
 "PO-Revision-Date: 2005-07-20 01:21+0200\n"
 "Last-Translator: Арангел Ангов <ufo@linux.net.mk>\n"
 "Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\n"
@@ -91,51 +91,40 @@ msgstr ""
 msgid "_Install security updates without confirmation"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:115
+#: ../SoftwareProperties/SoftwareProperties.py:101
 #, python-format
 msgid "Every %s days"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:145
+#: ../SoftwareProperties/SoftwareProperties.py:131
 #, python-format
 msgid "After %s days"
 msgstr ""
 
-#. cell_desc.set_property("xpad", 10)
-#. cell_desc.set_property("ypad", 10)
-#: ../SoftwareProperties/SoftwareProperties.py:230
-#, fuzzy
-msgid "Software Channel"
-msgstr "Надградба на софтвер"
-
-#: ../SoftwareProperties/SoftwareProperties.py:236
-msgid "Active"
-msgstr ""
-
-#: ../SoftwareProperties/SoftwareProperties.py:413
+#: ../SoftwareProperties/SoftwareProperties.py:354
 msgid "Import key"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:423
+#: ../SoftwareProperties/SoftwareProperties.py:364
 msgid "Error importing selected file"
 msgstr "Грешка при увоз на избраната датотека"
 
-#: ../SoftwareProperties/SoftwareProperties.py:424
+#: ../SoftwareProperties/SoftwareProperties.py:365
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr ""
 "Избраната датотека може да не е GPG датотека или пак може да е расипана."
 
-#: ../SoftwareProperties/SoftwareProperties.py:436
+#: ../SoftwareProperties/SoftwareProperties.py:377
 msgid "Error removing the key"
 msgstr "Грешка при отстранување на клучот"
 
-#: ../SoftwareProperties/SoftwareProperties.py:437
+#: ../SoftwareProperties/SoftwareProperties.py:378
 msgid "The key you selected could not be removed. Please report this as a bug."
 msgstr ""
 "Клучот што го избравте не може да биде отстранет. Ве молам пријавете го ова "
 "како бубачка."
 
-#: ../SoftwareProperties/SoftwareProperties.py:480
+#: ../SoftwareProperties/SoftwareProperties.py:421
 #, python-format
 msgid ""
 "<big><b>Error scaning the CD</b></big>\n"
@@ -143,46 +132,14 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:530
+#: ../SoftwareProperties/SoftwareProperties.py:471
 msgid "Please enter a name for the disc"
 msgstr ""
 
-#: ../SoftwareProperties/SoftwareProperties.py:546
+#: ../SoftwareProperties/SoftwareProperties.py:487
 msgid "Please insert a disc in the drive:"
 msgstr ""
 
-#: ../SoftwareProperties/dialog_sources_list.py:35
-#, fuzzy
-msgid "Add Software Channels"
-msgstr "Надградба на софтвер"
-
-#: ../SoftwareProperties/dialog_sources_list.py:71
-msgid "Add the following software channel?"
-msgid_plural "Add the following software channels?"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: ../SoftwareProperties/dialog_sources_list.py:74
-msgid "You can install software from a channel. Use trusted channels, only."
-msgstr ""
-
-#: ../SoftwareProperties/dialog_sources_list.py:78
-msgid "_Add Channel"
-msgid_plural "_Add Channels"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: ../SoftwareProperties/dialog_sources_list.py:91
-msgid "Could not add any software channels"
-msgstr ""
-
-#: ../SoftwareProperties/dialog_sources_list.py:92
-#, python-format
-msgid "The file '%s' does not contain any valid software channels."
-msgstr ""
-
 #: ../DistUpgrade/DistUpgradeCache.py:92
 msgid "Broken packages"
 msgstr ""
@@ -467,7 +424,7 @@ msgstr ""
 #: ../DistUpgrade/DistUpgradeViewGtk.py:339
 #, fuzzy, python-format
 msgid "<b>Remove %s</b>"
-msgstr "<b>Складиште</b>"
+msgstr "<b>Копчиња</b>"
 
 #: ../DistUpgrade/DistUpgradeViewGtk.py:341
 #, fuzzy, python-format
@@ -643,15 +600,11 @@ msgid "Upgrade to the latest version of Ubuntu"
 msgstr ""
 
 #: ../data/UpdateManager.glade.h:22
-msgid "_Hide this information in the future"
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:23
 #, fuzzy
 msgid "_Install Updates"
 msgstr "Инсталирам надградби..."
 
-#: ../data/UpdateManager.glade.h:24
+#: ../data/UpdateManager.glade.h:23
 #, fuzzy
 msgid "_Reload"
 msgstr "Освежи"
@@ -664,35 +617,6 @@ msgstr "Покажи достапни надградби и избери кои
 msgid "Update Manager"
 msgstr "Менаџер за надградба"
 
-#: ../data/update-manager.schemas.in.h:1
-msgid ""
-"If automatic checking for updates is disabeld, you have to reload the "
-"channel list manually. This option allows to hide the reminder shown in this "
-"case."
-msgstr ""
-
-#: ../data/update-manager.schemas.in.h:2
-msgid "Remind to reload the channel list"
-msgstr ""
-
-#: ../data/update-manager.schemas.in.h:3
-msgid "Show details of an update"
-msgstr ""
-
-#: ../data/update-manager.schemas.in.h:4
-msgid "Stores the size of the update-manager dialog"
-msgstr ""
-
-#: ../data/update-manager.schemas.in.h:5
-msgid ""
-"Stores the state of the expander that contains the list of changs and the "
-"description"
-msgstr ""
-
-#: ../data/update-manager.schemas.in.h:6
-msgid "The window size"
-msgstr ""
-
 #. ChangelogURI
 #: ../channels/Ubuntu.info.in.h:4
 #, no-c-format
@@ -802,15 +726,6 @@ msgstr ""
 msgid "Non-DFSG-compatible Software"
 msgstr ""
 
-#~ msgid "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
-#~ msgstr "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
-
-#~ msgid "Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>"
-#~ msgstr "Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>"
-
-#~ msgid "Choose a key-file"
-#~ msgstr "Одберете датотека за клуч"
-
 #, fuzzy
 #~ msgid "Error fetching the packages"
 #~ msgstr "Грешка при отстранување на клучот"
@@ -836,6 +751,9 @@ msgstr ""
 #~ msgid "<b>Distribution:</b>"
 #~ msgstr "<b>Дистрибуција:</b>"
 
+#~ msgid "<b>Repository</b>"
+#~ msgstr "<b>Складиште</b>"
+
 #~ msgid "<b>Sections:</b>"
 #~ msgstr "<b>Оддели:</b>"
 
@@ -1013,6 +931,15 @@ msgstr ""
 #~ msgid "Debian Non-US (Testing)"
 #~ msgstr "Debian Non-US (Testing)"
 
+#~ msgid "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
+#~ msgstr "Ubuntu Archive Automatic Signing Key <ftpmaster@ubuntu.com>"
+
+#~ msgid "Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>"
+#~ msgstr "Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>"
+
+#~ msgid "Choose a key-file"
+#~ msgstr "Одберете датотека за клуч"
+
 #~ msgid "Your system is up-to-date!"
 #~ msgstr "Вашиот систем е надграден!"