summaryrefslogtreecommitdiff
path: root/po/km.po
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2014-04-10 10:37:03 +0200
committerMichael Vogt <mvo@debian.org>2014-04-10 10:37:03 +0200
commitb3f695d42baa95139e8172e97b0f4ab38550b7b5 (patch)
tree0aa1bc53b760b1c33acf662ea8614e128ccb34d0 /po/km.po
parenta1a253e8be978998b66af62240a25864db2cc694 (diff)
parent128aa7d3630f138f37ef83e3e8564feca01ec429 (diff)
Merge remote-tracking branch 'origin/debian/sid' into ubuntu/master1.0.1ubuntu1
Conflicts: debian/changelog
Diffstat (limited to 'po/km.po')
-rw-r--r--po/km.po38
1 files changed, 19 insertions, 19 deletions
diff --git a/po/km.po b/po/km.po
index 98f874066..dcd1541d6 100644
--- a/po/km.po
+++ b/po/km.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_km\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-04-01 15:51+0200\n"
+"POT-Creation-Date: 2014-04-10 10:18+0200\n"
"PO-Revision-Date: 2006-10-10 09:48+0700\n"
"Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
"Language-Team: Khmer <support@khmeros.info>\n"
@@ -823,9 +823,9 @@ msgstr "អស់ពេល​ក្នុងការតភ្ជាប់​"
msgid "Server closed the connection"
msgstr "ម៉ាស៊ីន​បម្រើ​បាន​បិទ​ការតភ្ជាប់​"
-#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1468
-#: apt-pkg/contrib/fileutl.cc:1477 apt-pkg/contrib/fileutl.cc:1482
-#: apt-pkg/contrib/fileutl.cc:1484
+#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1475
+#: apt-pkg/contrib/fileutl.cc:1484 apt-pkg/contrib/fileutl.cc:1489
+#: apt-pkg/contrib/fileutl.cc:1491
msgid "Read error"
msgstr "ការអាន​មានកំហុស"
@@ -838,9 +838,9 @@ msgid "Protocol corruption"
msgstr "ការបង្ខូច​ពិធីការ​"
#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:875
-#: apt-pkg/contrib/fileutl.cc:1590 apt-pkg/contrib/fileutl.cc:1599
-#: apt-pkg/contrib/fileutl.cc:1604 apt-pkg/contrib/fileutl.cc:1606
-#: apt-pkg/contrib/fileutl.cc:1631
+#: apt-pkg/contrib/fileutl.cc:1597 apt-pkg/contrib/fileutl.cc:1606
+#: apt-pkg/contrib/fileutl.cc:1611 apt-pkg/contrib/fileutl.cc:1613
+#: apt-pkg/contrib/fileutl.cc:1638
msgid "Write error"
msgstr "ការសរសេរ​មានកំហុស"
@@ -1095,7 +1095,7 @@ msgstr "ការតភ្ជាប់​បាន​បរាជ័យ​"
msgid "Internal error"
msgstr "កំហុស​ខាង​ក្នុង​"
-#: apt-private/private-list.cc:132
+#: apt-private/private-list.cc:131
msgid "Listing"
msgstr ""
@@ -2547,54 +2547,54 @@ msgstr "ដំណើរការ​រង​ %s បានចេញ ដោយ​
msgid "Problem closing the gzip file %s"
msgstr "មាន​បញ្ហា​ក្នុងការ​បិទ​ឯកសារ"
-#: apt-pkg/contrib/fileutl.cc:1097
+#: apt-pkg/contrib/fileutl.cc:1104
#, c-format
msgid "Could not open file %s"
msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ"
-#: apt-pkg/contrib/fileutl.cc:1156 apt-pkg/contrib/fileutl.cc:1203
+#: apt-pkg/contrib/fileutl.cc:1163 apt-pkg/contrib/fileutl.cc:1210
#, fuzzy, c-format
msgid "Could not open file descriptor %d"
msgstr "មិន​អាច​បើក​បំពុង​សម្រាប់​ %s បានឡើយ"
-#: apt-pkg/contrib/fileutl.cc:1310
+#: apt-pkg/contrib/fileutl.cc:1317
msgid "Failed to create subprocess IPC"
msgstr "បរាជ័យ​ក្នុង​ការ​បង្កើត​ដំណើរការ​រង​ IPC"
-#: apt-pkg/contrib/fileutl.cc:1365
+#: apt-pkg/contrib/fileutl.cc:1372
msgid "Failed to exec compressor "
msgstr "បរាជ័យ​ក្នុង​ការ​ប្រតិបត្តិ​កម្មវិធី​បង្ហាប់ "
-#: apt-pkg/contrib/fileutl.cc:1506
+#: apt-pkg/contrib/fileutl.cc:1513
#, fuzzy, c-format
msgid "read, still have %llu to read but none left"
msgstr "អាន​, នៅតែ​មាន %lu ដើម្បី​អាន​ ប៉ុន្តែ​គ្មាន​អ្វី​នៅសល់"
-#: apt-pkg/contrib/fileutl.cc:1619 apt-pkg/contrib/fileutl.cc:1641
+#: apt-pkg/contrib/fileutl.cc:1626 apt-pkg/contrib/fileutl.cc:1648
#, fuzzy, c-format
msgid "write, still have %llu to write but couldn't"
msgstr "សរសេរ​, នៅតែមាន​ %lu ដើម្បី​សរសេរ​ ប៉ុន្តែ​មិន​អាច​"
-#: apt-pkg/contrib/fileutl.cc:1911
+#: apt-pkg/contrib/fileutl.cc:1918
#, fuzzy, c-format
msgid "Problem closing the file %s"
msgstr "មាន​បញ្ហា​ក្នុងការ​បិទ​ឯកសារ"
-#: apt-pkg/contrib/fileutl.cc:1923
+#: apt-pkg/contrib/fileutl.cc:1930
#, fuzzy, c-format
msgid "Problem renaming the file %s to %s"
msgstr "មានបញ្ហា​ក្នុង​ការធ្វើ​សមកាលកម្មឯកសារ​"
-#: apt-pkg/contrib/fileutl.cc:1934
+#: apt-pkg/contrib/fileutl.cc:1941
#, fuzzy, c-format
msgid "Problem unlinking the file %s"
msgstr "មានបញ្ហា​ក្នុងការ​ផ្ដាច់តំណ​ឯកសារ"
-#: apt-pkg/contrib/fileutl.cc:1947
+#: apt-pkg/contrib/fileutl.cc:1954
msgid "Problem syncing the file"
msgstr "មានបញ្ហា​ក្នុង​ការធ្វើ​សមកាលកម្មឯកសារ​"
-#: apt-pkg/contrib/fileutl.cc:2043 apt-pkg/acquire-item.cc:148
+#: apt-pkg/contrib/fileutl.cc:2050 apt-pkg/acquire-item.cc:148
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "ប្តូរ​ឈ្មោះ​បានបរាជ័យ​, %s (%s -> %s) ។"