tags 640403 + patch tags 640403 + pending thanks On Wed, Sep 07, 2011 at 10:52:34PM +0200, Olivier Berger wrote: > > The rest of my comments still stand, AFAICT. >
Here's a proposed patch (interdiff format for a NMU revision of the package sources), which seems to solve the problem, including updated french translations accordingly. Please upload this or tell me if you prefer me to NMU. Best regards, -- Olivier BERGER (OpenPGP: 4096R/7C5BB6A5) http://www.olivierberger.com/weblog/
diff -u conduit-0.3.17/debian/changelog conduit-0.3.17/debian/changelog --- conduit-0.3.17/debian/changelog +++ conduit-0.3.17/debian/changelog @@ -1,3 +1,9 @@ +conduit (0.3.17-1.1) unstable; urgency=low + + * Fix translation issues (Closes: #640403) + + -- Olivier Berger <[email protected]> Wed, 07 Sep 2011 23:24:36 +0200 + conduit (0.3.17-1) unstable; urgency=low * New upstream release. diff -u conduit-0.3.17/debian/patches/00list conduit-0.3.17/debian/patches/00list --- conduit-0.3.17/debian/patches/00list +++ conduit-0.3.17/debian/patches/00list @@ -6,0 +7 @@ +09_fix_640403.dpatch only in patch2: unchanged: --- conduit-0.3.17.orig/debian/patches/09_fix_640403.dpatch +++ conduit-0.3.17/debian/patches/09_fix_640403.dpatch @@ -0,0 +1,739 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 09_fix_640403.dpatch by Olivier Berger <[email protected]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix #640403 + +@DPATCH@ + +diff -Naur /home/olivier/conduit-0.3.17/conduit/gtkui/UI.py conduit-0.3.17.new/conduit/gtkui/UI.py +--- /home/olivier/conduit-0.3.17/conduit/gtkui/UI.py 2010-01-28 23:31:07.000000000 +0100 ++++ conduit-0.3.17.new/conduit/gtkui/UI.py 2011-09-07 22:59:05.000000000 +0200 +@@ -37,11 +37,21 @@ + ) + + #set up the gettext system and locales ++# FOR STRINGS INSIDE SOURCE FILES (.py) ++import locale + for module in (gettext,): + module.bindtextdomain('conduit', conduit.LOCALE_DIR) ++ locale.setlocale(locale.LC_ALL, '') + module.textdomain('conduit') + if hasattr(module, 'bind_textdomain_codeset'): + module.bind_textdomain_codeset('conduit','UTF-8') ++ gettext.install('conduit', localedir=None, unicode=1) ++ gettext.bindtextdomain('conduit', conduit.LOCALE_DIR) ++ ++# FOR STRINGS INSIDE XML FILES (.glade) ++import gtk.glade ++gtk.glade.bindtextdomain('conduit', conduit.LOCALE_DIR) ++gtk.glade.textdomain('conduit') + + class _PreconfiguredConduitMenu: + """ +diff -Naur /home/olivier/conduit-0.3.17/po/POTFILES.in conduit-0.3.17.new/po/POTFILES.in +--- /home/olivier/conduit-0.3.17/po/POTFILES.in 2010-01-28 23:31:07.000000000 +0100 ++++ conduit-0.3.17.new/po/POTFILES.in 2011-09-07 22:33:52.000000000 +0200 +@@ -1,6 +1,6 @@ + [encoding: UTF-8] + data/conduit.desktop.in.in +-data/conduit.ui ++[type: gettext/glade]data/conduit.ui + conduit/Knowledge.py + conduit/Main.py + #conduit/Module.py +diff -Naur /home/olivier/conduit-0.3.17/po/fr.po conduit-0.3.17.new/po/fr.po +--- /home/olivier/conduit-0.3.17/po/fr.po 2010-01-28 23:31:07.000000000 +0100 ++++ conduit-0.3.17.new/po/fr.po 2011-09-07 23:05:08.000000000 +0200 +@@ -30,203 +30,175 @@ + msgid "Synchronization for GNOME" + msgstr "Synchronisation pour GNOME" + +-#: ../data/conduit.glade.h:1 ++#: ../data/conduit.ui.h:1 + msgid "<b>Default Synchronization Options</b>" + msgstr "<b>Options de synchronisation par défaut</b>" + +-#: ../data/conduit.glade.h:2 ++#: ../data/conduit.ui.h:2 + msgid "<b>General</b>" + msgstr "<b>Général</b>" + +-#: ../data/conduit.glade.h:3 ++#: ../data/conduit.ui.h:3 + msgid "Always Up-To-Date" + msgstr "Toujours à jour" + +-#: ../data/conduit.glade.h:4 ++#: ../data/conduit.ui.h:4 + msgid "Ask Me What to Do" + msgstr "Me demander quoi faire" + +-#: ../data/conduit.glade.h:5 ++#: ../data/conduit.ui.h:5 + msgid "Ask me what to do" + msgstr "Me demander quoi faire" + +-#: ../data/conduit.glade.h:6 ++#: ../data/conduit.ui.h:6 + msgid "Cancel Synchronization" + msgstr "Annuler la synchronisation" + +-#: ../data/conduit.glade.h:7 +-msgid "Cancel currently-synchronizing groups" +-msgstr "Annule les groupes actuellement en cours de synchronisation" +- +-#: ../data/conduit.glade.h:8 ++#: ../data/conduit.ui.h:7 + msgid "Clear Canvas" + msgstr "Effacer le canevas" + +-#: ../data/conduit.glade.h:9 ++#: ../data/conduit.ui.h:8 + msgid "Compare" + msgstr "Comparer" + +-#: ../data/conduit.glade.h:10 ++#: ../data/conduit.ui.h:9 + msgid "Conduit Preferences" + msgstr "Préférences de Conduit" + +-#: ../data/conduit.glade.h:11 ++#: ../data/conduit.ui.h:10 + msgid "Configuration" + msgstr "Configuration" + +-#: ../data/conduit.glade.h:12 ++#: ../data/conduit.ui.h:11 + msgid "Configure Item" + msgstr "Configurer l'élément" + +-#: ../data/conduit.glade.h:13 +-msgid "Configure the synchronization settings for this item" +-msgstr "Configure les paramètres de synchronisation de cet élément" +- +-#: ../data/conduit.glade.h:14 ++#: ../data/conduit.ui.h:12 + msgid "Conflict Options" + msgstr "Options de conflits" + +-#: ../data/conduit.glade.h:15 ++#: ../data/conduit.ui.h:13 + msgid "Conflicts" + msgstr "Conflits" + +-#: ../data/conduit.glade.h:16 +-msgid "Contents" +-msgstr "Contenu" +- +-#: ../data/conduit.glade.h:17 ++#: ../data/conduit.ui.h:14 + msgid "Data Conversions" + msgstr "Conversions de données" + +-#: ../data/conduit.glade.h:18 ++#: ../data/conduit.ui.h:15 + msgid "Data Providers" + msgstr "Sources de données" + +-#: ../data/conduit.glade.h:19 ++#: ../data/conduit.ui.h:16 + msgid "Delete Group" + msgstr "Supprimer ce groupe" + +-#: ../data/conduit.glade.h:20 ++#: ../data/conduit.ui.h:17 + msgid "Delete Item" + msgstr "Supprimer l'élément" + +-#: ../data/conduit.glade.h:21 ++#: ../data/conduit.ui.h:18 + msgid "Delete Options" + msgstr "Options de suppression" + +-#: ../data/conduit.glade.h:22 ++#: ../data/conduit.ui.h:19 + msgid "Delete from the corresponding sink" + msgstr "Supprimer du collecteur correspondant" + +-#: ../data/conduit.glade.h:23 ++#: ../data/conduit.ui.h:20 + msgid "Delete the Corresponding Item" + msgstr "Supprimer l'élément correspondant" + +-#: ../data/conduit.glade.h:24 ++#: ../data/conduit.ui.h:21 + msgid "Editor" + msgstr "Éditeur" + +-#: ../data/conduit.glade.h:25 ++#: ../data/conduit.ui.h:22 + msgid "Minimize to notification area" + msgstr "Minimiser dans la zone de notification" + +-#: ../data/conduit.glade.h:26 +-msgid "Refresh Group" +-msgstr "Actualiser le groupe" +- +-#: ../data/conduit.glade.h:27 ++#: ../data/conduit.ui.h:23 + msgid "Refresh Item" + msgstr "Actualiser l'élément" + +-#: ../data/conduit.glade.h:28 ++#: ../data/conduit.ui.h:24 ++msgid "Regresh Group" ++msgstr "Actualiser le groupe" ++ ++#: ../data/conduit.ui.h:25 + msgid "Replace the Older Item" + msgstr "Remplacer l'élément le plus ancien" + +-#: ../data/conduit.glade.h:29 ++#: ../data/conduit.ui.h:26 + msgid "Replace the older item" + msgstr "Remplacer l'élément le plus ancien" + +-#: ../data/conduit.glade.h:30 ++#: ../data/conduit.ui.h:27 + msgid "Resolve Conflicts" + msgstr "Résoudre les conflits" + +-#: ../data/conduit.glade.h:31 ++#: ../data/conduit.ui.h:28 + msgid "Save settings on exit" + msgstr "Enregistrer les paramètres à la fermeture" + +-#: ../data/conduit.glade.h:32 ++#: ../data/conduit.ui.h:29 + msgid "Show Hints" + msgstr "Afficher les astuces" + +-#: ../data/conduit.glade.h:33 ++#: ../data/conduit.ui.h:30 + msgid "Show status icon" + msgstr "Afficher l'icône d'état" + +-#: ../data/conduit.glade.h:34 ++#: ../data/conduit.ui.h:31 + msgid "Skip" + msgstr "Ignorer" + +-#: ../data/conduit.glade.h:35 ++#: ../data/conduit.ui.h:32 + msgid "Slow Synchronization" + msgstr "Synchronisation lente" + +-#: ../data/conduit.glade.h:36 ++#: ../data/conduit.ui.h:33 + msgid "Start Conduit at login" + msgstr "Démarrer Conduit à la connexion" + +-#: ../data/conduit.glade.h:37 ++#: ../data/conduit.ui.h:34 + msgid "Synchronization Options" + msgstr "Options de synchronisation" + +-#: ../data/conduit.glade.h:38 ++#: ../data/conduit.ui.h:35 + msgid "Synchronize All" + msgstr "Tout synchroniser" + +-#: ../data/conduit.glade.h:39 ++#: ../data/conduit.ui.h:36 + msgid "Synchronize Group" + msgstr "Synchroniser ce groupe" + +-#: ../data/conduit.glade.h:40 +-msgid "Synchronize group" +-msgstr "Synchroniser ce groupe" +- +-#: ../data/conduit.glade.h:41 +-msgid "Synchronizes all groups" +-msgstr "Synchronise tous les groupes" +- +-#: ../data/conduit.glade.h:42 ++#: ../data/conduit.ui.h:37 + msgid "Title" + msgstr "Titre" + +-#: ../data/conduit.glade.h:43 ++#: ../data/conduit.ui.h:38 + msgid "Two-Way Synchronization" + msgstr "Synchronisation bidirectionnelle" + +-#: ../data/conduit.glade.h:44 ++#: ../data/conduit.ui.h:39 + msgid "When an item has been deleted:" + msgstr "Quand un objet a été supprimé :" + +-#: ../data/conduit.glade.h:45 +-msgid "When an item is deleted..." +-msgstr "Quand un objet est supprimé..." +- +-#: ../data/conduit.glade.h:46 +-msgid "When there is a conflict..." +-msgstr "Quand il y a un conflit..." +- +-#: ../data/conduit.glade.h:47 ++#: ../data/conduit.ui.h:40 + msgid "When there is a two-way conflict:" + msgstr "Quand il y a un conflit bidirectionnel :" + +-#: ../data/conduit.glade.h:48 ++#: ../data/conduit.ui.h:41 + msgid "_Edit" + msgstr "É_dition" + +-#: ../data/conduit.glade.h:49 ++#: ../data/conduit.ui.h:42 + msgid "_File" + msgstr "_Fichier" + +-#: ../data/conduit.glade.h:50 ++#: ../data/conduit.ui.h:43 + msgid "_Help" + msgstr "Aid_e" + +@@ -254,20 +226,32 @@ + msgid "Right Click on Group for Options" + msgstr "Cliquez avec le bouton droit sur les groupes pour afficher les options" + +-#. source,sinc #comment +-#. twoway +-#: ../conduit/Knowledge.py:22 ++#: ../conduit/Knowledge.py:24 + msgid "Synchronize Two Folders" + msgstr "Synchroniser deux dossiers" + +-#: ../conduit/Knowledge.py:24 ++#: ../conduit/Knowledge.py:27 + msgid "Backup Folder to Box.net" + msgstr "Sauvegarder le dossier sur box.net" + +-#: ../conduit/Knowledge.py:26 ++#: ../conduit/Knowledge.py:30 + msgid "Synchronize Tagged F-Spot Photos to Flickr" + msgstr "Synchroniser vos photos F-Spot étiquetées vers Flicker" + ++#: ../conduit/Knowledge.py:33 ++#, fuzzy ++msgid "Synchronize Photos to Flickr" ++msgstr "Synchroniser vos photos F-Spot étiquetées vers Flicker" ++ ++#: ../conduit/Knowledge.py:36 ++msgid "Upload Photos to Facebook" ++msgstr "" ++ ++#: ../conduit/Knowledge.py:39 ++#, fuzzy ++msgid "Synchronize Desktop Wallpaper from a RSS Feed" ++msgstr "Synchroniser des données depuis un flux média RSS" ++ + #: ../conduit/Main.py:59 + msgid "Conduit is a synchronization application." + msgstr "Conduit est une application de synchronisation." +@@ -317,8 +301,8 @@ + #: ../conduit/Main.py:91 + #, python-format + msgid "" +-"Enable loading of unfinished or unsupported dataproviders. [default: %" +-"default]" ++"Enable loading of unfinished or unsupported dataproviders. [default: " ++"%default]" + msgstr "" + "Permettre le chargement de fournisseurs de données non terminés ou non pris " + "en charge. [par défaut : %default]" +@@ -387,17 +371,17 @@ + msgstr "Non configuré" + + #: ../conduit/dataproviders/Image.py:34 +-#: ../conduit/modules/FlickrModule/FlickrModule.py:328 ++#: ../conduit/modules/FlickrModule/FlickrModule.py:329 + msgid "640x480" + msgstr "640x480" + + #: ../conduit/dataproviders/Image.py:34 +-#: ../conduit/modules/FlickrModule/FlickrModule.py:328 ++#: ../conduit/modules/FlickrModule/FlickrModule.py:329 + msgid "800x600" + msgstr "800x600" + + #: ../conduit/dataproviders/Image.py:34 +-#: ../conduit/modules/FlickrModule/FlickrModule.py:328 ++#: ../conduit/modules/FlickrModule/FlickrModule.py:329 + msgid "1024x768" + msgstr "1024x768" + +@@ -493,94 +477,94 @@ + msgid "Test Results" + msgstr "Résultats de tests" + +-#: ../conduit/gtkui/UI.py:129 +-#, python-format +-msgid " - %s (Development Version)" +-msgstr " - %s (version de développement)" +- +-#: ../conduit/gtkui/UI.py:131 +-msgid " - Running Uninstalled" +-msgstr " - exécution sans installation" +- +-#: ../conduit/gtkui/UI.py:165 ++#: ../conduit/gtkui/UI.py:52 + msgid "Examples" + msgstr "Exemples" + +-#: ../conduit/gtkui/UI.py:177 +-msgid "Developers" +-msgstr "Développeurs" +- + #. Build some liststores to display +-#: ../conduit/gtkui/UI.py:318 ++#: ../conduit/gtkui/UI.py:139 + msgid "Convert from" + msgstr "Convertir depuis" + +-#: ../conduit/gtkui/UI.py:319 ++#: ../conduit/gtkui/UI.py:140 + msgid "into" + msgstr "en" + +-#: ../conduit/gtkui/UI.py:370 ++#: ../conduit/gtkui/UI.py:190 + msgid "Relationship Database" + msgstr "Base de données des relations" + +-#: ../conduit/gtkui/UI.py:374 ++#: ../conduit/gtkui/UI.py:194 + msgid "Conversions Available" + msgstr "Conversions disponibles" + +-#: ../conduit/gtkui/UI.py:380 ../conduit/gtkui/Tree.py:348 ++#: ../conduit/gtkui/UI.py:200 ../conduit/gtkui/Tree.py:355 + #: ../conduit/modules/FileModule/FileConfiguration.py:117 + msgid "Name" + msgstr "Nom" + +-#: ../conduit/gtkui/UI.py:384 ++#: ../conduit/gtkui/UI.py:204 + msgid "Loaded" + msgstr "Chargé" + +-#: ../conduit/gtkui/UI.py:512 ../conduit/hildonui/UI.py:127 ++#: ../conduit/gtkui/UI.py:329 ++#, python-format ++msgid " - %s (Development Version)" ++msgstr " - %s (version de développement)" ++ ++#: ../conduit/gtkui/UI.py:331 ++msgid " - Running Uninstalled" ++msgstr " - exécution sans installation" ++ ++#: ../conduit/gtkui/UI.py:375 ++msgid "Developers" ++msgstr "Développeurs" ++ ++#: ../conduit/gtkui/UI.py:539 ../conduit/hildonui/UI.py:127 + msgid "Synchronization in progress. Do you want to cancel it?" + msgstr "Synchronisation en cours. Voulez-vous l'annuler ?" + +-#: ../conduit/gtkui/UI.py:684 ++#: ../conduit/gtkui/UI.py:711 + msgid "_Synchronize All" + msgstr "_Tout synchroniser" + +-#: ../conduit/gtkui/UI.py:684 ++#: ../conduit/gtkui/UI.py:711 + msgid "Synchronizes All Groups" + msgstr "Synchronise tous les groupes" + +-#: ../conduit/gtkui/UI.py:685 ++#: ../conduit/gtkui/UI.py:712 + msgid "_Cancel Synchronization" + msgstr "_Annuler la synchronisation" + +-#: ../conduit/gtkui/UI.py:685 ++#: ../conduit/gtkui/UI.py:712 + msgid "Cancels Currently Synchronizing Groups" + msgstr "Annule les groupes actuellement en cours de synchronisation" + +-#: ../conduit/gtkui/UI.py:686 ++#: ../conduit/gtkui/UI.py:713 + msgid "_Quit" + msgstr "_Quitter" + +-#: ../conduit/gtkui/UI.py:686 ++#: ../conduit/gtkui/UI.py:713 + msgid "Close Conduit" + msgstr "Ferme Conduit" + +-#: ../conduit/gtkui/UI.py:726 ++#: ../conduit/gtkui/UI.py:753 + msgid "Synchronization Error" + msgstr "Erreur de synchronisation" + +-#: ../conduit/gtkui/UI.py:729 ++#: ../conduit/gtkui/UI.py:756 + msgid "Synchronization Complete" + msgstr "Synchronisation terminée" + +-#: ../conduit/gtkui/UI.py:745 ++#: ../conduit/gtkui/UI.py:764 + msgid "Synchronizing" + msgstr "Synchronisation en cours" + +-#: ../conduit/gtkui/Tree.py:357 ++#: ../conduit/gtkui/Tree.py:364 + msgid "Description" + msgstr "Description" + +-#: ../conduit/gtkui/ConfigItems.py:729 ++#: ../conduit/gtkui/ConfigItems.py:733 + #, python-format + msgid "Total: %d" + msgstr "Total : %d" +@@ -889,24 +873,24 @@ + msgid "Username" + msgstr "Identifiant" + +-#: ../conduit/modules/FlickrModule/FlickrModule.py:318 ++#: ../conduit/modules/FlickrModule/FlickrModule.py:319 + msgid "Authenticate" + msgstr "S'authentifier" + +-#: ../conduit/modules/FlickrModule/FlickrModule.py:322 ++#: ../conduit/modules/FlickrModule/FlickrModule.py:323 + #: ../conduit/modules/ZotoModule/ZotoModule.py:251 + msgid "Saved photo settings" + msgstr "Paramètres des photos enregistrées" + +-#: ../conduit/modules/FlickrModule/FlickrModule.py:327 ++#: ../conduit/modules/FlickrModule/FlickrModule.py:328 + msgid "Resize photos" + msgstr "Redimensionner les photos" + +-#: ../conduit/modules/FlickrModule/FlickrModule.py:328 ++#: ../conduit/modules/FlickrModule/FlickrModule.py:329 + msgid "Do not resize" + msgstr "Ne pas redimmensioner" + +-#: ../conduit/modules/FlickrModule/FlickrModule.py:331 ++#: ../conduit/modules/FlickrModule/FlickrModule.py:332 + msgid "Photos are public" + msgstr "Les photos sont publiques" + +@@ -1001,7 +985,6 @@ + msgstr "Mot de passe" + + #: ../conduit/modules/GoogleModule/GoogleModule.py:399 +-#: ../conduit/modules/GoogleModule/calendar-config.glade.h:4 + msgid "Google Calendar" + msgstr "Calendrier Google" + +@@ -1054,32 +1037,11 @@ + msgid "Synchronize data from YouTube" + msgstr "Synchroniser des données de YouTube" + +-#: ../conduit/modules/GoogleModule/calendar-config.glade.h:1 +-msgid "<b>Account Details</b>" +-msgstr "<b>Détails du compte</b>" +- +-#: ../conduit/modules/GoogleModule/calendar-config.glade.h:2 +-msgid "Calendar:" +-msgstr "Calendrier :" +- +-#: ../conduit/modules/GoogleModule/calendar-config.glade.h:3 +-msgid "Email:" +-msgstr "Courriel :" +- +-#: ../conduit/modules/GoogleModule/calendar-config.glade.h:5 +-msgid "Load Calendars" +-msgstr "Charger les calendriers" +- +-#: ../conduit/modules/GoogleModule/calendar-config.glade.h:6 +-msgid "Password:" +-msgstr "Mot de passe :" +- + #: ../conduit/modules/iPodModule/iPodModule.py:180 + msgid "Synchronize your iPod notes" + msgstr "Synchroniser vos notes iPod" + + #: ../conduit/modules/iPodModule/iPodModule.py:295 +-#: ../conduit/modules/SynceModule.py:311 + msgid "Contacts" + msgstr "Contacts" + +@@ -1088,7 +1050,6 @@ + msgstr "Synchroniser vos contacts iPod" + + #: ../conduit/modules/iPodModule/iPodModule.py:331 +-#: ../conduit/modules/SynceModule.py:449 + msgid "Calendar" + msgstr "Calendrier" + +@@ -1259,26 +1220,6 @@ + msgid "Synchronize your SmugMug.com photos" + msgstr "Synchroniser vos photos SmugMug.com" + +-#: ../conduit/modules/SynceModule.py:139 +-msgid "Create Partnership" +-msgstr "Créer un partenariat" +- +-#: ../conduit/modules/SynceModule.py:312 +-msgid "Windows Mobile Contacts" +-msgstr "Contacts Windows Mobile" +- +-#: ../conduit/modules/SynceModule.py:450 +-msgid "Windows Mobile Calendar" +-msgstr "Calendrier Windows Mobile" +- +-#: ../conduit/modules/SynceModule.py:459 +-msgid "Tasks" +-msgstr "Tâches" +- +-#: ../conduit/modules/SynceModule.py:460 +-msgid "Windows Mobile Tasks" +-msgstr "Tâches Windows Mobile" +- + #: ../conduit/modules/ZotoModule/ZotoModule.py:154 + msgid "Zoto" + msgstr "Zoto" +@@ -1286,3 +1227,54 @@ + #: ../conduit/modules/ZotoModule/ZotoModule.py:155 + msgid "Synchronize your Zoto photos" + msgstr "Synchroniser vos photos Zoto" ++ ++#~ msgid "Cancel currently-synchronizing groups" ++#~ msgstr "Annule les groupes actuellement en cours de synchronisation" ++ ++#~ msgid "Configure the synchronization settings for this item" ++#~ msgstr "Configure les paramètres de synchronisation de cet élément" ++ ++#~ msgid "Contents" ++#~ msgstr "Contenu" ++ ++#~ msgid "Synchronize group" ++#~ msgstr "Synchroniser ce groupe" ++ ++#~ msgid "Synchronizes all groups" ++#~ msgstr "Synchronise tous les groupes" ++ ++#~ msgid "When an item is deleted..." ++#~ msgstr "Quand un objet est supprimé..." ++ ++#~ msgid "When there is a conflict..." ++#~ msgstr "Quand il y a un conflit..." ++ ++#~ msgid "<b>Account Details</b>" ++#~ msgstr "<b>Détails du compte</b>" ++ ++#~ msgid "Calendar:" ++#~ msgstr "Calendrier :" ++ ++#~ msgid "Email:" ++#~ msgstr "Courriel :" ++ ++#~ msgid "Load Calendars" ++#~ msgstr "Charger les calendriers" ++ ++#~ msgid "Password:" ++#~ msgstr "Mot de passe :" ++ ++#~ msgid "Create Partnership" ++#~ msgstr "Créer un partenariat" ++ ++#~ msgid "Windows Mobile Contacts" ++#~ msgstr "Contacts Windows Mobile" ++ ++#~ msgid "Windows Mobile Calendar" ++#~ msgstr "Calendrier Windows Mobile" ++ ++#~ msgid "Tasks" ++#~ msgstr "Tâches" ++ ++#~ msgid "Windows Mobile Tasks" ++#~ msgstr "Tâches Windows Mobile" +diff -Naur /home/olivier/conduit-0.3.17/data/conduit.ui conduit-0.3.17.new/data/conduit.ui +--- /home/olivier/conduit-0.3.17/data/conduit.ui 2010-01-28 23:31:07.000000000 +0100 ++++ conduit-0.3.17.new/data/conduit.ui 2011-09-07 22:34:38.000000000 +0200 +@@ -36,7 +36,7 @@ + </child> + <child> + <object class="GtkImageMenuItem" id="synchronize"> +- <property name="label">Synchronize All</property> ++ <property name="label" translatable="yes">Synchronize All</property> + <property name="visible">True</property> + <property name="image">image7</property> + <property name="use_stock">False</property> +@@ -45,7 +45,7 @@ + </child> + <child> + <object class="GtkImageMenuItem" id="cancel"> +- <property name="label">Cancel Synchronization</property> ++ <property name="label" translatable="yes">Cancel Synchronization</property> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> +@@ -81,7 +81,7 @@ + <object class="GtkMenu" id="edit_menu"> + <child> + <object class="GtkImageMenuItem" id="clear_canvas"> +- <property name="label">Clear Canvas</property> ++ <property name="label" translatable="yes">Clear Canvas</property> + <property name="visible">True</property> + <property name="image">image9</property> + <property name="use_stock">False</property> +@@ -426,7 +426,7 @@ + <object class="GtkMenu" id="ConduitMenu"> + <child> + <object class="GtkImageMenuItem" id="refresh_conduit"> +- <property name="label">Regresh Group</property> ++ <property name="label" translatable="yes">Regresh Group</property> + <property name="visible">True</property> + <property name="image">image1</property> + <property name="use_stock">False</property> +@@ -434,7 +434,7 @@ + </child> + <child> + <object class="GtkImageMenuItem" id="synchronize_conduit"> +- <property name="label">Synchronize Group</property> ++ <property name="label" translatable="yes">Synchronize Group</property> + <property name="visible">True</property> + <property name="image">image2</property> + <property name="use_stock">False</property> +@@ -447,7 +447,7 @@ + </child> + <child> + <object class="GtkImageMenuItem" id="delete_conduit"> +- <property name="label">Delete Group</property> ++ <property name="label" translatable="yes">Delete Group</property> + <property name="visible">True</property> + <property name="image">image3</property> + <property name="use_stock">False</property> +@@ -575,7 +575,7 @@ + <object class="GtkMenu" id="DataProviderMenu"> + <child> + <object class="GtkImageMenuItem" id="refresh_dataprovider"> +- <property name="label">Refresh Item</property> ++ <property name="label" translatable="yes">Refresh Item</property> + <property name="visible">True</property> + <property name="image">image4</property> + <property name="use_stock">False</property> +@@ -583,7 +583,7 @@ + </child> + <child> + <object class="GtkImageMenuItem" id="configure_dataprovider"> +- <property name="label">Configure Item</property> ++ <property name="label" translatable="yes">Configure Item</property> + <property name="visible">True</property> + <property name="image">image5</property> + <property name="use_stock">False</property> +@@ -596,7 +596,7 @@ + </child> + <child> + <object class="GtkImageMenuItem" id="delete_dataprovider"> +- <property name="label">Delete Item</property> ++ <property name="label" translatable="yes">Delete Item</property> + <property name="visible">True</property> + <property name="image">image6</property> + <property name="use_stock">False</property>
