Drop build dependency on intltool

Closes #13

.gitignore

@@ -11,4 +11,4 @@ data/patterns/*.hearing-impaired
 data/patterns/*.line-break
 dist
 locale
-winsetup.log
+po/LINGUAS

.travis.yml

@@ -6,7 +6,7 @@ python:
   - 3.6
 before_install:
   - sudo apt-get update -qq
-  - sudo apt-get install -y enchant gettext intltool
+  - sudo apt-get install -y enchant gettext
   - pip install chardet pyenchant
 script:
   - py.test aeidon

INSTALL.md

@@ -5,7 +5,7 @@ To install, run command
 
     python3 setup.py install [--prefix=...]
 
-You'll need Python, gettext and intltool.
+In addition to Python, you'll need gettext.
 
 Developers or packagers interested in installing Python packages aeidon
 and gaupol separately, see the file [`README.aeidon.md`](README.aeidon.md).

TODO.md

@@ -1,8 +1,10 @@
-Gaupol 1.2.1/1.3
-================
+Gaupol 1.3
+==========
 
 * [x] Fix unhandled exception when adding recent menu items
 * [x] Fix video player actions being sensitive when playback
       initialization fails (#52)
 * [x] Install appdata XML file under /usr/share/metainfo
+* [x] Drop build dependency on intltool (use gettext instead, #13)
 * [x] Add donate button to about dialog
+* [ ] Update translations

data/extensions/custom-framerates/custom-framerates.extension.in

@@ -1,8 +1,8 @@
 [Extension]
 GaupolVersion=1.2
 Module=custom-framerates
-_Name=Custom Framerates
-_Description=Allow use of non-standard framerates
+Name=Custom Framerates
+Description=Allow use of non-standard framerates
 Version=1.2
 Authors=Osmo Salomaa <[email protected]>;
 Copyright=Copyright © 2011 Osmo Salomaa;

data/extensions/custom-framerates/test/test_custom-framerates.py

@@ -20,6 +20,7 @@
 
 sys.path.insert(0, os.path.abspath(os.path.join(
     os.path.dirname(__file__), "..")))
+
 sys.path.insert(1, os.path.abspath(os.path.join(
     os.path.dirname(__file__), "..", "..", "..", "..")))
 

data/gaupol.appdata.xml.in

@@ -6,16 +6,16 @@
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0+</project_license>
   <description>
-    <_p>Gaupol is an editor for text-based subtitle files. It supports
+    <p>Gaupol is an editor for text-based subtitle files. It supports
     multiple subtitle file formats and provides means of creating
     subtitles, editing texts and timing subtitles to match video. The
     user interface is designed with attention to batch processing of
-    multiple documents and convenience of translating.</_p>
+    multiple documents and convenience of translating.</p>
   </description>
   <screenshots>
     <screenshot type="default">
       <image>https://otsaloma.io/gaupol/screenshot-appdata.png</image>
-      <_caption>Main window</_caption>
+      <caption>Main window</caption>
     </screenshot>
   </screenshots>
   <url type="homepage">https://otsaloma.io/gaupol/</url>

data/gaupol.desktop.in

@@ -1,14 +1,14 @@
 [Desktop Entry]
 Name=Gaupol
-_GenericName=Subtitle Editor
-_Comment=Edit subtitle files
+GenericName=Subtitle Editor
+Comment=Edit subtitle files
 # TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
-_Keywords=video;subtitles;captions;
+Keywords=video;subtitles;captions;
 Exec=gaupol %F
 Terminal=false
 StartupNotify=true
 Icon=gaupol
 Type=Application
 MimeType=text/x-microdvd;text/x-ssa;application/x-subrip;text/x-subviewer;text/vtt;
 Categories=GTK;AudioVideo;Video;
-_X-GNOME-FullName=Gaupol Subtitle Editor
+X-GNOME-FullName=Gaupol Subtitle Editor

data/patterns/Latn-en-US.common-error.in

@@ -1,8 +1,8 @@
 # -*- conf -*-
 
 [Common Error Pattern]
-_Name=Period after title
-_Description=Add period after a shortened title, such as "Mr" and "Dr"
+Name=Period after title
+Description=Add period after a shortened title, such as "Mr" and "Dr"
 Classes=Human;
 Pattern=\b(Dr|Jr|Mr|Mrs|Ms|Sr|St)\b(?!\.)
 Flags=DOTALL;MULTILINE;

data/patterns/Latn-en.capitalization.in

@@ -1,8 +1,8 @@
 # -*- conf -*-
 
 [Capitalization Pattern]
-_Name=First person pronoun
-_Description=Capitalize the first person pronoun "I"
+Name=First person pronoun
+Description=Capitalize the first person pronoun "I"
 Capitalize=Start
 Pattern=\bi\b
 Flags=DOTALL;MULTILINE;

data/patterns/Latn-en.common-error.in

@@ -1,53 +1,53 @@
 # -*- conf -*-
 
 [Common Error Pattern]
-_Name=Letter "I" in a lower case word
-_Description=Replace letter "I" with letter "l" in a lower case word
+Name=Letter "I" in a lower case word
+Description=Replace letter "I" with letter "l" in a lower case word
 Classes=OCR;
 Pattern=(?<=[a-z])I
 Flags=DOTALL;MULTILINE;
 Replacement=l
 Repeat=True
 
 [Common Error Pattern]
-_Name=Letter "I" in a lower case word
-_Description=Replace letter "I" with letter "l" in a lower case word
+Name=Letter "I" in a lower case word
+Description=Replace letter "I" with letter "l" in a lower case word
 Classes=OCR;
 Pattern=(?<=\b[A-Z])I(?=[a-z])
 Flags=DOTALL;MULTILINE;
 Replacement=l
 Repeat=True
 
 [Common Error Pattern]
-_Name=Letter "I" in a lower case word
-_Description=Replace letter "I" with letter "l" in a lower case word
+Name=Letter "I" in a lower case word
+Description=Replace letter "I" with letter "l" in a lower case word
 Classes=OCR;
 Pattern='[Il][Il]\b
 Flags=DOTALL;MULTILINE;
 Replacement='ll
 Repeat=False
 
 [Common Error Pattern]
-_Name=Letter "l" in an upper case word
-_Description=Replace letter "l" with letter "I" in an upper case word
+Name=Letter "l" in an upper case word
+Description=Replace letter "l" with letter "I" in an upper case word
 Classes=OCR;
 Pattern=(?<=[A-Z][A-Z])l
 Flags=DOTALL;MULTILINE;
 Replacement=I
 Repeat=True
 
 [Common Error Pattern]
-_Name=Letter "l" in an upper case word
-_Description=Replace letter "l" with letter "I" in an upper case word
+Name=Letter "l" in an upper case word
+Description=Replace letter "l" with letter "I" in an upper case word
 Classes=OCR;
 Pattern=l(?=[A-Z])
 Flags=DOTALL;MULTILINE;
 Replacement=I
 Repeat=True
 
 [Common Error Pattern]
-_Name=Letter "l" in an upper case word
-_Description=Replace letter "l" with letter "I" in an upper case word
+Name=Letter "l" in an upper case word
+Description=Replace letter "l" with letter "I" in an upper case word
 Classes=OCR;
 # Handle the case of the first person pronoun "I".
 # Disallow dashes for the case of spelling out a word, but allow them
@@ -58,8 +58,8 @@ Replacement=I
 Repeat=True
 
 [Common Error Pattern]
-_Name=Letter "l" in an upper case word
-_Description=Replace letter "l" with letter "I" in an upper case word
+Name=Letter "l" in an upper case word
+Description=Replace letter "l" with letter "I" in an upper case word
 Classes=OCR;
 # Replace with "I" if "l" is the the first letter of a word
 # and is followed by a consonant.
@@ -69,53 +69,53 @@ Replacement=\1I\3
 Repeat=False
 
 [Common Error Pattern]
-_Name=Zero in an upper case word
-_Description=Replace zero with letter "O" in an upper case word
+Name=Zero in an upper case word
+Description=Replace zero with letter "O" in an upper case word
 Classes=OCR;
 Pattern=(?<=[A-Z])0(?!\d)
 Flags=DOTALL;MULTILINE;
 Replacement=O
 Repeat=True
 
 [Common Error Pattern]
-_Name=Zero in an upper case word
-_Description=Replace zero with letter "O" in an upper case word
+Name=Zero in an upper case word
+Description=Replace zero with letter "O" in an upper case word
 Classes=OCR;
 Pattern=(?<!\d)0(?=[A-Z])
 Flags=DOTALL;MULTILINE;
 Replacement=O
 Repeat=True
 
 [Common Error Pattern]
-_Name=Space between number and unit
-_Description=Add or remove space between a number and the associated unit
+Name=Space between number and unit
+Description=Add or remove space between a number and the associated unit
 Classes=Human;OCR;
 Pattern=(\d+) (st|nd|rd|th)\b
 Flags=DOTALL;MULTILINE;
 Replacement=\1\2
 Repeat=False
 
 [Common Error Pattern]
-_Name=Spaces around an apostrophe
-_Description=Remove spaces around an apostrophe
+Name=Spaces around an apostrophe
+Description=Remove spaces around an apostrophe
 Classes=OCR;
 Pattern=(\w)(' +| +')(d|ll|m|re|s|t|ve)\b
 Flags=DOTALL;MULTILINE;
 Replacement=\1'\3
 Repeat=False
 
 [Common Error Pattern]
-_Name=Okay
-_Description=Spell two-letter forms of "okay" in all upper case
+Name=Okay
+Description=Spell two-letter forms of "okay" in all upper case
 Classes=Human;
 Pattern=\b[Oo]k\b
 Flags=DOTALL;MULTILINE;
 Replacement=OK
 Repeat=False
 
 [Common Error Pattern]
-_Name=Okay
-_Description=Spell two-letter forms of "okay" in all upper case
+Name=Okay
+Description=Spell two-letter forms of "okay" in all upper case
 Classes=Human;
 Pattern=\b[Oo]\.k\.
 Flags=DOTALL;MULTILINE;

data/patterns/Latn-en.hearing-impaired.in

@@ -1,8 +1,8 @@
 # -*- conf -*-
 
 [Hearing Impaired Pattern]
-_Name=Uppercase speaker before a colon
-_Description=Replace the uppercase name of the speaker before a colon with a dialogue dash
+Name=Uppercase speaker before a colon
+Description=Replace the uppercase name of the speaker before a colon with a dialogue dash
 # Allow lower case "c" for McNAMES.
 Pattern=^[\-\–\—]?\s*?[A-Z\[][A-Zc\d#&'.\-\[\] ]+?:\s
 Flags=MULTILINE;

data/patterns/Latn-en.line-break.in

@@ -1,33 +1,33 @@
 # -*- conf -*-
 
 [Line Break Pattern]
-_Name=Title
-_Description=Do not break after a title, e.g. " Dr."
+Name=Title
+Description=Do not break after a title, e.g. " Dr."
 Pattern=\b(Dr|Jr|Mr|Mrs|Ms|Sr|St)\.?( )
 Flags=DOTALL;MULTILINE;
 Group=2
 Penalty=1000000
 
 [Line Break Pattern]
-_Name=Article
-_Description=Do not break after an article
+Name=Article
+Description=Do not break after an article
 Pattern=\b(a|an|the)( )
 Flags=DOTALL;MULTILINE;
 Group=2
 Penalty=1000000
 
 [Line Break Pattern]
-_Name=Preposition
-_Description=Do not break after a preposition
+Name=Preposition
+Description=Do not break after a preposition
 # http://en.wikipedia.org/wiki/List_of_English_prepositions
 Pattern=\b(abaft|aboard|about|above|absent|across|afore|after|against|along|alongside|amid|amidst|among|amongst|apropos|around|as|aside|astride|at|athwart|atop|barring|before|behind|below|beneath|beside|besides|between|betwixt|beyond|but|by|circa|concerning|despite|down|during|except|excluding|failing|following|for|from|given|in|including|inside|into|lest|like|mid|midst|minus|modulo|near|next|notwithstanding|of|off|on|onto|opposite|out|outside|over|pace|past|per|plus|pro|qua|regarding|round|sans|save|since|than|though|throughout|till|times|to|toward|towards|under|underneath|unlike|until|unto|up|upon|versus|via|vice|with|within|without|worth)( )
 Flags=DOTALL;MULTILINE;
 Group=2
 Penalty=100
 
 [Line Break Pattern]
-_Name=Possessive determiner
-_Description=Do not break after a possessive determiner, e.g. "my"
+Name=Possessive determiner
+Description=Do not break after a possessive determiner, e.g. "my"
 # http://en.wikipedia.org/wiki/Possessive_determiner
 Pattern=\b(my|your|his|her|its|our|your|their)( )
 Flags=DOTALL;MULTILINE;

data/patterns/Latn-fi.common-error.in

@@ -1,8 +1,8 @@
 # -*- conf -*-
 
 [Common Error Pattern]
-_Name=Space after punctuation marks
-_Description=Add space after various punctuation marks
+Name=Space after punctuation marks
+Description=Add space after various punctuation marks
 Classes=Human;OCR;
 # Same as the Latin pattern, except no space after colon
 # to accommodate Finnish suffixes, e.g. "TV:ssä".

data/patterns/Latn-fr.common-error.in

@@ -1,44 +1,44 @@
 # -*- conf -*-
 
 [Common Error Pattern]
-_Name=Spaces around guillemets
-_Description=Add spaces around guillemets
+Name=Spaces around guillemets
+Description=Add spaces around guillemets
 Classes=Human;OCR;
 Pattern=(\S)(«)
 Flags=DOTALL;MULTILINE;
 Replacement=\1 \2
 Repeat=False
 
 [Common Error Pattern]
-_Name=Spaces around guillemets
-_Description=Add spaces around guillemets
+Name=Spaces around guillemets
+Description=Add spaces around guillemets
 Classes=Human;OCR;
 Pattern=(»)(\w)
 Flags=DOTALL;MULTILINE;
 Replacement=\1 \2
 Repeat=False
 
 [Common Error Pattern]
-_Name=Spaces around guillemets
-_Description=Add spaces around guillemets
+Name=Spaces around guillemets
+Description=Add spaces around guillemets
 Classes=Human;OCR;
 Pattern=(«)(\S)
 Flags=DOTALL;MULTILINE;
 Replacement=\1 \2
 Repeat=False
 
 [Common Error Pattern]
-_Name=Spaces around guillemets
-_Description=Add spaces around guillemets
+Name=Spaces around guillemets
+Description=Add spaces around guillemets
 Classes=Human;OCR;
 Pattern=(\S)(»)
 Flags=DOTALL;MULTILINE;
 Replacement=\1 \2
 Repeat=False
 
 [Common Error Pattern]
-_Name=Space before punctuation marks
-_Description=Add or remove space before various punctuation marks
+Name=Space before punctuation marks
+Description=Add or remove space before various punctuation marks
 Classes=Human;OCR;
 # Same as the Latin pattern, except keep space before [?!;:].
 Pattern= +(['‘’"“”«»]?(?!\.\.)([,.])(?!\d))
@@ -48,8 +48,8 @@ Repeat=False
 Policy=Replace
 
 [Common Error Pattern]
-_Name=Space before punctuation marks
-_Description=Add or remove space before various punctuation marks
+Name=Space before punctuation marks
+Description=Add or remove space before various punctuation marks
 Classes=Human;OCR;
 Pattern=([^\s?!;:])([?!;:])(?!\d)
 Flags=DOTALL;MULTILINE;