Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Schampijer <simon@schampijer.de>2009-03-02 14:19:29 (GMT)
committer Simon Schampijer <simon@schampijer.de>2009-03-02 14:19:29 (GMT)
commitc1b5b9cf98c5d7f1a1d4c90f4df189770e87cb8c (patch)
tree310b8c96bc9ded71e2ca2daa49a22b15b610de4a
parent2494040d8ab41d1594c8544ea525a7bb35846d2f (diff)
parentd330506bd3c88b3b141d5d7ecc8d3316edb00b35 (diff)
Merge branch 'master' of gitorious@git.sugarlabs.org:sugar/mainline
-rw-r--r--po/de.po1383
-rw-r--r--po/fr.po207
-rw-r--r--po/ja.po207
-rw-r--r--po/nl.po207
-rw-r--r--po/pt.po213
-rw-r--r--po/sl.po210
-rw-r--r--po/sv.po1328
-rw-r--r--po/zh_TW.po231
-rw-r--r--src/jarabe/frame/clipboardobject.py16
-rw-r--r--src/jarabe/journal/misc.py9
-rw-r--r--src/jarabe/journal/model.py2
-rw-r--r--src/jarabe/model/bundleregistry.py13
12 files changed, 2382 insertions, 1644 deletions
diff --git a/po/de.po b/po/de.po
index 6102875..1b59d25 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,421 +4,110 @@ msgid ""
msgstr ""
"Project-Id-Version: sugar\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-25 00:30-0400\n"
-"PO-Revision-Date: 2008-11-14 12:15-0500\n"
+"POT-Creation-Date: 2009-02-21 00:30-0500\n"
+"PO-Revision-Date: 2009-02-28 19:45+0100\n"
"Last-Translator: Markus Schlager <m.slg@gmx.de>\n"
"Language-Team: German <fedora-trans-de@redhat.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 1.1.0rc2\n"
"X-Poedit-Language: German\n"
-#: ../src/intro/window.py:93 ../src/controlpanel/aboutme/view.py:100
-msgid "Name:"
-msgstr "Name:"
-
-#: ../src/intro/window.py:125
-msgid "Click to change color:"
-msgstr "Klicken zum Wechseln der Farbe:"
-
-#: ../src/intro/window.py:175 ../src/journal/detailview.py:119
-msgid "Back"
-msgstr "Zurück"
-
-#: ../src/intro/window.py:189 ../src/controlpanel/toolbar.py:61
-msgid "Done"
-msgstr "Fertig"
-
-# (Markus S.) war 'Nächste'
-#: ../src/intro/window.py:192
-msgid "Next"
-msgstr "Vor"
-
-#: ../src/view/BuddyMenu.py:60
-msgid "Remove friend"
-msgstr "Freund entfernen"
-
-#: ../src/view/BuddyMenu.py:63
-msgid "Make friend"
-msgstr "Freunde werden"
-
-#: ../src/view/BuddyMenu.py:92
-#, python-format
-msgid "Invite to %s"
-msgstr "Einladen zu %s"
-
-#: ../src/view/clipboardmenu.py:51
-msgid "Remove"
-msgstr "Entfernen"
-
-#: ../src/view/clipboardmenu.py:56 ../src/view/clipboardmenu.py:78
-msgid "Open"
-msgstr "Öffnen"
-
-# self._stop_item = MenuItem(_('Stop download'), 'stock-close')
-# TODO: Implement stopping downloads
-# self._stop_item.connect('activate', self._stop_item_activate_cb)
-# self.append_menu_item(self._stop_item)
-#: ../src/view/clipboardmenu.py:61 ../src/view/home/HomeBox.py:84
-msgid "Keep"
-msgstr "Behalten"
-
-#: ../src/view/clipboardmenu.py:83
-msgid "Open with"
-msgstr "Öffnen mit"
-
-# (Markus S.) 'clipping', nicht 'clipped'
-#: ../src/view/clipboardmenu.py:228
-#, python-format
-#, fuzzy
-msgid "%s clipping"
-msgstr "%s ausgeschnitten"
-
-#: ../src/hardware/keydialog.py:150
-msgid "Key Type:"
-msgstr "Schlüsseltyp:"
-
-#: ../src/hardware/keydialog.py:170
-msgid "Authentication Type:"
-msgstr "Authentifizierungstyp:"
-
-#: ../src/hardware/keydialog.py:251
-msgid "Encryption Type:"
-msgstr "Verschlüsselungstyp:"
-
-#: ../src/hardware/schoolserver.py:17
-msgid "Cannot obtain data needed for registration."
-msgstr "Notwendige Daten für die Registrierung sind nicht verfügbar."
-
-#: ../src/hardware/schoolserver.py:31
-msgid "Cannot connect to the server."
-msgstr "Kann nicht mit dem Server verbinden."
-
-#: ../src/hardware/schoolserver.py:36
-msgid "The server could not complete the request."
-msgstr "Der Server konnte die Anforderung nicht erfüllen."
-
-#: ../src/view/Shell.py:251
-msgid "Screenshot"
-msgstr "Bildschirmfoto"
-
-#: ../src/view/home/HomeBox.py:78
-msgid "Confirm erase"
-msgstr "Löschen bestätigen"
-
-#: ../src/view/home/HomeBox.py:80
-#, python-format
-msgid "Confirm erase: Do you want to permanently erase %s?"
-msgstr "Löschen bestätigen: Willst du %s wirklich dauerhaft löschen?"
-
-#: ../src/view/home/HomeBox.py:87 ../src/view/palettes.py:120
-#: ../src/journal/journaltoolbox.py:335 ../src/journal/palettes.py:75
-msgid "Erase"
-msgstr "Löschen"
-
-#: ../src/view/home/HomeBox.py:117
-msgid "Software Update"
-msgstr "Software-Aktualisierung"
-
-#: ../src/view/home/HomeBox.py:118
-msgid "Update your activities to ensure compatibility with your new software"
-msgstr ""
-"Aktualisiere deine Aktivitäten, um die Kompatibilität mit deiner neuen "
-"Software sicher zu stellen."
-
-#: ../src/view/home/HomeBox.py:122 ../src/controlpanel/toolbar.py:115
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#: ../src/view/home/HomeBox.py:124 ../src/controlpanel/gui.py:273
-msgid "Later"
-msgstr "Später"
-
-#: ../src/view/home/HomeBox.py:127
-msgid "Check now"
-msgstr "Jetzt prüfen"
-
-#: ../src/view/home/HomeBox.py:261
-msgid "List view"
-msgstr "Listenansicht"
-
-#: ../src/view/home/HomeBox.py:262
-msgid "<Ctrl>2"
-msgstr "<Ctrl>2"
-
-#: ../src/view/home/HomeBox.py:320
-msgid "Favorites view"
-msgstr "Favoritenansicht"
-
-#: ../src/view/home/HomeBox.py:321
-msgid "<Ctrl>1"
-msgstr "<Ctrl>1"
-
-#: ../src/view/home/MeshBox.py:97
-msgid "Connect"
-msgstr "Verbinden"
-
-# (mschlager) war 'Nicht verbunden', ich würde aber eher erwarten, dass das die Beschriftung eines Menüeintrags ist, mit dem man eine Verbindung trennt, was dann in der Folge die Meldung 'Disconnecting...' liefert.
-#: ../src/view/home/MeshBox.py:106
-msgid "Disconnect"
-msgstr "Verbindung trennen"
-
-# Only show disconnect when there's a mesh device, because mesh takes
-# priority over the normal wireless device. NM doesn't have a "disconnect"
-# method for a device either (for various reasons) so this doesn't
-# have a good mapping
-#: ../src/view/home/MeshBox.py:118
-msgid "Disconnecting..."
-msgstr "Trenne Verbindung..."
-
-# Only show disconnect when there's a mesh device, because mesh takes
-# priority over the normal wireless device. NM doesn't have a "disconnect"
-# method for a device either (for various reasons) so this doesn't
-# have a good mapping
-#: ../src/view/home/MeshBox.py:159
-msgid "Connecting..."
-msgstr "Verbinde..."
-
-# TODO: show the channel number
-#. TODO: show the channel number
-#: ../src/view/home/MeshBox.py:166
-msgid "Connected"
-msgstr "Verbunden"
-
-#: ../src/view/home/MeshBox.py:218 ../src/view/devices/network/mesh.py:41
-#: ../src/view/devices/network/mesh.py:68
-#: ../src/view/devices/network/mesh.py:72
-msgid "Mesh Network"
-msgstr "Maschennetzwerk"
-
-# Only show disconnect when there's a mesh device, because mesh takes
-# priority over the normal wireless device. NM doesn't have a "disconnect"
-# method for a device either (for various reasons) so this doesn't
-# have a good mapping
-#: ../src/view/home/MeshBox.py:221 ../src/view/devices/network/wireless.py:125
-#: ../src/view/devices/network/mesh.py:89
-msgid "Disconnect..."
-msgstr "Verbindung trennen..."
-
-#. TRANS: Action label for resuming an activity.
-#: ../src/view/home/MeshBox.py:309 ../src/view/palettes.py:61
-#: ../src/journal/journaltoolbox.py:399 ../src/journal/palettes.py:57
-msgid "Resume"
-msgstr "Wiederaufnehmen"
-
-#: ../src/view/home/MeshBox.py:314 ../src/view/frame/activitiestray.py:206
-msgid "Join"
-msgstr "Mitmachen"
-
-#: ../src/view/devices/battery.py:45
-msgid "My Battery"
-msgstr "Meine Batterie"
-
-#: ../src/view/devices/battery.py:114
-msgid "Charging"
-msgstr "Aufladen"
-
-#: ../src/view/devices/battery.py:117
-msgid "Very little power remaining"
-msgstr "Sehr wenig Ladung verbleibend"
-
-#: ../src/view/devices/battery.py:123
-#, python-format
-msgid "%(hour)d:%(min).2d remaining"
-msgstr "%(hour)d:%(min).2d verbleibend"
-
-#: ../src/view/devices/battery.py:127
-msgid "Charged"
-msgstr "Aufgeladen"
-
-#: ../src/view/devices/speaker.py:44
-msgid "My Speakers"
-msgstr "Meine Lautsprecher"
-
-#: ../src/view/devices/speaker.py:125
-msgid "Unmute"
-msgstr "Laut schalten"
-
-#: ../src/view/devices/speaker.py:128
-msgid "Mute"
-msgstr "Stumm schalten"
-
-#: ../src/view/devices/network/wireless.py:67
-msgid "Disconnected"
-msgstr "Nicht verbunden"
-
-#: ../src/view/devices/network/wireless.py:143
-msgid "Channel"
-msgstr "Kanal"
-
-#: ../src/view/frame/zoomtoolbar.py:37
-msgid "Neighborhood"
-msgstr "Umgebung"
-
-#: ../src/view/frame/zoomtoolbar.py:39
-msgid "Group"
-msgstr "Gruppe"
-
-# (Markus S.) war 'Zuhause', vgl. stuffer-sheet
-#: ../src/view/frame/zoomtoolbar.py:41
-msgid "Home"
-msgstr "Startbildschirm"
-
-#: ../src/view/frame/zoomtoolbar.py:43
-msgid "Activity"
-msgstr "Aktivität"
-
-#: ../src/controlpanel/cmd.py:26
-#, python-format
-msgid ""
-"sugar-control-panel: WARNING, found more than one option with the same name: "
-"%s module: %r"
-msgstr ""
-"sugar-control-panel: WARNUNG, mehr als eine Option mit demselben Namen: %s "
-"und Modul: %r gefunden"
-
-#: ../src/controlpanel/cmd.py:28
-#, python-format
-msgid "sugar-control-panel: key=%s not an available option"
-msgstr "sugar-control-panel: key=%s ist keine verfügbare Option"
-
-#: ../src/controlpanel/cmd.py:29
-#, python-format
-msgid "sugar-control-panel: %s"
-msgstr "sugar-control-panel: %s"
-
-# (Markus S.) war 'Benutzung: sugar-control-panel [ option ] key [ args ... ] \n'; 'Parameter' war 'Key'.
-#. TRANS: Translators, there's a empty line at the end of this string,
-#. which must appear in the translated string (msgstr) as well.
-#: ../src/controlpanel/cmd.py:35
-msgid ""
-"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
-" Control for the sugar environment. \n"
-" Options: \n"
-" -h show this help message and exit \n"
-" -l list all the available options \n"
-" -h key show information about this key \n"
-" -g key get the current value of the key \n"
-" -s key set the current value for the key \n"
-" -c key clear the current value for the key \n"
-" "
-msgstr ""
-"Benutzung: sugar-control-panel [ Option ] Parameter [ Argumente ... ] \n"
-" Einstellungen für Sugar. \n"
-" Optionen: \n"
-" -h Diese Hilfe anzeigen und beenden\n"
-" -l Alle verfügbaren Optionen auflisten\n"
-" -h Parameter Informationen zu diesem Parameter zeigen\n"
-" -g Parameter Den aktuellen Wert für diesen Parameter auslesen\n"
-" -s Parameter Den aktuellen Wert für diesen Parameter festlegen\n"
-" -c Parameter Den aktuellen Wert für diesen Parameter zurücksetzen\n"
-" "
-
-#: ../src/controlpanel/cmd.py:48
-msgid "To apply your changes you have to restart sugar.\n"
-msgstr "Um die Änderungen zu übernehmen, muss Sugar neu gestartet werden.\n"
-
-#: ../src/controlpanel/toolbar.py:121 ../src/view/home/favoritesview.py:305
-msgid "Ok"
-msgstr "Ok"
-
-#: ../src/controlpanel/sectionview.py:42 ../src/controlpanel/gui.py:265
-msgid "Changes require restart"
-msgstr "Neustart zur Übernahme der Änderungen notwendig"
-
-#: ../src/controlpanel/gui.py:264
-msgid "Warning"
-msgstr "Warnung"
-
-#: ../src/controlpanel/gui.py:268
-msgid "Cancel changes"
-msgstr "Änderungen aufheben"
-
-#: ../src/controlpanel/gui.py:277
-msgid "Restart now"
-msgstr "Jetzt neustarten"
+#: ../extensions/cpsection/aboutme/__init__.py:24
+msgid "About Me"
+msgstr "Über mich"
-#: ../src/controlpanel/aboutme/model.py:44
+#: ../extensions/cpsection/aboutme/model.py:43
msgid "You must enter a name."
msgstr "Bitte einen Namen eingeben"
-#: ../src/controlpanel/aboutme/model.py:69
+#: ../extensions/cpsection/aboutme/model.py:68
#, python-format
msgid "stroke: color=%s hue=%s"
msgstr "Linie: Farbe=%s Farbton=%s"
-#: ../src/controlpanel/aboutme/model.py:72
+#: ../extensions/cpsection/aboutme/model.py:71
#, python-format
msgid "stroke: %s"
msgstr "Linie: %s"
-#: ../src/controlpanel/aboutme/model.py:74
+#: ../extensions/cpsection/aboutme/model.py:73
#, python-format
msgid "fill: color=%s hue=%s"
msgstr "Füllung: Farbe=%s Farbton=%s"
-#: ../src/controlpanel/aboutme/model.py:76
+#: ../extensions/cpsection/aboutme/model.py:75
#, python-format
msgid "fill: %s"
msgstr "Füllung: %s"
-#: ../src/controlpanel/aboutme/model.py:87
+#: ../extensions/cpsection/aboutme/model.py:86
msgid "Error in specified color modifiers."
msgstr "Fehler in den angegebenen Farbänderungen."
-#: ../src/controlpanel/aboutme/model.py:90
+#: ../extensions/cpsection/aboutme/model.py:89
msgid "Error in specified colors."
msgstr "Fehler in den angegebenen Farben."
-#: ../src/controlpanel/aboutme/view.py:32
-#: ../src/controlpanel/aboutme/__init__.py:22
-msgid "About Me"
-msgstr "Über mich"
+#: ../extensions/cpsection/aboutme/view.py:94
+#: ../src/jarabe/intro/window.py:92
+msgid "Name:"
+msgstr "Name:"
-#: ../src/controlpanel/aboutme/view.py:134
+#: ../extensions/cpsection/aboutme/view.py:128
msgid "Click to change your color:"
msgstr "Klicken, um deine Farbe zu wechseln:"
-#: ../src/controlpanel/aboutxo/model.py:24
+#: ../extensions/cpsection/aboutcomputer/__init__.py:21
+msgid "About my Computer"
+msgstr "Über meinen Computer"
+
+#: ../extensions/cpsection/aboutcomputer/model.py:26
msgid "Not available"
msgstr "Nicht verfügbar"
-#: ../src/controlpanel/aboutxo/view.py:55
+#: ../extensions/cpsection/aboutcomputer/view.py:59
msgid "Identity"
msgstr "Identität"
-#: ../src/controlpanel/aboutxo/view.py:64
+#: ../extensions/cpsection/aboutcomputer/view.py:68
msgid "Serial Number:"
msgstr "Seriennummer:"
-#: ../src/controlpanel/aboutxo/view.py:87
+#: ../extensions/cpsection/aboutcomputer/view.py:90
msgid "Software"
msgstr "Software"
-#: ../src/controlpanel/aboutxo/view.py:96
+#: ../extensions/cpsection/aboutcomputer/view.py:99
msgid "Build:"
msgstr "Version:"
-#: ../src/controlpanel/aboutxo/view.py:111
+#: ../extensions/cpsection/aboutcomputer/view.py:114
msgid "Sugar:"
msgstr "Sugar:"
-#: ../src/controlpanel/aboutxo/view.py:126
+#: ../extensions/cpsection/aboutcomputer/view.py:130
msgid "Firmware:"
msgstr "Firmware:"
-#: ../src/controlpanel/aboutxo/view.py:148
+#: ../extensions/cpsection/aboutcomputer/view.py:145
+#, fuzzy
+msgid "Wireless Firmware:"
+msgstr "WLAN-Firmware:"
+
+#: ../extensions/cpsection/aboutcomputer/view.py:168
msgid "Copyright and License"
msgstr "Copyright und Lizenz"
-#: ../src/controlpanel/aboutxo/view.py:156
+#: ../extensions/cpsection/aboutcomputer/view.py:176
msgid ""
"© 2008 One Laptop per Child Association Inc; Red Hat Inc; and Contributors."
msgstr ""
"© 2008 One Laptop per Child Association Inc; Red Hat Inc; and Contributors."
-#: ../src/controlpanel/aboutxo/view.py:163
+#: ../extensions/cpsection/aboutcomputer/view.py:183
msgid ""
"Sugar is the graphical user interface that you are looking at. Sugar is free "
"software, covered by the GNU General Public License, and you are welcome to "
@@ -430,395 +119,1037 @@ msgstr ""
"darin festgelegten Bedingungen ist es erlaubt, die Software zu verändern "
"und/oder Kopien davon zu erstellen und zu verteilen."
-#: ../src/controlpanel/aboutxo/view.py:175
+#: ../extensions/cpsection/aboutcomputer/view.py:195
msgid "Full license:"
msgstr "Vollständige Lizenz:"
-#: ../src/controlpanel/aboutxo/__init__.py:21
-msgid "About my XO"
-msgstr "Über meinen XO"
+#: ../extensions/cpsection/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr "Datum & Uhrzeit"
-#: ../src/controlpanel/datetime/model.py:89
+#: ../extensions/cpsection/datetime/model.py:87
msgid "Error timezone does not exist."
msgstr "Fehler: unbekannte Zeitzone."
-#: ../src/controlpanel/datetime/view.py:68
+#: ../extensions/cpsection/datetime/view.py:68
+#: ../data/sugar.schemas.in.h:19
msgid "Timezone"
msgstr "Zeitzone"
-#: ../src/controlpanel/datetime/__init__.py:21
-msgid "Date & Time"
-msgstr "Datum & Uhrzeit"
+# (Markus S.) 'Rahmen'? (Vorschlag von hmeyer)
+#: ../extensions/cpsection/frame/__init__.py:21
+#, fuzzy
+msgid "Frame"
+msgstr "Frame"
-#: ../src/controlpanel/frame/model.py:38 ../src/controlpanel/frame/model.py:60
+#: ../extensions/cpsection/frame/model.py:38
+#: ../extensions/cpsection/frame/model.py:60
msgid "Value must be an integer."
msgstr "Der Wert muss ganzzahlig sein."
-#: ../src/controlpanel/frame/view.py:26
+#: ../extensions/cpsection/frame/view.py:26
msgid "never"
msgstr "nie"
# (Markus S.) ' unmittelbar'?
-#: ../src/controlpanel/frame/view.py:27
+#: ../extensions/cpsection/frame/view.py:27
msgid "instantaneous"
msgstr "sofort"
-#: ../src/controlpanel/frame/view.py:28
+#: ../extensions/cpsection/frame/view.py:28
#, python-format
msgid "%s seconds"
msgstr "%s Sekunden"
-#: ../src/controlpanel/frame/view.py:52
+#: ../extensions/cpsection/frame/view.py:52
msgid "Activation Delay"
msgstr "Aktivierungsverzögerung"
-#: ../src/controlpanel/frame/view.py:76
+#: ../extensions/cpsection/frame/view.py:76
msgid "Corner"
msgstr "Ecke"
-#: ../src/controlpanel/frame/view.py:111
+#: ../extensions/cpsection/frame/view.py:111
msgid "Edge"
msgstr "Kante"
-# (Markus S.) 'Rahmen'? (Vorschlag von hmeyer)
-#: ../src/controlpanel/frame/__init__.py:21
-#, fuzzy
-msgid "Frame"
-msgstr "Frame"
+#: ../extensions/cpsection/language/__init__.py:21
+#: ../extensions/cpsection/language/view.py:32
+msgid "Language"
+msgstr "Sprache"
-#: ../src/controlpanel/language/model.py:28
+#: ../extensions/cpsection/language/model.py:28
msgid "Could not access ~/.i18n. Create standard settings."
msgstr "Zugriff auf %s nicht möglich. Erzeuge daher Standardeinstellungen."
-#: ../src/controlpanel/language/model.py:114
+#: ../extensions/cpsection/language/model.py:124
#, python-format
msgid "Language for code=%s could not be determined."
msgstr "Sprache für Code=%s konnte nicht ermittelt werden."
-#: ../src/controlpanel/language/model.py:131
+#: ../extensions/cpsection/language/model.py:144
#, python-format
msgid "Sorry I do not speak '%s'."
msgstr "Entschuldigung, ich spreche nicht '%s'."
-#: ../src/controlpanel/language/view.py:70
-#: ../src/controlpanel/language/__init__.py:21
-msgid "Language"
-msgstr "Sprache"
+#: ../extensions/cpsection/network/__init__.py:21
+#: ../extensions/cpsection/network/view.py:28
+msgid "Network"
+msgstr "Netzwerk"
-#: ../src/controlpanel/network/model.py:62
+#: ../extensions/cpsection/network/model.py:79
msgid "State is unknown."
msgstr "Status ist nicht bekannt."
# (Markus S.) vgl. http://lists.laptop.org/pipermail/localization/2008-July/001232.html
-#: ../src/controlpanel/network/model.py:82
+#: ../extensions/cpsection/network/model.py:105
msgid "Error in specified radio argument use on/off."
msgstr "Fehler im angegebenen radio-Parameter (Funknetz) -- on/off verwenden."
-#: ../src/controlpanel/network/view.py:28
-#: ../src/controlpanel/network/__init__.py:21
-msgid "Network"
-msgstr "Netzwerk"
+# (Markus S.) vgl. http://lists.laptop.org/pipermail/localization/2008-July/001232.html
+#: ../extensions/cpsection/network/model.py:137
+#, fuzzy
+msgid "Error in specified argument use 0/1."
+msgstr "Fehler im angegebenen radio-Parameter (Funknetz) -- on/off verwenden."
-#: ../src/controlpanel/network/view.py:54
+#: ../extensions/cpsection/network/view.py:56
msgid "Wireless"
msgstr "Drahtlosnetzwerk"
-#: ../src/controlpanel/network/view.py:62
-msgid "Turn of the wireless radio to save battery life"
+#: ../extensions/cpsection/network/view.py:64
+msgid "Turn off the wireless radio to save battery life"
msgstr "Schalte das Funknetz aus, um die Lebensdauer der Batterie zu erhöhen"
# (Markus S,) war 'Radio:'
-#: ../src/controlpanel/network/view.py:75
-#, fuzzy
+#: ../extensions/cpsection/network/view.py:77
msgid "Radio"
msgstr "Funknetz"
-#: ../src/controlpanel/network/view.py:91
+#: ../extensions/cpsection/network/view.py:93
msgid "Discard network history if you have trouble connecting to the network"
msgstr ""
"Verwirf die Netzwerk-Chronik, wenn du Schwierigkeiten hast, dich mit dem "
"Netzwerk zu verbinden"
-#: ../src/controlpanel/network/view.py:100
+#: ../extensions/cpsection/network/view.py:102
msgid "Discard network history"
msgstr "Netzwerk-Chronik verwerfen"
-# (Markus S.) 'Zelle'?
-#: ../src/controlpanel/network/view.py:113
-msgid "Mesh"
-msgstr "Masche"
+#: ../extensions/cpsection/network/view.py:115
+#, fuzzy
+msgid "Collaboration"
+msgstr "Zusammenarbeit"
+
+#: ../extensions/cpsection/network/view.py:123
+msgid ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
+msgstr ""
+"Der Server entspricht dem Raum, in dem du dich befindest; Personen am selben "
+"Server können einander sehen, selbst wenn sie sich nicht im selben Netzwerk "
+"befinden."
-#: ../src/controlpanel/network/view.py:122
+#: ../extensions/cpsection/network/view.py:133
msgid "Server:"
msgstr "Server:"
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr "Energieversorgung"
+
# (Markus S.) vgl. http://lists.laptop.org/pipermail/localization/2008-July/001232.html
-#: ../src/controlpanel/power/model.py:55
+#: ../extensions/cpsection/power/model.py:54
msgid "Error in automatic pm argument, use on/off."
msgstr ""
"Fehler im automatischen pm-Parameter (Energieverwaltung) --on/off verwenden."
# (Markus S.) vgl. http://lists.laptop.org/pipermail/localization/2008-July/001232.html
-#: ../src/controlpanel/power/model.py:84
+#: ../extensions/cpsection/power/model.py:81
msgid "Error in extreme pm argument, use on/off."
msgstr "Fehler im extremen pm-Parameter (Energieverwaltung) -- on/off benutzen."
-#: ../src/controlpanel/power/view.py:47
+#: ../extensions/cpsection/power/view.py:47
msgid "Power management"
msgstr "Energieverwaltung"
-#: ../src/controlpanel/power/view.py:57
+#: ../extensions/cpsection/power/view.py:57
msgid "Automatic power management (increases battery life)"
msgstr "Automatische Energieverwaltung (erhöht die Lebensdauer der Batterie)"
-#: ../src/controlpanel/power/view.py:85
+#: ../extensions/cpsection/power/view.py:85
msgid ""
"Extreme power management (disableswireless radio, increases battery life)"
msgstr ""
"Extreme Energieverwaltung (deaktiviert das Funknetz, erhöht die Lebensdauer "
"der Batterie)"
-#: ../src/controlpanel/power/__init__.py:21
-msgid "Power"
-msgstr "Energieversorgung"
+#: ../extensions/deviceicon/battery.py:56
+msgid "My Battery"
+msgstr "Meine Batterie"
-#: ../src/view/devices/network/mesh.py:111
-msgid "Connected to a School Mesh Portal"
-msgstr "Verbunden mit einem Schul-Maschennetzwerk-Portal"
+#: ../extensions/deviceicon/battery.py:137
+#, fuzzy
+msgid "Removed"
+msgstr "Entfernen"
-#: ../src/view/devices/network/mesh.py:113
-msgid "Looking for a School Mesh Portal..."
-msgstr "Suche Schul-Maschennetzwerk-Portal..."
+#: ../extensions/deviceicon/battery.py:140
+msgid "Charging"
+msgstr "Aufladen"
+
+#: ../extensions/deviceicon/battery.py:143
+msgid "Very little power remaining"
+msgstr "Sehr wenig Ladung verbleibend"
-#: ../src/view/devices/network/mesh.py:116
-msgid "Connected to an XO Mesh Portal"
-msgstr "Verbunden mit einem XO-Maschennetzwerk-Portal"
+#: ../extensions/deviceicon/battery.py:149
+#, python-format
+msgid "%(hour)d:%(min).2d remaining"
+msgstr "%(hour)d:%(min).2d verbleibend"
-#: ../src/view/devices/network/mesh.py:118
-msgid "Looking for an XO Mesh Portal..."
-msgstr "Suche XO-Maschennetzwerk-Portal..."
+#: ../extensions/deviceicon/battery.py:152
+msgid "Charged"
+msgstr "Aufgeladen"
-#: ../src/view/devices/network/mesh.py:121
-msgid "Connected to a Simple Mesh"
-msgstr "Verbunden mit einem einfachen Maschennetzwerk"
+#: ../extensions/deviceicon/network.py:40
+#, python-format
+msgid "IP address: %s"
+msgstr "IP-Addresse: %s"
-#: ../src/view/devices/network/mesh.py:123
-msgid "Starting a Simple Mesh"
-msgstr "Starte ein einfaches Maschennetzwerk"
+# Only show disconnect when there's a mesh device, because mesh takes
+# priority over the normal wireless device. NM doesn't have a "disconnect"
+# method for a device either (for various reasons) so this doesn't
+# have a good mapping
+#: ../extensions/deviceicon/network.py:104
+msgid "Disconnect..."
+msgstr "Verbindung trennen..."
-#: ../src/view/devices/network/mesh.py:130
-msgid "Unknown Mesh"
-msgstr "Unbekanntes Maschennetzwerk"
+# Only show disconnect when there's a mesh device, because mesh takes
+# priority over the normal wireless device. NM doesn't have a "disconnect"
+# method for a device either (for various reasons) so this doesn't
+# have a good mapping
+#: ../extensions/deviceicon/network.py:109
+#: ../src/jarabe/desktop/meshbox.py:247
+msgid "Connecting..."
+msgstr "Verbinde..."
-#: ../src/view/frame/activitiestray.py:211
-msgid "Decline"
-msgstr "Ablehnen"
+# TODO: show the channel number
+#: ../extensions/deviceicon/network.py:113
+#: ../extensions/deviceicon/network.py:166
+#: ../src/jarabe/desktop/meshbox.py:253
+msgid "Connected"
+msgstr "Verbunden"
+
+#: ../extensions/deviceicon/network.py:126
+msgid "Channel"
+msgstr "Kanal"
+
+#: ../extensions/deviceicon/network.py:141
+msgid "Wired Network"
+msgstr "Kabelnetzwerk"
+
+#: ../extensions/deviceicon/network.py:169
+#, fuzzy
+msgid "Speed"
+msgstr "Geschwindigkeit"
+
+#: ../extensions/deviceicon/speaker.py:46
+msgid "My Speakers"
+msgstr "Meine Lautsprecher"
+
+#: ../extensions/deviceicon/speaker.py:128
+msgid "Unmute"
+msgstr "Laut schalten"
+
+#: ../extensions/deviceicon/speaker.py:131
+msgid "Mute"
+msgstr "Stumm schalten"
+
+#: ../extensions/globalkey/screenshot.py:50
+msgid "Screenshot"
+msgstr "Bildschirmfoto"
+
+#: ../data/sugar.schemas.in.h:1
+#, fuzzy
+msgid "Backup URL"
+msgstr "Backup-URL"
+
+#: ../data/sugar.schemas.in.h:2
+msgid ""
+"Color for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke color and fill color, format is that of rbg colors. "
+"Example: #AC32FF,#9A5200"
+msgstr ""
+"Farbe des XO-Symbols, das überall auf dem Desktop benutzt wird. Die "
+"Zeichenkette setzt sich aus der Linien- und der Füllfarbe zusammen, die "
+"jeweils als RGB-Farben angeben werden. Beispiel: #AC32FF,#9A5200"
+
+#: ../data/sugar.schemas.in.h:3
+msgid "Corner Delay"
+msgstr "Eckenverzögerung"
+
+#: ../data/sugar.schemas.in.h:4
+msgid "Delay for the activation of the frame using the corners."
+msgstr "Verzögerung bei der Aktivierung eines Rahmens über die Ecken."
+
+#: ../data/sugar.schemas.in.h:5
+msgid "Delay for the activation of the frame using the edges."
+msgstr "Verzögerung bei der Aktivierung eines Rahmens über die Ränder."
+
+#: ../data/sugar.schemas.in.h:6
+msgid "Edge Delay"
+msgstr "Randverzögerung"
+
+#: ../data/sugar.schemas.in.h:7
+#, fuzzy
+msgid "Favorites Layout"
+msgstr "Favoriten-Layout"
+
+#: ../data/sugar.schemas.in.h:8
+#, fuzzy
+msgid "Favorites resume mode"
+msgstr "Favoriten-Wiederaufnahemodus"
+
+#: ../data/sugar.schemas.in.h:9
+#, fuzzy
+msgid ""
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
+msgstr ""
+"Falls WAHR, wird Sugar es anderen Benutzern des Jabber-Servers ermöglichen, "
+"nach uns zu suchen."
+
+#: ../data/sugar.schemas.in.h:10
+#, fuzzy
+msgid "Jabber Server"
+msgstr "Jabber-Server"
+
+#: ../data/sugar.schemas.in.h:11
+msgid "Layout of the favorites view."
+msgstr "Layout der Favoriten-Ansicht"
+
+#: ../data/sugar.schemas.in.h:12
+msgid "Power Automatic"
+msgstr "Automatische Energieverwaltung"
+
+#: ../data/sugar.schemas.in.h:13
+msgid "Power Automatic."
+msgstr "Automatische Energieverwaltung."
+
+#: ../data/sugar.schemas.in.h:14
+#, fuzzy
+msgid "Power Extreme"
+msgstr "Extreme Energieverwaltung"
+
+#: ../data/sugar.schemas.in.h:15
+#, fuzzy
+msgid "Power Extreme."
+msgstr "Extreme Energieverwaltung."
+
+#: ../data/sugar.schemas.in.h:16
+#, fuzzy
+msgid "Publish to Gadget"
+msgstr "Veröffentlichen auf Gerät"
+
+#: ../data/sugar.schemas.in.h:17
+msgid "Setting for muting the sound device."
+msgstr "Einstellung zum Stummschalten der Audio-Ausgabe"
+
+#: ../data/sugar.schemas.in.h:18
+msgid "Sound Muted"
+msgstr "Stummgeschaltet"
+
+#: ../data/sugar.schemas.in.h:20
+msgid "Timezone setting for the system."
+msgstr "Zeitzoneneinstellung des Systems"
+
+#: ../data/sugar.schemas.in.h:21
+#, fuzzy
+msgid "Url of the jabber server to use."
+msgstr "URL des zu nutzenden Jabber-Servers."
+
+#: ../data/sugar.schemas.in.h:22
+msgid "Url where the backup is saved to."
+msgstr "URL, unter der das Backup gespeichert wird."
+
+#: ../data/sugar.schemas.in.h:23
+msgid "User Color"
+msgstr "Benutzerfarbe"
+
+#: ../data/sugar.schemas.in.h:24
+msgid "User Name"
+msgstr "Benutzername"
+
+#: ../data/sugar.schemas.in.h:25
+msgid "User name that is used throughout the desktop."
+msgstr "Benutzername, der überall auf dem Desktop benutzt wird."
+
+#: ../data/sugar.schemas.in.h:26
+msgid "Volume Level"
+msgstr "Lautstärkepegel"
+
+#: ../data/sugar.schemas.in.h:27
+msgid "Volume level for the sound device."
+msgstr "Lautstärkepegel für die Audio-Ausgabe"
+
+#: ../data/sugar.schemas.in.h:28
+#, fuzzy
+msgid ""
+"When in resume mode, clicking on a favorite icon will cause the last entry "
+"for that activity to be resumed."
+msgstr ""
+"Wenn im Wiederaufnahemodus, führt ein Anklicken des Favoriten-Symbols dazu, "
+"dass der letzte Eintrag für diese Aktivität wieder aufgenommen wird."
+
+#: ../src/jarabe/controlpanel/cmd.py:28
+#, python-format
+msgid ""
+"sugar-control-panel: WARNING, found more than one option with the same name: "
+"%s module: %r"
+msgstr ""
+"sugar-control-panel: WARNUNG, mehr als eine Option mit demselben Namen: %s "
+"und Modul: %r gefunden"
+
+#: ../src/jarabe/controlpanel/cmd.py:30
+#, python-format
+msgid "sugar-control-panel: key=%s not an available option"
+msgstr "sugar-control-panel: key=%s ist keine verfügbare Option"
+
+#: ../src/jarabe/controlpanel/cmd.py:31
+#, python-format
+msgid "sugar-control-panel: %s"
+msgstr "sugar-control-panel: %s"
+
+# (Markus S.) war 'Benutzung: sugar-control-panel [ option ] key [ args ... ] \n'; 'Parameter' war 'Key'.
+# TRANS: Translators, there's a empty line at the end of this string,
+# which must appear in the translated string (msgstr) as well.
+#. TRANS: Translators, there's a empty line at the end of this string,
+#. which must appear in the translated string (msgstr) as well.
+#: ../src/jarabe/controlpanel/cmd.py:37
+msgid ""
+"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
+" Control for the sugar environment. \n"
+" Options: \n"
+" -h show this help message and exit \n"
+" -l list all the available options \n"
+" -h key show information about this key \n"
+" -g key get the current value of the key \n"
+" -s key set the current value for the key \n"
+" -c key clear the current value for the key \n"
+" "
+msgstr ""
+"Benutzung: sugar-control-panel [ Option ] Parameter [ Argumente ... ] \n"
+" Einstellungen für Sugar. \n"
+" Optionen: \n"
+" -h Diese Hilfe anzeigen und beenden\n"
+" -l Alle verfügbaren Optionen auflisten\n"
+" -h Parameter Informationen zu diesem Parameter zeigen\n"
+" -g Parameter Den aktuellen Wert für diesen Parameter auslesen\n"
+" -s Parameter Den aktuellen Wert für diesen Parameter festlegen\n"
+" -c Parameter Den aktuellen Wert für diesen Parameter zurücksetzen\n"
+" "
+
+#: ../src/jarabe/controlpanel/cmd.py:50
+msgid "To apply your changes you have to restart sugar.\n"
+msgstr "Um die Änderungen zu übernehmen, muss Sugar neu gestartet werden.\n"
+
+#: ../src/jarabe/controlpanel/gui.py:275
+msgid "Warning"
+msgstr "Warnung"
+
+#: ../src/jarabe/controlpanel/gui.py:276
+#: ../src/jarabe/controlpanel/sectionview.py:42
+msgid "Changes require restart"
+msgstr "Neustart zur Übernahme der Änderungen notwendig"
+
+#: ../src/jarabe/controlpanel/gui.py:279
+msgid "Cancel changes"
+msgstr "Änderungen aufheben"
+
+#: ../src/jarabe/controlpanel/gui.py:284
+#: ../src/jarabe/desktop/homebox.py:113
+msgid "Later"
+msgstr "Später"
+
+#: ../src/jarabe/controlpanel/gui.py:288
+msgid "Restart now"
+msgstr "Jetzt neustarten"
+
+#: ../src/jarabe/controlpanel/toolbar.py:61
+#: ../src/jarabe/intro/window.py:188
+msgid "Done"
+msgstr "Fertig"
+
+#: ../src/jarabe/controlpanel/toolbar.py:115
+#: ../src/jarabe/desktop/homebox.py:111
+#: ../src/jarabe/frame/activitiestray.py:687
+#: ../src/jarabe/frame/activitiestray.py:766
+#: ../src/jarabe/frame/activitiestray.py:794
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: ../src/jarabe/controlpanel/toolbar.py:121
+#: ../src/jarabe/desktop/favoritesview.py:338
+msgid "Ok"
+msgstr "Ok"
# TRANS: label for the freeform layout in the favorites view
#. TRANS: label for the freeform layout in the favorites view
-#: ../src/view/home/favoriteslayout.py:107
+#: ../src/jarabe/desktop/favoriteslayout.py:114
msgid "Freeform"
msgstr "Freie Form"
# TRANS: label for the ring layout in the favorites view
#. TRANS: label for the ring layout in the favorites view
-#: ../src/view/home/favoriteslayout.py:189
+#: ../src/jarabe/desktop/favoriteslayout.py:196
msgid "Ring"
msgstr "Ring"
+# TRANS: label for the spiral layout in the favorites view
#. TRANS: label for the spiral layout in the favorites view
-#: ../src/view/home/favoriteslayout.py:334
+#: ../src/jarabe/desktop/favoriteslayout.py:332
msgid "Spiral"
msgstr "Spirale"
+# TRANS: label for the box layout in the favorites view
#. TRANS: label for the box layout in the favorites view
-#: ../src/view/home/favoriteslayout.py:401
+#: ../src/jarabe/desktop/favoriteslayout.py:399
msgid "Box"
msgstr "Rechteck"
+# TRANS: label for the box layout in the favorites view
#. TRANS: label for the box layout in the favorites view
-#: ../src/view/home/favoriteslayout.py:442
+#: ../src/jarabe/desktop/favoriteslayout.py:440
msgid "Triangle"
msgstr "Dreieck"
-#: ../src/view/home/favoritesview.py:295
+#: ../src/jarabe/desktop/favoritesview.py:329
msgid "Registration Failed"
msgstr "Registrierung fehlgeschlagen"
-#: ../src/view/home/favoritesview.py:296
+#: ../src/jarabe/desktop/favoritesview.py:330
#, python-format
msgid "%s"
msgstr "%s"
-#: ../src/view/home/favoritesview.py:298
+#: ../src/jarabe/desktop/favoritesview.py:332
msgid "Registration Successful"
msgstr "Registrierung erfolgreich"
-#: ../src/view/home/favoritesview.py:299
+#: ../src/jarabe/desktop/favoritesview.py:333
msgid "You are now registered with your school server."
msgstr "Du bist nun bei deinem Schulserver registriert."
-#: ../src/view/home/favoritesview.py:420
-msgid "Settings"
-msgstr "Einstellungen"
+#: ../src/jarabe/desktop/favoritesview.py:668
+msgid "Register"
+msgstr "Registrieren"
-#: ../src/view/home/favoritesview.py:425
-msgid "Restart"
-msgstr "Neustart"
+#: ../src/jarabe/desktop/homebox.py:67
+msgid "Confirm erase"
+msgstr "Löschen bestätigen"
-#: ../src/view/home/favoritesview.py:430
-msgid "Shutdown"
-msgstr "Ausschalten"
+#: ../src/jarabe/desktop/homebox.py:69
+#, python-format
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr "Löschen bestätigen: Willst du %s wirklich dauerhaft löschen?"
-#: ../src/view/home/favoritesview.py:436
-msgid "Register"
-msgstr "Registrieren"
+# self._stop_item = MenuItem(_('Stop download'), 'stock-close')
+# TODO: Implement stopping downloads
+# self._stop_item.connect('activate', self._stop_item_activate_cb)
+# self.append_menu_item(self._stop_item)
+#: ../src/jarabe/desktop/homebox.py:73
+#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/view/viewsource.py:218
+msgid "Keep"
+msgstr "Behalten"
-#: ../src/view/palettes.py:42
-msgid "Starting..."
-msgstr "Starte..."
+#: ../src/jarabe/desktop/homebox.py:76
+#: ../src/jarabe/journal/journaltoolbox.py:357
+#: ../src/jarabe/journal/palettes.py:112
+#: ../src/jarabe/view/palettes.py:153
+msgid "Erase"
+msgstr "Löschen"
-#: ../src/view/palettes.py:72
-msgid "Stop"
-msgstr "Stopp"
+#: ../src/jarabe/desktop/homebox.py:106
+msgid "Software Update"
+msgstr "Software-Aktualisierung"
-#. TRANS: Action label for starting an entry.
-#: ../src/view/palettes.py:104 ../src/journal/journaltoolbox.py:402
-#: ../src/journal/palettes.py:59
-msgid "Start"
-msgstr "Start"
+#: ../src/jarabe/desktop/homebox.py:107
+msgid "Update your activities to ensure compatibility with your new software"
+msgstr ""
+"Aktualisiere deine Aktivitäten, um die Kompatibilität mit deiner neuen "
+"Software sicher zu stellen."
-#: ../src/view/palettes.py:138
-msgid "Remove favorite"
-msgstr "Favorit entfernen"
+#: ../src/jarabe/desktop/homebox.py:116
+msgid "Check now"
+msgstr "Jetzt prüfen"
-#: ../src/view/palettes.py:142
-msgid "Make favorite"
-msgstr "Zum Favorit machen"
+#: ../src/jarabe/desktop/homebox.py:233
+msgid "List view"
+msgstr "Listenansicht"
-#: ../src/view/palettes.py:191
-msgid "Show contents"
-msgstr "Inhalte anzeigen"
+#: ../src/jarabe/desktop/homebox.py:234
+msgid "<Ctrl>2"
+msgstr "<Ctrl>2"
-#: ../src/view/palettes.py:215
+#: ../src/jarabe/desktop/homebox.py:296
+msgid "Favorites view"
+msgstr "Favoritenansicht"
+
+#: ../src/jarabe/desktop/homebox.py:297
+msgid "<Ctrl>1"
+msgstr "<Ctrl>1"
+
+#: ../src/jarabe/desktop/keydialog.py:131
+msgid "Key Type:"
+msgstr "Schlüsseltyp:"
+
+#: ../src/jarabe/desktop/keydialog.py:151
+msgid "Authentication Type:"
+msgstr "Authentifizierungstyp:"
+
+#: ../src/jarabe/desktop/keydialog.py:215
+msgid "WPA & WPA2 Personal"
+msgstr "WPA & WPA2 Personal"
+
+#: ../src/jarabe/desktop/keydialog.py:224
+#, fuzzy
+msgid "Wireless Security:"
+msgstr "WLAN-Sicherheit:"
+
+#: ../src/jarabe/desktop/meshbox.py:131
+msgid "Connect"
+msgstr "Verbinden"
+
+# (mschlager) war 'Nicht verbunden', ich würde aber eher erwarten, dass das die Beschriftung eines Menüeintrags ist, mit dem man eine Verbindung trennt, was dann in der Folge die Meldung 'Disconnecting...' liefert.
+#: ../src/jarabe/desktop/meshbox.py:135
+msgid "Disconnect"
+msgstr "Verbindung trennen"
+
+# TRANS: Action label for resuming an activity.
+#. TRANS: Action label for resuming an activity.
+#: ../src/jarabe/desktop/meshbox.py:441
+#: ../src/jarabe/frame/activitiestray.py:711
+#: ../src/jarabe/journal/journaltoolbox.py:425
+#: ../src/jarabe/journal/palettes.py:72
+#: ../src/jarabe/view/palettes.py:66
+msgid "Resume"
+msgstr "Wiederaufnehmen"
+
+#: ../src/jarabe/desktop/meshbox.py:446
+#: ../src/jarabe/frame/activitiestray.py:227
+msgid "Join"
+msgstr "Mitmachen"
+
+#: ../src/jarabe/desktop/schoolserver.py:34
+msgid "Cannot obtain data needed for registration."
+msgstr "Notwendige Daten für die Registrierung sind nicht verfügbar."
+
+#: ../src/jarabe/desktop/schoolserver.py:51
+msgid "Cannot connect to the server."
+msgstr "Kann nicht mit dem Server verbinden."
+
+#: ../src/jarabe/desktop/schoolserver.py:56
+msgid "The server could not complete the request."
+msgstr "Der Server konnte die Anforderung nicht erfüllen."
+
+#: ../src/jarabe/frame/activitiestray.py:232
+#: ../src/jarabe/frame/activitiestray.py:659
+msgid "Decline"
+msgstr "Ablehnen"
+
+#: ../src/jarabe/frame/activitiestray.py:612
#, python-format
-msgid "%(free_space)d MB Free"
-msgstr "%(free_space)d MB frei"
+msgid "%dB"
+msgstr "%dB"
+
+#: ../src/jarabe/frame/activitiestray.py:614
+#, python-format
+msgid "%dKB"
+msgstr "%dKB"
+
+#: ../src/jarabe/frame/activitiestray.py:616
+#, python-format
+msgid "%dMB"
+msgstr "%dMB"
+
+#: ../src/jarabe/frame/activitiestray.py:633
+#, python-format
+msgid "%s of %s"
+msgstr "%s von %s"
+
+#: ../src/jarabe/frame/activitiestray.py:644
+#, python-format
+#, fuzzy, python-format
+msgid "Transfer from %r"
+msgstr "Übertragung von %r"
+
+#: ../src/jarabe/frame/activitiestray.py:654
+msgid "Accept"
+msgstr "Akzeptieren"
+
+#: ../src/jarabe/frame/activitiestray.py:677
+#: ../src/jarabe/frame/activitiestray.py:784
+#, python-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../src/jarabe/frame/activitiestray.py:755
+#, python-format
+#, fuzzy, python-format
+msgid "Transfer to %r"
+msgstr "Übertragung zu %r"
+
+#: ../src/jarabe/frame/clipboardmenu.py:52
+msgid "Remove"
+msgstr "Entfernen"
+
+#: ../src/jarabe/frame/clipboardmenu.py:57
+#: ../src/jarabe/frame/clipboardmenu.py:80
+msgid "Open"
+msgstr "Öffnen"
+
+#: ../src/jarabe/frame/clipboardmenu.py:85
+msgid "Open with"
+msgstr "Öffnen mit"
+
+# (Markus S.) 'clipping', nicht 'clipped'
+#: ../src/jarabe/frame/clipboardobject.py:49
+#, python-format
+msgid "%s clipping"
+msgstr "%s ausgeschnitten"
+
+#: ../src/jarabe/frame/zoomtoolbar.py:36
+msgid "Neighborhood"
+msgstr "Umgebung"
+
+#: ../src/jarabe/frame/zoomtoolbar.py:38
+msgid "Group"
+msgstr "Gruppe"
+
+# (Markus S.) war 'Zuhause', vgl. stuffer-sheet
+#: ../src/jarabe/frame/zoomtoolbar.py:40
+msgid "Home"
+msgstr "Startbildschirm"
+
+#: ../src/jarabe/frame/zoomtoolbar.py:42
+msgid "Activity"
+msgstr "Aktivität"
+
+#: ../src/jarabe/intro/window.py:124
+msgid "Click to change color:"
+msgstr "Klicken zum Wechseln der Farbe:"
+
+#: ../src/jarabe/intro/window.py:174
+#: ../src/jarabe/journal/detailview.py:103
+msgid "Back"
+msgstr "Zurück"
+
+# (Markus S.) war 'Nächste'
+#: ../src/jarabe/intro/window.py:191
+msgid "Next"
+msgstr "Vor"
+
+#: ../src/jarabe/journal/collapsedentry.py:258
+#: ../src/jarabe/journal/expandedentry.py:159
+#: ../src/jarabe/journal/palettes.py:66
+msgid "Untitled"
+msgstr "Ohne Titel"
-#: ../src/journal/journaltoolbox.py:62
+#: ../src/jarabe/journal/expandedentry.py:205
+msgid "No preview"
+msgstr "Keine Vorschau"
+
+#: ../src/jarabe/journal/expandedentry.py:224
+msgid "Participants:"
+msgstr "Teilnehmer:"
+
+#: ../src/jarabe/journal/expandedentry.py:247
+msgid "Description:"
+msgstr "Beschreibung:"
+
+#: ../src/jarabe/journal/expandedentry.py:273
+msgid "Tags:"
+msgstr "Stichwörter:"
+
+#: ../src/jarabe/journal/journalactivity.py:108
+#: ../src/jarabe/journal/volumestoolbar.py:47
+msgid "Journal"
+msgstr "Journal"
+
+#: ../src/jarabe/journal/journaltoolbox.py:65
msgid "Search"
msgstr "Suchen"
-#: ../src/journal/journaltoolbox.py:119
+#: ../src/jarabe/journal/journaltoolbox.py:124
msgid "Anytime"
msgstr "Beliebiges Datum"
-#: ../src/journal/journaltoolbox.py:121
+#: ../src/jarabe/journal/journaltoolbox.py:126
msgid "Today"
msgstr "Heute"
-#: ../src/journal/journaltoolbox.py:123
+#: ../src/jarabe/journal/journaltoolbox.py:128
msgid "Since yesterday"
msgstr "Seit gestern"
+# TRANS: Filter entries modified during the last 7 days.
#. TRANS: Filter entries modified during the last 7 days.
-#: ../src/journal/journaltoolbox.py:125
+#: ../src/jarabe/journal/journaltoolbox.py:130
msgid "Past week"
msgstr "Vergangene Woche"
+# TRANS: Filter entries modified during the last 30 days.
#. TRANS: Filter entries modified during the last 30 days.
-#: ../src/journal/journaltoolbox.py:127
+#: ../src/jarabe/journal/journaltoolbox.py:132
msgid "Past month"
msgstr "Vergangener Monat"
+# TRANS: Filter entries modified during the last 356 days.
#. TRANS: Filter entries modified during the last 356 days.
-#: ../src/journal/journaltoolbox.py:129
+#: ../src/jarabe/journal/journaltoolbox.py:134
msgid "Past year"
msgstr "Vergangenes Jahr"
-#: ../src/journal/journaltoolbox.py:136
+#: ../src/jarabe/journal/journaltoolbox.py:141
msgid "Anyone"
msgstr "Alle"
-#: ../src/journal/journaltoolbox.py:138
+#: ../src/jarabe/journal/journaltoolbox.py:143
msgid "My friends"
msgstr "Meine Freunde"
-#: ../src/journal/journaltoolbox.py:139
+#: ../src/jarabe/journal/journaltoolbox.py:144
msgid "My class"
msgstr "Meine Klasse"
+# TRANS: Item in a combo box that filters by entry type.
#. TRANS: Item in a combo box that filters by entry type.
-#: ../src/journal/journaltoolbox.py:255
+#: ../src/jarabe/journal/journaltoolbox.py:271
msgid "Anything"
msgstr "Alles"
-#. TODO: Add "Start with" menu item
-#: ../src/journal/journaltoolbox.py:325 ../src/journal/palettes.py:67
+# TODO: Add "Start with" menu item
+#: ../src/jarabe/journal/journaltoolbox.py:347
+#: ../src/jarabe/journal/palettes.py:90
msgid "Copy"
msgstr "Kopieren"
-#: ../src/journal/collapsedentry.py:248 ../src/journal/expandedentry.py:176
-#: ../src/journal/palettes.py:51
-msgid "Untitled"
-msgstr "Ohne Titel"
+# TRANS: Action label for starting an entry.
+#. TRANS: Action label for starting an entry.
+#: ../src/jarabe/journal/journaltoolbox.py:428
+#: ../src/jarabe/journal/palettes.py:75
+#: ../src/jarabe/view/palettes.py:135
+msgid "Start"
+msgstr "Start"
-#: ../src/journal/journalactivity.py:119 ../src/journal/volumesmanager.py:57
-msgid "Journal"
-msgstr "Journal"
+#: ../src/jarabe/journal/listview.py:40
+msgid "Your Journal is empty"
+msgstr "Dein Journal ist leer."
-#: ../src/journal/expandedentry.py:222
-msgid "No preview"
-msgstr "Keine Vorschau"
+#: ../src/jarabe/journal/listview.py:41
+msgid "No matching entries "
+msgstr "Keine passenden Einträge"
-#: ../src/journal/expandedentry.py:241
-msgid "Participants:"
-msgstr "Teilnehmer:"
+#: ../src/jarabe/journal/listview.py:369
+#, fuzzy
+msgid "Clear search"
+msgstr "Suchliste leeren"
-#: ../src/journal/expandedentry.py:266
-msgid "Description:"
-msgstr "Beschreibung:"
+#: ../src/jarabe/journal/misc.py:91
+msgid "No date"
+msgstr "Kein Datum"
-#: ../src/journal/expandedentry.py:292
-msgid "Tags:"
-msgstr "Stichwörter:"
+#: ../src/jarabe/journal/modalalert.py:63
+msgid "Your Journal is full"
+msgstr "Dein Journal ist voll."
+
+#: ../src/jarabe/journal/modalalert.py:67
+msgid "Please delete some old Journal entries to make space for new ones."
+msgstr ""
+"Lösche bitte einige alte Journal-Einträge, um Platz für neue zu schaffen."
+
+#: ../src/jarabe/journal/modalalert.py:79
+msgid "Show Journal"
+msgstr "Journal anzeigen"
-#: ../src/journal/objectchooser.py:134
+#: ../src/jarabe/journal/objectchooser.py:147
msgid "Choose an object"
msgstr "Ein Objekt auswählen"
-#: ../src/journal/objectchooser.py:139
+#: ../src/jarabe/journal/objectchooser.py:152
+#: ../src/jarabe/view/viewsource.py:308
msgid "Close"
msgstr "Schließen"
-#: ../src/journal/volumestoolbar.py:93
+#: ../src/jarabe/journal/palettes.py:73
+#, fuzzy
+msgid "Resume with"
+msgstr "Wiederaufnahme mit"
+
+#: ../src/jarabe/journal/palettes.py:76
+#, fuzzy
+msgid "Start with"
+msgstr "Beginnen mit"
+
+#: ../src/jarabe/journal/palettes.py:98
+#, fuzzy
+msgid "Send to"
+msgstr "Senden an"
+
+#: ../src/jarabe/journal/palettes.py:107
+msgid "View Details"
+msgstr "Details betrachten"
+
+#: ../src/jarabe/journal/palettes.py:185
+msgid "No friends present"
+msgstr "Keine Freunde anwesend"
+
+#: ../src/jarabe/journal/palettes.py:190
+#, fuzzy
+msgid "No valid connection found"
+msgstr "Keine gültige Verbindung gefunden"
+
+#: ../src/jarabe/journal/palettes.py:218
+msgid "No activity to resume entry"
+msgstr "Keine Aktivität, um den Eintrag wieder aufzunehmen"
+
+#: ../src/jarabe/journal/palettes.py:220
+#, fuzzy
+msgid "No activity to start entry"
+msgstr "Keine Aktivität, um den Eintrag zu beginnen"
+
+#: ../src/jarabe/view/buddymenu.py:62
+msgid "Remove friend"
+msgstr "Freund entfernen"
+
+#: ../src/jarabe/view/buddymenu.py:65
+msgid "Make friend"
+msgstr "Freunde werden"
+
+#: ../src/jarabe/view/buddymenu.py:82
+msgid "My Settings"
+msgstr "Meine Einstellungen"
+
+#: ../src/jarabe/view/buddymenu.py:90
+msgid "Logout"
+msgstr "Logout"
+
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr "Neustart"
+
+#: ../src/jarabe/view/buddymenu.py:100
+msgid "Shutdown"
+msgstr "Ausschalten"
+
+#: ../src/jarabe/view/buddymenu.py:135
+#, python-format
+msgid "Invite to %s"
+msgstr "Einladen zu %s"
+
+#: ../src/jarabe/view/palettes.py:47
+msgid "Starting..."
+msgstr "Starte..."
+
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:73
+#, fuzzy
+msgid "View Source"
+msgstr "Quelltext betrachten"
+
+#: ../src/jarabe/view/palettes.py:84
+msgid "Stop"
+msgstr "Stopp"
+
+#: ../src/jarabe/view/palettes.py:171
+msgid "Remove favorite"
+msgstr "Favorit entfernen"
+
+#: ../src/jarabe/view/palettes.py:175
+msgid "Make favorite"
+msgstr "Zum Favorit machen"
+
+#: ../src/jarabe/view/palettes.py:238
+msgid "Show contents"
+msgstr "Inhalte anzeigen"
+
+#: ../src/jarabe/view/palettes.py:260
+#: ../src/jarabe/view/palettes.py:309
+#, python-format
+msgid "%(free_space)d MB Free"
+msgstr "%(free_space)d MB frei"
+
+#: ../src/jarabe/view/palettes.py:285
msgid "Unmount"
msgstr "Einbindung lösen"
-#: ../src/journal/misc.py:95
-msgid "No date"
-msgstr "Kein Datum"
+#: ../src/jarabe/view/viewsource.py:208
+#, fuzzy
+msgid "Instance Source"
+msgstr "Quelltext der Instanz"
-#: ../src/journal/listview.py:39
-msgid "Your Journal is empty"
-msgstr "Dein Journal ist leer."
+#: ../src/jarabe/view/viewsource.py:233
+#, fuzzy
+msgid "Source"
+msgstr "Quelltext"
-#: ../src/journal/listview.py:40
-msgid "No matching entries "
-msgstr "Keine passenden Einträge"
+#: ../src/jarabe/view/viewsource.py:292
+#, fuzzy
+msgid "Activity Bundle Source"
+msgstr "Quelltext des Aktivitätenbündels"
-#: ../src/journal/modalalert.py:59
-msgid "Your Journal is full"
-msgstr "Dein Journal ist voll."
+#: ../src/jarabe/view/viewsource.py:299
+#, python-format
+#, fuzzy, python-format
+msgid "View source: %r"
+msgstr "Quelltext betrachten: %r"
-#: ../src/journal/modalalert.py:63
-msgid "Please delete some old Journal entries to make space for new ones."
-msgstr ""
-"Lösche bitte einige alte Journal-Einträge, um Platz für neue zu schaffen."
+#~ msgid "Encryption Type:"
+#~ msgstr "Verschlüsselungstyp:"
-#: ../src/journal/modalalert.py:75
-msgid "Show Journal"
-msgstr "Journal anzeigen"
+# Only show disconnect when there's a mesh device, because mesh takes
+# priority over the normal wireless device. NM doesn't have a "disconnect"
+# method for a device either (for various reasons) so this doesn't
+# have a good mapping
+#~ msgid "Disconnecting..."
+#~ msgstr "Trenne Verbindung..."
+
+#~ msgid "Mesh Network"
+#~ msgstr "Maschennetzwerk"
+
+#~ msgid "Disconnected"
+#~ msgstr "Nicht verbunden"
+
+#~ msgid "About my XO"
+#~ msgstr "Über meinen XO"
+
+# (Markus S.) 'Zelle'?
+#~ msgid "Mesh"
+#~ msgstr "Masche"
+
+#~ msgid "Connected to a School Mesh Portal"
+#~ msgstr "Verbunden mit einem Schul-Maschennetzwerk-Portal"
+
+#~ msgid "Looking for a School Mesh Portal..."
+#~ msgstr "Suche Schul-Maschennetzwerk-Portal..."
+
+#~ msgid "Connected to an XO Mesh Portal"
+#~ msgstr "Verbunden mit einem XO-Maschennetzwerk-Portal"
+
+#~ msgid "Looking for an XO Mesh Portal..."
+#~ msgstr "Suche XO-Maschennetzwerk-Portal..."
+
+#~ msgid "Connected to a Simple Mesh"
+#~ msgstr "Verbunden mit einem einfachen Maschennetzwerk"
+
+#~ msgid "Starting a Simple Mesh"
+#~ msgstr "Starte ein einfaches Maschennetzwerk"
+
+#~ msgid "Unknown Mesh"
+#~ msgstr "Unbekanntes Maschennetzwerk"
+
+#~ msgid "Settings"
+#~ msgstr "Einstellungen"
#, python-format
#~ msgid "Clipboard object: %s."
@@ -1008,5 +1339,9 @@ msgstr "Journal anzeigen"
#~ msgid " and "
#~ msgstr " und "
+# Only show disconnect when there's a mesh device, because mesh takes
+# priority over the normal wireless device. NM doesn't have a "disconnect"
+# method for a device either (for various reasons) so this doesn't
+# have a good mapping
#~ msgid ", "
#~ msgstr ", "
diff --git a/po/fr.po b/po/fr.po
index bca46be..a7921fa 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: sugar\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-27 13:34-0500\n"
-"PO-Revision-Date: 2009-02-14 05:40-0500\n"
+"POT-Creation-Date: 2009-02-21 00:30-0500\n"
+"PO-Revision-Date: 2009-02-28 10:21-0500\n"
"Last-Translator: samy boutayeb <s.boutayeb@free.fr>\n"
"Language-Team: French <traduc@traduc.org>\n"
"MIME-Version: 1.0\n"
@@ -292,7 +292,7 @@ msgstr "La batterie est pratiquement déchargée"
msgid "%(hour)d:%(min).2d remaining"
msgstr "%(hour)d:%(min).2d restantes"
-#: ../extensions/deviceicon/battery.py:153
+#: ../extensions/deviceicon/battery.py:152
msgid "Charged"
msgstr "Charge complète"
@@ -310,14 +310,14 @@ msgid "Disconnect..."
msgstr "Déconnexion..."
#: ../extensions/deviceicon/network.py:109
-#: ../src/jarabe/desktop/meshbox.py:246
+#: ../src/jarabe/desktop/meshbox.py:247
msgid "Connecting..."
msgstr "Connexion..."
# TODO: show the channel number
#: ../extensions/deviceicon/network.py:113
#: ../extensions/deviceicon/network.py:166
-#: ../src/jarabe/desktop/meshbox.py:252
+#: ../src/jarabe/desktop/meshbox.py:253
msgid "Connected"
msgstr "Connecté"
@@ -349,25 +349,6 @@ msgstr "Mettre en sourdine"
msgid "Screenshot"
msgstr "Capture d'écran"
-#: ../extensions/globalkey/viewsource.py:196
-#, python-format
-msgid "View source: %r"
-msgstr "Afficher le code source : %r"
-
-#: ../extensions/globalkey/viewsource.py:205
-#: ../src/jarabe/frame/zoomtoolbar.py:42
-msgid "Activity"
-msgstr "Activité"
-
-#: ../extensions/globalkey/viewsource.py:212
-msgid "Document"
-msgstr "Document"
-
-#: ../extensions/globalkey/viewsource.py:226
-#: ../src/jarabe/journal/objectchooser.py:141
-msgid "Close"
-msgstr "Fermer"
-
#: ../data/sugar.schemas.in.h:1
msgid "Backup URL"
msgstr "Sauvegarde de l'URL"
@@ -540,24 +521,24 @@ msgstr ""
msgid "To apply your changes you have to restart sugar.\n"
msgstr "Redémarrer sugar pour que les changements prennent effet.\n"
-#: ../src/jarabe/controlpanel/gui.py:272
+#: ../src/jarabe/controlpanel/gui.py:275
msgid "Warning"
msgstr "Attention"
-#: ../src/jarabe/controlpanel/gui.py:273
+#: ../src/jarabe/controlpanel/gui.py:276
#: ../src/jarabe/controlpanel/sectionview.py:42
msgid "Changes require restart"
msgstr "Relancer pour valider"
-#: ../src/jarabe/controlpanel/gui.py:276
+#: ../src/jarabe/controlpanel/gui.py:279
msgid "Cancel changes"
msgstr "Abandonner"
-#: ../src/jarabe/controlpanel/gui.py:281 ../src/jarabe/desktop/homebox.py:113
+#: ../src/jarabe/controlpanel/gui.py:284 ../src/jarabe/desktop/homebox.py:113
msgid "Later"
msgstr "Plus tard"
-#: ../src/jarabe/controlpanel/gui.py:285
+#: ../src/jarabe/controlpanel/gui.py:288
msgid "Restart now"
msgstr "Maintenant"
@@ -567,14 +548,14 @@ msgstr "Accepter"
#: ../src/jarabe/controlpanel/toolbar.py:115
#: ../src/jarabe/desktop/homebox.py:111
-#: ../src/jarabe/frame/activitiestray.py:683
-#: ../src/jarabe/frame/activitiestray.py:762
-#: ../src/jarabe/frame/activitiestray.py:790
+#: ../src/jarabe/frame/activitiestray.py:687
+#: ../src/jarabe/frame/activitiestray.py:766
+#: ../src/jarabe/frame/activitiestray.py:794
msgid "Cancel"
msgstr "Annuler"
#: ../src/jarabe/controlpanel/toolbar.py:121
-#: ../src/jarabe/desktop/favoritesview.py:334
+#: ../src/jarabe/desktop/favoritesview.py:338
msgid "Ok"
msgstr "Ok"
@@ -592,40 +573,40 @@ msgstr "Concentrique"
# TRANS: label for the spiral layout in the favorites view
#. TRANS: label for the spiral layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:341
+#: ../src/jarabe/desktop/favoriteslayout.py:332
msgid "Spiral"
msgstr "Spirale"
# TRANS: label for the box layout in the favorites view
#. TRANS: label for the box layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:408
+#: ../src/jarabe/desktop/favoriteslayout.py:399
msgid "Box"
msgstr "Boîte"
# TRANS: label for the box layout in the favorites view
#. TRANS: label for the box layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:449
+#: ../src/jarabe/desktop/favoriteslayout.py:440
msgid "Triangle"
msgstr "Triangle"
-#: ../src/jarabe/desktop/favoritesview.py:325
+#: ../src/jarabe/desktop/favoritesview.py:329
msgid "Registration Failed"
msgstr "Echec de l'enregistrement"
-#: ../src/jarabe/desktop/favoritesview.py:326
+#: ../src/jarabe/desktop/favoritesview.py:330
#, python-format
msgid "%s"
msgstr "%s"
-#: ../src/jarabe/desktop/favoritesview.py:328
+#: ../src/jarabe/desktop/favoritesview.py:332
msgid "Registration Successful"
msgstr "Enregistrement réussi"
-#: ../src/jarabe/desktop/favoritesview.py:329
+#: ../src/jarabe/desktop/favoritesview.py:333
msgid "You are now registered with your school server."
msgstr "Vous êtes maintenant enregistré sur le serveur de l'école"
-#: ../src/jarabe/desktop/favoritesview.py:666
+#: ../src/jarabe/desktop/favoritesview.py:668
msgid "Register"
msgstr "S'enregistrer"
@@ -644,12 +625,13 @@ msgstr "Confirmer la suppression : faut-il supprimer %s définitivement ?"
# self._stop_item.connect('activate', self._stop_item_activate_cb)
# self.append_menu_item(self._stop_item)
#: ../src/jarabe/desktop/homebox.py:73 ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/view/viewsource.py:218
msgid "Keep"
msgstr "Conserver"
#: ../src/jarabe/desktop/homebox.py:76
#: ../src/jarabe/journal/journaltoolbox.py:357
-#: ../src/jarabe/journal/palettes.py:97 ../src/jarabe/view/palettes.py:127
+#: ../src/jarabe/journal/palettes.py:112 ../src/jarabe/view/palettes.py:153
msgid "Erase"
msgstr "Supprimer"
@@ -681,10 +663,6 @@ msgstr "Écran favoris"
msgid "<Ctrl>1"
msgstr "<Ctrl>1"
-#: ../src/jarabe/desktop/homebox.py:304
-msgid "Resume by default"
-msgstr "Reprise par défaut"
-
#: ../src/jarabe/desktop/keydialog.py:131
msgid "Key Type:"
msgstr "Type de clé :"
@@ -701,81 +679,81 @@ msgstr "WPA & WPA2 Personal"
msgid "Wireless Security:"
msgstr "Sécurité sans fil :"
-#: ../src/jarabe/desktop/meshbox.py:130
+#: ../src/jarabe/desktop/meshbox.py:131
msgid "Connect"
msgstr "Connecter"
-#: ../src/jarabe/desktop/meshbox.py:134
+#: ../src/jarabe/desktop/meshbox.py:135
msgid "Disconnect"
msgstr "Déconnecter"
# TRANS: Action label for resuming an activity.
#. TRANS: Action label for resuming an activity.
-#: ../src/jarabe/desktop/meshbox.py:440
-#: ../src/jarabe/frame/activitiestray.py:707
+#: ../src/jarabe/desktop/meshbox.py:441
+#: ../src/jarabe/frame/activitiestray.py:711
#: ../src/jarabe/journal/journaltoolbox.py:425
-#: ../src/jarabe/journal/palettes.py:63 ../src/jarabe/view/palettes.py:62
+#: ../src/jarabe/journal/palettes.py:72 ../src/jarabe/view/palettes.py:66
msgid "Resume"
msgstr "Reprendre"
-#: ../src/jarabe/desktop/meshbox.py:445
-#: ../src/jarabe/frame/activitiestray.py:221
+#: ../src/jarabe/desktop/meshbox.py:446
+#: ../src/jarabe/frame/activitiestray.py:227
msgid "Join"
msgstr "Rejoindre"
-#: ../src/jarabe/desktop/schoolserver.py:18
+#: ../src/jarabe/desktop/schoolserver.py:34
msgid "Cannot obtain data needed for registration."
msgstr "Impossible d'obtenir les données nécessaires à l'enregistrement."
-#: ../src/jarabe/desktop/schoolserver.py:35
+#: ../src/jarabe/desktop/schoolserver.py:51
msgid "Cannot connect to the server."
msgstr "Impossible de se connecter au serveur."
-#: ../src/jarabe/desktop/schoolserver.py:40
+#: ../src/jarabe/desktop/schoolserver.py:56
msgid "The server could not complete the request."
msgstr "Le serveur n'a pas pu achever la requête."
-#: ../src/jarabe/frame/activitiestray.py:226
-#: ../src/jarabe/frame/activitiestray.py:655
+#: ../src/jarabe/frame/activitiestray.py:232
+#: ../src/jarabe/frame/activitiestray.py:659
msgid "Decline"
msgstr "Refuser"
-#: ../src/jarabe/frame/activitiestray.py:608
+#: ../src/jarabe/frame/activitiestray.py:612
#, python-format
msgid "%dB"
msgstr "%do"
-#: ../src/jarabe/frame/activitiestray.py:610
+#: ../src/jarabe/frame/activitiestray.py:614
#, python-format
msgid "%dKB"
msgstr "%dKo"
-#: ../src/jarabe/frame/activitiestray.py:612
+#: ../src/jarabe/frame/activitiestray.py:616
#, python-format
msgid "%dMB"
msgstr "%dMo"
-#: ../src/jarabe/frame/activitiestray.py:629
+#: ../src/jarabe/frame/activitiestray.py:633
#, python-format
msgid "%s of %s"
msgstr "%s sur %s"
-#: ../src/jarabe/frame/activitiestray.py:640
+#: ../src/jarabe/frame/activitiestray.py:644
#, python-format
msgid "Transfer from %r"
msgstr "Transfert depuis %r"
-#: ../src/jarabe/frame/activitiestray.py:650
+#: ../src/jarabe/frame/activitiestray.py:654
msgid "Accept"
msgstr "Accepter"
-#: ../src/jarabe/frame/activitiestray.py:673
-#: ../src/jarabe/frame/activitiestray.py:780
+#: ../src/jarabe/frame/activitiestray.py:677
+#: ../src/jarabe/frame/activitiestray.py:784
#, python-format
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../src/jarabe/frame/activitiestray.py:751
+#: ../src/jarabe/frame/activitiestray.py:755
#, python-format
msgid "Transfer to %r"
msgstr "Transfert vers %r"
@@ -793,7 +771,7 @@ msgstr "Ouvrir"
msgid "Open with"
msgstr "Ouvrir avec"
-#: ../src/jarabe/frame/clipboardobject.py:47
+#: ../src/jarabe/frame/clipboardobject.py:49
#, python-format
msgid "%s clipping"
msgstr "%s coupure"
@@ -810,6 +788,10 @@ msgstr "Groupe"
msgid "Home"
msgstr "Accueil"
+#: ../src/jarabe/frame/zoomtoolbar.py:42
+msgid "Activity"
+msgstr "Activité"
+
#: ../src/jarabe/intro/window.py:124
msgid "Click to change color:"
msgstr "Cliquer pour changer de couleur :"
@@ -822,9 +804,9 @@ msgstr "Précédent"
msgid "Next"
msgstr "Suivant"
-#: ../src/jarabe/journal/collapsedentry.py:243
+#: ../src/jarabe/journal/collapsedentry.py:258
#: ../src/jarabe/journal/expandedentry.py:159
-#: ../src/jarabe/journal/palettes.py:57
+#: ../src/jarabe/journal/palettes.py:66
msgid "Untitled"
msgstr "Sans titre"
@@ -903,14 +885,14 @@ msgstr "Tout"
# TODO: Add "Start with" menu item
#: ../src/jarabe/journal/journaltoolbox.py:347
-#: ../src/jarabe/journal/palettes.py:81
+#: ../src/jarabe/journal/palettes.py:90
msgid "Copy"
msgstr "Copier"
# TRANS: Action label for starting an entry.
#. TRANS: Action label for starting an entry.
#: ../src/jarabe/journal/journaltoolbox.py:428
-#: ../src/jarabe/journal/palettes.py:66 ../src/jarabe/view/palettes.py:111
+#: ../src/jarabe/journal/palettes.py:75 ../src/jarabe/view/palettes.py:135
msgid "Start"
msgstr "Lancer"
@@ -926,7 +908,7 @@ msgstr "Aucune entrée correspondante"
msgid "Clear search"
msgstr "Effacer la recherche"
-#: ../src/jarabe/journal/misc.py:92
+#: ../src/jarabe/journal/misc.py:91
msgid "No date"
msgstr "Sans date"
@@ -944,96 +926,133 @@ msgstr ""
msgid "Show Journal"
msgstr "Montre le Journal"
-#: ../src/jarabe/journal/objectchooser.py:136
+#: ../src/jarabe/journal/objectchooser.py:147
msgid "Choose an object"
msgstr "Choisir un objet"
-#: ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/objectchooser.py:152
+#: ../src/jarabe/view/viewsource.py:308
+msgid "Close"
+msgstr "Fermer"
+
+#: ../src/jarabe/journal/palettes.py:73
msgid "Resume with"
msgstr "Reprendre avec"
-#: ../src/jarabe/journal/palettes.py:67
+#: ../src/jarabe/journal/palettes.py:76
msgid "Start with"
msgstr "Commencer avec"
-#: ../src/jarabe/journal/palettes.py:89
+#: ../src/jarabe/journal/palettes.py:98
msgid "Send to"
msgstr "Envoyer à"
-#: ../src/jarabe/journal/palettes.py:167
+#: ../src/jarabe/journal/palettes.py:107
+msgid "View Details"
+msgstr "Afficher les détails"
+
+#: ../src/jarabe/journal/palettes.py:185
msgid "No friends present"
msgstr "Aucun ami présent"
-#: ../src/jarabe/journal/palettes.py:172
+#: ../src/jarabe/journal/palettes.py:190
msgid "No valid connection found"
msgstr "Aucune connexion valide trouvée"
-#: ../src/jarabe/journal/palettes.py:200
+#: ../src/jarabe/journal/palettes.py:218
msgid "No activity to resume entry"
msgstr "Aucune activité pour reprendre l'entrée"
-#: ../src/jarabe/journal/palettes.py:202
+#: ../src/jarabe/journal/palettes.py:220
msgid "No activity to start entry"
msgstr "Acune activité pour démarrer l'entrée"
-#: ../src/jarabe/view/buddymenu.py:61
+#: ../src/jarabe/view/buddymenu.py:62
msgid "Remove friend"
msgstr "Retirer de mes amis"
-#: ../src/jarabe/view/buddymenu.py:64
+#: ../src/jarabe/view/buddymenu.py:65
msgid "Make friend"
msgstr "Ajouter à mes amis"
-#: ../src/jarabe/view/buddymenu.py:81
+#: ../src/jarabe/view/buddymenu.py:82
msgid "My Settings"
msgstr "Mes paramètres"
-#: ../src/jarabe/view/buddymenu.py:86
+#: ../src/jarabe/view/buddymenu.py:90
msgid "Logout"
msgstr "Se déconnecter"
-#: ../src/jarabe/view/buddymenu.py:91
+#: ../src/jarabe/view/buddymenu.py:95
msgid "Restart"
msgstr "Redémarrer"
-#: ../src/jarabe/view/buddymenu.py:96
+#: ../src/jarabe/view/buddymenu.py:100
msgid "Shutdown"
msgstr "Éteindre"
-#: ../src/jarabe/view/buddymenu.py:131
+#: ../src/jarabe/view/buddymenu.py:135
#, python-format
msgid "Invite to %s"
msgstr "Inviter à %s"
-#: ../src/jarabe/view/palettes.py:43
+#: ../src/jarabe/view/palettes.py:47
msgid "Starting..."
msgstr "Démarrage..."
+#. TODO: share-with, keep
#: ../src/jarabe/view/palettes.py:73
+msgid "View Source"
+msgstr "Afficher la source"
+
+#: ../src/jarabe/view/palettes.py:84
msgid "Stop"
msgstr "Arrêter"
-#: ../src/jarabe/view/palettes.py:145
+#: ../src/jarabe/view/palettes.py:171
msgid "Remove favorite"
msgstr "Retirer le favori"
-#: ../src/jarabe/view/palettes.py:149
+#: ../src/jarabe/view/palettes.py:175
msgid "Make favorite"
msgstr "Ajouter aux favoris"
-#: ../src/jarabe/view/palettes.py:201
+#: ../src/jarabe/view/palettes.py:238
msgid "Show contents"
msgstr "Afficher les contenus"
-#: ../src/jarabe/view/palettes.py:223 ../src/jarabe/view/palettes.py:272
+#: ../src/jarabe/view/palettes.py:260 ../src/jarabe/view/palettes.py:309
#, python-format
msgid "%(free_space)d MB Free"
msgstr "%(free_space)d Mo de libre"
-#: ../src/jarabe/view/palettes.py:248
+#: ../src/jarabe/view/palettes.py:285
msgid "Unmount"
msgstr "Démonter"
+#: ../src/jarabe/view/viewsource.py:208
+msgid "Instance Source"
+msgstr "Instancie source"
+
+#: ../src/jarabe/view/viewsource.py:233
+msgid "Source"
+msgstr "Source"
+
+#: ../src/jarabe/view/viewsource.py:292
+msgid "Activity Bundle Source"
+msgstr "Source du paquet activité"
+
+#: ../src/jarabe/view/viewsource.py:299
+#, python-format
+msgid "View source: %r"
+msgstr "Afficher le code source : %r"
+
+#~ msgid "Document"
+#~ msgstr "Document"
+
+#~ msgid "Resume by default"
+#~ msgstr "Reprise par défaut"
+
#~ msgid "Encryption Type:"
#~ msgstr "Type d'encryptage :"
diff --git a/po/ja.po b/po/ja.po
index 9a767fb..781ac36 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-27 13:34-0500\n"
-"PO-Revision-Date: 2009-02-15 09:52-0500\n"
+"POT-Creation-Date: 2009-02-21 00:30-0500\n"
+"PO-Revision-Date: 2009-03-01 17:27-0500\n"
"Last-Translator: korakurider <korakurider@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -283,7 +283,7 @@ msgstr "電池が残りわずかです"
msgid "%(hour)d:%(min).2d remaining"
msgstr "残り %(hour)d:%(min).2d"
-#: ../extensions/deviceicon/battery.py:153
+#: ../extensions/deviceicon/battery.py:152
msgid "Charged"
msgstr "充電済み"
@@ -305,14 +305,14 @@ msgstr "切断..."
# method for a device either (for various reasons) so this doesn't
# have a good mapping
#: ../extensions/deviceicon/network.py:109
-#: ../src/jarabe/desktop/meshbox.py:246
+#: ../src/jarabe/desktop/meshbox.py:247
msgid "Connecting..."
msgstr "接続しています..."
# TODO: show the channel number
#: ../extensions/deviceicon/network.py:113
#: ../extensions/deviceicon/network.py:166
-#: ../src/jarabe/desktop/meshbox.py:252
+#: ../src/jarabe/desktop/meshbox.py:253
msgid "Connected"
msgstr "接続しました"
@@ -344,25 +344,6 @@ msgstr "音を消す"
msgid "Screenshot"
msgstr "スクリーンショット"
-#: ../extensions/globalkey/viewsource.py:196
-#, python-format
-msgid "View source: %r"
-msgstr "ソースを表示: %r"
-
-#: ../extensions/globalkey/viewsource.py:205
-#: ../src/jarabe/frame/zoomtoolbar.py:42
-msgid "Activity"
-msgstr "アクティビティ"
-
-#: ../extensions/globalkey/viewsource.py:212
-msgid "Document"
-msgstr "ドキュメント"
-
-#: ../extensions/globalkey/viewsource.py:226
-#: ../src/jarabe/journal/objectchooser.py:141
-msgid "Close"
-msgstr "閉じる"
-
#: ../data/sugar.schemas.in.h:1
msgid "Backup URL"
msgstr "バックアップURL"
@@ -528,24 +509,24 @@ msgstr ""
msgid "To apply your changes you have to restart sugar.\n"
msgstr "変更を適用するにはsugarを再起動しなければいけません。\n"
-#: ../src/jarabe/controlpanel/gui.py:272
+#: ../src/jarabe/controlpanel/gui.py:275
msgid "Warning"
msgstr "注意"
-#: ../src/jarabe/controlpanel/gui.py:273
+#: ../src/jarabe/controlpanel/gui.py:276
#: ../src/jarabe/controlpanel/sectionview.py:42
msgid "Changes require restart"
msgstr "変更には再起動が必要です"
-#: ../src/jarabe/controlpanel/gui.py:276
+#: ../src/jarabe/controlpanel/gui.py:279
msgid "Cancel changes"
msgstr "変更を取りやめる"
-#: ../src/jarabe/controlpanel/gui.py:281 ../src/jarabe/desktop/homebox.py:113
+#: ../src/jarabe/controlpanel/gui.py:284 ../src/jarabe/desktop/homebox.py:113
msgid "Later"
msgstr "あとで"
-#: ../src/jarabe/controlpanel/gui.py:285
+#: ../src/jarabe/controlpanel/gui.py:288
msgid "Restart now"
msgstr "今すぐ再起動"
@@ -555,14 +536,14 @@ msgstr "完了"
#: ../src/jarabe/controlpanel/toolbar.py:115
#: ../src/jarabe/desktop/homebox.py:111
-#: ../src/jarabe/frame/activitiestray.py:683
-#: ../src/jarabe/frame/activitiestray.py:762
-#: ../src/jarabe/frame/activitiestray.py:790
+#: ../src/jarabe/frame/activitiestray.py:687
+#: ../src/jarabe/frame/activitiestray.py:766
+#: ../src/jarabe/frame/activitiestray.py:794
msgid "Cancel"
msgstr "中止"
#: ../src/jarabe/controlpanel/toolbar.py:121
-#: ../src/jarabe/desktop/favoritesview.py:334
+#: ../src/jarabe/desktop/favoritesview.py:338
msgid "Ok"
msgstr "了解"
@@ -580,40 +561,40 @@ msgstr "円に並べる"
# TRANS: label for the spiral layout in the favorites view
#. TRANS: label for the spiral layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:341
+#: ../src/jarabe/desktop/favoriteslayout.py:332
msgid "Spiral"
msgstr "渦巻きに並べる"
# TRANS: label for the box layout in the favorites view
#. TRANS: label for the box layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:408
+#: ../src/jarabe/desktop/favoriteslayout.py:399
msgid "Box"
msgstr "箱型に並べる"
# TRANS: label for the box layout in the favorites view
#. TRANS: label for the box layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:449
+#: ../src/jarabe/desktop/favoriteslayout.py:440
msgid "Triangle"
msgstr "三角形に並べる"
-#: ../src/jarabe/desktop/favoritesview.py:325
+#: ../src/jarabe/desktop/favoritesview.py:329
msgid "Registration Failed"
msgstr "登録失敗"
-#: ../src/jarabe/desktop/favoritesview.py:326
+#: ../src/jarabe/desktop/favoritesview.py:330
#, python-format
msgid "%s"
msgstr "%s"
-#: ../src/jarabe/desktop/favoritesview.py:328
+#: ../src/jarabe/desktop/favoritesview.py:332
msgid "Registration Successful"
msgstr "登録成功"
-#: ../src/jarabe/desktop/favoritesview.py:329
+#: ../src/jarabe/desktop/favoritesview.py:333
msgid "You are now registered with your school server."
msgstr "あなたはスクールサーバーに登録されました"
-#: ../src/jarabe/desktop/favoritesview.py:666
+#: ../src/jarabe/desktop/favoritesview.py:668
msgid "Register"
msgstr "登録"
@@ -631,12 +612,13 @@ msgstr "消去の確認: %s を完全に消去しますか?"
# self._stop_item.connect('activate', self._stop_item_activate_cb)
# self.append_menu_item(self._stop_item)
#: ../src/jarabe/desktop/homebox.py:73 ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/view/viewsource.py:218
msgid "Keep"
msgstr "ジャーナルに保存"
#: ../src/jarabe/desktop/homebox.py:76
#: ../src/jarabe/journal/journaltoolbox.py:357
-#: ../src/jarabe/journal/palettes.py:97 ../src/jarabe/view/palettes.py:127
+#: ../src/jarabe/journal/palettes.py:112 ../src/jarabe/view/palettes.py:153
msgid "Erase"
msgstr "消去する"
@@ -668,10 +650,6 @@ msgstr "お気に入り"
msgid "<Ctrl>1"
msgstr "<Ctrl>1"
-#: ../src/jarabe/desktop/homebox.py:304
-msgid "Resume by default"
-msgstr "デフォルトのアクティビティで再開"
-
#: ../src/jarabe/desktop/keydialog.py:131
msgid "Key Type:"
msgstr "キーのタイプ:"
@@ -688,81 +666,81 @@ msgstr "WPA と WPA2パーソナル"
msgid "Wireless Security:"
msgstr "無線のセキュリティ:"
-#: ../src/jarabe/desktop/meshbox.py:130
+#: ../src/jarabe/desktop/meshbox.py:131
msgid "Connect"
msgstr "接続"
-#: ../src/jarabe/desktop/meshbox.py:134
+#: ../src/jarabe/desktop/meshbox.py:135
msgid "Disconnect"
msgstr "切断"
# TRANS: Action label for resuming an activity.
#. TRANS: Action label for resuming an activity.
-#: ../src/jarabe/desktop/meshbox.py:440
-#: ../src/jarabe/frame/activitiestray.py:707
+#: ../src/jarabe/desktop/meshbox.py:441
+#: ../src/jarabe/frame/activitiestray.py:711
#: ../src/jarabe/journal/journaltoolbox.py:425
-#: ../src/jarabe/journal/palettes.py:63 ../src/jarabe/view/palettes.py:62
+#: ../src/jarabe/journal/palettes.py:72 ../src/jarabe/view/palettes.py:66
msgid "Resume"
msgstr "再開"
-#: ../src/jarabe/desktop/meshbox.py:445
-#: ../src/jarabe/frame/activitiestray.py:221
+#: ../src/jarabe/desktop/meshbox.py:446
+#: ../src/jarabe/frame/activitiestray.py:227
msgid "Join"
msgstr "参加"
-#: ../src/jarabe/desktop/schoolserver.py:18
+#: ../src/jarabe/desktop/schoolserver.py:34
msgid "Cannot obtain data needed for registration."
msgstr "登録に必要なデータを取得できません"
-#: ../src/jarabe/desktop/schoolserver.py:35
+#: ../src/jarabe/desktop/schoolserver.py:51
msgid "Cannot connect to the server."
msgstr "サーバーに接続できません"
-#: ../src/jarabe/desktop/schoolserver.py:40
+#: ../src/jarabe/desktop/schoolserver.py:56
msgid "The server could not complete the request."
msgstr "サーバーは要求の処理を完了できませんでした"
-#: ../src/jarabe/frame/activitiestray.py:226
-#: ../src/jarabe/frame/activitiestray.py:655
+#: ../src/jarabe/frame/activitiestray.py:232
+#: ../src/jarabe/frame/activitiestray.py:659
msgid "Decline"
msgstr "断る"
-#: ../src/jarabe/frame/activitiestray.py:608
+#: ../src/jarabe/frame/activitiestray.py:612
#, python-format
msgid "%dB"
msgstr "%dB"
-#: ../src/jarabe/frame/activitiestray.py:610
+#: ../src/jarabe/frame/activitiestray.py:614
#, python-format
msgid "%dKB"
msgstr "%dKB"
-#: ../src/jarabe/frame/activitiestray.py:612
+#: ../src/jarabe/frame/activitiestray.py:616
#, python-format
msgid "%dMB"
msgstr "%dMB"
-#: ../src/jarabe/frame/activitiestray.py:629
+#: ../src/jarabe/frame/activitiestray.py:633
#, python-format
msgid "%s of %s"
msgstr "%s の %s"
-#: ../src/jarabe/frame/activitiestray.py:640
+#: ../src/jarabe/frame/activitiestray.py:644
#, python-format
msgid "Transfer from %r"
msgstr "%rから転送"
-#: ../src/jarabe/frame/activitiestray.py:650
+#: ../src/jarabe/frame/activitiestray.py:654
msgid "Accept"
msgstr "受け入れる"
-#: ../src/jarabe/frame/activitiestray.py:673
-#: ../src/jarabe/frame/activitiestray.py:780
+#: ../src/jarabe/frame/activitiestray.py:677
+#: ../src/jarabe/frame/activitiestray.py:784
#, python-format
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../src/jarabe/frame/activitiestray.py:751
+#: ../src/jarabe/frame/activitiestray.py:755
#, python-format
msgid "Transfer to %r"
msgstr "%rへ転送"
@@ -780,7 +758,7 @@ msgstr "開く"
msgid "Open with"
msgstr "次のもので開く:"
-#: ../src/jarabe/frame/clipboardobject.py:47
+#: ../src/jarabe/frame/clipboardobject.py:49
#, python-format
msgid "%s clipping"
msgstr "%sのクリッピング"
@@ -797,6 +775,10 @@ msgstr "グループ"
msgid "Home"
msgstr "ホーム"
+#: ../src/jarabe/frame/zoomtoolbar.py:42
+msgid "Activity"
+msgstr "アクティビティ"
+
#: ../src/jarabe/intro/window.py:124
msgid "Click to change color:"
msgstr "クリックして色を変更:"
@@ -809,9 +791,9 @@ msgstr "戻る"
msgid "Next"
msgstr "進む"
-#: ../src/jarabe/journal/collapsedentry.py:243
+#: ../src/jarabe/journal/collapsedentry.py:258
#: ../src/jarabe/journal/expandedentry.py:159
-#: ../src/jarabe/journal/palettes.py:57
+#: ../src/jarabe/journal/palettes.py:66
msgid "Untitled"
msgstr "タイトル無し"
@@ -890,14 +872,14 @@ msgstr "すべての種類"
# TODO: Add "Start with" menu item
#: ../src/jarabe/journal/journaltoolbox.py:347
-#: ../src/jarabe/journal/palettes.py:81
+#: ../src/jarabe/journal/palettes.py:90
msgid "Copy"
msgstr "コピー"
# TRANS: Action label for starting an entry.
#. TRANS: Action label for starting an entry.
#: ../src/jarabe/journal/journaltoolbox.py:428
-#: ../src/jarabe/journal/palettes.py:66 ../src/jarabe/view/palettes.py:111
+#: ../src/jarabe/journal/palettes.py:75 ../src/jarabe/view/palettes.py:135
msgid "Start"
msgstr "開始"
@@ -913,7 +895,7 @@ msgstr "あてはまるものが無いです"
msgid "Clear search"
msgstr "検索をクリア"
-#: ../src/jarabe/journal/misc.py:92
+#: ../src/jarabe/journal/misc.py:91
msgid "No date"
msgstr "日付無し"
@@ -929,96 +911,133 @@ msgstr "新しいものが入るよう、ジャーナルの中身の古いもの
msgid "Show Journal"
msgstr "ジャーナルを表示"
-#: ../src/jarabe/journal/objectchooser.py:136
+#: ../src/jarabe/journal/objectchooser.py:147
msgid "Choose an object"
msgstr "オブジェクトを選ぶ"
-#: ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/objectchooser.py:152
+#: ../src/jarabe/view/viewsource.py:308
+msgid "Close"
+msgstr "閉じる"
+
+#: ../src/jarabe/journal/palettes.py:73
msgid "Resume with"
msgstr "次のアクティビティで再開"
-#: ../src/jarabe/journal/palettes.py:67
+#: ../src/jarabe/journal/palettes.py:76
msgid "Start with"
msgstr "次のアクティビティで開始"
-#: ../src/jarabe/journal/palettes.py:89
+#: ../src/jarabe/journal/palettes.py:98
msgid "Send to"
msgstr "次に送る"
-#: ../src/jarabe/journal/palettes.py:167
+#: ../src/jarabe/journal/palettes.py:107
+msgid "View Details"
+msgstr "詳細を表示"
+
+#: ../src/jarabe/journal/palettes.py:185
msgid "No friends present"
msgstr "お友達がいません"
-#: ../src/jarabe/journal/palettes.py:172
+#: ../src/jarabe/journal/palettes.py:190
msgid "No valid connection found"
msgstr "正しい接続がありません"
-#: ../src/jarabe/journal/palettes.py:200
+#: ../src/jarabe/journal/palettes.py:218
msgid "No activity to resume entry"
msgstr "エントリを再開するアクティビティがありません"
-#: ../src/jarabe/journal/palettes.py:202
+#: ../src/jarabe/journal/palettes.py:220
msgid "No activity to start entry"
msgstr "エントリを開始するアクティビティがありません"
-#: ../src/jarabe/view/buddymenu.py:61
+#: ../src/jarabe/view/buddymenu.py:62
msgid "Remove friend"
msgstr "お友だちの登録削除"
-#: ../src/jarabe/view/buddymenu.py:64
+#: ../src/jarabe/view/buddymenu.py:65
msgid "Make friend"
msgstr "お友だちを登録"
-#: ../src/jarabe/view/buddymenu.py:81
+#: ../src/jarabe/view/buddymenu.py:82
msgid "My Settings"
msgstr "私の設定"
-#: ../src/jarabe/view/buddymenu.py:86
+#: ../src/jarabe/view/buddymenu.py:90
msgid "Logout"
msgstr "ログアウト"
-#: ../src/jarabe/view/buddymenu.py:91
+#: ../src/jarabe/view/buddymenu.py:95
msgid "Restart"
msgstr "再起動"
-#: ../src/jarabe/view/buddymenu.py:96
+#: ../src/jarabe/view/buddymenu.py:100
msgid "Shutdown"
msgstr "シャットダウン"
-#: ../src/jarabe/view/buddymenu.py:131
+#: ../src/jarabe/view/buddymenu.py:135
#, python-format
msgid "Invite to %s"
msgstr "%s に招待する"
-#: ../src/jarabe/view/palettes.py:43
+#: ../src/jarabe/view/palettes.py:47
msgid "Starting..."
msgstr "起動中..."
+#. TODO: share-with, keep
#: ../src/jarabe/view/palettes.py:73
+msgid "View Source"
+msgstr "ソースコードを表示"
+
+#: ../src/jarabe/view/palettes.py:84
msgid "Stop"
msgstr "停止"
-#: ../src/jarabe/view/palettes.py:145
+#: ../src/jarabe/view/palettes.py:171
msgid "Remove favorite"
msgstr "お気に入りから削除"
-#: ../src/jarabe/view/palettes.py:149
+#: ../src/jarabe/view/palettes.py:175
msgid "Make favorite"
msgstr "お気に入りに登録"
-#: ../src/jarabe/view/palettes.py:201
+#: ../src/jarabe/view/palettes.py:238
msgid "Show contents"
msgstr "内容を表示"
-#: ../src/jarabe/view/palettes.py:223 ../src/jarabe/view/palettes.py:272
+#: ../src/jarabe/view/palettes.py:260 ../src/jarabe/view/palettes.py:309
#, python-format
msgid "%(free_space)d MB Free"
msgstr "%(free_space)d MB 空き"
-#: ../src/jarabe/view/palettes.py:248
+#: ../src/jarabe/view/palettes.py:285
msgid "Unmount"
msgstr "取りはずす"
+#: ../src/jarabe/view/viewsource.py:208
+msgid "Instance Source"
+msgstr "インスタンスのソースコード"
+
+#: ../src/jarabe/view/viewsource.py:233
+msgid "Source"
+msgstr "ソースコード"
+
+#: ../src/jarabe/view/viewsource.py:292
+msgid "Activity Bundle Source"
+msgstr "アクティビティバンドルのソースコード"
+
+#: ../src/jarabe/view/viewsource.py:299
+#, python-format
+msgid "View source: %r"
+msgstr "ソースを表示: %r"
+
+#~ msgid "Document"
+#~ msgstr "ドキュメント"
+
+#~ msgid "Resume by default"
+#~ msgstr "デフォルトのアクティビティで再開"
+
#~ msgid "Encryption Type:"
#~ msgstr "暗号タイプ:"
diff --git a/po/nl.po b/po/nl.po
index e91fe05..3bb2cb6 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-27 13:34-0500\n"
-"PO-Revision-Date: 2009-01-28 15:45-0500\n"
+"POT-Creation-Date: 2009-02-21 00:30-0500\n"
+"PO-Revision-Date: 2009-03-01 13:50-0500\n"
"Last-Translator: Myckel Habets <myckel@sdf.lonestar.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -292,7 +292,7 @@ msgstr "Heel weinig energie over"
msgid "%(hour)d:%(min).2d remaining"
msgstr "%(hour)d:%(min).2d over"
-#: ../extensions/deviceicon/battery.py:153
+#: ../extensions/deviceicon/battery.py:152
msgid "Charged"
msgstr "Opgeladen"
@@ -306,14 +306,14 @@ msgid "Disconnect..."
msgstr "Verbinding verbreken..."
#: ../extensions/deviceicon/network.py:109
-#: ../src/jarabe/desktop/meshbox.py:246
+#: ../src/jarabe/desktop/meshbox.py:247
msgid "Connecting..."
msgstr "Verbinden..."
# TODO: show the channel number
#: ../extensions/deviceicon/network.py:113
#: ../extensions/deviceicon/network.py:166
-#: ../src/jarabe/desktop/meshbox.py:252
+#: ../src/jarabe/desktop/meshbox.py:253
msgid "Connected"
msgstr "Verbonden"
@@ -345,25 +345,6 @@ msgstr "Dempen"
msgid "Screenshot"
msgstr "Schermafdruk"
-#: ../extensions/globalkey/viewsource.py:196
-#, python-format
-msgid "View source: %r"
-msgstr "Bron weergeven: %r"
-
-#: ../extensions/globalkey/viewsource.py:205
-#: ../src/jarabe/frame/zoomtoolbar.py:42
-msgid "Activity"
-msgstr "Activiteit"
-
-#: ../extensions/globalkey/viewsource.py:212
-msgid "Document"
-msgstr "Document"
-
-#: ../extensions/globalkey/viewsource.py:226
-#: ../src/jarabe/journal/objectchooser.py:141
-msgid "Close"
-msgstr "Sluiten"
-
#: ../data/sugar.schemas.in.h:1
msgid "Backup URL"
msgstr "Backup URL"
@@ -537,24 +518,24 @@ msgstr ""
msgid "To apply your changes you have to restart sugar.\n"
msgstr "Om je veranderingen toe te passen moet je sugar herstarten.\n"
-#: ../src/jarabe/controlpanel/gui.py:272
+#: ../src/jarabe/controlpanel/gui.py:275
msgid "Warning"
msgstr "Waarschuwing"
-#: ../src/jarabe/controlpanel/gui.py:273
+#: ../src/jarabe/controlpanel/gui.py:276
#: ../src/jarabe/controlpanel/sectionview.py:42
msgid "Changes require restart"
msgstr "Verandering vereist een herstart"
-#: ../src/jarabe/controlpanel/gui.py:276
+#: ../src/jarabe/controlpanel/gui.py:279
msgid "Cancel changes"
msgstr "Veranderingen annuleren"
-#: ../src/jarabe/controlpanel/gui.py:281 ../src/jarabe/desktop/homebox.py:113
+#: ../src/jarabe/controlpanel/gui.py:284 ../src/jarabe/desktop/homebox.py:113
msgid "Later"
msgstr "Later"
-#: ../src/jarabe/controlpanel/gui.py:285
+#: ../src/jarabe/controlpanel/gui.py:288
msgid "Restart now"
msgstr "Herstart nu"
@@ -564,14 +545,14 @@ msgstr "Klaar"
#: ../src/jarabe/controlpanel/toolbar.py:115
#: ../src/jarabe/desktop/homebox.py:111
-#: ../src/jarabe/frame/activitiestray.py:683
-#: ../src/jarabe/frame/activitiestray.py:762
-#: ../src/jarabe/frame/activitiestray.py:790
+#: ../src/jarabe/frame/activitiestray.py:687
+#: ../src/jarabe/frame/activitiestray.py:766
+#: ../src/jarabe/frame/activitiestray.py:794
msgid "Cancel"
msgstr "Annuleren"
#: ../src/jarabe/controlpanel/toolbar.py:121
-#: ../src/jarabe/desktop/favoritesview.py:334
+#: ../src/jarabe/desktop/favoritesview.py:338
msgid "Ok"
msgstr "Ok"
@@ -589,40 +570,40 @@ msgstr "Ring"
# TRANS: label for the spiral layout in the favorites view
#. TRANS: label for the spiral layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:341
+#: ../src/jarabe/desktop/favoriteslayout.py:332
msgid "Spiral"
msgstr "Spiraal"
# TRANS: label for the box layout in the favorites view
#. TRANS: label for the box layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:408
+#: ../src/jarabe/desktop/favoriteslayout.py:399
msgid "Box"
msgstr "Vierkant"
# TRANS: label for the box layout in the favorites view
#. TRANS: label for the box layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:449
+#: ../src/jarabe/desktop/favoriteslayout.py:440
msgid "Triangle"
msgstr "Driehoek"
-#: ../src/jarabe/desktop/favoritesview.py:325
+#: ../src/jarabe/desktop/favoritesview.py:329
msgid "Registration Failed"
msgstr "Registratie mislukt"
-#: ../src/jarabe/desktop/favoritesview.py:326
+#: ../src/jarabe/desktop/favoritesview.py:330
#, python-format
msgid "%s"
msgstr "%s"
-#: ../src/jarabe/desktop/favoritesview.py:328
+#: ../src/jarabe/desktop/favoritesview.py:332
msgid "Registration Successful"
msgstr "Registratie succesvol uitgevoerd"
-#: ../src/jarabe/desktop/favoritesview.py:329
+#: ../src/jarabe/desktop/favoritesview.py:333
msgid "You are now registered with your school server."
msgstr "Je bent nu geregistreerd bij je schoolserver."
-#: ../src/jarabe/desktop/favoritesview.py:666
+#: ../src/jarabe/desktop/favoritesview.py:668
msgid "Register"
msgstr "Registreren"
@@ -641,12 +622,13 @@ msgstr "Bevestig wissen: Wilt u permanent %s wissen?"
# self._stop_item.connect('activate', self._stop_item_activate_cb)
# self.append_menu_item(self._stop_item)
#: ../src/jarabe/desktop/homebox.py:73 ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/view/viewsource.py:218
msgid "Keep"
msgstr "Bewaar"
#: ../src/jarabe/desktop/homebox.py:76
#: ../src/jarabe/journal/journaltoolbox.py:357
-#: ../src/jarabe/journal/palettes.py:97 ../src/jarabe/view/palettes.py:127
+#: ../src/jarabe/journal/palettes.py:112 ../src/jarabe/view/palettes.py:153
msgid "Erase"
msgstr "Wissen"
@@ -680,10 +662,6 @@ msgstr "Favorietenweergave"
msgid "<Ctrl>1"
msgstr "<Ctrl>1"
-#: ../src/jarabe/desktop/homebox.py:304
-msgid "Resume by default"
-msgstr "Standaard hervatten"
-
#: ../src/jarabe/desktop/keydialog.py:131
msgid "Key Type:"
msgstr "Sleutel type:"
@@ -700,82 +678,82 @@ msgstr "WPA en WPA 2 Persoonlijk"
msgid "Wireless Security:"
msgstr "Draadloze netwerkbeveiliging:"
-#: ../src/jarabe/desktop/meshbox.py:130
+#: ../src/jarabe/desktop/meshbox.py:131
msgid "Connect"
msgstr "Verbinden"
-#: ../src/jarabe/desktop/meshbox.py:134
+#: ../src/jarabe/desktop/meshbox.py:135
msgid "Disconnect"
msgstr "Verbinding verbreken"
# TRANS: Action label for resuming an activity.
#. TRANS: Action label for resuming an activity.
-#: ../src/jarabe/desktop/meshbox.py:440
-#: ../src/jarabe/frame/activitiestray.py:707
+#: ../src/jarabe/desktop/meshbox.py:441
+#: ../src/jarabe/frame/activitiestray.py:711
#: ../src/jarabe/journal/journaltoolbox.py:425
-#: ../src/jarabe/journal/palettes.py:63 ../src/jarabe/view/palettes.py:62
+#: ../src/jarabe/journal/palettes.py:72 ../src/jarabe/view/palettes.py:66
msgid "Resume"
msgstr "Hervatten"
-#: ../src/jarabe/desktop/meshbox.py:445
-#: ../src/jarabe/frame/activitiestray.py:221
+#: ../src/jarabe/desktop/meshbox.py:446
+#: ../src/jarabe/frame/activitiestray.py:227
msgid "Join"
msgstr "Bijvoegen"
-#: ../src/jarabe/desktop/schoolserver.py:18
+#: ../src/jarabe/desktop/schoolserver.py:34
msgid "Cannot obtain data needed for registration."
msgstr ""
"Kan vereiste gegevens die nodig zijn voor de registratie niet verkrijgen."
-#: ../src/jarabe/desktop/schoolserver.py:35
+#: ../src/jarabe/desktop/schoolserver.py:51
msgid "Cannot connect to the server."
msgstr "Kan niet met de server verbinden."
-#: ../src/jarabe/desktop/schoolserver.py:40
+#: ../src/jarabe/desktop/schoolserver.py:56
msgid "The server could not complete the request."
msgstr "De server kon de aanvraag niet voltooien."
-#: ../src/jarabe/frame/activitiestray.py:226
-#: ../src/jarabe/frame/activitiestray.py:655
+#: ../src/jarabe/frame/activitiestray.py:232
+#: ../src/jarabe/frame/activitiestray.py:659
msgid "Decline"
msgstr "Weigeren"
-#: ../src/jarabe/frame/activitiestray.py:608
+#: ../src/jarabe/frame/activitiestray.py:612
#, python-format
msgid "%dB"
msgstr "%dB"
-#: ../src/jarabe/frame/activitiestray.py:610
+#: ../src/jarabe/frame/activitiestray.py:614
#, python-format
msgid "%dKB"
msgstr "%dKB"
-#: ../src/jarabe/frame/activitiestray.py:612
+#: ../src/jarabe/frame/activitiestray.py:616
#, python-format
msgid "%dMB"
msgstr "%dMB"
-#: ../src/jarabe/frame/activitiestray.py:629
+#: ../src/jarabe/frame/activitiestray.py:633
#, python-format
msgid "%s of %s"
msgstr "%s van %s"
-#: ../src/jarabe/frame/activitiestray.py:640
+#: ../src/jarabe/frame/activitiestray.py:644
#, python-format
msgid "Transfer from %r"
msgstr "Overdragen van %r"
-#: ../src/jarabe/frame/activitiestray.py:650
+#: ../src/jarabe/frame/activitiestray.py:654
msgid "Accept"
msgstr "Accepteren"
-#: ../src/jarabe/frame/activitiestray.py:673
-#: ../src/jarabe/frame/activitiestray.py:780
+#: ../src/jarabe/frame/activitiestray.py:677
+#: ../src/jarabe/frame/activitiestray.py:784
#, python-format
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../src/jarabe/frame/activitiestray.py:751
+#: ../src/jarabe/frame/activitiestray.py:755
#, python-format
msgid "Transfer to %r"
msgstr "Overdragen naar %r"
@@ -793,7 +771,7 @@ msgstr "Openen"
msgid "Open with"
msgstr "Openen met"
-#: ../src/jarabe/frame/clipboardobject.py:47
+#: ../src/jarabe/frame/clipboardobject.py:49
#, python-format
msgid "%s clipping"
msgstr "%s in klembord zetten"
@@ -810,6 +788,10 @@ msgstr "Groep"
msgid "Home"
msgstr "Thuis"
+#: ../src/jarabe/frame/zoomtoolbar.py:42
+msgid "Activity"
+msgstr "Activiteit"
+
#: ../src/jarabe/intro/window.py:124
msgid "Click to change color:"
msgstr "Klik om de kleur te veranderen:"
@@ -822,9 +804,9 @@ msgstr "Terug"
msgid "Next"
msgstr "Volgende"
-#: ../src/jarabe/journal/collapsedentry.py:243
+#: ../src/jarabe/journal/collapsedentry.py:258
#: ../src/jarabe/journal/expandedentry.py:159
-#: ../src/jarabe/journal/palettes.py:57
+#: ../src/jarabe/journal/palettes.py:66
msgid "Untitled"
msgstr "Naamloos"
@@ -903,14 +885,14 @@ msgstr "Alles"
# TODO: Add "Start with" menu item
#: ../src/jarabe/journal/journaltoolbox.py:347
-#: ../src/jarabe/journal/palettes.py:81
+#: ../src/jarabe/journal/palettes.py:90
msgid "Copy"
msgstr "Kopieer"
# TRANS: Action label for starting an entry.
#. TRANS: Action label for starting an entry.
#: ../src/jarabe/journal/journaltoolbox.py:428
-#: ../src/jarabe/journal/palettes.py:66 ../src/jarabe/view/palettes.py:111
+#: ../src/jarabe/journal/palettes.py:75 ../src/jarabe/view/palettes.py:135
msgid "Start"
msgstr "Start"
@@ -926,7 +908,7 @@ msgstr "Geen overeenkomende ingangen "
msgid "Clear search"
msgstr "Zoekopdracht wissen"
-#: ../src/jarabe/journal/misc.py:92
+#: ../src/jarabe/journal/misc.py:91
msgid "No date"
msgstr "Geen datum"
@@ -942,96 +924,133 @@ msgstr "Verwijder a.u.b. oude dagboekingangen om ruimte te maken voor nieuwe."
msgid "Show Journal"
msgstr "Dagboek weergeven"
-#: ../src/jarabe/journal/objectchooser.py:136
+#: ../src/jarabe/journal/objectchooser.py:147
msgid "Choose an object"
msgstr "Kies een object"
-#: ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/objectchooser.py:152
+#: ../src/jarabe/view/viewsource.py:308
+msgid "Close"
+msgstr "Sluiten"
+
+#: ../src/jarabe/journal/palettes.py:73
msgid "Resume with"
msgstr "Hervatten met"
-#: ../src/jarabe/journal/palettes.py:67
+#: ../src/jarabe/journal/palettes.py:76
msgid "Start with"
msgstr "Starten met"
-#: ../src/jarabe/journal/palettes.py:89
+#: ../src/jarabe/journal/palettes.py:98
msgid "Send to"
msgstr "Verstuur naar"
-#: ../src/jarabe/journal/palettes.py:167
+#: ../src/jarabe/journal/palettes.py:107
+msgid "View Details"
+msgstr "Details weergeven"
+
+#: ../src/jarabe/journal/palettes.py:185
msgid "No friends present"
msgstr "Geen vrienden aanwezig"
-#: ../src/jarabe/journal/palettes.py:172
+#: ../src/jarabe/journal/palettes.py:190
msgid "No valid connection found"
msgstr "Geen geldige verbinding gevonden"
-#: ../src/jarabe/journal/palettes.py:200
+#: ../src/jarabe/journal/palettes.py:218
msgid "No activity to resume entry"
msgstr "Geen activiteit om ingang mee te hervatten"
-#: ../src/jarabe/journal/palettes.py:202
+#: ../src/jarabe/journal/palettes.py:220
msgid "No activity to start entry"
msgstr "Geen activiteit om ingang mee te starten"
-#: ../src/jarabe/view/buddymenu.py:61
+#: ../src/jarabe/view/buddymenu.py:62
msgid "Remove friend"
msgstr "Verwijder vriend"
-#: ../src/jarabe/view/buddymenu.py:64
+#: ../src/jarabe/view/buddymenu.py:65
msgid "Make friend"
msgstr "Maak vriend"
-#: ../src/jarabe/view/buddymenu.py:81
+#: ../src/jarabe/view/buddymenu.py:82
msgid "My Settings"
msgstr "Mijn instellingen"
-#: ../src/jarabe/view/buddymenu.py:86
+#: ../src/jarabe/view/buddymenu.py:90
msgid "Logout"
msgstr "Afmelden"
-#: ../src/jarabe/view/buddymenu.py:91
+#: ../src/jarabe/view/buddymenu.py:95
msgid "Restart"
msgstr "Herstarten"
-#: ../src/jarabe/view/buddymenu.py:96
+#: ../src/jarabe/view/buddymenu.py:100
msgid "Shutdown"
msgstr "Afsluiten"
-#: ../src/jarabe/view/buddymenu.py:131
+#: ../src/jarabe/view/buddymenu.py:135
#, python-format
msgid "Invite to %s"
msgstr "Nodig uit voor %s"
-#: ../src/jarabe/view/palettes.py:43
+#: ../src/jarabe/view/palettes.py:47
msgid "Starting..."
msgstr "Beginnen..."
+#. TODO: share-with, keep
#: ../src/jarabe/view/palettes.py:73
+msgid "View Source"
+msgstr "Bron weergeven"
+
+#: ../src/jarabe/view/palettes.py:84
msgid "Stop"
msgstr "Stop"
-#: ../src/jarabe/view/palettes.py:145
+#: ../src/jarabe/view/palettes.py:171
msgid "Remove favorite"
msgstr "Verwijder favoriet"
-#: ../src/jarabe/view/palettes.py:149
+#: ../src/jarabe/view/palettes.py:175
msgid "Make favorite"
msgstr "Maak favoriet"
-#: ../src/jarabe/view/palettes.py:201
+#: ../src/jarabe/view/palettes.py:238
msgid "Show contents"
msgstr "Inhoud weergeven"
-#: ../src/jarabe/view/palettes.py:223 ../src/jarabe/view/palettes.py:272
+#: ../src/jarabe/view/palettes.py:260 ../src/jarabe/view/palettes.py:309
#, python-format
msgid "%(free_space)d MB Free"
msgstr "%(free_space)d MB vrij"
-#: ../src/jarabe/view/palettes.py:248
+#: ../src/jarabe/view/palettes.py:285
msgid "Unmount"
msgstr "Loskoppelen"
+#: ../src/jarabe/view/viewsource.py:208
+msgid "Instance Source"
+msgstr "Werkkopie van bron maken"
+
+#: ../src/jarabe/view/viewsource.py:233
+msgid "Source"
+msgstr "Bron"
+
+#: ../src/jarabe/view/viewsource.py:292
+msgid "Activity Bundle Source"
+msgstr "Activiteitsbundel Bron"
+
+#: ../src/jarabe/view/viewsource.py:299
+#, python-format
+msgid "View source: %r"
+msgstr "Bron weergeven: %r"
+
+#~ msgid "Document"
+#~ msgstr "Document"
+
+#~ msgid "Resume by default"
+#~ msgstr "Standaard hervatten"
+
#~ msgid "Encryption Type:"
#~ msgstr "Encryptie type:"
diff --git a/po/pt.po b/po/pt.po
index 1f14db0..cba72e0 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,9 +6,9 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-27 13:34-0500\n"
-"PO-Revision-Date: 2009-02-22 12:50-0500\n"
-"Last-Translator: Eduardo H. Silva <HoboPrimate@gmail.com>\n"
+"POT-Creation-Date: 2009-02-21 00:30-0500\n"
+"PO-Revision-Date: 2009-03-01 20:34-0500\n"
+"Last-Translator: Chris Leonard <cjl@laptop.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -288,7 +288,7 @@ msgstr "Resta muito pouca energia"
msgid "%(hour)d:%(min).2d remaining"
msgstr "%(hour)d:%(min).2d restantes"
-#: ../extensions/deviceicon/battery.py:153
+#: ../extensions/deviceicon/battery.py:152
msgid "Charged"
msgstr "Recarregada"
@@ -310,14 +310,14 @@ msgstr "Desligar..."
# method for a device either (for various reasons) so this doesn't
# have a good mapping
#: ../extensions/deviceicon/network.py:109
-#: ../src/jarabe/desktop/meshbox.py:246
+#: ../src/jarabe/desktop/meshbox.py:247
msgid "Connecting..."
msgstr "A Ligar..."
# TODO: show the channel number
#: ../extensions/deviceicon/network.py:113
#: ../extensions/deviceicon/network.py:166
-#: ../src/jarabe/desktop/meshbox.py:252
+#: ../src/jarabe/desktop/meshbox.py:253
msgid "Connected"
msgstr "Ligado"
@@ -349,25 +349,6 @@ msgstr "Silenciar"
msgid "Screenshot"
msgstr "Imagem do ecrã"
-#: ../extensions/globalkey/viewsource.py:196
-#, python-format
-msgid "View source: %r"
-msgstr "Ver o código-fonte: %r"
-
-#: ../extensions/globalkey/viewsource.py:205
-#: ../src/jarabe/frame/zoomtoolbar.py:42
-msgid "Activity"
-msgstr "Actividade"
-
-#: ../extensions/globalkey/viewsource.py:212
-msgid "Document"
-msgstr "Documento"
-
-#: ../extensions/globalkey/viewsource.py:226
-#: ../src/jarabe/journal/objectchooser.py:141
-msgid "Close"
-msgstr "Fechar"
-
#: ../data/sugar.schemas.in.h:1
msgid "Backup URL"
msgstr "URL da cópia de segurança"
@@ -541,24 +522,24 @@ msgstr ""
msgid "To apply your changes you have to restart sugar.\n"
msgstr "Para aplicar as alterações tens que reiniciar o açúcar (sugar).\n"
-#: ../src/jarabe/controlpanel/gui.py:272
+#: ../src/jarabe/controlpanel/gui.py:275
msgid "Warning"
msgstr "Aviso"
-#: ../src/jarabe/controlpanel/gui.py:273
+#: ../src/jarabe/controlpanel/gui.py:276
#: ../src/jarabe/controlpanel/sectionview.py:42
msgid "Changes require restart"
msgstr "As alterações feitas necessitam que reinicies"
-#: ../src/jarabe/controlpanel/gui.py:276
+#: ../src/jarabe/controlpanel/gui.py:279
msgid "Cancel changes"
msgstr "Cancelar alterações"
-#: ../src/jarabe/controlpanel/gui.py:281 ../src/jarabe/desktop/homebox.py:113
+#: ../src/jarabe/controlpanel/gui.py:284 ../src/jarabe/desktop/homebox.py:113
msgid "Later"
msgstr "Mais tarde"
-#: ../src/jarabe/controlpanel/gui.py:285
+#: ../src/jarabe/controlpanel/gui.py:288
msgid "Restart now"
msgstr "Reiniciar agora"
@@ -568,14 +549,14 @@ msgstr "Finalizar"
#: ../src/jarabe/controlpanel/toolbar.py:115
#: ../src/jarabe/desktop/homebox.py:111
-#: ../src/jarabe/frame/activitiestray.py:683
-#: ../src/jarabe/frame/activitiestray.py:762
-#: ../src/jarabe/frame/activitiestray.py:790
+#: ../src/jarabe/frame/activitiestray.py:687
+#: ../src/jarabe/frame/activitiestray.py:766
+#: ../src/jarabe/frame/activitiestray.py:794
msgid "Cancel"
msgstr "Cancelar"
#: ../src/jarabe/controlpanel/toolbar.py:121
-#: ../src/jarabe/desktop/favoritesview.py:334
+#: ../src/jarabe/desktop/favoritesview.py:338
msgid "Ok"
msgstr "Ok"
@@ -591,39 +572,42 @@ msgstr "Disposição livre"
msgid "Ring"
msgstr "Anel"
+# TRANS: label for the spiral layout in the favorites view
#. TRANS: label for the spiral layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:341
+#: ../src/jarabe/desktop/favoriteslayout.py:332
msgid "Spiral"
msgstr "Espiral"
+# TRANS: label for the box layout in the favorites view
#. TRANS: label for the box layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:408
+#: ../src/jarabe/desktop/favoriteslayout.py:399
msgid "Box"
msgstr "Caixa"
+# TRANS: label for the box layout in the favorites view
#. TRANS: label for the box layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:449
+#: ../src/jarabe/desktop/favoriteslayout.py:440
msgid "Triangle"
msgstr "Triângulo "
-#: ../src/jarabe/desktop/favoritesview.py:325
+#: ../src/jarabe/desktop/favoritesview.py:329
msgid "Registration Failed"
msgstr "O Registo Falhou"
-#: ../src/jarabe/desktop/favoritesview.py:326
+#: ../src/jarabe/desktop/favoritesview.py:330
#, python-format
msgid "%s"
msgstr "%s"
-#: ../src/jarabe/desktop/favoritesview.py:328
+#: ../src/jarabe/desktop/favoritesview.py:332
msgid "Registration Successful"
msgstr "O Registo teve sucesso"
-#: ../src/jarabe/desktop/favoritesview.py:329
+#: ../src/jarabe/desktop/favoritesview.py:333
msgid "You are now registered with your school server."
msgstr "Estás agora registado com o teu servidor de escola."
-#: ../src/jarabe/desktop/favoritesview.py:666
+#: ../src/jarabe/desktop/favoritesview.py:668
msgid "Register"
msgstr "Registar"
@@ -641,12 +625,13 @@ msgstr "Confirma apagar: Queres apagar permanentemente %s?"
# self._stop_item.connect('activate', self._stop_item_activate_cb)
# self.append_menu_item(self._stop_item)
#: ../src/jarabe/desktop/homebox.py:73 ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/view/viewsource.py:218
msgid "Keep"
msgstr "Guardar"
#: ../src/jarabe/desktop/homebox.py:76
#: ../src/jarabe/journal/journaltoolbox.py:357
-#: ../src/jarabe/journal/palettes.py:97 ../src/jarabe/view/palettes.py:127
+#: ../src/jarabe/journal/palettes.py:112 ../src/jarabe/view/palettes.py:153
msgid "Erase"
msgstr "Apagar"
@@ -680,10 +665,6 @@ msgstr "Vista de favoritos"
msgid "<Ctrl>1"
msgstr "<Ctrl>1"
-#: ../src/jarabe/desktop/homebox.py:304
-msgid "Resume by default"
-msgstr "Continuar por omissão"
-
#: ../src/jarabe/desktop/keydialog.py:131
msgid "Key Type:"
msgstr "Tipo de chave:"
@@ -693,7 +674,6 @@ msgid "Authentication Type:"
msgstr "Tipo de Autenticação:"
#: ../src/jarabe/desktop/keydialog.py:215
-#, fuzzy
msgid "WPA & WPA2 Personal"
msgstr "WPA e WPA2 pessoal"
@@ -701,81 +681,81 @@ msgstr "WPA e WPA2 pessoal"
msgid "Wireless Security:"
msgstr "Segurança da rede sem fios:"
-#: ../src/jarabe/desktop/meshbox.py:130
+#: ../src/jarabe/desktop/meshbox.py:131
msgid "Connect"
msgstr "Ligar"
-#: ../src/jarabe/desktop/meshbox.py:134
+#: ../src/jarabe/desktop/meshbox.py:135
msgid "Disconnect"
msgstr "Desligar"
# TRANS: Action label for resuming an activity.
#. TRANS: Action label for resuming an activity.
-#: ../src/jarabe/desktop/meshbox.py:440
-#: ../src/jarabe/frame/activitiestray.py:707
+#: ../src/jarabe/desktop/meshbox.py:441
+#: ../src/jarabe/frame/activitiestray.py:711
#: ../src/jarabe/journal/journaltoolbox.py:425
-#: ../src/jarabe/journal/palettes.py:63 ../src/jarabe/view/palettes.py:62
+#: ../src/jarabe/journal/palettes.py:72 ../src/jarabe/view/palettes.py:66
msgid "Resume"
msgstr "Continuar"
-#: ../src/jarabe/desktop/meshbox.py:445
-#: ../src/jarabe/frame/activitiestray.py:221
+#: ../src/jarabe/desktop/meshbox.py:446
+#: ../src/jarabe/frame/activitiestray.py:227
msgid "Join"
msgstr "Juntar-se"
-#: ../src/jarabe/desktop/schoolserver.py:18
+#: ../src/jarabe/desktop/schoolserver.py:34
msgid "Cannot obtain data needed for registration."
msgstr "Não foi possível obter os dados necessários para o registo."
-#: ../src/jarabe/desktop/schoolserver.py:35
+#: ../src/jarabe/desktop/schoolserver.py:51
msgid "Cannot connect to the server."
msgstr "Não foi possível ligar ao servidor."
-#: ../src/jarabe/desktop/schoolserver.py:40
+#: ../src/jarabe/desktop/schoolserver.py:56
msgid "The server could not complete the request."
msgstr "Não foi possível ao servidor completar o pedido."
-#: ../src/jarabe/frame/activitiestray.py:226
-#: ../src/jarabe/frame/activitiestray.py:655
+#: ../src/jarabe/frame/activitiestray.py:232
+#: ../src/jarabe/frame/activitiestray.py:659
msgid "Decline"
msgstr "Recusar"
-#: ../src/jarabe/frame/activitiestray.py:608
+#: ../src/jarabe/frame/activitiestray.py:612
#, python-format
msgid "%dB"
msgstr "%dB"
-#: ../src/jarabe/frame/activitiestray.py:610
+#: ../src/jarabe/frame/activitiestray.py:614
#, python-format
msgid "%dKB"
msgstr "%dKB"
-#: ../src/jarabe/frame/activitiestray.py:612
+#: ../src/jarabe/frame/activitiestray.py:616
#, python-format
msgid "%dMB"
msgstr "%dMB"
-#: ../src/jarabe/frame/activitiestray.py:629
+#: ../src/jarabe/frame/activitiestray.py:633
#, python-format
msgid "%s of %s"
msgstr "%s de %s"
-#: ../src/jarabe/frame/activitiestray.py:640
+#: ../src/jarabe/frame/activitiestray.py:644
#, python-format
msgid "Transfer from %r"
msgstr "Transferência de %r"
-#: ../src/jarabe/frame/activitiestray.py:650
+#: ../src/jarabe/frame/activitiestray.py:654
msgid "Accept"
msgstr "Aceitar"
-#: ../src/jarabe/frame/activitiestray.py:673
-#: ../src/jarabe/frame/activitiestray.py:780
+#: ../src/jarabe/frame/activitiestray.py:677
+#: ../src/jarabe/frame/activitiestray.py:784
#, python-format
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../src/jarabe/frame/activitiestray.py:751
+#: ../src/jarabe/frame/activitiestray.py:755
#, python-format
msgid "Transfer to %r"
msgstr "Transferência para %r"
@@ -793,7 +773,7 @@ msgstr "Abrir"
msgid "Open with"
msgstr "Abrir com"
-#: ../src/jarabe/frame/clipboardobject.py:47
+#: ../src/jarabe/frame/clipboardobject.py:49
#, python-format
msgid "%s clipping"
msgstr "Recorte de %s"
@@ -810,6 +790,10 @@ msgstr "Grupo"
msgid "Home"
msgstr "Casa"
+#: ../src/jarabe/frame/zoomtoolbar.py:42
+msgid "Activity"
+msgstr "Actividade"
+
#: ../src/jarabe/intro/window.py:124
msgid "Click to change color:"
msgstr "Clica para mudar a cor:"
@@ -822,9 +806,9 @@ msgstr "Voltar"
msgid "Next"
msgstr "Próximo"
-#: ../src/jarabe/journal/collapsedentry.py:243
+#: ../src/jarabe/journal/collapsedentry.py:258
#: ../src/jarabe/journal/expandedentry.py:159
-#: ../src/jarabe/journal/palettes.py:57
+#: ../src/jarabe/journal/palettes.py:66
msgid "Untitled"
msgstr "Sem título"
@@ -903,14 +887,14 @@ msgstr "Qualquer coisa"
# TODO: Add "Start with" menu item
#: ../src/jarabe/journal/journaltoolbox.py:347
-#: ../src/jarabe/journal/palettes.py:81
+#: ../src/jarabe/journal/palettes.py:90
msgid "Copy"
msgstr "Copiar"
# TRANS: Action label for starting an entry.
#. TRANS: Action label for starting an entry.
#: ../src/jarabe/journal/journaltoolbox.py:428
-#: ../src/jarabe/journal/palettes.py:66 ../src/jarabe/view/palettes.py:111
+#: ../src/jarabe/journal/palettes.py:75 ../src/jarabe/view/palettes.py:135
msgid "Start"
msgstr "Iniciar"
@@ -926,7 +910,7 @@ msgstr "Nenhuma entrada encontrada "
msgid "Clear search"
msgstr "Limpar a busca"
-#: ../src/jarabe/journal/misc.py:92
+#: ../src/jarabe/journal/misc.py:91
msgid "No date"
msgstr "Sem data"
@@ -944,96 +928,133 @@ msgstr ""
msgid "Show Journal"
msgstr "Mostrar o diário"
-#: ../src/jarabe/journal/objectchooser.py:136
+#: ../src/jarabe/journal/objectchooser.py:147
msgid "Choose an object"
msgstr "Escolhe um objecto"
-#: ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/objectchooser.py:152
+#: ../src/jarabe/view/viewsource.py:308
+msgid "Close"
+msgstr "Fechar"
+
+#: ../src/jarabe/journal/palettes.py:73
msgid "Resume with"
msgstr "Continuar com"
-#: ../src/jarabe/journal/palettes.py:67
+#: ../src/jarabe/journal/palettes.py:76
msgid "Start with"
msgstr "Iniciar com"
-#: ../src/jarabe/journal/palettes.py:89
+#: ../src/jarabe/journal/palettes.py:98
msgid "Send to"
msgstr "Enviar para"
-#: ../src/jarabe/journal/palettes.py:167
+#: ../src/jarabe/journal/palettes.py:107
+msgid "View Details"
+msgstr "Ver detalhes"
+
+#: ../src/jarabe/journal/palettes.py:185
msgid "No friends present"
msgstr "Não está presente nenhum amigo"
-#: ../src/jarabe/journal/palettes.py:172
+#: ../src/jarabe/journal/palettes.py:190
msgid "No valid connection found"
msgstr "Não foi encontrada uma ligação válida"
-#: ../src/jarabe/journal/palettes.py:200
+#: ../src/jarabe/journal/palettes.py:218
msgid "No activity to resume entry"
msgstr "Não existe nenhuma actividade para continuar a entrada"
-#: ../src/jarabe/journal/palettes.py:202
+#: ../src/jarabe/journal/palettes.py:220
msgid "No activity to start entry"
msgstr "Não existe nenhuma actividade para iniciar a entrada"
-#: ../src/jarabe/view/buddymenu.py:61
+#: ../src/jarabe/view/buddymenu.py:62
msgid "Remove friend"
msgstr "Remover amigo"
-#: ../src/jarabe/view/buddymenu.py:64
+#: ../src/jarabe/view/buddymenu.py:65
msgid "Make friend"
msgstr "Fazer amigo"
-#: ../src/jarabe/view/buddymenu.py:81
+#: ../src/jarabe/view/buddymenu.py:82
msgid "My Settings"
msgstr "As minhas definições"
-#: ../src/jarabe/view/buddymenu.py:86
+#: ../src/jarabe/view/buddymenu.py:90
msgid "Logout"
msgstr "Terminar a sessão"
-#: ../src/jarabe/view/buddymenu.py:91
+#: ../src/jarabe/view/buddymenu.py:95
msgid "Restart"
msgstr "Reiniciar"
-#: ../src/jarabe/view/buddymenu.py:96
+#: ../src/jarabe/view/buddymenu.py:100
msgid "Shutdown"
msgstr "Desligar"
-#: ../src/jarabe/view/buddymenu.py:131
+#: ../src/jarabe/view/buddymenu.py:135
#, python-format
msgid "Invite to %s"
msgstr "Convidar para %s"
-#: ../src/jarabe/view/palettes.py:43
+#: ../src/jarabe/view/palettes.py:47
msgid "Starting..."
msgstr "A Iniciar..."
+#. TODO: share-with, keep
#: ../src/jarabe/view/palettes.py:73
+msgid "View Source"
+msgstr "Ver código-fonte"
+
+#: ../src/jarabe/view/palettes.py:84
msgid "Stop"
msgstr "Parar"
-#: ../src/jarabe/view/palettes.py:145
+#: ../src/jarabe/view/palettes.py:171
msgid "Remove favorite"
msgstr "Remover favorito"
-#: ../src/jarabe/view/palettes.py:149
+#: ../src/jarabe/view/palettes.py:175
msgid "Make favorite"
msgstr "Tornar favorito"
-#: ../src/jarabe/view/palettes.py:201
+#: ../src/jarabe/view/palettes.py:238
msgid "Show contents"
msgstr "Mostrar os conteúdos"
-#: ../src/jarabe/view/palettes.py:223 ../src/jarabe/view/palettes.py:272
+#: ../src/jarabe/view/palettes.py:260 ../src/jarabe/view/palettes.py:309
#, python-format
msgid "%(free_space)d MB Free"
msgstr "%(free_space)d MB Livres"
-#: ../src/jarabe/view/palettes.py:248
+#: ../src/jarabe/view/palettes.py:285
msgid "Unmount"
msgstr "Remover"
+#: ../src/jarabe/view/viewsource.py:208
+msgid "Instance Source"
+msgstr "Código-fonte da instância"
+
+#: ../src/jarabe/view/viewsource.py:233
+msgid "Source"
+msgstr "Código-fonte"
+
+#: ../src/jarabe/view/viewsource.py:292
+msgid "Activity Bundle Source"
+msgstr "Código-fonte do pacote de actividade"
+
+#: ../src/jarabe/view/viewsource.py:299
+#, python-format
+msgid "View source: %r"
+msgstr "Ver o código-fonte: %r"
+
+#~ msgid "Document"
+#~ msgstr "Documento"
+
+#~ msgid "Resume by default"
+#~ msgstr "Continuar por omissão"
+
#~ msgid "Encryption Type:"
#~ msgstr "Tipo de Encriptação:"
diff --git a/po/sl.po b/po/sl.po
index 4ce5cb0..6981824 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-27 13:34-0500\n"
-"PO-Revision-Date: 2009-01-28 16:33-0500\n"
+"POT-Creation-Date: 2009-02-21 00:30-0500\n"
+"PO-Revision-Date: 2009-02-28 04:26-0500\n"
"Last-Translator: Denis Oštir <denis.ostir@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -289,7 +289,7 @@ msgstr "Baterija je skoraj prazna"
msgid "%(hour)d:%(min).2d remaining"
msgstr "Ostaja %(hour)d:%(min).2d"
-#: ../extensions/deviceicon/battery.py:153
+#: ../extensions/deviceicon/battery.py:152
msgid "Charged"
msgstr "Polno"
@@ -303,14 +303,14 @@ msgid "Disconnect..."
msgstr "Prekini ... "
#: ../extensions/deviceicon/network.py:109
-#: ../src/jarabe/desktop/meshbox.py:246
+#: ../src/jarabe/desktop/meshbox.py:247
msgid "Connecting..."
msgstr "Povezujem ..."
# TODO: show the channel number
#: ../extensions/deviceicon/network.py:113
#: ../extensions/deviceicon/network.py:166
-#: ../src/jarabe/desktop/meshbox.py:252
+#: ../src/jarabe/desktop/meshbox.py:253
msgid "Connected"
msgstr "Povezan"
@@ -343,25 +343,6 @@ msgstr "Tiho"
msgid "Screenshot"
msgstr "Slika zaslona"
-#: ../extensions/globalkey/viewsource.py:196
-#, python-format
-msgid "View source: %r"
-msgstr "Poglej vir: %r"
-
-#: ../extensions/globalkey/viewsource.py:205
-#: ../src/jarabe/frame/zoomtoolbar.py:42
-msgid "Activity"
-msgstr "Aktivnost"
-
-#: ../extensions/globalkey/viewsource.py:212
-msgid "Document"
-msgstr "Dokument"
-
-#: ../extensions/globalkey/viewsource.py:226
-#: ../src/jarabe/journal/objectchooser.py:141
-msgid "Close"
-msgstr "Zapri"
-
#: ../data/sugar.schemas.in.h:1
msgid "Backup URL"
msgstr "Nadomestni spletni naslov"
@@ -433,9 +414,8 @@ msgid "Power Extreme."
msgstr "Ekstremno upravljanje z elektriko"
#: ../data/sugar.schemas.in.h:16
-#, fuzzy
msgid "Publish to Gadget"
-msgstr "Objavi "
+msgstr "Objavi v napravi"
#: ../data/sugar.schemas.in.h:17
msgid "Setting for muting the sound device."
@@ -536,24 +516,24 @@ msgstr ""
msgid "To apply your changes you have to restart sugar.\n"
msgstr "Za uveljavitev sprememb je potreben ponovni zagon programa sugar.\n"
-#: ../src/jarabe/controlpanel/gui.py:272
+#: ../src/jarabe/controlpanel/gui.py:275
msgid "Warning"
msgstr "Opozorilo"
-#: ../src/jarabe/controlpanel/gui.py:273
+#: ../src/jarabe/controlpanel/gui.py:276
#: ../src/jarabe/controlpanel/sectionview.py:42
msgid "Changes require restart"
msgstr "Sprembe zahtevajo ponovni zagon"
-#: ../src/jarabe/controlpanel/gui.py:276
+#: ../src/jarabe/controlpanel/gui.py:279
msgid "Cancel changes"
msgstr "Prekliči spremembe"
-#: ../src/jarabe/controlpanel/gui.py:281 ../src/jarabe/desktop/homebox.py:113
+#: ../src/jarabe/controlpanel/gui.py:284 ../src/jarabe/desktop/homebox.py:113
msgid "Later"
msgstr "Kasneje"
-#: ../src/jarabe/controlpanel/gui.py:285
+#: ../src/jarabe/controlpanel/gui.py:288
msgid "Restart now"
msgstr "Ponovni zagon"
@@ -563,14 +543,14 @@ msgstr "Končano"
#: ../src/jarabe/controlpanel/toolbar.py:115
#: ../src/jarabe/desktop/homebox.py:111
-#: ../src/jarabe/frame/activitiestray.py:683
-#: ../src/jarabe/frame/activitiestray.py:762
-#: ../src/jarabe/frame/activitiestray.py:790
+#: ../src/jarabe/frame/activitiestray.py:687
+#: ../src/jarabe/frame/activitiestray.py:766
+#: ../src/jarabe/frame/activitiestray.py:794
msgid "Cancel"
msgstr "Prekliči"
#: ../src/jarabe/controlpanel/toolbar.py:121
-#: ../src/jarabe/desktop/favoritesview.py:334
+#: ../src/jarabe/desktop/favoritesview.py:338
msgid "Ok"
msgstr "V redu"
@@ -588,40 +568,40 @@ msgstr "Obroč"
# TRANS: label for the spiral layout in the favorites view
#. TRANS: label for the spiral layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:341
+#: ../src/jarabe/desktop/favoriteslayout.py:332
msgid "Spiral"
msgstr "Spirala"
# TRANS: label for the box layout in the favorites view
#. TRANS: label for the box layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:408
+#: ../src/jarabe/desktop/favoriteslayout.py:399
msgid "Box"
msgstr "Okvir"
# TRANS: label for the box layout in the favorites view
#. TRANS: label for the box layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:449
+#: ../src/jarabe/desktop/favoriteslayout.py:440
msgid "Triangle"
msgstr "Trikotnik"
-#: ../src/jarabe/desktop/favoritesview.py:325
+#: ../src/jarabe/desktop/favoritesview.py:329
msgid "Registration Failed"
msgstr "Registracija ni uspela"
-#: ../src/jarabe/desktop/favoritesview.py:326
+#: ../src/jarabe/desktop/favoritesview.py:330
#, python-format
msgid "%s"
msgstr "%s"
-#: ../src/jarabe/desktop/favoritesview.py:328
+#: ../src/jarabe/desktop/favoritesview.py:332
msgid "Registration Successful"
msgstr "Uspešna registracija"
-#: ../src/jarabe/desktop/favoritesview.py:329
+#: ../src/jarabe/desktop/favoritesview.py:333
msgid "You are now registered with your school server."
msgstr "Vpisan si v šolski strežnik."
-#: ../src/jarabe/desktop/favoritesview.py:666
+#: ../src/jarabe/desktop/favoritesview.py:668
msgid "Register"
msgstr "Registracija"
@@ -635,12 +615,13 @@ msgid "Confirm erase: Do you want to permanently erase %s?"
msgstr "Potrdi brisanje: Želiš dokočno izbrisati %s?"
#: ../src/jarabe/desktop/homebox.py:73 ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/view/viewsource.py:218
msgid "Keep"
msgstr "Obdrži"
#: ../src/jarabe/desktop/homebox.py:76
#: ../src/jarabe/journal/journaltoolbox.py:357
-#: ../src/jarabe/journal/palettes.py:97 ../src/jarabe/view/palettes.py:127
+#: ../src/jarabe/journal/palettes.py:112 ../src/jarabe/view/palettes.py:153
msgid "Erase"
msgstr "Izbriši"
@@ -673,10 +654,6 @@ msgstr "Priljubljene"
msgid "<Ctrl>1"
msgstr "<Ctrl>1"
-#: ../src/jarabe/desktop/homebox.py:304
-msgid "Resume by default"
-msgstr "Vedno nadaljuj"
-
#: ../src/jarabe/desktop/keydialog.py:131
msgid "Key Type:"
msgstr "Tip ključa:"
@@ -693,81 +670,81 @@ msgstr "WPA in WPA2 Osebni ključ"
msgid "Wireless Security:"
msgstr "Varovanje brezžičnega omrežja:"
-#: ../src/jarabe/desktop/meshbox.py:130
+#: ../src/jarabe/desktop/meshbox.py:131
msgid "Connect"
msgstr "Poveži"
-#: ../src/jarabe/desktop/meshbox.py:134
+#: ../src/jarabe/desktop/meshbox.py:135
msgid "Disconnect"
msgstr "Prekini"
# TRANS: Action label for resuming an activity.
#. TRANS: Action label for resuming an activity.
-#: ../src/jarabe/desktop/meshbox.py:440
-#: ../src/jarabe/frame/activitiestray.py:707
+#: ../src/jarabe/desktop/meshbox.py:441
+#: ../src/jarabe/frame/activitiestray.py:711
#: ../src/jarabe/journal/journaltoolbox.py:425
-#: ../src/jarabe/journal/palettes.py:63 ../src/jarabe/view/palettes.py:62
+#: ../src/jarabe/journal/palettes.py:72 ../src/jarabe/view/palettes.py:66
msgid "Resume"
msgstr "Nadaljuj"
-#: ../src/jarabe/desktop/meshbox.py:445
-#: ../src/jarabe/frame/activitiestray.py:221
+#: ../src/jarabe/desktop/meshbox.py:446
+#: ../src/jarabe/frame/activitiestray.py:227
msgid "Join"
msgstr "Pridruži se"
-#: ../src/jarabe/desktop/schoolserver.py:18
+#: ../src/jarabe/desktop/schoolserver.py:34
msgid "Cannot obtain data needed for registration."
msgstr "Ne morem pridobiti podatkov, potrebnih za registracijo."
-#: ../src/jarabe/desktop/schoolserver.py:35
+#: ../src/jarabe/desktop/schoolserver.py:51
msgid "Cannot connect to the server."
msgstr "Povezava s strežnikom ni mogoča."
-#: ../src/jarabe/desktop/schoolserver.py:40
+#: ../src/jarabe/desktop/schoolserver.py:56
msgid "The server could not complete the request."
msgstr "Strežnik ne more izpolniti zahteve."
-#: ../src/jarabe/frame/activitiestray.py:226
-#: ../src/jarabe/frame/activitiestray.py:655
+#: ../src/jarabe/frame/activitiestray.py:232
+#: ../src/jarabe/frame/activitiestray.py:659
msgid "Decline"
msgstr "Zavrni"
-#: ../src/jarabe/frame/activitiestray.py:608
+#: ../src/jarabe/frame/activitiestray.py:612
#, python-format
msgid "%dB"
msgstr "%dB"
-#: ../src/jarabe/frame/activitiestray.py:610
+#: ../src/jarabe/frame/activitiestray.py:614
#, python-format
msgid "%dKB"
msgstr "%dKB"
-#: ../src/jarabe/frame/activitiestray.py:612
+#: ../src/jarabe/frame/activitiestray.py:616
#, python-format
msgid "%dMB"
msgstr "%dMB"
-#: ../src/jarabe/frame/activitiestray.py:629
+#: ../src/jarabe/frame/activitiestray.py:633
#, python-format
msgid "%s of %s"
msgstr "%s od %s"
-#: ../src/jarabe/frame/activitiestray.py:640
+#: ../src/jarabe/frame/activitiestray.py:644
#, python-format
msgid "Transfer from %r"
msgstr "Prenesi z %r"
-#: ../src/jarabe/frame/activitiestray.py:650
+#: ../src/jarabe/frame/activitiestray.py:654
msgid "Accept"
msgstr "Sprejmi"
-#: ../src/jarabe/frame/activitiestray.py:673
-#: ../src/jarabe/frame/activitiestray.py:780
+#: ../src/jarabe/frame/activitiestray.py:677
+#: ../src/jarabe/frame/activitiestray.py:784
#, python-format
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../src/jarabe/frame/activitiestray.py:751
+#: ../src/jarabe/frame/activitiestray.py:755
#, python-format
msgid "Transfer to %r"
msgstr "Prenesi na %r"
@@ -785,7 +762,7 @@ msgstr "Odpri"
msgid "Open with"
msgstr "Odpri z"
-#: ../src/jarabe/frame/clipboardobject.py:47
+#: ../src/jarabe/frame/clipboardobject.py:49
#, python-format
msgid "%s clipping"
msgstr "%s strižem"
@@ -802,6 +779,10 @@ msgstr "Skupina"
msgid "Home"
msgstr "Domov"
+#: ../src/jarabe/frame/zoomtoolbar.py:42
+msgid "Activity"
+msgstr "Aktivnost"
+
#: ../src/jarabe/intro/window.py:124
msgid "Click to change color:"
msgstr "Klikni za spremembo barve:"
@@ -814,9 +795,9 @@ msgstr "Nazaj"
msgid "Next"
msgstr "Naslednji"
-#: ../src/jarabe/journal/collapsedentry.py:243
+#: ../src/jarabe/journal/collapsedentry.py:258
#: ../src/jarabe/journal/expandedentry.py:159
-#: ../src/jarabe/journal/palettes.py:57
+#: ../src/jarabe/journal/palettes.py:66
msgid "Untitled"
msgstr "Neimenovan"
@@ -895,14 +876,14 @@ msgstr "Karkoli"
# TODO: Add "Start with" menu item
#: ../src/jarabe/journal/journaltoolbox.py:347
-#: ../src/jarabe/journal/palettes.py:81
+#: ../src/jarabe/journal/palettes.py:90
msgid "Copy"
msgstr "Kopiraj"
# TRANS: Action label for starting an entry.
#. TRANS: Action label for starting an entry.
#: ../src/jarabe/journal/journaltoolbox.py:428
-#: ../src/jarabe/journal/palettes.py:66 ../src/jarabe/view/palettes.py:111
+#: ../src/jarabe/journal/palettes.py:75 ../src/jarabe/view/palettes.py:135
msgid "Start"
msgstr "Zaženi"
@@ -918,7 +899,7 @@ msgstr "Ne najdem vsebine za "
msgid "Clear search"
msgstr "Počisti iskanje"
-#: ../src/jarabe/journal/misc.py:92
+#: ../src/jarabe/journal/misc.py:91
msgid "No date"
msgstr "Brez datuma"
@@ -934,96 +915,133 @@ msgstr "Izbriši starejše vpise v beležko, da narediš prostor za nove."
msgid "Show Journal"
msgstr "Prikaži beležko"
-#: ../src/jarabe/journal/objectchooser.py:136
+#: ../src/jarabe/journal/objectchooser.py:147
msgid "Choose an object"
msgstr "Izberi predmet"
-#: ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/objectchooser.py:152
+#: ../src/jarabe/view/viewsource.py:308
+msgid "Close"
+msgstr "Zapri"
+
+#: ../src/jarabe/journal/palettes.py:73
msgid "Resume with"
msgstr "Nadaljuj z"
-#: ../src/jarabe/journal/palettes.py:67
+#: ../src/jarabe/journal/palettes.py:76
msgid "Start with"
msgstr "Začni z"
-#: ../src/jarabe/journal/palettes.py:89
+#: ../src/jarabe/journal/palettes.py:98
msgid "Send to"
msgstr "Pošlji"
-#: ../src/jarabe/journal/palettes.py:167
+#: ../src/jarabe/journal/palettes.py:107
+msgid "View Details"
+msgstr "Poglej podrobnosti"
+
+#: ../src/jarabe/journal/palettes.py:185
msgid "No friends present"
msgstr "Prisoten ni noben prijatelj"
-#: ../src/jarabe/journal/palettes.py:172
+#: ../src/jarabe/journal/palettes.py:190
msgid "No valid connection found"
msgstr "Na voljo ni nobena veljavna povezava"
-#: ../src/jarabe/journal/palettes.py:200
+#: ../src/jarabe/journal/palettes.py:218
msgid "No activity to resume entry"
msgstr "Ni aktivnosti za nadaljevanje"
-#: ../src/jarabe/journal/palettes.py:202
+#: ../src/jarabe/journal/palettes.py:220
msgid "No activity to start entry"
msgstr "Ni aktivnosti za začetek"
-#: ../src/jarabe/view/buddymenu.py:61
+#: ../src/jarabe/view/buddymenu.py:62
msgid "Remove friend"
msgstr "Odstrani prijatelja"
-#: ../src/jarabe/view/buddymenu.py:64
+#: ../src/jarabe/view/buddymenu.py:65
msgid "Make friend"
msgstr "Dodaj prijatelja"
-#: ../src/jarabe/view/buddymenu.py:81
+#: ../src/jarabe/view/buddymenu.py:82
msgid "My Settings"
msgstr "Moje nastavitve"
-#: ../src/jarabe/view/buddymenu.py:86
+#: ../src/jarabe/view/buddymenu.py:90
msgid "Logout"
msgstr "Odjava"
-#: ../src/jarabe/view/buddymenu.py:91
+#: ../src/jarabe/view/buddymenu.py:95
msgid "Restart"
msgstr "Ponovni zagon"
-#: ../src/jarabe/view/buddymenu.py:96
+#: ../src/jarabe/view/buddymenu.py:100
msgid "Shutdown"
msgstr "Zaustavitev"
-#: ../src/jarabe/view/buddymenu.py:131
+#: ../src/jarabe/view/buddymenu.py:135
#, python-format
msgid "Invite to %s"
msgstr "Povabi na %s"
-#: ../src/jarabe/view/palettes.py:43
+#: ../src/jarabe/view/palettes.py:47
msgid "Starting..."
msgstr "Zaganjam ..."
+#. TODO: share-with, keep
#: ../src/jarabe/view/palettes.py:73
+msgid "View Source"
+msgstr "Poglej izvor"
+
+#: ../src/jarabe/view/palettes.py:84
msgid "Stop"
msgstr "Ustavi"
-#: ../src/jarabe/view/palettes.py:145
+#: ../src/jarabe/view/palettes.py:171
msgid "Remove favorite"
msgstr "Odstrani priljubljeno"
-#: ../src/jarabe/view/palettes.py:149
+#: ../src/jarabe/view/palettes.py:175
msgid "Make favorite"
msgstr "Nastavi priljubljeno"
-#: ../src/jarabe/view/palettes.py:201
+#: ../src/jarabe/view/palettes.py:238
msgid "Show contents"
msgstr "Prikaži vsebino"
-#: ../src/jarabe/view/palettes.py:223 ../src/jarabe/view/palettes.py:272
+#: ../src/jarabe/view/palettes.py:260 ../src/jarabe/view/palettes.py:309
#, python-format
msgid "%(free_space)d MB Free"
msgstr "%(free_space)d MB prosto"
-#: ../src/jarabe/view/palettes.py:248
+#: ../src/jarabe/view/palettes.py:285
msgid "Unmount"
msgstr "Odstrani"
+#: ../src/jarabe/view/viewsource.py:208
+msgid "Instance Source"
+msgstr "Primer izvora"
+
+#: ../src/jarabe/view/viewsource.py:233
+msgid "Source"
+msgstr "Izvor"
+
+#: ../src/jarabe/view/viewsource.py:292
+msgid "Activity Bundle Source"
+msgstr "Izvor kompleta aktivnosti"
+
+#: ../src/jarabe/view/viewsource.py:299
+#, python-format
+msgid "View source: %r"
+msgstr "Poglej vir: %r"
+
+#~ msgid "Document"
+#~ msgstr "Dokument"
+
+#~ msgid "Resume by default"
+#~ msgstr "Vedno nadaljuj"
+
#~ msgid "Encryption Type:"
#~ msgstr "Tip kodiranja:"
diff --git a/po/sv.po b/po/sv.po
index 0ab6089..3b430ce 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,408 +6,108 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-25 00:30-0400\n"
-"PO-Revision-Date: 2008-10-14 08:00-0400\n"
-"Last-Translator: Mattias Ohlsson <mattias_oh@yahoo.com>\n"
+"POT-Creation-Date: 2009-02-21 00:30-0500\n"
+"PO-Revision-Date: 2009-02-27 19:17-0500\n"
+"Last-Translator: Susanna Björverud <susanna.bjorverud@telia.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Pootle 1.1.0rc2\n"
-#: ../src/intro/window.py:93 ../src/controlpanel/aboutme/view.py:100
-msgid "Name:"
-msgstr "Namn:"
-
-#: ../src/intro/window.py:125
-msgid "Click to change color:"
-msgstr "Klicka för att ändra färg:"
-
-#: ../src/intro/window.py:175 ../src/journal/detailview.py:119
-msgid "Back"
-msgstr "Tillbaka"
-
-#: ../src/intro/window.py:189 ../src/controlpanel/toolbar.py:61
-msgid "Done"
-msgstr "Klar"
-
-#: ../src/intro/window.py:192
-msgid "Next"
-msgstr "Nästa"
-
-#: ../src/view/BuddyMenu.py:60
-msgid "Remove friend"
-msgstr "Ta bort kompis"
-
-#: ../src/view/BuddyMenu.py:63
-msgid "Make friend"
-msgstr "Bli kompis med"
-
-#: ../src/view/BuddyMenu.py:92
-#, python-format
-msgid "Invite to %s"
-msgstr "Bjud in till %s"
-
-#: ../src/view/clipboardmenu.py:51
-msgid "Remove"
-msgstr "Ta bort"
-
-#: ../src/view/clipboardmenu.py:56 ../src/view/clipboardmenu.py:78
-msgid "Open"
-msgstr "Öppna"
-
-# self._stop_item = MenuItem(_('Stop download'), 'stock-close')
-# TODO: Implement stopping downloads
-# self._stop_item.connect('activate', self._stop_item_activate_cb)
-# self.append_menu_item(self._stop_item)
-#: ../src/view/clipboardmenu.py:61 ../src/view/home/HomeBox.py:84
-msgid "Keep"
-msgstr "Spara"
-
-#: ../src/view/clipboardmenu.py:83
-msgid "Open with"
-msgstr "Öppna med"
-
-#: ../src/view/clipboardmenu.py:228
-#, python-format
-msgid "%s clipping"
-msgstr ""
-
-#: ../src/hardware/keydialog.py:150
-msgid "Key Type:"
-msgstr "Huvudtyp:"
-
-#: ../src/hardware/keydialog.py:170
-msgid "Authentication Type:"
-msgstr "Verifieringstyp:"
-
-#: ../src/hardware/keydialog.py:251
-msgid "Encryption Type:"
-msgstr "Krypteringstyp:"
-
-#: ../src/hardware/schoolserver.py:17
-msgid "Cannot obtain data needed for registration."
-msgstr ""
-"Kunde inte komma åt den data som krävs för att genomföra registreringen."
-
-#: ../src/hardware/schoolserver.py:31
-msgid "Cannot connect to the server."
-msgstr "Kunde inte komma åter servern."
-
-#: ../src/hardware/schoolserver.py:36
-msgid "The server could not complete the request."
-msgstr "Servern misslyckades med att fullfölja förfrågan."
-
-#: ../src/view/Shell.py:251
-msgid "Screenshot"
-msgstr "Skärmbild"
-
-#: ../src/view/home/HomeBox.py:78
-msgid "Confirm erase"
-msgstr "Bekräfta borttagning"
-
-#: ../src/view/home/HomeBox.py:80
-#, python-format
-msgid "Confirm erase: Do you want to permanently erase %s?"
-msgstr "Bekräfta borttagning: Vill du verkligen ta bort %s för alltid?"
-
-#: ../src/view/home/HomeBox.py:87 ../src/view/palettes.py:120
-#: ../src/journal/journaltoolbox.py:335 ../src/journal/palettes.py:75
-msgid "Erase"
-msgstr "Ta bort"
-
-#: ../src/view/home/HomeBox.py:117
-msgid "Software Update"
-msgstr "Aktivitetsuppdatering"
-
-#: ../src/view/home/HomeBox.py:118
-msgid "Update your activities to ensure compatibility with your new software"
-msgstr ""
-"Uppdaterar dina aktiviteter för att på så sätt ge dig tillgång till nya "
-"funktioner"
-
-#: ../src/view/home/HomeBox.py:122 ../src/controlpanel/toolbar.py:115
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: ../src/view/home/HomeBox.py:124 ../src/controlpanel/gui.py:273
-msgid "Later"
-msgstr "Senare"
-
-#: ../src/view/home/HomeBox.py:127
-msgid "Check now"
-msgstr "Kontrollera nu"
-
-#: ../src/view/home/HomeBox.py:261
-msgid "List view"
-msgstr "Listvy"
-
-#: ../src/view/home/HomeBox.py:262
-msgid "<Ctrl>2"
-msgstr "<Ctrl> + 2"
-
-#: ../src/view/home/HomeBox.py:320
-msgid "Favorites view"
-msgstr "Favoritvy"
-
-#: ../src/view/home/HomeBox.py:321
-msgid "<Ctrl>1"
-msgstr "<Ctrl> + 1"
-
-#: ../src/view/home/MeshBox.py:97
-msgid "Connect"
-msgstr "Anslut"
-
-#: ../src/view/home/MeshBox.py:106
-msgid "Disconnect"
-msgstr "Avbryt anslutning"
-
-#: ../src/view/home/MeshBox.py:118
-msgid "Disconnecting..."
-msgstr "Kopplar ned..."
-
-#: ../src/view/home/MeshBox.py:159
-msgid "Connecting..."
-msgstr "Kopplar upp..."
-
-# TODO: show the channel number
-#. TODO: show the channel number
-#: ../src/view/home/MeshBox.py:166
-msgid "Connected"
-msgstr "Ansluten"
-
-# only temporarily
-#: ../src/view/home/MeshBox.py:218 ../src/view/devices/network/mesh.py:41
-#: ../src/view/devices/network/mesh.py:68
-#: ../src/view/devices/network/mesh.py:72
-msgid "Mesh Network"
-msgstr "Meshnätverk"
-
-#: ../src/view/home/MeshBox.py:221 ../src/view/devices/network/wireless.py:125
-#: ../src/view/devices/network/mesh.py:89
-msgid "Disconnect..."
-msgstr "Avbryt anslutning..."
-
-#. TRANS: Action label for resuming an activity.
-#: ../src/view/home/MeshBox.py:309 ../src/view/palettes.py:61
-#: ../src/journal/journaltoolbox.py:399 ../src/journal/palettes.py:57
-msgid "Resume"
-msgstr "Återuppta"
-
-#: ../src/view/home/MeshBox.py:314 ../src/view/frame/activitiestray.py:206
-msgid "Join"
-msgstr "Gå med i"
-
-#: ../src/view/devices/battery.py:45
-msgid "My Battery"
-msgstr "Mitt batteri"
-
-#: ../src/view/devices/battery.py:114
-msgid "Charging"
-msgstr "Laddar"
-
-#: ../src/view/devices/battery.py:117
-msgid "Very little power remaining"
-msgstr "Batteriet är nästan slut"
-
-#: ../src/view/devices/battery.py:123
-#, python-format
-msgid "%(hour)d:%(min).2d remaining"
-msgstr "%(hour)d:%(min).2d återstår"
-
-#: ../src/view/devices/battery.py:127
-msgid "Charged"
-msgstr "Fulladdad"
-
-#: ../src/view/devices/speaker.py:44
-msgid "My Speakers"
-msgstr "Mina högtalare"
-
-#: ../src/view/devices/speaker.py:125
-msgid "Unmute"
-msgstr "Slå på ljud"
-
-#: ../src/view/devices/speaker.py:128
-msgid "Mute"
-msgstr "Stäng av ljud"
-
-#: ../src/view/devices/network/wireless.py:67
-msgid "Disconnected"
-msgstr "Inte ansluten"
-
-#: ../src/view/devices/network/wireless.py:143
-msgid "Channel"
-msgstr "Kanal"
-
-#: ../src/view/frame/zoomtoolbar.py:37
-msgid "Neighborhood"
-msgstr "Grannar"
-
-#: ../src/view/frame/zoomtoolbar.py:39
-msgid "Group"
-msgstr "Grupp"
-
-#: ../src/view/frame/zoomtoolbar.py:41
-msgid "Home"
-msgstr "Hem"
-
-#: ../src/view/frame/zoomtoolbar.py:43
-msgid "Activity"
-msgstr "Aktivitet"
-
-#: ../src/controlpanel/cmd.py:26
-#, python-format
-msgid ""
-"sugar-control-panel: WARNING, found more than one option with the same name: "
-"%s module: %r"
-msgstr ""
-"sugar-control-panel: VARNING, Hittade mer än ett alternativ med samma namn: "
-"%s modul: %r"
-
-#: ../src/controlpanel/cmd.py:28
-#, python-format
-msgid "sugar-control-panel: key=%s not an available option"
-msgstr "sugar-control-panel: key=%s är inte ett giltigt val."
-
-#: ../src/controlpanel/cmd.py:29
-#, python-format
-msgid "sugar-control-panel: %s"
-msgstr "sugar-control-panel: %s"
-
-# TRANS: Translators, there's a empty line at the end of this string,
-# which must appear in the translated string (msgstr) as well.
-#. TRANS: Translators, there's a empty line at the end of this string,
-#. which must appear in the translated string (msgstr) as well.
-#: ../src/controlpanel/cmd.py:35
-msgid ""
-"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
-" Control for the sugar environment. \n"
-" Options: \n"
-" -h show this help message and exit \n"
-" -l list all the available options \n"
-" -h key show information about this key \n"
-" -g key get the current value of the key \n"
-" -s key set the current value for the key \n"
-" -c key clear the current value for the key \n"
-" "
-msgstr ""
-"Användning: sugar-control-panel [ val ] nyckel [ parametrar ... ] \n"
-" Ställ in Sockermiljön. \n"
-" Val: \n"
-" -h visar hjälpmeddelande och avslutar. \n"
-" -l listar upp alla möjliga val \n"
-" -h nyckel Visar information om nyckeln \n"
-" -g nyckel Hämtar nuvarande värde på nyckel \n"
-" -s nyckel Sätter nuvarande värde på nyckel \n"
-" -c nyckel Rensar nuvarande värde på nyckel \n"
-" "
-
-#: ../src/controlpanel/cmd.py:48
-msgid "To apply your changes you have to restart sugar.\n"
-msgstr "För att förändringarna ska träda i kraft behöver du starta om Socker."
-
-#: ../src/controlpanel/toolbar.py:121 ../src/view/home/favoritesview.py:305
-msgid "Ok"
-msgstr "Ok"
-
-#: ../src/controlpanel/sectionview.py:42 ../src/controlpanel/gui.py:265
-msgid "Changes require restart"
-msgstr "Ändringarna kräver omstart"
-
-#: ../src/controlpanel/gui.py:264
-msgid "Warning"
-msgstr "Varning"
-
-#: ../src/controlpanel/gui.py:268
-msgid "Cancel changes"
-msgstr "Ångra ändringar"
-
-#: ../src/controlpanel/gui.py:277
-msgid "Restart now"
-msgstr "Starta om nu"
+#: ../extensions/cpsection/aboutme/__init__.py:24
+msgid "About Me"
+msgstr "Om mig"
-#: ../src/controlpanel/aboutme/model.py:44
+#: ../extensions/cpsection/aboutme/model.py:43
msgid "You must enter a name."
msgstr "Du måste ange ett namn."
# Varför ska detta översättas? Är det inte direkta kommandon till grafikuppritaren?
-#: ../src/controlpanel/aboutme/model.py:69
+#: ../extensions/cpsection/aboutme/model.py:68
#, python-format
msgid "stroke: color=%s hue=%s"
msgstr "stroke: color=%s hue=%s"
-#: ../src/controlpanel/aboutme/model.py:72
+#: ../extensions/cpsection/aboutme/model.py:71
#, python-format
msgid "stroke: %s"
msgstr "stroke: %s"
-#: ../src/controlpanel/aboutme/model.py:74
+#: ../extensions/cpsection/aboutme/model.py:73
#, python-format
msgid "fill: color=%s hue=%s"
msgstr "fill: color=%s hue=%s"
-#: ../src/controlpanel/aboutme/model.py:76
+#: ../extensions/cpsection/aboutme/model.py:75
#, python-format
msgid "fill: %s"
msgstr "fill: %s"
-#: ../src/controlpanel/aboutme/model.py:87
+#: ../extensions/cpsection/aboutme/model.py:86
msgid "Error in specified color modifiers."
msgstr "Error in specified color modifiers."
-#: ../src/controlpanel/aboutme/model.py:90
+#: ../extensions/cpsection/aboutme/model.py:89
msgid "Error in specified colors."
msgstr "Fel i angivna färger."
-#: ../src/controlpanel/aboutme/view.py:32
-#: ../src/controlpanel/aboutme/__init__.py:22
-msgid "About Me"
-msgstr "Om mig"
+#: ../extensions/cpsection/aboutme/view.py:94 ../src/jarabe/intro/window.py:92
+msgid "Name:"
+msgstr "Namn:"
-#: ../src/controlpanel/aboutme/view.py:134
+#: ../extensions/cpsection/aboutme/view.py:128
msgid "Click to change your color:"
msgstr "Klicka för att ändra din färg:"
-#: ../src/controlpanel/aboutxo/model.py:24
+#: ../extensions/cpsection/aboutcomputer/__init__.py:21
+msgid "About my Computer"
+msgstr "Om min dator"
+
+#: ../extensions/cpsection/aboutcomputer/model.py:26
msgid "Not available"
msgstr "Finns inte tillgänglig"
-#: ../src/controlpanel/aboutxo/view.py:55
+#: ../extensions/cpsection/aboutcomputer/view.py:59
msgid "Identity"
msgstr "Identitet"
-#: ../src/controlpanel/aboutxo/view.py:64
+#: ../extensions/cpsection/aboutcomputer/view.py:68
msgid "Serial Number:"
msgstr "Serienummer:"
-#: ../src/controlpanel/aboutxo/view.py:87
+#: ../extensions/cpsection/aboutcomputer/view.py:90
msgid "Software"
msgstr "Programvara"
-#: ../src/controlpanel/aboutxo/view.py:96
+#: ../extensions/cpsection/aboutcomputer/view.py:99
msgid "Build:"
msgstr "Byggnummer:"
-#: ../src/controlpanel/aboutxo/view.py:111
+#: ../extensions/cpsection/aboutcomputer/view.py:114
msgid "Sugar:"
msgstr "Sockerversion:"
-#: ../src/controlpanel/aboutxo/view.py:126
+#: ../extensions/cpsection/aboutcomputer/view.py:130
msgid "Firmware:"
-msgstr "Firmware:"
+msgstr "Fast mjukvara:"
-#: ../src/controlpanel/aboutxo/view.py:148
+#: ../extensions/cpsection/aboutcomputer/view.py:145
+msgid "Wireless Firmware:"
+msgstr "Trådlös fast mjukvara:"
+
+#: ../extensions/cpsection/aboutcomputer/view.py:168
msgid "Copyright and License"
msgstr "Copyright och Licens"
-#: ../src/controlpanel/aboutxo/view.py:156
+#: ../extensions/cpsection/aboutcomputer/view.py:176
msgid ""
"© 2008 One Laptop per Child Association Inc; Red Hat Inc; and Contributors."
msgstr ""
"© 2008 One Laptop per Child Association Inc; Red Hat Inc; och andra "
"bidragare."
-#: ../src/controlpanel/aboutxo/view.py:163
+#: ../extensions/cpsection/aboutcomputer/view.py:183
msgid ""
"Sugar is the graphical user interface that you are looking at. Sugar is free "
"software, covered by the GNU General Public License, and you are welcome to "
@@ -418,392 +118,988 @@ msgstr ""
"är fri programvara och licenserad under GNU GPL vilket innebär att du fritt "
"får ändra programmet och/eller sprida vidare kopior av programmet."
-#: ../src/controlpanel/aboutxo/view.py:175
+#: ../extensions/cpsection/aboutcomputer/view.py:195
msgid "Full license:"
msgstr "Detaljerad licens:"
-#: ../src/controlpanel/aboutxo/__init__.py:21
-msgid "About my XO"
-msgstr "Om min XO"
+#: ../extensions/cpsection/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr "Datum och tid"
-#: ../src/controlpanel/datetime/model.py:89
+#: ../extensions/cpsection/datetime/model.py:87
msgid "Error timezone does not exist."
msgstr "Fel: Tidszonen finns inte."
-#: ../src/controlpanel/datetime/view.py:68
+#: ../extensions/cpsection/datetime/view.py:68 ../data/sugar.schemas.in.h:19
msgid "Timezone"
msgstr "Tidszon"
-#: ../src/controlpanel/datetime/__init__.py:21
-msgid "Date & Time"
-msgstr "Datum och tid"
+#: ../extensions/cpsection/frame/__init__.py:21
+msgid "Frame"
+msgstr "Ram"
-#: ../src/controlpanel/frame/model.py:38 ../src/controlpanel/frame/model.py:60
+#: ../extensions/cpsection/frame/model.py:38
+#: ../extensions/cpsection/frame/model.py:60
msgid "Value must be an integer."
msgstr "Talet måste vara ett heltal."
-#: ../src/controlpanel/frame/view.py:26
+#: ../extensions/cpsection/frame/view.py:26
msgid "never"
msgstr "aldrig"
-#: ../src/controlpanel/frame/view.py:27
+#: ../extensions/cpsection/frame/view.py:27
msgid "instantaneous"
msgstr "direkt"
-#: ../src/controlpanel/frame/view.py:28
+#: ../extensions/cpsection/frame/view.py:28
#, python-format
msgid "%s seconds"
msgstr "efter %s sekunder"
-#: ../src/controlpanel/frame/view.py:52
+#: ../extensions/cpsection/frame/view.py:52
msgid "Activation Delay"
msgstr "Tid tills aktivering"
-#: ../src/controlpanel/frame/view.py:76
+#: ../extensions/cpsection/frame/view.py:76
msgid "Corner"
msgstr "Hörn"
-#: ../src/controlpanel/frame/view.py:111
+#: ../extensions/cpsection/frame/view.py:111
msgid "Edge"
msgstr "Kant"
-#: ../src/controlpanel/frame/__init__.py:21
-msgid "Frame"
-msgstr "Ram"
+#: ../extensions/cpsection/language/__init__.py:21
+#: ../extensions/cpsection/language/view.py:32
+msgid "Language"
+msgstr "Språk"
-#: ../src/controlpanel/language/model.py:28
+#: ../extensions/cpsection/language/model.py:28
msgid "Could not access ~/.i18n. Create standard settings."
msgstr "Kunde inte komma åt ~/.i18n. Skapar standardinställningar."
-#: ../src/controlpanel/language/model.py:114
+#: ../extensions/cpsection/language/model.py:124
#, python-format
msgid "Language for code=%s could not be determined."
-msgstr "Kunde inte avgöra vilket språk det är som förkortas %s."
+msgstr "Kunde inte avgöra vilket språk det är som har koden %s."
-#: ../src/controlpanel/language/model.py:131
+#: ../extensions/cpsection/language/model.py:144
#, python-format
msgid "Sorry I do not speak '%s'."
msgstr "Tyvärr så pratar jag inte '%s'."
-#: ../src/controlpanel/language/view.py:70
-#: ../src/controlpanel/language/__init__.py:21
-msgid "Language"
-msgstr "Språk"
+#: ../extensions/cpsection/network/__init__.py:21
+#: ../extensions/cpsection/network/view.py:28
+msgid "Network"
+msgstr "Nätverk"
-#: ../src/controlpanel/network/model.py:62
+#: ../extensions/cpsection/network/model.py:79
msgid "State is unknown."
msgstr "Status är okänd."
-#: ../src/controlpanel/network/model.py:82
+#: ../extensions/cpsection/network/model.py:105
msgid "Error in specified radio argument use on/off."
msgstr "Fel i angiven trådlös nätverksinställning. Använd på eller av."
-#: ../src/controlpanel/network/view.py:28
-#: ../src/controlpanel/network/__init__.py:21
-msgid "Network"
-msgstr "Nätverk"
+#: ../extensions/cpsection/network/model.py:137
+msgid "Error in specified argument use 0/1."
+msgstr "Fel i angivet argument. Använd 0/1"
-#: ../src/controlpanel/network/view.py:54
+#: ../extensions/cpsection/network/view.py:56
msgid "Wireless"
msgstr "Trådlöst nätverk"
-#: ../src/controlpanel/network/view.py:62
-msgid "Turn of the wireless radio to save battery life"
+#: ../extensions/cpsection/network/view.py:64
+msgid "Turn off the wireless radio to save battery life"
msgstr "Stäng av det trådlösa nätverket för att få batteriet att räcka längre"
-#: ../src/controlpanel/network/view.py:75
+#: ../extensions/cpsection/network/view.py:77
msgid "Radio"
msgstr "Trådlöst nätverk"
-#: ../src/controlpanel/network/view.py:91
+#: ../extensions/cpsection/network/view.py:93
msgid "Discard network history if you have trouble connecting to the network"
msgstr ""
"Ta bort nätverkshistoriken om du har problem med att ansluta till ett "
"nätverk"
-#: ../src/controlpanel/network/view.py:100
+#: ../extensions/cpsection/network/view.py:102
msgid "Discard network history"
msgstr "Ta bort nätverkshistorik"
-#: ../src/controlpanel/network/view.py:113
-msgid "Mesh"
-msgstr "Mesh"
+#: ../extensions/cpsection/network/view.py:115
+msgid "Collaboration"
+msgstr "Samarbete"
-#: ../src/controlpanel/network/view.py:122
+#: ../extensions/cpsection/network/view.py:123
+msgid ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
+msgstr ""
+"Servern motsvarar det rum som du är i; de som är på samma server kan se "
+"varandra även när de inte är på samma nätverk."
+
+#: ../extensions/cpsection/network/view.py:133
msgid "Server:"
msgstr "Server:"
-#: ../src/controlpanel/power/model.py:55
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr "Ström"
+
+#: ../extensions/cpsection/power/model.py:54
msgid "Error in automatic pm argument, use on/off."
-msgstr "Fel i angiven strömbestparingsinställning. Använd på eller av."
+msgstr "Fel i angiven strömbesparingsinställning. Använd på eller av."
-#: ../src/controlpanel/power/model.py:84
+#: ../extensions/cpsection/power/model.py:81
msgid "Error in extreme pm argument, use on/off."
-msgstr "Fel i angiven extrem strömbestparingsinställning. Använd på eller av."
+msgstr "Fel i angiven extrem strömbesparingsinställning. Använd på eller av."
-#: ../src/controlpanel/power/view.py:47
+#: ../extensions/cpsection/power/view.py:47
msgid "Power management"
msgstr "Strömhantering"
-#: ../src/controlpanel/power/view.py:57
+#: ../extensions/cpsection/power/view.py:57
msgid "Automatic power management (increases battery life)"
-msgstr "Automatisk strömhantering (förbättrar tiden som batteriet håller)"
+msgstr "Automatisk strömhantering (förlänger tiden som batteriet varar)"
-#: ../src/controlpanel/power/view.py:85
+#: ../extensions/cpsection/power/view.py:85
msgid ""
"Extreme power management (disableswireless radio, increases battery life)"
msgstr ""
"Extrem strömhantering (stänger av det trådlösa nätverket, ökar "
"batterilivslängden)"
-#: ../src/controlpanel/power/__init__.py:21
-msgid "Power"
-msgstr "Ström"
+#: ../extensions/deviceicon/battery.py:56
+msgid "My Battery"
+msgstr "Mitt batteri"
-#: ../src/view/devices/network/mesh.py:111
-msgid "Connected to a School Mesh Portal"
-msgstr "Ansluten till en skolportal"
+#: ../extensions/deviceicon/battery.py:137
+msgid "Removed"
+msgstr "Borttaget"
-#: ../src/view/devices/network/mesh.py:113
-msgid "Looking for a School Mesh Portal..."
-msgstr "Letar efter en skolportal..."
+#: ../extensions/deviceicon/battery.py:140
+msgid "Charging"
+msgstr "Laddar"
-#: ../src/view/devices/network/mesh.py:116
-msgid "Connected to an XO Mesh Portal"
-msgstr "Ansluten till en XO-portal"
+#: ../extensions/deviceicon/battery.py:143
+msgid "Very little power remaining"
+msgstr "Batteriet är nästan slut"
-#: ../src/view/devices/network/mesh.py:118
-msgid "Looking for an XO Mesh Portal..."
-msgstr "Letar efter en XO-portal..."
+#: ../extensions/deviceicon/battery.py:149
+#, python-format
+msgid "%(hour)d:%(min).2d remaining"
+msgstr "%(hour)d:%(min).2d återstår"
-#: ../src/view/devices/network/mesh.py:121
-msgid "Connected to a Simple Mesh"
-msgstr "Ansluten till ett enkelt meshnätverk"
+#: ../extensions/deviceicon/battery.py:152
+msgid "Charged"
+msgstr "Fulladdad"
-#: ../src/view/devices/network/mesh.py:123
-msgid "Starting a Simple Mesh"
-msgstr "Startar ett enkelt meshnätverk..."
+#: ../extensions/deviceicon/network.py:40
+#, python-format
+msgid "IP address: %s"
+msgstr "IP-adress: %s"
-#: ../src/view/devices/network/mesh.py:130
-msgid "Unknown Mesh"
-msgstr "Okänt meshnätverk"
+#: ../extensions/deviceicon/network.py:104
+msgid "Disconnect..."
+msgstr "Avbryt anslutning..."
-#: ../src/view/frame/activitiestray.py:211
-msgid "Decline"
-msgstr "Avstå"
+#: ../extensions/deviceicon/network.py:109
+#: ../src/jarabe/desktop/meshbox.py:247
+msgid "Connecting..."
+msgstr "Kopplar upp..."
+
+# TODO: show the channel number
+#: ../extensions/deviceicon/network.py:113
+#: ../extensions/deviceicon/network.py:166
+#: ../src/jarabe/desktop/meshbox.py:253
+msgid "Connected"
+msgstr "Ansluten"
+
+#: ../extensions/deviceicon/network.py:126
+msgid "Channel"
+msgstr "Kanal"
+
+#: ../extensions/deviceicon/network.py:141
+msgid "Wired Network"
+msgstr "Trådbundet nätverk"
+
+#: ../extensions/deviceicon/network.py:169
+msgid "Speed"
+msgstr "Hastighet"
+
+#: ../extensions/deviceicon/speaker.py:46
+msgid "My Speakers"
+msgstr "Mina högtalare"
+
+#: ../extensions/deviceicon/speaker.py:128
+msgid "Unmute"
+msgstr "Slå på ljud"
+
+#: ../extensions/deviceicon/speaker.py:131
+msgid "Mute"
+msgstr "Stäng av ljud"
+
+#: ../extensions/globalkey/screenshot.py:50
+msgid "Screenshot"
+msgstr "Skärmbild"
+
+#: ../data/sugar.schemas.in.h:1
+msgid "Backup URL"
+msgstr "URL för säkerhetskopiering"
+
+# Error in original string! Never heard of "rbg colors".
+#: ../data/sugar.schemas.in.h:2
+msgid ""
+"Color for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke color and fill color, format is that of rbg colors. "
+"Example: #AC32FF,#9A5200"
+msgstr ""
+"Den färg som används för XO-ikonen överallt på skrivbordet. Det skall vara "
+"en sträng som består av streckfärg och fyllnadsfärg båda formaterade som "
+"rgb-färger. Exempel: #AC32FF,#9A5200"
+
+#: ../data/sugar.schemas.in.h:3
+msgid "Corner Delay"
+msgstr "Hörnfördröjning"
+
+#: ../data/sugar.schemas.in.h:4
+msgid "Delay for the activation of the frame using the corners."
+msgstr "Fördröjning innan aktivering av ramen med hjälp av hörnen."
+
+#: ../data/sugar.schemas.in.h:5
+msgid "Delay for the activation of the frame using the edges."
+msgstr "Fördröjning innan aktivering av ramen med hjälp av kanterna."
+
+#: ../data/sugar.schemas.in.h:6
+msgid "Edge Delay"
+msgstr "Kantfördröjning"
+
+#: ../data/sugar.schemas.in.h:7
+msgid "Favorites Layout"
+msgstr "Utseende på favoriter"
+
+#: ../data/sugar.schemas.in.h:8
+msgid "Favorites resume mode"
+msgstr "Fortsättningsläge för favoriter"
+
+#: ../data/sugar.schemas.in.h:9
+msgid ""
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
+msgstr ""
+"Om SANT, så gör Sugar så att vi kan sökas fram av andra användare av jabber-"
+"servern."
+
+#: ../data/sugar.schemas.in.h:10
+msgid "Jabber Server"
+msgstr "Jabber-server"
+
+#: ../data/sugar.schemas.in.h:11
+msgid "Layout of the favorites view."
+msgstr "Hur favoritvyn ser ut."
+
+#: ../data/sugar.schemas.in.h:12
+msgid "Power Automatic"
+msgstr "Automatisk ström"
+
+#: ../data/sugar.schemas.in.h:13
+msgid "Power Automatic."
+msgstr "Automatisk ström."
+
+#: ../data/sugar.schemas.in.h:14
+msgid "Power Extreme"
+msgstr "Extrem ström"
+
+#: ../data/sugar.schemas.in.h:15
+msgid "Power Extreme."
+msgstr "Extrem ström."
+
+#: ../data/sugar.schemas.in.h:16
+msgid "Publish to Gadget"
+msgstr "Publicera till Gadget"
+
+#: ../data/sugar.schemas.in.h:17
+msgid "Setting for muting the sound device."
+msgstr "Inställningar för att stänga av ljudenheten."
+
+#: ../data/sugar.schemas.in.h:18
+msgid "Sound Muted"
+msgstr "Ljud avstängt"
+
+#: ../data/sugar.schemas.in.h:20
+msgid "Timezone setting for the system."
+msgstr "Systemets tidszonsinställning."
+
+#: ../data/sugar.schemas.in.h:21
+msgid "Url of the jabber server to use."
+msgstr "URL för den jabber-server som skall användas."
+
+#: ../data/sugar.schemas.in.h:22
+msgid "Url where the backup is saved to."
+msgstr "URL för den plats där säkerhetskopieringar skall lagras."
+
+#: ../data/sugar.schemas.in.h:23
+msgid "User Color"
+msgstr "Användarfärg"
+
+#: ../data/sugar.schemas.in.h:24
+msgid "User Name"
+msgstr "Användarnamn"
+
+#: ../data/sugar.schemas.in.h:25
+msgid "User name that is used throughout the desktop."
+msgstr "Det användarnamn som används överallt på skrivbordet."
+
+#: ../data/sugar.schemas.in.h:26
+msgid "Volume Level"
+msgstr "Volymnivå"
+
+#: ../data/sugar.schemas.in.h:27
+msgid "Volume level for the sound device."
+msgstr "Ljudenhetens volymnivå."
+#: ../data/sugar.schemas.in.h:28
+msgid ""
+"When in resume mode, clicking on a favorite icon will cause the last entry "
+"for that activity to be resumed."
+msgstr ""
+"Om fortsättningsläge är aktiverat så kommer ett klick på en favoritikon "
+"innebära att den senaste posten för den aktiviteten kommer att återupptas."
+
+#: ../src/jarabe/controlpanel/cmd.py:28
+#, python-format
+msgid ""
+"sugar-control-panel: WARNING, found more than one option with the same name: "
+"%s module: %r"
+msgstr ""
+"sugar-control-panel: VARNING, Hittade mer än ett alternativ med samma namn: "
+"%s modul: %r"
+
+#: ../src/jarabe/controlpanel/cmd.py:30
+#, python-format
+msgid "sugar-control-panel: key=%s not an available option"
+msgstr "sugar-control-panel: key=%s är inte ett giltigt val."
+
+#: ../src/jarabe/controlpanel/cmd.py:31
+#, python-format
+msgid "sugar-control-panel: %s"
+msgstr "sugar-control-panel: %s"
+
+# TRANS: Translators, there's a empty line at the end of this string,
+# which must appear in the translated string (msgstr) as well.
+#. TRANS: Translators, there's a empty line at the end of this string,
+#. which must appear in the translated string (msgstr) as well.
+#: ../src/jarabe/controlpanel/cmd.py:37
+msgid ""
+"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
+" Control for the sugar environment. \n"
+" Options: \n"
+" -h show this help message and exit \n"
+" -l list all the available options \n"
+" -h key show information about this key \n"
+" -g key get the current value of the key \n"
+" -s key set the current value for the key \n"
+" -c key clear the current value for the key \n"
+" "
+msgstr ""
+"Användning: sugar-control-panel [ val ] nyckel [ parametrar ... ] \n"
+" Ställ in Sockermiljön. \n"
+" Val: \n"
+" -h visar hjälpmeddelande och avslutar. \n"
+" -l listar upp alla möjliga val \n"
+" -h nyckel Visar information om nyckeln \n"
+" -g nyckel Hämtar nuvarande värde på nyckel \n"
+" -s nyckel Sätter nuvarande värde på nyckel \n"
+" -c nyckel Rensar nuvarande värde på nyckel \n"
+" "
+
+#: ../src/jarabe/controlpanel/cmd.py:50
+msgid "To apply your changes you have to restart sugar.\n"
+msgstr "För att förändringarna ska träda i kraft behöver du starta om Socker."
+
+#: ../src/jarabe/controlpanel/gui.py:275
+msgid "Warning"
+msgstr "Varning"
+
+#: ../src/jarabe/controlpanel/gui.py:276
+#: ../src/jarabe/controlpanel/sectionview.py:42
+msgid "Changes require restart"
+msgstr "Ändringarna kräver omstart"
+
+#: ../src/jarabe/controlpanel/gui.py:279
+msgid "Cancel changes"
+msgstr "Ångra ändringar"
+
+#: ../src/jarabe/controlpanel/gui.py:284 ../src/jarabe/desktop/homebox.py:113
+msgid "Later"
+msgstr "Senare"
+
+#: ../src/jarabe/controlpanel/gui.py:288
+msgid "Restart now"
+msgstr "Starta om nu"
+
+#: ../src/jarabe/controlpanel/toolbar.py:61 ../src/jarabe/intro/window.py:188
+msgid "Done"
+msgstr "Klar"
+
+#: ../src/jarabe/controlpanel/toolbar.py:115
+#: ../src/jarabe/desktop/homebox.py:111
+#: ../src/jarabe/frame/activitiestray.py:687
+#: ../src/jarabe/frame/activitiestray.py:766
+#: ../src/jarabe/frame/activitiestray.py:794
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: ../src/jarabe/controlpanel/toolbar.py:121
+#: ../src/jarabe/desktop/favoritesview.py:338
+msgid "Ok"
+msgstr "Ok"
+
+# TRANS: label for the freeform layout in the favorites view
#. TRANS: label for the freeform layout in the favorites view
-#: ../src/view/home/favoriteslayout.py:107
+#: ../src/jarabe/desktop/favoriteslayout.py:114
msgid "Freeform"
msgstr "Frihand"
+# TRANS: label for the ring layout in the favorites view
#. TRANS: label for the ring layout in the favorites view
-#: ../src/view/home/favoriteslayout.py:189
+#: ../src/jarabe/desktop/favoriteslayout.py:196
msgid "Ring"
msgstr "Ring"
+# TRANS: label for the spiral layout in the favorites view
#. TRANS: label for the spiral layout in the favorites view
-#: ../src/view/home/favoriteslayout.py:334
+#: ../src/jarabe/desktop/favoriteslayout.py:332
msgid "Spiral"
msgstr "Spiral"
+# TRANS: label for the box layout in the favorites view
#. TRANS: label for the box layout in the favorites view
-#: ../src/view/home/favoriteslayout.py:401
-#, fuzzy
+#: ../src/jarabe/desktop/favoriteslayout.py:399
msgid "Box"
msgstr "Låda"
+# TRANS: label for the box layout in the favorites view
#. TRANS: label for the box layout in the favorites view
-#: ../src/view/home/favoriteslayout.py:442
+#: ../src/jarabe/desktop/favoriteslayout.py:440
msgid "Triangle"
msgstr "Triangel"
-#: ../src/view/home/favoritesview.py:295
+#: ../src/jarabe/desktop/favoritesview.py:329
msgid "Registration Failed"
msgstr "Registreringen misslyckades"
-#: ../src/view/home/favoritesview.py:296
+#: ../src/jarabe/desktop/favoritesview.py:330
#, python-format
msgid "%s"
msgstr "%s"
-#: ../src/view/home/favoritesview.py:298
+#: ../src/jarabe/desktop/favoritesview.py:332
msgid "Registration Successful"
msgstr "Registreringen lyckades"
-#: ../src/view/home/favoritesview.py:299
+#: ../src/jarabe/desktop/favoritesview.py:333
msgid "You are now registered with your school server."
msgstr "Du är nu registread hos din skolserver"
-#: ../src/view/home/favoritesview.py:420
-msgid "Settings"
-msgstr "Inställningar"
+#: ../src/jarabe/desktop/favoritesview.py:668
+msgid "Register"
+msgstr "Registrera"
-#: ../src/view/home/favoritesview.py:425
-msgid "Restart"
-msgstr "Starta om"
+#: ../src/jarabe/desktop/homebox.py:67
+msgid "Confirm erase"
+msgstr "Bekräfta borttagning"
-#: ../src/view/home/favoritesview.py:430
-msgid "Shutdown"
-msgstr "Stäng av"
+#: ../src/jarabe/desktop/homebox.py:69
+#, python-format
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr "Bekräfta borttagning: Vill du verkligen ta bort %s för alltid?"
-#: ../src/view/home/favoritesview.py:436
-msgid "Register"
-msgstr "Registrera"
+# self._stop_item = MenuItem(_('Stop download'), 'stock-close')
+# TODO: Implement stopping downloads
+# self._stop_item.connect('activate', self._stop_item_activate_cb)
+# self.append_menu_item(self._stop_item)
+#: ../src/jarabe/desktop/homebox.py:73 ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/view/viewsource.py:218
+msgid "Keep"
+msgstr "Spara"
-#: ../src/view/palettes.py:42
-msgid "Starting..."
-msgstr "Startar..."
+#: ../src/jarabe/desktop/homebox.py:76
+#: ../src/jarabe/journal/journaltoolbox.py:357
+#: ../src/jarabe/journal/palettes.py:112 ../src/jarabe/view/palettes.py:153
+msgid "Erase"
+msgstr "Ta bort"
-#: ../src/view/palettes.py:72
-msgid "Stop"
-msgstr "Avsluta"
+#: ../src/jarabe/desktop/homebox.py:106
+msgid "Software Update"
+msgstr "Mjukvaruuppdatering"
-#. TRANS: Action label for starting an entry.
-#: ../src/view/palettes.py:104 ../src/journal/journaltoolbox.py:402
-#: ../src/journal/palettes.py:59
-msgid "Start"
-msgstr "Starta"
+#: ../src/jarabe/desktop/homebox.py:107
+msgid "Update your activities to ensure compatibility with your new software"
+msgstr ""
+"Uppdatera dina aktiviteter så att du är säker på att de fungerar ihop med "
+"din nya mjukvara"
-#: ../src/view/palettes.py:138
-msgid "Remove favorite"
-msgstr "Ta bort från favoriter"
+#: ../src/jarabe/desktop/homebox.py:116
+msgid "Check now"
+msgstr "Kontrollera nu"
-#: ../src/view/palettes.py:142
-msgid "Make favorite"
-msgstr "Lägg till till favoriter"
+#: ../src/jarabe/desktop/homebox.py:233
+msgid "List view"
+msgstr "Listvy"
-#: ../src/view/palettes.py:191
-msgid "Show contents"
-msgstr "Visa innehåll"
+#: ../src/jarabe/desktop/homebox.py:234
+msgid "<Ctrl>2"
+msgstr "<Ctrl> + 2"
+
+#: ../src/jarabe/desktop/homebox.py:296
+msgid "Favorites view"
+msgstr "Favoritvy"
+
+#: ../src/jarabe/desktop/homebox.py:297
+msgid "<Ctrl>1"
+msgstr "<Ctrl> + 1"
+
+#: ../src/jarabe/desktop/keydialog.py:131
+msgid "Key Type:"
+msgstr "Huvudtyp:"
+
+#: ../src/jarabe/desktop/keydialog.py:151
+msgid "Authentication Type:"
+msgstr "Verifieringstyp:"
+
+# Uncertain whether Personal here refers to both protocols or WPA2 only.
+#: ../src/jarabe/desktop/keydialog.py:215
+msgid "WPA & WPA2 Personal"
+msgstr "WPA & WPA2 Personal"
-#: ../src/view/palettes.py:215
+#: ../src/jarabe/desktop/keydialog.py:224
+msgid "Wireless Security:"
+msgstr "Trådlös säkerhet:"
+
+#: ../src/jarabe/desktop/meshbox.py:131
+msgid "Connect"
+msgstr "Anslut"
+
+#: ../src/jarabe/desktop/meshbox.py:135
+msgid "Disconnect"
+msgstr "Avbryt anslutning"
+
+# TRANS: Action label for resuming an activity.
+#. TRANS: Action label for resuming an activity.
+#: ../src/jarabe/desktop/meshbox.py:441
+#: ../src/jarabe/frame/activitiestray.py:711
+#: ../src/jarabe/journal/journaltoolbox.py:425
+#: ../src/jarabe/journal/palettes.py:72 ../src/jarabe/view/palettes.py:66
+msgid "Resume"
+msgstr "Återuppta"
+
+#: ../src/jarabe/desktop/meshbox.py:446
+#: ../src/jarabe/frame/activitiestray.py:227
+msgid "Join"
+msgstr "Gå med i"
+
+#: ../src/jarabe/desktop/schoolserver.py:34
+msgid "Cannot obtain data needed for registration."
+msgstr ""
+"Kunde inte komma åt den data som krävs för att genomföra registreringen."
+
+#: ../src/jarabe/desktop/schoolserver.py:51
+msgid "Cannot connect to the server."
+msgstr "Kunde inte komma åter servern."
+
+#: ../src/jarabe/desktop/schoolserver.py:56
+msgid "The server could not complete the request."
+msgstr "Servern misslyckades med att fullfölja förfrågan."
+
+#: ../src/jarabe/frame/activitiestray.py:232
+#: ../src/jarabe/frame/activitiestray.py:659
+msgid "Decline"
+msgstr "Avstå"
+
+#: ../src/jarabe/frame/activitiestray.py:612
#, python-format
-msgid "%(free_space)d MB Free"
-msgstr "%(free_space)d MB ledigt"
+msgid "%dB"
+msgstr "%dB"
+
+#: ../src/jarabe/frame/activitiestray.py:614
+#, python-format
+msgid "%dKB"
+msgstr "%dKB"
+
+#: ../src/jarabe/frame/activitiestray.py:616
+#, python-format
+msgid "%dMB"
+msgstr "%dMB"
+
+# This really needs a TRANS!
+#: ../src/jarabe/frame/activitiestray.py:633
+#, python-format
+msgid "%s of %s"
+msgstr "%s av %s"
-#: ../src/journal/journaltoolbox.py:62
+#: ../src/jarabe/frame/activitiestray.py:644
+#, python-format
+msgid "Transfer from %r"
+msgstr "Överföring från %r"
+
+#: ../src/jarabe/frame/activitiestray.py:654
+msgid "Accept"
+msgstr "Godta"
+
+#: ../src/jarabe/frame/activitiestray.py:677
+#: ../src/jarabe/frame/activitiestray.py:784
+#, python-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../src/jarabe/frame/activitiestray.py:755
+#, python-format
+msgid "Transfer to %r"
+msgstr "Överföring till %r"
+
+#: ../src/jarabe/frame/clipboardmenu.py:52
+msgid "Remove"
+msgstr "Ta bort"
+
+#: ../src/jarabe/frame/clipboardmenu.py:57
+#: ../src/jarabe/frame/clipboardmenu.py:80
+msgid "Open"
+msgstr "Öppna"
+
+#: ../src/jarabe/frame/clipboardmenu.py:85
+msgid "Open with"
+msgstr "Öppna med"
+
+#: ../src/jarabe/frame/clipboardobject.py:49
+#, python-format
+msgid "%s clipping"
+msgstr "%s urklipp"
+
+#: ../src/jarabe/frame/zoomtoolbar.py:36
+msgid "Neighborhood"
+msgstr "Grannar"
+
+#: ../src/jarabe/frame/zoomtoolbar.py:38
+msgid "Group"
+msgstr "Grupp"
+
+#: ../src/jarabe/frame/zoomtoolbar.py:40
+msgid "Home"
+msgstr "Hem"
+
+#: ../src/jarabe/frame/zoomtoolbar.py:42
+msgid "Activity"
+msgstr "Aktivitet"
+
+#: ../src/jarabe/intro/window.py:124
+msgid "Click to change color:"
+msgstr "Klicka för att ändra färg:"
+
+#: ../src/jarabe/intro/window.py:174 ../src/jarabe/journal/detailview.py:103
+msgid "Back"
+msgstr "Tillbaka"
+
+#: ../src/jarabe/intro/window.py:191
+msgid "Next"
+msgstr "Nästa"
+
+#: ../src/jarabe/journal/collapsedentry.py:258
+#: ../src/jarabe/journal/expandedentry.py:159
+#: ../src/jarabe/journal/palettes.py:66
+msgid "Untitled"
+msgstr "Ingen titel"
+
+#: ../src/jarabe/journal/expandedentry.py:205
+msgid "No preview"
+msgstr "Ingen förhandsvisning"
+
+#: ../src/jarabe/journal/expandedentry.py:224
+msgid "Participants:"
+msgstr "Medverkande:"
+
+#: ../src/jarabe/journal/expandedentry.py:247
+msgid "Description:"
+msgstr "Beskrivning:"
+
+#: ../src/jarabe/journal/expandedentry.py:273
+msgid "Tags:"
+msgstr "Nyckelord:"
+
+#: ../src/jarabe/journal/journalactivity.py:108
+#: ../src/jarabe/journal/volumestoolbar.py:47
+msgid "Journal"
+msgstr "Dagbok"
+
+#: ../src/jarabe/journal/journaltoolbox.py:65
msgid "Search"
msgstr "Sök"
-#: ../src/journal/journaltoolbox.py:119
+#: ../src/jarabe/journal/journaltoolbox.py:124
msgid "Anytime"
msgstr "När som helst"
-#: ../src/journal/journaltoolbox.py:121
+#: ../src/jarabe/journal/journaltoolbox.py:126
msgid "Today"
msgstr "Idag"
-#: ../src/journal/journaltoolbox.py:123
+#: ../src/jarabe/journal/journaltoolbox.py:128
msgid "Since yesterday"
msgstr "Sedan igår"
+# TRANS: Filter entries modified during the last 7 days.
#. TRANS: Filter entries modified during the last 7 days.
-#: ../src/journal/journaltoolbox.py:125
+#: ../src/jarabe/journal/journaltoolbox.py:130
msgid "Past week"
msgstr "Förra veckan"
+# TRANS: Filter entries modified during the last 30 days.
#. TRANS: Filter entries modified during the last 30 days.
-#: ../src/journal/journaltoolbox.py:127
+#: ../src/jarabe/journal/journaltoolbox.py:132
msgid "Past month"
msgstr "Senaste månaden"
+# TRANS: Filter entries modified during the last 356 days.
#. TRANS: Filter entries modified during the last 356 days.
-#: ../src/journal/journaltoolbox.py:129
+#: ../src/jarabe/journal/journaltoolbox.py:134
msgid "Past year"
msgstr "Senaste året"
-#: ../src/journal/journaltoolbox.py:136
+#: ../src/jarabe/journal/journaltoolbox.py:141
msgid "Anyone"
msgstr "Vem som helst"
-#: ../src/journal/journaltoolbox.py:138
+#: ../src/jarabe/journal/journaltoolbox.py:143
msgid "My friends"
msgstr "Mina vänner"
-#: ../src/journal/journaltoolbox.py:139
+#: ../src/jarabe/journal/journaltoolbox.py:144
msgid "My class"
msgstr "Mina klasskompisar"
+# TRANS: Item in a combo box that filters by entry type.
#. TRANS: Item in a combo box that filters by entry type.
-#: ../src/journal/journaltoolbox.py:255
+#: ../src/jarabe/journal/journaltoolbox.py:271
msgid "Anything"
msgstr "Vad som helst"
-#. TODO: Add "Start with" menu item
-#: ../src/journal/journaltoolbox.py:325 ../src/journal/palettes.py:67
+# TODO: Add "Start with" menu item
+#: ../src/jarabe/journal/journaltoolbox.py:347
+#: ../src/jarabe/journal/palettes.py:90
msgid "Copy"
msgstr "Kopiera"
-#: ../src/journal/collapsedentry.py:248 ../src/journal/expandedentry.py:176
-#: ../src/journal/palettes.py:51
-msgid "Untitled"
-msgstr "Ingen titel"
+# TRANS: Action label for starting an entry.
+#. TRANS: Action label for starting an entry.
+#: ../src/jarabe/journal/journaltoolbox.py:428
+#: ../src/jarabe/journal/palettes.py:75 ../src/jarabe/view/palettes.py:135
+msgid "Start"
+msgstr "Starta"
-#: ../src/journal/journalactivity.py:119 ../src/journal/volumesmanager.py:57
-msgid "Journal"
-msgstr "Dagbok"
+#: ../src/jarabe/journal/listview.py:40
+msgid "Your Journal is empty"
+msgstr "Din dagbok är tom."
-#: ../src/journal/expandedentry.py:222
-msgid "No preview"
-msgstr "Ingen förhandsvisning"
+#: ../src/jarabe/journal/listview.py:41
+msgid "No matching entries "
+msgstr "Kunde inte hitta några matchande filer "
-#: ../src/journal/expandedentry.py:241
-msgid "Participants:"
-msgstr "Medverkande:"
+# Uncertain if this is used to clear the search criteria or the search results. A TRANS would be nice.
+#: ../src/jarabe/journal/listview.py:369
+msgid "Clear search"
+msgstr "Rensa sökning"
-#: ../src/journal/expandedentry.py:266
-msgid "Description:"
-msgstr "Beskrivning:"
+#: ../src/jarabe/journal/misc.py:91
+msgid "No date"
+msgstr "Inget datum"
-#: ../src/journal/expandedentry.py:292
-msgid "Tags:"
-msgstr "Nyckelord:"
+#: ../src/jarabe/journal/modalalert.py:63
+msgid "Your Journal is full"
+msgstr "Din dagbok är full"
-#: ../src/journal/objectchooser.py:134
+#: ../src/jarabe/journal/modalalert.py:67
+msgid "Please delete some old Journal entries to make space for new ones."
+msgstr "Ta bort gamla dagboksinlägg för att få plats med nya."
+
+#: ../src/jarabe/journal/modalalert.py:79
+msgid "Show Journal"
+msgstr "Visa Dagbok"
+
+#: ../src/jarabe/journal/objectchooser.py:147
msgid "Choose an object"
msgstr "Välj ett objekt"
-#: ../src/journal/objectchooser.py:139
+#: ../src/jarabe/journal/objectchooser.py:152
+#: ../src/jarabe/view/viewsource.py:308
msgid "Close"
msgstr "Stäng"
-#: ../src/journal/volumestoolbar.py:93
+#: ../src/jarabe/journal/palettes.py:73
+msgid "Resume with"
+msgstr "Återuppta med"
+
+#: ../src/jarabe/journal/palettes.py:76
+msgid "Start with"
+msgstr "Börja med"
+
+#: ../src/jarabe/journal/palettes.py:98
+msgid "Send to"
+msgstr "Skicka till"
+
+#: ../src/jarabe/journal/palettes.py:107
+msgid "View Details"
+msgstr "Se detaljer"
+
+#: ../src/jarabe/journal/palettes.py:185
+msgid "No friends present"
+msgstr "Inga kompisar närvarande"
+
+#: ../src/jarabe/journal/palettes.py:190
+msgid "No valid connection found"
+msgstr "Ingen giltig anslutning hittad"
+
+#: ../src/jarabe/journal/palettes.py:218
+msgid "No activity to resume entry"
+msgstr "Ingen aktivitet att fortsätta med"
+
+#: ../src/jarabe/journal/palettes.py:220
+msgid "No activity to start entry"
+msgstr "Ingen aktivitet att börja med"
+
+#: ../src/jarabe/view/buddymenu.py:62
+msgid "Remove friend"
+msgstr "Ta bort kompis"
+
+#: ../src/jarabe/view/buddymenu.py:65
+msgid "Make friend"
+msgstr "Bli kompis med"
+
+#: ../src/jarabe/view/buddymenu.py:82
+msgid "My Settings"
+msgstr "Mina inställningar"
+
+#: ../src/jarabe/view/buddymenu.py:90
+msgid "Logout"
+msgstr "Logga ut"
+
+#: ../src/jarabe/view/buddymenu.py:95
+msgid "Restart"
+msgstr "Starta om"
+
+#: ../src/jarabe/view/buddymenu.py:100
+msgid "Shutdown"
+msgstr "Stäng av"
+
+#: ../src/jarabe/view/buddymenu.py:135
+#, python-format
+msgid "Invite to %s"
+msgstr "Bjud in till %s"
+
+#: ../src/jarabe/view/palettes.py:47
+msgid "Starting..."
+msgstr "Startar..."
+
+#. TODO: share-with, keep
+#: ../src/jarabe/view/palettes.py:73
+msgid "View Source"
+msgstr "Se källa"
+
+#: ../src/jarabe/view/palettes.py:84
+msgid "Stop"
+msgstr "Avsluta"
+
+#: ../src/jarabe/view/palettes.py:171
+msgid "Remove favorite"
+msgstr "Ta bort från favoriter"
+
+#: ../src/jarabe/view/palettes.py:175
+msgid "Make favorite"
+msgstr "Lägg till till favoriter"
+
+#: ../src/jarabe/view/palettes.py:238
+msgid "Show contents"
+msgstr "Visa innehåll"
+
+#: ../src/jarabe/view/palettes.py:260 ../src/jarabe/view/palettes.py:309
+#, python-format
+msgid "%(free_space)d MB Free"
+msgstr "%(free_space)d MB ledigt"
+
+#: ../src/jarabe/view/palettes.py:285
msgid "Unmount"
msgstr "Avmontera"
-#: ../src/journal/misc.py:95
-msgid "No date"
-msgstr "Inget datum"
+#: ../src/jarabe/view/viewsource.py:208
+msgid "Instance Source"
+msgstr "Instanskälla"
-#: ../src/journal/listview.py:39
-msgid "Your Journal is empty"
-msgstr "Din dagbok är tom."
+#: ../src/jarabe/view/viewsource.py:233
+msgid "Source"
+msgstr "Källa"
-#: ../src/journal/listview.py:40
-msgid "No matching entries "
-msgstr "Kunde inte hitta några matchande filer "
+#: ../src/jarabe/view/viewsource.py:292
+msgid "Activity Bundle Source"
+msgstr "Källa för aktivitetspaket"
-#: ../src/journal/modalalert.py:59
-msgid "Your Journal is full"
-msgstr "Din dagbok är full"
+#: ../src/jarabe/view/viewsource.py:299
+#, python-format
+msgid "View source: %r"
+msgstr "Se källa: %r"
-#: ../src/journal/modalalert.py:63
-msgid "Please delete some old Journal entries to make space for new ones."
-msgstr "Ta bort gamla dagboksinlägg för att få plats med nya."
+#~ msgid "Document"
+#~ msgstr "Dokument"
-#: ../src/journal/modalalert.py:75
-msgid "Show Journal"
-msgstr "Visa Dagbok"
+#~ msgid "Resume by default"
+#~ msgstr "Återuppta som förval"
+
+#~ msgid "Encryption Type:"
+#~ msgstr "Krypteringstyp:"
+
+#~ msgid "Disconnecting..."
+#~ msgstr "Kopplar ned..."
+
+# only temporarily
+#~ msgid "Mesh Network"
+#~ msgstr "Meshnätverk"
+
+#~ msgid "Disconnected"
+#~ msgstr "Inte ansluten"
+
+#~ msgid "About my XO"
+#~ msgstr "Om min XO"
+
+#~ msgid "Mesh"
+#~ msgstr "Mesh"
+
+#~ msgid "Connected to a School Mesh Portal"
+#~ msgstr "Ansluten till en skolportal"
+
+#~ msgid "Looking for a School Mesh Portal..."
+#~ msgstr "Letar efter en skolportal..."
+
+#~ msgid "Connected to an XO Mesh Portal"
+#~ msgstr "Ansluten till en XO-portal"
+
+#~ msgid "Looking for an XO Mesh Portal..."
+#~ msgstr "Letar efter en XO-portal..."
+
+#~ msgid "Connected to a Simple Mesh"
+#~ msgstr "Ansluten till ett enkelt meshnätverk"
+
+#~ msgid "Starting a Simple Mesh"
+#~ msgstr "Startar ett enkelt meshnätverk..."
+
+#~ msgid "Unknown Mesh"
+#~ msgstr "Okänt meshnätverk"
+
+#~ msgid "Settings"
+#~ msgstr "Inställningar"
#, python-format
#~ msgid "Clipboard object: %s."
#~ msgstr "Kopieringsminne: %s."
-#, python-format
-#~ msgid "IP address: %s"
-#~ msgstr "IP-adress: %s"
-
#~ msgid ""
#~ "Extreme power management (disables wireless radio, increases battery life)"
#~ msgstr ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 4300edd..d71e80d 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Sugar\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-27 13:34-0500\n"
-"PO-Revision-Date: 2009-02-14 18:37-0500\n"
+"POT-Creation-Date: 2009-02-21 00:30-0500\n"
+"PO-Revision-Date: 2009-02-27 20:17-0500\n"
"Last-Translator: Yuan Chao <yuanchao@gmail.com>\n"
"Language-Team: Yuan CHAO <yuanchao@gmail.com>\n"
"MIME-Version: 1.0\n"
@@ -21,7 +21,7 @@ msgstr "關於我"
#: ../extensions/cpsection/aboutme/model.py:43
msgid "You must enter a name."
-msgstr "您必需輸入名稱"
+msgstr "請輸入姓名"
#: ../extensions/cpsection/aboutme/model.py:68
#, python-format
@@ -51,8 +51,7 @@ msgstr "指定增修顏色時發生錯誤"
msgid "Error in specified colors."
msgstr "指定顏色時發生錯誤"
-#: ../extensions/cpsection/aboutme/view.py:94
-#: ../src/jarabe/intro/window.py:92
+#: ../extensions/cpsection/aboutme/view.py:94 ../src/jarabe/intro/window.py:92
msgid "Name:"
msgstr "姓名:"
@@ -125,8 +124,7 @@ msgstr "日期與時間"
msgid "Error timezone does not exist."
msgstr "錯誤,時區資料不存在."
-#: ../extensions/cpsection/datetime/view.py:68
-#: ../data/sugar.schemas.in.h:19
+#: ../extensions/cpsection/datetime/view.py:68 ../data/sugar.schemas.in.h:19
msgid "Timezone"
msgstr "時區"
@@ -198,7 +196,7 @@ msgstr "錯誤的無線網路信號開關設定,請指定on/off。"
#: ../extensions/cpsection/network/model.py:137
msgid "Error in specified argument use 0/1."
-msgstr "錯誤的無線網路信號開關設定,請指定0/1。"
+msgstr "無線網路信號開關只能設為 0/1。"
#: ../extensions/cpsection/network/view.py:56
msgid "Wireless"
@@ -281,7 +279,7 @@ msgstr "電池電源即將用完"
msgid "%(hour)d:%(min).2d remaining"
msgstr "剩餘 %(hour)d:%(min).2d"
-#: ../extensions/deviceicon/battery.py:153
+#: ../extensions/deviceicon/battery.py:152
msgid "Charged"
msgstr "充電完成"
@@ -303,14 +301,14 @@ msgstr "切斷連線…"
# method for a device either (for various reasons) so this doesn't
# have a good mapping
#: ../extensions/deviceicon/network.py:109
-#: ../src/jarabe/desktop/meshbox.py:246
+#: ../src/jarabe/desktop/meshbox.py:247
msgid "Connecting..."
msgstr "連線中…"
# TODO: show the channel number
#: ../extensions/deviceicon/network.py:113
#: ../extensions/deviceicon/network.py:166
-#: ../src/jarabe/desktop/meshbox.py:252
+#: ../src/jarabe/desktop/meshbox.py:253
msgid "Connected"
msgstr "已連線"
@@ -342,25 +340,6 @@ msgstr "喇叭靜音"
msgid "Screenshot"
msgstr "畫面抓圖"
-#: ../extensions/globalkey/viewsource.py:196
-#, python-format
-msgid "View source: %r"
-msgstr "查看原始碼: %r"
-
-#: ../extensions/globalkey/viewsource.py:205
-#: ../src/jarabe/frame/zoomtoolbar.py:42
-msgid "Activity"
-msgstr "活動"
-
-#: ../extensions/globalkey/viewsource.py:212
-msgid "Document"
-msgstr "文件"
-
-#: ../extensions/globalkey/viewsource.py:226
-#: ../src/jarabe/journal/objectchooser.py:141
-msgid "Close"
-msgstr "關閉"
-
#: ../data/sugar.schemas.in.h:1
msgid "Backup URL"
msgstr "備份網址"
@@ -525,43 +504,41 @@ msgstr ""
msgid "To apply your changes you have to restart sugar.\n"
msgstr "需要重新啟動系統使變更生效.\n"
-#: ../src/jarabe/controlpanel/gui.py:272
+#: ../src/jarabe/controlpanel/gui.py:275
msgid "Warning"
msgstr "警告"
-#: ../src/jarabe/controlpanel/gui.py:273
+#: ../src/jarabe/controlpanel/gui.py:276
#: ../src/jarabe/controlpanel/sectionview.py:42
msgid "Changes require restart"
msgstr "改變須要重新啟動才能生效"
-#: ../src/jarabe/controlpanel/gui.py:276
+#: ../src/jarabe/controlpanel/gui.py:279
msgid "Cancel changes"
msgstr "取消改變"
-#: ../src/jarabe/controlpanel/gui.py:281
-#: ../src/jarabe/desktop/homebox.py:113
+#: ../src/jarabe/controlpanel/gui.py:284 ../src/jarabe/desktop/homebox.py:113
msgid "Later"
msgstr "稍候"
-#: ../src/jarabe/controlpanel/gui.py:285
+#: ../src/jarabe/controlpanel/gui.py:288
msgid "Restart now"
msgstr "馬上重新啟動"
-#: ../src/jarabe/controlpanel/toolbar.py:61
-#: ../src/jarabe/intro/window.py:188
+#: ../src/jarabe/controlpanel/toolbar.py:61 ../src/jarabe/intro/window.py:188
msgid "Done"
msgstr "完成"
#: ../src/jarabe/controlpanel/toolbar.py:115
#: ../src/jarabe/desktop/homebox.py:111
-#: ../src/jarabe/frame/activitiestray.py:683
-#: ../src/jarabe/frame/activitiestray.py:762
-#: ../src/jarabe/frame/activitiestray.py:790
+#: ../src/jarabe/frame/activitiestray.py:687
+#: ../src/jarabe/frame/activitiestray.py:766
+#: ../src/jarabe/frame/activitiestray.py:794
msgid "Cancel"
msgstr "取消"
#: ../src/jarabe/controlpanel/toolbar.py:121
-#: ../src/jarabe/desktop/favoritesview.py:334
+#: ../src/jarabe/desktop/favoritesview.py:338
msgid "Ok"
msgstr "確定"
@@ -579,40 +556,40 @@ msgstr "活動環"
# TRANS: label for the spiral layout in the favorites view
#. TRANS: label for the spiral layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:341
+#: ../src/jarabe/desktop/favoriteslayout.py:332
msgid "Spiral"
msgstr "螺旋"
# TRANS: label for the box layout in the favorites view
#. TRANS: label for the box layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:408
+#: ../src/jarabe/desktop/favoriteslayout.py:399
msgid "Box"
msgstr "方型"
# TRANS: label for the box layout in the favorites view
#. TRANS: label for the box layout in the favorites view
-#: ../src/jarabe/desktop/favoriteslayout.py:449
+#: ../src/jarabe/desktop/favoriteslayout.py:440
msgid "Triangle"
msgstr "三角形"
-#: ../src/jarabe/desktop/favoritesview.py:325
+#: ../src/jarabe/desktop/favoritesview.py:329
msgid "Registration Failed"
msgstr "註冊失敗"
-#: ../src/jarabe/desktop/favoritesview.py:326
+#: ../src/jarabe/desktop/favoritesview.py:330
#, python-format
msgid "%s"
msgstr "%s"
-#: ../src/jarabe/desktop/favoritesview.py:328
+#: ../src/jarabe/desktop/favoritesview.py:332
msgid "Registration Successful"
msgstr "註冊成功"
-#: ../src/jarabe/desktop/favoritesview.py:329
+#: ../src/jarabe/desktop/favoritesview.py:333
msgid "You are now registered with your school server."
msgstr "您已經成功註冊到校園主機"
-#: ../src/jarabe/desktop/favoritesview.py:666
+#: ../src/jarabe/desktop/favoritesview.py:668
msgid "Register"
msgstr "註冊"
@@ -629,15 +606,14 @@ msgstr "確認刪除:您確定要永久地刪除 %s 嗎?"
# TODO: Implement stopping downloads
# self._stop_item.connect('activate', self._stop_item_activate_cb)
# self.append_menu_item(self._stop_item)
-#: ../src/jarabe/desktop/homebox.py:73
-#: ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/desktop/homebox.py:73 ../src/jarabe/frame/clipboardmenu.py:62
+#: ../src/jarabe/view/viewsource.py:218
msgid "Keep"
msgstr "保存"
#: ../src/jarabe/desktop/homebox.py:76
#: ../src/jarabe/journal/journaltoolbox.py:357
-#: ../src/jarabe/journal/palettes.py:97
-#: ../src/jarabe/view/palettes.py:127
+#: ../src/jarabe/journal/palettes.py:112 ../src/jarabe/view/palettes.py:153
msgid "Erase"
msgstr "刪除"
@@ -669,10 +645,6 @@ msgstr "偏好檢視"
msgid "<Ctrl>1"
msgstr "<Ctrl>1"
-#: ../src/jarabe/desktop/homebox.py:304
-msgid "Resume by default"
-msgstr "預設回復"
-
#: ../src/jarabe/desktop/keydialog.py:131
msgid "Key Type:"
msgstr "金鑰類型:"
@@ -689,82 +661,81 @@ msgstr "個人的 WPA & WPA2 加密"
msgid "Wireless Security:"
msgstr "無線網路加密:"
-#: ../src/jarabe/desktop/meshbox.py:130
+#: ../src/jarabe/desktop/meshbox.py:131
msgid "Connect"
msgstr "連線"
-#: ../src/jarabe/desktop/meshbox.py:134
+#: ../src/jarabe/desktop/meshbox.py:135
msgid "Disconnect"
msgstr "切斷連線"
# TRANS: Action label for resuming an activity.
#. TRANS: Action label for resuming an activity.
-#: ../src/jarabe/desktop/meshbox.py:440
-#: ../src/jarabe/frame/activitiestray.py:707
+#: ../src/jarabe/desktop/meshbox.py:441
+#: ../src/jarabe/frame/activitiestray.py:711
#: ../src/jarabe/journal/journaltoolbox.py:425
-#: ../src/jarabe/journal/palettes.py:63
-#: ../src/jarabe/view/palettes.py:62
+#: ../src/jarabe/journal/palettes.py:72 ../src/jarabe/view/palettes.py:66
msgid "Resume"
msgstr "回復"
-#: ../src/jarabe/desktop/meshbox.py:445
-#: ../src/jarabe/frame/activitiestray.py:221
+#: ../src/jarabe/desktop/meshbox.py:446
+#: ../src/jarabe/frame/activitiestray.py:227
msgid "Join"
msgstr "加入"
-#: ../src/jarabe/desktop/schoolserver.py:18
+#: ../src/jarabe/desktop/schoolserver.py:34
msgid "Cannot obtain data needed for registration."
msgstr "無法取得註冊所需的資料"
-#: ../src/jarabe/desktop/schoolserver.py:35
+#: ../src/jarabe/desktop/schoolserver.py:51
msgid "Cannot connect to the server."
msgstr "無法連線到伺服器"
-#: ../src/jarabe/desktop/schoolserver.py:40
+#: ../src/jarabe/desktop/schoolserver.py:56
msgid "The server could not complete the request."
msgstr "伺服器無法完成查尋動作"
-#: ../src/jarabe/frame/activitiestray.py:226
-#: ../src/jarabe/frame/activitiestray.py:655
+#: ../src/jarabe/frame/activitiestray.py:232
+#: ../src/jarabe/frame/activitiestray.py:659
msgid "Decline"
msgstr "拒絕"
-#: ../src/jarabe/frame/activitiestray.py:608
+#: ../src/jarabe/frame/activitiestray.py:612
#, python-format
msgid "%dB"
msgstr "%dB"
-#: ../src/jarabe/frame/activitiestray.py:610
+#: ../src/jarabe/frame/activitiestray.py:614
#, python-format
msgid "%dKB"
msgstr "%dKB"
-#: ../src/jarabe/frame/activitiestray.py:612
+#: ../src/jarabe/frame/activitiestray.py:616
#, python-format
msgid "%dMB"
msgstr "%dMB"
-#: ../src/jarabe/frame/activitiestray.py:629
+#: ../src/jarabe/frame/activitiestray.py:633
#, python-format
msgid "%s of %s"
msgstr "%s 之 %s"
-#: ../src/jarabe/frame/activitiestray.py:640
+#: ../src/jarabe/frame/activitiestray.py:644
#, python-format
msgid "Transfer from %r"
msgstr "傳送自 %r"
-#: ../src/jarabe/frame/activitiestray.py:650
+#: ../src/jarabe/frame/activitiestray.py:654
msgid "Accept"
msgstr "接受"
-#: ../src/jarabe/frame/activitiestray.py:673
-#: ../src/jarabe/frame/activitiestray.py:780
+#: ../src/jarabe/frame/activitiestray.py:677
+#: ../src/jarabe/frame/activitiestray.py:784
#, python-format
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../src/jarabe/frame/activitiestray.py:751
+#: ../src/jarabe/frame/activitiestray.py:755
#, python-format
msgid "Transfer to %r"
msgstr "傳送給 %r"
@@ -782,7 +753,7 @@ msgstr "開啟"
msgid "Open with"
msgstr "開啟使用"
-#: ../src/jarabe/frame/clipboardobject.py:47
+#: ../src/jarabe/frame/clipboardobject.py:49
#, python-format
msgid "%s clipping"
msgstr "%s 裁剪"
@@ -799,12 +770,15 @@ msgstr "我的群組"
msgid "Home"
msgstr "我的家"
+#: ../src/jarabe/frame/zoomtoolbar.py:42
+msgid "Activity"
+msgstr "活動"
+
#: ../src/jarabe/intro/window.py:124
msgid "Click to change color:"
msgstr "點選改變顏色:"
-#: ../src/jarabe/intro/window.py:174
-#: ../src/jarabe/journal/detailview.py:103
+#: ../src/jarabe/intro/window.py:174 ../src/jarabe/journal/detailview.py:103
msgid "Back"
msgstr "上一步"
@@ -812,9 +786,9 @@ msgstr "上一步"
msgid "Next"
msgstr "下一步"
-#: ../src/jarabe/journal/collapsedentry.py:243
+#: ../src/jarabe/journal/collapsedentry.py:258
#: ../src/jarabe/journal/expandedentry.py:159
-#: ../src/jarabe/journal/palettes.py:57
+#: ../src/jarabe/journal/palettes.py:66
msgid "Untitled"
msgstr "未命名"
@@ -893,15 +867,14 @@ msgstr "所有類別"
# TODO: Add "Start with" menu item
#: ../src/jarabe/journal/journaltoolbox.py:347
-#: ../src/jarabe/journal/palettes.py:81
+#: ../src/jarabe/journal/palettes.py:90
msgid "Copy"
msgstr "複製"
# TRANS: Action label for starting an entry.
#. TRANS: Action label for starting an entry.
#: ../src/jarabe/journal/journaltoolbox.py:428
-#: ../src/jarabe/journal/palettes.py:66
-#: ../src/jarabe/view/palettes.py:111
+#: ../src/jarabe/journal/palettes.py:75 ../src/jarabe/view/palettes.py:135
msgid "Start"
msgstr "啟動"
@@ -917,7 +890,7 @@ msgstr "沒有相符的紀錄 "
msgid "Clear search"
msgstr "清除搜尋項目"
-#: ../src/jarabe/journal/misc.py:92
+#: ../src/jarabe/journal/misc.py:91
msgid "No date"
msgstr "無日期"
@@ -933,97 +906,133 @@ msgstr "請刪除一些舊的日誌內容來騰出空間給新的日誌"
msgid "Show Journal"
msgstr "顯示日誌"
-#: ../src/jarabe/journal/objectchooser.py:136
+#: ../src/jarabe/journal/objectchooser.py:147
msgid "Choose an object"
msgstr "選擇物件"
-#: ../src/jarabe/journal/palettes.py:64
+#: ../src/jarabe/journal/objectchooser.py:152
+#: ../src/jarabe/view/viewsource.py:308
+msgid "Close"
+msgstr "關閉"
+
+#: ../src/jarabe/journal/palettes.py:73
msgid "Resume with"
msgstr "回復活動"
-#: ../src/jarabe/journal/palettes.py:67
+#: ../src/jarabe/journal/palettes.py:76
msgid "Start with"
msgstr "開始活動"
-#: ../src/jarabe/journal/palettes.py:89
+#: ../src/jarabe/journal/palettes.py:98
msgid "Send to"
msgstr "傳送給"
-#: ../src/jarabe/journal/palettes.py:167
+#: ../src/jarabe/journal/palettes.py:107
+msgid "View Details"
+msgstr "檢視詳細內容"
+
+#: ../src/jarabe/journal/palettes.py:185
msgid "No friends present"
msgstr "沒有好友上線"
-#: ../src/jarabe/journal/palettes.py:172
+#: ../src/jarabe/journal/palettes.py:190
msgid "No valid connection found"
msgstr "找不到有效的網路連線"
-#: ../src/jarabe/journal/palettes.py:200
+#: ../src/jarabe/journal/palettes.py:218
msgid "No activity to resume entry"
msgstr "找不到用來回復的活動"
-#: ../src/jarabe/journal/palettes.py:202
+#: ../src/jarabe/journal/palettes.py:220
msgid "No activity to start entry"
msgstr "找不到用來啟用的活動"
-#: ../src/jarabe/view/buddymenu.py:61
+#: ../src/jarabe/view/buddymenu.py:62
msgid "Remove friend"
msgstr "移除好友"
-#: ../src/jarabe/view/buddymenu.py:64
+#: ../src/jarabe/view/buddymenu.py:65
msgid "Make friend"
msgstr "結交好友"
-#: ../src/jarabe/view/buddymenu.py:81
+#: ../src/jarabe/view/buddymenu.py:82
msgid "My Settings"
msgstr "我的設定"
-#: ../src/jarabe/view/buddymenu.py:86
+#: ../src/jarabe/view/buddymenu.py:90
msgid "Logout"
msgstr "顯示方式"
-#: ../src/jarabe/view/buddymenu.py:91
+#: ../src/jarabe/view/buddymenu.py:95
msgid "Restart"
msgstr "重新啟動"
-#: ../src/jarabe/view/buddymenu.py:96
+#: ../src/jarabe/view/buddymenu.py:100
msgid "Shutdown"
msgstr "關機"
-#: ../src/jarabe/view/buddymenu.py:131
+#: ../src/jarabe/view/buddymenu.py:135
#, python-format
msgid "Invite to %s"
msgstr "邀請 %s"
-#: ../src/jarabe/view/palettes.py:43
+#: ../src/jarabe/view/palettes.py:47
msgid "Starting..."
msgstr "啟動中…"
+#. TODO: share-with, keep
#: ../src/jarabe/view/palettes.py:73
+msgid "View Source"
+msgstr "檢視原始碼"
+
+#: ../src/jarabe/view/palettes.py:84
msgid "Stop"
msgstr "停止"
-#: ../src/jarabe/view/palettes.py:145
+#: ../src/jarabe/view/palettes.py:171
msgid "Remove favorite"
msgstr "移除偏好活動"
-#: ../src/jarabe/view/palettes.py:149
+#: ../src/jarabe/view/palettes.py:175
msgid "Make favorite"
msgstr "指定偏好活動"
-#: ../src/jarabe/view/palettes.py:201
+#: ../src/jarabe/view/palettes.py:238
msgid "Show contents"
msgstr "顯示內容"
-#: ../src/jarabe/view/palettes.py:223
-#: ../src/jarabe/view/palettes.py:272
+#: ../src/jarabe/view/palettes.py:260 ../src/jarabe/view/palettes.py:309
#, python-format
msgid "%(free_space)d MB Free"
msgstr "剩餘 %(free_space)d MB 空間"
-#: ../src/jarabe/view/palettes.py:248
+#: ../src/jarabe/view/palettes.py:285
msgid "Unmount"
msgstr "退出磁碟"
+#: ../src/jarabe/view/viewsource.py:208
+msgid "Instance Source"
+msgstr "範例原始碼"
+
+#: ../src/jarabe/view/viewsource.py:233
+msgid "Source"
+msgstr "原始碼"
+
+#: ../src/jarabe/view/viewsource.py:292
+msgid "Activity Bundle Source"
+msgstr "預裝活動原始碼"
+
+#: ../src/jarabe/view/viewsource.py:299
+#, python-format
+msgid "View source: %r"
+msgstr "查看原始碼: %r"
+
+#~ msgid "Document"
+#~ msgstr "文件"
+
+#~ msgid "Resume by default"
+#~ msgstr "預設回復"
+
#~ msgid "Encryption Type:"
#~ msgstr "加密類型:"
diff --git a/src/jarabe/frame/clipboardobject.py b/src/jarabe/frame/clipboardobject.py
index ccbaf8e..38da151 100644
--- a/src/jarabe/frame/clipboardobject.py
+++ b/src/jarabe/frame/clipboardobject.py
@@ -51,7 +51,14 @@ class ClipboardObject(object):
return name
def get_icon(self):
- icons = gio.content_type_get_icon(self.get_mime_type())
+ mime_type = self.get_mime_type()
+
+ generic_types = mime.get_all_generic_types()
+ for generic_type in generic_types:
+ if mime_type in generic_type.mime_types:
+ return generic_type.icon
+
+ icons = gio.content_type_get_icon(mime_type)
icon_name = None
if icons is not None:
icon_theme = gtk.icon_theme_get_default()
@@ -60,12 +67,9 @@ class ClipboardObject(object):
gtk.ICON_SIZE_LARGE_TOOLBAR, 0)
if icon_info is not None:
icon_info.free()
- break
-
- if icon_name is None:
- icon_name = 'application-octet-stream'
+ return icon_name
- return icon_name
+ return 'application-octet-stream'
def get_preview(self):
for mime_type in ['text/plain']:
diff --git a/src/jarabe/journal/misc.py b/src/jarabe/journal/misc.py
index 52a86fa..f481644 100644
--- a/src/jarabe/journal/misc.py
+++ b/src/jarabe/journal/misc.py
@@ -65,17 +65,20 @@ def get_icon_name(metadata):
if file_name is None and is_activity_bundle(metadata):
file_path = model.get_file(metadata['uid'])
- if os.path.exists(file_path):
+ if file_path is not None and os.path.exists(file_path):
try:
bundle = ActivityBundle(file_path)
file_name = bundle.get_icon()
- except Exception:
+ except:
logging.warning('Could not read bundle:\n' + \
- ''.join(traceback.format_exception(*sys.exc_info())))
+ traceback.format_exc())
if file_name is None:
file_name = _get_icon_for_mime(metadata.get('mime_type', ''))
+ if file_name is None:
+ file_name = get_icon_file_name('application-octet-stream')
+
return file_name
def get_date(metadata):
diff --git a/src/jarabe/journal/model.py b/src/jarabe/journal/model.py
index 054de7d..b6d2bde 100644
--- a/src/jarabe/journal/model.py
+++ b/src/jarabe/journal/model.py
@@ -39,7 +39,7 @@ DS_DBUS_PATH = '/org/laptop/sugar/DataStore'
# Properties the journal cares about.
PROPERTIES = ['uid', 'title', 'mtime', 'timestamp', 'keep', 'buddies',
'icon-color', 'mime_type', 'progress', 'activity', 'mountpoint',
- 'activity_id']
+ 'activity_id', 'bundle_id']
PAGES_TO_CACHE = 5
diff --git a/src/jarabe/model/bundleregistry.py b/src/jarabe/model/bundleregistry.py
index 62ac6e2..ee440a5 100644
--- a/src/jarabe/model/bundleregistry.py
+++ b/src/jarabe/model/bundleregistry.py
@@ -72,15 +72,7 @@ class BundleRegistry(gobject.GObject):
if not one_file.get_path().endswith('.activity'):
return
if event_type == gio.FILE_MONITOR_EVENT_CREATED:
- try:
- bundle = ActivityBundle(one_file.get_path())
- except MalformedBundleException:
- logging.error('Error loading bundle %r:\n%s' % (
- one_file.get_path(),
- ''.join(traceback.format_exception(*sys.exc_info()))))
- return
- if not self.is_installed(bundle):
- self.add_bundle(one_file.get_path())
+ self.add_bundle(one_file.get_path())
elif event_type == gio.FILE_MONITOR_EVENT_DELETED:
self.remove_bundle(one_file.get_path())
@@ -216,6 +208,9 @@ class BundleRegistry(gobject.GObject):
''.join(traceback.format_exception(*sys.exc_info()))))
return None
+ if self.get_bundle(bundle.get_bundle_id()) is not None:
+ return None
+
self._bundles.append(bundle)
return bundle