GNOME.org
 

[gedit] Do not merge xml translation in gschema files

commit ce5293209c9e4ffa9fafc9aec3dba63580ecb1b2
Author: Paolo Borelli <pborelli gnome org>
Date:   Sat Apr 4 10:08:05 2015 +0200

    Do not merge xml translation in gschema files

 configure.ac                                       |   10 ++--
 ...gnome.gedit.plugins.checkupdate.gschema.xml.in} |    4 +-
 ...ome.gedit.plugins.externaltools.gschema.xml.in} |   12 ++--
 ....gnome.gedit.plugins.filebrowser.gschema.xml.in |   58 ++++++++++++++++++++
 ...ome.gedit.plugins.filebrowser.gschema.xml.in.in |   58 --------------------
 ...ome.gedit.plugins.pythonconsole.gschema.xml.in} |   20 ++++----
 ...=> org.gnome.gedit.plugins.time.gschema.xml.in} |   12 ++--
 po/POTFILES.in                                     |   10 ++--
 po/POTFILES.skip                                   |    5 --
 9 files changed, 92 insertions(+), 97 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index e335404..ecfd152 100644
--- a/configure.ac
+++ b/configure.ac
@@ -464,11 +464,11 @@ docs/Makefile
 docs/reference/Makefile
 help/Makefile
 libgd/Makefile
-plugins/checkupdate/org.gnome.gedit.plugins.checkupdate.gschema.xml.in
-plugins/externaltools/org.gnome.gedit.plugins.externaltools.gschema.xml.in
-plugins/filebrowser/org.gnome.gedit.plugins.filebrowser.gschema.xml.in
-plugins/pythonconsole/org.gnome.gedit.plugins.pythonconsole.gschema.xml.in
-plugins/time/org.gnome.gedit.plugins.time.gschema.xml.in
+plugins/checkupdate/org.gnome.gedit.plugins.checkupdate.gschema.xml
+plugins/externaltools/org.gnome.gedit.plugins.externaltools.gschema.xml
+plugins/filebrowser/org.gnome.gedit.plugins.filebrowser.gschema.xml
+plugins/pythonconsole/org.gnome.gedit.plugins.pythonconsole.gschema.xml
+plugins/time/org.gnome.gedit.plugins.time.gschema.xml
 po/Makefile.in
 osx/bundle/data/Info.plist])
 
diff --git a/plugins/checkupdate/org.gnome.gedit.plugins.checkupdate.gschema.xml.in.in 
b/plugins/checkupdate/org.gnome.gedit.plugins.checkupdate.gschema.xml.in
similarity index 70%
rename from plugins/checkupdate/org.gnome.gedit.plugins.checkupdate.gschema.xml.in.in
rename to plugins/checkupdate/org.gnome.gedit.plugins.checkupdate.gschema.xml.in
index c7d75e1..594a01b 100644
--- a/plugins/checkupdate/org.gnome.gedit.plugins.checkupdate.gschema.xml.in.in
+++ b/plugins/checkupdate/org.gnome.gedit.plugins.checkupdate.gschema.xml.in
@@ -2,9 +2,9 @@
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.gedit.plugins.checkupdate" 
path="/org/gnome/gedit/plugins/checkupdate/">
     <key name="ignore-version" type="s">
       <default>''</default>
-      <_summary>Version to Ignore</_summary>
+      <summary>Version to Ignore</summary>
       <!-- This is releated to the next gedit version to be released -->
-      <_description>Version to ignore until a newer version is released.</_description>
+      <description>Version to ignore until a newer version is released.</description>
     </key>
   </schema>
 </schemalist>
diff --git a/plugins/externaltools/org.gnome.gedit.plugins.externaltools.gschema.xml.in.in 
b/plugins/externaltools/org.gnome.gedit.plugins.externaltools.gschema.xml.in
similarity index 76%
rename from plugins/externaltools/org.gnome.gedit.plugins.externaltools.gschema.xml.in.in
rename to plugins/externaltools/org.gnome.gedit.plugins.externaltools.gschema.xml.in
index 2033b2b..bd4075e 100644
--- a/plugins/externaltools/org.gnome.gedit.plugins.externaltools.gschema.xml.in.in
+++ b/plugins/externaltools/org.gnome.gedit.plugins.externaltools.gschema.xml.in
@@ -2,19 +2,19 @@
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.gedit.plugins.externaltools" 
path="/org/gnome/gedit/plugins/externaltools/">
     <key name="use-system-font" type="b">
       <default>true</default>
-      <_summary>Whether to use the system font</_summary>
-      <_description>
+      <summary>Whether to use the system font</summary>
+      <description>
         If true, the external tools will use the desktop-global standard
         font if it's monospace (and the most similar font it can
         come up with otherwise).
-      </_description>
+      </description>
     </key>
     <key name="font" type="s">
       <default>'Monospace 10'</default>
-      <_summary>Font</_summary>
-      <_description>
+      <summary>Font</summary>
+      <description>
         A Pango font name. Examples are "Sans 12" or "Monospace Bold 14".
-      </_description>
+      </description>
     </key>
   </schema>
 </schemalist>
diff --git a/plugins/filebrowser/org.gnome.gedit.plugins.filebrowser.gschema.xml.in 
b/plugins/filebrowser/org.gnome.gedit.plugins.filebrowser.gschema.xml.in
new file mode 100644
index 0000000..5c31e8e
--- /dev/null
+++ b/plugins/filebrowser/org.gnome.gedit.plugins.filebrowser.gschema.xml.in
@@ -0,0 +1,58 @@
+<schemalist>
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.gedit.plugins.filebrowser" 
path="/org/gnome/gedit/plugins/filebrowser/">
+    <key name="tree-view" type="b">
+      <default>true</default>
+      <summary>Open With Tree View</summary>
+      <description>Open the tree view when the file browser plugin gets loaded instead of the bookmarks 
view</description>
+    </key>
+    <key name="root" type="s">
+      <default>''</default>
+      <summary>File Browser Root Directory</summary>
+      <description>The file browser root directory to use when loading the file browser plugin and 
onload/tree_view is TRUE.</description>
+    </key>
+    <key name="virtual-root" type="s">
+      <default>''</default>
+      <summary>File Browser Virtual Root Directory</summary>
+      <description>The file browser virtual root directory to use when loading the file browser plugin when 
onload/tree_view is TRUE. The virtual root must always be below the actual root.</description>
+    </key>
+    <key name="enable-remote" type="b">
+      <default>false</default>
+      <summary>Enable Restore of Remote Locations</summary>
+      <description>Sets whether to enable restoring of remote locations.</description>
+    </key>
+    <key name="open-at-first-doc" type="b">
+      <default>true</default>
+      <summary>Set Location to First Document</summary>
+      <description>If TRUE the file browser plugin will view the directory of the first opened document 
given that the file browser hasn't been used yet. (Thus this generally applies to opening a document from the 
command line or opening it with Nautilus, etc.)</description>
+    </key>
+    <key name="filter-mode" flags="org.gnome.gedit.plugins.filebrowser.GeditFileBrowserStoreFilterMode">
+      <default>['hide-hidden', 'hide-binary']</default>
+      <summary>File Browser Filter Mode</summary>
+      <description>This value determines what files get filtered from the file browser. Valid values are: 
none (filter nothing), hide-hidden (filter hidden files) and hide-binary (filter binary files).</description>
+    </key>
+    <key name="filter-pattern" type="s">
+      <default>''</default>
+      <summary>File Browser Filter Pattern</summary>
+      <description>The filter pattern to filter the file browser with. This filter works on top of the 
filter_mode.</description>
+    </key>
+    <key name="binary-patterns" type="as">
+      <default>['*.la', '*.lo']</default>
+      <summary>File Browser Binary Patterns</summary>
+      <description>The supplemental patterns to use when filtering binary files.</description>
+    </key>
+  </schema>
+
+  <enum id="org.gnome.gedit.plugins.filebrowser.nautilus.ClickPolicy">
+    <value value="0" nick="single"/>
+    <value value="1" nick="double"/>
+  </enum>
+
+  <schema id="org.gnome.gedit.plugins.filebrowser.nautilus" 
path="/org/gnome/gedit/plugins/filebrowser/nautilus/">
+    <key name="click-policy" enum="org.gnome.gedit.plugins.filebrowser.nautilus.ClickPolicy">
+      <default>'double'</default>
+    </key>
+    <key name="confirm-trash" type="b">
+      <default>true</default>
+    </key>
+  </schema>
+</schemalist>
diff --git a/plugins/pythonconsole/org.gnome.gedit.plugins.pythonconsole.gschema.xml.in.in 
b/plugins/pythonconsole/org.gnome.gedit.plugins.pythonconsole.gschema.xml.in
similarity index 66%
rename from plugins/pythonconsole/org.gnome.gedit.plugins.pythonconsole.gschema.xml.in.in
rename to plugins/pythonconsole/org.gnome.gedit.plugins.pythonconsole.gschema.xml.in
index 90a534e..31d3f87 100644
--- a/plugins/pythonconsole/org.gnome.gedit.plugins.pythonconsole.gschema.xml.in.in
+++ b/plugins/pythonconsole/org.gnome.gedit.plugins.pythonconsole.gschema.xml.in
@@ -2,29 +2,29 @@
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.gedit.plugins.pythonconsole" 
path="/org/gnome/gedit/plugins/pythonconsole/">
     <key name="command-color" type="s">
       <default>'#314e6c'</default>
-      <_summary>Command Color Text</_summary>
-      <_description>The command color text</_description>
+      <summary>Command Color Text</summary>
+      <description>The command color text</description>
     </key>
     <key name="error-color" type="s">
       <default>'#990000'</default>
-      <_summary>Error Color Text</_summary>
-      <_description>The error color text</_description>
+      <summary>Error Color Text</summary>
+      <description>The error color text</description>
     </key>
     <key name="use-system-font" type="b">
       <default>true</default>
-      <_summary>Whether to use the system font</_summary>
-      <_description>
+      <summary>Whether to use the system font</summary>
+      <description>
         If true, the terminal will use the desktop-global standard
         font if it's monospace (and the most similar font it can
         come up with otherwise).
-      </_description>
+      </description>
     </key>
     <key name="font" type="s">
       <default>'Monospace 10'</default>
-      <_summary>Font</_summary>
-      <_description>
+      <summary>Font</summary>
+      <description>
         A Pango font name. Examples are "Sans 12" or "Monospace Bold 14".
-      </_description>
+      </description>
     </key>
   </schema>
 </schemalist>
diff --git a/plugins/time/org.gnome.gedit.plugins.time.gschema.xml.in.in 
b/plugins/time/org.gnome.gedit.plugins.time.gschema.xml.in
similarity index 53%
rename from plugins/time/org.gnome.gedit.plugins.time.gschema.xml.in.in
rename to plugins/time/org.gnome.gedit.plugins.time.gschema.xml.in
index 34a5329..b825b47 100644
--- a/plugins/time/org.gnome.gedit.plugins.time.gschema.xml.in.in
+++ b/plugins/time/org.gnome.gedit.plugins.time.gschema.xml.in
@@ -2,18 +2,18 @@
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.gedit.plugins.time" 
path="/org/gnome/gedit/plugins/time/">
     <key name="prompt-type" enum="org.gnome.gedit.plugins.time.GeditTimePluginPromptType">
       <default>'prompt-selected-format'</default>
-      <_summary>Prompt Type</_summary>
-      <_description>If the user should be prompted for a format or if the selected or custom format should 
be used.</_description>
+      <summary>Prompt Type</summary>
+      <description>If the user should be prompted for a format or if the selected or custom format should be 
used.</description>
     </key>
     <key name="selected-format" type="s">
       <default>'%c'</default>
-      <_summary>Selected Format</_summary>
-      <_description>The selected format used when inserting the date/time.</_description>
+      <summary>Selected Format</summary>
+      <description>The selected format used when inserting the date/time.</description>
     </key>
     <key name="custom-format" type="s">
       <default>'%d/%m/%Y %H:%M:%S'</default>
-      <_summary>Custom Format</_summary>
-      <_description>The custom format used when inserting the date/time.</_description>
+      <summary>Custom Format</summary>
+      <description>The custom format used when inserting the date/time.</description>
     </key>
   </schema>
 </schemalist>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3b0d41c..822f2fb 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -54,7 +54,7 @@ gedit/gedit-window.c
 [type: gettext/glade]gedit/resources/ui/gedit-window.ui
 plugins/checkupdate/checkupdate.plugin.desktop.in
 plugins/checkupdate/gedit-check-update-plugin.c
-plugins/checkupdate/org.gnome.gedit.plugins.checkupdate.gschema.xml.in.in
+[type: gettext/gsettings]plugins/checkupdate/org.gnome.gedit.plugins.checkupdate.gschema.xml.in
 plugins/docinfo/docinfo.plugin.desktop.in
 plugins/docinfo/gedit-docinfo-plugin.c
 [type: gettext/glade]plugins/docinfo/resources/ui/gedit-docinfo-plugin.ui
@@ -65,7 +65,7 @@ plugins/externaltools/data/remove-trailing-spaces.desktop.in
 plugins/externaltools/data/run-command.desktop.in
 plugins/externaltools/data/send-to-fpaste.desktop.in
 plugins/externaltools/externaltools.plugin.desktop.in
-plugins/externaltools/org.gnome.gedit.plugins.externaltools.gschema.xml.in.in
+[type: gettext/gsettings]plugins/externaltools/org.gnome.gedit.plugins.externaltools.gschema.xml.in
 plugins/externaltools/tools/appactivatable.py
 plugins/externaltools/tools/capture.py
 plugins/externaltools/tools/functions.py
@@ -82,11 +82,11 @@ plugins/filebrowser/gedit-file-browser-store.c
 plugins/filebrowser/gedit-file-browser-utils.c
 plugins/filebrowser/gedit-file-browser-view.c
 plugins/filebrowser/gedit-file-browser-widget.c
-plugins/filebrowser/org.gnome.gedit.plugins.filebrowser.gschema.xml.in.in
+[type: gettext/gsettings]plugins/filebrowser/org.gnome.gedit.plugins.filebrowser.gschema.xml.in
 [type: gettext/glade]plugins/filebrowser/resources/ui/gedit-file-browser-menus.ui
 [type: gettext/glade]plugins/filebrowser/resources/ui/gedit-file-browser-widget.ui
 plugins/modelines/modelines.plugin.desktop.in
-plugins/pythonconsole/org.gnome.gedit.plugins.pythonconsole.gschema.xml.in.in
+[type: gettext/gsettings]plugins/pythonconsole/org.gnome.gedit.plugins.pythonconsole.gschema.xml.in
 [type: gettext/glade]plugins/pythonconsole/pythonconsole/config.ui
 plugins/pythonconsole/pythonconsole/__init__.py
 plugins/pythonconsole/pythonconsole.plugin.desktop.in
@@ -116,7 +116,7 @@ plugins/spell/gedit-spell-plugin.c
 [type: gettext/glade]plugins/spell/resources/ui/spell-checker.ui
 plugins/spell/spell.plugin.desktop.in
 plugins/time/gedit-time-plugin.c
-plugins/time/org.gnome.gedit.plugins.time.gschema.xml.in.in
+[type: gettext/gsettings]plugins/time/org.gnome.gedit.plugins.time.gschema.xml.in
 [type: gettext/glade]plugins/time/resources/ui/gedit-time-dialog.ui
 [type: gettext/glade]plugins/time/resources/ui/gedit-time-setup-dialog.ui
 plugins/time/time.plugin.desktop.in
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 8ede6fb..f4c26df 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -6,11 +6,6 @@ gedit/gedit-document-output-stream.c
 gedit/resources/gtk/menus.ui
 gedit/smclient/eggdesktopfile.c
 gedit/smclient/eggsmclient.c
-plugins/checkupdate/org.gnome.gedit.plugins.checkupdate.gschema.xml.in
-plugins/externaltools/org.gnome.gedit.plugins.externaltools.gschema.xml.in
-plugins/filebrowser/org.gnome.gedit.plugins.filebrowser.gschema.xml.in
-plugins/pythonconsole/org.gnome.gedit.plugins.pythonconsole.gschema.xml.in
-plugins/time/org.gnome.gedit.plugins.time.gschema.xml.in
 tools/generate-plugin.py
 tools/plugin_template/gedit-plugin.desktop.in
 tools/plugin_template/gedit-plugin-helper.py
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]