SVN commit 1097344 by lranghetti: another round of poconflicts (this time until 'created') M +1 -1 docmessages/extragear-graphics/kgraphviewer.po M +1 -1 docmessages/extragear-graphics/kipi-plugins_metadataeditor.po M +1 -1 docmessages/extragear-graphics/kpovmodeler.po M +1 -1 docmessages/extragear-graphics/showfoto.po M +3 -3 docmessages/extragear-multimedia/amarok_config.po M +1 -1 docmessages/extragear-multimedia/amarok_using.po M +3 -3 docmessages/extragear-multimedia/kmid.po M +1 -1 docmessages/extragear-multimedia/kplayer_commands.po M +2 -2 docmessages/extragear-multimedia/kplayer_howto-properties.po M +1 -1 docmessages/extragear-multimedia/kplayer_howto-settings.po M +2 -2 docmessages/extragear-multimedia/kplayer_properties.po M +1 -1 docmessages/extragear-multimedia/kplayer_settings.po M +1 -1 docmessages/extragear-office/skrooge.po M +1 -1 docmessages/extragear-pim/ksig.po M +4 -4 docmessages/extragear-sdk/quanta_extending-quanta.po M +1 -1 docmessages/extragear-sdk/quanta_quanta-projects.po M +3 -3 docmessages/extragear-sdk/xsldbg_commands.po M +2 -2 docmessages/extragear-utils/kdiff3.po M +5 -6 docmessages/extragear-utils/kdiff3_man-kdiff3.1.po M +1 -1 docmessages/extragear-utils/kpager.po M +1 -1 docmessages/extragear-utils/krusader_compare.po M +2 -2 docmessages/extragear-utils/krusader_keyboard-commands.po M +1 -1 docmessages/extragear-utils/krusader_menu-commands.po M +2 -2 docmessages/extragear-utils/krusader_user-interface.po M +2 -1 docmessages/kdeaccessibility/kmouth.po M +1 -1 docmessages/kdeadmin/kcontrol_knetworkconf.po M +1 -1 docmessages/kdebase-apps/kfind.po M +1 -1 docmessages/kdebase-apps/konqueror_commands.po M +13 -103 docmessages/kdebase-apps/konqueror_config.po M +1 -1 docmessages/kdebase-apps/konsole.po M +57 -118 docmessages/kdebase-apps/kwrite.po M +1 -1 docmessages/kdebase-runtime/kcontrol_bookmarks.po M +1 -1 docmessages/kdebase-runtime/kcontrol_cookies.po M +1 -1 docmessages/kdebase-runtime/kcontrol_netpref.po M +2 -2 docmessages/kdebase-runtime/kcontrol_proxy.po M +1 -1 docmessages/kdebase-runtime/kcontrol_spellchecking.po M +1 -1 docmessages/kdebase-runtime/userguide_customizing-desktop.po M +4 -4 docmessages/kdebase-runtime/userguide_net-connection-setup.po M +1 -1 docmessages/kdebase-runtime/userguide_programs-and-documents.po M +1 -1 docmessages/kdebase-runtime/userguide_standard-menu-entries.po M +2 -2 docmessages/kdebase-runtime/userguide_usenet.po M +1 -1 docmessages/kdebase-runtime/visualdict.po M +1 -1 docmessages/kdebase-workspace/kcontrol_kcmaccess.po M +1 -1 docmessages/kdebase-workspace/kcontrol_powerdevil.po M +7 -7 docmessages/kdebase-workspace/kdm.po M +1 -1 docmessages/kdebase-workspace/kdm_kdmrc-ref.po M +1 -1 docmessages/kdebase-workspace/kmenuedit.po M +1 -1 docmessages/kdebase-workspace/ksysguard.po M +1 -1 docmessages/kdebase-workspace/systemsettings.po M +1 -1 docmessages/kdeedu/khangman.po M +1 -1 docmessages/kdeedu/kmplot_credits.po M +1 -1 docmessages/kdeedu/kstars_ai-contents.po M +2 -2 docmessages/kdeedu/kstars_calculator.po M +2 -2 docmessages/kdeedu/kstars_commands.po M +1 -1 docmessages/kdeedu/kstars_geocoords.po M +1 -1 docmessages/kdeedu/kstars_indi.po M +1 -1 docmessages/kdeedu/kstars_skycoords.po M +1 -1 docmessages/kdeedu/kturtle_glossary.po M +1 -1 docmessages/kdeedu/kturtle_programming-reference.po M +1 -1 docmessages/kdeedu/kwordquiz.po M +1 -1 docmessages/kdeedu/marble.po M +1 -1 docmessages/kdeedu/rocs.po M +3 -3 docmessages/kdegames/bomber.po M +1 -1 docmessages/kdegames/granatier.po M +1 -1 docmessages/kdegames/kblocks.po M +3 -3 docmessages/kdegames/kbounce.po M +2 -2 docmessages/kdegames/kdiamond.po M +2 -165 docmessages/kdegames/kfourinline.po M +1 -1 docmessages/kdegames/kigo.po M +3 -3 docmessages/kdegames/kjumpingcube.po M +1 -1 docmessages/kdegames/kmines.po M +2 -2 docmessages/kdegames/knetwalk.po M +1 -1 docmessages/kdegames/kolf.po M +2 -2 docmessages/kdegames/kshisen.po M +1 -1 docmessages/kdegames/ksirk_ksirkskineditor.po M +2 -1 docmessages/kdegames/kspaceduel.po M +2 -2 docmessages/kdegames/ksquares.po M +1 -1 docmessages/kdegames/ksudoku.po M +2 -2 docmessages/kdegames/ktron.po M +1 -1 docmessages/kdegames/ktuberling.po M +1 -1 docmessages/kdegames/kubrick.po M +2 -2 docmessages/kdegames/palapeli.po M +1 -1 docmessages/kdelibs/kbuildsycoca4_man-kbuildsycoca4.8.po M +1 -1 docmessages/kdelibs/kde4-config_man-kde4-config.1.po M +1 -1 docmessages/kdemultimedia/kmix.po M +3 -3 docmessages/kdenetwork/kget.po M +5 -5 docmessages/kdenetwork/kopete.po M +3 -3 docmessages/kdenetwork/kppp_dialog-setup.po M +1 -1 docmessages/kdenetwork/kppp_hayes.po M +4 -4 docmessages/kdenetwork/kppp_wizard.po M +2 -2 docmessages/kdepim/kabcclient.po M +4 -4 docmessages/kdepim/kalarm.po M +2 -2 docmessages/kdepim/kleopatra.po M +8 -8 docmessages/kdepim/kmail_configure.po M +1 -1 docmessages/kdepim/kmail_menus.po M +1 -1 docmessages/kdepim/kmail_using-kmail.po M +5 -5 docmessages/kdepim/knode_using-firststart.po M +1 -1 docmessages/kdepim/kontact.po M +6 -6 docmessages/kdepim/korganizer.po M +1 -1 docmessages/kdepim/ktimetracker.po M +1 -1 docmessages/kdepim/kwatchgnupg.po M +1 -1 docmessages/kdereview/filelight.po M +1 -1 docmessages/kdereview/kajongg.po M +1 -1 docmessages/kdereview/kmid2.po M +3 -4 docmessages/kdesdk/kate.po M +35 -75 docmessages/kdesdk/kate_configuring.po M +2 -2 docmessages/kdesdk/kate_fundamentals.po M +4 -4 docmessages/kdesdk/kate_menus.po M +18 -18 docmessages/kdesdk/kate_plugins.po M +1 -1 docmessages/kdesdk/umbrello_credits.po M +1 -1 docmessages/kdesdk/umbrello_introduction.po M +1 -1 docmessages/kdeutils/ark.po M +1 -1 docmessages/kdeutils/kdelirc_kcmlirc.po M +1 -55 docmessages/kdeutils/okteta_menu.po M +2 -2 docmessages/kdeutils/okteta_tools.po M +1 -1 docmessages/kdewebdev/kommander_tutorials.po M +1 -1 docmessages/kdewebdev/kommander_widgets.po M +2 -2 docmessages/koffice/kchart.po M +2 -2 docmessages/koffice/kformula.po M +2 -2 docmessages/koffice/kspread_a11y.po M +1 -1 docmessages/koffice/kspread_commands.po M +4 -4 docmessages/koffice/kspread_configdialog.po M +2 -2 docmessages/koffice/kspread_format.po M +2 -1 docmessages/playground-base/kdeprint.po M +2 -3 docmessages/playground-base/kdeprint_cups-config.po M +1 -1 docmessages/playground-games/ksirtet.po M +3 -3 docmessages/playground-games/pege.po M +2 -2 docmessages/playground-graphics/kooka.po M +1 -1 docmessages/playground-network/rekonq.po M +2 -2 docmessages/playground-network/smb4k.po M +1 -1 docmessages/playground-office/kmymoney_details-reports.po M +4 -4 docmessages/playground-utils/synaptiks.po M +1 -1 messages/extragear-base/kwebkitpart.po M +2 -2 messages/extragear-base/polkit-kde-authentication-agent-1.po M +1 -1 messages/extragear-graphics/desktop_extragear-graphics_digikamimageplugins.po M +3 -2 messages/extragear-graphics/desktop_extragear-graphics_kipi-plugins.po M +5 -6 messages/extragear-graphics/digikam.po M +3 -3 messages/extragear-graphics/kgraphviewer.po M +5 -5 messages/extragear-graphics/kipiplugin_batchprocessimages.po M +2 -1 messages/extragear-graphics/kipiplugin_dngconverter.po M +2 -2 messages/extragear-graphics/kipiplugin_facebook.po M +1 -1 messages/extragear-graphics/kipiplugin_metadataedit.po M +1 -1 messages/extragear-graphics/kipiplugin_printimages.po M +3 -3 messages/extragear-graphics/kipiplugin_sendimages.po M +3 -3 messages/extragear-graphics/kpovmodeler.po M +10 -10 messages/extragear-multimedia/amarok.po M +1 -1 messages/extragear-multimedia/amarok_scriptengine_qscript.po M +4 -4 messages/extragear-multimedia/k3b.po M +7 -6 messages/extragear-multimedia/kaudiocreator.po M +1 -1 messages/extragear-multimedia/kmplayer.po M +5 -5 messages/extragear-multimedia/kplayer.po M +1 -1 messages/extragear-multimedia/libk3b.po M +1 -1 messages/extragear-network/desktop_extragear-network_choqok.po M +1 -1 messages/extragear-network/desktop_extragear-network_kmldonkey.po M +3 -3 messages/extragear-network/kftpgrabber.po M +10 -6 messages/extragear-network/kmldonkey.po M +8 -8 messages/extragear-network/konversation.po M +6 -3 messages/extragear-network/ktorrent.po M +1 -1 messages/extragear-network/kwlan.po M +4 -4 messages/extragear-office/kile.po M +3 -3 messages/extragear-office/skrooge.po M +8 -8 messages/extragear-office/tellico.po M +1 -1 messages/extragear-sdk/desktop_extragear-sdk_kdevelop.po M +1 -1 messages/extragear-sdk/desktop_extragear-sdk_kdevplatform.po M +1 -1 messages/extragear-sdk/kdevclassbrowser.po M +1 -1 messages/extragear-sdk/kdevcmake.po M +1 -1 messages/extragear-sdk/kdevcvs.po M +2 -2 messages/extragear-sdk/kdevgdb.po M +1 -1 messages/extragear-sdk/kdevphp.po M +6 -6 messages/extragear-sdk/kdevplatform.po M +1 -1 messages/extragear-sdk/kdevprojectmanagerview.po M +1 -1 messages/extragear-sdk/kdevsubversion.po M +1 -1 messages/extragear-sdk/kdevupload.po M +4 -4 messages/extragear-sdk/quanta.po M +1 -1 messages/extragear-sysadmin/partitionmanager.po M +8 -8 messages/extragear-utils/kdiff3.po M +1 -1 messages/extragear-utils/kerry.po M +9 -9 messages/extragear-utils/krecipes.po M +6 -6 messages/extragear-utils/krusader.po M +14 -14 messages/kdeaccessibility/kmouth.po M +1 -1 messages/kdeaccessibility/kttsd.po M +1 -1 messages/kdeadmin/ksystemlog.po M +1 -1 messages/kdeadmin/kuser.po M +4 -4 messages/kdeadmin/system-config-printer-kde.po M +1 -1 messages/kdeartwork/desktop_kdeartwork.po M +2 -2 messages/kdeartwork/kxsconfig.po M +4 -4 messages/kdebase/desktop_kdebase.po M +4 -4 messages/kdebase/kcmdevinfo.po M +3 -3 messages/kdebase/kcmkio.po M +1 -1 messages/kdebase/kcmkwincompositing.po M +1 -1 messages/kdebase/kcmsamba.po M +1 -1 messages/kdebase/kcmstyle.po M +2 -2 messages/kdebase/kdmgreet.po M +1 -1 messages/kdebase/keditbookmarks.po M +1 -1 messages/kdebase/kfmclient.po M +2 -2 messages/kdebase/khelpcenter.po M +1 -1 messages/kdebase/konqueror.po M +1 -1 messages/kdebase/kurifilter.po M +1 -1 messages/kdebase/kwin.po M +3 -3 messages/kdebase/kwrite.po M +1 -1 messages/kdebase/libplasmaclock.po M +1 -1 messages/kdebase/plasma_engine_soliddevice.po M +3 -3 messages/kdebase/plasma_engine_weather.po M +1 -1 messages/kdebase/plasma_scriptengine_qscript.po M +2 -2 messages/kdebase/plasmaengineexplorer.po M +2 -2 messages/kdebase/policykit-kde.po M +1 -1 messages/kdeedu/cantor.po M +2 -2 messages/kdeedu/kalgebra.po M +1 -1 messages/kdeedu/kalzium.po M +4 -4 messages/kdeedu/kgeography.po M +1 -1 messages/kdeedu/kiten.po M +1 -1 messages/kdeedu/kmplot.po M +6 -6 messages/kdeedu/kstars.po M +2 -2 messages/kdeedu/kwordquiz.po M +1 -1 messages/kdeedu/marble.po M +1 -1 messages/kdeedu/marble_qt.po M +3 -3 messages/kdeedu/parley.po M +1 -1 messages/kdeedu/rocs.po M +1 -0 messages/kdeedu/step_qt.po M +3 -3 messages/kdegames/desktop_kdegames.po M +2 -2 messages/kdegames/kbattleship.po M +1 -1 messages/kdegames/kblocks.po M +1 -1 messages/kdegames/kfourinline.po M +1 -1 messages/kdegames/killbots.po M +1 -1 messages/kdegames/kjumpingcube.po M +10 -11 messages/kdegames/ksirk.po M +4 -4 messages/kdegames/ksirkskineditor.po M +1 -1 messages/kdegames/libkdegames.po M +1 -1 messages/kdegraphics/kfile_exr.po M +1 -1 messages/kdegraphics/kfile_tiff.po M +1 -1 messages/kdegraphics/kolourpaint.po M +5 -5 messages/kdegraphics/okular.po M +11 -11 messages/kdelibs/katepart4.po M +8 -8 messages/kdelibs/kdelibs4.po M +4 -4 messages/kdelibs/kio4.po M +1 -1 messages/kdelibs/kio_help4.po M +1 -1 messages/kdemultimedia/juk.po M +1 -1 messages/kdemultimedia/kfile_flac.po M +1 -1 messages/kdemultimedia/kfile_mp3.po M +1 -1 messages/kdemultimedia/kfile_mpc.po M +1 -1 messages/kdemultimedia/kfile_ogg.po M +1 -1 messages/kdemultimedia/kfile_sid.po M +1 -1 messages/kdemultimedia/kmix.po M +3 -3 messages/kdenetwork/desktop_kdenetwork.po M +2 -2 messages/kdenetwork/kcm_krfb.po M +1 -1 messages/kdenetwork/kfileshare.po M +4 -6 messages/kdenetwork/kget.po M +18 -19 messages/kdenetwork/kopete.po M +3 -3 messages/kdenetwork/kppp.po M +2 -2 messages/kdenetwork/krdc.po M +1 -1 messages/kdepim/akonadi_pop3_resource.po M +1 -1 messages/kdepim/akregator.po M +1 -1 messages/kdepim/blogilo.po M +3 -3 messages/kdepim/desktop_kdepim.po M +2 -2 messages/kdepim/kalarm.po M +1 -1 messages/kdepim/kjots.po M +1 -1 messages/kdepim/kjotsmigrator.po M +6 -6 messages/kdepim/kleopatra.po M +1 -1 messages/kdepim/kmail-migrator.po M +9 -9 messages/kdepim/kmail.po M +5 -5 messages/kdepim/knode.po M +1 -1 messages/kdepim/knotes.po M +15 -12 messages/kdepim/kontact.po M +5 -5 messages/kdepim/korganizer.po M +1 -1 messages/kdepim/kres-migrator.po M +1 -1 messages/kdepim/libkpgp.po M +1 -1 messages/kdepim/libmessagelist.po M +1 -1 messages/kdepim/libmessageviewer.po M +2 -2 messages/kdepimlibs/akonadicontact.po M +1 -1 messages/kdepimlibs/kabc_ldapkio.po M +1 -1 messages/kdepimlibs/kio_smtp.po M +1 -1 messages/kdeplasma-addons/lancelot.po M +1 -1 messages/kdeplasma-addons/plasma_applet_binaryclock.po M +1 -1 messages/kdeplasma-addons/plasma_applet_frame.po M +1 -1 messages/kdeplasma-addons/plasma_applet_fuzzy_clock.po M +1 -1 messages/kdeplasma-addons/plasma_applet_kdeobservatory.po M +1 -1 messages/kdeplasma-addons/plasma_applet_notes.po M +1 -1 messages/kdeplasma-addons/plasma_applet_unitconverter.po M +1 -1 messages/kdereview/libknetworkmanager.po M +1 -1 messages/kdereview/plasma_applet_adjustableclock.po M +0 -6 messages/kdereview/plasma_applet_networkmanagement.po M +1 -1 messages/kdesdk/cervisia.po M +2 -2 messages/kdesdk/desktop_kdesdk.po M +4 -4 messages/kdesdk/kate.po M +1 -1 messages/kdesdk/kateinsertcommand.po M +1 -1 messages/kdesdk/katesnippetstng_editor.po M +5 -5 messages/kdesdk/kbugbuster.po M +1 -1 messages/kdesdk/kcachegrind_qt.po M +1 -1 messages/kdesdk/kompare.po M +1 -1 messages/kdesdk/lokalize.po M +11 -7 messages/kdesdk/umbrello.po M +1 -1 messages/kdeutils/ark.po M +1 -1 messages/kdeutils/kcm_lirc.po M +1 -1 messages/kdeutils/kcmkwallet.po M +3 -3 messages/kdeutils/liboktetakasten.po M +1 -1 messages/kdewebdev/kfilereplace.po M +8 -8 messages/kdewebdev/kommander.po M +3 -3 messages/koffice/ChartShape.po M +1 -1 messages/koffice/FormulaShape.po M +1 -1 messages/koffice/desktop_koffice.po M +1 -1 messages/koffice/karbon.po M +14 -14 messages/koffice/kexi.po M +5 -5 messages/koffice/koffice.po M +3 -3 messages/koffice/kplatolibs.po M +2 -2 messages/koffice/kplatowork.po M +10 -10 messages/koffice/krita.po M +16 -16 messages/koffice/kspread.po M +1 -1 messages/playground-base/kbstateapplet.po M +3 -3 messages/playground-base/kdeprint4.po M +1 -1 messages/playground-base/plasma-mid.po M +1 -1 messages/playground-base/plasma_applet_clock_hybrid.po M +1 -1 messages/playground-base/plasma_applet_crystal.po M +1 -1 messages/playground-base/plasma_applet_discburner.po M +1 -1 messages/playground-base/plasma_applet_fancytasks.po M +1 -1 messages/playground-base/plasma_applet_groupphoto.po M +3 -3 messages/playground-base/plasma_applet_nepomukcontextchooser.po M +1 -1 messages/playground-base/plasma_applet_togglepanel.po M +1 -1 messages/playground-base/plasmate.po M +1 -1 messages/playground-base/plasmoidviewer.po M +6 -6 messages/playground-base/ppdtranslations4.po M +1 -1 messages/playground-devtools/icemon.po M +1 -1 messages/playground-devtools/kdevcoverage.po M +2 -2 messages/playground-devtools/kdevgdb.po M +1 -1 messages/playground-devtools/kdevjava.po M +1 -1 messages/playground-devtools/kdevpython.po M +1 -1 messages/playground-devtools/kdevteamwork.po M +1 -1 messages/playground-edu/kverbos.po M +3 -3 messages/playground-games/kamala.po M +1 -1 messages/playground-games/kblocks.po M +1 -1 messages/playground-graphics/athec.po M +1 -1 messages/playground-graphics/darkroom.po M +5 -5 messages/playground-multimedia/audex.po M +3 -3 messages/playground-multimedia/kdetv.po M +2 -2 messages/playground-multimedia/ktabedit.po M +1 -1 messages/playground-multimedia/lintv.po M +1 -1 messages/playground-network/aki.po M +1 -1 messages/playground-network/kcall.po M +1 -1 messages/playground-network/kdevmo.po M +2 -2 messages/playground-network/kvpnc.po M +6 -6 messages/playground-office/kmymoney.po M +1 -1 messages/playground-pim/kitchensync.po M +1 -1 messages/playground-pim/kmobiletools.po M +2 -2 messages/playground-pim/knowit.po M +2 -2 messages/playground-pim/kpilot.po M +1 -1 messages/playground-pim/kxforms.po M +1 -1 messages/playground-sysadmin/kcm_aqpm_databases.po M +4 -4 messages/playground-sysadmin/kpackagekit.po M +4 -4 messages/playground-sysadmin/libshaman.po M +1 -1 messages/playground-utils/gwenrename.po M +0 -1 messages/playground-utils/synaptiks.po M +1 -1 messages/playground-utils/ultracopier.po M +1 -1 messages/playground-utils/viki.po M +4 -2 messages/qt/kdeqt.po M +1 -1 messages/qt/phonon-xine.po http://websvn.kde.org/?view=rev&revision=1097344