GNOME.org
 

[latexila/latexila-next] Use intltool native support for GSettings

commit 6b56572b6e4dde49501c6468b3e8d235bb7a08db
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Fri Mar 28 22:37:50 2014 +0100

    Use intltool native support for GSettings

 configure.ac                                       |    4 +-
 data/Makefile.am                                   |    2 +-
 ...xml.in.in => org.gnome.latexila.gschema.xml.in} |  116 ++++++++++----------
 po/POTFILES.in                                     |    2 +-
 po/POTFILES.skip                                   |    1 -
 5 files changed, 62 insertions(+), 63 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 3c7df44..6dde085 100644
--- a/configure.ac
+++ b/configure.ac
@@ -119,7 +119,7 @@ CFLAGS="$CFLAGS `pkg-config --cflags ${dependencies}`"
 LIBS="$LIBS `pkg-config --libs ${dependencies}`"
 
 # Native Language Support
-IT_PROG_INTLTOOL([0.40.0])
+IT_PROG_INTLTOOL([0.50.1])
 AM_GNU_GETTEXT_VERSION([0.17])
 AM_GNU_GETTEXT([external])
 
@@ -154,7 +154,7 @@ AC_CONFIG_FILES([Makefile
                 data/icons/scalable/Makefile
                 data/images/Makefile
                 data/images/app/Makefile
-                data/org.gnome.latexila.gschema.xml.in
+                data/org.gnome.latexila.gschema.xml
                 data/templates/Makefile
                 help/Makefile
                 man/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 4314eea..3e78d85 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -18,7 +18,7 @@ gsettings_SCHEMAS = org.gnome.latexila.gschema.xml
 
 EXTRA_DIST =                                   \
        latexila.desktop.in                     \
-       org.gnome.latexila.gschema.xml.in.in    \
+       org.gnome.latexila.gschema.xml.in       \
        $(appdata_in_files)
 
 CLEANFILES =                           \
diff --git a/data/org.gnome.latexila.gschema.xml.in.in b/data/org.gnome.latexila.gschema.xml.in
similarity index 51%
rename from data/org.gnome.latexila.gschema.xml.in.in
rename to data/org.gnome.latexila.gschema.xml.in
index c2ca408..8a9cd63 100644
--- a/data/org.gnome.latexila.gschema.xml.in.in
+++ b/data/org.gnome.latexila.gschema.xml.in
@@ -14,166 +14,166 @@
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.latexila.preferences.editor" 
path="/org/gnome/latexila/preferences/editor/">
     <key name="use-default-font" type="b">
       <default>true</default>
-      <_summary>Use Default Font</_summary>
-      <_description>Whether to use the system's default fixed width font for editing text instead of a font 
specific to LaTeXila. If this option is turned off, then the font named in the "Editor Font" option will be 
used instead of the system font.</_description>
+      <summary>Use Default Font</summary>
+      <description>Whether to use the system's default fixed width font for editing text instead of a font 
specific to LaTeXila. If this option is turned off, then the font named in the "Editor Font" option will be 
used instead of the system font.</description>
     </key>
     <key name="editor-font" type="s">
       <default>'Monospace 10'</default>
-      <_summary>Editor Font</_summary>
-      <_description>A custom font that will be used for the editing area. This will only take effect if the 
"Use Default Font" option is turned off.</_description>
+      <summary>Editor Font</summary>
+      <description>A custom font that will be used for the editing area. This will only take effect if the 
"Use Default Font" option is turned off.</description>
     </key>
     <key name="scheme" type="s">
       <default>'tango'</default>
-      <_summary>Style Scheme</_summary>
-      <_description>The ID of a GtkSourceView Style Scheme used to color the text.</_description>
+      <summary>Style Scheme</summary>
+      <description>The ID of a GtkSourceView Style Scheme used to color the text.</description>
     </key>
     <key name="create-backup-copy" type="b">
       <default>true</default>
-      <_summary>Create Backup Copies</_summary>
-      <_description>Whether LaTeXila should create backup copies for the files it saves.</_description>
+      <summary>Create Backup Copies</summary>
+      <description>Whether LaTeXila should create backup copies for the files it saves.</description>
     </key>
     <key name="auto-save" type="b">
       <default>false</default>
-      <_summary>Autosave</_summary>
-      <_description>Whether LaTeXila should automatically save modified files after a time interval. You can 
set the time interval with the "Autosave Interval" option.</_description>
+      <summary>Autosave</summary>
+      <description>Whether LaTeXila should automatically save modified files after a time interval. You can 
set the time interval with the "Autosave Interval" option.</description>
     </key>
     <key name="auto-save-interval" type="u">
       <range min="1" max="100" />
       <default>10</default>
-      <_summary>Autosave Interval</_summary>
-      <_description>Number of minutes after which LaTeXila will automatically save modified files. This will 
only take effect if the "Autosave" option is turned on.</_description>
+      <summary>Autosave Interval</summary>
+      <description>Number of minutes after which LaTeXila will automatically save modified files. This will 
only take effect if the "Autosave" option is turned on.</description>
     </key>
     <key name="reopen-files" type="b">
       <default>true</default>
-      <_summary>Reopen files on startup</_summary>
-      <_description>Whether LaTeXila should reopen the files that was opened the last time.</_description>
+      <summary>Reopen files on startup</summary>
+      <description>Whether LaTeXila should reopen the files that was opened the last time.</description>
     </key>
     <key name="tabs-size" type="u">
       <range min="1" max="24" />
       <default>2</default>
-      <_summary>Tab Size</_summary>
-      <_description>Specifies the number of spaces that should be displayed instead of Tab 
characters.</_description>
+      <summary>Tab Size</summary>
+      <description>Specifies the number of spaces that should be displayed instead of Tab 
characters.</description>
     </key>
     <key name="insert-spaces" type="b">
       <default>true</default>
-      <_summary>Insert spaces</_summary>
-      <_description>Whether LaTeXila should insert spaces instead of tabs.</_description>
+      <summary>Insert spaces</summary>
+      <description>Whether LaTeXila should insert spaces instead of tabs.</description>
     </key>
     <key name="forget-no-tabs" type="b">
       <default>true</default>
-      <_summary>Forget lack of tabulations</_summary>
-      <_description>Forget you are not using tabulations.</_description>
+      <summary>Forget lack of tabulations</summary>
+      <description>Forget you are not using tabulations.</description>
     </key>
     <key name="display-line-numbers" type="b">
       <default>false</default>
-      <_summary>Display Line Numbers</_summary>
-      <_description>Whether LaTeXila should display line numbers in the editing area.</_description>
+      <summary>Display Line Numbers</summary>
+      <description>Whether LaTeXila should display line numbers in the editing area.</description>
     </key>
     <key name="highlight-current-line" type="b">
       <default>true</default>
-      <_summary>Highlight Current Line</_summary>
-      <_description>Whether LaTeXila should highlight the current line.</_description>
+      <summary>Highlight Current Line</summary>
+      <description>Whether LaTeXila should highlight the current line.</description>
     </key>
     <key name="bracket-matching" type="b">
       <default>true</default>
-      <_summary>Highlight Matching Brackets</_summary>
-      <_description>Whether LaTeXila should highlight matching brackets.</_description>
+      <summary>Highlight Matching Brackets</summary>
+      <description>Whether LaTeXila should highlight matching brackets.</description>
     </key>
     <key name="spell-checking" type="b">
       <default>false</default>
-      <_summary>Spell checking</_summary>
+      <summary>Spell checking</summary>
     </key>
   </schema>
 
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.latexila.preferences.ui" 
path="/org/gnome/latexila/preferences/ui/">
     <key name="main-toolbar-visible" type="b">
       <default>true</default>
-      <_summary>Main toolbar is visible</_summary>
-      <_description>Whether the main toolbar (file open, close, build, ...) should be visible.</_description>
+      <summary>Main toolbar is visible</summary>
+      <description>Whether the main toolbar (file open, close, build, ...) should be visible.</description>
     </key>
     <key name="edit-toolbar-visible" type="b">
       <default>true</default>
-      <_summary>Edit toolbar is visible</_summary>
-      <_description>Whether the edit toolbar (bold, italic, character sizes, ...) should be 
visible.</_description>
+      <summary>Edit toolbar is visible</summary>
+      <description>Whether the edit toolbar (bold, italic, character sizes, ...) should be 
visible.</description>
     </key>
     <key name="side-panel-visible" type="b">
       <default>true</default>
-      <_summary>Side panel is Visible</_summary>
-      <_description>Whether the side panel at the left of editing windows should be visible.</_description>
+      <summary>Side panel is Visible</summary>
+      <description>Whether the side panel at the left of editing windows should be visible.</description>
     </key>
     <key name="bottom-panel-visible" type="b">
       <default>true</default>
-      <_summary>Bottom panel is Visible</_summary>
-      <_description>Whether the bottom panel containing the build view should be visible.</_description>
+      <summary>Bottom panel is Visible</summary>
+      <description>Whether the bottom panel containing the build view should be visible.</description>
     </key>
     <key name="side-panel-component" type="i">
       <default>0</default>
-      <_summary>Side panel component</_summary>
-      <_description>Side panel's active component. 0: Symbols. 1: File browser. 2: Structure.</_description>
+      <summary>Side panel component</summary>
+      <description>Side panel's active component. 0: Symbols. 1: File browser. 2: Structure.</description>
     </key>
     <key name="show-build-warnings" type="b">
       <default>true</default>
-      <_summary>Show build output warnings</_summary>
+      <summary>Show build output warnings</summary>
     </key>
     <key name="show-build-badboxes" type="b">
       <default>true</default>
-      <_summary>Show build output badboxes</_summary>
+      <summary>Show build output badboxes</summary>
     </key>
   </schema>
 
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.latexila.preferences.latex" 
path="/org/gnome/latexila/preferences/latex/">
     <key name="interactive-completion" type="b">
       <default>true</default>
-      <_summary>Interactive completion</_summary>
-      <_description>Automatically show LaTeX commands proposals</_description>
+      <summary>Interactive completion</summary>
+      <description>Automatically show LaTeX commands proposals</description>
     </key>
     <key name="interactive-completion-num" type="u">
       <range min="0" max="8" />
       <default>2</default>
-      <_summary>Minimum number of characters for interactive completion</_summary>
-      <_description>Minimum number of characters after "\" for the interactive completion of LaTeX 
commands</_description>
+      <summary>Minimum number of characters for interactive completion</summary>
+      <description>Minimum number of characters after "\" for the interactive completion of LaTeX 
commands</description>
     </key>
     <key name="no-confirm-clean" type="b">
       <default>false</default>
-      <_summary>No confirmation when cleaning-up</_summary>
+      <summary>No confirmation when cleaning-up</summary>
     </key>
     <key name="automatic-clean" type="b">
       <default>false</default>
-      <_summary>Automatic clean-up</_summary>
-      <_description>Automatically clean-up files after close. no-confirm-clean must be true.</_description>
+      <summary>Automatic clean-up</summary>
+      <description>Automatically clean-up files after close. no-confirm-clean must be true.</description>
     </key>
     <key name="clean-extensions" type="s">
       <default>'.aux .blg .bbl .fdb_latexmk .fls .idx .ilg .ind .log .nav .out .snm .synctex.gz 
.toc'</default>
-      <_summary>File extensions for the clean-up</_summary>
-      <_description>The list of file extensions for the clean-up, separated by spaces</_description>
+      <summary>File extensions for the clean-up</summary>
+      <description>The list of file extensions for the clean-up, separated by spaces</description>
     </key>
     <key name="enabled-default-build-tools" type="ai">
       <default>[]</default>
-      <_summary>Enabled default build tools</_summary>
-      <_description>The list of the default build tools that are enabled</_description>
+      <summary>Enabled default build tools</summary>
+      <description>The list of the default build tools that are enabled</description>
     </key>
     <key name="disabled-default-build-tools" type="ai">
       <default>[]</default>
-      <_summary>Disabled default build tools</_summary>
-      <_description>The list of the default build tools that are disabled</_description>
+      <summary>Disabled default build tools</summary>
+      <description>The list of the default build tools that are disabled</description>
     </key>
   </schema>
 
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.latexila.preferences.file-browser" 
path="/org/gnome/latexila/preferences/file-browser/">
     <key name="current-directory" type="s">
       <default>''</default>
-      <_summary>Current directory</_summary>
-      <_description>URI of the file browser current directory</_description>
+      <summary>Current directory</summary>
+      <description>URI of the file browser current directory</description>
     </key>
     <key name="show-build-files" type="b">
       <default>false</default>
-      <_summary>Show build files</_summary>
-      <_description>Show files with an extension present in 
preferences.latex.clean-extensions.</_description>
+      <summary>Show build files</summary>
+      <description>Show files with an extension present in preferences.latex.clean-extensions.</description>
     </key>
     <key name="show-hidden-files" type="b">
       <default>false</default>
-      <_summary>Show hidden files</_summary>
-      <_description>Show files beginning with a dot.</_description>
+      <summary>Show hidden files</summary>
+      <description>Show files beginning with a dot.</description>
     </key>
   </schema>
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c3b60f3..a9b5988 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,7 +4,7 @@
 data/build_tools/build_tools.pot
 data/latexila.appdata.xml.in
 data/latexila.desktop.in.in
-data/org.gnome.latexila.gschema.xml.in.in
+[type: gettext/gsettings]data/org.gnome.latexila.gschema.xml.in
 data/templates/templates.pot
 src/app_settings.vala
 src/bottom_panel.vala
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 4ba7850..3cd61da 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,5 +1,4 @@
 data/latexila.desktop.in
-data/org.gnome.latexila.gschema.xml.in
 src/bottom_panel.c
 src/build_tool_dialog.c
 src/build_tool_runner.c
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]