[zypp-commit] r9494 - in /trunk/updater-gnome: ./ cmake/modules/ po/ src/ src/zypp/

Author: ckornacker Date: Wed Apr 9 17:53:57 2008 New Revision: 9494 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9494&view=rev Log: localization cleanup Added: trunk/updater-gnome/cmake/modules/FindGettext.cmake trunk/updater-gnome/po/CMakeLists.txt Modified: trunk/updater-gnome/CMakeLists.txt trunk/updater-gnome/po/POTFILES.in trunk/updater-gnome/po/opensuseupdater-gnome.pot trunk/updater-gnome/src/CMakeLists.txt trunk/updater-gnome/src/updater-applet.c trunk/updater-gnome/src/zypp/updater-zypper-gui.c Modified: trunk/updater-gnome/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/CMakeLists.txt?rev=9494&r1=9493&r2=9494&view=diff ============================================================================== --- trunk/updater-gnome/CMakeLists.txt (original) +++ trunk/updater-gnome/CMakeLists.txt Wed Apr 9 17:53:57 2008 @@ -61,6 +61,7 @@ # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked SET( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ) +FIND_PACKAGE(Gettext REQUIRED) FIND_PACKAGE( PkgConfig REQUIRED ) IF( PKG_CONFIG_FOUND ) @@ -104,7 +105,7 @@ ELSE( SED_EXECUTABLE_NOTFOUND ) MESSAGE( STATUS "sed: ${SED_EXECUTABLE}" ) ENDIF( SED_EXECUTABLE_NOTFOUND ) - + # --------- configure files ------------------------------------------------- # correct updater.glade file @@ -162,8 +163,7 @@ # subdirs ADD_SUBDIRECTORY( src ) -#TODO -#ADD_SUBDIRECTORY( po EXCLUDE_FROM_ALL ) +ADD_SUBDIRECTORY( po ) # ------- custom targets ---------------------------------------------------- Added: trunk/updater-gnome/cmake/modules/FindGettext.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/cmake/modules/FindGettext.cmake?rev=9494&view=auto ============================================================================== --- trunk/updater-gnome/cmake/modules/FindGettext.cmake (added) +++ trunk/updater-gnome/cmake/modules/FindGettext.cmake Wed Apr 9 17:53:57 2008 @@ -0,0 +1,63 @@ +# - Find GNU gettext tools +# This module looks for the GNU gettext tools. This module defines the +# following values: +# GETTEXT_MSGMERGE_EXECUTABLE: the full path to the msgmerge tool. +# GETTEXT_MSGFMT_EXECUTABLE: the full path to the msgfmt tool. +# GETTEXT_FOUND: True if gettext has been found. +# +# Additionally it provides the following macros: +# GETTEXT_CREATE_TRANSLATIONS ( outputFile [ALL] file1 ... fileN ) +# This will create a target "translations" which will convert the +# given input po files into the binary output mo file. If the +# ALL option is used, the translations will also be created when +# building the default target. + +FIND_PROGRAM(GETTEXT_MSGMERGE_EXECUTABLE msgmerge) + +FIND_PROGRAM(GETTEXT_MSGFMT_EXECUTABLE msgfmt) + +MACRO(GETTEXT_CREATE_TRANSLATIONS _potFile _firstPoFile) + + SET(_gmoFiles) + GET_FILENAME_COMPONENT(_potBasename ${_potFile} NAME_WE) + GET_FILENAME_COMPONENT(_absPotFile ${_potFile} ABSOLUTE) + +#MESSAGE( STATUS "pot: ${_potFile} converted to ${_potBasename}") + + SET(_addToAll) + IF(${_firstPoFile} STREQUAL "ALL") + SET(_addToAll "ALL") + SET(_firstPoFile) + ENDIF(${_firstPoFile} STREQUAL "ALL") + + FOREACH (_currentPoFile ${ARGN}) + GET_FILENAME_COMPONENT(_absFile ${_currentPoFile} ABSOLUTE) + GET_FILENAME_COMPONENT(_abs_PATH ${_absFile} PATH) + GET_FILENAME_COMPONENT(_lang ${_absFile} NAME_WE) + SET(_gmoFile ${CMAKE_CURRENT_BINARY_DIR}/${_lang}.gmo) + + ADD_CUSTOM_COMMAND( + OUTPUT ${_gmoFile} +#COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} --quiet --update --backup=none -s ${_absFile} ${_absPotFile} + COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${_gmoFile} ${_absFile} +#DEPENDS ${_absPotFile} ${_absFile} + DEPENDS ${_absFile} + ) + + INSTALL(FILES ${_gmoFile} DESTINATION share/locale/${_lang}/LC_MESSAGES RENAME ${_potBasename}.mo) + SET(_gmoFiles ${_gmoFiles} ${_gmoFile}) + + ENDFOREACH (_currentPoFile ) + + ADD_CUSTOM_TARGET(translations ${_addToAll} DEPENDS ${_gmoFiles}) + +ENDMACRO(GETTEXT_CREATE_TRANSLATIONS ) + +IF (GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE ) + SET(GETTEXT_FOUND TRUE) +ELSE (GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE ) + SET(GETTEXT_FOUND FALSE) + IF (GetText_REQUIRED) + MESSAGE(FATAL_ERROR "GetText not found") + ENDIF (GetText_REQUIRED) +ENDIF (GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE ) \ No newline at end of file Added: trunk/updater-gnome/po/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/po/CMakeLists.txt?rev=9494&view=auto ============================================================================== --- trunk/updater-gnome/po/CMakeLists.txt (added) +++ trunk/updater-gnome/po/CMakeLists.txt Wed Apr 9 17:53:57 2008 @@ -0,0 +1,2 @@ +FILE( GLOB OPENSUSEUPDATER_PO_FILES ${CMAKE_SOURCE_DIR}/po/*.po ) +GETTEXT_CREATE_TRANSLATIONS( "${CMAKE_SOURCE_DIR}/po/opensuseupdater-gnome.pot" ALL ${OPENSUSEUPDATER_PO_FILES} ) Modified: trunk/updater-gnome/po/POTFILES.in URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/po/POTFILES.in?rev=9494&r1=9493&r2=9494&view=diff ============================================================================== --- trunk/updater-gnome/po/POTFILES.in (original) +++ trunk/updater-gnome/po/POTFILES.in Wed Apr 9 17:53:57 2008 @@ -1,19 +1,19 @@ -src/updater.c -src/updater-backend.h -src/zypp/updater-zypper-gui.c -src/zypp/updater-zypp.c -src/zypp/updater-zypp.h -src/updater-support.c -src/updater-applet-callbacks.h -src/updater-applet.c -src/updater-backend.c -src/updater-applet-callbacks.c -src/updater.h -src/updater-support.h -src/updater-callbacks.c -src/updater-applet-support.h -src/updater-applet-support.c -src/updater-main.c -src/updater-callbacks.h -glade/updater.glade -src/opensuse-updater-applet.desktop +../src/updater.c +../src/updater-backend.h +../src/zypp/updater-zypper-gui.c +../src/zypp/updater-zypp.c +../src/zypp/updater-zypp.h +../src/updater-support.c +../src/updater-applet-callbacks.h +../src/updater-applet.c +../src/updater-backend.c +../src/updater-applet-callbacks.c +../src/updater.h +../src/updater-support.h +../src/updater-callbacks.c +../src/updater-applet-support.h +../src/updater-applet-support.c +../src/updater-main.c +../src/updater-callbacks.h +../glade/updater.glade +../src/opensuse-updater-applet.desktop Modified: trunk/updater-gnome/po/opensuseupdater-gnome.pot URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/po/opensuseupdater-gnome.pot?rev=9494&r1=9493&r2=9494&view=diff ============================================================================== --- trunk/updater-gnome/po/opensuseupdater-gnome.pot (original) +++ trunk/updater-gnome/po/opensuseupdater-gnome.pot Wed Apr 9 17:53:57 2008 @@ -1,6 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. +# This file is put in the public domain. # FIRST AUTHOR , YEAR. # #, fuzzy @@ -8,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-06 14:34+0200\n" +"POT-Creation-Date: 2008-04-09 17:19+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,96 +20,108 @@ msgid "Checking for updates..." msgstr "" -#: ../src/zypp/updater-zypper-gui.c:137 +#: ../src/zypp/updater-zypper-gui.c:138 msgid "Update Progress" msgstr "" -#: ../src/zypp/updater-zypper-gui.c:171 +#: ../src/zypp/updater-zypper-gui.c:172 msgid "Update in progress" msgstr "" -#: ../src/zypp/updater-zypper-gui.c:172 +#: ../src/zypp/updater-zypper-gui.c:173 msgid "" "You're not able to stop this process in order to ensure integrity of your " "system. Please be patient." msgstr "" -#: ../src/zypp/updater-zypper-gui.c:195 +#: ../src/zypp/updater-zypper-gui.c:196 msgid "No mandatory updates to apply" msgstr "" -#: ../src/zypp/updater-zypper-gui.c:197 +#: ../src/zypp/updater-zypper-gui.c:198 msgid "Applying mandatory updates" msgstr "" -#: ../src/zypp/updater-zypper-gui.c:214 +#: ../src/zypp/updater-zypper-gui.c:215 msgid "Applying additional updates" msgstr "" -#: ../src/zypp/updater-zypper-gui.c:216 +#: ../src/zypp/updater-zypper-gui.c:217 msgid "No additional updates to apply" msgstr "" -#: ../src/zypp/updater-zypper-gui.c:254 +#: ../src/zypp/updater-zypper-gui.c:255 msgid "Applying additional updates..." msgstr "" -#: ../src/zypp/updater-zypper-gui.c:257 +#: ../src/zypp/updater-zypper-gui.c:258 msgid "Applying additional package updates..." msgstr "" -#: ../src/zypp/updater-zypper-gui.c:262 +#: ../src/zypp/updater-zypper-gui.c:263 msgid "Applying mandatory updates..." msgstr "" -#: ../src/zypp/updater-zypper-gui.c:277 ../src/zypp/updater-zypper-gui.c:291 -#: ../src/zypp/updater-zypper-gui.c:582 -msgid "Error" -msgstr "" - -#: ../src/zypp/updater-zypper-gui.c:315 +#: ../src/zypp/updater-zypper-gui.c:283 msgid "Additonal updates done." msgstr "" -#: ../src/zypp/updater-zypper-gui.c:325 ../src/zypp/updater-zypper-gui.c:368 -#: ../src/zypp/updater-zypper-gui.c:425 ../src/zypp/updater-zypper-gui.c:468 +#: ../src/zypp/updater-zypper-gui.c:293 ../src/zypp/updater-zypper-gui.c:336 +#: ../src/zypp/updater-zypper-gui.c:393 ../src/zypp/updater-zypper-gui.c:436 msgid "Updates installed" msgstr "" -#: ../src/zypp/updater-zypper-gui.c:342 ../src/zypp/updater-zypper-gui.c:442 +#: ../src/zypp/updater-zypper-gui.c:310 ../src/zypp/updater-zypper-gui.c:410 msgid "Restart needed" msgstr "" -#: ../src/zypp/updater-zypper-gui.c:343 ../src/zypp/updater-zypper-gui.c:443 +#: ../src/zypp/updater-zypper-gui.c:311 ../src/zypp/updater-zypper-gui.c:411 msgid "" "All updates have been applied successfully. Some updates require your system " "to be restarted." msgstr "" -#: ../src/zypp/updater-zypper-gui.c:344 ../src/zypp/updater-zypper-gui.c:444 +#: ../src/zypp/updater-zypper-gui.c:312 ../src/zypp/updater-zypper-gui.c:412 msgid "Please restart your system as soon as possible." msgstr "" -#: ../src/zypp/updater-zypper-gui.c:384 ../src/zypp/updater-zypper-gui.c:484 +#: ../src/zypp/updater-zypper-gui.c:352 ../src/zypp/updater-zypper-gui.c:452 msgid "Update successful!" msgstr "" -#: ../src/zypp/updater-zypper-gui.c:385 ../src/zypp/updater-zypper-gui.c:485 +#: ../src/zypp/updater-zypper-gui.c:353 ../src/zypp/updater-zypper-gui.c:453 msgid "All updates have been applied successfully." msgstr "" -#: ../src/zypp/updater-zypper-gui.c:386 ../src/zypp/updater-zypper-gui.c:486 +#: ../src/zypp/updater-zypper-gui.c:354 ../src/zypp/updater-zypper-gui.c:454 msgid "Enjoy your day!" msgstr "" -#: ../src/zypp/updater-zypper-gui.c:409 +#: ../src/zypp/updater-zypper-gui.c:377 msgid "Checking for additional package updates" msgstr "" -#: ../src/zypp/updater-zypper-gui.c:415 +#: ../src/zypp/updater-zypper-gui.c:383 msgid "Mandatory updates done." msgstr "" +#: ../src/zypp/updater-zypper-gui.c:478 ../src/zypp/updater-zypper-gui.c:492 +#: ../src/zypp/updater-zypper-gui.c:582 +msgid "Error" +msgstr "" + +#: ../src/zypp/updater-zypper-gui.c:493 +msgid "Failed to apply the updates." +msgstr "" + +#: ../src/zypp/updater-zypper-gui.c:494 +msgid "Please consider running the Package Manager manually." +msgstr "" + +#: ../src/zypp/updater-zypper-gui.c:565 +msgid "zypper could not be started!\n" +msgstr "" + #: ../src/zypp/updater-zypper-gui.c:568 msgid "Update error" msgstr "" @@ -123,30 +134,46 @@ msgid "Please ensure you have zypper installed correctly." msgstr "" -#: ../src/updater-support.c:285 +#: ../src/zypp/updater-zypper-gui.c:684 +msgid "Invalid arguments. You're not supposed to run this by hand!\n" +msgstr "" + +#: ../src/updater-support.c:274 +msgid "Mandatory updates available" +msgstr "" + +#: ../src/updater-support.c:279 +msgid "Additional updates available" +msgstr "" + +#: ../src/updater-support.c:284 +msgid "Your system is up-to-date" +msgstr "" + +#: ../src/updater-support.c:353 msgid "Your system is up-to-date." msgstr "" -#: ../src/updater-support.c:288 +#: ../src/updater-support.c:356 msgid "There are no updates that need to be installed." msgstr "" -#: ../src/updater-support.c:289 +#: ../src/updater-support.c:357 msgid "No optional updates available" msgstr "" -#: ../src/updater-support.c:300 +#: ../src/updater-support.c:368 msgid "New software for your system is available" msgstr "" -#: ../src/updater-support.c:307 ../src/updater-support.c:338 +#: ../src/updater-support.c:375 ../src/updater-support.c:406 #, c-format msgid "%d mandatory update is about to be installed" msgid_plural "%d mandatory updates are about to be installed" msgstr[0] "" msgstr[1] "" -#: ../src/updater-support.c:314 ../src/updater-support.c:345 +#: ../src/updater-support.c:382 ../src/updater-support.c:413 #, c-format msgid "include %d additional update" msgid_plural "include %d additional updates" @@ -173,45 +200,53 @@ msgid "System is up-to-date" msgstr "" -#: ../src/updater-applet.c:252 ../glade/updater.glade.h:28 +#: ../src/updater-applet.c:252 ../glade/updater.glade:10 +#: ../glade/updater.glade:282 msgid "openSUSE Updater" msgstr "" -#: ../src/updater-backend.c:196 -msgid "Mandatory updates available" +#: ../src/updater-callbacks.c:212 +msgid "Installing updates..." msgstr "" -#: ../src/updater-backend.c:201 -msgid "Additional updates available" +#: ../glade/updater.glade:56 +msgid "" +"<b>Available Updates:</b>\n" +"Following security updates and recommended updates are available for your " +"computer" msgstr "" -#: ../src/updater-backend.c:206 -msgid "Your system is up-to-date" +#: ../glade/updater.glade:162 +msgid "Add/Remove Update Sources" msgstr "" -#: ../src/updater-callbacks.c:207 -msgid "Installing updates..." +#: ../glade/updater.glade:219 ../glade/updater.glade:540 +msgid "Install" msgstr "" -#. vim: set ts=2 sts=2 sw=2 et ai: -#: ../glade/updater.glade.h:1 +#: ../glade/updater.glade:334 +msgid "" +"New software for your system is " +"available</span>" +msgstr "" + +#: ../glade/updater.glade:377 msgid "0 mandatory updates are about to be installed" msgstr "" -#: ../glade/updater.glade.h:2 -msgid "" -"<b>Available Updates:</b>\n" -"Following security updates and recommended updates are available for your " -"computer" +#: ../glade/updater.glade:403 +msgid "include 0 additional updates" msgstr "" -#: ../glade/updater.glade.h:4 -msgid "" -"New software for your system is " -"available</span>" +#: ../glade/updater.glade:433 +msgid "Don't install updates that require a restart" msgstr "" -#: ../glade/updater.glade.h:5 +#: ../glade/updater.glade:481 +msgid "Details" +msgstr "" + +#: ../glade/updater.glade:679 msgid "" "Some security updates do not get " "installed</span>\n" @@ -222,73 +257,53 @@ "install those updates as soon as possible!" msgstr "" -#: ../glade/updater.glade.h:10 -msgid "Check interval:</span>" -msgstr "" - -#: ../glade/updater.glade.h:11 -msgid "Optional & 3rd party updates:</span>" -msgstr "" - -#: ../glade/updater.glade.h:12 -msgid "Recommended updates:</span>" +#: ../glade/updater.glade:717 +msgid "Update Applet Preferences" msgstr "" -#: ../glade/updater.glade.h:13 -msgid "Add/Remove Update Sources" +#: ../glade/updater.glade:774 +msgid "Check interval:</span>" msgstr "" -#: ../glade/updater.glade.h:14 +#: ../glade/updater.glade:817 msgid "Check for updates:" msgstr "" -#: ../glade/updater.glade.h:15 -msgid "Details" -msgstr "" - -#: ../glade/updater.glade.h:16 -msgid "Don't install updates that require a restart" -msgstr "" - -#: ../glade/updater.glade.h:17 +#: ../glade/updater.glade:842 msgid "" "Every day\n" "Every other day" msgstr "" -#: ../glade/updater.glade.h:19 -msgid "Include 3rd party updates in additional updates" -msgstr "" - -#: ../glade/updater.glade.h:20 -msgid "Include optional patches in additional updates" +#: ../glade/updater.glade:866 +msgid "Recommended updates:</span>" msgstr "" -#: ../glade/updater.glade.h:21 -msgid "Install" +#: ../glade/updater.glade:909 +msgid "Treat as:" msgstr "" -#: ../glade/updater.glade.h:22 +#: ../glade/updater.glade:934 msgid "" "Mandatory updates\n" "Additional updates" msgstr "" -#: ../glade/updater.glade.h:24 -msgid "" -"The default settings provide a sane default for most users. Changes should " -"only be made, if they are absolutely necessary and you know what you're " -"doing." +#: ../glade/updater.glade:958 +msgid "Optional & 3rd party updates:</span>" msgstr "" -#: ../glade/updater.glade.h:25 -msgid "Treat as:" +#: ../glade/updater.glade:1002 +msgid "Include optional patches in additional updates" msgstr "" -#: ../glade/updater.glade.h:26 -msgid "Update Applet Preferences" +#: ../glade/updater.glade:1021 +msgid "Include 3rd party updates in additional updates" msgstr "" -#: ../glade/updater.glade.h:27 -msgid "include 0 additional updates" +#: ../glade/updater.glade:1082 +msgid "" +"The default settings provide a sane default for most users. Changes should " +"only be made, if they are absolutely necessary and you know what you're " +"doing." msgstr "" Modified: trunk/updater-gnome/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/src/CMakeLists.txt?rev=9494&r1=9493&r2=9494&view=diff ============================================================================== --- trunk/updater-gnome/src/CMakeLists.txt (original) +++ trunk/updater-gnome/src/CMakeLists.txt Wed Apr 9 17:53:57 2008 @@ -1,7 +1,7 @@ ADD_DEFINITIONS( -DDATADIR=\\\"${DATADIR}\\\" -DPROJECTDIR=\\\"${CMAKE_SOURCE_DIR}\\\" -# -DLOCALEDIR=\\\"/usr/share/l\\\" - -DTEXTDOMAIN=\\\"opensuse-updater-gnome\\\") + -DLOCALEDIR=\\\"/usr/share/locale\\\" + -DTEXTDOMAIN=\\\"opensuseupdater-gnome\\\") SET( updater_SRCS Modified: trunk/updater-gnome/src/updater-applet.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/src/updater-applet.c?rev=9494&r1=9493&r2=9494&view=diff ============================================================================== --- trunk/updater-gnome/src/updater-applet.c (original) +++ trunk/updater-gnome/src/updater-applet.c Wed Apr 9 17:53:57 2008 @@ -238,13 +238,11 @@ { UpdaterApplet *applet; -#ifdef HAVE_GETTEXT // setlocale (LC_ALL, ""); is already called by gtk_set_locale() // via gtk_init(). - bindtextdomain (TEXT_DOMAIN, LOCALE_DIR); - textdomain (TEXT_DOMAIN); - bind_textdomain_codeset (TEXT_DOMAIN, "UTF-8"); -#endif + bindtextdomain (TEXTDOMAIN, LOCALEDIR); + textdomain (TEXTDOMAIN); + bind_textdomain_codeset (TEXTDOMAIN, "UTF-8"); // FIXME This hack is very nasty! And it doesn't even always work! // sleep(5); Modified: trunk/updater-gnome/src/zypp/updater-zypper-gui.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/src/zypp/updater-zypper-gui.c?rev=9494&r1=9493&r2=9494&view=diff ============================================================================== --- trunk/updater-gnome/src/zypp/updater-zypper-gui.c (original) +++ trunk/updater-gnome/src/zypp/updater-zypper-gui.c Wed Apr 9 17:53:57 2008 @@ -562,7 +562,7 @@ if (!ret) { - g_warning ("zypper could not be started!\n"); + g_warning (_("zypper could not be started!\n")); GtkWidget *errordialog, *errorlabel, *vbox; errordialog = gtk_dialog_new_with_buttons (_("Update error"), @@ -681,7 +681,7 @@ { if (argc<8) { - g_print("Invalid arguments. You're not supposed to run this by hand!\n"); + g_print(_("Invalid arguments. You're not supposed to run this by hand!\n")); exit(42); } -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org