Remove non-ASCII from source strings; add en translation

5 files changed, 166 insertions, 10 deletions

diff --git a/Bustle/Noninteractive.hs b/Bustle/Noninteractive.hs
index 948b864..cc64a9f 100644
--- a/Bustle/Noninteractive.hs
+++ b/Bustle/Noninteractive.hs
@@ -45,7 +45,7 @@ process filepath analyze format = do
     ret <- runErrorT $ readLog filepath
     case ret of
         Left (LoadError _ err) -> do
-            warn $ printf (__ "Couldn't parse ‘%s’: %s") filepath err
+            warn $ printf (__ "Couldn't parse '%s': %s") filepath err
             exitFailure
         Right (warnings, log) -> do
             mapM warn warnings
diff --git a/Bustle/UI.hs b/Bustle/UI.hs
index e4da385..75cd5a2 100644
--- a/Bustle/UI.hs
+++ b/Bustle/UI.hs
@@ -207,7 +207,7 @@ loadLogWith getWindow logDetails = do
 
     case ret of
       Left (LoadError f e) -> io $
-          displayError Nothing (printf (__ "Could not read ‘%s’") f) (Just e)
+          displayError Nothing (printf (__ "Could not read '%s'") f) (Just e)
       Right () -> return ()
 
 startRecording :: B ()
@@ -283,14 +283,14 @@ promptToSave wi = io $ do
     case mdetails of
         Just (RecordedLog tempFilePath) -> do
             let tempFileName = takeFileName tempFilePath
-                title = printf (__ "Save log “%s” before closing?") tempFileName
+                title = printf (__ "Save log '%s' before closing?") tempFileName
             prompt <- messageDialogNew (Just (wiWindow wi))
                                        [DialogModal]
                                        MessageWarning
                                        ButtonsNone
                                        title
             messageDialogSetSecondaryText prompt
-                (__ "If you don’t save, this log will be lost forever.")
+                (__ "If you don't save, this log will be lost forever.")
             dialogAddButton prompt (__ "Close _Without Saving") ResponseClose
             dialogAddButton prompt stockCancel ResponseCancel
             dialogAddButton prompt stockSave ResponseYes
@@ -464,7 +464,7 @@ wiSetLogDetails :: WindowInfo
                 -> IO ()
 wiSetLogDetails wi logDetails = do
     writeIORef (wiLogDetails wi) (Just logDetails)
-    windowSetTitle (wiWindow wi) (printf (__ "%s — Bustle") (logWindowTitle logDetails))
+    windowSetTitle (wiWindow wi) (printf (__ "%s - Bustle") (logWindowTitle logDetails))
 
 setPage :: MonadIO io
         => WindowInfo
diff --git a/Makefile b/Makefile
index 198204c..46daa8b 100644
--- a/Makefile
+++ b/Makefile
@@ -85,3 +85,6 @@ maintainer-binary-tarball: all
 	./ldd-me-up.sh $(TARBALL_FULL_DIR)/bin/bustle \
 		| xargs -I XXX cp XXX $(TARBALL_FULL_DIR)/lib
 	cd $(TARBALL_PARENT_DIR) && tar cjf $(TARBALL) $(TARBALL_DIR)
+
+maintainer-update-messages-pot:
+	hgettext -k __ -o po/messages.pot **/*.hs
diff --git a/po/en.po b/po/en.po
new file mode 100644
index 0000000..0fd7db2
--- /dev/null
+++ b/po/en.po
@@ -0,0 +1,153 @@
+# Translation file
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-13 06:05-0800\n"
+"PO-Revision-Date: 2014-01-12 14:19+0000\n"
+"Last-Translator: Will Thompson <will@willthompson.co.uk>\n"
+"Language-Team: English\n"
+"Language: en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: Bustle/Loader.hs:0
+msgid "Parse error %s"
+msgstr "Parse error %s"
+
+#: Bustle/Noninteractive.hs:0
+msgid "Couldn't parse '%s': %s"
+msgstr "Couldn’t parse ‘%s’: %s"
+
+#: Bustle/Noninteractive.hs:0
+msgid "(no interface)"
+msgstr "(no interface)"
+
+#: Bustle/StatisticsPane.hs:0
+msgid "Name"
+msgstr "Name"
+
+#: Bustle/StatisticsPane.hs:0
+msgid "Frequency"
+msgstr "Frequency"
+
+#: Bustle/StatisticsPane.hs:0
+msgid "Method"
+msgstr "Method"
+
+#: Bustle/StatisticsPane.hs:0
+msgid "Total"
+msgstr "Total"
+
+#: Bustle/StatisticsPane.hs:0
+msgid "%.1f ms"
+msgstr "%.1f ms"
+
+#: Bustle/StatisticsPane.hs:0
+msgid "Calls"
+msgstr "Calls"
+
+#: Bustle/StatisticsPane.hs:0
+msgid "Mean"
+msgstr "Mean"
+
+#: Bustle/StatisticsPane.hs:0
+msgid "B"
+msgstr "B"
+
+#: Bustle/StatisticsPane.hs:0
+msgid "KB"
+msgstr "KB"
+
+#: Bustle/StatisticsPane.hs:0
+msgid "MB"
+msgstr "MB"
+
+#: Bustle/StatisticsPane.hs:0
+msgid "Member"
+msgstr "Member"
+
+#: Bustle/StatisticsPane.hs:0
+msgid "Smallest"
+msgstr "Smallest"
+
+#: Bustle/StatisticsPane.hs:0
+msgid "Largest"
+msgstr "Largest"
+
+#: Bustle/UI/AboutDialog.hs:0
+#, fuzzy
+msgid "Bustle"
+msgstr "%s – Bustle"
+
+#: Bustle/UI/AboutDialog.hs:0
+msgid "Someone's favourite D-Bus profiler"
+msgstr ""
+
+#: Bustle/UI/DetailsView.hs:0
+msgid "Path:"
+msgstr ""
+
+#: Bustle/UI/DetailsView.hs:0
+#, fuzzy
+msgid "Member:"
+msgstr "Member"
+
+#: Bustle/UI/DetailsView.hs:0
+msgid "Arguments:"
+msgstr ""
+
+#: Bustle/UI/DetailsView.hs:0
+#, fuzzy
+msgid "Method call"
+msgstr "Method"
+
+#: Bustle/UI/DetailsView.hs:0
+#, fuzzy
+msgid "Method return"
+msgstr "Method"
+
+#: Bustle/UI/DetailsView.hs:0
+msgid "Error"
+msgstr ""
+
+#: Bustle/UI/DetailsView.hs:0
+msgid "Signal"
+msgstr ""
+
+#: Bustle/UI/DetailsView.hs:0
+msgid "Directed signal"
+msgstr ""
+
+#: Bustle/UI/FilterDialog.hs:0
+msgid ""
+"Unticking a service hides its column in the diagram, and all messages it is "
+"involved in. That is, all methods it calls or are called on it, the "
+"corresponding returns, and all signals it emits will be hidden."
+msgstr ""
+
+#: Bustle/UI.hs:0
+msgid "Could not read '%s'"
+msgstr "Could not read ‘%s’"
+
+#: Bustle/UI.hs:0
+msgid "Save log '%s' before closing?"
+msgstr "Save log ‘%s’ before closing?"
+
+#: Bustle/UI.hs:0
+msgid "If you don't save, this log will be lost forever."
+msgstr "If you don’t save, this log will be lost forever."
+
+#: Bustle/UI.hs:0
+msgid "Close _Without Saving"
+msgstr "Close _Without Saving"
+
+#: Bustle/UI.hs:0
+msgid "%s - Bustle"
+msgstr "%s – Bustle"
+
+#: Bustle/Util.hs:0
+msgid "Warning: "
+msgstr "Warning: "
diff --git a/po/messages.pot b/po/messages.pot
index be86a43..792804a 100644
--- a/po/messages.pot
+++ b/po/messages.pot
@@ -18,7 +18,7 @@ msgid "Parse error %s"
 msgstr ""
 
 #: Bustle/Noninteractive.hs:0
-msgid "Couldn't parse \8216%s\8217: %s"
+msgid "Couldn't parse '%s': %s"
 msgstr ""
 
 #: Bustle/Noninteractive.hs:0
@@ -122,15 +122,15 @@ msgid "Unticking a service hides its column in the diagram, and all messages it
 msgstr ""
 
 #: Bustle/UI.hs:0
-msgid "Could not read \8216%s\8217"
+msgid "Could not read '%s'"
 msgstr ""
 
 #: Bustle/UI.hs:0
-msgid "Save log \8220%s\8221 before closing?"
+msgid "Save log '%s' before closing?"
 msgstr ""
 
 #: Bustle/UI.hs:0
-msgid "If you don\8217t save, this log will be lost forever."
+msgid "If you don't save, this log will be lost forever."
 msgstr ""
 
 #: Bustle/UI.hs:0
@@ -138,7 +138,7 @@ msgid "Close _Without Saving"
 msgstr ""
 
 #: Bustle/UI.hs:0
-msgid "%s \8212 Bustle"
+msgid "%s - Bustle"
 msgstr ""
 
 #: Bustle/Util.hs:0