Commit ce529320 authored by Paolo Borelli's avatar Paolo Borelli

Do not merge xml translation in gschema files

parent 6eb5e33e
...@@ -464,11 +464,11 @@ docs/Makefile ...@@ -464,11 +464,11 @@ docs/Makefile
docs/reference/Makefile docs/reference/Makefile
help/Makefile help/Makefile
libgd/Makefile libgd/Makefile
plugins/checkupdate/org.gnome.gedit.plugins.checkupdate.gschema.xml.in plugins/checkupdate/org.gnome.gedit.plugins.checkupdate.gschema.xml
plugins/externaltools/org.gnome.gedit.plugins.externaltools.gschema.xml.in plugins/externaltools/org.gnome.gedit.plugins.externaltools.gschema.xml
plugins/filebrowser/org.gnome.gedit.plugins.filebrowser.gschema.xml.in plugins/filebrowser/org.gnome.gedit.plugins.filebrowser.gschema.xml
plugins/pythonconsole/org.gnome.gedit.plugins.pythonconsole.gschema.xml.in plugins/pythonconsole/org.gnome.gedit.plugins.pythonconsole.gschema.xml
plugins/time/org.gnome.gedit.plugins.time.gschema.xml.in plugins/time/org.gnome.gedit.plugins.time.gschema.xml
po/Makefile.in po/Makefile.in
osx/bundle/data/Info.plist]) osx/bundle/data/Info.plist])
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
<schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.gedit.plugins.checkupdate" path="/org/gnome/gedit/plugins/checkupdate/"> <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.gedit.plugins.checkupdate" path="/org/gnome/gedit/plugins/checkupdate/">
<key name="ignore-version" type="s"> <key name="ignore-version" type="s">
<default>''</default> <default>''</default>
<_summary>Version to Ignore</_summary> <summary>Version to Ignore</summary>
<!-- This is releated to the next gedit version to be released --> <!-- 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> </key>
</schema> </schema>
</schemalist> </schemalist>
...@@ -2,19 +2,19 @@ ...@@ -2,19 +2,19 @@
<schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.gedit.plugins.externaltools" path="/org/gnome/gedit/plugins/externaltools/"> <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.gedit.plugins.externaltools" path="/org/gnome/gedit/plugins/externaltools/">
<key name="use-system-font" type="b"> <key name="use-system-font" type="b">
<default>true</default> <default>true</default>
<_summary>Whether to use the system font</_summary> <summary>Whether to use the system font</summary>
<_description> <description>
If true, the external tools will use the desktop-global standard If true, the external tools will use the desktop-global standard
font if it's monospace (and the most similar font it can font if it's monospace (and the most similar font it can
come up with otherwise). come up with otherwise).
</_description> </description>
</key> </key>
<key name="font" type="s"> <key name="font" type="s">
<default>'Monospace 10'</default> <default>'Monospace 10'</default>
<_summary>Font</_summary> <summary>Font</summary>
<_description> <description>
A Pango font name. Examples are "Sans 12" or "Monospace Bold 14". A Pango font name. Examples are "Sans 12" or "Monospace Bold 14".
</_description> </description>
</key> </key>
</schema> </schema>
</schemalist> </schemalist>
...@@ -2,43 +2,43 @@ ...@@ -2,43 +2,43 @@
<schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.gedit.plugins.filebrowser" path="/org/gnome/gedit/plugins/filebrowser/"> <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.gedit.plugins.filebrowser" path="/org/gnome/gedit/plugins/filebrowser/">
<key name="tree-view" type="b"> <key name="tree-view" type="b">
<default>true</default> <default>true</default>
<_summary>Open With Tree View</_summary> <summary>Open With Tree View</summary>
<_description>Open the tree view when the file browser plugin gets loaded instead of the bookmarks view</_description> <description>Open the tree view when the file browser plugin gets loaded instead of the bookmarks view</description>
</key> </key>
<key name="root" type="s"> <key name="root" type="s">
<default>''</default> <default>''</default>
<_summary>File Browser Root Directory</_summary> <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> <description>The file browser root directory to use when loading the file browser plugin and onload/tree_view is TRUE.</description>
</key> </key>
<key name="virtual-root" type="s"> <key name="virtual-root" type="s">
<default>''</default> <default>''</default>
<_summary>File Browser Virtual Root Directory</_summary> <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> <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>
<key name="enable-remote" type="b"> <key name="enable-remote" type="b">
<default>false</default> <default>false</default>
<_summary>Enable Restore of Remote Locations</_summary> <summary>Enable Restore of Remote Locations</summary>
<_description>Sets whether to enable restoring of remote locations.</_description> <description>Sets whether to enable restoring of remote locations.</description>
</key> </key>
<key name="open-at-first-doc" type="b"> <key name="open-at-first-doc" type="b">
<default>true</default> <default>true</default>
<_summary>Set Location to First Document</_summary> <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> <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>
<key name="filter-mode" flags="org.gnome.gedit.plugins.filebrowser.GeditFileBrowserStoreFilterMode"> <key name="filter-mode" flags="org.gnome.gedit.plugins.filebrowser.GeditFileBrowserStoreFilterMode">
<default>['hide-hidden', 'hide-binary']</default> <default>['hide-hidden', 'hide-binary']</default>
<_summary>File Browser Filter Mode</_summary> <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> <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>
<key name="filter-pattern" type="s"> <key name="filter-pattern" type="s">
<default>''</default> <default>''</default>
<_summary>File Browser Filter Pattern</_summary> <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> <description>The filter pattern to filter the file browser with. This filter works on top of the filter_mode.</description>
</key> </key>
<key name="binary-patterns" type="as"> <key name="binary-patterns" type="as">
<default>['*.la', '*.lo']</default> <default>['*.la', '*.lo']</default>
<_summary>File Browser Binary Patterns</_summary> <summary>File Browser Binary Patterns</summary>
<_description>The supplemental patterns to use when filtering binary files.</_description> <description>The supplemental patterns to use when filtering binary files.</description>
</key> </key>
</schema> </schema>
......
...@@ -2,29 +2,29 @@ ...@@ -2,29 +2,29 @@
<schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.gedit.plugins.pythonconsole" path="/org/gnome/gedit/plugins/pythonconsole/"> <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.gedit.plugins.pythonconsole" path="/org/gnome/gedit/plugins/pythonconsole/">
<key name="command-color" type="s"> <key name="command-color" type="s">
<default>'#314e6c'</default> <default>'#314e6c'</default>
<_summary>Command Color Text</_summary> <summary>Command Color Text</summary>
<_description>The command color text</_description> <description>The command color text</description>
</key> </key>
<key name="error-color" type="s"> <key name="error-color" type="s">
<default>'#990000'</default> <default>'#990000'</default>
<_summary>Error Color Text</_summary> <summary>Error Color Text</summary>
<_description>The error color text</_description> <description>The error color text</description>
</key> </key>
<key name="use-system-font" type="b"> <key name="use-system-font" type="b">
<default>true</default> <default>true</default>
<_summary>Whether to use the system font</_summary> <summary>Whether to use the system font</summary>
<_description> <description>
If true, the terminal will use the desktop-global standard If true, the terminal will use the desktop-global standard
font if it's monospace (and the most similar font it can font if it's monospace (and the most similar font it can
come up with otherwise). come up with otherwise).
</_description> </description>
</key> </key>
<key name="font" type="s"> <key name="font" type="s">
<default>'Monospace 10'</default> <default>'Monospace 10'</default>
<_summary>Font</_summary> <summary>Font</summary>
<_description> <description>
A Pango font name. Examples are "Sans 12" or "Monospace Bold 14". A Pango font name. Examples are "Sans 12" or "Monospace Bold 14".
</_description> </description>
</key> </key>
</schema> </schema>
</schemalist> </schemalist>
...@@ -2,18 +2,18 @@ ...@@ -2,18 +2,18 @@
<schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.gedit.plugins.time" path="/org/gnome/gedit/plugins/time/"> <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"> <key name="prompt-type" enum="org.gnome.gedit.plugins.time.GeditTimePluginPromptType">
<default>'prompt-selected-format'</default> <default>'prompt-selected-format'</default>
<_summary>Prompt Type</_summary> <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> <description>If the user should be prompted for a format or if the selected or custom format should be used.</description>
</key> </key>
<key name="selected-format" type="s"> <key name="selected-format" type="s">
<default>'%c'</default> <default>'%c'</default>
<_summary>Selected Format</_summary> <summary>Selected Format</summary>
<_description>The selected format used when inserting the date/time.</_description> <description>The selected format used when inserting the date/time.</description>
</key> </key>
<key name="custom-format" type="s"> <key name="custom-format" type="s">
<default>'%d/%m/%Y %H:%M:%S'</default> <default>'%d/%m/%Y %H:%M:%S'</default>
<_summary>Custom Format</_summary> <summary>Custom Format</summary>
<_description>The custom format used when inserting the date/time.</_description> <description>The custom format used when inserting the date/time.</description>
</key> </key>
</schema> </schema>
</schemalist> </schemalist>
...@@ -54,7 +54,7 @@ gedit/gedit-window.c ...@@ -54,7 +54,7 @@ gedit/gedit-window.c
[type: gettext/glade]gedit/resources/ui/gedit-window.ui [type: gettext/glade]gedit/resources/ui/gedit-window.ui
plugins/checkupdate/checkupdate.plugin.desktop.in plugins/checkupdate/checkupdate.plugin.desktop.in
plugins/checkupdate/gedit-check-update-plugin.c 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/docinfo.plugin.desktop.in
plugins/docinfo/gedit-docinfo-plugin.c plugins/docinfo/gedit-docinfo-plugin.c
[type: gettext/glade]plugins/docinfo/resources/ui/gedit-docinfo-plugin.ui [type: gettext/glade]plugins/docinfo/resources/ui/gedit-docinfo-plugin.ui
...@@ -65,7 +65,7 @@ plugins/externaltools/data/remove-trailing-spaces.desktop.in ...@@ -65,7 +65,7 @@ plugins/externaltools/data/remove-trailing-spaces.desktop.in
plugins/externaltools/data/run-command.desktop.in plugins/externaltools/data/run-command.desktop.in
plugins/externaltools/data/send-to-fpaste.desktop.in plugins/externaltools/data/send-to-fpaste.desktop.in
plugins/externaltools/externaltools.plugin.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/appactivatable.py
plugins/externaltools/tools/capture.py plugins/externaltools/tools/capture.py
plugins/externaltools/tools/functions.py plugins/externaltools/tools/functions.py
...@@ -82,11 +82,11 @@ plugins/filebrowser/gedit-file-browser-store.c ...@@ -82,11 +82,11 @@ plugins/filebrowser/gedit-file-browser-store.c
plugins/filebrowser/gedit-file-browser-utils.c plugins/filebrowser/gedit-file-browser-utils.c
plugins/filebrowser/gedit-file-browser-view.c plugins/filebrowser/gedit-file-browser-view.c
plugins/filebrowser/gedit-file-browser-widget.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-menus.ui
[type: gettext/glade]plugins/filebrowser/resources/ui/gedit-file-browser-widget.ui [type: gettext/glade]plugins/filebrowser/resources/ui/gedit-file-browser-widget.ui
plugins/modelines/modelines.plugin.desktop.in 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 [type: gettext/glade]plugins/pythonconsole/pythonconsole/config.ui
plugins/pythonconsole/pythonconsole/__init__.py plugins/pythonconsole/pythonconsole/__init__.py
plugins/pythonconsole/pythonconsole.plugin.desktop.in plugins/pythonconsole/pythonconsole.plugin.desktop.in
...@@ -116,7 +116,7 @@ plugins/spell/gedit-spell-plugin.c ...@@ -116,7 +116,7 @@ plugins/spell/gedit-spell-plugin.c
[type: gettext/glade]plugins/spell/resources/ui/spell-checker.ui [type: gettext/glade]plugins/spell/resources/ui/spell-checker.ui
plugins/spell/spell.plugin.desktop.in plugins/spell/spell.plugin.desktop.in
plugins/time/gedit-time-plugin.c 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-dialog.ui
[type: gettext/glade]plugins/time/resources/ui/gedit-time-setup-dialog.ui [type: gettext/glade]plugins/time/resources/ui/gedit-time-setup-dialog.ui
plugins/time/time.plugin.desktop.in plugins/time/time.plugin.desktop.in
...@@ -6,11 +6,6 @@ gedit/gedit-document-output-stream.c ...@@ -6,11 +6,6 @@ gedit/gedit-document-output-stream.c
gedit/resources/gtk/menus.ui gedit/resources/gtk/menus.ui
gedit/smclient/eggdesktopfile.c gedit/smclient/eggdesktopfile.c
gedit/smclient/eggsmclient.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/generate-plugin.py
tools/plugin_template/gedit-plugin.desktop.in tools/plugin_template/gedit-plugin.desktop.in
tools/plugin_template/gedit-plugin-helper.py tools/plugin_template/gedit-plugin-helper.py
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment