summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
authorPatrick Ohly <patrick.ohly@intel.com>2011-12-12 10:38:44 +0100
committerPatrick Ohly <patrick.ohly@intel.com>2011-12-13 14:08:27 +0100
commit24dccab4a66c07073178069fe6866673620216d5 (patch)
tree5a14399134885259c280dd44d20ddc953e25d751 /po
parent2e01af7e099959efd4b3b7e05bb9e1cddb73b303 (diff)
updated translations
.po files downloaded from https://meego.transifex.net/projects/p/syncevolution/resource/syncevolution-1-2/ Up-to-date for all of the 16 languages: - new error message from previous commit - "Use these settings" - .desktop files
Diffstat (limited to 'po')
-rw-r--r--po/de.po594
-rw-r--r--po/en_GB.po528
-rw-r--r--po/en_US.po985
-rw-r--r--po/es.po607
-rw-r--r--po/fi.po478
-rw-r--r--po/fr.po719
-rw-r--r--po/it.po690
-rw-r--r--po/ja.po483
-rw-r--r--po/ko.po566
-rw-r--r--po/nl.po624
-rw-r--r--po/pl.po421
-rw-r--r--po/pt_BR.po663
-rw-r--r--po/ru.po585
-rw-r--r--po/sv.po706
-rw-r--r--po/zh_CN.po551
-rw-r--r--po/zh_TW.po511
16 files changed, 5433 insertions, 4278 deletions
diff --git a/po/de.po b/po/de.po
index 4b635c53..b5611741 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,24 +1,27 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# <claus@claus-schittenhelm.de>, 2011.
+# <tomas.galicia@intel.com>, 2011.
msgid ""
msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: http://moblin.org/projects/syncevolution\n"
-"POT-Creation-Date: 2010-05-17 21:48+0000\n"
-"PO-Revision-Date: \n"
-"Last-Translator: Clara Steiner-Jay <csteiner@aracnet.com>\n"
-"Language-Team: \n"
+"Project-Id-Version: syncevolution\n"
+"Report-Msgid-Bugs-To: https://bugs.meego.com/\n"
+"POT-Creation-Date: 2011-12-05 10:21-0800\n"
+"PO-Revision-Date: 2011-12-06 11:21+0000\n"
+"Last-Translator: GLS_Translator_DEU1 <claus@claus-schittenhelm.de>\n"
+"Language-Team: German <meego-de@lists.hendi.name>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: German\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"Plural-Forms: nplurals=2; plural=n!=1;\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-# (assuming it's a noun...
-# If this is supposed to be a verb, then it would be "synchronisieren" in DEU)
#. TRANSLATORS: this is the application name that may be used by e.g.
#. the windowmanager
-#: ../src/gtk-ui/main.c:40
-#: ../src/gtk-ui/ui.glade.h:38
+#: ../src/gtk-ui/main.c:40 ../src/gtk-ui/ui.glade.h:38
#: ../src/gtk-ui/sync.desktop.in.h:1
#: ../src/gnome-bluetooth/syncevolution.c:112
msgid "Sync"
@@ -32,8 +35,7 @@ msgstr "Kontakte"
msgid "Appointments"
msgstr "Termine"
-#: ../src/gtk-ui/sync-ui.c:270
-#: ../src/gtk-ui/ui.glade.h:40
+#: ../src/gtk-ui/sync-ui.c:270 ../src/gtk-ui/ui.glade.h:40
msgid "Tasks"
msgstr "Aufgaben"
@@ -48,7 +50,6 @@ msgstr "Notizen"
msgid "Appointments & Tasks"
msgstr "Termine & Aufgaben"
-# shortened to fix truncation issue
#: ../src/gtk-ui/sync-ui.c:349
msgid "Starting sync"
msgstr "Sync wird gestartet"
@@ -68,147 +69,152 @@ msgstr "Ja, langsame Synchronisation durchführen"
msgid "No, cancel sync"
msgstr "Nein, Synchronisation abbrechen"
-#. TRANSLATORS: confirmation dialog for refresh-from-server. Placeholder
+#. TRANSLATORS: confirmation dialog for "refresh from peer". Placeholder
#. * is service/device name
#: ../src/gtk-ui/sync-ui.c:424
#, c-format
-msgid "Do you want to delete all local data and replace it with data from %s? This is not usually advised."
-msgstr "Möchtest du alle lokalen Daten löschen und mit Daten von %s ersetzen? Dies ist normalerweise nicht zu empfehlen."
+msgid ""
+"Do you want to delete all local data and replace it with data from %s? This "
+"is not usually advised."
+msgstr ""
+"Möchtest du alle lokalen Daten löschen und mit Daten von %s ersetzen? Dies "
+"ist normalerweise nicht zu empfehlen."
-#: ../src/gtk-ui/sync-ui.c:429
-#: ../src/gtk-ui/sync-ui.c:460
+#: ../src/gtk-ui/sync-ui.c:429 ../src/gtk-ui/sync-ui.c:462
msgid "Yes, delete and replace"
msgstr "Ja, löschen und ersetzen"
-#: ../src/gtk-ui/sync-ui.c:429
-#: ../src/gtk-ui/sync-ui.c:460
-#: ../src/gtk-ui/sync-ui.c:1605
+#: ../src/gtk-ui/sync-ui.c:429 ../src/gtk-ui/sync-ui.c:462
+#: ../src/gtk-ui/sync-ui.c:1610
msgid "No"
msgstr "Nein"
-#. TRANSLATORS: confirmation dialog for refresh-from-client. Placeholder
+#. TRANSLATORS: confirmation dialog for "refresh from local side". Placeholder
#. * is service/device name
-#: ../src/gtk-ui/sync-ui.c:455
+#: ../src/gtk-ui/sync-ui.c:457
#, c-format
-msgid "Do you want to delete all data in %s and replace it with your local data? This is not usually advised."
-msgstr "Möchtest du alle Daten in %s löschen und mit deinen lokalen Daten ersetzen? Dies ist normalerweise nicht zu empfehlen."
+msgid ""
+"Do you want to delete all data in %s and replace it with your local data? "
+"This is not usually advised."
+msgstr ""
+"Möchtest du alle Daten in %s löschen und mit deinen lokalen Daten ersetzen? "
+"Dies ist normalerweise nicht zu empfehlen."
-#: ../src/gtk-ui/sync-ui.c:487
+#: ../src/gtk-ui/sync-ui.c:491
msgid "Trying to cancel sync"
msgstr "Abbruchversuch der Synchronisation"
-#: ../src/gtk-ui/sync-ui.c:529
+#: ../src/gtk-ui/sync-ui.c:533
msgid "No service or device selected"
msgstr "Kein Service oder Gerät gewählt"
-# "last synchronization happened a few seconds ago"
#. TRANSLATORS: This is the title on main view. Placeholder is
#. * the service name. Example: "Google - synced just now"
-#: ../src/gtk-ui/sync-ui.c:537
+#: ../src/gtk-ui/sync-ui.c:541
#, c-format
msgid "%s - synced just now"
msgstr "%s - Synchronisation fand vor wenigen Sekunden statt"
-#: ../src/gtk-ui/sync-ui.c:541
+#: ../src/gtk-ui/sync-ui.c:545
#, c-format
msgid "%s - synced a minute ago"
msgstr "%s - Synchronisation fand vor einer Minute statt"
-#: ../src/gtk-ui/sync-ui.c:545
+#: ../src/gtk-ui/sync-ui.c:549
#, c-format
msgid "%s - synced %ld minutes ago"
msgstr "%s - Synchronisation fand vor %ld Minuten statt"
-#: ../src/gtk-ui/sync-ui.c:550
+#: ../src/gtk-ui/sync-ui.c:554
#, c-format
msgid "%s - synced an hour ago"
msgstr "%s - Synchronisation fand vor einer Stunde statt"
-#: ../src/gtk-ui/sync-ui.c:554
+#: ../src/gtk-ui/sync-ui.c:558
#, c-format
msgid "%s - synced %ld hours ago"
msgstr "%s - Synchronisation fand vor %ld Stunden statt"
-#: ../src/gtk-ui/sync-ui.c:559
+#: ../src/gtk-ui/sync-ui.c:563
#, c-format
msgid "%s - synced a day ago"
msgstr "%s - Synchronisation fand vor einem Tag statt"
-#: ../src/gtk-ui/sync-ui.c:563
+#: ../src/gtk-ui/sync-ui.c:567
#, c-format
msgid "%s - synced %ld days ago"
msgstr "%s - Synchronisation fand vor %ld Tagen statt"
-# use of the horrible word "syncen" is necessary to avoid truncation
#. TRANSLATORS: Action button in info bar in main view. Shown with e.g.
#. * "You've just restored a backup. The changes have not been "
#. * "synced with %s yet"
-#: ../src/gtk-ui/sync-ui.c:612
-#: ../src/gtk-ui/sync-ui.c:726
+#: ../src/gtk-ui/sync-ui.c:616 ../src/gtk-ui/sync-ui.c:701
msgid "Sync now"
msgstr "Jetzt syncen"
#. TRANSLATORS: Action button in info bar in main view. Shown with e.g.
#. * "A normal sync is not possible at this time..." message.
#. * "Other options" will open Emergency view
-#: ../src/gtk-ui/sync-ui.c:618
-#: ../src/gtk-ui/ui.glade.h:37
+#: ../src/gtk-ui/sync-ui.c:622 ../src/gtk-ui/ui.glade.h:37
msgid "Slow sync"
msgstr ""
"Langsame\n"
"Synchronisation"
-#: ../src/gtk-ui/sync-ui.c:619
+#: ../src/gtk-ui/sync-ui.c:623
msgid "Other options..."
msgstr "Andere Optionen..."
#. TRANSLATORS: Action button in info bar in main view. Shown e.g.
#. * when no service is selected. Will open configuration view
-#: ../src/gtk-ui/sync-ui.c:624
+#: ../src/gtk-ui/sync-ui.c:628
msgid "Select sync service"
msgstr "Synchronisations-Service wählen"
#. TRANSLATORS: Action button in info bar in main view. Shown e.g.
#. * login to service fails. Will open configuration view for this service
-#: ../src/gtk-ui/sync-ui.c:629
+#: ../src/gtk-ui/sync-ui.c:633
msgid "Edit service settings"
msgstr "Service-Einstellungen bearbeiten"
-#: ../src/gtk-ui/sync-ui.c:700
-msgid "You haven't selected a sync service or device yet. Sync services let you synchronize your data between your netbook and a web service. You can also sync directly with some devices."
-msgstr "Es ist noch kein Synchronisations-Service oder Gerät ausgewählt. Sync-Services synchronisieren die Daten deines Netbooks mit einem Web-Service. Mit einigen Geräten kannst du auch direkt synchronisieren."
+#: ../src/gtk-ui/sync-ui.c:709
+msgid ""
+"You haven't selected a sync service or device yet. Sync services let you "
+"synchronize your data between your netbook and a web service. You can also "
+"sync directly with some devices."
+msgstr ""
+"Es ist noch kein Synchronisations-Service oder Gerät ausgewählt. Sync-"
+"Services synchronisieren die Daten deines Netbooks mit einem Web-Service. "
+"Mit einigen Geräten kannst du auch direkt synchronisieren."
-# Shortened to avoid truncation. If truncation is no longer an issue, please use the full form of the verb: 'synchronisieren'.
-#: ../src/gtk-ui/sync-ui.c:722
+#: ../src/gtk-ui/sync-ui.c:729
msgid "Sync again"
msgstr "Erneut syncen"
-#: ../src/gtk-ui/sync-ui.c:743
+#: ../src/gtk-ui/sync-ui.c:748
msgid "Restoring"
msgstr "Wiederherstellung"
-# looks horrible to my German eyes, but is necessary to avoid truncation
-#: ../src/gtk-ui/sync-ui.c:745
+#: ../src/gtk-ui/sync-ui.c:750
msgid "Syncing"
msgstr "Syncen..."
#. TRANSLATORS: This is for the button in main view, right side.
#. Keep line length below ~20 characters, use two lines if needed
-#: ../src/gtk-ui/sync-ui.c:757
-#: ../src/gtk-ui/sync-ui.c:3399
+#: ../src/gtk-ui/sync-ui.c:762 ../src/gtk-ui/sync-ui.c:3407
msgid "Cancel sync"
msgstr ""
"Synchronisation\n"
"abbrechen"
-#: ../src/gtk-ui/sync-ui.c:922
+#: ../src/gtk-ui/sync-ui.c:927
msgid "Back to sync"
msgstr "Zurück zur Synchronisation"
#. TRANSLATORS: label for checkbutton/toggle in main view.
#. * Please stick to similar length strings or break the line with
#. * "\n" if absolutely needed
-#: ../src/gtk-ui/sync-ui.c:1224
+#: ../src/gtk-ui/sync-ui.c:1229
msgid "Automatic sync"
msgstr ""
"Automatische\n"
@@ -218,61 +224,79 @@ msgstr ""
#. * currently selected data sources. First placeholder is service/device
#. * name, second a comma separeted list of sources.
#. * E.g. "Affected data: Google Contacts, Appointments"
-#: ../src/gtk-ui/sync-ui.c:1519
+#: ../src/gtk-ui/sync-ui.c:1524
#, c-format
msgid "Affected data: %s %s"
msgstr "Betroffene Daten: %s %s"
-#: ../src/gtk-ui/sync-ui.c:1524
+#: ../src/gtk-ui/sync-ui.c:1529
#, c-format
msgid "Affected data: none"
msgstr "Betroffene Daten: Keine"
#. TRANSLATORS: confirmation for restoring a backup. placeholder is the
#. * backup time string defined below
-#: ../src/gtk-ui/sync-ui.c:1602
+#: ../src/gtk-ui/sync-ui.c:1607
#, c-format
-msgid "Do you want to restore the backup from %s? All changes you have made since then will be lost."
-msgstr "Soll die Sicherheitskopie von %s wiederhergestellt werden? Alle seither gemachten Änderungen gehen dann verloren."
+msgid ""
+"Do you want to restore the backup from %s? All changes you have made since "
+"then will be lost."
+msgstr ""
+"Soll die Sicherheitskopie von %s wiederhergestellt werden? Alle seither "
+"gemachten Änderungen gehen dann verloren."
-#: ../src/gtk-ui/sync-ui.c:1605
+#: ../src/gtk-ui/sync-ui.c:1610
msgid "Yes, restore"
msgstr "Ja, wiederherstellen"
#. TRANSLATORS: date/time for strftime(), used in emergency view backup
#. * label. Any time format that shows date and time is good.
-#: ../src/gtk-ui/sync-ui.c:1637
+#: ../src/gtk-ui/sync-ui.c:1642
#, c-format
msgid "%x %X"
msgstr "%x %X"
#. TRANSLATORS: label for a backup in emergency view. Placeholder is
#. * service or device name
-#: ../src/gtk-ui/sync-ui.c:1656
+#: ../src/gtk-ui/sync-ui.c:1661
#, c-format
msgid "Backed up before syncing with %s"
msgstr "Sicherheitskopie wurde erstellt vor Synchronisation mit %s"
-#: ../src/gtk-ui/sync-ui.c:1673
+#: ../src/gtk-ui/sync-ui.c:1678
msgid "Restore"
msgstr "Wiederherstellen"
#. TRANSLATORS: this is an explanation in Emergency view.
#. * Placeholder is a service/device name
-#: ../src/gtk-ui/sync-ui.c:1780
+#: ../src/gtk-ui/sync-ui.c:1785
#, c-format
-msgid "A normal sync with %s is not possible at this time. You can do a slow two-way sync or start from scratch. You can also restore a backup, but a slow sync or starting from scratch will still be required before normal sync is possible."
-msgstr "Eine normale Synchronisation mit %s ist zur Zeit nicht möglich. Du kannst eine langsame Zwei-Wege-Synchronisation durchführen, neu anfangen, oder eine Sicherheitskopie wiederherstellen. Eine langsame Synchronisation oder ein Neuanfang sind jedoch erforderlich, bevor eine normale Synchronisation mäglich ist."
+msgid ""
+"A normal sync with %s is not possible at this time. You can do a slow two-"
+"way sync or start from scratch. You can also restore a backup, but a slow "
+"sync or starting from scratch will still be required before normal sync is "
+"possible."
+msgstr ""
+"Eine normale Synchronisation mit %s ist zur Zeit nicht möglich. Du kannst "
+"eine langsame Zwei-Wege-Synchronisation durchführen, neu anfangen, oder eine"
+" Sicherheitskopie wiederherstellen. Eine langsame Synchronisation oder ein "
+"Neuanfang sind jedoch erforderlich, bevor eine normale Synchronisation "
+"mäglich ist."
-#: ../src/gtk-ui/sync-ui.c:1790
+#: ../src/gtk-ui/sync-ui.c:1795
#, c-format
-msgid "If something has gone horribly wrong, you can try a slow sync, start from scratch or restore from backup."
-msgstr "Falls etwas fehlgeschlagen ist, kannst du eine langsame Synchronisation versuchen, neu anfangen oder von der Sicherheitskopie Daten wiederherstellen."
+msgid ""
+"If something has gone horribly wrong, you can try a slow sync, start from "
+"scratch or restore from backup."
+msgstr ""
+"Falls etwas fehlgeschlagen ist, kannst du eine langsame Synchronisation "
+"versuchen, neu anfangen oder von der Sicherheitskopie Daten "
+"wiederherstellen."
#. TRANSLATORS: These are a buttons in Emergency view. Placeholder is a
#. * service/device name. Please don't use too long lines, but feel free to
#. * use several lines.
-#: ../src/gtk-ui/sync-ui.c:1799
+#: ../src/gtk-ui/sync-ui.c:1804
#, c-format
msgid ""
"Delete all your local\n"
@@ -283,7 +307,7 @@ msgstr ""
"löschen und ersetzen mit\n"
"Daten von %s"
-#: ../src/gtk-ui/sync-ui.c:1805
+#: ../src/gtk-ui/sync-ui.c:1810
#, c-format
msgid ""
"Delete all data on\n"
@@ -294,72 +318,76 @@ msgstr ""
"löschen und ersetzen\n"
"mit deinen lokalen Daten"
-#: ../src/gtk-ui/sync-ui.c:2267
+#: ../src/gtk-ui/sync-ui.c:2275
msgid "Failed to get list of supported services from SyncEvolution"
-msgstr "Liste der unterstützten Services konnte nicht von SyncEvolution empfangen werden."
+msgstr ""
+"Liste der unterstützten Services konnte nicht von SyncEvolution empfangen "
+"werden."
-#: ../src/gtk-ui/sync-ui.c:2321
-msgid "There was a problem communicating with the sync process. Please try again later."
-msgstr "Bei der Kommunikation mit dem Sync-Service trat ein Problem auf. Versuche es später nochmals."
+#: ../src/gtk-ui/sync-ui.c:2329
+msgid ""
+"There was a problem communicating with the sync process. Please try again "
+"later."
+msgstr ""
+"Bei der Kommunikation mit dem Sync-Service trat ein Problem auf. Versuche es"
+" später nochmals."
-#: ../src/gtk-ui/sync-ui.c:2380
+#: ../src/gtk-ui/sync-ui.c:2388
msgid "Restore failed"
msgstr "Verbindung fehlgeschlagen"
-# changed to avoid truncation
-#: ../src/gtk-ui/sync-ui.c:2383
-#: ../src/gtk-ui/sync-ui.c:3268
+#: ../src/gtk-ui/sync-ui.c:2391 ../src/gtk-ui/sync-ui.c:3276
msgid "Sync failed"
msgstr "Sync fehlgeschlagen"
-#: ../src/gtk-ui/sync-ui.c:2389
+#: ../src/gtk-ui/sync-ui.c:2397
msgid "Restore complete"
msgstr "Wiederherstellung beendet"
-#: ../src/gtk-ui/sync-ui.c:2392
+#: ../src/gtk-ui/sync-ui.c:2400
msgid "Sync complete"
msgstr "Sync beendet"
-#: ../src/gtk-ui/sync-ui.c:2484
+#: ../src/gtk-ui/sync-ui.c:2492
#, c-format
msgid "Preparing '%s'"
msgstr "'%s' wird vorbereitet"
-#: ../src/gtk-ui/sync-ui.c:2487
+#: ../src/gtk-ui/sync-ui.c:2495
#, c-format
msgid "Receiving '%s'"
msgstr "'%s' wird empfangen"
-#: ../src/gtk-ui/sync-ui.c:2490
+#: ../src/gtk-ui/sync-ui.c:2498
#, c-format
msgid "Sending '%s'"
msgstr "'%s' wird gesendet"
-#: ../src/gtk-ui/sync-ui.c:2611
+#: ../src/gtk-ui/sync-ui.c:2619
#, c-format
msgid "There was one remote rejection."
msgid_plural "There were %ld remote rejections."
msgstr[0] "Es gab eine Remote-Ablehnung."
msgstr[1] "Es gab %ld Remote-Ablehnungen."
-#: ../src/gtk-ui/sync-ui.c:2616
+#: ../src/gtk-ui/sync-ui.c:2624
#, c-format
msgid "There was one local rejection."
msgid_plural "There were %ld local rejections."
msgstr[0] "Es gab eine lokale Ablehnung."
msgstr[1] "Es gab %ld lokale Ablehnungen."
-#: ../src/gtk-ui/sync-ui.c:2621
+#: ../src/gtk-ui/sync-ui.c:2629
#, c-format
msgid "There were %ld local rejections and %ld remote rejections."
msgstr "Es gab %ld lokale Ablehnungen und %ld Remote-Ablehnungen."
-#: ../src/gtk-ui/sync-ui.c:2626
+#: ../src/gtk-ui/sync-ui.c:2634
#, c-format
msgid "Last time: No changes."
msgstr "Letztes Mal: Keine Änderungen."
-#: ../src/gtk-ui/sync-ui.c:2628
+#: ../src/gtk-ui/sync-ui.c:2636
#, c-format
msgid "Last time: Sent one change."
msgid_plural "Last time: Sent %ld changes."
@@ -369,21 +397,22 @@ msgstr[1] "Letztes Mal: %ld Änderungen abgeschickt."
#. This is about changes made to the local data. Not all of these
#. changes were requested by the remote server, so "applied"
#. is a better word than "received" (bug #5185).
-#: ../src/gtk-ui/sync-ui.c:2636
+#: ../src/gtk-ui/sync-ui.c:2644
#, c-format
msgid "Last time: Applied one change."
msgid_plural "Last time: Applied %ld changes."
msgstr[0] "Letztes Mal: Eine Änderung angewandt."
msgstr[1] "Letztes Mal: %ld Änderungen angewandt."
-#: ../src/gtk-ui/sync-ui.c:2641
+#: ../src/gtk-ui/sync-ui.c:2649
#, c-format
msgid "Last time: Applied %ld changes and sent %ld changes."
-msgstr "Letztes Mal: %ld Änderungen angewandt und %ld Änderungen abgeschickt."
+msgstr ""
+"Letztes Mal: %ld Änderungen angewandt und %ld Änderungen abgeschickt."
#. TRANSLATORS: the placeholder is a error message (hopefully)
#. * explaining the problem
-#: ../src/gtk-ui/sync-ui.c:2848
+#: ../src/gtk-ui/sync-ui.c:2856
#, c-format
msgid ""
"There was a problem with last sync:\n"
@@ -392,125 +421,154 @@ msgstr ""
"Bei der letzten Synchronisation trat ein Problem auf:\n"
"%s"
-#: ../src/gtk-ui/sync-ui.c:2858
+#: ../src/gtk-ui/sync-ui.c:2866
#, c-format
-msgid "You've just restored a backup. The changes have not been synced with %s yet"
-msgstr "Du hast soeben eine Sicherheitskopie erstellt. Die Änderungen wurden noch nicht mit %s synchronisiert."
+msgid ""
+"You've just restored a backup. The changes have not been synced with %s yet"
+msgstr ""
+"Du hast soeben eine Sicherheitskopie erstellt. Die Änderungen wurden noch "
+"nicht mit %s synchronisiert."
-#: ../src/gtk-ui/sync-ui.c:3146
+#: ../src/gtk-ui/sync-ui.c:3154
msgid "Waiting for current operation to finish..."
msgstr "Warten auf Beenden des laufenden Vorgangs..."
#. TRANSLATORS: next strings are error messages.
-#: ../src/gtk-ui/sync-ui.c:3180
-msgid "A normal sync is not possible at this time. The server suggests a slow sync, but this might not always be what you want if both ends already have data."
-msgstr "Eine normale Synchronisation ist zur Zeit nicht möglich. Der Server schlägt eine langsame Synchronisation vor, doch wenn beide Enden bereits Daten haben, ist dies vielleicht nicht immer wünschenswert."
+#: ../src/gtk-ui/sync-ui.c:3188
+msgid ""
+"A normal sync is not possible at this time. The server suggests a slow sync,"
+" but this might not always be what you want if both ends already have data."
+msgstr ""
+"Eine normale Synchronisation ist zur Zeit nicht möglich. Der Server schlägt "
+"eine langsame Synchronisation vor, doch wenn beide Enden bereits Daten "
+"haben, ist dies vielleicht nicht immer wünschenswert."
-#: ../src/gtk-ui/sync-ui.c:3184
+#: ../src/gtk-ui/sync-ui.c:3192
msgid "The sync process died unexpectedly."
msgstr "Sync-Prozess wurde unerwartet abgebrochen."
-#: ../src/gtk-ui/sync-ui.c:3189
-msgid "Password request was not answered. You can save the password in the settings to prevent the request."
-msgstr "Passwortanfrage wurde nicht beantwortet. Du kannst das Passwort in den Einstellungen speichern, um die Anfrage zu vermeiden."
+#: ../src/gtk-ui/sync-ui.c:3197
+msgid ""
+"Password request was not answered. You can save the password in the settings"
+" to prevent the request."
+msgstr ""
+"Passwortanfrage wurde nicht beantwortet. Du kannst das Passwort in den "
+"Einstellungen speichern, um die Anfrage zu vermeiden."
#. TODO use the service device name here, this is a remote problem
-#: ../src/gtk-ui/sync-ui.c:3193
+#: ../src/gtk-ui/sync-ui.c:3201
msgid "There was a problem processing sync request. Trying again may help."
-msgstr "Beim Bearbeiten der Synchronisationsanfrage trat ein Problem auf. Es wird empfohlen, es noch einmal zu versuchen."
+msgstr ""
+"Beim Bearbeiten der Synchronisationsanfrage trat ein Problem auf. Es wird "
+"empfohlen, es noch einmal zu versuchen."
-#: ../src/gtk-ui/sync-ui.c:3199
-msgid "Failed to login. Could there be a problem with your username or password?"
-msgstr "Anmeldung gescheitert. Es könnte ein Problem mit dem Benutzernamen oder dem Kennwort bestehen."
+#: ../src/gtk-ui/sync-ui.c:3207
+msgid ""
+"Failed to login. Could there be a problem with your username or password?"
+msgstr ""
+"Anmeldung gescheitert. Es könnte ein Problem mit dem Benutzernamen oder dem "
+"Kennwort bestehen."
-#: ../src/gtk-ui/sync-ui.c:3202
+#: ../src/gtk-ui/sync-ui.c:3210
msgid "Forbidden"
msgstr "Verboten"
#. TRANSLATORS: data source means e.g. calendar or addressbook
-#: ../src/gtk-ui/sync-ui.c:3208
-msgid "A data source could not be found. Could there be a problem with the settings?"
-msgstr "Die Datenquelle wurde nicht gefunden. Könnte es ein Problem bei den Einstellungen geben?"
+#: ../src/gtk-ui/sync-ui.c:3216
+msgid ""
+"A data source could not be found. Could there be a problem with the "
+"settings?"
+msgstr ""
+"Die Datenquelle wurde nicht gefunden. Könnte es ein Problem bei den "
+"Einstellungen geben?"
-#: ../src/gtk-ui/sync-ui.c:3212
+#: ../src/gtk-ui/sync-ui.c:3220
msgid "Remote database error"
msgstr "Fehler bei Remote-Datenbank"
#. This can happen when EDS is borked, restart it may help...
-#: ../src/gtk-ui/sync-ui.c:3215
-msgid "There is a problem with the local database. Syncing again or rebooting may help."
-msgstr "Es gibt ein Problem mit der lokalen Datenbank. Es wird empfohlen, noch einmal zu synchronisieren oder den Computer neu zu starten"
+#: ../src/gtk-ui/sync-ui.c:3223
+msgid ""
+"There is a problem with the local database. Syncing again or rebooting may "
+"help."
+msgstr ""
+"Es gibt ein Problem mit der lokalen Datenbank. Es wird empfohlen, noch "
+"einmal zu synchronisieren oder den Computer neu zu starten"
-#: ../src/gtk-ui/sync-ui.c:3218
+#: ../src/gtk-ui/sync-ui.c:3226
msgid "No space on disk"
msgstr "Kein Platz auf der Festplatte"
-#: ../src/gtk-ui/sync-ui.c:3220
+#: ../src/gtk-ui/sync-ui.c:3228
msgid "Failed to process SyncML"
msgstr "SyncML konnte nicht verarbeitet werden"
-#: ../src/gtk-ui/sync-ui.c:3222
+#: ../src/gtk-ui/sync-ui.c:3230
msgid "Server authorization failed"
msgstr "Serverauthentifizierung fehlgeschlagen"
-#: ../src/gtk-ui/sync-ui.c:3224
+#: ../src/gtk-ui/sync-ui.c:3232
msgid "Failed to parse configuration file"
msgstr "Konfigurationsdatei konnte nicht analysiert werden"
-#: ../src/gtk-ui/sync-ui.c:3226
+#: ../src/gtk-ui/sync-ui.c:3234
msgid "Failed to read configuration file"
msgstr "Konfigurationsdatei konnte nicht gelesen werden"
-#: ../src/gtk-ui/sync-ui.c:3228
+#: ../src/gtk-ui/sync-ui.c:3236
msgid "No configuration found"
msgstr "Keine Konfiguration gefunden"
-#: ../src/gtk-ui/sync-ui.c:3230
+#: ../src/gtk-ui/sync-ui.c:3238
msgid "No configuration file found"
msgstr "Keine Konfigurationsdatei gefunden"
-# "The Server has sent invalid content"
-#: ../src/gtk-ui/sync-ui.c:3232
+#: ../src/gtk-ui/sync-ui.c:3240
msgid "Server sent bad content"
msgstr "Der Server hat ungültigen Inhalt gesendet"
-#: ../src/gtk-ui/sync-ui.c:3234
+#: ../src/gtk-ui/sync-ui.c:3242
msgid "Connection certificate has expired"
msgstr "Das Zertifikat der Verbindung ist abgelaufen"
-#: ../src/gtk-ui/sync-ui.c:3236
+#: ../src/gtk-ui/sync-ui.c:3244
msgid "Connection certificate is invalid"
msgstr "Das Zertifikat der Verbindung ist ungültig"
-#: ../src/gtk-ui/sync-ui.c:3244
-msgid "We were unable to connect to the server. The problem could be temporary or there could be something wrong with the settings."
-msgstr "Verbindung mit dem Server konnte nicht hergestellt werden. Das Problem ist vielleicht nur temporär, oder es könnte ein Fehler bei den Einstellungen vorliegen."
+#: ../src/gtk-ui/sync-ui.c:3252
+msgid ""
+"We were unable to connect to the server. The problem could be temporary or "
+"there could be something wrong with the settings."
+msgstr ""
+"Verbindung mit dem Server konnte nicht hergestellt werden. Das Problem ist "
+"vielleicht nur temporär, oder es könnte ein Fehler bei den Einstellungen "
+"vorliegen."
-#: ../src/gtk-ui/sync-ui.c:3251
+#: ../src/gtk-ui/sync-ui.c:3259
msgid "The server URL is bad"
msgstr "Server-URL ist nicht korrekt"
-#: ../src/gtk-ui/sync-ui.c:3256
+#: ../src/gtk-ui/sync-ui.c:3264
msgid "The server was not found"
msgstr "Der Server wurde nicht gefunden"
-#: ../src/gtk-ui/sync-ui.c:3258
+#: ../src/gtk-ui/sync-ui.c:3266
#, c-format
msgid "Error %d"
msgstr "Fehler %d"
#. TRANSLATORS: password request dialog contents: title, cancel button
#. * and ok button
-#: ../src/gtk-ui/sync-ui.c:3396
+#: ../src/gtk-ui/sync-ui.c:3404
msgid "Password is required for sync"
msgstr "Kennwort ist zur Synchronisation erforderlich"
-#: ../src/gtk-ui/sync-ui.c:3400
+#: ../src/gtk-ui/sync-ui.c:3408
msgid "Sync with password"
msgstr "Synchronisation mit Kennwort"
#. TRANSLATORS: password request dialog message, placeholder is service name
-#: ../src/gtk-ui/sync-ui.c:3410
+#: ../src/gtk-ui/sync-ui.c:3418
#, c-format
msgid "Please enter password for syncing with %s:"
msgstr "Kennwort zur Synchronisation mit %s eingeben:"
@@ -556,26 +614,30 @@ msgstr ""
"Eine langsame Synchronisation vergleicht Elemente beider Seiten und fügt sie zusammen.\n"
"Dies kann manchmal fehlschlagen und Duplikate oder verlorene Informationen zur Folge haben."
-# "add new" - shortened to avoid truncation
#: ../src/gtk-ui/ui.glade.h:15
msgid "Add new device"
msgstr "Gerät zufügen"
-# "add new" - shortened to avoid truncation
#: ../src/gtk-ui/ui.glade.h:16
msgid "Add new service"
msgstr "Service zufügen"
#. explanation of "Restore backup" function
#: ../src/gtk-ui/ui.glade.h:18
-msgid "Backups are made before every time we Sync. Choose a backup to restore. Any changes you have made since then will be lost."
-msgstr "Bei jeder Synchronisation wird eine Sicherheitskopie erstellt. Wähle zur Wiederherstellung eine Sicherheitskopie. Seither vorgenommene Änderungen gehen verloren."
+msgid ""
+"Backups are made before every time we Sync. Choose a backup to restore. Any "
+"changes you have made since then will be lost."
+msgstr ""
+"Bei jeder Synchronisation wird eine Sicherheitskopie erstellt. Wähle zur "
+"Wiederherstellung eine Sicherheitskopie. Seither vorgenommene Änderungen "
+"gehen verloren."
#: ../src/gtk-ui/ui.glade.h:19
msgid "Calendar"
msgstr "Kalender"
-#. Button in main view, right side. Keep to below 20 chars per line, feel free to use two lines
+#. Button in main view, right side. Keep to below 20 chars per line, feel free
+#. to use two lines
#: ../src/gtk-ui/ui.glade.h:21
msgid ""
"Change or edit\n"
@@ -609,7 +671,8 @@ msgstr ""
"löschen und ersetzen\n"
"mit Daten von Zyb"
-#. button in main view, right side. Keep length to 20 characters or so, use two lines if needed
+#. button in main view, right side. Keep length to 20 characters or so, use
+#. two lines if needed
#: ../src/gtk-ui/ui.glade.h:32
msgid ""
"Fix a sync\n"
@@ -644,96 +707,137 @@ msgstr ""
#: ../src/gtk-ui/ui.glade.h:43
msgid "Use Bluetooth to Sync your data from one device to another."
-msgstr "Benutze Bluetooth, um die Daten von einem Gerät mit einem anderen zu synchronisieren."
+msgstr ""
+"Benutze Bluetooth, um die Daten von einem Gerät mit einem anderen zu "
+"synchronisieren."
#: ../src/gtk-ui/ui.glade.h:44
msgid "You will need to add Bluetooth devices before they can be synced."
-msgstr "Bluetooth-Geräte müssen zugefügt werden, bevor sie synchronisiert werden können."
+msgstr ""
+"Bluetooth-Geräte müssen zugefügt werden, bevor sie synchronisiert werden "
+"können."
#: ../src/gtk-ui/sync.desktop.in.h:2
-#: ../src/gtk-ui/sync-gtk.desktop.in.h:2
msgid "Up to date"
msgstr "Aktuell bleiben"
#: ../src/gtk-ui/sync-gtk.desktop.in.h:1
-msgid "Sync (GTK)"
-msgstr "Synchronisation (GTK)"
+msgid "SyncEvolution (GTK)"
+msgstr "SyncEvolution (GTK)"
+
+#: ../src/gtk-ui/sync-gtk.desktop.in.h:2
+msgid "Synchronize PIM data"
+msgstr "Synchronize PIM data"
-#: ../src/gtk-ui/sync-config-widget.c:78
-msgid "ScheduleWorld enables you to keep your contacts, events, tasks, and notes in sync."
-msgstr "ScheduleWorld erlaubt dir, deine Kontakte, Events, Aufgaben und Notizen zu synchronisieren."
+#: ../src/gtk-ui/sync-config-widget.c:88
+msgid ""
+"ScheduleWorld enables you to keep your contacts, events, tasks, and notes in"
+" sync."
+msgstr ""
+"ScheduleWorld erlaubt dir, deine Kontakte, Events, Aufgaben und Notizen zu "
+"synchronisieren."
-#: ../src/gtk-ui/sync-config-widget.c:81
-msgid "Google Sync can back up and synchronize your contacts with your Gmail contacts."
-msgstr "Google Synchronisation kann dein Addressbuch mit deinen Gmail Kontakten synchronisieren und eine Sicherheitskopie davon erstellen."
+#: ../src/gtk-ui/sync-config-widget.c:91
+msgid ""
+"Google Sync can back up and synchronize your contacts with your Gmail "
+"contacts."
+msgstr ""
+"Google Synchronisation kann dein Addressbuch mit deinen Gmail Kontakten "
+"synchronisieren und eine Sicherheitskopie davon erstellen."
#. TRANSLATORS: Please include the word "demo" (or the equivalent in
#. your language): Funambol is going to be a 90 day demo service
#. in the future
-#: ../src/gtk-ui/sync-config-widget.c:87
-msgid "Back up your contacts and calendar. Sync with a single click, anytime, anywhere (DEMO)."
-msgstr "Erstelle Sicherheitskopien deiner Kontakte und deines Kalenders. Sync mit einem einzigen Klick, irgendwann, irgendwo (DEMO)."
+#: ../src/gtk-ui/sync-config-widget.c:97
+msgid ""
+"Back up your contacts and calendar. Sync with a single click, anytime, "
+"anywhere (DEMO)."
+msgstr ""
+"Erstelle Sicherheitskopien deiner Kontakte und deines Kalenders. Sync mit "
+"einem einzigen Klick, irgendwann, irgendwo (DEMO)."
-#: ../src/gtk-ui/sync-config-widget.c:90
-msgid "Mobical Backup and Restore service allows you to securely back up your personal mobile data for free."
-msgstr "Mit Mobical Backup und Restore Service kannst du gratis eine Sicherheitskopie deiner persönlichen mobilen Daten erstellen."
+#: ../src/gtk-ui/sync-config-widget.c:100
+msgid ""
+"Mobical Backup and Restore service allows you to securely back up your "
+"personal mobile data for free."
+msgstr ""
+"Mit Mobical Backup und Restore Service kannst du gratis eine "
+"Sicherheitskopie deiner persönlichen mobilen Daten erstellen."
-#: ../src/gtk-ui/sync-config-widget.c:93
-msgid "ZYB is a simple way for people to store and share mobile information online."
-msgstr "Mit ZYB können mobile Informationen online geteilt und gespeichert werden."
+#: ../src/gtk-ui/sync-config-widget.c:103
+msgid ""
+"ZYB is a simple way for people to store and share mobile information online."
+msgstr ""
+"Mit ZYB können mobile Informationen online geteilt und gespeichert werden."
-#: ../src/gtk-ui/sync-config-widget.c:96
-msgid "Memotoo lets you access your personal data from any computer connected to the Internet."
-msgstr "Memotoo gibt Zugriff auf persönliche Daten von jedem Computer, der mit dem Internet verbunden ist."
+#: ../src/gtk-ui/sync-config-widget.c:106
+msgid ""
+"Memotoo lets you access your personal data from any computer connected to "
+"the Internet."
+msgstr ""
+"Memotoo gibt Zugriff auf persönliche Daten von jedem Computer, der mit dem "
+"Internet verbunden ist."
-#: ../src/gtk-ui/sync-config-widget.c:192
+#: ../src/gtk-ui/sync-config-widget.c:195
msgid "Sorry, failed to save the configuration"
msgstr "Das Speichern der Konfiguration ist leider fehlgeschlagen"
-#: ../src/gtk-ui/sync-config-widget.c:381
+#: ../src/gtk-ui/sync-config-widget.c:445
msgid "Service must have a name and server URL"
msgstr "Der Service muss einen Namen und eine URL haben"
-#: ../src/gtk-ui/sync-config-widget.c:422
+#. TRANSLATORS: error dialog when creating a new sync configuration
+#: ../src/gtk-ui/sync-config-widget.c:451
+msgid "A username is required for this service"
+msgstr "Für diesen Service ist ein Benutzername erforderlich"
+
+#: ../src/gtk-ui/sync-config-widget.c:493
#, c-format
-msgid "Do you want to reset the settings for %s? This will not remove any synced information on either end."
-msgstr "Sollen die Einstellungen für %s neu eingerichtet werden? Es wird dabei keine synchronisierte Information gelöscht."
+msgid ""
+"Do you want to reset the settings for %s? This will not remove any synced "
+"information on either end."
+msgstr ""
+"Sollen die Einstellungen für %s neu eingerichtet werden? Es wird dabei keine"
+" synchronisierte Information gelöscht."
#. TRANSLATORS: buttons in reset-service warning dialog
-#: ../src/gtk-ui/sync-config-widget.c:426
+#: ../src/gtk-ui/sync-config-widget.c:497
msgid "Yes, reset"
msgstr "Ja, neu einrichten"
-#: ../src/gtk-ui/sync-config-widget.c:427
-#: ../src/gtk-ui/sync-config-widget.c:438
+#: ../src/gtk-ui/sync-config-widget.c:498
+#: ../src/gtk-ui/sync-config-widget.c:509
msgid "No, keep settings"
msgstr "Nein, Einstellungen behalten"
-#: ../src/gtk-ui/sync-config-widget.c:432
+#: ../src/gtk-ui/sync-config-widget.c:503
#, c-format
-msgid "Do you want to delete the settings for %s? This will not remove any synced information on either end but it will remove these settings."
-msgstr "Sollen die Einstellungen für %s gelöscht werden? Dabei werden keine synchronisierten Informationen gelöscht, jedoch wird die Service-Konfiguration gelöscht."
+msgid ""
+"Do you want to delete the settings for %s? This will not remove any synced "
+"information on either end but it will remove these settings."
+msgstr ""
+"Sollen die Einstellungen für %s gelöscht werden? Dabei werden keine "
+"synchronisierten Informationen gelöscht, jedoch wird die Service-"
+"Konfiguration gelöscht."
#. TRANSLATORS: buttons in delete-service warning dialog
-#: ../src/gtk-ui/sync-config-widget.c:437
+#: ../src/gtk-ui/sync-config-widget.c:508
msgid "Yes, delete"
msgstr "Ja, löschen"
-#: ../src/gtk-ui/sync-config-widget.c:467
+#: ../src/gtk-ui/sync-config-widget.c:539
msgid "Reset settings"
msgstr "Einstellungen zurücksetzen"
-#: ../src/gtk-ui/sync-config-widget.c:470
+#: ../src/gtk-ui/sync-config-widget.c:542
msgid "Delete settings"
msgstr "Einstellungen löschen"
-# shortened to prevent truncation
-# BUT, the only way to make it fit is to leave out the "...and use" portion of the string completely.
-#: ../src/gtk-ui/sync-config-widget.c:480
+#: ../src/gtk-ui/sync-config-widget.c:552
msgid "Save and use"
msgstr "Speichern und benutzen"
-#: ../src/gtk-ui/sync-config-widget.c:483
+#: ../src/gtk-ui/sync-config-widget.c:555
msgid ""
"Save and replace\n"
"current service"
@@ -741,103 +845,119 @@ msgstr ""
"Diesen Service\n"
"speichern und ersetzen"
-#: ../src/gtk-ui/sync-config-widget.c:493
+#: ../src/gtk-ui/sync-config-widget.c:563
msgid "Stop using device"
msgstr "Service nicht mehr benutzen"
-#: ../src/gtk-ui/sync-config-widget.c:496
+#: ../src/gtk-ui/sync-config-widget.c:566
msgid "Stop using service"
msgstr "Service nicht mehr benutzen"
#. TRANSLATORS: label for an entry in service configuration form.
#. * Placeholder is a source name.
#. * Example: "Appointments URI"
-#: ../src/gtk-ui/sync-config-widget.c:679
+#: ../src/gtk-ui/sync-config-widget.c:749
#, c-format
msgid "%s URI"
msgstr "URI von %s"
#. TRANSLATORS: toggles in service configuration form, placeholder is service
#. * or device name
-#: ../src/gtk-ui/sync-config-widget.c:854
+#: ../src/gtk-ui/sync-config-widget.c:936
#, c-format
msgid "Send changes to %s"
msgstr "Änderungen senden an %s"
-#: ../src/gtk-ui/sync-config-widget.c:859
+#: ../src/gtk-ui/sync-config-widget.c:941
#, c-format
msgid "Receive changes from %s"
msgstr "Änderungen von %s empfangen"
-#: ../src/gtk-ui/sync-config-widget.c:875
+#: ../src/gtk-ui/sync-config-widget.c:957
msgid "<b>Sync</b>"
msgstr "<b>Sync</b>"
#. TRANSLATORS: label of a entry in service configuration
-#: ../src/gtk-ui/sync-config-widget.c:891
+#: ../src/gtk-ui/sync-config-widget.c:973
msgid "Server address"
msgstr "Serveradresse"
#. TRANSLATORS: explanation before a device template combobox.
#. * Placeholder is a device name like 'Nokia N85' or 'Syncevolution
#. * Client'
-#: ../src/gtk-ui/sync-config-widget.c:967
+#: ../src/gtk-ui/sync-config-widget.c:1049
#, c-format
-msgid "This device looks like it might be a '%s'. If this is not correct, please take a look at the list of supported devices and pick yours if it is listed"
-msgstr "Dieses Gerät scheint ein '%s' zu sein. Sollte das nicht stimmen, schau dir bitte die Liste der unterstützten Geräte an, um dein Gerät auszuwählen."
+msgid ""
+"This device looks like it might be a '%s'. If this is not correct, please "
+"take a look at the list of supported devices and pick yours if it is listed"
+msgstr ""
+"Dieses Gerät scheint ein '%s' zu sein. Sollte das nicht stimmen, schau dir "
+"bitte die Liste der unterstützten Geräte an, um dein Gerät auszuwählen."
-#: ../src/gtk-ui/sync-config-widget.c:973
-msgid "We don't know what this device is exactly. Please take a look at the list of supported devices and pick yours if it is listed"
-msgstr "Dieses Gerät kann nicht genau identifiziert werden. Schau dir bitte die Liste der unterstützten Geräte an, um dein Gerät auszuwählen."
+#: ../src/gtk-ui/sync-config-widget.c:1055
+#: ../src/gtk-ui/sync-config-widget.c:1915
+msgid ""
+"We don't know what this device is exactly. Please take a look at the list of"
+" supported devices and pick yours if it is listed"
+msgstr ""
+"Dieses Gerät kann nicht genau identifiziert werden. Schau dir bitte die "
+"Liste der unterstützten Geräte an, um dein Gerät auszuwählen."
-#: ../src/gtk-ui/sync-config-widget.c:1126
+#: ../src/gtk-ui/sync-config-widget.c:1207
#, c-format
msgid "%s - Bluetooth device"
msgstr "%s - Bluetooth-Gerät"
#. TRANSLATORS: service title for services that are not based on a
#. * template in service list, the placeholder is the name of the service
-#: ../src/gtk-ui/sync-config-widget.c:1132
+#: ../src/gtk-ui/sync-config-widget.c:1213
#, c-format
msgid "%s - manually setup"
msgstr "%s - manuell einrichten"
#. TRANSLATORS: link button in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1807
+#: ../src/gtk-ui/sync-config-widget.c:1886
msgid "Launch website"
msgstr "Website starten"
-# shortened to prevent truncation
-# BUT, the only way to make it fit is to leave out the "...and use" portion of the string completely.
#. TRANSLATORS: button in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1816
+#: ../src/gtk-ui/sync-config-widget.c:1895
msgid "Set up now"
msgstr "Jetzt einrichten"
+#: ../src/gtk-ui/sync-config-widget.c:1953
+msgid "Use these settings"
+msgstr "Diese Einstellungen verwenden"
+
#. TRANSLATORS: labels of entries in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1912
+#: ../src/gtk-ui/sync-config-widget.c:1991
msgid "Username"
msgstr "Benutzername"
-#: ../src/gtk-ui/sync-config-widget.c:1927
+#: ../src/gtk-ui/sync-config-widget.c:2006
msgid "Password"
msgstr "Kennwort"
#. TRANSLATORS: warning in service configuration form for people
#. who have modified the configuration via other means.
-#: ../src/gtk-ui/sync-config-widget.c:1950
-msgid "Current configuration is more complex than what can be shown here. Changes to sync mode or synced data types will overwrite that configuration."
-msgstr "Die Service-Konfiguration ist komplexer als hier angezeigt werden kann. Änderungen am Synchronisationsmodus oder den synchronisierten Datentypen werden diese Konfiguration überschreiben."
+#: ../src/gtk-ui/sync-config-widget.c:2029
+msgid ""
+"Current configuration is more complex than what can be shown here. Changes "
+"to sync mode or synced data types will overwrite that configuration."
+msgstr ""
+"Die Service-Konfiguration ist komplexer als hier angezeigt werden kann. "
+"Änderungen am Synchronisationsmodus oder den synchronisierten Datentypen "
+"werden diese Konfiguration überschreiben."
#. TRANSLATORS: this is the epander label for server settings
#. in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1969
+#: ../src/gtk-ui/sync-config-widget.c:2048
msgid "Hide server settings"
msgstr "Servereinstellungen "
#. TRANSLATORS: this is the epander label for server settings
#. in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1989
+#: ../src/gtk-ui/sync-config-widget.c:2068
msgid "Show server settings"
msgstr "Servereinstellungen anzeigen"
@@ -845,62 +965,50 @@ msgstr "Servereinstellungen anzeigen"
msgid "Sync in the Sync application"
msgstr "Sync in der Sync Anwendung"
-#: ../src/syncevo-dbus-server.cpp:5664
+#: ../src/syncevo-dbus-server.cpp:6653
#, c-format
msgid "%s is syncing"
msgstr "%s Synchronisation"
-#: ../src/syncevo-dbus-server.cpp:5665
+#: ../src/syncevo-dbus-server.cpp:6654
#, c-format
msgid "We have just started to sync your computer with the %s sync service."
-msgstr "Die Synchronisation deines Computers mit dem %s Sync-Service wurde gestartet."
+msgstr ""
+"Die Synchronisation deines Computers mit dem %s Sync-Service wurde "
+"gestartet."
#. if sync is successfully started and done
-#: ../src/syncevo-dbus-server.cpp:5679
+#: ../src/syncevo-dbus-server.cpp:6670
#, c-format
msgid "%s sync complete"
msgstr "%s Synchronisation abgeschlossen"
-#: ../src/syncevo-dbus-server.cpp:5680
+#: ../src/syncevo-dbus-server.cpp:6671
#, c-format
msgid "We have just finished syncing your computer with the %s sync service."
-msgstr "Die Synchronisation deines Computers mit dem %s Sync-Service ist abgeschlossen."
+msgstr ""
+"Die Synchronisation deines Computers mit dem %s Sync-Service ist "
+"abgeschlossen."
-#. if sync is successfully started and has errors, or not started successful with a fatal problem
-#: ../src/syncevo-dbus-server.cpp:5685
+#. if sync is successfully started and has errors, or not started successful
+#. with a fatal problem
+#: ../src/syncevo-dbus-server.cpp:6676
msgid "Sync problem."
msgstr "Sync-Problem"
-#: ../src/syncevo-dbus-server.cpp:5686
+#: ../src/syncevo-dbus-server.cpp:6677
msgid "Sorry, there's a problem with your sync that you need to attend to."
msgstr "Ein Problem mit der Synchronisation bedarf deiner Aufmerksamkeit."
-#: ../src/syncevo-dbus-server.cpp:5759
+#: ../src/syncevo-dbus-server.cpp:6758
msgid "View"
msgstr "Anzeigen"
#. Use "default" as ID because that is what mutter-moblin
#. recognizes: it then skips the action instead of adding it
#. in addition to its own "Dismiss" button (always added).
-#: ../src/syncevo-dbus-server.cpp:5763
+#: ../src/syncevo-dbus-server.cpp:6762
msgid "Dismiss"
msgstr "Ignorieren"
-#~ msgid "Database error"
-#~ msgstr "Datenbankfehler"
-#~ msgid ""
-#~ "Do you want to replace %s with %s? This will not remove any synced "
-#~ "information on either end but you will no longer be able to sync with %s."
-#~ msgstr ""
-#~ "Soll %s durch %s? ersetzt werden? Es wird dabei keine synchronisierte "
-#~ "Information gelöscht, Synchronisierung mit %s ist jedoch nichit mehr "
-#~ "möglich."
-#~ msgid "Yes, use %s"
-#~ msgstr "Ja, %s benutzen"
-#~ msgid "No, use %s"
-#~ msgstr "Nein, %s benutzen"
-#~ msgid "Reset service"
-#~ msgstr "Service neu einstellen"
-#~ msgid "Addressbook"
-#~ msgstr "Adressbuch"
diff --git a/po/en_GB.po b/po/en_GB.po
index 866b5b46..032980a4 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -1,28 +1,26 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+#
+# Translators:
+# Margie Foster <margie@linux.intel.com>, 2011.
msgid ""
msgstr ""
-"Project-Id-Version: SynchEvolution\n"
-"Report-Msgid-Bugs-To: http://moblin.org/projects/syncevolution\n"
-"POT-Creation-Date: 2010-04-24 09:26+0000\n"
-"PO-Revision-Date: 2010-04-25 09:07-0800\n"
-"Last-Translator: Margie <margie@linux.intel.com>\n"
-"Language-Team: British English <margie@linux.intel.com>\n"
+"Project-Id-Version: syncevolution\n"
+"Report-Msgid-Bugs-To: https://bugs.meego.com/\n"
+"POT-Creation-Date: 2011-12-05 10:21-0800\n"
+"PO-Revision-Date: 2011-12-05 19:25+0000\n"
+"Last-Translator: margie <margie@linux.intel.com>\n"
+"Language-Team: English (United Kingdom) (http://www.transifex.net/projects/p/meego/team/en_GB/)\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n!=1;\\n\n"
-"X-Poedit-Language: English\n"
-"X-Poedit-Country: UNITED KINGDOM\n"
-"X-Poedit-SourceCharset: utf-8\n"
+"Language: en_GB\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. TRANSLATORS: this is the application name that may be used by e.g.
#. the windowmanager
-#: ../src/gtk-ui/main.c:40
-#: ../src/gtk-ui/ui.glade.h:38
+#: ../src/gtk-ui/main.c:40 ../src/gtk-ui/ui.glade.h:38
#: ../src/gtk-ui/sync.desktop.in.h:1
#: ../src/gnome-bluetooth/syncevolution.c:112
msgid "Sync"
@@ -36,8 +34,7 @@ msgstr "Contacts"
msgid "Appointments"
msgstr "Appointments"
-#: ../src/gtk-ui/sync-ui.c:270
-#: ../src/gtk-ui/ui.glade.h:40
+#: ../src/gtk-ui/sync-ui.c:270 ../src/gtk-ui/ui.glade.h:40
msgid "Tasks"
msgstr "Tasks"
@@ -71,72 +68,78 @@ msgstr "Yes, do slow sync"
msgid "No, cancel sync"
msgstr "No, cancel sync"
-#. TRANSLATORS: confirmation dialog for refresh-from-server. Placeholder
+#. TRANSLATORS: confirmation dialog for "refresh from peer". Placeholder
#. * is service/device name
#: ../src/gtk-ui/sync-ui.c:424
#, c-format
-msgid "Do you want to delete all local data and replace it with data from %s? This is not usually advised."
-msgstr "Do you want to delete all local data and replace it with data from %s? This is not usually advised."
+msgid ""
+"Do you want to delete all local data and replace it with data from %s? This "
+"is not usually advised."
+msgstr ""
+"Do you want to delete all local data and replace it with data from %s? This "
+"is not usually advised."
-#: ../src/gtk-ui/sync-ui.c:429
-#: ../src/gtk-ui/sync-ui.c:460
+#: ../src/gtk-ui/sync-ui.c:429 ../src/gtk-ui/sync-ui.c:462
msgid "Yes, delete and replace"
msgstr "Yes, delete and replace"
-#: ../src/gtk-ui/sync-ui.c:429
-#: ../src/gtk-ui/sync-ui.c:460
-#: ../src/gtk-ui/sync-ui.c:1580
+#: ../src/gtk-ui/sync-ui.c:429 ../src/gtk-ui/sync-ui.c:462
+#: ../src/gtk-ui/sync-ui.c:1610
msgid "No"
msgstr "No"
-#. TRANSLATORS: confirmation dialog for refresh-from-client. Placeholder
+#. TRANSLATORS: confirmation dialog for "refresh from local side". Placeholder
#. * is service/device name
-#: ../src/gtk-ui/sync-ui.c:455
+#: ../src/gtk-ui/sync-ui.c:457
#, c-format
-msgid "Do you want to delete all data in %s and replace it with your local data? This is not usually advised."
-msgstr "Do you want to delete all data in %s and replace it with your local data? This is not usually advised."
+msgid ""
+"Do you want to delete all data in %s and replace it with your local data? "
+"This is not usually advised."
+msgstr ""
+"Do you want to delete all data in %s and replace it with your local data? "
+"This is not usually advised."
-#: ../src/gtk-ui/sync-ui.c:487
+#: ../src/gtk-ui/sync-ui.c:491
msgid "Trying to cancel sync"
msgstr "Trying to cancel sync"
-#: ../src/gtk-ui/sync-ui.c:529
+#: ../src/gtk-ui/sync-ui.c:533
msgid "No service or device selected"
msgstr "No service or device selected"
#. TRANSLATORS: This is the title on main view. Placeholder is
#. * the service name. Example: "Google - synced just now"
-#: ../src/gtk-ui/sync-ui.c:537
+#: ../src/gtk-ui/sync-ui.c:541
#, c-format
msgid "%s - synced just now"
msgstr "%s - synced just now"
-#: ../src/gtk-ui/sync-ui.c:541
+#: ../src/gtk-ui/sync-ui.c:545
#, c-format
msgid "%s - synced a minute ago"
msgstr "%s - synced a minute ago"
-#: ../src/gtk-ui/sync-ui.c:545
+#: ../src/gtk-ui/sync-ui.c:549
#, c-format
msgid "%s - synced %ld minutes ago"
msgstr "%s - synced %ld minutes ago"
-#: ../src/gtk-ui/sync-ui.c:550
+#: ../src/gtk-ui/sync-ui.c:554
#, c-format
msgid "%s - synced an hour ago"
msgstr "%s - synced an hour ago"
-#: ../src/gtk-ui/sync-ui.c:554
+#: ../src/gtk-ui/sync-ui.c:558
#, c-format
msgid "%s - synced %ld hours ago"
msgstr "%s - synced %ld hours ago"
-#: ../src/gtk-ui/sync-ui.c:559
+#: ../src/gtk-ui/sync-ui.c:563
#, c-format
msgid "%s - synced a day ago"
msgstr "%s - synced a day ago"
-#: ../src/gtk-ui/sync-ui.c:563
+#: ../src/gtk-ui/sync-ui.c:567
#, c-format
msgid "%s - synced %ld days ago"
msgstr "%s - synced %ld days ago"
@@ -144,66 +147,69 @@ msgstr "%s - synced %ld days ago"
#. TRANSLATORS: Action button in info bar in main view. Shown with e.g.
#. * "You've just restored a backup. The changes have not been "
#. * "synced with %s yet"
-#: ../src/gtk-ui/sync-ui.c:612
-#: ../src/gtk-ui/sync-ui.c:726
+#: ../src/gtk-ui/sync-ui.c:616 ../src/gtk-ui/sync-ui.c:701
msgid "Sync now"
msgstr "Sync now"
#. TRANSLATORS: Action button in info bar in main view. Shown with e.g.
#. * "A normal sync is not possible at this time..." message.
#. * "Other options" will open Emergency view
-#: ../src/gtk-ui/sync-ui.c:618
-#: ../src/gtk-ui/ui.glade.h:37
+#: ../src/gtk-ui/sync-ui.c:622 ../src/gtk-ui/ui.glade.h:37
msgid "Slow sync"
msgstr "Slow sync"
-#: ../src/gtk-ui/sync-ui.c:619
+#: ../src/gtk-ui/sync-ui.c:623
msgid "Other options..."
msgstr "Other options..."
#. TRANSLATORS: Action button in info bar in main view. Shown e.g.
#. * when no service is selected. Will open configuration view
-#: ../src/gtk-ui/sync-ui.c:624
+#: ../src/gtk-ui/sync-ui.c:628
msgid "Select sync service"
msgstr "Select sync service"
#. TRANSLATORS: Action button in info bar in main view. Shown e.g.
#. * login to service fails. Will open configuration view for this service
-#: ../src/gtk-ui/sync-ui.c:629
+#: ../src/gtk-ui/sync-ui.c:633
msgid "Edit service settings"
msgstr "Edit service settings"
-#: ../src/gtk-ui/sync-ui.c:700
-msgid "You haven't selected a sync service or device yet. Sync services let you synchronize your data between your netbook and a web service. You can also sync directly with some devices."
-msgstr "You haven't selected a sync service or device yet. Sync services let you synchronise your data between your netbook and a web service. You can also sync directly with some devices."
+#: ../src/gtk-ui/sync-ui.c:709
+msgid ""
+"You haven't selected a sync service or device yet. Sync services let you "
+"synchronize your data between your netbook and a web service. You can also "
+"sync directly with some devices."
+msgstr ""
+"You haven't selected a sync service or device yet. Sync services let you "
+"synchronise your data between your netbook and a web service. You can also "
+"sync directly with some devices."
-#: ../src/gtk-ui/sync-ui.c:722
+#: ../src/gtk-ui/sync-ui.c:729
msgid "Sync again"
msgstr "Sync again"
-#: ../src/gtk-ui/sync-ui.c:743
+#: ../src/gtk-ui/sync-ui.c:748
msgid "Restoring"
msgstr "Restoring"
-#: ../src/gtk-ui/sync-ui.c:745
+#: ../src/gtk-ui/sync-ui.c:750
msgid "Syncing"
msgstr "Syncing"
#. TRANSLATORS: This is for the button in main view, right side.
#. Keep line length below ~20 characters, use two lines if needed
-#: ../src/gtk-ui/sync-ui.c:757
-#: ../src/gtk-ui/sync-ui.c:3373
+#: ../src/gtk-ui/sync-ui.c:762 ../src/gtk-ui/sync-ui.c:3407
msgid "Cancel sync"
msgstr "Cancel sync"
-#: ../src/gtk-ui/sync-ui.c:922
+#: ../src/gtk-ui/sync-ui.c:927
msgid "Back to sync"
msgstr "Back to sync"
#. TRANSLATORS: label for checkbutton/toggle in main view.
#. * Please stick to similar length strings or break the line with
#. * "\n" if absolutely needed
-#: ../src/gtk-ui/sync-ui.c:1223
+#: ../src/gtk-ui/sync-ui.c:1229
msgid "Automatic sync"
msgstr "Automatic sync"
@@ -211,61 +217,77 @@ msgstr "Automatic sync"
#. * currently selected data sources. First placeholder is service/device
#. * name, second a comma separeted list of sources.
#. * E.g. "Affected data: Google Contacts, Appointments"
-#: ../src/gtk-ui/sync-ui.c:1494
+#: ../src/gtk-ui/sync-ui.c:1524
#, c-format
msgid "Affected data: %s %s"
msgstr "Affected data: %s %s"
-#: ../src/gtk-ui/sync-ui.c:1499
+#: ../src/gtk-ui/sync-ui.c:1529
#, c-format
msgid "Affected data: none"
msgstr "Affected data: none"
#. TRANSLATORS: confirmation for restoring a backup. placeholder is the
#. * backup time string defined below
-#: ../src/gtk-ui/sync-ui.c:1577
+#: ../src/gtk-ui/sync-ui.c:1607
#, c-format
-msgid "Do you want to restore the backup from %s? All changes you have made since then will be lost."
-msgstr "Do you want to restore the backup from %s? All changes you have made since then will be lost."
+msgid ""
+"Do you want to restore the backup from %s? All changes you have made since "
+"then will be lost."
+msgstr ""
+"Do you want to restore the backup from %s? All changes you have made since "
+"then will be lost."
-#: ../src/gtk-ui/sync-ui.c:1580
+#: ../src/gtk-ui/sync-ui.c:1610
msgid "Yes, restore"
msgstr "Yes, restore"
#. TRANSLATORS: date/time for strftime(), used in emergency view backup
#. * label. Any time format that shows date and time is good.
-#: ../src/gtk-ui/sync-ui.c:1612
+#: ../src/gtk-ui/sync-ui.c:1642
#, c-format
msgid "%x %X"
msgstr "%x %X"
#. TRANSLATORS: label for a backup in emergency view. Placeholder is
#. * service or device name
-#: ../src/gtk-ui/sync-ui.c:1631
+#: ../src/gtk-ui/sync-ui.c:1661
#, c-format
msgid "Backed up before syncing with %s"
msgstr "Backed up before syncing with %s"
-#: ../src/gtk-ui/sync-ui.c:1648
+#: ../src/gtk-ui/sync-ui.c:1678
msgid "Restore"
msgstr "Restore"
#. TRANSLATORS: this is an explanation in Emergency view.
#. * Placeholder is a service/device name
-#: ../src/gtk-ui/sync-ui.c:1755
+#: ../src/gtk-ui/sync-ui.c:1785
#, c-format
-msgid "A normal sync with %s is not possible at this time. You can do a slow two-way sync or start from scratch. You can also restore a backup, but a slow sync or starting from scratch will still be required before normal sync is possible."
-msgstr "A normal sync with %s is not possible at this time. You can do a slow two-way sync or start from scratch. You can also restore a backup, but a slow sync or starting from scratch will still be required before normal sync is possible."
+msgid ""
+"A normal sync with %s is not possible at this time. You can do a slow two-"
+"way sync or start from scratch. You can also restore a backup, but a slow "
+"sync or starting from scratch will still be required before normal sync is "
+"possible."
+msgstr ""
+"A normal sync with %s is not possible at this time. You can do a slow two-"
+"way sync or start from scratch. You can also restore a backup, but a slow "
+"sync or starting from scratch will still be required before normal sync is "
+"possible."
-#: ../src/gtk-ui/sync-ui.c:1765
+#: ../src/gtk-ui/sync-ui.c:1795
#, c-format
-msgid "If something has gone horribly wrong, you can try a slow sync, start from scratch or restore from backup."
-msgstr "If something has gone horribly wrong, you can try a slow sync, start from scratch or restore from backup."
+msgid ""
+"If something has gone horribly wrong, you can try a slow sync, start from "
+"scratch or restore from backup."
+msgstr ""
+"If something has gone horribly wrong, you can try a slow sync, start from "
+"scratch or restore from backup."
#. TRANSLATORS: These are a buttons in Emergency view. Placeholder is a
#. * service/device name. Please don't use too long lines, but feel free to
#. * use several lines.
-#: ../src/gtk-ui/sync-ui.c:1774
+#: ../src/gtk-ui/sync-ui.c:1804
#, c-format
msgid ""
"Delete all your local\n"
@@ -276,7 +298,7 @@ msgstr ""
"data and replace with\n"
"data from %s"
-#: ../src/gtk-ui/sync-ui.c:1780
+#: ../src/gtk-ui/sync-ui.c:1810
#, c-format
msgid ""
"Delete all data on\n"
@@ -287,71 +309,74 @@ msgstr ""
"%s and replace\n"
"with your local data"
-#: ../src/gtk-ui/sync-ui.c:2241
+#: ../src/gtk-ui/sync-ui.c:2275
msgid "Failed to get list of supported services from SyncEvolution"
msgstr "Failed to get list of supported services from SyncEvolution"
-#: ../src/gtk-ui/sync-ui.c:2295
-msgid "There was a problem communicating with the sync process. Please try again later."
-msgstr "There was a problem communicating with the sync process. Please try again later."
+#: ../src/gtk-ui/sync-ui.c:2329
+msgid ""
+"There was a problem communicating with the sync process. Please try again "
+"later."
+msgstr ""
+"There was a problem communicating with the sync process. Please try again "
+"later."
-#: ../src/gtk-ui/sync-ui.c:2354
+#: ../src/gtk-ui/sync-ui.c:2388
msgid "Restore failed"
msgstr "Restore failed"
-#: ../src/gtk-ui/sync-ui.c:2357
-#: ../src/gtk-ui/sync-ui.c:3242
+#: ../src/gtk-ui/sync-ui.c:2391 ../src/gtk-ui/sync-ui.c:3276
msgid "Sync failed"
msgstr "Sync failed"
-#: ../src/gtk-ui/sync-ui.c:2363
+#: ../src/gtk-ui/sync-ui.c:2397
msgid "Restore complete"
msgstr "Restore complete"
-#: ../src/gtk-ui/sync-ui.c:2366
+#: ../src/gtk-ui/sync-ui.c:2400
msgid "Sync complete"
msgstr "Sync complete"
-#: ../src/gtk-ui/sync-ui.c:2458
+#: ../src/gtk-ui/sync-ui.c:2492
#, c-format
msgid "Preparing '%s'"
msgstr "Preparing '%s'"
-#: ../src/gtk-ui/sync-ui.c:2461
+#: ../src/gtk-ui/sync-ui.c:2495
#, c-format
msgid "Receiving '%s'"
msgstr "Receiving '%s'"
-#: ../src/gtk-ui/sync-ui.c:2464
+#: ../src/gtk-ui/sync-ui.c:2498
#, c-format
msgid "Sending '%s'"
msgstr "Sending '%s'"
-#: ../src/gtk-ui/sync-ui.c:2585
+#: ../src/gtk-ui/sync-ui.c:2619
#, c-format
msgid "There was one remote rejection."
msgid_plural "There were %ld remote rejections."
msgstr[0] "There was one remote rejection."
msgstr[1] "There were %ld remote rejections."
-#: ../src/gtk-ui/sync-ui.c:2590
+#: ../src/gtk-ui/sync-ui.c:2624
#, c-format
msgid "There was one local rejection."
msgid_plural "There were %ld local rejections."
msgstr[0] "There was one local rejection."
msgstr[1] "There were %ld local rejections."
-#: ../src/gtk-ui/sync-ui.c:2595
+#: ../src/gtk-ui/sync-ui.c:2629
#, c-format
msgid "There were %ld local rejections and %ld remote rejections."
msgstr "There were %ld local rejections and %ld remote rejections."
-#: ../src/gtk-ui/sync-ui.c:2600
+#: ../src/gtk-ui/sync-ui.c:2634
#, c-format
msgid "Last time: No changes."
msgstr "Last time: No changes."
-#: ../src/gtk-ui/sync-ui.c:2602
+#: ../src/gtk-ui/sync-ui.c:2636
#, c-format
msgid "Last time: Sent one change."
msgid_plural "Last time: Sent %ld changes."
@@ -361,21 +386,21 @@ msgstr[1] "Last time: Sent %ld changes."
#. This is about changes made to the local data. Not all of these
#. changes were requested by the remote server, so "applied"
#. is a better word than "received" (bug #5185).
-#: ../src/gtk-ui/sync-ui.c:2610
+#: ../src/gtk-ui/sync-ui.c:2644
#, c-format
msgid "Last time: Applied one change."
msgid_plural "Last time: Applied %ld changes."
msgstr[0] "Last time: Applied one change."
msgstr[1] "Last time: Applied %ld changes."
-#: ../src/gtk-ui/sync-ui.c:2615
+#: ../src/gtk-ui/sync-ui.c:2649
#, c-format
msgid "Last time: Applied %ld changes and sent %ld changes."
msgstr "Last time: Applied %ld changes and sent %ld changes."
#. TRANSLATORS: the placeholder is a error message (hopefully)
#. * explaining the problem
-#: ../src/gtk-ui/sync-ui.c:2822
+#: ../src/gtk-ui/sync-ui.c:2856
#, c-format
msgid ""
"There was a problem with last sync:\n"
@@ -384,124 +409,148 @@ msgstr ""
"There was a problem with last sync:\n"
"%s"
-#: ../src/gtk-ui/sync-ui.c:2832
+#: ../src/gtk-ui/sync-ui.c:2866
#, c-format
-msgid "You've just restored a backup. The changes have not been synced with %s yet"
-msgstr "You've just restored a backup. The changes have not been synced with %s yet"
+msgid ""
+"You've just restored a backup. The changes have not been synced with %s yet"
+msgstr ""
+"You've just restored a backup. The changes have not been synced with %s yet"
-#: ../src/gtk-ui/sync-ui.c:3120
+#: ../src/gtk-ui/sync-ui.c:3154
msgid "Waiting for current operation to finish..."
msgstr "Waiting for current operation to finish..."
#. TRANSLATORS: next strings are error messages.
-#: ../src/gtk-ui/sync-ui.c:3154
-msgid "A normal sync is not possible at this time. The server suggests a slow sync, but this might not always be what you want if both ends already have data."
-msgstr "A normal sync is not possible at this time. The server suggests a slow sync, but this might not always be what you want if both ends already have data."
+#: ../src/gtk-ui/sync-ui.c:3188
+msgid ""
+"A normal sync is not possible at this time. The server suggests a slow sync,"
+" but this might not always be what you want if both ends already have data."
+msgstr ""
+"A normal sync is not possible at this time. The server suggests a slow sync,"
+" but this might not always be what you want if both ends already have data."
-#: ../src/gtk-ui/sync-ui.c:3158
+#: ../src/gtk-ui/sync-ui.c:3192
msgid "The sync process died unexpectedly."
msgstr "The sync process died unexpectedly."
-#: ../src/gtk-ui/sync-ui.c:3163
-msgid "Password request was not answered. You can save the password in the settings to prevent the request."
-msgstr "Password request was not answered. You can save the password in the settings to prevent the request."
+#: ../src/gtk-ui/sync-ui.c:3197
+msgid ""
+"Password request was not answered. You can save the password in the settings"
+" to prevent the request."
+msgstr ""
+"Password request was not answered. You can save the password in the settings"
+" to prevent the request."
#. TODO use the service device name here, this is a remote problem
-#: ../src/gtk-ui/sync-ui.c:3167
+#: ../src/gtk-ui/sync-ui.c:3201
msgid "There was a problem processing sync request. Trying again may help."
msgstr "There was a problem processing sync request. Trying again may help."
-#: ../src/gtk-ui/sync-ui.c:3173
-msgid "Failed to login. Could there be a problem with your username or password?"
-msgstr "Failed to login. Could there be a problem with your username or password?"
+#: ../src/gtk-ui/sync-ui.c:3207
+msgid ""
+"Failed to login. Could there be a problem with your username or password?"
+msgstr ""
+"Failed to login. Could there be a problem with your username or password?"
-#: ../src/gtk-ui/sync-ui.c:3176
+#: ../src/gtk-ui/sync-ui.c:3210
msgid "Forbidden"
msgstr "Forbidden"
#. TRANSLATORS: data source means e.g. calendar or addressbook
-#: ../src/gtk-ui/sync-ui.c:3182
-msgid "A data source could not be found. Could there be a problem with the settings?"
-msgstr "A data source could not be found. Could there be a problem with the settings?"
+#: ../src/gtk-ui/sync-ui.c:3216
+msgid ""
+"A data source could not be found. Could there be a problem with the "
+"settings?"
+msgstr ""
+"A data source could not be found. Could there be a problem with the "
+"settings?"
-#: ../src/gtk-ui/sync-ui.c:3186
+#: ../src/gtk-ui/sync-ui.c:3220
msgid "Remote database error"
msgstr "Remote database error"
#. This can happen when EDS is borked, restart it may help...
-#: ../src/gtk-ui/sync-ui.c:3189
-msgid "There is a problem with the local database. Syncing again or rebooting may help."
-msgstr "There is a problem with the local database. Syncing again or rebooting may help."
+#: ../src/gtk-ui/sync-ui.c:3223
+msgid ""
+"There is a problem with the local database. Syncing again or rebooting may "
+"help."
+msgstr ""
+"There is a problem with the local database. Syncing again or rebooting may "
+"help."
-#: ../src/gtk-ui/sync-ui.c:3192
+#: ../src/gtk-ui/sync-ui.c:3226
msgid "No space on disk"
msgstr "No space on disk"
-#: ../src/gtk-ui/sync-ui.c:3194
+#: ../src/gtk-ui/sync-ui.c:3228
msgid "Failed to process SyncML"
msgstr "Failed to process SyncML"
-#: ../src/gtk-ui/sync-ui.c:3196
+#: ../src/gtk-ui/sync-ui.c:3230
msgid "Server authorization failed"
msgstr "Server authorisation failed"
-#: ../src/gtk-ui/sync-ui.c:3198
+#: ../src/gtk-ui/sync-ui.c:3232
msgid "Failed to parse configuration file"
msgstr "Failed to parse configuration file"
-#: ../src/gtk-ui/sync-ui.c:3200
+#: ../src/gtk-ui/sync-ui.c:3234
msgid "Failed to read configuration file"
msgstr "Failed to read configuration file"
-#: ../src/gtk-ui/sync-ui.c:3202
+#: ../src/gtk-ui/sync-ui.c:3236
msgid "No configuration found"
msgstr "No configuration found"
-#: ../src/gtk-ui/sync-ui.c:3204
+#: ../src/gtk-ui/sync-ui.c:3238
msgid "No configuration file found"
msgstr "No configuration file found"
-#: ../src/gtk-ui/sync-ui.c:3206
+#: ../src/gtk-ui/sync-ui.c:3240
msgid "Server sent bad content"
msgstr "Server sent bad content"
-#: ../src/gtk-ui/sync-ui.c:3208
+#: ../src/gtk-ui/sync-ui.c:3242
msgid "Connection certificate has expired"
msgstr "Connection certificate has expired"
-#: ../src/gtk-ui/sync-ui.c:3210
+#: ../src/gtk-ui/sync-ui.c:3244
msgid "Connection certificate is invalid"
msgstr "Connection certificate is invalid"
-#: ../src/gtk-ui/sync-ui.c:3218
-msgid "We were unable to connect to the server. The problem could be temporary or there could be something wrong with the settings."
-msgstr "We were unable to connect to the server. The problem could be temporary or there could be something wrong with the settings."
+#: ../src/gtk-ui/sync-ui.c:3252
+msgid ""
+"We were unable to connect to the server. The problem could be temporary or "
+"there could be something wrong with the settings."
+msgstr ""
+"We were unable to connect to the server. The problem could be temporary or "
+"there could be something wrong with the settings."
-#: ../src/gtk-ui/sync-ui.c:3225
+#: ../src/gtk-ui/sync-ui.c:3259
msgid "The server URL is bad"
msgstr "The server URL is bad"
-#: ../src/gtk-ui/sync-ui.c:3230
+#: ../src/gtk-ui/sync-ui.c:3264
msgid "The server was not found"
msgstr "The server was not found"
-#: ../src/gtk-ui/sync-ui.c:3232
+#: ../src/gtk-ui/sync-ui.c:3266
#, c-format
msgid "Error %d"
msgstr "Error %d"
#. TRANSLATORS: password request dialog contents: title, cancel button
#. * and ok button
-#: ../src/gtk-ui/sync-ui.c:3370
+#: ../src/gtk-ui/sync-ui.c:3404
msgid "Password is required for sync"
msgstr "Password is required for sync"
-#: ../src/gtk-ui/sync-ui.c:3374
+#: ../src/gtk-ui/sync-ui.c:3408
msgid "Sync with password"
msgstr "Sync with password"
#. TRANSLATORS: password request dialog message, placeholder is service name
-#: ../src/gtk-ui/sync-ui.c:3384
+#: ../src/gtk-ui/sync-ui.c:3418
#, c-format
msgid "Please enter password for syncing with %s:"
msgstr "Please enter password for syncing with %s:"
@@ -557,14 +606,19 @@ msgstr "Add new service"
#. explanation of "Restore backup" function
#: ../src/gtk-ui/ui.glade.h:18
-msgid "Backups are made before every time we Sync. Choose a backup to restore. Any changes you have made since then will be lost."
-msgstr "Backups are made before every time we Sync. Choose a backup to restore. Any changes you have made since then will be lost."
+msgid ""
+"Backups are made before every time we Sync. Choose a backup to restore. Any "
+"changes you have made since then will be lost."
+msgstr ""
+"Backups are made before every time we Sync. Choose a backup to restore. Any "
+"changes you have made since then will be lost."
#: ../src/gtk-ui/ui.glade.h:19
msgid "Calendar"
msgstr "Calendar"
-#. Button in main view, right side. Keep to below 20 chars per line, feel free to use two lines
+#. Button in main view, right side. Keep to below 20 chars per line, feel free
+#. to use two lines
#: ../src/gtk-ui/ui.glade.h:21
msgid ""
"Change or edit\n"
@@ -598,7 +652,8 @@ msgstr ""
"information and replace\n"
"with data from Zyb"
-#. button in main view, right side. Keep length to 20 characters or so, use two lines if needed
+#. button in main view, right side. Keep length to 20 characters or so, use
+#. two lines if needed
#: ../src/gtk-ui/ui.glade.h:32
msgid ""
"Fix a sync\n"
@@ -640,87 +695,125 @@ msgid "You will need to add Bluetooth devices before they can be synced."
msgstr "You will need to add Bluetooth devices before they can be synced."
#: ../src/gtk-ui/sync.desktop.in.h:2
-#: ../src/gtk-ui/sync-gtk.desktop.in.h:2
msgid "Up to date"
msgstr "Up to date"
#: ../src/gtk-ui/sync-gtk.desktop.in.h:1
-msgid "Sync (GTK)"
-msgstr "Sync (GTK)"
+msgid "SyncEvolution (GTK)"
+msgstr "SyncEvolution (GTK)"
-#: ../src/gtk-ui/sync-config-widget.c:78
-msgid "ScheduleWorld enables you to keep your contacts, events, tasks, and notes in sync."
-msgstr "ScheduleWorld enables you to keep your contacts, events, tasks, and notes in sync."
+#: ../src/gtk-ui/sync-gtk.desktop.in.h:2
+msgid "Synchronize PIM data"
+msgstr "Synchronize PIM data"
-#: ../src/gtk-ui/sync-config-widget.c:81
-msgid "Google Sync can back up and synchronize your contacts with your Gmail contacts."
-msgstr "Google Sync can back up and synchronise your contacts with your Gmail contacts."
+#: ../src/gtk-ui/sync-config-widget.c:88
+msgid ""
+"ScheduleWorld enables you to keep your contacts, events, tasks, and notes in"
+" sync."
+msgstr ""
+"ScheduleWorld enables you to keep your contacts, events, tasks, and notes in"
+" sync."
+
+#: ../src/gtk-ui/sync-config-widget.c:91
+msgid ""
+"Google Sync can back up and synchronize your contacts with your Gmail "
+"contacts."
+msgstr ""
+"Google Sync can back up and synchronise your contacts with your Gmail "
+"contacts."
#. TRANSLATORS: Please include the word "demo" (or the equivalent in
#. your language): Funambol is going to be a 90 day demo service
#. in the future
-#: ../src/gtk-ui/sync-config-widget.c:87
-msgid "Back up your contacts and calendar. Sync with a single click, anytime, anywhere (DEMO)."
-msgstr "Back up your contacts and calendar. Sync with a single click, anytime, anywhere (DEMO)."
+#: ../src/gtk-ui/sync-config-widget.c:97
+msgid ""
+"Back up your contacts and calendar. Sync with a single click, anytime, "
+"anywhere (DEMO)."
+msgstr ""
+"Back up your contacts and calendar. Sync with a single click, anytime, "
+"anywhere (DEMO)."
-#: ../src/gtk-ui/sync-config-widget.c:90
-msgid "Mobical Backup and Restore service allows you to securely back up your personal mobile data for free."
-msgstr "Mobical Backup and Restore service allows you to securely back up your personal mobile data for free."
+#: ../src/gtk-ui/sync-config-widget.c:100
+msgid ""
+"Mobical Backup and Restore service allows you to securely back up your "
+"personal mobile data for free."
+msgstr ""
+"Mobical Backup and Restore service allows you to securely back up your "
+"personal mobile data for free."
-#: ../src/gtk-ui/sync-config-widget.c:93
-msgid "ZYB is a simple way for people to store and share mobile information online."
-msgstr "ZYB is a simple way for people to store and share mobile information online."
+#: ../src/gtk-ui/sync-config-widget.c:103
+msgid ""
+"ZYB is a simple way for people to store and share mobile information online."
+msgstr ""
+"ZYB is a simple way for people to store and share mobile information online."
-#: ../src/gtk-ui/sync-config-widget.c:96
-msgid "Memotoo lets you access your personal data from any computer connected to the Internet."
-msgstr "Memotoo lets you access your personal data from any computer connected to the Internet."
+#: ../src/gtk-ui/sync-config-widget.c:106
+msgid ""
+"Memotoo lets you access your personal data from any computer connected to "
+"the Internet."
+msgstr ""
+"Memotoo lets you access your personal data from any computer connected to "
+"the Internet."
-#: ../src/gtk-ui/sync-config-widget.c:192
+#: ../src/gtk-ui/sync-config-widget.c:195
msgid "Sorry, failed to save the configuration"
msgstr "Sorry, failed to save the configuration"
-#: ../src/gtk-ui/sync-config-widget.c:381
+#: ../src/gtk-ui/sync-config-widget.c:445
msgid "Service must have a name and server URL"
msgstr "Service must have a name and server URL"
-#: ../src/gtk-ui/sync-config-widget.c:422
+#. TRANSLATORS: error dialog when creating a new sync configuration
+#: ../src/gtk-ui/sync-config-widget.c:451
+msgid "A username is required for this service"
+msgstr "A username is required for this service"
+
+#: ../src/gtk-ui/sync-config-widget.c:493
#, c-format
-msgid "Do you want to reset the settings for %s? This will not remove any synced information on either end."
-msgstr "Do you want to reset the settings for %s? This will not remove any synced information on either end."
+msgid ""
+"Do you want to reset the settings for %s? This will not remove any synced "
+"information on either end."
+msgstr ""
+"Do you want to reset the settings for %s? This will not remove any synced "
+"information on either end."
#. TRANSLATORS: buttons in reset-service warning dialog
-#: ../src/gtk-ui/sync-config-widget.c:426
+#: ../src/gtk-ui/sync-config-widget.c:497
msgid "Yes, reset"
msgstr "Yes, reset"
-#: ../src/gtk-ui/sync-config-widget.c:427
-#: ../src/gtk-ui/sync-config-widget.c:438
+#: ../src/gtk-ui/sync-config-widget.c:498
+#: ../src/gtk-ui/sync-config-widget.c:509
msgid "No, keep settings"
msgstr "No, keep settings"
-#: ../src/gtk-ui/sync-config-widget.c:432
+#: ../src/gtk-ui/sync-config-widget.c:503
#, c-format
-msgid "Do you want to delete the settings for %s? This will not remove any synced information on either end but it will remove these settings."
-msgstr "Do you want to delete the settings for %s? This will not remove any synced information on either end but it will remove these settings."
+msgid ""
+"Do you want to delete the settings for %s? This will not remove any synced "
+"information on either end but it will remove these settings."
+msgstr ""
+"Do you want to delete the settings for %s? This will not remove any synced "
+"information on either end but it will remove these settings."
#. TRANSLATORS: buttons in delete-service warning dialog
-#: ../src/gtk-ui/sync-config-widget.c:437
+#: ../src/gtk-ui/sync-config-widget.c:508
msgid "Yes, delete"
msgstr "Yes, delete"
-#: ../src/gtk-ui/sync-config-widget.c:467
+#: ../src/gtk-ui/sync-config-widget.c:539
msgid "Reset settings"
msgstr "Reset settings"
-#: ../src/gtk-ui/sync-config-widget.c:470
+#: ../src/gtk-ui/sync-config-widget.c:542
msgid "Delete settings"
msgstr "Delete settings"
-#: ../src/gtk-ui/sync-config-widget.c:480
+#: ../src/gtk-ui/sync-config-widget.c:552
msgid "Save and use"
msgstr "Save and use"
-#: ../src/gtk-ui/sync-config-widget.c:483
+#: ../src/gtk-ui/sync-config-widget.c:555
msgid ""
"Save and replace\n"
"current service"
@@ -728,101 +821,118 @@ msgstr ""
"Save and replace\n"
"current service"
-#: ../src/gtk-ui/sync-config-widget.c:493
+#: ../src/gtk-ui/sync-config-widget.c:563
msgid "Stop using device"
msgstr "Stop using device"
-#: ../src/gtk-ui/sync-config-widget.c:496
+#: ../src/gtk-ui/sync-config-widget.c:566
msgid "Stop using service"
msgstr "Stop using service"
#. TRANSLATORS: label for an entry in service configuration form.
#. * Placeholder is a source name.
#. * Example: "Appointments URI"
-#: ../src/gtk-ui/sync-config-widget.c:679
+#: ../src/gtk-ui/sync-config-widget.c:749
#, c-format
msgid "%s URI"
msgstr "%s URI"
#. TRANSLATORS: toggles in service configuration form, placeholder is service
#. * or device name
-#: ../src/gtk-ui/sync-config-widget.c:854
+#: ../src/gtk-ui/sync-config-widget.c:936
#, c-format
msgid "Send changes to %s"
msgstr "Send changes to %s"
-#: ../src/gtk-ui/sync-config-widget.c:859
+#: ../src/gtk-ui/sync-config-widget.c:941
#, c-format
msgid "Receive changes from %s"
msgstr "Receive changes from %s"
-#: ../src/gtk-ui/sync-config-widget.c:875
+#: ../src/gtk-ui/sync-config-widget.c:957
msgid "<b>Sync</b>"
msgstr "<b>Sync</b>"
#. TRANSLATORS: label of a entry in service configuration
-#: ../src/gtk-ui/sync-config-widget.c:891
+#: ../src/gtk-ui/sync-config-widget.c:973
msgid "Server address"
msgstr "Server address"
#. TRANSLATORS: explanation before a device template combobox.
#. * Placeholder is a device name like 'Nokia N85' or 'Syncevolution
#. * Client'
-#: ../src/gtk-ui/sync-config-widget.c:967
+#: ../src/gtk-ui/sync-config-widget.c:1049
#, c-format
-msgid "This device looks like it might be a '%s'. If this is not correct, please take a look at the list of supported devices and pick yours if it is listed"
-msgstr "This device looks like it might be a '%s'. If this is not correct, please take a look at the list of supported devices and pick yours if it is listed"
+msgid ""
+"This device looks like it might be a '%s'. If this is not correct, please "
+"take a look at the list of supported devices and pick yours if it is listed"
+msgstr ""
+"This device looks like it might be a '%s'. If this is not correct, please "
+"take a look at the list of supported devices and pick yours if it is listed"
-#: ../src/gtk-ui/sync-config-widget.c:973
-msgid "We don't know what this device is exactly. Please take a look at the list of supported devices and pick yours if it is listed"
-msgstr "We don't know what this device is exactly. Please take a look at the list of supported devices and pick yours if it is listed"
+#: ../src/gtk-ui/sync-config-widget.c:1055
+#: ../src/gtk-ui/sync-config-widget.c:1915
+msgid ""
+"We don't know what this device is exactly. Please take a look at the list of"
+" supported devices and pick yours if it is listed"
+msgstr ""
+"We don't know what this device is exactly. Please take a look at the list of"
+" supported devices and pick yours if it is listed"
-#: ../src/gtk-ui/sync-config-widget.c:1126
+#: ../src/gtk-ui/sync-config-widget.c:1207
#, c-format
msgid "%s - Bluetooth device"
msgstr "%s - Bluetooth device"
#. TRANSLATORS: service title for services that are not based on a
#. * template in service list, the placeholder is the name of the service
-#: ../src/gtk-ui/sync-config-widget.c:1132
+#: ../src/gtk-ui/sync-config-widget.c:1213
#, c-format
msgid "%s - manually setup"
msgstr "%s - manually setup"
#. TRANSLATORS: link button in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1807
+#: ../src/gtk-ui/sync-config-widget.c:1886
msgid "Launch website"
msgstr "Launch website"
#. TRANSLATORS: button in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1816
+#: ../src/gtk-ui/sync-config-widget.c:1895
msgid "Set up now"
msgstr "Set up now"
+#: ../src/gtk-ui/sync-config-widget.c:1953
+msgid "Use these settings"
+msgstr "Use these settings"
+
#. TRANSLATORS: labels of entries in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1912
+#: ../src/gtk-ui/sync-config-widget.c:1991
msgid "Username"
msgstr "Username"
-#: ../src/gtk-ui/sync-config-widget.c:1927
+#: ../src/gtk-ui/sync-config-widget.c:2006
msgid "Password"
msgstr "Password"
#. TRANSLATORS: warning in service configuration form for people
#. who have modified the configuration via other means.
-#: ../src/gtk-ui/sync-config-widget.c:1950
-msgid "Current configuration is more complex than what can be shown here. Changes to sync mode or synced data types will overwrite that configuration."
-msgstr "Current configuration is more complex than what can be shown here. Changes to sync mode or synced data types will overwrite that configuration."
+#: ../src/gtk-ui/sync-config-widget.c:2029
+msgid ""
+"Current configuration is more complex than what can be shown here. Changes "
+"to sync mode or synced data types will overwrite that configuration."
+msgstr ""
+"Current configuration is more complex than what can be shown here. Changes "
+"to sync mode or synced data types will overwrite that configuration."
#. TRANSLATORS: this is the epander label for server settings
#. in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1969
+#: ../src/gtk-ui/sync-config-widget.c:2048
msgid "Hide server settings"
msgstr "Hide server settings"
#. TRANSLATORS: this is the epander label for server settings
#. in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1989
+#: ../src/gtk-ui/sync-config-widget.c:2068
msgid "Show server settings"
msgstr "Show server settings"
@@ -830,44 +940,46 @@ msgstr "Show server settings"
msgid "Sync in the Sync application"
msgstr "Sync in the Sync application"
-#: ../src/syncevo-dbus-server.cpp:5664
+#: ../src/syncevo-dbus-server.cpp:6653
#, c-format
msgid "%s is syncing"
msgstr "%s is syncing"
-#: ../src/syncevo-dbus-server.cpp:5665
+#: ../src/syncevo-dbus-server.cpp:6654
#, c-format
msgid "We have just started to sync your computer with the %s sync service."
msgstr "We have just started to sync your computer with the %s sync service."
#. if sync is successfully started and done
-#: ../src/syncevo-dbus-server.cpp:5679
+#: ../src/syncevo-dbus-server.cpp:6670
#, c-format
msgid "%s sync complete"
msgstr "%s sync complete"
-#: ../src/syncevo-dbus-server.cpp:5680
+#: ../src/syncevo-dbus-server.cpp:6671
#, c-format
msgid "We have just finished syncing your computer with the %s sync service."
msgstr "We have just finished syncing your computer with the %s sync service."
-#. if sync is successfully started and has errors, or not started successful with a fatal problem
-#: ../src/syncevo-dbus-server.cpp:5685
+#. if sync is successfully started and has errors, or not started successful
+#. with a fatal problem
+#: ../src/syncevo-dbus-server.cpp:6676
msgid "Sync problem."
msgstr "Sync problem."
-#: ../src/syncevo-dbus-server.cpp:5686
+#: ../src/syncevo-dbus-server.cpp:6677
msgid "Sorry, there's a problem with your sync that you need to attend to."
msgstr "Sorry, there's a problem with your sync that you need to attend to."
-#: ../src/syncevo-dbus-server.cpp:5759
+#: ../src/syncevo-dbus-server.cpp:6758
msgid "View"
msgstr "View"
#. Use "default" as ID because that is what mutter-moblin
#. recognizes: it then skips the action instead of adding it
#. in addition to its own "Dismiss" button (always added).
-#: ../src/syncevo-dbus-server.cpp:5763
+#: ../src/syncevo-dbus-server.cpp:6762
msgid "Dismiss"
msgstr "Dismiss"
+
diff --git a/po/en_US.po b/po/en_US.po
new file mode 100644
index 00000000..051b1136
--- /dev/null
+++ b/po/en_US.po
@@ -0,0 +1,985 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# Margie Foster <margie@linux.intel.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: syncevolution\n"
+"Report-Msgid-Bugs-To: https://bugs.meego.com/\n"
+"POT-Creation-Date: 2011-12-05 10:21-0800\n"
+"PO-Revision-Date: 2011-12-05 22:05+0000\n"
+"Last-Translator: margie <margie@linux.intel.com>\n"
+"Language-Team: English (United States) (http://www.transifex.net/projects/p/meego/team/en_US/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_US\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#. TRANSLATORS: this is the application name that may be used by e.g.
+#. the windowmanager
+#: ../src/gtk-ui/main.c:40 ../src/gtk-ui/ui.glade.h:38
+#: ../src/gtk-ui/sync.desktop.in.h:1
+#: ../src/gnome-bluetooth/syncevolution.c:112
+msgid "Sync"
+msgstr "Sync"
+
+#: ../src/gtk-ui/sync-ui.c:266
+msgid "Contacts"
+msgstr "Contacts"
+
+#: ../src/gtk-ui/sync-ui.c:268
+msgid "Appointments"
+msgstr "Appointments"
+
+#: ../src/gtk-ui/sync-ui.c:270 ../src/gtk-ui/ui.glade.h:40
+msgid "Tasks"
+msgstr "Tasks"
+
+#: ../src/gtk-ui/sync-ui.c:272
+msgid "Notes"
+msgstr "Notes"
+
+#. TRANSLATORS: This is a "combination source" for syncing with devices
+#. * that combine appointments and tasks. the name should match the ones
+#. * used for calendar and todo above
+#: ../src/gtk-ui/sync-ui.c:277
+msgid "Appointments & Tasks"
+msgstr "Appointments & Tasks"
+
+#: ../src/gtk-ui/sync-ui.c:349
+msgid "Starting sync"
+msgstr "Starting sync"
+
+#. TRANSLATORS: slow sync confirmation dialog message. Placeholder
+#. * is service/device name
+#: ../src/gtk-ui/sync-ui.c:387
+#, c-format
+msgid "Do you want to slow sync with %s?"
+msgstr "Do you want to slow sync with %s?"
+
+#: ../src/gtk-ui/sync-ui.c:391
+msgid "Yes, do slow sync"
+msgstr "Yes, do slow sync"
+
+#: ../src/gtk-ui/sync-ui.c:391
+msgid "No, cancel sync"
+msgstr "No, cancel sync"
+
+#. TRANSLATORS: confirmation dialog for "refresh from peer". Placeholder
+#. * is service/device name
+#: ../src/gtk-ui/sync-ui.c:424
+#, c-format
+msgid ""
+"Do you want to delete all local data and replace it with data from %s? This "
+"is not usually advised."
+msgstr ""
+"Do you want to delete all local data and replace it with data from %s? This "
+"is not usually advised."
+
+#: ../src/gtk-ui/sync-ui.c:429 ../src/gtk-ui/sync-ui.c:462
+msgid "Yes, delete and replace"
+msgstr "Yes, delete and replace"
+
+#: ../src/gtk-ui/sync-ui.c:429 ../src/gtk-ui/sync-ui.c:462
+#: ../src/gtk-ui/sync-ui.c:1610
+msgid "No"
+msgstr "No"
+
+#. TRANSLATORS: confirmation dialog for "refresh from local side". Placeholder
+#. * is service/device name
+#: ../src/gtk-ui/sync-ui.c:457
+#, c-format
+msgid ""
+"Do you want to delete all data in %s and replace it with your local data? "
+"This is not usually advised."
+msgstr ""
+"Do you want to delete all data in %s and replace it with your local data? "
+"This is not usually advised."
+
+#: ../src/gtk-ui/sync-ui.c:491
+msgid "Trying to cancel sync"
+msgstr "Trying to cancel sync"
+
+#: ../src/gtk-ui/sync-ui.c:533
+msgid "No service or device selected"
+msgstr "No service or device selected"
+
+#. TRANSLATORS: This is the title on main view. Placeholder is
+#. * the service name. Example: "Google - synced just now"
+#: ../src/gtk-ui/sync-ui.c:541
+#, c-format
+msgid "%s - synced just now"
+msgstr "%s - synced just now"
+
+#: ../src/gtk-ui/sync-ui.c:545
+#, c-format
+msgid "%s - synced a minute ago"
+msgstr "%s - synced a minute ago"
+
+#: ../src/gtk-ui/sync-ui.c:549
+#, c-format
+msgid "%s - synced %ld minutes ago"
+msgstr "%s - synced %ld minutes ago"
+
+#: ../src/gtk-ui/sync-ui.c:554
+#, c-format
+msgid "%s - synced an hour ago"
+msgstr "%s - synced an hour ago"
+
+#: ../src/gtk-ui/sync-ui.c:558
+#, c-format
+msgid "%s - synced %ld hours ago"
+msgstr "%s - synced %ld hours ago"
+
+#: ../src/gtk-ui/sync-ui.c:563
+#, c-format
+msgid "%s - synced a day ago"
+msgstr "%s - synced a day ago"
+
+#: ../src/gtk-ui/sync-ui.c:567
+#, c-format
+msgid "%s - synced %ld days ago"
+msgstr "%s - synced %ld days ago"
+
+#. TRANSLATORS: Action button in info bar in main view. Shown with e.g.
+#. * "You've just restored a backup. The changes have not been "
+#. * "synced with %s yet"
+#: ../src/gtk-ui/sync-ui.c:616 ../src/gtk-ui/sync-ui.c:701
+msgid "Sync now"
+msgstr "Sync now"
+
+#. TRANSLATORS: Action button in info bar in main view. Shown with e.g.
+#. * "A normal sync is not possible at this time..." message.
+#. * "Other options" will open Emergency view
+#: ../src/gtk-ui/sync-ui.c:622 ../src/gtk-ui/ui.glade.h:37
+msgid "Slow sync"
+msgstr "Slow sync"
+
+#: ../src/gtk-ui/sync-ui.c:623
+msgid "Other options..."
+msgstr "Other options..."
+
+#. TRANSLATORS: Action button in info bar in main view. Shown e.g.
+#. * when no service is selected. Will open configuration view
+#: ../src/gtk-ui/sync-ui.c:628
+msgid "Select sync service"
+msgstr "Select sync service"
+
+#. TRANSLATORS: Action button in info bar in main view. Shown e.g.
+#. * login to service fails. Will open configuration view for this service
+#: ../src/gtk-ui/sync-ui.c:633
+msgid "Edit service settings"
+msgstr "Edit service settings"
+
+#: ../src/gtk-ui/sync-ui.c:709
+msgid ""
+"You haven't selected a sync service or device yet. Sync services let you "
+"synchronize your data between your netbook and a web service. You can also "
+"sync directly with some devices."
+msgstr ""
+"You haven't selected a sync service or device yet. Sync services let you "
+"synchronize your data between your netbook and a web service. You can also "
+"sync directly with some devices."
+
+#: ../src/gtk-ui/sync-ui.c:729
+msgid "Sync again"
+msgstr "Sync again"
+
+#: ../src/gtk-ui/sync-ui.c:748
+msgid "Restoring"
+msgstr "Restoring"
+
+#: ../src/gtk-ui/sync-ui.c:750
+msgid "Syncing"
+msgstr "Syncing"
+
+#. TRANSLATORS: This is for the button in main view, right side.
+#. Keep line length below ~20 characters, use two lines if needed
+#: ../src/gtk-ui/sync-ui.c:762 ../src/gtk-ui/sync-ui.c:3407
+msgid "Cancel sync"
+msgstr "Cancel sync"
+
+#: ../src/gtk-ui/sync-ui.c:927
+msgid "Back to sync"
+msgstr "Back to sync"
+
+#. TRANSLATORS: label for checkbutton/toggle in main view.
+#. * Please stick to similar length strings or break the line with
+#. * "\n" if absolutely needed
+#: ../src/gtk-ui/sync-ui.c:1229
+msgid "Automatic sync"
+msgstr "Automatic sync"
+
+#. This is the expander label in emergency view. It summarizes the
+#. * currently selected data sources. First placeholder is service/device
+#. * name, second a comma separeted list of sources.
+#. * E.g. "Affected data: Google Contacts, Appointments"
+#: ../src/gtk-ui/sync-ui.c:1524
+#, c-format
+msgid "Affected data: %s %s"
+msgstr "Affected data: %s %s"
+
+#: ../src/gtk-ui/sync-ui.c:1529
+#, c-format
+msgid "Affected data: none"
+msgstr "Affected data: none"
+
+#. TRANSLATORS: confirmation for restoring a backup. placeholder is the
+#. * backup time string defined below
+#: ../src/gtk-ui/sync-ui.c:1607
+#, c-format
+msgid ""
+"Do you want to restore the backup from %s? All changes you have made since "
+"then will be lost."
+msgstr ""
+"Do you want to restore the backup from %s? All changes you have made since "
+"then will be lost."
+
+#: ../src/gtk-ui/sync-ui.c:1610
+msgid "Yes, restore"
+msgstr "Yes, restore"
+
+#. TRANSLATORS: date/time for strftime(), used in emergency view backup
+#. * label. Any time format that shows date and time is good.
+#: ../src/gtk-ui/sync-ui.c:1642
+#, c-format
+msgid "%x %X"
+msgstr "%x %X"
+
+#. TRANSLATORS: label for a backup in emergency view. Placeholder is
+#. * service or device name
+#: ../src/gtk-ui/sync-ui.c:1661
+#, c-format
+msgid "Backed up before syncing with %s"
+msgstr "Backed up before syncing with %s"
+
+#: ../src/gtk-ui/sync-ui.c:1678
+msgid "Restore"
+msgstr "Restore"
+
+#. TRANSLATORS: this is an explanation in Emergency view.
+#. * Placeholder is a service/device name
+#: ../src/gtk-ui/sync-ui.c:1785
+#, c-format
+msgid ""
+"A normal sync with %s is not possible at this time. You can do a slow two-"
+"way sync or start from scratch. You can also restore a backup, but a slow "
+"sync or starting from scratch will still be required before normal sync is "
+"possible."
+msgstr ""
+"A normal sync with %s is not possible at this time. You can do a slow two-"
+"way sync or start from scratch. You can also restore a backup, but a slow "
+"sync or starting from scratch will still be required before normal sync is "
+"possible."
+
+#: ../src/gtk-ui/sync-ui.c:1795
+#, c-format
+msgid ""
+"If something has gone horribly wrong, you can try a slow sync, start from "
+"scratch or restore from backup."
+msgstr ""
+"If something has gone horribly wrong, you can try a slow sync, start from "
+"scratch or restore from backup."
+
+#. TRANSLATORS: These are a buttons in Emergency view. Placeholder is a
+#. * service/device name. Please don't use too long lines, but feel free to
+#. * use several lines.
+#: ../src/gtk-ui/sync-ui.c:1804
+#, c-format
+msgid ""
+"Delete all your local\n"
+"data and replace with\n"
+"data from %s"
+msgstr ""
+"Delete all your local\n"
+"data and replace with\n"
+"data from %s"
+
+#: ../src/gtk-ui/sync-ui.c:1810
+#, c-format
+msgid ""
+"Delete all data on\n"
+"%s and replace\n"
+"with your local data"
+msgstr ""
+"Delete all data on\n"
+"%s and replace\n"
+"with your local data"
+
+#: ../src/gtk-ui/sync-ui.c:2275
+msgid "Failed to get list of supported services from SyncEvolution"
+msgstr "Failed to get list of supported services from SyncEvolution"
+
+#: ../src/gtk-ui/sync-ui.c:2329
+msgid ""
+"There was a problem communicating with the sync process. Please try again "
+"later."
+msgstr ""
+"There was a problem communicating with the sync process. Please try again "
+"later."
+
+#: ../src/gtk-ui/sync-ui.c:2388
+msgid "Restore failed"
+msgstr "Restore failed"
+
+#: ../src/gtk-ui/sync-ui.c:2391 ../src/gtk-ui/sync-ui.c:3276
+msgid "Sync failed"
+msgstr "Sync failed"
+
+#: ../src/gtk-ui/sync-ui.c:2397
+msgid "Restore complete"
+msgstr "Restore complete"
+
+#: ../src/gtk-ui/sync-ui.c:2400
+msgid "Sync complete"
+msgstr "Sync complete"
+
+#: ../src/gtk-ui/sync-ui.c:2492
+#, c-format
+msgid "Preparing '%s'"
+msgstr "Preparing '%s'"
+
+#: ../src/gtk-ui/sync-ui.c:2495
+#, c-format
+msgid "Receiving '%s'"
+msgstr "Receiving '%s'"
+
+#: ../src/gtk-ui/sync-ui.c:2498
+#, c-format
+msgid "Sending '%s'"
+msgstr "Sending '%s'"
+
+#: ../src/gtk-ui/sync-ui.c:2619
+#, c-format
+msgid "There was one remote rejection."
+msgid_plural "There were %ld remote rejections."
+msgstr[0] "There was one remote rejection."
+msgstr[1] "There were %ld remote rejections."
+
+#: ../src/gtk-ui/sync-ui.c:2624
+#, c-format
+msgid "There was one local rejection."
+msgid_plural "There were %ld local rejections."
+msgstr[0] "There was one local rejection."
+msgstr[1] "There were %ld local rejections."
+
+#: ../src/gtk-ui/sync-ui.c:2629
+#, c-format
+msgid "There were %ld local rejections and %ld remote rejections."
+msgstr "There were %ld local rejections and %ld remote rejections."
+
+#: ../src/gtk-ui/sync-ui.c:2634
+#, c-format
+msgid "Last time: No changes."
+msgstr "Last time: No changes."
+
+#: ../src/gtk-ui/sync-ui.c:2636
+#, c-format
+msgid "Last time: Sent one change."
+msgid_plural "Last time: Sent %ld changes."
+msgstr[0] "Last time: Sent one change."
+msgstr[1] "Last time: Sent %ld changes."
+
+#. This is about changes made to the local data. Not all of these
+#. changes were requested by the remote server, so "applied"
+#. is a better word than "received" (bug #5185).
+#: ../src/gtk-ui/sync-ui.c:2644
+#, c-format
+msgid "Last time: Applied one change."
+msgid_plural "Last time: Applied %ld changes."
+msgstr[0] "Last time: Applied one change."
+msgstr[1] "Last time: Applied %ld changes."
+
+#: ../src/gtk-ui/sync-ui.c:2649
+#, c-format
+msgid "Last time: Applied %ld changes and sent %ld changes."
+msgstr "Last time: Applied %ld changes and sent %ld changes."
+
+#. TRANSLATORS: the placeholder is a error message (hopefully)
+#. * explaining the problem
+#: ../src/gtk-ui/sync-ui.c:2856
+#, c-format
+msgid ""
+"There was a problem with last sync:\n"
+"%s"
+msgstr ""
+"There was a problem with last sync:\n"
+"%s"
+
+#: ../src/gtk-ui/sync-ui.c:2866
+#, c-format
+msgid ""
+"You've just restored a backup. The changes have not been synced with %s yet"
+msgstr ""
+"You've just restored a backup. The changes have not been synced with %s yet"
+
+#: ../src/gtk-ui/sync-ui.c:3154
+msgid "Waiting for current operation to finish..."
+msgstr "Waiting for current operation to finish..."
+
+#. TRANSLATORS: next strings are error messages.
+#: ../src/gtk-ui/sync-ui.c:3188
+msgid ""
+"A normal sync is not possible at this time. The server suggests a slow sync,"
+" but this might not always be what you want if both ends already have data."
+msgstr ""
+"A normal sync is not possible at this time. The server suggests a slow sync,"
+" but this might not always be what you want if both ends already have data."
+
+#: ../src/gtk-ui/sync-ui.c:3192
+msgid "The sync process died unexpectedly."
+msgstr "The sync process died unexpectedly."
+
+#: ../src/gtk-ui/sync-ui.c:3197
+msgid ""
+"Password request was not answered. You can save the password in the settings"
+" to prevent the request."
+msgstr ""
+"Password request was not answered. You can save the password in the settings"
+" to prevent the request."
+
+#. TODO use the service device name here, this is a remote problem
+#: ../src/gtk-ui/sync-ui.c:3201
+msgid "There was a problem processing sync request. Trying again may help."
+msgstr "There was a problem processing sync request. Trying again may help."
+
+#: ../src/gtk-ui/sync-ui.c:3207
+msgid ""
+"Failed to login. Could there be a problem with your username or password?"
+msgstr ""
+"Failed to log in. Could there be a problem with your username or password?"
+
+#: ../src/gtk-ui/sync-ui.c:3210
+msgid "Forbidden"
+msgstr "Forbidden"
+
+#. TRANSLATORS: data source means e.g. calendar or addressbook
+#: ../src/gtk-ui/sync-ui.c:3216
+msgid ""
+"A data source could not be found. Could there be a problem with the "
+"settings?"
+msgstr ""
+"A data source could not be found. Could there be a problem with the "
+"settings?"
+
+#: ../src/gtk-ui/sync-ui.c:3220
+msgid "Remote database error"
+msgstr "Remote database error"
+
+#. This can happen when EDS is borked, restart it may help...
+#: ../src/gtk-ui/sync-ui.c:3223
+msgid ""
+"There is a problem with the local database. Syncing again or rebooting may "
+"help."
+msgstr ""
+"There is a problem with the local database. Syncing again or rebooting may "
+"help."
+
+#: ../src/gtk-ui/sync-ui.c:3226
+msgid "No space on disk"
+msgstr "No space on disk"
+
+#: ../src/gtk-ui/sync-ui.c:3228
+msgid "Failed to process SyncML"
+msgstr "Failed to process SyncML"
+
+#: ../src/gtk-ui/sync-ui.c:3230
+msgid "Server authorization failed"
+msgstr "Server authorization failed"
+
+#: ../src/gtk-ui/sync-ui.c:3232
+msgid "Failed to parse configuration file"
+msgstr "Failed to parse configuration file"
+
+#: ../src/gtk-ui/sync-ui.c:3234
+msgid "Failed to read configuration file"
+msgstr "Failed to read configuration file"
+
+#: ../src/gtk-ui/sync-ui.c:3236
+msgid "No configuration found"
+msgstr "No configuration found"
+
+#: ../src/gtk-ui/sync-ui.c:3238
+msgid "No configuration file found"
+msgstr "No configuration file found"
+
+#: ../src/gtk-ui/sync-ui.c:3240
+msgid "Server sent bad content"
+msgstr "Server sent bad content"
+
+#: ../src/gtk-ui/sync-ui.c:3242
+msgid "Connection certificate has expired"
+msgstr "Connection certificate has expired"
+
+#: ../src/gtk-ui/sync-ui.c:3244
+msgid "Connection certificate is invalid"
+msgstr "Connection certificate is invalid"
+
+#: ../src/gtk-ui/sync-ui.c:3252
+msgid ""
+"We were unable to connect to the server. The problem could be temporary or "
+"there could be something wrong with the settings."
+msgstr ""
+"We were unable to connect to the server. The problem could be temporary or "
+"there could be something wrong with the settings."
+
+#: ../src/gtk-ui/sync-ui.c:3259
+msgid "The server URL is bad"
+msgstr "The server URL is bad"
+
+#: ../src/gtk-ui/sync-ui.c:3264
+msgid "The server was not found"
+msgstr "The server was not found"
+
+#: ../src/gtk-ui/sync-ui.c:3266
+#, c-format
+msgid "Error %d"
+msgstr "Error %d"
+
+#. TRANSLATORS: password request dialog contents: title, cancel button
+#. * and ok button
+#: ../src/gtk-ui/sync-ui.c:3404
+msgid "Password is required for sync"
+msgstr "Password is required for sync"
+
+#: ../src/gtk-ui/sync-ui.c:3408
+msgid "Sync with password"
+msgstr "Sync with password"
+
+#. TRANSLATORS: password request dialog message, placeholder is service name
+#: ../src/gtk-ui/sync-ui.c:3418
+#, c-format
+msgid "Please enter password for syncing with %s:"
+msgstr "Please enter password for syncing with %s:"
+
+#. title for the buttons on the right side of main view
+#: ../src/gtk-ui/ui.glade.h:2
+msgid "<b>Actions</b>"
+msgstr "<b>Actions</b>"
+
+#. text between the two "start from scratch" buttons in emergency view
+#: ../src/gtk-ui/ui.glade.h:4
+msgid "<b>or</b>"
+msgstr "<b>or</b>"
+
+#: ../src/gtk-ui/ui.glade.h:5
+msgid "<big>Direct sync</big>"
+msgstr "<big>Direct sync</big>"
+
+#: ../src/gtk-ui/ui.glade.h:6
+msgid "<big>Network sync</big>"
+msgstr "<big>Network sync</big>"
+
+#. a title in emergency view
+#: ../src/gtk-ui/ui.glade.h:8
+msgid "<big>Restore from backup</big>"
+msgstr "<big>Restore from backup</big>"
+
+#. a title in emergency view
+#: ../src/gtk-ui/ui.glade.h:10
+msgid "<big>Slow sync</big>"
+msgstr "<big>Slow sync</big>"
+
+#. a title in emergency view
+#: ../src/gtk-ui/ui.glade.h:12
+msgid "<big>Start from scratch</big>"
+msgstr "<big>Start from scratch</big>"
+
+#: ../src/gtk-ui/ui.glade.h:13
+msgid ""
+"A slow sync compares items from both sides and tries to merge them. \n"
+"This may fail in some cases, leading to duplicates or lost information."
+msgstr ""
+"A slow sync compares items from both sides and tries to merge them. \n"
+"This may fail in some cases, leading to duplicates or lost information."
+
+#: ../src/gtk-ui/ui.glade.h:15
+msgid "Add new device"
+msgstr "Add new device"
+
+#: ../src/gtk-ui/ui.glade.h:16
+msgid "Add new service"
+msgstr "Add new service"
+
+#. explanation of "Restore backup" function
+#: ../src/gtk-ui/ui.glade.h:18
+msgid ""
+"Backups are made before every time we Sync. Choose a backup to restore. Any "
+"changes you have made since then will be lost."
+msgstr ""
+"Backups are made before every sync. Choose a backup to restore. Any changes "
+"you have made since then will be lost."
+
+#: ../src/gtk-ui/ui.glade.h:19
+msgid "Calendar"
+msgstr "Calendar"
+
+#. Button in main view, right side. Keep to below 20 chars per line, feel free
+#. to use two lines
+#: ../src/gtk-ui/ui.glade.h:21
+msgid ""
+"Change or edit\n"
+"sync service"
+msgstr ""
+"Change or edit\n"
+"sync service"
+
+#. close button for settings window
+#: ../src/gtk-ui/ui.glade.h:24
+msgid "Close"
+msgstr "Close"
+
+#: ../src/gtk-ui/ui.glade.h:25
+msgid ""
+"Delete all data on Zyb \n"
+"and replace with your\n"
+"local information"
+msgstr ""
+"Delete all data on Zyb \n"
+"and replace with your\n"
+"local information"
+
+#: ../src/gtk-ui/ui.glade.h:28
+msgid ""
+"Delete all your local\n"
+"information and replace\n"
+"with data from Zyb"
+msgstr ""
+"Delete all your local\n"
+"information and replace\n"
+"with data from Zyb"
+
+#. button in main view, right side. Keep length to 20 characters or so, use
+#. two lines if needed
+#: ../src/gtk-ui/ui.glade.h:32
+msgid ""
+"Fix a sync\n"
+"emergency"
+msgstr ""
+"Fix a sync\n"
+"emergency"
+
+#: ../src/gtk-ui/ui.glade.h:34
+msgid ""
+"If you don't see your service above but know that your sync provider uses SyncML\n"
+"you can setup a service manually."
+msgstr ""
+"If you don't see your service above but know that your sync provider uses SyncML\n"
+"you can setup a service manually."
+
+#: ../src/gtk-ui/ui.glade.h:36
+msgid "Settings"
+msgstr "Settings"
+
+#: ../src/gtk-ui/ui.glade.h:39
+msgid "Sync Emergency"
+msgstr "Sync Emergency"
+
+#: ../src/gtk-ui/ui.glade.h:41
+msgid ""
+"To sync you'll need a network connection and an account with a sync service.\n"
+"We support the following services: "
+msgstr ""
+"To sync you'll need a network connection and an account with a sync service.\n"
+"We support the following services: "
+
+#: ../src/gtk-ui/ui.glade.h:43
+msgid "Use Bluetooth to Sync your data from one device to another."
+msgstr "Use Bluetooth to sync your data from one device to another."
+
+#: ../src/gtk-ui/ui.glade.h:44
+msgid "You will need to add Bluetooth devices before they can be synced."
+msgstr "You will need to add Bluetooth devices before they can be synced."
+
+#: ../src/gtk-ui/sync.desktop.in.h:2
+msgid "Up to date"
+msgstr "Up to date"
+
+#: ../src/gtk-ui/sync-gtk.desktop.in.h:1
+msgid "SyncEvolution (GTK)"
+msgstr "SyncEvolution (GTK)"
+
+#: ../src/gtk-ui/sync-gtk.desktop.in.h:2
+msgid "Synchronize PIM data"
+msgstr "Synchronize PIM data"
+
+#: ../src/gtk-ui/sync-config-widget.c:88
+msgid ""
+"ScheduleWorld enables you to keep your contacts, events, tasks, and notes in"
+" sync."
+msgstr ""
+"ScheduleWorld enables you to keep your contacts, events, tasks, and notes in"
+" sync."
+
+#: ../src/gtk-ui/sync-config-widget.c:91
+msgid ""
+"Google Sync can back up and synchronize your contacts with your Gmail "
+"contacts."
+msgstr ""
+"Google Sync can back up and synchronize your contacts with your Gmail "
+"contacts."
+
+#. TRANSLATORS: Please include the word "demo" (or the equivalent in
+#. your language): Funambol is going to be a 90 day demo service
+#. in the future
+#: ../src/gtk-ui/sync-config-widget.c:97
+msgid ""
+"Back up your contacts and calendar. Sync with a single click, anytime, "
+"anywhere (DEMO)."
+msgstr ""
+"Back up your contacts and calendar. Sync with a single click, anytime, "
+"anywhere (DEMO)."
+
+#: ../src/gtk-ui/sync-config-widget.c:100
+msgid ""
+"Mobical Backup and Restore service allows you to securely back up your "
+"personal mobile data for free."
+msgstr ""
+"Mobical Backup and Restore service allows you to securely back up your "
+"personal mobile data for free."
+
+#: ../src/gtk-ui/sync-config-widget.c:103
+msgid ""
+"ZYB is a simple way for people to store and share mobile information online."
+msgstr ""
+"ZYB is a simple way for people to store and share mobile information online."
+
+#: ../src/gtk-ui/sync-config-widget.c:106
+msgid ""
+"Memotoo lets you access your personal data from any computer connected to "
+"the Internet."
+msgstr ""
+"Memotoo lets you access your personal data from any computer connected to "
+"the Internet."
+
+#: ../src/gtk-ui/sync-config-widget.c:195
+msgid "Sorry, failed to save the configuration"
+msgstr "Sorry, failed to save the configuration"
+
+#: ../src/gtk-ui/sync-config-widget.c:445
+msgid "Service must have a name and server URL"
+msgstr "Service must have a name and server URL"
+
+#. TRANSLATORS: error dialog when creating a new sync configuration
+#: ../src/gtk-ui/sync-config-widget.c:451
+msgid "A username is required for this service"
+msgstr "A username is required for this service"
+
+#: ../src/gtk-ui/sync-config-widget.c:493
+#, c-format
+msgid ""
+"Do you want to reset the settings for %s? This will not remove any synced "
+"information on either end."
+msgstr ""
+"Do you want to reset the settings for %s? This will not remove any synced "
+"information on either end."
+
+#. TRANSLATORS: buttons in reset-service warning dialog
+#: ../src/gtk-ui/sync-config-widget.c:497
+msgid "Yes, reset"
+msgstr "Yes, reset"
+
+#: ../src/gtk-ui/sync-config-widget.c:498
+#: ../src/gtk-ui/sync-config-widget.c:509
+msgid "No, keep settings"
+msgstr "No, keep settings"
+
+#: ../src/gtk-ui/sync-config-widget.c:503
+#, c-format
+msgid ""
+"Do you want to delete the settings for %s? This will not remove any synced "
+"information on either end but it will remove these settings."
+msgstr ""
+"Do you want to delete the settings for %s? This will not remove any synced "
+"information on either end but it will remove these settings."
+
+#. TRANSLATORS: buttons in delete-service warning dialog
+#: ../src/gtk-ui/sync-config-widget.c:508
+msgid "Yes, delete"
+msgstr "Yes, delete"
+
+#: ../src/gtk-ui/sync-config-widget.c:539
+msgid "Reset settings"
+msgstr "Reset settings"
+
+#: ../src/gtk-ui/sync-config-widget.c:542
+msgid "Delete settings"
+msgstr "Delete settings"
+
+#: ../src/gtk-ui/sync-config-widget.c:552
+msgid "Save and use"
+msgstr "Save and use"
+
+#: ../src/gtk-ui/sync-config-widget.c:555
+msgid ""
+"Save and replace\n"
+"current service"
+msgstr ""
+"Save and replace\n"
+"current service"
+
+#: ../src/gtk-ui/sync-config-widget.c:563
+msgid "Stop using device"
+msgstr "Stop using device"
+
+#: ../src/gtk-ui/sync-config-widget.c:566
+msgid "Stop using service"
+msgstr "Stop using service"
+
+#. TRANSLATORS: label for an entry in service configuration form.
+#. * Placeholder is a source name.
+#. * Example: "Appointments URI"
+#: ../src/gtk-ui/sync-config-widget.c:749
+#, c-format
+msgid "%s URI"
+msgstr "%s URI"
+
+#. TRANSLATORS: toggles in service configuration form, placeholder is service
+#. * or device name
+#: ../src/gtk-ui/sync-config-widget.c:936
+#, c-format
+msgid "Send changes to %s"
+msgstr "Send changes to %s"
+
+#: ../src/gtk-ui/sync-config-widget.c:941
+#, c-format
+msgid "Receive changes from %s"
+msgstr "Receive changes from %s"
+
+#: ../src/gtk-ui/sync-config-widget.c:957
+msgid "<b>Sync</b>"
+msgstr "<b>Sync</b>"
+
+#. TRANSLATORS: label of a entry in service configuration
+#: ../src/gtk-ui/sync-config-widget.c:973
+msgid "Server address"
+msgstr "Server address"
+
+#. TRANSLATORS: explanation before a device template combobox.
+#. * Placeholder is a device name like 'Nokia N85' or 'Syncevolution
+#. * Client'
+#: ../src/gtk-ui/sync-config-widget.c:1049
+#, c-format
+msgid ""
+"This device looks like it might be a '%s'. If this is not correct, please "
+"take a look at the list of supported devices and pick yours if it is listed"
+msgstr ""
+"This device looks like it might be a '%s'. If this is not correct, please "
+"take a look at the list of supported devices and pick yours if it is listed"
+
+#: ../src/gtk-ui/sync-config-widget.c:1055
+#: ../src/gtk-ui/sync-config-widget.c:1915
+msgid ""
+"We don't know what this device is exactly. Please take a look at the list of"
+" supported devices and pick yours if it is listed"
+msgstr ""
+"We don't know what this device is exactly. Please take a look at the list of"
+" supported devices and pick yours if it is listed"
+
+#: ../src/gtk-ui/sync-config-widget.c:1207
+#, c-format
+msgid "%s - Bluetooth device"
+msgstr "%s - Bluetooth device"
+
+#. TRANSLATORS: service title for services that are not based on a
+#. * template in service list, the placeholder is the name of the service
+#: ../src/gtk-ui/sync-config-widget.c:1213
+#, c-format
+msgid "%s - manually setup"
+msgstr "%s - manually set up"
+
+#. TRANSLATORS: link button in service configuration form
+#: ../src/gtk-ui/sync-config-widget.c:1886
+msgid "Launch website"
+msgstr "Launch website"
+
+#. TRANSLATORS: button in service configuration form
+#: ../src/gtk-ui/sync-config-widget.c:1895
+msgid "Set up now"
+msgstr "Set up now"
+
+#: ../src/gtk-ui/sync-config-widget.c:1953
+msgid "Use these settings"
+msgstr "Use these settings"
+
+#. TRANSLATORS: labels of entries in service configuration form
+#: ../src/gtk-ui/sync-config-widget.c:1991
+msgid "Username"
+msgstr "Username"
+
+#: ../src/gtk-ui/sync-config-widget.c:2006
+msgid "Password"
+msgstr "Password"
+
+#. TRANSLATORS: warning in service configuration form for people
+#. who have modified the configuration via other means.
+#: ../src/gtk-ui/sync-config-widget.c:2029
+msgid ""
+"Current configuration is more complex than what can be shown here. Changes "
+"to sync mode or synced data types will overwrite that configuration."
+msgstr ""
+"Current configuration is more complex than what can be shown here. Changes "
+"to sync mode or synced data types will overwrite that configuration."
+
+#. TRANSLATORS: this is the epander label for server settings
+#. in service configuration form
+#: ../src/gtk-ui/sync-config-widget.c:2048
+msgid "Hide server settings"
+msgstr "Hide server settings"
+
+#. TRANSLATORS: this is the epander label for server settings
+#. in service configuration form
+#: ../src/gtk-ui/sync-config-widget.c:2068
+msgid "Show server settings"
+msgstr "Show server settings"
+
+#: ../src/gnome-bluetooth/syncevolution.c:110
+msgid "Sync in the Sync application"
+msgstr "Sync in the Sync application"
+
+#: ../src/syncevo-dbus-server.cpp:6653
+#, c-format
+msgid "%s is syncing"
+msgstr "%s is syncing"
+
+#: ../src/syncevo-dbus-server.cpp:6654
+#, c-format
+msgid "We have just started to sync your computer with the %s sync service."
+msgstr "We have just started to sync your computer with the %s sync service."
+
+#. if sync is successfully started and done
+#: ../src/syncevo-dbus-server.cpp:6670
+#, c-format
+msgid "%s sync complete"
+msgstr "%s sync complete"
+
+#: ../src/syncevo-dbus-server.cpp:6671
+#, c-format
+msgid "We have just finished syncing your computer with the %s sync service."
+msgstr "We have just finished syncing your computer with the %s sync service."
+
+#. if sync is successfully started and has errors, or not started successful
+#. with a fatal problem
+#: ../src/syncevo-dbus-server.cpp:6676
+msgid "Sync problem."
+msgstr "Sync problem."
+
+#: ../src/syncevo-dbus-server.cpp:6677
+msgid "Sorry, there's a problem with your sync that you need to attend to."
+msgstr "Sorry, there's a problem with your sync that you need to attend to."
+
+#: ../src/syncevo-dbus-server.cpp:6758
+msgid "View"
+msgstr "View"
+
+#. Use "default" as ID because that is what mutter-moblin
+#. recognizes: it then skips the action instead of adding it
+#. in addition to its own "Dismiss" button (always added).
+#: ../src/syncevo-dbus-server.cpp:6762
+msgid "Dismiss"
+msgstr "Dismiss"
+
+
diff --git a/po/es.po b/po/es.po
index 460011b8..37503d2c 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,22 +1,27 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# <meego.pti.esp@gmail.com>, 2011.
+# <tomas.galicia@intel.com>, 2011.
msgid ""
msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: http://moblin.org/projects/syncevolution\n"
-"POT-Creation-Date: 2010-05-12 09:27+0000\n"
-"PO-Revision-Date: \n"
-"Last-Translator: Tomás Galicia <tomas.galicia@intel.com>\n"
-"Language-Team: \n"
+"Project-Id-Version: syncevolution\n"
+"Report-Msgid-Bugs-To: https://bugs.meego.com/\n"
+"POT-Creation-Date: 2011-12-05 10:21-0800\n"
+"PO-Revision-Date: 2011-12-09 00:30+0000\n"
+"Last-Translator: GLS_ESP <meego.pti.esp@gmail.com>\n"
+"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/meego/team/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Spanish\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"Plural-Forms: nplurals=2; plural=n!=1;\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. TRANSLATORS: this is the application name that may be used by e.g.
#. the windowmanager
-#: ../src/gtk-ui/main.c:40
-#: ../src/gtk-ui/ui.glade.h:38
+#: ../src/gtk-ui/main.c:40 ../src/gtk-ui/ui.glade.h:38
#: ../src/gtk-ui/sync.desktop.in.h:1
#: ../src/gnome-bluetooth/syncevolution.c:112
msgid "Sync"
@@ -30,8 +35,7 @@ msgstr "Contactos"
msgid "Appointments"
msgstr "Citas"
-#: ../src/gtk-ui/sync-ui.c:270
-#: ../src/gtk-ui/ui.glade.h:40
+#: ../src/gtk-ui/sync-ui.c:270 ../src/gtk-ui/ui.glade.h:40
msgid "Tasks"
msgstr "Tareas"
@@ -65,81 +69,78 @@ msgstr "Sí, realizar sincronización lenta"
msgid "No, cancel sync"
msgstr "No, cancelar la sincronización"
-#. TRANSLATORS: confirmation dialog for refresh-from-server. Placeholder
+#. TRANSLATORS: confirmation dialog for "refresh from peer". Placeholder
#. * is service/device name
#: ../src/gtk-ui/sync-ui.c:424
#, c-format
-msgid "Do you want to delete all local data and replace it with data from %s? This is not usually advised."
-msgstr "¿Quieres borrar todos los datos locales y sustituirlos por los datos de %s? Normalmente, no es recomendable."
+msgid ""
+"Do you want to delete all local data and replace it with data from %s? This "
+"is not usually advised."
+msgstr ""
+"¿Quieres borrar todos los datos locales y sustituirlos por los datos de %s? "
+"Normalmente, no es recomendable."
-#: ../src/gtk-ui/sync-ui.c:429
-#: ../src/gtk-ui/sync-ui.c:460
+#: ../src/gtk-ui/sync-ui.c:429 ../src/gtk-ui/sync-ui.c:462
msgid "Yes, delete and replace"
msgstr "Sí, borrar y reemplazar"
-#: ../src/gtk-ui/sync-ui.c:429
-#: ../src/gtk-ui/sync-ui.c:460
-#: ../src/gtk-ui/sync-ui.c:1605
+#: ../src/gtk-ui/sync-ui.c:429 ../src/gtk-ui/sync-ui.c:462
+#: ../src/gtk-ui/sync-ui.c:1610
msgid "No"
msgstr "No"
-#. TRANSLATORS: confirmation dialog for refresh-from-client. Placeholder
+#. TRANSLATORS: confirmation dialog for "refresh from local side". Placeholder
#. * is service/device name
-#: ../src/gtk-ui/sync-ui.c:455
+#: ../src/gtk-ui/sync-ui.c:457
#, c-format
-msgid "Do you want to delete all data in %s and replace it with your local data? This is not usually advised."
-msgstr "¿Quieres borrar todos los datos de %s y sustituirlos por los datos locales? Normalmente, no es recomendable."
+msgid ""
+"Do you want to delete all data in %s and replace it with your local data? "
+"This is not usually advised."
+msgstr ""
+"¿Quieres borrar todos los datos de %s y sustituirlos por los datos locales? "
+"Normalmente, no es recomendable."
-# We are trying to cancel the synchronization
-#: ../src/gtk-ui/sync-ui.c:487
+#: ../src/gtk-ui/sync-ui.c:491
msgid "Trying to cancel sync"
msgstr "Estamos intentando cancelar la sincronización"
-# There is no space left
-#: ../src/gtk-ui/sync-ui.c:529
+#: ../src/gtk-ui/sync-ui.c:533
msgid "No service or device selected"
msgstr "No se ha seleccionado ningún servicio o dispositivo"
-# Last synchronization happened a few seconds ago
#. TRANSLATORS: This is the title on main view. Placeholder is
#. * the service name. Example: "Google - synced just now"
-#: ../src/gtk-ui/sync-ui.c:537
+#: ../src/gtk-ui/sync-ui.c:541
#, c-format
msgid "%s - synced just now"
msgstr "%s - se sincronizo hace unos segundos"
-# Last synchronization happened one minute ago
-#: ../src/gtk-ui/sync-ui.c:541
+#: ../src/gtk-ui/sync-ui.c:545
#, c-format
msgid "%s - synced a minute ago"
msgstr "%s - se sincronizo hace un minuto"
-# Last synchronization happened %ld minutes ago
-#: ../src/gtk-ui/sync-ui.c:545
+#: ../src/gtk-ui/sync-ui.c:549
#, c-format
msgid "%s - synced %ld minutes ago"
msgstr "%s - se sincronizo hace %ld minutos"
-# Last synchronization happened one hour ago
-#: ../src/gtk-ui/sync-ui.c:550
+#: ../src/gtk-ui/sync-ui.c:554
#, c-format
msgid "%s - synced an hour ago"
msgstr "%s - se sincronizo hace una hora"
-# Last synchronization happened %ld hours ago
-#: ../src/gtk-ui/sync-ui.c:554
+#: ../src/gtk-ui/sync-ui.c:558
#, c-format
msgid "%s - synced %ld hours ago"
msgstr "%s - se sincronizo hace %ld horas"
-# Last synchronization happened one day ago
-#: ../src/gtk-ui/sync-ui.c:559
+#: ../src/gtk-ui/sync-ui.c:563
#, c-format
msgid "%s - synced a day ago"
msgstr "%s - se sincronizo hace un día"
-# Last synchronization happened %ld days ago
-#: ../src/gtk-ui/sync-ui.c:563
+#: ../src/gtk-ui/sync-ui.c:567
#, c-format
msgid "%s - synced %ld days ago"
msgstr "%s - se sincronizo hace %ld días"
@@ -147,70 +148,70 @@ msgstr "%s - se sincronizo hace %ld días"
#. TRANSLATORS: Action button in info bar in main view. Shown with e.g.
#. * "You've just restored a backup. The changes have not been "
#. * "synced with %s yet"
-#: ../src/gtk-ui/sync-ui.c:612
-#: ../src/gtk-ui/sync-ui.c:726
+#: ../src/gtk-ui/sync-ui.c:616 ../src/gtk-ui/sync-ui.c:701
msgid "Sync now"
msgstr "Sincronizar"
#. TRANSLATORS: Action button in info bar in main view. Shown with e.g.
#. * "A normal sync is not possible at this time..." message.
#. * "Other options" will open Emergency view
-#: ../src/gtk-ui/sync-ui.c:618
-#: ../src/gtk-ui/ui.glade.h:37
+#: ../src/gtk-ui/sync-ui.c:622 ../src/gtk-ui/ui.glade.h:37
msgid "Slow sync"
msgstr "Sincronización lenta"
-#: ../src/gtk-ui/sync-ui.c:619
+#: ../src/gtk-ui/sync-ui.c:623
msgid "Other options..."
msgstr "Otras opciones..."
-# "Select a service". Omitted 'syn' because there's no room in the button for proper display. The context is clear and this will not impair understanding by the user.
#. TRANSLATORS: Action button in info bar in main view. Shown e.g.
#. * when no service is selected. Will open configuration view
-#: ../src/gtk-ui/sync-ui.c:624
+#: ../src/gtk-ui/sync-ui.c:628
msgid "Select sync service"
msgstr "Seleccionar un servicio"
-# Edit the configuration of the service
#. TRANSLATORS: Action button in info bar in main view. Shown e.g.
#. * login to service fails. Will open configuration view for this service
-#: ../src/gtk-ui/sync-ui.c:629
+#: ../src/gtk-ui/sync-ui.c:633
msgid "Edit service settings"
msgstr "Editar la configuración del servicio"
-# There's no sync service yet between the netbook and a web service.
-#: ../src/gtk-ui/sync-ui.c:700
-msgid "You haven't selected a sync service or device yet. Sync services let you synchronize your data between your netbook and a web service. You can also sync directly with some devices."
-msgstr "Todavía no has seleccionado ningún servicio o dispositivo de sincronización. Estos servicios te permiten sincronizar los datos entre el miniportátil y un servicio web. También puede hacerse directamente con algunos dispositivos."
+#: ../src/gtk-ui/sync-ui.c:709
+msgid ""
+"You haven't selected a sync service or device yet. Sync services let you "
+"synchronize your data between your netbook and a web service. You can also "
+"sync directly with some devices."
+msgstr ""
+"Todavía no has seleccionado ningún servicio o dispositivo de sincronización."
+" Estos servicios te permiten sincronizar los datos entre el miniportátil y "
+"un servicio web. También puede hacerse directamente con algunos "
+"dispositivos."
-#: ../src/gtk-ui/sync-ui.c:722
+#: ../src/gtk-ui/sync-ui.c:729
msgid "Sync again"
msgstr "¡Sincronízate!"
-#: ../src/gtk-ui/sync-ui.c:743
+#: ../src/gtk-ui/sync-ui.c:748
msgid "Restoring"
msgstr "Restaurando"
-# Synchronization is taking place
-#: ../src/gtk-ui/sync-ui.c:745
+#: ../src/gtk-ui/sync-ui.c:750
msgid "Syncing"
msgstr "Sincronizando..."
#. TRANSLATORS: This is for the button in main view, right side.
#. Keep line length below ~20 characters, use two lines if needed
-#: ../src/gtk-ui/sync-ui.c:757
-#: ../src/gtk-ui/sync-ui.c:3399
+#: ../src/gtk-ui/sync-ui.c:762 ../src/gtk-ui/sync-ui.c:3407
msgid "Cancel sync"
msgstr "Cancelar la sincronización"
-#: ../src/gtk-ui/sync-ui.c:922
+#: ../src/gtk-ui/sync-ui.c:927
msgid "Back to sync"
msgstr "Volver a la sincronización"
#. TRANSLATORS: label for checkbutton/toggle in main view.
#. * Please stick to similar length strings or break the line with
#. * "\n" if absolutely needed
-#: ../src/gtk-ui/sync-ui.c:1224
+#: ../src/gtk-ui/sync-ui.c:1229
msgid "Automatic sync"
msgstr ""
"Sincronización\n"
@@ -220,61 +221,78 @@ msgstr ""
#. * currently selected data sources. First placeholder is service/device
#. * name, second a comma separeted list of sources.
#. * E.g. "Affected data: Google Contacts, Appointments"
-#: ../src/gtk-ui/sync-ui.c:1519
+#: ../src/gtk-ui/sync-ui.c:1524
#, c-format
msgid "Affected data: %s %s"
msgstr "Datos afectados: %s %s"
-#: ../src/gtk-ui/sync-ui.c:1524
+#: ../src/gtk-ui/sync-ui.c:1529
#, c-format
msgid "Affected data: none"
msgstr "Datos afectados: ninguno"
#. TRANSLATORS: confirmation for restoring a backup. placeholder is the
#. * backup time string defined below
-#: ../src/gtk-ui/sync-ui.c:1602
+#: ../src/gtk-ui/sync-ui.c:1607
#, c-format
-msgid "Do you want to restore the backup from %s? All changes you have made since then will be lost."
-msgstr "¿Deseas restaurar la copia de seguridad de %s? Todos los cambios que hayas realizado desde entonces se perderán."
+msgid ""
+"Do you want to restore the backup from %s? All changes you have made since "
+"then will be lost."
+msgstr ""
+"¿Deseas restaurar la copia de seguridad de %s? Todos los cambios que hayas "
+"realizado desde entonces se perderán."
-#: ../src/gtk-ui/sync-ui.c:1605
+#: ../src/gtk-ui/sync-ui.c:1610
msgid "Yes, restore"
msgstr "Sí, restaurar"
#. TRANSLATORS: date/time for strftime(), used in emergency view backup
#. * label. Any time format that shows date and time is good.
-#: ../src/gtk-ui/sync-ui.c:1637
+#: ../src/gtk-ui/sync-ui.c:1642
#, c-format
msgid "%x %X"
msgstr "%x %X"
#. TRANSLATORS: label for a backup in emergency view. Placeholder is
#. * service or device name
-#: ../src/gtk-ui/sync-ui.c:1656
+#: ../src/gtk-ui/sync-ui.c:1661
#, c-format
msgid "Backed up before syncing with %s"
msgstr "Copia de seguridad realizada ante de sincronizar con %s"
-#: ../src/gtk-ui/sync-ui.c:1673
+#: ../src/gtk-ui/sync-ui.c:1678
msgid "Restore"
msgstr "Restaurar"
#. TRANSLATORS: this is an explanation in Emergency view.
#. * Placeholder is a service/device name
-#: ../src/gtk-ui/sync-ui.c:1780
+#: ../src/gtk-ui/sync-ui.c:1785
#, c-format
-msgid "A normal sync with %s is not possible at this time. You can do a slow two-way sync or start from scratch. You can also restore a backup, but a slow sync or starting from scratch will still be required before normal sync is possible."
-msgstr "Una sincronización normal con %s no es posible en este momento. Puedes realizar una sincronización lenta de dos vías o iniciar de cero. También puedes restaurar una copia de seguridad, pero una sincronización lenta o iniciar de cero igual será necesaria antes de que sea posible una sincronización normal."
+msgid ""
+"A normal sync with %s is not possible at this time. You can do a slow two-"
+"way sync or start from scratch. You can also restore a backup, but a slow "
+"sync or starting from scratch will still be required before normal sync is "
+"possible."
+msgstr ""
+"Una sincronización normal con %s no es posible en este momento. Puedes "
+"realizar una sincronización lenta de dos vías o iniciar de cero. También "
+"puedes restaurar una copia de seguridad, pero una sincronización lenta o "
+"iniciar de cero igual será necesaria antes de que sea posible una "
+"sincronización normal."
-#: ../src/gtk-ui/sync-ui.c:1790
+#: ../src/gtk-ui/sync-ui.c:1795
#, c-format
-msgid "If something has gone horribly wrong, you can try a slow sync, start from scratch or restore from backup."
-msgstr "Si algo realmente malo sucede, puedes intentar una sincronización lenta, empezar de cero o restaurar la copia de seguridad."
+msgid ""
+"If something has gone horribly wrong, you can try a slow sync, start from "
+"scratch or restore from backup."
+msgstr ""
+"Si algo realmente malo sucede, puedes intentar una sincronización lenta, "
+"empezar de cero o restaurar la copia de seguridad."
#. TRANSLATORS: These are a buttons in Emergency view. Placeholder is a
#. * service/device name. Please don't use too long lines, but feel free to
#. * use several lines.
-#: ../src/gtk-ui/sync-ui.c:1799
+#: ../src/gtk-ui/sync-ui.c:1804
#, c-format
msgid ""
"Delete all your local\n"
@@ -285,7 +303,7 @@ msgstr ""
"locales y reemplazarlos con\n"
"datos de %s"
-#: ../src/gtk-ui/sync-ui.c:1805
+#: ../src/gtk-ui/sync-ui.c:1810
#, c-format
msgid ""
"Delete all data on\n"
@@ -296,71 +314,74 @@ msgstr ""
"%s y reemplazarlos\n"
"con tus datos locales"
-#: ../src/gtk-ui/sync-ui.c:2267
+#: ../src/gtk-ui/sync-ui.c:2275
msgid "Failed to get list of supported services from SyncEvolution"
msgstr "Error al obtener la lista de servicios compatibles de SyncEvolution"
-#: ../src/gtk-ui/sync-ui.c:2321
-msgid "There was a problem communicating with the sync process. Please try again later."
-msgstr "Ha ocurrido un problema de comunicación en el proceso de sincronización. Inténtalo más tarde."
+#: ../src/gtk-ui/sync-ui.c:2329
+msgid ""
+"There was a problem communicating with the sync process. Please try again "
+"later."
+msgstr ""
+"Ha ocurrido un problema de comunicación en el proceso de sincronización. "
+"Inténtalo más tarde."
-#: ../src/gtk-ui/sync-ui.c:2380
+#: ../src/gtk-ui/sync-ui.c:2388
msgid "Restore failed"
msgstr "Restaurar falló"
-#: ../src/gtk-ui/sync-ui.c:2383
-#: ../src/gtk-ui/sync-ui.c:3268
+#: ../src/gtk-ui/sync-ui.c:2391 ../src/gtk-ui/sync-ui.c:3276
msgid "Sync failed"
msgstr "Sincronización falló"
-#: ../src/gtk-ui/sync-ui.c:2389
+#: ../src/gtk-ui/sync-ui.c:2397
msgid "Restore complete"
msgstr "Restaurado completo"
-#: ../src/gtk-ui/sync-ui.c:2392
+#: ../src/gtk-ui/sync-ui.c:2400
msgid "Sync complete"
msgstr "¡Sincronizado!"
-#: ../src/gtk-ui/sync-ui.c:2484
+#: ../src/gtk-ui/sync-ui.c:2492
#, c-format
msgid "Preparing '%s'"
msgstr "Preparando '%s'"
-#: ../src/gtk-ui/sync-ui.c:2487
+#: ../src/gtk-ui/sync-ui.c:2495
#, c-format
msgid "Receiving '%s'"
msgstr "Recibiendo '%s'"
-#: ../src/gtk-ui/sync-ui.c:2490
+#: ../src/gtk-ui/sync-ui.c:2498
#, c-format
msgid "Sending '%s'"
msgstr "Enviando '%s'"
-#: ../src/gtk-ui/sync-ui.c:2611
+#: ../src/gtk-ui/sync-ui.c:2619
#, c-format
msgid "There was one remote rejection."
msgid_plural "There were %ld remote rejections."
msgstr[0] "Hubo un rechazo remoto."
msgstr[1] "Hubo %ld rechazos remotos."
-#: ../src/gtk-ui/sync-ui.c:2616
+#: ../src/gtk-ui/sync-ui.c:2624
#, c-format
msgid "There was one local rejection."
msgid_plural "There were %ld local rejections."
msgstr[0] "Hubo un rechazo local."
msgstr[1] "Hubo %ld rechazos locales."
-#: ../src/gtk-ui/sync-ui.c:2621
+#: ../src/gtk-ui/sync-ui.c:2629
#, c-format
msgid "There were %ld local rejections and %ld remote rejections."
msgstr "Se han producido %ld rechazos locales y %ld rechazos remotos."
-#: ../src/gtk-ui/sync-ui.c:2626
+#: ../src/gtk-ui/sync-ui.c:2634
#, c-format
msgid "Last time: No changes."
msgstr "La última vez: no hubo cambios."
-#: ../src/gtk-ui/sync-ui.c:2628
+#: ../src/gtk-ui/sync-ui.c:2636
#, c-format
msgid "Last time: Sent one change."
msgid_plural "Last time: Sent %ld changes."
@@ -370,21 +391,21 @@ msgstr[1] "La última vez: se enviaron %ld cambios."
#. This is about changes made to the local data. Not all of these
#. changes were requested by the remote server, so "applied"
#. is a better word than "received" (bug #5185).
-#: ../src/gtk-ui/sync-ui.c:2636
+#: ../src/gtk-ui/sync-ui.c:2644
#, c-format
msgid "Last time: Applied one change."
msgid_plural "Last time: Applied %ld changes."
msgstr[0] "La última vez: se aplicó un cambio."
msgstr[1] "La última vez: se aplicaron %ld cambios."
-#: ../src/gtk-ui/sync-ui.c:2641
+#: ../src/gtk-ui/sync-ui.c:2649
#, c-format
msgid "Last time: Applied %ld changes and sent %ld changes."
msgstr "La última vez: se aplicaron %ld cambios y se enviaron %ld cambios."
#. TRANSLATORS: the placeholder is a error message (hopefully)
#. * explaining the problem
-#: ../src/gtk-ui/sync-ui.c:2848
+#: ../src/gtk-ui/sync-ui.c:2856
#, c-format
msgid ""
"There was a problem with last sync:\n"
@@ -393,135 +414,152 @@ msgstr ""
"Hubo un problema en la última sincronización:\n"
"%s"
-#: ../src/gtk-ui/sync-ui.c:2858
+#: ../src/gtk-ui/sync-ui.c:2866
#, c-format
-msgid "You've just restored a backup. The changes have not been synced with %s yet"
-msgstr "Has restaurado una copia de resguardo. Los cambios aún no se sincronizan con %s"
+msgid ""
+"You've just restored a backup. The changes have not been synced with %s yet"
+msgstr ""
+"Has restaurado una copia de resguardo. Los cambios aún no se sincronizan con"
+" %s"
-#: ../src/gtk-ui/sync-ui.c:3146
+#: ../src/gtk-ui/sync-ui.c:3154
msgid "Waiting for current operation to finish..."
msgstr "Esperando que la operación actual termine..."
#. TRANSLATORS: next strings are error messages.
-#: ../src/gtk-ui/sync-ui.c:3180
-msgid "A normal sync is not possible at this time. The server suggests a slow sync, but this might not always be what you want if both ends already have data."
-msgstr "Una sincronización normal no es posible en este momento. El servidor sugiere una sincronización lenta, pero esto no es necesariamente lo que deseas si ambas partes ya tienen datos."
+#: ../src/gtk-ui/sync-ui.c:3188
+msgid ""
+"A normal sync is not possible at this time. The server suggests a slow sync,"
+" but this might not always be what you want if both ends already have data."
+msgstr ""
+"Una sincronización normal no es posible en este momento. El servidor sugiere"
+" una sincronización lenta, pero esto no es necesariamente lo que deseas si "
+"ambas partes ya tienen datos."
-# the syncronization service D-Bus closed unexpectedly
-#: ../src/gtk-ui/sync-ui.c:3184
+#: ../src/gtk-ui/sync-ui.c:3192
msgid "The sync process died unexpectedly."
msgstr "El servicio de sincronización se cerró inesperadamente."
-#: ../src/gtk-ui/sync-ui.c:3189
-msgid "Password request was not answered. You can save the password in the settings to prevent the request."
-msgstr "No se ha respondido a la solicitud de contraseña. Para evitar que aparezca otra vez, se puede guardar la contraseña en los ajustes."
+#: ../src/gtk-ui/sync-ui.c:3197
+msgid ""
+"Password request was not answered. You can save the password in the settings"
+" to prevent the request."
+msgstr ""
+"No se ha respondido a la solicitud de contraseña. Para evitar que aparezca "
+"otra vez, se puede guardar la contraseña en los ajustes."
#. TODO use the service device name here, this is a remote problem
-#: ../src/gtk-ui/sync-ui.c:3193
+#: ../src/gtk-ui/sync-ui.c:3201
msgid "There was a problem processing sync request. Trying again may help."
-msgstr "Ha ocurrido un problema al procesar la solicitud de sincronización. Intentar otra vez puede ayudar."
+msgstr ""
+"Ha ocurrido un problema al procesar la solicitud de sincronización. Intentar"
+" otra vez puede ayudar."
-#: ../src/gtk-ui/sync-ui.c:3199
-msgid "Failed to login. Could there be a problem with your username or password?"
-msgstr "Acceso fallido. ¿Podría haber algún problema con tu usuario o contraseña?"
+#: ../src/gtk-ui/sync-ui.c:3207
+msgid ""
+"Failed to login. Could there be a problem with your username or password?"
+msgstr ""
+"Acceso fallido. ¿Podría haber algún problema con tu usuario o contraseña?"
-#: ../src/gtk-ui/sync-ui.c:3202
+#: ../src/gtk-ui/sync-ui.c:3210
msgid "Forbidden"
msgstr "Prohibido"
#. TRANSLATORS: data source means e.g. calendar or addressbook
-#: ../src/gtk-ui/sync-ui.c:3208
-msgid "A data source could not be found. Could there be a problem with the settings?"
-msgstr "No se pudo hallar la fuente de datos. ¿Podría haber algún problema con la configuración?"
+#: ../src/gtk-ui/sync-ui.c:3216
+msgid ""
+"A data source could not be found. Could there be a problem with the "
+"settings?"
+msgstr ""
+"No se pudo hallar la fuente de datos. ¿Podría haber algún problema con la "
+"configuración?"
-# Fatal error in the database
-#: ../src/gtk-ui/sync-ui.c:3212
+#: ../src/gtk-ui/sync-ui.c:3220
msgid "Remote database error"
msgstr "Error en la base de datos remota"
#. This can happen when EDS is borked, restart it may help...
-#: ../src/gtk-ui/sync-ui.c:3215
-msgid "There is a problem with the local database. Syncing again or rebooting may help."
-msgstr "Hay un problema con la base de datos local. Sincronizar otra vez o reiniciar puede ayudar."
+#: ../src/gtk-ui/sync-ui.c:3223
+msgid ""
+"There is a problem with the local database. Syncing again or rebooting may "
+"help."
+msgstr ""
+"Hay un problema con la base de datos local. Sincronizar otra vez o reiniciar"
+" puede ayudar."
-# There is no space left
-#: ../src/gtk-ui/sync-ui.c:3218
+#: ../src/gtk-ui/sync-ui.c:3226
msgid "No space on disk"
msgstr "No queda espacio"
-#: ../src/gtk-ui/sync-ui.c:3220
+#: ../src/gtk-ui/sync-ui.c:3228
msgid "Failed to process SyncML"
msgstr "Error al procesar SyncML"
-# the server didn't accept the authorization
-#: ../src/gtk-ui/sync-ui.c:3222
+#: ../src/gtk-ui/sync-ui.c:3230
msgid "Server authorization failed"
msgstr "El servidor no ha aceptado la autorización"
-# Error while analysing the syntax of the configuration file
-#: ../src/gtk-ui/sync-ui.c:3224
+#: ../src/gtk-ui/sync-ui.c:3232
msgid "Failed to parse configuration file"
msgstr "Error al analizar la sintaxis del archivo de configuración"
-# Error while reading the configuration file
-#: ../src/gtk-ui/sync-ui.c:3226
+#: ../src/gtk-ui/sync-ui.c:3234
msgid "Failed to read configuration file"
msgstr "Error al leer del archivo de configuración"
-# The configuration has not been found
-#: ../src/gtk-ui/sync-ui.c:3228
+#: ../src/gtk-ui/sync-ui.c:3236
msgid "No configuration found"
msgstr "No se ha encontrado la configuración"
-# The configuration file has not been found
-#: ../src/gtk-ui/sync-ui.c:3230
+#: ../src/gtk-ui/sync-ui.c:3238
msgid "No configuration file found"
msgstr "No se ha encontrado el archivo de configuración"
-# The server sent an an invalid content
-#: ../src/gtk-ui/sync-ui.c:3232
+#: ../src/gtk-ui/sync-ui.c:3240
msgid "Server sent bad content"
msgstr "El servidor envió un contenido no válido"
-#: ../src/gtk-ui/sync-ui.c:3234
+#: ../src/gtk-ui/sync-ui.c:3242
msgid "Connection certificate has expired"
msgstr "El certificado de conexión está vencido"
-# The connection certificate is not valid
-#: ../src/gtk-ui/sync-ui.c:3236
+#: ../src/gtk-ui/sync-ui.c:3244
msgid "Connection certificate is invalid"
msgstr "El certificado de conexión no es válido"
-#: ../src/gtk-ui/sync-ui.c:3244
-msgid "We were unable to connect to the server. The problem could be temporary or there could be something wrong with the settings."
-msgstr "No hemos podido conectarnos con el servidor. El problema podría ser temporal o podría haber algún problema con la configuración."
+#: ../src/gtk-ui/sync-ui.c:3252
+msgid ""
+"We were unable to connect to the server. The problem could be temporary or "
+"there could be something wrong with the settings."
+msgstr ""
+"No hemos podido conectarnos con el servidor. El problema podría ser temporal"
+" o podría haber algún problema con la configuración."
-# The URL is incorrect
-#: ../src/gtk-ui/sync-ui.c:3251
+#: ../src/gtk-ui/sync-ui.c:3259
msgid "The server URL is bad"
msgstr "La URL del servidor es incorrecta"
-#: ../src/gtk-ui/sync-ui.c:3256
+#: ../src/gtk-ui/sync-ui.c:3264
msgid "The server was not found"
msgstr "No se ha encontrado el servidor"
-#: ../src/gtk-ui/sync-ui.c:3258
+#: ../src/gtk-ui/sync-ui.c:3266
#, c-format
msgid "Error %d"
msgstr "Error: %d"
#. TRANSLATORS: password request dialog contents: title, cancel button
#. * and ok button
-#: ../src/gtk-ui/sync-ui.c:3396
+#: ../src/gtk-ui/sync-ui.c:3404
msgid "Password is required for sync"
msgstr "Se requiere contraseña para la sincronización"
-#: ../src/gtk-ui/sync-ui.c:3400
+#: ../src/gtk-ui/sync-ui.c:3408
msgid "Sync with password"
msgstr "Sincronización con contraseña"
#. TRANSLATORS: password request dialog message, placeholder is service name
-#: ../src/gtk-ui/sync-ui.c:3410
+#: ../src/gtk-ui/sync-ui.c:3418
#, c-format
msgid "Please enter password for syncing with %s:"
msgstr "Por favor ingresa la contraseña para sincronizar con %s:"
@@ -536,7 +574,6 @@ msgstr "<b>Acciones</b>"
msgid "<b>or</b>"
msgstr "<b>o</b>"
-# compatible services
#: ../src/gtk-ui/ui.glade.h:5
msgid "<big>Direct sync</big>"
msgstr "<big>Sincronización directa</big>"
@@ -550,13 +587,11 @@ msgstr "<big>Sincronización de red</big>"
msgid "<big>Restore from backup</big>"
msgstr "<big>Restaurar de la copia de seguridad</big>"
-# compatible services
#. a title in emergency view
#: ../src/gtk-ui/ui.glade.h:10
msgid "<big>Slow sync</big>"
msgstr "<big>Sincronización lenta</big>"
-# compatible services
#. a title in emergency view
#: ../src/gtk-ui/ui.glade.h:12
msgid "<big>Start from scratch</big>"
@@ -570,7 +605,6 @@ msgstr ""
"Una sincronización lenta compara elementos de ambos lados e intenta combinarlos. \n"
"Esto puede fallar en algunos casos, creando duplicados o perdida de información."
-# I had to shorten the string to fit the button
#: ../src/gtk-ui/ui.glade.h:15
msgid "Add new device"
msgstr "Agregar dispositivo"
@@ -581,14 +615,20 @@ msgstr "Agregar servicio"
#. explanation of "Restore backup" function
#: ../src/gtk-ui/ui.glade.h:18
-msgid "Backups are made before every time we Sync. Choose a backup to restore. Any changes you have made since then will be lost."
-msgstr "Las copias de seguridad son realizadas antes cada vez que sincronizamos. Elije una copia de seguridad para restaurar. Cualquier cambio que hayas realizado desde entonces se perderá."
+msgid ""
+"Backups are made before every time we Sync. Choose a backup to restore. Any "
+"changes you have made since then will be lost."
+msgstr ""
+"Las copias de seguridad son realizadas antes cada vez que sincronizamos. "
+"Elije una copia de seguridad para restaurar. Cualquier cambio que hayas "
+"realizado desde entonces se perderá."
#: ../src/gtk-ui/ui.glade.h:19
msgid "Calendar"
msgstr "Calendario"
-#. Button in main view, right side. Keep to below 20 chars per line, feel free to use two lines
+#. Button in main view, right side. Keep to below 20 chars per line, feel free
+#. to use two lines
#: ../src/gtk-ui/ui.glade.h:21
msgid ""
"Change or edit\n"
@@ -620,9 +660,10 @@ msgid ""
msgstr ""
"Borrar todos los datos\n"
"locales y reemplazarlos con\n"
-"datos de %s"
+"datos de Zyb"
-#. button in main view, right side. Keep length to 20 characters or so, use two lines if needed
+#. button in main view, right side. Keep length to 20 characters or so, use
+#. two lines if needed
#: ../src/gtk-ui/ui.glade.h:32
msgid ""
"Fix a sync\n"
@@ -657,202 +698,257 @@ msgstr ""
#: ../src/gtk-ui/ui.glade.h:43
msgid "Use Bluetooth to Sync your data from one device to another."
-msgstr "Utiliza Bluetooth para sincronizar tus datos a partir de un dispositivo a otro. "
+msgstr ""
+"Utiliza Bluetooth para sincronizar tus datos a partir de un dispositivo a "
+"otro. "
#: ../src/gtk-ui/ui.glade.h:44
msgid "You will need to add Bluetooth devices before they can be synced."
-msgstr "Necesitarás agregar dispositivos Bluetooth antes de que puedan ser sincronizados."
+msgstr ""
+"Necesitarás agregar dispositivos Bluetooth antes de que puedan ser "
+"sincronizados."
#: ../src/gtk-ui/sync.desktop.in.h:2
-#: ../src/gtk-ui/sync-gtk.desktop.in.h:2
msgid "Up to date"
msgstr "Al día"
#: ../src/gtk-ui/sync-gtk.desktop.in.h:1
-msgid "Sync (GTK)"
-msgstr "Sync (GTK)"
+msgid "SyncEvolution (GTK)"
+msgstr "SyncEvolution (GTK)"
-#: ../src/gtk-ui/sync-config-widget.c:78
-msgid "ScheduleWorld enables you to keep your contacts, events, tasks, and notes in sync."
-msgstr "ScheduleWorld te permite sincronizar los contactos, eventos, tareas y notas."
+#: ../src/gtk-ui/sync-gtk.desktop.in.h:2
+msgid "Synchronize PIM data"
+msgstr "Sincronizar los datos del gestor de información personal (GIP)"
+
+#: ../src/gtk-ui/sync-config-widget.c:88
+msgid ""
+"ScheduleWorld enables you to keep your contacts, events, tasks, and notes in"
+" sync."
+msgstr ""
+"ScheduleWorld te permite sincronizar los contactos, eventos, tareas y notas."
-#: ../src/gtk-ui/sync-config-widget.c:81
-msgid "Google Sync can back up and synchronize your contacts with your Gmail contacts."
-msgstr "Google Sync puede hacer copia de resguardo y sincroniza tus contactos y con los que tengas en Gmail."
+#: ../src/gtk-ui/sync-config-widget.c:91
+msgid ""
+"Google Sync can back up and synchronize your contacts with your Gmail "
+"contacts."
+msgstr ""
+"Google Sync puede hacer copia de resguardo y sincroniza tus contactos y con "
+"los que tengas en Gmail."
#. TRANSLATORS: Please include the word "demo" (or the equivalent in
#. your language): Funambol is going to be a 90 day demo service
#. in the future
-#: ../src/gtk-ui/sync-config-widget.c:87
-msgid "Back up your contacts and calendar. Sync with a single click, anytime, anywhere (DEMO)."
-msgstr "Resguarda tus contactos y el calendario. Sincronízalos con un clic, en cualquier momento y desde donde sea (DEMO)."
+#: ../src/gtk-ui/sync-config-widget.c:97
+msgid ""
+"Back up your contacts and calendar. Sync with a single click, anytime, "
+"anywhere (DEMO)."
+msgstr ""
+"Resguarda tus contactos y el calendario. Sincronízalos con un clic, en "
+"cualquier momento y desde donde sea (DEMO)."
-#: ../src/gtk-ui/sync-config-widget.c:90
-msgid "Mobical Backup and Restore service allows you to securely back up your personal mobile data for free."
-msgstr "El servicio Mobical Backup and Restore te permite realizar copias de resguardo seguras de la información de tu móvil gratis."
+#: ../src/gtk-ui/sync-config-widget.c:100
+msgid ""
+"Mobical Backup and Restore service allows you to securely back up your "
+"personal mobile data for free."
+msgstr ""
+"El servicio Mobical Backup and Restore te permite realizar copias de "
+"resguardo seguras de la información de tu móvil gratis."
-#: ../src/gtk-ui/sync-config-widget.c:93
-msgid "ZYB is a simple way for people to store and share mobile information online."
-msgstr "ZYB es una manera simple para que la gente almacene y comparta la información móvil en línea."
+#: ../src/gtk-ui/sync-config-widget.c:103
+msgid ""
+"ZYB is a simple way for people to store and share mobile information online."
+msgstr ""
+"ZYB es una manera simple para que la gente almacene y comparta la "
+"información móvil en línea."
-#: ../src/gtk-ui/sync-config-widget.c:96
-msgid "Memotoo lets you access your personal data from any computer connected to the Internet."
-msgstr "Memotoo te permite acceder a tus datos personales desde cualquier computadora conectada con Internet."
+#: ../src/gtk-ui/sync-config-widget.c:106
+msgid ""
+"Memotoo lets you access your personal data from any computer connected to "
+"the Internet."
+msgstr ""
+"Memotoo te permite acceder a tus datos personales desde cualquier "
+"computadora conectada con Internet."
-# Error while analysing the syntax of the configuration file
-#: ../src/gtk-ui/sync-config-widget.c:192
+#: ../src/gtk-ui/sync-config-widget.c:195
msgid "Sorry, failed to save the configuration"
msgstr "Lo sentimos, no se pudo guardar la configuración"
-#: ../src/gtk-ui/sync-config-widget.c:381
+#: ../src/gtk-ui/sync-config-widget.c:445
msgid "Service must have a name and server URL"
msgstr "El servicio debe llamarse de alguna manera y tener una URL"
-#: ../src/gtk-ui/sync-config-widget.c:422
+#. TRANSLATORS: error dialog when creating a new sync configuration
+#: ../src/gtk-ui/sync-config-widget.c:451
+msgid "A username is required for this service"
+msgstr "Este servicio requiere un nombre de usuario"
+
+#: ../src/gtk-ui/sync-config-widget.c:493
#, c-format
-msgid "Do you want to reset the settings for %s? This will not remove any synced information on either end."
-msgstr "¿Deseas reajustar la configuración para %s? Esto no removerá ninguna información sincronizada en las partes."
+msgid ""
+"Do you want to reset the settings for %s? This will not remove any synced "
+"information on either end."
+msgstr ""
+"¿Deseas reajustar la configuración para %s? Esto no removerá ninguna "
+"información sincronizada en las partes."
#. TRANSLATORS: buttons in reset-service warning dialog
-#: ../src/gtk-ui/sync-config-widget.c:426
+#: ../src/gtk-ui/sync-config-widget.c:497
msgid "Yes, reset"
msgstr "Sí, reiniciar"
-#: ../src/gtk-ui/sync-config-widget.c:427
-#: ../src/gtk-ui/sync-config-widget.c:438
+#: ../src/gtk-ui/sync-config-widget.c:498
+#: ../src/gtk-ui/sync-config-widget.c:509
msgid "No, keep settings"
msgstr "No, mantener configuración"
-#: ../src/gtk-ui/sync-config-widget.c:432
+#: ../src/gtk-ui/sync-config-widget.c:503
#, c-format
-msgid "Do you want to delete the settings for %s? This will not remove any synced information on either end but it will remove these settings."
-msgstr "¿Quieres eliminar la configuración de %s? Esto no eliminará ninguna información sincronizada en ninguno de los dos lados, pero eliminará esta configuración. "
+msgid ""
+"Do you want to delete the settings for %s? This will not remove any synced "
+"information on either end but it will remove these settings."
+msgstr ""
+"¿Quieres eliminar la configuración de %s? Esto no eliminará ninguna "
+"información sincronizada en ninguno de los dos lados, pero eliminará esta "
+"configuración. "
#. TRANSLATORS: buttons in delete-service warning dialog
-#: ../src/gtk-ui/sync-config-widget.c:437
+#: ../src/gtk-ui/sync-config-widget.c:508
msgid "Yes, delete"
msgstr "Sí, borrar"
-#: ../src/gtk-ui/sync-config-widget.c:467
+#: ../src/gtk-ui/sync-config-widget.c:539
msgid "Reset settings"
msgstr "Devolver la configuración a sus valores originales"
-#: ../src/gtk-ui/sync-config-widget.c:470
+#: ../src/gtk-ui/sync-config-widget.c:542
msgid "Delete settings"
msgstr "Borrar la configuración"
-# Configuring and using
-#: ../src/gtk-ui/sync-config-widget.c:480
+#: ../src/gtk-ui/sync-config-widget.c:552
msgid "Save and use"
msgstr "Guardar y usar"
-#: ../src/gtk-ui/sync-config-widget.c:483
+#: ../src/gtk-ui/sync-config-widget.c:555
msgid ""
"Save and replace\n"
"current service"
msgstr ""
-"Guardar y reeemplazar\n"
+"Guardar y reemplazar\n"
"servicio actual"
-#: ../src/gtk-ui/sync-config-widget.c:493
+#: ../src/gtk-ui/sync-config-widget.c:563
msgid "Stop using device"
msgstr "Dejar de usar este dispositivo"
-#: ../src/gtk-ui/sync-config-widget.c:496
+#: ../src/gtk-ui/sync-config-widget.c:566
msgid "Stop using service"
msgstr "Dejar de usar este servicio"
-# URI of %s
#. TRANSLATORS: label for an entry in service configuration form.
#. * Placeholder is a source name.
#. * Example: "Appointments URI"
-#: ../src/gtk-ui/sync-config-widget.c:679
+#: ../src/gtk-ui/sync-config-widget.c:749
#, c-format
msgid "%s URI"
msgstr "URI de %s"
#. TRANSLATORS: toggles in service configuration form, placeholder is service
#. * or device name
-#: ../src/gtk-ui/sync-config-widget.c:854
+#: ../src/gtk-ui/sync-config-widget.c:936
#, c-format
msgid "Send changes to %s"
msgstr "Enviar cambios a %s"
-#: ../src/gtk-ui/sync-config-widget.c:859
+#: ../src/gtk-ui/sync-config-widget.c:941
#, c-format
msgid "Receive changes from %s"
msgstr "Recibir cambio de %s"
-#: ../src/gtk-ui/sync-config-widget.c:875
+#: ../src/gtk-ui/sync-config-widget.c:957
msgid "<b>Sync</b>"
msgstr "<b>Sincronizar</b>"
#. TRANSLATORS: label of a entry in service configuration
-#: ../src/gtk-ui/sync-config-widget.c:891
+#: ../src/gtk-ui/sync-config-widget.c:973
msgid "Server address"
msgstr "Dirección del servidor"
-# I had to use colon to avoid the problem of selecting a masculine or feminine gender in the article, which would create problems down the road.
#. TRANSLATORS: explanation before a device template combobox.
#. * Placeholder is a device name like 'Nokia N85' or 'Syncevolution
#. * Client'
-#: ../src/gtk-ui/sync-config-widget.c:967
+#: ../src/gtk-ui/sync-config-widget.c:1049
#, c-format
-msgid "This device looks like it might be a '%s'. If this is not correct, please take a look at the list of supported devices and pick yours if it is listed"
-msgstr "Parece que este dispositivo es: %s'. Si no es cierto, mira la lista de los dispositivos compatibles y selecciona el correcto, si aparece."
+msgid ""
+"This device looks like it might be a '%s'. If this is not correct, please "
+"take a look at the list of supported devices and pick yours if it is listed"
+msgstr ""
+"Parece que este dispositivo es: %s'. Si no es cierto, mira la lista de los "
+"dispositivos compatibles y selecciona el correcto, si aparece."
-#: ../src/gtk-ui/sync-config-widget.c:973
-msgid "We don't know what this device is exactly. Please take a look at the list of supported devices and pick yours if it is listed"
-msgstr "No sabemos qué dispositivo es éste. Mira la lista de los dispositivos compatibles y selecciona el correcto, si aparece."
+#: ../src/gtk-ui/sync-config-widget.c:1055
+#: ../src/gtk-ui/sync-config-widget.c:1915
+msgid ""
+"We don't know what this device is exactly. Please take a look at the list of"
+" supported devices and pick yours if it is listed"
+msgstr ""
+"No sabemos qué dispositivo es éste. Mira la lista de los dispositivos "
+"compatibles y selecciona el correcto, si aparece."
-#: ../src/gtk-ui/sync-config-widget.c:1126
+#: ../src/gtk-ui/sync-config-widget.c:1207
#, c-format
msgid "%s - Bluetooth device"
msgstr "%s - Dispositivo Bluetooth"
#. TRANSLATORS: service title for services that are not based on a
#. * template in service list, the placeholder is the name of the service
-#: ../src/gtk-ui/sync-config-widget.c:1132
+#: ../src/gtk-ui/sync-config-widget.c:1213
#, c-format
msgid "%s - manually setup"
msgstr "%s - configurar manualmente"
-# Open the website
#. TRANSLATORS: link button in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1807
+#: ../src/gtk-ui/sync-config-widget.c:1886
msgid "Launch website"
msgstr "Abrir el sitio web"
-# Configuring and using
#. TRANSLATORS: button in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1816
+#: ../src/gtk-ui/sync-config-widget.c:1895
msgid "Set up now"
msgstr "Configurar ahora"
+#: ../src/gtk-ui/sync-config-widget.c:1953
+msgid "Use these settings"
+msgstr "Usar estos ajustes"
+
#. TRANSLATORS: labels of entries in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1912
+#: ../src/gtk-ui/sync-config-widget.c:1991
msgid "Username"
msgstr "Usuario"
-#: ../src/gtk-ui/sync-config-widget.c:1927
+#: ../src/gtk-ui/sync-config-widget.c:2006
msgid "Password"
msgstr "Contraseña"
#. TRANSLATORS: warning in service configuration form for people
#. who have modified the configuration via other means.
-#: ../src/gtk-ui/sync-config-widget.c:1950
-msgid "Current configuration is more complex than what can be shown here. Changes to sync mode or synced data types will overwrite that configuration."
-msgstr "La configuración es más compleja de lo que podemos mostrar aquí. Cambios en el modo de sincronización o los tipos de datos sincronizados sobrescribirán esa configuración."
+#: ../src/gtk-ui/sync-config-widget.c:2029
+msgid ""
+"Current configuration is more complex than what can be shown here. Changes "
+"to sync mode or synced data types will overwrite that configuration."
+msgstr ""
+"La configuración es más compleja de lo que podemos mostrar aquí. Cambios en "
+"el modo de sincronización o los tipos de datos sincronizados sobrescribirán "
+"esa configuración."
#. TRANSLATORS: this is the epander label for server settings
#. in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1969
+#: ../src/gtk-ui/sync-config-widget.c:2048
msgid "Hide server settings"
msgstr "Ocultar la configuración del servidor"
#. TRANSLATORS: this is the epander label for server settings
#. in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1989
+#: ../src/gtk-ui/sync-config-widget.c:2068
msgid "Show server settings"
msgstr "Mostrar la configuración del servidor"
@@ -860,58 +956,51 @@ msgstr "Mostrar la configuración del servidor"
msgid "Sync in the Sync application"
msgstr "Sincronizar en la aplicación de sincronización"
-# Synchronization is taking place
-#: ../src/syncevo-dbus-server.cpp:5664
+#: ../src/syncevo-dbus-server.cpp:6653
#, c-format
msgid "%s is syncing"
msgstr "%s está sincronizándose"
-#: ../src/syncevo-dbus-server.cpp:5665
+#: ../src/syncevo-dbus-server.cpp:6654
#, c-format
msgid "We have just started to sync your computer with the %s sync service."
-msgstr "Hemos empezado a sincronizar esta máquina con el servicio de sincronización %s."
+msgstr ""
+"Hemos empezado a sincronizar esta máquina con el servicio de sincronización "
+"%s."
#. if sync is successfully started and done
-#: ../src/syncevo-dbus-server.cpp:5679
+#: ../src/syncevo-dbus-server.cpp:6670
#, c-format
msgid "%s sync complete"
msgstr "Se ha completado la sincronización de %s"
-#: ../src/syncevo-dbus-server.cpp:5680
+#: ../src/syncevo-dbus-server.cpp:6671
#, c-format
msgid "We have just finished syncing your computer with the %s sync service."
-msgstr "Hemos terminado de sincronizar esta máquina con el servicio de sincronización %s."
+msgstr ""
+"Hemos terminado de sincronizar esta máquina con el servicio de "
+"sincronización %s."
-#. if sync is successfully started and has errors, or not started successful with a fatal problem
-#: ../src/syncevo-dbus-server.cpp:5685
+#. if sync is successfully started and has errors, or not started successful
+#. with a fatal problem
+#: ../src/syncevo-dbus-server.cpp:6676
msgid "Sync problem."
msgstr "Problemas en la sincronización."
-#: ../src/syncevo-dbus-server.cpp:5686
+#: ../src/syncevo-dbus-server.cpp:6677
msgid "Sorry, there's a problem with your sync that you need to attend to."
-msgstr "Ha ocurrido un problema durante la sincronización que debes solucionar."
+msgstr ""
+"Ha ocurrido un problema durante la sincronización que debes solucionar."
-#: ../src/syncevo-dbus-server.cpp:5759
+#: ../src/syncevo-dbus-server.cpp:6758
msgid "View"
msgstr "Ver"
#. Use "default" as ID because that is what mutter-moblin
#. recognizes: it then skips the action instead of adding it
#. in addition to its own "Dismiss" button (always added).
-#: ../src/syncevo-dbus-server.cpp:5763
+#: ../src/syncevo-dbus-server.cpp:6762
msgid "Dismiss"
msgstr "Cerrar"
-#~ msgid ""
-#~ "Do you want to replace %s with %s? This will not remove any synced "
-#~ "information on either end but you will no longer be able to sync with %s."
-#~ msgstr ""
-#~ "¿Deseas reemplazar %s por %s? Esto no removerá ninguna información "
-#~ "sincronizada en las partes pero no podrás volver a sincronizar con %s."
-#~ msgid "Yes, use %s"
-#~ msgstr "Sí, usa %s"
-#~ msgid "No, use %s"
-#~ msgstr "No, usa %s"
-#~ msgid "Database error"
-#~ msgstr "Error en la base de datos"
diff --git a/po/fi.po b/po/fi.po
index 5bc61171..d20d63fe 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,17 +1,23 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: http://moblin.org/projects/syncevolution\n"
-"POT-Creation-Date: 2010-05-05 09:24+0000\n"
-"PO-Revision-Date: \n"
-"Last-Translator: Eija <eija@wimma.com>\n"
-"Language-Team: \n"
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# Eija Lapinleimu <eija@wimma.com>, 2011.
+# <tomas.galicia@intel.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: syncevolution\n"
+"Report-Msgid-Bugs-To: https://bugs.meego.com/\n"
+"POT-Creation-Date: 2011-12-05 10:21-0800\n"
+"PO-Revision-Date: 2011-12-06 18:07+0000\n"
+"Last-Translator: GLS_Translator_FIN1 <eija@wimma.com>\n"
+"Language-Team: Finnish <gnome-fi-laatu@lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Finnish\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"Plural-Forms: nplurals=2; plural=n!=1;\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. TRANSLATORS: this is the application name that may be used by e.g.
#. the windowmanager
@@ -63,7 +69,7 @@ msgstr "Kyllä, tehdään hidas synkkaus"
msgid "No, cancel sync"
msgstr "Ei, peru synkkaus"
-#. TRANSLATORS: confirmation dialog for refresh-from-server. Placeholder
+#. TRANSLATORS: confirmation dialog for "refresh from peer". Placeholder
#. * is service/device name
#: ../src/gtk-ui/sync-ui.c:424
#, c-format
@@ -71,21 +77,21 @@ msgid ""
"Do you want to delete all local data and replace it with data from %s? This "
"is not usually advised."
msgstr ""
-"Haluatko poistaa kaikki paikalliset tiedot ja korvata ne tiedoilla kohteesta "
-"%s? Tämä ei ole yleensä suositeltavaa."
+"Haluatko poistaa kaikki paikalliset tiedot ja korvata ne tiedoilla kohteesta"
+" %s? Tämä ei ole yleensä suositeltavaa."
-#: ../src/gtk-ui/sync-ui.c:429 ../src/gtk-ui/sync-ui.c:460
+#: ../src/gtk-ui/sync-ui.c:429 ../src/gtk-ui/sync-ui.c:462
msgid "Yes, delete and replace"
msgstr "Kyllä, poista ja korvaa"
-#: ../src/gtk-ui/sync-ui.c:429 ../src/gtk-ui/sync-ui.c:460
-#: ../src/gtk-ui/sync-ui.c:1580
+#: ../src/gtk-ui/sync-ui.c:429 ../src/gtk-ui/sync-ui.c:462
+#: ../src/gtk-ui/sync-ui.c:1610
msgid "No"
msgstr "Ei"
-#. TRANSLATORS: confirmation dialog for refresh-from-client. Placeholder
+#. TRANSLATORS: confirmation dialog for "refresh from local side". Placeholder
#. * is service/device name
-#: ../src/gtk-ui/sync-ui.c:455
+#: ../src/gtk-ui/sync-ui.c:457
#, c-format
msgid ""
"Do you want to delete all data in %s and replace it with your local data? "
@@ -94,48 +100,47 @@ msgstr ""
"Haluatko poistaa kaikki tiedot kohteessa %s ja korvata ne paikallisilla "
"tiedoillasi? Tämä ei ole yleensä suositeltavaa."
-#: ../src/gtk-ui/sync-ui.c:487
+#: ../src/gtk-ui/sync-ui.c:491
msgid "Trying to cancel sync"
msgstr "Yritetään perua synkkaus"
-#: ../src/gtk-ui/sync-ui.c:529
+#: ../src/gtk-ui/sync-ui.c:533
msgid "No service or device selected"
msgstr "Palvelua tai laitetta ei ole valittuna"
#. TRANSLATORS: This is the title on main view. Placeholder is
#. * the service name. Example: "Google - synced just now"
-#: ../src/gtk-ui/sync-ui.c:537
+#: ../src/gtk-ui/sync-ui.c:541
#, c-format
msgid "%s - synced just now"
msgstr "%s - synkataan juuri nyt"
-#: ../src/gtk-ui/sync-ui.c:541
+#: ../src/gtk-ui/sync-ui.c:545
#, c-format
msgid "%s - synced a minute ago"
msgstr "%s - Synkattu viimeksi minuutti sitten"
-#: ../src/gtk-ui/sync-ui.c:545
+#: ../src/gtk-ui/sync-ui.c:549
#, c-format
msgid "%s - synced %ld minutes ago"
msgstr "%s - Synkattu viimeksi %ld minuuttia sitten"
-#: ../src/gtk-ui/sync-ui.c:550
+#: ../src/gtk-ui/sync-ui.c:554
#, c-format
msgid "%s - synced an hour ago"
msgstr "%s - Synkattu viimeksi tunti sitten"
-#: ../src/gtk-ui/sync-ui.c:554
+#: ../src/gtk-ui/sync-ui.c:558
#, c-format
msgid "%s - synced %ld hours ago"
msgstr "%s - Synkattu viimeksi %ld tuntia sitten"
-# last synced yesterday
-#: ../src/gtk-ui/sync-ui.c:559
+#: ../src/gtk-ui/sync-ui.c:563
#, c-format
msgid "%s - synced a day ago"
msgstr "%s - Synkattu viimeksi eilen"
-#: ../src/gtk-ui/sync-ui.c:563
+#: ../src/gtk-ui/sync-ui.c:567
#, c-format
msgid "%s - synced %ld days ago"
msgstr "%s - Synkattu viimeksi %ld päivää sitten"
@@ -143,35 +148,36 @@ msgstr "%s - Synkattu viimeksi %ld päivää sitten"
#. TRANSLATORS: Action button in info bar in main view. Shown with e.g.
#. * "You've just restored a backup. The changes have not been "
#. * "synced with %s yet"
-#: ../src/gtk-ui/sync-ui.c:612 ../src/gtk-ui/sync-ui.c:726
+#: ../src/gtk-ui/sync-ui.c:616 ../src/gtk-ui/sync-ui.c:701
msgid "Sync now"
msgstr "Synkkaa nyt"
#. TRANSLATORS: Action button in info bar in main view. Shown with e.g.
#. * "A normal sync is not possible at this time..." message.
#. * "Other options" will open Emergency view
-#: ../src/gtk-ui/sync-ui.c:618 ../src/gtk-ui/ui.glade.h:37
+#: ../src/gtk-ui/sync-ui.c:622 ../src/gtk-ui/ui.glade.h:37
msgid "Slow sync"
-msgstr "Hidas\n"
+msgstr ""
+"Hidas\n"
"synkkaus"
-#: ../src/gtk-ui/sync-ui.c:619
+#: ../src/gtk-ui/sync-ui.c:623
msgid "Other options..."
msgstr "Muut asetukset..."
#. TRANSLATORS: Action button in info bar in main view. Shown e.g.
#. * when no service is selected. Will open configuration view
-#: ../src/gtk-ui/sync-ui.c:624
+#: ../src/gtk-ui/sync-ui.c:628
msgid "Select sync service"
msgstr "Määritä synkkauspalvelu"
#. TRANSLATORS: Action button in info bar in main view. Shown e.g.
#. * login to service fails. Will open configuration view for this service
-#: ../src/gtk-ui/sync-ui.c:629
+#: ../src/gtk-ui/sync-ui.c:633
msgid "Edit service settings"
msgstr "Muuta palveluasetuksia"
-#: ../src/gtk-ui/sync-ui.c:700
+#: ../src/gtk-ui/sync-ui.c:709
msgid ""
"You haven't selected a sync service or device yet. Sync services let you "
"synchronize your data between your netbook and a web service. You can also "
@@ -181,33 +187,32 @@ msgstr ""
"mahdollistaa Netbookisi ja verkkopalvelusi tietojen synkkauksen. Voit myös "
"synkata suoraan joitakin laitteita."
-# using taas instead of uudelleen to fix a truncation
-#: ../src/gtk-ui/sync-ui.c:722
+#: ../src/gtk-ui/sync-ui.c:729
msgid "Sync again"
msgstr "Synkkaa taas"
-#: ../src/gtk-ui/sync-ui.c:743
+#: ../src/gtk-ui/sync-ui.c:748
msgid "Restoring"
msgstr "Palautetaan"
-#: ../src/gtk-ui/sync-ui.c:745
+#: ../src/gtk-ui/sync-ui.c:750
msgid "Syncing"
msgstr "Synkkaus käynnissä"
#. TRANSLATORS: This is for the button in main view, right side.
#. Keep line length below ~20 characters, use two lines if needed
-#: ../src/gtk-ui/sync-ui.c:757 ../src/gtk-ui/sync-ui.c:3374
+#: ../src/gtk-ui/sync-ui.c:762 ../src/gtk-ui/sync-ui.c:3407
msgid "Cancel sync"
msgstr "Peru synkkaus"
-#: ../src/gtk-ui/sync-ui.c:922
+#: ../src/gtk-ui/sync-ui.c:927
msgid "Back to sync"
msgstr "Takaisin synkkaukseen"
#. TRANSLATORS: label for checkbutton/toggle in main view.
#. * Please stick to similar length strings or break the line with
#. * "\n" if absolutely needed
-#: ../src/gtk-ui/sync-ui.c:1223
+#: ../src/gtk-ui/sync-ui.c:1229
msgid "Automatic sync"
msgstr "Automaattinen synkkaus"
@@ -215,19 +220,19 @@ msgstr "Automaattinen synkkaus"
#. * currently selected data sources. First placeholder is service/device
#. * name, second a comma separeted list of sources.
#. * E.g. "Affected data: Google Contacts, Appointments"
-#: ../src/gtk-ui/sync-ui.c:1494
+#: ../src/gtk-ui/sync-ui.c:1524
#, c-format
msgid "Affected data: %s %s"
msgstr "Koskee tietoja: %s %s"
-#: ../src/gtk-ui/sync-ui.c:1499
+#: ../src/gtk-ui/sync-ui.c:1529
#, c-format
msgid "Affected data: none"
msgstr "Koskee tietoja: ei mitään"
#. TRANSLATORS: confirmation for restoring a backup. placeholder is the
#. * backup time string defined below
-#: ../src/gtk-ui/sync-ui.c:1577
+#: ../src/gtk-ui/sync-ui.c:1607
#, c-format
msgid ""
"Do you want to restore the backup from %s? All changes you have made since "
@@ -236,31 +241,31 @@ msgstr ""
"Haluatko palauttaa varmuuskopioinnin kohteesta %s? Menetät kaikki tämän "
"jälkeen tekemäsi muutokset."
-#: ../src/gtk-ui/sync-ui.c:1580
+#: ../src/gtk-ui/sync-ui.c:1610
msgid "Yes, restore"
msgstr "Kyllä, palauta"
#. TRANSLATORS: date/time for strftime(), used in emergency view backup
#. * label. Any time format that shows date and time is good.
-#: ../src/gtk-ui/sync-ui.c:1612
+#: ../src/gtk-ui/sync-ui.c:1642
#, c-format
msgid "%x %X"
msgstr "%x %X"
#. TRANSLATORS: label for a backup in emergency view. Placeholder is
#. * service or device name
-#: ../src/gtk-ui/sync-ui.c:1631
+#: ../src/gtk-ui/sync-ui.c:1661
#, c-format
msgid "Backed up before syncing with %s"
msgstr "Varmuuskopioitu ennen sunkkausta kohteen %s kanssa"
-#: ../src/gtk-ui/sync-ui.c:1648
+#: ../src/gtk-ui/sync-ui.c:1678
msgid "Restore"
msgstr "Palauttaa"
#. TRANSLATORS: this is an explanation in Emergency view.
#. * Placeholder is a service/device name
-#: ../src/gtk-ui/sync-ui.c:1755
+#: ../src/gtk-ui/sync-ui.c:1785
#, c-format
msgid ""
"A normal sync with %s is not possible at this time. You can do a slow two-"
@@ -270,10 +275,10 @@ msgid ""
msgstr ""
"Normaali synkkaus kohteen %s ei ole mahdollinen täällä kertaa. Voit tehdä "
"hitaan kaksisuuntaisen synkkauksen tai aloittaa nollasta. Voit myös "
-"palauttaa varmuuskopion, mutta joko hidas synkkaus tai aloittaminen nollasta "
-"vaaditaan, ennen kuin normaali synkkaus on mahdollinen."
+"palauttaa varmuuskopion, mutta joko hidas synkkaus tai aloittaminen nollasta"
+" vaaditaan, ennen kuin normaali synkkaus on mahdollinen."
-#: ../src/gtk-ui/sync-ui.c:1765
+#: ../src/gtk-ui/sync-ui.c:1795
#, c-format
msgid ""
"If something has gone horribly wrong, you can try a slow sync, start from "
@@ -285,7 +290,7 @@ msgstr ""
#. TRANSLATORS: These are a buttons in Emergency view. Placeholder is a
#. * service/device name. Please don't use too long lines, but feel free to
#. * use several lines.
-#: ../src/gtk-ui/sync-ui.c:1774
+#: ../src/gtk-ui/sync-ui.c:1804
#, c-format
msgid ""
"Delete all your local\n"
@@ -296,7 +301,7 @@ msgstr ""
" tiedot ja korvaa ne \n"
"tiedoilla kohteesta %s"
-#: ../src/gtk-ui/sync-ui.c:1780
+#: ../src/gtk-ui/sync-ui.c:1810
#, c-format
msgid ""
"Delete all data on\n"
@@ -307,11 +312,11 @@ msgstr ""
"%s ja korvaa \n"
"paikallisilla tiedoilla"
-#: ../src/gtk-ui/sync-ui.c:2242
+#: ../src/gtk-ui/sync-ui.c:2275
msgid "Failed to get list of supported services from SyncEvolution"
msgstr "Tuettujen palveluiden listan saaminen SyncEvolutionista epäonnistui"
-#: ../src/gtk-ui/sync-ui.c:2296
+#: ../src/gtk-ui/sync-ui.c:2329
msgid ""
"There was a problem communicating with the sync process. Please try again "
"later."
@@ -319,63 +324,62 @@ msgstr ""
"Ilmeni onglema kommunikoitaessa synkkausprosessin kanssa. Yritä myöhemmin "
"uudelleen."
-#: ../src/gtk-ui/sync-ui.c:2355
+#: ../src/gtk-ui/sync-ui.c:2388
msgid "Restore failed"
msgstr "Palauttaminen epäonnistui"
-# changed to "sync error" in order to fix a truncation in the UI.
-#: ../src/gtk-ui/sync-ui.c:2358 ../src/gtk-ui/sync-ui.c:3243
+#: ../src/gtk-ui/sync-ui.c:2391 ../src/gtk-ui/sync-ui.c:3276
msgid "Sync failed"
msgstr "Synkkaus epäonnistui"
-#: ../src/gtk-ui/sync-ui.c:2364
+#: ../src/gtk-ui/sync-ui.c:2397
msgid "Restore complete"
msgstr "Palautus valmis"
-#: ../src/gtk-ui/sync-ui.c:2367
+#: ../src/gtk-ui/sync-ui.c:2400
msgid "Sync complete"
msgstr "Synkkaus valmis"
-#: ../src/gtk-ui/sync-ui.c:2459
+#: ../src/gtk-ui/sync-ui.c:2492
#, c-format
msgid "Preparing '%s'"
msgstr "Valmistellaan: '%s'"
-#: ../src/gtk-ui/sync-ui.c:2462
+#: ../src/gtk-ui/sync-ui.c:2495
#, c-format
msgid "Receiving '%s'"
msgstr "Vastaanotetaan: '%s'"
-#: ../src/gtk-ui/sync-ui.c:2465
+#: ../src/gtk-ui/sync-ui.c:2498
#, c-format
msgid "Sending '%s'"
msgstr "Lähetetään: '%s'"
-#: ../src/gtk-ui/sync-ui.c:2586
+#: ../src/gtk-ui/sync-ui.c:2619
#, c-format
msgid "There was one remote rejection."
msgid_plural "There were %ld remote rejections."
msgstr[0] "Tapahtui yksi etähylkäys"
msgstr[1] "Tapahtui %ld etähylkäystä"
-#: ../src/gtk-ui/sync-ui.c:2591
+#: ../src/gtk-ui/sync-ui.c:2624
#, c-format
msgid "There was one local rejection."
msgid_plural "There were %ld local rejections."
msgstr[0] "Tapahtui yksi paikallinen hylkäys"
msgstr[1] "Tapahtui %ld paikallista hylkäystä"
-#: ../src/gtk-ui/sync-ui.c:2596
+#: ../src/gtk-ui/sync-ui.c:2629
#, c-format
msgid "There were %ld local rejections and %ld remote rejections."
msgstr "Tapahtui %ld paikallista hylkäystä ja %ld etähylkäystä"
-#: ../src/gtk-ui/sync-ui.c:2601
+#: ../src/gtk-ui/sync-ui.c:2634
#, c-format
msgid "Last time: No changes."
msgstr "Viime kerta: ei muutoksia"
-#: ../src/gtk-ui/sync-ui.c:2603
+#: ../src/gtk-ui/sync-ui.c:2636
#, c-format
msgid "Last time: Sent one change."
msgid_plural "Last time: Sent %ld changes."
@@ -385,21 +389,21 @@ msgstr[1] "Viime kerralla: %ld muutosta lähetetty."
#. This is about changes made to the local data. Not all of these
#. changes were requested by the remote server, so "applied"
#. is a better word than "received" (bug #5185).
-#: ../src/gtk-ui/sync-ui.c:2611
+#: ../src/gtk-ui/sync-ui.c:2644
#, c-format
msgid "Last time: Applied one change."
msgid_plural "Last time: Applied %ld changes."
msgstr[0] "Viime kerralla: yksi muutos sovellettu."
msgstr[1] "Viime kerralla: %ld muutosta sovellettu."
-#: ../src/gtk-ui/sync-ui.c:2616
+#: ../src/gtk-ui/sync-ui.c:2649
#, c-format
msgid "Last time: Applied %ld changes and sent %ld changes."
msgstr "Viime kerralla: Sovellettu %ld muutosta ja lähetetty %ld muutosta."
#. TRANSLATORS: the placeholder is a error message (hopefully)
#. * explaining the problem
-#: ../src/gtk-ui/sync-ui.c:2823
+#: ../src/gtk-ui/sync-ui.c:2856
#, c-format
msgid ""
"There was a problem with last sync:\n"
@@ -408,7 +412,7 @@ msgstr ""
"Ilmeni onglema viimeisen synkkauksen kanssa :\n"
"%s"
-#: ../src/gtk-ui/sync-ui.c:2833
+#: ../src/gtk-ui/sync-ui.c:2866
#, c-format
msgid ""
"You've just restored a backup. The changes have not been synced with %s yet"
@@ -416,63 +420,63 @@ msgstr ""
"Olet juuri palauttanut varmuuskopion. Muutoksia ei ole vielä synkattu "
"kohteen %s kanssa."
-#: ../src/gtk-ui/sync-ui.c:3121
+#: ../src/gtk-ui/sync-ui.c:3154
msgid "Waiting for current operation to finish..."
msgstr "Nykyisen toiminnon päättymistä odotetaan..."
#. TRANSLATORS: next strings are error messages.
-#: ../src/gtk-ui/sync-ui.c:3155
+#: ../src/gtk-ui/sync-ui.c:3188
msgid ""
-"A normal sync is not possible at this time. The server suggests a slow sync, "
-"but this might not always be what you want if both ends already have data."
+"A normal sync is not possible at this time. The server suggests a slow sync,"
+" but this might not always be what you want if both ends already have data."
msgstr ""
"Normaali synkkaus ei ole mahdollinen tällä kertaa. Palvelin suosittelee "
"hidasta synkkausta, mutta tämä ei aina ehkä ole sitä, mitä haluat, jos "
"molemmissa päissä on jo tietoja."
-# ...service ended unexpectedly
-#: ../src/gtk-ui/sync-ui.c:3159
+#: ../src/gtk-ui/sync-ui.c:3192
msgid "The sync process died unexpectedly."
msgstr "Synkkauspalvelu loppui odottamattomasti"
-#: ../src/gtk-ui/sync-ui.c:3164
+#: ../src/gtk-ui/sync-ui.c:3197
msgid ""
-"Password request was not answered. You can save the password in the settings "
-"to prevent the request."
+"Password request was not answered. You can save the password in the settings"
+" to prevent the request."
msgstr ""
"Salasanapyyntöön ei vastattu. Voit tallentaa salasanan asetuksissa "
"estääksesi pyynnön."
#. TODO use the service device name here, this is a remote problem
-#: ../src/gtk-ui/sync-ui.c:3168
+#: ../src/gtk-ui/sync-ui.c:3201
msgid "There was a problem processing sync request. Trying again may help."
msgstr ""
"Synkkauspyynnön prosessoimisessa ilmeni ongelma. Voi auttaa, jos yrität "
"uudelleen."
-#: ../src/gtk-ui/sync-ui.c:3174
+#: ../src/gtk-ui/sync-ui.c:3207
msgid ""
"Failed to login. Could there be a problem with your username or password?"
msgstr ""
"Sisäänkirjautuminen ei onnistunut. Voisiko käyttäjänimen tai salasanan "
"kanssa olla ongelma?"
-#: ../src/gtk-ui/sync-ui.c:3177
+#: ../src/gtk-ui/sync-ui.c:3210
msgid "Forbidden"
msgstr "Kielletty"
#. TRANSLATORS: data source means e.g. calendar or addressbook
-#: ../src/gtk-ui/sync-ui.c:3183
+#: ../src/gtk-ui/sync-ui.c:3216
msgid ""
-"A data source could not be found. Could there be a problem with the settings?"
+"A data source could not be found. Could there be a problem with the "
+"settings?"
msgstr "Tietolähdettä ei löydy. Voisiko asetusten kanssa olla ongelma?"
-#: ../src/gtk-ui/sync-ui.c:3187
+#: ../src/gtk-ui/sync-ui.c:3220
msgid "Remote database error"
msgstr "Etätietokantavirhe"
#. This can happen when EDS is borked, restart it may help...
-#: ../src/gtk-ui/sync-ui.c:3190
+#: ../src/gtk-ui/sync-ui.c:3223
msgid ""
"There is a problem with the local database. Syncing again or rebooting may "
"help."
@@ -480,48 +484,47 @@ msgstr ""
"Paikallisen tietokannan kanssa on ongelmia. Voi auttaa, jos synkkaat "
"uudelleen tai buuttaat."
-#: ../src/gtk-ui/sync-ui.c:3193
+#: ../src/gtk-ui/sync-ui.c:3226
msgid "No space on disk"
msgstr "Levykkeen tila lopussa"
-#: ../src/gtk-ui/sync-ui.c:3195
+#: ../src/gtk-ui/sync-ui.c:3228
msgid "Failed to process SyncML"
msgstr "SyncML:n käsittely epäonnistui"
-#: ../src/gtk-ui/sync-ui.c:3197
+#: ../src/gtk-ui/sync-ui.c:3230
msgid "Server authorization failed"
msgstr "Serverin varmennus epäonnistui"
-#: ../src/gtk-ui/sync-ui.c:3199
+#: ../src/gtk-ui/sync-ui.c:3232
msgid "Failed to parse configuration file"
msgstr "Asetustiedoston jäsennys epäonnistui"
-#: ../src/gtk-ui/sync-ui.c:3201
+#: ../src/gtk-ui/sync-ui.c:3234
msgid "Failed to read configuration file"
msgstr "Asetustiedoston lukeminen epäonnistui"
-#: ../src/gtk-ui/sync-ui.c:3203
+#: ../src/gtk-ui/sync-ui.c:3236
msgid "No configuration found"
msgstr "Asetuksia ei löydy"
-#: ../src/gtk-ui/sync-ui.c:3205
+#: ../src/gtk-ui/sync-ui.c:3238
msgid "No configuration file found"
msgstr "Asetustiedostoa ei löytynyt"
-# using erroneous instead of bad
-#: ../src/gtk-ui/sync-ui.c:3207
+#: ../src/gtk-ui/sync-ui.c:3240
msgid "Server sent bad content"
msgstr "Serveri lähetti virheellistä sisältöä"
-#: ../src/gtk-ui/sync-ui.c:3209
+#: ../src/gtk-ui/sync-ui.c:3242
msgid "Connection certificate has expired"
msgstr "Yhteyden varmenne on vanhentunut"
-#: ../src/gtk-ui/sync-ui.c:3211
+#: ../src/gtk-ui/sync-ui.c:3244
msgid "Connection certificate is invalid"
msgstr "Yhteyden varmenne on virheellinen"
-#: ../src/gtk-ui/sync-ui.c:3219
+#: ../src/gtk-ui/sync-ui.c:3252
msgid ""
"We were unable to connect to the server. The problem could be temporary or "
"there could be something wrong with the settings."
@@ -529,31 +532,31 @@ msgstr ""
"Palvelimeen ei saada yhteyttä. Ongelma voi olla tilapäinen tai palvelimen "
"asetuksissa voi olla virhe. "
-#: ../src/gtk-ui/sync-ui.c:3226
+#: ../src/gtk-ui/sync-ui.c:3259
msgid "The server URL is bad"
msgstr "Serverin URL on virheellinen"
-#: ../src/gtk-ui/sync-ui.c:3231
+#: ../src/gtk-ui/sync-ui.c:3264
msgid "The server was not found"
msgstr "Serveriä ei löydy"
-#: ../src/gtk-ui/sync-ui.c:3233
+#: ../src/gtk-ui/sync-ui.c:3266
#, c-format
msgid "Error %d"
msgstr "Virhe: %d"
#. TRANSLATORS: password request dialog contents: title, cancel button
#. * and ok button
-#: ../src/gtk-ui/sync-ui.c:3371
+#: ../src/gtk-ui/sync-ui.c:3404
msgid "Password is required for sync"
msgstr "Synkkaukseen vaaditaan salasana."
-#: ../src/gtk-ui/sync-ui.c:3375
+#: ../src/gtk-ui/sync-ui.c:3408
msgid "Sync with password"
msgstr "Synkkaa salasanan kanssa"
#. TRANSLATORS: password request dialog message, placeholder is service name
-#: ../src/gtk-ui/sync-ui.c:3385
+#: ../src/gtk-ui/sync-ui.c:3418
#, c-format
msgid "Please enter password for syncing with %s:"
msgstr "Anna salasana synkkaukseen kohteen %s kanssa:"
@@ -596,10 +599,8 @@ msgid ""
"A slow sync compares items from both sides and tries to merge them. \n"
"This may fail in some cases, leading to duplicates or lost information."
msgstr ""
-"Hidas synkkaus vertailee kohteita molemmista päistä ja yrittää yhdistää "
-"ne. \n"
-"Tämä saattaa joissakin tapauksissa epäonnistua, johtaa kaksoiskappeleiden "
-"muodostumiseen tai tietojen menettämiseen."
+"Hidas synkkaus vertailee kohteita molemmista päistä ja yrittää yhdistää ne. \n"
+"Tämä saattaa joissakin tapauksissa epäonnistua, johtaa kaksoiskappeleiden muodostumiseen tai tietojen menettämiseen."
#: ../src/gtk-ui/ui.glade.h:15
msgid "Add new device"
@@ -622,11 +623,8 @@ msgstr ""
msgid "Calendar"
msgstr "Kalenteri"
-# use:
-# "Muuta\n
-# synkkausta"
-# if not enough space. This translates as "change sync".
-#. Button in main view, right side. Keep to below 20 chars per line, feel free to use two lines
+#. Button in main view, right side. Keep to below 20 chars per line, feel free
+#. to use two lines
#: ../src/gtk-ui/ui.glade.h:21
msgid ""
"Change or edit\n"
@@ -660,7 +658,8 @@ msgstr ""
"tiedot ja korvaa\n"
"ne Zybin tiedoilla"
-#. button in main view, right side. Keep length to 20 characters or so, use two lines if needed
+#. button in main view, right side. Keep length to 20 characters or so, use
+#. two lines if needed
#: ../src/gtk-ui/ui.glade.h:32
msgid ""
"Fix a sync\n"
@@ -671,12 +670,10 @@ msgstr ""
#: ../src/gtk-ui/ui.glade.h:34
msgid ""
-"If you don't see your service above but know that your sync provider uses "
-"SyncML\n"
+"If you don't see your service above but know that your sync provider uses SyncML\n"
"you can setup a service manually."
msgstr ""
-"Jos et näe palveluasi yllä mutta tiedät, että synkkauspalvelun tarjoajasi "
-"käyttää\n"
+"Jos et näe palveluasi yllä mutta tiedät, että synkkauspalvelun tarjoajasi käyttää\n"
"SyncML:ää, voit määrittää palvelun manuaalisesti."
#: ../src/gtk-ui/ui.glade.h:36
@@ -689,8 +686,7 @@ msgstr "Synkkauksen hätätila"
#: ../src/gtk-ui/ui.glade.h:41
msgid ""
-"To sync you'll need a network connection and an account with a sync "
-"service.\n"
+"To sync you'll need a network connection and an account with a sync service.\n"
"We support the following services: "
msgstr ""
"Synkkaus edellyttää verkkoyhteyttä ja synkkauspalvelutiliä.\n"
@@ -704,23 +700,27 @@ msgstr "Käytä Bluetoothia ja synkkaa tiedot yhdeltä laitteelta toiselle."
msgid "You will need to add Bluetooth devices before they can be synced."
msgstr "Sinun täytyy lisätä Bluetooth-laitteet ennen kuin niitä voi synkata."
-#: ../src/gtk-ui/sync.desktop.in.h:2 ../src/gtk-ui/sync-gtk.desktop.in.h:2
+#: ../src/gtk-ui/sync.desktop.in.h:2
msgid "Up to date"
msgstr "Ajantasalla"
#: ../src/gtk-ui/sync-gtk.desktop.in.h:1
-msgid "Sync (GTK)"
-msgstr "Synkkaa (GTK)"
+msgid "SyncEvolution (GTK)"
+msgstr "SyncEvolution (GTK)"
-#: ../src/gtk-ui/sync-config-widget.c:78
+#: ../src/gtk-ui/sync-gtk.desktop.in.h:2
+msgid "Synchronize PIM data"
+msgstr "Synkronoi PIM-tiedot"
+
+#: ../src/gtk-ui/sync-config-widget.c:88
msgid ""
-"ScheduleWorld enables you to keep your contacts, events, tasks, and notes in "
-"sync."
+"ScheduleWorld enables you to keep your contacts, events, tasks, and notes in"
+" sync."
msgstr ""
"ScheduleWorld mahdollistaa kontaktien,tapahtumien,tehtävien, ja viestien "
"synkkaamisen. "
-#: ../src/gtk-ui/sync-config-widget.c:81
+#: ../src/gtk-ui/sync-config-widget.c:91
msgid ""
"Google Sync can back up and synchronize your contacts with your Gmail "
"contacts."
@@ -729,7 +729,7 @@ msgstr "Google Sync voi kopioida ja synkata kontaktisi Gmail-kontakteihisi"
#. TRANSLATORS: Please include the word "demo" (or the equivalent in
#. your language): Funambol is going to be a 90 day demo service
#. in the future
-#: ../src/gtk-ui/sync-config-widget.c:87
+#: ../src/gtk-ui/sync-config-widget.c:97
msgid ""
"Back up your contacts and calendar. Sync with a single click, anytime, "
"anywhere (DEMO)."
@@ -737,7 +737,7 @@ msgstr ""
"Varmuuskopioi kontaktisi ja kalenterisi. Synkkaa yhdellä klikkauksella, "
"milloin ja missä tahansa (DEMO)."
-#: ../src/gtk-ui/sync-config-widget.c:90
+#: ../src/gtk-ui/sync-config-widget.c:100
msgid ""
"Mobical Backup and Restore service allows you to securely back up your "
"personal mobile data for free."
@@ -745,12 +745,13 @@ msgstr ""
"Mobical-varmuuskopio- ja palautuspalvelun avulla voit varmuuskopioida omat "
"mobiilitietosi ilmaiseksi ja varmasti."
-#: ../src/gtk-ui/sync-config-widget.c:93
+#: ../src/gtk-ui/sync-config-widget.c:103
msgid ""
"ZYB is a simple way for people to store and share mobile information online."
-msgstr "ZYB on yksinkertainen tapa tallentaa ja jakaa mobiilitietoja verkossa."
+msgstr ""
+"ZYB on yksinkertainen tapa tallentaa ja jakaa mobiilitietoja verkossa."
-#: ../src/gtk-ui/sync-config-widget.c:96
+#: ../src/gtk-ui/sync-config-widget.c:106
msgid ""
"Memotoo lets you access your personal data from any computer connected to "
"the Internet."
@@ -758,15 +759,20 @@ msgstr ""
"Mometoon avulla voi käyttää omia tietoja kaikilta koneilta, joilla on "
"Internet-yhteys. "
-#: ../src/gtk-ui/sync-config-widget.c:192
+#: ../src/gtk-ui/sync-config-widget.c:195
msgid "Sorry, failed to save the configuration"
msgstr "Konfiguraation tallennus epäonnistui"
-#: ../src/gtk-ui/sync-config-widget.c:381
+#: ../src/gtk-ui/sync-config-widget.c:445
msgid "Service must have a name and server URL"
msgstr "Palvelulla pitää olla nimi ja palvelimen URL"
-#: ../src/gtk-ui/sync-config-widget.c:422
+#. TRANSLATORS: error dialog when creating a new sync configuration
+#: ../src/gtk-ui/sync-config-widget.c:451
+msgid "A username is required for this service"
+msgstr "Tähän palveluun vaaditaan käyttäjätunnus"
+
+#: ../src/gtk-ui/sync-config-widget.c:493
#, c-format
msgid ""
"Do you want to reset the settings for %s? This will not remove any synced "
@@ -776,16 +782,16 @@ msgstr ""
"tietoja kummassakaan päässä."
#. TRANSLATORS: buttons in reset-service warning dialog
-#: ../src/gtk-ui/sync-config-widget.c:426
+#: ../src/gtk-ui/sync-config-widget.c:497
msgid "Yes, reset"
msgstr "Kyllä, nollaa."
-#: ../src/gtk-ui/sync-config-widget.c:427
-#: ../src/gtk-ui/sync-config-widget.c:438
+#: ../src/gtk-ui/sync-config-widget.c:498
+#: ../src/gtk-ui/sync-config-widget.c:509
msgid "No, keep settings"
msgstr "Ei, säilytä asetukset"
-#: ../src/gtk-ui/sync-config-widget.c:432
+#: ../src/gtk-ui/sync-config-widget.c:503
#, c-format
msgid ""
"Do you want to delete the settings for %s? This will not remove any synced "
@@ -795,23 +801,23 @@ msgstr ""
"tietoja kummassakaan päässä, mutta poistaa nämä asetukset. "
#. TRANSLATORS: buttons in delete-service warning dialog
-#: ../src/gtk-ui/sync-config-widget.c:437
+#: ../src/gtk-ui/sync-config-widget.c:508
msgid "Yes, delete"
msgstr "Kyllä, poista"
-#: ../src/gtk-ui/sync-config-widget.c:467
+#: ../src/gtk-ui/sync-config-widget.c:539
msgid "Reset settings"
msgstr "Nollaa asetukset"
-#: ../src/gtk-ui/sync-config-widget.c:470
+#: ../src/gtk-ui/sync-config-widget.c:542
msgid "Delete settings"
msgstr "Poista asetukset"
-#: ../src/gtk-ui/sync-config-widget.c:480
+#: ../src/gtk-ui/sync-config-widget.c:552
msgid "Save and use"
msgstr "Tallenna ja käytä"
-#: ../src/gtk-ui/sync-config-widget.c:483
+#: ../src/gtk-ui/sync-config-widget.c:555
msgid ""
"Save and replace\n"
"current service"
@@ -819,48 +825,47 @@ msgstr ""
"Tallenna ja korvaa\n"
"nykyinen palvelu"
-#: ../src/gtk-ui/sync-config-widget.c:493
+#: ../src/gtk-ui/sync-config-widget.c:563
msgid "Stop using device"
msgstr "Lopeta laitteen käyttö"
-#: ../src/gtk-ui/sync-config-widget.c:496
+#: ../src/gtk-ui/sync-config-widget.c:566
msgid "Stop using service"
msgstr "Lopeta palvelun käyttö"
-# URI for target %s
#. TRANSLATORS: label for an entry in service configuration form.
#. * Placeholder is a source name.
#. * Example: "Appointments URI"
-#: ../src/gtk-ui/sync-config-widget.c:679
+#: ../src/gtk-ui/sync-config-widget.c:749
#, c-format
msgid "%s URI"
msgstr "Kohteen %s URI"
#. TRANSLATORS: toggles in service configuration form, placeholder is service
#. * or device name
-#: ../src/gtk-ui/sync-config-widget.c:854
+#: ../src/gtk-ui/sync-config-widget.c:936
#, c-format
msgid "Send changes to %s"
msgstr "Lähetä muutokset kohteeseen %s"
-#: ../src/gtk-ui/sync-config-widget.c:859
+#: ../src/gtk-ui/sync-config-widget.c:941
#, c-format
msgid "Receive changes from %s"
msgstr "Vastaanota muutokset kohteesta %s"
-#: ../src/gtk-ui/sync-config-widget.c:875
+#: ../src/gtk-ui/sync-config-widget.c:957
msgid "<b>Sync</b>"
msgstr "<b>Synkkaa</b>"
#. TRANSLATORS: label of a entry in service configuration
-#: ../src/gtk-ui/sync-config-widget.c:891
+#: ../src/gtk-ui/sync-config-widget.c:973
msgid "Server address"
msgstr "Serverin osoite"
#. TRANSLATORS: explanation before a device template combobox.
#. * Placeholder is a device name like 'Nokia N85' or 'Syncevolution
#. * Client'
-#: ../src/gtk-ui/sync-config-widget.c:967
+#: ../src/gtk-ui/sync-config-widget.c:1049
#, c-format
msgid ""
"This device looks like it might be a '%s'. If this is not correct, please "
@@ -870,48 +875,53 @@ msgstr ""
"oikein, katso tätä tuettujen laitteiden luetteloa ja poimi omasi, jos se on "
"luettelossa."
-#: ../src/gtk-ui/sync-config-widget.c:973
+#: ../src/gtk-ui/sync-config-widget.c:1055
+#: ../src/gtk-ui/sync-config-widget.c:1915
msgid ""
-"We don't know what this device is exactly. Please take a look at the list of "
-"supported devices and pick yours if it is listed"
+"We don't know what this device is exactly. Please take a look at the list of"
+" supported devices and pick yours if it is listed"
msgstr ""
"Emme tiedä täsmälleen, mikä tämä laite on. Katso luetteloa tuetuista ja "
"poimi omasi, jos se on luettelossa."
-#: ../src/gtk-ui/sync-config-widget.c:1126
+#: ../src/gtk-ui/sync-config-widget.c:1207
#, c-format
msgid "%s - Bluetooth device"
msgstr "%s - Bluetooth-laite"
#. TRANSLATORS: service title for services that are not based on a
#. * template in service list, the placeholder is the name of the service
-#: ../src/gtk-ui/sync-config-widget.c:1132
+#: ../src/gtk-ui/sync-config-widget.c:1213
#, c-format
msgid "%s - manually setup"
msgstr "%s - manuaalinen asetus"
#. TRANSLATORS: link button in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1807
+#: ../src/gtk-ui/sync-config-widget.c:1886
msgid "Launch website"
msgstr "Siirry sivustoon"
#. TRANSLATORS: button in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1816
+#: ../src/gtk-ui/sync-config-widget.c:1895
msgid "Set up now"
msgstr "Tee asetukset nyt"
+#: ../src/gtk-ui/sync-config-widget.c:1953
+msgid "Use these settings"
+msgstr "Käytä näitä asetuksia"
+
#. TRANSLATORS: labels of entries in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1912
+#: ../src/gtk-ui/sync-config-widget.c:1991
msgid "Username"
msgstr "Käyttäjätunnus"
-#: ../src/gtk-ui/sync-config-widget.c:1927
+#: ../src/gtk-ui/sync-config-widget.c:2006
msgid "Password"
msgstr "Salasana"
#. TRANSLATORS: warning in service configuration form for people
#. who have modified the configuration via other means.
-#: ../src/gtk-ui/sync-config-widget.c:1950
+#: ../src/gtk-ui/sync-config-widget.c:2029
msgid ""
"Current configuration is more complex than what can be shown here. Changes "
"to sync mode or synced data types will overwrite that configuration."
@@ -922,13 +932,13 @@ msgstr ""
#. TRANSLATORS: this is the epander label for server settings
#. in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1969
+#: ../src/gtk-ui/sync-config-widget.c:2048
msgid "Hide server settings"
msgstr "Piilota serverin asetukset"
#. TRANSLATORS: this is the epander label for server settings
#. in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1989
+#: ../src/gtk-ui/sync-config-widget.c:2068
msgid "Show server settings"
msgstr "Näytä serverin asetukset"
@@ -936,154 +946,46 @@ msgstr "Näytä serverin asetukset"
msgid "Sync in the Sync application"
msgstr "Synkkaa synkkaussovelluksessa. "
-#: ../src/syncevo-dbus-server.cpp:5664
+#: ../src/syncevo-dbus-server.cpp:6653
#, c-format
msgid "%s is syncing"
msgstr "Synkkaus käynnissä kohteessa %s"
-#: ../src/syncevo-dbus-server.cpp:5665
+#: ../src/syncevo-dbus-server.cpp:6654
#, c-format
msgid "We have just started to sync your computer with the %s sync service."
msgstr "Tietokoneesi synkkaus on juuri aloitettu %s-synkkauspalvelulla."
#. if sync is successfully started and done
-#: ../src/syncevo-dbus-server.cpp:5679
+#: ../src/syncevo-dbus-server.cpp:6670
#, c-format
msgid "%s sync complete"
msgstr "Kohteen %s synkkaus valmis"
-#: ../src/syncevo-dbus-server.cpp:5680
+#: ../src/syncevo-dbus-server.cpp:6671
#, c-format
msgid "We have just finished syncing your computer with the %s sync service."
msgstr "Tietokoneesi synkkaus on juuri lopetettu %s-synkkauspalvelulla."
-#. if sync is successfully started and has errors, or not started successful with a fatal problem
-#: ../src/syncevo-dbus-server.cpp:5685
+#. if sync is successfully started and has errors, or not started successful
+#. with a fatal problem
+#: ../src/syncevo-dbus-server.cpp:6676
msgid "Sync problem."
msgstr "Synkkauksen ongelma"
-#: ../src/syncevo-dbus-server.cpp:5686
+#: ../src/syncevo-dbus-server.cpp:6677
msgid "Sorry, there's a problem with your sync that you need to attend to."
msgstr "Sorry, ilmeni ongelma synkkauksessa, jota sinun täytyy seurata."
-#: ../src/syncevo-dbus-server.cpp:5759
+#: ../src/syncevo-dbus-server.cpp:6758
msgid "View"
msgstr "Näytä"
#. Use "default" as ID because that is what mutter-moblin
#. recognizes: it then skips the action instead of adding it
#. in addition to its own "Dismiss" button (always added).
-#: ../src/syncevo-dbus-server.cpp:5763
+#: ../src/syncevo-dbus-server.cpp:6762
msgid "Dismiss"
msgstr "Hylkää"
-#~ msgid "Database error"
-#~ msgstr "Tietokantavirhe"
-
-#~ msgid ""
-#~ "Do you want to replace %s with %s? This will not remove any synced "
-#~ "information on either end but you will no longer be able to sync with %s."
-#~ msgstr ""
-#~ "Haluatko korvata kohteen %s kohteella %s? Tämä ei poista mitään "
-#~ "synkattuja tietoja kummassakaan päässä, mutta et voi enää synkata kohteen "
-#~ "%s kanssa."
-
-#~ msgid "Yes, use %s"
-#~ msgstr "Kyllä, käytä kohdetta %s"
-
-#~ msgid "No, use %s"
-#~ msgstr "Ei, älä käytä kohdetta %s"
-
-#~ msgid "Reset service"
-#~ msgstr "Nollaa palvelu"
-
-#~ msgid "Addressbook"
-#~ msgstr "Osoitekirja"
-
-#~ msgid "Todo"
-#~ msgstr "Tehtävälista"
-
-#~ msgid "Memo"
-#~ msgstr "Muistio"
-
-#~ msgid "Failed to save current service in GConf configuration system"
-#~ msgstr ""
-#~ "Tämänhetkisen palvelun tallentaminen GConf määritysjärjestelmään "
-#~ "epäonnistui"
-
-#~ msgid "Failed to save service configuration to SyncEvolution"
-#~ msgstr "Palvelun määritysten tallentaminen SyncEvolutioniin epäonnistui"
-
-#~ msgid "Failed to get service configuration from SyncEvolution"
-#~ msgstr "Palvelun määritysten saanti SyncEvolutionista epäonnistui"
-
-#~ msgid "Failed to remove service configuration from SyncEvolution"
-#~ msgstr "Palvelun määritysten poistaminen SyncEvolutionista epäonnistui"
-
-#~ msgid "Failed to cancel: sync was no longer in progress"
-#~ msgstr "Peruminen epäonnistui: synkkaus ei ole enää käynnissä"
-
-#~ msgid "Failed to cancel sync"
-#~ msgstr "Synkkauksen peruminen epäonnistui"
-
-#~ msgid "Canceling sync"
-#~ msgstr "Synkkaus perutaan"
-
-#~ msgid "No sources are enabled, not syncing"
-#~ msgstr "Mitään kohteita ei ole otettu käyttöön. Synkkaus ei käynnissä."
-
-#~ msgid "A sync is already in progress"
-#~ msgstr "Synkkaus on jo meneillään"
-
-#~ msgid "Failed to start sync"
-#~ msgstr "Synkkauksen aloitus epäonnistui"
-
-#~ msgid "%s (not supported by this service)"
-#~ msgstr "%s (tämä palvelu ei tue tätä)"
-
-#~ msgid "Failed to get server configuration from SyncEvolution"
-#~ msgstr "Serverin asetusten saanti SyncEvolutionista epäonnistui"
-
-#~ msgid "Server URL"
-#~ msgstr "Serverin URL"
-
-#~ msgid "Failed to get list of manually setup services from SyncEvolution"
-#~ msgstr ""
-#~ "Manuaalisesti määritettyjen palveluiden listan saaminen SyncEvolutionista "
-#~ "epäonnistui"
-
-#~ msgid "Service configuration not found"
-#~ msgstr "Palvelun määritystietoja ei löydy"
-
-#~ msgid "Not authorized"
-#~ msgstr "Ei käyttöoikeutta"
-
-#~ msgid "Not found"
-#~ msgstr "Ei löydy"
-
-#~ msgid "Transport failure (no connection?)"
-#~ msgstr "Siirtyminen epäonnistui (ei yhteyttä?)"
-
-#~ msgid "Connection timed out"
-#~ msgstr "Yhteys aikakatkaistu"
-
-#~ msgid "Sync canceled"
-#~ msgstr "Synkkaus peruttu"
-
-#~ msgid "Ending sync"
-#~ msgstr "Lopetetaan synkkaus"
-
-#~ msgid "<b>No sync service in use</b>"
-#~ msgstr "<b>Ei mitään synkkauspalvelua käytössä</b>"
-
-#~ msgid "<big>Manual setup</big>"
-#~ msgstr "<big>Manuaalinen määritys</big>"
-
-#~ msgid "Merge local and remote data (recommended)"
-#~ msgstr "Sulauta paikallis- ja etätiedot (suositeltavaa)"
-
-#~ msgid "Reset original server settings"
-#~ msgstr "Palauta alkuperäiset serveriasetukset"
-#~ msgid "Service name"
-#~ msgstr "Palvelun nimi"
diff --git a/po/fr.po b/po/fr.po
index 10973192..4eac9a6d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,22 +1,28 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# <martine.landais@intel.com>, 2011.
+# <meego.pti.fra2@gmail.com>, 2011.
+# <tomas.galicia@intel.com>, 2011.
msgid ""
msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: http://moblin.org/projects/syncevolution\n"
-"POT-Creation-Date: 2010-05-17 21:48+0000\n"
-"PO-Revision-Date: 2010-05-17 17:05-0800\n"
-"Last-Translator: David Cicognani <david.cicognani@ptiglobal.net>\n"
-"Language-Team: \n"
+"Project-Id-Version: syncevolution\n"
+"Report-Msgid-Bugs-To: https://bugs.meego.com/\n"
+"POT-Creation-Date: 2011-12-05 10:21-0800\n"
+"PO-Revision-Date: 2011-12-09 19:05+0000\n"
+"Last-Translator: GLS_FRA2 <meego.pti.fra2@gmail.com>\n"
+"Language-Team: French (http://www.transifex.net/projects/p/meego/team/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: French\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"Plural-Forms: nplurals=2; plural=n!=1;\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
#. TRANSLATORS: this is the application name that may be used by e.g.
#. the windowmanager
-#: ../src/gtk-ui/main.c:40
-#: ../src/gtk-ui/ui.glade.h:38
+#: ../src/gtk-ui/main.c:40 ../src/gtk-ui/ui.glade.h:38
#: ../src/gtk-ui/sync.desktop.in.h:1
#: ../src/gnome-bluetooth/syncevolution.c:112
msgid "Sync"
@@ -30,8 +36,7 @@ msgstr "Contacts"
msgid "Appointments"
msgstr "Rendez-vous"
-#: ../src/gtk-ui/sync-ui.c:270
-#: ../src/gtk-ui/ui.glade.h:40
+#: ../src/gtk-ui/sync-ui.c:270 ../src/gtk-ui/ui.glade.h:40
msgid "Tasks"
msgstr "Tâches"
@@ -44,7 +49,7 @@ msgstr "Notes"
#. * used for calendar and todo above
#: ../src/gtk-ui/sync-ui.c:277
msgid "Appointments & Tasks"
-msgstr "Rendez-vous & Tâches"
+msgstr "Rendez-vous et Tâches"
#: ../src/gtk-ui/sync-ui.c:349
msgid "Starting sync"
@@ -55,150 +60,159 @@ msgstr "Synchronisation en cours de démarrage"
#: ../src/gtk-ui/sync-ui.c:387
#, c-format
msgid "Do you want to slow sync with %s?"
-msgstr "Voulez-vous effectuer une synchro lente avec %s ?"
+msgstr "Voulez-vous effectuer une synchronisation lente avec %s ?"
#: ../src/gtk-ui/sync-ui.c:391
msgid "Yes, do slow sync"
-msgstr "Oui, effectuer une synchro lente"
+msgstr "Oui, effectuer une synchronisation lente"
#: ../src/gtk-ui/sync-ui.c:391
msgid "No, cancel sync"
msgstr "Non, annuler la synchronisation"
-#. TRANSLATORS: confirmation dialog for refresh-from-server. Placeholder
+#. TRANSLATORS: confirmation dialog for "refresh from peer". Placeholder
#. * is service/device name
#: ../src/gtk-ui/sync-ui.c:424
#, c-format
-msgid "Do you want to delete all local data and replace it with data from %s? This is not usually advised."
-msgstr "Voulez-vous effacer toutes les données locales et les remplacer avec les données de %s ? Ceci est en général une mauvaise idée."
+msgid ""
+"Do you want to delete all local data and replace it with data from %s? This "
+"is not usually advised."
+msgstr ""
+"Voulez-vous effacer toutes les données locales et les remplacer avec les "
+"données de %s ? Ceci est en général une mauvaise idée."
-#: ../src/gtk-ui/sync-ui.c:429
-#: ../src/gtk-ui/sync-ui.c:460
+#: ../src/gtk-ui/sync-ui.c:429 ../src/gtk-ui/sync-ui.c:462
msgid "Yes, delete and replace"
msgstr "Oui, supprimer et remplacer"
-#: ../src/gtk-ui/sync-ui.c:429
-#: ../src/gtk-ui/sync-ui.c:460
-#: ../src/gtk-ui/sync-ui.c:1605
+#: ../src/gtk-ui/sync-ui.c:429 ../src/gtk-ui/sync-ui.c:462
+#: ../src/gtk-ui/sync-ui.c:1610
msgid "No"
msgstr "Non"
-#. TRANSLATORS: confirmation dialog for refresh-from-client. Placeholder
+#. TRANSLATORS: confirmation dialog for "refresh from local side". Placeholder
#. * is service/device name
-#: ../src/gtk-ui/sync-ui.c:455
+#: ../src/gtk-ui/sync-ui.c:457
#, c-format
-msgid "Do you want to delete all data in %s and replace it with your local data? This is not usually advised."
-msgstr "Voulez-vous effacer toutes les données de %s et les remplacer avec vos données locales ? Ceci est en général une mauvaise idée."
+msgid ""
+"Do you want to delete all data in %s and replace it with your local data? "
+"This is not usually advised."
+msgstr ""
+"Voulez-vous effacer toutes les données de %s et les remplacer avec vos "
+"données locales ? Ceci est en général une mauvaise idée."
-#: ../src/gtk-ui/sync-ui.c:487
+#: ../src/gtk-ui/sync-ui.c:491
msgid "Trying to cancel sync"
msgstr "Essai d'annulation de la synchronisation"
-#: ../src/gtk-ui/sync-ui.c:529
+#: ../src/gtk-ui/sync-ui.c:533
msgid "No service or device selected"
msgstr "Aucun service ou périphérique sélectionné"
#. TRANSLATORS: This is the title on main view. Placeholder is
#. * the service name. Example: "Google - synced just now"
-#: ../src/gtk-ui/sync-ui.c:537
+#: ../src/gtk-ui/sync-ui.c:541
#, c-format
msgid "%s - synced just now"
-msgstr "%s - dernière synchro il y a quelques secondes"
+msgstr "%s - dernière synchronisation il y a quelques secondes"
-#: ../src/gtk-ui/sync-ui.c:541
+#: ../src/gtk-ui/sync-ui.c:545
#, c-format
msgid "%s - synced a minute ago"
-msgstr "%s - dernière synchro il y a moins d'une minute"
+msgstr "%s - dernière synchronisation il y a moins d'une minute"
-#: ../src/gtk-ui/sync-ui.c:545
+#: ../src/gtk-ui/sync-ui.c:549
#, c-format
msgid "%s - synced %ld minutes ago"
-msgstr "%s - dernière synchro il y a %ld minutes"
+msgstr "%s - dernière synchronisation il y a %ld minutes"
-#: ../src/gtk-ui/sync-ui.c:550
+#: ../src/gtk-ui/sync-ui.c:554
#, c-format
msgid "%s - synced an hour ago"
-msgstr "%s - dernière synchro il y a moins d'une heure"
+msgstr "%s - dernière synchronisation il y a moins d'une heure"
-#: ../src/gtk-ui/sync-ui.c:554
+#: ../src/gtk-ui/sync-ui.c:558
#, c-format
msgid "%s - synced %ld hours ago"
-msgstr "%s - dernière synchro il y a %ld heures"
+msgstr "%s - dernière synchronisation il y a %ld heures"
-#: ../src/gtk-ui/sync-ui.c:559
+#: ../src/gtk-ui/sync-ui.c:563
#, c-format
msgid "%s - synced a day ago"
-msgstr "%s - dernière synchro hier"
+msgstr "%s - dernière synchronisation hier"
-#: ../src/gtk-ui/sync-ui.c:563
+#: ../src/gtk-ui/sync-ui.c:567
#, c-format
msgid "%s - synced %ld days ago"
-msgstr "%s - dernière synchro il y a %ld jours"
+msgstr "%s - dernière synchronisation il y a %ld jours"
-# QA FRA : I erased the "now" in the French translation because it caused a truncation
#. TRANSLATORS: Action button in info bar in main view. Shown with e.g.
#. * "You've just restored a backup. The changes have not been "
#. * "synced with %s yet"
-#: ../src/gtk-ui/sync-ui.c:612
-#: ../src/gtk-ui/sync-ui.c:726
+#: ../src/gtk-ui/sync-ui.c:616 ../src/gtk-ui/sync-ui.c:701
msgid "Sync now"
msgstr "Synchroniser"
#. TRANSLATORS: Action button in info bar in main view. Shown with e.g.
#. * "A normal sync is not possible at this time..." message.
#. * "Other options" will open Emergency view
-#: ../src/gtk-ui/sync-ui.c:618
-#: ../src/gtk-ui/ui.glade.h:37
+#: ../src/gtk-ui/sync-ui.c:622 ../src/gtk-ui/ui.glade.h:37
msgid "Slow sync"
msgstr "Synchronisation lente"
-#: ../src/gtk-ui/sync-ui.c:619
+#: ../src/gtk-ui/sync-ui.c:623
msgid "Other options..."
msgstr "Autres options..."
#. TRANSLATORS: Action button in info bar in main view. Shown e.g.
#. * when no service is selected. Will open configuration view
-#: ../src/gtk-ui/sync-ui.c:624
+#: ../src/gtk-ui/sync-ui.c:628
msgid "Select sync service"
msgstr "Sélectionner le service de synchronisation"
#. TRANSLATORS: Action button in info bar in main view. Shown e.g.
#. * login to service fails. Will open configuration view for this service
-#: ../src/gtk-ui/sync-ui.c:629
+#: ../src/gtk-ui/sync-ui.c:633
msgid "Edit service settings"
msgstr "Modifier les paramètres du service"
-#: ../src/gtk-ui/sync-ui.c:700
-msgid "You haven't selected a sync service or device yet. Sync services let you synchronize your data between your netbook and a web service. You can also sync directly with some devices."
-msgstr "Vous n'avez pas encore sélectionné de service de synchronisation ou de périphérique. Les services de synchronisation vous permettent de synchroniser vos données de votre netbook à un service web. Vous pouvez également synchroniser directement avec certains périphériques."
+#: ../src/gtk-ui/sync-ui.c:709
+msgid ""
+"You haven't selected a sync service or device yet. Sync services let you "
+"synchronize your data between your netbook and a web service. You can also "
+"sync directly with some devices."
+msgstr ""
+"Vous n'avez pas encore sélectionné de service de synchronisation ou de "
+"périphérique. Les services de synchronisation vous permettent de "
+"synchroniser vos données de votre netbook à un service web. Vous pouvez "
+"également synchroniser directement avec certains périphériques."
-#: ../src/gtk-ui/sync-ui.c:722
+#: ../src/gtk-ui/sync-ui.c:729
msgid "Sync again"
msgstr "Synchroniser de nouveau"
-#: ../src/gtk-ui/sync-ui.c:743
+#: ../src/gtk-ui/sync-ui.c:748
msgid "Restoring"
-msgstr "En cours de restauration..."
+msgstr "Restauration en cours"
-#: ../src/gtk-ui/sync-ui.c:745
+#: ../src/gtk-ui/sync-ui.c:750
msgid "Syncing"
msgstr "Synchronisation en cours"
#. TRANSLATORS: This is for the button in main view, right side.
#. Keep line length below ~20 characters, use two lines if needed
-#: ../src/gtk-ui/sync-ui.c:757
-#: ../src/gtk-ui/sync-ui.c:3399
+#: ../src/gtk-ui/sync-ui.c:762 ../src/gtk-ui/sync-ui.c:3407
msgid "Cancel sync"
msgstr "Annuler la synchronisation"
-#: ../src/gtk-ui/sync-ui.c:922
+#: ../src/gtk-ui/sync-ui.c:927
msgid "Back to sync"
msgstr "Retourner à la synchronisation"
#. TRANSLATORS: label for checkbutton/toggle in main view.
#. * Please stick to similar length strings or break the line with
#. * "\n" if absolutely needed
-#: ../src/gtk-ui/sync-ui.c:1224
+#: ../src/gtk-ui/sync-ui.c:1229
msgid "Automatic sync"
msgstr "Synchronisation automatique"
@@ -206,61 +220,78 @@ msgstr "Synchronisation automatique"
#. * currently selected data sources. First placeholder is service/device
#. * name, second a comma separeted list of sources.
#. * E.g. "Affected data: Google Contacts, Appointments"
-#: ../src/gtk-ui/sync-ui.c:1519
+#: ../src/gtk-ui/sync-ui.c:1524
#, c-format
msgid "Affected data: %s %s"
msgstr "Données affectées : %s %s"
-#: ../src/gtk-ui/sync-ui.c:1524
+#: ../src/gtk-ui/sync-ui.c:1529
#, c-format
msgid "Affected data: none"
msgstr "Données affectées : aucunes"
#. TRANSLATORS: confirmation for restoring a backup. placeholder is the
#. * backup time string defined below
-#: ../src/gtk-ui/sync-ui.c:1602
+#: ../src/gtk-ui/sync-ui.c:1607
#, c-format
-msgid "Do you want to restore the backup from %s? All changes you have made since then will be lost."
-msgstr "Voulez-vous restaurer la sauvegarde de %s ? Toutes les modifications effectuées à partir de là seront perdues."
+msgid ""
+"Do you want to restore the backup from %s? All changes you have made since "
+"then will be lost."
+msgstr ""
+"Voulez-vous restaurer la sauvegarde de %s ? Toutes les modifications "
+"effectuées à partir de là seront perdues."
-#: ../src/gtk-ui/sync-ui.c:1605
+#: ../src/gtk-ui/sync-ui.c:1610
msgid "Yes, restore"
msgstr "Oui, restaurer"
#. TRANSLATORS: date/time for strftime(), used in emergency view backup
#. * label. Any time format that shows date and time is good.
-#: ../src/gtk-ui/sync-ui.c:1637
+#: ../src/gtk-ui/sync-ui.c:1642
#, c-format
msgid "%x %X"
msgstr "%x %X"
#. TRANSLATORS: label for a backup in emergency view. Placeholder is
#. * service or device name
-#: ../src/gtk-ui/sync-ui.c:1656
+#: ../src/gtk-ui/sync-ui.c:1661
#, c-format
msgid "Backed up before syncing with %s"
msgstr "Sauvegardé avant la synchronisation avec %s"
-#: ../src/gtk-ui/sync-ui.c:1673
+#: ../src/gtk-ui/sync-ui.c:1678
msgid "Restore"
msgstr "Restaurer"
#. TRANSLATORS: this is an explanation in Emergency view.
#. * Placeholder is a service/device name
-#: ../src/gtk-ui/sync-ui.c:1780
+#: ../src/gtk-ui/sync-ui.c:1785
#, c-format
-msgid "A normal sync with %s is not possible at this time. You can do a slow two-way sync or start from scratch. You can also restore a backup, but a slow sync or starting from scratch will still be required before normal sync is possible."
-msgstr "Une synchronisation normale avec %s est actuellement impossible. Vous pouvez effectuer une synchronisation lente à deux files ou alors reprendre à zéro. Vous pouvez aussi restaurer une sauvegarde, mais une synchronisation lente ou une reprise à zéro seront nécessaires avant qu'une synchronisation soit possible."
+msgid ""
+"A normal sync with %s is not possible at this time. You can do a slow two-"
+"way sync or start from scratch. You can also restore a backup, but a slow "
+"sync or starting from scratch will still be required before normal sync is "
+"possible."
+msgstr ""
+"Une synchronisation normale avec %s est actuellement impossible. Vous pouvez"
+" effectuer une synchronisation lente à deux files ou alors reprendre à zéro."
+" Vous pouvez aussi restaurer une sauvegarde, mais une synchronisation lente "
+"ou une reprise à zéro seront nécessaires avant qu'une synchronisation soit "
+"possible."
-#: ../src/gtk-ui/sync-ui.c:1790
+#: ../src/gtk-ui/sync-ui.c:1795
#, c-format
-msgid "If something has gone horribly wrong, you can try a slow sync, start from scratch or restore from backup."
-msgstr "En cas de problème sérieux, vous pouvez essayer une synchronisation lente, reprendre à zéro ou alors restaurer depuis une sauvegarde."
+msgid ""
+"If something has gone horribly wrong, you can try a slow sync, start from "
+"scratch or restore from backup."
+msgstr ""
+"En cas de problème sérieux, vous pouvez essayer une synchronisation lente, "
+"reprendre à zéro ou alors restaurer depuis une sauvegarde."
#. TRANSLATORS: These are a buttons in Emergency view. Placeholder is a
#. * service/device name. Please don't use too long lines, but feel free to
#. * use several lines.
-#: ../src/gtk-ui/sync-ui.c:1799
+#: ../src/gtk-ui/sync-ui.c:1804
#, c-format
msgid ""
"Delete all your local\n"
@@ -272,7 +303,7 @@ msgstr ""
"et les remplacer avec\n"
"les données de %s"
-#: ../src/gtk-ui/sync-ui.c:1805
+#: ../src/gtk-ui/sync-ui.c:1810
#, c-format
msgid ""
"Delete all data on\n"
@@ -283,71 +314,76 @@ msgstr ""
"sur %s et les remplacer\n"
"avec les données locales"
-#: ../src/gtk-ui/sync-ui.c:2267
+#: ../src/gtk-ui/sync-ui.c:2275
msgid "Failed to get list of supported services from SyncEvolution"
-msgstr "Impossible d'obtenir la liste des services pris en charge depuis SyncEvolution"
+msgstr ""
+"Impossible d'obtenir la liste des services pris en charge depuis "
+"SyncEvolution"
-#: ../src/gtk-ui/sync-ui.c:2321
-msgid "There was a problem communicating with the sync process. Please try again later."
-msgstr "Un problème est survenu en communiquant avec le processus de synchronisation. Veuillez réessayer ultérieurement."
+#: ../src/gtk-ui/sync-ui.c:2329
+msgid ""
+"There was a problem communicating with the sync process. Please try again "
+"later."
+msgstr ""
+"Un problème est survenu en communiquant avec le processus de "
+"synchronisation. Veuillez réessayer ultérieurement."
-#: ../src/gtk-ui/sync-ui.c:2380
+#: ../src/gtk-ui/sync-ui.c:2388
msgid "Restore failed"
msgstr "Échec de la restauration"
-#: ../src/gtk-ui/sync-ui.c:2383
-#: ../src/gtk-ui/sync-ui.c:3268
+#: ../src/gtk-ui/sync-ui.c:2391 ../src/gtk-ui/sync-ui.c:3276
msgid "Sync failed"
msgstr "Échec de la synchronisation"
-#: ../src/gtk-ui/sync-ui.c:2389
+#: ../src/gtk-ui/sync-ui.c:2397
msgid "Restore complete"
msgstr "Restauration terminée"
-#: ../src/gtk-ui/sync-ui.c:2392
+#: ../src/gtk-ui/sync-ui.c:2400
msgid "Sync complete"
msgstr "Synchronisation terminée"
-#: ../src/gtk-ui/sync-ui.c:2484
+#: ../src/gtk-ui/sync-ui.c:2492
#, c-format
msgid "Preparing '%s'"
msgstr "'%s' en cours de préparation"
-#: ../src/gtk-ui/sync-ui.c:2487
+#: ../src/gtk-ui/sync-ui.c:2495
#, c-format
msgid "Receiving '%s'"
msgstr "'%s' en cours de réception"
-#: ../src/gtk-ui/sync-ui.c:2490
+#: ../src/gtk-ui/sync-ui.c:2498
#, c-format
msgid "Sending '%s'"
msgstr "'%s' en cours d'envoi"
-#: ../src/gtk-ui/sync-ui.c:2611
+#: ../src/gtk-ui/sync-ui.c:2619
#, c-format
msgid "There was one remote rejection."
msgid_plural "There were %ld remote rejections."
msgstr[0] "Il y a eu un rejet distant."
msgstr[1] "Il y a eu %ld rejets distants."
-#: ../src/gtk-ui/sync-ui.c:2616
+#: ../src/gtk-ui/sync-ui.c:2624
#, c-format
msgid "There was one local rejection."
msgid_plural "There were %ld local rejections."
msgstr[0] "Il y a eu un rejet local."
msgstr[1] "Il y a eu %ld rejets locaux."
-#: ../src/gtk-ui/sync-ui.c:2621
+#: ../src/gtk-ui/sync-ui.c:2629
#, c-format
msgid "There were %ld local rejections and %ld remote rejections."
msgstr "Il y a eu %ld rejets locaux et %ld rejets distants."
-#: ../src/gtk-ui/sync-ui.c:2626
+#: ../src/gtk-ui/sync-ui.c:2634
#, c-format
msgid "Last time: No changes."
msgstr "Dernière fois : pas de changement. "
-#: ../src/gtk-ui/sync-ui.c:2628
+#: ../src/gtk-ui/sync-ui.c:2636
#, c-format
msgid "Last time: Sent one change."
msgid_plural "Last time: Sent %ld changes."
@@ -357,21 +393,21 @@ msgstr[1] "Dernière fois : %ld changements envoyés."
#. This is about changes made to the local data. Not all of these
#. changes were requested by the remote server, so "applied"
#. is a better word than "received" (bug #5185).
-#: ../src/gtk-ui/sync-ui.c:2636
+#: ../src/gtk-ui/sync-ui.c:2644
#, c-format
msgid "Last time: Applied one change."
msgid_plural "Last time: Applied %ld changes."
msgstr[0] "Dernière fois : un changement reçu."
msgstr[1] "Dernière fois : %ld changements reçus."
-#: ../src/gtk-ui/sync-ui.c:2641
+#: ../src/gtk-ui/sync-ui.c:2649
#, c-format
msgid "Last time: Applied %ld changes and sent %ld changes."
msgstr "Dernière fois : %ld changements reçus et %ld changements envoyés."
#. TRANSLATORS: the placeholder is a error message (hopefully)
#. * explaining the problem
-#: ../src/gtk-ui/sync-ui.c:2848
+#: ../src/gtk-ui/sync-ui.c:2856
#, c-format
msgid ""
"There was a problem with last sync:\n"
@@ -380,124 +416,153 @@ msgstr ""
"Un problème est survenu lors de la dernière synchronisation :\n"
"%s"
-#: ../src/gtk-ui/sync-ui.c:2858
+#: ../src/gtk-ui/sync-ui.c:2866
#, c-format
-msgid "You've just restored a backup. The changes have not been synced with %s yet"
-msgstr "Vous venez de restaurer une sauvegarde. Les modifications n'ont pas encore été synchronisées avec %s"
+msgid ""
+"You've just restored a backup. The changes have not been synced with %s yet"
+msgstr ""
+"Vous venez de restaurer une sauvegarde. Les modifications n'ont pas encore "
+"été synchronisées avec %s"
-#: ../src/gtk-ui/sync-ui.c:3146
+#: ../src/gtk-ui/sync-ui.c:3154
msgid "Waiting for current operation to finish..."
msgstr "En attente de fin d'opération en cours..."
#. TRANSLATORS: next strings are error messages.
-#: ../src/gtk-ui/sync-ui.c:3180
-msgid "A normal sync is not possible at this time. The server suggests a slow sync, but this might not always be what you want if both ends already have data."
-msgstr "Une synchronisation normale est actuellement impossible. Le serveur suggère une synchronisation lente, mais cela n'est pas forcément dans votre intérêt si les deux côtés contiennent déjà des données."
+#: ../src/gtk-ui/sync-ui.c:3188
+msgid ""
+"A normal sync is not possible at this time. The server suggests a slow sync,"
+" but this might not always be what you want if both ends already have data."
+msgstr ""
+"Une synchronisation normale est actuellement impossible. Le serveur suggère "
+"une synchronisation lente, mais cela n'est pas forcément dans votre intérêt "
+"si les deux côtés contiennent déjà des données."
-#: ../src/gtk-ui/sync-ui.c:3184
+#: ../src/gtk-ui/sync-ui.c:3192
msgid "The sync process died unexpectedly."
msgstr "Processus de synchronisation terminé de façon inattendue."
-#: ../src/gtk-ui/sync-ui.c:3189
-msgid "Password request was not answered. You can save the password in the settings to prevent the request."
-msgstr "La demande de mot de passe n'a pas été prise en compte. Vous pouvez enregistrer le mot de passe dans les paramètres pour empêcher la demande."
+#: ../src/gtk-ui/sync-ui.c:3197
+msgid ""
+"Password request was not answered. You can save the password in the settings"
+" to prevent the request."
+msgstr ""
+"La demande de mot de passe n'a pas été prise en compte. Vous pouvez "
+"enregistrer le mot de passe dans les paramètres pour empêcher la demande."
#. TODO use the service device name here, this is a remote problem
-#: ../src/gtk-ui/sync-ui.c:3193
+#: ../src/gtk-ui/sync-ui.c:3201
msgid "There was a problem processing sync request. Trying again may help."
-msgstr "Un problème est survenu lors du traitement de la demande de synchronisation. Une nouvelle tentative peut se révéler utile."
+msgstr ""
+"Un problème est survenu lors du traitement de la demande de synchronisation."
+" Une nouvelle tentative peut se révéler utile."
-#: ../src/gtk-ui/sync-ui.c:3199
-msgid "Failed to login. Could there be a problem with your username or password?"
-msgstr "Échec de connexion. Pourrait-il y avoir un problème avec votre nom d'utilisateur ou bien votre mot de passe ?"
+#: ../src/gtk-ui/sync-ui.c:3207
+msgid ""
+"Failed to login. Could there be a problem with your username or password?"
+msgstr ""
+"Échec de connexion. Pourrait-il y avoir un problème avec votre nom "
+"d'utilisateur ou bien votre mot de passe ?"
-#: ../src/gtk-ui/sync-ui.c:3202
+#: ../src/gtk-ui/sync-ui.c:3210
msgid "Forbidden"
msgstr "Interdit"
#. TRANSLATORS: data source means e.g. calendar or addressbook
-#: ../src/gtk-ui/sync-ui.c:3208
-msgid "A data source could not be found. Could there be a problem with the settings?"
-msgstr "Une source de données n'a pas pu être trouvée. Pourrait-il y avoir un problème avec les paramètres ?"
+#: ../src/gtk-ui/sync-ui.c:3216
+msgid ""
+"A data source could not be found. Could there be a problem with the "
+"settings?"
+msgstr ""
+"Une source de données n'a pas pu être trouvée. Pourrait-il y avoir un "
+"problème avec les paramètres ?"
-#: ../src/gtk-ui/sync-ui.c:3212
+#: ../src/gtk-ui/sync-ui.c:3220
msgid "Remote database error"
msgstr "Erreur de base de données à distance"
#. This can happen when EDS is borked, restart it may help...
-#: ../src/gtk-ui/sync-ui.c:3215
-msgid "There is a problem with the local database. Syncing again or rebooting may help."
-msgstr "Il y a un problème avec la base de données locale. Synchroniser de nouveau ou bien redémarrer peut aider."
+#: ../src/gtk-ui/sync-ui.c:3223
+msgid ""
+"There is a problem with the local database. Syncing again or rebooting may "
+"help."
+msgstr ""
+"Il y a un problème avec la base de données locale. Synchroniser de nouveau "
+"ou bien redémarrer peut aider."
-#: ../src/gtk-ui/sync-ui.c:3218
+#: ../src/gtk-ui/sync-ui.c:3226
msgid "No space on disk"
msgstr "Il n'y a plus d'espace disponible sur le disque"
-#: ../src/gtk-ui/sync-ui.c:3220
+#: ../src/gtk-ui/sync-ui.c:3228
msgid "Failed to process SyncML"
msgstr "Impossible de terminer SyncML"
-#: ../src/gtk-ui/sync-ui.c:3222
+#: ../src/gtk-ui/sync-ui.c:3230
msgid "Server authorization failed"
msgstr "L'autorisation du serveur a échoué"
-#: ../src/gtk-ui/sync-ui.c:3224
+#: ../src/gtk-ui/sync-ui.c:3232
msgid "Failed to parse configuration file"
msgstr "Impossible d'analyser le fichier de configuration"
-#: ../src/gtk-ui/sync-ui.c:3226
+#: ../src/gtk-ui/sync-ui.c:3234
msgid "Failed to read configuration file"
msgstr "Impossible de lire le fichier de configuration"
-#: ../src/gtk-ui/sync-ui.c:3228
+#: ../src/gtk-ui/sync-ui.c:3236
msgid "No configuration found"
msgstr "Aucune configuration trouvée"
-#: ../src/gtk-ui/sync-ui.c:3230
+#: ../src/gtk-ui/sync-ui.c:3238
msgid "No configuration file found"
msgstr "Aucun fichier de configuration trouvé"
-#: ../src/gtk-ui/sync-ui.c:3232
+#: ../src/gtk-ui/sync-ui.c:3240
msgid "Server sent bad content"
msgstr "Le serveur a transmis des données incorrectes"
-#: ../src/gtk-ui/sync-ui.c:3234
+#: ../src/gtk-ui/sync-ui.c:3242
msgid "Connection certificate has expired"
msgstr "Le certificat de la connexion a expiré"
-#: ../src/gtk-ui/sync-ui.c:3236
+#: ../src/gtk-ui/sync-ui.c:3244
msgid "Connection certificate is invalid"
msgstr "le certificat de la connexion est invalide"
-#: ../src/gtk-ui/sync-ui.c:3244
-msgid "We were unable to connect to the server. The problem could be temporary or there could be something wrong with the settings."
-msgstr "Nous n'avons pas pu nous connecter au serveur. Il se peut que le problème soit temporaire ou bien qu’il y ait une erreur avec les paramètres."
+#: ../src/gtk-ui/sync-ui.c:3252
+msgid ""
+"We were unable to connect to the server. The problem could be temporary or "
+"there could be something wrong with the settings."
+msgstr ""
+"Nous n'avons pas pu nous connecter au serveur. Il se peut que le problème "
+"soit temporaire ou bien qu’il y ait une erreur avec les paramètres."
-#: ../src/gtk-ui/sync-ui.c:3251
+#: ../src/gtk-ui/sync-ui.c:3259
msgid "The server URL is bad"
msgstr "L'URL du serveur est mauvaise"
-#: ../src/gtk-ui/sync-ui.c:3256
+#: ../src/gtk-ui/sync-ui.c:3264
msgid "The server was not found"
msgstr "Le serveur n'a pas été trouvé"
-#: ../src/gtk-ui/sync-ui.c:3258
+#: ../src/gtk-ui/sync-ui.c:3266
#, c-format
msgid "Error %d"
msgstr "Erreur %d"
#. TRANSLATORS: password request dialog contents: title, cancel button
#. * and ok button
-#: ../src/gtk-ui/sync-ui.c:3396
+#: ../src/gtk-ui/sync-ui.c:3404
msgid "Password is required for sync"
msgstr "Mot de passe nécessaire pour la synchronisation"
-#: ../src/gtk-ui/sync-ui.c:3400
+#: ../src/gtk-ui/sync-ui.c:3408
msgid "Sync with password"
msgstr "Synchronisation avec le mot de passe..."
#. TRANSLATORS: password request dialog message, placeholder is service name
-#: ../src/gtk-ui/sync-ui.c:3410
+#: ../src/gtk-ui/sync-ui.c:3418
#, c-format
msgid "Please enter password for syncing with %s:"
msgstr "Veuillez saisir le mot de passe pour synchroniser avec %s :"
@@ -543,28 +608,30 @@ msgstr ""
"Une synchronisation lente compare les articles des deux côtés et tente de les fusionner. \n"
"Cela peut échouer dans certains cas, provoquant des duplicatas ou une perte d'information. "
-# "New" for lack of space
-# If it fits , it should be : Nouveau périphérique
#: ../src/gtk-ui/ui.glade.h:15
msgid "Add new device"
-msgstr "Nouveau"
+msgstr "Nouveau peripherique"
-# "New" for lack of space
-# If it fits , it should be : Nouveau service
#: ../src/gtk-ui/ui.glade.h:16
msgid "Add new service"
-msgstr "Nouveau"
+msgstr "Nouveau service"
#. explanation of "Restore backup" function
#: ../src/gtk-ui/ui.glade.h:18
-msgid "Backups are made before every time we Sync. Choose a backup to restore. Any changes you have made since then will be lost."
-msgstr "Les sauvegardes sont effectuées à chaque synchronisation. Choisissez une sauvegarde à restaurer. Toutes les modifications effectuées à partir de là seront perdues."
+msgid ""
+"Backups are made before every time we Sync. Choose a backup to restore. Any "
+"changes you have made since then will be lost."
+msgstr ""
+"Les sauvegardes sont effectuées à chaque synchronisation. Choisissez une "
+"sauvegarde à restaurer. Toutes les modifications effectuées à partir de là "
+"seront perdues."
#: ../src/gtk-ui/ui.glade.h:19
msgid "Calendar"
msgstr "Calendrier"
-#. Button in main view, right side. Keep to below 20 chars per line, feel free to use two lines
+#. Button in main view, right side. Keep to below 20 chars per line, feel free
+#. to use two lines
#: ../src/gtk-ui/ui.glade.h:21
msgid ""
"Change or edit\n"
@@ -601,7 +668,8 @@ msgstr ""
"et les remplacer avec\n"
"les données de Zyb"
-#. button in main view, right side. Keep length to 20 characters or so, use two lines if needed
+#. button in main view, right side. Keep length to 20 characters or so, use
+#. two lines if needed
#: ../src/gtk-ui/ui.glade.h:32
msgid ""
"Fix a sync\n"
@@ -637,95 +705,138 @@ msgstr ""
#: ../src/gtk-ui/ui.glade.h:43
msgid "Use Bluetooth to Sync your data from one device to another."
-msgstr "Utiliser Bluetooth pour synchroniser vos données d'un périphérique à l'autre."
+msgstr ""
+"Utiliser Bluetooth pour synchroniser vos données d'un périphérique à "
+"l'autre."
#: ../src/gtk-ui/ui.glade.h:44
msgid "You will need to add Bluetooth devices before they can be synced."
-msgstr "Vous devrez ajouter des périphériques Bluetooth avant de pouvoir les synchroniser. "
+msgstr ""
+"Vous devrez ajouter des périphériques Bluetooth avant de pouvoir les "
+"synchroniser. "
#: ../src/gtk-ui/sync.desktop.in.h:2
-#: ../src/gtk-ui/sync-gtk.desktop.in.h:2
msgid "Up to date"
msgstr "À jour"
#: ../src/gtk-ui/sync-gtk.desktop.in.h:1
-msgid "Sync (GTK)"
-msgstr "Sync (GTK)"
+msgid "SyncEvolution (GTK)"
+msgstr "SyncEvolution (GTK)"
-#: ../src/gtk-ui/sync-config-widget.c:78
-msgid "ScheduleWorld enables you to keep your contacts, events, tasks, and notes in sync."
-msgstr "ScheduleWorld vous permet de garder vos contacts, événements, tâches et notes synchronisés."
+#: ../src/gtk-ui/sync-gtk.desktop.in.h:2
+msgid "Synchronize PIM data"
+msgstr "Synchroniser les données du gestionnaire d'informations personnelles"
-#: ../src/gtk-ui/sync-config-widget.c:81
-msgid "Google Sync can back up and synchronize your contacts with your Gmail contacts."
-msgstr "Google Sync permet de sauvegarder et synchroniser votre carnet d'adresses avec vos contacts Gmail."
+#: ../src/gtk-ui/sync-config-widget.c:88
+msgid ""
+"ScheduleWorld enables you to keep your contacts, events, tasks, and notes in"
+" sync."
+msgstr ""
+"ScheduleWorld vous permet de garder vos contacts, événements, tâches et "
+"notes synchronisés."
+
+#: ../src/gtk-ui/sync-config-widget.c:91
+msgid ""
+"Google Sync can back up and synchronize your contacts with your Gmail "
+"contacts."
+msgstr ""
+"Google Sync permet de sauvegarder et synchroniser votre carnet d'adresses "
+"avec vos contacts Gmail."
#. TRANSLATORS: Please include the word "demo" (or the equivalent in
#. your language): Funambol is going to be a 90 day demo service
#. in the future
-#: ../src/gtk-ui/sync-config-widget.c:87
-msgid "Back up your contacts and calendar. Sync with a single click, anytime, anywhere (DEMO)."
-msgstr "Sauvegarde de vos contacts et calendrier. Synchronisation en un seul clic, n'importe quand, n'importe où (DEMO)."
+#: ../src/gtk-ui/sync-config-widget.c:97
+msgid ""
+"Back up your contacts and calendar. Sync with a single click, anytime, "
+"anywhere (DEMO)."
+msgstr ""
+"Sauvegarde de vos contacts et calendrier. Synchronisation en un seul clic, "
+"n'importe quand, n'importe où (DEMO)."
-#: ../src/gtk-ui/sync-config-widget.c:90
-msgid "Mobical Backup and Restore service allows you to securely back up your personal mobile data for free."
-msgstr "Le service Mobical de sauvegarde et de restauration vous permet de sauvegarder vos données personnelles mobiles gratuitement et en toute sécurité."
+#: ../src/gtk-ui/sync-config-widget.c:100
+msgid ""
+"Mobical Backup and Restore service allows you to securely back up your "
+"personal mobile data for free."
+msgstr ""
+"Le service Mobical de sauvegarde et de restauration vous permet de "
+"sauvegarder vos données personnelles mobiles gratuitement et en toute "
+"sécurité."
-#: ../src/gtk-ui/sync-config-widget.c:93
-msgid "ZYB is a simple way for people to store and share mobile information online."
-msgstr "ZYB est une façon simple de stocker et de partager les informations mobiles en ligne."
+#: ../src/gtk-ui/sync-config-widget.c:103
+msgid ""
+"ZYB is a simple way for people to store and share mobile information online."
+msgstr ""
+"ZYB est une façon simple de stocker et de partager les informations mobiles "
+"en ligne."
-#: ../src/gtk-ui/sync-config-widget.c:96
-msgid "Memotoo lets you access your personal data from any computer connected to the Internet."
-msgstr "Memotoo vous permet d'accéder à vos données personnelles depuis n'importe quel ordinateur connecté à Internet."
+#: ../src/gtk-ui/sync-config-widget.c:106
+msgid ""
+"Memotoo lets you access your personal data from any computer connected to "
+"the Internet."
+msgstr ""
+"Memotoo vous permet d'accéder à vos données personnelles depuis n'importe "
+"quel ordinateur connecté à Internet."
-#: ../src/gtk-ui/sync-config-widget.c:192
+#: ../src/gtk-ui/sync-config-widget.c:195
msgid "Sorry, failed to save the configuration"
msgstr "Désolé, la sauvegarde de la configuration a échoué"
-#: ../src/gtk-ui/sync-config-widget.c:381
+#: ../src/gtk-ui/sync-config-widget.c:445
msgid "Service must have a name and server URL"
msgstr "Le service doit avoir un nom et une URL de serveur"
-#: ../src/gtk-ui/sync-config-widget.c:422
+#. TRANSLATORS: error dialog when creating a new sync configuration
+#: ../src/gtk-ui/sync-config-widget.c:451
+msgid "A username is required for this service"
+msgstr "Un nom d'utilisateur est nécessaire pour ce service"
+
+#: ../src/gtk-ui/sync-config-widget.c:493
#, c-format
-msgid "Do you want to reset the settings for %s? This will not remove any synced information on either end."
-msgstr "Voulez-vous réinitialiser les paramètres pour %s ? Cela ne supprimera aucune information synchronisée de part et d’autre. "
+msgid ""
+"Do you want to reset the settings for %s? This will not remove any synced "
+"information on either end."
+msgstr ""
+"Voulez-vous réinitialiser les paramètres pour %s ? Cela ne supprimera aucune"
+" information synchronisée de part et d’autre. "
#. TRANSLATORS: buttons in reset-service warning dialog
-#: ../src/gtk-ui/sync-config-widget.c:426
+#: ../src/gtk-ui/sync-config-widget.c:497
msgid "Yes, reset"
msgstr "Oui, réinitialiser"
-#: ../src/gtk-ui/sync-config-widget.c:427
-#: ../src/gtk-ui/sync-config-widget.c:438
+#: ../src/gtk-ui/sync-config-widget.c:498
+#: ../src/gtk-ui/sync-config-widget.c:509
msgid "No, keep settings"
msgstr "Non, conserver les paramètres"
-#: ../src/gtk-ui/sync-config-widget.c:432
+#: ../src/gtk-ui/sync-config-widget.c:503
#, c-format
-msgid "Do you want to delete the settings for %s? This will not remove any synced information on either end but it will remove these settings."
-msgstr "Voulez-vous supprimer les paramètres pour %s ? Cela ne supprimera aucune information synchronisée de part et d’autre mais supprimera ces paramètres."
+msgid ""
+"Do you want to delete the settings for %s? This will not remove any synced "
+"information on either end but it will remove these settings."
+msgstr ""
+"Voulez-vous supprimer les paramètres pour %s ? Cela ne supprimera aucune "
+"information synchronisée de part et d’autre mais supprimera ces paramètres."
#. TRANSLATORS: buttons in delete-service warning dialog
-#: ../src/gtk-ui/sync-config-widget.c:437
+#: ../src/gtk-ui/sync-config-widget.c:508
msgid "Yes, delete"
msgstr "Oui, supprimer"
-#: ../src/gtk-ui/sync-config-widget.c:467
+#: ../src/gtk-ui/sync-config-widget.c:539
msgid "Reset settings"
msgstr "Rétablir les paramètres"
-#: ../src/gtk-ui/sync-config-widget.c:470
+#: ../src/gtk-ui/sync-config-widget.c:542
msgid "Delete settings"
msgstr "Supprimer les paramètres"
-# "setup" for limited space
-#: ../src/gtk-ui/sync-config-widget.c:480
+#: ../src/gtk-ui/sync-config-widget.c:552
msgid "Save and use"
msgstr "Sauvegarder et utiliser"
-#: ../src/gtk-ui/sync-config-widget.c:483
+#: ../src/gtk-ui/sync-config-widget.c:555
msgid ""
"Save and replace\n"
"current service"
@@ -733,104 +844,121 @@ msgstr ""
"Sauvegarder et utiliser\n"
"le service actuel"
-#: ../src/gtk-ui/sync-config-widget.c:493
+#: ../src/gtk-ui/sync-config-widget.c:563
msgid "Stop using device"
msgstr "Ne plus utiliser ce périphérique"
-#: ../src/gtk-ui/sync-config-widget.c:496
+#: ../src/gtk-ui/sync-config-widget.c:566
msgid "Stop using service"
msgstr "Ne plus utiliser ce service"
#. TRANSLATORS: label for an entry in service configuration form.
#. * Placeholder is a source name.
#. * Example: "Appointments URI"
-#: ../src/gtk-ui/sync-config-widget.c:679
+#: ../src/gtk-ui/sync-config-widget.c:749
#, c-format
msgid "%s URI"
msgstr "%s URI"
#. TRANSLATORS: toggles in service configuration form, placeholder is service
#. * or device name
-#: ../src/gtk-ui/sync-config-widget.c:854
+#: ../src/gtk-ui/sync-config-widget.c:936
#, c-format
msgid "Send changes to %s"
msgstr "Envoyer les modifications à %s"
-#: ../src/gtk-ui/sync-config-widget.c:859
+#: ../src/gtk-ui/sync-config-widget.c:941
#, c-format
msgid "Receive changes from %s"
msgstr "Recevoir les modifications de %s"
-# verb = Synchroniser
-# noun = Synchronisation
-#: ../src/gtk-ui/sync-config-widget.c:875
+#: ../src/gtk-ui/sync-config-widget.c:957
msgid "<b>Sync</b>"
msgstr "<b>Synchroniser</b>"
#. TRANSLATORS: label of a entry in service configuration
-#: ../src/gtk-ui/sync-config-widget.c:891
+#: ../src/gtk-ui/sync-config-widget.c:973
msgid "Server address"
msgstr "Adresse du serveur"
#. TRANSLATORS: explanation before a device template combobox.
#. * Placeholder is a device name like 'Nokia N85' or 'Syncevolution
#. * Client'
-#: ../src/gtk-ui/sync-config-widget.c:967
+#: ../src/gtk-ui/sync-config-widget.c:1049
#, c-format
-msgid "This device looks like it might be a '%s'. If this is not correct, please take a look at the list of supported devices and pick yours if it is listed"
-msgstr "Il semble que le périphérique est un '%s'. Si ce n'est pas correct, veuillez consulter la liste de périphériques pris en charge et sélectionnez le votre s'il apparait dans la liste"
+msgid ""
+"This device looks like it might be a '%s'. If this is not correct, please "
+"take a look at the list of supported devices and pick yours if it is listed"
+msgstr ""
+"Il semble que le périphérique est un '%s'. Si ce n'est pas correct, veuillez"
+" consulter la liste de périphériques pris en charge et sélectionnez le votre"
+" s'il apparait dans la liste"
-#: ../src/gtk-ui/sync-config-widget.c:973
-msgid "We don't know what this device is exactly. Please take a look at the list of supported devices and pick yours if it is listed"
-msgstr "Nous ne savons pas exactement ce qu’est ce périphérique. Veuillez consulter la liste de périphériques pris en charge et sélectionnez le votre s'il apparait dans la liste"
+#: ../src/gtk-ui/sync-config-widget.c:1055
+#: ../src/gtk-ui/sync-config-widget.c:1915
+msgid ""
+"We don't know what this device is exactly. Please take a look at the list of"
+" supported devices and pick yours if it is listed"
+msgstr ""
+"Nous ne savons pas exactement ce qu’est ce périphérique. Veuillez consulter "
+"la liste de périphériques pris en charge et sélectionnez le votre s'il "
+"apparait dans la liste"
-#: ../src/gtk-ui/sync-config-widget.c:1126
+#: ../src/gtk-ui/sync-config-widget.c:1207
#, c-format
msgid "%s - Bluetooth device"
msgstr "%s - Périphérique Bluetooth"
#. TRANSLATORS: service title for services that are not based on a
#. * template in service list, the placeholder is the name of the service
-#: ../src/gtk-ui/sync-config-widget.c:1132
+#: ../src/gtk-ui/sync-config-widget.c:1213
#, c-format
msgid "%s - manually setup"
msgstr "%s - configurer manuellement"
#. TRANSLATORS: link button in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1807
+#: ../src/gtk-ui/sync-config-widget.c:1886
msgid "Launch website"
msgstr "Lancer le site Web"
-# "setup" for limited space
#. TRANSLATORS: button in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1816
+#: ../src/gtk-ui/sync-config-widget.c:1895
msgid "Set up now"
msgstr "Configurer"
+#: ../src/gtk-ui/sync-config-widget.c:1953
+msgid "Use these settings"
+msgstr "Utiliser ces paramètres"
+
#. TRANSLATORS: labels of entries in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1912
+#: ../src/gtk-ui/sync-config-widget.c:1991
msgid "Username"
msgstr "Nom d'utilisateur"
-#: ../src/gtk-ui/sync-config-widget.c:1927
+#: ../src/gtk-ui/sync-config-widget.c:2006
msgid "Password"
msgstr "Mot de passe"
#. TRANSLATORS: warning in service configuration form for people
#. who have modified the configuration via other means.
-#: ../src/gtk-ui/sync-config-widget.c:1950
-msgid "Current configuration is more complex than what can be shown here. Changes to sync mode or synced data types will overwrite that configuration."
-msgstr "La configuration actuelle est plus complexe que ce qui peut être affiché ici. Les modifications apportées au mode synchronisation ou aux types de données synchronisées écraseront cette configuration."
+#: ../src/gtk-ui/sync-config-widget.c:2029
+msgid ""
+"Current configuration is more complex than what can be shown here. Changes "
+"to sync mode or synced data types will overwrite that configuration."
+msgstr ""
+"La configuration actuelle est plus complexe que ce qui peut être affiché "
+"ici. Les modifications apportées au mode synchronisation ou aux types de "
+"données synchronisées écraseront cette configuration."
#. TRANSLATORS: this is the epander label for server settings
#. in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1969
+#: ../src/gtk-ui/sync-config-widget.c:2048
msgid "Hide server settings"
msgstr "Masquer les paramètres du serveur"
#. TRANSLATORS: this is the epander label for server settings
#. in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1989
+#: ../src/gtk-ui/sync-config-widget.c:2068
msgid "Show server settings"
msgstr "Afficher les paramètres du serveur"
@@ -838,172 +966,47 @@ msgstr "Afficher les paramètres du serveur"
msgid "Sync in the Sync application"
msgstr "Synchroniser dans l'application Synchronisation"
-#: ../src/syncevo-dbus-server.cpp:5664
+#: ../src/syncevo-dbus-server.cpp:6653
#, c-format
msgid "%s is syncing"
msgstr "%s est en cours de synchronisation"
-#: ../src/syncevo-dbus-server.cpp:5665
+#: ../src/syncevo-dbus-server.cpp:6654
#, c-format
msgid "We have just started to sync your computer with the %s sync service."
-msgstr "Démarrage de la synchronisation de votre ordinateur avec le service %s."
+msgstr ""
+"Démarrage de la synchronisation de votre ordinateur avec le service %s."
#. if sync is successfully started and done
-#: ../src/syncevo-dbus-server.cpp:5679
+#: ../src/syncevo-dbus-server.cpp:6670
#, c-format
msgid "%s sync complete"
msgstr "Synchronisation %s terminée"
-#: ../src/syncevo-dbus-server.cpp:5680
+#: ../src/syncevo-dbus-server.cpp:6671
#, c-format
msgid "We have just finished syncing your computer with the %s sync service."
msgstr "Synchronisation de votre ordinateur avec le service %s"
-#. if sync is successfully started and has errors, or not started successful with a fatal problem
-#: ../src/syncevo-dbus-server.cpp:5685
+#. if sync is successfully started and has errors, or not started successful
+#. with a fatal problem
+#: ../src/syncevo-dbus-server.cpp:6676
msgid "Sync problem."
msgstr "Problème de synchronisation."
-#: ../src/syncevo-dbus-server.cpp:5686
+#: ../src/syncevo-dbus-server.cpp:6677
msgid "Sorry, there's a problem with your sync that you need to attend to."
msgstr "Désolé, il y a un problème avec la synchronisation que vous tentez."
-#: ../src/syncevo-dbus-server.cpp:5759
+#: ../src/syncevo-dbus-server.cpp:6758
msgid "View"
msgstr "Affichage"
#. Use "default" as ID because that is what mutter-moblin
#. recognizes: it then skips the action instead of adding it
#. in addition to its own "Dismiss" button (always added).
-#: ../src/syncevo-dbus-server.cpp:5763
+#: ../src/syncevo-dbus-server.cpp:6762
msgid "Dismiss"
msgstr "Ignorer"
-#~ msgid ""
-#~ "Do you want to replace %s with %s? This will not remove any synced "
-#~ "information on either end but you will no longer be able to sync with %s."
-#~ msgstr ""
-#~ "Voulez-vous remplacer %s avec %s ? Cela ne supprimera aucune information "
-#~ "synchronisée de part et d’autre mais vous ne pourrez plus synchroniser "
-#~ "avec %s."
-
-#~ msgid "Yes, use %s"
-#~ msgstr "Oui, utiliser %s"
-
-#~ msgid "No, use %s"
-#~ msgstr "Non, utiliser %s"
-
-#~ msgid "Database error"
-#~ msgstr "Erreur de base de données"
-
-#~ msgid "Reset service"
-#~ msgstr "Réinitialiser le service"
-
-#~ msgid "Addressbook"
-#~ msgstr "Carnet d'adresses"
-
-#~ msgid "Todo"
-#~ msgstr "À Faire"
-
-#~ msgid "Memo"
-#~ msgstr "Mémo"
-
-#~ msgid "Failed to save current service in GConf configuration system"
-#~ msgstr ""
-#~ "Impossible de sauvegarder le service actuel dans le système de "
-#~ "configuration GConf"
-
-#~ msgid "Failed to save service configuration to SyncEvolution"
-#~ msgstr ""
-#~ "Impossible de sauvegarder la configuration du service dans SyncEvolution"
-
-#~ msgid "Failed to get service configuration from SyncEvolution"
-#~ msgstr ""
-#~ "Impossible d'obtenir la configuration du service depuis SyncEvolution"
-
-#~ msgid "Failed to remove service configuration from SyncEvolution"
-#~ msgstr "Impossible d'éliminer la configuration du service de SyncEvolution"
-
-#~ msgid "Failed to cancel: sync was no longer in progress"
-#~ msgstr "Impossible d'annuler : sync n'était plus en cours de fonctionnement"
-
-#~ msgid "Failed to cancel sync"
-#~ msgstr "Impossible d'annuler la synchronisation"
-
-#~ msgid "Canceling sync"
-#~ msgstr "Synchronisation en cours d'annulation"
-
-#~ msgid "No sources are enabled, not syncing"
-#~ msgstr "Pas de source activée, échec de la synchronisation"
-
-#~ msgid "A sync is already in progress"
-#~ msgstr "Une synchronisation est déjà en cours"
-
-#~ msgid "Failed to start sync"
-#~ msgstr "Impossible de démarrer la synchronisation"
-
-#~ msgid "%s (not supported by this service)"
-#~ msgstr "%s (non pris en charge par ce service)"
-
-#~ msgid "Failed to get server configuration from SyncEvolution"
-#~ msgstr ""
-#~ "Impossible d'obtenir la configuration du serveur depuis SyncEvolution"
-
-#~ msgid "Server URL"
-#~ msgstr "URL du serveur"
-
-#~ msgid "Failed to get list of manually setup services from SyncEvolution"
-#~ msgstr ""
-#~ "Impossible d'obtenir la liste des services configurés manuellement depuis "
-#~ "SyncEvolution"
-
-#~ msgid "Service configuration not found"
-#~ msgstr "Configuration du service introuvable"
-
-#~ msgid "Not authorized"
-#~ msgstr "Non autorisé"
-
-#~ msgid "Not found"
-#~ msgstr "Introuvable"
-
-#~ msgid "Transport failure (no connection?)"
-#~ msgstr "Échec lors du transport (pas de connexion ?)"
-
-#~ msgid "Connection timed out"
-#~ msgstr "Connexion expirée"
-
-#~ msgid "Sync canceled"
-#~ msgstr "Synchronisation annulée"
-
-#~ msgid "Ending sync"
-#~ msgstr "Arrêt de la synchronisation en cours"
-
-#~ msgid "<b>No sync service in use</b>"
-#~ msgstr "<b>Pas de service de synchro en cours d'utilisation</b>"
-
-#~ msgid "<big>Manual setup</big>"
-#~ msgstr "<big>Configuration manuelle</big>"
-
-#~ msgid "Merge local and remote data (recommended)"
-#~ msgstr "Combiner les données locales et distantes (recommandé)"
-
-#~ msgid "Reset original server settings"
-#~ msgstr "Rétablir les paramètres d'origine du serveur"
-
-#~ msgid "Service name"
-#~ msgstr "Nom du service"
-
-#~ msgid ""
-#~ "Sorry, you need an internet\n"
-#~ "connection to sync."
-#~ msgstr ""
-#~ "Désolé, vous avez besoin d'une connexion\n"
-#~ "Internet pour synchroniser."
-
-#~ msgid ""
-#~ "Synchronization is not available (D-Bus service does not answer), sorry."
-#~ msgstr ""
-#~ "Synchronisation non disponible (pas de réponse du service D-Bus), désolé."
-#~ msgid "Bring your data with you"
-#~ msgstr "Apporter vos données avec vous"
diff --git a/po/it.po b/po/it.po
index 3c402c50..85e7e2ca 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,28 +1,28 @@
-# Italian translations for syncevolution package.
-# Copyright (C) 2009 syncevolution copyright package holder.
-# This file is distributed under the same license as the syncevolution package.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
# Milo Casagrande <milo@ubuntu.com>, 2009.
-#
+# <sbenassi@xmission.com>, 2011.
+# <tomas.galicia@intel.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: syncevolution\n"
-"Report-Msgid-Bugs-To: http://moblin.org/projects/syncevolution\n"
-"POT-Creation-Date: 2010-05-17 21:48+0000\n"
-"PO-Revision-Date: 2010-05-18 10:32-0800\n"
-"Last-Translator: francesca godani <francesca.godani@ptiglobal.net>\n"
-"Language-Team: Italian <tp@lists.linux.it>\n"
+"Report-Msgid-Bugs-To: https://bugs.meego.com/\n"
+"POT-Creation-Date: 2011-12-05 10:21-0800\n"
+"PO-Revision-Date: 2011-12-06 00:27+0000\n"
+"Last-Translator: GLS_Translator_ITA2 <sbenassi@xmission.com>\n"
+"Language-Team: Italian (http://www.transifex.net/projects/p/meego/team/it/)\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-Poedit-Language: Italian\n"
-"X-Poedit-SourceCharset: utf-8\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-# (ndt) titolo finestra
#. TRANSLATORS: this is the application name that may be used by e.g.
#. the windowmanager
-#: ../src/gtk-ui/main.c:40
-#: ../src/gtk-ui/ui.glade.h:38
+#: ../src/gtk-ui/main.c:40 ../src/gtk-ui/ui.glade.h:38
#: ../src/gtk-ui/sync.desktop.in.h:1
#: ../src/gnome-bluetooth/syncevolution.c:112
msgid "Sync"
@@ -36,8 +36,7 @@ msgstr "Contatti"
msgid "Appointments"
msgstr "Appuntamenti"
-#: ../src/gtk-ui/sync-ui.c:270
-#: ../src/gtk-ui/ui.glade.h:40
+#: ../src/gtk-ui/sync-ui.c:270 ../src/gtk-ui/ui.glade.h:40
msgid "Tasks"
msgstr "Compiti"
@@ -67,151 +66,153 @@ msgstr "Vuoi effettuare la sincronizzazione lenta con %s?"
msgid "Yes, do slow sync"
msgstr "Sì, effettua la sincronizzazione lenta"
-# (ndt) pulsante
#: ../src/gtk-ui/sync-ui.c:391
msgid "No, cancel sync"
msgstr "Annulla sincronizzazione"
-#. TRANSLATORS: confirmation dialog for refresh-from-server. Placeholder
+#. TRANSLATORS: confirmation dialog for "refresh from peer". Placeholder
#. * is service/device name
#: ../src/gtk-ui/sync-ui.c:424
#, c-format
-msgid "Do you want to delete all local data and replace it with data from %s? This is not usually advised."
-msgstr "Eliminare i dati locali e sostituirli con quelli da %s? Solitamente questo non è consigliato."
+msgid ""
+"Do you want to delete all local data and replace it with data from %s? This "
+"is not usually advised."
+msgstr ""
+"Eliminare i dati locali e sostituirli con quelli da %s? Solitamente questo "
+"non è consigliato."
-# (ndt) pulsante
-#: ../src/gtk-ui/sync-ui.c:429
-#: ../src/gtk-ui/sync-ui.c:460
+#: ../src/gtk-ui/sync-ui.c:429 ../src/gtk-ui/sync-ui.c:462
msgid "Yes, delete and replace"
msgstr "Elimina e sostituisci"
-#: ../src/gtk-ui/sync-ui.c:429
-#: ../src/gtk-ui/sync-ui.c:460
-#: ../src/gtk-ui/sync-ui.c:1605
+#: ../src/gtk-ui/sync-ui.c:429 ../src/gtk-ui/sync-ui.c:462
+#: ../src/gtk-ui/sync-ui.c:1610
msgid "No"
msgstr "No"
-#. TRANSLATORS: confirmation dialog for refresh-from-client. Placeholder
+#. TRANSLATORS: confirmation dialog for "refresh from local side". Placeholder
#. * is service/device name
-#: ../src/gtk-ui/sync-ui.c:455
+#: ../src/gtk-ui/sync-ui.c:457
#, c-format
-msgid "Do you want to delete all data in %s and replace it with your local data? This is not usually advised."
-msgstr "Eliminare i dati in %s e sostituirli con quelli locali? Solitamente questo non è consigliato."
+msgid ""
+"Do you want to delete all data in %s and replace it with your local data? "
+"This is not usually advised."
+msgstr ""
+"Eliminare i dati in %s e sostituirli con quelli locali? Solitamente questo "
+"non è consigliato."
-#: ../src/gtk-ui/sync-ui.c:487
+#: ../src/gtk-ui/sync-ui.c:491
msgid "Trying to cancel sync"
msgstr "Tentativo di annullare la sincronizzazione"
-#: ../src/gtk-ui/sync-ui.c:529
+#: ../src/gtk-ui/sync-ui.c:533
msgid "No service or device selected"
msgstr "Nessun servizio o dispositivo selezionato"
#. TRANSLATORS: This is the title on main view. Placeholder is
#. * the service name. Example: "Google - synced just now"
-#: ../src/gtk-ui/sync-ui.c:537
+#: ../src/gtk-ui/sync-ui.c:541
#, c-format
msgid "%s - synced just now"
msgstr "%s - Ultima sincronizzazione pochi secondi fa"
-#: ../src/gtk-ui/sync-ui.c:541
+#: ../src/gtk-ui/sync-ui.c:545
#, c-format
msgid "%s - synced a minute ago"
msgstr "%s - Ultima sincronizzazione un minuto fa"
-#: ../src/gtk-ui/sync-ui.c:545
+#: ../src/gtk-ui/sync-ui.c:549
#, c-format
msgid "%s - synced %ld minutes ago"
msgstr "%s - Ultima sincronizzazione %ld minuti fa"
-#: ../src/gtk-ui/sync-ui.c:550
+#: ../src/gtk-ui/sync-ui.c:554
#, c-format
msgid "%s - synced an hour ago"
msgstr "%s - Ultima sincronizzazione un'ora fa"
-#: ../src/gtk-ui/sync-ui.c:554
+#: ../src/gtk-ui/sync-ui.c:558
#, c-format
msgid "%s - synced %ld hours ago"
msgstr "%s - Ultima sincronizzazione %ld ore fa"
-#: ../src/gtk-ui/sync-ui.c:559
+#: ../src/gtk-ui/sync-ui.c:563
#, c-format
msgid "%s - synced a day ago"
msgstr "%s - Ultima sincronizzazione un giorno fa"
-#: ../src/gtk-ui/sync-ui.c:563
+#: ../src/gtk-ui/sync-ui.c:567
#, c-format
msgid "%s - synced %ld days ago"
msgstr "%s - Ultima sincronizzazione %ld giorni fa"
-# (ndt) pulsante
#. TRANSLATORS: Action button in info bar in main view. Shown with e.g.
#. * "You've just restored a backup. The changes have not been "
#. * "synced with %s yet"
-#: ../src/gtk-ui/sync-ui.c:612
-#: ../src/gtk-ui/sync-ui.c:726
+#: ../src/gtk-ui/sync-ui.c:616 ../src/gtk-ui/sync-ui.c:701
msgid "Sync now"
msgstr "Sincronizza ora"
-# (ndt) titolo finestra
#. TRANSLATORS: Action button in info bar in main view. Shown with e.g.
#. * "A normal sync is not possible at this time..." message.
#. * "Other options" will open Emergency view
-#: ../src/gtk-ui/sync-ui.c:618
-#: ../src/gtk-ui/ui.glade.h:37
+#: ../src/gtk-ui/sync-ui.c:622 ../src/gtk-ui/ui.glade.h:37
msgid "Slow sync"
msgstr "Sincronizzazione lenta"
-#: ../src/gtk-ui/sync-ui.c:619
+#: ../src/gtk-ui/sync-ui.c:623
msgid "Other options..."
msgstr "Altre opzioni..."
#. TRANSLATORS: Action button in info bar in main view. Shown e.g.
#. * when no service is selected. Will open configuration view
-#: ../src/gtk-ui/sync-ui.c:624
+#: ../src/gtk-ui/sync-ui.c:628
msgid "Select sync service"
msgstr "Seleziona servizio di sincronizzazione"
-# (ndt) pulsante, sto sul corto
#. TRANSLATORS: Action button in info bar in main view. Shown e.g.
#. * login to service fails. Will open configuration view for this service
-#: ../src/gtk-ui/sync-ui.c:629
+#: ../src/gtk-ui/sync-ui.c:633
msgid "Edit service settings"
msgstr "Modifica impostazioni"
-#: ../src/gtk-ui/sync-ui.c:700
-msgid "You haven't selected a sync service or device yet. Sync services let you synchronize your data between your netbook and a web service. You can also sync directly with some devices."
-msgstr "Non è ancora stato selezionato un servizio di sincronizzazione. Questi servizi consentono di sincronizzare i dati tra il proprio netbook e un servizio web. E' anche possibile sincronizzare direttamente con alcuni dispositivi."
+#: ../src/gtk-ui/sync-ui.c:709
+msgid ""
+"You haven't selected a sync service or device yet. Sync services let you "
+"synchronize your data between your netbook and a web service. You can also "
+"sync directly with some devices."
+msgstr ""
+"Non è ancora stato selezionato un servizio di sincronizzazione. Questi "
+"servizi consentono di sincronizzare i dati tra il proprio netbook e un "
+"servizio web. E' anche possibile sincronizzare direttamente con alcuni "
+"dispositivi."
-# (ndt) pulsante
-#: ../src/gtk-ui/sync-ui.c:722
+#: ../src/gtk-ui/sync-ui.c:729
msgid "Sync again"
msgstr "Sincronizza ancora"
-#: ../src/gtk-ui/sync-ui.c:743
+#: ../src/gtk-ui/sync-ui.c:748
msgid "Restoring"
msgstr "Ripristino"
-#: ../src/gtk-ui/sync-ui.c:745
+#: ../src/gtk-ui/sync-ui.c:750
msgid "Syncing"
msgstr "Sincronizzazione"
-# (ndt) pulsante
#. TRANSLATORS: This is for the button in main view, right side.
#. Keep line length below ~20 characters, use two lines if needed
-#: ../src/gtk-ui/sync-ui.c:757
-#: ../src/gtk-ui/sync-ui.c:3399
+#: ../src/gtk-ui/sync-ui.c:762 ../src/gtk-ui/sync-ui.c:3407
msgid "Cancel sync"
msgstr "Annulla sincronizzazione"
-# (ndt) pulsante, dovrebbe tornare alla finestra principale
-#: ../src/gtk-ui/sync-ui.c:922
+#: ../src/gtk-ui/sync-ui.c:927
msgid "Back to sync"
msgstr "Torna indietro"
#. TRANSLATORS: label for checkbutton/toggle in main view.
#. * Please stick to similar length strings or break the line with
#. * "\n" if absolutely needed
-#: ../src/gtk-ui/sync-ui.c:1224
+#: ../src/gtk-ui/sync-ui.c:1229
msgid "Automatic sync"
msgstr "Sincronizzazione automatica"
@@ -219,61 +220,78 @@ msgstr "Sincronizzazione automatica"
#. * currently selected data sources. First placeholder is service/device
#. * name, second a comma separeted list of sources.
#. * E.g. "Affected data: Google Contacts, Appointments"
-#: ../src/gtk-ui/sync-ui.c:1519
+#: ../src/gtk-ui/sync-ui.c:1524
#, c-format
msgid "Affected data: %s %s"
msgstr "Dati interessati: %s %s"
-#: ../src/gtk-ui/sync-ui.c:1524
+#: ../src/gtk-ui/sync-ui.c:1529
#, c-format
msgid "Affected data: none"
msgstr "Dati interessati: nessuno"
#. TRANSLATORS: confirmation for restoring a backup. placeholder is the
#. * backup time string defined below
-#: ../src/gtk-ui/sync-ui.c:1602
+#: ../src/gtk-ui/sync-ui.c:1607
#, c-format
-msgid "Do you want to restore the backup from %s? All changes you have made since then will be lost."
-msgstr "Vuoi ripristinare il backup da %s? Tutte le modifiche apportate da allora saranno perse."
+msgid ""
+"Do you want to restore the backup from %s? All changes you have made since "
+"then will be lost."
+msgstr ""
+"Vuoi ripristinare il backup da %s? Tutte le modifiche apportate da allora "
+"saranno perse."
-#: ../src/gtk-ui/sync-ui.c:1605
+#: ../src/gtk-ui/sync-ui.c:1610
msgid "Yes, restore"
msgstr "Sì, ripristina"
#. TRANSLATORS: date/time for strftime(), used in emergency view backup
#. * label. Any time format that shows date and time is good.
-#: ../src/gtk-ui/sync-ui.c:1637
+#: ../src/gtk-ui/sync-ui.c:1642
#, c-format
msgid "%x %X"
msgstr "%x %X"
#. TRANSLATORS: label for a backup in emergency view. Placeholder is
#. * service or device name
-#: ../src/gtk-ui/sync-ui.c:1656
+#: ../src/gtk-ui/sync-ui.c:1661
#, c-format
msgid "Backed up before syncing with %s"
msgstr "Back up effettuato prima della sincronizzazione con %s"
-#: ../src/gtk-ui/sync-ui.c:1673
+#: ../src/gtk-ui/sync-ui.c:1678
msgid "Restore"
msgstr "Ripristina"
#. TRANSLATORS: this is an explanation in Emergency view.
#. * Placeholder is a service/device name
-#: ../src/gtk-ui/sync-ui.c:1780
+#: ../src/gtk-ui/sync-ui.c:1785
#, c-format
-msgid "A normal sync with %s is not possible at this time. You can do a slow two-way sync or start from scratch. You can also restore a backup, but a slow sync or starting from scratch will still be required before normal sync is possible."
-msgstr "Una sincronizzazione normale con %s non è possibile in questo momento. Si può fare una sincronizzazione lenta a due vie o iniziare da zero. Si può anche ripristinare dal backup, ma una sincronizzazione lenta o un inizio da zero saranno comunque richiesti prima che sia possibile una sincronizzazione normale."
+msgid ""
+"A normal sync with %s is not possible at this time. You can do a slow two-"
+"way sync or start from scratch. You can also restore a backup, but a slow "
+"sync or starting from scratch will still be required before normal sync is "
+"possible."
+msgstr ""
+"Una sincronizzazione normale con %s non è possibile in questo momento. Si "
+"può fare una sincronizzazione lenta a due vie o iniziare da zero. Si può "
+"anche ripristinare dal backup, ma una sincronizzazione lenta o un inizio da "
+"zero saranno comunque richiesti prima che sia possibile una sincronizzazione"
+" normale."
-#: ../src/gtk-ui/sync-ui.c:1790
+#: ../src/gtk-ui/sync-ui.c:1795
#, c-format
-msgid "If something has gone horribly wrong, you can try a slow sync, start from scratch or restore from backup."
-msgstr "Se qualcosa è andato terribilmente storto, puoi provare una sincronizzazione lenta, iniziare da zero o ripristinare dal backup"
+msgid ""
+"If something has gone horribly wrong, you can try a slow sync, start from "
+"scratch or restore from backup."
+msgstr ""
+"Se qualcosa è andato terribilmente storto, puoi provare una sincronizzazione"
+" lenta, iniziare da zero o ripristinare dal backup"
#. TRANSLATORS: These are a buttons in Emergency view. Placeholder is a
#. * service/device name. Please don't use too long lines, but feel free to
#. * use several lines.
-#: ../src/gtk-ui/sync-ui.c:1799
+#: ../src/gtk-ui/sync-ui.c:1804
#, c-format
msgid ""
"Delete all your local\n"
@@ -284,7 +302,7 @@ msgstr ""
"e sostituirli con\n"
"quelli da %s"
-#: ../src/gtk-ui/sync-ui.c:1805
+#: ../src/gtk-ui/sync-ui.c:1810
#, c-format
msgid ""
"Delete all data on\n"
@@ -295,71 +313,74 @@ msgstr ""
"%s e sostituirli\n"
"con quelli locali"
-#: ../src/gtk-ui/sync-ui.c:2267
+#: ../src/gtk-ui/sync-ui.c:2275
msgid "Failed to get list of supported services from SyncEvolution"
msgstr "Recupero elenco dei servizi supportati da SyncEvolution non riuscito"
-#: ../src/gtk-ui/sync-ui.c:2321
-msgid "There was a problem communicating with the sync process. Please try again later."
-msgstr "Si è verificato un problema di comunicazione con il processo di sincronizzazione. Si prega di riprovare più tardi."
+#: ../src/gtk-ui/sync-ui.c:2329
+msgid ""
+"There was a problem communicating with the sync process. Please try again "
+"later."
+msgstr ""
+"Si è verificato un problema di comunicazione con il processo di "
+"sincronizzazione. Si prega di riprovare più tardi."
-#: ../src/gtk-ui/sync-ui.c:2380
+#: ../src/gtk-ui/sync-ui.c:2388
msgid "Restore failed"
msgstr "Ripristino non riuscito"
-#: ../src/gtk-ui/sync-ui.c:2383
-#: ../src/gtk-ui/sync-ui.c:3268
+#: ../src/gtk-ui/sync-ui.c:2391 ../src/gtk-ui/sync-ui.c:3276
msgid "Sync failed"
msgstr "Sincronizzazione non riuscita"
-#: ../src/gtk-ui/sync-ui.c:2389
+#: ../src/gtk-ui/sync-ui.c:2397
msgid "Restore complete"
msgstr "Ripristino completato"
-#: ../src/gtk-ui/sync-ui.c:2392
+#: ../src/gtk-ui/sync-ui.c:2400
msgid "Sync complete"
msgstr "Sincronizzazione completata"
-#: ../src/gtk-ui/sync-ui.c:2484
+#: ../src/gtk-ui/sync-ui.c:2492
#, c-format
msgid "Preparing '%s'"
msgstr "Preparazione di '%s'"
-#: ../src/gtk-ui/sync-ui.c:2487
+#: ../src/gtk-ui/sync-ui.c:2495
#, c-format
msgid "Receiving '%s'"
msgstr "Ricezione di '%s'"
-#: ../src/gtk-ui/sync-ui.c:2490
+#: ../src/gtk-ui/sync-ui.c:2498
#, c-format
msgid "Sending '%s'"
msgstr "Invio di '%s'"
-#: ../src/gtk-ui/sync-ui.c:2611
+#: ../src/gtk-ui/sync-ui.c:2619
#, c-format
msgid "There was one remote rejection."
msgid_plural "There were %ld remote rejections."
msgstr[0] "Si è verificato un rifiuto remoto."
msgstr[1] "Si sono verificati %ld rifiuti remoti."
-#: ../src/gtk-ui/sync-ui.c:2616
+#: ../src/gtk-ui/sync-ui.c:2624
#, c-format
msgid "There was one local rejection."
msgid_plural "There were %ld local rejections."
msgstr[0] "Si è verificato un rifiuto locale."
msgstr[1] "Si sono verificati %ld rifiuti locali."
-#: ../src/gtk-ui/sync-ui.c:2621
+#: ../src/gtk-ui/sync-ui.c:2629
#, c-format
msgid "There were %ld local rejections and %ld remote rejections."
msgstr "Si sono verificati %ld rifiuti locali e %ld remoti."
-#: ../src/gtk-ui/sync-ui.c:2626
+#: ../src/gtk-ui/sync-ui.c:2634
#, c-format
msgid "Last time: No changes."
msgstr "Ultima volta: nessuna modifica."
-#: ../src/gtk-ui/sync-ui.c:2628
+#: ../src/gtk-ui/sync-ui.c:2636
#, c-format
msgid "Last time: Sent one change."
msgid_plural "Last time: Sent %ld changes."
@@ -369,21 +390,21 @@ msgstr[1] "Ultima volta: inviate %ld modifiche."
#. This is about changes made to the local data. Not all of these
#. changes were requested by the remote server, so "applied"
#. is a better word than "received" (bug #5185).
-#: ../src/gtk-ui/sync-ui.c:2636
+#: ../src/gtk-ui/sync-ui.c:2644
#, c-format
msgid "Last time: Applied one change."
msgid_plural "Last time: Applied %ld changes."
msgstr[0] "Ultima volta: applicata una modifica."
msgstr[1] "Ultima volta: applicate %ld modifiche."
-#: ../src/gtk-ui/sync-ui.c:2641
+#: ../src/gtk-ui/sync-ui.c:2649
#, c-format
msgid "Last time: Applied %ld changes and sent %ld changes."
msgstr "Ultima volta: applicate %ld modifiche e inviate %ld."
#. TRANSLATORS: the placeholder is a error message (hopefully)
#. * explaining the problem
-#: ../src/gtk-ui/sync-ui.c:2848
+#: ../src/gtk-ui/sync-ui.c:2856
#, c-format
msgid ""
"There was a problem with last sync:\n"
@@ -392,127 +413,156 @@ msgstr ""
"Si è verificato un problema con l'ultima sincronizzazione:\n"
"%s"
-#: ../src/gtk-ui/sync-ui.c:2858
+#: ../src/gtk-ui/sync-ui.c:2866
#, c-format
-msgid "You've just restored a backup. The changes have not been synced with %s yet"
-msgstr "Hai appena ripristinato un backup. I cambiamenti non sono ancora stati sincronizzati con %s"
+msgid ""
+"You've just restored a backup. The changes have not been synced with %s yet"
+msgstr ""
+"Hai appena ripristinato un backup. I cambiamenti non sono ancora stati "
+"sincronizzati con %s"
-#: ../src/gtk-ui/sync-ui.c:3146
+#: ../src/gtk-ui/sync-ui.c:3154
msgid "Waiting for current operation to finish..."
msgstr "In attesa che termini l'operazione..."
#. TRANSLATORS: next strings are error messages.
-#: ../src/gtk-ui/sync-ui.c:3180
-msgid "A normal sync is not possible at this time. The server suggests a slow sync, but this might not always be what you want if both ends already have data."
-msgstr "Una sincronizzazione normale non è possibile in questo momento. Il server suggerisce una sincronizzazione lenta, ma questo potrebbe non essere sempre quello che vuoi, se entrambe le estremità hanno dati."
+#: ../src/gtk-ui/sync-ui.c:3188
+msgid ""
+"A normal sync is not possible at this time. The server suggests a slow sync,"
+" but this might not always be what you want if both ends already have data."
+msgstr ""
+"Una sincronizzazione normale non è possibile in questo momento. Il server "
+"suggerisce una sincronizzazione lenta, ma questo potrebbe non essere sempre "
+"quello che vuoi, se entrambe le estremità hanno dati."
-#: ../src/gtk-ui/sync-ui.c:3184
+#: ../src/gtk-ui/sync-ui.c:3192
msgid "The sync process died unexpectedly."
msgstr "Il servizio di sincronizzazione è terminato inaspettatamente."
-#: ../src/gtk-ui/sync-ui.c:3189
-msgid "Password request was not answered. You can save the password in the settings to prevent the request."
-msgstr "La richiesta della password ha ricevuto risposta. È possibile salvare la password nelle impostazioni per evitare la richiesta."
+#: ../src/gtk-ui/sync-ui.c:3197
+msgid ""
+"Password request was not answered. You can save the password in the settings"
+" to prevent the request."
+msgstr ""
+"La richiesta della password ha ricevuto risposta. È possibile salvare la "
+"password nelle impostazioni per evitare la richiesta."
#. TODO use the service device name here, this is a remote problem
-#: ../src/gtk-ui/sync-ui.c:3193
+#: ../src/gtk-ui/sync-ui.c:3201
msgid "There was a problem processing sync request. Trying again may help."
-msgstr "C'è stato un problema di elaborazione delle richieste di sincronizzazione. Riprovare potrebbe risolvere il problema."
+msgstr ""
+"C'è stato un problema di elaborazione delle richieste di sincronizzazione. "
+"Riprovare potrebbe risolvere il problema."
-#: ../src/gtk-ui/sync-ui.c:3199
-msgid "Failed to login. Could there be a problem with your username or password?"
-msgstr "Impossibile effettuare il login. Ci potrebbe essere un problema con il tuo nome utente o la password?"
+#: ../src/gtk-ui/sync-ui.c:3207
+msgid ""
+"Failed to login. Could there be a problem with your username or password?"
+msgstr ""
+"Impossibile effettuare il login. Ci potrebbe essere un problema con il tuo "
+"nome utente o la password?"
-#: ../src/gtk-ui/sync-ui.c:3202
+#: ../src/gtk-ui/sync-ui.c:3210
msgid "Forbidden"
msgstr "Proibito"
#. TRANSLATORS: data source means e.g. calendar or addressbook
-#: ../src/gtk-ui/sync-ui.c:3208
-msgid "A data source could not be found. Could there be a problem with the settings?"
-msgstr "Impossibile trovare la sorgente. Ci potrebbe essere un problema con le impostazioni?"
+#: ../src/gtk-ui/sync-ui.c:3216
+msgid ""
+"A data source could not be found. Could there be a problem with the "
+"settings?"
+msgstr ""
+"Impossibile trovare la sorgente. Ci potrebbe essere un problema con le "
+"impostazioni?"
-#: ../src/gtk-ui/sync-ui.c:3212
+#: ../src/gtk-ui/sync-ui.c:3220
msgid "Remote database error"
msgstr "Errore remoto nel database"
#. This can happen when EDS is borked, restart it may help...
-#: ../src/gtk-ui/sync-ui.c:3215
-msgid "There is a problem with the local database. Syncing again or rebooting may help."
-msgstr "C'è un problema con il database locale. Sincronizzare di nuovo o riavviare."
+#: ../src/gtk-ui/sync-ui.c:3223
+msgid ""
+"There is a problem with the local database. Syncing again or rebooting may "
+"help."
+msgstr ""
+"C'è un problema con il database locale. Sincronizzare di nuovo o riavviare."
-#: ../src/gtk-ui/sync-ui.c:3218
+#: ../src/gtk-ui/sync-ui.c:3226
msgid "No space on disk"
msgstr "Spazio esaurito sul disco"
-#: ../src/gtk-ui/sync-ui.c:3220
+#: ../src/gtk-ui/sync-ui.c:3228
msgid "Failed to process SyncML"
msgstr "Elaborazione SyncML non riuscita"
-#: ../src/gtk-ui/sync-ui.c:3222
+#: ../src/gtk-ui/sync-ui.c:3230
msgid "Server authorization failed"
msgstr "Autorizzazione server non riuscita"
-#: ../src/gtk-ui/sync-ui.c:3224
+#: ../src/gtk-ui/sync-ui.c:3232
msgid "Failed to parse configuration file"
msgstr "Analisi del file di configurazione non riuscita"
-#: ../src/gtk-ui/sync-ui.c:3226
+#: ../src/gtk-ui/sync-ui.c:3234
msgid "Failed to read configuration file"
msgstr "Lettura del file di configurazione non riuscita"
-#: ../src/gtk-ui/sync-ui.c:3228
+#: ../src/gtk-ui/sync-ui.c:3236
msgid "No configuration found"
msgstr "Non è stata trovata alcuna configurazione"
-#: ../src/gtk-ui/sync-ui.c:3230
+#: ../src/gtk-ui/sync-ui.c:3238
msgid "No configuration file found"
msgstr "Non è stato trovato alcun file di configurazione"
-#: ../src/gtk-ui/sync-ui.c:3232
+#: ../src/gtk-ui/sync-ui.c:3240
msgid "Server sent bad content"
msgstr "Il server ha inviato dei contenuti errati"
-#: ../src/gtk-ui/sync-ui.c:3234
+#: ../src/gtk-ui/sync-ui.c:3242
msgid "Connection certificate has expired"
msgstr "Il certificato della connessione è scaduto"
-#: ../src/gtk-ui/sync-ui.c:3236
+#: ../src/gtk-ui/sync-ui.c:3244
msgid "Connection certificate is invalid"
msgstr "Il certificato della connessione non è valido"
-#: ../src/gtk-ui/sync-ui.c:3244
-msgid "We were unable to connect to the server. The problem could be temporary or there could be something wrong with the settings."
-msgstr "Non siamo stati in grado di connetterci al server. Il problema potrebbe essere temporaneo o ci potrebbe essere qualcosa di sbagliato con le impostazioni."
+#: ../src/gtk-ui/sync-ui.c:3252
+msgid ""
+"We were unable to connect to the server. The problem could be temporary or "
+"there could be something wrong with the settings."
+msgstr ""
+"Non siamo stati in grado di connetterci al server. Il problema potrebbe "
+"essere temporaneo o ci potrebbe essere qualcosa di sbagliato con le "
+"impostazioni."
-#: ../src/gtk-ui/sync-ui.c:3251
+#: ../src/gtk-ui/sync-ui.c:3259
msgid "The server URL is bad"
-msgstr "L'URLdel server non è corretto"
+msgstr "L'URL del server non è corretto"
-#: ../src/gtk-ui/sync-ui.c:3256
+#: ../src/gtk-ui/sync-ui.c:3264
msgid "The server was not found"
msgstr "Il server non è stato trovato"
-#: ../src/gtk-ui/sync-ui.c:3258
+#: ../src/gtk-ui/sync-ui.c:3266
#, c-format
msgid "Error %d"
msgstr "Errore %d"
#. TRANSLATORS: password request dialog contents: title, cancel button
#. * and ok button
-#: ../src/gtk-ui/sync-ui.c:3396
+#: ../src/gtk-ui/sync-ui.c:3404
msgid "Password is required for sync"
msgstr "Password necessaria per la sincronizzazione"
-#: ../src/gtk-ui/sync-ui.c:3400
+#: ../src/gtk-ui/sync-ui.c:3408
msgid "Sync with password"
msgstr "Sincronizza con password"
#. TRANSLATORS: password request dialog message, placeholder is service name
-#: ../src/gtk-ui/sync-ui.c:3410
+#: ../src/gtk-ui/sync-ui.c:3418
#, c-format
msgid "Please enter password for syncing with %s:"
-msgstr "Inserire la passoword per la sincronizzazione con %s:"
+msgstr "Inserire la password per la sincronizzazione con %s:"
#. title for the buttons on the right side of main view
#: ../src/gtk-ui/ui.glade.h:2
@@ -555,27 +605,29 @@ msgstr ""
"Una sincronizzazione lenta compara gli elementi da entrambe le parti e tenta di metterli insieme. \n"
"Questo potrebbe non riuscire in alcuni casi, portando a duplicati o a informazioni perse."
-# (ndt) pulsante
#: ../src/gtk-ui/ui.glade.h:15
msgid "Add new device"
msgstr "Aggiungi un nuovo dispositivo"
-# (ndt) pulsante
#: ../src/gtk-ui/ui.glade.h:16
msgid "Add new service"
msgstr "Aggiungi servizio"
#. explanation of "Restore backup" function
#: ../src/gtk-ui/ui.glade.h:18
-msgid "Backups are made before every time we Sync. Choose a backup to restore. Any changes you have made since then will be lost."
-msgstr "I backup sono effettuati prima di ogni sincronizzazione. Scegli un backup da ripristinare. Ogni modifica fatta da allora andrà persa."
+msgid ""
+"Backups are made before every time we Sync. Choose a backup to restore. Any "
+"changes you have made since then will be lost."
+msgstr ""
+"I backup sono effettuati prima di ogni sincronizzazione. Scegli un backup da"
+" ripristinare. Ogni modifica fatta da allora andrà persa."
#: ../src/gtk-ui/ui.glade.h:19
msgid "Calendar"
msgstr "Calendario"
-# (ndt) pulsante
-#. Button in main view, right side. Keep to below 20 chars per line, feel free to use two lines
+#. Button in main view, right side. Keep to below 20 chars per line, feel free
+#. to use two lines
#: ../src/gtk-ui/ui.glade.h:21
msgid ""
"Change or edit\n"
@@ -607,7 +659,8 @@ msgstr ""
"Eliminare i dati locali\n"
"e sostituirli con quelli da Zyb"
-#. button in main view, right side. Keep length to 20 characters or so, use two lines if needed
+#. button in main view, right side. Keep length to 20 characters or so, use
+#. two lines if needed
#: ../src/gtk-ui/ui.glade.h:32
msgid ""
"Fix a sync\n"
@@ -617,7 +670,6 @@ msgstr ""
"sincronizzazione di\n"
"emergenza"
-# (ndt) segnalare SyncML?
#: ../src/gtk-ui/ui.glade.h:34
msgid ""
"If you don't see your service above but know that your sync provider uses SyncML\n"
@@ -648,94 +700,132 @@ msgstr "Usa Blootooth per sincronizzare i dati da un dispositivo all'altro."
#: ../src/gtk-ui/ui.glade.h:44
msgid "You will need to add Bluetooth devices before they can be synced."
-msgstr "Devi aggiungere i dispositivi Bluetooth prima che possano essere sincronizzati."
+msgstr ""
+"Devi aggiungere i dispositivi Bluetooth prima che possano essere "
+"sincronizzati."
#: ../src/gtk-ui/sync.desktop.in.h:2
-#: ../src/gtk-ui/sync-gtk.desktop.in.h:2
msgid "Up to date"
msgstr "Aggiornato"
#: ../src/gtk-ui/sync-gtk.desktop.in.h:1
-msgid "Sync (GTK)"
-msgstr "Sync (GTK)"
+msgid "SyncEvolution (GTK)"
+msgstr "SyncEvolution (GTK)"
+
+#: ../src/gtk-ui/sync-gtk.desktop.in.h:2
+msgid "Synchronize PIM data"
+msgstr "Sincronizza dati PIM"
-#: ../src/gtk-ui/sync-config-widget.c:78
-msgid "ScheduleWorld enables you to keep your contacts, events, tasks, and notes in sync."
-msgstr "ScheduleWorld consente di tenere sincronizzati contatti, eventi, attività e note."
+#: ../src/gtk-ui/sync-config-widget.c:88
+msgid ""
+"ScheduleWorld enables you to keep your contacts, events, tasks, and notes in"
+" sync."
+msgstr ""
+"ScheduleWorld consente di tenere sincronizzati contatti, eventi, attività e "
+"note."
-#: ../src/gtk-ui/sync-config-widget.c:81
-msgid "Google Sync can back up and synchronize your contacts with your Gmail contacts."
-msgstr "Google Sync è in grado di eseguire backup di sicurezza e di sincronizzare la propria rubrica con i contatti di Gmail."
+#: ../src/gtk-ui/sync-config-widget.c:91
+msgid ""
+"Google Sync can back up and synchronize your contacts with your Gmail "
+"contacts."
+msgstr ""
+"Google Sync è in grado di eseguire backup di sicurezza e di sincronizzare la"
+" propria rubrica con i contatti di Gmail."
#. TRANSLATORS: Please include the word "demo" (or the equivalent in
#. your language): Funambol is going to be a 90 day demo service
#. in the future
-#: ../src/gtk-ui/sync-config-widget.c:87
-msgid "Back up your contacts and calendar. Sync with a single click, anytime, anywhere (DEMO)."
-msgstr "Eseguire una copia di sicurezza dei propri contatti e del proprio calendario. Sincronizzare con un solo clic, sempre e ovunque (dimostrativo)."
+#: ../src/gtk-ui/sync-config-widget.c:97
+msgid ""
+"Back up your contacts and calendar. Sync with a single click, anytime, "
+"anywhere (DEMO)."
+msgstr ""
+"Eseguire una copia di sicurezza dei propri contatti e del proprio "
+"calendario. Sincronizzare con un solo clic, sempre e ovunque (dimostrativo)."
-#: ../src/gtk-ui/sync-config-widget.c:90
-msgid "Mobical Backup and Restore service allows you to securely back up your personal mobile data for free."
-msgstr "Il servizio Mobical Backup and Restore ti permette di effettuare backup dei tuoi mobile data gratuitamente e in tutta sicurezza."
+#: ../src/gtk-ui/sync-config-widget.c:100
+msgid ""
+"Mobical Backup and Restore service allows you to securely back up your "
+"personal mobile data for free."
+msgstr ""
+"Il servizio Mobical Backup and Restore ti permette di effettuare backup dei "
+"tuoi mobile data gratuitamente e in tutta sicurezza."
-#: ../src/gtk-ui/sync-config-widget.c:93
-msgid "ZYB is a simple way for people to store and share mobile information online."
-msgstr "ZYB è un modo semplice di memorizzare e condividere le tue informazioni mobili online."
+#: ../src/gtk-ui/sync-config-widget.c:103
+msgid ""
+"ZYB is a simple way for people to store and share mobile information online."
+msgstr ""
+"ZYB è un modo semplice di memorizzare e condividere le tue informazioni "
+"mobili online."
-#: ../src/gtk-ui/sync-config-widget.c:96
-msgid "Memotoo lets you access your personal data from any computer connected to the Internet."
-msgstr "Memotoo ti permettere di accedere ai tuoi dati personali da qualsiasi computer connesso a internet."
+#: ../src/gtk-ui/sync-config-widget.c:106
+msgid ""
+"Memotoo lets you access your personal data from any computer connected to "
+"the Internet."
+msgstr ""
+"Memotoo ti permettere di accedere ai tuoi dati personali da qualsiasi "
+"computer connesso a internet."
-#: ../src/gtk-ui/sync-config-widget.c:192
+#: ../src/gtk-ui/sync-config-widget.c:195
msgid "Sorry, failed to save the configuration"
msgstr "Siamo spiacenti, impossibile salvare la configurazione"
-#: ../src/gtk-ui/sync-config-widget.c:381
+#: ../src/gtk-ui/sync-config-widget.c:445
msgid "Service must have a name and server URL"
msgstr "Il servizio deve avere un nome e un indirizzo del server"
-#: ../src/gtk-ui/sync-config-widget.c:422
+#. TRANSLATORS: error dialog when creating a new sync configuration
+#: ../src/gtk-ui/sync-config-widget.c:451
+msgid "A username is required for this service"
+msgstr "Il nome utente è necessario per questo servizio"
+
+#: ../src/gtk-ui/sync-config-widget.c:493
#, c-format
-msgid "Do you want to reset the settings for %s? This will not remove any synced information on either end."
-msgstr "Vuoi ripristinare le impostazioni per %s? Questa operazione non rimuoverà nessuna informazione sincronizzata."
+msgid ""
+"Do you want to reset the settings for %s? This will not remove any synced "
+"information on either end."
+msgstr ""
+"Vuoi ripristinare le impostazioni per %s? Questa operazione non rimuoverà "
+"nessuna informazione sincronizzata."
#. TRANSLATORS: buttons in reset-service warning dialog
-#: ../src/gtk-ui/sync-config-widget.c:426
+#: ../src/gtk-ui/sync-config-widget.c:497
msgid "Yes, reset"
msgstr "Sì, ripristina"
-#: ../src/gtk-ui/sync-config-widget.c:427
-#: ../src/gtk-ui/sync-config-widget.c:438
+#: ../src/gtk-ui/sync-config-widget.c:498
+#: ../src/gtk-ui/sync-config-widget.c:509
msgid "No, keep settings"
msgstr "No, mantieni le impostazioni"
-#: ../src/gtk-ui/sync-config-widget.c:432
+#: ../src/gtk-ui/sync-config-widget.c:503
#, c-format
-msgid "Do you want to delete the settings for %s? This will not remove any synced information on either end but it will remove these settings."
-msgstr "Vuoi eliminare le impostazioni per %s? Questa operazione non rimuoverà nessuna informazione sincronizzata ma rimuoverà le configurazioni per questo servizio."
+msgid ""
+"Do you want to delete the settings for %s? This will not remove any synced "
+"information on either end but it will remove these settings."
+msgstr ""
+"Vuoi eliminare le impostazioni per %s? Questa operazione non rimuoverà "
+"nessuna informazione sincronizzata ma rimuoverà le configurazioni per questo"
+" servizio."
-# (ndt) pulsante
#. TRANSLATORS: buttons in delete-service warning dialog
-#: ../src/gtk-ui/sync-config-widget.c:437
+#: ../src/gtk-ui/sync-config-widget.c:508
msgid "Yes, delete"
msgstr "Sì, elimina"
-#: ../src/gtk-ui/sync-config-widget.c:467
+#: ../src/gtk-ui/sync-config-widget.c:539
msgid "Reset settings"
msgstr "Reimposta le impostazioni"
-# (ndt) pulsante
-#: ../src/gtk-ui/sync-config-widget.c:470
+#: ../src/gtk-ui/sync-config-widget.c:542
msgid "Delete settings"
msgstr "Elimina le impostazioni"
-# (ndt) pulsante
-#: ../src/gtk-ui/sync-config-widget.c:480
+#: ../src/gtk-ui/sync-config-widget.c:552
msgid "Save and use"
msgstr "Salva e usa"
-# (ndt) pulsante
-#: ../src/gtk-ui/sync-config-widget.c:483
+#: ../src/gtk-ui/sync-config-widget.c:555
msgid ""
"Save and replace\n"
"current service"
@@ -743,105 +833,121 @@ msgstr ""
"Salva e sostituisci\n"
" il servizio"
-# (ndt) pulsante
-#: ../src/gtk-ui/sync-config-widget.c:493
+#: ../src/gtk-ui/sync-config-widget.c:563
msgid "Stop using device"
msgstr "Non usare il servizio"
-# (ndt) pulsante
-#: ../src/gtk-ui/sync-config-widget.c:496
+#: ../src/gtk-ui/sync-config-widget.c:566
msgid "Stop using service"
msgstr "Non usare il servizio"
#. TRANSLATORS: label for an entry in service configuration form.
#. * Placeholder is a source name.
#. * Example: "Appointments URI"
-#: ../src/gtk-ui/sync-config-widget.c:679
+#: ../src/gtk-ui/sync-config-widget.c:749
#, c-format
msgid "%s URI"
msgstr "URI di %s"
#. TRANSLATORS: toggles in service configuration form, placeholder is service
#. * or device name
-#: ../src/gtk-ui/sync-config-widget.c:854
+#: ../src/gtk-ui/sync-config-widget.c:936
#, c-format
msgid "Send changes to %s"
msgstr "Invia modifiche a %s"
-#: ../src/gtk-ui/sync-config-widget.c:859
+#: ../src/gtk-ui/sync-config-widget.c:941
#, c-format
msgid "Receive changes from %s"
msgstr "Ricevi le modifiche per %s"
-#: ../src/gtk-ui/sync-config-widget.c:875
+#: ../src/gtk-ui/sync-config-widget.c:957
msgid "<b>Sync</b>"
msgstr "<b>Sincronizzazione</b>"
#. TRANSLATORS: label of a entry in service configuration
-#: ../src/gtk-ui/sync-config-widget.c:891
+#: ../src/gtk-ui/sync-config-widget.c:973
msgid "Server address"
msgstr "Indirizzo server"
#. TRANSLATORS: explanation before a device template combobox.
#. * Placeholder is a device name like 'Nokia N85' or 'Syncevolution
#. * Client'
-#: ../src/gtk-ui/sync-config-widget.c:967
+#: ../src/gtk-ui/sync-config-widget.c:1049
#, c-format
-msgid "This device looks like it might be a '%s'. If this is not correct, please take a look at the list of supported devices and pick yours if it is listed"
-msgstr "Il dispositivo sembra essere un '%s'. Se questo non è corretto, si prega di dare un'occhiata alla lista dei dispositivi supportati e scegliere quello più appropriato"
+msgid ""
+"This device looks like it might be a '%s'. If this is not correct, please "
+"take a look at the list of supported devices and pick yours if it is listed"
+msgstr ""
+"Il dispositivo sembra essere un '%s'. Se questo non è corretto, si prega di "
+"dare un'occhiata alla lista dei dispositivi supportati e scegliere quello "
+"più appropriato"
-#: ../src/gtk-ui/sync-config-widget.c:973
-msgid "We don't know what this device is exactly. Please take a look at the list of supported devices and pick yours if it is listed"
-msgstr "Non sappiamo che sia esattamente questo dispositivo. Si prega di dare un'occhiata alla lista delle periferiche supportate e scegliere quella appropriata se è elencata"
+#: ../src/gtk-ui/sync-config-widget.c:1055
+#: ../src/gtk-ui/sync-config-widget.c:1915
+msgid ""
+"We don't know what this device is exactly. Please take a look at the list of"
+" supported devices and pick yours if it is listed"
+msgstr ""
+"Non sappiamo che sia esattamente questo dispositivo. Si prega di dare "
+"un'occhiata alla lista delle periferiche supportate e scegliere quella "
+"appropriata se è elencata"
-#: ../src/gtk-ui/sync-config-widget.c:1126
+#: ../src/gtk-ui/sync-config-widget.c:1207
#, c-format
msgid "%s - Bluetooth device"
msgstr "%s - Dispositivo Bluetooth"
#. TRANSLATORS: service title for services that are not based on a
#. * template in service list, the placeholder is the name of the service
-#: ../src/gtk-ui/sync-config-widget.c:1132
+#: ../src/gtk-ui/sync-config-widget.c:1213
#, c-format
msgid "%s - manually setup"
msgstr "%s - configura manualmente"
-# (ndt) è un collegamento
#. TRANSLATORS: link button in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1807
+#: ../src/gtk-ui/sync-config-widget.c:1886
msgid "Launch website"
msgstr "Visita il sito web"
-# (ndt) pulsante
#. TRANSLATORS: button in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1816
+#: ../src/gtk-ui/sync-config-widget.c:1895
msgid "Set up now"
msgstr "Configura adesso"
+#: ../src/gtk-ui/sync-config-widget.c:1953
+msgid "Use these settings"
+msgstr "Usare queste impostazioni"
+
#. TRANSLATORS: labels of entries in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1912
+#: ../src/gtk-ui/sync-config-widget.c:1991
msgid "Username"
msgstr "Nome utente"
-#: ../src/gtk-ui/sync-config-widget.c:1927
+#: ../src/gtk-ui/sync-config-widget.c:2006
msgid "Password"
msgstr "Password"
#. TRANSLATORS: warning in service configuration form for people
#. who have modified the configuration via other means.
-#: ../src/gtk-ui/sync-config-widget.c:1950
-msgid "Current configuration is more complex than what can be shown here. Changes to sync mode or synced data types will overwrite that configuration."
-msgstr "La configurazione del servizio attuale è più complessa di quello che può essere mostrato qui. Le modifiche alla modalità di sincronizzazione o ai tipi di dati sincronizzati sovrascriveranno quella configurazione."
+#: ../src/gtk-ui/sync-config-widget.c:2029
+msgid ""
+"Current configuration is more complex than what can be shown here. Changes "
+"to sync mode or synced data types will overwrite that configuration."
+msgstr ""
+"La configurazione del servizio attuale è più complessa di quello che può "
+"essere mostrato qui. Le modifiche alla modalità di sincronizzazione o ai "
+"tipi di dati sincronizzati sovrascriveranno quella configurazione."
#. TRANSLATORS: this is the epander label for server settings
#. in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1969
+#: ../src/gtk-ui/sync-config-widget.c:2048
msgid "Hide server settings"
msgstr "Nascondi impostazioni server"
#. TRANSLATORS: this is the epander label for server settings
#. in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1989
+#: ../src/gtk-ui/sync-config-widget.c:2068
msgid "Show server settings"
msgstr "Mostra impostazioni server"
@@ -849,156 +955,50 @@ msgstr "Mostra impostazioni server"
msgid "Sync in the Sync application"
msgstr "Sincronizza nell'applicazione di sincronizzazione"
-#: ../src/syncevo-dbus-server.cpp:5664
+#: ../src/syncevo-dbus-server.cpp:6653
#, c-format
msgid "%s is syncing"
msgstr "%s è in fase di sincronizzazione"
-#: ../src/syncevo-dbus-server.cpp:5665
+#: ../src/syncevo-dbus-server.cpp:6654
#, c-format
msgid "We have just started to sync your computer with the %s sync service."
-msgstr "Abbiamo appena iniziato a sincronizzare il computer con il servizio di sincronizzazione %s."
+msgstr ""
+"Abbiamo appena iniziato a sincronizzare il computer con il servizio di "
+"sincronizzazione %s."
#. if sync is successfully started and done
-#: ../src/syncevo-dbus-server.cpp:5679
+#: ../src/syncevo-dbus-server.cpp:6670
#, c-format
msgid "%s sync complete"
msgstr "Sincronizzazione di %s completata"
-#: ../src/syncevo-dbus-server.cpp:5680
+#: ../src/syncevo-dbus-server.cpp:6671
#, c-format
msgid "We have just finished syncing your computer with the %s sync service."
-msgstr "Abbiamo finito di sincronizzare il computer con il servizio di sincronizzazione %s."
+msgstr ""
+"Abbiamo finito di sincronizzare il computer con il servizio di "
+"sincronizzazione %s."
-#. if sync is successfully started and has errors, or not started successful with a fatal problem
-#: ../src/syncevo-dbus-server.cpp:5685
+#. if sync is successfully started and has errors, or not started successful
+#. with a fatal problem
+#: ../src/syncevo-dbus-server.cpp:6676
msgid "Sync problem."
msgstr "Problema di sincronizzazione."
-#: ../src/syncevo-dbus-server.cpp:5686
+#: ../src/syncevo-dbus-server.cpp:6677
msgid "Sorry, there's a problem with your sync that you need to attend to."
msgstr "C'è un problema con la sincronizzazione che richiede attenzione."
-#: ../src/syncevo-dbus-server.cpp:5759
+#: ../src/syncevo-dbus-server.cpp:6758
msgid "View"
msgstr "Visualizza"
#. Use "default" as ID because that is what mutter-moblin
#. recognizes: it then skips the action instead of adding it
#. in addition to its own "Dismiss" button (always added).
-#: ../src/syncevo-dbus-server.cpp:5763
+#: ../src/syncevo-dbus-server.cpp:6762
msgid "Dismiss"
msgstr "Scarta"
-#~ msgid "Database error"
-#~ msgstr "Errore nel database"
-
-#~ msgid ""
-#~ "Do you want to replace %s with %s? This will not remove any synced "
-#~ "information on either end but you will no longer be able to sync with %s."
-#~ msgstr ""
-#~ "Vuoi sostituire %s con %s? Questa operazione non rimuoverà nessuna "
-#~ "informazione sincronizzata ma non sarai più in grado di sincronizzare con "
-#~ "%s."
-
-#~ msgid "Yes, use %s"
-#~ msgstr "Sì, utilizza %s"
-
-#~ msgid "No, use %s"
-#~ msgstr "No, utilizza %s"
-
-#~ msgid "Reset service"
-#~ msgstr "Servizio di ripristino"
-
-#~ msgid "Addressbook"
-#~ msgstr "Rubrica"
-
-#~ msgid "Todo"
-#~ msgstr "Attività"
-
-#~ msgid "Memo"
-#~ msgstr "Memo"
-
-#~ msgid "Failed to save current service in GConf configuration system"
-#~ msgstr ""
-#~ "Salvataggio del servizio attuale nel sistema di configurazione GConf non "
-#~ "riuscito"
-
-#~ msgid "Failed to save service configuration to SyncEvolution"
-#~ msgstr ""
-#~ "Salvataggio della configurazione del servizio in SyncEvolution non "
-#~ "riuscito"
-
-#~ msgid "Failed to get service configuration from SyncEvolution"
-#~ msgstr ""
-#~ "Recupero della configurazione del servizio da SyncEvolution non riuscito"
-
-#~ msgid "Failed to remove service configuration from SyncEvolution"
-#~ msgstr ""
-#~ "Rimozione della configurazione del servizio da SyncEvolution non riuscita"
-
-#~ msgid "Failed to cancel: sync was no longer in progress"
-#~ msgstr "Annullamento non riuscito: la sincronizzazione non era più in corso"
-
-#~ msgid "Failed to cancel sync"
-#~ msgstr "Annullamento sincronizzazione non riuscito"
-
-#~ msgid "Canceling sync"
-#~ msgstr "Annullamento sincronizzazione"
-
-#~ msgid "No sources are enabled, not syncing"
-#~ msgstr "Nessuna sorgente è abilitata, niente da sincronizzare"
-
-#~ msgid "A sync is already in progress"
-#~ msgstr "È già in corso una sincronizzazione"
-
-#~ msgid "Failed to start sync"
-#~ msgstr "Avvio della sincronizzazione non riuscito"
-
-#~ msgid "%s (not supported by this service)"
-#~ msgstr "%s (non supportato da questo servizio)"
-
-#~ msgid "Failed to get server configuration from SyncEvolution"
-#~ msgstr ""
-#~ "Recupero della configurazione del server da SyncEvolution non riuscito"
-
-#~ msgid "Server URL"
-#~ msgstr "URL del server"
-
-#~ msgid "Failed to get list of manually setup services from SyncEvolution"
-#~ msgstr ""
-#~ "Recupero elenco dei servizi configurati manualmente da SyncEvolution non "
-#~ "riuscito"
-
-#~ msgid "Service configuration not found"
-#~ msgstr "Configurazione del servizio non trovata"
-
-#~ msgid "Not authorized"
-#~ msgstr "Non autorizzato"
-
-#~ msgid "Not found"
-#~ msgstr "Non trovato"
-
-#~ msgid "Transport failure (no connection?)"
-#~ msgstr "Errore nel trasporto dei dati (connessione assente?)"
-
-#~ msgid "Connection timed out"
-#~ msgstr "La connessione è terminata"
-
-#~ msgid "Connection failed"
-#~ msgstr "La connessione non è stata stabilita"
-
-#~ msgid "Sync canceled"
-#~ msgstr "Sincronizzazione annullata"
-
-#~ msgid "Ending sync"
-#~ msgstr "Termine sincronizzazione"
-
-#~ msgid "<b>No sync service in use</b>"
-#~ msgstr "<b>Nessun servizio di sincronizzazione in uso</b>"
-
-#~ msgid "<big>Manual setup</big>"
-#~ msgstr "<big>Configurazione manuale</big>"
-#~ msgid "Merge local and remote data (recommended)"
-#~ msgstr "Unire i dati locali e remoti (raccomandato)"
diff --git a/po/ja.po b/po/ja.po
index a0f49141..5b65104b 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,22 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# <tomas.galicia@intel.com>, 2011.
msgid ""
msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: http://moblin.org/projects/syncevolution\n"
-"POT-Creation-Date: 2010-05-12 09:27+0000\n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: \n"
+"Project-Id-Version: syncevolution\n"
+"Report-Msgid-Bugs-To: https://bugs.meego.com/\n"
+"POT-Creation-Date: 2011-12-05 10:21-0800\n"
+"PO-Revision-Date: 2011-12-06 06:05+0000\n"
+"Last-Translator: GLS_Translator_JPN <trans@novuscom.net>\n"
+"Language-Team: Japanese (http://www.transifex.net/projects/p/meego/team/ja/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Japanese\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"Plural-Forms: nplurals=2; plural=n!=1;\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. TRANSLATORS: this is the application name that may be used by e.g.
#. the windowmanager
-#: ../src/gtk-ui/main.c:40
-#: ../src/gtk-ui/ui.glade.h:38
+#: ../src/gtk-ui/main.c:40 ../src/gtk-ui/ui.glade.h:38
#: ../src/gtk-ui/sync.desktop.in.h:1
#: ../src/gnome-bluetooth/syncevolution.c:112
msgid "Sync"
@@ -30,8 +34,7 @@ msgstr "連絡先"
msgid "Appointments"
msgstr "予定"
-#: ../src/gtk-ui/sync-ui.c:270
-#: ../src/gtk-ui/ui.glade.h:40
+#: ../src/gtk-ui/sync-ui.c:270 ../src/gtk-ui/ui.glade.h:40
msgid "Tasks"
msgstr "タスク"
@@ -46,7 +49,6 @@ msgstr "メモ"
msgid "Appointments & Tasks"
msgstr "予定とタスク"
-# "sync process"
#: ../src/gtk-ui/sync-ui.c:349
msgid "Starting sync"
msgstr "同期化を開始しています"
@@ -62,79 +64,78 @@ msgstr "%s で低速同期しますか?"
msgid "Yes, do slow sync"
msgstr "はい、低速同期します"
-# "sync process"
#: ../src/gtk-ui/sync-ui.c:391
msgid "No, cancel sync"
msgstr "いいえ、同期化をキャンセルする"
-#. TRANSLATORS: confirmation dialog for refresh-from-server. Placeholder
+#. TRANSLATORS: confirmation dialog for "refresh from peer". Placeholder
#. * is service/device name
#: ../src/gtk-ui/sync-ui.c:424
#, c-format
-msgid "Do you want to delete all local data and replace it with data from %s? This is not usually advised."
+msgid ""
+"Do you want to delete all local data and replace it with data from %s? This "
+"is not usually advised."
msgstr "ローカルデータをすべて削除して、%s のデータに置き換えますか?通常は推奨されません。"
-#: ../src/gtk-ui/sync-ui.c:429
-#: ../src/gtk-ui/sync-ui.c:460
+#: ../src/gtk-ui/sync-ui.c:429 ../src/gtk-ui/sync-ui.c:462
msgid "Yes, delete and replace"
msgstr "はい、削除して置き換える"
-#: ../src/gtk-ui/sync-ui.c:429
-#: ../src/gtk-ui/sync-ui.c:460
-#: ../src/gtk-ui/sync-ui.c:1605
+#: ../src/gtk-ui/sync-ui.c:429 ../src/gtk-ui/sync-ui.c:462
+#: ../src/gtk-ui/sync-ui.c:1610
msgid "No"
msgstr "いいえ"
-#. TRANSLATORS: confirmation dialog for refresh-from-client. Placeholder
+#. TRANSLATORS: confirmation dialog for "refresh from local side". Placeholder
#. * is service/device name
-#: ../src/gtk-ui/sync-ui.c:455
+#: ../src/gtk-ui/sync-ui.c:457
#, c-format
-msgid "Do you want to delete all data in %s and replace it with your local data? This is not usually advised."
+msgid ""
+"Do you want to delete all data in %s and replace it with your local data? "
+"This is not usually advised."
msgstr "%s のデータをすべて削除して、ローカルデータに置き換えますか?通常は推奨されません。"
-#: ../src/gtk-ui/sync-ui.c:487
+#: ../src/gtk-ui/sync-ui.c:491
msgid "Trying to cancel sync"
msgstr "同期化のキャンセルを試行しています"
-# "there is no space"
-#: ../src/gtk-ui/sync-ui.c:529
+#: ../src/gtk-ui/sync-ui.c:533
msgid "No service or device selected"
msgstr "サービスまたはデバイスが選択されていません"
-# last syncing happened few sedonds ago
#. TRANSLATORS: This is the title on main view. Placeholder is
#. * the service name. Example: "Google - synced just now"
-#: ../src/gtk-ui/sync-ui.c:537
+#: ../src/gtk-ui/sync-ui.c:541
#, c-format
msgid "%s - synced just now"
msgstr "%s - 同期されました"
-#: ../src/gtk-ui/sync-ui.c:541
+#: ../src/gtk-ui/sync-ui.c:545
#, c-format
msgid "%s - synced a minute ago"
msgstr "%s - 1 分前に同期されました"
-#: ../src/gtk-ui/sync-ui.c:545
+#: ../src/gtk-ui/sync-ui.c:549
#, c-format
msgid "%s - synced %ld minutes ago"
msgstr "%s - %ld 分前に同期されました"
-#: ../src/gtk-ui/sync-ui.c:550
+#: ../src/gtk-ui/sync-ui.c:554
#, c-format
msgid "%s - synced an hour ago"
msgstr "%s - 1 時間前に同期されました"
-#: ../src/gtk-ui/sync-ui.c:554
+#: ../src/gtk-ui/sync-ui.c:558
#, c-format
msgid "%s - synced %ld hours ago"
msgstr "%s - %ld 時間前に同期されました"
-#: ../src/gtk-ui/sync-ui.c:559
+#: ../src/gtk-ui/sync-ui.c:563
#, c-format
msgid "%s - synced a day ago"
msgstr "%s - 前日に同期されました"
-#: ../src/gtk-ui/sync-ui.c:563
+#: ../src/gtk-ui/sync-ui.c:567
#, c-format
msgid "%s - synced %ld days ago"
msgstr "%s - %ld 日前に同期されました"
@@ -142,69 +143,68 @@ msgstr "%s - %ld 日前に同期されました"
#. TRANSLATORS: Action button in info bar in main view. Shown with e.g.
#. * "You've just restored a backup. The changes have not been "
#. * "synced with %s yet"
-#: ../src/gtk-ui/sync-ui.c:612
-#: ../src/gtk-ui/sync-ui.c:726
+#: ../src/gtk-ui/sync-ui.c:616 ../src/gtk-ui/sync-ui.c:701
msgid "Sync now"
msgstr "今、同期化する"
#. TRANSLATORS: Action button in info bar in main view. Shown with e.g.
#. * "A normal sync is not possible at this time..." message.
#. * "Other options" will open Emergency view
-#: ../src/gtk-ui/sync-ui.c:618
-#: ../src/gtk-ui/ui.glade.h:37
+#: ../src/gtk-ui/sync-ui.c:622 ../src/gtk-ui/ui.glade.h:37
msgid "Slow sync"
msgstr "低速同期"
-#: ../src/gtk-ui/sync-ui.c:619
+#: ../src/gtk-ui/sync-ui.c:623
msgid "Other options..."
msgstr "他のオプション"
#. TRANSLATORS: Action button in info bar in main view. Shown e.g.
#. * when no service is selected. Will open configuration view
-#: ../src/gtk-ui/sync-ui.c:624
+#: ../src/gtk-ui/sync-ui.c:628
msgid "Select sync service"
msgstr "同期化サービスを選択"
#. TRANSLATORS: Action button in info bar in main view. Shown e.g.
#. * login to service fails. Will open configuration view for this service
-#: ../src/gtk-ui/sync-ui.c:629
+#: ../src/gtk-ui/sync-ui.c:633
msgid "Edit service settings"
msgstr "サービス設定の編集"
-# "sync service is not yet configured. With sync service, will sync data between netbook and web service."
-#: ../src/gtk-ui/sync-ui.c:700
-msgid "You haven't selected a sync service or device yet. Sync services let you synchronize your data between your netbook and a web service. You can also sync directly with some devices."
-msgstr "同期化サービスまたはデバイスがまだ選択されていません。同期化サービスでネットブックと Web サービス間のデータを同期できます。また、他の一部のデバイスと直接同期することも可能です。"
+#: ../src/gtk-ui/sync-ui.c:709
+msgid ""
+"You haven't selected a sync service or device yet. Sync services let you "
+"synchronize your data between your netbook and a web service. You can also "
+"sync directly with some devices."
+msgstr ""
+"同期化サービスまたはデバイスがまだ選択されていません。同期化サービスでネットブックと Web "
+"サービス間のデータを同期できます。また、他の一部のデバイスと直接同期することも可能です。"
-# space limitation
-#: ../src/gtk-ui/sync-ui.c:722
+#: ../src/gtk-ui/sync-ui.c:729
msgid "Sync again"
msgstr "もう1度同期化"
-#: ../src/gtk-ui/sync-ui.c:743
+#: ../src/gtk-ui/sync-ui.c:748
msgid "Restoring"
msgstr "復元中"
-#: ../src/gtk-ui/sync-ui.c:745
+#: ../src/gtk-ui/sync-ui.c:750
msgid "Syncing"
msgstr "同期化中"
#. TRANSLATORS: This is for the button in main view, right side.
#. Keep line length below ~20 characters, use two lines if needed
-#: ../src/gtk-ui/sync-ui.c:757
-#: ../src/gtk-ui/sync-ui.c:3399
+#: ../src/gtk-ui/sync-ui.c:762 ../src/gtk-ui/sync-ui.c:3407
msgid "Cancel sync"
msgstr "同期化のキャンセル"
-#: ../src/gtk-ui/sync-ui.c:922
+#: ../src/gtk-ui/sync-ui.c:927
msgid "Back to sync"
msgstr "同期化に戻る"
-# "sync process"
#. TRANSLATORS: label for checkbutton/toggle in main view.
#. * Please stick to similar length strings or break the line with
#. * "\n" if absolutely needed
-#: ../src/gtk-ui/sync-ui.c:1224
+#: ../src/gtk-ui/sync-ui.c:1229
msgid "Automatic sync"
msgstr "自動同期"
@@ -212,61 +212,71 @@ msgstr "自動同期"
#. * currently selected data sources. First placeholder is service/device
#. * name, second a comma separeted list of sources.
#. * E.g. "Affected data: Google Contacts, Appointments"
-#: ../src/gtk-ui/sync-ui.c:1519
+#: ../src/gtk-ui/sync-ui.c:1524
#, c-format
msgid "Affected data: %s %s"
msgstr "影響を受けたデータ: %s %s"
-#: ../src/gtk-ui/sync-ui.c:1524
+#: ../src/gtk-ui/sync-ui.c:1529
#, c-format
msgid "Affected data: none"
msgstr "影響を受けたデータ: なし"
#. TRANSLATORS: confirmation for restoring a backup. placeholder is the
#. * backup time string defined below
-#: ../src/gtk-ui/sync-ui.c:1602
+#: ../src/gtk-ui/sync-ui.c:1607
#, c-format
-msgid "Do you want to restore the backup from %s? All changes you have made since then will be lost."
+msgid ""
+"Do you want to restore the backup from %s? All changes you have made since "
+"then will be lost."
msgstr "%s からバックアップを復元しますか? これまでに変更した内容はすべて失われてしまいます。"
-#: ../src/gtk-ui/sync-ui.c:1605
+#: ../src/gtk-ui/sync-ui.c:1610
msgid "Yes, restore"
msgstr "はい、復元します"
#. TRANSLATORS: date/time for strftime(), used in emergency view backup
#. * label. Any time format that shows date and time is good.
-#: ../src/gtk-ui/sync-ui.c:1637
+#: ../src/gtk-ui/sync-ui.c:1642
#, c-format
msgid "%x %X"
msgstr "%x %X"
#. TRANSLATORS: label for a backup in emergency view. Placeholder is
#. * service or device name
-#: ../src/gtk-ui/sync-ui.c:1656
+#: ../src/gtk-ui/sync-ui.c:1661
#, c-format
msgid "Backed up before syncing with %s"
msgstr "%s で同期する前にバックアップされます"
-#: ../src/gtk-ui/sync-ui.c:1673
+#: ../src/gtk-ui/sync-ui.c:1678
msgid "Restore"
msgstr "復元"
#. TRANSLATORS: this is an explanation in Emergency view.
#. * Placeholder is a service/device name
-#: ../src/gtk-ui/sync-ui.c:1780
+#: ../src/gtk-ui/sync-ui.c:1785
#, c-format
-msgid "A normal sync with %s is not possible at this time. You can do a slow two-way sync or start from scratch. You can also restore a backup, but a slow sync or starting from scratch will still be required before normal sync is possible."
-msgstr "%s での通常同期は現在できません。低速で双方向同期するか、最初からやり直すことになります。また、バックアップを復元することもできますが、通常の同期を行う前に低速同期を行うか、最初からやり直す必要があります。"
+msgid ""
+"A normal sync with %s is not possible at this time. You can do a slow two-"
+"way sync or start from scratch. You can also restore a backup, but a slow "
+"sync or starting from scratch will still be required before normal sync is "
+"possible."
+msgstr ""
+"%s "
+"での通常同期は現在できません。低速で双方向同期するか、最初からやり直すことになります。また、バックアップを復元することもできますが、通常の同期を行う前に低速同期を行うか、最初からやり直す必要があります。"
-#: ../src/gtk-ui/sync-ui.c:1790
+#: ../src/gtk-ui/sync-ui.c:1795
#, c-format
-msgid "If something has gone horribly wrong, you can try a slow sync, start from scratch or restore from backup."
+msgid ""
+"If something has gone horribly wrong, you can try a slow sync, start from "
+"scratch or restore from backup."
msgstr "深刻な問題が生じた場合は、低速同期を行うか、最初からやり直すか、バックアップから復元できます。"
#. TRANSLATORS: These are a buttons in Emergency view. Placeholder is a
#. * service/device name. Please don't use too long lines, but feel free to
#. * use several lines.
-#: ../src/gtk-ui/sync-ui.c:1799
+#: ../src/gtk-ui/sync-ui.c:1804
#, c-format
msgid ""
"Delete all your local\n"
@@ -277,7 +287,7 @@ msgstr ""
"削除して、%s のデータに\n"
"置き換えます"
-#: ../src/gtk-ui/sync-ui.c:1805
+#: ../src/gtk-ui/sync-ui.c:1810
#, c-format
msgid ""
"Delete all data on\n"
@@ -288,101 +298,92 @@ msgstr ""
"して、ローカルデータに\n"
"置き換えます"
-#: ../src/gtk-ui/sync-ui.c:2267
+#: ../src/gtk-ui/sync-ui.c:2275
msgid "Failed to get list of supported services from SyncEvolution"
msgstr "サポートされているサービスのリストを SyncEvolution から入手するのに失敗しました"
-#: ../src/gtk-ui/sync-ui.c:2321
-msgid "There was a problem communicating with the sync process. Please try again later."
+#: ../src/gtk-ui/sync-ui.c:2329
+msgid ""
+"There was a problem communicating with the sync process. Please try again "
+"later."
msgstr "同期化プロセスへの通信に問題がありました。時間を置いてからもう一度試してみてください。"
-#: ../src/gtk-ui/sync-ui.c:2380
+#: ../src/gtk-ui/sync-ui.c:2388
msgid "Restore failed"
msgstr "復元に失敗しました"
-# space limitation
-#: ../src/gtk-ui/sync-ui.c:2383
-#: ../src/gtk-ui/sync-ui.c:3268
+#: ../src/gtk-ui/sync-ui.c:2391 ../src/gtk-ui/sync-ui.c:3276
msgid "Sync failed"
msgstr "同期に失敗しました"
-# space limitation
-#: ../src/gtk-ui/sync-ui.c:2389
+#: ../src/gtk-ui/sync-ui.c:2397
msgid "Restore complete"
msgstr "復元の完了"
-# space limitation
-#: ../src/gtk-ui/sync-ui.c:2392
+#: ../src/gtk-ui/sync-ui.c:2400
msgid "Sync complete"
msgstr "同期化の完了"
-# added colon to separate
-#: ../src/gtk-ui/sync-ui.c:2484
+#: ../src/gtk-ui/sync-ui.c:2492
#, c-format
msgid "Preparing '%s'"
msgstr "待機中です:%s"
-# added colon to separate
-#: ../src/gtk-ui/sync-ui.c:2487
+#: ../src/gtk-ui/sync-ui.c:2495
#, c-format
msgid "Receiving '%s'"
msgstr "受信中です:%s"
-# added colon to separate
-#: ../src/gtk-ui/sync-ui.c:2490
+#: ../src/gtk-ui/sync-ui.c:2498
#, c-format
msgid "Sending '%s'"
msgstr "送信中です:%s"
-#: ../src/gtk-ui/sync-ui.c:2611
+#: ../src/gtk-ui/sync-ui.c:2619
#, c-format
msgid "There was one remote rejection."
msgid_plural "There were %ld remote rejections."
-msgstr[0] "リモートで接続拒否が 1 件ありました。"
-msgstr[1] "リモートで接続拒否が %ld 件ありました。"
+msgstr[0] "リモートで接続拒否が 1 件ありました。@リモートで接続拒否が %ldl 件ありました。"
-#: ../src/gtk-ui/sync-ui.c:2616
+#: ../src/gtk-ui/sync-ui.c:2624
#, c-format
msgid "There was one local rejection."
msgid_plural "There were %ld local rejections."
-msgstr[0] "ローカルで接続拒否が 1 件ありました。"
-msgstr[1] "ローカルで接続拒否が %ld 件ありました。"
+msgstr[0] "ローカルで接続拒否が 1 件ありました。@ローカルで接続拒否が %ld 件ありました。"
-#: ../src/gtk-ui/sync-ui.c:2621
+#: ../src/gtk-ui/sync-ui.c:2629
#, c-format
msgid "There were %ld local rejections and %ld remote rejections."
msgstr "ローカルの接続拒否が %ld 件、およびリモートの接続拒否が %ld 件あります。"
-#: ../src/gtk-ui/sync-ui.c:2626
+#: ../src/gtk-ui/sync-ui.c:2634
#, c-format
msgid "Last time: No changes."
msgstr "前回:変更なし。"
-#: ../src/gtk-ui/sync-ui.c:2628
+#: ../src/gtk-ui/sync-ui.c:2636
#, c-format
msgid "Last time: Sent one change."
msgid_plural "Last time: Sent %ld changes."
-msgstr[0] "前回:1 箇所の変更が送信されました。"
-msgstr[1] "前回:%ld 箇所の変更が送信されました。"
+msgstr[0] "前回:1 箇所の変更が送信されました。@前回:%ld 箇所の変更が送信されました。"
#. This is about changes made to the local data. Not all of these
#. changes were requested by the remote server, so "applied"
#. is a better word than "received" (bug #5185).
-#: ../src/gtk-ui/sync-ui.c:2636
+#: ../src/gtk-ui/sync-ui.c:2644
#, c-format
msgid "Last time: Applied one change."
msgid_plural "Last time: Applied %ld changes."
-msgstr[0] "前回:1 箇所の変更を適用しました。"
-msgstr[1] "前回:%ld 箇所の変更を受信しました。"
+msgstr[0] "前回:1 箇所の変更を適用しました。@前回:%ld 箇所の変更を受信しました。"
-#: ../src/gtk-ui/sync-ui.c:2641
+#: ../src/gtk-ui/sync-ui.c:2649
#, c-format
msgid "Last time: Applied %ld changes and sent %ld changes."
msgstr "前回:%ld 箇所の変更を適用し、%ld 箇所の変更を送信しました。"
#. TRANSLATORS: the placeholder is a error message (hopefully)
#. * explaining the problem
-#: ../src/gtk-ui/sync-ui.c:2848
+#: ../src/gtk-ui/sync-ui.c:2856
#, c-format
msgid ""
"There was a problem with last sync:\n"
@@ -391,130 +392,136 @@ msgstr ""
"前回の同期化に次の問題がありました:\n"
"%s"
-#: ../src/gtk-ui/sync-ui.c:2858
+#: ../src/gtk-ui/sync-ui.c:2866
#, c-format
-msgid "You've just restored a backup. The changes have not been synced with %s yet"
+msgid ""
+"You've just restored a backup. The changes have not been synced with %s yet"
msgstr "バックアップの復元が完了しました。変更内容はまだ %s と同期されていませn"
-#: ../src/gtk-ui/sync-ui.c:3146
+#: ../src/gtk-ui/sync-ui.c:3154
msgid "Waiting for current operation to finish..."
msgstr "実行中の操作の終了を待機しています..."
#. TRANSLATORS: next strings are error messages.
-#: ../src/gtk-ui/sync-ui.c:3180
-msgid "A normal sync is not possible at this time. The server suggests a slow sync, but this might not always be what you want if both ends already have data."
+#: ../src/gtk-ui/sync-ui.c:3188
+msgid ""
+"A normal sync is not possible at this time. The server suggests a slow sync,"
+" but this might not always be what you want if both ends already have data."
msgstr "通常同期は現在できません。サーバーは低速同期を推奨していますが、双方に既にデータがある場合は期待通りの結果にならない場合があります。"
-#: ../src/gtk-ui/sync-ui.c:3184
+#: ../src/gtk-ui/sync-ui.c:3192
msgid "The sync process died unexpectedly."
msgstr "同期サービスが突然終了しました。"
-#: ../src/gtk-ui/sync-ui.c:3189
-msgid "Password request was not answered. You can save the password in the settings to prevent the request."
+#: ../src/gtk-ui/sync-ui.c:3197
+msgid ""
+"Password request was not answered. You can save the password in the settings"
+" to prevent the request."
msgstr "パスワード要求に答えていません。設定でパスワードを保存すると、パスワードが要求されなようにできます。"
#. TODO use the service device name here, this is a remote problem
-#: ../src/gtk-ui/sync-ui.c:3193
+#: ../src/gtk-ui/sync-ui.c:3201
msgid "There was a problem processing sync request. Trying again may help."
msgstr "同期化要求の処理に問題がありました。もう一度試してみてください。"
-#: ../src/gtk-ui/sync-ui.c:3199
-msgid "Failed to login. Could there be a problem with your username or password?"
+#: ../src/gtk-ui/sync-ui.c:3207
+msgid ""
+"Failed to login. Could there be a problem with your username or password?"
msgstr "ログインに失敗しました。ユーザー名またはパスワードに問題がある可能性があります。"
-# "access is forbidden"
-#: ../src/gtk-ui/sync-ui.c:3202
+#: ../src/gtk-ui/sync-ui.c:3210
msgid "Forbidden"
msgstr "アクセスが禁止されています"
#. TRANSLATORS: data source means e.g. calendar or addressbook
-#: ../src/gtk-ui/sync-ui.c:3208
-msgid "A data source could not be found. Could there be a problem with the settings?"
+#: ../src/gtk-ui/sync-ui.c:3216
+msgid ""
+"A data source could not be found. Could there be a problem with the "
+"settings?"
msgstr "データのソースが見つかりません。設定に問題がある可能性があります。"
-#: ../src/gtk-ui/sync-ui.c:3212
+#: ../src/gtk-ui/sync-ui.c:3220
msgid "Remote database error"
msgstr "リモート データベースのエラー"
#. This can happen when EDS is borked, restart it may help...
-#: ../src/gtk-ui/sync-ui.c:3215
-msgid "There is a problem with the local database. Syncing again or rebooting may help."
+#: ../src/gtk-ui/sync-ui.c:3223
+msgid ""
+"There is a problem with the local database. Syncing again or rebooting may "
+"help."
msgstr "ローカル データベースに問題があります。再度同期を行うか、再起動で解決できるかも知れません。"
-# "there is no space"
-#: ../src/gtk-ui/sync-ui.c:3218
+#: ../src/gtk-ui/sync-ui.c:3226
msgid "No space on disk"
msgstr "ディスクに空き領域がありません"
-#: ../src/gtk-ui/sync-ui.c:3220
+#: ../src/gtk-ui/sync-ui.c:3228
msgid "Failed to process SyncML"
msgstr "SyncML プロセスに失敗しました"
-#: ../src/gtk-ui/sync-ui.c:3222
+#: ../src/gtk-ui/sync-ui.c:3230
msgid "Server authorization failed"
msgstr "サーバー認証に失敗しました"
-#: ../src/gtk-ui/sync-ui.c:3224
+#: ../src/gtk-ui/sync-ui.c:3232
msgid "Failed to parse configuration file"
msgstr "設定ファイルの中断に失敗しました"
-#: ../src/gtk-ui/sync-ui.c:3226
+#: ../src/gtk-ui/sync-ui.c:3234
msgid "Failed to read configuration file"
msgstr "設定ファイルの読み込みに失敗しました"
-# "configuration entries (items) are not found"
-#: ../src/gtk-ui/sync-ui.c:3228
+#: ../src/gtk-ui/sync-ui.c:3236
msgid "No configuration found"
msgstr "設定項目が見つかりません"
-# "configuration file is not found"
-#: ../src/gtk-ui/sync-ui.c:3230
+#: ../src/gtk-ui/sync-ui.c:3238
msgid "No configuration file found"
msgstr "設定ファイルが見つかりません"
-#: ../src/gtk-ui/sync-ui.c:3232
+#: ../src/gtk-ui/sync-ui.c:3240
msgid "Server sent bad content"
msgstr "サーバーが悪いコンテンツを送信しました"
-#: ../src/gtk-ui/sync-ui.c:3234
+#: ../src/gtk-ui/sync-ui.c:3242
msgid "Connection certificate has expired"
msgstr "接続証明書の期限が切れています"
-#: ../src/gtk-ui/sync-ui.c:3236
+#: ../src/gtk-ui/sync-ui.c:3244
msgid "Connection certificate is invalid"
msgstr "接続証明書が無効です"
-#: ../src/gtk-ui/sync-ui.c:3244
-msgid "We were unable to connect to the server. The problem could be temporary or there could be something wrong with the settings."
+#: ../src/gtk-ui/sync-ui.c:3252
+msgid ""
+"We were unable to connect to the server. The problem could be temporary or "
+"there could be something wrong with the settings."
msgstr "サーバーに接続できません。障害は一時的である可能性もありますが、サーバーの設定に問題がある可能性もあります。"
-# "URL is not appropriate"
-#: ../src/gtk-ui/sync-ui.c:3251
+#: ../src/gtk-ui/sync-ui.c:3259
msgid "The server URL is bad"
msgstr "サーバーの URL が正しくありません"
-#: ../src/gtk-ui/sync-ui.c:3256
+#: ../src/gtk-ui/sync-ui.c:3264
msgid "The server was not found"
msgstr "サーバーが見つかりませんでした"
-# in case the error message is in JPN, added colon
-#: ../src/gtk-ui/sync-ui.c:3258
+#: ../src/gtk-ui/sync-ui.c:3266
#, c-format
msgid "Error %d"
msgstr "エラー:%d"
#. TRANSLATORS: password request dialog contents: title, cancel button
#. * and ok button
-#: ../src/gtk-ui/sync-ui.c:3396
+#: ../src/gtk-ui/sync-ui.c:3404
msgid "Password is required for sync"
msgstr "同期にはパスワードが必要です"
-#: ../src/gtk-ui/sync-ui.c:3400
+#: ../src/gtk-ui/sync-ui.c:3408
msgid "Sync with password"
msgstr "パスワード付き同期"
#. TRANSLATORS: password request dialog message, placeholder is service name
-#: ../src/gtk-ui/sync-ui.c:3410
+#: ../src/gtk-ui/sync-ui.c:3418
#, c-format
msgid "Please enter password for syncing with %s:"
msgstr "%s と同期するためのパスワードを入力してください:"
@@ -560,28 +567,27 @@ msgstr ""
"低速同期では双方のアイテムが比較され、マージが試行されます。\n"
"失敗した場合、情報の重複や損失が起きる可能性があります。"
-# space limitation
-# omitted "Add" from JPN as it creates truncation
#: ../src/gtk-ui/ui.glade.h:15
msgid "Add new device"
msgstr "新規デバイス"
-# space limitation
-# omitted "Add" from JPN as it creates truncation
#: ../src/gtk-ui/ui.glade.h:16
msgid "Add new service"
msgstr "新規サービス"
#. explanation of "Restore backup" function
#: ../src/gtk-ui/ui.glade.h:18
-msgid "Backups are made before every time we Sync. Choose a backup to restore. Any changes you have made since then will be lost."
+msgid ""
+"Backups are made before every time we Sync. Choose a backup to restore. Any "
+"changes you have made since then will be lost."
msgstr "バックアップは同期を実行する前に必ず実行されます。バックアップの復元を選択してください。バックアップ時以降の変更内容は失われます。"
#: ../src/gtk-ui/ui.glade.h:19
msgid "Calendar"
msgstr "カレンダー"
-#. Button in main view, right side. Keep to below 20 chars per line, feel free to use two lines
+#. Button in main view, right side. Keep to below 20 chars per line, feel free
+#. to use two lines
#: ../src/gtk-ui/ui.glade.h:21
msgid ""
"Change or edit\n"
@@ -615,7 +621,8 @@ msgstr ""
"削除して、Zyb のデータl\n"
"に置き換えます"
-#. button in main view, right side. Keep length to 20 characters or so, use two lines if needed
+#. button in main view, right side. Keep length to 20 characters or so, use
+#. two lines if needed
#: ../src/gtk-ui/ui.glade.h:32
msgid ""
"Fix a sync\n"
@@ -657,87 +664,110 @@ msgid "You will need to add Bluetooth devices before they can be synced."
msgstr "同期を行う前に Bluetooth デバイスを追加する必要があります。"
#: ../src/gtk-ui/sync.desktop.in.h:2
-#: ../src/gtk-ui/sync-gtk.desktop.in.h:2
msgid "Up to date"
msgstr "最新の情報に更新"
#: ../src/gtk-ui/sync-gtk.desktop.in.h:1
-msgid "Sync (GTK)"
-msgstr "同期化 (GTK)"
+msgid "SyncEvolution (GTK)"
+msgstr "SyncEvolution (GTK)"
+
+#: ../src/gtk-ui/sync-gtk.desktop.in.h:2
+msgid "Synchronize PIM data"
+msgstr "PIM データの同期"
-#: ../src/gtk-ui/sync-config-widget.c:78
-msgid "ScheduleWorld enables you to keep your contacts, events, tasks, and notes in sync."
+#: ../src/gtk-ui/sync-config-widget.c:88
+msgid ""
+"ScheduleWorld enables you to keep your contacts, events, tasks, and notes in"
+" sync."
msgstr "ScheduleWorld では、連絡先、イベント、タスク、メモを同期させておくことができます。"
-#: ../src/gtk-ui/sync-config-widget.c:81
-msgid "Google Sync can back up and synchronize your contacts with your Gmail contacts."
+#: ../src/gtk-ui/sync-config-widget.c:91
+msgid ""
+"Google Sync can back up and synchronize your contacts with your Gmail "
+"contacts."
msgstr "Google Sync では、連絡先をバックアップし、Gmail の連絡先と同期できます。"
#. TRANSLATORS: Please include the word "demo" (or the equivalent in
#. your language): Funambol is going to be a 90 day demo service
#. in the future
-#: ../src/gtk-ui/sync-config-widget.c:87
-msgid "Back up your contacts and calendar. Sync with a single click, anytime, anywhere (DEMO)."
+#: ../src/gtk-ui/sync-config-widget.c:97
+msgid ""
+"Back up your contacts and calendar. Sync with a single click, anytime, "
+"anywhere (DEMO)."
msgstr "連絡先とカレンダーをバックアップします。いつでも、どこでも、クリック 1 つで同期します (デモ)。"
-#: ../src/gtk-ui/sync-config-widget.c:90
-msgid "Mobical Backup and Restore service allows you to securely back up your personal mobile data for free."
+#: ../src/gtk-ui/sync-config-widget.c:100
+msgid ""
+"Mobical Backup and Restore service allows you to securely back up your "
+"personal mobile data for free."
msgstr "Mobical のバックアップおよび復元サービスを使用すると、無料で個人の携帯電話データを安全にバックアップできます。"
-#: ../src/gtk-ui/sync-config-widget.c:93
-msgid "ZYB is a simple way for people to store and share mobile information online."
+#: ../src/gtk-ui/sync-config-widget.c:103
+msgid ""
+"ZYB is a simple way for people to store and share mobile information online."
msgstr "ZYB を使用すると携帯電話の情報をオンラインで簡単に保存したり共有できます。"
-#: ../src/gtk-ui/sync-config-widget.c:96
-msgid "Memotoo lets you access your personal data from any computer connected to the Internet."
+#: ../src/gtk-ui/sync-config-widget.c:106
+msgid ""
+"Memotoo lets you access your personal data from any computer connected to "
+"the Internet."
msgstr "Memotoo を使用すると、インターネットに接続したコンピュータから自分の個人データにアクセスできるようになります。"
-#: ../src/gtk-ui/sync-config-widget.c:192
+#: ../src/gtk-ui/sync-config-widget.c:195
msgid "Sorry, failed to save the configuration"
msgstr "設置の保存に失敗しました"
-#: ../src/gtk-ui/sync-config-widget.c:381
+#: ../src/gtk-ui/sync-config-widget.c:445
msgid "Service must have a name and server URL"
msgstr "サービスには名前とサーバーの URL が必要です"
-#: ../src/gtk-ui/sync-config-widget.c:422
+#. TRANSLATORS: error dialog when creating a new sync configuration
+#: ../src/gtk-ui/sync-config-widget.c:451
+msgid "A username is required for this service"
+msgstr "このサービスにはユーザー名が必要です"
+
+#: ../src/gtk-ui/sync-config-widget.c:493
#, c-format
-msgid "Do you want to reset the settings for %s? This will not remove any synced information on either end."
+msgid ""
+"Do you want to reset the settings for %s? This will not remove any synced "
+"information on either end."
msgstr "%s の設定内容をリセットしますか? この操作を行っても双方の同期された情報は一切削除されません。"
#. TRANSLATORS: buttons in reset-service warning dialog
-#: ../src/gtk-ui/sync-config-widget.c:426
+#: ../src/gtk-ui/sync-config-widget.c:497
msgid "Yes, reset"
msgstr "はい、リセットします"
-#: ../src/gtk-ui/sync-config-widget.c:427
-#: ../src/gtk-ui/sync-config-widget.c:438
+#: ../src/gtk-ui/sync-config-widget.c:498
+#: ../src/gtk-ui/sync-config-widget.c:509
msgid "No, keep settings"
msgstr "いいえ、設定をそのままにします"
-#: ../src/gtk-ui/sync-config-widget.c:432
+#: ../src/gtk-ui/sync-config-widget.c:503
#, c-format
-msgid "Do you want to delete the settings for %s? This will not remove any synced information on either end but it will remove these settings."
+msgid ""
+"Do you want to delete the settings for %s? This will not remove any synced "
+"information on either end but it will remove these settings."
msgstr "%s の設定を削除しますか? この操作を行っても双方の同期した情報は一切削除されませんが、どちら側の設定も削除されます。"
#. TRANSLATORS: buttons in delete-service warning dialog
-#: ../src/gtk-ui/sync-config-widget.c:437
+#: ../src/gtk-ui/sync-config-widget.c:508
msgid "Yes, delete"
msgstr "はい、削除します"
-#: ../src/gtk-ui/sync-config-widget.c:467
+#: ../src/gtk-ui/sync-config-widget.c:539
msgid "Reset settings"
msgstr "設定のリセット"
-#: ../src/gtk-ui/sync-config-widget.c:470
+#: ../src/gtk-ui/sync-config-widget.c:542
msgid "Delete settings"
msgstr "設定の削除"
-#: ../src/gtk-ui/sync-config-widget.c:480
+#: ../src/gtk-ui/sync-config-widget.c:552
msgid "Save and use"
msgstr "保存して使用します"
-#: ../src/gtk-ui/sync-config-widget.c:483
+#: ../src/gtk-ui/sync-config-widget.c:555
msgid ""
"Save and replace\n"
"current service"
@@ -745,102 +775,112 @@ msgstr ""
"保存してこのサービス\n"
"を置き換えます"
-#: ../src/gtk-ui/sync-config-widget.c:493
+#: ../src/gtk-ui/sync-config-widget.c:563
msgid "Stop using device"
msgstr "デバイスの使用を中止する"
-#: ../src/gtk-ui/sync-config-widget.c:496
+#: ../src/gtk-ui/sync-config-widget.c:566
msgid "Stop using service"
msgstr "サービスの使用を中止する"
#. TRANSLATORS: label for an entry in service configuration form.
#. * Placeholder is a source name.
#. * Example: "Appointments URI"
-#: ../src/gtk-ui/sync-config-widget.c:679
+#: ../src/gtk-ui/sync-config-widget.c:749
#, c-format
msgid "%s URI"
msgstr "%s の URI"
#. TRANSLATORS: toggles in service configuration form, placeholder is service
#. * or device name
-#: ../src/gtk-ui/sync-config-widget.c:854
+#: ../src/gtk-ui/sync-config-widget.c:936
#, c-format
msgid "Send changes to %s"
msgstr "%s に変更を送信します"
-#: ../src/gtk-ui/sync-config-widget.c:859
+#: ../src/gtk-ui/sync-config-widget.c:941
#, c-format
msgid "Receive changes from %s"
msgstr "%s から変更を受信します"
-#: ../src/gtk-ui/sync-config-widget.c:875
+#: ../src/gtk-ui/sync-config-widget.c:957
msgid "<b>Sync</b>"
msgstr "<b>同期化</b>"
#. TRANSLATORS: label of a entry in service configuration
-#: ../src/gtk-ui/sync-config-widget.c:891
+#: ../src/gtk-ui/sync-config-widget.c:973
msgid "Server address"
msgstr "サーバー・アドレス"
#. TRANSLATORS: explanation before a device template combobox.
#. * Placeholder is a device name like 'Nokia N85' or 'Syncevolution
#. * Client'
-#: ../src/gtk-ui/sync-config-widget.c:967
+#: ../src/gtk-ui/sync-config-widget.c:1049
#, c-format
-msgid "This device looks like it might be a '%s'. If this is not correct, please take a look at the list of supported devices and pick yours if it is listed"
+msgid ""
+"This device looks like it might be a '%s'. If this is not correct, please "
+"take a look at the list of supported devices and pick yours if it is listed"
msgstr "このデバイスは「%s」と判断されました。正しくない場合は、サポートされているデバイスのリストからご利用のデバイスを選択してください。"
-#: ../src/gtk-ui/sync-config-widget.c:973
-msgid "We don't know what this device is exactly. Please take a look at the list of supported devices and pick yours if it is listed"
+#: ../src/gtk-ui/sync-config-widget.c:1055
+#: ../src/gtk-ui/sync-config-widget.c:1915
+msgid ""
+"We don't know what this device is exactly. Please take a look at the list of"
+" supported devices and pick yours if it is listed"
msgstr "このデバイスを判別できません。サポートされているデバイスのリストからご利用のデバイスを選択してください。"
-#: ../src/gtk-ui/sync-config-widget.c:1126
+#: ../src/gtk-ui/sync-config-widget.c:1207
#, c-format
msgid "%s - Bluetooth device"
msgstr "%s - Bluetooth デバイス"
#. TRANSLATORS: service title for services that are not based on a
#. * template in service list, the placeholder is the name of the service
-#: ../src/gtk-ui/sync-config-widget.c:1132
+#: ../src/gtk-ui/sync-config-widget.c:1213
#, c-format
msgid "%s - manually setup"
msgstr "%s - 手動設定"
-# Access Web site
#. TRANSLATORS: link button in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1807
+#: ../src/gtk-ui/sync-config-widget.c:1886
msgid "Launch website"
msgstr "Web サイトにアクセス"
#. TRANSLATORS: button in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1816
+#: ../src/gtk-ui/sync-config-widget.c:1895
msgid "Set up now"
msgstr "すぐに設定する"
+#: ../src/gtk-ui/sync-config-widget.c:1953
+msgid "Use these settings"
+msgstr "これらの設定を使用する"
+
#. TRANSLATORS: labels of entries in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1912
+#: ../src/gtk-ui/sync-config-widget.c:1991
msgid "Username"
msgstr "ユーザー名"
-#: ../src/gtk-ui/sync-config-widget.c:1927
+#: ../src/gtk-ui/sync-config-widget.c:2006
msgid "Password"
msgstr "パスワード"
#. TRANSLATORS: warning in service configuration form for people
#. who have modified the configuration via other means.
-#: ../src/gtk-ui/sync-config-widget.c:1950
-msgid "Current configuration is more complex than what can be shown here. Changes to sync mode or synced data types will overwrite that configuration."
+#: ../src/gtk-ui/sync-config-widget.c:2029
+msgid ""
+"Current configuration is more complex than what can be shown here. Changes "
+"to sync mode or synced data types will overwrite that configuration."
msgstr "現在のサービス設定はここに表示できる内容よりも複雑です。同期モードまたは同期データへの変更は、その設定内容を上書きします。"
#. TRANSLATORS: this is the epander label for server settings
#. in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1969
+#: ../src/gtk-ui/sync-config-widget.c:2048
msgid "Hide server settings"
msgstr "サーバの設定を隠す"
#. TRANSLATORS: this is the epander label for server settings
#. in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1989
+#: ../src/gtk-ui/sync-config-widget.c:2068
msgid "Show server settings"
msgstr "サーバの設定を表示する"
@@ -848,63 +888,46 @@ msgstr "サーバの設定を表示する"
msgid "Sync in the Sync application"
msgstr "同期化アプリケーション内の同期"
-#: ../src/syncevo-dbus-server.cpp:5664
+#: ../src/syncevo-dbus-server.cpp:6653
#, c-format
msgid "%s is syncing"
msgstr "%s は同期中です。"
-#: ../src/syncevo-dbus-server.cpp:5665
+#: ../src/syncevo-dbus-server.cpp:6654
#, c-format
msgid "We have just started to sync your computer with the %s sync service."
msgstr "お使いのデバイスと %s 同期化サービスの同期を開始しました。"
-# space limitation
#. if sync is successfully started and done
-#: ../src/syncevo-dbus-server.cpp:5679
+#: ../src/syncevo-dbus-server.cpp:6670
#, c-format
msgid "%s sync complete"
msgstr "%s の同期化が完了しました"
-#: ../src/syncevo-dbus-server.cpp:5680
+#: ../src/syncevo-dbus-server.cpp:6671
#, c-format
msgid "We have just finished syncing your computer with the %s sync service."
msgstr "ご利用のデバイスと %s 同期化サービスの同期が完了しました。"
-# space limitation
-#. if sync is successfully started and has errors, or not started successful with a fatal problem
-#: ../src/syncevo-dbus-server.cpp:5685
+#. if sync is successfully started and has errors, or not started successful
+#. with a fatal problem
+#: ../src/syncevo-dbus-server.cpp:6676
msgid "Sync problem."
msgstr "同期化に問題があります。"
-#: ../src/syncevo-dbus-server.cpp:5686
+#: ../src/syncevo-dbus-server.cpp:6677
msgid "Sorry, there's a problem with your sync that you need to attend to."
msgstr "接続対象の同期化サービスに問題があります。"
-#: ../src/syncevo-dbus-server.cpp:5759
+#: ../src/syncevo-dbus-server.cpp:6758
msgid "View"
msgstr "表示"
#. Use "default" as ID because that is what mutter-moblin
#. recognizes: it then skips the action instead of adding it
#. in addition to its own "Dismiss" button (always added).
-#: ../src/syncevo-dbus-server.cpp:5763
+#: ../src/syncevo-dbus-server.cpp:6762
msgid "Dismiss"
msgstr "閉じる"
-#~ msgid "Database error"
-#~ msgstr "データベース・エラー"
-#~ msgid ""
-#~ "Do you want to replace %s with %s? This will not remove any synced "
-#~ "information on either end but you will no longer be able to sync with %s."
-#~ msgstr ""
-#~ "%s を %s に入れ替えますか? この操作を行っても、双方の同期した情報は一切削"
-#~ "除されませんが、%s とは同期できなくなります。"
-#~ msgid "Yes, use %s"
-#~ msgstr "はい、%s を使用します"
-#~ msgid "No, use %s"
-#~ msgstr "いいえ、%s を使用します"
-#~ msgid "Reset service"
-#~ msgstr "サービスをリセットします"
-#~ msgid "Addressbook"
-#~ msgstr "アドレスブック"
diff --git a/po/ko.po b/po/ko.po
index d3314a7a..68ee288d 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,22 +1,28 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# <kushylee@yahoo.com>, 2011.
+# <meego.pti.kor@gmail.com>, 2011.
+# <tomas.galicia@intel.com>, 2011.
msgid ""
msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: http://moblin.org/projects/syncevolution\n"
-"POT-Creation-Date: 2010-04-28 09:27+0000\n"
-"PO-Revision-Date: \n"
-"Last-Translator: GLSKOR_SunKim <sunx.kim@intel.com>\n"
-"Language-Team: \n"
+"Project-Id-Version: syncevolution\n"
+"Report-Msgid-Bugs-To: https://bugs.meego.com/\n"
+"POT-Creation-Date: 2011-12-05 10:21-0800\n"
+"PO-Revision-Date: 2011-12-08 21:49+0000\n"
+"Last-Translator: GLS_KOR <meego.pti.kor@gmail.com>\n"
+"Language-Team: Korean (http://www.transifex.net/projects/p/meego/team/ko/)\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-Poedit-Language: Korean\n"
-"X-Poedit-SourceCharset: utf-8\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. TRANSLATORS: this is the application name that may be used by e.g.
#. the windowmanager
-#: ../src/gtk-ui/main.c:40
-#: ../src/gtk-ui/ui.glade.h:38
+#: ../src/gtk-ui/main.c:40 ../src/gtk-ui/ui.glade.h:38
#: ../src/gtk-ui/sync.desktop.in.h:1
#: ../src/gnome-bluetooth/syncevolution.c:112
msgid "Sync"
@@ -30,8 +36,7 @@ msgstr "연락처"
msgid "Appointments"
msgstr "약속"
-#: ../src/gtk-ui/sync-ui.c:270
-#: ../src/gtk-ui/ui.glade.h:40
+#: ../src/gtk-ui/sync-ui.c:270 ../src/gtk-ui/ui.glade.h:40
msgid "Tasks"
msgstr "작업"
@@ -59,78 +64,80 @@ msgstr " %s과의 동기화를 늦추시겠습니까?"
#: ../src/gtk-ui/sync-ui.c:391
msgid "Yes, do slow sync"
-msgstr "네, 동기화를 늦춰주십시오."
+msgstr "예, 동기화를 늦춰주십시오."
#: ../src/gtk-ui/sync-ui.c:391
msgid "No, cancel sync"
-msgstr "주소록"
+msgstr "아니요, 동기화를 취소하겠습니다."
-#. TRANSLATORS: confirmation dialog for refresh-from-server. Placeholder
+#. TRANSLATORS: confirmation dialog for "refresh from peer". Placeholder
#. * is service/device name
#: ../src/gtk-ui/sync-ui.c:424
#, c-format
-msgid "Do you want to delete all local data and replace it with data from %s? This is not usually advised."
+msgid ""
+"Do you want to delete all local data and replace it with data from %s? This "
+"is not usually advised."
msgstr "모든 로컬 데이터을 삭제하고 %s로 부터의 데이터로 바꾸시겠습니까? 항상 권하지는 않습니다"
-#: ../src/gtk-ui/sync-ui.c:429
-#: ../src/gtk-ui/sync-ui.c:460
+#: ../src/gtk-ui/sync-ui.c:429 ../src/gtk-ui/sync-ui.c:462
msgid "Yes, delete and replace"
msgstr "예, 삭제하시고 변경하십시오"
-#: ../src/gtk-ui/sync-ui.c:429
-#: ../src/gtk-ui/sync-ui.c:460
-#: ../src/gtk-ui/sync-ui.c:1580
+#: ../src/gtk-ui/sync-ui.c:429 ../src/gtk-ui/sync-ui.c:462
+#: ../src/gtk-ui/sync-ui.c:1610
msgid "No"
-msgstr "아니오."
+msgstr "아니요."
-#. TRANSLATORS: confirmation dialog for refresh-from-client. Placeholder
+#. TRANSLATORS: confirmation dialog for "refresh from local side". Placeholder
#. * is service/device name
-#: ../src/gtk-ui/sync-ui.c:455
+#: ../src/gtk-ui/sync-ui.c:457
#, c-format
-msgid "Do you want to delete all data in %s and replace it with your local data? This is not usually advised."
-msgstr "%s에 있는 모든 데이터를 삭네하고 당신의 로컬 데이터로 바꾸시겠습니까? 항상 권하지는 않습니다."
+msgid ""
+"Do you want to delete all data in %s and replace it with your local data? "
+"This is not usually advised."
+msgstr "%s에 있는 모든 데이터를 삭제하고 당신의 로컬 데이터로 바꾸시겠습니까? 항상 권하지는 않습니다."
-#: ../src/gtk-ui/sync-ui.c:487
+#: ../src/gtk-ui/sync-ui.c:491
msgid "Trying to cancel sync"
msgstr "동기화 취소 시도"
-#: ../src/gtk-ui/sync-ui.c:529
+#: ../src/gtk-ui/sync-ui.c:533
msgid "No service or device selected"
msgstr "서비스나 장치가 선택되지 않았음"
#. TRANSLATORS: This is the title on main view. Placeholder is
#. * the service name. Example: "Google - synced just now"
-#: ../src/gtk-ui/sync-ui.c:537
+#: ../src/gtk-ui/sync-ui.c:541
#, c-format
msgid "%s - synced just now"
msgstr "%s - 방금 동기화됨"
-#: ../src/gtk-ui/sync-ui.c:541
+#: ../src/gtk-ui/sync-ui.c:545
#, c-format
msgid "%s - synced a minute ago"
msgstr "%s - 일 분 전 동기화됨"
-#: ../src/gtk-ui/sync-ui.c:545
+#: ../src/gtk-ui/sync-ui.c:549
#, c-format
msgid "%s - synced %ld minutes ago"
msgstr "%s - %ld 분 전 동기화됨"
-#: ../src/gtk-ui/sync-ui.c:550
+#: ../src/gtk-ui/sync-ui.c:554
#, c-format
msgid "%s - synced an hour ago"
msgstr "%s - 한 시간 전 동기화됨"
-#: ../src/gtk-ui/sync-ui.c:554
+#: ../src/gtk-ui/sync-ui.c:558
#, c-format
msgid "%s - synced %ld hours ago"
msgstr "%s - %ld 시간 전 동기화됨"
-#: ../src/gtk-ui/sync-ui.c:559
+#: ../src/gtk-ui/sync-ui.c:563
#, c-format
msgid "%s - synced a day ago"
msgstr "%s - 하루 전 동기화됨"
-#: ../src/gtk-ui/sync-ui.c:563
+#: ../src/gtk-ui/sync-ui.c:567
#, c-format
msgid "%s - synced %ld days ago"
msgstr "%s - %ld 일 전 동기화됨"
@@ -138,66 +145,68 @@ msgstr "%s - %ld 일 전 동기화됨"
#. TRANSLATORS: Action button in info bar in main view. Shown with e.g.
#. * "You've just restored a backup. The changes have not been "
#. * "synced with %s yet"
-#: ../src/gtk-ui/sync-ui.c:612
-#: ../src/gtk-ui/sync-ui.c:726
+#: ../src/gtk-ui/sync-ui.c:616 ../src/gtk-ui/sync-ui.c:701
msgid "Sync now"
msgstr "지금 동기화 시도"
#. TRANSLATORS: Action button in info bar in main view. Shown with e.g.
#. * "A normal sync is not possible at this time..." message.
#. * "Other options" will open Emergency view
-#: ../src/gtk-ui/sync-ui.c:618
-#: ../src/gtk-ui/ui.glade.h:37
+#: ../src/gtk-ui/sync-ui.c:622 ../src/gtk-ui/ui.glade.h:37
msgid "Slow sync"
msgstr "느린 동기화"
-#: ../src/gtk-ui/sync-ui.c:619
+#: ../src/gtk-ui/sync-ui.c:623
msgid "Other options..."
msgstr "기타 옵션..."
#. TRANSLATORS: Action button in info bar in main view. Shown e.g.
#. * when no service is selected. Will open configuration view
-#: ../src/gtk-ui/sync-ui.c:624
+#: ../src/gtk-ui/sync-ui.c:628
msgid "Select sync service"
msgstr "동기화 서비스를 선택하십시오."
#. TRANSLATORS: Action button in info bar in main view. Shown e.g.
#. * login to service fails. Will open configuration view for this service
-#: ../src/gtk-ui/sync-ui.c:629
+#: ../src/gtk-ui/sync-ui.c:633
msgid "Edit service settings"
msgstr "서비스 설정 편집"
-#: ../src/gtk-ui/sync-ui.c:700
-msgid "You haven't selected a sync service or device yet. Sync services let you synchronize your data between your netbook and a web service. You can also sync directly with some devices."
-msgstr "동기화 서비스나 장치를 아직 선택하지 않았습니다. 동기화 서비스는 넷북과 웹 서비스 사이의 데이터를 동기화 시켜줍니다. 또한 일부 장치를 사용하여 직접 동기화할 수도 있습니다. "
+#: ../src/gtk-ui/sync-ui.c:709
+msgid ""
+"You haven't selected a sync service or device yet. Sync services let you "
+"synchronize your data between your netbook and a web service. You can also "
+"sync directly with some devices."
+msgstr ""
+"동기화 서비스나 장치를 아직 선택하지 않았습니다. 동기화 서비스는 넷북과 웹 서비스 사이의 데이터를 동기화 시켜줍니다. 또한 일부 장치를"
+" 사용하여 직접 동기화할 수도 있습니다. "
-#: ../src/gtk-ui/sync-ui.c:722
+#: ../src/gtk-ui/sync-ui.c:729
msgid "Sync again"
msgstr "다시 동기화 시도"
-#: ../src/gtk-ui/sync-ui.c:743
+#: ../src/gtk-ui/sync-ui.c:748
msgid "Restoring"
msgstr "복원중"
-#: ../src/gtk-ui/sync-ui.c:745
+#: ../src/gtk-ui/sync-ui.c:750
msgid "Syncing"
msgstr "동기화 시도중"
#. TRANSLATORS: This is for the button in main view, right side.
#. Keep line length below ~20 characters, use two lines if needed
-#: ../src/gtk-ui/sync-ui.c:757
-#: ../src/gtk-ui/sync-ui.c:3373
+#: ../src/gtk-ui/sync-ui.c:762 ../src/gtk-ui/sync-ui.c:3407
msgid "Cancel sync"
msgstr "동기화 취소"
-#: ../src/gtk-ui/sync-ui.c:922
+#: ../src/gtk-ui/sync-ui.c:927
msgid "Back to sync"
msgstr "동기화로 다시 돌아가기"
#. TRANSLATORS: label for checkbutton/toggle in main view.
#. * Please stick to similar length strings or break the line with
#. * "\n" if absolutely needed
-#: ../src/gtk-ui/sync-ui.c:1223
+#: ../src/gtk-ui/sync-ui.c:1229
msgid "Automatic sync"
msgstr "자동 동기화"
@@ -205,61 +214,71 @@ msgstr "자동 동기화"
#. * currently selected data sources. First placeholder is service/device
#. * name, second a comma separeted list of sources.
#. * E.g. "Affected data: Google Contacts, Appointments"
-#: ../src/gtk-ui/sync-ui.c:1494
+#: ../src/gtk-ui/sync-ui.c:1524
#, c-format
msgid "Affected data: %s %s"
msgstr "영향받은 데이터: %s %s"
-#: ../src/gtk-ui/sync-ui.c:1499
+#: ../src/gtk-ui/sync-ui.c:1529
#, c-format
msgid "Affected data: none"
msgstr "영향받은 데이터: 없음"
#. TRANSLATORS: confirmation for restoring a backup. placeholder is the
#. * backup time string defined below
-#: ../src/gtk-ui/sync-ui.c:1577
+#: ../src/gtk-ui/sync-ui.c:1607
#, c-format
-msgid "Do you want to restore the backup from %s? All changes you have made since then will be lost."
+msgid ""
+"Do you want to restore the backup from %s? All changes you have made since "
+"then will be lost."
msgstr "%s에서 백업을 복원하시겠습니까? 그 이후의 변경 내용은 모두 손실됩니다."
-#: ../src/gtk-ui/sync-ui.c:1580
+#: ../src/gtk-ui/sync-ui.c:1610
msgid "Yes, restore"
msgstr "네, 복원해 주십시오."
#. TRANSLATORS: date/time for strftime(), used in emergency view backup
#. * label. Any time format that shows date and time is good.
-#: ../src/gtk-ui/sync-ui.c:1612
+#: ../src/gtk-ui/sync-ui.c:1642
#, c-format
msgid "%x %X"
msgstr "%x %X"
#. TRANSLATORS: label for a backup in emergency view. Placeholder is
#. * service or device name
-#: ../src/gtk-ui/sync-ui.c:1631
+#: ../src/gtk-ui/sync-ui.c:1661
#, c-format
msgid "Backed up before syncing with %s"
msgstr "%s와 동기화하기 전에 백업되었습니다."
-#: ../src/gtk-ui/sync-ui.c:1648
+#: ../src/gtk-ui/sync-ui.c:1678
msgid "Restore"
msgstr "복원"
#. TRANSLATORS: this is an explanation in Emergency view.
#. * Placeholder is a service/device name
-#: ../src/gtk-ui/sync-ui.c:1755
+#: ../src/gtk-ui/sync-ui.c:1785
#, c-format
-msgid "A normal sync with %s is not possible at this time. You can do a slow two-way sync or start from scratch. You can also restore a backup, but a slow sync or starting from scratch will still be required before normal sync is possible."
-msgstr "지금은 %s와의 정상적인 동기화가 가능하지 않습니다. 느린 양방향 동기화를 하거나 처음부터 새로 시작할 수 있습니다. 백업을 복원할 수도 있지만, 정상적인 동기화가 가능해지기 전까지는 느린 동기화를 하거나 처음부터 새로 시작해야 합니다."
+msgid ""
+"A normal sync with %s is not possible at this time. You can do a slow two-"
+"way sync or start from scratch. You can also restore a backup, but a slow "
+"sync or starting from scratch will still be required before normal sync is "
+"possible."
+msgstr ""
+"지금은 %s와의 정상적인 동기화가 가능하지 않습니다. 느린 양방향 동기화를 하거나 처음부터 새로 시작할 수 있습니다. 백업을 복원할 수도"
+" 있지만, 정상적인 동기화가 가능해지기 전까지는 느린 동기화를 하거나 처음부터 새로 시작해야 합니다."
-#: ../src/gtk-ui/sync-ui.c:1765
+#: ../src/gtk-ui/sync-ui.c:1795
#, c-format
-msgid "If something has gone horribly wrong, you can try a slow sync, start from scratch or restore from backup."
+msgid ""
+"If something has gone horribly wrong, you can try a slow sync, start from "
+"scratch or restore from backup."
msgstr "뭔가 아주 잘못되었을 경우, 느린 동기화를 시도해보거나 처음부터 새로 시작하거나 백업으로부터 복원할 수 있습니다."
#. TRANSLATORS: These are a buttons in Emergency view. Placeholder is a
#. * service/device name. Please don't use too long lines, but feel free to
#. * use several lines.
-#: ../src/gtk-ui/sync-ui.c:1774
+#: ../src/gtk-ui/sync-ui.c:1804
#, c-format
msgid ""
"Delete all your local\n"
@@ -270,7 +289,7 @@ msgstr ""
"삭제하고 %s의 데이터로\n"
"교체하십시오."
-#: ../src/gtk-ui/sync-ui.c:1780
+#: ../src/gtk-ui/sync-ui.c:1810
#, c-format
msgid ""
"Delete all data on\n"
@@ -281,95 +300,92 @@ msgstr ""
"삭제하고 로컬 데이터로\n"
"교체하십시오."
-#: ../src/gtk-ui/sync-ui.c:2241
+#: ../src/gtk-ui/sync-ui.c:2275
msgid "Failed to get list of supported services from SyncEvolution"
msgstr "SyncEvolution으로 부터 지원 서비스 목록을 불러오기를 실패했습니다."
-#: ../src/gtk-ui/sync-ui.c:2295
-msgid "There was a problem communicating with the sync process. Please try again later."
+#: ../src/gtk-ui/sync-ui.c:2329
+msgid ""
+"There was a problem communicating with the sync process. Please try again "
+"later."
msgstr "동기화 프로세스와의 통신에 문제가 있습니다. 나중에 다시 시도하십시오."
-#: ../src/gtk-ui/sync-ui.c:2354
+#: ../src/gtk-ui/sync-ui.c:2388
msgid "Restore failed"
msgstr "복원 실패"
-#: ../src/gtk-ui/sync-ui.c:2357
-#: ../src/gtk-ui/sync-ui.c:3242
+#: ../src/gtk-ui/sync-ui.c:2391 ../src/gtk-ui/sync-ui.c:3276
msgid "Sync failed"
msgstr "동기화 실패"
-#: ../src/gtk-ui/sync-ui.c:2363
+#: ../src/gtk-ui/sync-ui.c:2397
msgid "Restore complete"
msgstr "복원 완료"
-#: ../src/gtk-ui/sync-ui.c:2366
+#: ../src/gtk-ui/sync-ui.c:2400
msgid "Sync complete"
msgstr "동기화 완료"
-#: ../src/gtk-ui/sync-ui.c:2458
+#: ../src/gtk-ui/sync-ui.c:2492
#, c-format
msgid "Preparing '%s'"
msgstr "'%s' 준비하는 중"
-#: ../src/gtk-ui/sync-ui.c:2461
+#: ../src/gtk-ui/sync-ui.c:2495
#, c-format
msgid "Receiving '%s'"
msgstr "'%s' 받는 중"
-#: ../src/gtk-ui/sync-ui.c:2464
+#: ../src/gtk-ui/sync-ui.c:2498
#, c-format
msgid "Sending '%s'"
msgstr "'%s' 보내는 중"
-#: ../src/gtk-ui/sync-ui.c:2585
+#: ../src/gtk-ui/sync-ui.c:2619
#, c-format
msgid "There was one remote rejection."
msgid_plural "There were %ld remote rejections."
-msgstr[0] "한 개의 원격 거부가 있었습니다."
-msgstr[1] "%ld건의 원격 거부가 있었습니다"
+msgstr[0] "%ld 개의 원격 거부가 있었습니다."
-#: ../src/gtk-ui/sync-ui.c:2590
+#: ../src/gtk-ui/sync-ui.c:2624
#, c-format
msgid "There was one local rejection."
msgid_plural "There were %ld local rejections."
-msgstr[0] "한 개의 로컬 거부가 있었습니다."
-msgstr[1] "%ld건의 로컬 거부가 있었습니다."
+msgstr[0] "%ld 개의 로컬 거부가 있었습니다."
-#: ../src/gtk-ui/sync-ui.c:2595
+#: ../src/gtk-ui/sync-ui.c:2629
#, c-format
msgid "There were %ld local rejections and %ld remote rejections."
msgstr "%ld 개의 로컬 거부와 %ld 개의 원격 거부가 있었습니다. "
-#: ../src/gtk-ui/sync-ui.c:2600
+#: ../src/gtk-ui/sync-ui.c:2634
#, c-format
msgid "Last time: No changes."
msgstr "지난 시간: 변동 사항 없음."
-#: ../src/gtk-ui/sync-ui.c:2602
+#: ../src/gtk-ui/sync-ui.c:2636
#, c-format
msgid "Last time: Sent one change."
msgid_plural "Last time: Sent %ld changes."
-msgstr[0] "최근: 한 개의 변경 내용을 보냈습니다."
-msgstr[1] "최근: %ld 개의 변경 내용을 보냈습니다."
+msgstr[0] "최근: %ld 개의 변경 사항을 보냈습니다."
#. This is about changes made to the local data. Not all of these
#. changes were requested by the remote server, so "applied"
#. is a better word than "received" (bug #5185).
-#: ../src/gtk-ui/sync-ui.c:2610
+#: ../src/gtk-ui/sync-ui.c:2644
#, c-format
msgid "Last time: Applied one change."
msgid_plural "Last time: Applied %ld changes."
-msgstr[0] "최근: 한 개의 변경 내용을 적용했습니다."
-msgstr[1] "최근: %ld 개의 변경 내용을 적용했습니다."
+msgstr[0] "최근: %ld 개의 변경 사항을 적용했습니다."
-#: ../src/gtk-ui/sync-ui.c:2615
+#: ../src/gtk-ui/sync-ui.c:2649
#, c-format
msgid "Last time: Applied %ld changes and sent %ld changes."
msgstr "최근: %ld 개의 변경 내용을 적용했고, %ld 개의 변경 내용을 보냈습니다."
#. TRANSLATORS: the placeholder is a error message (hopefully)
#. * explaining the problem
-#: ../src/gtk-ui/sync-ui.c:2822
+#: ../src/gtk-ui/sync-ui.c:2856
#, c-format
msgid ""
"There was a problem with last sync:\n"
@@ -378,124 +394,138 @@ msgstr ""
"최근 동기화에 문제가 있습니다.\n"
"%s"
-#: ../src/gtk-ui/sync-ui.c:2832
+#: ../src/gtk-ui/sync-ui.c:2866
#, c-format
-msgid "You've just restored a backup. The changes have not been synced with %s yet"
+msgid ""
+"You've just restored a backup. The changes have not been synced with %s yet"
msgstr "방금 백업을 복원했습니다. 변경 내용은 아직 %s와 동기화되지 않았습니다."
-#: ../src/gtk-ui/sync-ui.c:3120
+#: ../src/gtk-ui/sync-ui.c:3154
msgid "Waiting for current operation to finish..."
msgstr "현재 작동이 끝나기를 기다리고 있습니다..."
#. TRANSLATORS: next strings are error messages.
-#: ../src/gtk-ui/sync-ui.c:3154
-msgid "A normal sync is not possible at this time. The server suggests a slow sync, but this might not always be what you want if both ends already have data."
-msgstr "지금은 정상적인 동기화가 가능하지 않습니다. 서버는 느린 동기화를 제안하지만, 이미 양쪽 끝에 데이터가 있는 경우 이것이 항상 귀하가 원하시는 방법이 아닐 수도 있습니다."
+#: ../src/gtk-ui/sync-ui.c:3188
+msgid ""
+"A normal sync is not possible at this time. The server suggests a slow sync,"
+" but this might not always be what you want if both ends already have data."
+msgstr ""
+"지금은 정상적인 동기화가 가능하지 않습니다. 서버는 느린 동기화를 제안하지만, 이미 양쪽 끝에 데이터가 있는 경우 이것이 항상 귀하가 "
+"원하시는 방법이 아닐 수도 있습니다."
-#: ../src/gtk-ui/sync-ui.c:3158
+#: ../src/gtk-ui/sync-ui.c:3192
msgid "The sync process died unexpectedly."
msgstr "동기화 프로세스가 갑자기 종료했습니다."
-#: ../src/gtk-ui/sync-ui.c:3163
-msgid "Password request was not answered. You can save the password in the settings to prevent the request."
+#: ../src/gtk-ui/sync-ui.c:3197
+msgid ""
+"Password request was not answered. You can save the password in the settings"
+" to prevent the request."
msgstr "암호 요청에 응답하지 않았습니다. 설정에 암호를 저장하면 요청을 하지 않습니다."
#. TODO use the service device name here, this is a remote problem
-#: ../src/gtk-ui/sync-ui.c:3167
+#: ../src/gtk-ui/sync-ui.c:3201
msgid "There was a problem processing sync request. Trying again may help."
msgstr "동기화 요청을 처리하는 중에 문제가 발생했습니다. 다시 시도하면 문제가 해결될 수도 있습니다."
-#: ../src/gtk-ui/sync-ui.c:3173
-msgid "Failed to login. Could there be a problem with your username or password?"
+#: ../src/gtk-ui/sync-ui.c:3207
+msgid ""
+"Failed to login. Could there be a problem with your username or password?"
msgstr "로그인하지 못했습니다. 사용자 이름이나 암호에 문제가 있습니까?"
-#: ../src/gtk-ui/sync-ui.c:3176
+#: ../src/gtk-ui/sync-ui.c:3210
msgid "Forbidden"
msgstr "금지"
#. TRANSLATORS: data source means e.g. calendar or addressbook
-#: ../src/gtk-ui/sync-ui.c:3182
-msgid "A data source could not be found. Could there be a problem with the settings?"
+#: ../src/gtk-ui/sync-ui.c:3216
+msgid ""
+"A data source could not be found. Could there be a problem with the "
+"settings?"
msgstr "데이터 원본을 찾을 수 없습니다. 서버 설정에 문제가 있습니까?"
-#: ../src/gtk-ui/sync-ui.c:3186
+#: ../src/gtk-ui/sync-ui.c:3220
msgid "Remote database error"
msgstr "원격 데이터베이스 오류"
#. This can happen when EDS is borked, restart it may help...
-#: ../src/gtk-ui/sync-ui.c:3189
-msgid "There is a problem with the local database. Syncing again or rebooting may help."
+#: ../src/gtk-ui/sync-ui.c:3223
+msgid ""
+"There is a problem with the local database. Syncing again or rebooting may "
+"help."
msgstr "이것은 로컬 데이터베이스 문제입니다. 다시 동기화하거나 재부트하면 문제가 해결될 수도 있습니다."
-#: ../src/gtk-ui/sync-ui.c:3192
+#: ../src/gtk-ui/sync-ui.c:3226
msgid "No space on disk"
msgstr "디스크에 남은 공간이 없음"
-#: ../src/gtk-ui/sync-ui.c:3194
+#: ../src/gtk-ui/sync-ui.c:3228
msgid "Failed to process SyncML"
msgstr "SyncML 프로세스 실패"
-#: ../src/gtk-ui/sync-ui.c:3196
+#: ../src/gtk-ui/sync-ui.c:3230
msgid "Server authorization failed"
msgstr "서버 권한 부여 실패"
-#: ../src/gtk-ui/sync-ui.c:3198
+#: ../src/gtk-ui/sync-ui.c:3232
msgid "Failed to parse configuration file"
msgstr "구성 파일 구문 분석 실패"
-#: ../src/gtk-ui/sync-ui.c:3200
+#: ../src/gtk-ui/sync-ui.c:3234
msgid "Failed to read configuration file"
msgstr "구성요소 파일 읽기 실패"
-#: ../src/gtk-ui/sync-ui.c:3202
+#: ../src/gtk-ui/sync-ui.c:3236
msgid "No configuration found"
msgstr "구성요소를 찾을수 없습니다."
-#: ../src/gtk-ui/sync-ui.c:3204
+#: ../src/gtk-ui/sync-ui.c:3238
msgid "No configuration file found"
msgstr "구성요소 파일을 찾지 못했습니다."
-#: ../src/gtk-ui/sync-ui.c:3206
+#: ../src/gtk-ui/sync-ui.c:3240
msgid "Server sent bad content"
msgstr "서버가 안좋은 컨텐츠를 보냈습니다."
-#: ../src/gtk-ui/sync-ui.c:3208
+#: ../src/gtk-ui/sync-ui.c:3242
msgid "Connection certificate has expired"
msgstr "연결 인증이 만료되었습니다. "
-#: ../src/gtk-ui/sync-ui.c:3210
+#: ../src/gtk-ui/sync-ui.c:3244
msgid "Connection certificate is invalid"
msgstr "연결 인증이 유효하지 않습니다."
-#: ../src/gtk-ui/sync-ui.c:3218
-msgid "We were unable to connect to the server. The problem could be temporary or there could be something wrong with the settings."
+#: ../src/gtk-ui/sync-ui.c:3252
+msgid ""
+"We were unable to connect to the server. The problem could be temporary or "
+"there could be something wrong with the settings."
msgstr "서버에 연결할 수 없습니다. 이 문제는 일시적이거나 설정에 문제가 있을 수 있습니다."
-#: ../src/gtk-ui/sync-ui.c:3225
+#: ../src/gtk-ui/sync-ui.c:3259
msgid "The server URL is bad"
msgstr "서버 URL이 잘못되었습니다."
-#: ../src/gtk-ui/sync-ui.c:3230
+#: ../src/gtk-ui/sync-ui.c:3264
msgid "The server was not found"
msgstr "서버를 찾을 수 없습니다."
-#: ../src/gtk-ui/sync-ui.c:3232
+#: ../src/gtk-ui/sync-ui.c:3266
#, c-format
msgid "Error %d"
msgstr "오류 %d"
#. TRANSLATORS: password request dialog contents: title, cancel button
#. * and ok button
-#: ../src/gtk-ui/sync-ui.c:3370
+#: ../src/gtk-ui/sync-ui.c:3404
msgid "Password is required for sync"
msgstr "동기화하려면 암호가 필요합니다."
-#: ../src/gtk-ui/sync-ui.c:3374
+#: ../src/gtk-ui/sync-ui.c:3408
msgid "Sync with password"
msgstr "암호 동기화"
#. TRANSLATORS: password request dialog message, placeholder is service name
-#: ../src/gtk-ui/sync-ui.c:3384
+#: ../src/gtk-ui/sync-ui.c:3418
#, c-format
msgid "Please enter password for syncing with %s:"
msgstr "%s 동기화 암호를 입력하십시오."
@@ -551,14 +581,17 @@ msgstr "새로운 서비스 추가"
#. explanation of "Restore backup" function
#: ../src/gtk-ui/ui.glade.h:18
-msgid "Backups are made before every time we Sync. Choose a backup to restore. Any changes you have made since then will be lost."
+msgid ""
+"Backups are made before every time we Sync. Choose a backup to restore. Any "
+"changes you have made since then will be lost."
msgstr "백업은 매번 동기화하기 전에 만들어집니다. 복원할 백업을 선택하십시오. 그 이후의 변경 내용은 모두 손실됩니다."
#: ../src/gtk-ui/ui.glade.h:19
msgid "Calendar"
msgstr "캘린더"
-#. Button in main view, right side. Keep to below 20 chars per line, feel free to use two lines
+#. Button in main view, right side. Keep to below 20 chars per line, feel free
+#. to use two lines
#: ../src/gtk-ui/ui.glade.h:21
msgid ""
"Change or edit\n"
@@ -592,7 +625,8 @@ msgstr ""
"삭제하고 Zyb 데이터로\n"
"교체하십시오."
-#. button in main view, right side. Keep length to 20 characters or so, use two lines if needed
+#. button in main view, right side. Keep length to 20 characters or so, use
+#. two lines if needed
#: ../src/gtk-ui/ui.glade.h:32
msgid ""
"Fix a sync\n"
@@ -606,7 +640,8 @@ msgid ""
"If you don't see your service above but know that your sync provider uses SyncML\n"
"you can setup a service manually."
msgstr ""
-"만약 당신의 서비스가 보이지는 않지만 당신의 동기화 제공자가 SyncML을 사용하는것을 알고 있다면\n"
+"만약 당신의 서비스가 보이지는 않지만 당신의 동기화 제공자가 \n"
+"SyncML을 사용하는것을 알고 있다면\n"
"서비스를 수동으로 설정할 수 있습니다."
#: ../src/gtk-ui/ui.glade.h:36
@@ -631,90 +666,113 @@ msgstr "데이터를 한 장치에서 다른 장치로 동기화하려면 블루
#: ../src/gtk-ui/ui.glade.h:44
msgid "You will need to add Bluetooth devices before they can be synced."
-msgstr "블루투스 장치가 동기화되기 전에 이들을 추가해야 합니다."
+msgstr "데이터가 동기화되기 전에 블루투스를 추가해야 합니다."
#: ../src/gtk-ui/sync.desktop.in.h:2
-#: ../src/gtk-ui/sync-gtk.desktop.in.h:2
msgid "Up to date"
msgstr "최신"
#: ../src/gtk-ui/sync-gtk.desktop.in.h:1
-msgid "Sync (GTK)"
-msgstr "Sync (GTK)"
+msgid "SyncEvolution (GTK)"
+msgstr "SyncEvolution (GTK)"
+
+#: ../src/gtk-ui/sync-gtk.desktop.in.h:2
+msgid "Synchronize PIM data"
+msgstr "PIM 데이터 동기화"
-#: ../src/gtk-ui/sync-config-widget.c:78
-msgid "ScheduleWorld enables you to keep your contacts, events, tasks, and notes in sync."
+#: ../src/gtk-ui/sync-config-widget.c:88
+msgid ""
+"ScheduleWorld enables you to keep your contacts, events, tasks, and notes in"
+" sync."
msgstr "scheduleworld에서 귀사의 연락처, 이벤트, 작업 및 동기화 노트를 보존할 수 있습니다. "
-#: ../src/gtk-ui/sync-config-widget.c:81
-msgid "Google Sync can back up and synchronize your contacts with your Gmail contacts."
+#: ../src/gtk-ui/sync-config-widget.c:91
+msgid ""
+"Google Sync can back up and synchronize your contacts with your Gmail "
+"contacts."
msgstr "Google Sync에서 귀하의 연락처 기록을 Gmail 연락처로 백업하거나 동기화할 수 있습니다. "
#. TRANSLATORS: Please include the word "demo" (or the equivalent in
#. your language): Funambol is going to be a 90 day demo service
#. in the future
-#: ../src/gtk-ui/sync-config-widget.c:87
-msgid "Back up your contacts and calendar. Sync with a single click, anytime, anywhere (DEMO)."
+#: ../src/gtk-ui/sync-config-widget.c:97
+msgid ""
+"Back up your contacts and calendar. Sync with a single click, anytime, "
+"anywhere (DEMO)."
msgstr "귀하의 연락처 및 일정을 백업합니다. 한 번의 클릭으로 언제 어디서나 동기화가 가능합니다(DEMO). "
-#: ../src/gtk-ui/sync-config-widget.c:90
-msgid "Mobical Backup and Restore service allows you to securely back up your personal mobile data for free."
-msgstr "Moblin식 백업과 복원 서비스를 사용하면 개인용 모바일 데이터를 무료로 안전하게 백업할 수 있습니다."
+#: ../src/gtk-ui/sync-config-widget.c:100
+msgid ""
+"Mobical Backup and Restore service allows you to securely back up your "
+"personal mobile data for free."
+msgstr "Mobical 백업과 복원 서비스를 사용하면 개인용 모바일 데이터를 무료로 안전하게 백업할 수 있습니다."
-#: ../src/gtk-ui/sync-config-widget.c:93
-msgid "ZYB is a simple way for people to store and share mobile information online."
+#: ../src/gtk-ui/sync-config-widget.c:103
+msgid ""
+"ZYB is a simple way for people to store and share mobile information online."
msgstr "ZYB는 모바일 정보를 온라인으로 저장하고 공유할 수 있는 간단한 방법입니다."
-#: ../src/gtk-ui/sync-config-widget.c:96
-msgid "Memotoo lets you access your personal data from any computer connected to the Internet."
+#: ../src/gtk-ui/sync-config-widget.c:106
+msgid ""
+"Memotoo lets you access your personal data from any computer connected to "
+"the Internet."
msgstr "Memotoo를 사용하면 인터넷에 연결된 컴퓨터에서 개인용 데이터를 액세스할 수 있습니다."
-#: ../src/gtk-ui/sync-config-widget.c:192
+#: ../src/gtk-ui/sync-config-widget.c:195
msgid "Sorry, failed to save the configuration"
msgstr "죄송합니다만 구성을 저장하지 못했습니다."
-#: ../src/gtk-ui/sync-config-widget.c:381
+#: ../src/gtk-ui/sync-config-widget.c:445
msgid "Service must have a name and server URL"
msgstr "서비스는 반듯이 이름 및 서버 URL이 있어야 합니다."
-#: ../src/gtk-ui/sync-config-widget.c:422
+#. TRANSLATORS: error dialog when creating a new sync configuration
+#: ../src/gtk-ui/sync-config-widget.c:451
+msgid "A username is required for this service"
+msgstr "이 서비스를 이용하려면 사용자 이름을 입력해야 합니다."
+
+#: ../src/gtk-ui/sync-config-widget.c:493
#, c-format
-msgid "Do you want to reset the settings for %s? This will not remove any synced information on either end."
+msgid ""
+"Do you want to reset the settings for %s? This will not remove any synced "
+"information on either end."
msgstr "%s의 설정값을 다시 설정하시겠습니까? 이것은 동기화된 정보를 어느 한쪽에서도 제거하지 않습니다."
#. TRANSLATORS: buttons in reset-service warning dialog
-#: ../src/gtk-ui/sync-config-widget.c:426
+#: ../src/gtk-ui/sync-config-widget.c:497
msgid "Yes, reset"
msgstr "예, 재설정합니다."
-#: ../src/gtk-ui/sync-config-widget.c:427
-#: ../src/gtk-ui/sync-config-widget.c:438
+#: ../src/gtk-ui/sync-config-widget.c:498
+#: ../src/gtk-ui/sync-config-widget.c:509
msgid "No, keep settings"
-msgstr "아니오, 설정값을 유지합니다."
+msgstr "아니요, 설정값을 유지합니다."
-#: ../src/gtk-ui/sync-config-widget.c:432
+#: ../src/gtk-ui/sync-config-widget.c:503
#, c-format
-msgid "Do you want to delete the settings for %s? This will not remove any synced information on either end but it will remove these settings."
+msgid ""
+"Do you want to delete the settings for %s? This will not remove any synced "
+"information on either end but it will remove these settings."
msgstr "%s의 설정값을 삭제하시겠습니까? 이것은 동기화된 정보를 어느 한쪽에서도 제거하지는 않지만 이 설정값들은 제거합니다."
#. TRANSLATORS: buttons in delete-service warning dialog
-#: ../src/gtk-ui/sync-config-widget.c:437
+#: ../src/gtk-ui/sync-config-widget.c:508
msgid "Yes, delete"
msgstr "예, 삭제합니다."
-#: ../src/gtk-ui/sync-config-widget.c:467
+#: ../src/gtk-ui/sync-config-widget.c:539
msgid "Reset settings"
msgstr "설정값 재설정"
-#: ../src/gtk-ui/sync-config-widget.c:470
+#: ../src/gtk-ui/sync-config-widget.c:542
msgid "Delete settings"
msgstr "설정값 삭제"
-#: ../src/gtk-ui/sync-config-widget.c:480
+#: ../src/gtk-ui/sync-config-widget.c:552
msgid "Save and use"
msgstr "저장 및 사용"
-#: ../src/gtk-ui/sync-config-widget.c:483
+#: ../src/gtk-ui/sync-config-widget.c:555
msgid ""
"Save and replace\n"
"current service"
@@ -722,101 +780,113 @@ msgstr ""
"현재 서비스를\n"
"저장하고 교체합니다."
-#: ../src/gtk-ui/sync-config-widget.c:493
+#: ../src/gtk-ui/sync-config-widget.c:563
msgid "Stop using device"
msgstr "장치 사용 중단"
-#: ../src/gtk-ui/sync-config-widget.c:496
+#: ../src/gtk-ui/sync-config-widget.c:566
msgid "Stop using service"
msgstr "서비스 사용 중단"
#. TRANSLATORS: label for an entry in service configuration form.
#. * Placeholder is a source name.
#. * Example: "Appointments URI"
-#: ../src/gtk-ui/sync-config-widget.c:679
+#: ../src/gtk-ui/sync-config-widget.c:749
#, c-format
msgid "%s URI"
msgstr "%s URI"
#. TRANSLATORS: toggles in service configuration form, placeholder is service
#. * or device name
-#: ../src/gtk-ui/sync-config-widget.c:854
+#: ../src/gtk-ui/sync-config-widget.c:936
#, c-format
msgid "Send changes to %s"
msgstr "%s으로 변경 내용을 보냅니다."
-#: ../src/gtk-ui/sync-config-widget.c:859
+#: ../src/gtk-ui/sync-config-widget.c:941
#, c-format
msgid "Receive changes from %s"
msgstr "%s에서 변경 내용을 받습니다."
-#: ../src/gtk-ui/sync-config-widget.c:875
+#: ../src/gtk-ui/sync-config-widget.c:957
msgid "<b>Sync</b>"
msgstr "<b>동기화</b>"
#. TRANSLATORS: label of a entry in service configuration
-#: ../src/gtk-ui/sync-config-widget.c:891
+#: ../src/gtk-ui/sync-config-widget.c:973
msgid "Server address"
msgstr "서버 주소"
#. TRANSLATORS: explanation before a device template combobox.
#. * Placeholder is a device name like 'Nokia N85' or 'Syncevolution
#. * Client'
-#: ../src/gtk-ui/sync-config-widget.c:967
+#: ../src/gtk-ui/sync-config-widget.c:1049
#, c-format
-msgid "This device looks like it might be a '%s'. If this is not correct, please take a look at the list of supported devices and pick yours if it is listed"
+msgid ""
+"This device looks like it might be a '%s'. If this is not correct, please "
+"take a look at the list of supported devices and pick yours if it is listed"
msgstr "이 장치는 '%s'인 것 같습니다. 그렇지 않으면 지원 장치 목록에서 열거된 것이 있는지 찾아보십시오."
-#: ../src/gtk-ui/sync-config-widget.c:973
-msgid "We don't know what this device is exactly. Please take a look at the list of supported devices and pick yours if it is listed"
+#: ../src/gtk-ui/sync-config-widget.c:1055
+#: ../src/gtk-ui/sync-config-widget.c:1915
+msgid ""
+"We don't know what this device is exactly. Please take a look at the list of"
+" supported devices and pick yours if it is listed"
msgstr "이 장치가 정확히 무엇인지 모르겠습니다. 지원 장치 목록에서 열거된 것이 있는지 찾아보십시오."
-#: ../src/gtk-ui/sync-config-widget.c:1126
+#: ../src/gtk-ui/sync-config-widget.c:1207
#, c-format
msgid "%s - Bluetooth device"
msgstr "%s - 블루투스 장치"
#. TRANSLATORS: service title for services that are not based on a
#. * template in service list, the placeholder is the name of the service
-#: ../src/gtk-ui/sync-config-widget.c:1132
+#: ../src/gtk-ui/sync-config-widget.c:1213
#, c-format
msgid "%s - manually setup"
msgstr "%s - 수동으로 설정"
#. TRANSLATORS: link button in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1807
+#: ../src/gtk-ui/sync-config-widget.c:1886
msgid "Launch website"
msgstr "웹사이트 시작"
#. TRANSLATORS: button in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1816
+#: ../src/gtk-ui/sync-config-widget.c:1895
msgid "Set up now"
msgstr "지금 설정"
+#: ../src/gtk-ui/sync-config-widget.c:1953
+msgid "Use these settings"
+msgstr "이 설정값들을 사용하십시오."
+
#. TRANSLATORS: labels of entries in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1912
+#: ../src/gtk-ui/sync-config-widget.c:1991
msgid "Username"
msgstr "사용자 이름"
-#: ../src/gtk-ui/sync-config-widget.c:1927
+#: ../src/gtk-ui/sync-config-widget.c:2006
msgid "Password"
msgstr "암호"
#. TRANSLATORS: warning in service configuration form for people
#. who have modified the configuration via other means.
-#: ../src/gtk-ui/sync-config-widget.c:1950
-msgid "Current configuration is more complex than what can be shown here. Changes to sync mode or synced data types will overwrite that configuration."
-msgstr "현재 구성은 여기에 표시될 수 있는 것보다 더 복잡합니다. 동기화 모드 또는 동기화된 데이터 유형을 변경하면 그 구성을 덮어쓰게 됩니다."
+#: ../src/gtk-ui/sync-config-widget.c:2029
+msgid ""
+"Current configuration is more complex than what can be shown here. Changes "
+"to sync mode or synced data types will overwrite that configuration."
+msgstr ""
+"현재 구성은 여기에 표시될 수 있는 것보다 더 복잡합니다. 동기화 모드 또는 동기화된 데이터 유형을 변경하면 그 구성을 덮어쓰게 됩니다."
#. TRANSLATORS: this is the epander label for server settings
#. in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1969
+#: ../src/gtk-ui/sync-config-widget.c:2048
msgid "Hide server settings"
msgstr "서버 설정값 숨김"
#. TRANSLATORS: this is the epander label for server settings
#. in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1989
+#: ../src/gtk-ui/sync-config-widget.c:2068
msgid "Show server settings"
msgstr "서버 설정값 표시"
@@ -824,144 +894,46 @@ msgstr "서버 설정값 표시"
msgid "Sync in the Sync application"
msgstr "동기화 응용 프로그램에서 동기화"
-#: ../src/syncevo-dbus-server.cpp:5664
+#: ../src/syncevo-dbus-server.cpp:6653
#, c-format
msgid "%s is syncing"
msgstr "%s 동기화 중"
-#: ../src/syncevo-dbus-server.cpp:5665
+#: ../src/syncevo-dbus-server.cpp:6654
#, c-format
msgid "We have just started to sync your computer with the %s sync service."
msgstr "%s 동기화 서비스로 방금 귀하의 컴퓨터를 동기화하기 시작했습니다."
#. if sync is successfully started and done
-#: ../src/syncevo-dbus-server.cpp:5679
+#: ../src/syncevo-dbus-server.cpp:6670
#, c-format
msgid "%s sync complete"
msgstr "%s 동기화 완료"
-#: ../src/syncevo-dbus-server.cpp:5680
+#: ../src/syncevo-dbus-server.cpp:6671
#, c-format
msgid "We have just finished syncing your computer with the %s sync service."
msgstr "%s 동기화 서비스로 방금 귀하의 컴퓨터 동기화를 마쳤습니다."
-#. if sync is successfully started and has errors, or not started successful with a fatal problem
-#: ../src/syncevo-dbus-server.cpp:5685
+#. if sync is successfully started and has errors, or not started successful
+#. with a fatal problem
+#: ../src/syncevo-dbus-server.cpp:6676
msgid "Sync problem."
msgstr "동기화 문제"
-#: ../src/syncevo-dbus-server.cpp:5686
+#: ../src/syncevo-dbus-server.cpp:6677
msgid "Sorry, there's a problem with your sync that you need to attend to."
msgstr "죄송합니다. 동기화에 문제가 있으니 주의를 요합니다."
-#: ../src/syncevo-dbus-server.cpp:5759
+#: ../src/syncevo-dbus-server.cpp:6758
msgid "View"
msgstr "보기"
#. Use "default" as ID because that is what mutter-moblin
#. recognizes: it then skips the action instead of adding it
#. in addition to its own "Dismiss" button (always added).
-#: ../src/syncevo-dbus-server.cpp:5763
+#: ../src/syncevo-dbus-server.cpp:6762
msgid "Dismiss"
msgstr "종료"
-#~ msgid "Database error"
-#~ msgstr "데이터베이스 오류"
-#~ msgid ""
-#~ "Do you want to replace %s with %s? This will not remove any synced "
-#~ "information on either end but you will no longer be able to sync with %s."
-#~ msgstr ""
-#~ "%s을 %s로 교체하시겠습니까? 이것은 어느 한쪽에서나 동기화된 정보를 제거하"
-#~ "지는 않지만 %s와는 더 이상 동기화할 수 없게 됩니다."
-#~ msgid "Yes, use %s"
-#~ msgstr "예, %s을 사용합니다."
-#~ msgid "No, use %s"
-#~ msgstr "아니오, %s을 사용합니다."
-#~ msgid "Reset service"
-#~ msgstr "서비스 재설정"
-#~ msgid "Addressbook"
-#~ msgstr "주소록"
-#~ msgid "Todo"
-#~ msgstr "할일"
-#~ msgid "Memo"
-#~ msgstr "메모"
-#~ msgid "Failed to save current service in GConf configuration system"
-#~ msgstr "GConf 구성 시스템의 현재 서비스를 저장하는데 실패했습니다."
-#~ msgid "Failed to save service configuration to SyncEvolution"
-#~ msgstr "서비스 구성을 SyncEvolution에 저장하는데 실패했습니다."
-#~ msgid "Failed to get service configuration from SyncEvolution"
-#~ msgstr "SyncEvolution으로 부터 구성 서비스를 불러오기를 실패했습니다."
-#~ msgid "Failed to remove service configuration from SyncEvolution"
-#~ msgstr "SyncEvolution으로 부터 구성 시스템을 제거하는데 실패했습니다."
-#~ msgid "Failed to cancel: sync was no longer in progress"
-#~ msgstr "취소 실패: 동기화는 더이상 진행되지 않습니다."
-#~ msgid "Failed to cancel sync"
-#~ msgstr "동기화 취소 실패"
-#~ msgid "Canceling sync"
-#~ msgstr "동기화 취소 중 "
-#~ msgid "No sources are enabled, not syncing"
-#~ msgstr "사용 가능한 소스가 없습니다. 동기화 되지 않았습니다."
-#~ msgid "A sync is already in progress"
-#~ msgstr "동기화가 이미 진행중 입니다."
-#~ msgid "Failed to start sync"
-#~ msgstr "동기화를 시작하는데 실패했습니다."
-#~ msgid "%s (not supported by this service)"
-#~ msgstr "%s (이 서비스에 의해 지원되지 않습니다)"
-#~ msgid "Failed to get server configuration from SyncEvolution"
-#~ msgstr "SyncEvolution으로 부터 서버 구성 기능을 불러오기를 실패했습니다."
-#~ msgid "Server URL"
-#~ msgstr "서버 URL"
-#~ msgid "Failed to get list of manually setup services from SyncEvolution"
-#~ msgstr ""
-#~ "SyncEvolution으로 부터 수동 설치 서비스 목록을 불러오기를 실패했습니다."
-#~ msgid "Service configuration not found"
-#~ msgstr "서비스 구성 요소를 찾을 수 없습니다."
-#~ msgid "Not authorized"
-#~ msgstr "권한이 없습니다"
-#~ msgid "Not found"
-#~ msgstr "찾을 수 없음"
-#~ msgid "Transport failure (no connection?)"
-#~ msgstr "전송 실패(연결 없음?)"
-#~ msgid "Connection timed out"
-#~ msgstr "연결 시간 초과"
-#~ msgid "Sync canceled"
-#~ msgstr "동기화 취소"
-#~ msgid "Ending sync"
-#~ msgstr "동기화 종료"
-#~ msgid "<b>No sync service in use</b>"
-#~ msgstr "<b>사용중인 동기화 서비스가 없습니다</b>"
-#~ msgid "<big>Manual setup</big>"
-#~ msgstr "<big>설명서 설정</big>"
-#~ msgid "Merge local and remote data (recommended)"
-#~ msgstr "로컬 데이터와 원격 데이터의 합병"
-#~ msgid "Reset original server settings"
-#~ msgstr "오리지날 서버 설정 다시 설정하기."
-#~ msgid "Service name"
-#~ msgstr "서비스 이름"
-#~ msgid ""
-#~ "Sorry, you need an internet\n"
-#~ "connection to sync."
-#~ msgstr ""
-#~ "죄송합니다, 동기화를 하려면\n"
-#~ "인터넷 연결이 필요합니다."
-#~ msgid ""
-#~ "Synchronization is not available (D-Bus service does not answer), sorry."
-#~ msgstr ""
-#~ "동기화가 가능하지 않습니다(D-Bus 서비스는 응답이 없습니다),죄송합니다."
-#~ msgid "Last time: Received one change."
-#~ msgid_plural "Last time: Received %d changes."
-#~ msgstr[0] "지난 시간: 한건의 변경 사항을 받았습니다."
-#~ msgstr[1] "지난 시간: %d건의 변경 사항을 받았습니다."
-#~ msgid "Last time: Received %d changes and sent %d changes."
-#~ msgstr "지난 시간: %d 변동 사항 접수 및 %d 변동 사항 보냄."
-#~ msgid "Setup sync service"
-#~ msgstr "동기화 서비스를 설정할 수 없습니다."
-#~ msgid ""
-#~ "You haven't set up a sync service yet. Sync services let you \n"
-#~ "synchronize your data between your netbook and a web service."
-#~ msgstr ""
-#~ "당신은 동기화 서비스를 아직 설치하지 않았습니다. 동기화 서비스는\n"
-#~ "당신의 넷북과 웹 서비스 사이의 데이터를 동기화 시켜줍니다. "
-#~ msgid "Bring your data with you"
-#~ msgstr "귀하의 데이타를 가져오십시오."
diff --git a/po/nl.po b/po/nl.po
index 0d0b431f..8a129838 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,21 +1,27 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# Jiri Najman <jiri@transmundi.org>, 2011.
+# <tomas.galicia@intel.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: syncevolution\n"
-"Report-Msgid-Bugs-To: http://moblin.org/projects/syncevolution\n"
-"POT-Creation-Date: 2010-05-10 09:25+0000\n"
-"PO-Revision-Date: 2010-05-12 13:02-0800\n"
-"Last-Translator: Thomas <thomas.martens@ptiglobal.net>\n"
-"Language-Team: \n"
+"Report-Msgid-Bugs-To: https://bugs.meego.com/\n"
+"POT-Creation-Date: 2011-12-05 10:21-0800\n"
+"PO-Revision-Date: 2011-12-06 12:22+0000\n"
+"Last-Translator: GLS_Translator_NLD1 <jiri@transmundi.org>\n"
+"Language-Team: Dutch (http://www.transifex.net/projects/p/meego/team/nl/)\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-Poedit-Language: Dutch\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. TRANSLATORS: this is the application name that may be used by e.g.
#. the windowmanager
-#: ../src/gtk-ui/main.c:40
-#: ../src/gtk-ui/ui.glade.h:38
+#: ../src/gtk-ui/main.c:40 ../src/gtk-ui/ui.glade.h:38
#: ../src/gtk-ui/sync.desktop.in.h:1
#: ../src/gnome-bluetooth/syncevolution.c:112
msgid "Sync"
@@ -29,8 +35,7 @@ msgstr "Contacten"
msgid "Appointments"
msgstr "Afspraken"
-#: ../src/gtk-ui/sync-ui.c:270
-#: ../src/gtk-ui/ui.glade.h:40
+#: ../src/gtk-ui/sync-ui.c:270 ../src/gtk-ui/ui.glade.h:40
msgid "Tasks"
msgstr "Taken"
@@ -64,72 +69,78 @@ msgstr "Ja, voer een synchronisatie uit"
msgid "No, cancel sync"
msgstr "Nee, breek synchronisatie af"
-#. TRANSLATORS: confirmation dialog for refresh-from-server. Placeholder
+#. TRANSLATORS: confirmation dialog for "refresh from peer". Placeholder
#. * is service/device name
#: ../src/gtk-ui/sync-ui.c:424
#, c-format
-msgid "Do you want to delete all local data and replace it with data from %s? This is not usually advised."
-msgstr "Wil je alle lokale data verwijderen en vervangen met data van %s? Dit is niet aan te raden."
+msgid ""
+"Do you want to delete all local data and replace it with data from %s? This "
+"is not usually advised."
+msgstr ""
+"Wil je alle lokale data verwijderen en vervangen met data van %s? Dit is "
+"niet aan te raden."
-#: ../src/gtk-ui/sync-ui.c:429
-#: ../src/gtk-ui/sync-ui.c:460
+#: ../src/gtk-ui/sync-ui.c:429 ../src/gtk-ui/sync-ui.c:462
msgid "Yes, delete and replace"
msgstr "Ja, verwijder en vervang"
-#: ../src/gtk-ui/sync-ui.c:429
-#: ../src/gtk-ui/sync-ui.c:460
-#: ../src/gtk-ui/sync-ui.c:1580
+#: ../src/gtk-ui/sync-ui.c:429 ../src/gtk-ui/sync-ui.c:462
+#: ../src/gtk-ui/sync-ui.c:1610
msgid "No"
msgstr "Nee"
-#. TRANSLATORS: confirmation dialog for refresh-from-client. Placeholder
+#. TRANSLATORS: confirmation dialog for "refresh from local side". Placeholder
#. * is service/device name
-#: ../src/gtk-ui/sync-ui.c:455
+#: ../src/gtk-ui/sync-ui.c:457
#, c-format
-msgid "Do you want to delete all data in %s and replace it with your local data? This is not usually advised."
-msgstr "Wil je alle data in %s verwijderen en vervangen met lokale data? Dit is niet aan te raden."
+msgid ""
+"Do you want to delete all data in %s and replace it with your local data? "
+"This is not usually advised."
+msgstr ""
+"Wil je alle data in %s verwijderen en vervangen met lokale data? Dit is niet"
+" aan te raden."
-#: ../src/gtk-ui/sync-ui.c:487
+#: ../src/gtk-ui/sync-ui.c:491
msgid "Trying to cancel sync"
msgstr "Proberen syncrhonisatie af te breken"
-#: ../src/gtk-ui/sync-ui.c:529
+#: ../src/gtk-ui/sync-ui.c:533
msgid "No service or device selected"
msgstr "Geen service of apparaat geselecteerd"
#. TRANSLATORS: This is the title on main view. Placeholder is
#. * the service name. Example: "Google - synced just now"
-#: ../src/gtk-ui/sync-ui.c:537
+#: ../src/gtk-ui/sync-ui.c:541
#, c-format
msgid "%s - synced just now"
msgstr "%s - just klaar met synchroniseren"
-#: ../src/gtk-ui/sync-ui.c:541
+#: ../src/gtk-ui/sync-ui.c:545
#, c-format
msgid "%s - synced a minute ago"
msgstr "%s - een minuut geleden gesynchroniseerd"
-#: ../src/gtk-ui/sync-ui.c:545
+#: ../src/gtk-ui/sync-ui.c:549
#, c-format
msgid "%s - synced %ld minutes ago"
msgstr "%s - %ld minuten geleden gesynchroniseerd"
-#: ../src/gtk-ui/sync-ui.c:550
+#: ../src/gtk-ui/sync-ui.c:554
#, c-format
msgid "%s - synced an hour ago"
msgstr "%s - een uur geleden gesynchroniseerd"
-#: ../src/gtk-ui/sync-ui.c:554
+#: ../src/gtk-ui/sync-ui.c:558
#, c-format
msgid "%s - synced %ld hours ago"
msgstr "%s - %ld uren geleden gesynchroniseerd"
-#: ../src/gtk-ui/sync-ui.c:559
+#: ../src/gtk-ui/sync-ui.c:563
#, c-format
msgid "%s - synced a day ago"
msgstr "%s - een dag geleden gesynchroniseerd"
-#: ../src/gtk-ui/sync-ui.c:563
+#: ../src/gtk-ui/sync-ui.c:567
#, c-format
msgid "%s - synced %ld days ago"
msgstr "%s - %ld dagen geleden gesynchroniseerd"
@@ -137,66 +148,68 @@ msgstr "%s - %ld dagen geleden gesynchroniseerd"
#. TRANSLATORS: Action button in info bar in main view. Shown with e.g.
#. * "You've just restored a backup. The changes have not been "
#. * "synced with %s yet"
-#: ../src/gtk-ui/sync-ui.c:612
-#: ../src/gtk-ui/sync-ui.c:726
+#: ../src/gtk-ui/sync-ui.c:616 ../src/gtk-ui/sync-ui.c:701
msgid "Sync now"
msgstr "Synchroniseer nu"
#. TRANSLATORS: Action button in info bar in main view. Shown with e.g.
#. * "A normal sync is not possible at this time..." message.
#. * "Other options" will open Emergency view
-#: ../src/gtk-ui/sync-ui.c:618
-#: ../src/gtk-ui/ui.glade.h:37
+#: ../src/gtk-ui/sync-ui.c:622 ../src/gtk-ui/ui.glade.h:37
msgid "Slow sync"
msgstr "Synchronisatie"
-#: ../src/gtk-ui/sync-ui.c:619
+#: ../src/gtk-ui/sync-ui.c:623
msgid "Other options..."
msgstr "Andere opties..."
#. TRANSLATORS: Action button in info bar in main view. Shown e.g.
#. * when no service is selected. Will open configuration view
-#: ../src/gtk-ui/sync-ui.c:624
+#: ../src/gtk-ui/sync-ui.c:628
msgid "Select sync service"
msgstr "Selecteer synchronisatie service"
#. TRANSLATORS: Action button in info bar in main view. Shown e.g.
#. * login to service fails. Will open configuration view for this service
-#: ../src/gtk-ui/sync-ui.c:629
+#: ../src/gtk-ui/sync-ui.c:633
msgid "Edit service settings"
msgstr "Bewerk service instellingen"
-#: ../src/gtk-ui/sync-ui.c:700
-msgid "You haven't selected a sync service or device yet. Sync services let you synchronize your data between your netbook and a web service. You can also sync directly with some devices."
-msgstr "Je hebt geen synchronisatie service of apparaat geselecteerd. Synchronisatie service laten je synchroniseren tussen je netbook en een web service."
+#: ../src/gtk-ui/sync-ui.c:709
+msgid ""
+"You haven't selected a sync service or device yet. Sync services let you "
+"synchronize your data between your netbook and a web service. You can also "
+"sync directly with some devices."
+msgstr ""
+"Je hebt geen synchronisatie service of apparaat geselecteerd. Synchronisatie"
+" service laten je synchroniseren tussen je netbook en een web service."
-#: ../src/gtk-ui/sync-ui.c:722
+#: ../src/gtk-ui/sync-ui.c:729
msgid "Sync again"
msgstr "Synchroniseer opnieuw"
-#: ../src/gtk-ui/sync-ui.c:743
+#: ../src/gtk-ui/sync-ui.c:748
msgid "Restoring"
msgstr "Herstellen"
-#: ../src/gtk-ui/sync-ui.c:745
+#: ../src/gtk-ui/sync-ui.c:750
msgid "Syncing"
msgstr "Synchronisatie bezig"
#. TRANSLATORS: This is for the button in main view, right side.
#. Keep line length below ~20 characters, use two lines if needed
-#: ../src/gtk-ui/sync-ui.c:757
-#: ../src/gtk-ui/sync-ui.c:3374
+#: ../src/gtk-ui/sync-ui.c:762 ../src/gtk-ui/sync-ui.c:3407
msgid "Cancel sync"
msgstr "Synchronisatie afbreken"
-#: ../src/gtk-ui/sync-ui.c:922
+#: ../src/gtk-ui/sync-ui.c:927
msgid "Back to sync"
msgstr "Terug naar synchronisatie"
#. TRANSLATORS: label for checkbutton/toggle in main view.
#. * Please stick to similar length strings or break the line with
#. * "\n" if absolutely needed
-#: ../src/gtk-ui/sync-ui.c:1223
+#: ../src/gtk-ui/sync-ui.c:1229
msgid "Automatic sync"
msgstr "Automatische synchronisatie"
@@ -204,61 +217,78 @@ msgstr "Automatische synchronisatie"
#. * currently selected data sources. First placeholder is service/device
#. * name, second a comma separeted list of sources.
#. * E.g. "Affected data: Google Contacts, Appointments"
-#: ../src/gtk-ui/sync-ui.c:1494
+#: ../src/gtk-ui/sync-ui.c:1524
#, c-format
msgid "Affected data: %s %s"
msgstr "Betroffen gegevens: %s %s"
-#: ../src/gtk-ui/sync-ui.c:1499
+#: ../src/gtk-ui/sync-ui.c:1529
#, c-format
msgid "Affected data: none"
msgstr "Betroffen gegevens: geen"
#. TRANSLATORS: confirmation for restoring a backup. placeholder is the
#. * backup time string defined below
-#: ../src/gtk-ui/sync-ui.c:1577
+#: ../src/gtk-ui/sync-ui.c:1607
#, c-format
-msgid "Do you want to restore the backup from %s? All changes you have made since then will be lost."
-msgstr "Wilt u de backup terugzetten van % s? Alle wijzigingen die u sindsdien hebt gemaakt gaan verloren."
+msgid ""
+"Do you want to restore the backup from %s? All changes you have made since "
+"then will be lost."
+msgstr ""
+"Wilt u de backup terugzetten van % s? Alle wijzigingen die u sindsdien hebt "
+"gemaakt gaan verloren."
-#: ../src/gtk-ui/sync-ui.c:1580
+#: ../src/gtk-ui/sync-ui.c:1610
msgid "Yes, restore"
msgstr "Ja, herstellen"
#. TRANSLATORS: date/time for strftime(), used in emergency view backup
#. * label. Any time format that shows date and time is good.
-#: ../src/gtk-ui/sync-ui.c:1612
+#: ../src/gtk-ui/sync-ui.c:1642
#, c-format
msgid "%x %X"
msgstr "%x %X"
#. TRANSLATORS: label for a backup in emergency view. Placeholder is
#. * service or device name
-#: ../src/gtk-ui/sync-ui.c:1631
+#: ../src/gtk-ui/sync-ui.c:1661
#, c-format
msgid "Backed up before syncing with %s"
msgstr "Gebackupt vóór synchroniseren met %s"
-#: ../src/gtk-ui/sync-ui.c:1648
+#: ../src/gtk-ui/sync-ui.c:1678
msgid "Restore"
msgstr "Herstellen"
#. TRANSLATORS: this is an explanation in Emergency view.
#. * Placeholder is a service/device name
-#: ../src/gtk-ui/sync-ui.c:1755
+#: ../src/gtk-ui/sync-ui.c:1785
#, c-format
-msgid "A normal sync with %s is not possible at this time. You can do a slow two-way sync or start from scratch. You can also restore a backup, but a slow sync or starting from scratch will still be required before normal sync is possible."
-msgstr "Een normale synchronisatie met %s is niet mogelijk op dit moment. U kunt een langzame twee-weg synchronisatie uitvoeren of weer starten vanaf het begin. U kunt ook een back-up terugzetten, maar een langzame twee-weg synchronisatie of starten vanaf het begin is nog steeds noodzakelijk voordat een normale synchronisatie mogelijk is."
+msgid ""
+"A normal sync with %s is not possible at this time. You can do a slow two-"
+"way sync or start from scratch. You can also restore a backup, but a slow "
+"sync or starting from scratch will still be required before normal sync is "
+"possible."
+msgstr ""
+"Een normale synchronisatie met %s is niet mogelijk op dit moment. U kunt een"
+" langzame twee-weg synchronisatie uitvoeren of weer starten vanaf het begin."
+" U kunt ook een back-up terugzetten, maar een langzame twee-weg "
+"synchronisatie of starten vanaf het begin is nog steeds noodzakelijk voordat"
+" een normale synchronisatie mogelijk is."
-#: ../src/gtk-ui/sync-ui.c:1765
+#: ../src/gtk-ui/sync-ui.c:1795
#, c-format
-msgid "If something has gone horribly wrong, you can try a slow sync, start from scratch or restore from backup."
-msgstr "Als iets verschrikkelijk mis is gegaan, kunt u een langzame synchronisatie proberen, starten vanaf het begin of herstellen vanaf een backup."
+msgid ""
+"If something has gone horribly wrong, you can try a slow sync, start from "
+"scratch or restore from backup."
+msgstr ""
+"Als iets verschrikkelijk mis is gegaan, kunt u een langzame synchronisatie "
+"proberen, starten vanaf het begin of herstellen vanaf een backup."
#. TRANSLATORS: These are a buttons in Emergency view. Placeholder is a
#. * service/device name. Please don't use too long lines, but feel free to
#. * use several lines.
-#: ../src/gtk-ui/sync-ui.c:1774
+#: ../src/gtk-ui/sync-ui.c:1804
#, c-format
msgid ""
"Delete all your local\n"
@@ -269,7 +299,7 @@ msgstr ""
"data en vervang het\n"
"met data van %s"
-#: ../src/gtk-ui/sync-ui.c:1780
+#: ../src/gtk-ui/sync-ui.c:1810
#, c-format
msgid ""
"Delete all data on\n"
@@ -280,71 +310,74 @@ msgstr ""
"%s en vervang het\n"
"met uw lokale data"
-#: ../src/gtk-ui/sync-ui.c:2242
+#: ../src/gtk-ui/sync-ui.c:2275
msgid "Failed to get list of supported services from SyncEvolution"
msgstr "Fout bij het verkrijgen van ondersteunde services uit SyncEvolution"
-#: ../src/gtk-ui/sync-ui.c:2296
-msgid "There was a problem communicating with the sync process. Please try again later."
-msgstr "Er was een probleem met de synchronisatie communicatie. Probeer het later nog eens."
+#: ../src/gtk-ui/sync-ui.c:2329
+msgid ""
+"There was a problem communicating with the sync process. Please try again "
+"later."
+msgstr ""
+"Er was een probleem met de synchronisatie communicatie. Probeer het later "
+"nog eens."
-#: ../src/gtk-ui/sync-ui.c:2355
+#: ../src/gtk-ui/sync-ui.c:2388
msgid "Restore failed"
msgstr "Herstellen mislukt"
-#: ../src/gtk-ui/sync-ui.c:2358
-#: ../src/gtk-ui/sync-ui.c:3243
+#: ../src/gtk-ui/sync-ui.c:2391 ../src/gtk-ui/sync-ui.c:3276
msgid "Sync failed"
msgstr "Synchronisatie mislukt"
-#: ../src/gtk-ui/sync-ui.c:2364
+#: ../src/gtk-ui/sync-ui.c:2397
msgid "Restore complete"
msgstr "Herstellen afgerond"
-#: ../src/gtk-ui/sync-ui.c:2367
+#: ../src/gtk-ui/sync-ui.c:2400
msgid "Sync complete"
msgstr "Synchronisatie afgerond"
-#: ../src/gtk-ui/sync-ui.c:2459
+#: ../src/gtk-ui/sync-ui.c:2492
#, c-format
msgid "Preparing '%s'"
msgstr "'%s' voorbereiden"
-#: ../src/gtk-ui/sync-ui.c:2462
+#: ../src/gtk-ui/sync-ui.c:2495
#, c-format
msgid "Receiving '%s'"
msgstr "'%s' ontvangen"
-#: ../src/gtk-ui/sync-ui.c:2465
+#: ../src/gtk-ui/sync-ui.c:2498
#, c-format
msgid "Sending '%s'"
msgstr "'%s' versturen"
-#: ../src/gtk-ui/sync-ui.c:2586
+#: ../src/gtk-ui/sync-ui.c:2619
#, c-format
msgid "There was one remote rejection."
msgid_plural "There were %ld remote rejections."
msgstr[0] "Er waren %ld externe afwijzingen."
msgstr[1] "Er waren %ld externe verwerpingen."
-#: ../src/gtk-ui/sync-ui.c:2591
+#: ../src/gtk-ui/sync-ui.c:2624
#, c-format
msgid "There was one local rejection."
msgid_plural "There were %ld local rejections."
msgstr[0] "Er was een lokale afwijzing."
msgstr[1] "Er waren %ld lokale afwijzingen."
-#: ../src/gtk-ui/sync-ui.c:2596
+#: ../src/gtk-ui/sync-ui.c:2629
#, c-format
msgid "There were %ld local rejections and %ld remote rejections."
msgstr "Er waren %ld lokale en %ld externe afwijzingen."
-#: ../src/gtk-ui/sync-ui.c:2601
+#: ../src/gtk-ui/sync-ui.c:2634
#, c-format
msgid "Last time: No changes."
msgstr "Laatste keer: geen veranderingen."
-#: ../src/gtk-ui/sync-ui.c:2603
+#: ../src/gtk-ui/sync-ui.c:2636
#, c-format
msgid "Last time: Sent one change."
msgid_plural "Last time: Sent %ld changes."
@@ -354,21 +387,21 @@ msgstr[1] "Laatste keer: %ld veranderingen verstuurd."
#. This is about changes made to the local data. Not all of these
#. changes were requested by the remote server, so "applied"
#. is a better word than "received" (bug #5185).
-#: ../src/gtk-ui/sync-ui.c:2611
+#: ../src/gtk-ui/sync-ui.c:2644
#, c-format
msgid "Last time: Applied one change."
msgid_plural "Last time: Applied %ld changes."
msgstr[0] "Laatste keer: één verandering uitgevoerd."
msgstr[1] "Laatste keer: %ld veranderingen uitgevoerd."
-#: ../src/gtk-ui/sync-ui.c:2616
+#: ../src/gtk-ui/sync-ui.c:2649
#, c-format
msgid "Last time: Applied %ld changes and sent %ld changes."
msgstr "Laatste keer: %ld wijzigingen uitgevoerd, %ld verzonden."
#. TRANSLATORS: the placeholder is a error message (hopefully)
#. * explaining the problem
-#: ../src/gtk-ui/sync-ui.c:2823
+#: ../src/gtk-ui/sync-ui.c:2856
#, c-format
msgid ""
"There was a problem with last sync:\n"
@@ -377,124 +410,149 @@ msgstr ""
"Er was een probleem met de laatste synchonisatie:\n"
"%s"
-#: ../src/gtk-ui/sync-ui.c:2833
+#: ../src/gtk-ui/sync-ui.c:2866
#, c-format
-msgid "You've just restored a backup. The changes have not been synced with %s yet"
-msgstr "Je hebt zojuist hersteld van een backup. De veranderingen zijn nog niet met %s gesynchroniseerd"
+msgid ""
+"You've just restored a backup. The changes have not been synced with %s yet"
+msgstr ""
+"Je hebt zojuist hersteld van een backup. De veranderingen zijn nog niet met "
+"%s gesynchroniseerd"
-#: ../src/gtk-ui/sync-ui.c:3121
+#: ../src/gtk-ui/sync-ui.c:3154
msgid "Waiting for current operation to finish..."
msgstr "Wachten op het voltooien van de huidige operatie..."
#. TRANSLATORS: next strings are error messages.
-#: ../src/gtk-ui/sync-ui.c:3155
-msgid "A normal sync is not possible at this time. The server suggests a slow sync, but this might not always be what you want if both ends already have data."
+#: ../src/gtk-ui/sync-ui.c:3188
+msgid ""
+"A normal sync is not possible at this time. The server suggests a slow sync,"
+" but this might not always be what you want if both ends already have data."
msgstr "Een normale synchronisatie is niet mogelijk op dit moment."
-#: ../src/gtk-ui/sync-ui.c:3159
+#: ../src/gtk-ui/sync-ui.c:3192
msgid "The sync process died unexpectedly."
msgstr "De synchronisatie service hing onverwachts op"
-#: ../src/gtk-ui/sync-ui.c:3164
-msgid "Password request was not answered. You can save the password in the settings to prevent the request."
-msgstr "Wachtwoord was niet beantwoord. Je kunt het wachtwoord in de instellingen opslaan om dit probleem te voorkomen."
+#: ../src/gtk-ui/sync-ui.c:3197
+msgid ""
+"Password request was not answered. You can save the password in the settings"
+" to prevent the request."
+msgstr ""
+"Wachtwoord was niet beantwoord. Je kunt het wachtwoord in de instellingen "
+"opslaan om dit probleem te voorkomen."
#. TODO use the service device name here, this is a remote problem
-#: ../src/gtk-ui/sync-ui.c:3168
+#: ../src/gtk-ui/sync-ui.c:3201
msgid "There was a problem processing sync request. Trying again may help."
-msgstr "Er is een probleem met de synchronisatie. Opnieuw proberen kan wellicht helpen."
+msgstr ""
+"Er is een probleem met de synchronisatie. Opnieuw proberen kan wellicht "
+"helpen."
-#: ../src/gtk-ui/sync-ui.c:3174
-msgid "Failed to login. Could there be a problem with your username or password?"
-msgstr "Inloggen Mislukt. Is er een probleem met uw gebruikersnaam of wachtwoord?"
+#: ../src/gtk-ui/sync-ui.c:3207
+msgid ""
+"Failed to login. Could there be a problem with your username or password?"
+msgstr ""
+"Inloggen Mislukt. Is er een probleem met uw gebruikersnaam of wachtwoord?"
-#: ../src/gtk-ui/sync-ui.c:3177
+#: ../src/gtk-ui/sync-ui.c:3210
msgid "Forbidden"
msgstr "Verboden"
#. TRANSLATORS: data source means e.g. calendar or addressbook
-#: ../src/gtk-ui/sync-ui.c:3183
-msgid "A data source could not be found. Could there be a problem with the settings?"
-msgstr "De bron kon niet worden gevonden. Is er een probleem met de serverinstellingen?"
+#: ../src/gtk-ui/sync-ui.c:3216
+msgid ""
+"A data source could not be found. Could there be a problem with the "
+"settings?"
+msgstr ""
+"De bron kon niet worden gevonden. Is er een probleem met de "
+"serverinstellingen?"
-#: ../src/gtk-ui/sync-ui.c:3187
+#: ../src/gtk-ui/sync-ui.c:3220
msgid "Remote database error"
msgstr "Service database fout"
#. This can happen when EDS is borked, restart it may help...
-#: ../src/gtk-ui/sync-ui.c:3190
-msgid "There is a problem with the local database. Syncing again or rebooting may help."
-msgstr "Er is een probleem met de lokale database. Opnieuw synchroniseren of herstarten kan helpen."
+#: ../src/gtk-ui/sync-ui.c:3223
+msgid ""
+"There is a problem with the local database. Syncing again or rebooting may "
+"help."
+msgstr ""
+"Er is een probleem met de lokale database. Opnieuw synchroniseren of "
+"herstarten kan helpen."
-#: ../src/gtk-ui/sync-ui.c:3193
+#: ../src/gtk-ui/sync-ui.c:3226
msgid "No space on disk"
msgstr "Geen schijf ruimte beschikbaar"
-#: ../src/gtk-ui/sync-ui.c:3195
+#: ../src/gtk-ui/sync-ui.c:3228
msgid "Failed to process SyncML"
msgstr "Fout bij verwerken van SyncML"
-#: ../src/gtk-ui/sync-ui.c:3197
+#: ../src/gtk-ui/sync-ui.c:3230
msgid "Server authorization failed"
msgstr "Server authorisatie mislukt"
-#: ../src/gtk-ui/sync-ui.c:3199
+#: ../src/gtk-ui/sync-ui.c:3232
msgid "Failed to parse configuration file"
msgstr "Fout bij verwerken van configuratie bestand"
-#: ../src/gtk-ui/sync-ui.c:3201
+#: ../src/gtk-ui/sync-ui.c:3234
msgid "Failed to read configuration file"
msgstr "Fout bij lezen van configuratie bestand"
-#: ../src/gtk-ui/sync-ui.c:3203
+#: ../src/gtk-ui/sync-ui.c:3236
msgid "No configuration found"
msgstr "Geen configuratie gevonden"
-#: ../src/gtk-ui/sync-ui.c:3205
+#: ../src/gtk-ui/sync-ui.c:3238
msgid "No configuration file found"
msgstr "Geen configuratie bestand gevonden"
-#: ../src/gtk-ui/sync-ui.c:3207
+#: ../src/gtk-ui/sync-ui.c:3240
msgid "Server sent bad content"
msgstr "Server verstuurde foute gegevens"
-#: ../src/gtk-ui/sync-ui.c:3209
+#: ../src/gtk-ui/sync-ui.c:3242
msgid "Connection certificate has expired"
msgstr "Verbindingscertificaat is verlopen"
-#: ../src/gtk-ui/sync-ui.c:3211
+#: ../src/gtk-ui/sync-ui.c:3244
msgid "Connection certificate is invalid"
msgstr "Verbindingscertificaat is ongeldig"
-#: ../src/gtk-ui/sync-ui.c:3219
-msgid "We were unable to connect to the server. The problem could be temporary or there could be something wrong with the settings."
-msgstr "We waren niet in staat om verbinding te maken met de server. Het probleem kan tijdelijk zijn of er kan iets mis zijn met de serverinstellingen."
+#: ../src/gtk-ui/sync-ui.c:3252
+msgid ""
+"We were unable to connect to the server. The problem could be temporary or "
+"there could be something wrong with the settings."
+msgstr ""
+"We waren niet in staat om verbinding te maken met de server. Het probleem "
+"kan tijdelijk zijn of er kan iets mis zijn met de serverinstellingen."
-#: ../src/gtk-ui/sync-ui.c:3226
+#: ../src/gtk-ui/sync-ui.c:3259
msgid "The server URL is bad"
msgstr "De server URL is niet geldig"
-#: ../src/gtk-ui/sync-ui.c:3231
+#: ../src/gtk-ui/sync-ui.c:3264
msgid "The server was not found"
msgstr "Server niet gevonden"
-#: ../src/gtk-ui/sync-ui.c:3233
+#: ../src/gtk-ui/sync-ui.c:3266
#, c-format
msgid "Error %d"
msgstr "Fout %d"
#. TRANSLATORS: password request dialog contents: title, cancel button
#. * and ok button
-#: ../src/gtk-ui/sync-ui.c:3371
+#: ../src/gtk-ui/sync-ui.c:3404
msgid "Password is required for sync"
msgstr "Een wachtwoord is vereist voor synchronisatie"
-#: ../src/gtk-ui/sync-ui.c:3375
+#: ../src/gtk-ui/sync-ui.c:3408
msgid "Sync with password"
msgstr "Synchroniseer met een wachtwoord"
#. TRANSLATORS: password request dialog message, placeholder is service name
-#: ../src/gtk-ui/sync-ui.c:3385
+#: ../src/gtk-ui/sync-ui.c:3418
#, c-format
msgid "Please enter password for syncing with %s:"
msgstr "Voer een wachtwoord in voor synchroniseren met %s:"
@@ -551,14 +609,20 @@ msgstr "Nieuwe service "
#. explanation of "Restore backup" function
#: ../src/gtk-ui/ui.glade.h:18
-msgid "Backups are made before every time we Sync. Choose a backup to restore. Any changes you have made since then will be lost."
-msgstr "Backups worden gemaakt vóór elke synchronisatie. Kies een backup om te herstellen. Eventuele wijzigingen die u hebt gemaakt sindsdien zullen verloren gaan."
+msgid ""
+"Backups are made before every time we Sync. Choose a backup to restore. Any "
+"changes you have made since then will be lost."
+msgstr ""
+"Backups worden gemaakt vóór elke synchronisatie. Kies een backup om te "
+"herstellen. Eventuele wijzigingen die u hebt gemaakt sindsdien zullen "
+"verloren gaan."
#: ../src/gtk-ui/ui.glade.h:19
msgid "Calendar"
msgstr "Kalender"
-#. Button in main view, right side. Keep to below 20 chars per line, feel free to use two lines
+#. Button in main view, right side. Keep to below 20 chars per line, feel free
+#. to use two lines
#: ../src/gtk-ui/ui.glade.h:21
msgid ""
"Change or edit\n"
@@ -593,7 +657,8 @@ msgstr ""
"data en vervang het\n"
"met data van Zyb"
-#. button in main view, right side. Keep length to 20 characters or so, use two lines if needed
+#. button in main view, right side. Keep length to 20 characters or so, use
+#. two lines if needed
#: ../src/gtk-ui/ui.glade.h:32
msgid ""
"Fix a sync\n"
@@ -628,94 +693,137 @@ msgstr ""
#: ../src/gtk-ui/ui.glade.h:43
msgid "Use Bluetooth to Sync your data from one device to another."
-msgstr "Gebruik Bluetooth voor het synchroniseren van gegevens van het ene apparaat naar het andere."
+msgstr ""
+"Gebruik Bluetooth voor het synchroniseren van gegevens van het ene apparaat "
+"naar het andere."
#: ../src/gtk-ui/ui.glade.h:44
msgid "You will need to add Bluetooth devices before they can be synced."
-msgstr "U moet Bluetooth-apparaten toevoegen voordat ze kunnen worden gesynchroniseerd."
+msgstr ""
+"U moet Bluetooth-apparaten toevoegen voordat ze kunnen worden "
+"gesynchroniseerd."
#: ../src/gtk-ui/sync.desktop.in.h:2
-#: ../src/gtk-ui/sync-gtk.desktop.in.h:2
msgid "Up to date"
msgstr "Niet veroudert"
#: ../src/gtk-ui/sync-gtk.desktop.in.h:1
-msgid "Sync (GTK)"
-msgstr "Sync (GTK)"
+msgid "SyncEvolution (GTK)"
+msgstr "SyncEvolution (GTK)"
+
+#: ../src/gtk-ui/sync-gtk.desktop.in.h:2
+msgid "Synchronize PIM data"
+msgstr "PIM-data synchroniseren"
-#: ../src/gtk-ui/sync-config-widget.c:78
-msgid "ScheduleWorld enables you to keep your contacts, events, tasks, and notes in sync."
-msgstr "ScheduleWorld kan je contacten, gebeurtenissen, taken en notities synchroniseren."
+#: ../src/gtk-ui/sync-config-widget.c:88
+msgid ""
+"ScheduleWorld enables you to keep your contacts, events, tasks, and notes in"
+" sync."
+msgstr ""
+"ScheduleWorld kan je contacten, gebeurtenissen, taken en notities "
+"synchroniseren."
-#: ../src/gtk-ui/sync-config-widget.c:81
-msgid "Google Sync can back up and synchronize your contacts with your Gmail contacts."
-msgstr "Google Sync kan je adresboek en Gmail contacten synchroniseren en er backups van maken."
+#: ../src/gtk-ui/sync-config-widget.c:91
+msgid ""
+"Google Sync can back up and synchronize your contacts with your Gmail "
+"contacts."
+msgstr ""
+"Google Sync kan je adresboek en Gmail contacten synchroniseren en er backups"
+" van maken."
#. TRANSLATORS: Please include the word "demo" (or the equivalent in
#. your language): Funambol is going to be a 90 day demo service
#. in the future
-#: ../src/gtk-ui/sync-config-widget.c:87
-msgid "Back up your contacts and calendar. Sync with a single click, anytime, anywhere (DEMO)."
-msgstr "Backup je adresboek en kalender. Synchroniseer met een muisklik, elk moment, overal (DEMO)."
+#: ../src/gtk-ui/sync-config-widget.c:97
+msgid ""
+"Back up your contacts and calendar. Sync with a single click, anytime, "
+"anywhere (DEMO)."
+msgstr ""
+"Backup je adresboek en kalender. Synchroniseer met een muisklik, elk moment,"
+" overal (DEMO)."
-#: ../src/gtk-ui/sync-config-widget.c:90
-msgid "Mobical Backup and Restore service allows you to securely back up your personal mobile data for free."
-msgstr "Met Mobical Backup and Herstel service kunt u uw persoonlijke mobiele data veilig en gratis backuppen."
+#: ../src/gtk-ui/sync-config-widget.c:100
+msgid ""
+"Mobical Backup and Restore service allows you to securely back up your "
+"personal mobile data for free."
+msgstr ""
+"Met Mobical Backup and Herstel service kunt u uw persoonlijke mobiele data "
+"veilig en gratis backuppen."
-#: ../src/gtk-ui/sync-config-widget.c:93
-msgid "ZYB is a simple way for people to store and share mobile information online."
-msgstr "Met ZYB kan men eenvoudige mobiele informatie online opslaan en delen."
+#: ../src/gtk-ui/sync-config-widget.c:103
+msgid ""
+"ZYB is a simple way for people to store and share mobile information online."
+msgstr ""
+"Met ZYB kan men eenvoudige mobiele informatie online opslaan en delen."
-#: ../src/gtk-ui/sync-config-widget.c:96
-msgid "Memotoo lets you access your personal data from any computer connected to the Internet."
-msgstr "Met Memotoo kunt u toegang krijgen tot uw persoonlijke gegevens vanaf elke computer die aangesloten is op het internet."
+#: ../src/gtk-ui/sync-config-widget.c:106
+msgid ""
+"Memotoo lets you access your personal data from any computer connected to "
+"the Internet."
+msgstr ""
+"Met Memotoo kunt u toegang krijgen tot uw persoonlijke gegevens vanaf elke "
+"computer die aangesloten is op het internet."
-#: ../src/gtk-ui/sync-config-widget.c:192
+#: ../src/gtk-ui/sync-config-widget.c:195
msgid "Sorry, failed to save the configuration"
msgstr "Fout bij het opslaan van het configuratie bestand"
-#: ../src/gtk-ui/sync-config-widget.c:381
+#: ../src/gtk-ui/sync-config-widget.c:445
msgid "Service must have a name and server URL"
msgstr "Service moet een naam en server URL hebben"
-#: ../src/gtk-ui/sync-config-widget.c:422
+#. TRANSLATORS: error dialog when creating a new sync configuration
+#: ../src/gtk-ui/sync-config-widget.c:451
+msgid "A username is required for this service"
+msgstr "Voor deze service is een gebruikersnaam vereist"
+
+#: ../src/gtk-ui/sync-config-widget.c:493
#, c-format
-msgid "Do you want to reset the settings for %s? This will not remove any synced information on either end."
-msgstr "Wilt u de instellingen voor %s resetten? Data dat al gesynchroniseerde is zal niet worden verwijderd."
+msgid ""
+"Do you want to reset the settings for %s? This will not remove any synced "
+"information on either end."
+msgstr ""
+"Wilt u de instellingen voor %s resetten? Data dat al gesynchroniseerde is "
+"zal niet worden verwijderd."
#. TRANSLATORS: buttons in reset-service warning dialog
-#: ../src/gtk-ui/sync-config-widget.c:426
+#: ../src/gtk-ui/sync-config-widget.c:497
msgid "Yes, reset"
msgstr "Ja, reset"
-#: ../src/gtk-ui/sync-config-widget.c:427
-#: ../src/gtk-ui/sync-config-widget.c:438
+#: ../src/gtk-ui/sync-config-widget.c:498
+#: ../src/gtk-ui/sync-config-widget.c:509
msgid "No, keep settings"
msgstr "Nee, behoud de instellingen"
-#: ../src/gtk-ui/sync-config-widget.c:432
+#: ../src/gtk-ui/sync-config-widget.c:503
#, c-format
-msgid "Do you want to delete the settings for %s? This will not remove any synced information on either end but it will remove these settings."
-msgstr "Wilt u de instellingen voor %s verwijderen? Data dat al gesynchroniseerde is zal niet worden verwijderd, alleen deze service configuratie zal worden verwijdert."
+msgid ""
+"Do you want to delete the settings for %s? This will not remove any synced "
+"information on either end but it will remove these settings."
+msgstr ""
+"Wilt u de instellingen voor %s verwijderen? Data dat al gesynchroniseerde is"
+" zal niet worden verwijderd, alleen deze service configuratie zal worden "
+"verwijdert."
#. TRANSLATORS: buttons in delete-service warning dialog
-#: ../src/gtk-ui/sync-config-widget.c:437
+#: ../src/gtk-ui/sync-config-widget.c:508
msgid "Yes, delete"
msgstr "Ja, verwijderen"
-#: ../src/gtk-ui/sync-config-widget.c:467
+#: ../src/gtk-ui/sync-config-widget.c:539
msgid "Reset settings"
msgstr "Instellingen wissen"
-#: ../src/gtk-ui/sync-config-widget.c:470
+#: ../src/gtk-ui/sync-config-widget.c:542
msgid "Delete settings"
msgstr "Verwijder instellingen"
-#: ../src/gtk-ui/sync-config-widget.c:480
+#: ../src/gtk-ui/sync-config-widget.c:552
msgid "Save and use"
msgstr "Opslaan en gebruik"
-#: ../src/gtk-ui/sync-config-widget.c:483
+#: ../src/gtk-ui/sync-config-widget.c:555
msgid ""
"Save and replace\n"
"current service"
@@ -723,101 +831,119 @@ msgstr ""
"Opslaan en vervang\n"
"de huidige service"
-#: ../src/gtk-ui/sync-config-widget.c:493
+#: ../src/gtk-ui/sync-config-widget.c:563
msgid "Stop using device"
msgstr "Stop apparaat gebruik"
-#: ../src/gtk-ui/sync-config-widget.c:496
+#: ../src/gtk-ui/sync-config-widget.c:566
msgid "Stop using service"
msgstr "Stop service gebruik"
#. TRANSLATORS: label for an entry in service configuration form.
#. * Placeholder is a source name.
#. * Example: "Appointments URI"
-#: ../src/gtk-ui/sync-config-widget.c:679
+#: ../src/gtk-ui/sync-config-widget.c:749
#, c-format
msgid "%s URI"
msgstr "%s URI"
#. TRANSLATORS: toggles in service configuration form, placeholder is service
#. * or device name
-#: ../src/gtk-ui/sync-config-widget.c:854
+#: ../src/gtk-ui/sync-config-widget.c:936
#, c-format
msgid "Send changes to %s"
msgstr "Stuur wijzigingen naar '%s'"
-#: ../src/gtk-ui/sync-config-widget.c:859
+#: ../src/gtk-ui/sync-config-widget.c:941
#, c-format
msgid "Receive changes from %s"
msgstr "Ontvang veranderingen van %s"
-#: ../src/gtk-ui/sync-config-widget.c:875
+#: ../src/gtk-ui/sync-config-widget.c:957
msgid "<b>Sync</b>"
msgstr "<b>Synchronisatie</b>"
#. TRANSLATORS: label of a entry in service configuration
-#: ../src/gtk-ui/sync-config-widget.c:891
+#: ../src/gtk-ui/sync-config-widget.c:973
msgid "Server address"
msgstr "Server adres"
#. TRANSLATORS: explanation before a device template combobox.
#. * Placeholder is a device name like 'Nokia N85' or 'Syncevolution
#. * Client'
-#: ../src/gtk-ui/sync-config-widget.c:967
+#: ../src/gtk-ui/sync-config-widget.c:1049
#, c-format
-msgid "This device looks like it might be a '%s'. If this is not correct, please take a look at the list of supported devices and pick yours if it is listed"
-msgstr "Dit apparaat ziet eruit als een '%s'. Als dit niet correct is, kijk dan in de lijst met ondersteunde apparaten en kies de juiste."
+msgid ""
+"This device looks like it might be a '%s'. If this is not correct, please "
+"take a look at the list of supported devices and pick yours if it is listed"
+msgstr ""
+"Dit apparaat ziet eruit als een '%s'. Als dit niet correct is, kijk dan in "
+"de lijst met ondersteunde apparaten en kies de juiste."
-#: ../src/gtk-ui/sync-config-widget.c:973
-msgid "We don't know what this device is exactly. Please take a look at the list of supported devices and pick yours if it is listed"
-msgstr "We kunnen niet zien wat voor apparaat dit is. Kijk naar de lijst van ondersteunde apparaten en kies de juiste."
+#: ../src/gtk-ui/sync-config-widget.c:1055
+#: ../src/gtk-ui/sync-config-widget.c:1915
+msgid ""
+"We don't know what this device is exactly. Please take a look at the list of"
+" supported devices and pick yours if it is listed"
+msgstr ""
+"We kunnen niet zien wat voor apparaat dit is. Kijk naar de lijst van "
+"ondersteunde apparaten en kies de juiste."
-#: ../src/gtk-ui/sync-config-widget.c:1126
+#: ../src/gtk-ui/sync-config-widget.c:1207
#, c-format
msgid "%s - Bluetooth device"
msgstr "%s - Bluetooth-apparaat"
#. TRANSLATORS: service title for services that are not based on a
#. * template in service list, the placeholder is the name of the service
-#: ../src/gtk-ui/sync-config-widget.c:1132
+#: ../src/gtk-ui/sync-config-widget.c:1213
#, c-format
msgid "%s - manually setup"
msgstr "%s - handmatig instellen"
#. TRANSLATORS: link button in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1807
+#: ../src/gtk-ui/sync-config-widget.c:1886
msgid "Launch website"
msgstr "Start website"
#. TRANSLATORS: button in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1816
+#: ../src/gtk-ui/sync-config-widget.c:1895
msgid "Set up now"
msgstr "Nu instellen"
+#: ../src/gtk-ui/sync-config-widget.c:1953
+msgid "Use these settings"
+msgstr "Deze instellingen gebruiken"
+
#. TRANSLATORS: labels of entries in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1912
+#: ../src/gtk-ui/sync-config-widget.c:1991
msgid "Username"
msgstr "gebruikersnaam"
-#: ../src/gtk-ui/sync-config-widget.c:1927
+#: ../src/gtk-ui/sync-config-widget.c:2006
msgid "Password"
msgstr "Wachtwoord"
#. TRANSLATORS: warning in service configuration form for people
#. who have modified the configuration via other means.
-#: ../src/gtk-ui/sync-config-widget.c:1950
-msgid "Current configuration is more complex than what can be shown here. Changes to sync mode or synced data types will overwrite that configuration."
-msgstr "De huidige configuratie is complexer dan wat hier kan worden weergegeven. Wijzigingen aan de synchronisatie modus of aan de gesynchroniseerd data types overschrijft de configuratie."
+#: ../src/gtk-ui/sync-config-widget.c:2029
+msgid ""
+"Current configuration is more complex than what can be shown here. Changes "
+"to sync mode or synced data types will overwrite that configuration."
+msgstr ""
+"De huidige configuratie is complexer dan wat hier kan worden weergegeven. "
+"Wijzigingen aan de synchronisatie modus of aan de gesynchroniseerd data "
+"types overschrijft de configuratie."
#. TRANSLATORS: this is the epander label for server settings
#. in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1969
+#: ../src/gtk-ui/sync-config-widget.c:2048
msgid "Hide server settings"
msgstr "Server instellingen verbergen"
#. TRANSLATORS: this is the epander label for server settings
#. in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1989
+#: ../src/gtk-ui/sync-config-widget.c:2068
msgid "Show server settings"
msgstr "Server instellingen weergeven"
@@ -825,130 +951,48 @@ msgstr "Server instellingen weergeven"
msgid "Sync in the Sync application"
msgstr "Synchroniseer in de synchronisatie toepassing"
-#: ../src/syncevo-dbus-server.cpp:5664
+#: ../src/syncevo-dbus-server.cpp:6653
#, c-format
msgid "%s is syncing"
msgstr "%s synchronisatie bezig"
-#: ../src/syncevo-dbus-server.cpp:5665
+#: ../src/syncevo-dbus-server.cpp:6654
#, c-format
msgid "We have just started to sync your computer with the %s sync service."
msgstr "We hebben de synchronisatie met service %s en je computer gestart."
#. if sync is successfully started and done
-#: ../src/syncevo-dbus-server.cpp:5679
+#: ../src/syncevo-dbus-server.cpp:6670
#, c-format
msgid "%s sync complete"
msgstr "%s synchronisatie afgerond"
-#: ../src/syncevo-dbus-server.cpp:5680
+#: ../src/syncevo-dbus-server.cpp:6671
#, c-format
msgid "We have just finished syncing your computer with the %s sync service."
msgstr "Synchronisatie met service %s en je computer is voltooid."
-#. if sync is successfully started and has errors, or not started successful with a fatal problem
-#: ../src/syncevo-dbus-server.cpp:5685
+#. if sync is successfully started and has errors, or not started successful
+#. with a fatal problem
+#: ../src/syncevo-dbus-server.cpp:6676
msgid "Sync problem."
msgstr "Synchronisatie probleem."
-#: ../src/syncevo-dbus-server.cpp:5686
+#: ../src/syncevo-dbus-server.cpp:6677
msgid "Sorry, there's a problem with your sync that you need to attend to."
-msgstr "Sorry, er is een probleem met de synchronisatie dat naar ingekeken moet worden."
+msgstr ""
+"Sorry, er is een probleem met de synchronisatie dat naar ingekeken moet "
+"worden."
-#: ../src/syncevo-dbus-server.cpp:5759
+#: ../src/syncevo-dbus-server.cpp:6758
msgid "View"
msgstr "Bekijk"
#. Use "default" as ID because that is what mutter-moblin
#. recognizes: it then skips the action instead of adding it
#. in addition to its own "Dismiss" button (always added).
-#: ../src/syncevo-dbus-server.cpp:5763
+#: ../src/syncevo-dbus-server.cpp:6762
msgid "Dismiss"
msgstr "Gezien"
-#~ msgid "Database error"
-#~ msgstr "Database fout"
-#~ msgid ""
-#~ "Do you want to replace %s with %s? This will not remove any synced "
-#~ "information on either end but you will no longer be able to sync with %s."
-#~ msgstr ""
-#~ "Wilt u %s met %s vervangen? Data dat al gesynchroniseerde is zal niet "
-#~ "worden verwijdert, maar u zal niet langer in staat zijn om met %s te "
-#~ "synchroniseren."
-#~ msgid "Yes, use %s"
-#~ msgstr "Ja, gebruik %s"
-#~ msgid "No, use %s"
-#~ msgstr "Nee, gebruik %s"
-#~ msgid "Reset service"
-#~ msgstr "Reset service"
-#~ msgid "Addressbook"
-#~ msgstr "Adresboek"
-#~ msgid "Todo"
-#~ msgstr "Te doen"
-#~ msgid "Memo"
-#~ msgstr "Memo"
-#~ msgid "Failed to save current service in GConf configuration system"
-#~ msgstr "Fout bij wegschrijven huidige service in GConf configuratie systeem"
-#~ msgid "Failed to save service configuration to SyncEvolution"
-#~ msgstr "Fout bij wegschrijven service configuratie naar SyncEvolution"
-#~ msgid "Failed to get service configuration from SyncEvolution"
-#~ msgstr "Fout bij inlezen service configuratie uit SyncEvolution"
-#~ msgid "Failed to remove service configuration from SyncEvolution"
-#~ msgstr "Fout bij verwijderen service configuratie uit SyncEvolution"
-#~ msgid "Failed to cancel: sync was no longer in progress"
-#~ msgstr "Afbreken mislukt: syncrhonisatie was niet langer bezig"
-#~ msgid "Failed to cancel sync"
-#~ msgstr "Afbreken synchronisatie mislukt"
-#~ msgid "Canceling sync"
-#~ msgstr "Afbreken synchronisatie"
-#~ msgid "No sources are enabled, not syncing"
-#~ msgstr "Geen bronnen zijn actief, synchronisatie niet gestart"
-#~ msgid "A sync is already in progress"
-#~ msgstr "Synchronisatie is al bezig"
-#~ msgid "Failed to start sync"
-#~ msgstr "Fout bij opstarten synchronisatie"
-#~ msgid "%s (not supported by this service)"
-#~ msgstr "%s (niet ondersteund door deze service)"
-#~ msgid "Failed to get server configuration from SyncEvolution"
-#~ msgstr "Fout bij inlezen server configuratie uit SyncEvolution"
-#~ msgid "Server URL"
-#~ msgstr "Server URL"
-#~ msgid "Failed to get list of manually setup services from SyncEvolution"
-#~ msgstr ""
-#~ "Fout bij verkrijgen van handmatige opgezette services uit SyncEvolution"
-#~ msgid "Service configuration not found"
-#~ msgstr "Service configuratie niet gevonden"
-#~ msgid "Not authorized"
-#~ msgstr "Niet toegestaan"
-#~ msgid "Not found"
-#~ msgstr "Niet gevonden"
-#~ msgid "Transport failure (no connection?)"
-#~ msgstr "Transport fout (geen verbinding?)"
-#~ msgid "Connection timed out"
-#~ msgstr "Verbinding verlopen"
-#~ msgid "Sync canceled"
-#~ msgstr "Synchronisatie afgebroken"
-#~ msgid "Ending sync"
-#~ msgstr "Beindigen synchronisatie"
-#~ msgid "<b>No sync service in use</b>"
-#~ msgstr "<b>Geen synchronisatie service in gebruik</b>"
-#~ msgid "<big>Manual setup</big>"
-#~ msgstr "<big>Handleiding opzetten</big>"
-#~ msgid "Merge local and remote data (recommended)"
-#~ msgstr "Voeg lokale en externe data samen (aanbevolen)"
-#~ msgid "Reset original server settings"
-#~ msgstr "Herstel originele server installingen"
-#~ msgid "Service name"
-#~ msgstr "Service naam"
-#~ msgid ""
-#~ "Sorry, you need an internet\n"
-#~ "connection to sync."
-#~ msgstr ""
-#~ "Sorry, je hebt een internet\n"
-#~ "verbinding nodig on te synchroniseren."
-#~ msgid ""
-#~ "Synchronization is not available (D-Bus service does not answer), sorry."
-#~ msgstr ""
-#~ "Synchronisatie is niet beschikbaar (D-Bus service niet beschikbaar), "
-#~ "sorry."
diff --git a/po/pl.po b/po/pl.po
index 485afc56..fc5fd109 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,24 +1,24 @@
-# pl locale
-# Copyright (C) 2009 Intel Corporation
-# This file is distributed under the same license as the syncevolution package.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
# Andrzej Zaborowski <andrew.zaborowski@intel.com>, 2009.
-#
+# Romuald Pawlikowski <r.pawlikowski@gmail.com>, 2011.
+# <tomas.galicia@intel.com>, 2011.
msgid ""
msgstr ""
-"Project-Id-Version: Moblin\n"
-"Report-Msgid-Bugs-To: http://moblin.org/projects/syncevolution\n"
-"POT-Creation-Date: 2010-04-28 09:27+0000\n"
-"PO-Revision-Date: \n"
-"Last-Translator: Romuald Pawlikowski <r.pawlikowski@gmail.com>\n"
-"Language-Team: Moblin\n"
+"Project-Id-Version: syncevolution\n"
+"Report-Msgid-Bugs-To: https://bugs.meego.com/\n"
+"POT-Creation-Date: 2011-12-05 10:21-0800\n"
+"PO-Revision-Date: 2011-12-06 18:11+0000\n"
+"Last-Translator: GLS_Translator_PLK2 <r.pawlikowski@gmail.com>\n"
+"Language-Team: Polish (http://www.transifex.net/projects/p/meego/team/pl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2);\n"
-"X-Poedit-Language: Polish\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-Poedit-Bookmarks: -1,37,-1,-1,-1,-1,-1,-1,-1,-1\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
#. TRANSLATORS: this is the application name that may be used by e.g.
#. the windowmanager
@@ -70,7 +70,7 @@ msgstr "Tak, wykonaj wolną synchronizację"
msgid "No, cancel sync"
msgstr "Nie, anuluj synchronizację"
-#. TRANSLATORS: confirmation dialog for refresh-from-server. Placeholder
+#. TRANSLATORS: confirmation dialog for "refresh from peer". Placeholder
#. * is service/device name
#: ../src/gtk-ui/sync-ui.c:424
#, c-format
@@ -78,21 +78,21 @@ msgid ""
"Do you want to delete all local data and replace it with data from %s? This "
"is not usually advised."
msgstr ""
-"Czy chcesz usunąć wszystkie lokalne dane i zastąpić je danymi z %s? Nie jest "
-"to zwykle zalecane."
+"Czy chcesz usunąć wszystkie lokalne dane i zastąpić je danymi z %s? Nie jest"
+" to zwykle zalecane."
-#: ../src/gtk-ui/sync-ui.c:429 ../src/gtk-ui/sync-ui.c:460
+#: ../src/gtk-ui/sync-ui.c:429 ../src/gtk-ui/sync-ui.c:462
msgid "Yes, delete and replace"
msgstr "Tak, usuń i zastąp"
-#: ../src/gtk-ui/sync-ui.c:429 ../src/gtk-ui/sync-ui.c:460
-#: ../src/gtk-ui/sync-ui.c:1580
+#: ../src/gtk-ui/sync-ui.c:429 ../src/gtk-ui/sync-ui.c:462
+#: ../src/gtk-ui/sync-ui.c:1610
msgid "No"
msgstr "Nie"
-#. TRANSLATORS: confirmation dialog for refresh-from-client. Placeholder
+#. TRANSLATORS: confirmation dialog for "refresh from local side". Placeholder
#. * is service/device name
-#: ../src/gtk-ui/sync-ui.c:455
+#: ../src/gtk-ui/sync-ui.c:457
#, c-format
msgid ""
"Do you want to delete all data in %s and replace it with your local data? "
@@ -101,56 +101,47 @@ msgstr ""
"Czy chcesz usunąć wszystkie dane w %s i zastąpić je danymi lokalnymi? Nie "
"jest to zwykle zalecane."
-# We are trying to cancel the synchronization
-#: ../src/gtk-ui/sync-ui.c:487
+#: ../src/gtk-ui/sync-ui.c:491
msgid "Trying to cancel sync"
msgstr "Trwa próba anulowania synchronizacji"
-# There is no space left
-#: ../src/gtk-ui/sync-ui.c:529
+#: ../src/gtk-ui/sync-ui.c:533
msgid "No service or device selected"
msgstr "Nie wybrano usługi lub urządzenia"
-# Last synchronization happened a few seconds ago
#. TRANSLATORS: This is the title on main view. Placeholder is
#. * the service name. Example: "Google - synced just now"
-#: ../src/gtk-ui/sync-ui.c:537
+#: ../src/gtk-ui/sync-ui.c:541
#, c-format
msgid "%s - synced just now"
msgstr "%s - właśnie zsynchronizowano"
-# Last synchronization happened one minute ago
-#: ../src/gtk-ui/sync-ui.c:541
+#: ../src/gtk-ui/sync-ui.c:545
#, c-format
msgid "%s - synced a minute ago"
msgstr "%s - zsynchronizowano minutę temu"
-# Last synchronization happened %ld minutes ago
-#: ../src/gtk-ui/sync-ui.c:545
+#: ../src/gtk-ui/sync-ui.c:549
#, c-format
msgid "%s - synced %ld minutes ago"
msgstr "%s - zsynchronizowano %ld minut temu"
-# Last synchronization happened one hour ago
-#: ../src/gtk-ui/sync-ui.c:550
+#: ../src/gtk-ui/sync-ui.c:554
#, c-format
msgid "%s - synced an hour ago"
msgstr "%s - zsynchronizowano godzinę temu"
-# Last synchronization happened %ld hours ago
-#: ../src/gtk-ui/sync-ui.c:554
+#: ../src/gtk-ui/sync-ui.c:558
#, c-format
msgid "%s - synced %ld hours ago"
msgstr "%s - zsynchronizowano %ld godzin temu"
-# Last synchronization happened one day ago
-#: ../src/gtk-ui/sync-ui.c:559
+#: ../src/gtk-ui/sync-ui.c:563
#, c-format
msgid "%s - synced a day ago"
msgstr "%s - zsynchronizowano wczoraj"
-# Last synchronization happened %ld days ago
-#: ../src/gtk-ui/sync-ui.c:563
+#: ../src/gtk-ui/sync-ui.c:567
#, c-format
msgid "%s - synced %ld days ago"
msgstr "%s - zsynchronizowano %ld dni temu"
@@ -158,37 +149,34 @@ msgstr "%s - zsynchronizowano %ld dni temu"
#. TRANSLATORS: Action button in info bar in main view. Shown with e.g.
#. * "You've just restored a backup. The changes have not been "
#. * "synced with %s yet"
-#: ../src/gtk-ui/sync-ui.c:612 ../src/gtk-ui/sync-ui.c:726
+#: ../src/gtk-ui/sync-ui.c:616 ../src/gtk-ui/sync-ui.c:701
msgid "Sync now"
msgstr "Synchronizuj teraz"
#. TRANSLATORS: Action button in info bar in main view. Shown with e.g.
#. * "A normal sync is not possible at this time..." message.
#. * "Other options" will open Emergency view
-#: ../src/gtk-ui/sync-ui.c:618 ../src/gtk-ui/ui.glade.h:37
+#: ../src/gtk-ui/sync-ui.c:622 ../src/gtk-ui/ui.glade.h:37
msgid "Slow sync"
msgstr "Wolna synchronizacja"
-#: ../src/gtk-ui/sync-ui.c:619
+#: ../src/gtk-ui/sync-ui.c:623
msgid "Other options..."
msgstr "Inne opcje..."
-# Configuration of the synchronization service
#. TRANSLATORS: Action button in info bar in main view. Shown e.g.
#. * when no service is selected. Will open configuration view
-#: ../src/gtk-ui/sync-ui.c:624
+#: ../src/gtk-ui/sync-ui.c:628
msgid "Select sync service"
msgstr "Wybierz usługę synchronizacji"
-# Edit the configuration of the service
#. TRANSLATORS: Action button in info bar in main view. Shown e.g.
#. * login to service fails. Will open configuration view for this service
-#: ../src/gtk-ui/sync-ui.c:629
+#: ../src/gtk-ui/sync-ui.c:633
msgid "Edit service settings"
msgstr "Edycja ustawień usługi"
-# There's no sync service yet between the netbook and a web service.
-#: ../src/gtk-ui/sync-ui.c:700
+#: ../src/gtk-ui/sync-ui.c:709
msgid ""
"You haven't selected a sync service or device yet. Sync services let you "
"synchronize your data between your netbook and a web service. You can also "
@@ -199,33 +187,32 @@ msgstr ""
"usługą internetową. Można również synchronizować bezpośrednio z niektórymi "
"urządzeniami."
-#: ../src/gtk-ui/sync-ui.c:722
+#: ../src/gtk-ui/sync-ui.c:729
msgid "Sync again"
msgstr "Synchronizuj jeszcze raz"
-#: ../src/gtk-ui/sync-ui.c:743
+#: ../src/gtk-ui/sync-ui.c:748
msgid "Restoring"
msgstr "Przywracanie"
-# Synchronization is taking place
-#: ../src/gtk-ui/sync-ui.c:745
+#: ../src/gtk-ui/sync-ui.c:750
msgid "Syncing"
msgstr "Synchronizowanie"
#. TRANSLATORS: This is for the button in main view, right side.
#. Keep line length below ~20 characters, use two lines if needed
-#: ../src/gtk-ui/sync-ui.c:757 ../src/gtk-ui/sync-ui.c:3373
+#: ../src/gtk-ui/sync-ui.c:762 ../src/gtk-ui/sync-ui.c:3407
msgid "Cancel sync"
msgstr "Anuluj synchronizację"
-#: ../src/gtk-ui/sync-ui.c:922
+#: ../src/gtk-ui/sync-ui.c:927
msgid "Back to sync"
msgstr "Powrót do synchronizacji"
#. TRANSLATORS: label for checkbutton/toggle in main view.
#. * Please stick to similar length strings or break the line with
#. * "\n" if absolutely needed
-#: ../src/gtk-ui/sync-ui.c:1223
+#: ../src/gtk-ui/sync-ui.c:1229
msgid "Automatic sync"
msgstr ""
"Automatyczna\n"
@@ -235,19 +222,19 @@ msgstr ""
#. * currently selected data sources. First placeholder is service/device
#. * name, second a comma separeted list of sources.
#. * E.g. "Affected data: Google Contacts, Appointments"
-#: ../src/gtk-ui/sync-ui.c:1494
+#: ../src/gtk-ui/sync-ui.c:1524
#, c-format
msgid "Affected data: %s %s"
msgstr "Dane, na które ma to wpływ: %s %s"
-#: ../src/gtk-ui/sync-ui.c:1499
+#: ../src/gtk-ui/sync-ui.c:1529
#, c-format
msgid "Affected data: none"
msgstr "Dane, na które ma to wpływ: brak"
#. TRANSLATORS: confirmation for restoring a backup. placeholder is the
#. * backup time string defined below
-#: ../src/gtk-ui/sync-ui.c:1577
+#: ../src/gtk-ui/sync-ui.c:1607
#, c-format
msgid ""
"Do you want to restore the backup from %s? All changes you have made since "
@@ -256,31 +243,31 @@ msgstr ""
"Czy chcesz przywrócić kopię zapasową z %s? Wszystkie wprowadzone od tamtego "
"czasu zmiany zostaną utracone."
-#: ../src/gtk-ui/sync-ui.c:1580
+#: ../src/gtk-ui/sync-ui.c:1610
msgid "Yes, restore"
msgstr "Tak, przywróć"
#. TRANSLATORS: date/time for strftime(), used in emergency view backup
#. * label. Any time format that shows date and time is good.
-#: ../src/gtk-ui/sync-ui.c:1612
+#: ../src/gtk-ui/sync-ui.c:1642
#, c-format
msgid "%x %X"
msgstr "%x %X"
#. TRANSLATORS: label for a backup in emergency view. Placeholder is
#. * service or device name
-#: ../src/gtk-ui/sync-ui.c:1631
+#: ../src/gtk-ui/sync-ui.c:1661
#, c-format
msgid "Backed up before syncing with %s"
msgstr "Wykonano kopie zapasową przed synchronizacją z %s"
-#: ../src/gtk-ui/sync-ui.c:1648
+#: ../src/gtk-ui/sync-ui.c:1678
msgid "Restore"
msgstr "Przywróć"
#. TRANSLATORS: this is an explanation in Emergency view.
#. * Placeholder is a service/device name
-#: ../src/gtk-ui/sync-ui.c:1755
+#: ../src/gtk-ui/sync-ui.c:1785
#, c-format
msgid ""
"A normal sync with %s is not possible at this time. You can do a slow two-"
@@ -291,10 +278,10 @@ msgstr ""
"Normalna synchronizacja z %s nie jest teraz możliwa. Można wykonać wolną, "
"dwukierunkową synchronizację, lub zacząć od początku. Można również "
"przywrócić kopię zapasową, ale wykonanie wolnej synchronizacji lub "
-"rozpoczęcie od początku wciąż będzie wymagane, zanim normalna synchronizacja "
-"będzie możliwa."
+"rozpoczęcie od początku wciąż będzie wymagane, zanim normalna synchronizacja"
+" będzie możliwa."
-#: ../src/gtk-ui/sync-ui.c:1765
+#: ../src/gtk-ui/sync-ui.c:1795
#, c-format
msgid ""
"If something has gone horribly wrong, you can try a slow sync, start from "
@@ -306,7 +293,7 @@ msgstr ""
#. TRANSLATORS: These are a buttons in Emergency view. Placeholder is a
#. * service/device name. Please don't use too long lines, but feel free to
#. * use several lines.
-#: ../src/gtk-ui/sync-ui.c:1774
+#: ../src/gtk-ui/sync-ui.c:1804
#, c-format
msgid ""
"Delete all your local\n"
@@ -317,7 +304,7 @@ msgstr ""
"dane i zastąp je\n"
"zdalnymi z %s"
-#: ../src/gtk-ui/sync-ui.c:1780
+#: ../src/gtk-ui/sync-ui.c:1810
#, c-format
msgid ""
"Delete all data on\n"
@@ -328,11 +315,11 @@ msgstr ""
"na %s i zastąp je\n"
"lokalnymi"
-#: ../src/gtk-ui/sync-ui.c:2241
+#: ../src/gtk-ui/sync-ui.c:2275
msgid "Failed to get list of supported services from SyncEvolution"
msgstr "Błąd przy pobieraniu listy kompatybilnych usług z SyncEvolution"
-#: ../src/gtk-ui/sync-ui.c:2295
+#: ../src/gtk-ui/sync-ui.c:2329
msgid ""
"There was a problem communicating with the sync process. Please try again "
"later."
@@ -340,38 +327,38 @@ msgstr ""
"Wystąpił problem podczas komunikacji z procesem synchronizacji. Spróbuj "
"ponownie później."
-#: ../src/gtk-ui/sync-ui.c:2354
+#: ../src/gtk-ui/sync-ui.c:2388
msgid "Restore failed"
msgstr "Przywracanie nie powiodło się"
-#: ../src/gtk-ui/sync-ui.c:2357 ../src/gtk-ui/sync-ui.c:3242
+#: ../src/gtk-ui/sync-ui.c:2391 ../src/gtk-ui/sync-ui.c:3276
msgid "Sync failed"
msgstr "Synchronizacja nie powiodła się"
-#: ../src/gtk-ui/sync-ui.c:2363
+#: ../src/gtk-ui/sync-ui.c:2397
msgid "Restore complete"
msgstr "Przywracanie zakończone"
-#: ../src/gtk-ui/sync-ui.c:2366
+#: ../src/gtk-ui/sync-ui.c:2400
msgid "Sync complete"
msgstr "Synchronizacja zakończona"
-#: ../src/gtk-ui/sync-ui.c:2458
+#: ../src/gtk-ui/sync-ui.c:2492
#, c-format
msgid "Preparing '%s'"
msgstr "Przygotowywanie '%s'"
-#: ../src/gtk-ui/sync-ui.c:2461
+#: ../src/gtk-ui/sync-ui.c:2495
#, c-format
msgid "Receiving '%s'"
msgstr "Odbieranie '%s'"
-#: ../src/gtk-ui/sync-ui.c:2464
+#: ../src/gtk-ui/sync-ui.c:2498
#, c-format
msgid "Sending '%s'"
msgstr "Wysyłanie '%s'"
-#: ../src/gtk-ui/sync-ui.c:2585
+#: ../src/gtk-ui/sync-ui.c:2619
#, c-format
msgid "There was one remote rejection."
msgid_plural "There were %ld remote rejections."
@@ -379,7 +366,7 @@ msgstr[0] "Druga strona odrzuciła jeden z elementów."
msgstr[1] "Druga strona odrzuciła %ld elementy."
msgstr[2] "Druga strona odrzuciła %ld elementów."
-#: ../src/gtk-ui/sync-ui.c:2590
+#: ../src/gtk-ui/sync-ui.c:2624
#, c-format
msgid "There was one local rejection."
msgid_plural "There were %ld local rejections."
@@ -387,19 +374,19 @@ msgstr[0] "Odrzucono lokalnie jeden element."
msgstr[1] "Odrzucono lokalnie %ld elementy."
msgstr[2] "Odrzucono lokalnie %ld elementów."
-#: ../src/gtk-ui/sync-ui.c:2595
+#: ../src/gtk-ui/sync-ui.c:2629
#, c-format
msgid "There were %ld local rejections and %ld remote rejections."
msgstr ""
"Odrzucono lokalnie %ld elementów podczas gdy druga strona odrzuciła %ld "
"elementów."
-#: ../src/gtk-ui/sync-ui.c:2600
+#: ../src/gtk-ui/sync-ui.c:2634
#, c-format
msgid "Last time: No changes."
msgstr "Ostatnio: brak zmian."
-#: ../src/gtk-ui/sync-ui.c:2602
+#: ../src/gtk-ui/sync-ui.c:2636
#, c-format
msgid "Last time: Sent one change."
msgid_plural "Last time: Sent %ld changes."
@@ -410,7 +397,7 @@ msgstr[2] "Ostatnio: wysłano %ld zmian."
#. This is about changes made to the local data. Not all of these
#. changes were requested by the remote server, so "applied"
#. is a better word than "received" (bug #5185).
-#: ../src/gtk-ui/sync-ui.c:2610
+#: ../src/gtk-ui/sync-ui.c:2644
#, c-format
msgid "Last time: Applied one change."
msgid_plural "Last time: Applied %ld changes."
@@ -418,14 +405,14 @@ msgstr[0] "Ostatnio: zastosowano jedną zmianę."
msgstr[1] "Ostatnio: zastosowano %ld zmiany."
msgstr[2] "Ostatnio: zastosowano %ld zmian."
-#: ../src/gtk-ui/sync-ui.c:2615
+#: ../src/gtk-ui/sync-ui.c:2649
#, c-format
msgid "Last time: Applied %ld changes and sent %ld changes."
msgstr "Ostatnio: zastosowano %ld zmian i wysłano %ld zmian."
#. TRANSLATORS: the placeholder is a error message (hopefully)
#. * explaining the problem
-#: ../src/gtk-ui/sync-ui.c:2822
+#: ../src/gtk-ui/sync-ui.c:2856
#, c-format
msgid ""
"There was a problem with last sync:\n"
@@ -434,7 +421,7 @@ msgstr ""
"Wystąpił problem z ostatnią synchronizacją:\n"
"%s"
-#: ../src/gtk-ui/sync-ui.c:2832
+#: ../src/gtk-ui/sync-ui.c:2866
#, c-format
msgid ""
"You've just restored a backup. The changes have not been synced with %s yet"
@@ -442,64 +429,64 @@ msgstr ""
"Właśnie przywrócono kopię zapasową. Zmiany nie zostały jeszcze "
"zsynchronizowane z %s"
-#: ../src/gtk-ui/sync-ui.c:3120
+#: ../src/gtk-ui/sync-ui.c:3154
msgid "Waiting for current operation to finish..."
msgstr "Oczekiwanie na zakończenie bieżącej operacji..."
#. TRANSLATORS: next strings are error messages.
-#: ../src/gtk-ui/sync-ui.c:3154
+#: ../src/gtk-ui/sync-ui.c:3188
msgid ""
-"A normal sync is not possible at this time. The server suggests a slow sync, "
-"but this might not always be what you want if both ends already have data."
+"A normal sync is not possible at this time. The server suggests a slow sync,"
+" but this might not always be what you want if both ends already have data."
msgstr ""
"Wykonanie normalnej synchronizacji nie jest teraz możliwe. Serwer sugeruje "
"wykonanie wolnej synchronizacji, ale może to nie być pożądana czynność w "
"przypadku, gdy po obu stronach znajdują się już dane."
-#: ../src/gtk-ui/sync-ui.c:3158
+#: ../src/gtk-ui/sync-ui.c:3192
msgid "The sync process died unexpectedly."
msgstr "Proces synchronizacji został nieoczekiwanie zakończony."
-#: ../src/gtk-ui/sync-ui.c:3163
+#: ../src/gtk-ui/sync-ui.c:3197
msgid ""
-"Password request was not answered. You can save the password in the settings "
-"to prevent the request."
+"Password request was not answered. You can save the password in the settings"
+" to prevent the request."
msgstr ""
"Nie uzyskano odpowiedzi na żądanie o hasło. Hasło można zapisać w "
"ustawieniach, aby uniknąć wysyłania żądania."
#. TODO use the service device name here, this is a remote problem
-#: ../src/gtk-ui/sync-ui.c:3167
+#: ../src/gtk-ui/sync-ui.c:3201
msgid "There was a problem processing sync request. Trying again may help."
msgstr ""
-"Wystąpił problem z przetwarzaniem żądania synchronizacji. Ponowna próba może "
-"pomóc."
+"Wystąpił problem z przetwarzaniem żądania synchronizacji. Ponowna próba może"
+" pomóc."
-#: ../src/gtk-ui/sync-ui.c:3173
+#: ../src/gtk-ui/sync-ui.c:3207
msgid ""
"Failed to login. Could there be a problem with your username or password?"
msgstr ""
"Logowanie nie powiodło się. Czy może to być problem z nazwą użytkownika lub "
"hasłem?"
-#: ../src/gtk-ui/sync-ui.c:3176
+#: ../src/gtk-ui/sync-ui.c:3210
msgid "Forbidden"
msgstr "Nie dozwolone"
#. TRANSLATORS: data source means e.g. calendar or addressbook
-#: ../src/gtk-ui/sync-ui.c:3182
+#: ../src/gtk-ui/sync-ui.c:3216
msgid ""
-"A data source could not be found. Could there be a problem with the settings?"
+"A data source could not be found. Could there be a problem with the "
+"settings?"
msgstr ""
"Nie można odnaleźć źródła danych. Czy może być to problem z ustawieniami?"
-# Fatal error in the database
-#: ../src/gtk-ui/sync-ui.c:3186
+#: ../src/gtk-ui/sync-ui.c:3220
msgid "Remote database error"
msgstr "Błąd zdalnej bazy danych"
#. This can happen when EDS is borked, restart it may help...
-#: ../src/gtk-ui/sync-ui.c:3189
+#: ../src/gtk-ui/sync-ui.c:3223
msgid ""
"There is a problem with the local database. Syncing again or rebooting may "
"help."
@@ -507,55 +494,47 @@ msgstr ""
"Wystąpił problem z lokalną bazą danych. Ponowna synchronizacja lub "
"uruchomienie komputera mogą pomóc."
-# There is no space left
-#: ../src/gtk-ui/sync-ui.c:3192
+#: ../src/gtk-ui/sync-ui.c:3226
msgid "No space on disk"
msgstr "Brak miejsca na dysku"
-#: ../src/gtk-ui/sync-ui.c:3194
+#: ../src/gtk-ui/sync-ui.c:3228
msgid "Failed to process SyncML"
msgstr "Błąd przetwarzania SyncML"
-# the server didn't accept the authorization
-#: ../src/gtk-ui/sync-ui.c:3196
+#: ../src/gtk-ui/sync-ui.c:3230
msgid "Server authorization failed"
msgstr "Serwer nie zaakceptował autoryzacji"
-# Error while analysing the syntax of the configuration file
-#: ../src/gtk-ui/sync-ui.c:3198
+#: ../src/gtk-ui/sync-ui.c:3232
msgid "Failed to parse configuration file"
msgstr "Błąd składniowy w pliku konfiguracyjnym"
-# Error while reading the configuration file
-#: ../src/gtk-ui/sync-ui.c:3200
+#: ../src/gtk-ui/sync-ui.c:3234
msgid "Failed to read configuration file"
msgstr "Błąd odczytu pliku konfiguracyjnego"
-# The configuration has not been found
-#: ../src/gtk-ui/sync-ui.c:3202
+#: ../src/gtk-ui/sync-ui.c:3236
msgid "No configuration found"
msgstr "Nie znaleziono konfiguracji"
-# The configuration file has not been found
-#: ../src/gtk-ui/sync-ui.c:3204
+#: ../src/gtk-ui/sync-ui.c:3238
msgid "No configuration file found"
msgstr "Nie znaleziono pliku konfiguracyjnego"
-# The server sent an an invalid content
-#: ../src/gtk-ui/sync-ui.c:3206
+#: ../src/gtk-ui/sync-ui.c:3240
msgid "Server sent bad content"
msgstr "Serwer przysłał nie prawidłowe dane"
-#: ../src/gtk-ui/sync-ui.c:3208
+#: ../src/gtk-ui/sync-ui.c:3242
msgid "Connection certificate has expired"
msgstr "Wygasł certyfikat połączenia"
-# The connection certificate is not valid
-#: ../src/gtk-ui/sync-ui.c:3210
+#: ../src/gtk-ui/sync-ui.c:3244
msgid "Connection certificate is invalid"
msgstr "Niewłaściwy certyfikat połączenia"
-#: ../src/gtk-ui/sync-ui.c:3218
+#: ../src/gtk-ui/sync-ui.c:3252
msgid ""
"We were unable to connect to the server. The problem could be temporary or "
"there could be something wrong with the settings."
@@ -563,32 +542,31 @@ msgstr ""
"Nie można połączyć się z serwerem. Problem może być tymczasowy, lub "
"ustawienia mogą być błędne."
-# The URL is incorrect
-#: ../src/gtk-ui/sync-ui.c:3225
+#: ../src/gtk-ui/sync-ui.c:3259
msgid "The server URL is bad"
msgstr "Nieprawidłowy adres URL serwera"
-#: ../src/gtk-ui/sync-ui.c:3230
+#: ../src/gtk-ui/sync-ui.c:3264
msgid "The server was not found"
msgstr "Nie znaleziono serwera"
-#: ../src/gtk-ui/sync-ui.c:3232
+#: ../src/gtk-ui/sync-ui.c:3266
#, c-format
msgid "Error %d"
msgstr "Błąd %d"
#. TRANSLATORS: password request dialog contents: title, cancel button
#. * and ok button
-#: ../src/gtk-ui/sync-ui.c:3370
+#: ../src/gtk-ui/sync-ui.c:3404
msgid "Password is required for sync"
msgstr "Synchronizacja wymaga hasła"
-#: ../src/gtk-ui/sync-ui.c:3374
+#: ../src/gtk-ui/sync-ui.c:3408
msgid "Sync with password"
msgstr "Synchronizacja z hasłem"
#. TRANSLATORS: password request dialog message, placeholder is service name
-#: ../src/gtk-ui/sync-ui.c:3384
+#: ../src/gtk-ui/sync-ui.c:3418
#, c-format
msgid "Please enter password for syncing with %s:"
msgstr "Podaj hasło do synchronizacji z %s:"
@@ -631,10 +609,8 @@ msgid ""
"A slow sync compares items from both sides and tries to merge them. \n"
"This may fail in some cases, leading to duplicates or lost information."
msgstr ""
-"Powolna synchronizacja porównuje elementu po obu stronach i próbuje je "
-"połączyć. \n"
-"W niektórych przypadkach może się to nie powieść, prowadząc do zduplikowania "
-"lub utraty informacji."
+"Powolna synchronizacja porównuje elementu po obu stronach i próbuje je połączyć. \n"
+"W niektórych przypadkach może się to nie powieść, prowadząc do zduplikowania lub utraty informacji."
#: ../src/gtk-ui/ui.glade.h:15
msgid "Add new device"
@@ -658,7 +634,8 @@ msgstr ""
msgid "Calendar"
msgstr "Kalendarz"
-#. Button in main view, right side. Keep to below 20 chars per line, feel free to use two lines
+#. Button in main view, right side. Keep to below 20 chars per line, feel free
+#. to use two lines
#: ../src/gtk-ui/ui.glade.h:21
msgid ""
"Change or edit\n"
@@ -692,7 +669,8 @@ msgstr ""
"dane i zastąp je zdalnymi\n"
"z usługi Zyb"
-#. button in main view, right side. Keep length to 20 characters or so, use two lines if needed
+#. button in main view, right side. Keep length to 20 characters or so, use
+#. two lines if needed
#: ../src/gtk-ui/ui.glade.h:32
msgid ""
"Fix a sync\n"
@@ -703,12 +681,10 @@ msgstr ""
#: ../src/gtk-ui/ui.glade.h:34
msgid ""
-"If you don't see your service above but know that your sync provider uses "
-"SyncML\n"
+"If you don't see your service above but know that your sync provider uses SyncML\n"
"you can setup a service manually."
msgstr ""
-"Jeśli Twoja usługa nie jest widoczna powyżej a wiesz że dostawca używa "
-"SyncML\n"
+"Jeśli Twoja usługa nie jest widoczna powyżej a wiesz że dostawca używa SyncML\n"
"możesz ustawić usługę ręcznie."
#: ../src/gtk-ui/ui.glade.h:36
@@ -721,12 +697,10 @@ msgstr "Awaria synchronizacji"
#: ../src/gtk-ui/ui.glade.h:41
msgid ""
-"To sync you'll need a network connection and an account with a sync "
-"service.\n"
+"To sync you'll need a network connection and an account with a sync service.\n"
"We support the following services: "
msgstr ""
-"Aby móc synchronizować potrzebne są połączenie z siecią oraz konto dla "
-"usługi\n"
+"Aby móc synchronizować potrzebne są połączenie z siecią oraz konto dla usługi\n"
"synchronizacji. Następujące usługi są kompatybilne:"
#: ../src/gtk-ui/ui.glade.h:43
@@ -740,34 +714,38 @@ msgid "You will need to add Bluetooth devices before they can be synced."
msgstr ""
"Konieczne będzie dodanie urządzeń Bluetooth, zanim będą one synchronizowane."
-#: ../src/gtk-ui/sync.desktop.in.h:2 ../src/gtk-ui/sync-gtk.desktop.in.h:2
+#: ../src/gtk-ui/sync.desktop.in.h:2
msgid "Up to date"
msgstr "Aktualny"
#: ../src/gtk-ui/sync-gtk.desktop.in.h:1
-msgid "Sync (GTK)"
-msgstr "Synchronizacja (GTK)"
+msgid "SyncEvolution (GTK)"
+msgstr "SyncEvolution (GTK)"
+
+#: ../src/gtk-ui/sync-gtk.desktop.in.h:2
+msgid "Synchronize PIM data"
+msgstr "Synchronizuj dane PIM"
-#: ../src/gtk-ui/sync-config-widget.c:78
+#: ../src/gtk-ui/sync-config-widget.c:88
msgid ""
-"ScheduleWorld enables you to keep your contacts, events, tasks, and notes in "
-"sync."
+"ScheduleWorld enables you to keep your contacts, events, tasks, and notes in"
+" sync."
msgstr ""
"ScheduleWorld pozwala na synchronizowanie kontaktów, spotkań, zadań i "
"notatek."
-#: ../src/gtk-ui/sync-config-widget.c:81
+#: ../src/gtk-ui/sync-config-widget.c:91
msgid ""
"Google Sync can back up and synchronize your contacts with your Gmail "
"contacts."
msgstr ""
-"Google Sync może zapisywać i synchronizować kopię twojej książki adresowej z "
-"kontaktami Gmail."
+"Google Sync może zapisywać i synchronizować kopię twojej książki adresowej z"
+" kontaktami Gmail."
#. TRANSLATORS: Please include the word "demo" (or the equivalent in
#. your language): Funambol is going to be a 90 day demo service
#. in the future
-#: ../src/gtk-ui/sync-config-widget.c:87
+#: ../src/gtk-ui/sync-config-widget.c:97
msgid ""
"Back up your contacts and calendar. Sync with a single click, anytime, "
"anywhere (DEMO)."
@@ -775,7 +753,7 @@ msgstr ""
"Zrób kopię zapasową swoich kontaktów i kalendarza. Synchronizuj jednym "
"kliknięciem, kiedykolwiek i gdziekolwiek (DEMO)."
-#: ../src/gtk-ui/sync-config-widget.c:90
+#: ../src/gtk-ui/sync-config-widget.c:100
msgid ""
"Mobical Backup and Restore service allows you to securely back up your "
"personal mobile data for free."
@@ -783,14 +761,14 @@ msgstr ""
"Usługa kopii zapasowej i przywracania Mobical umożliwia za darmo wykonanie "
"bezpiecznej kopii zapasowej osobistych danych mobilnych."
-#: ../src/gtk-ui/sync-config-widget.c:93
+#: ../src/gtk-ui/sync-config-widget.c:103
msgid ""
"ZYB is a simple way for people to store and share mobile information online."
msgstr ""
"ZYB to prosty sposób na przechowywanie i udostępnianie informacji mobilnych "
"w trybie online."
-#: ../src/gtk-ui/sync-config-widget.c:96
+#: ../src/gtk-ui/sync-config-widget.c:106
msgid ""
"Memotoo lets you access your personal data from any computer connected to "
"the Internet."
@@ -798,16 +776,20 @@ msgstr ""
"Memotoo umożliwia dostęp do informacji osobistych z dowolnego komputera "
"podłączonego do sieci Internet."
-# Error while analysing the syntax of the configuration file
-#: ../src/gtk-ui/sync-config-widget.c:192
+#: ../src/gtk-ui/sync-config-widget.c:195
msgid "Sorry, failed to save the configuration"
msgstr "Przepraszamy, zapis pliku konfiguracyjnego nie powiódł się"
-#: ../src/gtk-ui/sync-config-widget.c:381
+#: ../src/gtk-ui/sync-config-widget.c:445
msgid "Service must have a name and server URL"
msgstr "Usługa musi mieć nazwę i URL serwera"
-#: ../src/gtk-ui/sync-config-widget.c:422
+#. TRANSLATORS: error dialog when creating a new sync configuration
+#: ../src/gtk-ui/sync-config-widget.c:451
+msgid "A username is required for this service"
+msgstr "Ta usługa wymaga podania nazwy użytkownika"
+
+#: ../src/gtk-ui/sync-config-widget.c:493
#, c-format
msgid ""
"Do you want to reset the settings for %s? This will not remove any synced "
@@ -817,16 +799,16 @@ msgstr ""
"jakichkolwiek informacji zsynchronizowanych na żadnym z urządzeń."
#. TRANSLATORS: buttons in reset-service warning dialog
-#: ../src/gtk-ui/sync-config-widget.c:426
+#: ../src/gtk-ui/sync-config-widget.c:497
msgid "Yes, reset"
msgstr "Tak, zresetuj"
-#: ../src/gtk-ui/sync-config-widget.c:427
-#: ../src/gtk-ui/sync-config-widget.c:438
+#: ../src/gtk-ui/sync-config-widget.c:498
+#: ../src/gtk-ui/sync-config-widget.c:509
msgid "No, keep settings"
msgstr "Nie, zachowaj ustawienia"
-#: ../src/gtk-ui/sync-config-widget.c:432
+#: ../src/gtk-ui/sync-config-widget.c:503
#, c-format
msgid ""
"Do you want to delete the settings for %s? This will not remove any synced "
@@ -837,23 +819,23 @@ msgstr ""
"spowoduje usunięcie ustawień."
#. TRANSLATORS: buttons in delete-service warning dialog
-#: ../src/gtk-ui/sync-config-widget.c:437
+#: ../src/gtk-ui/sync-config-widget.c:508
msgid "Yes, delete"
msgstr "Tak, usuń"
-#: ../src/gtk-ui/sync-config-widget.c:467
+#: ../src/gtk-ui/sync-config-widget.c:539
msgid "Reset settings"
msgstr "Resetuj ustawienia"
-#: ../src/gtk-ui/sync-config-widget.c:470
+#: ../src/gtk-ui/sync-config-widget.c:542
msgid "Delete settings"
msgstr "Usuń ustawienia"
-#: ../src/gtk-ui/sync-config-widget.c:480
+#: ../src/gtk-ui/sync-config-widget.c:552
msgid "Save and use"
msgstr "Zapisz i użyj"
-#: ../src/gtk-ui/sync-config-widget.c:483
+#: ../src/gtk-ui/sync-config-widget.c:555
msgid ""
"Save and replace\n"
"current service"
@@ -861,99 +843,103 @@ msgstr ""
"Zapisz i zastąp\n"
"bieżącą usługę"
-#: ../src/gtk-ui/sync-config-widget.c:493
+#: ../src/gtk-ui/sync-config-widget.c:563
msgid "Stop using device"
msgstr "Zaprzestań używania urządzenia"
-#: ../src/gtk-ui/sync-config-widget.c:496
+#: ../src/gtk-ui/sync-config-widget.c:566
msgid "Stop using service"
msgstr "Zaprzestań używania usługi"
-# URI of %s
#. TRANSLATORS: label for an entry in service configuration form.
#. * Placeholder is a source name.
#. * Example: "Appointments URI"
-#: ../src/gtk-ui/sync-config-widget.c:679
+#: ../src/gtk-ui/sync-config-widget.c:749
#, c-format
msgid "%s URI"
msgstr "URI %s"
#. TRANSLATORS: toggles in service configuration form, placeholder is service
#. * or device name
-#: ../src/gtk-ui/sync-config-widget.c:854
+#: ../src/gtk-ui/sync-config-widget.c:936
#, c-format
msgid "Send changes to %s"
msgstr "Wyślij zmiany do %s"
-#: ../src/gtk-ui/sync-config-widget.c:859
+#: ../src/gtk-ui/sync-config-widget.c:941
#, c-format
msgid "Receive changes from %s"
msgstr "Odbierz zmiany od %s"
-#: ../src/gtk-ui/sync-config-widget.c:875
+#: ../src/gtk-ui/sync-config-widget.c:957
msgid "<b>Sync</b>"
msgstr "<b>Synchronizacja</b>"
#. TRANSLATORS: label of a entry in service configuration
-#: ../src/gtk-ui/sync-config-widget.c:891
+#: ../src/gtk-ui/sync-config-widget.c:973
msgid "Server address"
msgstr "Adres serwera"
#. TRANSLATORS: explanation before a device template combobox.
#. * Placeholder is a device name like 'Nokia N85' or 'Syncevolution
#. * Client'
-#: ../src/gtk-ui/sync-config-widget.c:967
+#: ../src/gtk-ui/sync-config-widget.c:1049
#, c-format
msgid ""
"This device looks like it might be a '%s'. If this is not correct, please "
"take a look at the list of supported devices and pick yours if it is listed"
msgstr ""
"Najprawdopodobniej do urządzenie to „%s”. Jeśli tak nie jest, przejrzyj "
-"listę obsługiwanych urządzeń i wybierz posiadane, jeśli się na niej znajduje."
+"listę obsługiwanych urządzeń i wybierz posiadane, jeśli się na niej "
+"znajduje."
-#: ../src/gtk-ui/sync-config-widget.c:973
+#: ../src/gtk-ui/sync-config-widget.c:1055
+#: ../src/gtk-ui/sync-config-widget.c:1915
msgid ""
-"We don't know what this device is exactly. Please take a look at the list of "
-"supported devices and pick yours if it is listed"
+"We don't know what this device is exactly. Please take a look at the list of"
+" supported devices and pick yours if it is listed"
msgstr ""
-"Nie można dokładnie zidentyfikować urządzenia. Przejrzyj listę obsługiwanych "
-"urządzeń i wybierz posiadane, jeśli się na niej znajduje."
+"Nie można dokładnie zidentyfikować urządzenia. Przejrzyj listę obsługiwanych"
+" urządzeń i wybierz posiadane, jeśli się na niej znajduje."
-#: ../src/gtk-ui/sync-config-widget.c:1126
+#: ../src/gtk-ui/sync-config-widget.c:1207
#, c-format
msgid "%s - Bluetooth device"
msgstr "%s - Urządzenie Bluetooth"
#. TRANSLATORS: service title for services that are not based on a
#. * template in service list, the placeholder is the name of the service
-#: ../src/gtk-ui/sync-config-widget.c:1132
+#: ../src/gtk-ui/sync-config-widget.c:1213
#, c-format
msgid "%s - manually setup"
msgstr "%s - konfiguracja ręczna"
-# Open the website
#. TRANSLATORS: link button in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1807
+#: ../src/gtk-ui/sync-config-widget.c:1886
msgid "Launch website"
msgstr "Otworzyć stronę www"
#. TRANSLATORS: button in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1816
+#: ../src/gtk-ui/sync-config-widget.c:1895
msgid "Set up now"
msgstr "Skonfiguruj teraz"
+#: ../src/gtk-ui/sync-config-widget.c:1953
+msgid "Use these settings"
+msgstr "Użyj tych ustawień"
+
#. TRANSLATORS: labels of entries in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1912
+#: ../src/gtk-ui/sync-config-widget.c:1991
msgid "Username"
msgstr "Nazwa użytkownika"
-#: ../src/gtk-ui/sync-config-widget.c:1927
+#: ../src/gtk-ui/sync-config-widget.c:2006
msgid "Password"
msgstr "Hasło"
#. TRANSLATORS: warning in service configuration form for people
#. who have modified the configuration via other means.
-#: ../src/gtk-ui/sync-config-widget.c:1950
+#: ../src/gtk-ui/sync-config-widget.c:2029
msgid ""
"Current configuration is more complex than what can be shown here. Changes "
"to sync mode or synced data types will overwrite that configuration."
@@ -964,13 +950,13 @@ msgstr ""
#. TRANSLATORS: this is the epander label for server settings
#. in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1969
+#: ../src/gtk-ui/sync-config-widget.c:2048
msgid "Hide server settings"
msgstr "Ukryj ustawienia serwera"
#. TRANSLATORS: this is the epander label for server settings
#. in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1989
+#: ../src/gtk-ui/sync-config-widget.c:2068
msgid "Show server settings"
msgstr "Pokaż ustawienia serwera"
@@ -978,71 +964,50 @@ msgstr "Pokaż ustawienia serwera"
msgid "Sync in the Sync application"
msgstr "Synchronizuj w aplikacji do synchronizacji"
-# Synchronization is taking place
-#: ../src/syncevo-dbus-server.cpp:5664
+#: ../src/syncevo-dbus-server.cpp:6653
#, c-format
msgid "%s is syncing"
msgstr "Synchronizowanie %s"
-#: ../src/syncevo-dbus-server.cpp:5665
+#: ../src/syncevo-dbus-server.cpp:6654
#, c-format
msgid "We have just started to sync your computer with the %s sync service."
msgstr ""
"Właśnie rozpoczęto synchronizację komputera z usługą synchronizacji %s."
#. if sync is successfully started and done
-#: ../src/syncevo-dbus-server.cpp:5679
+#: ../src/syncevo-dbus-server.cpp:6670
#, c-format
msgid "%s sync complete"
msgstr "Synchronizacja %s zakończona"
-#: ../src/syncevo-dbus-server.cpp:5680
+#: ../src/syncevo-dbus-server.cpp:6671
#, c-format
msgid "We have just finished syncing your computer with the %s sync service."
msgstr ""
"Właśnie zakończono synchronizację komputera z usługą synchronizacji %s."
-#. if sync is successfully started and has errors, or not started successful with a fatal problem
-#: ../src/syncevo-dbus-server.cpp:5685
+#. if sync is successfully started and has errors, or not started successful
+#. with a fatal problem
+#: ../src/syncevo-dbus-server.cpp:6676
msgid "Sync problem."
msgstr "Problem z synchronizacją."
-#: ../src/syncevo-dbus-server.cpp:5686
+#: ../src/syncevo-dbus-server.cpp:6677
msgid "Sorry, there's a problem with your sync that you need to attend to."
msgstr ""
"Przepraszamy, wystąpił problem z synchronizacją wymagający interwencji "
"użytkownika."
-#: ../src/syncevo-dbus-server.cpp:5759
+#: ../src/syncevo-dbus-server.cpp:6758
msgid "View"
msgstr "Pokaż"
#. Use "default" as ID because that is what mutter-moblin
#. recognizes: it then skips the action instead of adding it
#. in addition to its own "Dismiss" button (always added).
-#: ../src/syncevo-dbus-server.cpp:5763
+#: ../src/syncevo-dbus-server.cpp:6762
msgid "Dismiss"
msgstr "Odrzuć"
-#~ msgid ""
-#~ "Do you want to replace %s with %s? This will not remove any synced "
-#~ "information on either end but you will no longer be able to sync with %s."
-#~ msgstr ""
-#~ "Czy chcesz zastąpić %s poprzez %s? Nie spowoduje to usunięcia "
-#~ "jakichkolwiek informacji zsynchronizowanych na żadnym z urządzeń, ale nie "
-#~ "będzie już można dokonać synchronizacji z %s."
-
-#~ msgid "Yes, use %s"
-#~ msgstr "Tak, użyj %s"
-
-#~ msgid "No, use %s"
-#~ msgstr "Nie, użyj %s"
-
-#~ msgid "Database error"
-#~ msgstr "Błąd bazy danych"
-
-#~ msgid "Reset service"
-#~ msgstr "Zresetuj usługę"
-#~ msgid "Addressbook"
-#~ msgstr "Książka adresowa"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 2382e69b..fef227eb 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,22 +1,28 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# <andrea.aguiar@infolink.com.br>, 2011.
+# <meego.pti.ptb@gmail.com>, 2011.
+# <tomas.galicia@intel.com>, 2011.
msgid ""
msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: http://moblin.org/projects/syncevolution\n"
-"POT-Creation-Date: 2010-05-10 09:25+0000\n"
-"PO-Revision-Date: \n"
-"Last-Translator: GLSPTB_Gabor <bechtg@gmail.com>\n"
-"Language-Team: \n"
+"Project-Id-Version: syncevolution\n"
+"Report-Msgid-Bugs-To: https://bugs.meego.com/\n"
+"POT-Creation-Date: 2011-12-05 10:21-0800\n"
+"PO-Revision-Date: 2011-12-10 00:43+0000\n"
+"Last-Translator: GLS_PTB <meego.pti.ptb@gmail.com>\n"
+"Language-Team: Portuguese (Brazilian) <l10n-pt-br@meego.org.br>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Portuguese\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"Plural-Forms: nplurals=2; plural=n!=1;\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
#. TRANSLATORS: this is the application name that may be used by e.g.
#. the windowmanager
-#: ../src/gtk-ui/main.c:40
-#: ../src/gtk-ui/ui.glade.h:38
+#: ../src/gtk-ui/main.c:40 ../src/gtk-ui/ui.glade.h:38
#: ../src/gtk-ui/sync.desktop.in.h:1
#: ../src/gnome-bluetooth/syncevolution.c:112
msgid "Sync"
@@ -30,8 +36,7 @@ msgstr "Contatos"
msgid "Appointments"
msgstr "Compromissos"
-#: ../src/gtk-ui/sync-ui.c:270
-#: ../src/gtk-ui/ui.glade.h:40
+#: ../src/gtk-ui/sync-ui.c:270 ../src/gtk-ui/ui.glade.h:40
msgid "Tasks"
msgstr "Tarefas"
@@ -65,72 +70,78 @@ msgstr "Sim, faça sincronização lenta"
msgid "No, cancel sync"
msgstr "Não, cancele a sincronização"
-#. TRANSLATORS: confirmation dialog for refresh-from-server. Placeholder
+#. TRANSLATORS: confirmation dialog for "refresh from peer". Placeholder
#. * is service/device name
#: ../src/gtk-ui/sync-ui.c:424
#, c-format
-msgid "Do you want to delete all local data and replace it with data from %s? This is not usually advised."
-msgstr "Você quer excluir todos os dados locais e substituir por dados de: %s? Isso não é aconselhável."
+msgid ""
+"Do you want to delete all local data and replace it with data from %s? This "
+"is not usually advised."
+msgstr ""
+"Você quer excluir todos os dados locais e substituir por dados de: %s? Isso "
+"não é aconselhável."
-#: ../src/gtk-ui/sync-ui.c:429
-#: ../src/gtk-ui/sync-ui.c:460
+#: ../src/gtk-ui/sync-ui.c:429 ../src/gtk-ui/sync-ui.c:462
msgid "Yes, delete and replace"
msgstr "Sim, excluir e substituir"
-#: ../src/gtk-ui/sync-ui.c:429
-#: ../src/gtk-ui/sync-ui.c:460
-#: ../src/gtk-ui/sync-ui.c:1580
+#: ../src/gtk-ui/sync-ui.c:429 ../src/gtk-ui/sync-ui.c:462
+#: ../src/gtk-ui/sync-ui.c:1610
msgid "No"
msgstr "Não"
-#. TRANSLATORS: confirmation dialog for refresh-from-client. Placeholder
+#. TRANSLATORS: confirmation dialog for "refresh from local side". Placeholder
#. * is service/device name
-#: ../src/gtk-ui/sync-ui.c:455
+#: ../src/gtk-ui/sync-ui.c:457
#, c-format
-msgid "Do you want to delete all data in %s and replace it with your local data? This is not usually advised."
-msgstr "Você quer excluir todos os dados em: %s e substituir por seus dados locais? Isso não é aconselhável."
+msgid ""
+"Do you want to delete all data in %s and replace it with your local data? "
+"This is not usually advised."
+msgstr ""
+"Você quer excluir todos os dados em: %s e substituir por seus dados locais? "
+"Isso não é aconselhável."
-#: ../src/gtk-ui/sync-ui.c:487
+#: ../src/gtk-ui/sync-ui.c:491
msgid "Trying to cancel sync"
msgstr "Tentando cancelar sincronização"
-#: ../src/gtk-ui/sync-ui.c:529
+#: ../src/gtk-ui/sync-ui.c:533
msgid "No service or device selected"
msgstr "Nenhum serviço ou dispositivo selecionado"
#. TRANSLATORS: This is the title on main view. Placeholder is
#. * the service name. Example: "Google - synced just now"
-#: ../src/gtk-ui/sync-ui.c:537
+#: ../src/gtk-ui/sync-ui.c:541
#, c-format
msgid "%s - synced just now"
msgstr "%s - fez sincronização agora mesmo"
-#: ../src/gtk-ui/sync-ui.c:541
+#: ../src/gtk-ui/sync-ui.c:545
#, c-format
msgid "%s - synced a minute ago"
msgstr "%s - fez sincronização há um minuto atrás"
-#: ../src/gtk-ui/sync-ui.c:545
+#: ../src/gtk-ui/sync-ui.c:549
#, c-format
msgid "%s - synced %ld minutes ago"
msgstr "%s - fez sincronização há: %ld minutos atrás"
-#: ../src/gtk-ui/sync-ui.c:550
+#: ../src/gtk-ui/sync-ui.c:554
#, c-format
msgid "%s - synced an hour ago"
msgstr "%s - fez sincronização há uma hora atrás"
-#: ../src/gtk-ui/sync-ui.c:554
+#: ../src/gtk-ui/sync-ui.c:558
#, c-format
msgid "%s - synced %ld hours ago"
msgstr "%s - fez sincronização há: %ld horas atrás"
-#: ../src/gtk-ui/sync-ui.c:559
+#: ../src/gtk-ui/sync-ui.c:563
#, c-format
msgid "%s - synced a day ago"
msgstr "%s - sincronização há um dia atrás"
-#: ../src/gtk-ui/sync-ui.c:563
+#: ../src/gtk-ui/sync-ui.c:567
#, c-format
msgid "%s - synced %ld days ago"
msgstr "%s - sincronização há %ld dias atrás"
@@ -138,66 +149,70 @@ msgstr "%s - sincronização há %ld dias atrás"
#. TRANSLATORS: Action button in info bar in main view. Shown with e.g.
#. * "You've just restored a backup. The changes have not been "
#. * "synced with %s yet"
-#: ../src/gtk-ui/sync-ui.c:612
-#: ../src/gtk-ui/sync-ui.c:726
+#: ../src/gtk-ui/sync-ui.c:616 ../src/gtk-ui/sync-ui.c:701
msgid "Sync now"
-msgstr "Sincronize agora"
+msgstr "Sincron. agora"
#. TRANSLATORS: Action button in info bar in main view. Shown with e.g.
#. * "A normal sync is not possible at this time..." message.
#. * "Other options" will open Emergency view
-#: ../src/gtk-ui/sync-ui.c:618
-#: ../src/gtk-ui/ui.glade.h:37
+#: ../src/gtk-ui/sync-ui.c:622 ../src/gtk-ui/ui.glade.h:37
msgid "Slow sync"
msgstr "Sincronização lenta"
-#: ../src/gtk-ui/sync-ui.c:619
+#: ../src/gtk-ui/sync-ui.c:623
msgid "Other options..."
msgstr "Outras opções"
#. TRANSLATORS: Action button in info bar in main view. Shown e.g.
#. * when no service is selected. Will open configuration view
-#: ../src/gtk-ui/sync-ui.c:624
+#: ../src/gtk-ui/sync-ui.c:628
msgid "Select sync service"
msgstr "Selecione serviço de sincronização"
#. TRANSLATORS: Action button in info bar in main view. Shown e.g.
#. * login to service fails. Will open configuration view for this service
-#: ../src/gtk-ui/sync-ui.c:629
+#: ../src/gtk-ui/sync-ui.c:633
msgid "Edit service settings"
msgstr "Editar configurações de serviço"
-#: ../src/gtk-ui/sync-ui.c:700
-msgid "You haven't selected a sync service or device yet. Sync services let you synchronize your data between your netbook and a web service. You can also sync directly with some devices."
-msgstr "Você ainda não selecionou um serviço de sincronização ou dispositivo. Serviços de sincronização permitem a sincronização de dados entre seu netbook e um serviço na web. Você também pode sincronizar diretamente com alguns dispositivos."
+#: ../src/gtk-ui/sync-ui.c:709
+msgid ""
+"You haven't selected a sync service or device yet. Sync services let you "
+"synchronize your data between your netbook and a web service. You can also "
+"sync directly with some devices."
+msgstr ""
+"Você ainda não selecionou um serviço de sincronização ou dispositivo. "
+"Serviços de sincronização permitem a sincronização de dados entre seu "
+"netbook e um serviço na web. Você também pode sincronizar diretamente com "
+"alguns dispositivos."
-#: ../src/gtk-ui/sync-ui.c:722
+#: ../src/gtk-ui/sync-ui.c:729
msgid "Sync again"
msgstr "Sincronize de novo"
-#: ../src/gtk-ui/sync-ui.c:743
+#: ../src/gtk-ui/sync-ui.c:748
msgid "Restoring"
msgstr "Restaurando"
-#: ../src/gtk-ui/sync-ui.c:745
+#: ../src/gtk-ui/sync-ui.c:750
msgid "Syncing"
msgstr "Sincronizando"
#. TRANSLATORS: This is for the button in main view, right side.
#. Keep line length below ~20 characters, use two lines if needed
-#: ../src/gtk-ui/sync-ui.c:757
-#: ../src/gtk-ui/sync-ui.c:3374
+#: ../src/gtk-ui/sync-ui.c:762 ../src/gtk-ui/sync-ui.c:3407
msgid "Cancel sync"
msgstr "Cancelar sincronização"
-#: ../src/gtk-ui/sync-ui.c:922
+#: ../src/gtk-ui/sync-ui.c:927
msgid "Back to sync"
msgstr "Voltar à sincronização"
#. TRANSLATORS: label for checkbutton/toggle in main view.
#. * Please stick to similar length strings or break the line with
#. * "\n" if absolutely needed
-#: ../src/gtk-ui/sync-ui.c:1223
+#: ../src/gtk-ui/sync-ui.c:1229
msgid "Automatic sync"
msgstr "Sincronização automática"
@@ -205,61 +220,77 @@ msgstr "Sincronização automática"
#. * currently selected data sources. First placeholder is service/device
#. * name, second a comma separeted list of sources.
#. * E.g. "Affected data: Google Contacts, Appointments"
-#: ../src/gtk-ui/sync-ui.c:1494
+#: ../src/gtk-ui/sync-ui.c:1524
#, c-format
msgid "Affected data: %s %s"
msgstr "Dados afetados: %s %s"
-#: ../src/gtk-ui/sync-ui.c:1499
+#: ../src/gtk-ui/sync-ui.c:1529
#, c-format
msgid "Affected data: none"
msgstr "Dados afetados: nenhum"
#. TRANSLATORS: confirmation for restoring a backup. placeholder is the
#. * backup time string defined below
-#: ../src/gtk-ui/sync-ui.c:1577
+#: ../src/gtk-ui/sync-ui.c:1607
#, c-format
-msgid "Do you want to restore the backup from %s? All changes you have made since then will be lost."
-msgstr "Você quer restaurar o backup do %s? Todas as modificações que você fez depois serão perdidas."
+msgid ""
+"Do you want to restore the backup from %s? All changes you have made since "
+"then will be lost."
+msgstr ""
+"Você quer restaurar o backup do %s? Todas as modificações que você fez "
+"depois serão perdidas."
-#: ../src/gtk-ui/sync-ui.c:1580
+#: ../src/gtk-ui/sync-ui.c:1610
msgid "Yes, restore"
msgstr "Sim, restaurar"
#. TRANSLATORS: date/time for strftime(), used in emergency view backup
#. * label. Any time format that shows date and time is good.
-#: ../src/gtk-ui/sync-ui.c:1612
+#: ../src/gtk-ui/sync-ui.c:1642
#, c-format
msgid "%x %X"
msgstr "%x %X"
#. TRANSLATORS: label for a backup in emergency view. Placeholder is
#. * service or device name
-#: ../src/gtk-ui/sync-ui.c:1631
+#: ../src/gtk-ui/sync-ui.c:1661
#, c-format
msgid "Backed up before syncing with %s"
msgstr "Fez backup antes de sincronização com %s"
-#: ../src/gtk-ui/sync-ui.c:1648
+#: ../src/gtk-ui/sync-ui.c:1678
msgid "Restore"
msgstr "Restaurar"
#. TRANSLATORS: this is an explanation in Emergency view.
#. * Placeholder is a service/device name
-#: ../src/gtk-ui/sync-ui.c:1755
+#: ../src/gtk-ui/sync-ui.c:1785
#, c-format
-msgid "A normal sync with %s is not possible at this time. You can do a slow two-way sync or start from scratch. You can also restore a backup, but a slow sync or starting from scratch will still be required before normal sync is possible."
-msgstr "Uma sincronização normal com %s não é possível agora. Você poderá fazer uma sincronização lenta bidirecional ou iniciar do começo. Você também poderá restaurar um backup, mas uma sincronização lenta ou começando do início ainda será necessária antes de uma sincronização normal."
+msgid ""
+"A normal sync with %s is not possible at this time. You can do a slow two-"
+"way sync or start from scratch. You can also restore a backup, but a slow "
+"sync or starting from scratch will still be required before normal sync is "
+"possible."
+msgstr ""
+"Uma sincronização normal com %s não é possível agora. Você poderá fazer uma "
+"sincronização lenta bidirecional ou iniciar do começo. Você também poderá "
+"restaurar um backup, mas uma sincronização lenta ou começando do início "
+"ainda será necessária antes de uma sincronização normal."
-#: ../src/gtk-ui/sync-ui.c:1765
+#: ../src/gtk-ui/sync-ui.c:1795
#, c-format
-msgid "If something has gone horribly wrong, you can try a slow sync, start from scratch or restore from backup."
-msgstr "Se algo está terrivelmente errado, você ainda pode tentar uma sincronização lenta, começar tudo de novo ou restaruar do backup."
+msgid ""
+"If something has gone horribly wrong, you can try a slow sync, start from "
+"scratch or restore from backup."
+msgstr ""
+"Se algo está terrivelmente errado, você ainda pode tentar uma sincronização "
+"lenta, começar tudo de novo ou restaurar do backup."
#. TRANSLATORS: These are a buttons in Emergency view. Placeholder is a
#. * service/device name. Please don't use too long lines, but feel free to
#. * use several lines.
-#: ../src/gtk-ui/sync-ui.c:1774
+#: ../src/gtk-ui/sync-ui.c:1804
#, c-format
msgid ""
"Delete all your local\n"
@@ -270,7 +301,7 @@ msgstr ""
"locais e substitua com\n"
"dados de %s"
-#: ../src/gtk-ui/sync-ui.c:1780
+#: ../src/gtk-ui/sync-ui.c:1810
#, c-format
msgid ""
"Delete all data on\n"
@@ -281,71 +312,74 @@ msgstr ""
"%s e substituir\n"
"com seus dados locais"
-#: ../src/gtk-ui/sync-ui.c:2242
+#: ../src/gtk-ui/sync-ui.c:2275
msgid "Failed to get list of supported services from SyncEvolution"
msgstr "Não conseguiu a lista de serviços suportados do SyncEvolution"
-#: ../src/gtk-ui/sync-ui.c:2296
-msgid "There was a problem communicating with the sync process. Please try again later."
-msgstr "Houve um problema comunicando com o processo de sincronização. Favor tente de novo mais tarde."
+#: ../src/gtk-ui/sync-ui.c:2329
+msgid ""
+"There was a problem communicating with the sync process. Please try again "
+"later."
+msgstr ""
+"Houve um problema comunicando com o processo de sincronização. Favor tente "
+"de novo mais tarde."
-#: ../src/gtk-ui/sync-ui.c:2355
+#: ../src/gtk-ui/sync-ui.c:2388
msgid "Restore failed"
msgstr "Restauração falhou"
-#: ../src/gtk-ui/sync-ui.c:2358
-#: ../src/gtk-ui/sync-ui.c:3243
+#: ../src/gtk-ui/sync-ui.c:2391 ../src/gtk-ui/sync-ui.c:3276
msgid "Sync failed"
msgstr "Sincronização falhou"
-#: ../src/gtk-ui/sync-ui.c:2364
+#: ../src/gtk-ui/sync-ui.c:2397
msgid "Restore complete"
msgstr "Restauração completada"
-#: ../src/gtk-ui/sync-ui.c:2367
+#: ../src/gtk-ui/sync-ui.c:2400
msgid "Sync complete"
msgstr "Sincronização completada"
-#: ../src/gtk-ui/sync-ui.c:2459
+#: ../src/gtk-ui/sync-ui.c:2492
#, c-format
msgid "Preparing '%s'"
msgstr "Preparando: '%s'"
-#: ../src/gtk-ui/sync-ui.c:2462
+#: ../src/gtk-ui/sync-ui.c:2495
#, c-format
msgid "Receiving '%s'"
msgstr "Recebendo: '%s'"
-#: ../src/gtk-ui/sync-ui.c:2465
+#: ../src/gtk-ui/sync-ui.c:2498
#, c-format
msgid "Sending '%s'"
msgstr "Enviando: '%s"
-#: ../src/gtk-ui/sync-ui.c:2586
+#: ../src/gtk-ui/sync-ui.c:2619
#, c-format
msgid "There was one remote rejection."
msgid_plural "There were %ld remote rejections."
msgstr[0] "Houve uma rejeição remota."
msgstr[1] "Houve %ld rejeições remotas."
-#: ../src/gtk-ui/sync-ui.c:2591
+#: ../src/gtk-ui/sync-ui.c:2624
#, c-format
msgid "There was one local rejection."
msgid_plural "There were %ld local rejections."
msgstr[0] "Houve uma rejeição local."
msgstr[1] "Houve %ld rejeições locais."
-#: ../src/gtk-ui/sync-ui.c:2596
+#: ../src/gtk-ui/sync-ui.c:2629
#, c-format
msgid "There were %ld local rejections and %ld remote rejections."
msgstr "Houve %ld rejeições locais e %ld rejeições remotas."
-#: ../src/gtk-ui/sync-ui.c:2601
+#: ../src/gtk-ui/sync-ui.c:2634
#, c-format
msgid "Last time: No changes."
msgstr "Ultima vez: sem mudanças."
-#: ../src/gtk-ui/sync-ui.c:2603
+#: ../src/gtk-ui/sync-ui.c:2636
#, c-format
msgid "Last time: Sent one change."
msgid_plural "Last time: Sent %ld changes."
@@ -355,21 +389,21 @@ msgstr[1] "Ultima vez: Enviou %ld mudanças."
#. This is about changes made to the local data. Not all of these
#. changes were requested by the remote server, so "applied"
#. is a better word than "received" (bug #5185).
-#: ../src/gtk-ui/sync-ui.c:2611
+#: ../src/gtk-ui/sync-ui.c:2644
#, c-format
msgid "Last time: Applied one change."
msgid_plural "Last time: Applied %ld changes."
msgstr[0] "Ultima vez: Efetuou uma mudança."
msgstr[1] "Ultima vez: Efetuou %ld mudanças."
-#: ../src/gtk-ui/sync-ui.c:2616
+#: ../src/gtk-ui/sync-ui.c:2649
#, c-format
msgid "Last time: Applied %ld changes and sent %ld changes."
msgstr "Ultima vez: Efetuou %ld mudanças e enviou %ld mudanças."
#. TRANSLATORS: the placeholder is a error message (hopefully)
#. * explaining the problem
-#: ../src/gtk-ui/sync-ui.c:2823
+#: ../src/gtk-ui/sync-ui.c:2856
#, c-format
msgid ""
"There was a problem with last sync:\n"
@@ -378,124 +412,151 @@ msgstr ""
"Houve um problema com a ultima sincronização:\n"
"%s"
-#: ../src/gtk-ui/sync-ui.c:2833
+#: ../src/gtk-ui/sync-ui.c:2866
#, c-format
-msgid "You've just restored a backup. The changes have not been synced with %s yet"
-msgstr "Você acabou de restaurar um backup. As modificações não foram sincronizadas com %s ainda"
+msgid ""
+"You've just restored a backup. The changes have not been synced with %s yet"
+msgstr ""
+"Você acabou de restaurar um backup. As modificações não foram sincronizadas "
+"com %s ainda"
-#: ../src/gtk-ui/sync-ui.c:3121
+#: ../src/gtk-ui/sync-ui.c:3154
msgid "Waiting for current operation to finish..."
msgstr "Aguardando a conclusão da atual operação..."
#. TRANSLATORS: next strings are error messages.
-#: ../src/gtk-ui/sync-ui.c:3155
-msgid "A normal sync is not possible at this time. The server suggests a slow sync, but this might not always be what you want if both ends already have data."
-msgstr "Uma sincronização normal não é possível agora. O servidor sugere uma sincronização normal, mas isto não é sempre aquilo que você deseja se ambos os lados têm dados."
+#: ../src/gtk-ui/sync-ui.c:3188
+msgid ""
+"A normal sync is not possible at this time. The server suggests a slow sync,"
+" but this might not always be what you want if both ends already have data."
+msgstr ""
+"Uma sincronização normal não é possível agora. O servidor sugere uma "
+"sincronização normal, mas isto não é sempre aquilo que você deseja se ambos "
+"os lados têm dados."
-#: ../src/gtk-ui/sync-ui.c:3159
+#: ../src/gtk-ui/sync-ui.c:3192
msgid "The sync process died unexpectedly."
msgstr "Saída inesperada do serviço de sincronização."
-#: ../src/gtk-ui/sync-ui.c:3164
-msgid "Password request was not answered. You can save the password in the settings to prevent the request."
-msgstr "O pedido de senha não teve resposta. Você pode salvar a senha nas configurações para prevenir o pedido."
+#: ../src/gtk-ui/sync-ui.c:3197
+msgid ""
+"Password request was not answered. You can save the password in the settings"
+" to prevent the request."
+msgstr ""
+"O pedido de senha não teve resposta. Você pode salvar a senha nas "
+"configurações para prevenir o pedido."
#. TODO use the service device name here, this is a remote problem
-#: ../src/gtk-ui/sync-ui.c:3168
+#: ../src/gtk-ui/sync-ui.c:3201
msgid "There was a problem processing sync request. Trying again may help."
-msgstr "Houve um problema com o processamento do pedido de sincronização. Tentar de novo poderá ajudar. "
+msgstr ""
+"Houve um problema com o processamento do pedido de sincronização. Tentar de "
+"novo poderá ajudar. "
-#: ../src/gtk-ui/sync-ui.c:3174
-msgid "Failed to login. Could there be a problem with your username or password?"
+#: ../src/gtk-ui/sync-ui.c:3207
+msgid ""
+"Failed to login. Could there be a problem with your username or password?"
msgstr "Falha do login. Existe um problema com seu nome de usuário ou senha?"
-#: ../src/gtk-ui/sync-ui.c:3177
+#: ../src/gtk-ui/sync-ui.c:3210
msgid "Forbidden"
msgstr "Proibido"
#. TRANSLATORS: data source means e.g. calendar or addressbook
-#: ../src/gtk-ui/sync-ui.c:3183
-msgid "A data source could not be found. Could there be a problem with the settings?"
-msgstr "Uma fonte de dados não pôde ser encontrada. Existe um problema com as configurações?"
+#: ../src/gtk-ui/sync-ui.c:3216
+msgid ""
+"A data source could not be found. Could there be a problem with the "
+"settings?"
+msgstr ""
+"Uma fonte de dados não pôde ser encontrada. Existe um problema com as "
+"configurações?"
-#: ../src/gtk-ui/sync-ui.c:3187
+#: ../src/gtk-ui/sync-ui.c:3220
msgid "Remote database error"
msgstr "Erro no banco de dados remoto"
#. This can happen when EDS is borked, restart it may help...
-#: ../src/gtk-ui/sync-ui.c:3190
-msgid "There is a problem with the local database. Syncing again or rebooting may help."
-msgstr "Existe um problema com o banco de dados local. Nova sincronização ou reinicialização poderá ajudar. "
+#: ../src/gtk-ui/sync-ui.c:3223
+msgid ""
+"There is a problem with the local database. Syncing again or rebooting may "
+"help."
+msgstr ""
+"Existe um problema com o banco de dados local. Nova sincronização ou "
+"reinicialização poderá ajudar. "
-#: ../src/gtk-ui/sync-ui.c:3193
+#: ../src/gtk-ui/sync-ui.c:3226
msgid "No space on disk"
msgstr "Não há espaço no disco"
-#: ../src/gtk-ui/sync-ui.c:3195
+#: ../src/gtk-ui/sync-ui.c:3228
msgid "Failed to process SyncML"
msgstr "Falhou o processo de SyncML"
-#: ../src/gtk-ui/sync-ui.c:3197
+#: ../src/gtk-ui/sync-ui.c:3230
msgid "Server authorization failed"
msgstr "Autorização do servidor falhou"
-#: ../src/gtk-ui/sync-ui.c:3199
+#: ../src/gtk-ui/sync-ui.c:3232
msgid "Failed to parse configuration file"
msgstr "Falha na triagem do arquivo de configuração"
-#: ../src/gtk-ui/sync-ui.c:3201
+#: ../src/gtk-ui/sync-ui.c:3234
msgid "Failed to read configuration file"
msgstr "Falha na leitura do arquivo de configuração"
-#: ../src/gtk-ui/sync-ui.c:3203
+#: ../src/gtk-ui/sync-ui.c:3236
msgid "No configuration found"
msgstr "Nenhuma configuração encontrada"
-#: ../src/gtk-ui/sync-ui.c:3205
+#: ../src/gtk-ui/sync-ui.c:3238
msgid "No configuration file found"
msgstr "Nenhum arquivo de configuração encontrado"
-#: ../src/gtk-ui/sync-ui.c:3207
+#: ../src/gtk-ui/sync-ui.c:3240
msgid "Server sent bad content"
msgstr "Servidor enviou conteúdo ruim"
-#: ../src/gtk-ui/sync-ui.c:3209
+#: ../src/gtk-ui/sync-ui.c:3242
msgid "Connection certificate has expired"
msgstr "Certificado de conexão vencido"
-#: ../src/gtk-ui/sync-ui.c:3211
+#: ../src/gtk-ui/sync-ui.c:3244
msgid "Connection certificate is invalid"
msgstr "Certificado de conexão inválido"
-#: ../src/gtk-ui/sync-ui.c:3219
-msgid "We were unable to connect to the server. The problem could be temporary or there could be something wrong with the settings."
-msgstr "Não foi possível conectar com o servidor. O problema pode ser temporário ou talvez exista um problema com as configurações."
+#: ../src/gtk-ui/sync-ui.c:3252
+msgid ""
+"We were unable to connect to the server. The problem could be temporary or "
+"there could be something wrong with the settings."
+msgstr ""
+"Não foi possível conectar com o servidor. O problema pode ser temporário ou "
+"talvez exista um problema com as configurações."
-#: ../src/gtk-ui/sync-ui.c:3226
+#: ../src/gtk-ui/sync-ui.c:3259
msgid "The server URL is bad"
msgstr "O URL do servidor está ruim"
-#: ../src/gtk-ui/sync-ui.c:3231
+#: ../src/gtk-ui/sync-ui.c:3264
msgid "The server was not found"
msgstr "Servidor não localizado"
-#: ../src/gtk-ui/sync-ui.c:3233
+#: ../src/gtk-ui/sync-ui.c:3266
#, c-format
msgid "Error %d"
msgstr "Erro: %d"
#. TRANSLATORS: password request dialog contents: title, cancel button
#. * and ok button
-#: ../src/gtk-ui/sync-ui.c:3371
+#: ../src/gtk-ui/sync-ui.c:3404
msgid "Password is required for sync"
msgstr "Senha é necessária para sincronização "
-#: ../src/gtk-ui/sync-ui.c:3375
+#: ../src/gtk-ui/sync-ui.c:3408
msgid "Sync with password"
msgstr "Sincronização com senha"
#. TRANSLATORS: password request dialog message, placeholder is service name
-#: ../src/gtk-ui/sync-ui.c:3385
+#: ../src/gtk-ui/sync-ui.c:3418
#, c-format
msgid "Please enter password for syncing with %s:"
msgstr "Favor introduzir a senha para sincronização com %s:"
@@ -543,22 +604,27 @@ msgstr ""
#: ../src/gtk-ui/ui.glade.h:15
msgid "Add new device"
-msgstr "Adicionar dispositivo"
+msgstr "Adicionar novo dispositivo"
#: ../src/gtk-ui/ui.glade.h:16
msgid "Add new service"
-msgstr "Adicionar serviço"
+msgstr "Adicionar novo serviço"
#. explanation of "Restore backup" function
#: ../src/gtk-ui/ui.glade.h:18
-msgid "Backups are made before every time we Sync. Choose a backup to restore. Any changes you have made since then will be lost."
-msgstr "Backups são feitos antes de cada sincronização . Selecione um backup para restaurar. Quaisquer modificações que você fez depois serão perdidas."
+msgid ""
+"Backups are made before every time we Sync. Choose a backup to restore. Any "
+"changes you have made since then will be lost."
+msgstr ""
+"Backups são feitos antes de cada sincronização . Selecione um backup para "
+"restaurar. Quaisquer modificações que você fez depois serão perdidas."
#: ../src/gtk-ui/ui.glade.h:19
msgid "Calendar"
msgstr "Calendário"
-#. Button in main view, right side. Keep to below 20 chars per line, feel free to use two lines
+#. Button in main view, right side. Keep to below 20 chars per line, feel free
+#. to use two lines
#: ../src/gtk-ui/ui.glade.h:21
msgid ""
"Change or edit\n"
@@ -592,14 +658,15 @@ msgstr ""
"informações locais e\n"
"substituir por dados de Zyb"
-#. button in main view, right side. Keep length to 20 characters or so, use two lines if needed
+#. button in main view, right side. Keep length to 20 characters or so, use
+#. two lines if needed
#: ../src/gtk-ui/ui.glade.h:32
msgid ""
"Fix a sync\n"
"emergency"
msgstr ""
"Conserta uma\n"
-"sincronização emergência"
+"sincr. emergência"
#: ../src/gtk-ui/ui.glade.h:34
msgid ""
@@ -627,94 +694,136 @@ msgstr ""
#: ../src/gtk-ui/ui.glade.h:43
msgid "Use Bluetooth to Sync your data from one device to another."
-msgstr "Use Bluetooth para sincronização de dados de um dispositivo para outro."
+msgstr ""
+"Use Bluetooth para sincronização de dados de um dispositivo para outro."
#: ../src/gtk-ui/ui.glade.h:44
msgid "You will need to add Bluetooth devices before they can be synced."
-msgstr "Você precisará adicionar dispositivos Bluetooth antes que eles possam fazer sincronização."
+msgstr ""
+"Você precisará adicionar dispositivos Bluetooth antes que eles possam fazer "
+"sincronização."
#: ../src/gtk-ui/sync.desktop.in.h:2
-#: ../src/gtk-ui/sync-gtk.desktop.in.h:2
msgid "Up to date"
msgstr "Atualizado"
#: ../src/gtk-ui/sync-gtk.desktop.in.h:1
-msgid "Sync (GTK)"
-msgstr "Sincronizar (GTK)"
+msgid "SyncEvolution (GTK)"
+msgstr "SyncEvolution (GTK)"
-#: ../src/gtk-ui/sync-config-widget.c:78
-msgid "ScheduleWorld enables you to keep your contacts, events, tasks, and notes in sync."
-msgstr "ScheduleWorld possibilita manter sincronizados seus contatos, eventos, tarefas e anotações."
+#: ../src/gtk-ui/sync-gtk.desktop.in.h:2
+msgid "Synchronize PIM data"
+msgstr "Sincronizar dados PIM"
-#: ../src/gtk-ui/sync-config-widget.c:81
-msgid "Google Sync can back up and synchronize your contacts with your Gmail contacts."
-msgstr "Google Sync pode fazer backup e sincronizar seus contatos com seus contatos Gmail."
+#: ../src/gtk-ui/sync-config-widget.c:88
+msgid ""
+"ScheduleWorld enables you to keep your contacts, events, tasks, and notes in"
+" sync."
+msgstr ""
+"ScheduleWorld possibilita manter sincronizados seus contatos, eventos, "
+"tarefas e anotações."
+
+#: ../src/gtk-ui/sync-config-widget.c:91
+msgid ""
+"Google Sync can back up and synchronize your contacts with your Gmail "
+"contacts."
+msgstr ""
+"Google Sync pode fazer backup e sincronizar seus contatos com seus contatos "
+"Gmail."
#. TRANSLATORS: Please include the word "demo" (or the equivalent in
#. your language): Funambol is going to be a 90 day demo service
#. in the future
-#: ../src/gtk-ui/sync-config-widget.c:87
-msgid "Back up your contacts and calendar. Sync with a single click, anytime, anywhere (DEMO)."
-msgstr "Faça backup de seus contatos e calendário. Sincronize com um só clique, a qualquer hora em qualquer lugar (DEMO)."
+#: ../src/gtk-ui/sync-config-widget.c:97
+msgid ""
+"Back up your contacts and calendar. Sync with a single click, anytime, "
+"anywhere (DEMO)."
+msgstr ""
+"Faça backup de seus contatos e calendário. Sincronize com um só clique, a "
+"qualquer hora em qualquer lugar (DEMO)."
-#: ../src/gtk-ui/sync-config-widget.c:90
-msgid "Mobical Backup and Restore service allows you to securely back up your personal mobile data for free."
-msgstr "O serviço Backup e Restauração Mobical permite o backup seguro de seus dados móveis pessoais de graça."
+#: ../src/gtk-ui/sync-config-widget.c:100
+msgid ""
+"Mobical Backup and Restore service allows you to securely back up your "
+"personal mobile data for free."
+msgstr ""
+"O serviço Backup e Restauração Mobical permite o backup seguro de seus dados"
+" móveis pessoais de graça."
-#: ../src/gtk-ui/sync-config-widget.c:93
-msgid "ZYB is a simple way for people to store and share mobile information online."
-msgstr "ZYB é uma maneira simples para as pessoas armazenarem e compartilharem informações móveis online."
+#: ../src/gtk-ui/sync-config-widget.c:103
+msgid ""
+"ZYB is a simple way for people to store and share mobile information online."
+msgstr ""
+"ZYB é uma maneira simples para as pessoas armazenarem e compartilharem "
+"informações móveis online."
-#: ../src/gtk-ui/sync-config-widget.c:96
-msgid "Memotoo lets you access your personal data from any computer connected to the Internet."
-msgstr "Memotoo permite a você acessar seus dados pessoais de qualquer computador conectado a Internet."
+#: ../src/gtk-ui/sync-config-widget.c:106
+msgid ""
+"Memotoo lets you access your personal data from any computer connected to "
+"the Internet."
+msgstr ""
+"Memotoo permite a você acessar seus dados pessoais de qualquer computador "
+"conectado a Internet."
-#: ../src/gtk-ui/sync-config-widget.c:192
+#: ../src/gtk-ui/sync-config-widget.c:195
msgid "Sorry, failed to save the configuration"
msgstr "Sinto muito, falha ao salvar a configuração"
-#: ../src/gtk-ui/sync-config-widget.c:381
+#: ../src/gtk-ui/sync-config-widget.c:445
msgid "Service must have a name and server URL"
msgstr "Serviço tem que ter um nome e um URL de servidor"
-#: ../src/gtk-ui/sync-config-widget.c:422
+#. TRANSLATORS: error dialog when creating a new sync configuration
+#: ../src/gtk-ui/sync-config-widget.c:451
+msgid "A username is required for this service"
+msgstr "É preciso fornecer um nome de usuário para este serviço"
+
+#: ../src/gtk-ui/sync-config-widget.c:493
#, c-format
-msgid "Do you want to reset the settings for %s? This will not remove any synced information on either end."
-msgstr "Você quer restaurar as configurações para %s? Isto não removerá qualquer informação sincronizada em cada lado."
+msgid ""
+"Do you want to reset the settings for %s? This will not remove any synced "
+"information on either end."
+msgstr ""
+"Você quer restaurar as configurações para %s? Isto não removerá qualquer "
+"informação sincronizada em cada lado."
#. TRANSLATORS: buttons in reset-service warning dialog
-#: ../src/gtk-ui/sync-config-widget.c:426
+#: ../src/gtk-ui/sync-config-widget.c:497
msgid "Yes, reset"
msgstr "Sim, redefinir"
-#: ../src/gtk-ui/sync-config-widget.c:427
-#: ../src/gtk-ui/sync-config-widget.c:438
+#: ../src/gtk-ui/sync-config-widget.c:498
+#: ../src/gtk-ui/sync-config-widget.c:509
msgid "No, keep settings"
msgstr "Não, manter configurações "
-#: ../src/gtk-ui/sync-config-widget.c:432
+#: ../src/gtk-ui/sync-config-widget.c:503
#, c-format
-msgid "Do you want to delete the settings for %s? This will not remove any synced information on either end but it will remove these settings."
-msgstr "Você quer excluir as configurações para %s? Isto não removerá qualquer informação sincronizada de cada lado, mas removerá essas configurações."
+msgid ""
+"Do you want to delete the settings for %s? This will not remove any synced "
+"information on either end but it will remove these settings."
+msgstr ""
+"Você quer excluir as configurações para %s? Isto não removerá qualquer "
+"informação sincronizada de cada lado, mas removerá essas configurações."
#. TRANSLATORS: buttons in delete-service warning dialog
-#: ../src/gtk-ui/sync-config-widget.c:437
+#: ../src/gtk-ui/sync-config-widget.c:508
msgid "Yes, delete"
msgstr "Sim, excluir "
-#: ../src/gtk-ui/sync-config-widget.c:467
+#: ../src/gtk-ui/sync-config-widget.c:539
msgid "Reset settings"
msgstr "Redefinir configurações "
-#: ../src/gtk-ui/sync-config-widget.c:470
+#: ../src/gtk-ui/sync-config-widget.c:542
msgid "Delete settings"
msgstr "Excluir configurações"
-#: ../src/gtk-ui/sync-config-widget.c:480
+#: ../src/gtk-ui/sync-config-widget.c:552
msgid "Save and use"
msgstr "Salvar e usar"
-#: ../src/gtk-ui/sync-config-widget.c:483
+#: ../src/gtk-ui/sync-config-widget.c:555
msgid ""
"Save and replace\n"
"current service"
@@ -722,101 +831,119 @@ msgstr ""
"Salvar e substituir\n"
"serviço atual"
-#: ../src/gtk-ui/sync-config-widget.c:493
+#: ../src/gtk-ui/sync-config-widget.c:563
msgid "Stop using device"
-msgstr "Parar de usar o dispositivo"
+msgstr "Pare de usar o dispositivo"
-#: ../src/gtk-ui/sync-config-widget.c:496
+#: ../src/gtk-ui/sync-config-widget.c:566
msgid "Stop using service"
msgstr "Pare de usar o serviço"
#. TRANSLATORS: label for an entry in service configuration form.
#. * Placeholder is a source name.
#. * Example: "Appointments URI"
-#: ../src/gtk-ui/sync-config-widget.c:679
+#: ../src/gtk-ui/sync-config-widget.c:749
#, c-format
msgid "%s URI"
msgstr "URI: %s"
#. TRANSLATORS: toggles in service configuration form, placeholder is service
#. * or device name
-#: ../src/gtk-ui/sync-config-widget.c:854
+#: ../src/gtk-ui/sync-config-widget.c:936
#, c-format
msgid "Send changes to %s"
msgstr "Enviar mudanças para %s"
-#: ../src/gtk-ui/sync-config-widget.c:859
+#: ../src/gtk-ui/sync-config-widget.c:941
#, c-format
msgid "Receive changes from %s"
msgstr "Receber modificações de %s"
-#: ../src/gtk-ui/sync-config-widget.c:875
+#: ../src/gtk-ui/sync-config-widget.c:957
msgid "<b>Sync</b>"
msgstr "<b>Sincronização</b>"
#. TRANSLATORS: label of a entry in service configuration
-#: ../src/gtk-ui/sync-config-widget.c:891
+#: ../src/gtk-ui/sync-config-widget.c:973
msgid "Server address"
msgstr "Endereço de servidor"
#. TRANSLATORS: explanation before a device template combobox.
#. * Placeholder is a device name like 'Nokia N85' or 'Syncevolution
#. * Client'
-#: ../src/gtk-ui/sync-config-widget.c:967
+#: ../src/gtk-ui/sync-config-widget.c:1049
#, c-format
-msgid "This device looks like it might be a '%s'. If this is not correct, please take a look at the list of supported devices and pick yours if it is listed"
-msgstr "Este dispositivo parece ser um '%s'. Se isto não for o caso, favor verificar a lista de dispositivos suportados e selecione o seu se constar da lista"
+msgid ""
+"This device looks like it might be a '%s'. If this is not correct, please "
+"take a look at the list of supported devices and pick yours if it is listed"
+msgstr ""
+"Este dispositivo parece ser um '%s'. Se isto não for o caso, favor verificar"
+" a lista de dispositivos suportados e selecione o seu se constar da lista"
-#: ../src/gtk-ui/sync-config-widget.c:973
-msgid "We don't know what this device is exactly. Please take a look at the list of supported devices and pick yours if it is listed"
-msgstr "Não sabemos que dispositivo isto é exatamente. Favor verificar a lista de dispositivos suportados e selecione o seu se constar da lista"
+#: ../src/gtk-ui/sync-config-widget.c:1055
+#: ../src/gtk-ui/sync-config-widget.c:1915
+msgid ""
+"We don't know what this device is exactly. Please take a look at the list of"
+" supported devices and pick yours if it is listed"
+msgstr ""
+"Não sabemos que dispositivo isto é exatamente. Favor verificar a lista de "
+"dispositivos suportados e selecione o seu se constar da lista"
-#: ../src/gtk-ui/sync-config-widget.c:1126
+#: ../src/gtk-ui/sync-config-widget.c:1207
#, c-format
msgid "%s - Bluetooth device"
msgstr "%s - dispositivo Bluetooth "
#. TRANSLATORS: service title for services that are not based on a
#. * template in service list, the placeholder is the name of the service
-#: ../src/gtk-ui/sync-config-widget.c:1132
+#: ../src/gtk-ui/sync-config-widget.c:1213
#, c-format
msgid "%s - manually setup"
msgstr "%s - configurar manualmente"
#. TRANSLATORS: link button in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1807
+#: ../src/gtk-ui/sync-config-widget.c:1886
msgid "Launch website"
msgstr "Iniciar o site na web"
#. TRANSLATORS: button in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1816
+#: ../src/gtk-ui/sync-config-widget.c:1895
msgid "Set up now"
msgstr "Configure agora"
+#: ../src/gtk-ui/sync-config-widget.c:1953
+msgid "Use these settings"
+msgstr "Usar essas configurações"
+
#. TRANSLATORS: labels of entries in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1912
+#: ../src/gtk-ui/sync-config-widget.c:1991
msgid "Username"
msgstr "Nome do usuário"
-#: ../src/gtk-ui/sync-config-widget.c:1927
+#: ../src/gtk-ui/sync-config-widget.c:2006
msgid "Password"
msgstr "Senha"
#. TRANSLATORS: warning in service configuration form for people
#. who have modified the configuration via other means.
-#: ../src/gtk-ui/sync-config-widget.c:1950
-msgid "Current configuration is more complex than what can be shown here. Changes to sync mode or synced data types will overwrite that configuration."
-msgstr "Atual configuração é complexa demais para ser mostrada aqui. As modificações ao modo sincronização ou tipos de dados sincronizados substituirão aquela configuração,"
+#: ../src/gtk-ui/sync-config-widget.c:2029
+msgid ""
+"Current configuration is more complex than what can be shown here. Changes "
+"to sync mode or synced data types will overwrite that configuration."
+msgstr ""
+"Atual configuração é complexa demais para ser mostrada aqui. As modificações"
+" ao modo sincronização ou tipos de dados sincronizados substituirão aquela "
+"configuração,"
#. TRANSLATORS: this is the epander label for server settings
#. in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1969
+#: ../src/gtk-ui/sync-config-widget.c:2048
msgid "Hide server settings"
msgstr "Ocultar configurações de servidor"
#. TRANSLATORS: this is the epander label for server settings
#. in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1989
+#: ../src/gtk-ui/sync-config-widget.c:2068
msgid "Show server settings"
msgstr "Mostrar configurações de servidor"
@@ -824,146 +951,52 @@ msgstr "Mostrar configurações de servidor"
msgid "Sync in the Sync application"
msgstr "Sincronização no aplicativo Sync"
-#: ../src/syncevo-dbus-server.cpp:5664
+#: ../src/syncevo-dbus-server.cpp:6653
#, c-format
msgid "%s is syncing"
msgstr "%s está sincronizando"
-#: ../src/syncevo-dbus-server.cpp:5665
+#: ../src/syncevo-dbus-server.cpp:6654
#, c-format
msgid "We have just started to sync your computer with the %s sync service."
-msgstr "Começamos a sincronização de seu computador com o serviço de sincronização %s."
+msgstr ""
+"Começamos a sincronização de seu computador com o serviço de sincronização "
+"%s."
#. if sync is successfully started and done
-#: ../src/syncevo-dbus-server.cpp:5679
+#: ../src/syncevo-dbus-server.cpp:6670
#, c-format
msgid "%s sync complete"
msgstr "%s Sincronização completada"
-#: ../src/syncevo-dbus-server.cpp:5680
+#: ../src/syncevo-dbus-server.cpp:6671
#, c-format
msgid "We have just finished syncing your computer with the %s sync service."
-msgstr "Completamos a sincronização de seu computador com o serviço de sincronização %s."
+msgstr ""
+"Completamos a sincronização de seu computador com o serviço de sincronização"
+" %s."
-#. if sync is successfully started and has errors, or not started successful with a fatal problem
-#: ../src/syncevo-dbus-server.cpp:5685
+#. if sync is successfully started and has errors, or not started successful
+#. with a fatal problem
+#: ../src/syncevo-dbus-server.cpp:6676
msgid "Sync problem."
msgstr "Problema com sincronização. "
-#: ../src/syncevo-dbus-server.cpp:5686
+#: ../src/syncevo-dbus-server.cpp:6677
msgid "Sorry, there's a problem with your sync that you need to attend to."
-msgstr "Sinto muito, existe um problema com sua sincronização e necessita a sua atenção."
+msgstr ""
+"Sinto muito, existe um problema com sua sincronização e necessita a sua "
+"atenção."
-#: ../src/syncevo-dbus-server.cpp:5759
+#: ../src/syncevo-dbus-server.cpp:6758
msgid "View"
msgstr "Visualizar"
#. Use "default" as ID because that is what mutter-moblin
#. recognizes: it then skips the action instead of adding it
#. in addition to its own "Dismiss" button (always added).
-#: ../src/syncevo-dbus-server.cpp:5763
+#: ../src/syncevo-dbus-server.cpp:6762
msgid "Dismiss"
msgstr "Ignorar"
-#~ msgid "Database error"
-#~ msgstr "Erro de banco de dados"
-#~ msgid ""
-#~ "Do you want to replace %s with %s? This will not remove any synced "
-#~ "information on either end but you will no longer be able to sync with %s."
-#~ msgstr ""
-#~ "Você quer substituir %s com %s? Isto não removerá qualquer informação de "
-#~ "sincronização nos dois lados porém não poderá mais fazer sincronização "
-#~ "vom %s."
-#~ msgid "Yes, use %s"
-#~ msgstr "Sim, use %s"
-#~ msgid "No, use %s"
-#~ msgstr "Não, use %s"
-#~ msgid "Reset service"
-#~ msgstr "Redefinir serviço"
-#~ msgid "Addressbook"
-#~ msgstr "Endereços"
-#~ msgid "Todo"
-#~ msgstr "Tarefas"
-#~ msgid "Memo"
-#~ msgstr "Anotação"
-#~ msgid "Failed to save current service in GConf configuration system"
-#~ msgstr "Falha ao salvar o serviço atual no sistema de configuração do GConf"
-#~ msgid "Failed to save service configuration to SyncEvolution"
-#~ msgstr "Falha ao salvar a configuração de serviço ao SyncEvolution"
-#~ msgid "Failed to get service configuration from SyncEvolution"
-#~ msgstr "Falha ao buscar a configuração de serviço do SyncEvolution"
-#~ msgid "Failed to remove service configuration from SyncEvolution"
-#~ msgstr "Falha ao remover a configuração de serviço do SyncEvolution"
-#~ msgid "Failed to cancel: sync was no longer in progress"
-#~ msgstr "Falhou ao cancelar: sincronização não estava em andamento"
-#~ msgid "Failed to cancel sync"
-#~ msgstr "Falha ao cancelar sincronização"
-#~ msgid "Canceling sync"
-#~ msgstr "Cancelando sincronização"
-#~ msgid "No sources are enabled, not syncing"
-#~ msgstr "Nenhuma fonte habilitada, não sincronizando."
-#~ msgid "A sync is already in progress"
-#~ msgstr "Sincronização já em andamento"
-#~ msgid "Failed to start sync"
-#~ msgstr "Falha no início da sincronização"
-#~ msgid "%s (not supported by this service)"
-#~ msgstr "%s: (não suportado por este serviço)"
-#~ msgid "Failed to get server configuration from SyncEvolution"
-#~ msgstr "Não conseguiu a configuração do servidor do SyncEvolution"
-#~ msgid "Server URL"
-#~ msgstr "URL de servidor"
-#~ msgid "Failed to get list of manually setup services from SyncEvolution"
-#~ msgstr ""
-#~ "Não conseguiu a lista de serviços configurados manualmente do "
-#~ "SyncEvolution"
-#~ msgid "Service configuration not found"
-#~ msgstr "Configuração de serviço não localizado"
-#~ msgid "Not authorized"
-#~ msgstr "Não autorizado"
-#~ msgid "Not found"
-#~ msgstr "Não localizado"
-#~ msgid "Transport failure (no connection?)"
-#~ msgstr "Falha de transporte (sem conexão?)"
-#~ msgid "Connection timed out"
-#~ msgstr "Conexão expirou"
-#~ msgid "Sync canceled"
-#~ msgstr "Sinc. cancelado"
-#~ msgid "Ending sync"
-#~ msgstr "Terminando sinc."
-#~ msgid "<b>No sync service in use</b>"
-#~ msgstr "<b>Nenhum serviço de sincronização em uso</b>"
-#~ msgid "<big>Manual setup</big>"
-#~ msgstr "<big>Configuração manual</big>"
-#~ msgid "Merge local and remote data (recommended)"
-#~ msgstr "Intercalar dados locais e remotos (recomendado)"
-#~ msgid "Reset original server settings"
-#~ msgstr "Reinicializar configurações originais do servidor"
-#~ msgid "Service name"
-#~ msgstr "Nome do serviço"
-#~ msgid ""
-#~ "Sorry, you need an internet\n"
-#~ "connection to sync."
-#~ msgstr ""
-#~ "Sinto muito, você precisa de\n"
-#~ "conexão internet para sincronizar."
-#~ msgid ""
-#~ "Synchronization is not available (D-Bus service does not answer), sorry."
-#~ msgstr ""
-#~ "Sincronização não disponível (Serviço D-Bus não responde), sinto muito."
-#~ msgid "Last time: Received one change."
-#~ msgid_plural "Last time: Received %d changes."
-#~ msgstr[0] "Ultima vez: Recebeu uma mudança."
-#~ msgstr[1] "Ultima vez: Recebeu %d mudanças."
-#~ msgid "Last time: Received %d changes and sent %d changes."
-#~ msgstr "Ultima vez: Recebidos %d mudanças e enviados %d mudanças."
-#~ msgid "Setup sync service"
-#~ msgstr "Configurar serviço de sincronização"
-#~ msgid ""
-#~ "You haven't set up a sync service yet. Sync services let you \n"
-#~ "synchronize your data between your netbook and a web service."
-#~ msgstr ""
-#~ "Você ainda não configurou seu serviço de sincronização. Os serviços\n"
-#~ "lhe permitem sincronizar os dados entre netbook e serviço na web."
-#~ msgid "Bring your data with you"
-#~ msgstr "Traga seus dados contigo"
diff --git a/po/ru.po b/po/ru.po
index 9e403c12..55e7aa03 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,27 +1,27 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+#
+# Translators:
+# <melentiev@gmail.com>, 2011.
+# <tomas.galicia@intel.com>, 2011.
msgid ""
msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: http://moblin.org/projects/syncevolution\n"
-"POT-Creation-Date: 2010-05-05 09:24+0000\n"
-"PO-Revision-Date: 2010-05-17 17:45-0800\n"
-"Last-Translator: Bogdan Nosach <bogdan.nosach@ptiglobal.net>\n"
-"Language-Team: \n"
+"Project-Id-Version: syncevolution\n"
+"Report-Msgid-Bugs-To: https://bugs.meego.com/\n"
+"POT-Creation-Date: 2011-12-05 10:21-0800\n"
+"PO-Revision-Date: 2011-12-05 23:16+0000\n"
+"Last-Translator: GLS_Translator_RUS2 <melentiev@gmail.com>\n"
+"Language-Team: Russian (http://www.transifex.net/projects/p/meego/team/ru/)\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n!=1;\n"
-"X-Poedit-Language: Russian\n"
-"X-Poedit-SourceCharset: utf-8\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
#. TRANSLATORS: this is the application name that may be used by e.g.
#. the windowmanager
-#: ../src/gtk-ui/main.c:40
-#: ../src/gtk-ui/ui.glade.h:38
+#: ../src/gtk-ui/main.c:40 ../src/gtk-ui/ui.glade.h:38
#: ../src/gtk-ui/sync.desktop.in.h:1
#: ../src/gnome-bluetooth/syncevolution.c:112
msgid "Sync"
@@ -35,8 +35,7 @@ msgstr "Контакты"
msgid "Appointments"
msgstr "Встречи"
-#: ../src/gtk-ui/sync-ui.c:270
-#: ../src/gtk-ui/ui.glade.h:40
+#: ../src/gtk-ui/sync-ui.c:270 ../src/gtk-ui/ui.glade.h:40
msgid "Tasks"
msgstr "Задания"
@@ -70,72 +69,78 @@ msgstr "Да, замедлить синхронизацию"
msgid "No, cancel sync"
msgstr "Нет, отменить синхронизацию"
-#. TRANSLATORS: confirmation dialog for refresh-from-server. Placeholder
+#. TRANSLATORS: confirmation dialog for "refresh from peer". Placeholder
#. * is service/device name
#: ../src/gtk-ui/sync-ui.c:424
#, c-format
-msgid "Do you want to delete all local data and replace it with data from %s? This is not usually advised."
-msgstr "Удалить все локальные данные и заменить их на %s? Обычно это не рекомендуется."
+msgid ""
+"Do you want to delete all local data and replace it with data from %s? This "
+"is not usually advised."
+msgstr ""
+"Удалить все локальные данные и заменить их на %s? Обычно это не "
+"рекомендуется."
-#: ../src/gtk-ui/sync-ui.c:429
-#: ../src/gtk-ui/sync-ui.c:460
+#: ../src/gtk-ui/sync-ui.c:429 ../src/gtk-ui/sync-ui.c:462
msgid "Yes, delete and replace"
msgstr "Да, удалить и заменить"
-#: ../src/gtk-ui/sync-ui.c:429
-#: ../src/gtk-ui/sync-ui.c:460
-#: ../src/gtk-ui/sync-ui.c:1580
+#: ../src/gtk-ui/sync-ui.c:429 ../src/gtk-ui/sync-ui.c:462
+#: ../src/gtk-ui/sync-ui.c:1610
msgid "No"
msgstr "Нет"
-#. TRANSLATORS: confirmation dialog for refresh-from-client. Placeholder
+#. TRANSLATORS: confirmation dialog for "refresh from local side". Placeholder
#. * is service/device name
-#: ../src/gtk-ui/sync-ui.c:455
+#: ../src/gtk-ui/sync-ui.c:457
#, c-format
-msgid "Do you want to delete all data in %s and replace it with your local data? This is not usually advised."
-msgstr "Хотите удалить все данные в %s и заменить на ваши локальные данные? Обычно это не рекомендуется."
+msgid ""
+"Do you want to delete all data in %s and replace it with your local data? "
+"This is not usually advised."
+msgstr ""
+"Хотите удалить все данные в %s и заменить на ваши локальные данные? Обычно "
+"это не рекомендуется."
-#: ../src/gtk-ui/sync-ui.c:487
+#: ../src/gtk-ui/sync-ui.c:491
msgid "Trying to cancel sync"
msgstr "Попытка отменить синхронизацию"
-#: ../src/gtk-ui/sync-ui.c:529
+#: ../src/gtk-ui/sync-ui.c:533
msgid "No service or device selected"
msgstr "Служба или устройство не выбраны"
#. TRANSLATORS: This is the title on main view. Placeholder is
#. * the service name. Example: "Google - synced just now"
-#: ../src/gtk-ui/sync-ui.c:537
+#: ../src/gtk-ui/sync-ui.c:541
#, c-format
msgid "%s - synced just now"
msgstr "%s - синхронизировано сейчас"
-#: ../src/gtk-ui/sync-ui.c:541
+#: ../src/gtk-ui/sync-ui.c:545
#, c-format
msgid "%s - synced a minute ago"
msgstr "%s - синхронизировано минуту назад"
-#: ../src/gtk-ui/sync-ui.c:545
+#: ../src/gtk-ui/sync-ui.c:549
#, c-format
msgid "%s - synced %ld minutes ago"
msgstr "%s - синхронизировано %ld минут назад"
-#: ../src/gtk-ui/sync-ui.c:550
+#: ../src/gtk-ui/sync-ui.c:554
#, c-format
msgid "%s - synced an hour ago"
msgstr "%s - синхронизировано час назад"
-#: ../src/gtk-ui/sync-ui.c:554
+#: ../src/gtk-ui/sync-ui.c:558
#, c-format
msgid "%s - synced %ld hours ago"
msgstr "%s - синхронизировано %ld часов назад"
-#: ../src/gtk-ui/sync-ui.c:559
+#: ../src/gtk-ui/sync-ui.c:563
#, c-format
msgid "%s - synced a day ago"
msgstr "%s - синхронизировано день назад"
-#: ../src/gtk-ui/sync-ui.c:563
+#: ../src/gtk-ui/sync-ui.c:567
#, c-format
msgid "%s - synced %ld days ago"
msgstr "%s - синхронизировано %ld дней назад"
@@ -143,66 +148,69 @@ msgstr "%s - синхронизировано %ld дней назад"
#. TRANSLATORS: Action button in info bar in main view. Shown with e.g.
#. * "You've just restored a backup. The changes have not been "
#. * "synced with %s yet"
-#: ../src/gtk-ui/sync-ui.c:612
-#: ../src/gtk-ui/sync-ui.c:726
+#: ../src/gtk-ui/sync-ui.c:616 ../src/gtk-ui/sync-ui.c:701
msgid "Sync now"
msgstr "Синхронизировать"
#. TRANSLATORS: Action button in info bar in main view. Shown with e.g.
#. * "A normal sync is not possible at this time..." message.
#. * "Other options" will open Emergency view
-#: ../src/gtk-ui/sync-ui.c:618
-#: ../src/gtk-ui/ui.glade.h:37
+#: ../src/gtk-ui/sync-ui.c:622 ../src/gtk-ui/ui.glade.h:37
msgid "Slow sync"
msgstr "Медленная/nсинхронизация"
-#: ../src/gtk-ui/sync-ui.c:619
+#: ../src/gtk-ui/sync-ui.c:623
msgid "Other options..."
msgstr "Другие варианты..."
#. TRANSLATORS: Action button in info bar in main view. Shown e.g.
#. * when no service is selected. Will open configuration view
-#: ../src/gtk-ui/sync-ui.c:624
+#: ../src/gtk-ui/sync-ui.c:628
msgid "Select sync service"
msgstr "Выбрать службу синхронизации"
#. TRANSLATORS: Action button in info bar in main view. Shown e.g.
#. * login to service fails. Will open configuration view for this service
-#: ../src/gtk-ui/sync-ui.c:629
+#: ../src/gtk-ui/sync-ui.c:633
msgid "Edit service settings"
msgstr "Редактировать настройки службы"
-#: ../src/gtk-ui/sync-ui.c:700
-msgid "You haven't selected a sync service or device yet. Sync services let you synchronize your data between your netbook and a web service. You can also sync directly with some devices."
-msgstr "Служба синхронизации или устройство еще не выбраны. Службы синхронизации позволяют синхронизировать данные между нетбуком и веб-службой. Кроме того, вы можете выполнить синхронизацию непосредственно с некоторыми устройствами."
+#: ../src/gtk-ui/sync-ui.c:709
+msgid ""
+"You haven't selected a sync service or device yet. Sync services let you "
+"synchronize your data between your netbook and a web service. You can also "
+"sync directly with some devices."
+msgstr ""
+"Служба синхронизации или устройство еще не выбраны. Службы синхронизации "
+"позволяют синхронизировать данные между нетбуком и веб-службой. Кроме того, "
+"вы можете выполнить синхронизацию непосредственно с некоторыми устройствами."
-#: ../src/gtk-ui/sync-ui.c:722
+#: ../src/gtk-ui/sync-ui.c:729
msgid "Sync again"
msgstr "Синхронизировать повторно"
-#: ../src/gtk-ui/sync-ui.c:743
+#: ../src/gtk-ui/sync-ui.c:748
msgid "Restoring"
msgstr "Восстановление"
-#: ../src/gtk-ui/sync-ui.c:745
+#: ../src/gtk-ui/sync-ui.c:750
msgid "Syncing"
msgstr "Синхронизация"
#. TRANSLATORS: This is for the button in main view, right side.
#. Keep line length below ~20 characters, use two lines if needed
-#: ../src/gtk-ui/sync-ui.c:757
-#: ../src/gtk-ui/sync-ui.c:3374
+#: ../src/gtk-ui/sync-ui.c:762 ../src/gtk-ui/sync-ui.c:3407
msgid "Cancel sync"
msgstr "Отменить синхронизацию"
-#: ../src/gtk-ui/sync-ui.c:922
+#: ../src/gtk-ui/sync-ui.c:927
msgid "Back to sync"
msgstr "Вернуться к синхронизации"
#. TRANSLATORS: label for checkbutton/toggle in main view.
#. * Please stick to similar length strings or break the line with
#. * "\n" if absolutely needed
-#: ../src/gtk-ui/sync-ui.c:1223
+#: ../src/gtk-ui/sync-ui.c:1229
msgid "Automatic sync"
msgstr "Автоматическая синхронизация"
@@ -210,61 +218,77 @@ msgstr "Автоматическая синхронизация"
#. * currently selected data sources. First placeholder is service/device
#. * name, second a comma separeted list of sources.
#. * E.g. "Affected data: Google Contacts, Appointments"
-#: ../src/gtk-ui/sync-ui.c:1494
+#: ../src/gtk-ui/sync-ui.c:1524
#, c-format
msgid "Affected data: %s %s"
msgstr "Поврежденные данные: %s %s"
-#: ../src/gtk-ui/sync-ui.c:1499
+#: ../src/gtk-ui/sync-ui.c:1529
#, c-format
msgid "Affected data: none"
msgstr "Поврежденные данные: нет"
#. TRANSLATORS: confirmation for restoring a backup. placeholder is the
#. * backup time string defined below
-#: ../src/gtk-ui/sync-ui.c:1577
+#: ../src/gtk-ui/sync-ui.c:1607
#, c-format
-msgid "Do you want to restore the backup from %s? All changes you have made since then will be lost."
-msgstr "Восстановить резервные файлы из %s? Все внесенные изменения будут утрачены."
+msgid ""
+"Do you want to restore the backup from %s? All changes you have made since "
+"then will be lost."
+msgstr ""
+"Восстановить резервные файлы из %s? Все внесенные изменения будут утрачены."
-#: ../src/gtk-ui/sync-ui.c:1580
+#: ../src/gtk-ui/sync-ui.c:1610
msgid "Yes, restore"
msgstr "Да, восстановить"
#. TRANSLATORS: date/time for strftime(), used in emergency view backup
#. * label. Any time format that shows date and time is good.
-#: ../src/gtk-ui/sync-ui.c:1612
+#: ../src/gtk-ui/sync-ui.c:1642
#, c-format
msgid "%x %X"
msgstr "%x %X"
#. TRANSLATORS: label for a backup in emergency view. Placeholder is
#. * service or device name
-#: ../src/gtk-ui/sync-ui.c:1631
+#: ../src/gtk-ui/sync-ui.c:1661
#, c-format
msgid "Backed up before syncing with %s"
msgstr "Создана резервная копия перед синхронизацией с %s"
-#: ../src/gtk-ui/sync-ui.c:1648
+#: ../src/gtk-ui/sync-ui.c:1678
msgid "Restore"
msgstr "Восстановить"
#. TRANSLATORS: this is an explanation in Emergency view.
#. * Placeholder is a service/device name
-#: ../src/gtk-ui/sync-ui.c:1755
+#: ../src/gtk-ui/sync-ui.c:1785
#, c-format
-msgid "A normal sync with %s is not possible at this time. You can do a slow two-way sync or start from scratch. You can also restore a backup, but a slow sync or starting from scratch will still be required before normal sync is possible."
-msgstr "В настоящий момент стандартная синхронизация с %s невозможна. Вы можете выполнить медленную двустороннюю синхронизацию или начать с черновой версии. Вы также можете восстановить резервную копию, но медленная синхронизация или черновая вресия все еще будут необходимы до того, как стандартная синхронизация станет возможной."
+msgid ""
+"A normal sync with %s is not possible at this time. You can do a slow two-"
+"way sync or start from scratch. You can also restore a backup, but a slow "
+"sync or starting from scratch will still be required before normal sync is "
+"possible."
+msgstr ""
+"В настоящий момент стандартная синхронизация с %s невозможна. Вы можете "
+"выполнить медленную двустороннюю синхронизацию или начать с черновой версии."
+" Вы также можете восстановить резервную копию, но медленная синхронизация "
+"или черновая вресия все еще будут необходимы до того, как стандартная "
+"синхронизация станет возможной."
-#: ../src/gtk-ui/sync-ui.c:1765
+#: ../src/gtk-ui/sync-ui.c:1795
#, c-format
-msgid "If something has gone horribly wrong, you can try a slow sync, start from scratch or restore from backup."
-msgstr "При наличии серьезных сбоев можно попробовать выполнить медленную синхронизацию, запуск с черновой версии или восстановление резервной копии."
+msgid ""
+"If something has gone horribly wrong, you can try a slow sync, start from "
+"scratch or restore from backup."
+msgstr ""
+"При наличии серьезных сбоев можно попробовать выполнить медленную "
+"синхронизацию, запуск с черновой версии или восстановление резервной копии."
#. TRANSLATORS: These are a buttons in Emergency view. Placeholder is a
#. * service/device name. Please don't use too long lines, but feel free to
#. * use several lines.
-#: ../src/gtk-ui/sync-ui.c:1774
+#: ../src/gtk-ui/sync-ui.c:1804
#, c-format
msgid ""
"Delete all your local\n"
@@ -275,7 +299,7 @@ msgstr ""
"данные и замените на\n"
"данные из %s"
-#: ../src/gtk-ui/sync-ui.c:1780
+#: ../src/gtk-ui/sync-ui.c:1810
#, c-format
msgid ""
"Delete all data on\n"
@@ -286,95 +310,101 @@ msgstr ""
"%s и замените\n"
"на свои локальные данные"
-#: ../src/gtk-ui/sync-ui.c:2242
+#: ../src/gtk-ui/sync-ui.c:2275
msgid "Failed to get list of supported services from SyncEvolution"
msgstr "Не удалось получить список поддерживаемых служб от SyncEvolution"
-#: ../src/gtk-ui/sync-ui.c:2296
-msgid "There was a problem communicating with the sync process. Please try again later."
-msgstr "проблема установки связи с процессом синхронизации. Повторите попытку позже."
+#: ../src/gtk-ui/sync-ui.c:2329
+msgid ""
+"There was a problem communicating with the sync process. Please try again "
+"later."
+msgstr ""
+"проблема установки связи с процессом синхронизации. Повторите попытку позже."
-#: ../src/gtk-ui/sync-ui.c:2355
+#: ../src/gtk-ui/sync-ui.c:2388
msgid "Restore failed"
msgstr "Восстановление не удалось"
-#: ../src/gtk-ui/sync-ui.c:2358
-#: ../src/gtk-ui/sync-ui.c:3243
+#: ../src/gtk-ui/sync-ui.c:2391 ../src/gtk-ui/sync-ui.c:3276
msgid "Sync failed"
msgstr "Синхронизация не удалась"
-#: ../src/gtk-ui/sync-ui.c:2364
+#: ../src/gtk-ui/sync-ui.c:2397
msgid "Restore complete"
msgstr "Восстановление завершено"
-#: ../src/gtk-ui/sync-ui.c:2367
+#: ../src/gtk-ui/sync-ui.c:2400
msgid "Sync complete"
msgstr "Синхронизация завершена"
-#: ../src/gtk-ui/sync-ui.c:2459
+#: ../src/gtk-ui/sync-ui.c:2492
#, c-format
msgid "Preparing '%s'"
msgstr "Подготовка '%s'"
-#: ../src/gtk-ui/sync-ui.c:2462
+#: ../src/gtk-ui/sync-ui.c:2495
#, c-format
msgid "Receiving '%s'"
msgstr "Получение '%s'"
-#: ../src/gtk-ui/sync-ui.c:2465
+#: ../src/gtk-ui/sync-ui.c:2498
#, c-format
msgid "Sending '%s'"
msgstr "Отправка '%s'"
-#: ../src/gtk-ui/sync-ui.c:2586
+#: ../src/gtk-ui/sync-ui.c:2619
#, c-format
msgid "There was one remote rejection."
msgid_plural "There were %ld remote rejections."
-msgstr[0] "Был один удаленный отказ."
-msgstr[1] "Было %ld удаленных отказов."
+msgstr[0] "Удаленное отклонение: одно."
+msgstr[1] "Удаленные отклонения: %ld."
+msgstr[2] "Удаленные отклонения: %ld."
-#: ../src/gtk-ui/sync-ui.c:2591
+#: ../src/gtk-ui/sync-ui.c:2624
#, c-format
msgid "There was one local rejection."
msgid_plural "There were %ld local rejections."
-msgstr[0] "Был один локальный отказ."
-msgstr[1] "Было %ld локальных отказов."
+msgstr[0] "Локальное отклонение: одно."
+msgstr[1] "Локальные отклонения: %ld."
+msgstr[2] "Локальные отклонения: %ld."
-#: ../src/gtk-ui/sync-ui.c:2596
+#: ../src/gtk-ui/sync-ui.c:2629
#, c-format
msgid "There were %ld local rejections and %ld remote rejections."
msgstr "Было %ld локальных и %ld удаленных отказов."
-#: ../src/gtk-ui/sync-ui.c:2601
+#: ../src/gtk-ui/sync-ui.c:2634
#, c-format
msgid "Last time: No changes."
msgstr "Прошлый раз: без изменений."
-#: ../src/gtk-ui/sync-ui.c:2603
+#: ../src/gtk-ui/sync-ui.c:2636
#, c-format
msgid "Last time: Sent one change."
msgid_plural "Last time: Sent %ld changes."
msgstr[0] "Прошлый раз: отправлено одно изменение."
-msgstr[1] "Прошлый раз: отправлено %ld изменений."
+msgstr[1] "Прошлый раз: отправлено изменений: %ld."
+msgstr[2] "Прошлый раз: отправлено изменений: %ld."
#. This is about changes made to the local data. Not all of these
#. changes were requested by the remote server, so "applied"
#. is a better word than "received" (bug #5185).
-#: ../src/gtk-ui/sync-ui.c:2611
+#: ../src/gtk-ui/sync-ui.c:2644
#, c-format
msgid "Last time: Applied one change."
msgid_plural "Last time: Applied %ld changes."
msgstr[0] "Прошлый раз: применено одно изменение."
-msgstr[1] "Прошлый раз: применено %ld изменений."
+msgstr[1] "Прошлый раз: применено изменений: %ld."
+msgstr[2] "Прошлый раз: применено изменений: %ld."
-#: ../src/gtk-ui/sync-ui.c:2616
+#: ../src/gtk-ui/sync-ui.c:2649
#, c-format
msgid "Last time: Applied %ld changes and sent %ld changes."
msgstr "Прошлый раз: применено %ld и отправлено %ld изменений."
#. TRANSLATORS: the placeholder is a error message (hopefully)
#. * explaining the problem
-#: ../src/gtk-ui/sync-ui.c:2823
+#: ../src/gtk-ui/sync-ui.c:2856
#, c-format
msgid ""
"There was a problem with last sync:\n"
@@ -383,124 +413,151 @@ msgstr ""
"Ошибка во время последней синхронизации:\n"
"%s"
-#: ../src/gtk-ui/sync-ui.c:2833
+#: ../src/gtk-ui/sync-ui.c:2866
#, c-format
-msgid "You've just restored a backup. The changes have not been synced with %s yet"
-msgstr "Вы только что восстановили резервную копию. Изменения еще не синхронизированы с %s"
+msgid ""
+"You've just restored a backup. The changes have not been synced with %s yet"
+msgstr ""
+"Вы только что восстановили резервную копию. Изменения еще не "
+"синхронизированы с %s"
-#: ../src/gtk-ui/sync-ui.c:3121
+#: ../src/gtk-ui/sync-ui.c:3154
msgid "Waiting for current operation to finish..."
msgstr "Ожидание окончания текущей операции..."
#. TRANSLATORS: next strings are error messages.
-#: ../src/gtk-ui/sync-ui.c:3155
-msgid "A normal sync is not possible at this time. The server suggests a slow sync, but this might not always be what you want if both ends already have data."
-msgstr "В настоящий момент стандартная синхронизация невозможна. Сервер предлагает медленную синхронизацию, но это не всегда приводит к желаемому результату, если на обеих сторонах уже имеются данные."
+#: ../src/gtk-ui/sync-ui.c:3188
+msgid ""
+"A normal sync is not possible at this time. The server suggests a slow sync,"
+" but this might not always be what you want if both ends already have data."
+msgstr ""
+"В настоящий момент стандартная синхронизация невозможна. Сервер предлагает "
+"медленную синхронизацию, но это не всегда приводит к желаемому результату, "
+"если на обеих сторонах уже имеются данные."
-#: ../src/gtk-ui/sync-ui.c:3159
+#: ../src/gtk-ui/sync-ui.c:3192
msgid "The sync process died unexpectedly."
msgstr "Неожиданный сбой процесса синхронизации."
-#: ../src/gtk-ui/sync-ui.c:3164
-msgid "Password request was not answered. You can save the password in the settings to prevent the request."
-msgstr "Запрос пароля остался без ответа. Вы можете сохранить пароль в настройках для предупреждения запроса."
+#: ../src/gtk-ui/sync-ui.c:3197
+msgid ""
+"Password request was not answered. You can save the password in the settings"
+" to prevent the request."
+msgstr ""
+"Запрос пароля остался без ответа. Вы можете сохранить пароль в настройках "
+"для предупреждения запроса."
#. TODO use the service device name here, this is a remote problem
-#: ../src/gtk-ui/sync-ui.c:3168
+#: ../src/gtk-ui/sync-ui.c:3201
msgid "There was a problem processing sync request. Trying again may help."
-msgstr "Проблема обработки запроса синхронизации. Возможно, повторная попытка может помочь."
+msgstr ""
+"Проблема обработки запроса синхронизации. Возможно, повторная попытка может "
+"помочь."
-#: ../src/gtk-ui/sync-ui.c:3174
-msgid "Failed to login. Could there be a problem with your username or password?"
-msgstr "Не удалось войти в систему. Возможно, неправильное имя пользователя или пароль?"
+#: ../src/gtk-ui/sync-ui.c:3207
+msgid ""
+"Failed to login. Could there be a problem with your username or password?"
+msgstr ""
+"Не удалось войти в систему. Возможно, неправильное имя пользователя или "
+"пароль?"
-#: ../src/gtk-ui/sync-ui.c:3177
+#: ../src/gtk-ui/sync-ui.c:3210
msgid "Forbidden"
msgstr "Запрещено"
#. TRANSLATORS: data source means e.g. calendar or addressbook
-#: ../src/gtk-ui/sync-ui.c:3183
-msgid "A data source could not be found. Could there be a problem with the settings?"
+#: ../src/gtk-ui/sync-ui.c:3216
+msgid ""
+"A data source could not be found. Could there be a problem with the "
+"settings?"
msgstr "Источник найти не удалось. Возможно, неправильные настройки."
-#: ../src/gtk-ui/sync-ui.c:3187
+#: ../src/gtk-ui/sync-ui.c:3220
msgid "Remote database error"
msgstr "Ошибка удаленной базы данных"
#. This can happen when EDS is borked, restart it may help...
-#: ../src/gtk-ui/sync-ui.c:3190
-msgid "There is a problem with the local database. Syncing again or rebooting may help."
-msgstr "Проблема локальной базы данных. Возможно, повторная синхронизация или перезагрузка могут помочь."
+#: ../src/gtk-ui/sync-ui.c:3223
+msgid ""
+"There is a problem with the local database. Syncing again or rebooting may "
+"help."
+msgstr ""
+"Проблема локальной базы данных. Возможно, повторная синхронизация или "
+"перезагрузка могут помочь."
-#: ../src/gtk-ui/sync-ui.c:3193
+#: ../src/gtk-ui/sync-ui.c:3226
msgid "No space on disk"
msgstr "Недостаточно свободного места на диске"
-#: ../src/gtk-ui/sync-ui.c:3195
+#: ../src/gtk-ui/sync-ui.c:3228
msgid "Failed to process SyncML"
msgstr "Не удалось обработать SyncML"
-#: ../src/gtk-ui/sync-ui.c:3197
+#: ../src/gtk-ui/sync-ui.c:3230
msgid "Server authorization failed"
msgstr "Авторизация сервера не удалась"
-#: ../src/gtk-ui/sync-ui.c:3199
+#: ../src/gtk-ui/sync-ui.c:3232
msgid "Failed to parse configuration file"
msgstr "Преобразование файла конфигурации не удалось"
-#: ../src/gtk-ui/sync-ui.c:3201
+#: ../src/gtk-ui/sync-ui.c:3234
msgid "Failed to read configuration file"
msgstr "Не удалось прочитать файл конфигурации"
-#: ../src/gtk-ui/sync-ui.c:3203
+#: ../src/gtk-ui/sync-ui.c:3236
msgid "No configuration found"
msgstr "Конфигурация не найдена"
-#: ../src/gtk-ui/sync-ui.c:3205
+#: ../src/gtk-ui/sync-ui.c:3238
msgid "No configuration file found"
msgstr "Файл конфигурации не найден"
-#: ../src/gtk-ui/sync-ui.c:3207
+#: ../src/gtk-ui/sync-ui.c:3240
msgid "Server sent bad content"
msgstr "Сервер отправил недействительную информацию"
-#: ../src/gtk-ui/sync-ui.c:3209
+#: ../src/gtk-ui/sync-ui.c:3242
msgid "Connection certificate has expired"
msgstr "Срок действия сертификата подключения истек"
-#: ../src/gtk-ui/sync-ui.c:3211
+#: ../src/gtk-ui/sync-ui.c:3244
msgid "Connection certificate is invalid"
msgstr "Сертификат подключения недействителен"
-#: ../src/gtk-ui/sync-ui.c:3219
-msgid "We were unable to connect to the server. The problem could be temporary or there could be something wrong with the settings."
-msgstr "Не удалось подключиться к серверу. Проблема может быть временной, либо неправильно указаны настройки."
+#: ../src/gtk-ui/sync-ui.c:3252
+msgid ""
+"We were unable to connect to the server. The problem could be temporary or "
+"there could be something wrong with the settings."
+msgstr ""
+"Не удалось подключиться к серверу. Проблема может быть временной, либо "
+"неправильно указаны настройки."
-#: ../src/gtk-ui/sync-ui.c:3226
+#: ../src/gtk-ui/sync-ui.c:3259
msgid "The server URL is bad"
msgstr "Неверный URL-адрес сервера"
-#: ../src/gtk-ui/sync-ui.c:3231
+#: ../src/gtk-ui/sync-ui.c:3264
msgid "The server was not found"
msgstr "Сервер найти не удалось"
-#: ../src/gtk-ui/sync-ui.c:3233
+#: ../src/gtk-ui/sync-ui.c:3266
#, c-format
msgid "Error %d"
msgstr "Ошибка %d"
#. TRANSLATORS: password request dialog contents: title, cancel button
#. * and ok button
-#: ../src/gtk-ui/sync-ui.c:3371
+#: ../src/gtk-ui/sync-ui.c:3404
msgid "Password is required for sync"
msgstr "Для синхронизации требуется пароль"
-#: ../src/gtk-ui/sync-ui.c:3375
+#: ../src/gtk-ui/sync-ui.c:3408
msgid "Sync with password"
msgstr "Синхронизация с паролем"
#. TRANSLATORS: password request dialog message, placeholder is service name
-#: ../src/gtk-ui/sync-ui.c:3385
+#: ../src/gtk-ui/sync-ui.c:3418
#, c-format
msgid "Please enter password for syncing with %s:"
msgstr "Введите пароль для синхронизации с %s:"
@@ -556,14 +613,19 @@ msgstr "Новая служба"
#. explanation of "Restore backup" function
#: ../src/gtk-ui/ui.glade.h:18
-msgid "Backups are made before every time we Sync. Choose a backup to restore. Any changes you have made since then will be lost."
-msgstr "Резервные копии создаются перед каждой синхронизацией. Выберите одну из них для восстановления. Все изменения, внесенные после этого, будут утрачены."
+msgid ""
+"Backups are made before every time we Sync. Choose a backup to restore. Any "
+"changes you have made since then will be lost."
+msgstr ""
+"Резервные копии создаются перед каждой синхронизацией. Выберите одну из них "
+"для восстановления. Все изменения, внесенные после этого, будут утрачены."
#: ../src/gtk-ui/ui.glade.h:19
msgid "Calendar"
msgstr "Календарь"
-#. Button in main view, right side. Keep to below 20 chars per line, feel free to use two lines
+#. Button in main view, right side. Keep to below 20 chars per line, feel free
+#. to use two lines
#: ../src/gtk-ui/ui.glade.h:21
msgid ""
"Change or edit\n"
@@ -597,7 +659,8 @@ msgstr ""
"информацию и замените\n"
"на данные из Zyb"
-#. button in main view, right side. Keep length to 20 characters or so, use two lines if needed
+#. button in main view, right side. Keep length to 20 characters or so, use
+#. two lines if needed
#: ../src/gtk-ui/ui.glade.h:32
msgid ""
"Fix a sync\n"
@@ -632,94 +695,137 @@ msgstr ""
#: ../src/gtk-ui/ui.glade.h:43
msgid "Use Bluetooth to Sync your data from one device to another."
-msgstr "Используйте bluetooth для синхронизации своих данных между устройствами."
+msgstr ""
+"Используйте bluetooth для синхронизации своих данных между устройствами."
#: ../src/gtk-ui/ui.glade.h:44
msgid "You will need to add Bluetooth devices before they can be synced."
-msgstr "Перед синхронизацией вам необходимо добавить устройства с поддержкой Bluetooth."
+msgstr ""
+"Перед синхронизацией вам необходимо добавить устройства с поддержкой "
+"Bluetooth."
#: ../src/gtk-ui/sync.desktop.in.h:2
-#: ../src/gtk-ui/sync-gtk.desktop.in.h:2
msgid "Up to date"
msgstr "Обновлено"
#: ../src/gtk-ui/sync-gtk.desktop.in.h:1
-msgid "Sync (GTK)"
-msgstr "Sync (GTK)"
+msgid "SyncEvolution (GTK)"
+msgstr "SyncEvolution (GTK)"
-#: ../src/gtk-ui/sync-config-widget.c:78
-msgid "ScheduleWorld enables you to keep your contacts, events, tasks, and notes in sync."
-msgstr "ScheduleWorld позволяет синхронизировать ваши контакты, информацию о событиях, задания и заметки."
+#: ../src/gtk-ui/sync-gtk.desktop.in.h:2
+msgid "Synchronize PIM data"
+msgstr "Синхронизировать данные PIM"
-#: ../src/gtk-ui/sync-config-widget.c:81
-msgid "Google Sync can back up and synchronize your contacts with your Gmail contacts."
-msgstr "Google Sync может создавать резервные копии и синхронизировать ваши контакты с контактами в Gmail."
+#: ../src/gtk-ui/sync-config-widget.c:88
+msgid ""
+"ScheduleWorld enables you to keep your contacts, events, tasks, and notes in"
+" sync."
+msgstr ""
+"ScheduleWorld позволяет синхронизировать ваши контакты, информацию о "
+"событиях, задания и заметки."
+
+#: ../src/gtk-ui/sync-config-widget.c:91
+msgid ""
+"Google Sync can back up and synchronize your contacts with your Gmail "
+"contacts."
+msgstr ""
+"Google Sync может создавать резервные копии и синхронизировать ваши контакты"
+" с контактами в Gmail."
#. TRANSLATORS: Please include the word "demo" (or the equivalent in
#. your language): Funambol is going to be a 90 day demo service
#. in the future
-#: ../src/gtk-ui/sync-config-widget.c:87
-msgid "Back up your contacts and calendar. Sync with a single click, anytime, anywhere (DEMO)."
-msgstr "Создайте резервные копии своих контактов и календаря. Синхронизируйтесь одним щелчком мыши в любое время и в любом месте (ДЕМО)."
+#: ../src/gtk-ui/sync-config-widget.c:97
+msgid ""
+"Back up your contacts and calendar. Sync with a single click, anytime, "
+"anywhere (DEMO)."
+msgstr ""
+"Создайте резервные копии своих контактов и календаря. Синхронизируйтесь "
+"одним щелчком мыши в любое время и в любом месте (ДЕМО)."
-#: ../src/gtk-ui/sync-config-widget.c:90
-msgid "Mobical Backup and Restore service allows you to securely back up your personal mobile data for free."
-msgstr "Служба Mobical позволяет вам безопасно и бесплатно создавать копии ваших персональных мобильных данных."
+#: ../src/gtk-ui/sync-config-widget.c:100
+msgid ""
+"Mobical Backup and Restore service allows you to securely back up your "
+"personal mobile data for free."
+msgstr ""
+"Служба Mobical позволяет вам безопасно и бесплатно создавать копии ваших "
+"персональных мобильных данных."
-#: ../src/gtk-ui/sync-config-widget.c:93
-msgid "ZYB is a simple way for people to store and share mobile information online."
-msgstr "ZYB - это простой способ хранения и передачи мобильной информации в режиме онлайн."
+#: ../src/gtk-ui/sync-config-widget.c:103
+msgid ""
+"ZYB is a simple way for people to store and share mobile information online."
+msgstr ""
+"ZYB - это простой способ хранения и передачи мобильной информации в режиме "
+"онлайн."
-#: ../src/gtk-ui/sync-config-widget.c:96
-msgid "Memotoo lets you access your personal data from any computer connected to the Internet."
-msgstr "Memotoo позволяет вам получить доступ к своим данным с любого компьютера, подключенного к Интернету."
+#: ../src/gtk-ui/sync-config-widget.c:106
+msgid ""
+"Memotoo lets you access your personal data from any computer connected to "
+"the Internet."
+msgstr ""
+"Memotoo позволяет вам получить доступ к своим данным с любого компьютера, "
+"подключенного к Интернету."
-#: ../src/gtk-ui/sync-config-widget.c:192
+#: ../src/gtk-ui/sync-config-widget.c:195
msgid "Sorry, failed to save the configuration"
msgstr "Не удалось сохранить файл конфигурации"
-#: ../src/gtk-ui/sync-config-widget.c:381
+#: ../src/gtk-ui/sync-config-widget.c:445
msgid "Service must have a name and server URL"
msgstr "У службы должно быть имя и URL-адрес сервера"
-#: ../src/gtk-ui/sync-config-widget.c:422
+#. TRANSLATORS: error dialog when creating a new sync configuration
+#: ../src/gtk-ui/sync-config-widget.c:451
+msgid "A username is required for this service"
+msgstr "Необходимо указать имя пользователя этой службы"
+
+#: ../src/gtk-ui/sync-config-widget.c:493
#, c-format
-msgid "Do you want to reset the settings for %s? This will not remove any synced information on either end."
-msgstr "Сбросить настройки для %s? Это не приведет к удалению какой-либо синхронизированной информации на любой из сторон."
+msgid ""
+"Do you want to reset the settings for %s? This will not remove any synced "
+"information on either end."
+msgstr ""
+"Сбросить настройки для %s? Это не приведет к удалению какой-либо "
+"синхронизированной информации на любой из сторон."
#. TRANSLATORS: buttons in reset-service warning dialog
-#: ../src/gtk-ui/sync-config-widget.c:426
+#: ../src/gtk-ui/sync-config-widget.c:497
msgid "Yes, reset"
msgstr "Да, сбросить"
-#: ../src/gtk-ui/sync-config-widget.c:427
-#: ../src/gtk-ui/sync-config-widget.c:438
+#: ../src/gtk-ui/sync-config-widget.c:498
+#: ../src/gtk-ui/sync-config-widget.c:509
msgid "No, keep settings"
msgstr "Нет, сохранить настройки"
-#: ../src/gtk-ui/sync-config-widget.c:432
+#: ../src/gtk-ui/sync-config-widget.c:503
#, c-format
-msgid "Do you want to delete the settings for %s? This will not remove any synced information on either end but it will remove these settings."
-msgstr "Удалить настройки для %s? Это не приведет к удалению какой-либо синхронизированной информации на любой стороне, но при этом эти настройки будут удалены."
+msgid ""
+"Do you want to delete the settings for %s? This will not remove any synced "
+"information on either end but it will remove these settings."
+msgstr ""
+"Удалить настройки для %s? Это не приведет к удалению какой-либо "
+"синхронизированной информации на любой стороне, но при этом эти настройки "
+"будут удалены."
#. TRANSLATORS: buttons in delete-service warning dialog
-#: ../src/gtk-ui/sync-config-widget.c:437
+#: ../src/gtk-ui/sync-config-widget.c:508
msgid "Yes, delete"
msgstr "Да, удалить"
-#: ../src/gtk-ui/sync-config-widget.c:467
+#: ../src/gtk-ui/sync-config-widget.c:539
msgid "Reset settings"
msgstr "Сбросить настройки"
-#: ../src/gtk-ui/sync-config-widget.c:470
+#: ../src/gtk-ui/sync-config-widget.c:542
msgid "Delete settings"
msgstr "Удалить настройки"
-#: ../src/gtk-ui/sync-config-widget.c:480
+#: ../src/gtk-ui/sync-config-widget.c:552
msgid "Save and use"
msgstr "Сохранить и использовать"
-#: ../src/gtk-ui/sync-config-widget.c:483
+#: ../src/gtk-ui/sync-config-widget.c:555
msgid ""
"Save and replace\n"
"current service"
@@ -727,101 +833,119 @@ msgstr ""
"Сохранить и заменить\n"
"текущую службу"
-#: ../src/gtk-ui/sync-config-widget.c:493
+#: ../src/gtk-ui/sync-config-widget.c:563
msgid "Stop using device"
msgstr "Прекратить использование устройства"
-#: ../src/gtk-ui/sync-config-widget.c:496
+#: ../src/gtk-ui/sync-config-widget.c:566
msgid "Stop using service"
msgstr "Прекратить использование сервера"
#. TRANSLATORS: label for an entry in service configuration form.
#. * Placeholder is a source name.
#. * Example: "Appointments URI"
-#: ../src/gtk-ui/sync-config-widget.c:679
+#: ../src/gtk-ui/sync-config-widget.c:749
#, c-format
msgid "%s URI"
msgstr "URL-адрес %s"
#. TRANSLATORS: toggles in service configuration form, placeholder is service
#. * or device name
-#: ../src/gtk-ui/sync-config-widget.c:854
+#: ../src/gtk-ui/sync-config-widget.c:936
#, c-format
msgid "Send changes to %s"
msgstr "Отправить изменения в %s"
-#: ../src/gtk-ui/sync-config-widget.c:859
+#: ../src/gtk-ui/sync-config-widget.c:941
#, c-format
msgid "Receive changes from %s"
msgstr "Получить изменения от %s"
-#: ../src/gtk-ui/sync-config-widget.c:875
+#: ../src/gtk-ui/sync-config-widget.c:957
msgid "<b>Sync</b>"
msgstr "<b>Sync</b>"
#. TRANSLATORS: label of a entry in service configuration
-#: ../src/gtk-ui/sync-config-widget.c:891
+#: ../src/gtk-ui/sync-config-widget.c:973
msgid "Server address"
msgstr "Адрес сервера"
#. TRANSLATORS: explanation before a device template combobox.
#. * Placeholder is a device name like 'Nokia N85' or 'Syncevolution
#. * Client'
-#: ../src/gtk-ui/sync-config-widget.c:967
+#: ../src/gtk-ui/sync-config-widget.c:1049
#, c-format
-msgid "This device looks like it might be a '%s'. If this is not correct, please take a look at the list of supported devices and pick yours if it is listed"
-msgstr "Возможно, это устройство - '%s'. Если это неверно, просмотрите список поддерживаемых устройств и выберите свое, если оно указано"
+msgid ""
+"This device looks like it might be a '%s'. If this is not correct, please "
+"take a look at the list of supported devices and pick yours if it is listed"
+msgstr ""
+"Возможно, это устройство - '%s'. Если это неверно, просмотрите список "
+"поддерживаемых устройств и выберите свое, если оно указано"
-#: ../src/gtk-ui/sync-config-widget.c:973
-msgid "We don't know what this device is exactly. Please take a look at the list of supported devices and pick yours if it is listed"
-msgstr "Невозможно точно установить тип устройства. Просмотрите список поддерживаемых устройств и выберите свое, если оно указано"
+#: ../src/gtk-ui/sync-config-widget.c:1055
+#: ../src/gtk-ui/sync-config-widget.c:1915
+msgid ""
+"We don't know what this device is exactly. Please take a look at the list of"
+" supported devices and pick yours if it is listed"
+msgstr ""
+"Невозможно точно установить тип устройства. Просмотрите список "
+"поддерживаемых устройств и выберите свое, если оно указано"
-#: ../src/gtk-ui/sync-config-widget.c:1126
+#: ../src/gtk-ui/sync-config-widget.c:1207
#, c-format
msgid "%s - Bluetooth device"
msgstr "%s - Bluetooth-устройство"
#. TRANSLATORS: service title for services that are not based on a
#. * template in service list, the placeholder is the name of the service
-#: ../src/gtk-ui/sync-config-widget.c:1132
+#: ../src/gtk-ui/sync-config-widget.c:1213
#, c-format
msgid "%s - manually setup"
msgstr "%s - ручная настройка"
#. TRANSLATORS: link button in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1807
+#: ../src/gtk-ui/sync-config-widget.c:1886
msgid "Launch website"
msgstr "Открыть веб-сайт"
#. TRANSLATORS: button in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1816
+#: ../src/gtk-ui/sync-config-widget.c:1895
msgid "Set up now"
msgstr "Настроить сейчас"
+#: ../src/gtk-ui/sync-config-widget.c:1953
+msgid "Use these settings"
+msgstr "Использовать эти настройки"
+
#. TRANSLATORS: labels of entries in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1912
+#: ../src/gtk-ui/sync-config-widget.c:1991
msgid "Username"
msgstr "Имя пользователя"
-#: ../src/gtk-ui/sync-config-widget.c:1927
+#: ../src/gtk-ui/sync-config-widget.c:2006
msgid "Password"
msgstr "Пароль"
#. TRANSLATORS: warning in service configuration form for people
#. who have modified the configuration via other means.
-#: ../src/gtk-ui/sync-config-widget.c:1950
-msgid "Current configuration is more complex than what can be shown here. Changes to sync mode or synced data types will overwrite that configuration."
-msgstr "Текущая конфигурация сервера более сложная, чем та, которую можно отобразить здесь. Изменения режима синхронизации или синхронизированных типов данных перезапишут эту конфигурацию."
+#: ../src/gtk-ui/sync-config-widget.c:2029
+msgid ""
+"Current configuration is more complex than what can be shown here. Changes "
+"to sync mode or synced data types will overwrite that configuration."
+msgstr ""
+"Текущая конфигурация сервера более сложная, чем та, которую можно отобразить"
+" здесь. Изменения режима синхронизации или синхронизированных типов данных "
+"перезапишут эту конфигурацию."
#. TRANSLATORS: this is the epander label for server settings
#. in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1969
+#: ../src/gtk-ui/sync-config-widget.c:2048
msgid "Hide server settings"
msgstr "Скрыть настройки сервера"
#. TRANSLATORS: this is the epander label for server settings
#. in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1989
+#: ../src/gtk-ui/sync-config-widget.c:2068
msgid "Show server settings"
msgstr "Отобразить настройки сервера"
@@ -829,63 +953,52 @@ msgstr "Отобразить настройки сервера"
msgid "Sync in the Sync application"
msgstr "Синхронизировать в приложении Sync"
-#: ../src/syncevo-dbus-server.cpp:5664
+#: ../src/syncevo-dbus-server.cpp:6653
#, c-format
msgid "%s is syncing"
msgstr "Синхронизация %s"
-#: ../src/syncevo-dbus-server.cpp:5665
+#: ../src/syncevo-dbus-server.cpp:6654
#, c-format
msgid "We have just started to sync your computer with the %s sync service."
-msgstr "Синхронизация вашего компьютера со службой синхронизации %s только что началась."
+msgstr ""
+"Синхронизация вашего компьютера со службой синхронизации %s только что "
+"началась."
#. if sync is successfully started and done
-#: ../src/syncevo-dbus-server.cpp:5679
+#: ../src/syncevo-dbus-server.cpp:6670
#, c-format
msgid "%s sync complete"
msgstr "Синхронизация %s завершена"
-#: ../src/syncevo-dbus-server.cpp:5680
+#: ../src/syncevo-dbus-server.cpp:6671
#, c-format
msgid "We have just finished syncing your computer with the %s sync service."
-msgstr "Синхронизация вашего компьютера со службой синхронизации %s только что завершилась."
+msgstr ""
+"Синхронизация вашего компьютера со службой синхронизации %s только что "
+"завершилась."
-#. if sync is successfully started and has errors, or not started successful with a fatal problem
-#: ../src/syncevo-dbus-server.cpp:5685
+#. if sync is successfully started and has errors, or not started successful
+#. with a fatal problem
+#: ../src/syncevo-dbus-server.cpp:6676
msgid "Sync problem."
msgstr "Ошибка синхронизации"
-#: ../src/syncevo-dbus-server.cpp:5686
+#: ../src/syncevo-dbus-server.cpp:6677
msgid "Sorry, there's a problem with your sync that you need to attend to."
-msgstr "Во время синхронизации возникла проблема, на которую вам следует обратить внимание."
+msgstr ""
+"Во время синхронизации возникла проблема, на которую вам следует обратить "
+"внимание."
-#: ../src/syncevo-dbus-server.cpp:5759
+#: ../src/syncevo-dbus-server.cpp:6758
msgid "View"
msgstr "Просмотреть"
#. Use "default" as ID because that is what mutter-moblin
#. recognizes: it then skips the action instead of adding it
#. in addition to its own "Dismiss" button (always added).
-#: ../src/syncevo-dbus-server.cpp:5763
+#: ../src/syncevo-dbus-server.cpp:6762
msgid "Dismiss"
msgstr "Отклонить"
-#~ msgid "Database error"
-#~ msgstr "Ошибка базы данных"
-
-#~ msgid ""
-#~ "Do you want to replace %s with %s? This will not remove any synced "
-#~ "information on either end but you will no longer be able to sync with %s."
-#~ msgstr ""
-#~ "Заменить %s на %s? Это не приведет к удалению какой-либо "
-#~ "синхронизированной информации на любой стороне, но синхронизация с %s "
-#~ "будет невозможной."
-
-#~ msgid "Yes, use %s"
-#~ msgstr "Да, использовать %s"
-
-#~ msgid "No, use %s"
-#~ msgstr "Нет, использовать %s"
-#~ msgid "Reset service"
-#~ msgstr "Сбросить настройки службы"
diff --git a/po/sv.po b/po/sv.po
index 5eadc45b..07b69965 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,136 +1,147 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# Annika Olsson <annikanbpt@gmail.com>, 2011.
+# Mathilda <meego.pti.sve1@gmail.com>, 2011.
+# <tomas.galicia@intel.com>, 2011.
msgid ""
msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: http://moblin.org/projects/syncevolution\n"
-"POT-Creation-Date: 2010-04-07 09:29+0000\n"
-"PO-Revision-Date: \n"
-"Last-Translator: Annika <AnnikaNbpt@gmail.com>\n"
-"Language-Team: \n"
+"Project-Id-Version: syncevolution\n"
+"Report-Msgid-Bugs-To: https://bugs.meego.com/\n"
+"POT-Creation-Date: 2011-12-05 10:21-0800\n"
+"PO-Revision-Date: 2011-12-11 17:36+0000\n"
+"Last-Translator: GLS_SVE1 <meego.pti.sve1@gmail.com>\n"
+"Language-Team: Swedish (http://www.transifex.net/projects/p/meego/team/sv/)\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-Poedit-Language: Swedish\n"
-"X-Poedit-SourceCharset: utf-8\n"
+"Language: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. TRANSLATORS: this is the application name that may be used by e.g.
#. the windowmanager
-#: ../src/gtk-ui/main.c:40
-#: ../src/gtk-ui/ui.glade.h:38
+#: ../src/gtk-ui/main.c:40 ../src/gtk-ui/ui.glade.h:38
#: ../src/gtk-ui/sync.desktop.in.h:1
#: ../src/gnome-bluetooth/syncevolution.c:112
msgid "Sync"
msgstr "Synkronisering "
-#: ../src/gtk-ui/sync-ui.c:260
+#: ../src/gtk-ui/sync-ui.c:266
msgid "Contacts"
msgstr "Kontakter"
-#: ../src/gtk-ui/sync-ui.c:262
+#: ../src/gtk-ui/sync-ui.c:268
msgid "Appointments"
msgstr "Möten"
-#: ../src/gtk-ui/sync-ui.c:264
-#: ../src/gtk-ui/ui.glade.h:40
+#: ../src/gtk-ui/sync-ui.c:270 ../src/gtk-ui/ui.glade.h:40
msgid "Tasks"
msgstr "Uppgifter"
-#: ../src/gtk-ui/sync-ui.c:266
+#: ../src/gtk-ui/sync-ui.c:272
msgid "Notes"
msgstr "Anteckningar"
#. TRANSLATORS: This is a "combination source" for syncing with devices
#. * that combine appointments and tasks. the name should match the ones
#. * used for calendar and todo above
-#: ../src/gtk-ui/sync-ui.c:271
+#: ../src/gtk-ui/sync-ui.c:277
msgid "Appointments & Tasks"
msgstr "Möten och uppgifter"
-#: ../src/gtk-ui/sync-ui.c:343
+#: ../src/gtk-ui/sync-ui.c:349
msgid "Starting sync"
msgstr "Startar synkronisering"
#. TRANSLATORS: slow sync confirmation dialog message. Placeholder
#. * is service/device name
-#: ../src/gtk-ui/sync-ui.c:381
+#: ../src/gtk-ui/sync-ui.c:387
#, c-format
msgid "Do you want to slow sync with %s?"
msgstr "Vill du sakta ner synkronisering med %s?"
-#: ../src/gtk-ui/sync-ui.c:385
+#: ../src/gtk-ui/sync-ui.c:391
msgid "Yes, do slow sync"
msgstr "Ja, sakta ner synk"
-#: ../src/gtk-ui/sync-ui.c:385
+#: ../src/gtk-ui/sync-ui.c:391
msgid "No, cancel sync"
msgstr "Nej, avbryt synkronisering "
-#. TRANSLATORS: confirmation dialog for refresh-from-server. Placeholder
+#. TRANSLATORS: confirmation dialog for "refresh from peer". Placeholder
#. * is service/device name
-#: ../src/gtk-ui/sync-ui.c:418
+#: ../src/gtk-ui/sync-ui.c:424
#, c-format
-msgid "Do you want to delete all local data and replace it with data from %s? This is not usually advised."
-msgstr "Vill du radera alla lokala data och ersätta dem med data från %s? Detta rekommenderas vanligtvis inte."
+msgid ""
+"Do you want to delete all local data and replace it with data from %s? This "
+"is not usually advised."
+msgstr ""
+"Vill du radera alla lokala data och ersätta dem med data från %s? Detta "
+"rekommenderas vanligtvis inte."
-#: ../src/gtk-ui/sync-ui.c:423
-#: ../src/gtk-ui/sync-ui.c:454
+#: ../src/gtk-ui/sync-ui.c:429 ../src/gtk-ui/sync-ui.c:462
msgid "Yes, delete and replace"
msgstr "Ja, radera och ersätt filer"
-#: ../src/gtk-ui/sync-ui.c:423
-#: ../src/gtk-ui/sync-ui.c:454
-#: ../src/gtk-ui/sync-ui.c:1566
+#: ../src/gtk-ui/sync-ui.c:429 ../src/gtk-ui/sync-ui.c:462
+#: ../src/gtk-ui/sync-ui.c:1610
msgid "No"
msgstr "Nej"
-#. TRANSLATORS: confirmation dialog for refresh-from-client. Placeholder
+#. TRANSLATORS: confirmation dialog for "refresh from local side". Placeholder
#. * is service/device name
-#: ../src/gtk-ui/sync-ui.c:449
+#: ../src/gtk-ui/sync-ui.c:457
#, c-format
-msgid "Do you want to delete all data in %s and replace it with your local data? This is not usually advised."
-msgstr "Vill du radera alla data på %s och ersätta dem med lokala data? Detta rekommenderas vanligtvis inte."
+msgid ""
+"Do you want to delete all data in %s and replace it with your local data? "
+"This is not usually advised."
+msgstr ""
+"Vill du radera alla data på %s och ersätta dem med lokala data? Detta "
+"rekommenderas vanligtvis inte."
-#: ../src/gtk-ui/sync-ui.c:481
+#: ../src/gtk-ui/sync-ui.c:491
msgid "Trying to cancel sync"
msgstr "Försöker att avbryta synkronisering"
-#: ../src/gtk-ui/sync-ui.c:521
+#: ../src/gtk-ui/sync-ui.c:533
msgid "No service or device selected"
msgstr "Ingen markerad tjänst eller enhet"
#. TRANSLATORS: This is the title on main view. Placeholder is
#. * the service name. Example: "Google - synced just now"
-#: ../src/gtk-ui/sync-ui.c:529
+#: ../src/gtk-ui/sync-ui.c:541
#, c-format
msgid "%s - synced just now"
-msgstr "%s - synkroniserat just nu"
+msgstr "%s - synkroniserade nyss"
-#: ../src/gtk-ui/sync-ui.c:533
+#: ../src/gtk-ui/sync-ui.c:545
#, c-format
msgid "%s - synced a minute ago"
msgstr "%s - synkroniserat en minut sedan"
-#: ../src/gtk-ui/sync-ui.c:537
+#: ../src/gtk-ui/sync-ui.c:549
#, c-format
msgid "%s - synced %ld minutes ago"
msgstr "%s - synkroniserat %ld minuter sedan"
-#: ../src/gtk-ui/sync-ui.c:542
+#: ../src/gtk-ui/sync-ui.c:554
#, c-format
msgid "%s - synced an hour ago"
msgstr "%s - synkroniserat en timme sedan"
-#: ../src/gtk-ui/sync-ui.c:546
+#: ../src/gtk-ui/sync-ui.c:558
#, c-format
msgid "%s - synced %ld hours ago"
msgstr "%s - synkroniserat %ld timmar sedan"
-#: ../src/gtk-ui/sync-ui.c:551
+#: ../src/gtk-ui/sync-ui.c:563
#, c-format
msgid "%s - synced a day ago"
msgstr "%s - synkroniserat en dag sedan"
-#: ../src/gtk-ui/sync-ui.c:555
+#: ../src/gtk-ui/sync-ui.c:567
#, c-format
msgid "%s - synced %ld days ago"
msgstr "%s - synkroniserat %ld dagar sedan"
@@ -138,66 +149,69 @@ msgstr "%s - synkroniserat %ld dagar sedan"
#. TRANSLATORS: Action button in info bar in main view. Shown with e.g.
#. * "You've just restored a backup. The changes have not been "
#. * "synced with %s yet"
-#: ../src/gtk-ui/sync-ui.c:604
-#: ../src/gtk-ui/sync-ui.c:719
+#: ../src/gtk-ui/sync-ui.c:616 ../src/gtk-ui/sync-ui.c:701
msgid "Sync now"
msgstr "Synkronisera nu"
#. TRANSLATORS: Action button in info bar in main view. Shown with e.g.
#. * "A normal sync is not possible at this time..." message.
#. * "Other options" will open Emergency view
-#: ../src/gtk-ui/sync-ui.c:610
-#: ../src/gtk-ui/ui.glade.h:37
+#: ../src/gtk-ui/sync-ui.c:622 ../src/gtk-ui/ui.glade.h:37
msgid "Slow sync"
msgstr "Långsam synkronisering "
-#: ../src/gtk-ui/sync-ui.c:611
+#: ../src/gtk-ui/sync-ui.c:623
msgid "Other options..."
msgstr "Andra alternativ"
#. TRANSLATORS: Action button in info bar in main view. Shown e.g.
#. * when no service is selected. Will open configuration view
-#: ../src/gtk-ui/sync-ui.c:616
+#: ../src/gtk-ui/sync-ui.c:628
msgid "Select sync service"
msgstr "Välj synkroniseringstjänst"
#. TRANSLATORS: Action button in info bar in main view. Shown e.g.
#. * login to service fails. Will open configuration view for this service
-#: ../src/gtk-ui/sync-ui.c:621
+#: ../src/gtk-ui/sync-ui.c:633
msgid "Edit service settings"
-msgstr "Ändra tjänsteinställningar "
+msgstr "Ändra inställningar för tjänst"
-#: ../src/gtk-ui/sync-ui.c:670
-msgid "You haven't selected a sync service or device yet. Sync services let you synchronize your data between your netbook and a web service. You can also sync directly with some devices."
-msgstr "Du har inte valt synktjänst eller -enhet än. Med synktjänster kan du synka dina data mellan din netbook och en webbtjänst. Du kan också synka direkt med vissa enheter."
+#: ../src/gtk-ui/sync-ui.c:709
+msgid ""
+"You haven't selected a sync service or device yet. Sync services let you "
+"synchronize your data between your netbook and a web service. You can also "
+"sync directly with some devices."
+msgstr ""
+"Du har inte valt synktjänst eller -enhet än. Med synktjänster kan du synka "
+"dina data mellan din netbook och en webbtjänst. Du kan också synka direkt "
+"med vissa enheter."
-#: ../src/gtk-ui/sync-ui.c:717
+#: ../src/gtk-ui/sync-ui.c:729
msgid "Sync again"
msgstr "Synkronisera igen"
-#: ../src/gtk-ui/sync-ui.c:730
+#: ../src/gtk-ui/sync-ui.c:748
msgid "Restoring"
msgstr "Återställer"
-#: ../src/gtk-ui/sync-ui.c:732
+#: ../src/gtk-ui/sync-ui.c:750
msgid "Syncing"
msgstr "Synkroniserar "
#. TRANSLATORS: This is for the button in main view, right side.
#. Keep line length below ~20 characters, use two lines if needed
-#: ../src/gtk-ui/sync-ui.c:743
-#: ../src/gtk-ui/sync-ui.c:3358
+#: ../src/gtk-ui/sync-ui.c:762 ../src/gtk-ui/sync-ui.c:3407
msgid "Cancel sync"
msgstr "Avbryt synkronisering"
-#: ../src/gtk-ui/sync-ui.c:908
+#: ../src/gtk-ui/sync-ui.c:927
msgid "Back to sync"
msgstr "Tillbaka till synkronisering"
#. TRANSLATORS: label for checkbutton/toggle in main view.
#. * Please stick to similar length strings or break the line with
#. * "\n" if absolutely needed
-#: ../src/gtk-ui/sync-ui.c:1209
+#: ../src/gtk-ui/sync-ui.c:1229
msgid "Automatic sync"
msgstr "Automatisk synkronisering"
@@ -205,61 +219,77 @@ msgstr "Automatisk synkronisering"
#. * currently selected data sources. First placeholder is service/device
#. * name, second a comma separeted list of sources.
#. * E.g. "Affected data: Google Contacts, Appointments"
-#: ../src/gtk-ui/sync-ui.c:1480
+#: ../src/gtk-ui/sync-ui.c:1524
#, c-format
msgid "Affected data: %s %s"
msgstr "Data som påverkas: %s %s"
-#: ../src/gtk-ui/sync-ui.c:1485
+#: ../src/gtk-ui/sync-ui.c:1529
#, c-format
msgid "Affected data: none"
msgstr "Data som påverkas: inga"
#. TRANSLATORS: confirmation for restoring a backup. placeholder is the
#. * backup time string defined below
-#: ../src/gtk-ui/sync-ui.c:1563
+#: ../src/gtk-ui/sync-ui.c:1607
#, c-format
-msgid "Do you want to restore the backup from %s? All changes you have made since then will be lost."
-msgstr "Vill du återställa säkerhetskopian från %s? Då förlorar du alla ändringar du har gjort sedan dess."
+msgid ""
+"Do you want to restore the backup from %s? All changes you have made since "
+"then will be lost."
+msgstr ""
+"Vill du återställa säkerhetskopian från %s? Då förlorar du alla ändringar du"
+" har gjort sedan dess."
-#: ../src/gtk-ui/sync-ui.c:1566
+#: ../src/gtk-ui/sync-ui.c:1610
msgid "Yes, restore"
msgstr "Ja, återställ"
#. TRANSLATORS: date/time for strftime(), used in emergency view backup
#. * label. Any time format that shows date and time is good.
-#: ../src/gtk-ui/sync-ui.c:1598
+#: ../src/gtk-ui/sync-ui.c:1642
#, c-format
msgid "%x %X"
msgstr "%x %X"
#. TRANSLATORS: label for a backup in emergency view. Placeholder is
#. * service or device name
-#: ../src/gtk-ui/sync-ui.c:1617
+#: ../src/gtk-ui/sync-ui.c:1661
#, c-format
msgid "Backed up before syncing with %s"
msgstr "Säkerhetskopierades före synkronisering med %s"
-#: ../src/gtk-ui/sync-ui.c:1634
+#: ../src/gtk-ui/sync-ui.c:1678
msgid "Restore"
msgstr "Återställ"
#. TRANSLATORS: this is an explanation in Emergency view.
#. * Placeholder is a service/device name
-#: ../src/gtk-ui/sync-ui.c:1741
+#: ../src/gtk-ui/sync-ui.c:1785
#, c-format
-msgid "A normal sync with %s is not possible at this time. You can do a slow two-way sync or start from scratch. You can also restore a backup, but a slow sync or starting from scratch will still be required before normal sync is possible."
-msgstr "En normal synkronisering med %s är inte möjlig just nu. Du kan göra en långsam tvävägssynk eller börja från början. Du kan också återställa en säkerhetskopia, men en långsam synk eller att börja från början krävs ändå innan normal synk blir möjlig."
+msgid ""
+"A normal sync with %s is not possible at this time. You can do a slow two-"
+"way sync or start from scratch. You can also restore a backup, but a slow "
+"sync or starting from scratch will still be required before normal sync is "
+"possible."
+msgstr ""
+"En normal synkronisering med %s är inte möjlig just nu. Du kan göra en "
+"långsam tvåvägssynk eller börja om från början. Du kan också återställa en "
+"säkerhetskopia, men en långsam synk eller att börja om från början krävs "
+"ändå innan normal synk blir möjlig."
-#: ../src/gtk-ui/sync-ui.c:1751
+#: ../src/gtk-ui/sync-ui.c:1795
#, c-format
-msgid "If something has gone horribly wrong, you can try a slow sync, start from scratch or restore from backup."
-msgstr "Om något har gått verkligt fel kan du prova en långsam synk, börja från början eller återställa från säkerhetskopian."
+msgid ""
+"If something has gone horribly wrong, you can try a slow sync, start from "
+"scratch or restore from backup."
+msgstr ""
+"Om något har gått verkligt fel kan du prova en långsam synk, börja från "
+"början eller återställa från säkerhetskopian."
#. TRANSLATORS: These are a buttons in Emergency view. Placeholder is a
#. * service/device name. Please don't use too long lines, but feel free to
#. * use several lines.
-#: ../src/gtk-ui/sync-ui.c:1760
+#: ../src/gtk-ui/sync-ui.c:1804
#, c-format
msgid ""
"Delete all your local\n"
@@ -270,7 +300,7 @@ msgstr ""
"data och ersätt med\n"
"data från %s"
-#: ../src/gtk-ui/sync-ui.c:1766
+#: ../src/gtk-ui/sync-ui.c:1810
#, c-format
msgid ""
"Delete all data on\n"
@@ -281,71 +311,73 @@ msgstr ""
"%s och ersätt med\n"
"dina lokala data"
-#: ../src/gtk-ui/sync-ui.c:2226
+#: ../src/gtk-ui/sync-ui.c:2275
msgid "Failed to get list of supported services from SyncEvolution"
msgstr "Kunde inte få en lista med tjänster som stöds från SyncEvolution"
-#: ../src/gtk-ui/sync-ui.c:2280
-msgid "There was a problem communicating with the sync process. Please try again later."
-msgstr "Det uppstod problem vid kommunikation med synkprocessen. Försök igen senare."
+#: ../src/gtk-ui/sync-ui.c:2329
+msgid ""
+"There was a problem communicating with the sync process. Please try again "
+"later."
+msgstr ""
+"Det uppstod problem vid kommunikation med synkprocessen. Försök igen senare."
-#: ../src/gtk-ui/sync-ui.c:2339
+#: ../src/gtk-ui/sync-ui.c:2388
msgid "Restore failed"
msgstr "Återställning misslyckades"
-#: ../src/gtk-ui/sync-ui.c:2342
-#: ../src/gtk-ui/sync-ui.c:3227
+#: ../src/gtk-ui/sync-ui.c:2391 ../src/gtk-ui/sync-ui.c:3276
msgid "Sync failed"
msgstr "Synk misslyckades"
-#: ../src/gtk-ui/sync-ui.c:2348
+#: ../src/gtk-ui/sync-ui.c:2397
msgid "Restore complete"
msgstr "Återställning färdig"
-#: ../src/gtk-ui/sync-ui.c:2351
+#: ../src/gtk-ui/sync-ui.c:2400
msgid "Sync complete"
msgstr "Synk färdig"
-#: ../src/gtk-ui/sync-ui.c:2443
+#: ../src/gtk-ui/sync-ui.c:2492
#, c-format
msgid "Preparing '%s'"
msgstr "Förbereder '%s'"
-#: ../src/gtk-ui/sync-ui.c:2446
+#: ../src/gtk-ui/sync-ui.c:2495
#, c-format
msgid "Receiving '%s'"
msgstr "Tas emot från '%s'"
-#: ../src/gtk-ui/sync-ui.c:2449
+#: ../src/gtk-ui/sync-ui.c:2498
#, c-format
msgid "Sending '%s'"
msgstr "Skickas till '%s'"
-#: ../src/gtk-ui/sync-ui.c:2570
+#: ../src/gtk-ui/sync-ui.c:2619
#, c-format
msgid "There was one remote rejection."
msgid_plural "There were %ld remote rejections."
msgstr[0] "Det finns en fjärr-refusering."
msgstr[1] "Det finns %ld fjärr-refuseringar."
-#: ../src/gtk-ui/sync-ui.c:2575
+#: ../src/gtk-ui/sync-ui.c:2624
#, c-format
msgid "There was one local rejection."
msgid_plural "There were %ld local rejections."
msgstr[0] "Det finns en lokal refusering."
msgstr[1] "Det finns %ld lokala refuseringar."
-#: ../src/gtk-ui/sync-ui.c:2580
+#: ../src/gtk-ui/sync-ui.c:2629
#, c-format
msgid "There were %ld local rejections and %ld remote rejections."
msgstr "Det fanns %ld lokala refuseringar och %ld fjärr-refuseringar."
-#: ../src/gtk-ui/sync-ui.c:2585
+#: ../src/gtk-ui/sync-ui.c:2634
#, c-format
msgid "Last time: No changes."
msgstr "Senast: Inga ändringar."
-#: ../src/gtk-ui/sync-ui.c:2587
+#: ../src/gtk-ui/sync-ui.c:2636
#, c-format
msgid "Last time: Sent one change."
msgid_plural "Last time: Sent %ld changes."
@@ -355,21 +387,21 @@ msgstr[1] "Senast: Skickade %ld ändringar."
#. This is about changes made to the local data. Not all of these
#. changes were requested by the remote server, so "applied"
#. is a better word than "received" (bug #5185).
-#: ../src/gtk-ui/sync-ui.c:2595
+#: ../src/gtk-ui/sync-ui.c:2644
#, c-format
msgid "Last time: Applied one change."
msgid_plural "Last time: Applied %ld changes."
msgstr[0] "Senast: Utförde en ändring."
msgstr[1] "Senast: Utförde %ld ändringar."
-#: ../src/gtk-ui/sync-ui.c:2600
+#: ../src/gtk-ui/sync-ui.c:2649
#, c-format
msgid "Last time: Applied %ld changes and sent %ld changes."
msgstr "Senast: Utförde %ld ändringar och skickade %ld ändringar."
#. TRANSLATORS: the placeholder is a error message (hopefully)
#. * explaining the problem
-#: ../src/gtk-ui/sync-ui.c:2807
+#: ../src/gtk-ui/sync-ui.c:2856
#, c-format
msgid ""
"There was a problem with last sync:\n"
@@ -378,124 +410,150 @@ msgstr ""
"Problem med senaste synkronisering:\n"
"%s"
-#: ../src/gtk-ui/sync-ui.c:2817
+#: ../src/gtk-ui/sync-ui.c:2866
#, c-format
-msgid "You've just restored a backup. The changes have not been synced with %s yet"
-msgstr "Du har just återställt en säkerhetskopia. Ändringarna har ännu inte synkroniserats med %s"
+msgid ""
+"You've just restored a backup. The changes have not been synced with %s yet"
+msgstr ""
+"Du har just återställt en säkerhetskopia. Ändringarna har ännu inte "
+"synkroniserats med %s"
-#: ../src/gtk-ui/sync-ui.c:3105
+#: ../src/gtk-ui/sync-ui.c:3154
msgid "Waiting for current operation to finish..."
msgstr "Väntar på att nuvarande åtgärd ska bli klar..."
#. TRANSLATORS: next strings are error messages.
-#: ../src/gtk-ui/sync-ui.c:3139
-msgid "A normal sync is not possible at this time. The server suggests a slow sync, but this might not always be what you want if both ends already have data."
-msgstr "En normal synk är inte möjlig just nu. Servern föreslår en långsam synk men detta kanke inte alltid är vad du vill ha om båda ändar redan har data."
+#: ../src/gtk-ui/sync-ui.c:3188
+msgid ""
+"A normal sync is not possible at this time. The server suggests a slow sync,"
+" but this might not always be what you want if both ends already have data."
+msgstr ""
+"En normal synk är inte möjlig just nu. Servern föreslår en långsam synk men "
+"detta kanke inte alltid är vad du vill ha om båda ändar redan har data."
-#: ../src/gtk-ui/sync-ui.c:3143
+#: ../src/gtk-ui/sync-ui.c:3192
msgid "The sync process died unexpectedly."
msgstr "Synkprocessen avslutades oväntat."
-#: ../src/gtk-ui/sync-ui.c:3148
-msgid "Password request was not answered. You can save the password in the settings to prevent the request."
-msgstr "Lösenordsförfrågan besvarades inte. Förhindra förfrågan genom att spara lösenordet i inställningarna."
+#: ../src/gtk-ui/sync-ui.c:3197
+msgid ""
+"Password request was not answered. You can save the password in the settings"
+" to prevent the request."
+msgstr ""
+"Lösenordsförfrågan besvarades inte. Förhindra förfrågan genom att spara "
+"lösenordet i inställningarna."
#. TODO use the service device name here, this is a remote problem
-#: ../src/gtk-ui/sync-ui.c:3152
+#: ../src/gtk-ui/sync-ui.c:3201
msgid "There was a problem processing sync request. Trying again may help."
-msgstr "Problem med behandling av synkbegäran. Det kan vara en bra idé att försöka igen."
+msgstr ""
+"Problem med behandling av synkbegäran. Det kan vara en bra idé att försöka "
+"igen."
-#: ../src/gtk-ui/sync-ui.c:3158
-msgid "Failed to login. Could there be a problem with your username or password?"
-msgstr "Kunde inte logg in. Kan det finnas problem med ditt användarnamn eller lösenord?"
+#: ../src/gtk-ui/sync-ui.c:3207
+msgid ""
+"Failed to login. Could there be a problem with your username or password?"
+msgstr ""
+"Kunde inte logg in. Kan det finnas problem med ditt användarnamn eller "
+"lösenord?"
-#: ../src/gtk-ui/sync-ui.c:3161
+#: ../src/gtk-ui/sync-ui.c:3210
msgid "Forbidden"
msgstr "Förbjuden"
#. TRANSLATORS: data source means e.g. calendar or addressbook
-#: ../src/gtk-ui/sync-ui.c:3167
-msgid "A data source could not be found. Could there be a problem with the settings?"
+#: ../src/gtk-ui/sync-ui.c:3216
+msgid ""
+"A data source could not be found. Could there be a problem with the "
+"settings?"
msgstr "Hittade inte en datakälla. Kan det finnas problem i inställningarna?"
-#: ../src/gtk-ui/sync-ui.c:3171
+#: ../src/gtk-ui/sync-ui.c:3220
msgid "Remote database error"
msgstr "Fjärrdatabasfel"
#. This can happen when EDS is borked, restart it may help...
-#: ../src/gtk-ui/sync-ui.c:3174
-msgid "There is a problem with the local database. Syncing again or rebooting may help."
-msgstr "Det finns problem i den lokala databasen. Det kan vara en bra idé att synkronisera eller starta upp igen."
+#: ../src/gtk-ui/sync-ui.c:3223
+msgid ""
+"There is a problem with the local database. Syncing again or rebooting may "
+"help."
+msgstr ""
+"Det finns problem i den lokala databasen. Det kan vara en bra idé att "
+"synkronisera eller starta upp igen."
-#: ../src/gtk-ui/sync-ui.c:3177
+#: ../src/gtk-ui/sync-ui.c:3226
msgid "No space on disk"
msgstr "Inget diskutrymme"
-#: ../src/gtk-ui/sync-ui.c:3179
+#: ../src/gtk-ui/sync-ui.c:3228
msgid "Failed to process SyncML"
msgstr "Kunde inte hantera SyncML"
-#: ../src/gtk-ui/sync-ui.c:3181
+#: ../src/gtk-ui/sync-ui.c:3230
msgid "Server authorization failed"
msgstr "Kunde inte ansluta till server"
-#: ../src/gtk-ui/sync-ui.c:3183
+#: ../src/gtk-ui/sync-ui.c:3232
msgid "Failed to parse configuration file"
msgstr "Kunde inte analysera konfigurationsfilen "
-#: ../src/gtk-ui/sync-ui.c:3185
+#: ../src/gtk-ui/sync-ui.c:3234
msgid "Failed to read configuration file"
msgstr "Kunde inte öppna konfigurationsfilen"
-#: ../src/gtk-ui/sync-ui.c:3187
+#: ../src/gtk-ui/sync-ui.c:3236
msgid "No configuration found"
msgstr "Konfiurationen hittades inte"
-#: ../src/gtk-ui/sync-ui.c:3189
+#: ../src/gtk-ui/sync-ui.c:3238
msgid "No configuration file found"
msgstr "Konfigurationsfilen hittades inte"
-#: ../src/gtk-ui/sync-ui.c:3191
+#: ../src/gtk-ui/sync-ui.c:3240
msgid "Server sent bad content"
msgstr "Server skickade felaktigt innehåll"
-#: ../src/gtk-ui/sync-ui.c:3193
+#: ../src/gtk-ui/sync-ui.c:3242
msgid "Connection certificate has expired"
msgstr "Utfärdat certifikat har gått ut"
-#: ../src/gtk-ui/sync-ui.c:3195
+#: ../src/gtk-ui/sync-ui.c:3244
msgid "Connection certificate is invalid"
msgstr "Anslutningscertifikatet är ogiltig."
-#: ../src/gtk-ui/sync-ui.c:3203
-msgid "We were unable to connect to the server. The problem could be temporary or there could be something wrong with the settings."
-msgstr "Vi kunde inte ansluta till servern. Problemet kan vara temporärt eller så kan det finnas fel i inställningarna."
+#: ../src/gtk-ui/sync-ui.c:3252
+msgid ""
+"We were unable to connect to the server. The problem could be temporary or "
+"there could be something wrong with the settings."
+msgstr ""
+"Vi kunde inte ansluta till servern. Problemet kan vara temporärt eller så "
+"kan det finnas fel i inställningarna."
-#: ../src/gtk-ui/sync-ui.c:3210
+#: ../src/gtk-ui/sync-ui.c:3259
msgid "The server URL is bad"
msgstr "Ogiltig server-URL"
-#: ../src/gtk-ui/sync-ui.c:3215
+#: ../src/gtk-ui/sync-ui.c:3264
msgid "The server was not found"
msgstr "Hittade inte servern"
-#: ../src/gtk-ui/sync-ui.c:3217
+#: ../src/gtk-ui/sync-ui.c:3266
#, c-format
msgid "Error %d"
msgstr "Fel %d"
#. TRANSLATORS: password request dialog contents: title, cancel button
#. * and ok button
-#: ../src/gtk-ui/sync-ui.c:3355
+#: ../src/gtk-ui/sync-ui.c:3404
msgid "Password is required for sync"
msgstr "Lösenord krävs för synkronisering"
-#: ../src/gtk-ui/sync-ui.c:3359
+#: ../src/gtk-ui/sync-ui.c:3408
msgid "Sync with password"
msgstr "Synkronisera med lösenord"
#. TRANSLATORS: password request dialog message, placeholder is service name
-#: ../src/gtk-ui/sync-ui.c:3369
+#: ../src/gtk-ui/sync-ui.c:3418
#, c-format
msgid "Please enter password for syncing with %s:"
msgstr "Ange lösenord för synkronisering med %s:"
@@ -516,7 +574,7 @@ msgstr "<big>Direktsynk</big>"
#: ../src/gtk-ui/ui.glade.h:6
msgid "<big>Network sync</big>"
-msgstr "<b>Nätverkssynk</b>"
+msgstr "<big>Nätverkssynk</big>"
#. a title in emergency view
#: ../src/gtk-ui/ui.glade.h:8
@@ -551,14 +609,19 @@ msgstr "Lägg till ny tjänst"
#. explanation of "Restore backup" function
#: ../src/gtk-ui/ui.glade.h:18
-msgid "Backups are made before every time we Sync. Choose a backup to restore. Any changes you have made since then will be lost."
-msgstr "Säkerhetskopieringar görs före varje synkronisering. Välj en säkerhetskopia att återställa. Alla ändringar som du gjort sedan dess förloras."
+msgid ""
+"Backups are made before every time we Sync. Choose a backup to restore. Any "
+"changes you have made since then will be lost."
+msgstr ""
+"Säkerhetskopieringar görs före varje synkronisering. Välj en säkerhetskopia "
+"att återställa. Alla ändringar som du gjort sedan dess förloras."
#: ../src/gtk-ui/ui.glade.h:19
msgid "Calendar"
msgstr "Kalender"
-#. Button in main view, right side. Keep to below 20 chars per line, feel free to use two lines
+#. Button in main view, right side. Keep to below 20 chars per line, feel free
+#. to use two lines
#: ../src/gtk-ui/ui.glade.h:21
msgid ""
"Change or edit\n"
@@ -592,7 +655,8 @@ msgstr ""
"information och ersätt\n"
"med data från Zyb"
-#. button in main view, right side. Keep length to 20 characters or so, use two lines if needed
+#. button in main view, right side. Keep length to 20 characters or so, use
+#. two lines if needed
#: ../src/gtk-ui/ui.glade.h:32
msgid ""
"Fix a sync\n"
@@ -627,94 +691,135 @@ msgstr ""
#: ../src/gtk-ui/ui.glade.h:43
msgid "Use Bluetooth to Sync your data from one device to another."
-msgstr "Använd Bluetooth för att synkroisera dina data från en enhet till en annan."
+msgstr ""
+"Använd Bluetooth för att synkroisera dina data från en enhet till en annan."
#: ../src/gtk-ui/ui.glade.h:44
msgid "You will need to add Bluetooth devices before they can be synced."
msgstr "Du måste lägga till Bluetooth-enheter innan du kan synkronisera dem."
#: ../src/gtk-ui/sync.desktop.in.h:2
-#: ../src/gtk-ui/sync-gtk.desktop.in.h:2
msgid "Up to date"
msgstr "Uppdaterad"
#: ../src/gtk-ui/sync-gtk.desktop.in.h:1
-msgid "Sync (GTK)"
-msgstr "Synk (GTK)"
+msgid "SyncEvolution (GTK)"
+msgstr "SyncEvolution (GTK)"
+
+#: ../src/gtk-ui/sync-gtk.desktop.in.h:2
+msgid "Synchronize PIM data"
+msgstr "Synkronisera PIM-data"
-#: ../src/gtk-ui/sync-config-widget.c:74
-msgid "ScheduleWorld enables you to keep your contacts, events, tasks, and notes in sync."
-msgstr "Med ScheduleWorld kan du hålla kontakter, aktiviteter, uppgifter och meddelanden uppdaterade."
+#: ../src/gtk-ui/sync-config-widget.c:88
+msgid ""
+"ScheduleWorld enables you to keep your contacts, events, tasks, and notes in"
+" sync."
+msgstr ""
+"Med ScheduleWorld kan du hålla kontakter, aktiviteter, uppgifter och "
+"meddelanden uppdaterade."
-#: ../src/gtk-ui/sync-config-widget.c:77
-msgid "Google Sync can back up and synchronize your contacts with your Gmail contacts."
-msgstr "Google Sync kan säkerhetskopiera och synka dina kontakter med dina Gmail-kontakter."
+#: ../src/gtk-ui/sync-config-widget.c:91
+msgid ""
+"Google Sync can back up and synchronize your contacts with your Gmail "
+"contacts."
+msgstr ""
+"Google Sync kan säkerhetskopiera och synka dina kontakter med dina Gmail-"
+"kontakter."
#. TRANSLATORS: Please include the word "demo" (or the equivalent in
#. your language): Funambol is going to be a 90 day demo service
#. in the future
-#: ../src/gtk-ui/sync-config-widget.c:83
-msgid "Back up your contacts and calendar. Sync with a single click, anytime, anywhere (DEMO)."
-msgstr "Säkerhetskopiera kontakter och kalender. Synka med ett enkelklick, när som helst, var som helst (DEMO)."
+#: ../src/gtk-ui/sync-config-widget.c:97
+msgid ""
+"Back up your contacts and calendar. Sync with a single click, anytime, "
+"anywhere (DEMO)."
+msgstr ""
+"Säkerhetskopiera kontakter och kalender. Synka med ett enkelklick, när som "
+"helst, var som helst (DEMO)."
-#: ../src/gtk-ui/sync-config-widget.c:86
-msgid "Mobical Backup and Restore service allows you to securely back up your personal mobile data for free."
-msgstr "Med Mobical-tjänsten för säkerhetskopiering och återställning kan du säkert säkerhetskopia dina personliga mobila data gratis."
+#: ../src/gtk-ui/sync-config-widget.c:100
+msgid ""
+"Mobical Backup and Restore service allows you to securely back up your "
+"personal mobile data for free."
+msgstr ""
+"Med Mobical-tjänsten för säkerhetskopiering och återställning kan du säkert "
+"säkerhetskopia dina personliga mobila data gratis."
-#: ../src/gtk-ui/sync-config-widget.c:89
-msgid "ZYB is a simple way for people to store and share mobile information online."
-msgstr "ZYB är ett enkelt sätt för människor att lagra och dela mobilinformation online."
+#: ../src/gtk-ui/sync-config-widget.c:103
+msgid ""
+"ZYB is a simple way for people to store and share mobile information online."
+msgstr ""
+"ZYB är ett enkelt sätt för människor att lagra och dela mobilinformation "
+"online."
-#: ../src/gtk-ui/sync-config-widget.c:92
-msgid "Memotoo lets you access your personal data from any computer connected to the Internet."
-msgstr "Med Memotoo kan du nå dina personliga data från valfri dator ansluten till Internet."
+#: ../src/gtk-ui/sync-config-widget.c:106
+msgid ""
+"Memotoo lets you access your personal data from any computer connected to "
+"the Internet."
+msgstr ""
+"Med Memotoo kan du nå dina personliga data från valfri dator ansluten till "
+"Internet."
-#: ../src/gtk-ui/sync-config-widget.c:188
+#: ../src/gtk-ui/sync-config-widget.c:195
msgid "Sorry, failed to save the configuration"
msgstr "Kunde inte spara konfigurationen "
-#: ../src/gtk-ui/sync-config-widget.c:377
+#: ../src/gtk-ui/sync-config-widget.c:445
msgid "Service must have a name and server URL"
msgstr "Du måste ange ett namn på tjänsten och URL till servern"
-#: ../src/gtk-ui/sync-config-widget.c:418
+#. TRANSLATORS: error dialog when creating a new sync configuration
+#: ../src/gtk-ui/sync-config-widget.c:451
+msgid "A username is required for this service"
+msgstr "Det behövs ett användarnamn för denna tjänst"
+
+#: ../src/gtk-ui/sync-config-widget.c:493
#, c-format
-msgid "Do you want to reset the settings for %s? This will not remove any synced information on either end."
-msgstr "Vill du återställa inställningarna för %s? Detta tar inte bort någon synkroniserad information på någon ände."
+msgid ""
+"Do you want to reset the settings for %s? This will not remove any synced "
+"information on either end."
+msgstr ""
+"Vill du återställa inställningarna för %s? Detta tar inte bort någon "
+"synkroniserad information på någon ände."
#. TRANSLATORS: buttons in reset-service warning dialog
-#: ../src/gtk-ui/sync-config-widget.c:422
+#: ../src/gtk-ui/sync-config-widget.c:497
msgid "Yes, reset"
msgstr "Ja, återställ"
-#: ../src/gtk-ui/sync-config-widget.c:423
-#: ../src/gtk-ui/sync-config-widget.c:434
+#: ../src/gtk-ui/sync-config-widget.c:498
+#: ../src/gtk-ui/sync-config-widget.c:509
msgid "No, keep settings"
msgstr "Nej, behåll inställningar"
-#: ../src/gtk-ui/sync-config-widget.c:428
+#: ../src/gtk-ui/sync-config-widget.c:503
#, c-format
-msgid "Do you want to delete the settings for %s? This will not remove any synced information on either end but it will remove these settings."
-msgstr "Vill du ta bort inställningarna för %s? Detta tar inte bort någon synkroniserad information på någon ände men det tar bort dessa inställningar."
+msgid ""
+"Do you want to delete the settings for %s? This will not remove any synced "
+"information on either end but it will remove these settings."
+msgstr ""
+"Vill du ta bort inställningarna för %s? Detta tar inte bort någon "
+"synkroniserad information på någon ände men det tar bort dessa "
+"inställningar."
#. TRANSLATORS: buttons in delete-service warning dialog
-#: ../src/gtk-ui/sync-config-widget.c:433
+#: ../src/gtk-ui/sync-config-widget.c:508
msgid "Yes, delete"
msgstr "Ja, radera"
-#: ../src/gtk-ui/sync-config-widget.c:463
+#: ../src/gtk-ui/sync-config-widget.c:539
msgid "Reset settings"
msgstr "Återställ inställningar"
-#: ../src/gtk-ui/sync-config-widget.c:466
+#: ../src/gtk-ui/sync-config-widget.c:542
msgid "Delete settings"
msgstr "Radera inställningar"
-#: ../src/gtk-ui/sync-config-widget.c:476
+#: ../src/gtk-ui/sync-config-widget.c:552
msgid "Save and use"
msgstr "Spara och använd"
-#: ../src/gtk-ui/sync-config-widget.c:479
+#: ../src/gtk-ui/sync-config-widget.c:555
msgid ""
"Save and replace\n"
"current service"
@@ -722,101 +827,119 @@ msgstr ""
"Spara och ersätt\n"
"nuvarande tjänst"
-#: ../src/gtk-ui/sync-config-widget.c:489
+#: ../src/gtk-ui/sync-config-widget.c:563
msgid "Stop using device"
msgstr "Sluta använda enhet"
-#: ../src/gtk-ui/sync-config-widget.c:492
+#: ../src/gtk-ui/sync-config-widget.c:566
msgid "Stop using service"
msgstr "Sluta använda tjänst"
#. TRANSLATORS: label for an entry in service configuration form.
#. * Placeholder is a source name.
#. * Example: "Appointments URI"
-#: ../src/gtk-ui/sync-config-widget.c:675
+#: ../src/gtk-ui/sync-config-widget.c:749
#, c-format
msgid "%s URI"
msgstr "%s URI"
#. TRANSLATORS: toggles in service configuration form, placeholder is service
#. * or device name
-#: ../src/gtk-ui/sync-config-widget.c:850
+#: ../src/gtk-ui/sync-config-widget.c:936
#, c-format
msgid "Send changes to %s"
msgstr "Skicka ändringar till %s"
-#: ../src/gtk-ui/sync-config-widget.c:855
+#: ../src/gtk-ui/sync-config-widget.c:941
#, c-format
msgid "Receive changes from %s"
msgstr "Ta emot ändringar från %s"
-#: ../src/gtk-ui/sync-config-widget.c:871
+#: ../src/gtk-ui/sync-config-widget.c:957
msgid "<b>Sync</b>"
msgstr "<b>Synkronisera</b>"
#. TRANSLATORS: label of a entry in service configuration
-#: ../src/gtk-ui/sync-config-widget.c:887
+#: ../src/gtk-ui/sync-config-widget.c:973
msgid "Server address"
msgstr "Serveradress"
#. TRANSLATORS: explanation before a device template combobox.
#. * Placeholder is a device name like 'Nokia N85' or 'Syncevolution
#. * Client'
-#: ../src/gtk-ui/sync-config-widget.c:963
+#: ../src/gtk-ui/sync-config-widget.c:1049
#, c-format
-msgid "This device looks like it might be a '%s'. If this is not correct, please take a look at the list of supported devices and pick yours if it is listed"
-msgstr "Den här enheten ser ut som om den kan vara en %s. Om detta inte är korrekt, ta en titt på listan med enheter som stöds och välj din om den finns med på listan"
+msgid ""
+"This device looks like it might be a '%s'. If this is not correct, please "
+"take a look at the list of supported devices and pick yours if it is listed"
+msgstr ""
+"Den här enheten ser ut som om den kan vara en %s. Om detta inte är korrekt, "
+"ta en titt på listan med enheter som stöds och välj din om den finns med på "
+"listan"
-#: ../src/gtk-ui/sync-config-widget.c:969
-msgid "We don't know what this device is exactly. Please take a look at the list of supported devices and pick yours if it is listed"
-msgstr "Vi kan inte identifiera den här enheten. Ta en titt på listan med enheter som stöds och välj din om den finns med på listan"
+#: ../src/gtk-ui/sync-config-widget.c:1055
+#: ../src/gtk-ui/sync-config-widget.c:1915
+msgid ""
+"We don't know what this device is exactly. Please take a look at the list of"
+" supported devices and pick yours if it is listed"
+msgstr ""
+"Vi kan inte identifiera den här enheten. Ta en titt på listan med enheter "
+"som stöds och välj din om den finns med på listan"
-#: ../src/gtk-ui/sync-config-widget.c:1122
+#: ../src/gtk-ui/sync-config-widget.c:1207
#, c-format
msgid "%s - Bluetooth device"
msgstr "%s - Bluetooth-enhet"
#. TRANSLATORS: service title for services that are not based on a
#. * template in service list, the placeholder is the name of the service
-#: ../src/gtk-ui/sync-config-widget.c:1128
+#: ../src/gtk-ui/sync-config-widget.c:1213
#, c-format
msgid "%s - manually setup"
msgstr "%s - konfigurera manuellt"
#. TRANSLATORS: link button in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1803
+#: ../src/gtk-ui/sync-config-widget.c:1886
msgid "Launch website"
msgstr "Öppna webbplatsen "
#. TRANSLATORS: button in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1812
+#: ../src/gtk-ui/sync-config-widget.c:1895
msgid "Set up now"
msgstr "Konfigurera nu"
+#: ../src/gtk-ui/sync-config-widget.c:1953
+msgid "Use these settings"
+msgstr "Använd dessa inställningar"
+
#. TRANSLATORS: labels of entries in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1908
+#: ../src/gtk-ui/sync-config-widget.c:1991
msgid "Username"
msgstr "Användarnamn"
-#: ../src/gtk-ui/sync-config-widget.c:1923
+#: ../src/gtk-ui/sync-config-widget.c:2006
msgid "Password"
msgstr "Lösenord"
#. TRANSLATORS: warning in service configuration form for people
#. who have modified the configuration via other means.
-#: ../src/gtk-ui/sync-config-widget.c:1946
-msgid "Current configuration is more complex than what can be shown here. Changes to sync mode or synced data types will overwrite that configuration."
-msgstr "Nuvarande konfiguration är mer komplex än vad som kan visas här. Ändringar i synkläge eller synkroniserade datatyper skriver över den konfigurationen."
+#: ../src/gtk-ui/sync-config-widget.c:2029
+msgid ""
+"Current configuration is more complex than what can be shown here. Changes "
+"to sync mode or synced data types will overwrite that configuration."
+msgstr ""
+"Nuvarande konfiguration är mer komplex än vad som kan visas här. Ändringar i"
+" synkläge eller synkroniserade datatyper skriver över den konfigurationen."
#. TRANSLATORS: this is the epander label for server settings
#. in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1965
+#: ../src/gtk-ui/sync-config-widget.c:2048
msgid "Hide server settings"
msgstr "Dölj serverinställningar"
#. TRANSLATORS: this is the epander label for server settings
#. in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1985
+#: ../src/gtk-ui/sync-config-widget.c:2068
msgid "Show server settings"
msgstr "Visa serverinställningar"
@@ -824,184 +947,47 @@ msgstr "Visa serverinställningar"
msgid "Sync in the Sync application"
msgstr "Synkronisera i programmet Sync"
-#: ../src/syncevo-dbus-server.cpp:5622
+#: ../src/syncevo-dbus-server.cpp:6653
#, c-format
msgid "%s is syncing"
msgstr "%s synkroniserar "
-#: ../src/syncevo-dbus-server.cpp:5623
+#: ../src/syncevo-dbus-server.cpp:6654
#, c-format
msgid "We have just started to sync your computer with the %s sync service."
msgstr "Vi har nyss börjat synkronisera din dator med synktjänsten %s."
#. if sync is successfully started and done
-#: ../src/syncevo-dbus-server.cpp:5637
+#: ../src/syncevo-dbus-server.cpp:6670
#, c-format
msgid "%s sync complete"
msgstr "%s synk färdig"
-#: ../src/syncevo-dbus-server.cpp:5638
+#: ../src/syncevo-dbus-server.cpp:6671
#, c-format
msgid "We have just finished syncing your computer with the %s sync service."
msgstr "Vi har precis synkroniserat din dator med synktjänsten %s."
-#. if sync is successfully started and has errors, or not started successful with a fatal problem
-#: ../src/syncevo-dbus-server.cpp:5643
+#. if sync is successfully started and has errors, or not started successful
+#. with a fatal problem
+#: ../src/syncevo-dbus-server.cpp:6676
msgid "Sync problem."
msgstr "Synkproblem."
-#: ../src/syncevo-dbus-server.cpp:5644
+#: ../src/syncevo-dbus-server.cpp:6677
msgid "Sorry, there's a problem with your sync that you need to attend to."
-msgstr "Det finns ett problem i din synkronisering som du måste ta en titt på."
+msgstr ""
+"Det finns ett problem i din synkronisering som du måste ta en titt på."
-#: ../src/syncevo-dbus-server.cpp:5717
+#: ../src/syncevo-dbus-server.cpp:6758
msgid "View"
msgstr "Visa"
-#: ../src/syncevo-dbus-server.cpp:5718
+#. Use "default" as ID because that is what mutter-moblin
+#. recognizes: it then skips the action instead of adding it
+#. in addition to its own "Dismiss" button (always added).
+#: ../src/syncevo-dbus-server.cpp:6762
msgid "Dismiss"
msgstr "Ignorera"
-#~ msgid ""
-#~ "Do you want to replace %s with %s? This will not remove any synced "
-#~ "information on either end but you will no longer be able to sync with %s."
-#~ msgstr ""
-#~ "Vill du ersätta %s med %s? Detta tar inte bort någon synkroniserad "
-#~ "information på någon ände men du kommer inte längre att kunna "
-#~ "synkronisera med %s."
-
-#~ msgid "Yes, use %s"
-#~ msgstr "Ja, använd %s"
-
-#~ msgid "No, use %s"
-#~ msgstr "Nej, använd %s"
-
-#~ msgid "Addressbook"
-#~ msgstr "Addressbok"
-
-#~ msgid "Todo"
-#~ msgstr "Att göra"
-
-#~ msgid "Memo"
-#~ msgstr "Memo"
-
-#~ msgid "Failed to save current service in GConf configuration system"
-#~ msgstr "Kunde inte spara nuvarande tjänst i GConf konfiguration"
-
-#~ msgid "Failed to save service configuration to SyncEvolution"
-#~ msgstr "Kunde inte spara tjänstekonfigurationen i SyncEvolution"
-
-#~ msgid "Failed to get service configuration from SyncEvolution"
-#~ msgstr "Kunde inte hämta tjänstkonfiguration från SyncEvolution"
-
-#~ msgid "Failed to remove service configuration from SyncEvolution"
-#~ msgstr "Kunde inte radera tjänstekonfigurationen från SyncEvolution"
-
-#~ msgid "Failed to cancel: sync was no longer in progress"
-#~ msgstr "Kunde inte avbryta: synkroniseringen var inte igång"
-
-#~ msgid "Failed to cancel sync"
-#~ msgstr "Kunde inte avbryta synkronisering"
-
-#~ msgid "Canceling sync"
-#~ msgstr "Avbryter synkronisering"
-
-#~ msgid "No sources are enabled, not syncing"
-#~ msgstr "Inga datakällor är anslutna, synkroniserar inte"
-
-#~ msgid "A sync is already in progress"
-#~ msgstr "Synkronisering pågår redan"
-
-#~ msgid "Failed to start sync"
-#~ msgstr "Kunde inte starta synkronisering"
-
-#~ msgid "%s (not supported by this service)"
-#~ msgstr "%s (stöds inte av denna tjänst)"
-
-#~ msgid "Failed to get server configuration from SyncEvolution"
-#~ msgstr "Kunde inte hämta serverkonfiguration från SyncEvolution"
-
-#~ msgid "New service"
-#~ msgstr "Ny tjänst"
-
-#~ msgid "Server URL"
-#~ msgstr "URL server"
-
-#~ msgid "Failed to get list of manually setup services from SyncEvolution"
-#~ msgstr ""
-#~ "Kunde inte få en lista av manuella inställningstjänster från SyncEvolution"
-
-#~ msgid "Service configuration not found"
-#~ msgstr "Konfigurationsfilen hittades inte"
-
-#~ msgid "Not authorized"
-#~ msgstr "Inte tillåten"
-
-#~ msgid "Not found"
-#~ msgstr "Hittades inte"
-
-#~ msgid "Database error"
-#~ msgstr "Databasfel"
-
-#~ msgid "Transport failure (no connection?)"
-#~ msgstr "Överföringsfel (ingen anslutning)?"
-
-#~ msgid "Connection timed out"
-#~ msgstr "Anslutningstiden överskreds"
-
-#~ msgid "Sync canceled"
-#~ msgstr "Synk avbruten"
-
-#~ msgid "Ending sync"
-#~ msgstr "Avslutar synk"
-
-#~ msgid "<b>No sync service in use</b>"
-#~ msgstr "<b>Ingen synktjänst används</b>"
-
-#~ msgid "<big>Manual setup</big>"
-#~ msgstr "<big>Manuell inställning</big>"
-
-#~ msgid "Delete this service"
-#~ msgstr "Ta bort denna tjänst"
-
-#~ msgid "Merge local and remote data (recommended)"
-#~ msgstr "Sammanför lokala och fjärrdata (rekommenderas)"
-
-#~ msgid "Reset original server settings"
-#~ msgstr "Återgå till originalserverinställningar"
-
-#~ msgid "Service name"
-#~ msgstr "Namn på tjänst"
-
-#~ msgid ""
-#~ "Sorry, you need an internet\n"
-#~ "connection to sync."
-#~ msgstr ""
-#~ "Du behöver internet-\n"
-#~ "anslutning för att synkronisera."
-
-#~ msgid ""
-#~ "Synchronization is not available (D-Bus service does not answer), sorry."
-#~ msgstr "Synkronisering är inte tillgänglig (D-Bustjänsten svarar ej)."
-
-#~ msgid "Last time: Received one change."
-
-#~ msgid_plural "Last time: Received %d changes."
-#~ msgstr[0] "Senast: Mottog en ändring"
-#~ msgstr[1] "Senast: Mottog %d ändringar"
-
-#~ msgid "Last time: Received %d changes and sent %d changes."
-#~ msgstr "Senast: Mottog %d ändringar och skickade %d ändringar"
-
-#~ msgid "Setup sync service"
-#~ msgstr "Inställning synkroniseringstjänst."
-
-#~ msgid ""
-#~ "You haven't set up a sync service yet. Sync services let you \n"
-#~ "synchronize your data between your netbook and a web service."
-#~ msgstr ""
-#~ "Du har inte installerat synktjänst ännu. Synktjänst låter dig \n"
-#~ "synkronisera din data mellan din netbook och en webbtjänst."
-#~ msgid "Bring your data with you"
-#~ msgstr "Ta med dig din information"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index bb049f19..20fd4040 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,25 +1,28 @@
-# syncevolution
-# Copyright (C) 2009 Intel
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# <rjming@yahoo.com>, 2011.
+# <tomas.galicia@intel.com>, 2011.
# Zhu Yanhai <yanhai.zhu@intel.com>, 2009.
-#
msgid ""
msgstr ""
"Project-Id-Version: syncevolution\n"
-"Report-Msgid-Bugs-To: http://moblin.org/projects/syncevolution\n"
-"POT-Creation-Date: 2010-05-05 09:24+0000\n"
-"PO-Revision-Date: 2010-05-06 17:44-0800\n"
-"Last-Translator: mackey tian <mackeyx.tian@ptiglobal.net>\n"
-"Language-Team: zh_CN <yanhai.zhu@intel.com>\n"
+"Report-Msgid-Bugs-To: https://bugs.meego.com/\n"
+"POT-Creation-Date: 2011-12-05 10:21-0800\n"
+"PO-Revision-Date: 2011-12-06 00:09+0000\n"
+"Last-Translator: GLS_Translator_CHS2 <rjming@yahoo.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/meego/team/zh_CN/)\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"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. TRANSLATORS: this is the application name that may be used by e.g.
#. the windowmanager
-#: ../src/gtk-ui/main.c:40
-#: ../src/gtk-ui/ui.glade.h:38
+#: ../src/gtk-ui/main.c:40 ../src/gtk-ui/ui.glade.h:38
#: ../src/gtk-ui/sync.desktop.in.h:1
#: ../src/gnome-bluetooth/syncevolution.c:112
msgid "Sync"
@@ -33,8 +36,7 @@ msgstr "联系人"
msgid "Appointments"
msgstr "约会"
-#: ../src/gtk-ui/sync-ui.c:270
-#: ../src/gtk-ui/ui.glade.h:40
+#: ../src/gtk-ui/sync-ui.c:270 ../src/gtk-ui/ui.glade.h:40
msgid "Tasks"
msgstr "任务"
@@ -68,72 +70,74 @@ msgstr "好的,做慢速同步吧"
msgid "No, cancel sync"
msgstr "不,取消同步"
-#. TRANSLATORS: confirmation dialog for refresh-from-server. Placeholder
+#. TRANSLATORS: confirmation dialog for "refresh from peer". Placeholder
#. * is service/device name
#: ../src/gtk-ui/sync-ui.c:424
#, c-format
-msgid "Do you want to delete all local data and replace it with data from %s? This is not usually advised."
+msgid ""
+"Do you want to delete all local data and replace it with data from %s? This "
+"is not usually advised."
msgstr "您想删除所有本地数据并用来自%s的数据替代它们吗?通常我们不建议您这样做."
-#: ../src/gtk-ui/sync-ui.c:429
-#: ../src/gtk-ui/sync-ui.c:460
+#: ../src/gtk-ui/sync-ui.c:429 ../src/gtk-ui/sync-ui.c:462
msgid "Yes, delete and replace"
msgstr "是的,删除然后替代"
-#: ../src/gtk-ui/sync-ui.c:429
-#: ../src/gtk-ui/sync-ui.c:460
-#: ../src/gtk-ui/sync-ui.c:1580
+#: ../src/gtk-ui/sync-ui.c:429 ../src/gtk-ui/sync-ui.c:462
+#: ../src/gtk-ui/sync-ui.c:1610
msgid "No"
msgstr "我不要做慢速同步"
-#. TRANSLATORS: confirmation dialog for refresh-from-client. Placeholder
+#. TRANSLATORS: confirmation dialog for "refresh from local side". Placeholder
#. * is service/device name
-#: ../src/gtk-ui/sync-ui.c:455
+#: ../src/gtk-ui/sync-ui.c:457
#, c-format
-msgid "Do you want to delete all data in %s and replace it with your local data? This is not usually advised."
+msgid ""
+"Do you want to delete all data in %s and replace it with your local data? "
+"This is not usually advised."
msgstr "您想删除 %s 中的所有数据并用您的本地数据来替代它们吗?通常我们不建议您这样做"
-#: ../src/gtk-ui/sync-ui.c:487
+#: ../src/gtk-ui/sync-ui.c:491
msgid "Trying to cancel sync"
msgstr "尝试取消同步"
-#: ../src/gtk-ui/sync-ui.c:529
+#: ../src/gtk-ui/sync-ui.c:533
msgid "No service or device selected"
msgstr "没有选择服务或设备"
#. TRANSLATORS: This is the title on main view. Placeholder is
#. * the service name. Example: "Google - synced just now"
-#: ../src/gtk-ui/sync-ui.c:537
+#: ../src/gtk-ui/sync-ui.c:541
#, c-format
msgid "%s - synced just now"
msgstr "%s - 刚刚同步完"
-#: ../src/gtk-ui/sync-ui.c:541
+#: ../src/gtk-ui/sync-ui.c:545
#, c-format
msgid "%s - synced a minute ago"
msgstr "%s - 一分钟前已同步"
-#: ../src/gtk-ui/sync-ui.c:545
+#: ../src/gtk-ui/sync-ui.c:549
#, c-format
msgid "%s - synced %ld minutes ago"
msgstr "%s - %ld 分钟前已同步"
-#: ../src/gtk-ui/sync-ui.c:550
+#: ../src/gtk-ui/sync-ui.c:554
#, c-format
msgid "%s - synced an hour ago"
msgstr "%s - 一小时前已同步"
-#: ../src/gtk-ui/sync-ui.c:554
+#: ../src/gtk-ui/sync-ui.c:558
#, c-format
msgid "%s - synced %ld hours ago"
msgstr "%s - %ld 小时前已同步"
-#: ../src/gtk-ui/sync-ui.c:559
+#: ../src/gtk-ui/sync-ui.c:563
#, c-format
msgid "%s - synced a day ago"
msgstr "%s - 一天之前已同步"
-#: ../src/gtk-ui/sync-ui.c:563
+#: ../src/gtk-ui/sync-ui.c:567
#, c-format
msgid "%s - synced %ld days ago"
msgstr "%s - %ld 天之前已同步"
@@ -141,66 +145,66 @@ msgstr "%s - %ld 天之前已同步"
#. TRANSLATORS: Action button in info bar in main view. Shown with e.g.
#. * "You've just restored a backup. The changes have not been "
#. * "synced with %s yet"
-#: ../src/gtk-ui/sync-ui.c:612
-#: ../src/gtk-ui/sync-ui.c:726
+#: ../src/gtk-ui/sync-ui.c:616 ../src/gtk-ui/sync-ui.c:701
msgid "Sync now"
msgstr "现在同步"
#. TRANSLATORS: Action button in info bar in main view. Shown with e.g.
#. * "A normal sync is not possible at this time..." message.
#. * "Other options" will open Emergency view
-#: ../src/gtk-ui/sync-ui.c:618
-#: ../src/gtk-ui/ui.glade.h:37
+#: ../src/gtk-ui/sync-ui.c:622 ../src/gtk-ui/ui.glade.h:37
msgid "Slow sync"
msgstr "慢速同步"
-#: ../src/gtk-ui/sync-ui.c:619
+#: ../src/gtk-ui/sync-ui.c:623
msgid "Other options..."
msgstr "其它选项"
#. TRANSLATORS: Action button in info bar in main view. Shown e.g.
#. * when no service is selected. Will open configuration view
-#: ../src/gtk-ui/sync-ui.c:624
+#: ../src/gtk-ui/sync-ui.c:628
msgid "Select sync service"
msgstr "选择同步服务"
#. TRANSLATORS: Action button in info bar in main view. Shown e.g.
#. * login to service fails. Will open configuration view for this service
-#: ../src/gtk-ui/sync-ui.c:629
+#: ../src/gtk-ui/sync-ui.c:633
msgid "Edit service settings"
msgstr "编辑服务设置"
-#: ../src/gtk-ui/sync-ui.c:700
-msgid "You haven't selected a sync service or device yet. Sync services let you synchronize your data between your netbook and a web service. You can also sync directly with some devices."
+#: ../src/gtk-ui/sync-ui.c:709
+msgid ""
+"You haven't selected a sync service or device yet. Sync services let you "
+"synchronize your data between your netbook and a web service. You can also "
+"sync directly with some devices."
msgstr "您尚未选择同步服务或设备。同步服务允许您在您的上网本和网络服务之间同步数据。您也可以直接与一些设备同步。"
-#: ../src/gtk-ui/sync-ui.c:722
+#: ../src/gtk-ui/sync-ui.c:729
msgid "Sync again"
msgstr "再次同步"
-#: ../src/gtk-ui/sync-ui.c:743
+#: ../src/gtk-ui/sync-ui.c:748
msgid "Restoring"
msgstr "恢复"
-#: ../src/gtk-ui/sync-ui.c:745
+#: ../src/gtk-ui/sync-ui.c:750
msgid "Syncing"
msgstr "正在同步"
#. TRANSLATORS: This is for the button in main view, right side.
#. Keep line length below ~20 characters, use two lines if needed
-#: ../src/gtk-ui/sync-ui.c:757
-#: ../src/gtk-ui/sync-ui.c:3374
+#: ../src/gtk-ui/sync-ui.c:762 ../src/gtk-ui/sync-ui.c:3407
msgid "Cancel sync"
msgstr "取消同步"
-#: ../src/gtk-ui/sync-ui.c:922
+#: ../src/gtk-ui/sync-ui.c:927
msgid "Back to sync"
msgstr "返回同步"
#. TRANSLATORS: label for checkbutton/toggle in main view.
#. * Please stick to similar length strings or break the line with
#. * "\n" if absolutely needed
-#: ../src/gtk-ui/sync-ui.c:1223
+#: ../src/gtk-ui/sync-ui.c:1229
msgid "Automatic sync"
msgstr "自动同步"
@@ -208,61 +212,69 @@ msgstr "自动同步"
#. * currently selected data sources. First placeholder is service/device
#. * name, second a comma separeted list of sources.
#. * E.g. "Affected data: Google Contacts, Appointments"
-#: ../src/gtk-ui/sync-ui.c:1494
+#: ../src/gtk-ui/sync-ui.c:1524
#, c-format
msgid "Affected data: %s %s"
msgstr "受影响的资料:%s %s"
-#: ../src/gtk-ui/sync-ui.c:1499
+#: ../src/gtk-ui/sync-ui.c:1529
#, c-format
msgid "Affected data: none"
msgstr "受影响的资料:没有"
#. TRANSLATORS: confirmation for restoring a backup. placeholder is the
#. * backup time string defined below
-#: ../src/gtk-ui/sync-ui.c:1577
+#: ../src/gtk-ui/sync-ui.c:1607
#, c-format
-msgid "Do you want to restore the backup from %s? All changes you have made since then will be lost."
+msgid ""
+"Do you want to restore the backup from %s? All changes you have made since "
+"then will be lost."
msgstr "您想要从 %s 恢复备份吗?您从那个时间"
-#: ../src/gtk-ui/sync-ui.c:1580
+#: ../src/gtk-ui/sync-ui.c:1610
msgid "Yes, restore"
msgstr "是的,恢复备份"
#. TRANSLATORS: date/time for strftime(), used in emergency view backup
#. * label. Any time format that shows date and time is good.
-#: ../src/gtk-ui/sync-ui.c:1612
+#: ../src/gtk-ui/sync-ui.c:1642
#, c-format
msgid "%x %X"
msgstr "%x %X"
#. TRANSLATORS: label for a backup in emergency view. Placeholder is
#. * service or device name
-#: ../src/gtk-ui/sync-ui.c:1631
+#: ../src/gtk-ui/sync-ui.c:1661
#, c-format
msgid "Backed up before syncing with %s"
msgstr "在和 %s 同步前已备份"
-#: ../src/gtk-ui/sync-ui.c:1648
+#: ../src/gtk-ui/sync-ui.c:1678
msgid "Restore"
msgstr "恢复"
#. TRANSLATORS: this is an explanation in Emergency view.
#. * Placeholder is a service/device name
-#: ../src/gtk-ui/sync-ui.c:1755
+#: ../src/gtk-ui/sync-ui.c:1785
#, c-format
-msgid "A normal sync with %s is not possible at this time. You can do a slow two-way sync or start from scratch. You can also restore a backup, but a slow sync or starting from scratch will still be required before normal sync is possible."
+msgid ""
+"A normal sync with %s is not possible at this time. You can do a slow two-"
+"way sync or start from scratch. You can also restore a backup, but a slow "
+"sync or starting from scratch will still be required before normal sync is "
+"possible."
msgstr "与 %s 的正常同步现在无法进行。您可以做慢速双向同步或从头开始。您也可以恢复一个备份,但是正常同步之前还是会需要慢速同步或从头开始。"
-#: ../src/gtk-ui/sync-ui.c:1765
+#: ../src/gtk-ui/sync-ui.c:1795
#, c-format
-msgid "If something has gone horribly wrong, you can try a slow sync, start from scratch or restore from backup."
+msgid ""
+"If something has gone horribly wrong, you can try a slow sync, start from "
+"scratch or restore from backup."
msgstr "如果发生严重错误,您可以尝试慢速同步,从头开始或者从备份恢复。"
#. TRANSLATORS: These are a buttons in Emergency view. Placeholder is a
#. * service/device name. Please don't use too long lines, but feel free to
#. * use several lines.
-#: ../src/gtk-ui/sync-ui.c:1774
+#: ../src/gtk-ui/sync-ui.c:1804
#, c-format
msgid ""
"Delete all your local\n"
@@ -273,7 +285,7 @@ msgstr ""
"数据并用 %s \n"
"数据替代它们"
-#: ../src/gtk-ui/sync-ui.c:1780
+#: ../src/gtk-ui/sync-ui.c:1810
#, c-format
msgid ""
"Delete all data on\n"
@@ -284,95 +296,92 @@ msgstr ""
"数据并用本地数据\n"
"替代它们"
-#: ../src/gtk-ui/sync-ui.c:2242
+#: ../src/gtk-ui/sync-ui.c:2275
msgid "Failed to get list of supported services from SyncEvolution"
msgstr "未能从 SyncEvolution 得到支持的服务列表"
-#: ../src/gtk-ui/sync-ui.c:2296
-msgid "There was a problem communicating with the sync process. Please try again later."
+#: ../src/gtk-ui/sync-ui.c:2329
+msgid ""
+"There was a problem communicating with the sync process. Please try again "
+"later."
msgstr "与同步进程通信时发生问题。请稍后再试。"
-#: ../src/gtk-ui/sync-ui.c:2355
+#: ../src/gtk-ui/sync-ui.c:2388
msgid "Restore failed"
msgstr "恢复失败"
-#: ../src/gtk-ui/sync-ui.c:2358
-#: ../src/gtk-ui/sync-ui.c:3243
+#: ../src/gtk-ui/sync-ui.c:2391 ../src/gtk-ui/sync-ui.c:3276
msgid "Sync failed"
msgstr "同步失败"
-#: ../src/gtk-ui/sync-ui.c:2364
+#: ../src/gtk-ui/sync-ui.c:2397
msgid "Restore complete"
msgstr "恢复完成"
-#: ../src/gtk-ui/sync-ui.c:2367
+#: ../src/gtk-ui/sync-ui.c:2400
msgid "Sync complete"
msgstr "同步完成"
-#: ../src/gtk-ui/sync-ui.c:2459
+#: ../src/gtk-ui/sync-ui.c:2492
#, c-format
msgid "Preparing '%s'"
msgstr "正在准备 '%s'"
-#: ../src/gtk-ui/sync-ui.c:2462
+#: ../src/gtk-ui/sync-ui.c:2495
#, c-format
msgid "Receiving '%s'"
msgstr "正在接收 '%s'"
-#: ../src/gtk-ui/sync-ui.c:2465
+#: ../src/gtk-ui/sync-ui.c:2498
#, c-format
msgid "Sending '%s'"
msgstr "正在发送 '%s'"
-#: ../src/gtk-ui/sync-ui.c:2586
+#: ../src/gtk-ui/sync-ui.c:2619
#, c-format
msgid "There was one remote rejection."
msgid_plural "There were %ld remote rejections."
-msgstr[0] "出现了一个远端拒绝。"
-msgstr[1] "出现了 %ld 个远端拒绝。"
+msgstr[0] "有 %ld 次远程拒绝。"
-#: ../src/gtk-ui/sync-ui.c:2591
+#: ../src/gtk-ui/sync-ui.c:2624
#, c-format
msgid "There was one local rejection."
msgid_plural "There were %ld local rejections."
-msgstr[0] "出现了一个本地拒绝。"
-msgstr[1] "出现了 %ld 个本地拒绝。"
+msgstr[0] "有 %ld 次本地拒绝。"
-#: ../src/gtk-ui/sync-ui.c:2596
+#: ../src/gtk-ui/sync-ui.c:2629
#, c-format
msgid "There were %ld local rejections and %ld remote rejections."
msgstr "一共出现了 %ld 个本地拒绝和 %ld 个远端拒绝。"
-#: ../src/gtk-ui/sync-ui.c:2601
+#: ../src/gtk-ui/sync-ui.c:2634
#, c-format
msgid "Last time: No changes."
msgstr "最近一次:没有更改"
-#: ../src/gtk-ui/sync-ui.c:2603
+#: ../src/gtk-ui/sync-ui.c:2636
#, c-format
msgid "Last time: Sent one change."
msgid_plural "Last time: Sent %ld changes."
-msgstr[0] "最近一次:发送了一个更改。"
-msgstr[1] "最近一次:发送了 %ld 个更改。"
+msgstr[0] "最近一次:发送了 %ld 个更改。"
#. This is about changes made to the local data. Not all of these
#. changes were requested by the remote server, so "applied"
#. is a better word than "received" (bug #5185).
-#: ../src/gtk-ui/sync-ui.c:2611
+#: ../src/gtk-ui/sync-ui.c:2644
#, c-format
msgid "Last time: Applied one change."
msgid_plural "Last time: Applied %ld changes."
-msgstr[0] "最近一次:应用了一个更改。"
-msgstr[1] "最近一次:应用了 %ld 个更改。"
+msgstr[0] "最近一次:应用了 %ld 个更改。"
-#: ../src/gtk-ui/sync-ui.c:2616
+#: ../src/gtk-ui/sync-ui.c:2649
#, c-format
msgid "Last time: Applied %ld changes and sent %ld changes."
msgstr "最近一次: 应用了 %ld 个更改并发送了 %ld 个更改。"
#. TRANSLATORS: the placeholder is a error message (hopefully)
#. * explaining the problem
-#: ../src/gtk-ui/sync-ui.c:2823
+#: ../src/gtk-ui/sync-ui.c:2856
#, c-format
msgid ""
"There was a problem with last sync:\n"
@@ -381,124 +390,136 @@ msgstr ""
"上一个同步发生问题:\n"
"%s"
-#: ../src/gtk-ui/sync-ui.c:2833
+#: ../src/gtk-ui/sync-ui.c:2866
#, c-format
-msgid "You've just restored a backup. The changes have not been synced with %s yet"
+msgid ""
+"You've just restored a backup. The changes have not been synced with %s yet"
msgstr "您刚刚恢复了一个备份。这些修改还没有和 %s 同步"
-#: ../src/gtk-ui/sync-ui.c:3121
+#: ../src/gtk-ui/sync-ui.c:3154
msgid "Waiting for current operation to finish..."
msgstr "正在等待当前的操作完成。。。"
#. TRANSLATORS: next strings are error messages.
-#: ../src/gtk-ui/sync-ui.c:3155
-msgid "A normal sync is not possible at this time. The server suggests a slow sync, but this might not always be what you want if both ends already have data."
+#: ../src/gtk-ui/sync-ui.c:3188
+msgid ""
+"A normal sync is not possible at this time. The server suggests a slow sync,"
+" but this might not always be what you want if both ends already have data."
msgstr "现在无法进行正常同步。服务器建议您做慢速同步,但是如果同步双方已经都有数据,您可能并不想使用慢速同步。"
-#: ../src/gtk-ui/sync-ui.c:3159
+#: ../src/gtk-ui/sync-ui.c:3192
msgid "The sync process died unexpectedly."
msgstr "同步服务异常退出。"
-#: ../src/gtk-ui/sync-ui.c:3164
-msgid "Password request was not answered. You can save the password in the settings to prevent the request."
+#: ../src/gtk-ui/sync-ui.c:3197
+msgid ""
+"Password request was not answered. You can save the password in the settings"
+" to prevent the request."
msgstr "密码请求没有回复。您可以在设置中保存密码,以防止密码请求。"
#. TODO use the service device name here, this is a remote problem
-#: ../src/gtk-ui/sync-ui.c:3168
+#: ../src/gtk-ui/sync-ui.c:3201
msgid "There was a problem processing sync request. Trying again may help."
msgstr "处理同步请求时发生问题。请再试一次。"
-#: ../src/gtk-ui/sync-ui.c:3174
-msgid "Failed to login. Could there be a problem with your username or password?"
+#: ../src/gtk-ui/sync-ui.c:3207
+msgid ""
+"Failed to login. Could there be a problem with your username or password?"
msgstr "登录失败。会不会是您的用户名或密码有问题?"
-#: ../src/gtk-ui/sync-ui.c:3177
+#: ../src/gtk-ui/sync-ui.c:3210
msgid "Forbidden"
msgstr "被禁止"
#. TRANSLATORS: data source means e.g. calendar or addressbook
-#: ../src/gtk-ui/sync-ui.c:3183
-msgid "A data source could not be found. Could there be a problem with the settings?"
+#: ../src/gtk-ui/sync-ui.c:3216
+msgid ""
+"A data source could not be found. Could there be a problem with the "
+"settings?"
msgstr "无法找到数据来源。会不会是设置有问题?"
-#: ../src/gtk-ui/sync-ui.c:3187
+#: ../src/gtk-ui/sync-ui.c:3220
msgid "Remote database error"
msgstr "远程数据库错误"
#. This can happen when EDS is borked, restart it may help...
-#: ../src/gtk-ui/sync-ui.c:3190
-msgid "There is a problem with the local database. Syncing again or rebooting may help."
+#: ../src/gtk-ui/sync-ui.c:3223
+msgid ""
+"There is a problem with the local database. Syncing again or rebooting may "
+"help."
msgstr "本地资料库有问题。请重新同步或者重新启动可能会有帮助。"
-#: ../src/gtk-ui/sync-ui.c:3193
+#: ../src/gtk-ui/sync-ui.c:3226
msgid "No space on disk"
msgstr "磁盘上没有剩余空间"
-#: ../src/gtk-ui/sync-ui.c:3195
+#: ../src/gtk-ui/sync-ui.c:3228
msgid "Failed to process SyncML"
msgstr "处理 SyncML 失败"
-#: ../src/gtk-ui/sync-ui.c:3197
+#: ../src/gtk-ui/sync-ui.c:3230
msgid "Server authorization failed"
msgstr "服务器认证失败"
-#: ../src/gtk-ui/sync-ui.c:3199
+#: ../src/gtk-ui/sync-ui.c:3232
msgid "Failed to parse configuration file"
msgstr "解析配置文件出错"
-#: ../src/gtk-ui/sync-ui.c:3201
+#: ../src/gtk-ui/sync-ui.c:3234
msgid "Failed to read configuration file"
msgstr "读配置文件时出错"
-#: ../src/gtk-ui/sync-ui.c:3203
+#: ../src/gtk-ui/sync-ui.c:3236
msgid "No configuration found"
msgstr "未找到配置"
-#: ../src/gtk-ui/sync-ui.c:3205
+#: ../src/gtk-ui/sync-ui.c:3238
msgid "No configuration file found"
msgstr "未找到配置文件"
-#: ../src/gtk-ui/sync-ui.c:3207
+#: ../src/gtk-ui/sync-ui.c:3240
msgid "Server sent bad content"
msgstr "服务器发送的内容错误"
-#: ../src/gtk-ui/sync-ui.c:3209
+#: ../src/gtk-ui/sync-ui.c:3242
msgid "Connection certificate has expired"
msgstr "该连接的认证已过期"
-#: ../src/gtk-ui/sync-ui.c:3211
+#: ../src/gtk-ui/sync-ui.c:3244
msgid "Connection certificate is invalid"
msgstr "连接认证不合法"
-#: ../src/gtk-ui/sync-ui.c:3219
-msgid "We were unable to connect to the server. The problem could be temporary or there could be something wrong with the settings."
+#: ../src/gtk-ui/sync-ui.c:3252
+msgid ""
+"We were unable to connect to the server. The problem could be temporary or "
+"there could be something wrong with the settings."
msgstr "我们无法连接到服务器。问题可能是暂时的,也可能是设置有问题。"
-#: ../src/gtk-ui/sync-ui.c:3226
+#: ../src/gtk-ui/sync-ui.c:3259
msgid "The server URL is bad"
msgstr "服务器的 URL有错误"
-#: ../src/gtk-ui/sync-ui.c:3231
+#: ../src/gtk-ui/sync-ui.c:3264
msgid "The server was not found"
msgstr "没有找到服务器"
-#: ../src/gtk-ui/sync-ui.c:3233
+#: ../src/gtk-ui/sync-ui.c:3266
#, c-format
msgid "Error %d"
msgstr "错误 %d"
#. TRANSLATORS: password request dialog contents: title, cancel button
#. * and ok button
-#: ../src/gtk-ui/sync-ui.c:3371
+#: ../src/gtk-ui/sync-ui.c:3404
msgid "Password is required for sync"
msgstr "同步需要密码"
-#: ../src/gtk-ui/sync-ui.c:3375
+#: ../src/gtk-ui/sync-ui.c:3408
msgid "Sync with password"
msgstr "用密码同步"
#. TRANSLATORS: password request dialog message, placeholder is service name
-#: ../src/gtk-ui/sync-ui.c:3385
+#: ../src/gtk-ui/sync-ui.c:3418
#, c-format
msgid "Please enter password for syncing with %s:"
msgstr "请输入与 %s 同步的密码:"
@@ -554,14 +575,17 @@ msgstr "添加新服务"
#. explanation of "Restore backup" function
#: ../src/gtk-ui/ui.glade.h:18
-msgid "Backups are made before every time we Sync. Choose a backup to restore. Any changes you have made since then will be lost."
+msgid ""
+"Backups are made before every time we Sync. Choose a backup to restore. Any "
+"changes you have made since then will be lost."
msgstr "在我们每次同步前都会进行备份。请选择要恢复的备份。所有您从备份时间后做的更改都将丢失。"
#: ../src/gtk-ui/ui.glade.h:19
msgid "Calendar"
msgstr "日历"
-#. Button in main view, right side. Keep to below 20 chars per line, feel free to use two lines
+#. Button in main view, right side. Keep to below 20 chars per line, feel free
+#. to use two lines
#: ../src/gtk-ui/ui.glade.h:21
msgid ""
"Change or edit\n"
@@ -595,7 +619,8 @@ msgstr ""
"并用 Zyb 上的数据\n"
"替代它们"
-#. button in main view, right side. Keep length to 20 characters or so, use two lines if needed
+#. button in main view, right side. Keep length to 20 characters or so, use
+#. two lines if needed
#: ../src/gtk-ui/ui.glade.h:32
msgid ""
"Fix a sync\n"
@@ -637,87 +662,110 @@ msgid "You will need to add Bluetooth devices before they can be synced."
msgstr "同步前你需要添加蓝牙设备。"
#: ../src/gtk-ui/sync.desktop.in.h:2
-#: ../src/gtk-ui/sync-gtk.desktop.in.h:2
msgid "Up to date"
msgstr "同步数据"
#: ../src/gtk-ui/sync-gtk.desktop.in.h:1
-msgid "Sync (GTK)"
-msgstr "同步 (GTK)"
+msgid "SyncEvolution (GTK)"
+msgstr "SyncEvolution (GTK)"
+
+#: ../src/gtk-ui/sync-gtk.desktop.in.h:2
+msgid "Synchronize PIM data"
+msgstr "同步 PIM(个人信息管理器)数据"
-#: ../src/gtk-ui/sync-config-widget.c:78
-msgid "ScheduleWorld enables you to keep your contacts, events, tasks, and notes in sync."
+#: ../src/gtk-ui/sync-config-widget.c:88
+msgid ""
+"ScheduleWorld enables you to keep your contacts, events, tasks, and notes in"
+" sync."
msgstr "ScheduleWorld 使您的联系人、事件、任务和便条保持同步。"
-#: ../src/gtk-ui/sync-config-widget.c:81
-msgid "Google Sync can back up and synchronize your contacts with your Gmail contacts."
+#: ../src/gtk-ui/sync-config-widget.c:91
+msgid ""
+"Google Sync can back up and synchronize your contacts with your Gmail "
+"contacts."
msgstr "Google Sync 可以把您的联系人和 Gmail 联系人备份和同步。"
#. TRANSLATORS: Please include the word "demo" (or the equivalent in
#. your language): Funambol is going to be a 90 day demo service
#. in the future
-#: ../src/gtk-ui/sync-config-widget.c:87
-msgid "Back up your contacts and calendar. Sync with a single click, anytime, anywhere (DEMO)."
+#: ../src/gtk-ui/sync-config-widget.c:97
+msgid ""
+"Back up your contacts and calendar. Sync with a single click, anytime, "
+"anywhere (DEMO)."
msgstr "备份您的联系人和日历。只需一键即可同步,随时、随地(演示)。"
-#: ../src/gtk-ui/sync-config-widget.c:90
-msgid "Mobical Backup and Restore service allows you to securely back up your personal mobile data for free."
+#: ../src/gtk-ui/sync-config-widget.c:100
+msgid ""
+"Mobical Backup and Restore service allows you to securely back up your "
+"personal mobile data for free."
msgstr "Mobical 备份和恢复服务可以让您免费而且安全地备份您的个人行动数据。"
-#: ../src/gtk-ui/sync-config-widget.c:93
-msgid "ZYB is a simple way for people to store and share mobile information online."
+#: ../src/gtk-ui/sync-config-widget.c:103
+msgid ""
+"ZYB is a simple way for people to store and share mobile information online."
msgstr "ZYB 是让您网上存储和分享行动咨询的简单方法。"
-#: ../src/gtk-ui/sync-config-widget.c:96
-msgid "Memotoo lets you access your personal data from any computer connected to the Internet."
+#: ../src/gtk-ui/sync-config-widget.c:106
+msgid ""
+"Memotoo lets you access your personal data from any computer connected to "
+"the Internet."
msgstr "Memotoo 让您从连接到互联网的任何电脑中存取您的个人数据。"
-#: ../src/gtk-ui/sync-config-widget.c:192
+#: ../src/gtk-ui/sync-config-widget.c:195
msgid "Sorry, failed to save the configuration"
msgstr "对不起,保存配置失败"
-#: ../src/gtk-ui/sync-config-widget.c:381
+#: ../src/gtk-ui/sync-config-widget.c:445
msgid "Service must have a name and server URL"
msgstr "需要给服务指定一个名字和服务器地址"
-#: ../src/gtk-ui/sync-config-widget.c:422
+#. TRANSLATORS: error dialog when creating a new sync configuration
+#: ../src/gtk-ui/sync-config-widget.c:451
+msgid "A username is required for this service"
+msgstr "此服务要求用户名"
+
+#: ../src/gtk-ui/sync-config-widget.c:493
#, c-format
-msgid "Do you want to reset the settings for %s? This will not remove any synced information on either end."
+msgid ""
+"Do you want to reset the settings for %s? This will not remove any synced "
+"information on either end."
msgstr "您想要重置 %s 的设置吗?这不会移除任何同步双方已经同步的数据。"
#. TRANSLATORS: buttons in reset-service warning dialog
-#: ../src/gtk-ui/sync-config-widget.c:426
+#: ../src/gtk-ui/sync-config-widget.c:497
msgid "Yes, reset"
msgstr "是,重置。"
-#: ../src/gtk-ui/sync-config-widget.c:427
-#: ../src/gtk-ui/sync-config-widget.c:438
+#: ../src/gtk-ui/sync-config-widget.c:498
+#: ../src/gtk-ui/sync-config-widget.c:509
msgid "No, keep settings"
msgstr "不,保留设置"
-#: ../src/gtk-ui/sync-config-widget.c:432
+#: ../src/gtk-ui/sync-config-widget.c:503
#, c-format
-msgid "Do you want to delete the settings for %s? This will not remove any synced information on either end but it will remove these settings."
+msgid ""
+"Do you want to delete the settings for %s? This will not remove any synced "
+"information on either end but it will remove these settings."
msgstr "您想要删除 %s 的设置吗?这不会移除任何双方已同步的资料,但是会移除这些设置。"
#. TRANSLATORS: buttons in delete-service warning dialog
-#: ../src/gtk-ui/sync-config-widget.c:437
+#: ../src/gtk-ui/sync-config-widget.c:508
msgid "Yes, delete"
msgstr "是的,删除"
-#: ../src/gtk-ui/sync-config-widget.c:467
+#: ../src/gtk-ui/sync-config-widget.c:539
msgid "Reset settings"
msgstr "重置设置"
-#: ../src/gtk-ui/sync-config-widget.c:470
+#: ../src/gtk-ui/sync-config-widget.c:542
msgid "Delete settings"
msgstr "删除设置"
-#: ../src/gtk-ui/sync-config-widget.c:480
+#: ../src/gtk-ui/sync-config-widget.c:552
msgid "Save and use"
msgstr "保存并使用"
-#: ../src/gtk-ui/sync-config-widget.c:483
+#: ../src/gtk-ui/sync-config-widget.c:555
msgid ""
"Save and replace\n"
"current service"
@@ -725,101 +773,112 @@ msgstr ""
"保存并替换\n"
"现有服务"
-#: ../src/gtk-ui/sync-config-widget.c:493
+#: ../src/gtk-ui/sync-config-widget.c:563
msgid "Stop using device"
msgstr "停止使用此设备"
-#: ../src/gtk-ui/sync-config-widget.c:496
+#: ../src/gtk-ui/sync-config-widget.c:566
msgid "Stop using service"
msgstr "停止使用此服务"
#. TRANSLATORS: label for an entry in service configuration form.
#. * Placeholder is a source name.
#. * Example: "Appointments URI"
-#: ../src/gtk-ui/sync-config-widget.c:679
+#: ../src/gtk-ui/sync-config-widget.c:749
#, c-format
msgid "%s URI"
msgstr "%s URI"
#. TRANSLATORS: toggles in service configuration form, placeholder is service
#. * or device name
-#: ../src/gtk-ui/sync-config-widget.c:854
+#: ../src/gtk-ui/sync-config-widget.c:936
#, c-format
msgid "Send changes to %s"
msgstr "发送更改至%s"
-#: ../src/gtk-ui/sync-config-widget.c:859
+#: ../src/gtk-ui/sync-config-widget.c:941
#, c-format
msgid "Receive changes from %s"
msgstr "接收改动自%s "
-#: ../src/gtk-ui/sync-config-widget.c:875
+#: ../src/gtk-ui/sync-config-widget.c:957
msgid "<b>Sync</b>"
msgstr "<b>同步</b>"
#. TRANSLATORS: label of a entry in service configuration
-#: ../src/gtk-ui/sync-config-widget.c:891
+#: ../src/gtk-ui/sync-config-widget.c:973
msgid "Server address"
msgstr "服务器地址"
#. TRANSLATORS: explanation before a device template combobox.
#. * Placeholder is a device name like 'Nokia N85' or 'Syncevolution
#. * Client'
-#: ../src/gtk-ui/sync-config-widget.c:967
+#: ../src/gtk-ui/sync-config-widget.c:1049
#, c-format
-msgid "This device looks like it might be a '%s'. If this is not correct, please take a look at the list of supported devices and pick yours if it is listed"
+msgid ""
+"This device looks like it might be a '%s'. If this is not correct, please "
+"take a look at the list of supported devices and pick yours if it is listed"
msgstr "设备看起来像“%s”。如果不是,请看一下列表中支持的设备,并从中选择您的设备。"
-#: ../src/gtk-ui/sync-config-widget.c:973
-msgid "We don't know what this device is exactly. Please take a look at the list of supported devices and pick yours if it is listed"
+#: ../src/gtk-ui/sync-config-widget.c:1055
+#: ../src/gtk-ui/sync-config-widget.c:1915
+msgid ""
+"We don't know what this device is exactly. Please take a look at the list of"
+" supported devices and pick yours if it is listed"
msgstr "我们不知道这到底是什么设备。请看一下列表中支持的设备,并从中选择您的设备。"
-#: ../src/gtk-ui/sync-config-widget.c:1126
+#: ../src/gtk-ui/sync-config-widget.c:1207
#, c-format
msgid "%s - Bluetooth device"
msgstr "%s - 蓝牙设备"
#. TRANSLATORS: service title for services that are not based on a
#. * template in service list, the placeholder is the name of the service
-#: ../src/gtk-ui/sync-config-widget.c:1132
+#: ../src/gtk-ui/sync-config-widget.c:1213
#, c-format
msgid "%s - manually setup"
msgstr "%s - 手动设置"
#. TRANSLATORS: link button in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1807
+#: ../src/gtk-ui/sync-config-widget.c:1886
msgid "Launch website"
msgstr "打开站点"
#. TRANSLATORS: button in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1816
+#: ../src/gtk-ui/sync-config-widget.c:1895
msgid "Set up now"
msgstr "现在设置"
+#: ../src/gtk-ui/sync-config-widget.c:1953
+msgid "Use these settings"
+msgstr "使用这些设置"
+
#. TRANSLATORS: labels of entries in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1912
+#: ../src/gtk-ui/sync-config-widget.c:1991
msgid "Username"
msgstr "用户名"
-#: ../src/gtk-ui/sync-config-widget.c:1927
+#: ../src/gtk-ui/sync-config-widget.c:2006
msgid "Password"
msgstr "密码"
#. TRANSLATORS: warning in service configuration form for people
#. who have modified the configuration via other means.
-#: ../src/gtk-ui/sync-config-widget.c:1950
-msgid "Current configuration is more complex than what can be shown here. Changes to sync mode or synced data types will overwrite that configuration."
+#: ../src/gtk-ui/sync-config-widget.c:2029
+msgid ""
+"Current configuration is more complex than what can be shown here. Changes "
+"to sync mode or synced data types will overwrite that configuration."
msgstr "目前的配置比当前显示的更复杂。同步模式或已同步数据类型的更改将会覆盖此配置。"
#. TRANSLATORS: this is the epander label for server settings
#. in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1969
+#: ../src/gtk-ui/sync-config-widget.c:2048
msgid "Hide server settings"
msgstr "隐藏服务器设置"
#. TRANSLATORS: this is the epander label for server settings
#. in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1989
+#: ../src/gtk-ui/sync-config-widget.c:2068
msgid "Show server settings"
msgstr "显示服务器设置"
@@ -827,164 +886,46 @@ msgstr "显示服务器设置"
msgid "Sync in the Sync application"
msgstr "在同步应用中同步"
-#: ../src/syncevo-dbus-server.cpp:5664
+#: ../src/syncevo-dbus-server.cpp:6653
#, c-format
msgid "%s is syncing"
msgstr "%s 正在进行同步"
-#: ../src/syncevo-dbus-server.cpp:5665
+#: ../src/syncevo-dbus-server.cpp:6654
#, c-format
msgid "We have just started to sync your computer with the %s sync service."
msgstr "我们已经将您的电脑与 %s 开始同步。"
#. if sync is successfully started and done
-#: ../src/syncevo-dbus-server.cpp:5679
+#: ../src/syncevo-dbus-server.cpp:6670
#, c-format
msgid "%s sync complete"
msgstr "%s 同步完成"
-#: ../src/syncevo-dbus-server.cpp:5680
+#: ../src/syncevo-dbus-server.cpp:6671
#, c-format
msgid "We have just finished syncing your computer with the %s sync service."
msgstr "我们已经完成您的电脑与 %s 的同步。"
-#. if sync is successfully started and has errors, or not started successful with a fatal problem
-#: ../src/syncevo-dbus-server.cpp:5685
+#. if sync is successfully started and has errors, or not started successful
+#. with a fatal problem
+#: ../src/syncevo-dbus-server.cpp:6676
msgid "Sync problem."
msgstr "同步出现问题。"
-#: ../src/syncevo-dbus-server.cpp:5686
+#: ../src/syncevo-dbus-server.cpp:6677
msgid "Sorry, there's a problem with your sync that you need to attend to."
msgstr "抱歉,有一个同步需要您看一下。"
-#: ../src/syncevo-dbus-server.cpp:5759
+#: ../src/syncevo-dbus-server.cpp:6758
msgid "View"
msgstr "查看"
#. Use "default" as ID because that is what mutter-moblin
#. recognizes: it then skips the action instead of adding it
#. in addition to its own "Dismiss" button (always added).
-#: ../src/syncevo-dbus-server.cpp:5763
+#: ../src/syncevo-dbus-server.cpp:6762
msgid "Dismiss"
msgstr "解除"
-#~ msgid "Database error"
-#~ msgstr "数据库错误"
-
-#~ msgid ""
-#~ "Do you want to replace %s with %s? This will not remove any synced "
-#~ "information on either end but you will no longer be able to sync with %s."
-#~ msgstr ""
-#~ "您想要用 %s 代替 %s 吗?这不会移除任何双方已同步的资料,但是您将无法再与 %"
-#~ "s 同步。"
-
-#~ msgid "Yes, use %s"
-#~ msgstr "是,使用 %s"
-
-#~ msgid "No, use %s"
-#~ msgstr "不,不使用 %s"
-
-#~ msgid "Reset service"
-#~ msgstr "重置此项服务"
-
-#~ msgid "Addressbook"
-#~ msgstr "地址本"
-
-#~ msgid "Todo"
-#~ msgstr "任务"
-
-#~ msgid "Memo"
-#~ msgstr "备忘录"
-
-#~ msgid "Failed to save current service in GConf configuration system"
-#~ msgstr "试图在 GConf 配置系统中保存当前服务时失败"
-
-#~ msgid "Failed to save service configuration to SyncEvolution"
-#~ msgstr "在向 SyncEvolution 中保存当前服务设置时失败"
-
-#~ msgid "Failed to get service configuration from SyncEvolution"
-#~ msgstr "试图从 SyncEvolution 中取得服务配置信息时失败"
-
-#~ msgid "Failed to remove service configuration from SyncEvolution"
-#~ msgstr "试图从 SyncEvolution 中删除服务配置信息时失败"
-
-#~ msgid "Failed to cancel: sync was no longer in progress"
-#~ msgstr "不能取消: 同步已经停止"
-
-#~ msgid "Failed to cancel sync"
-#~ msgstr "取消同步失败"
-
-#~ msgid "Canceling sync"
-#~ msgstr "正在取消同步"
-
-#~ msgid "No sources are enabled, not syncing"
-#~ msgstr "没有可用数据来源,同步未进行"
-
-#~ msgid "A sync is already in progress"
-#~ msgstr "同步操作已在进行中"
-
-#~ msgid "Failed to start sync"
-#~ msgstr "不能开始同步"
-
-#~ msgid "%s (not supported by this service)"
-#~ msgstr "%s (不被当前服务所支持)"
-
-#~ msgid "Failed to get server configuration from SyncEvolution"
-#~ msgstr "未能从 SyncEvolution 处取得服务器配置信息"
-
-#~ msgid "Server URL"
-#~ msgstr "服务器的 URL"
-
-#~ msgid "Failed to get list of manually setup services from SyncEvolution"
-#~ msgstr "未能从SyncEvolution取得手动设置服务列表"
-
-#~ msgid "Service configuration not found"
-#~ msgstr "服务配置没找到"
-
-#~ msgid "Not authorized"
-#~ msgstr "未认证"
-
-#~ msgid "Not found"
-#~ msgstr "没找到"
-
-#~ msgid "Transport failure (no connection?)"
-#~ msgstr "传输错误(没建立连接?)"
-
-#~ msgid "Connection timed out"
-#~ msgstr "连接超时"
-
-#~ msgid "Sync canceled"
-#~ msgstr "同步被取消"
-
-#~ msgid "Ending sync"
-#~ msgstr "结束同步"
-
-#~ msgid "<b>No sync service in use</b>"
-#~ msgstr "<b>没有正在使用中的同步服务</b>"
-
-#~ msgid "<big>Manual setup</big>"
-#~ msgstr "<big>手动设置</big>"
-
-#~ msgid "Merge local and remote data (recommended)"
-#~ msgstr "合并本地和远程数据(推荐)"
-
-#~ msgid "Reset original server settings"
-#~ msgstr "恢复服务器原始设置"
-
-#~ msgid "Service name"
-#~ msgstr "服务名字"
-
-#~ msgid ""
-#~ "Sorry, you need an internet\n"
-#~ "connection to sync."
-#~ msgstr "抱歉,您需要一个互联网连接来进行同步"
-
-#~ msgid ""
-#~ "Synchronization is not available (D-Bus service does not answer), sorry."
-#~ msgstr "抱歉,同步操作不可用(D-Bus服务无应答)."
-
-#~ msgid "Dummy string: This is not supposed to be seen at all."
-#~ msgstr "测试:这个应该被自动comment out"
-#~ msgid "Bring your data with you"
-#~ msgstr "让您的数据随身携带"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index bcaf178a..e31685a8 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,16 +1,25 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
# Cheng-Chia Tseng <pswo10680@gmail.com>, 2010.
+# Chung-Ying Huang <cutedoris@gmail.com>, 2011.
+# <tomas.galicia@intel.com>, 2011.
+# Wen-Hsin Moh <meego.pti.cht@gmail.com>, 2011.
msgid ""
msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: http://moblin.org/projects/syncevolution\n"
-"POT-Creation-Date: 2010-05-12 09:27+0000\n"
-"PO-Revision-Date: 2010-04-05 22:53+0800\n"
-"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
-"Language-Team: chinese-l10n <chinese-l10n@googlegroups.com>\n"
+"Project-Id-Version: syncevolution\n"
+"Report-Msgid-Bugs-To: https://bugs.meego.com/\n"
+"POT-Creation-Date: 2011-12-05 10:21-0800\n"
+"PO-Revision-Date: 2011-12-09 19:35+0000\n"
+"Last-Translator: GLS_CHT <meego.pti.cht@gmail.com>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/meego/team/zh_TW/)\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"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#. TRANSLATORS: this is the application name that may be used by e.g.
#. the windowmanager
@@ -22,7 +31,7 @@ msgstr "同步"
#: ../src/gtk-ui/sync-ui.c:266
msgid "Contacts"
-msgstr "連絡人"
+msgstr "聯絡人"
#: ../src/gtk-ui/sync-ui.c:268
msgid "Appointments"
@@ -62,76 +71,74 @@ msgstr "是,執行慢速同步"
msgid "No, cancel sync"
msgstr "不,取消同步"
-#. TRANSLATORS: confirmation dialog for refresh-from-server. Placeholder
+#. TRANSLATORS: confirmation dialog for "refresh from peer". Placeholder
#. * is service/device name
#: ../src/gtk-ui/sync-ui.c:424
#, c-format
msgid ""
"Do you want to delete all local data and replace it with data from %s? This "
"is not usually advised."
-msgstr ""
-"您要刪除所有本機資料,並使用 %s 上的資料取代它嗎?我們通常不建議這麼做。"
+msgstr "您要刪除所有本機資料,並使用 %s 上的資料取代它嗎?我們通常不建議這麼做。"
-#: ../src/gtk-ui/sync-ui.c:429 ../src/gtk-ui/sync-ui.c:460
+#: ../src/gtk-ui/sync-ui.c:429 ../src/gtk-ui/sync-ui.c:462
msgid "Yes, delete and replace"
msgstr "是,刪除並取代"
-#: ../src/gtk-ui/sync-ui.c:429 ../src/gtk-ui/sync-ui.c:460
-#: ../src/gtk-ui/sync-ui.c:1605
+#: ../src/gtk-ui/sync-ui.c:429 ../src/gtk-ui/sync-ui.c:462
+#: ../src/gtk-ui/sync-ui.c:1610
msgid "No"
msgstr "否"
-#. TRANSLATORS: confirmation dialog for refresh-from-client. Placeholder
+#. TRANSLATORS: confirmation dialog for "refresh from local side". Placeholder
#. * is service/device name
-#: ../src/gtk-ui/sync-ui.c:455
+#: ../src/gtk-ui/sync-ui.c:457
#, c-format
msgid ""
"Do you want to delete all data in %s and replace it with your local data? "
"This is not usually advised."
-msgstr ""
-"您要刪除所有在 %s 上的資料,並且使用本機資料取代它嗎?我們通常不建議這麼做。"
+msgstr "您要刪除所有在 %s 上的資料,並且使用本機資料取代它嗎?我們通常不建議這麼做。"
-#: ../src/gtk-ui/sync-ui.c:487
+#: ../src/gtk-ui/sync-ui.c:491
msgid "Trying to cancel sync"
msgstr "正在嘗試取消同步"
-#: ../src/gtk-ui/sync-ui.c:529
+#: ../src/gtk-ui/sync-ui.c:533
msgid "No service or device selected"
msgstr "未選取服務或裝置"
#. TRANSLATORS: This is the title on main view. Placeholder is
#. * the service name. Example: "Google - synced just now"
-#: ../src/gtk-ui/sync-ui.c:537
+#: ../src/gtk-ui/sync-ui.c:541
#, c-format
msgid "%s - synced just now"
msgstr "%s - 剛才同步過"
-#: ../src/gtk-ui/sync-ui.c:541
+#: ../src/gtk-ui/sync-ui.c:545
#, c-format
msgid "%s - synced a minute ago"
msgstr "%s - 一分鐘前同步過"
-#: ../src/gtk-ui/sync-ui.c:545
+#: ../src/gtk-ui/sync-ui.c:549
#, c-format
msgid "%s - synced %ld minutes ago"
msgstr "%s - %ld 分鐘前同步過"
-#: ../src/gtk-ui/sync-ui.c:550
+#: ../src/gtk-ui/sync-ui.c:554
#, c-format
msgid "%s - synced an hour ago"
msgstr "%s - 一小時前同步過"
-#: ../src/gtk-ui/sync-ui.c:554
+#: ../src/gtk-ui/sync-ui.c:558
#, c-format
msgid "%s - synced %ld hours ago"
msgstr "%s - %ld 小時前同步過"
-#: ../src/gtk-ui/sync-ui.c:559
+#: ../src/gtk-ui/sync-ui.c:563
#, c-format
msgid "%s - synced a day ago"
msgstr "%s - 一天前同步過"
-#: ../src/gtk-ui/sync-ui.c:563
+#: ../src/gtk-ui/sync-ui.c:567
#, c-format
msgid "%s - synced %ld days ago"
msgstr "%s - %ld 天前同步過"
@@ -139,68 +146,66 @@ msgstr "%s - %ld 天前同步過"
#. TRANSLATORS: Action button in info bar in main view. Shown with e.g.
#. * "You've just restored a backup. The changes have not been "
#. * "synced with %s yet"
-#: ../src/gtk-ui/sync-ui.c:612 ../src/gtk-ui/sync-ui.c:726
+#: ../src/gtk-ui/sync-ui.c:616 ../src/gtk-ui/sync-ui.c:701
msgid "Sync now"
msgstr "現在同步"
#. TRANSLATORS: Action button in info bar in main view. Shown with e.g.
#. * "A normal sync is not possible at this time..." message.
#. * "Other options" will open Emergency view
-#: ../src/gtk-ui/sync-ui.c:618 ../src/gtk-ui/ui.glade.h:37
+#: ../src/gtk-ui/sync-ui.c:622 ../src/gtk-ui/ui.glade.h:37
msgid "Slow sync"
msgstr "慢速同步"
-#: ../src/gtk-ui/sync-ui.c:619
+#: ../src/gtk-ui/sync-ui.c:623
msgid "Other options..."
msgstr "其他選項..."
#. TRANSLATORS: Action button in info bar in main view. Shown e.g.
#. * when no service is selected. Will open configuration view
-#: ../src/gtk-ui/sync-ui.c:624
+#: ../src/gtk-ui/sync-ui.c:628
msgid "Select sync service"
msgstr "選取同步服務"
#. TRANSLATORS: Action button in info bar in main view. Shown e.g.
#. * login to service fails. Will open configuration view for this service
-#: ../src/gtk-ui/sync-ui.c:629
+#: ../src/gtk-ui/sync-ui.c:633
msgid "Edit service settings"
msgstr "編輯服務設定"
-#: ../src/gtk-ui/sync-ui.c:700
+#: ../src/gtk-ui/sync-ui.c:709
msgid ""
"You haven't selected a sync service or device yet. Sync services let you "
"synchronize your data between your netbook and a web service. You can also "
"sync directly with some devices."
-msgstr ""
-"您尚未選取同步服務或裝置。同步服務讓您在您的網路筆電與網路服務間同步您的資"
-"料。您也可以直接和一些裝置進行同步。"
+msgstr "您尚未選取同步服務或裝置。同步服務讓您在您的網路筆電與網路服務間同步您的資料。您也可以直接和一些裝置進行同步。"
-#: ../src/gtk-ui/sync-ui.c:722
+#: ../src/gtk-ui/sync-ui.c:729
msgid "Sync again"
msgstr "再次同步"
-#: ../src/gtk-ui/sync-ui.c:743
+#: ../src/gtk-ui/sync-ui.c:748
msgid "Restoring"
msgstr "正在還原"
-#: ../src/gtk-ui/sync-ui.c:745
+#: ../src/gtk-ui/sync-ui.c:750
msgid "Syncing"
msgstr "正在同步中"
#. TRANSLATORS: This is for the button in main view, right side.
#. Keep line length below ~20 characters, use two lines if needed
-#: ../src/gtk-ui/sync-ui.c:757 ../src/gtk-ui/sync-ui.c:3399
+#: ../src/gtk-ui/sync-ui.c:762 ../src/gtk-ui/sync-ui.c:3407
msgid "Cancel sync"
msgstr "取消同步"
-#: ../src/gtk-ui/sync-ui.c:922
+#: ../src/gtk-ui/sync-ui.c:927
msgid "Back to sync"
msgstr "返回同步"
#. TRANSLATORS: label for checkbutton/toggle in main view.
#. * Please stick to similar length strings or break the line with
#. * "\n" if absolutely needed
-#: ../src/gtk-ui/sync-ui.c:1224
+#: ../src/gtk-ui/sync-ui.c:1229
msgid "Automatic sync"
msgstr "自動同步"
@@ -208,50 +213,50 @@ msgstr "自動同步"
#. * currently selected data sources. First placeholder is service/device
#. * name, second a comma separeted list of sources.
#. * E.g. "Affected data: Google Contacts, Appointments"
-#: ../src/gtk-ui/sync-ui.c:1519
+#: ../src/gtk-ui/sync-ui.c:1524
#, c-format
msgid "Affected data: %s %s"
msgstr "受影響的資料:%s %s"
-#: ../src/gtk-ui/sync-ui.c:1524
+#: ../src/gtk-ui/sync-ui.c:1529
#, c-format
msgid "Affected data: none"
msgstr "受影響的資料:無"
#. TRANSLATORS: confirmation for restoring a backup. placeholder is the
#. * backup time string defined below
-#: ../src/gtk-ui/sync-ui.c:1602
+#: ../src/gtk-ui/sync-ui.c:1607
#, c-format
msgid ""
"Do you want to restore the backup from %s? All changes you have made since "
"then will be lost."
msgstr "您想要還原來自 %s 的備份嗎?所有您從那時起的變更都會喪失。"
-#: ../src/gtk-ui/sync-ui.c:1605
+#: ../src/gtk-ui/sync-ui.c:1610
msgid "Yes, restore"
msgstr "是,還原"
#. TRANSLATORS: date/time for strftime(), used in emergency view backup
#. * label. Any time format that shows date and time is good.
-#: ../src/gtk-ui/sync-ui.c:1637
+#: ../src/gtk-ui/sync-ui.c:1642
#, c-format
msgid "%x %X"
msgstr "%x %X"
#. TRANSLATORS: label for a backup in emergency view. Placeholder is
#. * service or device name
-#: ../src/gtk-ui/sync-ui.c:1656
+#: ../src/gtk-ui/sync-ui.c:1661
#, c-format
msgid "Backed up before syncing with %s"
msgstr "在與 %s 同步前已備份"
-#: ../src/gtk-ui/sync-ui.c:1673
+#: ../src/gtk-ui/sync-ui.c:1678
msgid "Restore"
msgstr "還原"
#. TRANSLATORS: this is an explanation in Emergency view.
#. * Placeholder is a service/device name
-#: ../src/gtk-ui/sync-ui.c:1780
+#: ../src/gtk-ui/sync-ui.c:1785
#, c-format
msgid ""
"A normal sync with %s is not possible at this time. You can do a slow two-"
@@ -259,10 +264,9 @@ msgid ""
"sync or starting from scratch will still be required before normal sync is "
"possible."
msgstr ""
-"與 %s 的一般同步目前無法使用。您可以執行慢速雙方同步,或是從零開始。您也可以"
-"從備份中還原,但是在一般同步可以使用之前,會需要慢速同步或從零開始。"
+"與 %s 的一般同步目前無法使用。您可以執行慢速雙方同步,或是從零開始。您也可以從備份中還原,但是在一般同步可以使用之前,會需要慢速同步或從零開始。"
-#: ../src/gtk-ui/sync-ui.c:1790
+#: ../src/gtk-ui/sync-ui.c:1795
#, c-format
msgid ""
"If something has gone horribly wrong, you can try a slow sync, start from "
@@ -272,7 +276,7 @@ msgstr "如果有東西發生可怕錯誤,您可以嘗試慢速同步、從零
#. TRANSLATORS: These are a buttons in Emergency view. Placeholder is a
#. * service/device name. Please don't use too long lines, but feel free to
#. * use several lines.
-#: ../src/gtk-ui/sync-ui.c:1799
+#: ../src/gtk-ui/sync-ui.c:1804
#, c-format
msgid ""
"Delete all your local\n"
@@ -283,7 +287,7 @@ msgstr ""
"資料並使用來自\n"
"%s 的資料取代"
-#: ../src/gtk-ui/sync-ui.c:1805
+#: ../src/gtk-ui/sync-ui.c:1810
#, c-format
msgid ""
"Delete all data on\n"
@@ -294,96 +298,92 @@ msgstr ""
"資料並使用您的本機\n"
"資料取代"
-#: ../src/gtk-ui/sync-ui.c:2267
+#: ../src/gtk-ui/sync-ui.c:2275
msgid "Failed to get list of supported services from SyncEvolution"
msgstr "從 SyncEvolution 取得支援的服務清單時失敗"
-#: ../src/gtk-ui/sync-ui.c:2321
+#: ../src/gtk-ui/sync-ui.c:2329
msgid ""
"There was a problem communicating with the sync process. Please try again "
"later."
msgstr "與同步程序溝通成有錯誤發生。請稍候重試。"
-#: ../src/gtk-ui/sync-ui.c:2380
+#: ../src/gtk-ui/sync-ui.c:2388
msgid "Restore failed"
msgstr "還原失敗"
-#: ../src/gtk-ui/sync-ui.c:2383 ../src/gtk-ui/sync-ui.c:3268
+#: ../src/gtk-ui/sync-ui.c:2391 ../src/gtk-ui/sync-ui.c:3276
msgid "Sync failed"
msgstr "同步失敗"
-#: ../src/gtk-ui/sync-ui.c:2389
+#: ../src/gtk-ui/sync-ui.c:2397
msgid "Restore complete"
msgstr "還原完成"
-#: ../src/gtk-ui/sync-ui.c:2392
+#: ../src/gtk-ui/sync-ui.c:2400
msgid "Sync complete"
msgstr "同步完成"
-#: ../src/gtk-ui/sync-ui.c:2484
+#: ../src/gtk-ui/sync-ui.c:2492
#, c-format
msgid "Preparing '%s'"
msgstr "正在準備「%s」"
-#: ../src/gtk-ui/sync-ui.c:2487
+#: ../src/gtk-ui/sync-ui.c:2495
#, c-format
msgid "Receiving '%s'"
msgstr "正在接收「%s」"
-#: ../src/gtk-ui/sync-ui.c:2490
+#: ../src/gtk-ui/sync-ui.c:2498
#, c-format
msgid "Sending '%s'"
msgstr "正在傳送「%s」"
-#: ../src/gtk-ui/sync-ui.c:2611
+#: ../src/gtk-ui/sync-ui.c:2619
#, c-format
msgid "There was one remote rejection."
msgid_plural "There were %ld remote rejections."
-msgstr[0] "有過一次遠端拒絕。"
-msgstr[1] "有過 %ld 次遠端拒絕。"
+msgstr[0] "有 %ld 個遠端拒絕。"
-#: ../src/gtk-ui/sync-ui.c:2616
+#: ../src/gtk-ui/sync-ui.c:2624
#, c-format
msgid "There was one local rejection."
msgid_plural "There were %ld local rejections."
-msgstr[0] "有過一次本機拒絕。"
-msgstr[1] "有過 %ld 次本機拒絕。"
+msgstr[0] "有 %ld 個本機拒絕。"
-#: ../src/gtk-ui/sync-ui.c:2621
+#: ../src/gtk-ui/sync-ui.c:2629
#, c-format
msgid "There were %ld local rejections and %ld remote rejections."
msgstr "有過 %ld 次本機拒絕和 %ld 次遠端拒絕。"
-#: ../src/gtk-ui/sync-ui.c:2626
+#: ../src/gtk-ui/sync-ui.c:2634
#, c-format
msgid "Last time: No changes."
msgstr "上次:沒有變更。"
-#: ../src/gtk-ui/sync-ui.c:2628
+#: ../src/gtk-ui/sync-ui.c:2636
#, c-format
msgid "Last time: Sent one change."
msgid_plural "Last time: Sent %ld changes."
-msgstr[0] "上次:傳送了一個變更。"
-msgstr[1] "上次:傳送了 %ld 個變更。"
+msgstr[0] "上次:已傳送 %ld 個變更。"
#. This is about changes made to the local data. Not all of these
#. changes were requested by the remote server, so "applied"
#. is a better word than "received" (bug #5185).
-#: ../src/gtk-ui/sync-ui.c:2636
+#: ../src/gtk-ui/sync-ui.c:2644
#, c-format
msgid "Last time: Applied one change."
msgid_plural "Last time: Applied %ld changes."
-msgstr[0] "上次:套用了一個變更。"
-msgstr[1] "上次:套用了 %ld 個變更。"
+msgstr[0] "上次:已套用 %ld 個變更。"
-#: ../src/gtk-ui/sync-ui.c:2641
+#: ../src/gtk-ui/sync-ui.c:2649
#, c-format
msgid "Last time: Applied %ld changes and sent %ld changes."
msgstr "上次:套用了 %ld 個變更並傳送了 %ld 個變更。"
#. TRANSLATORS: the placeholder is a error message (hopefully)
#. * explaining the problem
-#: ../src/gtk-ui/sync-ui.c:2848
+#: ../src/gtk-ui/sync-ui.c:2856
#, c-format
msgid ""
"There was a problem with last sync:\n"
@@ -392,137 +392,136 @@ msgstr ""
"上次同步有錯誤發生:\n"
"%s"
-#: ../src/gtk-ui/sync-ui.c:2858
+#: ../src/gtk-ui/sync-ui.c:2866
#, c-format
msgid ""
"You've just restored a backup. The changes have not been synced with %s yet"
msgstr "您剛才已經還原一份備份。這些變更尚未與 %s 同步"
-#: ../src/gtk-ui/sync-ui.c:3146
+#: ../src/gtk-ui/sync-ui.c:3154
msgid "Waiting for current operation to finish..."
msgstr "正在等候目前的操作完成..."
#. TRANSLATORS: next strings are error messages.
-#: ../src/gtk-ui/sync-ui.c:3180
+#: ../src/gtk-ui/sync-ui.c:3188
msgid ""
-"A normal sync is not possible at this time. The server suggests a slow sync, "
-"but this might not always be what you want if both ends already have data."
-msgstr ""
-"一般同步目前無法使用。這台伺服器建議使用慢速同步,但這可能不總是您想要的,因"
-"為雙方可能都已經有資料。"
+"A normal sync is not possible at this time. The server suggests a slow sync,"
+" but this might not always be what you want if both ends already have data."
+msgstr "一般同步目前無法使用。這台伺服器建議使用慢速同步,但這可能不總是您想要的,因為雙方可能都已經有資料。"
-#: ../src/gtk-ui/sync-ui.c:3184
+#: ../src/gtk-ui/sync-ui.c:3192
msgid "The sync process died unexpectedly."
msgstr "同步程序在沒有預期的情況下終止了。"
-#: ../src/gtk-ui/sync-ui.c:3189
+#: ../src/gtk-ui/sync-ui.c:3197
msgid ""
-"Password request was not answered. You can save the password in the settings "
-"to prevent the request."
+"Password request was not answered. You can save the password in the settings"
+" to prevent the request."
msgstr "密碼請求沒有回應。您可以在設定值內儲存密碼來略過請求。"
#. TODO use the service device name here, this is a remote problem
-#: ../src/gtk-ui/sync-ui.c:3193
+#: ../src/gtk-ui/sync-ui.c:3201
msgid "There was a problem processing sync request. Trying again may help."
msgstr "同步請發生問題。重試一次可能會有幫助。"
-#: ../src/gtk-ui/sync-ui.c:3199
+#: ../src/gtk-ui/sync-ui.c:3207
msgid ""
"Failed to login. Could there be a problem with your username or password?"
msgstr "登入失敗。您的使用者名稱或密碼是否有問題?"
-#: ../src/gtk-ui/sync-ui.c:3202
+#: ../src/gtk-ui/sync-ui.c:3210
msgid "Forbidden"
msgstr "禁止"
#. TRANSLATORS: data source means e.g. calendar or addressbook
-#: ../src/gtk-ui/sync-ui.c:3208
+#: ../src/gtk-ui/sync-ui.c:3216
msgid ""
-"A data source could not be found. Could there be a problem with the settings?"
+"A data source could not be found. Could there be a problem with the "
+"settings?"
msgstr "無法找到資料來源。設定值是否有問題?"
-#: ../src/gtk-ui/sync-ui.c:3212
+#: ../src/gtk-ui/sync-ui.c:3220
msgid "Remote database error"
msgstr "遠端資料庫錯誤"
#. This can happen when EDS is borked, restart it may help...
-#: ../src/gtk-ui/sync-ui.c:3215
+#: ../src/gtk-ui/sync-ui.c:3223
msgid ""
"There is a problem with the local database. Syncing again or rebooting may "
"help."
msgstr "本機資料庫有問題。再次同步或是重新開機可能會有所幫助。"
-#: ../src/gtk-ui/sync-ui.c:3218
+#: ../src/gtk-ui/sync-ui.c:3226
msgid "No space on disk"
msgstr "磁碟沒有空間"
-#: ../src/gtk-ui/sync-ui.c:3220
+#: ../src/gtk-ui/sync-ui.c:3228
msgid "Failed to process SyncML"
msgstr "進行 SyncML 動作失敗"
-#: ../src/gtk-ui/sync-ui.c:3222
+#: ../src/gtk-ui/sync-ui.c:3230
msgid "Server authorization failed"
msgstr "伺服器授權失敗"
-#: ../src/gtk-ui/sync-ui.c:3224
+#: ../src/gtk-ui/sync-ui.c:3232
msgid "Failed to parse configuration file"
msgstr "解析設置檔案動作失敗"
-#: ../src/gtk-ui/sync-ui.c:3226
+#: ../src/gtk-ui/sync-ui.c:3234
msgid "Failed to read configuration file"
msgstr "讀取設置檔案動作失敗"
-#: ../src/gtk-ui/sync-ui.c:3228
+#: ../src/gtk-ui/sync-ui.c:3236
msgid "No configuration found"
msgstr "未找到設置"
-#: ../src/gtk-ui/sync-ui.c:3230
+#: ../src/gtk-ui/sync-ui.c:3238
msgid "No configuration file found"
msgstr "未找到設置檔案"
-#: ../src/gtk-ui/sync-ui.c:3232
+#: ../src/gtk-ui/sync-ui.c:3240
msgid "Server sent bad content"
msgstr "伺服器傳送出壞的內容"
-#: ../src/gtk-ui/sync-ui.c:3234
+#: ../src/gtk-ui/sync-ui.c:3242
msgid "Connection certificate has expired"
msgstr "連線憑證己過期"
-#: ../src/gtk-ui/sync-ui.c:3236
+#: ../src/gtk-ui/sync-ui.c:3244
msgid "Connection certificate is invalid"
msgstr "連線憑證無效"
-#: ../src/gtk-ui/sync-ui.c:3244
+#: ../src/gtk-ui/sync-ui.c:3252
msgid ""
"We were unable to connect to the server. The problem could be temporary or "
"there could be something wrong with the settings."
msgstr "我們無法連接到伺服器。問題可能是暫時的,或是伺服器的設定值可能有問題。"
-#: ../src/gtk-ui/sync-ui.c:3251
+#: ../src/gtk-ui/sync-ui.c:3259
msgid "The server URL is bad"
msgstr "伺服器的 URL 不對"
-#: ../src/gtk-ui/sync-ui.c:3256
+#: ../src/gtk-ui/sync-ui.c:3264
msgid "The server was not found"
msgstr "找不到伺服器"
-#: ../src/gtk-ui/sync-ui.c:3258
+#: ../src/gtk-ui/sync-ui.c:3266
#, c-format
msgid "Error %d"
msgstr "錯誤 %d"
#. TRANSLATORS: password request dialog contents: title, cancel button
#. * and ok button
-#: ../src/gtk-ui/sync-ui.c:3396
+#: ../src/gtk-ui/sync-ui.c:3404
msgid "Password is required for sync"
msgstr "同步需要密碼"
-#: ../src/gtk-ui/sync-ui.c:3400
+#: ../src/gtk-ui/sync-ui.c:3408
msgid "Sync with password"
msgstr "使用密碼進行同步"
#. TRANSLATORS: password request dialog message, placeholder is service name
-#: ../src/gtk-ui/sync-ui.c:3410
+#: ../src/gtk-ui/sync-ui.c:3418
#, c-format
msgid "Please enter password for syncing with %s:"
msgstr "請輸入使用 %s 進行同步的密碼:"
@@ -581,15 +580,14 @@ msgstr "新增服務"
msgid ""
"Backups are made before every time we Sync. Choose a backup to restore. Any "
"changes you have made since then will be lost."
-msgstr ""
-"在我們每次同步前都會進行備份。選擇要還原的備份。所有您從那時起的變更都會喪"
-"失。"
+msgstr "在我們每次同步前都會進行備份。選擇要還原的備份。所有您從那時起的變更都會喪失。"
#: ../src/gtk-ui/ui.glade.h:19
msgid "Calendar"
msgstr "行事曆"
-#. Button in main view, right side. Keep to below 20 chars per line, feel free to use two lines
+#. Button in main view, right side. Keep to below 20 chars per line, feel free
+#. to use two lines
#: ../src/gtk-ui/ui.glade.h:21
msgid ""
"Change or edit\n"
@@ -617,7 +615,8 @@ msgid ""
"with data from Zyb"
msgstr "刪除所有本機資料,並使用遠端資料取代"
-#. button in main view, right side. Keep length to 20 characters or so, use two lines if needed
+#. button in main view, right side. Keep length to 20 characters or so, use
+#. two lines if needed
#: ../src/gtk-ui/ui.glade.h:32
msgid ""
"Fix a sync\n"
@@ -628,12 +627,10 @@ msgstr ""
#: ../src/gtk-ui/ui.glade.h:34
msgid ""
-"If you don't see your service above but know that your sync provider uses "
-"SyncML\n"
+"If you don't see your service above but know that your sync provider uses SyncML\n"
"you can setup a service manually."
msgstr ""
-"如果您在上方沒有看到您的服務,但是您知道您的同步功能供應廠商使用 SyncML 的"
-"話,\n"
+"如果您在上方沒有看到您的服務,但是您知道您的同步功能供應廠商使用 SyncML 的話,\n"
"您可以手動設定服務。"
#: ../src/gtk-ui/ui.glade.h:36
@@ -646,8 +643,7 @@ msgstr "同步緊急狀況"
#: ../src/gtk-ui/ui.glade.h:41
msgid ""
-"To sync you'll need a network connection and an account with a sync "
-"service.\n"
+"To sync you'll need a network connection and an account with a sync service.\n"
"We support the following services: "
msgstr ""
"若要同步,您需要有網路連線以及使用同步服務的帳號。\n"
@@ -661,21 +657,25 @@ msgstr "使用藍牙從某裝置同步您的資料到另一個裝置去。"
msgid "You will need to add Bluetooth devices before they can be synced."
msgstr "在它們能被同步前,您需要先加入藍牙裝置。"
-#: ../src/gtk-ui/sync.desktop.in.h:2 ../src/gtk-ui/sync-gtk.desktop.in.h:2
+#: ../src/gtk-ui/sync.desktop.in.h:2
msgid "Up to date"
msgstr "已是最新"
#: ../src/gtk-ui/sync-gtk.desktop.in.h:1
-msgid "Sync (GTK)"
-msgstr "同步 (GTK)"
+msgid "SyncEvolution (GTK)"
+msgstr "SyncEvolution (GTK)"
+
+#: ../src/gtk-ui/sync-gtk.desktop.in.h:2
+msgid "Synchronize PIM data"
+msgstr "將個人資訊管理系統 (PIM) 的資料同步"
-#: ../src/gtk-ui/sync-config-widget.c:78
+#: ../src/gtk-ui/sync-config-widget.c:88
msgid ""
-"ScheduleWorld enables you to keep your contacts, events, tasks, and notes in "
-"sync."
+"ScheduleWorld enables you to keep your contacts, events, tasks, and notes in"
+" sync."
msgstr "ScheduleWorld 可以讓您的連絡人、行事曆事項、工作、以及註記保持同步。"
-#: ../src/gtk-ui/sync-config-widget.c:81
+#: ../src/gtk-ui/sync-config-widget.c:91
msgid ""
"Google Sync can back up and synchronize your contacts with your Gmail "
"contacts."
@@ -684,38 +684,43 @@ msgstr "Google Sync 可以將您的聯絡人和 Gmail 連絡人進行備份以
#. TRANSLATORS: Please include the word "demo" (or the equivalent in
#. your language): Funambol is going to be a 90 day demo service
#. in the future
-#: ../src/gtk-ui/sync-config-widget.c:87
+#: ../src/gtk-ui/sync-config-widget.c:97
msgid ""
"Back up your contacts and calendar. Sync with a single click, anytime, "
"anywhere (DEMO)."
-msgstr "備份您的連絡人與行事曆。一個按鍵就同步,任何時間、任何地點(樣本)。"
+msgstr "備份您的連絡人與行事曆。一個按鍵就同步,任何時間、任何地點 (樣本)。"
-#: ../src/gtk-ui/sync-config-widget.c:90
+#: ../src/gtk-ui/sync-config-widget.c:100
msgid ""
"Mobical Backup and Restore service allows you to securely back up your "
"personal mobile data for free."
msgstr "Mobical 備份與還原服務讓您可以安全地備份個人行動資料,而且免費。"
-#: ../src/gtk-ui/sync-config-widget.c:93
+#: ../src/gtk-ui/sync-config-widget.c:103
msgid ""
"ZYB is a simple way for people to store and share mobile information online."
msgstr "ZYB 是人們儲存與線上分享行動資訊的一種簡單方法。"
-#: ../src/gtk-ui/sync-config-widget.c:96
+#: ../src/gtk-ui/sync-config-widget.c:106
msgid ""
"Memotoo lets you access your personal data from any computer connected to "
"the Internet."
msgstr "Memotoo 能讓您從任何連接到網路的電腦存取您的個人資料。"
-#: ../src/gtk-ui/sync-config-widget.c:192
+#: ../src/gtk-ui/sync-config-widget.c:195
msgid "Sorry, failed to save the configuration"
msgstr "很抱歉,儲存設定檔失敗"
-#: ../src/gtk-ui/sync-config-widget.c:381
+#: ../src/gtk-ui/sync-config-widget.c:445
msgid "Service must have a name and server URL"
msgstr "服務項目必須要有一個名稱和伺服器網址"
-#: ../src/gtk-ui/sync-config-widget.c:422
+#. TRANSLATORS: error dialog when creating a new sync configuration
+#: ../src/gtk-ui/sync-config-widget.c:451
+msgid "A username is required for this service"
+msgstr "此服務需要使用者名稱"
+
+#: ../src/gtk-ui/sync-config-widget.c:493
#, c-format
msgid ""
"Do you want to reset the settings for %s? This will not remove any synced "
@@ -723,42 +728,40 @@ msgid ""
msgstr "您想要為 %s 重設設定嗎?這不會移除任何兩方同步過的資訊。"
#. TRANSLATORS: buttons in reset-service warning dialog
-#: ../src/gtk-ui/sync-config-widget.c:426
+#: ../src/gtk-ui/sync-config-widget.c:497
msgid "Yes, reset"
msgstr "是,重設"
-#: ../src/gtk-ui/sync-config-widget.c:427
-#: ../src/gtk-ui/sync-config-widget.c:438
+#: ../src/gtk-ui/sync-config-widget.c:498
+#: ../src/gtk-ui/sync-config-widget.c:509
msgid "No, keep settings"
msgstr "不,維持設定"
-#: ../src/gtk-ui/sync-config-widget.c:432
+#: ../src/gtk-ui/sync-config-widget.c:503
#, c-format
msgid ""
"Do you want to delete the settings for %s? This will not remove any synced "
"information on either end but it will remove these settings."
-msgstr ""
-"您想要為 %s 刪除設定值嗎?這不會移除任何兩端同步過的資訊,但是它會移除這些設"
-"定值。"
+msgstr "您想要為 %s 刪除設定值嗎?這不會移除任何兩端同步過的資訊,但是它會移除這些設定值。"
#. TRANSLATORS: buttons in delete-service warning dialog
-#: ../src/gtk-ui/sync-config-widget.c:437
+#: ../src/gtk-ui/sync-config-widget.c:508
msgid "Yes, delete"
msgstr "是,刪除"
-#: ../src/gtk-ui/sync-config-widget.c:467
+#: ../src/gtk-ui/sync-config-widget.c:539
msgid "Reset settings"
msgstr "重設設定值"
-#: ../src/gtk-ui/sync-config-widget.c:470
+#: ../src/gtk-ui/sync-config-widget.c:542
msgid "Delete settings"
msgstr "刪除設定值"
-#: ../src/gtk-ui/sync-config-widget.c:480
+#: ../src/gtk-ui/sync-config-widget.c:552
msgid "Save and use"
msgstr "儲存並使用"
-#: ../src/gtk-ui/sync-config-widget.c:483
+#: ../src/gtk-ui/sync-config-widget.c:555
msgid ""
"Save and replace\n"
"current service"
@@ -766,113 +769,112 @@ msgstr ""
"儲存並取代\n"
"目前的服務"
-#: ../src/gtk-ui/sync-config-widget.c:493
+#: ../src/gtk-ui/sync-config-widget.c:563
msgid "Stop using device"
msgstr "停止使用裝置"
-#: ../src/gtk-ui/sync-config-widget.c:496
+#: ../src/gtk-ui/sync-config-widget.c:566
msgid "Stop using service"
msgstr "停止使用服務"
#. TRANSLATORS: label for an entry in service configuration form.
#. * Placeholder is a source name.
#. * Example: "Appointments URI"
-#: ../src/gtk-ui/sync-config-widget.c:679
+#: ../src/gtk-ui/sync-config-widget.c:749
#, c-format
msgid "%s URI"
msgstr "%s URI"
#. TRANSLATORS: toggles in service configuration form, placeholder is service
#. * or device name
-#: ../src/gtk-ui/sync-config-widget.c:854
+#: ../src/gtk-ui/sync-config-widget.c:936
#, c-format
msgid "Send changes to %s"
msgstr "傳送變更到 %s"
-#: ../src/gtk-ui/sync-config-widget.c:859
+#: ../src/gtk-ui/sync-config-widget.c:941
#, c-format
msgid "Receive changes from %s"
msgstr "接收來自 %s 的變更"
-#: ../src/gtk-ui/sync-config-widget.c:875
+#: ../src/gtk-ui/sync-config-widget.c:957
msgid "<b>Sync</b>"
msgstr "<b>同步</b>"
#. TRANSLATORS: label of a entry in service configuration
-#: ../src/gtk-ui/sync-config-widget.c:891
+#: ../src/gtk-ui/sync-config-widget.c:973
msgid "Server address"
msgstr "伺服器位址"
#. TRANSLATORS: explanation before a device template combobox.
#. * Placeholder is a device name like 'Nokia N85' or 'Syncevolution
#. * Client'
-#: ../src/gtk-ui/sync-config-widget.c:967
+#: ../src/gtk-ui/sync-config-widget.c:1049
#, c-format
msgid ""
"This device looks like it might be a '%s'. If this is not correct, please "
"take a look at the list of supported devices and pick yours if it is listed"
-msgstr ""
-"此裝置看起來可能是「%s」。如果不正確的話,請查看支援裝置的清單,如果它列於其"
-"中的話請選取您的裝置。"
+msgstr "此裝置看起來可能是「%s」。如果不正確的話,請查看支援裝置的清單,如果它列於其中的話請選取您的裝置。"
-#: ../src/gtk-ui/sync-config-widget.c:973
+#: ../src/gtk-ui/sync-config-widget.c:1055
+#: ../src/gtk-ui/sync-config-widget.c:1915
msgid ""
-"We don't know what this device is exactly. Please take a look at the list of "
-"supported devices and pick yours if it is listed"
-msgstr ""
-"我們不知道此裝置到底是什麼。請查看支援裝置的清單,如果它列於其中的話請選取您"
-"的裝置。"
+"We don't know what this device is exactly. Please take a look at the list of"
+" supported devices and pick yours if it is listed"
+msgstr "我們不知道此裝置到底是什麼。請查看支援裝置的清單,如果它列於其中的話請選取您的裝置。"
-#: ../src/gtk-ui/sync-config-widget.c:1126
+#: ../src/gtk-ui/sync-config-widget.c:1207
#, c-format
msgid "%s - Bluetooth device"
msgstr "%s - 藍牙裝置"
#. TRANSLATORS: service title for services that are not based on a
#. * template in service list, the placeholder is the name of the service
-#: ../src/gtk-ui/sync-config-widget.c:1132
+#: ../src/gtk-ui/sync-config-widget.c:1213
#, c-format
msgid "%s - manually setup"
msgstr "%s - 手動設置"
#. TRANSLATORS: link button in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1807
+#: ../src/gtk-ui/sync-config-widget.c:1886
msgid "Launch website"
msgstr "開啟網站"
#. TRANSLATORS: button in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1816
+#: ../src/gtk-ui/sync-config-widget.c:1895
msgid "Set up now"
msgstr "立刻設置"
+#: ../src/gtk-ui/sync-config-widget.c:1953
+msgid "Use these settings"
+msgstr "使用這些設定"
+
#. TRANSLATORS: labels of entries in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1912
+#: ../src/gtk-ui/sync-config-widget.c:1991
msgid "Username"
msgstr "使用者名稱"
-#: ../src/gtk-ui/sync-config-widget.c:1927
+#: ../src/gtk-ui/sync-config-widget.c:2006
msgid "Password"
msgstr "密碼"
#. TRANSLATORS: warning in service configuration form for people
#. who have modified the configuration via other means.
-#: ../src/gtk-ui/sync-config-widget.c:1950
+#: ../src/gtk-ui/sync-config-widget.c:2029
msgid ""
"Current configuration is more complex than what can be shown here. Changes "
"to sync mode or synced data types will overwrite that configuration."
-msgstr ""
-"目前的設定檔比這裡能夠顯示的還要複雜許多。變更為同步模式或是同步過的資料類型"
-"將會覆蓋寫入那份設定檔。"
+msgstr "目前的設定檔比這裡能夠顯示的還要複雜許多。變更為同步模式或是同步過的資料類型將會覆蓋寫入那份設定檔。"
#. TRANSLATORS: this is the epander label for server settings
#. in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1969
+#: ../src/gtk-ui/sync-config-widget.c:2048
msgid "Hide server settings"
msgstr "隱藏伺服器設定"
#. TRANSLATORS: this is the epander label for server settings
#. in service configuration form
-#: ../src/gtk-ui/sync-config-widget.c:1989
+#: ../src/gtk-ui/sync-config-widget.c:2068
msgid "Show server settings"
msgstr "顯示伺服器設定"
@@ -880,169 +882,46 @@ msgstr "顯示伺服器設定"
msgid "Sync in the Sync application"
msgstr "在「同步」應用程式內同步"
-#: ../src/syncevo-dbus-server.cpp:5664
+#: ../src/syncevo-dbus-server.cpp:6653
#, c-format
msgid "%s is syncing"
msgstr "%s 正在同步中"
-#: ../src/syncevo-dbus-server.cpp:5665
+#: ../src/syncevo-dbus-server.cpp:6654
#, c-format
msgid "We have just started to sync your computer with the %s sync service."
msgstr "我們剛開始將您的電腦同步到 %s 同步服務。"
#. if sync is successfully started and done
-#: ../src/syncevo-dbus-server.cpp:5679
+#: ../src/syncevo-dbus-server.cpp:6670
#, c-format
msgid "%s sync complete"
msgstr "%s 同步完成"
-#: ../src/syncevo-dbus-server.cpp:5680
+#: ../src/syncevo-dbus-server.cpp:6671
#, c-format
msgid "We have just finished syncing your computer with the %s sync service."
msgstr "我們剛完成將您的電腦同步到 %s 同步服務。"
-#. if sync is successfully started and has errors, or not started successful with a fatal problem
-#: ../src/syncevo-dbus-server.cpp:5685
+#. if sync is successfully started and has errors, or not started successful
+#. with a fatal problem
+#: ../src/syncevo-dbus-server.cpp:6676
msgid "Sync problem."
msgstr "同步發生問題。"
-#: ../src/syncevo-dbus-server.cpp:5686
+#: ../src/syncevo-dbus-server.cpp:6677
msgid "Sorry, there's a problem with your sync that you need to attend to."
msgstr "抱歉,您的同步有個問題是您需要關心的。"
-#: ../src/syncevo-dbus-server.cpp:5759
+#: ../src/syncevo-dbus-server.cpp:6758
msgid "View"
msgstr "檢視"
#. Use "default" as ID because that is what mutter-moblin
#. recognizes: it then skips the action instead of adding it
#. in addition to its own "Dismiss" button (always added).
-#: ../src/syncevo-dbus-server.cpp:5763
+#: ../src/syncevo-dbus-server.cpp:6762
msgid "Dismiss"
msgstr "摒棄"
-#~ msgid ""
-#~ "Do you want to replace %s with %s? This will not remove any synced "
-#~ "information on either end but you will no longer be able to sync with %s."
-#~ msgstr ""
-#~ "您想要把 %s 用 %s 取代掉嗎?這不會移除兩方任何同步過的資訊,但是您將無法再"
-#~ "與 %s 進行同步。"
-
-#~ msgid "Yes, use %s"
-#~ msgstr "是,使用 %s"
-
-#~ msgid "No, use %s"
-#~ msgstr "是,使用 %s"
-
-#~ msgid "Database error"
-#~ msgstr "數據錯誤"
-
-#~ msgid "Reset service"
-#~ msgstr "重設服務"
-
-#~ msgid "Todo"
-#~ msgstr "要做的事"
-
-#~ msgid "Memo"
-#~ msgstr "備忘錄"
-
-#~ msgid "Failed to abort sync"
-#~ msgstr "放棄同步時失敗"
-
-#~ msgid "Failed to start sync"
-#~ msgstr "開始同步動作失敗"
-
-#~ msgid "%s (not supported by this service)"
-#~ msgstr "%s (不被此服務支援)"
-
-#~ msgid "Failed to get list of configured services from SyncEvolution"
-#~ msgstr "從 SyncEvolution 取得已設定的服務清單時失敗"
-
-#~ msgid "Not authorized"
-#~ msgstr "未授權"
-
-#~ msgid "Not found"
-#~ msgstr "未找到"
-
-#~ msgid "Transport failure (no connection?)"
-#~ msgstr "傳輸失敗(沒有連線?)"
-
-#~ msgid "Connection timed out"
-#~ msgstr "連線時間已過"
-
-#~ msgid "Connection failed"
-#~ msgstr "連線失敗"
-
-#~ msgid "<b>No sync service in use</b>"
-#~ msgstr "<b>沒有使用中的同步服務</b>"
-
-#~ msgid "<big>Manual setup</big>"
-#~ msgstr "<big>手動設置</big>"
-
-#~ msgid "Merge local and remote data (recommended)"
-#~ msgstr "合併本地和遠端資料(建議)"
-
-#~ msgid ""
-#~ "Sorry, you need an internet\n"
-#~ "connection to sync."
-#~ msgstr ""
-#~ "抱歉,您需要有網際網路連線\n"
-#~ "才能同步。"
-
-#~ msgid ""
-#~ "Synchronization is not available (D-Bus service does not answer), sorry."
-#~ msgstr "非常抱歉,因為 D-Bus 服務沒有回應,所以無法提供同步化。"
-
-#~ msgid "Server URL"
-#~ msgstr "伺服器 URL"
-
-#~ msgid "Addressbook"
-#~ msgstr "地址簿"
-
-#~ msgid "Failed to save current service in GConf configuration system"
-#~ msgstr "在 GConf 設定系統上儲存目前服務時失敗"
-
-#~ msgid "Failed to save service configuration to SyncEvolution"
-#~ msgstr "儲存服務設定檔到 SyncEvolution 時失敗"
-
-#~ msgid "Failed to get service configuration from SyncEvolution"
-#~ msgstr "從 SyncEvolution 取得服務設定檔時失敗"
-
-#~ msgid "Failed to remove service configuration from SyncEvolution"
-#~ msgstr "從 SyncEvolution 移除服務設定檔時失敗"
-
-#~ msgid "Failed to cancel: sync was no longer in progress"
-#~ msgstr "取消動作失敗:同步不再進行"
-
-#~ msgid "Failed to cancel sync"
-#~ msgstr "取消同步動作失敗"
-
-#~ msgid "Canceling sync"
-#~ msgstr "正在取消同步"
-
-#~ msgid "No sources are enabled, not syncing"
-#~ msgstr "沒有啟用的來源,無法同步"
-
-#~ msgid "A sync is already in progress"
-#~ msgstr "已經有同步在進行當中"
-
-#~ msgid "Failed to get server configuration from SyncEvolution"
-#~ msgstr "從 SyncEvolution 取得伺服器設定檔時失敗"
-
-#~ msgid "Failed to get list of manually setup services from SyncEvolution"
-#~ msgstr "從 SyncEvolution 取得手動設置服務的清單時失敗"
-
-#~ msgid "Service configuration not found"
-#~ msgstr "找不到服務設定檔"
-
-#~ msgid "Sync canceled"
-#~ msgstr "同步已取消"
-
-#~ msgid "Ending sync"
-#~ msgstr "正在結束同步"
-
-#~ msgid "Reset original server settings"
-#~ msgstr "重置為原始的伺服器設定"
-#~ msgid "Bring your data with you"
-#~ msgstr "請帶攜您的數據"