[gnome-packagekit] Updated Telugu Translations

[Krishnababu Krothapalli <kkrothap src gnome org>]

commit b86475384f55c99968f8eb83ceb2aeaa6883ad1f
Author: krishnababu k <kkrothap redhat ocm>
Date:   Fri Jan 29 21:05:50 2010 +0530

    Updated Telugu Translations

 po/te.po | 2604 --------------------------------------------------------------
 1 files changed, 0 insertions(+), 2604 deletions(-)
---
diff --git a/po/te.po b/po/te.po
index 74a16a4..940f75a 100644
--- a/po/te.po
+++ b/po/te.po
@@ -7,13 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-packagekit.master.te\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-packagekit&component=general\n";
-<<<<<<< HEAD:po/te.po
-"POT-Creation-Date: 2009-10-12 10:15+0000\n"
-"PO-Revision-Date: 2009-10-26 21:26+0530\n"
-=======
 "POT-Creation-Date: 2010-01-19 15:47+0000\n"
 "PO-Revision-Date: 2010-01-29 20:45+0530\n"
->>>>>>> Updated Telugu Translation:po/te.po
 "Last-Translator: Krishna Babu K <kkrothap redhat com>\n"
 "Language-Team: Telugu <en li org>\n"
 "MIME-Version: 1.0\n"
@@ -21,10 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n\n"
 "\n"
-<<<<<<< HEAD:po/te.po
-=======
 "\n"
->>>>>>> Updated Telugu Translation:po/te.po
 "X-Generator: KBabel 1.11.4\n"
 
 #: ../data/gnome-packagekit.schemas.in.h:1
@@ -238,14 +230,10 @@ msgid "Only show native packages in the file lists"
 msgstr "దస�త�రమ� �ాబితాలన�ద� న��ివ� ప�యా����లన� మాత�రమ� ��ప�మ�"
 
 #: ../data/gnome-packagekit.schemas.in.h:51
-<<<<<<< HEAD:po/te.po
-msgid "Only show native packages maching the machine architecture in the file lists"
-=======
 #| msgid ""
 #| "Only show native packages maching the machine architecture in the file "
 #| "lists"
 msgid "Only show native packages matching the machine architecture in the file lists"
->>>>>>> Updated Telugu Translation:po/te.po
 msgstr "దస�త�రమ�ల �ాబితాలన�ద� మిషన� ���తి�ి సరిప�ల� న��ివ� ప�యా����లన� మాత�రమ� ��ప�మ�"
 
 #: ../data/gnome-packagekit.schemas.in.h:52
@@ -265,25 +253,6 @@ msgid "Only show the newest updates in the list"
 msgstr "�ాబితాన�ద� ��త�త నవ��రణలన� మాత�రమ� ��పమ�"
 
 #: ../data/gnome-packagekit.schemas.in.h:55
-<<<<<<< HEAD:po/te.po
-msgid "Scroll to packages as they are downloaded"
-msgstr "డ�న�ల�డ�న ప�యా��లవ��బడి స���రాల� ��య�మ�"
-
-#: ../data/gnome-packagekit.schemas.in.h:56
-msgid "Scroll to packages in the update list as they are downloaded or installed."
-msgstr "నవ��రణ �ాబితాన�ద� డ�న�ల�డ�న ల�దా స�స�థాపి��ిన ప�యా����ల వ��బడి స���రాల� ��య�మ�."
-
-#: ../data/gnome-packagekit.schemas.in.h:57
-msgid "Show all repositories in the software source viewer"
-msgstr "సాఫà±?à°?à±?â??â??à°µà±?à°°à±? à°®à±?à°² దరà±?శనినà°?à°¦à±? à°?à°¨à±?ని à°°à°¿à°ªà±?à°?à°¿à°?à°°à±?లనà±? à°?à±?à°ªà±?à°®à±?"
-
-#: ../data/gnome-packagekit.schemas.in.h:58
-#| msgid "Show the category group menu"
-msgid "Show the 'All Packages' group menu"
-msgstr "'�న�ని ప�యా����ల�' సమ�హ మ�న�న� ��ప�మ�"
-
-#: ../data/gnome-packagekit.schemas.in.h:59
-=======
 msgid "Programs that should be ignored when they issue session D-Bus requests"
 msgstr "స�షన� D-Bus �భ�యర�ధనలన� యి����నప�ప�డ� ప���ి�����నవసరల�ని ప���రామ�ల�"
 
@@ -310,21 +279,10 @@ msgid "Show the 'All Packages' group menu"
 msgstr "'�న�ని ప�యా����ల�' సమ�హ మ�న�న� ��ప�మ�"
 
 #: ../data/gnome-packagekit.schemas.in.h:61
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "Show the all packages menu item. This takes a long time to populate on most "
 "backends and is not generally required by end users"
 msgstr ""
-<<<<<<< HEAD:po/te.po
-"�న�ని ప�యా����ల� మ�న� ��శమ�న� ��ప�మ�. �ాలా బ�యా���డ�స� ప�న యిది ��ప���� య�����వ సమయ� "
-"పడ�త��ది మరియ� వినియ��దార�ల�� సాధారణ� యిది �వసరమ�వ��డద�."
-
-#: ../data/gnome-packagekit.schemas.in.h:60
-msgid "Show the category group menu"
-msgstr "వర����రణ సమ�హప� మ�న�న� ��ప�మ�"
-
-#: ../data/gnome-packagekit.schemas.in.h:61
-=======
 "�న�ని ప�యా����ల� మ�న� ��శమ�న� ��ప�మ�. �ాలా బ�యా���డ�స� ప�న యిది ��ప���� య�����వ సమయ� పడ�త��ది "
 "మరియ� వినియ��దార�ల�� సాధారణ� యిది �వసరమ�వ��డద�."
 
@@ -333,7 +291,6 @@ msgid "Show the category group menu"
 msgstr "వర����రణ సమ�హప� మ�న�న� ��ప�మ�"
 
 #: ../data/gnome-packagekit.schemas.in.h:63
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "Show the category group menu. This is more complete and custom to the "
 "distribution, but takes longer to populate"
@@ -354,31 +311,12 @@ msgstr ""
 #. or just because they want to know what is happening in other user sessions.
 #. Those sort of people (not typical users) should enable this option.
 #.
-<<<<<<< HEAD:po/te.po
-#: ../data/gnome-packagekit.schemas.in.h:75
-=======
 #: ../data/gnome-packagekit.schemas.in.h:77
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "Show the transaction progress icon in the tray when the original application "
 "is still running."
 msgstr "వాస�తవ �న�వర�తనమ� యి��ా నడ�����న�నప�ప�డ� వ�యవహారప� ప�ర��తి ప�రతిమన� ��ర�న�ద� ��ప�మ�."
 
-<<<<<<< HEAD:po/te.po
-#: ../data/gnome-packagekit.schemas.in.h:76
-msgid "Show transactions that have the original application running"
-msgstr "నడ�స�త�న�న వాస�తవ �న�వర�తనమ� �లి�ివ�న�న వ�యవహారమ�లన� ��ప�మ�"
-
-#: ../data/gnome-packagekit.schemas.in.h:77
-msgid "The number of seconds at session startup to wait before checking for updates"
-msgstr "స�షన� ప�రార�భమ�వద�ద నవ��రణల ��ర�� పరిశ�లి������ మ��ద��ా వ��ివ��డవలసిన సమయ� స��న�లల�"
-
-#: ../data/gnome-packagekit.schemas.in.h:78
-msgid "The search mode used by default"
-msgstr "�ప�రమ�య��ా వ�పయ��ి��ిన శ�ధన ర�తి"
-
-#: ../data/gnome-packagekit.schemas.in.h:79
-=======
 #: ../data/gnome-packagekit.schemas.in.h:78
 msgid "Show transactions that have the original application running"
 msgstr "నడ�స�త�న�న వాస�తవ �న�వర�తనమ� �లి�ివ�న�న వ�యవహారమ�లన� ��ప�మ�"
@@ -392,35 +330,11 @@ msgid "The search mode used by default"
 msgstr "�ప�రమ�య��ా వ�పయ��ి��ిన శ�ధన ర�తి"
 
 #: ../data/gnome-packagekit.schemas.in.h:81
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "The search mode used by default. Options are \"name\", \"details\", or \"file"
 "\""
 msgstr "�ప�రమ�య��ా వ�పయ��ి��ిన శ�ధన ర�తి. \"నామమ�\", \"వివరమ�ల�\", ల�దా \"దస�త�రమ�\" యివి ����ి�మ�ల�"
 
-<<<<<<< HEAD:po/te.po
-#: ../data/gnome-packagekit.schemas.in.h:80
-msgid "This key determines if applications should be able to prompt for fonts"
-msgstr "�న�వర�తనమ�ల� ఫా���ల ��ర�� �డ���ల వల�న�మ� � �� నిర�ణయిస�త��ది"
-
-#: ../data/gnome-packagekit.schemas.in.h:81
-msgid "Use WiFi (wireless LAN) connections to check for updates"
-msgstr "నవà±?à°?రణలà°?à±?à°°à°?à±? పరిశà±?లిà°?à°?à±?à°?à°?à±? WiFi (à°µà±?à°°à±?â??à°²à±?à°¸à±? LAN) à°?à°¨à±?à°¸à°?ధానమà±?లనà±? à°µà±?పయà±?à°?à°¿à°?à°?à±?à°®à±?"
-
-#: ../data/gnome-packagekit.schemas.in.h:82
-msgid "Use WiFi connections"
-msgstr "WiFi �న�స�ధానమ�లన� వ�పయ��ి���మ�"
-
-#: ../data/gnome-packagekit.schemas.in.h:83
-msgid "Use mobile broadband connections"
-msgstr "à°®à±?à°¬à±?à°²à±? à°¬à±?రాడà±?â??బాà°?à°¡à±? à°?à°¨à±?à°¸à°?ధానమà±?లనà±? à°µà±?పయà±?à°?à°¿à°?à°?à±?à°®à±?"
-
-#: ../data/gnome-packagekit.schemas.in.h:84
-msgid "Use mobile broadband connections such as GSM and CDMA to check for updates"
-msgstr "నవà±?à°?రణల à°?à±?à°°à°?à±? పరిశà±?లిà°?à°?à±?à°?à°?à±? GSM మరియà±? CDMA à°µà°?à°?à°¿ à°®à±?à°¬à±?à°²à±? à°¬à±?రాడà±?â??బాà°?à°¡à±? à°?à°¨à±?à°¸à°?ధానమà±?లనà±? à°µà±?పయà±?à°?à°¿à°?à°?à±?à°®à±?"
-
-#: ../data/gnome-packagekit.schemas.in.h:85
-=======
 #: ../data/gnome-packagekit.schemas.in.h:82
 msgid "This key determines if applications should be able to prompt for fonts"
 msgstr "�న�వర�తనమ�ల� ఫా���ల ��ర�� �డ���ల వల�న�మ� � �� నిర�ణయిస�త��ది"
@@ -442,7 +356,6 @@ msgid "Use mobile broadband connections such as GSM and CDMA to check for update
 msgstr "నవà±?à°?రణల à°?à±?à°°à°?à±? పరిశà±?లిà°?à°?à±?à°?à°?à±? GSM మరియà±? CDMA à°µà°?à°?à°¿ à°®à±?à°¬à±?à°²à±? à°¬à±?రాడà±?â??బాà°?à°¡à±? à°?à°¨à±?à°¸à°?ధానమà±?లనà±? à°µà±?పయà±?à°?à°¿à°?à°?à±?à°®à±?"
 
 #: ../data/gnome-packagekit.schemas.in.h:87
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "When displaying UI from a session DBus request, automatically use these "
 "options by default"
@@ -450,11 +363,7 @@ msgstr ""
 "స�షన� DBus �భ�యర�ధనన��డి UI న� ప�రదర�శి���త�న�నప�ప�డ�, స�వయ��ాల���ా � ����ి�మ�లన� �ప�రమ�య��ా "
 "వ�పయ��ి���మ�"
 
-<<<<<<< HEAD:po/te.po
-#: ../data/gnome-packagekit.schemas.in.h:86
-=======
 #: ../data/gnome-packagekit.schemas.in.h:88
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "When displaying UI from a session DBus request, force these options to be "
 "turned on"
@@ -466,13 +375,8 @@ msgstr "à°? సిసà±?à°?à°®à±?â??à°¨à°?à°¦à±? à°¸à°?à°¸à±?థాపిà°?à°?
 
 #. TRANSLATORS: short name for gpk-update-viewer
 #: ../data/gpk-application.desktop.in.h:2 ../data/gpk-application.ui.h:2
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-application-main.c:97 ../src/gpk-log.c:478
-#: ../src/gpk-update-viewer-main.c:94
-=======
 #: ../src/gpk-application-main.c:94 ../src/gpk-log.c:513
 #: ../src/gpk-update-viewer-main.c:86
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Add/Remove Software"
 msgstr "సాఫ���వ�ర� �త��యి/త�సివ�యి"
 
@@ -678,11 +582,7 @@ msgstr "సిసà±?à°?à°®à±?â??à°¨à°?à°¦à±? à°¯à±?à°?పిà°?à°?à±?సిన 
 msgid "Package Installer"
 msgstr "ప�యా���� స�స�థాప�ి"
 
-<<<<<<< HEAD:po/te.po
-#: ../data/gpk-log.desktop.in.h:1 ../data/gpk-log.ui.h:2 ../src/gpk-log.c:671
-=======
 #: ../data/gpk-log.desktop.in.h:1 ../data/gpk-log.ui.h:2 ../src/gpk-log.c:708
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Software Log Viewer"
 msgstr "సాఫà±?à°?à±?â??â??à°µà±?à°°à±? లాà°?à±? దరà±?శిని"
 
@@ -719,11 +619,7 @@ msgid "Currently using mobile broadband"
 msgstr "à°ªà±?à°°à°¸à±?à°¤à±?తమà±? వినియà±?à°?à°¿à°?à°?à±?à°?à±?à°¨à±?à°¨ à°®à±?à°¬à±?à°²à±? à°¬à±?రాడà±?â??బాà°?à°¡à±?"
 
 #. TRANSLATORS: program name, an application to set per-user policy for updates
-<<<<<<< HEAD:po/te.po
-#: ../data/gpk-prefs.ui.h:5 ../src/gpk-prefs.c:510
-=======
 #: ../data/gpk-prefs.ui.h:5 ../src/gpk-prefs.c:485
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Software Update Preferences"
 msgstr "సాఫà±?à°?à±?â??â??à°µà±?à°°à±? నవà±?à°?à°°à°£ à°?à°­à±?à°·à±?à°?ాలà±?"
 
@@ -804,11 +700,7 @@ msgid "Select A Package List File"
 msgstr "�� ప�యా���� �ాబితా దస�త�రమ�న� య��పి���య�మ�"
 
 #. TRANSLATORS: program description, an application to create service packs
-<<<<<<< HEAD:po/te.po
-#: ../data/gpk-service-pack.ui.h:13 ../src/gpk-service-pack.c:716
-=======
 #: ../data/gpk-service-pack.ui.h:13 ../src/gpk-service-pack.c:722
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Service Pack Creator"
 msgstr "స�వా ప�యా�� స�ష��ి�ర�త"
 
@@ -854,11 +746,7 @@ msgstr "సాప��� వ�ర� నవ��రణ"
 
 #. TRANSLATORS: title to pass to to the user if there are not enough privs
 #: ../data/gpk-update-viewer.desktop.in.h:2
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-update-viewer-main.c:112
-=======
 #: ../src/gpk-update-viewer-main.c:103
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Software Update Viewer"
 msgstr "సాఫ���వ�ర� నవ��రణమ� దర�శని"
 
@@ -907,11 +795,7 @@ msgid ""
 msgstr "మ�ర� త�సివ�యాలని �న���న���న�న సాఫ���వ�ర� వ�ర�� సాఫ���వ�ర� నడ�వ���� �వసర�, �ది ��డా త�సివ�యబడ�త��ది."
 
 #. TRANSLATORS: button label, install
-<<<<<<< HEAD:po/te.po
-#: ../python/packagekit/gtkwidgets.py:646 ../src/gpk-helper-chooser.c:288
-=======
 #: ../python/packagekit/gtkwidgets.py:646 ../src/gpk-helper-chooser.c:298
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "_Install"
 msgstr "స�స�థాపి��� (_I)"
 
@@ -929,234 +813,6 @@ msgid ""
 msgstr "మ�ర� స�స�థాపి��ాలని �న���న���న�న సాఫ���వ�ర� సరి�ా నడ�వ���� �దనప� సాప���వ�ర� �వసరమ�."
 
 #. TRANSLATORS: title: how many files are installed by the application
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-application.c:589
-#, c-format
-msgid "%i file installed by %s"
-msgid_plural "%i files installed by %s"
-msgstr[0] "%i ఫ�ళ�ళ� %s��త స�స�థాపి��బడినవి"
-msgstr[1] "%i ఫ�ళ�ళ� %s��త స�స�థాపి��బడినవి"
-
-#. TRANSLATORS: no packages returned
-#: ../src/gpk-application.c:941 ../src/gpk-application.c:1064
-msgid "No packages"
-msgstr "���వ��ి ప�యా����ల�ల�వ�"
-
-#. TRANSLATORS: this package is not required by any others
-#: ../src/gpk-application.c:943
-msgid "No other packages require this package"
-msgstr "� యితర ప�యా����ల�� � ప�యా���� �వసరమ�ల�ద�"
-
-#. TRANSLATORS: title: how many packages require this package
-#: ../src/gpk-application.c:950
-#, c-format
-msgid "%i package requires %s"
-msgid_plural "%i packages require %s"
-msgstr[0] "%i ప�యా������ %s �వసరమ�"
-msgstr[1] "%i ప�యా������ %s �వసరమ�"
-
-#. TRANSLATORS: show a array of packages for the package
-#: ../src/gpk-application.c:955
-#, c-format
-msgid "Packages listed below require %s to function correctly."
-msgid_plural "Packages listed below require %s to function correctly."
-msgstr[0] "��రి�ద �ాబితా��సివ�న�న ప�యా����ల� సరి�ా పని��య���� %s �వసరమ�"
-msgstr[1] "��రి�ద �ాబితా��సివ�న�న ప�యా����ల� సరి�ా పని��య���� %s �వసరమ�"
-
-#. TRANSLATORS: this package does not depend on any others
-#: ../src/gpk-application.c:1066
-msgid "This package does not depends on any others"
-msgstr "� ప�యా���� � యితర ప�యా����లప�నా �ధారపడద�"
-
-#. TRANSLATORS: title: show the number of other packages we depend on
-#: ../src/gpk-application.c:1073
-#, c-format
-msgid "%i additional package is required for %s"
-msgid_plural "%i additional packages are required for %s"
-msgstr[0] "%i �దనప� ప�యా����ల� %s�� �వసరమ�"
-msgstr[1] "%i �దనప� ప�యా����ల� %s�� �వసరమ�"
-
-#. TRANSLATORS: message: show the array of dependant packages for this package
-#: ../src/gpk-application.c:1078
-#, c-format
-msgid "Packages listed below are required for %s to function correctly."
-msgid_plural "Packages listed below are required for %s to function correctly."
-msgstr[0] "��రి�దన �ాబితా��సివ�న�న ప�యా����ల� %s సరి�ాపని��య���� �వసరమ�"
-msgstr[1] "��రి�దన �ాబితా��సివ�న�న ప�యా����ల� %s సరి�ాపని��య���� �వసరమ�"
-
-#. TRANSLATORS: the repo name is invalid or not found, fall back to this
-#: ../src/gpk-application.c:1143
-msgid "Invalid"
-msgstr "సరి�ాని"
-
-#. TRANSLATORS: no results were found for this search
-#: ../src/gpk-application.c:1331
-msgid "No results were found."
-msgstr "���వ��ి ఫలితాల� �నబడల�ద�"
-
-#. TRANSLATORS: be helpful, but this shouldn't happen
-#: ../src/gpk-application.c:1339
-msgid "Try entering a package name in the search bar."
-msgstr "శ�ధన ప����న�ద� ప�యా���� నామమ�న� ప�రవ�శప�������� ప�రయత�ని���మ�."
-
-#. TRANSLATORS: nothing in the package queue
-#: ../src/gpk-application.c:1342
-msgid "There are no packages queued to be installed or removed."
-msgstr "స�స�థాపి������ ల�దా త�ల�ి������ ����డ య���వ��ి ప�యా����ల� ��య���సిల�వ�."
-
-#. TRANSLATORS: tell the user to switch to details search mode
-#: ../src/gpk-application.c:1347
-msgid ""
-"Try searching package descriptions by clicking the icon next to the search "
-"text."
-msgstr "శ�ధన పాఠ�యమ��� తర�వాతనవ�న�న ప�రతిమన� న������ద�వారా శ�ధన ప�యా���� వివరణలన� ప�రయత�ని���మ�."
-
-#. TRANSLATORS: tell the user to try harder
-#: ../src/gpk-application.c:1350
-msgid "Try again with a different search term."
-msgstr "వ�ర�� శ�ధన పదమ�త� మరలా ప�రయత�ని���మ�"
-
-#. TRANSLATORS: title: invlid text in the search bar
-#: ../src/gpk-application.c:1598
-msgid "Invalid search text"
-msgstr "సరి�ాని శ�ధన పాఠ�యమ�"
-
-#. TRANSLATORS: message: tell the user that's not allowed
-#: ../src/gpk-application.c:1600
-msgid "The search text contains invalid characters"
-msgstr "శ�ధన పాఠ�యమ� సరి�ాని ���షరమ�లన� �లి�ివ��ది"
-
-#. TRANSLATORS: title: we failed to execute the mthod
-#: ../src/gpk-application.c:1634
-msgid "The search could not be completed"
-msgstr "శ�ధన ప�ర�తవల�� ప�యి�ది"
-
-#. TRANSLATORS: low level failure, details to follow
-#: ../src/gpk-application.c:1636
-msgid "Running the transaction failed"
-msgstr "వ�యవహారమ�న� నడ�ప�� విఫలమ��ది"
-
-#. TRANSLATORS: title: warn the user they are quitting with unapplied changes
-#: ../src/gpk-application.c:1766
-msgid "Changes not applied"
-msgstr "మార�ప�ల� �పాది��ల�ద�"
-
-#: ../src/gpk-application.c:1767
-msgid "Close _Anyway"
-msgstr "�మ�నా మ�సివ�యి (_A)"
-
-#. TRANSLATORS: tell the user the problem
-#: ../src/gpk-application.c:1771
-msgid "You have made changes that have not yet been applied."
-msgstr "మ�ర� ��సిన మార�ప�ల� యి��న� �పాది��బడల�ద�."
-
-#: ../src/gpk-application.c:1772
-msgid "These changes will be lost if you close this window."
-msgstr "� వి�డ�న� మ�సివ�సిన��ల�త� � మార�ప�ల� ప�తాయి."
-
-#. TRANSLATORS: column for installed status
-#. TRANSLATORS: The state of a package
-#. TRANSLATORS: The action of the package, in past tense
-#: ../src/gpk-application.c:2097 ../src/gpk-enum.c:1139 ../src/gpk-enum.c:1220
-msgid "Installed"
-msgstr "స�స�థాపి��ిన"
-
-#. TRANSLATORS: column for package name
-#. TRANSLATORS: column for group name
-#. TRANSLATORS: column for the package name
-#: ../src/gpk-application.c:2113 ../src/gpk-application.c:2135
-#: ../src/gpk-dialog.c:143 ../src/gpk-modal-dialog.c:712
-msgid "Name"
-msgstr "నామమ�"
-
-#. TRANSLATORS: the type of package is a collection (metagroup)
-#: ../src/gpk-application.c:2262
-msgid "Type"
-msgstr "à°°à°?à°?"
-
-#: ../src/gpk-application.c:2262
-msgid "Collection"
-msgstr "స�ప��మ�"
-
-#. TRANSLATORS: tooltip: go to the web address
-#: ../src/gpk-application.c:2270
-#, c-format
-msgid "Visit %s"
-msgstr "దర�శి��� %s"
-
-#. TRANSLATORS: add an entry to go to the project home page
-#: ../src/gpk-application.c:2275
-msgid "Project"
-msgstr "ప�ర�������"
-
-#: ../src/gpk-application.c:2275
-msgid "Homepage"
-msgstr "నివాసప���"
-
-#. TRANSLATORS: the group the package belongs in
-#: ../src/gpk-application.c:2289
-msgid "Group"
-msgstr "సమ�హ�"
-
-#. TRANSLATORS: the licence string for the package
-#: ../src/gpk-application.c:2295
-msgid "License"
-msgstr "ల�స�న�స�"
-
-#. TRANSLATORS: the path in the menu, e.g. Applications -> Games
-#: ../src/gpk-application.c:2304
-msgid "Menu"
-msgstr "మ�న�"
-
-#. TRANSLATORS: the size of the meta package
-#. TRANSLATORS: a column that has size of each package
-#: ../src/gpk-application.c:2322 ../src/gpk-update-viewer.c:1488
-msgid "Size"
-msgstr "పరిమాణ�"
-
-#. TRANSLATORS: the installed size in bytes of the package
-#: ../src/gpk-application.c:2325
-msgid "Installed size"
-msgstr "స�స�థాపి��ిన పరిమాణమ�"
-
-#. TRANSLATORS: the download size of the package
-#: ../src/gpk-application.c:2328
-msgid "Download size"
-msgstr "డ�న�ల�డ� పరిమాణమ�"
-
-#. TRANSLATORS: where the package came from, the software source name
-#: ../src/gpk-application.c:2337
-msgid "Source"
-msgstr "వనర�"
-
-#. TRANSLATORS: this is a menu group of packages in the queue
-#: ../src/gpk-application.c:2479
-msgid "Selected packages"
-msgstr "��పి���సిన ప�యా����ల�"
-
-#. TRANSLATORS: entry tooltip: basic search
-#: ../src/gpk-application.c:2531
-msgid "Searching by name"
-msgstr "నామమ� ద�వారా శ�ధన"
-
-#. TRANSLATORS: entry tooltip: detailed search
-#: ../src/gpk-application.c:2554
-msgid "Searching by description"
-msgstr "వివరణమ� ద�వారా శ�ధన"
-
-#. TRANSLATORS: entry tooltip: file search
-#: ../src/gpk-application.c:2577
-msgid "Searching by file"
-msgstr "దస�త�రమ� ద�వారా శ�ధన"
-
-#. TRANSLATORS: context menu item for the search type icon
-#: ../src/gpk-application.c:2602
-msgid "Search by name"
-msgstr "నామమ� ద�వారా శ�ధన"
-
-#. TRANSLATORS: context menu item for the search type icon
-#: ../src/gpk-application.c:2612
-=======
 #: ../src/gpk-application.c:608
 #, c-format
 msgid "%i file installed by %s"
@@ -1383,44 +1039,27 @@ msgstr "నామమ� ద�వారా శ�ధన"
 
 #. TRANSLATORS: context menu item for the search type icon
 #: ../src/gpk-application.c:2658
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Search by description"
 msgstr "వివరణమ� ద�వారా శ�ధన"
 
 #. TRANSLATORS: context menu item for the search type icon
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-application.c:2622
-=======
 #: ../src/gpk-application.c:2668
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Search by file name"
 msgstr "దస�త�రమ� నామమ� ద�వారా శ�ధన"
 
 #. TRANSLATORS: packaging problem, failed to show link
 #. TRANSLATORS: normally a packaging error, cannot launch link
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-application.c:2665 ../src/gpk-check-update.c:203
-=======
 #: ../src/gpk-application.c:2711 ../src/gpk-check-update.c:202
->>>>>>> Updated Telugu Translation:po/te.po
 #: ../src/gpk-watch.c:428
 msgid "Failed to show url"
 msgstr "url ��ప���� విఫలమ��ది"
 
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-application.c:2702 ../src/gpk-check-update.c:227
-=======
 #: ../src/gpk-application.c:2748 ../src/gpk-check-update.c:226
->>>>>>> Updated Telugu Translation:po/te.po
 #: ../src/gpk-watch.c:448
 msgid "Licensed under the GNU General Public License Version 2"
 msgstr "GNU �నరల� పబ�లి�� ల�స�న�స� వర�షన� 2 ��రి�ద ల�స�న�స� ప��దబడి��ది"
 
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-application.c:2703 ../src/gpk-check-update.c:228
-=======
 #: ../src/gpk-application.c:2749 ../src/gpk-check-update.c:227
->>>>>>> Updated Telugu Translation:po/te.po
 #: ../src/gpk-watch.c:449
 msgid ""
 "PackageKit is free software; you can redistribute it and/or modify it under "
@@ -1432,11 +1071,7 @@ msgstr ""
 "ల�బడి ద�నిని మ�ర� ప�న�ప�పిణి మరియ�/ల�దా సవరణ ��యవ����; మ�ర� �న�సరి��వలిసినది ల�స�న�స� య���� వర�షన� 2, "
 "ల�దా (మ� ����ి�� వద�ద) దాని తర�వాతి వర�షన� �ాని."
 
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-application.c:2707 ../src/gpk-check-update.c:232
-=======
 #: ../src/gpk-application.c:2753 ../src/gpk-check-update.c:231
->>>>>>> Updated Telugu Translation:po/te.po
 #: ../src/gpk-watch.c:453
 msgid ""
 "PackageKit is distributed in the hope that it will be useful, but WITHOUT "
@@ -1447,11 +1082,7 @@ msgstr ""
 "ప�యా���ి�ి�� �ది �పయ��పడ�త��దన� నమ�మ�� త� ప�పిణ� ��యబడి�ది, �యిత� � హామి ల�ద�; వ�యాపారస�బ�ధిత��ా �ాని ల�దా "
 "ప�రతిపాదిత ప�రయ��న� ��ర�� �ాని హామ� ల�ద�. �ధి�వివరమ�ల��ర�� GNU �నరల� పబ�లి�� ల�స�న�స� న� ��డ�డి."
 
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-application.c:2711 ../src/gpk-check-update.c:236
-=======
 #: ../src/gpk-application.c:2757 ../src/gpk-check-update.c:235
->>>>>>> Updated Telugu Translation:po/te.po
 #: ../src/gpk-watch.c:457
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
@@ -1463,11 +1094,7 @@ msgstr ""
 "�� వ�రాయ�డి."
 
 #. TRANSLATORS: put your own name here -- you deserve credit!
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-application.c:2717 ../src/gpk-check-update.c:241
-=======
 #: ../src/gpk-application.c:2763 ../src/gpk-check-update.c:240
->>>>>>> Updated Telugu Translation:po/te.po
 #: ../src/gpk-watch.c:462
 msgid "translator-credits"
 msgstr ""
@@ -1475,136 +1102,67 @@ msgstr ""
 "Pramod <pramodfsf gmail com>"
 
 #. TRANSLATORS: website label
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-application.c:2743 ../src/gpk-check-update.c:261
-=======
 #: ../src/gpk-application.c:2789 ../src/gpk-check-update.c:260
->>>>>>> Updated Telugu Translation:po/te.po
 #: ../src/gpk-watch.c:481
 msgid "PackageKit Website"
 msgstr "PackageKit à°µà±?à°¬à±?â??à°¸à±?à°?à±?"
 
 #. TRANSLATORS: description of application, gpk-application that is
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-application.c:2746
-=======
 #: ../src/gpk-application.c:2792
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Package Manager for GNOME"
 msgstr "GNOME ��ర�� ప�యా���� నిర�వాహి�"
 
 #. TRANSLATORS: single column for the package details, not visible at the moment
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-application.c:3192
-=======
 #: ../src/gpk-application.c:3238
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Text"
 msgstr "పాఠ�యమ�"
 
 #. TRANSLATORS: welcome text if we can click the group array
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-application.c:3215
-=======
 #: ../src/gpk-application.c:3261
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Enter a package name and then click find, or click a group to get started."
 msgstr "ప�యా����నామమ�న� ప�రవ�శప����ి �న���న�మ� న�����మ�, ల�దా ప�రార�భమ����� సమ�హ�న� న�����మ�."
 
 #. TRANSLATORS: welcome text if we have to search by name
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-application.c:3218
-=======
 #: ../src/gpk-application.c:3264
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Enter a package name and then click find to get started."
 msgstr "ప�రార�భమ����� ప�యా����నామమ�న� ప�రవ�శప����ి �న���న�మ� న�����మ�."
 
 #. TRANSLATORS: daemon is broken
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-application.c:3412
-#| msgid "Exiting as backend details could not be retrieved"
-=======
 #: ../src/gpk-application.c:3492
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Exiting as properties could not be retrieved"
 msgstr "ల��షణమ�ల��ా నిష���రమి��ినవి తిరి�ిప��దబడల�వ�"
 
 #. TRANSLATORS: title: all of the packages on the system and availble in sources
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-application.c:3532
-=======
 #: ../src/gpk-application.c:3612
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "All packages"
 msgstr "�న�ని ప�యా����ల�"
 
 #. TRANSLATORS: tooltip: all packages
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-application.c:3534
-=======
 #: ../src/gpk-application.c:3614
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Show all packages"
 msgstr "�న�ని ప�యా����లన� ��ప�మ�"
 
 #. TRANSLATORS: tooltip on the clear button
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-application.c:3750
-=======
 #: ../src/gpk-application.c:3838
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Clear current selection"
 msgstr "ప�రస�త�త య��పి�న� శ�భ�రమ���య�మ�"
 
 #. TRANSLATORS: tooltip on the apply button
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-application.c:3775
-=======
 #: ../src/gpk-application.c:3863
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Changes are not applied instantly, this button applies all changes"
 msgstr "మార�ప�లన�న� సత�వరమ� �పాది��బడవ�, � బ�న� �న�ని మార�ప�లన� �పాదిస�త��ది."
 
 #. TRANSLATORS: tooltip on the homepage button
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-application.c:3801
-=======
 #: ../src/gpk-application.c:3889
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Visit home page for selected package"
 msgstr "��పి��ాబడిన ప�యా������ర�� నివాసప���ని దర�శి���మ�"
 
 #. TRANSLATORS: tooltip on the find button
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-application.c:3909
-=======
 #: ../src/gpk-application.c:3997
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Find packages"
 msgstr "ప�యా����లన� �న���న�మ�"
 
 #. TRANSLATORS: tooltip on the cancel button
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-application.c:3916
-msgid "Cancel search"
-msgstr "శ�ధనన� రద�ద���య�మ�"
-
-#. TRANSLATORS: show the debug data on the console
-#: ../src/gpk-application-main.c:78 ../src/gpk-backend-status.c:243
-#: ../src/gpk-install-catalog.c:53 ../src/gpk-install-local-file.c:52
-#: ../src/gpk-install-mime-type.c:52 ../src/gpk-install-package-name.c:52
-#: ../src/gpk-install-provide-file.c:52 ../src/gpk-log.c:650
-#: ../src/gpk-prefs.c:488 ../src/gpk-repo.c:572 ../src/gpk-service-pack.c:688
-#: ../src/gpk-update-icon.c:128 ../src/gpk-update-viewer-main.c:75
-msgid "Show extra debugging information"
-msgstr "�ధి� డ�బ���ి��� సమా�ారాన�ని ��ప�మ�"
-
-#. TRANSLATORS: show the program version
-#: ../src/gpk-application-main.c:81 ../src/gpk-backend-status.c:245
-#: ../src/gpk-prefs.c:490 ../src/gpk-update-icon.c:132
-#: ../src/gpk-update-viewer-main.c:78
-=======
 #: ../src/gpk-application.c:4004
 msgid "Cancel search"
 msgstr "శ�ధనన� రద�ద���య�మ�"
@@ -1613,7 +1171,6 @@ msgstr "శ�ధనన� రద�ద���య�మ�"
 #: ../src/gpk-application-main.c:77 ../src/gpk-backend-status.c:242
 #: ../src/gpk-prefs.c:464 ../src/gpk-update-icon.c:64
 #: ../src/gpk-update-viewer-main.c:69
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Show the program version and exit"
 msgstr "à°ªà±?à°°à±?à°?à±?రామà±? వరà±?à°·à°¨à±?â??à°¨à±? à°?à±?à°ªà±?à°®à±? మరియà±? నిషà±?à°?à±?రమిà°?à°?à±?à°®à±?"
 
@@ -1623,21 +1180,12 @@ msgid "Package installer"
 msgstr "ప�యా���� స�స�థాప�ి"
 
 #. TRANSLATORS: backend is broken, and won't tell us what it supports
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-backend-status.c:76 ../src/gpk-prefs.c:397 ../src/gpk-repo.c:492
-#: ../src/gpk-update-viewer.c:2604
-msgid "Exiting as backend details could not be retrieved"
-msgstr "బ�యా���డ� వివరమ�ల��ా నిష���రమి��ినవి తిరి�ిప��దబడల�వ�"
-
-#: ../src/gpk-backend-status.c:260
-=======
 #: ../src/gpk-backend-status.c:76 ../src/gpk-prefs.c:398 ../src/gpk-repo.c:534
 #: ../src/gpk-update-viewer.c:2730
 msgid "Exiting as backend details could not be retrieved"
 msgstr "బ�యా���డ� వివరమ�ల��ా నిష���రమి��ినవి తిరి�ిప��దబడల�వ�"
 
 #: ../src/gpk-backend-status.c:258
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "PackageKit Backend Details Viewer"
 msgstr "PackageKit బ�యా���డ� వివరమ�ల వ���షణి"
 
@@ -1648,40 +1196,24 @@ msgstr "�భ�ష��ాల�(_P)"
 
 #. TRANSLATORS: context menu to show the about screen
 #. TRANSLATORS: this is the right click menu item
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-check-update.c:307 ../src/gpk-watch.c:508
-=======
 #: ../src/gpk-check-update.c:306 ../src/gpk-watch.c:508
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "_About"
 msgstr "à°?à±?à°°à°¿à°?à°?à°¿ (_A)"
 
 #. TRANSLATORS: we did the update, but some updates were skipped and not applied
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-check-update.c:387
-=======
 #: ../src/gpk-check-update.c:397
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "One package was skipped:"
 msgid_plural "Some packages were skipped:"
 msgstr[0] "�� ప�యా���� వదిలివ�యబడి�ది:"
 msgstr[1] "�� ప�యా���� వదిలివ�యబడి�ది:"
 
 #. TRANSLATORS: title: system update completed all okay
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-check-update.c:418
-=======
 #: ../src/gpk-check-update.c:428
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "The system update has completed"
 msgstr "సిస��మ� నవ��రణ ప�ర�త�నది"
 
 #. TRANSLATORS: restart computer as system packages need update
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-check-update.c:426
-=======
 #: ../src/gpk-check-update.c:436
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Restart computer now"
 msgstr "à°?à°?à°ªà±?à°¯à±?à°?à°°à±?â??à°¨à±? యిపà±?à°ªà±?à°¡à±? à°ªà±?à°¨à°?à°ªà±?రారà°?à°­à°¿à°?à°?à±?à°®à±?"
 
@@ -1689,72 +1221,36 @@ msgstr "à°?à°?à°ªà±?à°¯à±?à°?à°°à±?â??à°¨à±? యిపà±?à°ªà±?à°¡à±? à°ªà±?à°¨
 #. TRANSLATORS: hides forever
 #. add a checkbutton for deps screen
 #. TRANSLATORS: don't pop-up the same message twice
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-check-update.c:433 ../src/gpk-check-update.c:1342
-#: ../src/gpk-dialog.c:304 ../src/gpk-hardware.c:185 ../src/gpk-watch.c:1538
-=======
 #: ../src/gpk-check-update.c:443 ../src/gpk-check-update.c:1355
 #: ../src/gpk-dialog.c:306 ../src/gpk-hardware.c:194 ../src/gpk-watch.c:1579
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Do not show this again"
 msgstr "ద�నిని మరలా ��పవద�ద�"
 
 #. TRANSLATORS: this is the application name for libcanberra
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-check-update.c:488 ../src/gpk-check-update.c:987
-#: ../src/gpk-check-update.c:1009
-=======
 #: ../src/gpk-check-update.c:498 ../src/gpk-check-update.c:990
 #: ../src/gpk-check-update.c:1012
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "GNOME PackageKit Update Icon"
 msgstr "GNOME PackageKit నవ��రణప� ప�రతిమ"
 
 #. TRANSLATORS: this is the sound description
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-check-update.c:490 ../src/gpk-update-viewer.c:441
-=======
 #: ../src/gpk-check-update.c:500 ../src/gpk-update-viewer.c:445
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Updated successfully"
 msgstr "వి�యవ�త��ా నవ��రి��బడి�ది"
 
 #. TRANSLATORS: title in the libnotify popup
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-check-update.c:629
-=======
 #: ../src/gpk-check-update.c:619
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Security update available"
 msgid_plural "Security updates available"
 msgstr[0] "ర��షణ నవ��రణాల� ��ద�బా��ల�వ�న�నాయి"
 msgstr[1] "ర��షణ నవ��రణాల� ��ద�బా��ల�వ�న�నాయి"
 
 #. TRANSLATORS: message when there are security updates
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-check-update.c:634
-=======
 #: ../src/gpk-check-update.c:624
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "The following important update is available for your computer:"
 msgid_plural "The following important updates are available for your computer:"
 msgstr[0] "à°?à°?à±?à°°à°¿à°?ది à°®à±?à°?à±?యమà±?à°¨ నవà±?à°?రణమà±?à°²à±? à°®à±? à°?à°?à°ªà±?à°¯à±?à°?à°°à±?â??à°?à±?à°°à°?à±? à°?à°?à°¦à±?బాà°?à±?à°²à±?à°µà±?à°¨à±?నాయి:"
 msgstr[1] "à°?à°?à±?à°°à°¿à°?ది à°®à±?à°?à±?యమà±?à°¨ నవà±?à°?రణమà±?à°²à±? à°®à±? à°?à°?à°ªà±?à°¯à±?à°?à°°à±?â??à°?à±?à°°à°?à±? à°?à°?à°¦à±?బాà°?à±?à°²à±?à°µà±?à°¨à±?నాయి:"
 
-<<<<<<< HEAD:po/te.po
-#. TRANSLATORS: button: only security updates
-#: ../src/gpk-check-update.c:657
-msgid "Install only security updates"
-msgstr "ర��షణ నవ��రణలన� మాత�రమ� స�స�థాపి���మ�"
-
-#. TRANSLATORS: button: open the update viewer
-#: ../src/gpk-check-update.c:663
-msgid "Show all software updates"
-msgstr "�న�ని సాఫ���వ�ర� నవ��రణలన� ��ప�మ�"
-
-#. TRANSLATORS: policy says update, but we are on battery and so prompt
-#: ../src/gpk-check-update.c:776
-=======
 #. TRANSLATORS: button: open the update viewer to install updates
 #: ../src/gpk-check-update.c:647
 #| msgid "Installing updates"
@@ -1763,62 +1259,37 @@ msgstr "నవ��రణలన� స�స�థాపి���మ�"
 
 #. TRANSLATORS: policy says update, but we are on battery and so prompt
 #: ../src/gpk-check-update.c:760
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "Automatic updates are not being installed as the computer is running on "
 "battery power"
 msgstr "à°?à°?à°ªà±?à°¯à±?à°?à°°à±? à°¬à±?యాà°?à°°à±? పవరà±?â??à°ªà±?à°µà±?à°¨à±?నపà±?à°ªà±?à°¡à±? à°¸à±?వయà°?à°?ాలà°? నవà±?à°?రణలà±? à°¸à°?à°¸à±?థాపిà°?à°?బడలà±?à°µà±?"
 
 #. TRANSLATORS: informs user will not install by default
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-check-update.c:778
-=======
 #: ../src/gpk-check-update.c:762
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Updates not installed"
 msgstr "నవ��రణల� స�స�థాపి��బడల�ద�"
 
 #. TRANSLATORS: to hell with my battery life, just do it
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-check-update.c:788
-=======
 #: ../src/gpk-check-update.c:772
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Install the updates anyway"
 msgstr "�మ�నాసర� నవ��రణలన� స�స�థాపి���మ�"
 
 #. TRANSLATORS: title: notification when we scheduled an automatic update
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-check-update.c:835
-=======
 #: ../src/gpk-check-update.c:819
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Updates are being installed"
 msgstr "నవ��రణల� స�స�థాపి��బడినవి"
 
 #. TRANSLATORS: tell the user why the hard disk is grinding...
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-check-update.c:837
-msgid "Updates are being automatically installed on your computer"
-msgstr "à°®à±? à°?à°?à°ªà±?à°¯à±?à°?à°°à±?â??à°¨à°?à°¦à±? నవà±?à°?రణలà±? à°¸à±?వయà°?à°?ాలà°?à°?à°?à°¾ à°¸à°?à°¸à±?థాపిà°?à°?బడినవి"
-
-#: ../src/gpk-check-update.c:843
-=======
 #: ../src/gpk-check-update.c:821
 msgid "Updates are being automatically installed on your computer"
 msgstr "à°®à±? à°?à°?à°ªà±?à°¯à±?à°?à°°à±?â??à°¨à°?à°¦à±? నవà±?à°?రణలà±? à°¸à±?వయà°?à°?ాలà°?à°?à°?à°¾ à°¸à°?à°¸à±?థాపిà°?à°?బడినవి"
 
 #: ../src/gpk-check-update.c:827
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Cancel update"
 msgstr "నవ��రణన� రద�ద���యి"
 
 #. TRANSLATORS: we have a notification that won't fit, so append on how many other we are not showing
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-check-update.c:943
-=======
 #: ../src/gpk-check-update.c:944
->>>>>>> Updated Telugu Translation:po/te.po
 #, c-format
 msgid "and %d other security update"
 msgid_plural "and %d other security updates"
@@ -1826,11 +1297,7 @@ msgstr[0] "మరియ� %d యితర ర��షణ నవ��రణల
 msgstr[1] "మరియ� %d యితర ర��షణ నవ��రణల�"
 
 #. TRANSLATORS: tooltip: how many updates are waiting to be applied
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-check-update.c:959
-=======
 #: ../src/gpk-check-update.c:962
->>>>>>> Updated Telugu Translation:po/te.po
 #, c-format
 msgid "There is %d update available"
 msgid_plural "There are %d updates available"
@@ -1838,29 +1305,17 @@ msgstr[0] "����డ %d నవ��రణ ��ద�బా��ల�
 msgstr[1] "����డ %d నవ��రణ ��ద�బా��ల�వ��ది"
 
 #. TRANSLATORS: this is the sound description
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-check-update.c:989
-=======
 #: ../src/gpk-check-update.c:992
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Update available"
 msgstr "నవ��రణమ� ��ద�బా��ల�వ��ది"
 
 #. TRANSLATORS: this is the sound description
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-check-update.c:1011
-=======
 #: ../src/gpk-check-update.c:1014
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Update available (on battery)"
 msgstr "నవ��రణమ� ��ద�బా��ల�వ��ది (బ�యా�ర� ప�న)"
 
 #. TRANSLATORS: a distro update is available, e.g. Fedora 8 to Fedora 9
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-check-update.c:1329
-=======
 #: ../src/gpk-check-update.c:1342
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Distribution upgrades available"
 msgstr "ప�పిణ� నవ��రణల� ��ద�బా��ల�వ�న�నాయి"
 
@@ -1869,15 +1324,9 @@ msgstr "ప�పిణ� నవ��రణల� ��ద�బా��ల
 #. TRANSLATORS: button: show the user a button to get more help finding stuff
 #. TRANSLATORS: button text
 #. TRANSLATORS: button: show the user a button to get more help finding stuff
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-check-update.c:1339 ../src/gpk-dbus-task.c:912
-#: ../src/gpk-dbus-task.c:1130 ../src/gpk-dbus-task.c:1423
-#: ../src/gpk-dbus-task.c:1596 ../src/gpk-dbus-task.c:1847
-=======
 #: ../src/gpk-check-update.c:1352 ../src/gpk-dbus-task.c:1017
 #: ../src/gpk-dbus-task.c:1251 ../src/gpk-dbus-task.c:1557
 #: ../src/gpk-dbus-task.c:1763 ../src/gpk-dbus-task.c:2021
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "More information"
 msgstr "�����వ సమా�ారమ�"
 
@@ -1987,135 +1436,79 @@ msgid "%s, %s, %s, %s and %s"
 msgstr "%s, %s, %s, %s మరియ� %s"
 
 #. TRANSLATORS: we failed to install
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:184
-=======
 #: ../src/gpk-dbus-task.c:245
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Failed to install software"
 msgstr "సాఫ���వ�ర� స�స�థాపి������ విఫలమ��ది"
 
 #. TRANSLATORS: we didn't select any applications that were returned
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:186
-=======
 #: ../src/gpk-dbus-task.c:247
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "No applications were chosen to be installed"
 msgstr "స�స�థాపి������ య���వ��ి �న�వర�తనమ�ల� య������నబడల�ద�"
 
 #. TRANSLATORS: detailed text about the error
 #. TRANSLATORS: The detailed error if the user clicks "more info"
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:218 ../src/gpk-watch.c:398
-msgid "Error details"
-msgstr "ద�షమ� వివరణల�"
-
-#: ../src/gpk-dbus-task.c:218
-=======
 #: ../src/gpk-dbus-task.c:279 ../src/gpk-watch.c:398
 msgid "Error details"
 msgstr "ద�షమ� వివరణల�"
 
 #: ../src/gpk-dbus-task.c:279
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Package Manager error details"
 msgstr "ప�యా���� నిర�వాహ��ని ద�ష వివరమ�ల�"
 
 #. TRANSLATORS: default fallback error -- this should never happen
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:233
-=======
 #: ../src/gpk-dbus-task.c:294
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "Unknown error. Please refer to the detailed report and report in your "
 "distribution bugtracker."
 msgstr "à°¤à±?లియని à°¦à±?à°·à°®à±?. విశదà±?à°?à±?తమà±?à°¨ నివà±?దిà°?à°¨à±? దయà°?à±?సి à°?à±?à°¡à±?à°®à±? మరియà±? à°®à±? à°ªà°?పిణి à°¬à°?à±?â??à°?à±?à°°à°¾à°?à°°à±?â??à°¨à°?à°¦à±? నివà±?దిà°?à°?à±?à°®à±?."
 
 #. TRANSLATORS: failed authentication
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:247
-=======
 #: ../src/gpk-dbus-task.c:308
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "You don't have the necessary privileges to perform this action."
 msgstr "� �ర�యన� �ర�ప���� మ�ర� �వసరమ�న �న�మత�లన� �లి�ిల�ర�."
 
 #. TRANSLATORS: could not start system service
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:251
-=======
 #: ../src/gpk-dbus-task.c:312
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "The packagekitd service could not be started."
 msgstr "packagekitd స�వ ప�రార�భి�బడల�� ప�యి�ది."
 
 #. TRANSLATORS: the user tried to query for something invalid
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:255
-=======
 #: ../src/gpk-dbus-task.c:316
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "The query is not valid."
 msgstr "��వర� ��ల�ల�నది �ాద�."
 
 #. TRANSLATORS: the user tried to install a file that was not compatable or broken
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:259
-=======
 #: ../src/gpk-dbus-task.c:320
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "The file is not valid."
 msgstr "దస�త�రమ� ��ల�ల�నది �ాద�."
 
 #. TRANSLATORS: button: show details about the error
 #. TRANSLATORS: This is a link in a libnotify bubble that shows the detailed error
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:322 ../src/gpk-watch.c:1380
-=======
 #: ../src/gpk-dbus-task.c:383 ../src/gpk-watch.c:1401
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Show details"
 msgstr "వివరమ�లన� ��ప�మ�"
 
 #. TRANSLATORS: error: failed to install, detailed error follows
 #. TRANSLATORS: failed to install, shouldn't be shown
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:345 ../src/gpk-dbus-task.c:958
-=======
 #: ../src/gpk-dbus-task.c:406 ../src/gpk-dbus-task.c:1070
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Failed to install package"
 msgstr "ప�యా����ని స�స�థాపి������ విఫలమ��ది"
 
 #. TRANSLATORS: title: installing packages
 #. TRANSLATORS: transaction state, installing packages
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:377 ../src/gpk-enum.c:938
-=======
 #: ../src/gpk-dbus-task.c:443 ../src/gpk-enum.c:955
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Installing packages"
 msgstr "ప�యా����లన� స�స�థాపి�����న�నది"
 
 #. TRANSLATORS: title
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:474 ../src/gpk-dbus-task.c:1162
-=======
 #: ../src/gpk-dbus-task.c:541 ../src/gpk-dbus-task.c:1289
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Failed to install file"
 msgid_plural "Failed to install files"
 msgstr[0] "ఫ�ళ�ళన� స�స�థాపి������ విఫలమ��ది"
 msgstr[1] "ఫ�ళ�ళన� స�స�థాపి������ విఫలమ��ది"
 
 #. TRANSLATORS: title: confirm the user want's to install a local file
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:553
-=======
 #: ../src/gpk-dbus-task.c:622
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Do you want to install this file?"
 msgid_plural "Do you want to install these files?"
 msgstr[0] "మ�ర� � దస�త�రమ�న� స�స�థాపి��వల�నని �న���న���న�నారా?"
@@ -2128,104 +1521,61 @@ msgstr[1] "మ�ర� � దస�త�రమ�న� స�స�థాప
 #. TRANSLATORS: button: install packages in catalog
 #. TRANSLATORS: button: install catalog
 #. TRANSLATORS: if the update should be installed
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:562 ../src/gpk-dbus-task.c:1045
-#: ../src/gpk-dbus-task.c:1249 ../src/gpk-dbus-task.c:1450
-#: ../src/gpk-dbus-task.c:1873 ../src/gpk-dbus-task.c:2091
-#: ../src/gpk-dbus-task.c:2141 ../src/gpk-update-viewer.c:1416
-=======
 #: ../src/gpk-dbus-task.c:631 ../src/gpk-dbus-task.c:1163
 #: ../src/gpk-dbus-task.c:1382 ../src/gpk-dbus-task.c:1585
 #: ../src/gpk-dbus-task.c:2048 ../src/gpk-dbus-task.c:2316
 #: ../src/gpk-dbus-task.c:2593 ../src/gpk-update-viewer.c:1420
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Install"
 msgstr "స�స�థాపి���మ�"
 
 #. TRANSLATORS: title: installing a local file
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:842
-=======
 #: ../src/gpk-dbus-task.c:946
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Install local file"
 msgid_plural "Install local files"
 msgstr[0] "స�థాని� దస�త�రమ�న� స�స�థాపి���మ�"
 msgstr[1] "స�థాని� దస�త�రమ�న� స�స�థాపి���మ�"
 
 #. TRANSLATORS: couldn't resolve name to package
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:900
-=======
 #: ../src/gpk-dbus-task.c:1005
->>>>>>> Updated Telugu Translation:po/te.po
 #, c-format
 msgid "Could not find packages"
 msgstr "ప�యా����లన� �న���నల�� ప�యి�ది"
 
 #. TRANSLATORS: message: could not find
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:909
-msgid "The packages could not be found in any software source"
-msgstr "� ప�యా���� � సాఫ���వ�ర� మ�లమ�న�ద� �న���నల�� ప�యి�ది"
-
-#: ../src/gpk-dbus-task.c:942
-=======
 #: ../src/gpk-dbus-task.c:1014
 msgid "The packages could not be found in any software source"
 msgstr "� ప�యా���� � సాఫ���వ�ర� మ�లమ�న�ద� �న���నల�� ప�యి�ది"
 
 #: ../src/gpk-dbus-task.c:1053
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Failed to install packages"
 msgstr "ప�యా����లన� స�స�థాపి����ల� విఫలమ��ది"
 
 #. TRANSLATORS: message: package is already installed
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:944 ../src/gpk-enum.c:365
-=======
 #: ../src/gpk-dbus-task.c:1055 ../src/gpk-enum.c:369
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "The package is already installed"
 msgstr "� ప�యా���� యిప�ప�ి�� స�స�థాపి��బడివ��ది"
 
 #. TRANSLATORS: the search gave us the wrong result. internal error. barf.
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:960
-=======
 #: ../src/gpk-dbus-task.c:1072
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Incorrect response from search"
 msgstr "శ�ధనన��డి సరి�ాని స�ప�దన"
 
 #. TRANSLATORS: a program needs a package, for instance openoffice-clipart
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:1029
-=======
 #: ../src/gpk-dbus-task.c:1147
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "An additional package is required:"
 msgid_plural "Additional packages are required:"
 msgstr[0] "�� �దనప� ప�యా���� �వసరమ��ది"
 msgstr[1] "�� �దనప� ప�యా���� �వసరమ��ది"
 
 #. TRANSLATORS: ask the user if it's okay to search
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:1032
-=======
 #: ../src/gpk-dbus-task.c:1150
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Do you want to search for and install this package now?"
 msgid_plural "Do you want to search for and install these packages now?"
 msgstr[0] "మ�ర� � ప�యా���� ��ర�� శ�ధి��ి దానిని స�స�థాపి��ాలని �న���న���న�నారా?"
 msgstr[1] "మ�ర� � ప�యా���� ��ర�� శ�ధి��ి దానిని స�స�థాపి��ాలని �న���న���న�నారా?"
 
 #. TRANSLATORS: string is a program name, e.g. "Movie Player"
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:1038
-=======
 #: ../src/gpk-dbus-task.c:1156
->>>>>>> Updated Telugu Translation:po/te.po
 #, c-format
 msgid "%s wants to install a package"
 msgid_plural "%s wants to install packages"
@@ -2233,81 +1583,49 @@ msgstr[0] "%s �� ప�యా����న� స�స�థాపి�
 msgstr[1] "%s �� ప�యా����న� స�స�థాపి��వల�నని ��ర���న���న�నది"
 
 #. TRANSLATORS: a random program which we can't get the name wants to do something
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:1041
-=======
 #: ../src/gpk-dbus-task.c:1159
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "A program wants to install a package"
 msgid_plural "A program wants to install packages"
 msgstr[0] "ప�ర���రామ� ప�యా����న� స�స�థాపి���దామని ��ర���న���న�నది"
 msgstr[1] "ప�ర���రామ� ప�యా����న� స�స�థాపి���దామని ��ర���న���న�నది"
 
 #. TRANSLATORS: title, searching
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:1057
-=======
 #: ../src/gpk-dbus-task.c:1176
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Searching for packages"
 msgstr "ప�యా����ల��ర�� శ�ధిస�త��ది"
 
 #. TRANSLATORS: failed to fild the package for thefile
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:1125
-=======
 #: ../src/gpk-dbus-task.c:1246
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Failed to find package"
 msgstr "ప�యా����ని �న���న��ల� విఫలమ��ది"
 
 #. TRANSLATORS: nothing found
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:1127
-=======
 #: ../src/gpk-dbus-task.c:1248 ../src/gpk-dbus-task.c:2440
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "The file could not be found in any packages"
 msgstr "� దస�త�రమ� య�ప�యా����న�ద� �న���నబడల�ద�"
 
 #. TRANSLATORS: we've already got a package that provides this file
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:1159
-=======
 #: ../src/gpk-dbus-task.c:1286
->>>>>>> Updated Telugu Translation:po/te.po
 #, c-format
 msgid "The %s package already provides this file"
 msgstr "%s ప�యా���� యిప�ప�ి�� � దస�త�రమ�న� ��ది�����న�నది"
 
 #. TRANSLATORS: a program wants to install a file, e.g. /lib/moo.so
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:1234
-=======
 #: ../src/gpk-dbus-task.c:1367
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "The following file is required:"
 msgid_plural "The following files are required:"
 msgstr[0] "� ��రి�ది దస�త�రమ� �వసరమ��ది:"
 msgstr[1] "� ��రి�ది దస�త�రమ� �వసరమ��ది:"
 
 #. TRANSLATORS: confirm with the user
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:1237
-=======
 #: ../src/gpk-dbus-task.c:1370
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Do you want to search for this file now?"
 msgid_plural "Do you want to search for these files now?"
 msgstr[0] "మ�ర� � దస�త�రమ� ��ర�� శ�ధి��ాలని �న���న���న�నారా?"
 msgstr[1] "మ�ర� � దస�త�రమ� ��ర�� శ�ధి��ాలని �న���న���న�నారా?"
 
 #. TRANSLATORS: string is a program name, e.g. "Movie Player"
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:1242
-=======
 #: ../src/gpk-dbus-task.c:1375
->>>>>>> Updated Telugu Translation:po/te.po
 #, c-format
 msgid "%s wants to install a file"
 msgid_plural "%s wants to install files"
@@ -2315,11 +1633,7 @@ msgstr[0] "%s �� దస�త�రమ� స�స�థాపి���
 msgstr[1] "%s �� దస�త�రమ� స�స�థాపి���దామని ��ర���న���న�నది"
 
 #. TRANSLATORS: a random program which we can't get the name wants to do something
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:1245
-=======
 #: ../src/gpk-dbus-task.c:1378
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "A program wants to install a file"
 msgid_plural "A program wants to install files"
 msgstr[0] "�� ప�ర���రామ� దస�త�రమ�న� స�స�థాపి���దామని ��ర���న���న�నది"
@@ -2327,43 +1641,27 @@ msgstr[1] "�� ప�ర���రామ� దస�త�రమ�న�
 
 #. TRANSLATORS: searching for the package that provides the file
 #. TRANSLATORS: The role of the transaction, in present tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:1260 ../src/gpk-enum.c:1290
-=======
 #: ../src/gpk-dbus-task.c:1394 ../src/gpk-dbus-task.c:2543
 #: ../src/gpk-enum.c:1307
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Searching for file"
 msgstr "దస�త�రమ� ��ర�� శ�ధిస�త�న�నది"
 
 #. TRANSLATORS: we are listing the plugins in a box
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:1303
-=======
 #: ../src/gpk-dbus-task.c:1437
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "The following plugin is required:"
 msgid_plural "The following plugins are required:"
 msgstr[0] "à°? à°?à±?à°°à°¿à°?ది à°ªà±?à°²à°?à±?â??యినà±?â??à°²à±? à°?వసరమà±?:"
 msgstr[1] "à°? à°?à±?à°°à°¿à°?ది à°ªà±?à°²à°?à±?â??యినà±?â??à°²à±? à°?వసరమà±?:"
 
 #. TRANSLATORS: ask for confirmation
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:1321
-=======
 #: ../src/gpk-dbus-task.c:1455
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Do you want to search for this now?"
 msgid_plural "Do you want to search for these now?"
 msgstr[0] "మ�ర� వ��ి��ర�� శ�ధి���దామని �న������న�నారా?"
 msgstr[1] "మ�ర� వ��ి��ర�� శ�ధి���దామని �న������న�నారా?"
 
 #. TRANSLATORS: a program wants to decode something (unknown) -- string is a program name, e.g. "Movie Player"
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:1334
-=======
 #: ../src/gpk-dbus-task.c:1468
->>>>>>> Updated Telugu Translation:po/te.po
 #, c-format
 msgid "%s requires an additional plugin to decode this file"
 msgid_plural "%s requires additional plugins to decode this file"
@@ -2371,11 +1669,7 @@ msgstr[0] "� ఫ�ల� డ���డ� ��య���� %s�� 
 msgstr[1] "à°? à°«à±?à°²à±? à°¡à±?à°?à±?à°¡à±? à°?à±?à°¯à±?à°?à°?à±? %sà°?à±? à°?దనపà±? à°ªà±?à°²à°?à±?â??యినà±?à°²à±? à°?వసరమà±?"
 
 #. TRANSLATORS: a program wants to encode something (unknown) -- string is a program name, e.g. "Movie Player"
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:1338
-=======
 #: ../src/gpk-dbus-task.c:1472
->>>>>>> Updated Telugu Translation:po/te.po
 #, c-format
 msgid "%s requires an additional plugin to encode this file"
 msgid_plural "%s requires additional plugins to encode this file"
@@ -2383,11 +1677,7 @@ msgstr[0] "� ఫ�ల�న� �న���డ� ��య���� %s
 msgstr[1] "à°? à°«à±?à°²à±?à°¨à±? à°?à°¨à±?à°?à±?à°¡à±? à°?à±?à°¯à±?à°?à°?à±? %sà°?à±? à°?దనపà±? à°ªà±?à°²à°?à±?â??యినà±? à°?వసరమà±?"
 
 #. TRANSLATORS: a program wants to do something (unknown) -- string is a program name, e.g. "Movie Player"
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:1342
-=======
 #: ../src/gpk-dbus-task.c:1476
->>>>>>> Updated Telugu Translation:po/te.po
 #, c-format
 msgid "%s requires an additional plugin for this operation"
 msgid_plural "%s requires additional plugins for this operation"
@@ -2395,89 +1685,54 @@ msgstr[0] "à°? à°?పరà±?à°·à°¨à±?â??à°?à±? %sà°?à±? à°?దనపà±? à°ªà±?à°²
 msgstr[1] "à°? à°?పరà±?à°·à°¨à±?â??à°?à±? %sà°?à±? à°?దనపà±? à°ªà±?à°²à°?à±?â??యినà±? à°?వసరమà±?"
 
 #. TRANSLATORS: a random program which we can't get the name wants to decode something
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:1348
-=======
 #: ../src/gpk-dbus-task.c:1482
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "A program requires an additional plugin to decode this file"
 msgid_plural "A program requires additional plugins to decode this file"
 msgstr[0] "à°? à°«à±?à°²à±?à°¨à±? à°¡à±?à°?à±?à°¡à±? à°?à±?à°¯à±?à°?à°?à±? à°µà±?à°? à°ªà±?à°°à±?à°?à±?రామà±?à°?à±? à°?దనపà±? à°ªà±?à°²à°?à±?â??యినà±? à°?వసరమà±?"
 msgstr[1] "à°? à°«à±?à°²à±?à°¨à±? à°¡à±?à°?à±?à°¡à±? à°?à±?à°¯à±?à°?à°?à±? à°µà±?à°? à°ªà±?à°°à±?à°?à±?రామà±?à°?à±? à°?దనపà±? à°ªà±?à°²à°?à±?â??యినà±? à°?వసరమà±?"
 
 #. TRANSLATORS: a random program which we can't get the name wants to encode something
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:1352
-=======
 #: ../src/gpk-dbus-task.c:1486
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "A program requires an additional plugin to encode this file"
 msgid_plural "A program requires additional plugins to encode this file"
 msgstr[0] "à°? à°«à±?à°²à±? à°¯à±?à°¨à±?à°?à±?à°¡à±? à°?à±?à°¯à±?à°?à°?à±? à°µà±?à°? à°ªà±?à°°à±?à°?à±?రామà±?à°?à±? à°?దనపà±? à°ªà±?à°²à°?à±?â??యినà±? à°?వసరమà±?"
 msgstr[1] "à°? à°«à±?à°²à±? à°¯à±?à°¨à±?à°?à±?à°¡à±? à°?à±?à°¯à±?à°?à°?à±? à°µà±?à°? à°ªà±?à°°à±?à°?à±?రామà±?à°?à±? à°?దనపà±? à°ªà±?à°²à°?à±?â??యినà±? à°?వసరమà±?"
 
 #. TRANSLATORS: a random program which we can't get the name wants to do something (unknown)
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:1356
-=======
 #: ../src/gpk-dbus-task.c:1490
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "A program requires an additional plugin for this operation"
 msgid_plural "A program requires additional plugins for this operation"
 msgstr[0] "à°? à°?పరà±?à°·à°¨à±? à°?à±?à°°à°?à±? à°µà±?à°? à°ªà±?à°°à±?à°?à±?రామà±?à°?à±? à°?దనపà±? à°ªà±?à°²à°?à±?â??యినà±? à°?వసరమà±?"
 msgstr[1] "à°? à°?పరà±?à°·à°¨à±? à°?à±?à°°à°?à±? à°µà±?à°? à°ªà±?à°°à±?à°?à±?రామà±?à°?à±? à°?దనపà±? à°ªà±?à°²à°?à±?â??యినà±? à°?వసరమà±?"
 
 #. TRANSLATORS: button: confirm to search for packages
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:1362 ../src/gpk-dbus-task.c:1679
-#: ../src/gpk-dbus-task.c:2001
-=======
 #: ../src/gpk-dbus-task.c:1496 ../src/gpk-dbus-task.c:1851
 #: ../src/gpk-dbus-task.c:2223
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Search"
 msgstr "శ�ధన"
 
 #. TRANSLATORS: failed to search for codec
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:1417
-=======
 #: ../src/gpk-dbus-task.c:1551
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Failed to search for plugin"
 msgstr "à°ªà±?à°²à°?à±?â??యినà±? à°?à±?à°°à°?à±? à°¶à±?ధిà°?à°?à±?à°?à°?à±? విఫలమà±?à°?ది"
 
 #. TRANSLATORS: no software sources have the wanted codec
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:1419
-msgid "Could not find plugin in any configured software source"
-msgstr "à°? à°?à°?à±?à°¤à±?à°?à°°à°¿à°?à°?à°¿à°¨ సాఫà±?à°?à±?à°µà±?à°°à±? à°®à±?లమà±?à°¨à°?à°¦à±? à°ªà±?à°²à°?à±?â??యినà±? à°?à°¨à±?à°?à±?నలà±?à°? à°ªà±?యిà°?ది"
-
-#: ../src/gpk-dbus-task.c:1441
-=======
 #: ../src/gpk-dbus-task.c:1553
 msgid "Could not find plugin in any configured software source"
 msgstr "à°? à°?à°?à±?à°¤à±?à°?à°°à°¿à°?à°?à°¿à°¨ సాఫà±?à°?à±?à°µà±?à°°à±? à°®à±?లమà±?à°¨à°?à°¦à±? à°ªà±?à°²à°?à±?â??యినà±? à°?à°¨à±?à°?à±?నలà±?à°? à°ªà±?యిà°?ది"
 
 #: ../src/gpk-dbus-task.c:1576
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Install the following plugin"
 msgid_plural "Install the following plugins"
 msgstr[0] "à°?à±?à°°à°¿à°?ది à°ªà±?à°²à°?à±?â??యినà±?â??à°²à±? à°¸à°?à°¸à±?థాపిà°?à°?à±?à°®à±?"
 msgstr[1] "à°?à±?à°°à°¿à°?ది à°ªà±?à°²à°?à±?â??యినà±?â??à°²à±? à°¸à°?à°¸à±?థాపిà°?à°?à±?à°®à±?"
 
 #. TRANSLATORS: title: show a list of fonts
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:1442 ../src/gpk-dbus-task.c:1866
-=======
 #: ../src/gpk-dbus-task.c:1577 ../src/gpk-dbus-task.c:2041
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Do you want to install this package now?"
 msgid_plural "Do you want to install these packages now?"
 msgstr[0] "మ�ర� � ప�యా����లన� స�స�థాపి���దామని �న���న���న�నారా?"
 msgstr[1] "మ�ర� � ప�యా����లన� స�స�థాపి���దామని �న���న���న�నారా?"
-<<<<<<< HEAD:po/te.po
-=======
 
 #. TRANSLATORS: search for codec
 #: ../src/gpk-dbus-task.c:1669
@@ -2503,58 +1758,19 @@ msgstr "సాఫ���వ�ర� �న���న��ల� విఫ
 #: ../src/gpk-dbus-task.c:1760
 msgid "No new applications can be found to handle this type of file"
 msgstr "� ర�మ�న దస�త�రమ� స�భాలి������ య���వ��ి ��త�త �న�వర�తనమ�ల� �న��నబడల�ద�"
->>>>>>> Updated Telugu Translation:po/te.po
-
-#. TRANSLATORS: search for codec
-#: ../src/gpk-dbus-task.c:1518
-msgid "Searching for plugins"
-msgstr "à°ªà±?à°²à°?à±?â??యినà±?â??à°² à°?à±?à°°à°?à±? à°¶à±?ధిసà±?à°¤à±?à°?ది"
-
-#. TRANSLATORS: title, searching for codecs
-#: ../src/gpk-dbus-task.c:1530
-#, c-format
-msgid "Searching for plugin: %s"
-msgstr "à°?à°ªà±?à°²à°?à±?â??యినà±? à°?à±?à°°à°?à±? à°¶à±?ధిసà±?à°¤à±?à°?ది: %s"
-
-#. TRANSLATORS: we failed to find the package, this shouldn't happen
-#: ../src/gpk-dbus-task.c:1561
-msgid "Failed to search for provides"
-msgstr "��దిప�ల��ర�� శ�ధి����ల� వ�ఫల�యమ�"
-
-#. TRANSLATORS: title
-#: ../src/gpk-dbus-task.c:1591
-msgid "Failed to find software"
-msgstr "సాఫ���వ�ర� �న���న��ల� విఫలమ��ది"
-
-#. TRANSLATORS: nothing found in the software sources that helps
-#: ../src/gpk-dbus-task.c:1593
-msgid "No new applications can be found to handle this type of file"
-msgstr "� ర�మ�న దస�త�రమ� స�భాలి������ య���వ��ి ��త�త �న�వర�తనమ�ల� �న��నబడల�ద�"
 
 #. TRANSLATORS: message: mime type opener required
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:1661
-=======
 #: ../src/gpk-dbus-task.c:1833
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "An additional program is required to open this type of file:"
 msgstr "� ర�మ�న దస�త�రమ�న� త�ర�వ���� వ�� �దనప� ప�ర���రామ� �వసరమ�:"
 
 #. TRANSLATORS: message: confirm with the user
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:1664
-=======
 #: ../src/gpk-dbus-task.c:1836
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Do you want to search for a program to open this file type now?"
 msgstr "à°? à°°à°?à°®à±?à°¨ దసà±?à°¤à±?à°°à°®à±? à°°à°?à°®à±?à°¨à±? à°¤à±?à°°à±?à°µà±?à°?à°?à±? à°®à±?à°°à±? à°ªà±?à°°à±?à°?à±?à°°à°®à±?â??à°?à±?à°°à°?à±? à°¶à±?ధిà°?à°?à±?దామని à°?à°¨à±?à°?à±?à°¨à±?à°?à±?à°¨à±?నారా?"
 
 #. TRANSLATORS: string is a program name, e.g. "Movie Player"
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:1672
-=======
 #: ../src/gpk-dbus-task.c:1844
->>>>>>> Updated Telugu Translation:po/te.po
 #, c-format
 msgid "%s requires a new mime type"
 msgid_plural "%s requires new mime types"
@@ -2562,91 +1778,55 @@ msgstr[0] "%s�� ��త�త మ�మ� ర�మ� �వసరమ�
 msgstr[1] "%s�� ��త�త మ�మ� ర�మ� �వసరమ�"
 
 #. TRANSLATORS: a random program which we can't get the name wants to do something
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:1675
-=======
 #: ../src/gpk-dbus-task.c:1847
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "A program requires a new mime type"
 msgid_plural "A program requires new mime types"
 msgstr[0] "à°?à°? à°ªà±?à°°à±?à°?à±?రామà±?â??à°?à±? à°?à±?à°¤à±?à°¤ à°®à±?à°®à±? à°°à°?à°®à±? à°?వసరమà±?"
 msgstr[1] "à°?à°? à°ªà±?à°°à±?à°?à±?రామà±?â??à°?à±? à°?à±?à°¤à±?à°¤ à°®à±?à°®à±? à°°à°?à°®à±? à°?వసరమà±?"
 
 #. TRANSLATORS: title: searching for mime type handlers
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:1689
-=======
 #: ../src/gpk-dbus-task.c:1862
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Searching for file handlers"
 msgstr "దస�త�రమ� స�భాలి�ల��ర�� శ�ధిస�త��ది"
 
 #. TRANSLATORS: we could not parse the ISO639 code from the fontconfig tag name
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:1769
-=======
 #: ../src/gpk-dbus-task.c:1942
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Language tag not parsed"
 msgstr "భాషా �ా�� పార�శ� �ాల�ద�"
 
 #. TRANSLATORS: we could not find en_US string for ISO639 code
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:1777
-=======
 #: ../src/gpk-dbus-task.c:1950
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Language code not matched"
 msgstr "భాషా ��డ� సరిప�ల ల�ద�"
 
 #. TRANSLATORS: title: cannot find in sources
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:1836
-=======
 #: ../src/gpk-dbus-task.c:2010
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Failed to find font"
 msgid_plural "Failed to find fonts"
 msgstr[0] "ఫా��� �న���న��ల� విఫలమ��ది"
 msgstr[1] "ఫా��� �న���న��ల� విఫలమ��ది"
 
 #. TRANSLATORS: message: tell the user we suck
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:1844
-=======
 #: ../src/gpk-dbus-task.c:2018
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "No new fonts can be found for this document"
 msgstr "� పత�రమ���ర�� య���త�త ఫ����ల� �న���నబడల�ద�"
 
 #. TRANSLATORS: we need to download a new font package to display a document
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:1980
-=======
 #: ../src/gpk-dbus-task.c:2202
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "An additional font is required to view this document correctly."
 msgid_plural "Additional fonts are required to view this document correctly."
 msgstr[0] "� ర�మ�న పత�రమ�న� సరి�ా దర�శి������ వ�� �దనప� ఫా��� �వసరమ�"
 msgstr[1] "� ర�మ�న పత�రమ�న� సరి�ా దర�శి������ వ�� �దనప� ఫా��� �వసరమ�"
 
 #. TRANSLATORS: we need to download a new font package to display a document
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:1984
-=======
 #: ../src/gpk-dbus-task.c:2206
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Do you want to search for a suitable package now?"
 msgid_plural "Do you want to search for suitable packages now?"
 msgstr[0] "సరిప�వ� ప�యా���� ��ర�� మ�ర� యిప�ప�డ� శ�ధి���దామని �న������న�నారా?"
 msgstr[1] "సరిప�వ� ప�యా���� ��ర�� మ�ర� యిప�ప�డ� శ�ధి���దామని �న������న�నారా?"
 
 #. TRANSLATORS: string is a program name, e.g. "Movie Player"
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:1994
-=======
 #: ../src/gpk-dbus-task.c:2216
->>>>>>> Updated Telugu Translation:po/te.po
 #, c-format
 msgid "%s wants to install a font"
 msgid_plural "%s wants to install fonts"
@@ -2654,50 +1834,19 @@ msgstr[0] "%s ఫా���న� స�స�థాపి��ాలని 
 msgstr[1] "%s ఫా���న� స�స�థాపి��ాలని ��ర���న���న�నది"
 
 #. TRANSLATORS: a random program which we can't get the name wants to do something
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:1997
-=======
 #: ../src/gpk-dbus-task.c:2219
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "A program wants to install a font"
 msgid_plural "A program wants to install fonts"
 msgstr[0] "�� ప�ర���రామ� ఫా���న� స�స�థాపి��ాలని ��ర�������ది"
 msgstr[1] "�� ప�ర���రామ� ఫా���న� స�స�థాపి��ాలని ��ర�������ది"
 
 #. TRANSLATORS: title to show when searching for font files
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:2012
-=======
 #: ../src/gpk-dbus-task.c:2235
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Searching for font"
 msgid_plural "Searching for fonts"
 msgstr[0] "ఫా��� ��ర�� శ�ధి�����న�నది"
 msgstr[1] "ఫా��� ��ర�� శ�ధి�����న�నది"
 
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:2050
-#| msgid "Could not reset client"
-msgid "Could not process catalog"
-msgstr "à°?à°¾à°?లాà°?à±?â??à°¨à±? à°ªà±?à°°à±?à°¸à±?à°¸à±? à°?à±?యలà±?à°?à°ªà±?యిà°?ది"
-
-#: ../src/gpk-dbus-task.c:2067
-msgid "No packages need to be installed"
-msgstr "���వ��ి ప�యా����ల� స�స�థాపి��వలసిన �వసరమ�ల�ద�"
-
-#. TRANSLATORS: title: allow user to confirm
-#: ../src/gpk-dbus-task.c:2085
-msgid "Install packages in catalog?"
-msgstr "à°?à°¾à°?లాà°?à±?â??à°¨à°?దలి à°ªà±?యాà°?à±?à°?à±?లనà±? à°¸à°?à°¸à±?థాపిà°?à°?ాలా?"
-
-#. TRANSLATORS: display a list of packages to install
-#: ../src/gpk-dbus-task.c:2087
-msgid "The following packages are marked to be installed from the catalog:"
-msgstr "à°?à°¾à°?లాà°?à±?â??à°¨à±?à°?à°¡à°¿ à°¸à°?à°¸à±?థాపిà°?à°?à±?à°?à°?à±? à°? à°?à±?à°°à°¿à°?ది à°ªà±?యాà°?à±?à°?à±?à°²à±? à°?à±?à°°à±?à°¤à±?à°?à°?బడినవి:"
-
-#. TRANSLATORS: title to install package catalogs
-#: ../src/gpk-dbus-task.c:2132
-=======
 #: ../src/gpk-dbus-task.c:2273
 msgid "Could not process catalog"
 msgstr "à°?à°¾à°?లాà°?à±?â??à°¨à±? à°ªà±?à°°à±?à°¸à±?à°¸à±? à°?à±?యలà±?à°?à°ªà±?యిà°?ది"
@@ -2779,18 +1928,13 @@ msgstr "త�సివ�య�మ�"
 
 #. TRANSLATORS: title to install package catalogs
 #: ../src/gpk-dbus-task.c:2584
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Do you want to install this catalog?"
 msgid_plural "Do you want to install these catalogs?"
 msgstr[0] "à°®à±?à°°à±? à°? à°?à°¾à°?లాà°?à±?â??à°¨à±? à°¸à°?à°¸à±?థాపిà°?à°?ాలని à°?à°¨à±?à°?à±?à°¨à±?à°?à±?à°¨à±?నారా?"
 msgstr[1] "à°®à±?à°°à±? à°? à°?à°¾à°?లాà°?à±?â??à°¨à±? à°¸à°?à°¸à±?థాపిà°?à°?ాలని à°?à°¨à±?à°?à±?à°¨à±?à°?à±?à°¨à±?నారా?"
 
 #. TRANSLATORS: title: install package catalogs, that is, instructions for installing
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dbus-task.c:2156
-=======
 #: ../src/gpk-dbus-task.c:2609
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Install catalogs"
 msgstr "à°?à°¾à°?లాà°?à±?à°¸à±?â??â??à°¨à±? à°¸à°?à°¸à±?థాపిà°?à°?à±?à°®à±?"
 
@@ -2801,11 +1945,7 @@ msgstr "�న�వర�తనమ�ల�"
 
 #. TRANSLATORS: the path in the menu, e.g. Applications -> Games
 #. TRANSLATORS: The group type
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-desktop.c:119 ../src/gpk-desktop.c:126 ../src/gpk-enum.c:1612
-=======
 #: ../src/gpk-desktop.c:119 ../src/gpk-desktop.c:126 ../src/gpk-enum.c:1629
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "System"
 msgstr "సిస��మ�"
 
@@ -2822,225 +1962,26 @@ msgstr "నిర�వహణ"
 msgid "many packages"
 msgstr "�ాలా ప�యా����ల�"
 
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-dialog.c:241
-=======
 #: ../src/gpk-dialog.c:243
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "No files"
 msgstr "���వ��ి ఫ�ళ�ళ�ల�వ�"
 
 #. TRANSLATORS: this is compact disk (CD) media
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:309
-=======
 #: ../src/gpk-enum.c:310
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "CD"
 msgstr "CD"
 
 #. TRANSLATORS: this is digital versatile disk (DVD) media
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:313
-=======
 #: ../src/gpk-enum.c:314
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "DVD"
 msgstr "DVD"
 
 #. TRANSLATORS: this is either CD or DVD media
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:317
-=======
 #: ../src/gpk-enum.c:318
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "disc"
 msgstr "డిస���"
 
 #. TRANSLATORS: this is generic media of unknown type that we will install from
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:321
-msgid "media"
-msgstr "మాధ�యమ�"
-
-#: ../src/gpk-enum.c:338
-msgid "No network connection available"
-msgstr "న���వర��� �న�స�ధానమ� ��ద�బా��ల�ల�ద�"
-
-#: ../src/gpk-enum.c:341
-msgid "No package cache is available."
-msgstr "���వ��ి ప�యా���� ��యా�� ��ద�బా��ల�ల�ద�."
-
-#: ../src/gpk-enum.c:344
-msgid "Out of memory"
-msgstr "మ�మ�ర� మి��ినది"
-
-#: ../src/gpk-enum.c:347
-msgid "Failed to create a thread"
-msgstr "త�తిని స�ష��ి������ విఫలమ��ది"
-
-#: ../src/gpk-enum.c:350
-msgid "Not supported by this backend"
-msgstr "à°? à°¬à±?యాà°?à±?â??à°¯à±?à°?à°¡à±? à°?à±?à°¤ మదà±?దతà±?యబడà±?à°?à°²à±?à°¦à±?"
-
-#: ../src/gpk-enum.c:353
-msgid "An internal system error has occurred"
-msgstr "��తర��త సిస��మ� ద�షమ� య�ద�ర��ది"
-
-#: ../src/gpk-enum.c:356
-msgid "A security signature is not present"
-msgstr "స�ర��షితా స�త�మ� ల�ద�"
-
-#: ../src/gpk-enum.c:359
-msgid "The package is not installed"
-msgstr "ప�యా���� స�స�థాపి��బడిల�ద�"
-
-#: ../src/gpk-enum.c:362
-msgid "The package was not found"
-msgstr "ప�యా���� �నబడల�ద�"
-
-#: ../src/gpk-enum.c:368
-msgid "The package download failed"
-msgstr "ప�యా���� డ�న�ల�డ� విఫలమ��ది"
-
-#: ../src/gpk-enum.c:371
-msgid "The group was not found"
-msgstr "సమ�హమ� �న���నబడల�ద�"
-
-#: ../src/gpk-enum.c:374
-msgid "The group list was invalid"
-msgstr "సమ�హప� �ాబితా సరి�ానిది"
-
-#: ../src/gpk-enum.c:377
-msgid "Dependency resolution failed"
-msgstr "�ధారాల పరిష��ార� విఫలమ��ది"
-
-#: ../src/gpk-enum.c:380
-msgid "Search filter was invalid"
-msgstr "శ�ధన ఫిల��ర� ��ల�లనిది"
-
-#: ../src/gpk-enum.c:383
-msgid "The package identifier was not well formed"
-msgstr "ప�యా���� ��ర�తి�ప��ారి సరి�ా య�ర�పా�� �ాల�ద�"
-
-#: ../src/gpk-enum.c:386
-msgid "Transaction error"
-msgstr "వ�యవహారప� ద�షమ�"
-
-#: ../src/gpk-enum.c:389
-msgid "Repository name was not found"
-msgstr "రిప��ి�ర� నామమ� �నబడల�ద�"
-
-#: ../src/gpk-enum.c:392
-msgid "Could not remove a protected system package"
-msgstr "ర��షిత సిస��మ� ప�యా����ని త�ల�ి��ల�� ప�యి�ది"
-
-#: ../src/gpk-enum.c:395
-msgid "The action was canceled"
-msgstr "�ర�య రద�ద���యబడి�ది"
-
-#: ../src/gpk-enum.c:398
-msgid "The action was forcibly canceled"
-msgstr "�ర�య బలవ�త��ా రద�ద���యబడి�ది"
-
-#: ../src/gpk-enum.c:401
-msgid "Reading the configuration file failed"
-msgstr "���త��రణ దస�త�రమ� �ద�వ�� విఫలమ��ది"
-
-#: ../src/gpk-enum.c:404
-msgid "The action cannot be canceled"
-msgstr "�ర�య రద�ద���యబడద�"
-
-#: ../src/gpk-enum.c:407
-msgid "Source packages cannot be installed"
-msgstr "మ�లప� ప�యా����ల� స�స�థాపి��బడల�వ�"
-
-#: ../src/gpk-enum.c:410
-msgid "The license agreement failed"
-msgstr "ల�స�న�స� వ�ప�ప�దమ� విఫలమ��ది"
-
-#: ../src/gpk-enum.c:413
-msgid "Local file conflict between packages"
-msgstr "ప�యా����ల మద�యన స�థాని� దస�త�రమ� విభ�దిస�త��ది"
-
-#: ../src/gpk-enum.c:416
-msgid "Packages are not compatible"
-msgstr "ప�యా����ల� సార�ప�యమ�నవి �ావ�"
-
-#: ../src/gpk-enum.c:419
-msgid "Problem connecting to a software source"
-msgstr "సాఫ���వ�ర� మ�లమ��� �న�స�ధాని��బడ��ల� సమస�య"
-
-#: ../src/gpk-enum.c:422
-msgid "Failed to initialize"
-msgstr "సిద�ధ��రణ�� విఫలమ��ది"
-
-#: ../src/gpk-enum.c:425
-msgid "Failed to finalise"
-msgstr "��తిమనిర�ణయ��� విఫలమ��ది"
-
-#: ../src/gpk-enum.c:428
-msgid "Cannot get lock"
-msgstr "లా�� ��యబడల�ద�"
-
-#: ../src/gpk-enum.c:431
-msgid "No packages to update"
-msgstr "నవ��రణ�� � ప�యా����ల�ల�వ�"
-
-#: ../src/gpk-enum.c:434
-msgid "Cannot write repository configuration"
-msgstr "రిప��ి�ర� ���త��రణన� వ�రాయల�ద�"
-
-#: ../src/gpk-enum.c:437
-msgid "Local install failed"
-msgstr "స�థాని� స�స�థాపన విఫలమ��ది"
-
-#: ../src/gpk-enum.c:440
-msgid "Bad security signature"
-msgstr "��డ�డ ర��షణ స�త�మ�"
-
-#: ../src/gpk-enum.c:443
-msgid "Missing security signature"
-msgstr "తప�పిప�యిన ర��షణ స�త�మ�"
-
-#: ../src/gpk-enum.c:446
-msgid "Repository configuration invalid"
-msgstr "రిప��ి�ర� ���త��రణ ��ల�లనిది"
-
-#: ../src/gpk-enum.c:449
-msgid "Invalid package file"
-msgstr "��ల�లని ప�యా���� దస�త�రమ�"
-
-#: ../src/gpk-enum.c:452
-msgid "Package install blocked"
-msgstr "ప�యా���� స�స�థాపన బ�లా���ది"
-
-#: ../src/gpk-enum.c:455
-msgid "Package is corrupt"
-msgstr "ప�యా���� పాడ�నది"
-
-#: ../src/gpk-enum.c:458
-msgid "All packages are already installed"
-msgstr "�న�ని ప�యా����ల� యిప�ప�ి�� స�స�థాపి��బడివ�న�నాయి"
-
-#: ../src/gpk-enum.c:461
-msgid "The specified file could not be found"
-msgstr "త�ల�బడిన దస�త�రమ� �న���నబడల�� ప�యి�ది"
-
-#: ../src/gpk-enum.c:464
-msgid "No more mirrors are available"
-msgstr "à°?à°?à±?à°µà°?à°?à°¿ మిరà±?à°°à°°à±?â??à°²à±? à°?à°?à°¦à±?బాà°?à±?à°²à±?à°²à±?à°µà±?"
-
-#: ../src/gpk-enum.c:467
-msgid "No distribution upgrade data is available"
-msgstr "à°?à°?à±?à°µà°?à°?à°¿ à°ªà°?పిణà±? నవà±?à°?à°°à°£ â??à°¡à°¾à°?à°¾ à°?à°?à°¦à±?బాà°?à±?à°²à±?à°²à±?à°¦à±?"
-
-#: ../src/gpk-enum.c:470
-msgid "Package is incompatible with this system"
-msgstr "à°? సిసà±?à°?à°®à±?â??à°¤à±? à°ªà±?యాà°?à±?à°?à±? à°?సారà±?à°ªà±?à°¯à°?à°?ావà±?à°?ది"
-
-#: ../src/gpk-enum.c:473
-=======
 #: ../src/gpk-enum.c:322
 msgid "media"
 msgstr "మాధ�యమ�"
@@ -3227,66 +2168,10 @@ msgid "Package is incompatible with this system"
 msgstr "à°? సిసà±?à°?à°®à±?â??à°¤à±? à°ªà±?యాà°?à±?à°?à±? à°?సారà±?à°ªà±?à°¯à°?à°?ావà±?à°?ది"
 
 #: ../src/gpk-enum.c:477
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "No space is left on the disk"
 msgstr "డిస���న�ద� �ా�ాల�ద�"
 
 #. TRANSLATORS: this is the window title when a new cd or dvd is required
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:476 ../src/gpk-task.c:323
-msgid "A media change is required"
-msgstr "�� మాధ�యమ� మార�ప� �వసరమ��ది"
-
-#: ../src/gpk-enum.c:479
-msgid "Authorization failed"
-msgstr "ధ�వ��రణమ� విఫలమ��ది"
-
-#: ../src/gpk-enum.c:482
-msgid "Update not found"
-msgstr "నవ��రణమ� �న���నబడల�ద�"
-
-#: ../src/gpk-enum.c:485
-msgid "Cannot install from untrusted source"
-msgstr "నమ�మద�ని మ�లమ�న��డి స�స�థాపి��ల�ద�"
-
-#: ../src/gpk-enum.c:488
-msgid "Cannot update from untrusted source"
-msgstr "నమ�మద�ని మ�లమ�న��డి నవ��రి��ల�మ�"
-
-#: ../src/gpk-enum.c:491
-msgid "Cannot get the file list"
-msgstr "దస�త�రమ�ల �ాబితాన� ప��దల�� ప�యి�ది"
-
-#: ../src/gpk-enum.c:494
-msgid "Cannot get package requires"
-msgstr "�వసరమ�న ప�యా����న� ప��దల�� ప�యి�ది"
-
-#: ../src/gpk-enum.c:497
-msgid "Cannot disable source"
-msgstr "మ�లమ�న� ���తనమ� ��యల�� ప�యి�ది"
-
-#: ../src/gpk-enum.c:500
-msgid "The download failed"
-msgstr "à°¡à±?à°¨à±?â??à°²à±?à°¡à±? విఫలమà±?à°?ది"
-
-#: ../src/gpk-enum.c:503
-msgid "Package failed to configure"
-msgstr "���త��రి������ ప�యా���� విఫలమ��ది"
-
-#: ../src/gpk-enum.c:506
-msgid "Package failed to build"
-msgstr "నిర�మి������ ప�యా���ి విఫలమ��ది"
-
-#: ../src/gpk-enum.c:509
-msgid "Package failed to install"
-msgstr "స�స�థాపి������ ప�యా���ి విఫలమ��ది"
-
-#: ../src/gpk-enum.c:512
-msgid "Package failed to be removed"
-msgstr "త�సివ�య���� ప�యా���� విఫలమ��ది"
-
-#: ../src/gpk-enum.c:529
-=======
 #: ../src/gpk-enum.c:480 ../src/gpk-task.c:359
 msgid "A media change is required"
 msgstr "�� మాధ�యమ� మార�ప� �వసరమ��ది"
@@ -3349,7 +2234,6 @@ msgid "Failed with unknown error code."
 msgstr "à°¤à±?లియని à°¦à±?à°·à°ªà±? à°?à±?à°¡à±?â??à°¤à±? విఫలమà±?à°?ది."
 
 #: ../src/gpk-enum.c:539
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "There is no network connection available.\n"
 "Please check your connection settings and try again."
@@ -3357,11 +2241,7 @@ msgstr ""
 "����డ య���వ��ి న���వర��� �న�స�ధానమ� ��ద�బా��ల�ల�ద�.\n"
 "మ� �న�స�ధాన� �మరి�లన� సరి��స���ని మరలా ప�రయత�ని���డి"
 
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:533
-=======
 #: ../src/gpk-enum.c:543
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "The package list needs to be rebuilt.\n"
 "This should have been done by the backend automatically."
@@ -3369,11 +2249,7 @@ msgstr ""
 "ప�యా���� �ాబితా ప�న�నిర�మితమ� �ావలిసివ��ది.\n"
 "à°?ది à°¬à±?యాà°?à±?à°?à°¡à±?â??à°¨à°?à°¦à±? à°¸à±?వయà°?à°?ాలà°?à°?à°?à°¾ à°?à°°à±?à°?వలà±?à°¨à±?."
 
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:537
-=======
 #: ../src/gpk-enum.c:547
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "The service that is responsible for handling user requests is out of "
 "memory.\n"
@@ -3382,19 +2258,11 @@ msgstr ""
 "వినియ��దారి �భ�యర�దనలన� స�భాలి��� భాద�యత�లి�ిన స�వ మ�మ�ర� �యిప�యి�ది.\n"
 "దయà°?à±?సి à°®à±? à°?à°?à°ªà±?à°¯à±?à°?à°°à±?â??à°¨à±? à°ªà±?à°¨à°?à°ªà±?రారà°?à°­à°¿à°?à°?à±?à°®à±?."
 
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:541
-msgid "A thread could not be created to service the user request."
-msgstr "వినియ��దారి �భ�యర�ధన�� స�వ��య���� త�తి స�ష��ి��బడ ల��ప�యి�ది."
-
-#: ../src/gpk-enum.c:544
-=======
 #: ../src/gpk-enum.c:551
 msgid "A thread could not be created to service the user request."
 msgstr "వినియ��దారి �భ�యర�ధన�� స�వ��య���� త�తి స�ష��ి��బడ ల��ప�యి�ది."
 
 #: ../src/gpk-enum.c:554
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "The action is not supported by this backend.\n"
 "Please report a bug in your distribution bugtracker as this should not have "
@@ -3403,11 +2271,7 @@ msgstr ""
 "� బ�యా���డ� ద�వారా �ర�య మద�దత�యబడద�.\n"
 "à°®à±? à°ªà°?పిణà±? à°¬à°?à±?â??à°?à±?à°°à°¾à°?à°°à±? à°¨à°?à°¦à±? దయà°?à±?సి à°¬à°?à±?â??à°¨à±? నివà±?దిà°?à°?à°?à°¡à°¿."
 
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:548
-=======
 #: ../src/gpk-enum.c:558
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "A problem that we were not expecting has occurred.\n"
 "Please report this bug in your distribution bugtracker with the error "
@@ -3416,11 +2280,7 @@ msgstr ""
 "మనమ� �న���ని సమస�య వ���ి�ది.\n"
 "à°®à±? à°ªà°?పిణà±? à°¬à°?à±?â??à°?à±?à°°à°¾à°?à°°à±?â??à°¨à°?à°¦à±? దయà°?à±?సి à°? à°¬à°?à±?â??à°¨à±? à°¦à±?à°·à°ªà±? వివరణతà±?సహా నివà±?దిà°?à°?à°?à°¡à°¿."
 
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:552
-=======
 #: ../src/gpk-enum.c:562
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "A security trust relationship could not be made with software source.\n"
 "Please check your security settings."
@@ -3428,37 +2288,21 @@ msgstr ""
 "సాఫ���వ�ర� మ�లమ�త� విశ�వాశమ�న భద�రతా స�భ�దమ� య�ర�పడల�� ప�యి�ది.\n"
 "దయ��సి మ� భద�రతా �మరి�లన� పరిశ�లి���మ�."
 
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:556
-msgid "The package that is trying to be removed or updated is not already installed."
-msgstr "త�ల�ి������ ల�దా నవ��రి������ ప�రయత�నిస�త�న�న ప�యా���� యి��ా స�స�థాపి��ిల�ద�."
-
-#: ../src/gpk-enum.c:559
-=======
 #: ../src/gpk-enum.c:566
 msgid "The package that is trying to be removed or updated is not already installed."
 msgstr "త�ల�ి������ ల�దా నవ��రి������ ప�రయత�నిస�త�న�న ప�యా���� యి��ా స�స�థాపి��ిల�ద�."
 
 #: ../src/gpk-enum.c:569
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "The package that is being modified was not found on your system or in any "
 "software source."
 msgstr "సవరిà°?పబడà±?à°¤à±?à°¨à±?à°¨ à°ªà±?యాà°?à±?à°?à±? à°®à±?సిసà±?à°?à°®à±?â??à°¨à°?à°¦à±?à°?ాని à°²à±?దా à°¯à±?యితర సాఫà±?à°?à±?à°µà±?à°°à±? à°®à±?లమà±?à°¨à°?à°¦à±?à°?ాని à°?నబడà±?à°?à°²à±?à°¦à±?."
 
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:562
-msgid "The package that is trying to be installed is already installed."
-msgstr "స�స�థాపి������ ప�రయత�నిస�త�న�న ప�యా���� యిప�ప�ి�� స�స�థాపి��బడివ��ది."
-
-#: ../src/gpk-enum.c:565
-=======
 #: ../src/gpk-enum.c:572
 msgid "The package that is trying to be installed is already installed."
 msgstr "స�స�థాపి������ ప�రయత�నిస�త�న�న ప�యా���� యిప�ప�ి�� స�స�థాపి��బడివ��ది."
 
 #: ../src/gpk-enum.c:575
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "The package download failed.\n"
 "Please check your network connectivity."
@@ -3466,11 +2310,7 @@ msgstr ""
 "ప�యా���� డ�న�ల�డ� విఫలమ��ది.\n"
 "దయ��సి మ� న���వర��� �న�స�ధానతన� పరిశ�లి���మ�."
 
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:569
-=======
 #: ../src/gpk-enum.c:579
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "The group type was not found.\n"
 "Please check your group list and try again."
@@ -3478,11 +2318,7 @@ msgstr ""
 "సమ�హప� ర�మ� �న���నబడల�ద�.\n"
 "మ� సమ�హ �ాబితాన� పరిశ�లి���మ� మరియ� తిరి�ి ప�రయత�ని���మ�."
 
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:573
-=======
 #: ../src/gpk-enum.c:583
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "The group list could not be loaded.\n"
 "Refreshing your cache may help, although this is normally a software source "
@@ -3491,11 +2327,7 @@ msgstr ""
 "సమ�హ �ాబితా ల�డ��ాబడల�ద�.\n"
 "మ� ��యా��ని ర�ఫ�ర�ష� ��య�� సహాయపడ�లద�, �ద� యిది సాదారణ��ా సాఫ���వ�ర� మ�లప� ద�షమ�."
 
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:578
-=======
 #: ../src/gpk-enum.c:588
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "A package could not be found that allows the action to complete.\n"
 "More information is available in the detailed report."
@@ -3503,19 +2335,11 @@ msgstr ""
 "�ర�య ప�ర�తి��య� ప�యా���� �న���న ల��ప�యి�ది.\n"
 "విశద���త నివ�ది�న�ద� య�����వ సమా�ారమ� ��ద�బా��ల�వ��ది."
 
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:582
-msgid "The search filter was not correctly formed."
-msgstr "శ�ధన ఫిల��ర� సరి�ా య�ర�పడల�ద�."
-
-#: ../src/gpk-enum.c:585
-=======
 #: ../src/gpk-enum.c:592
 msgid "The search filter was not correctly formed."
 msgstr "శ�ధన ఫిల��ర� సరి�ా య�ర�పడల�ద�."
 
 #: ../src/gpk-enum.c:595
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "The package identifier was not well formed when sent to the server.\n"
 "This normally indicates an internal error and should be reported."
@@ -3523,11 +2347,7 @@ msgstr ""
 "స�వి��� ప�ప�త�న�నప�ప�డ� ప�యా���� ��ర�తి�ప�దారి సరి�ా ర�ప��రి��బడల�ద�.\n"
 "�ది సాదారణమ��ా ��తర��త ద�షమ�న� స��ిస�త��ది మరియ� తప�ప� నివ�ది��ాలి."
 
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:589
-=======
 #: ../src/gpk-enum.c:599
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "An unspecified transaction error has occurred.\n"
 "More information is available in the detailed report."
@@ -3535,11 +2355,7 @@ msgstr ""
 "త�ల�పబడని వ�యవహార ద�షమ� య�ద�ర��ది.\n"
 "విశద���త నివ�ది�న�ద� య�����వ సమా�ారమ� ��ద�బా�ల� వ�����ది."
 
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:593
-=======
 #: ../src/gpk-enum.c:603
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "The remote software source name was not found.\n"
 "You may need to enable an item in Software Sources."
@@ -3547,17 +2363,6 @@ msgstr ""
 "ద��రస�థ సాఫ���వ�ర� మ�లప� నామమ� �నబడల�ద�.\n"
 "సాఫ���వ�ర� మ�లమ�లన�ద� మ�ర� వ�� ��శమ�న� ��తనపర�వలసి రావ���.�"
 
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:597
-msgid "Removing a protected system package is not allowed."
-msgstr "ర��షిత సిస��మ� ప�యా����ని త�ల�ి���� �న�మతి��బడద�."
-
-#: ../src/gpk-enum.c:600
-msgid "The action was canceled successfully and no packages were changed."
-msgstr "� �ర�య వి�యవ�త��ా రద�ద���యబడి�ది మరియ� య���వ��ి ప�యా����ల� మార��బడల�ద�."
-
-#: ../src/gpk-enum.c:603
-=======
 #: ../src/gpk-enum.c:607
 msgid "Removing a protected system package is not allowed."
 msgstr "ర��షిత సిస��మ� ప�యా����ని త�ల�ి���� �న�మతి��బడద�."
@@ -3567,7 +2372,6 @@ msgid "The action was canceled successfully and no packages were changed."
 msgstr "� �ర�య వి�యవ�త��ా రద�ద���యబడి�ది మరియ� య���వ��ి ప�యా����ల� మార��బడల�ద�."
 
 #: ../src/gpk-enum.c:613
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "The action was canceled successfully and no packages were changed.\n"
 "The backend did not exit cleanly."
@@ -3575,11 +2379,7 @@ msgstr ""
 "�ర�య వి�యవ�త��ా రద�ద���యబడి�ది మరియ� య���వ��ి ప�యా����ల� మార��బడల�ద�.\n"
 "బ�యా���డ� శ�భ�రమ��ా నిష���రమి�పబడల�ద�."
 
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:607
-=======
 #: ../src/gpk-enum.c:617
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "The native package configuration file could not be opened.\n"
 "Please make sure configuration is valid."
@@ -3587,19 +2387,11 @@ msgstr ""
 "స�వాభావి� ప�యా���� ���త��రణ దస�త�రమ� త�ర�వబడ ల��ప�యి�ది.\n"
 "���త��రణ ��ల�ల�నది�ా ��స���న�మ�."
 
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:611
-msgid "The action cannot be canceled at this time."
-msgstr "� సమయ�ల� �ర�య రద�ద���య బడల�ద�."
-
-#: ../src/gpk-enum.c:614
-=======
 #: ../src/gpk-enum.c:621
 msgid "The action cannot be canceled at this time."
 msgstr "� సమయ�ల� �ర�య రద�ద���య బడల�ద�."
 
 #: ../src/gpk-enum.c:624
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "Source packages are not normally installed this way.\n"
 "Check the extension of the file you are trying to install."
@@ -3607,11 +2399,7 @@ msgstr ""
 "సాదారణమ��ా మ�లప� ప�యా����ల� �విధమ��ా స�స�థాపి��బడవ�.\n"
 "మ�ర� స�స�థాపి���దామని �న���న���న�న దస�త�రమ�య���� ప�డి�ి�ప�న� పరిశ�లి���మ�."
 
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:618
-=======
 #: ../src/gpk-enum.c:628
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "The license agreement was not agreed to.\n"
 "To use this software you have to accept the license."
@@ -3619,11 +2407,7 @@ msgstr ""
 "ల�స�న�స� వ�ప�ప�దమ� �మ�ది��బడల�ద�.\n"
 "� సాఫ���వ�ర�న� వ�పయ��ి������ మ�ర� ల�స�న�స�న� �మ�ది��ాలి."
 
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:622
-=======
 #: ../src/gpk-enum.c:632
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "Two packages provide the same file.\n"
 "This is usually due to mixing packages from different software sources."
@@ -3631,11 +2415,7 @@ msgstr ""
 "ర��డ� ప�యా����ల� వ��� దస�త�రమ�న� ��దిస�త�న�నాయి.\n"
 "�ది సాదారణమ��ా ప�యా����లన� వ�ర�వ�ర� సాఫ���వ�ర� మ�లాలన��డి మిళిత� ��య��వలన."
 
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:626
-=======
 #: ../src/gpk-enum.c:636
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "Multiple packages exist that are not compatible with each other.\n"
 "This is usually due to mixing packages from different software sources."
@@ -3643,11 +2423,7 @@ msgstr ""
 "��దానిత� వ���ి సార�ప�య��ాని బహళ ప�యా����ల� వ�న�నాయి.\n"
 "�ది సాదారణమ��ా ప�యా����లన� వ�ర�వ�ర� సాఫ���వ�ర� మ�లాలన��డి మిళిత� ��య��వలన."
 
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:630
-=======
 #: ../src/gpk-enum.c:640
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "There was a (possibly temporary) problem connecting to a software source.\n"
 "Please check the detailed error for further details."
@@ -3655,11 +2431,7 @@ msgstr ""
 "సాఫ���వ�ర� మ�లమ��� �న�స�ధాని��బడ��ల� ����డ వ�� (బహ�శా తాత��ాలి��) సమస�యవ��ది\n"
 "దయ��సి యితర వివరమ�ల��ర�� విశద���త ద�షమ�న� పరిశ�లి���మ�."
 
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:634
-=======
 #: ../src/gpk-enum.c:644
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "Failed to initialize packaging backend.\n"
 "This may occur if other packaging tools are being used simultaneously."
@@ -3667,11 +2439,7 @@ msgstr ""
 "ప�యా���ి��� బ�యా���డ� సిద�దపర���ల� విఫలమ��ది.\n"
 "��� సమయ�ల� యితర ప�యా���ి��� సాధనమ�ల���డా వ�పయ��ిస�త���� యిది స�భవిస�త��ది."
 
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:638
-=======
 #: ../src/gpk-enum.c:648
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "Failed to close down the backend instance.\n"
 "This error can normally be ignored."
@@ -3679,11 +2447,7 @@ msgstr ""
 "à°¬à±?యాà°?à±?à°?à°¡à±? యినà±?â??à°¸à±?à°?ానà±?à°¸à±?â?? à°®à±?సివà±?à°¯à±?à°?à°²à±? విఫలమà±?à°?ది.\n"
 "� ద�షమ�న� సాదారణమ��ా వదిలివ�యవ����."
 
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:642
-=======
 #: ../src/gpk-enum.c:652
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "Cannot get the exclusive lock on the packaging backend.\n"
 "Please close any other legacy packaging tools that may be open."
@@ -3691,17 +2455,6 @@ msgstr ""
 "à°ªà±?యాà°?à±?à°?à°¿à°?à°?à±? à°¬à±?యాà°?à±?à°?à°¡à±?â??à°¨à°?à°¦à±? విశిషà±?à°? లాà°?à±?â??à°¨à±? à°ªà±?à°?దలà±?à°¦à±?.\n"
 "దయ��సి య�వ�నా యితర ల��స� ప�యా���ి��� సాధనమ�ల� త�రి�ివ���� మ�సివ�య�మ�."
 
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:646
-msgid "None of the selected packages could be updated."
-msgstr "��పి���సిన య�వ���� ప�యా���� నవ��రి��బడ ల�ద�."
-
-#: ../src/gpk-enum.c:649
-msgid "The repository configuration could not be modified."
-msgstr "రిప��ి�ర� ���త��రణ  సవరి�� ల��ప�యి�ది."
-
-#: ../src/gpk-enum.c:652
-=======
 #: ../src/gpk-enum.c:656
 msgid "None of the selected packages could be updated."
 msgstr "��పి���సిన య�వ���� ప�యా���� నవ��రి��బడ ల�ద�."
@@ -3711,7 +2464,6 @@ msgid "The repository configuration could not be modified."
 msgstr "రిప��ి�ర� ���త��రణ  సవరి�� ల��ప�యి�ది."
 
 #: ../src/gpk-enum.c:662
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "Installing the local file failed.\n"
 "More information is available in the detailed report."
@@ -3719,19 +2471,11 @@ msgstr ""
 "స�థాని� దస�త�రమ� స�స�థాపి���� విఫలమ��ది.\n"
 "విశద���త నివ�ది�న�ద� య�����వ సమా�ారమ� ��ద�బా��ల�వ��ది."
 
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:656
-msgid "The package security signature could not be verified."
-msgstr "ప�యా���� ర��షణా స�త�� నిర�ధారి�� ల��ప�యి�ది."
-
-#: ../src/gpk-enum.c:659
-=======
 #: ../src/gpk-enum.c:666
 msgid "The package security signature could not be verified."
 msgstr "ప�యా���� ర��షణా స�త�� నిర�ధారి�� ల��ప�యి�ది."
 
 #: ../src/gpk-enum.c:669
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "The package security signature is missing and this package is untrusted.\n"
 "This package was not signed when created."
@@ -3739,19 +2483,11 @@ msgstr ""
 "ప�యా���� స�త�మ� తప�పిప�యినది మరియ� � ప�యా���� నమ�మల�నిది.\n"
 "ప�యా���� స�ష��ి��బడ�నప�ప�డ� స�త�మ� ��యబడిల�ద�."
 
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:663
-msgid "Repository configuration was invalid and could not be read."
-msgstr "రిప��ి�ర� ���త��రణ ��ల�లనిది మరియ� �ద�వ ల��ప�యి�ది."
-
-#: ../src/gpk-enum.c:666
-=======
 #: ../src/gpk-enum.c:673
 msgid "Repository configuration was invalid and could not be read."
 msgstr "రిప��ి�ర� ���త��రణ ��ల�లనిది మరియ� �ద�వ ల��ప�యి�ది."
 
 #: ../src/gpk-enum.c:676
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "The package you are attempting to install is not valid.\n"
 "The package file could be corrupt, or not a proper package."
@@ -3759,27 +2495,12 @@ msgstr ""
 "మ�ర� స�స�థాపి������ ప�రయత�నిస�త�న�న ప�యా���� ��ల�ల�నది�ాద�.\n"
 "ప�యా���� దస�త�రమ� ��డిప�యివ��డ వ����, ల�దా సర�న ప�యా���� �ాద�."
 
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:670
-=======
 #: ../src/gpk-enum.c:680
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "Installation of this package prevented by your packaging system's "
 "configuration."
 msgstr "à°? à°ªà±?యాà°?à±?à°?à±?à°¯à±?à°?à±?à°? à°¸à°?à°¸à±?థాపన à°®à±? à°ªà±?యాà°?à±?à°?à°¿à°?à°?à±? సిసà±?à°?à°®à±?â??à°¯à±?à°?à±?à°? à°?à°?à±?à°¤à±?à°?à°°à°£à°?à±?à°¤ నిరà±?దిà°?à°?బడిà°?ది."
 
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:673
-msgid "The package that was downloaded is corrupt and needs to be downloaded again."
-msgstr "డ�న�ల�డ� ��సిన ప�యా���� ��డిప�యి�ది మరియ� తిరి�ి డ�న�ల�డ� ��యవలసివ��ది."
-
-#: ../src/gpk-enum.c:676
-msgid "All of the packages selected for install are already installed on the system."
-msgstr "à°¸à°?à°¸à±?థాపనà°?à±? à°¯à±?à°?పిà°?à°?à±?సిన à°?à°¨à±?ని à°ªà±?యాà°?à±?à°?à±?à°²à±? సిసà±?à°?à°®à±?â??à°¨à°?à°¦à±? యిపà±?à°ªà°?à°¿à°?à±? à°¸à°?à°¸à±?థాపిà°?à°?బడివà±?à°¨à±?నాయి."
-
-#: ../src/gpk-enum.c:679
-=======
 #: ../src/gpk-enum.c:683
 msgid "The package that was downloaded is corrupt and needs to be downloaded again."
 msgstr "డ�న�ల�డ� ��సిన ప�యా���� ��డిప�యి�ది మరియ� తిరి�ి డ�న�ల�డ� ��యవలసివ��ది."
@@ -3789,7 +2510,6 @@ msgid "All of the packages selected for install are already installed on the sys
 msgstr "à°¸à°?à°¸à±?థాపనà°?à±? à°¯à±?à°?పిà°?à°?à±?సిన à°?à°¨à±?ని à°ªà±?యాà°?à±?à°?à±?à°²à±? సిసà±?à°?à°®à±?â??à°¨à°?à°¦à±? యిపà±?à°ªà°?à°¿à°?à±? à°¸à°?à°¸à±?థాపిà°?à°?బడివà±?à°¨à±?నాయి."
 
 #: ../src/gpk-enum.c:689
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "The specified file could not be found on the system.\n"
 "Check the file still exists and has not been deleted."
@@ -3797,11 +2517,7 @@ msgstr ""
 "à°¤à±?à°²à±?పబడిన దసà±?à°¤à±?à°°à°®à±? సిసà±?à°?à°®à±?â??à°¨à°?à°¦à±? à°?à°¨à±?à°?à±?నబడలà±?à°¦à±?.\n"
 "త�ల�ి�����డా ఫ�ల� యి��ా వ��దా ల�దా పరిశ�లి���మ�."
 
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:683
-=======
 #: ../src/gpk-enum.c:693
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "Required data could not be found on any of the configured software sources.\n"
 "There were no more download mirrors that could be tried."
@@ -3809,11 +2525,7 @@ msgstr ""
 "���త��రి��ిన � సాఫ���వ�ర� మ�లాలన�ద� �ావలిసిన డా�ా �న���నబడల�ద�.\n"
 "à°ªà±?రయతà±?నిà°?à°?à°¦à°?à±?à°¨à°?à±?à°µà°?à°?à°¿ మిరà±?à°°à°°à±?â??à°¨à±? యిà°?à°?à°¾ à°²à±?à°µà±?."
 
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:687
-=======
 #: ../src/gpk-enum.c:697
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "Required upgrade data could not be found in any of the configured software "
 "sources.\n"
@@ -3822,19 +2534,11 @@ msgstr ""
 "���త��రి��ిన � సాఫ���వ�ర� మ�లాలన�ద� �ావలిసిన నవ��రణ డా�ా �న���నబడల�ద�.\n"
 "ప�పిణ� నవ��రణల �ాబితా ��ద�బా��ల� వ��డబ�ద�."
 
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:691
-msgid "The package that is trying to be installed is incompatible with this system."
-msgstr "à°¸à°?à°¸à±?థాపిà°?à°?à±?à°?à°?à±? à°ªà±?రయతà±?నిసà±?à°¤à±?à°¨à±?à°¨ à°ªà±?యాà°?à±?à°?à±? à°? సిసà±?à°?à°®à±?â??à°?à±? సారà±?à°ªà±?యమà±?à°?ది à°?ాదà±?."
-
-#: ../src/gpk-enum.c:694
-=======
 #: ../src/gpk-enum.c:701
 msgid "The package that is trying to be installed is incompatible with this system."
 msgstr "à°¸à°?à°¸à±?థాపిà°?à°?à±?à°?à°?à±? à°ªà±?రయతà±?నిసà±?à°¤à±?à°¨à±?à°¨ à°ªà±?యాà°?à±?à°?à±? à°? సిసà±?à°?à°®à±?â??à°?à±? సారà±?à°ªà±?యమà±?à°?ది à°?ాదà±?."
 
 #: ../src/gpk-enum.c:704
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "There is insufficient space on the device.\n"
 "Free some space on the system disk to perform this operation."
@@ -3842,19 +2546,11 @@ msgstr ""
 "పరి�రమ�న�ద� సరిప�వ� �ా�ా ల�ద�.\n"
 "� �ార�య��రమమ� నిర�వహి������ సిస��మ� డిస���న�దలి ���త �ా�ాన� �ాళ���య�మ�."
 
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:698
-msgid "Additional media is required to complete the transaction."
-msgstr "వ�యవహారమ�న� ప�ర�తి��య���� �దనప� మాధ�యమ� �వసరమ��ది."
-
-#: ../src/gpk-enum.c:701
-=======
 #: ../src/gpk-enum.c:708
 msgid "Additional media is required to complete the transaction."
 msgstr "వ�యవహారమ�న� ప�ర�తి��య���� �దనప� మాధ�యమ� �వసరమ��ది."
 
 #: ../src/gpk-enum.c:711
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "You have failed to provide correct authentication.\n"
 "Please check any passwords or account settings."
@@ -3862,11 +2558,7 @@ msgstr ""
 "సర�న ద�వ��రణమ� ��ది����ల� మ�ర� విఫలమ�నార�.\n"
 "స���తపదమ�లన� మరియ� �ాతా �మరి�లన� దయ��సి సరి��స����డి."
 
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:705
-=======
 #: ../src/gpk-enum.c:715
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "The specified update could not be found.\n"
 "It could have already been installed or no longer available on the remote "
@@ -3875,29 +2567,6 @@ msgstr ""
 "త�ల�పబడిన నవ��రణమ� �న���నబడల�� ప�యి�ది.\n"
 "�ది యిప�ప�ి�� స�స�థాపి��బడివ�����ది ల�దా ద�రస�థ స�వి�న�ద� ��ద�బా��ల� వ��డి వ��డద�."
 
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:709
-msgid "The package could not be installed from untrusted source."
-msgstr "నమ�మద�ని మ�లమ�న��డి ప�యా����న� స�స�థాపి��ల�మ�."
-
-#: ../src/gpk-enum.c:712
-msgid "The package could not be updated from untrusted source."
-msgstr "నమ�మద�ని మ�లమ�న��డి ప�యా����న� నవ��రి��ల�మ�."
-
-#: ../src/gpk-enum.c:715
-msgid "The file list is not available for this package."
-msgstr "� ప�యా���� ��ర�� దస�త�రమ� �ాబ�తా ��ద�బా��ల� ల�ద�."
-
-#: ../src/gpk-enum.c:718
-msgid "The information about what requires this package could not be obtained."
-msgstr "� ప�యా������ య�ది �వసరమ� �న�దానిప� సమా�ారమ� ప��దల�� ప�యి�ది."
-
-#: ../src/gpk-enum.c:721
-msgid "The specified software source could not be disabled."
-msgstr "త�ల�పబడిన సాఫ���వ�ర� మ�లమ� ���తనమ� ��యబడల�� ప�యి�ది."
-
-#: ../src/gpk-enum.c:724
-=======
 #: ../src/gpk-enum.c:719
 msgid "The package could not be installed from untrusted source."
 msgstr "నమ�మద�ని మ�లమ�న��డి ప�యా����న� స�స�థాపి��ల�మ�."
@@ -3919,7 +2588,6 @@ msgid "The specified software source could not be disabled."
 msgstr "త�ల�పబడిన సాఫ���వ�ర� మ�లమ� ���తనమ� ��యబడల�� ప�యి�ది."
 
 #: ../src/gpk-enum.c:734
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "The download could not be done automatically and should be done manually.\n"
 "More information is available in the detailed report."
@@ -3927,11 +2595,7 @@ msgstr ""
 "డ�న�ల�డ� స�వయ��ాల���ా �ర��ల�� ప�యి�ది మరియ� మానవ�య��ా �ర�ాలి. \n"
 "విశద���త నివ�ది�న�ద� మరి�త సమా�ారమ� ��ద�బా�ల� వ�����ది."
 
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:728
-=======
 #: ../src/gpk-enum.c:738
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "One of the selected packages failed to configure correctly.\n"
 "More information is available in the detailed report."
@@ -3939,11 +2603,7 @@ msgstr ""
 "��పి���సిన ప�యా����లల� వ���ి సరి�ా ���త��రి������ విఫలమ��ది.\n"
 "విశద���త నివ�ది�న�ద� మరి�త సమా�ారమ� ��ద�బా��ల� వ�����ది."
 
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:732
-=======
 #: ../src/gpk-enum.c:742
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "One of the selected packages failed to build correctly.\n"
 "More information is available in the detailed report."
@@ -3951,11 +2611,7 @@ msgstr ""
 "��పి���సిన ప�యా����లల� వ���ి సరి�ా నిర�మి������ విఫలమ��ది.\n"
 "విశద���త నివ�ది�న�ద� మరి�త సమా�ారమ� ��ద�బా��ల� వ�����ది."
 
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:736
-=======
 #: ../src/gpk-enum.c:746
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "One of the selected packages failed to install correctly.\n"
 "More information is available in the detailed report."
@@ -3963,11 +2619,7 @@ msgstr ""
 "��పి���సిన ప�యా����లల� వ���ి సరి�ా స�స�థాపి������ విఫలమ��ది.\n"
 "విశద���త నివ�ది�న�ద� మరి�త సమా�ారమ� ��ద�బా��ల� వ�����ది."
 
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:740
-=======
 #: ../src/gpk-enum.c:750
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "One of the selected packages failed to be removed correctly.\n"
 "More information is available in the detailed report."
@@ -3975,53 +2627,6 @@ msgstr ""
 "��పి���సిన ప�యా����లల� వ���ి సరి�ా త�సివ�య���� విఫలమ��ది.\n"
 "విశద���త నివ�ది�న�ద� మరి�త సమా�ారమ� ��ద�బా��ల� వ�����ది."
 
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:759
-msgid "No restart is necessary."
-msgstr "���వ��ి ప�న�ప�రార�భమ� �వసరమ�ల�ద�."
-
-#: ../src/gpk-enum.c:762
-msgid "You will be required to restart this application."
-msgstr "� �న�వర�తనమ�న� మ�ర� ప�న�ప�రార�భి��వలసి వ��ది."
-
-#: ../src/gpk-enum.c:765
-msgid "You will be required to log out and back in."
-msgstr "మ�ర� లా�వ��� �య�యి మరలా లా�ిన� �వ�వవలసి వ�����ది."
-
-#: ../src/gpk-enum.c:768
-msgid "A restart will be required."
-msgstr "ప�న�ప�రార�భమ� �వసరమ�త��ది."
-
-#: ../src/gpk-enum.c:771
-msgid "You will be required to log out and back in due to a security update."
-msgstr "మ�ర� లా�వ��� �య�యి మరలా లా�ిన� �వ�వవలసి వ�����ది."
-
-#: ../src/gpk-enum.c:774
-msgid "A restart will be required due to a security update."
-msgstr "ప�న�ప�రార�భమ� �వసరమ�త��ది."
-
-#: ../src/gpk-enum.c:791
-msgid "No restart is required."
-msgstr "ప�న�ప�రార�భమ� �వసరమ�ల�ద�."
-
-#: ../src/gpk-enum.c:794
-msgid "A restart is required."
-msgstr "ప�న�ప�రార�భమ� �వసరమ��ది."
-
-#: ../src/gpk-enum.c:797
-msgid "You need to log out and log back in."
-msgstr "మ�ర� లా�� �వ��� �య�యి లా�ిన� �ావలసివ�����ది."
-
-#: ../src/gpk-enum.c:800
-msgid "You need to restart the application."
-msgstr "మ�ర� �న�వర�తనమ�న� ప�న�ప�రార�భి��వలసివ��ది."
-
-#: ../src/gpk-enum.c:803
-msgid "You need to log out and log back in to remain secure."
-msgstr "స�ర��షితమ��ా వ��డ���� మ�ర� లా�� �వ��� �య�యి లా�ిన� �ావలసివ�����ది."
-
-#: ../src/gpk-enum.c:806
-=======
 #: ../src/gpk-enum.c:754
 #| msgid ""
 #| "A package could not be found that allows the action to complete.\n"
@@ -4078,94 +2683,20 @@ msgid "You need to log out and log back in to remain secure."
 msgstr "స�ర��షితమ��ా వ��డ���� మ�ర� లా�� �వ��� �య�యి లా�ిన� �ావలసివ�����ది."
 
 #: ../src/gpk-enum.c:820
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "A restart is required to remain secure."
 msgstr "స�ర��షితమ��ా వ��డ���� ప�న�ప�రార�భమ� �వసరమ��ది."
 
 #. TRANSLATORS: A distribution stability level
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:824
-=======
 #: ../src/gpk-enum.c:838
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Stable"
 msgstr "స�థిరమ�న"
 
 #. TRANSLATORS: A distribution stability level
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:828
-=======
 #: ../src/gpk-enum.c:842
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Unstable"
 msgstr "�స�థిరమ�న"
 
 #. TRANSLATORS: A distribution stability level
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:832
-msgid "Testing"
-msgstr "పరిశ�లి�����న�న"
-
-#: ../src/gpk-enum.c:849
-msgid "A mirror is possibly broken"
-msgstr "మిర�రర� బహశా విరి�ిప�యి వ��డవ����"
-
-#: ../src/gpk-enum.c:852
-msgid "The connection was refused"
-msgstr "�న�స�ధానమ� తిరస��రి��బడి వ��డవ����"
-
-#: ../src/gpk-enum.c:855
-msgid "The parameter was invalid"
-msgstr "పారామితి ��ల�లనిది"
-
-#: ../src/gpk-enum.c:858
-msgid "The priority was invalid"
-msgstr "ప�రామ���యత ��ల�లనిది"
-
-#: ../src/gpk-enum.c:861
-msgid "Backend warning"
-msgstr "బ�యా���డ� హ����రి�"
-
-#: ../src/gpk-enum.c:864
-msgid "Daemon warning"
-msgstr "డ�మ�న� హ����రి�"
-
-#: ../src/gpk-enum.c:867
-msgid "The package list cache is being rebuilt"
-msgstr "ప�యా���� �ాబితా ��యా�� ప�న�నిర�మితమ�త��ది"
-
-#: ../src/gpk-enum.c:870
-msgid "An untrusted package was installed"
-msgstr "నమ�మల�ని ప�యా���� స�స�థాపి��బడి�ది"
-
-#: ../src/gpk-enum.c:873
-msgid "A newer package exists"
-msgstr "��త�త ప�యా���� వ��ది"
-
-#: ../src/gpk-enum.c:876
-msgid "Could not find package"
-msgstr "ప�యా���� �న���న ల��ప�యి�ది"
-
-#: ../src/gpk-enum.c:879
-msgid "Configuration files were changed"
-msgstr "���త��రణ ఫ�ళ�ళ� మార��బడినవి"
-
-#: ../src/gpk-enum.c:882
-msgid "Package is already installed"
-msgstr "ప�యా���� యిప�ప�ి�� స�స�థాపి��బడినది"
-
-#: ../src/gpk-enum.c:885
-msgid "Automatic cleanup is being ignored"
-msgstr "స�వయ��ాల� ��ల�నప� వదిలివ�యబడ���న�నది"
-
-#: ../src/gpk-enum.c:888
-#| msgid "The package download failed"
-msgid "Software source download failed"
-msgstr "సాఫà±?à°?à±?â??à°µà±?à°°à±? à°¯à±?à°?à±?à°? à°®à±?లమà±? à°¡à±?à°¨à±?â??à°²à±?à°¡à±? విఫలమà±?à°?ది"
-
-#. TRANSLATORS: This is when the transaction status is not known
-#: ../src/gpk-enum.c:906
-=======
 #: ../src/gpk-enum.c:846
 msgid "Testing"
 msgstr "పరిశ�లి�����న�న"
@@ -4232,61 +2763,30 @@ msgstr "సాఫ���వ�ర� మ�లమ� �భివ�ద�ద
 
 #. TRANSLATORS: This is when the transaction status is not known
 #: ../src/gpk-enum.c:923
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Unknown state"
 msgstr "త�లియని స�థితి"
 
 #. TRANSLATORS: transaction state, the daemon is in the process of starting
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:910
-=======
 #: ../src/gpk-enum.c:927
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Starting"
 msgstr "ప�రార�భిస�త��ది"
 
 #. TRANSLATORS: transaction state, the transaction is waiting for another to complete
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:914
-=======
 #: ../src/gpk-enum.c:931
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Waiting in queue"
 msgstr "��య�న�ద� వ��ివ��ది"
 
 #. TRANSLATORS: transaction state, just started
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:918
-=======
 #: ../src/gpk-enum.c:935
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Running"
 msgstr "నడ�ప�త��ది"
 
 #. TRANSLATORS: transaction state, is querying data
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:922
-=======
 #: ../src/gpk-enum.c:939
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Querying"
 msgstr "��వర���స�త��ది"
 
 #. TRANSLATORS: transaction state, getting data from a server
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:926
-msgid "Getting information"
-msgstr "సమా�ారమ�న� ప��ద�త��ది"
-
-#. TRANSLATORS: transaction state, removing packages
-#: ../src/gpk-enum.c:930
-msgid "Removing packages"
-msgstr "ప�యా����లన� త�ల�ిస�త��ది"
-
-#. TRANSLATORS: transaction state, downloading package files
-#. TRANSLATORS: The role of the transaction, in present tense
-#: ../src/gpk-enum.c:934 ../src/gpk-enum.c:1370
-=======
 #: ../src/gpk-enum.c:943
 msgid "Getting information"
 msgstr "సమా�ారమ�న� ప��ద�త��ది"
@@ -4294,271 +2794,152 @@ msgstr "సమా�ారమ�న� ప��ద�త��ది"
 #. TRANSLATORS: transaction state, downloading package files
 #. TRANSLATORS: The role of the transaction, in present tense
 #: ../src/gpk-enum.c:951 ../src/gpk-enum.c:1387
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Downloading packages"
 msgstr "ప�యా����లన� డ�న�ల�డ���స�త��ది"
 
 #. TRANSLATORS: transaction state, refreshing internal lists
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:942
-=======
 #: ../src/gpk-enum.c:959
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Refreshing software list"
 msgstr "సాఫà±?à°?à±?à°µà±?à°°à±? à°?ాబితానà±? à°°à±?à°«à±?à°°à±?à°·à±?â??à°?à±?à°¸à±?à°¤à±?à°?ది"
 
 #. TRANSLATORS: transaction state, installing updates
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:946
-=======
 #: ../src/gpk-enum.c:963
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Installing updates"
 msgstr "నవ��రణలన� స�స�థాపి�����న�నది"
 
 #. TRANSLATORS: transaction state, removing old packages, and cleaning config files
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:950
-=======
 #: ../src/gpk-enum.c:967
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Cleaning up packages"
 msgstr "ప�యా����ల��ర�� త�డి�ివ�స�త��ది"
 
 #. TRANSLATORS: transaction state, obsoleting old packages
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:954
-=======
 #: ../src/gpk-enum.c:971
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Obsoleting packages"
 msgstr "ప�యా����లన� వాడ��న��డి త�సివ�స�త��ది"
 
 #. TRANSLATORS: transaction state, checking the transaction before we do it
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:958
-=======
 #: ../src/gpk-enum.c:975
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Resolving dependencies"
 msgstr "�ధారమ�లన� పరిష��రిస�త��ది"
 
 #. TRANSLATORS: transaction state, checking if we have all the security keys for the operation
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:962
-=======
 #: ../src/gpk-enum.c:979
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Checking signatures"
 msgstr "స�త�మ�లన� పరిశ�లిస�త��ది"
 
 #. TRANSLATORS: transaction state, when we return to a previous system state
 #. TRANSLATORS: The role of the transaction, in present tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:966 ../src/gpk-enum.c:1330
-=======
 #: ../src/gpk-enum.c:983 ../src/gpk-enum.c:1347
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Rolling back"
 msgstr "వ�న���� త�స���స�త��ది"
 
 #. TRANSLATORS: transaction state, when we're doing a test transaction
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:970
-=======
 #: ../src/gpk-enum.c:987
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Testing changes"
 msgstr "మార�ప�లన� పరిశ�లిస�త��ది"
 
 #. TRANSLATORS: transaction state, when we're writing to the system package database
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:974
-=======
 #: ../src/gpk-enum.c:991
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Committing changes"
 msgstr "మార�ప�లన� శాశ�వతపర�స�త��ది"
 
 #. TRANSLATORS: transaction state, requesting data from a server
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:978
-=======
 #: ../src/gpk-enum.c:995
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Requesting data"
 msgstr "డా�ాన� �భ�యర�దిస�త��ది"
 
 #. TRANSLATORS: transaction state, all done!
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:982
-=======
 #: ../src/gpk-enum.c:999
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Finished"
 msgstr "మ��ిసినది"
 
 #. TRANSLATORS: transaction state, in the process of cancelling
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:986
-=======
 #: ../src/gpk-enum.c:1003
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Cancelling"
 msgstr "రద�ద���య���న�నది"
 
 #. TRANSLATORS: transaction state, downloading metadata
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:990
-=======
 #: ../src/gpk-enum.c:1007
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Downloading repository information"
 msgstr "రిప��ి�ర� సమా�ారమ�న� డ�న�ల�డ� ��స�త��ది"
 
 #. TRANSLATORS: transaction state, downloading metadata
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:994
-=======
 #: ../src/gpk-enum.c:1011
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Downloading list of packages"
 msgstr "ప�యా����ల �ాబితాన� డ�న�ల�డ� ��స�త��ది"
 
 #. TRANSLATORS: transaction state, downloading metadata
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:998
-=======
 #: ../src/gpk-enum.c:1015
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Downloading file lists"
 msgstr "దస�త�రమ� �ాబితాలన� డ�న�ల�డ���స�త��ది"
 
 #. TRANSLATORS: transaction state, downloading metadata
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1002
-=======
 #: ../src/gpk-enum.c:1019
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Downloading lists of changes"
 msgstr "మార�ప�ల �ాబితాలన� డ�న�ల�డ���స�త��ది"
 
 #. TRANSLATORS: transaction state, downloading metadata
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1006
-=======
 #: ../src/gpk-enum.c:1023
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Downloading groups"
 msgstr "సమ�హాలన� డ�న�ల�డ���స�త��ది"
 
 #. TRANSLATORS: transaction state, downloading metadata
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1010
-=======
 #: ../src/gpk-enum.c:1027
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Downloading update information"
 msgstr "నవ��రణ సమా�ారమ�న� డ�న�ల�డ���స�త��ది"
 
 #. TRANSLATORS: transaction state, repackaging delta files
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1014
-=======
 #: ../src/gpk-enum.c:1031
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Repackaging files"
 msgstr "ఫ�ళ�ళన� ప�న�స��లనమ�(ర�పా���ి���) ��స�త��ది"
 
 #. TRANSLATORS: transaction state, loading databases
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1018
-=======
 #: ../src/gpk-enum.c:1035
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Loading cache"
 msgstr "��యా��ని ల�డ���స�త��ది"
 
 #. TRANSLATORS: transaction state, scanning for running processes
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1022
-=======
 #: ../src/gpk-enum.c:1039
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Scanning installed applications"
 msgstr "à°¸à°?à°¸à±?థాపిత à°?à°¨à±?వరà±?తనమà±?లనà±? à°¸à±?à°?ానిà°?à°?à±?â??à°?à±?à°¸à±?à°¤à±?à°?ది"
 
 #. TRANSLATORS: transaction state, generating a list of packages installed on the system
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1026
-=======
 #: ../src/gpk-enum.c:1043
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Generating package lists"
 msgstr "ప�యా���� �ాబితాలన� వ�ద�భవి�ప��స�త��ది"
 
 #. TRANSLATORS: transaction state, when we're waiting for the native tools to exit
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1030
-=======
 #: ../src/gpk-enum.c:1047
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Waiting for package manager lock"
 msgstr "ప�యా���� నిర�వాహి� లా�� ��ర�� వ��ివ��ది"
 
 #. TRANSLATORS: waiting for user to type in a password
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1034
-=======
 #: ../src/gpk-enum.c:1051
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Waiting for authentication"
 msgstr "ద�వ��రణమ� ��ర�� వ��ివ��ది"
 
 #. TRANSLATORS: we are updating the list of processes
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1038
-=======
 #: ../src/gpk-enum.c:1055
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Updating the list of running applications"
 msgstr "నడ�స�త�న�న �న�వర�తనమ�లయ���� �ాబితాన� నవ��రి�����న�నది"
 
 #. TRANSLATORS: we are checking executable files in use
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1042
-=======
 #: ../src/gpk-enum.c:1059
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Checking for applications currently in use"
 msgstr "�న�వర�తనమ�ల ��ర�� పరిశ�లన ప�రస�త�తమ� వ�పయ���ల� వ��ది"
 
 #. TRANSLATORS: we are checking for libraries in use
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1046
-=======
 #: ../src/gpk-enum.c:1063
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Checking for libraries currently in use"
 msgstr "ల�బ�రర�ల ��ర�� పరిశ�లన ప�రస�త�తమ� వ�పయ���ల�వ��ది"
 
 #. TRANSLATORS: we are copying package files to prepare to install
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1050
-#| msgid "Copying file"
-#| msgid_plural "Copying files"
-=======
 #: ../src/gpk-enum.c:1067
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Copying files"
 msgstr "దస�త�రమ�న� న�ల�త�య���న�నది"
 
 #. TRANSLATORS: type of update
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1068
-=======
 #: ../src/gpk-enum.c:1085
->>>>>>> Updated Telugu Translation:po/te.po
 #, c-format
 msgid "%i trivial update"
 msgid_plural "%i trivial updates"
@@ -4566,11 +2947,7 @@ msgstr[0] "%i ��ర�వల� నవ��రణల�"
 msgstr[1] "%i ��ర�వల� నవ��రణల�"
 
 #. TRANSLATORS: type of update in the case that we don't have any data
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1072
-=======
 #: ../src/gpk-enum.c:1089
->>>>>>> Updated Telugu Translation:po/te.po
 #, c-format
 msgid "%i update"
 msgid_plural "%i updates"
@@ -4578,11 +2955,7 @@ msgstr[0] "%i నవ��రణల�"
 msgstr[1] "%i నవ��రణల�"
 
 #. TRANSLATORS: type of update
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1076
-=======
 #: ../src/gpk-enum.c:1093
->>>>>>> Updated Telugu Translation:po/te.po
 #, c-format
 msgid "%i important update"
 msgid_plural "%i important updates"
@@ -4590,11 +2963,7 @@ msgstr[0] "%i మ���యమ�న నవ��రణల�"
 msgstr[1] "%i మ���యమ�న నవ��రణల�"
 
 #. TRANSLATORS: type of update
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1080
-=======
 #: ../src/gpk-enum.c:1097
->>>>>>> Updated Telugu Translation:po/te.po
 #, c-format
 msgid "%i security update"
 msgid_plural "%i security updates"
@@ -4602,11 +2971,7 @@ msgstr[0] "%i ర��షణ నవ��రణల�"
 msgstr[1] "%i ర��షణ నవ��రణల�"
 
 #. TRANSLATORS: type of update
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1084
-=======
 #: ../src/gpk-enum.c:1101
->>>>>>> Updated Telugu Translation:po/te.po
 #, c-format
 msgid "%i bug fix update"
 msgid_plural "%i bug fix updates"
@@ -4614,11 +2979,7 @@ msgstr[0] "%i à°¬à°?à±? à°«à°¿à°?à±?à°¸à±?â?? నవà±?à°?రణలà±?"
 msgstr[1] "%i à°¬à°?à±? à°«à°¿à°?à±?à°¸à±?â?? నవà±?à°?రణలà±?"
 
 #. TRANSLATORS: type of update
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1088
-=======
 #: ../src/gpk-enum.c:1105
->>>>>>> Updated Telugu Translation:po/te.po
 #, c-format
 msgid "%i enhancement update"
 msgid_plural "%i enhancement updates"
@@ -4626,11 +2987,7 @@ msgstr[0] "%i విస�తరి�ప� నవ��రణల�"
 msgstr[1] "%i విస�తరి�ప� నవ��రణల�"
 
 #. TRANSLATORS: number of updates that cannot be installed due to deps
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1092
-=======
 #: ../src/gpk-enum.c:1109
->>>>>>> Updated Telugu Translation:po/te.po
 #, c-format
 msgid "%i blocked update"
 msgid_plural "%i blocked updates"
@@ -4638,1115 +2995,620 @@ msgstr[0] "%i à°¬à±?లాà°?à±?â??à°¡à±? నవà±?à°?రణలà±?"
 msgstr[1] "%i à°¬à±?లాà°?à±?â??à°¡à±? నవà±?à°?రణలà±?"
 
 #. TRANSLATORS: The type of update
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1110
-=======
 #: ../src/gpk-enum.c:1127
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Trivial update"
 msgstr "��ర�వల� నవ��రణ"
 
 #. TRANSLATORS: The type of update
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1114
-=======
 #: ../src/gpk-enum.c:1131
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Normal update"
 msgstr "సాదారణ నవ��రణ"
 
 #. TRANSLATORS: The type of update
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1118
-=======
 #: ../src/gpk-enum.c:1135
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Important update"
 msgstr "మ���యమ�న నవ��రణ"
 
 #. TRANSLATORS: The type of update
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1122
-=======
 #: ../src/gpk-enum.c:1139
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Security update"
 msgstr "ర��షణ నవ��రణ"
 
 #. TRANSLATORS: The type of update
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1126
-=======
 #: ../src/gpk-enum.c:1143
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Bug fix update"
 msgstr "à°¬à°?à±? à°«à°¿à°?à±?à°¸à±?â?? నవà±?à°?à°°à°£"
 
 #. TRANSLATORS: The type of update
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1130
-=======
 #: ../src/gpk-enum.c:1147
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Enhancement update"
 msgstr "విస�తరణ నవ��రణ"
 
 #. TRANSLATORS: The type of update
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1134
-=======
 #: ../src/gpk-enum.c:1151
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Blocked update"
 msgstr "à°¬à±?లాà°?à±?â??à°¡à±? నవà±?à°?à°°à°£"
 
 #. TRANSLATORS: The state of a package, i.e. not installed
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1144
-=======
 #: ../src/gpk-enum.c:1161
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Available"
 msgstr "��ద�బా��ల�వ��ది"
 
 #. TRANSLATORS: The action of the package, in present tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1162 ../src/gpk-service-pack.c:418
-=======
 #: ../src/gpk-enum.c:1179 ../src/gpk-service-pack.c:427
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Downloading"
 msgstr "ది��మతి �వ�త�న�నది"
 
 #. TRANSLATORS: The action of the package, in present tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1166
-=======
 #: ../src/gpk-enum.c:1183
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Updating"
 msgstr "నవ��రిస�త��ది"
 
 #. TRANSLATORS: The action of the package, in present tense
 #. TRANSLATORS: The role of the transaction, in present tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1170 ../src/gpk-enum.c:1306
-=======
 #: ../src/gpk-enum.c:1187 ../src/gpk-enum.c:1323
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Installing"
 msgstr "స�స�థాపిస�త��ది"
 
 #. TRANSLATORS: The action of the package, in present tense
 #. TRANSLATORS: The role of the transaction, in present tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1174 ../src/gpk-enum.c:1302
-=======
 #: ../src/gpk-enum.c:1191 ../src/gpk-enum.c:1319
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Removing"
 msgstr "త�ల�ిస�త��ది"
 
 #. TRANSLATORS: The action of the package, in present tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1178
-=======
 #: ../src/gpk-enum.c:1195
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Cleaning up"
 msgstr "శ�భ�రపర�స�త��ది"
 
 #. TRANSLATORS: The action of the package, in present tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1182
-=======
 #: ../src/gpk-enum.c:1199
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Obsoleting"
 msgstr "త�ల�ిస�త��ది"
 
 #. TRANSLATORS: The action of the package, in present tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1186
-#| msgid "Installing"
-=======
 #: ../src/gpk-enum.c:1203
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Reinstalling"
 msgstr "ప�న�స�స�థాపిస�త��ది"
 
 #. TRANSLATORS: The action of the package, in present tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1190
-#| msgid "Programming"
-=======
 #: ../src/gpk-enum.c:1207
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Preparing"
 msgstr "సిద�దమ�త��ది"
 
 #. TRANSLATORS: The action of the package, in present tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1194
-=======
 #: ../src/gpk-enum.c:1211
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Decompressing"
 msgstr "విడబర�స�త��ది"
 
 #. TRANSLATORS: The action of the package, in past tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1212
-=======
 #: ../src/gpk-enum.c:1229
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Downloaded"
 msgstr "డ�న�ల�డ��ది"
 
 #. TRANSLATORS: The action of the package, in past tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1216
-=======
 #: ../src/gpk-enum.c:1233
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Updated"
 msgstr "తా�ాపర�బడిన"
 
 #. TRANSLATORS: The action of the package, in past tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1224
-=======
 #: ../src/gpk-enum.c:1241
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Removed"
 msgstr "త�సివ�యబడి�ది"
 
 #. TRANSLATORS: The action of the package, in past tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1228
-=======
 #: ../src/gpk-enum.c:1245
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Cleaned up"
 msgstr "శ�భ�రమ���యబడి�ది"
 
 #. TRANSLATORS: The action of the package, in past tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1232
-=======
 #: ../src/gpk-enum.c:1249
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Obsoleted"
 msgstr "త�ల�ి��బడి�ది"
 
 #. TRANSLATORS: The action of the package, in past tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1236
-#| msgid "Installed"
-=======
 #: ../src/gpk-enum.c:1253
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Reinstalled"
 msgstr "ప�న�స�స�థాపి��ిన"
 
 #. TRANSLATORS: The action of the package, in past tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1240
-=======
 #: ../src/gpk-enum.c:1257
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Prepared"
 msgstr "సిద�దమ�న"
 
 #. TRANSLATORS: The action of the package, in past tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1244
-=======
 #: ../src/gpk-enum.c:1261
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Decompressed"
 msgstr "విడబర��ిన"
 
 #. TRANSLATORS: The role of the transaction, in present tense
 #. TRANSLATORS: The role of the transaction, in past tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1262 ../src/gpk-enum.c:1418
-=======
 #: ../src/gpk-enum.c:1279 ../src/gpk-enum.c:1435
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Unknown role type"
 msgstr "త�లియని పాత�ర ర�మ�"
 
 #. TRANSLATORS: The role of the transaction, in present tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1266
-=======
 #: ../src/gpk-enum.c:1283
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Getting dependencies"
 msgstr "�ధారమ�లన� ప��ద�త��ది"
 
 #. TRANSLATORS: The role of the transaction, in present tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1270
-=======
 #: ../src/gpk-enum.c:1287
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Getting update detail"
 msgstr "నవ��రణ వివరమ�న� ప��ద�త��ది"
 
 #. TRANSLATORS: The role of the transaction, in present tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1274
-=======
 #: ../src/gpk-enum.c:1291
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Getting details"
 msgstr "వివరమ�లన� ప��ద�త��ది"
 
 #. TRANSLATORS: The role of the transaction, in present tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1278
-=======
 #: ../src/gpk-enum.c:1295
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Getting requires"
 msgstr "�వసరమ�లన� ప��ద�త��ది"
 
 #. TRANSLATORS: The role of the transaction, in present tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1282
-=======
 #: ../src/gpk-enum.c:1299
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Getting updates"
 msgstr "నవ��రణలన� ప��ద�త��ది"
 
 #. TRANSLATORS: The role of the transaction, in present tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1286
-=======
 #: ../src/gpk-enum.c:1303
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Searching details"
 msgstr "వివరమ�లన� శ�ధి�����న�నది"
 
 #. TRANSLATORS: The role of the transaction, in present tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1294
-=======
 #: ../src/gpk-enum.c:1311
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Searching groups"
 msgstr "సమ�హమ�లన� శ�ధి�����న�నది"
 
 #. TRANSLATORS: The role of the transaction, in present tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1298
-=======
 #: ../src/gpk-enum.c:1315
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Searching for package name"
 msgstr "ప�యా����నామమ� ��ర�� శ�ధిస�త�న�నది"
 
 #. TRANSLATORS: The role of the transaction, in present tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1310
-=======
 #: ../src/gpk-enum.c:1327
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Installing file"
 msgstr "దస�త�రమ�న� స�స�థాపిస�త�న�నది"
 
 #. TRANSLATORS: The role of the transaction, in present tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1314
-=======
 #: ../src/gpk-enum.c:1331
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Refreshing package cache"
 msgstr "à°ªà±?యాà°?à±?à°?à°¿ à°?à±?యాà°?à±?ని à°°à±?à°«à±?à°°à±?à°·à±?â??à°?à±?à°¸à±?à°¤à±?à°?ది"
 
 #. TRANSLATORS: The role of the transaction, in present tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1318
-=======
 #: ../src/gpk-enum.c:1335
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Updating packages"
 msgstr "ప�యా����లన� నవ��రిస�త��ది"
 
 #. TRANSLATORS: The role of the transaction, in present tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1322
-=======
 #: ../src/gpk-enum.c:1339
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Updating system"
 msgstr "సిసà±?à°?à°®à±?â??à°¨à±? నవà±?à°?à°°à°¿à°¸à±?à°¤à±?à°?ది"
 
 #. TRANSLATORS: The role of the transaction, in present tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1326
-=======
 #: ../src/gpk-enum.c:1343
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Canceling"
 msgstr "రద�ద���స�త��ది"
 
 #. TRANSLATORS: The role of the transaction, in present tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1334
-=======
 #: ../src/gpk-enum.c:1351
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Getting list of repositories"
 msgstr "రిప��ి�ర�లయ���� �ాబితాన� ప��ద�త��ది"
 
 #. TRANSLATORS: The role of the transaction, in present tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1338
-=======
 #: ../src/gpk-enum.c:1355
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Enabling repository"
 msgstr "రిప��ి�ర�ని ��తనపర�స�త��ది"
 
 #. TRANSLATORS: The role of the transaction, in present tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1342
-=======
 #: ../src/gpk-enum.c:1359
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Setting repository data"
 msgstr "రిప��ి�ర� డా�ాన� �మర���త��ది"
 
 #. TRANSLATORS: The role of the transaction, in present tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1346
-=======
 #: ../src/gpk-enum.c:1363
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Resolving"
 msgstr "పరిష��రిస�త��ది"
 
 #. TRANSLATORS: The role of the transaction, in present tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1350
-=======
 #: ../src/gpk-enum.c:1367
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Getting file list"
 msgstr "ప�ల� �ాబితాన� ప��ద�త��ది"
 
 #. TRANSLATORS: The role of the transaction, in present tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1354
-=======
 #: ../src/gpk-enum.c:1371
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Getting what provides"
 msgstr "�ది ��దిస�త��ద� ప��ద�త��ది"
 
 #. TRANSLATORS: The role of the transaction, in present tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1358
-=======
 #: ../src/gpk-enum.c:1375
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Installing signature"
 msgstr "స�త�మ�న� స�స�థాపి���త�న�నది"
 
 #. TRANSLATORS: The role of the transaction, in present tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1362
-=======
 #: ../src/gpk-enum.c:1379
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Getting package lists"
 msgstr "ప�యా���� �ాబితాలన� ప��ద�త��ది"
 
 #. TRANSLATORS: The role of the transaction, in present tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1366
-=======
 #: ../src/gpk-enum.c:1383
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Accepting EULA"
 msgstr "EULA �మ�దిస�త��ది"
 
 #. TRANSLATORS: The role of the transaction, in present tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1374
-=======
 #: ../src/gpk-enum.c:1391
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Getting distribution upgrade information"
 msgstr "ప�పిణ� నవ��రణ సమా�ారమ� ప��ద���న�నది"
 
 #. TRANSLATORS: The role of the transaction, in present tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1378
-=======
 #: ../src/gpk-enum.c:1395
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Getting categories"
 msgstr "వర����రణలన� ప��ద���న�నది"
 
 #. TRANSLATORS: The role of the transaction, in present tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1382
-=======
 #: ../src/gpk-enum.c:1399
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Getting old transactions"
 msgstr "పాత వ�యవహారమ�లన� ప��ద���న�నది"
 
 #. TRANSLATORS: The role of the transaction, in present tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1386
-=======
 #: ../src/gpk-enum.c:1403
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Simulating the install of files"
 msgstr "ఫ�ళ�ళ స�స�థాపనన� �న��రి��ి��ప�త��ది"
 
 #. TRANSLATORS: The role of the transaction, in present tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1390
-=======
 #: ../src/gpk-enum.c:1407
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Simulating the install"
 msgstr "స�స�థాపనన� �న��రి��ి��ప�త��ది"
 
 #. TRANSLATORS: The role of the transaction, in present tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1394
-=======
 #: ../src/gpk-enum.c:1411
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Simulating the remove"
 msgstr "త�సివ�తన� �న��రి��ి��ప�త��ది"
 
 #. TRANSLATORS: The role of the transaction, in present tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1398
-=======
 #: ../src/gpk-enum.c:1415
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Simulating the update"
 msgstr "నవ��రణన� �న��రి��ి ��ప�త��ది"
 
 #. TRANSLATORS: The role of the transaction, in past tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1422
-=======
 #: ../src/gpk-enum.c:1439
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Got dependencies"
 msgstr "�ధారమ�లన� ప��ద�త��ది"
 
 #. TRANSLATORS: The role of the transaction, in past tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1426
-=======
 #: ../src/gpk-enum.c:1443
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Got update detail"
 msgstr "నవ��రణ వివరమ�న� ప��ది�ది"
 
 #. TRANSLATORS: The role of the transaction, in past tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1430
-=======
 #: ../src/gpk-enum.c:1447
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Got details"
 msgstr "వివరమ�లన� ప��ది�ది"
 
 #. TRANSLATORS: The role of the transaction, in past tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1434
-=======
 #: ../src/gpk-enum.c:1451
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Got requires"
 msgstr "�వసరమ�నవి ప��ది�ది"
 
 #. TRANSLATORS: The role of the transaction, in past tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1438
-=======
 #: ../src/gpk-enum.c:1455
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Got updates"
 msgstr "నవ��రణల� ప��ది�ది"
 
 #. TRANSLATORS: The role of the transaction, in past tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1442
-=======
 #: ../src/gpk-enum.c:1459
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Searched for package details"
 msgstr "ప�యా���� వివరమ�ల ��ర�� శ�ధి��ి�ది"
 
 #. TRANSLATORS: The role of the transaction, in past tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1446
-=======
 #: ../src/gpk-enum.c:1463
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Searched for file"
 msgstr "దస�త�రమ� ��ర�� శ�ధి��ి�ది"
 
 #. TRANSLATORS: The role of the transaction, in past tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1450
-=======
 #: ../src/gpk-enum.c:1467
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Searched groups"
 msgstr "శ�ధి��ిన సమ�హాల�"
 
 #. TRANSLATORS: The role of the transaction, in past tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1454
-=======
 #: ../src/gpk-enum.c:1471
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Searched for package name"
 msgstr "ప�యా���� నామమ���ర�� శ�ధి��ి�ది"
 
 #. TRANSLATORS: The role of the transaction, in past tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1458
-=======
 #: ../src/gpk-enum.c:1475
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Removed packages"
 msgstr "త�ల�ి��ిన ప�యా����ల�"
 
 #. TRANSLATORS: The role of the transaction, in past tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1462
-=======
 #: ../src/gpk-enum.c:1479
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Installed packages"
 msgstr "స�స�థాపి��ిన ప�యా����ల�"
 
 #. TRANSLATORS: The role of the transaction, in past tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1466
-=======
 #: ../src/gpk-enum.c:1483
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Installed local files"
 msgstr "స�స�థాపి��ిన స�థాని� ఫ�ళ�ళ�"
 
 #. TRANSLATORS: The role of the transaction, in past tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1470
-=======
 #: ../src/gpk-enum.c:1487
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Refreshed package cache"
 msgstr "ర�ఫ�ర�ష� ��సిన ప�యా���� ��యా��"
 
 #. TRANSLATORS: The role of the transaction, in past tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1474
-=======
 #: ../src/gpk-enum.c:1491
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Updated packages"
 msgstr "నవ��రి��ిన ప�యా����ల�"
 
 #. TRANSLATORS: The role of the transaction, in past tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1478
-=======
 #: ../src/gpk-enum.c:1495
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Updated system"
 msgstr "నవ��రి��ిన సిస��మ�"
 
 #. TRANSLATORS: The role of the transaction, in past tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1482
-=======
 #: ../src/gpk-enum.c:1499
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Canceled"
 msgstr "రద�ద���యబడినది"
 
 #. TRANSLATORS: The role of the transaction, in past tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1486
-=======
 #: ../src/gpk-enum.c:1503
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Rolled back"
 msgstr "వ�న���� త����ిన"
 
 #. TRANSLATORS: The role of the transaction, in past tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1490
-=======
 #: ../src/gpk-enum.c:1507
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Got list of repositories"
 msgstr "రిప��ి�ర�ల �ాబితాన� ప��ది�ది"
 
 #. TRANSLATORS: The role of the transaction, in past tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1494
-=======
 #: ../src/gpk-enum.c:1511
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Enabled repository"
 msgstr "��తనపర�బడిన రిప��ి�ర�"
 
 #. TRANSLATORS: The role of the transaction, in past tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1498
-=======
 #: ../src/gpk-enum.c:1515
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Set repository data"
 msgstr "రిప��ి�ర� డా�ాన� �మర���మ�"
 
 #. TRANSLATORS: The role of the transaction, in past tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1502
-=======
 #: ../src/gpk-enum.c:1519
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Resolved"
 msgstr "పరిష��రి��ిన"
 
 #. TRANSLATORS: The role of the transaction, in past tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1506
-=======
 #: ../src/gpk-enum.c:1523
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Got file list"
 msgstr "దస�త�రమ� �ాబితాన� ప��ది�ది"
 
 #. TRANSLATORS: The role of the transaction, in past tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1510
-=======
 #: ../src/gpk-enum.c:1527
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Got what provides"
 msgstr "�ది ��దిస�త��ద� ప��ది�ది"
 
 #. TRANSLATORS: The role of the transaction, in past tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1514
-=======
 #: ../src/gpk-enum.c:1531
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Installed signature"
 msgstr "స�స�థాపి��ిన స�త�మ�"
 
 #. TRANSLATORS: The role of the transaction, in past tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1518
-=======
 #: ../src/gpk-enum.c:1535
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Got package lists"
 msgstr "ప�యా���� �ాబితాలన� ప��ది�ది"
 
 #. TRANSLATORS: The role of the transaction, in past tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1522
-=======
 #: ../src/gpk-enum.c:1539
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Accepted EULA"
 msgstr "�మ�ది��ిన EULA"
 
 #. TRANSLATORS: The role of the transaction, in past tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1526
-=======
 #: ../src/gpk-enum.c:1543
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Downloaded packages"
 msgstr "డ�న�ల�డ���సిన ప�యా����ల�"
 
 #. TRANSLATORS: The role of the transaction, in past tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1530
-=======
 #: ../src/gpk-enum.c:1547
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Got distribution upgrades"
 msgstr "ప�పిణ� నవ��రణలన� ప��ది�ది"
 
 #. TRANSLATORS: The role of the transaction, in past tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1534
-=======
 #: ../src/gpk-enum.c:1551
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Got categories"
 msgstr "వర����రణలన� ప��ది�ది"
 
 #. TRANSLATORS: The role of the transaction, in past tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1538
-=======
 #: ../src/gpk-enum.c:1555
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Got old transactions"
 msgstr "పాత వ�యవహారమ�లన� ప��దినది"
 
 #. TRANSLATORS: The role of the transaction, in past tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1542
-=======
 #: ../src/gpk-enum.c:1559
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Simulated the install of files"
 msgstr "ఫ�ళ�ళన� స�స�థాపి���� �న��రి��ినది"
 
 #. TRANSLATORS: The role of the transaction, in past tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1546
-=======
 #: ../src/gpk-enum.c:1563
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Simulated the install"
 msgstr "స�స�థాపనన� �న��రి��ినది"
 
 #. TRANSLATORS: The role of the transaction, in past tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1550
-=======
 #: ../src/gpk-enum.c:1567
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Simulated the remove"
 msgstr "త�సివ�తన� �న��రి��ినది"
 
 #. TRANSLATORS: The role of the transaction, in past tense
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1554
-=======
 #: ../src/gpk-enum.c:1571
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Simulated the update"
 msgstr "నవ��రణన� �న��రి��ినది"
 
 #. TRANSLATORS: The group type
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1572
-=======
 #: ../src/gpk-enum.c:1589
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Accessibility"
 msgstr "యాà°?à±?à°¸à±?à°¸à±?â??à°¬à±?లిà°?à°¿"
 
 #. TRANSLATORS: The group type
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1576
-=======
 #: ../src/gpk-enum.c:1593
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Accessories"
 msgstr "యా��స�సర�స�"
 
 #. TRANSLATORS: The group type
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1580
-=======
 #: ../src/gpk-enum.c:1597
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Education"
 msgstr "విధ�య"
 
 #. TRANSLATORS: The group type
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1584
-=======
 #: ../src/gpk-enum.c:1601
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Games"
 msgstr "��ల�"
 
 #. TRANSLATORS: The group type
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1588
-=======
 #: ../src/gpk-enum.c:1605
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Graphics"
 msgstr "à°?à±?రాఫిà°?à±?à°¸à±?â??"
 
 #. TRANSLATORS: The group type
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1592
-=======
 #: ../src/gpk-enum.c:1609
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Internet"
 msgstr "���ర�న���"
 
 #. TRANSLATORS: The group type
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1596
-=======
 #: ../src/gpk-enum.c:1613
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Office"
 msgstr "�ార�యాలయమ�"
 
 #. TRANSLATORS: The group type
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1600
-=======
 #: ../src/gpk-enum.c:1617
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Other"
 msgstr "�తర"
 
 #. TRANSLATORS: The group type
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1604
-=======
 #: ../src/gpk-enum.c:1621
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Programming"
 msgstr "ప�ర���రామి���"
 
 #. TRANSLATORS: The group type
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1608
-=======
 #: ../src/gpk-enum.c:1625
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Multimedia"
 msgstr "బహ�ళమాధ�యమ�"
 
 #. TRANSLATORS: The group type
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1616
-=======
 #: ../src/gpk-enum.c:1633
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "GNOME desktop"
 msgstr "GNOME డ�స����ాప�"
 
 #. TRANSLATORS: The group type
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1620
-=======
 #: ../src/gpk-enum.c:1637
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "KDE desktop"
 msgstr "KDE డ�స����ాప�"
 
 #. TRANSLATORS: The group type
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1624
-=======
 #: ../src/gpk-enum.c:1641
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "XFCE desktop"
 msgstr "XFCE డ�స����ాప�"
 
 #. TRANSLATORS: The group type
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1628
-=======
 #: ../src/gpk-enum.c:1645
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Other desktops"
 msgstr "�తర డ�స����ాప�ల�"
 
 #. TRANSLATORS: The group type
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1632
-=======
 #: ../src/gpk-enum.c:1649
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Publishing"
 msgstr "ప�ర��రి�����న�న"
 
 #. TRANSLATORS: The group type
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1636
-=======
 #: ../src/gpk-enum.c:1653
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Servers"
 msgstr "స�వి�ల�"
 
 #. TRANSLATORS: The group type
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1640
-=======
 #: ../src/gpk-enum.c:1657
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Fonts"
 msgstr "���షర శ�లిల�"
 
 #. TRANSLATORS: The group type
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1644
-=======
 #: ../src/gpk-enum.c:1661
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Admin tools"
 msgstr "నిర�వహణ సాధనమ�ల�"
 
 #. TRANSLATORS: The group type
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1648
-=======
 #: ../src/gpk-enum.c:1665
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Legacy"
 msgstr "ల��స�"
 
 #. TRANSLATORS: The group type
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1652
-=======
 #: ../src/gpk-enum.c:1669
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Localization"
 msgstr "స�థని���రణ"
 
 #. TRANSLATORS: The group type
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1656
-=======
 #: ../src/gpk-enum.c:1673
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Virtualization"
 msgstr "వర���య�ల���షన�"
 
 #. TRANSLATORS: The group type
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1660
-=======
 #: ../src/gpk-enum.c:1677
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Security"
 msgstr "à°°à°?à±?à°·à°£"
 
 #. TRANSLATORS: The group type
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1664
-=======
 #: ../src/gpk-enum.c:1681
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Power management"
 msgstr "పవర� నిర�వహణ"
 
 #. TRANSLATORS: The group type
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1668
-=======
 #: ../src/gpk-enum.c:1685
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Communication"
 msgstr "స�ప�రది�ప�"
 
 #. TRANSLATORS: The group type
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1672
-=======
 #: ../src/gpk-enum.c:1689
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Network"
 msgstr "న��� వర���"
 
 #. TRANSLATORS: The group type
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1676
-=======
 #: ../src/gpk-enum.c:1693
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Maps"
 msgstr "మాప�ల�"
 
 #. TRANSLATORS: The group type
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1680
-=======
 #: ../src/gpk-enum.c:1697
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Software sources"
 msgstr "సాఫ���వ�ర� మ�లాల�"
 
 #. TRANSLATORS: The group type
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1684
-=======
 #: ../src/gpk-enum.c:1701
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Science"
 msgstr "సా���తి�త"
 
 #. TRANSLATORS: The group type
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1688
-=======
 #: ../src/gpk-enum.c:1705
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Documentation"
 msgstr "పత�రి���రణమ�"
 
 #. TRANSLATORS: The group type
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1692
-=======
 #: ../src/gpk-enum.c:1709
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Electronics"
 msgstr "à°?à°²à°?à±?à°?à±?రానిà°?à±?à°¸à±?â??"
 
 #. TRANSLATORS: The group type
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1696
-=======
 #: ../src/gpk-enum.c:1713
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Package collections"
 msgstr "ప�యా���� ప�ర���ల�"
 
 #. TRANSLATORS: The group type
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1700
-=======
 #: ../src/gpk-enum.c:1717
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Vendor"
 msgstr "�మ�మ��దార�"
 
 #. TRANSLATORS: The group type
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1704
-=======
 #: ../src/gpk-enum.c:1721
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Newest packages"
 msgstr "సరి��త�త ప�యా����ల�"
 
 #. TRANSLATORS: The group type
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-enum.c:1708
-=======
 #: ../src/gpk-enum.c:1725
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Unknown group"
 msgstr "త�లియని సమ�హమ�"
 
@@ -5804,30 +3666,18 @@ msgstr "పరి�రమ�లన� వదిలివ�యి"
 
 #. TODO: tell the user what hardware, NOT JUST A UDI
 #. TRANSLATORS: we can install an extra package so this hardware works, e.g. firmware
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-hardware.c:174
-=======
 #: ../src/gpk-hardware.c:183
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Additional packages can be installed to support this hardware"
 msgstr "� హార�డ�వ�ర��� మద�దతి������� �దనప� ప�యా����ల� స�స�థాపి���లమ�"
 
 #. TRANSLATORS: a new bit of hardware has been plugged in
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-hardware.c:176
-=======
 #: ../src/gpk-hardware.c:185
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "New hardware attached"
 msgstr "��త�త హార�డ�వ�ర� �న�బ�ది��బడి�ది"
 
 #. TRANSLATORS: button text, install the packages needed for the hardware to work
 #. TRANSLATORS: button tooltip
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-hardware.c:182 ../src/gpk-helper-chooser.c:292
-=======
 #: ../src/gpk-hardware.c:191 ../src/gpk-helper-chooser.c:302
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Install package"
 msgstr "ప�యా���� స�స�థాపి���మ�"
 
@@ -5836,11 +3686,7 @@ msgstr "ప�యా���� స�స�థాపి���మ�"
 msgid "Icon"
 msgstr "ప�రతిమ"
 
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-helper-chooser.c:276
-=======
 #: ../src/gpk-helper-chooser.c:286
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Applications that can open this type of file"
 msgstr "� ర�మ�న దస�త�రమ�న� త�ర�వ�ల �న�వర�తనమ�"
 
@@ -5875,121 +3721,60 @@ msgid "Are you <b>sure</b> you want to install this package?"
 msgstr "మ�ర�<b>����ిత��ా</b> � ప�యా����ని స�స�థాపి���దామని �న���న���న�నారా?"
 
 #. TRANSLATORS: dialog body, explains to the user that they need to insert a disk to continue. The first replacement is DVD, CD etc
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-task.c:319
-=======
 #: ../src/gpk-task.c:355
->>>>>>> Updated Telugu Translation:po/te.po
 #, c-format
 msgid "Additional media is required. Please insert the %s labeled '%s' to continue."
 msgstr "à°?దనపà±? మాధà±?యమà°? à°?వసరమà±?. దయà°?à±?సి à°?à±?నసాà°?à°¿à°?à°?à±?à°?à°?à±? %s à°²à±?à°¬à±?à°²à±?â??à°¤à±? à°µà±?à°¨à±?à°¨ '%s' à°ªà±?à°°à°µà±?శపà±?à°?à±?à°?à±?à°®à±?."
 
 #. TRANSLATORS: this is button text
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-task.c:327 ../src/gpk-task.c:419
-=======
 #: ../src/gpk-task.c:363 ../src/gpk-task.c:483
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Continue"
 msgstr "��నసా�ి���మ�"
 
 #. TRANSLATORS: title of a dependency dialog
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-task.c:373 ../src/gpk-task.c:387 ../src/gpk-task.c:394
-#| msgid "Additional software was installed"
-=======
 #: ../src/gpk-task.c:417 ../src/gpk-task.c:431 ../src/gpk-task.c:438
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Additional software will be installed"
 msgstr "�దనప� సాఫ���వ�ర� స�స�థాపి��బడ�త��ది"
 
 #. TRANSLATORS: message text of a dependency dialog
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-task.c:376
-#| msgid "To install %s, an additional package also has to be downloaded."
-#| msgid_plural ""
-#| "To install %s, additional packages also have to be downloaded."
-=======
 #: ../src/gpk-task.c:420
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "To install this package, additional software also has to be installed."
 msgid_plural "To install these packages, additional software also has to be installed."
 msgstr[0] "� ప�యా����న� స�స�థాపి������, �దనప� ప�యా����ల���డా స�స�థాపి��బడాలి."
 msgstr[1] "à°? à°ªà±?యాà°?à±?à°?à±?à°²à±? à°¸à°?à°¸à±?థాపిà°?à°?à±?à°?à°?à±?, à°?దనపà±? సాఫà±?à°?à±?â??à°µà±?à°°à±? à°¸à°?à°¸à±?థాపిà°?à°?బడాలి."
 
 #. TRANSLATORS: title of a dependency dialog
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-task.c:380
-#| msgid "Additional software was installed"
-=======
 #: ../src/gpk-task.c:424
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Additional software will be removed"
 msgstr "�దనప� సాఫ���వ�ర� త�సివ�యబడ�త��ది"
 
 #. TRANSLATORS: message text of a dependency dialog
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-task.c:383
-#| msgid ""
-#| "To perform this update, an additional package also has to be downloaded."
-#| msgid_plural ""
-#| "To perform this update, additional packages also have to be downloaded."
-=======
 #: ../src/gpk-task.c:427
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "To remove this package, additional software also has to be removed."
 msgid_plural "To remove these packages, additional software also has to be removed."
 msgstr[0] "� ప�యా����న� త�సివ�య����, �దనప� సాఫ���వ�ర� ��డా త�సివ�యవలసి వ�����ది."
 msgstr[1] "� ప�యా����లన� త�సివ�య����, �దనప� సాఫ���వ�ర� ��డా త�సివ�యవలసి వ�����ది."
 
 #. TRANSLATORS: message text of a dependency dialog
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-task.c:390
-#| msgid ""
-#| "To perform this update, an additional package also has to be downloaded."
-#| msgid_plural ""
-#| "To perform this update, additional packages also have to be downloaded."
-=======
 #: ../src/gpk-task.c:434
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "To update this package, additional software also has to be installed."
 msgid_plural "To update these packages, additional software also has to be installed."
 msgstr[0] "� ప�యా����న� నవ��రి������, �దనప� సాఫ���వ�ర� ��డా స�స�థాపి��వలసి వ�����ది."
 msgstr[1] "� ప�యా����లన� నవ��రి������, �దనప� సాఫ���వ�ర� ��డా స�స�థాపి��వలసి వ�����ది."
 
 #. TRANSLATORS: message text of a dependency dialog
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-task.c:397
-#| msgid "To install %s, an additional package also has to be downloaded."
-#| msgid_plural ""
-#| "To install %s, additional packages also have to be downloaded."
-=======
 #: ../src/gpk-task.c:441
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "To install this file, additional software also has to be installed."
 msgid_plural "To install these file, additional software also has to be installed."
 msgstr[0] "� దస�త�రమ�న� స�స�థాపి������, �దనప� సాఫ���వ�ర� ��డా స�స�థాపి��వలసి వ�����ది."
 msgstr[1] "� దస�త�రమ�లన� స�స�థాపి������, �దనప� సాఫ���వ�ర� ��డా స�స�థాపి��వలసి వ�����ది."
 
 #. TRANSLATORS: title of a dependency dialog
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-task.c:401
-#| msgid "Additional firmware required"
-=======
 #: ../src/gpk-task.c:445
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Additional software required"
 msgstr "�దనప� సాఫ���వ�ర� �వసరమ�"
 
 #. TRANSLATORS: message text of a dependency dialog
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-task.c:404
-msgid "To process this transaction, additional software is required."
-msgstr "� వ�యవహారమ�న� �ర�ప����, �దనప� సాఫ���వ�ర� �వసరమ�."
-
-#. TRANSLATORS: button label, force the install, even though it's untrusted
-#: ../src/gpk-task.c:467
-=======
 #: ../src/gpk-task.c:448
 msgid "To process this transaction, additional software is required."
 msgstr "� వ�యవహారమ�న� �ర�ప����, �దనప� సాఫ���వ�ర� �వసరమ�."
@@ -6002,16 +3787,11 @@ msgstr "డ�న�ల�డ��� �దనప� ప�యా����
 
 #. TRANSLATORS: button label, force the install, even though it's untrusted
 #: ../src/gpk-task.c:533
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "_Force install"
 msgstr "బలవ�తప� స�స�థాపన (_F)"
 
 #. TRANSLATORS: button tooltip
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-task.c:471
-=======
 #: ../src/gpk-task.c:537
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Force installing package"
 msgstr "ప�యా���� బలవ�తప� స�స�థాపన"
 
@@ -6175,56 +3955,32 @@ msgid "Application"
 msgstr "�న�వర�తనమ�"
 
 #. TRANSLATORS: short name for pkcon
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-log.c:475
-=======
 #: ../src/gpk-log.c:510
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Command line client"
 msgstr "�ద�శ వర�స ���షిదారి"
 
 #. TRANSLATORS: short name for gpk-update-viewer
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-log.c:481
-=======
 #: ../src/gpk-log.c:516
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Update System"
 msgstr "సిస��మ� నవ��రి���మ�"
 
 #. TRANSLATORS: short name for gpk-update-icon
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-log.c:484
-=======
 #: ../src/gpk-log.c:519
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Update Icon"
 msgstr "నవ��రణ ప�రతిమ"
 
 #. TRANSLATORS: preset the GtktextBox with this filter text
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-log.c:653
-=======
 #: ../src/gpk-log.c:689
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Set the filter to this value"
 msgstr "� విల�వ�� వడప�తన� �మర���మ�"
 
 #. TRANSLATORS: we can make this modal (stay on top of) another window
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-log.c:656 ../src/gpk-prefs.c:493 ../src/gpk-repo.c:575
-=======
 #: ../src/gpk-log.c:692 ../src/gpk-prefs.c:467 ../src/gpk-repo.c:614
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Set the parent window to make this modal"
 msgstr "ప�ర���� వి�డ�న� � ర�తిని తయార���య���� �మర���మ�"
 
 #. are we running privileged
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-log.c:680
-=======
 #: ../src/gpk-log.c:716
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Log viewer"
 msgstr "లా�� వ���షణి"
 
@@ -6269,45 +4025,21 @@ msgid "Nothing"
 msgstr "�ద��ాద�"
 
 #. TRANSLATORS: for one reason or another, we could not enable or disable a software source
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-repo.c:246
-=======
 #: ../src/gpk-repo.c:272
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Failed to change status"
 msgstr "స�థితి మార������ విఫలమ��ది"
 
 #. TRANSLATORS: column if the source is enabled
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-repo.c:313
-=======
 #: ../src/gpk-repo.c:344
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Enabled"
 msgstr "��రియాశ�ల��రి��ిన"
 
 #. TRANSLATORS: column for the source description
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-repo.c:322
-=======
 #: ../src/gpk-repo.c:353
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Software Source"
 msgstr "సాఫ���వ�ర� మ�లమ�"
 
 #. TRANSLATORS: for one reason or another, we could not get the list of sources
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-repo.c:380
-#| msgid "Getting the list of updates"
-msgid "Failed to get the list of sources"
-msgstr "మ�లమ�ల �ాబితాన� ప��ద��ల� విఫలమ��ది"
-
-#: ../src/gpk-repo.c:515
-msgid "Getting software source list not supported by backend"
-msgstr "సాఫà±?à°?à±?à°µà±?à°°à±? à°®à±?లపà±? à°?ాబితానà±? à°ªà±?à°?à°¦à±?à°? à°¬à±?యాà°?à±?à°?à°¡à±?â??à°?à±?à°¤ మదà±?దతà±?యదà±?"
-
-#: ../src/gpk-repo.c:590
-=======
 #: ../src/gpk-repo.c:414
 msgid "Failed to get the list of sources"
 msgstr "మ�లమ�ల �ాబితాన� ప��ద��ల� విఫలమ��ది"
@@ -6317,16 +4049,11 @@ msgid "Getting software source list not supported by backend"
 msgstr "సాఫà±?à°?à±?à°µà±?à°°à±? à°®à±?లపà±? à°?ాబితానà±? à°ªà±?à°?à°¦à±?à°? à°¬à±?యాà°?à±?à°?à°¡à±?â??à°?à±?à°¤ మదà±?దతà±?యదà±?"
 
 #: ../src/gpk-repo.c:630
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Software Source Viewer"
 msgstr "సాఫ���వ�ర� మ�లప� వ���షణి"
 
 #. TRANSLATORS: title to pass to to the user if there are not enough privs
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-repo.c:599
-=======
 #: ../src/gpk-repo.c:638
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Software source viewer"
 msgstr "సాఫ���వ�ర� మ�లప� వ���షణి"
 
@@ -6338,25 +4065,10 @@ msgstr "'%s' నామమ�త� వ�న�న � ప�యా����
 
 #. TRANSLATORS: cannot find any valid package names
 #: ../src/gpk-service-pack.c:269
-<<<<<<< HEAD:po/te.po
-#, c-format
-=======
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Could not find any valid package names"
 msgstr "��ల�ల�న��వ��ి ప�యా���� నామమ�లన� �న���న ల��ప�యి�ది"
 
 #. TRANSLATORS: cannot get package array
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-service-pack.c:324
-#, c-format
-#| msgid "Could not get list of installed packages: %s"
-msgid "Could not get array of installed packages: %s"
-msgstr "స�స�థాపి��ిన ప�యా����ల య�ర�న� ప��దల�� ప�యి�ది: %s"
-
-#: ../src/gpk-service-pack.c:343
-#, c-format
-#| msgid "Could not reset client: %s"
-=======
 #: ../src/gpk-service-pack.c:333
 #, c-format
 msgid "Could not get array of installed packages: %s"
@@ -6364,31 +4076,12 @@ msgstr "స�స�థాపి��ిన ప�యా����ల య�
 
 #: ../src/gpk-service-pack.c:352
 #, c-format
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Could not save to file: %s"
 msgstr "దస�త�రమ�న�� దాయల�� ప�యి�ది: %s"
 
 #. TRANSLATORS: we could not create the pack file, generic error
 #. TRANSLATORS: Could not create package array
 #. TRANSLATORS: we could not read the file array for the destination computer
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-service-pack.c:374 ../src/gpk-service-pack.c:506
-#: ../src/gpk-service-pack.c:527 ../src/gpk-service-pack.c:536
-#: ../src/gpk-service-pack.c:576
-msgid "Create error"
-msgstr "స�ష����రణ ద�షమ�"
-
-#: ../src/gpk-service-pack.c:374
-msgid "Cannot create service pack"
-msgstr "à°¸à±?వా à°ªà±?యాà°?à±?â??à°¨à±? à°¸à±?à°·à±?à°?à°¿à°?à°?à°²à±?à°¦à±?"
-
-#: ../src/gpk-service-pack.c:506
-#| msgid "Cannot copy system package list"
-msgid "Cannot copy system package array"
-msgstr "సిస��మ� ప�యా���� య�ర�న� న�ల� త�యల��ప�యి�ది"
-
-#: ../src/gpk-service-pack.c:527
-=======
 #: ../src/gpk-service-pack.c:383 ../src/gpk-service-pack.c:515
 #: ../src/gpk-service-pack.c:536 ../src/gpk-service-pack.c:545
 #: ../src/gpk-service-pack.c:585
@@ -6404,34 +4097,15 @@ msgid "Cannot copy system package array"
 msgstr "సిస��మ� ప�యా���� య�ర�న� న�ల� త�యల��ప�యి�ది"
 
 #: ../src/gpk-service-pack.c:536
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "No package name selected"
 msgstr "య���వ��ి ప�యా���� నామమ� య��పి��ాల�ద�"
 
 #. TRANSLATORS: progressbar text
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-service-pack.c:549
-#| msgid "Refreshing system package list"
-=======
 #: ../src/gpk-service-pack.c:558
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Refreshing system package array"
 msgstr "సిస��మ� ప�యా���� య�ర�న� ర�ఫ�ర�ష� ��స�త�న�నది"
 
 #. TRANSLATORS: we could not reset internal state
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-service-pack.c:556
-msgid "Refresh error"
-msgstr "ర�ఫ�ర�ష� ద�షమ�"
-
-#: ../src/gpk-service-pack.c:556
-#| msgid "Could not refresh package list"
-msgid "Could not refresh package array"
-msgstr "ప�యా���� య�ర�న� ర�ఫ�ర�ష� ��యల�� ప�యి�ది"
-
-#: ../src/gpk-service-pack.c:576
-#| msgid "Cannot read destination package list"
-=======
 #: ../src/gpk-service-pack.c:565
 msgid "Refresh error"
 msgstr "ర�ఫ�ర�ష� ద�షమ�"
@@ -6441,64 +4115,36 @@ msgid "Could not refresh package array"
 msgstr "ప�యా���� య�ర�న� ర�ఫ�ర�ష� ��యల�� ప�యి�ది"
 
 #: ../src/gpk-service-pack.c:585
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Cannot read destination package array"
 msgstr "�మ�యప� ప�యా���� య�ర�న� �ద�వల�ద�"
 
 #. TRANSLATORS: the constants should not be translated
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-service-pack.c:691
-#| msgid "Set the option, allowable values are 'list', 'updates' and 'package'"
-=======
 #: ../src/gpk-service-pack.c:697
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Set the option, allowable values are 'array', 'updates' and 'package'"
 msgstr "����ి�ాన�ని �మర���మ�, '�ాబితా', 'నవ��రణల�' మరియ� 'ప�యా����' యివి �న�మతి��బడ� విల�వల�"
 
 #. TRANSLATORS: this refers to the GtkTextEntry in gpk-service-pack
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-service-pack.c:694
-=======
 #: ../src/gpk-service-pack.c:700
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Add the package name to the text entry box"
 msgstr "����స��� ప�రవ�శప� ప������� ప�యా���� నామమ�న� �త��య�మ�"
 
 #. TRANSLATORS: this is the destination computer package array
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-service-pack.c:697
-#| msgid "Set the remote package list filename"
-=======
 #: ../src/gpk-service-pack.c:703
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Set the remote package array filename"
 msgstr "ద�రస�థ ప�యా���� య�ర� దస�త�రమ�నామమ�న� �మర���మ�"
 
 #. TRANSLATORS: this is the file output directory
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-service-pack.c:700
-=======
 #: ../src/gpk-service-pack.c:706
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Set the default output directory"
 msgstr "à°?à°ªà±?à°°à°®à±?à°¯ à°?à°µà±?à°?à±?â??à°ªà±?à°?à±? à°¡à±?à°°à±?à°?à±?à°?à°°à±?ని à°?మరà±?à°?à±?à°®à±?"
 
 #. TRANSLATORS: file search type, lists of packages
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-service-pack.c:760
-#| msgid "Package list files"
-=======
 #: ../src/gpk-service-pack.c:780
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Package array files"
 msgstr "ప�యా���� య�ర� ఫ�ళ�ళ�"
 
 #. TRANSLATORS: file search type, service pack destination file type
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-service-pack.c:767
-=======
 #: ../src/gpk-service-pack.c:787
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Service pack files"
 msgstr "స�వా పా�� ఫ�ళ�ళ�"
 
@@ -6517,46 +4163,11 @@ msgid "Update applet"
 msgstr "à°?à°ªà±?à°²à±?à°?à±?â??à°¨à±? నవà±?à°?à°°à°¿à°?à°?à±?à°®à±?"
 
 #. TRANSLATORS: the message text for the restart
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-update-viewer.c:210
-=======
 #: ../src/gpk-update-viewer.c:209
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "Some of the updates that were installed require the computer to be restarted "
 "before the changes will be applied."
 msgstr "స�స�థాపి��బడిన వా�ిల� ��న�ని నవ��రణల� �పాది���� ��ర�� మ� ��ప�య��ర� ప�న�ప�రార�భి��వలసి వ�����ది."
-<<<<<<< HEAD:po/te.po
-
-#. TRANSLATORS: the button text for the restart
-#: ../src/gpk-update-viewer.c:212 ../src/gpk-update-viewer.c:218
-msgid "Restart Computer"
-msgstr "à°?à°?à°ªà±?à°¯à±?à°?à°°à±?â??à°¨à±? à°ªà±?à°¨à°?à°ªà±?రారà°?à°­à°¿à°?à°?à±?à°®à±?"
-
-#. TRANSLATORS: the message text for the restart
-#: ../src/gpk-update-viewer.c:216
-msgid ""
-"Some of the updates that were installed require the computer to be restarted "
-"to remain secure."
-msgstr ""
-"స�ర��షితమ��ా వ��డ�� ��ర�� స�స�థాపి��బడిన వా�ిల� ��న�ని నవ��రణల�� మ� ��ప�య��ర� ప�న�ప�రార�భి��వలసి "
-"వ�����ది."
-
-#. TRANSLATORS: the message text for the logout
-#: ../src/gpk-update-viewer.c:222
-msgid ""
-"Some of the updates that were installed require you to log out and back in "
-"before the changes will be applied."
-msgstr "స�స�థాపి��ిన నవ��రణలల� ��న�ని �పాది��బడ���� మ�ర� లా�� �వ��� �య�యి తిరి�ి లా�ిన� �వ�వవలసి వ�����ది"
-
-#. TRANSLATORS: the button text for the logout
-#: ../src/gpk-update-viewer.c:224 ../src/gpk-update-viewer.c:230
-msgid "Log Out"
-msgstr "లా�� �వ���"
-
-#. TRANSLATORS: the message text for the logout
-#: ../src/gpk-update-viewer.c:228
-=======
 
 #. TRANSLATORS: the button text for the restart
 #: ../src/gpk-update-viewer.c:211 ../src/gpk-update-viewer.c:217
@@ -6586,7 +4197,6 @@ msgstr "లా�� �వ���"
 
 #. TRANSLATORS: the message text for the logout
 #: ../src/gpk-update-viewer.c:227
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "Some of the updates that were installed require you to log out and back in "
 "to remain secure."
@@ -6595,99 +4205,53 @@ msgstr ""
 "�వ�వవలసి వ�����ది."
 
 #. TRANSLATORS: we failed to install all the updates we requested
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-update-viewer.c:328
-=======
 #: ../src/gpk-update-viewer.c:341
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Some updates were not installed"
 msgstr "��న�ని నవ��రణల� స�స�థాపి��బడిల�వ�"
 
 #. TRANSLATORS: this is the application name for libcanberra
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-update-viewer.c:405 ../src/gpk-update-viewer.c:439
-=======
 #: ../src/gpk-update-viewer.c:416 ../src/gpk-update-viewer.c:443
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "GNOME PackageKit Update Viewer"
 msgstr "GNOME PackageKit నవ��రణమ� దర�శని"
 
 #. TRANSLATORS: this is the sound description
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-update-viewer.c:407
-=======
 #: ../src/gpk-update-viewer.c:418
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Failed to update"
 msgstr "నవ��రణ�� విఫలమ��ది"
 
 #. TRANSLATORS: completed all updates
 #. TRANSLATORS: title: all updates installed okay
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-update-viewer.c:470 ../src/gpk-update-viewer.c:491
-#| msgid "Updates not installed"
-=======
 #: ../src/gpk-update-viewer.c:473 ../src/gpk-update-viewer.c:494
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Updates installed"
 msgstr "నవ��రణల� స�స�థాపి��బడినవి"
 
 #. TRANSLATORS: title: all updates for the machine installed okay
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-update-viewer.c:480
-#| msgid "All selected updates were successfully installed."
-=======
 #: ../src/gpk-update-viewer.c:483
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "All updates were installed successfully."
 msgstr "�న�ని నవ��రణల� వి�యవ�త��ా స�స�థాపి��బడినవి."
 
 #. TRANSLATORS: title: all the selected updates installed okay
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-update-viewer.c:483
-#| msgid "All selected updates were successfully installed."
-=======
 #: ../src/gpk-update-viewer.c:486
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "The selected updates were installed successfully."
 msgstr "��పి��ాబడిన �న�ని నవ��రణల� వి�యవ�త��ా స�స�థాపి��బడినవి."
 
 #. TRANSLATORS: querying update array
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-update-viewer.c:847
-=======
 #: ../src/gpk-update-viewer.c:852
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Getting the list of updates"
 msgstr "నవ��రణల �ాబితాన� ప��ద���న�నది"
 
 #. TRANSLATORS: we clicked apply, but had no packages selected
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-update-viewer.c:1002
-msgid "No updates selected"
-msgstr "���వ��ి నవ��రణల� య��పి��ాల�ద�"
-
-#: ../src/gpk-update-viewer.c:1003
-=======
 #: ../src/gpk-update-viewer.c:1007
 msgid "No updates selected"
 msgstr "���వ��ి నవ��రణల� య��పి��ాల�ద�"
 
 #: ../src/gpk-update-viewer.c:1008
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "No updates are selected"
 msgstr "���వ��ి నవ��రణల� య��పి��ాల�ద�"
 
 #. show a warning message
 #. TRANSLATORS, are we going to cost the user lots of money?
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-update-viewer.c:1094
-#| msgid ""
-#| "Connectivity is being provided by wireless broadband, and it may be "
-#| "expensive to download %s."
-=======
 #: ../src/gpk-update-viewer.c:1099
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "Connectivity is being provided by wireless broadband, and it may be "
 "expensive to update this package."
@@ -6695,16 +4259,6 @@ msgid_plural ""
 "Connectivity is being provided by wireless broadband, and it may be "
 "expensive to update these packages."
 msgstr[0] ""
-<<<<<<< HEAD:po/te.po
-"à°?à°¨à±?à°¸à°?ధానమà±? à°µà±?à°°à±?â??à°²à±?à°¸à±? à°¬à±?రాడà±?â??à°¬à±?యాà°?à°¡à±? à°¦à±?వారా à°?à°?దిà°?à°?బడà±?à°¤à±?à°?ది, మరియà±? à°? à°ªà±?యాà°?à±?à°?à±?à°¨à±? నవà±?à°?à°°à°¿à°?à°?à±?à°? "
-"వ�యయభరిత� �ావ����న�."
-msgstr[1] ""
-"à°?à°¨à±?à°¸à°?ధానమà±? à°µà±?à°°à±?â??à°²à±?à°¸à±? à°¬à±?రాడà±?â??à°¬à±?యాà°?à°¡à±? à°¦à±?వారా à°?à°?దిà°?à°?బడà±?à°¤à±?à°?ది, మరియà±? à°? à°ªà±?యాà°?à±?à°?à±?లనà±? నవà±?à°?à°°à°¿à°?à°?à±?à°? "
-"వ�యయభరిత� �ావ����న�."
-
-#. TRANSLATORS: this is the button text when we have updates
-#: ../src/gpk-update-viewer.c:1166
-=======
 "à°?à°¨à±?à°¸à°?ధానమà±? à°µà±?à°°à±?â??à°²à±?à°¸à±? à°¬à±?రాడà±?â??à°¬à±?యాà°?à°¡à±? à°¦à±?వారా à°?à°?దిà°?à°?బడà±?à°¤à±?à°?ది, మరియà±? à°? à°ªà±?యాà°?à±?à°?à±?à°¨à±? నవà±?à°?à°°à°¿à°?à°?à±?à°? à°µà±?యయభరితà°? "
 "�ావ����న�."
 msgstr[1] ""
@@ -6713,44 +4267,27 @@ msgstr[1] ""
 
 #. TRANSLATORS: this is the button text when we have updates
 #: ../src/gpk-update-viewer.c:1171
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "_Install Update"
 msgid_plural "_Install Updates"
 msgstr[0] "నవ��రణనన� స�స�థాపి���మ� (_I)"
 msgstr[1] "నవ��రణనన� స�స�థాపి���మ� (_I)"
 
 #. TRANSLATORS: there are no updates
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-update-viewer.c:1179
-=======
 #: ../src/gpk-update-viewer.c:1184
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "There are no updates available"
 msgstr "����డ య���వ��ి నవ��రణల� ��ద�బా��ల�ల�వ�"
 
 #. TRANSLATORS: title: warn the user they are quitting with unapplied changes
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-update-viewer.c:1188
-=======
 #: ../src/gpk-update-viewer.c:1193
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "All software is up to date"
 msgstr "సాఫ��� వ�ర� ��తా నవ�న��ావ��ది"
 
 #. TRANSLATORS: tell the user the problem
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-update-viewer.c:1192
-msgid "There are no software updates available for your computer at this time."
-msgstr "మ� ��ప�య��ర� ��ర�� � సమయ�ల� య���వ��ి నవ��రణల� ��ద�బా��ల� ల�వ�"
-
-#: ../src/gpk-update-viewer.c:1228
-=======
 #: ../src/gpk-update-viewer.c:1197
 msgid "There are no software updates available for your computer at this time."
 msgstr "మ� ��ప�య��ర� ��ర�� � సమయ�ల� య���వ��ి నవ��రణల� ��ద�బా��ల� ల�వ�"
 
 #: ../src/gpk-update-viewer.c:1233
->>>>>>> Updated Telugu Translation:po/te.po
 #, c-format
 msgid "There is %i update available"
 msgid_plural "There are %i updates available"
@@ -6758,11 +4295,7 @@ msgstr[0] "����డ %i నవ��రణ ��ద�బా��ల�
 msgstr[1] "����డ %i నవ��రణ ��ద�బా��ల�వ��ది"
 
 #. TRANSLATORS: how many updates are selected in the UI
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-update-viewer.c:1244
-=======
 #: ../src/gpk-update-viewer.c:1249
->>>>>>> Updated Telugu Translation:po/te.po
 #, c-format
 msgid "%i update selected"
 msgid_plural "%i updates selected"
@@ -6770,11 +4303,7 @@ msgstr[0] "%i నవ��రణ య��పి��ాబడి�ది"
 msgstr[1] "%i నవ��రణ య��పి��ాబడి�ది"
 
 #. TRANSLATORS: how many updates are selected in the UI, and the size of packages to download
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-update-viewer.c:1252
-=======
 #: ../src/gpk-update-viewer.c:1257
->>>>>>> Updated Telugu Translation:po/te.po
 #, c-format
 msgid "%i update selected (%s)"
 msgid_plural "%i updates selected (%s)"
@@ -6782,96 +4311,56 @@ msgstr[0] "%i నవ��రణ య��పి��ాబడి�ది (%s)
 msgstr[1] "%i నవ��రణ య��పి��ాబడి�ది (%s)"
 
 #. TRANSLATORS: a column that has name of the package that will be updated
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-update-viewer.c:1448
-=======
 #: ../src/gpk-update-viewer.c:1451
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Software"
 msgstr "సాఫ���వ�ర�"
 
 #. TRANSLATORS: a column that has state of each package
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-update-viewer.c:1458
-=======
 #: ../src/gpk-update-viewer.c:1461
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Status"
 msgstr "స�థితి"
 
 #. TRANSLATORS: this is the update type, e.g. security
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-update-viewer.c:1604
-=======
 #: ../src/gpk-update-viewer.c:1671
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "This update will fix bugs and other non-critical problems."
 msgstr "à°? నవà±?à°?à°°à°£ à°¬à°?à±?â??లనà±? మరియà±? యితర à°¸à°?à°?à±?లషà±?à°?à°?-à°?ాని సమసà±?యలనà±? పరిషà±?à°?à°°à°¿à°¸à±?à°¤à±?à°?ది."
 
 #. TRANSLATORS: this is the update type, e.g. security
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-update-viewer.c:1608
-=======
 #: ../src/gpk-update-viewer.c:1675
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "This update is important as it may solve critical problems."
 msgstr "� నవ��రణ మ���యమ��ది యిది స���లిష�� సమస�యలన� పరిష��రి��వ����న�."
 
 #. TRANSLATORS: this is the update type, e.g. security
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-update-viewer.c:1612
-=======
 #: ../src/gpk-update-viewer.c:1679
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "This update is needed to fix a security vulnerability with this package."
 msgstr "� ప�యా����త� వ�న�న ర��షణ రాహిత�యతన� పరిష��రి������ � నవ��రణ �వసరమ��ది."
 
 #. TRANSLATORS: this is the update type, e.g. security
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-update-viewer.c:1616
-=======
 #: ../src/gpk-update-viewer.c:1683
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "This update is blocked."
 msgstr "� నవ��రణ �పివ�యబడి�ది."
 
 #. TRANSLATORS: this is when the notification was issued and then updated
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-update-viewer.c:1625
-=======
 #: ../src/gpk-update-viewer.c:1695
->>>>>>> Updated Telugu Translation:po/te.po
 #, c-format
 msgid "This notification was issued on %s and last updated on %s."
 msgstr "� న���స� %sన యివ�వబడి�ది మరియ� ��రి నవ��రణ %sన�ద�."
 
 #. TRANSLATORS: this is when the update was issued
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-update-viewer.c:1634
-=======
 #: ../src/gpk-update-viewer.c:1702
->>>>>>> Updated Telugu Translation:po/te.po
 #, c-format
 msgid "This notification was issued on %s."
 msgstr "� న���స� %sన యివ�వబడి�ది."
 
 #. TRANSLATORS: this is a array of vendor URLs
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-update-viewer.c:1657
-=======
 #: ../src/gpk-update-viewer.c:1724
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "For more information about this update please visit this website:"
 msgid_plural "For more information about this update please visit these websites:"
 msgstr[0] "à°? నవà±?à°?à°°à°£ à°?à±?à°°à°¿à°?à°?à°¿ à°?ధిà°? సమాà°?ారమà±? à°?à±?à°°à°?à±? దయà°?à±?సి à°? à°µà±?à°¬à±?â??à°¸à±?à°?à±?à°¨à±? దరà±?శిà°?à°?à°?à°¡à°¿:"
 msgstr[1] "à°? నవà±?à°?à°°à°£ à°?à±?à°°à°¿à°?à°?à°¿ à°?ధిà°? సమాà°?ారమà±? à°?à±?à°°à°?à±? దయà°?à±?సి à°? à°µà±?à°¬à±?â??à°¸à±?à°?à±?à°¨à±? దరà±?శిà°?à°?à°?à°¡à°¿:"
 
 #. TRANSLATORS: this is a array of bugzilla URLs
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-update-viewer.c:1665
-=======
 #: ../src/gpk-update-viewer.c:1732
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "For more information about bugs fixed by this update please visit this "
 "website:"
@@ -6882,55 +4371,35 @@ msgstr[0] "� నవ��రణ ��త పరిష��రి��బడ
 msgstr[1] "à°? నవà±?à°?à°°à°£ à°?à±?à°¤ పరిషà±?à°?à°°à°¿à°?à°?బడà±? à°¬à°?à±?â??à°² à°?దిà°? సమాà°?ారమà±? à°?à±?à°°à°?à±? à°? à°µà±?à°¬à±?â??à°¸à±?à°?à±? దరà±?శిà°?à°?à°?à°¡à°¿:"
 
 #. TRANSLATORS: this is a array of CVE (security) URLs
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-update-viewer.c:1673
-=======
 #: ../src/gpk-update-viewer.c:1740
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "For more information about this security update please visit this website:"
 msgid_plural "For more information about this security update please visit these websites:"
 msgstr[0] "à°? à°°à°?à±?à°·à°£ నవà±?à°?à°°à°£ విడà±?దల à°?à±?à°°à°¿à°?à°?à°¿ à°?దిà°? సమాà°?ారమà±? à°?à±?à°°à°?à±? à°? à°µà±?à°¬à±?â??à°¸à±?à°?à±?à°¨à±? దరà±?శిà°?à°?à°?à°¡à°¿:"
 msgstr[1] "à°? à°°à°?à±?à°·à°£ నవà±?à°?à°°à°£ విడà±?దల à°?à±?à°°à°¿à°?à°?à°¿ à°?దిà°? సమాà°?ారమà±? à°?à±?à°°à°?à±? à°? à°µà±?à°¬à±?â??à°¸à±?à°?à±?à°¨à±? దరà±?శిà°?à°?à°?à°¡à°¿:"
 
 #. TRANSLATORS: reboot required
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-update-viewer.c:1682
-=======
 #: ../src/gpk-update-viewer.c:1749
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "The computer will have to be restarted after the update for the changes to "
 "take effect."
 msgstr "నవ��రణ తర�వాత మార�ప�ల� ప�రభావిత� �ావ���� ��ప�య��ర� ప�న�ప�రార�భి��వలసి వ����ది."
 
 #. TRANSLATORS: log out required
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-update-viewer.c:1686
-=======
 #: ../src/gpk-update-viewer.c:1753
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "You will need to log out and back in after the update for the changes to "
 "take effect."
 msgstr "� నవ��రణ తర�వాత మార�ప�ల� ప�రభావిత� �ావ���� మ�ర� లా�� �వ��� �య�యి లా�ిన� �వ�వవలసి వ����ది."
 
 #. TRANSLATORS: this is the stability status of the update
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-update-viewer.c:1693
-=======
 #: ../src/gpk-update-viewer.c:1760
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "The classifaction of this update is unstable which means it is not designed "
 "for production use."
 msgstr "� నవ��రణయ���� వర����రణ స�థిరమ��ా ల�ద� ���� �ది వ�త�పాదన �వసరమ� ��ర�� ర�ప��ది��ల�ద�."
 
 #. TRANSLATORS: this is the stability status of the update
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-update-viewer.c:1697
-=======
 #: ../src/gpk-update-viewer.c:1764
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "This is a test update, and is not designed for normal use. Please report any "
 "problems or regressions you encounter."
@@ -6939,67 +4408,39 @@ msgstr ""
 "నివ�ది���డి."
 
 #. TRANSLATORS: this is a ChangeLog
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-update-viewer.c:1706
-=======
 #: ../src/gpk-update-viewer.c:1773
->>>>>>> Updated Telugu Translation:po/te.po
 msgid ""
 "The developer logs will be shown as no description is available for this "
 "update:"
 msgstr "� నవ��రణ��ర�� య���వ��ి విశద��రణ ��ద�బా��ల�ల�ద� �ని �భివ�ద�ది�ారి లా��స� ��యి��బడతాయి:"
 
 #. set loading text
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-update-viewer.c:1729
-=======
 #: ../src/gpk-update-viewer.c:1809
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Loading..."
 msgstr "ల�డ���స�త��ది..."
 
 #. TRANSLATORS: right click menu, select all the updates
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-update-viewer.c:2041
-=======
 #: ../src/gpk-update-viewer.c:2138
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Select all"
 msgstr "�న�ని�ిని య��పి���య�మ�"
 
 #. TRANSLATORS: right click menu, unselect all the updates
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-update-viewer.c:2049
-=======
 #: ../src/gpk-update-viewer.c:2146
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Unselect all"
 msgstr "�న�ని�ి య��పి�న�త�య�మ�"
 
 #. TRANSLATORS: right click menu, select only security updates
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-update-viewer.c:2056
-=======
 #: ../src/gpk-update-viewer.c:2153
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Select security updates"
 msgstr "ర��షణ నవ��రణమ�లన� య��పి���య�మ�"
 
 #. TRANSLATORS: right click option, ignore this update name, not currently used
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-update-viewer.c:2062
-=======
 #: ../src/gpk-update-viewer.c:2159
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Ignore this update"
 msgstr "� నవ��రణన� వదిలివ�య�మ�"
 
 #. TRANSLATORS: this is the header
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-update-viewer.c:2266
-=======
 #: ../src/gpk-update-viewer.c:2377
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Checking for updates..."
 msgstr "నవ��రణల ��ర�� పరిశ�లి�����న�నది..."
 
@@ -7060,95 +4501,51 @@ msgid "Message"
 msgstr "స�ద�శమ�"
 
 #. TRANSLATORS: messages from the transaction
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-watch.c:922
-=======
 #: ../src/gpk-watch.c:930
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "_Show messages"
 msgstr "స�ద�శమ�లన� ��ప�మ� (_S)"
 
 #. TRANSLATORS: log out of the session
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-watch.c:935
-=======
 #: ../src/gpk-watch.c:943
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "_Log out"
 msgstr "లా�వ��� (_L)"
 
 #. TRANSLATORS: this menu item restarts the computer after an update
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-watch.c:950
-=======
 #: ../src/gpk-watch.c:958
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "_Restart computer"
 msgstr "à°?à°?à°ªà±?à°¯à±?à°?à°°à±?â??à°¨à±? à°ªà±?à°¨à°?à°ªà±?రారà°?à°­à°¿à°?à°?à±?à°®à±? (_R)"
 
 #. TRANSLATORS: This hides the 'restart required' icon
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-watch.c:962
-=======
 #: ../src/gpk-watch.c:970
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "_Hide this icon"
 msgstr "� ప�రతిమన� మర���నప�����మ� (_H)"
 
 #. do the bubble
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-watch.c:1319
-=======
 #: ../src/gpk-watch.c:1336
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "New package manager message"
 msgstr "��త�త ప�యా���� నిర�వాహి� స�ద�శమ�"
 
 #. TRANSLATORS: Prefix to the title shown in the libnotify popup
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-watch.c:1372
-=======
 #: ../src/gpk-watch.c:1393
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Package Manager"
 msgstr "ప�యా���� నిర�వాహి�"
 
 #. TRANSLATORS: This is the message in the libnotify body
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-watch.c:1521
-#| msgid "Package '%s' has been removed"
-=======
 #: ../src/gpk-watch.c:1562
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Packages have been removed"
 msgstr "ప�యా����ల� త�ల�ి��బడినవి"
 
 #. TRANSLATORS: This is the message in the libnotify body
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-watch.c:1524
-#| msgid "Package '%s' has been installed"
-=======
 #: ../src/gpk-watch.c:1565
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "Packages have been installed"
 msgstr "ప�యా����ల� స�స�థాపి��బడినవి"
 
 #. TRANSLATORS: This is the message in the libnotify body
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-watch.c:1527
-=======
 #: ../src/gpk-watch.c:1568
->>>>>>> Updated Telugu Translation:po/te.po
 msgid "System has been updated"
 msgstr "సిస��మ� నవ��రి��బడి�ది"
 
 #. TRANSLATORS: title: an action has finished, and we are showing the libnotify bubble
-<<<<<<< HEAD:po/te.po
-#: ../src/gpk-watch.c:1534
-msgid "Task completed"
-msgstr "�ర�తవ�యమ� ప�ర�త�నది"
-
-=======
 #: ../src/gpk-watch.c:1575
 msgid "Task completed"
 msgstr "�ర�తవ�యమ� ప�ర�త�నది"
@@ -7183,4 +4580,3 @@ msgstr "డిబ���ి��� ����ి�మ�ల�"
 msgid "Show debugging options"
 msgstr "డ�బ���ి��� ����ి�మ�లన� ��ప�మ�"
 
->>>>>>> Updated Telugu Translation:po/te.po