GNOME.org
 

[nautilus] build: Rely on intltool >= 0.50 for gsettings translation

commit da8b5d117ffcf83a533316be7fb82fe9c0421090
Author: Carlos Soriano <csoriano gnome org>
Date:   Wed Dec 16 09:23:37 2015 +0100

    build: Rely on intltool >= 0.50 for gsettings translation

 configure.ac                                       |    2 +-
 libnautilus-private/Makefile.am                    |    9 +-
 libnautilus-private/org.gnome.nautilus.gschema.xml |  319 ++++++++++++++++++
 .../org.gnome.nautilus.gschema.xml.in              |  339 --------------------
 po/POTFILES.in                                     |    2 +-
 5 files changed, 323 insertions(+), 348 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index cc3f792..9728009 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,7 +62,7 @@ GLIB_DEFINE_LOCALEDIR(GNOMELOCALEDIR)
 
 GLIB_GSETTINGS
 
-IT_PROG_INTLTOOL([0.40.1])
+IT_PROG_INTLTOOL([0.50])
 
 dnl ==========================================================================
 
diff --git a/libnautilus-private/Makefile.am b/libnautilus-private/Makefile.am
index 774cd77..d42d7b6 100644
--- a/libnautilus-private/Makefile.am
+++ b/libnautilus-private/Makefile.am
@@ -187,16 +187,12 @@ nodist_libnautilus_private_la_SOURCES =\
        $(BUILT_SOURCES) \
        $(NULL)
 
-gsettingsschema_in_files = org.gnome.nautilus.gschema.xml.in
-gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
-.PRECIOUS: $(gsettings_SCHEMAS)
-
- INTLTOOL_XML_NOMERGE_RULE@
+gsettings_SCHEMAS = org.gnome.nautilus.gschema.xml
 
 @GSETTINGS_RULES@
 
 EXTRA_DIST =                           \
-       $(gsettingsschema_in_files)     \
+       $(gsettings_SCHEMAS)     \
        $(TRACKER_SOURCES)              \
        nautilus-private-enum-types.h.template  \
        nautilus-private-enum-types.c.template  \
@@ -204,7 +200,6 @@ EXTRA_DIST =                                \
 
 CLEANFILES = \
        $(BUILT_SOURCES)                                \
-       $(gsettings_SCHEMAS)                            \
        $(NULL)
 
 dist-hook:
diff --git a/libnautilus-private/org.gnome.nautilus.gschema.xml 
b/libnautilus-private/org.gnome.nautilus.gschema.xml
new file mode 100644
index 0000000..7c24969
--- /dev/null
+++ b/libnautilus-private/org.gnome.nautilus.gschema.xml
@@ -0,0 +1,319 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist>
+  <enum id="org.gnome.nautilus.SpeedTradeoff">
+    <value value="0" nick="always"/>
+    <value value="1" nick="local-only"/>
+    <value value="2" nick="never"/>
+  </enum>
+
+  <enum id="org.gnome.nautilus.ClickPolicy">
+    <value value="0" nick="single"/>
+    <value value="1" nick="double"/>
+  </enum>
+
+  <enum id="org.gnome.nautilus.ActivationChoice">
+    <value value="0" nick="launch"/>
+    <value value="1" nick="display"/>
+    <value value="2" nick="ask"/>
+  </enum>
+
+  <enum id="org.gnome.nautilus.FolderView">
+    <value value="0" nick="icon-view"/>
+    <value value="1" nick="list-view"/>
+  </enum>
+
+  <enum id="org.gnome.nautilus.SortOrder">
+    <value value="0" nick="manually"/>
+    <value value="1" nick="name"/>
+    <value value="2" nick="size"/>
+    <value value="3" nick="type"/>
+    <value value="4" nick="mtime"/>
+    <value value="5" nick="atime"/>
+    <value value="6" nick="trash-time"/>
+  </enum>
+
+  <enum id="org.gnome.nautilus.CanvasZoomLevel">
+    <value value="0" nick="small"/>
+    <value value="1" nick="standard"/>
+    <value value="2" nick="large"/>
+  </enum>
+
+  <enum id="org.gnome.nautilus.ListZoomLevel">
+    <value value="0" nick="small"/>
+    <value value="1" nick="standard"/>
+    <value value="2" nick="large"/>
+  </enum>
+
+  <enum id="org.gnome.nautilus.TabPosition">
+    <value value="0" nick="after-current-tab"/>
+    <value value="1" nick="end"/>
+  </enum>
+
+  <schema path="/org/gnome/nautilus/" id="org.gnome.nautilus" gettext-domain="nautilus">
+    <child schema="org.gnome.nautilus.preferences" name="preferences"/>
+    <child schema="org.gnome.nautilus.icon-view" name="icon-view"/>
+    <child schema="org.gnome.nautilus.list-view" name="list-view"/>
+    <child schema="org.gnome.nautilus.desktop" name="desktop"/>
+    <child schema="org.gnome.nautilus.window-state" name="window-state"/>
+  </schema>
+
+  <schema path="/org/gnome/nautilus/preferences/" id="org.gnome.nautilus.preferences" 
gettext-domain="nautilus">
+    <key name="tabs-open-position" enum="org.gnome.nautilus.TabPosition">
+      <aliases>
+       <alias value='after_current_tab' target='after-current-tab'/>
+      </aliases>
+      <default>'after-current-tab'</default>
+      <summary>Where to position newly open tabs in browser windows.</summary>
+      <description>If set to "after-current-tab", then new tabs are inserted after the current tab. If set 
to "end", then new tabs are appended to the end of the tab list.</description>
+    </key>
+    <key type="b" name="always-use-location-entry">
+      <default>false</default>
+      <summary>Always use the location entry, instead of the pathbar</summary>
+      <description>If set to true, then Nautilus browser windows will always use a textual input entry for 
the location toolbar, instead of the pathbar.</description>
+    </key>
+    <key type="b" name="enable-recursive-search">
+      <default>true</default>
+      <summary>Whether to enable recursive search or not</summary>
+      <description>Enables or disables recursive search in Nautilus.</description>
+    </key>
+    <key type="b" name="show-delete-permanently">
+      <default>false</default>
+      <summary>Whether to show a context menu item to delete permanently</summary>
+      <description>If set to true Nautilus will show a delete permanently context menu item to bypass the 
trash.</description>
+    </key>
+    <key type="b" name="confirm-trash">
+      <default>true</default>
+      <summary>Whether to ask for confirmation when deleting files, or emptying Trash</summary>
+      <description>If set to true, then Nautilus will ask for confirmation when you attempt to delete files, 
or empty the Trash.</description>
+    </key>
+    <key name="show-directory-item-counts" enum="org.gnome.nautilus.SpeedTradeoff">
+      <aliases><alias value='local_only' target='local-only'/></aliases>
+      <default>'local-only'</default>
+      <summary>When to show number of items in a folder</summary>
+      <description>Speed tradeoff for when to show the number of items in a folder. If set to "always" then 
always show item counts, even if the folder is on a remote server. If set to "local-only" then only show 
counts for local file systems. If set to "never" then never bother to compute item counts.</description>
+    </key>
+    <key name="click-policy" enum="org.gnome.nautilus.ClickPolicy">
+      <default>'double'</default>
+      <summary>Type of click used to launch/open files</summary>
+      <description>Possible values are "single" to launch files on a single click, or "double" to launch 
them on a double click.</description>
+    </key>
+    <key name="executable-text-activation" enum="org.gnome.nautilus.ActivationChoice">
+      <default>'display'</default>
+      <summary>What to do with executable text files when activated</summary>
+      <description>What to do with executable text files when they are activated (single or double clicked). 
Possible values are "launch" to launch them as programs, "ask" to ask what to do via a dialog, and "display" 
to display them as text files.</description>
+    </key>
+    <key type="b" name="install-mime-activation">
+      <default>true</default>
+      <summary>Show the package installer for unknown mime types</summary>
+      <description>Whether to show the user a package installer dialog in case an unknown mime type is 
opened, in order to search for an application to handle it.</description>
+    </key>
+    <key type="b" name="show-move-to-trash-shortcut-changed-dialog">
+      <default>true</default>
+      <summary>Show a warning dialog for the change of the shortcut for move to trash</summary>
+      <description>Show a warning dialog for the change of the shortcut for move to trash from control + 
delete to just delete.</description>
+    </key>
+    <key type="b" name="mouse-use-extra-buttons">
+      <default>true</default>
+      <summary>Use extra mouse button events in Nautilus' browser window</summary>
+      <description>For users with mice that have "Forward" and "Back" buttons, this key will determine if 
any action is taken inside of Nautilus when either is pressed.</description>
+    </key>
+    <key type="i" name="mouse-forward-button">
+      <default>9</default>
+      <summary>Mouse button to activate the "Forward" command in browser window</summary>
+      <description>For users with mice that have buttons for "Forward" and "Back", this key will set which 
button activates the "Forward" command in a browser window. Possible values range between 6 and 
14.</description>
+    </key>
+    <key type="i" name="mouse-back-button">
+      <default>8</default>
+      <summary>Mouse button to activate the "Back" command in browser window</summary>
+      <description>For users with mice that have buttons for "Forward" and "Back", this key will set which 
button activates the "Back" command in a browser window. Possible values range between 6 and 14.</description>
+    </key>
+    <key name="show-image-thumbnails" enum="org.gnome.nautilus.SpeedTradeoff">
+      <aliases><alias value='local_only' target='local-only'/></aliases>
+      <default>'local-only'</default>
+      <summary>When to show thumbnails of files</summary>
+      <description>Speed tradeoff for when to show a file as a thumbnail. If set to "always" then always 
thumbnail, even if the folder is on a remote server. If set to "local-only" then only show thumbnails for 
local file systems. If set to "never" then never bother to thumbnail files, just use a generic icon. Despite 
what the name may suggest, this applies to any previewable file type.</description>
+    </key>
+    <key type="t" name="thumbnail-limit">
+      <default>10485760</default>
+      <summary>Maximum image size for thumbnailing</summary>
+      <description>Images over this size (in bytes) won't be thumbnailed. The purpose of this setting is to 
avoid thumbnailing large images that may take a long time to load or use lots of memory.</description>
+    </key>
+    <key type="b" name="sort-directories-first">
+      <default>false</default>
+      <summary>Show folders first in windows</summary>
+      <description>If set to true, then Nautilus shows folders prior to showing files in the icon and list 
views.</description>
+    </key>
+    <key name="default-sort-order" enum="org.gnome.nautilus.SortOrder">
+      <aliases>
+       <alias value='modification_date' target='mtime'/>
+      </aliases>
+      <default>'name'</default>
+      <summary>Default sort order</summary>
+      <description>The default sort-order for items in the icon view. Possible values are "name", "size", 
"type" and "mtime".</description>
+    </key>
+    <key type="b" name="default-sort-in-reverse-order">
+      <default>false</default>
+      <summary>Reverse sort order in new windows</summary>
+      <description>If true, files in new windows will be sorted in reverse order. ie, if sorted by name, 
then instead of sorting the files from "a" to "z", they will be sorted from "z" to "a"; if sorted by size, 
instead of being incrementally they will be sorted decrementally.</description>
+    </key>
+    <key name="default-folder-viewer" enum="org.gnome.nautilus.FolderView">
+      <aliases>
+        <alias value='icon_view' target='icon-view'/>
+        <alias value='compact_view' target='icon-view'/>
+        <alias value='compact-view' target='icon-view'/>
+        <alias value='list_view' target='list-view'/>
+      </aliases>
+      <default>'icon-view'</default>
+      <summary>Default folder viewer</summary>
+      <description>When a folder is visited this viewer is used unless you have selected another view for 
that particular folder. Possible values are "list-view", and "icon-view".</description>
+    </key>
+    <key type="b" name="show-hidden-files">
+      <default>false</default>
+      <summary>Whether to show hidden files</summary>
+      <description>This key is deprecated and ignored. The "show-hidden" key from 
"org.gtk.Settings.FileChooser" is now used instead.</description>
+    </key>
+    <key type="b" name="list-view-on-search">
+      <default>true</default>
+      <summary>Whether to switch to the list view on search</summary>
+      <description>If this is set to true, view mode will be switched to the list view while searching. 
However, if the user changes the mode manually, this will be disabled.</description>
+    </key>
+    <key type="ay" name="bulk-rename-tool">
+      <default>[]</default>
+      <summary>Bulk rename utility</summary>
+      <description>If set, Nautilus will append URIs of selected files and treat the result as a command 
line for bulk renaming. Bulk rename applications can register themselves in this key by setting the key to a 
space-separated string of their executable name and any command line options. If the executable name is not 
set to a full path, it will be searched for in the search path.</description>
+    </key>
+    <key type="b" name="open-folder-on-dnd-hover">
+      <default>true</default>
+      <summary>Whether to open the hovered folder after a timeout when drag and drop operation</summary>
+      <description>If this is set to true, when performing a drag and drop operation the hovered folder will 
open automatically after a timeout</description>
+    </key>
+  </schema>
+
+  <schema path="/org/gnome/nautilus/icon-view/" id="org.gnome.nautilus.icon-view" gettext-domain="nautilus">
+    <key type="as" name="captions">
+      <default>[ 'none', 'none', 'none' ]</default>
+      <summary>List of possible captions on icons</summary>
+      <description>A list of captions below an icon in the icon view and the desktop. The actual number of 
captions shown depends on the zoom level. Some possible values are: "size", "type", "date_modified", "owner", 
"group", "permissions", and "mime_type".</description>
+    </key>
+    <key name="default-zoom-level" enum="org.gnome.nautilus.CanvasZoomLevel">
+      <default>'standard'</default>
+      <summary>Default icon zoom level</summary>
+      <description>Default zoom level used by the icon view.</description>
+    </key>
+    <key type="i" name="thumbnail-size">
+      <default>64</default>
+      <summary>Default Thumbnail Icon Size</summary>
+      <description>The default size of an icon for a thumbnail in the icon view when using 
NAUTILUS_ICON_SIZE_SMALL size.</description>
+    </key>
+    <key type="as" name="text-ellipsis-limit">
+      <default>[ '3' ]</default>
+      <summary>Text Ellipsis Limit</summary>
+      <description>A string specifying how parts of overlong file names should be replaced by ellipses, 
depending on the zoom level. Each of the list entries is of the form "Zoom Level:Integer". For each specified 
zoom level, if the given integer is larger than 0, the file name will not exceed the given number of lines. 
If the integer is 0 or smaller, no limit is imposed on the specified zoom level. A default entry of the form 
"Integer" without any specified zoom level is also allowed. It defines the maximum number of lines for all 
other zoom levels. Examples: 0 - always display overlong file names; 3 - shorten file names if they exceed 
three lines; smallest:5,smaller:4,0 - shorten file names if they exceed five lines for zoom level "smallest". 
Shorten file names if they exceed four lines for zoom level "smaller". Do not shorten file names for other 
zoom levels. Available zoom levels: small, standard, large</description>
+    </key>
+  </schema>
+
+  <schema path="/org/gnome/nautilus/list-view/" id="org.gnome.nautilus.list-view" gettext-domain="nautilus">
+    <key name="default-zoom-level" enum="org.gnome.nautilus.ListZoomLevel">
+      <default>'standard'</default>
+      <summary>Default list zoom level</summary>
+      <description>Default zoom level used by the list view.</description>
+    </key>
+    <key type="as" name="default-visible-columns">
+      <default>[ 'name', 'size', 'date_modified' ]</default>
+      <summary>Default list of columns visible in the list view</summary>
+      <description>Default list of columns visible in the list view.</description>
+    </key>
+    <key type="as" name="default-column-order">
+      <default>[ 'name', 'size', 'type', 'owner', 'group', 'permissions', 'mime_type', 'where', 
'date_modified', 'date_modified_with_time', 'date_accessed' ]</default>
+      <summary>Default column order in the list view</summary>
+      <description>Default column order in the list view.</description>
+    </key>
+    <key type="b" name="use-tree-view">
+      <default>false</default>
+      <summary>Use tree view</summary>
+      <description>Whether a tree should be used for list view navigation instead of a flat 
list</description>
+    </key>
+  </schema>
+
+  <schema path="/org/gnome/nautilus/desktop/" id="org.gnome.nautilus.desktop" gettext-domain="nautilus">
+    <key type="s" name="font">
+      <default l10n="messages" context="desktop-font">''</default>
+      <summary>Desktop font</summary>
+      <description>The font description used for the icons on the desktop.</description>
+    </key>
+    <key type="b" name="home-icon-visible">
+      <default>true</default>
+      <summary>Home icon visible on desktop</summary>
+      <description>If this is set to true, an icon linking to the home folder will be put on the 
desktop.</description>
+    </key>
+    <key type="b" name="trash-icon-visible">
+      <default>true</default>
+      <summary>Trash icon visible on desktop</summary>
+      <description>If this is set to true, an icon linking to the trash will be put on the 
desktop.</description>
+    </key>
+    <key type="b" name="volumes-visible">
+      <default>true</default>
+      <summary>Show mounted volumes on the desktop</summary>
+      <description>If this is set to true, icons linking to mounted volumes will be put on the 
desktop.</description>
+    </key>
+    <key type="b" name="network-icon-visible">
+      <default>false</default>
+      <summary>Network Servers icon visible on the desktop</summary>
+      <description>If this is set to true, an icon linking to the Network Servers view will be put on the 
desktop.</description>
+    </key>
+    <key type="s" name="home-icon-name">
+      <default l10n="messages" context="home-icon-name">'Home'</default>
+      <summary>Desktop home icon name</summary>
+      <description>This name can be set if you want a custom name for the home icon on the 
desktop.</description>
+    </key>
+    <key type="s" name="trash-icon-name">
+      <default l10n="messages" context="trash-icon-name">'Trash'</default>
+      <summary>Desktop trash icon name</summary>
+      <description>This name can be set if you want a custom name for the trash icon on the 
desktop.</description>
+    </key>
+    <key type="s" name="network-icon-name">
+      <default l10n="messages" context="network-icon-name">'Network Servers'</default>
+      <summary>Network servers icon name</summary>
+      <description>This name can be set if you want a custom name for the network servers icon on the 
desktop.</description>
+    </key>
+    <key type="i" name="text-ellipsis-limit">
+      <default>3</default>
+      <summary>Text Ellipsis Limit</summary>
+      <description>An integer specifying how parts of overlong file names should be replaced by ellipses on 
the desktop. If the number is larger than 0, the file name will not exceed the given number of lines. If the 
number is 0 or smaller, no limit is imposed on the number of displayed lines.</description>
+    </key>
+    <key type="b" name="background-fade">
+      <default>true</default>
+      <summary>Fade the background on change</summary>
+      <description>If set to true, then Nautilus will use a fade effect to change the desktop 
background.</description>
+    </key>
+  </schema>
+
+  <schema path="/org/gnome/nautilus/window-state/" id="org.gnome.nautilus.window-state" 
gettext-domain="nautilus">
+    <key type="s" name="geometry">
+      <default>''</default>
+
+      <summary>The geometry string for a navigation window.</summary>
+      <description>A string containing the saved geometry and coordinates string for navigation 
windows.</description>
+    </key>
+    <key type="b" name="maximized">
+      <default>false</default>
+      <summary>Whether the navigation window should be maximized.</summary>
+      <description>Whether the navigation window should be maximized by default.</description>
+    </key>
+    <key type="i" name="sidebar-width">
+      <default>188</default>
+      <summary>Width of the side pane</summary>
+      <description>The default width of the side pane in new windows.</description>
+    </key>
+    <key type="b" name="start-with-location-bar">
+      <default>true</default>
+      <summary>Show location bar in new windows</summary>
+      <description>If set to true, newly opened windows will have the location bar visible.</description>
+    </key>
+    <key type="b" name="start-with-sidebar">
+      <default>true</default>
+      <summary>Show side pane in new windows</summary>
+      <description>If set to true, newly opened windows will have the side pane visible.</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2be1f03..ffa78b4 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -41,7 +41,7 @@ libnautilus-private/nautilus-search-directory-file.c
 libnautilus-private/nautilus-search-engine.c
 libnautilus-private/nautilus-tree-view-drag-dest.c
 libnautilus-private/nautilus-vfs-file.c
-libnautilus-private/org.gnome.nautilus.gschema.xml.in
+libnautilus-private/org.gnome.nautilus.gschema.xml
 nautilus-sendto-extension/nautilus-nste.c
 src/nautilus-application-actions.c
 src/nautilus-application.c
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]