summaryrefslogtreecommitdiff
path: root/po/hu.po
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2009-09-02 21:39:36 -0400
committerMatthias Clasen <mclasen@redhat.com>2009-09-02 21:39:36 -0400
commiteeac911e74476015f28373c66f0849c2de214189 (patch)
treeb6541edad12d4a388a1e69cd885f57ae2b882d89 /po/hu.po
parent64d164d1c3536850a4b2509def880181295b01b1 (diff)
downloadgdk-pixbuf-eeac911e74476015f28373c66f0849c2de214189.tar.gz
Fix a merge conflict
Diffstat (limited to 'po/hu.po')
-rw-r--r--po/hu.po1
1 files changed, 0 insertions, 1 deletions
diff --git a/po/hu.po b/po/hu.po
index 28edaa538..48723de67 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -5168,7 +5168,6 @@ msgstr "a nyomtató nem érhető el"
#. SUN_BRANDING
#: ../modules/printbackends/papi/gtkprintbackendpapi.c:829
->>>>>>> 2.17.10
msgid "ready to print"
msgstr "nyomtatásra kész"