[gnome-user-docs: 172/172] Merge branch 'gnome-3-0'
- From: Shaun McCance <shaunm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-user-docs: 172/172] Merge branch 'gnome-3-0'
- Date: Wed, 24 Aug 2011 23:04:44 +0000 (UTC)
commit c11897d9f0e4f96a1f5804fca2580d28ca62adb3
Merge: eb96c83 7953f97
Author: Shaun McCance <shaunm gnome org>
Date: Wed Aug 24 19:12:08 2011 -0400
Merge branch 'gnome-3-0'
Conflicts:
gnome-help/C/hardware-cardreader.page
gnome-help/C/nautilus-behavior.page
gnome-help/Makefile.am
gnome-help/de/de.po
gnome-help/es/es.po
NEWS | 28 +
configure.in | 2 +-
gnome-help/C/a11y-bouncekeys.page | 15 +-
gnome-help/C/a11y-braille.page | 2 +-
gnome-help/C/a11y-contrast.page | 18 +-
gnome-help/C/a11y-dwellclick.page | 10 +-
gnome-help/C/a11y-font-size.page | 19 +-
gnome-help/C/a11y-icon.page | 16 +-
gnome-help/C/a11y-locate-pointer.page | 2 +-
gnome-help/C/a11y-mag.page | 21 +-
gnome-help/C/a11y-right-click.page | 6 +-
gnome-help/C/a11y-screen-reader.page | 2 +-
gnome-help/C/a11y-slowkeys.page | 13 +-
gnome-help/C/a11y-stickykeys.page | 11 +-
gnome-help/C/a11y-visualalert.page | 14 +-
gnome-help/C/about-this-guide.page | 9 +-
gnome-help/C/app-evolution-setup.page.stub | 14 +-
gnome-help/C/backup-check.page | 35 +-
gnome-help/C/backup-frequency.page | 27 +-
gnome-help/C/backup-how.page | 20 +-
gnome-help/C/backup-restore.page | 25 +-
gnome-help/C/backup-thinkabout.page | 62 +-
gnome-help/C/backup-what.page | 28 +-
gnome-help/C/backup-where.page | 33 +-
gnome-help/C/backup-why.page | 14 +-
gnome-help/C/bluetooth-connect-device.page | 2 +-
gnome-help/C/bluetooth-problem-connecting.page | 10 +-
gnome-help/C/bluetooth-remove-connection.page | 2 +-
gnome-help/C/bluetooth-send-file.page | 2 +-
gnome-help/C/bluetooth-turn-on-off.page | 2 +-
gnome-help/C/bluetooth.page | 25 +
gnome-help/C/clock-calendar.page | 22 +-
gnome-help/C/clock-set.page | 30 +-
gnome-help/C/clock-timezone.page | 11 +-
gnome-help/C/clock.page | 2 +-
gnome-help/C/disk-benchmark.page | 19 +-
gnome-help/C/disk-capacity.page | 35 +-
gnome-help/C/disk-check.page | 51 +-
gnome-help/C/disk-format.page | 45 +-
gnome-help/C/disk-partitions.page | 29 +-
gnome-help/C/disk.page | 26 +
gnome-help/C/display-dimscreen.page | 4 +-
gnome-help/C/figures/evolution-setup.png | Bin 0 -> 30229 bytes
gnome-help/C/figures/shell-notification.png | Bin 0 -> 39413 bytes
gnome-help/C/files-autorun.page | 8 +-
gnome-help/C/files-browse.page | 61 +-
gnome-help/C/files-copy.page | 48 +-
gnome-help/C/files-delete.page | 16 +-
gnome-help/C/files-disc-write.page | 19 +-
gnome-help/C/files-hidden.page | 2 +-
gnome-help/C/files-lost.page | 2 +-
gnome-help/C/files-open.page | 2 +-
gnome-help/C/files-preview-music.page | 2 +-
gnome-help/C/files-recover.page | 14 +-
gnome-help/C/files-removedrive.page | 8 +-
gnome-help/C/files-rename.page | 9 +-
gnome-help/C/files-search.page | 10 +-
gnome-help/C/files-select.page | 2 +-
gnome-help/C/files-share.page | 4 +-
gnome-help/C/files-sort.page | 14 +-
gnome-help/C/files-tilde.page | 2 +-
gnome-help/C/files.page | 2 +-
gnome-help/C/get-involved.page | 10 +-
gnome-help/C/hardware-auth.page | 32 +
gnome-help/C/hardware-cardreader.page | 21 +-
gnome-help/C/hardware-driver.page | 14 +-
gnome-help/C/hardware-phone-connecting.page.stub | 2 +-
gnome-help/C/hardware-problems-bluetooth.page | 3 +-
gnome-help/C/hardware-problems-graphics.page | 5 +-
gnome-help/C/hardware.page | 60 +-
gnome-help/C/index.page | 2 +-
gnome-help/C/irc.page | 21 +
gnome-help/C/keyboard-cursor-blink.page | 8 +-
gnome-help/C/keyboard-layouts.page | 10 +-
gnome-help/C/keyboard-repeat-keys.page | 4 +-
gnome-help/C/keyboard.page | 2 +-
gnome-help/C/mailing-list.page | 23 +
gnome-help/C/media.page | 1 +
gnome-help/C/more-help.page | 4 +-
gnome-help/C/mouse-disabletouchpad.page | 2 +-
gnome-help/C/mouse-doubleclick.page | 4 +-
gnome-help/C/mouse-drag-threshold.page | 2 +-
gnome-help/C/mouse-lefthanded.page | 4 +-
gnome-help/C/mouse-middleclick.page | 3 +-
gnome-help/C/mouse-mousekeys.page | 13 +-
gnome-help/C/mouse-problem-notmoving.page | 2 +-
gnome-help/C/mouse-sensitivity.page | 4 +-
gnome-help/C/mouse-touchpad-click.page | 6 +-
gnome-help/C/mouse-wakeup.page | 2 +-
gnome-help/C/mouse.page | 15 +-
gnome-help/C/music-cantplay-drm.page | 2 +-
gnome-help/C/music-player-newipod.page | 8 +-
gnome-help/C/nautilus-behavior.page | 11 +-
gnome-help/C/nautilus-bookmarks-edit.page | 4 +-
gnome-help/C/nautilus-connect.page | 61 +-
gnome-help/C/nautilus-file-properties-basic.page | 71 +-
.../C/nautilus-file-properties-permissions.page | 2 +-
gnome-help/C/nautilus-views.page | 2 +-
gnome-help/C/net-adhoc.page | 22 +-
gnome-help/C/net-antivirus.page | 2 +-
gnome-help/C/net-editcon.page | 25 +-
gnome-help/C/net-findip.page | 10 +-
gnome-help/C/net-firewall-on-off.page | 20 +-
gnome-help/C/net-firewall-ports.page | 24 +-
gnome-help/C/net-fixed-ip-address.page | 26 +-
gnome-help/C/net-macaddress.page | 12 +-
gnome-help/C/net-othersconnect.page | 14 +-
gnome-help/C/net-otherscontrol.page | 16 +-
gnome-help/C/net-passwordok-noconnect.page | 4 +-
gnome-help/C/net-proxy.page | 4 +-
gnome-help/C/net-slow.page | 4 +-
gnome-help/C/net-vpn-connect.page | 2 +-
gnome-help/C/net-what-is-ip-address.page | 8 +-
gnome-help/C/net-wired-connect.page | 8 +-
gnome-help/C/net-wireless-airplane.page | 15 +-
gnome-help/C/net-wireless-connect.page | 34 +-
gnome-help/C/net-wireless-disconnecting.page | 8 +-
gnome-help/C/net-wireless-find.page | 2 +-
gnome-help/C/net-wireless-hidden.page | 22 +-
...et-wireless-troubleshooting-device-drivers.page | 81 +-
...et-wireless-troubleshooting-hardware-check.page | 134 +-
...net-wireless-troubleshooting-hardware-info.page | 52 +-
...net-wireless-troubleshooting-initial-check.page | 51 +-
gnome-help/C/net-wireless-troubleshooting.page | 25 +-
gnome-help/C/net-wireless-wepwpa.page | 8 +-
gnome-help/C/net-wrongnetwork.page | 15 +-
gnome-help/C/power-batterybroken.page | 20 +-
gnome-help/C/power-batteryestimate.page | 2 +-
gnome-help/C/power-batterylife.page | 13 +-
gnome-help/C/power-batteryoptimal.page | 6 +-
gnome-help/C/power-batteryslow.page | 2 +-
gnome-help/C/power-batterywindows.page | 2 +-
gnome-help/C/power-brighter.page | 6 +-
gnome-help/C/power-closelid.page | 25 +-
gnome-help/C/power-constantfan.page | 6 +-
gnome-help/C/power-hotcomputer.page | 2 +-
gnome-help/C/power-othercountry.page | 4 +-
gnome-help/C/power-suspendfail.page | 1 -
gnome-help/C/power-suspendhibernate.page | 20 +-
gnome-help/C/power-turnoffbutton.page | 2 +-
gnome-help/C/power-willnotturnon.page | 2 +-
gnome-help/C/power.page | 14 +-
gnome-help/C/prefs.page | 2 +-
gnome-help/C/printing-2sided.page | 6 +-
gnome-help/C/printing-booklet-duplex.page | 2 +-
gnome-help/C/printing-booklet-singlesided.page | 2 +-
gnome-help/C/printing-booklet.page | 2 +-
gnome-help/C/printing-cancel-job.page | 12 +-
gnome-help/C/printing-envelopes.page | 21 +-
gnome-help/C/printing-paperjam.page | 5 +-
gnome-help/C/printing-setup-default-printer.page | 1 -
gnome-help/C/printing-setup-drivers.page.stub | 2 +-
gnome-help/C/printing-setup-networked.page.stub | 1 -
gnome-help/C/printing-setup.page | 1 -
gnome-help/C/printing-streaks.page | 4 +-
gnome-help/C/printing.page | 21 +-
gnome-help/C/screen-shot-record.page | 6 +-
gnome-help/C/session-fingerprint.page | 22 +-
gnome-help/C/session-screenlocks.page | 2 +-
gnome-help/C/session-smartcard.page.stub | 4 +-
gnome-help/C/shell-apps-favorites.page | 2 +-
gnome-help/C/shell-apps-open.page | 12 +-
gnome-help/C/shell-exit.page | 2 +-
gnome-help/C/shell-introduction.page | 16 +-
gnome-help/C/shell-keyboard-shortcuts.page | 4 +-
gnome-help/C/shell-notifications.page | 19 +-
gnome-help/C/shell-overview.page | 2 +-
gnome-help/C/shell-session-status.page | 2 +-
gnome-help/C/shell-terminology.page | 16 +-
gnome-help/C/shell-windows-lost.page | 28 +-
gnome-help/C/shell-windows-maximize.page | 41 +-
gnome-help/C/shell-windows-states.page | 79 +-
gnome-help/C/shell-windows-switching.page | 43 +-
gnome-help/C/shell-windows.page | 2 +-
gnome-help/C/shell-workspaces-movewindow.page | 25 +-
gnome-help/C/shell-workspaces-switch.page | 14 +-
gnome-help/C/shell-workspaces.page | 17 +-
gnome-help/C/sound-alert.page | 8 +-
gnome-help/C/sound-broken.page | 2 +-
gnome-help/C/sound-usemic.page | 27 +-
gnome-help/C/user-add.page | 14 +-
gnome-help/C/user-addguest.page | 10 +-
gnome-help/C/user-admin-change.page | 25 +-
gnome-help/C/user-admin-explain.page | 6 +-
gnome-help/C/user-admin-problems.page | 2 +-
gnome-help/C/user-changepassword.page | 11 +-
gnome-help/C/user-changepicture.page | 4 +-
gnome-help/C/user-delete.page | 9 +-
...ssword.page => user-forgottenpassword.page.old} | 164 +-
gnome-help/C/user-forum.page | 22 +
gnome-help/C/video-sending.page | 15 +-
gnome-help/C/web-default-browser.page | 4 +-
gnome-help/C/web-default-email.page | 4 +-
gnome-help/C/web-email-virus.page | 2 +-
gnome-help/C/web-install-flash.page | 9 +-
gnome-help/C/web-install-moonlight.page | 7 +-
gnome-help/C/web.page | 18 +-
gnome-help/C/windows-key.page | 4 +-
gnome-help/Makefile.am | 9 +-
gnome-help/de/de.po |24506 ++++++++--------
gnome-help/es/es.po |30517 +++++++++++---------
201 files changed, 30698 insertions(+), 27344 deletions(-)
---
diff --cc gnome-help/C/shell-apps-open.page
index a6baec1,3c6dafd..17a2ea3
--- a/gnome-help/C/shell-apps-open.page
+++ b/gnome-help/C/shell-apps-open.page
@@@ -7,9 -7,9 +7,9 @@@
<link type="guide" xref="index" group="shell-apps-open" />
<link type="guide" xref="shell-overview#apps" />
- <desc>Launch apps from the the activities overview.</desc>
+ <desc>Launch apps from the activities overview.</desc>
<revision pkgversion="3.0" date="2011-04-04" status="final"/>
- <revision pkgversion="3.0" version="3.0.1" date="2011-04-06" status="outdated"/>
+ <revision pkgversion="3.0" version="3.0.1" date="2011-06-07" status="incomplete"/>
<credit type="author">
<name>GNOME Documentation Project</name>
<email>gnome-doc-list gnome org</email>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
