From 8ec8363b68ca8ff304af04be08af22400e403fd6 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Thu, 8 Dec 2011 07:45:13 +0000 Subject: [PATCH] Code cleanup --- po/de.po | 116 +++++++++++++++++++++++++-------------------------- po/es.po | 116 +++++++++++++++++++++++++-------------------------- po/fr.po | 116 +++++++++++++++++++++++++-------------------------- po/it.po | 116 +++++++++++++++++++++++++-------------------------- src/editor.c | 23 +++++----- 5 files changed, 242 insertions(+), 245 deletions(-) diff --git a/po/de.po b/po/de.po index eee6368..08b2b10 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Editor 0.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-12-07 12:50+0100\n" +"POT-Creation-Date: 2011-12-08 08:43+0100\n" "PO-Revision-Date: 2010-04-07 22:05+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: German\n" @@ -16,230 +16,230 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../src/editor.c:95 +#: ../src/editor.c:97 msgid "_New" msgstr "_Neu" -#: ../src/editor.c:97 +#: ../src/editor.c:99 msgid "_Open" msgstr "_Offnen" -#: ../src/editor.c:100 +#: ../src/editor.c:102 msgid "_Save" msgstr "" -#: ../src/editor.c:102 +#: ../src/editor.c:104 msgid "_Save as..." msgstr "" -#: ../src/editor.c:105 +#: ../src/editor.c:107 msgid "_Close" msgstr "_Schliessen" -#: ../src/editor.c:112 +#: ../src/editor.c:114 msgid "_Undo" msgstr "" -#: ../src/editor.c:114 +#: ../src/editor.c:116 msgid "_Redo" msgstr "" -#: ../src/editor.c:116 +#: ../src/editor.c:118 msgid "_Cut" msgstr "" -#: ../src/editor.c:118 +#: ../src/editor.c:120 msgid "_Copy" msgstr "" -#: ../src/editor.c:120 +#: ../src/editor.c:122 msgid "_Paste" msgstr "" -#: ../src/editor.c:123 +#: ../src/editor.c:125 msgid "Select _all" msgstr "" -#: ../src/editor.c:130 +#: ../src/editor.c:132 msgid "_Unselect all" msgstr "" -#: ../src/editor.c:132 +#: ../src/editor.c:134 msgid "_Find" msgstr "" -#: ../src/editor.c:135 +#: ../src/editor.c:137 msgid "_Preferences" msgstr "_Einstellungen" -#: ../src/editor.c:142 +#: ../src/editor.c:144 msgid "_File..." msgstr "_Datei..." -#: ../src/editor.c:148 +#: ../src/editor.c:150 msgid "_About" msgstr "_Info" -#: ../src/editor.c:159 +#: ../src/editor.c:161 msgid "_File" msgstr "_Datei" -#: ../src/editor.c:160 +#: ../src/editor.c:162 msgid "_Edit" msgstr "_Bearbeitung" -#: ../src/editor.c:161 +#: ../src/editor.c:163 msgid "_Insert" msgstr "" -#: ../src/editor.c:162 +#: ../src/editor.c:164 msgid "_Help" msgstr "_Hilfe" -#: ../src/editor.c:169 +#: ../src/editor.c:171 msgid "New" msgstr "" -#: ../src/editor.c:170 +#: ../src/editor.c:172 msgid "Open" msgstr "" -#: ../src/editor.c:172 +#: ../src/editor.c:174 msgid "Save" msgstr "" -#: ../src/editor.c:173 +#: ../src/editor.c:175 msgid "Save as" msgstr "" -#: ../src/editor.c:176 +#: ../src/editor.c:178 msgid "Cut" msgstr "" -#: ../src/editor.c:177 +#: ../src/editor.c:179 msgid "Copy" msgstr "" -#: ../src/editor.c:178 +#: ../src/editor.c:180 msgid "Paste" msgstr "" -#: ../src/editor.c:181 +#: ../src/editor.c:183 msgid "Preferences" msgstr "Einstellungen" -#: ../src/editor.c:193 +#: ../src/editor.c:195 msgid "none" msgstr "" -#: ../src/editor.c:194 +#: ../src/editor.c:196 msgid "characters" msgstr "" -#: ../src/editor.c:195 +#: ../src/editor.c:197 msgid "words" msgstr "" -#: ../src/editor.c:196 +#: ../src/editor.c:198 msgid "words then characters" msgstr "" -#: ../src/editor.c:279 +#: ../src/editor.c:281 msgid "Text editor - " msgstr "" -#: ../src/editor.c:280 +#: ../src/editor.c:282 msgid "(Untitled)" msgstr "" -#: ../src/editor.c:393 +#: ../src/editor.c:395 msgid "translator-credits" msgstr "Pierre Pronchery " -#: ../src/editor.c:429 +#: ../src/editor.c:431 msgid "Could not save configuration" msgstr "" -#: ../src/editor.c:446 ../src/editor.c:455 ../src/editor.c:913 -#: ../src/editor.c:918 +#: ../src/editor.c:448 ../src/editor.c:457 ../src/editor.c:910 +#: ../src/editor.c:915 msgid "Question" msgstr "" -#: ../src/editor.c:471 ../src/editor.c:475 +#: ../src/editor.c:473 ../src/editor.c:477 msgid "Error" msgstr "Fehler" -#: ../src/editor.c:497 ../src/editor.c:750 +#: ../src/editor.c:499 ../src/editor.c:747 msgid "" "There are unsaved changes.\n" "Discard or save them?" msgstr "" -#: ../src/editor.c:560 +#: ../src/editor.c:559 msgid "Find text" msgstr "" -#: ../src/editor.c:571 +#: ../src/editor.c:570 msgid "Text:" msgstr "Text:" -#: ../src/editor.c:582 +#: ../src/editor.c:581 msgid "Case-sensitive" msgstr "" -#: ../src/editor.c:584 +#: ../src/editor.c:583 msgid "Wrap" msgstr "" -#: ../src/editor.c:627 +#: ../src/editor.c:626 msgid "Text not found" msgstr "" -#: ../src/editor.c:708 +#: ../src/editor.c:705 msgid "Insert file..." msgstr "" -#: ../src/editor.c:714 ../src/editor.c:827 +#: ../src/editor.c:711 ../src/editor.c:824 msgid "Text files" msgstr "" -#: ../src/editor.c:718 ../src/editor.c:831 +#: ../src/editor.c:715 ../src/editor.c:828 msgid "All files" msgstr "" -#: ../src/editor.c:756 +#: ../src/editor.c:753 msgid "Discard" msgstr "" -#: ../src/editor.c:821 +#: ../src/editor.c:818 msgid "Open file..." msgstr "Offnen..." -#: ../src/editor.c:889 +#: ../src/editor.c:886 msgid "Partial write" msgstr "" -#: ../src/editor.c:917 +#: ../src/editor.c:914 msgid "This file already exists. Overwrite?" msgstr "" -#: ../src/editor.c:926 +#: ../src/editor.c:923 msgid "Allocation error" msgstr "" -#: ../src/editor.c:941 +#: ../src/editor.c:938 msgid "Save as..." msgstr "" -#: ../src/editor.c:998 +#: ../src/editor.c:995 msgid "Text editor preferences" msgstr "Text Editor Einstellungen" -#: ../src/editor.c:1015 +#: ../src/editor.c:1012 msgid "Font:" msgstr "" -#: ../src/editor.c:1025 +#: ../src/editor.c:1022 msgid "Wrap mode:" msgstr "" diff --git a/po/es.po b/po/es.po index 0b654b1..b43ff35 100644 --- a/po/es.po +++ b/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Editor 0.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-12-07 12:50+0100\n" +"POT-Creation-Date: 2011-12-08 08:43+0100\n" "PO-Revision-Date: 2010-04-07 22:07+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: Spanish\n" @@ -16,230 +16,230 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../src/editor.c:95 +#: ../src/editor.c:97 msgid "_New" msgstr "" -#: ../src/editor.c:97 +#: ../src/editor.c:99 msgid "_Open" msgstr "" -#: ../src/editor.c:100 +#: ../src/editor.c:102 msgid "_Save" msgstr "" -#: ../src/editor.c:102 +#: ../src/editor.c:104 msgid "_Save as..." msgstr "" -#: ../src/editor.c:105 +#: ../src/editor.c:107 msgid "_Close" msgstr "" -#: ../src/editor.c:112 +#: ../src/editor.c:114 msgid "_Undo" msgstr "" -#: ../src/editor.c:114 +#: ../src/editor.c:116 msgid "_Redo" msgstr "" -#: ../src/editor.c:116 +#: ../src/editor.c:118 msgid "_Cut" msgstr "" -#: ../src/editor.c:118 +#: ../src/editor.c:120 msgid "_Copy" msgstr "" -#: ../src/editor.c:120 +#: ../src/editor.c:122 msgid "_Paste" msgstr "" -#: ../src/editor.c:123 +#: ../src/editor.c:125 msgid "Select _all" msgstr "" -#: ../src/editor.c:130 +#: ../src/editor.c:132 msgid "_Unselect all" msgstr "" -#: ../src/editor.c:132 +#: ../src/editor.c:134 msgid "_Find" msgstr "" -#: ../src/editor.c:135 +#: ../src/editor.c:137 msgid "_Preferences" msgstr "_Preferencias" -#: ../src/editor.c:142 +#: ../src/editor.c:144 msgid "_File..." msgstr "" -#: ../src/editor.c:148 +#: ../src/editor.c:150 msgid "_About" msgstr "" -#: ../src/editor.c:159 +#: ../src/editor.c:161 msgid "_File" msgstr "" -#: ../src/editor.c:160 +#: ../src/editor.c:162 msgid "_Edit" msgstr "" -#: ../src/editor.c:161 +#: ../src/editor.c:163 msgid "_Insert" msgstr "" -#: ../src/editor.c:162 +#: ../src/editor.c:164 msgid "_Help" msgstr "" -#: ../src/editor.c:169 +#: ../src/editor.c:171 msgid "New" msgstr "" -#: ../src/editor.c:170 +#: ../src/editor.c:172 msgid "Open" msgstr "" -#: ../src/editor.c:172 +#: ../src/editor.c:174 msgid "Save" msgstr "" -#: ../src/editor.c:173 +#: ../src/editor.c:175 msgid "Save as" msgstr "" -#: ../src/editor.c:176 +#: ../src/editor.c:178 msgid "Cut" msgstr "" -#: ../src/editor.c:177 +#: ../src/editor.c:179 msgid "Copy" msgstr "" -#: ../src/editor.c:178 +#: ../src/editor.c:180 msgid "Paste" msgstr "" -#: ../src/editor.c:181 +#: ../src/editor.c:183 msgid "Preferences" msgstr "" -#: ../src/editor.c:193 +#: ../src/editor.c:195 msgid "none" msgstr "" -#: ../src/editor.c:194 +#: ../src/editor.c:196 msgid "characters" msgstr "" -#: ../src/editor.c:195 +#: ../src/editor.c:197 msgid "words" msgstr "" -#: ../src/editor.c:196 +#: ../src/editor.c:198 msgid "words then characters" msgstr "" -#: ../src/editor.c:279 +#: ../src/editor.c:281 msgid "Text editor - " msgstr "" -#: ../src/editor.c:280 +#: ../src/editor.c:282 msgid "(Untitled)" msgstr "" -#: ../src/editor.c:393 +#: ../src/editor.c:395 msgid "translator-credits" msgstr "" -#: ../src/editor.c:429 +#: ../src/editor.c:431 msgid "Could not save configuration" msgstr "" -#: ../src/editor.c:446 ../src/editor.c:455 ../src/editor.c:913 -#: ../src/editor.c:918 +#: ../src/editor.c:448 ../src/editor.c:457 ../src/editor.c:910 +#: ../src/editor.c:915 msgid "Question" msgstr "" -#: ../src/editor.c:471 ../src/editor.c:475 +#: ../src/editor.c:473 ../src/editor.c:477 msgid "Error" msgstr "" -#: ../src/editor.c:497 ../src/editor.c:750 +#: ../src/editor.c:499 ../src/editor.c:747 msgid "" "There are unsaved changes.\n" "Discard or save them?" msgstr "" -#: ../src/editor.c:560 +#: ../src/editor.c:559 msgid "Find text" msgstr "" -#: ../src/editor.c:571 +#: ../src/editor.c:570 msgid "Text:" msgstr "" -#: ../src/editor.c:582 +#: ../src/editor.c:581 msgid "Case-sensitive" msgstr "" -#: ../src/editor.c:584 +#: ../src/editor.c:583 msgid "Wrap" msgstr "" -#: ../src/editor.c:627 +#: ../src/editor.c:626 msgid "Text not found" msgstr "" -#: ../src/editor.c:708 +#: ../src/editor.c:705 msgid "Insert file..." msgstr "" -#: ../src/editor.c:714 ../src/editor.c:827 +#: ../src/editor.c:711 ../src/editor.c:824 msgid "Text files" msgstr "" -#: ../src/editor.c:718 ../src/editor.c:831 +#: ../src/editor.c:715 ../src/editor.c:828 msgid "All files" msgstr "" -#: ../src/editor.c:756 +#: ../src/editor.c:753 msgid "Discard" msgstr "" -#: ../src/editor.c:821 +#: ../src/editor.c:818 msgid "Open file..." msgstr "" -#: ../src/editor.c:889 +#: ../src/editor.c:886 msgid "Partial write" msgstr "" -#: ../src/editor.c:917 +#: ../src/editor.c:914 msgid "This file already exists. Overwrite?" msgstr "" -#: ../src/editor.c:926 +#: ../src/editor.c:923 msgid "Allocation error" msgstr "" -#: ../src/editor.c:941 +#: ../src/editor.c:938 msgid "Save as..." msgstr "" -#: ../src/editor.c:998 +#: ../src/editor.c:995 msgid "Text editor preferences" msgstr "" -#: ../src/editor.c:1015 +#: ../src/editor.c:1012 msgid "Font:" msgstr "" -#: ../src/editor.c:1025 +#: ../src/editor.c:1022 msgid "Wrap mode:" msgstr "" diff --git a/po/fr.po b/po/fr.po index 4c4637e..de1a4ed 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Editor 0.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-12-07 12:50+0100\n" +"POT-Creation-Date: 2011-12-08 08:43+0100\n" "PO-Revision-Date: 2010-04-11 12:32+0200\n" "Last-Translator: Calimero \n" "Language-Team: French\n" @@ -16,162 +16,162 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: ../src/editor.c:95 +#: ../src/editor.c:97 msgid "_New" msgstr "_Nouveau" -#: ../src/editor.c:97 +#: ../src/editor.c:99 msgid "_Open" msgstr "_Ouvrir" -#: ../src/editor.c:100 +#: ../src/editor.c:102 msgid "_Save" msgstr "_Enregistrer" -#: ../src/editor.c:102 +#: ../src/editor.c:104 msgid "_Save as..." msgstr "_Enregistrer sous..." -#: ../src/editor.c:105 +#: ../src/editor.c:107 msgid "_Close" msgstr "_Fermer" -#: ../src/editor.c:112 +#: ../src/editor.c:114 msgid "_Undo" msgstr "_Annuler" -#: ../src/editor.c:114 +#: ../src/editor.c:116 msgid "_Redo" msgstr "_Rétablir" -#: ../src/editor.c:116 +#: ../src/editor.c:118 msgid "_Cut" msgstr "Co_uper" -#: ../src/editor.c:118 +#: ../src/editor.c:120 msgid "_Copy" msgstr "_Copier" -#: ../src/editor.c:120 +#: ../src/editor.c:122 msgid "_Paste" msgstr "C_oller" -#: ../src/editor.c:123 +#: ../src/editor.c:125 msgid "Select _all" msgstr "Sélectionner _tout" -#: ../src/editor.c:130 +#: ../src/editor.c:132 msgid "_Unselect all" msgstr "Tout _désélectionner" -#: ../src/editor.c:132 +#: ../src/editor.c:134 msgid "_Find" msgstr "_Rechercher" -#: ../src/editor.c:135 +#: ../src/editor.c:137 msgid "_Preferences" msgstr "_Préférences" -#: ../src/editor.c:142 +#: ../src/editor.c:144 msgid "_File..." msgstr "_Fichier..." -#: ../src/editor.c:148 +#: ../src/editor.c:150 msgid "_About" msgstr "À _propos" -#: ../src/editor.c:159 +#: ../src/editor.c:161 msgid "_File" msgstr "_Fichier" -#: ../src/editor.c:160 +#: ../src/editor.c:162 msgid "_Edit" msgstr "É_dition" -#: ../src/editor.c:161 +#: ../src/editor.c:163 msgid "_Insert" msgstr "_Insertion" -#: ../src/editor.c:162 +#: ../src/editor.c:164 msgid "_Help" msgstr "_Aide" -#: ../src/editor.c:169 +#: ../src/editor.c:171 msgid "New" msgstr "Nouveau" -#: ../src/editor.c:170 +#: ../src/editor.c:172 msgid "Open" msgstr "Ouvrir" -#: ../src/editor.c:172 +#: ../src/editor.c:174 msgid "Save" msgstr "Enregistrer" -#: ../src/editor.c:173 +#: ../src/editor.c:175 msgid "Save as" msgstr "Enregistrer sous" -#: ../src/editor.c:176 +#: ../src/editor.c:178 msgid "Cut" msgstr "Couper" -#: ../src/editor.c:177 +#: ../src/editor.c:179 msgid "Copy" msgstr "Copier" -#: ../src/editor.c:178 +#: ../src/editor.c:180 msgid "Paste" msgstr "Coller" -#: ../src/editor.c:181 +#: ../src/editor.c:183 msgid "Preferences" msgstr "Préférences" -#: ../src/editor.c:193 +#: ../src/editor.c:195 msgid "none" msgstr "aucun" -#: ../src/editor.c:194 +#: ../src/editor.c:196 msgid "characters" msgstr "caractères" -#: ../src/editor.c:195 +#: ../src/editor.c:197 msgid "words" msgstr "mots" -#: ../src/editor.c:196 +#: ../src/editor.c:198 msgid "words then characters" msgstr "mots puis caractères" -#: ../src/editor.c:279 +#: ../src/editor.c:281 msgid "Text editor - " msgstr "Éditeur de texte - " -#: ../src/editor.c:280 +#: ../src/editor.c:282 msgid "(Untitled)" msgstr "(Sans titre)" -#: ../src/editor.c:393 +#: ../src/editor.c:395 msgid "translator-credits" msgstr "" "Calimero \n" "Pierre Pronchery " -#: ../src/editor.c:429 +#: ../src/editor.c:431 msgid "Could not save configuration" msgstr "Erreur lors de la sauvegarde de la configuration" -#: ../src/editor.c:446 ../src/editor.c:455 ../src/editor.c:913 -#: ../src/editor.c:918 +#: ../src/editor.c:448 ../src/editor.c:457 ../src/editor.c:910 +#: ../src/editor.c:915 msgid "Question" msgstr "Question" -#: ../src/editor.c:471 ../src/editor.c:475 +#: ../src/editor.c:473 ../src/editor.c:477 msgid "Error" msgstr "Erreur" -#: ../src/editor.c:497 ../src/editor.c:750 +#: ../src/editor.c:499 ../src/editor.c:747 msgid "" "There are unsaved changes.\n" "Discard or save them?" @@ -179,71 +179,71 @@ msgstr "" "Il y a des changements non enregistrés.\n" "Abandonner ou enregistrer ?" -#: ../src/editor.c:560 +#: ../src/editor.c:559 msgid "Find text" msgstr "Rechercher" -#: ../src/editor.c:571 +#: ../src/editor.c:570 msgid "Text:" msgstr "Texte :" -#: ../src/editor.c:582 +#: ../src/editor.c:581 msgid "Case-sensitive" msgstr "Sensible à la casse" -#: ../src/editor.c:584 +#: ../src/editor.c:583 msgid "Wrap" msgstr "Boucler" -#: ../src/editor.c:627 +#: ../src/editor.c:626 msgid "Text not found" msgstr "Texte non trouvé" -#: ../src/editor.c:708 +#: ../src/editor.c:705 msgid "Insert file..." msgstr "Insérer un fichier..." -#: ../src/editor.c:714 ../src/editor.c:827 +#: ../src/editor.c:711 ../src/editor.c:824 msgid "Text files" msgstr "Fichiers texte" -#: ../src/editor.c:718 ../src/editor.c:831 +#: ../src/editor.c:715 ../src/editor.c:828 msgid "All files" msgstr "Tous les fichiers" -#: ../src/editor.c:756 +#: ../src/editor.c:753 msgid "Discard" msgstr "Annuler" -#: ../src/editor.c:821 +#: ../src/editor.c:818 msgid "Open file..." msgstr "Ouvrir un fichier..." -#: ../src/editor.c:889 +#: ../src/editor.c:886 msgid "Partial write" msgstr "Écriture partielle" -#: ../src/editor.c:917 +#: ../src/editor.c:914 msgid "This file already exists. Overwrite?" msgstr "Le fichier existe déjà. L'écraser ?" -#: ../src/editor.c:926 +#: ../src/editor.c:923 msgid "Allocation error" msgstr "Erreur d'allocation" -#: ../src/editor.c:941 +#: ../src/editor.c:938 msgid "Save as..." msgstr "Enregistrer sous..." -#: ../src/editor.c:998 +#: ../src/editor.c:995 msgid "Text editor preferences" msgstr "Préférences de l'éditeur de texte" -#: ../src/editor.c:1015 +#: ../src/editor.c:1012 msgid "Font:" msgstr "Police :" -#: ../src/editor.c:1025 +#: ../src/editor.c:1022 msgid "Wrap mode:" msgstr "Retour à la ligne :" diff --git a/po/it.po b/po/it.po index add7587..c9f00bb 100644 --- a/po/it.po +++ b/po/it.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Editor 0.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-12-07 12:50+0100\n" +"POT-Creation-Date: 2011-12-08 08:43+0100\n" "PO-Revision-Date: 2010-04-09 16:43+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: Italian\n" @@ -17,230 +17,230 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../src/editor.c:95 +#: ../src/editor.c:97 msgid "_New" msgstr "" -#: ../src/editor.c:97 +#: ../src/editor.c:99 msgid "_Open" msgstr "" -#: ../src/editor.c:100 +#: ../src/editor.c:102 msgid "_Save" msgstr "" -#: ../src/editor.c:102 +#: ../src/editor.c:104 msgid "_Save as..." msgstr "" -#: ../src/editor.c:105 +#: ../src/editor.c:107 msgid "_Close" msgstr "" -#: ../src/editor.c:112 +#: ../src/editor.c:114 msgid "_Undo" msgstr "" -#: ../src/editor.c:114 +#: ../src/editor.c:116 msgid "_Redo" msgstr "" -#: ../src/editor.c:116 +#: ../src/editor.c:118 msgid "_Cut" msgstr "" -#: ../src/editor.c:118 +#: ../src/editor.c:120 msgid "_Copy" msgstr "" -#: ../src/editor.c:120 +#: ../src/editor.c:122 msgid "_Paste" msgstr "" -#: ../src/editor.c:123 +#: ../src/editor.c:125 msgid "Select _all" msgstr "" -#: ../src/editor.c:130 +#: ../src/editor.c:132 msgid "_Unselect all" msgstr "" -#: ../src/editor.c:132 +#: ../src/editor.c:134 msgid "_Find" msgstr "" -#: ../src/editor.c:135 +#: ../src/editor.c:137 msgid "_Preferences" msgstr "" -#: ../src/editor.c:142 +#: ../src/editor.c:144 msgid "_File..." msgstr "" -#: ../src/editor.c:148 +#: ../src/editor.c:150 msgid "_About" msgstr "" -#: ../src/editor.c:159 +#: ../src/editor.c:161 msgid "_File" msgstr "" -#: ../src/editor.c:160 +#: ../src/editor.c:162 msgid "_Edit" msgstr "" -#: ../src/editor.c:161 +#: ../src/editor.c:163 msgid "_Insert" msgstr "" -#: ../src/editor.c:162 +#: ../src/editor.c:164 msgid "_Help" msgstr "" -#: ../src/editor.c:169 +#: ../src/editor.c:171 msgid "New" msgstr "" -#: ../src/editor.c:170 +#: ../src/editor.c:172 msgid "Open" msgstr "" -#: ../src/editor.c:172 +#: ../src/editor.c:174 msgid "Save" msgstr "" -#: ../src/editor.c:173 +#: ../src/editor.c:175 msgid "Save as" msgstr "" -#: ../src/editor.c:176 +#: ../src/editor.c:178 msgid "Cut" msgstr "" -#: ../src/editor.c:177 +#: ../src/editor.c:179 msgid "Copy" msgstr "" -#: ../src/editor.c:178 +#: ../src/editor.c:180 msgid "Paste" msgstr "" -#: ../src/editor.c:181 +#: ../src/editor.c:183 msgid "Preferences" msgstr "" -#: ../src/editor.c:193 +#: ../src/editor.c:195 msgid "none" msgstr "" -#: ../src/editor.c:194 +#: ../src/editor.c:196 msgid "characters" msgstr "" -#: ../src/editor.c:195 +#: ../src/editor.c:197 msgid "words" msgstr "" -#: ../src/editor.c:196 +#: ../src/editor.c:198 msgid "words then characters" msgstr "" -#: ../src/editor.c:279 +#: ../src/editor.c:281 msgid "Text editor - " msgstr "" -#: ../src/editor.c:280 +#: ../src/editor.c:282 msgid "(Untitled)" msgstr "" -#: ../src/editor.c:393 +#: ../src/editor.c:395 msgid "translator-credits" msgstr "" -#: ../src/editor.c:429 +#: ../src/editor.c:431 msgid "Could not save configuration" msgstr "" -#: ../src/editor.c:446 ../src/editor.c:455 ../src/editor.c:913 -#: ../src/editor.c:918 +#: ../src/editor.c:448 ../src/editor.c:457 ../src/editor.c:910 +#: ../src/editor.c:915 msgid "Question" msgstr "" -#: ../src/editor.c:471 ../src/editor.c:475 +#: ../src/editor.c:473 ../src/editor.c:477 msgid "Error" msgstr "" -#: ../src/editor.c:497 ../src/editor.c:750 +#: ../src/editor.c:499 ../src/editor.c:747 msgid "" "There are unsaved changes.\n" "Discard or save them?" msgstr "" -#: ../src/editor.c:560 +#: ../src/editor.c:559 msgid "Find text" msgstr "" -#: ../src/editor.c:571 +#: ../src/editor.c:570 msgid "Text:" msgstr "" -#: ../src/editor.c:582 +#: ../src/editor.c:581 msgid "Case-sensitive" msgstr "" -#: ../src/editor.c:584 +#: ../src/editor.c:583 msgid "Wrap" msgstr "" -#: ../src/editor.c:627 +#: ../src/editor.c:626 msgid "Text not found" msgstr "" -#: ../src/editor.c:708 +#: ../src/editor.c:705 msgid "Insert file..." msgstr "" -#: ../src/editor.c:714 ../src/editor.c:827 +#: ../src/editor.c:711 ../src/editor.c:824 msgid "Text files" msgstr "" -#: ../src/editor.c:718 ../src/editor.c:831 +#: ../src/editor.c:715 ../src/editor.c:828 msgid "All files" msgstr "" -#: ../src/editor.c:756 +#: ../src/editor.c:753 msgid "Discard" msgstr "" -#: ../src/editor.c:821 +#: ../src/editor.c:818 msgid "Open file..." msgstr "" -#: ../src/editor.c:889 +#: ../src/editor.c:886 msgid "Partial write" msgstr "" -#: ../src/editor.c:917 +#: ../src/editor.c:914 msgid "This file already exists. Overwrite?" msgstr "" -#: ../src/editor.c:926 +#: ../src/editor.c:923 msgid "Allocation error" msgstr "" -#: ../src/editor.c:941 +#: ../src/editor.c:938 msgid "Save as..." msgstr "" -#: ../src/editor.c:998 +#: ../src/editor.c:995 msgid "Text editor preferences" msgstr "" -#: ../src/editor.c:1015 +#: ../src/editor.c:1012 msgid "Font:" msgstr "" -#: ../src/editor.c:1025 +#: ../src/editor.c:1022 msgid "Wrap mode:" msgstr "" diff --git a/src/editor.c b/src/editor.c index 012683f..122058b 100644 --- a/src/editor.c +++ b/src/editor.c @@ -15,6 +15,7 @@ static char const _license[] = "You should have received a copy of the GNU General Public License\n" "along with this program. If not, see .\n"; /* TODO: + * - use an infobar for errors * - consider using GtkSourceView also/instead * - move the "find" dialog over the status bar (and in Surfer too) */ @@ -62,6 +63,7 @@ struct _Editor GtkWidget * fi_dialog; GtkListStore * fi_store; GtkWidget * fi_text; + GtkWidget * fi_entry; GtkWidget * fi_case; GtkWidget * fi_wrap; /* about */ @@ -541,13 +543,10 @@ static void _on_find_response(GtkWidget * widget, gint response, gpointer data); void editor_find(Editor * editor, char const * text) { - GtkWidget * entry; - if(editor->fi_dialog == NULL) _find_dialog(editor); - entry = gtk_bin_get_child(GTK_BIN(editor->fi_text)); if(text != NULL) - gtk_entry_set_text(GTK_ENTRY(entry), text); + gtk_entry_set_text(GTK_ENTRY(editor->fi_entry), text); gtk_window_present(GTK_WINDOW(editor->fi_dialog)); } @@ -555,7 +554,7 @@ static void _find_dialog(Editor * editor) { GtkWidget * vbox; GtkWidget * hbox; - GtkWidget * widget; + GtkWidget * label; editor->fi_dialog = gtk_dialog_new_with_buttons(_("Find text"), GTK_WINDOW(editor->window), @@ -568,15 +567,15 @@ static void _find_dialog(Editor * editor) vbox = GTK_DIALOG(editor->fi_dialog)->vbox; #endif hbox = gtk_hbox_new(FALSE, 0); - widget = gtk_label_new(_("Text:")); - gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, TRUE, 0); + label = gtk_label_new(_("Text:")); + gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0); editor->fi_store = gtk_list_store_new(1, G_TYPE_STRING); editor->fi_text = gtk_combo_box_new_with_model_and_entry(GTK_TREE_MODEL( editor->fi_store)); gtk_combo_box_set_entry_text_column(GTK_COMBO_BOX(editor->fi_text), 0); - widget = gtk_bin_get_child(GTK_BIN(editor->fi_text)); - g_signal_connect(widget, "activate", G_CALLBACK(_on_find_activate), - editor); + editor->fi_entry = gtk_bin_get_child(GTK_BIN(editor->fi_text)); + g_signal_connect(editor->fi_entry, "activate", G_CALLBACK( + _on_find_activate), editor); gtk_box_pack_start(GTK_BOX(hbox), editor->fi_text, TRUE, TRUE, 4); gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 4); editor->fi_case = gtk_check_button_new_with_label(_("Case-sensitive")); @@ -630,7 +629,6 @@ static void _on_find_activate(GtkWidget * widget, gpointer data) static void _on_find_response(GtkWidget * widget, gint response, gpointer data) { Editor * editor = data; - GtkWidget * entry; if(response != GTK_RESPONSE_ACCEPT) { @@ -639,8 +637,7 @@ static void _on_find_response(GtkWidget * widget, gint response, gpointer data) editor->fi_dialog = NULL; return; } - entry = gtk_bin_get_child(GTK_BIN(editor->fi_text)); - _on_find_activate(entry, editor); + _on_find_activate(editor->fi_entry, editor); }