diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:56:37 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:56:37 -0600 |
| commit | f27722e2ce5ace1f24cd5708825dd5ca15f99eb5 (patch) | |
| tree | 230b82d435adca7dbef3efd8c46293bc37240d35 | |
| parent | 13bee4c83a03d3b058a5c67e1f1da7fc60c33ee3 (diff) | |
| download | tdesvn-f27722e2ce5ace1f24cd5708825dd5ca15f99eb5.tar.gz tdesvn-f27722e2ce5ace1f24cd5708825dd5ca15f99eb5.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
44 files changed, 407 insertions, 407 deletions
@@ -170,7 +170,7 @@ version 0.8.3 * fix: tdesvn wasn't able copy items from a specific revision (eg, restoring deleted items wasn't possible) version 0.8.2 - * fix: when creating dir in repository tdesvn/kio-ksvn asked twice for a logmessage + * fix: when creating dir in repository tdesvn/tdeio-ksvn asked twice for a logmessage * revision tree has context menues for diffs and detailed information * fix: log and info on repositories got sometimes wrong revisions to search for * added spain translation from Mario Palomo diff --git a/Helperstuff/BuildService/debian.changelog b/Helperstuff/BuildService/debian.changelog index 8f81ed3..8d18bdb 100644 --- a/Helperstuff/BuildService/debian.changelog +++ b/Helperstuff/BuildService/debian.changelog @@ -78,14 +78,14 @@ tdesvn (0.14.0-1) unstable; urgency=low * debian/tdesvn.menu - Change section to "Applications/Programming" to comply with the new menu spec. - * debian/patches/01-bashisms_kconf_update.patch - - Fix a bashism in the kconf_update script. + * debian/patches/01-bashisms_tdeconf_update.patch + - Fix a bashism in the tdeconf_update script. * debian/control - Use the new "Homepage:" field to specify the upstream URL. - SONAME bump, rename the libsvnqt3 package to libsvnqt4. * Rename libsvnqt3.install to libsvnqt4.install. * debian/tdesvn.install - - Install the kconf_update files. + - Install the tdeconf_update files. * debian/libsvnqt-dev.install - No longer install the libtool *.la files for libsvnqt. diff --git a/Helperstuff/BuildService/tdesvn.spec.in b/Helperstuff/BuildService/tdesvn.spec.in index 55405f6..84affd0 100644 --- a/Helperstuff/BuildService/tdesvn.spec.in +++ b/Helperstuff/BuildService/tdesvn.spec.in @@ -96,7 +96,7 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/* %{_datadir}/apps/tdesvn/* %{_datadir}/apps/tdesvnpart/* -%{_datadir}/apps/kconf_update/* +%{_datadir}/apps/tdeconf_update/* %{_datadir}/config.kcfg/* %{_datadir}/doc/* %{_datadir}/icons/* @@ -104,7 +104,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/*/kded_tdesvnd.* %{_datadir}/services/kded/tdesvnd.desktop %{_datadir}/apps/konqueror/servicemenus/tdesvn* -%{_libdir}/*/kio_ksvn* +%{_libdir}/*/tdeio_ksvn* %{_datadir}/services/ksvn*.protocol %{_datadir}/man/man1/* %{_libdir}/libsvnqt*.so* diff --git a/po/ca/tdesvn.po b/po/ca/tdesvn.po index b581af2..7832798 100644 --- a/po/ca/tdesvn.po +++ b/po/ca/tdesvn.po @@ -1591,40 +1591,40 @@ msgstr "Tria revisió" msgid "Default utf-8" msgstr "" -#: kiosvn/kiosvn.cpp:725 svnfrontend/svnactions.cpp:1010 +#: kiosvn/tdeiosvn.cpp:725 svnfrontend/svnactions.cpp:1010 #: svnfrontend/svnactions.cpp:2128 msgid "Committed revision %1." msgstr "S'ha entregat la revisió %1." -#: kiosvn/kiosvn.cpp:727 +#: kiosvn/tdeiosvn.cpp:727 msgid "Nothing to commit." msgstr "Encara no hi ha res per entregar." -#: kiosvn/kiosvn.cpp:771 +#: kiosvn/tdeiosvn.cpp:771 msgid "Empty logs" msgstr "Registre buit" -#: kiosvn/kiolistener.cpp:119 +#: kiosvn/tdeiolistener.cpp:119 msgid "A (bin) %1" msgstr "A (bin) %1" -#: kiosvn/kiolistener.cpp:121 kiosvn/kiolistener.cpp:155 +#: kiosvn/tdeiolistener.cpp:121 kiosvn/tdeiolistener.cpp:155 msgid "A %1" msgstr "A %1" -#: kiosvn/kiolistener.cpp:129 kiosvn/kiolistener.cpp:151 +#: kiosvn/tdeiolistener.cpp:129 kiosvn/tdeiolistener.cpp:151 msgid "D %1" msgstr "D %1" -#: kiosvn/kiolistener.cpp:132 +#: kiosvn/tdeiolistener.cpp:132 msgid "Restored %1." msgstr "S'ha restaurat %1." -#: kiosvn/kiolistener.cpp:135 +#: kiosvn/tdeiolistener.cpp:135 msgid "Reverted %1." msgstr "S'ha revertit %1." -#: kiosvn/kiolistener.cpp:138 +#: kiosvn/tdeiolistener.cpp:138 msgid "" "Failed to revert %1.\n" "Try updating instead." @@ -1632,67 +1632,67 @@ msgstr "" "Falla al revertir %1.\n" "Proveu a actualizar." -#: kiosvn/kiolistener.cpp:141 +#: kiosvn/tdeiolistener.cpp:141 msgid "Resolved conflicted state of %1." msgstr "S'ha resolt l'estat de conflicte de %1." -#: kiosvn/kiolistener.cpp:145 +#: kiosvn/tdeiolistener.cpp:145 msgid "Skipped missing target %1." msgstr "S'ha ignorat l'objectiu no existent %1." -#: kiosvn/kiolistener.cpp:147 +#: kiosvn/tdeiolistener.cpp:147 msgid "Skipped %1." msgstr "S'ha ignorat %1." -#: kiosvn/kiolistener.cpp:198 +#: kiosvn/tdeiolistener.cpp:198 msgid "Finished at revision %1." msgstr "Finalitzada a la revisió %1." -#: kiosvn/kiolistener.cpp:200 +#: kiosvn/tdeiolistener.cpp:200 msgid "Finished." msgstr "Finalitzat." -#: kiosvn/kiolistener.cpp:204 +#: kiosvn/tdeiolistener.cpp:204 msgid "Finished external at revision %1." msgstr "Externa finalitzada a la revisió %1." -#: kiosvn/kiolistener.cpp:206 +#: kiosvn/tdeiolistener.cpp:206 msgid "Finished external." msgstr "Externa finalitzada." -#: kiosvn/kiolistener.cpp:215 +#: kiosvn/tdeiolistener.cpp:215 msgid "Fetching external item into %1." msgstr "S'està obtenint l'ítem extern en %1." -#: kiosvn/kiolistener.cpp:219 +#: kiosvn/tdeiolistener.cpp:219 msgid "Status against revision: %1." msgstr "Estat respecte a la revisió: %1." -#: kiosvn/kiolistener.cpp:222 +#: kiosvn/tdeiolistener.cpp:222 msgid "Performing status on external item at %1." msgstr "S'està comprovant l'estat de l'ítem extern a %1." -#: kiosvn/kiolistener.cpp:225 +#: kiosvn/tdeiolistener.cpp:225 msgid "Sending %1." msgstr "S'està enviant %1." -#: kiosvn/kiolistener.cpp:229 +#: kiosvn/tdeiolistener.cpp:229 msgid "Adding (bin) %1." msgstr "S'està afegint (bin) %1." -#: kiosvn/kiolistener.cpp:231 +#: kiosvn/tdeiolistener.cpp:231 msgid "Adding %1." msgstr "S'està afegint %1." -#: kiosvn/kiolistener.cpp:235 +#: kiosvn/tdeiolistener.cpp:235 msgid "Deleting %1." msgstr "S'està eliminant %1." -#: kiosvn/kiolistener.cpp:238 +#: kiosvn/tdeiolistener.cpp:238 msgid "Replacing %1." msgstr "S'està substituint %1." -#: kiosvn/kiolistener.cpp:244 +#: kiosvn/tdeiolistener.cpp:244 msgid "Transmitting file data " msgstr "S'estan transmetent les dades del fitxer " diff --git a/po/cs/tdesvn.po b/po/cs/tdesvn.po index 9b36dce..36ba6dc 100644 --- a/po/cs/tdesvn.po +++ b/po/cs/tdesvn.po @@ -1492,40 +1492,40 @@ msgstr "Volba revize" msgid "Default utf-8" msgstr "" -#: kiosvn/kiosvn.cpp:725 svnfrontend/svnactions.cpp:1010 +#: kiosvn/tdeiosvn.cpp:725 svnfrontend/svnactions.cpp:1010 #: svnfrontend/svnactions.cpp:2128 msgid "Committed revision %1." msgstr "Odeslána revize %1." -#: kiosvn/kiosvn.cpp:727 +#: kiosvn/tdeiosvn.cpp:727 msgid "Nothing to commit." msgstr "Nic k odeslání." -#: kiosvn/kiosvn.cpp:771 +#: kiosvn/tdeiosvn.cpp:771 msgid "Empty logs" msgstr "Prázdné záznamy" -#: kiosvn/kiolistener.cpp:119 +#: kiosvn/tdeiolistener.cpp:119 msgid "A (bin) %1" msgstr "A (bin) %1" -#: kiosvn/kiolistener.cpp:121 kiosvn/kiolistener.cpp:155 +#: kiosvn/tdeiolistener.cpp:121 kiosvn/tdeiolistener.cpp:155 msgid "A %1" msgstr "A %1" -#: kiosvn/kiolistener.cpp:129 kiosvn/kiolistener.cpp:151 +#: kiosvn/tdeiolistener.cpp:129 kiosvn/tdeiolistener.cpp:151 msgid "D %1" msgstr "D %1" -#: kiosvn/kiolistener.cpp:132 +#: kiosvn/tdeiolistener.cpp:132 msgid "Restored %1." msgstr "Obnoveno %1." -#: kiosvn/kiolistener.cpp:135 +#: kiosvn/tdeiolistener.cpp:135 msgid "Reverted %1." msgstr "Vráceno %1." -#: kiosvn/kiolistener.cpp:138 +#: kiosvn/tdeiolistener.cpp:138 msgid "" "Failed to revert %1.\n" "Try updating instead." @@ -1533,71 +1533,71 @@ msgstr "" "Vrácení %1 selhalo.\n" "Pokuste se o aktualizaci." -#: kiosvn/kiolistener.cpp:141 +#: kiosvn/tdeiolistener.cpp:141 msgid "Resolved conflicted state of %1." msgstr "Vyřešen konfliktní stav %1." -#: kiosvn/kiolistener.cpp:145 +#: kiosvn/tdeiolistener.cpp:145 msgid "Skipped missing target %1." msgstr "Vynechán chybějící cíl %1." -#: kiosvn/kiolistener.cpp:147 +#: kiosvn/tdeiolistener.cpp:147 #, fuzzy msgid "Skipped %1." msgstr "Vynecháno %1." -#: kiosvn/kiolistener.cpp:198 +#: kiosvn/tdeiolistener.cpp:198 #, fuzzy msgid "Finished at revision %1." msgstr "Dokončeno na revizi %1" -#: kiosvn/kiolistener.cpp:200 +#: kiosvn/tdeiolistener.cpp:200 msgid "Finished." msgstr "Hotovo." -#: kiosvn/kiolistener.cpp:204 +#: kiosvn/tdeiolistener.cpp:204 #, fuzzy msgid "Finished external at revision %1." msgstr "Dokončeno na revizi %1" -#: kiosvn/kiolistener.cpp:206 +#: kiosvn/tdeiolistener.cpp:206 msgid "Finished external." msgstr "" -#: kiosvn/kiolistener.cpp:215 +#: kiosvn/tdeiolistener.cpp:215 msgid "Fetching external item into %1." msgstr "Získávám externí položku do %1." -#: kiosvn/kiolistener.cpp:219 +#: kiosvn/tdeiolistener.cpp:219 msgid "Status against revision: %1." msgstr "Stav oproti revizi: %1." -#: kiosvn/kiolistener.cpp:222 +#: kiosvn/tdeiolistener.cpp:222 msgid "Performing status on external item at %1." msgstr "Zjišťuji stav externí položky na %1." -#: kiosvn/kiolistener.cpp:225 +#: kiosvn/tdeiolistener.cpp:225 #, fuzzy msgid "Sending %1." msgstr "Posílám %1" -#: kiosvn/kiolistener.cpp:229 +#: kiosvn/tdeiolistener.cpp:229 msgid "Adding (bin) %1." msgstr "Přidávám (bin) %1." -#: kiosvn/kiolistener.cpp:231 +#: kiosvn/tdeiolistener.cpp:231 msgid "Adding %1." msgstr "Přidávám (%1)." -#: kiosvn/kiolistener.cpp:235 +#: kiosvn/tdeiolistener.cpp:235 msgid "Deleting %1." msgstr "Mažu %1." -#: kiosvn/kiolistener.cpp:238 +#: kiosvn/tdeiolistener.cpp:238 msgid "Replacing %1." msgstr "Nahrazuji %1." -#: kiosvn/kiolistener.cpp:244 +#: kiosvn/tdeiolistener.cpp:244 msgid "Transmitting file data " msgstr "Odesílají se data souborů " diff --git a/po/de/tdesvn.po b/po/de/tdesvn.po index 185f0e2..4b0edc0 100644 --- a/po/de/tdesvn.po +++ b/po/de/tdesvn.po @@ -1647,40 +1647,40 @@ msgstr "Wähle Kodierung:" msgid "Default utf-8" msgstr "Standard utf-8" -#: kiosvn/kiosvn.cpp:725 svnfrontend/svnactions.cpp:1010 +#: kiosvn/tdeiosvn.cpp:725 svnfrontend/svnactions.cpp:1010 #: svnfrontend/svnactions.cpp:2128 msgid "Committed revision %1." msgstr "Revision %1 gesendet." -#: kiosvn/kiosvn.cpp:727 +#: kiosvn/tdeiosvn.cpp:727 msgid "Nothing to commit." msgstr "Nichts zu senden." -#: kiosvn/kiosvn.cpp:771 +#: kiosvn/tdeiosvn.cpp:771 msgid "Empty logs" msgstr "Leere Logs." -#: kiosvn/kiolistener.cpp:119 +#: kiosvn/tdeiolistener.cpp:119 msgid "A (bin) %1" msgstr "A (bin) %1" -#: kiosvn/kiolistener.cpp:121 kiosvn/kiolistener.cpp:155 +#: kiosvn/tdeiolistener.cpp:121 kiosvn/tdeiolistener.cpp:155 msgid "A %1" msgstr "A %1" -#: kiosvn/kiolistener.cpp:129 kiosvn/kiolistener.cpp:151 +#: kiosvn/tdeiolistener.cpp:129 kiosvn/tdeiolistener.cpp:151 msgid "D %1" msgstr "D %1" -#: kiosvn/kiolistener.cpp:132 +#: kiosvn/tdeiolistener.cpp:132 msgid "Restored %1." msgstr "%1 wiederhergestellt." -#: kiosvn/kiolistener.cpp:135 +#: kiosvn/tdeiolistener.cpp:135 msgid "Reverted %1." msgstr "%1 rückgängig gemacht." -#: kiosvn/kiolistener.cpp:138 +#: kiosvn/tdeiolistener.cpp:138 msgid "" "Failed to revert %1.\n" "Try updating instead." @@ -1688,67 +1688,67 @@ msgstr "" "Konnte %1 nicht rückgängig machen.\n" "Versuchen Sie stattdessen \"update\"." -#: kiosvn/kiolistener.cpp:141 +#: kiosvn/tdeiolistener.cpp:141 msgid "Resolved conflicted state of %1." msgstr "Konfliktstatus von %1 aufgelöst." -#: kiosvn/kiolistener.cpp:145 +#: kiosvn/tdeiolistener.cpp:145 msgid "Skipped missing target %1." msgstr "Fehlendes Ziel %1 übersprungen." -#: kiosvn/kiolistener.cpp:147 +#: kiosvn/tdeiolistener.cpp:147 msgid "Skipped %1." msgstr "%1 übersprungen." -#: kiosvn/kiolistener.cpp:198 +#: kiosvn/tdeiolistener.cpp:198 msgid "Finished at revision %1." msgstr "Bei Revision %1 beendet." -#: kiosvn/kiolistener.cpp:200 +#: kiosvn/tdeiolistener.cpp:200 msgid "Finished." msgstr "Beendet." -#: kiosvn/kiolistener.cpp:204 +#: kiosvn/tdeiolistener.cpp:204 msgid "Finished external at revision %1." msgstr "Externe Referenz bei Revision %1 beendet." -#: kiosvn/kiolistener.cpp:206 +#: kiosvn/tdeiolistener.cpp:206 msgid "Finished external." msgstr "External beendet." -#: kiosvn/kiolistener.cpp:215 +#: kiosvn/tdeiolistener.cpp:215 msgid "Fetching external item into %1." msgstr "Hole externe Referenz nach %1." -#: kiosvn/kiolistener.cpp:219 +#: kiosvn/tdeiolistener.cpp:219 msgid "Status against revision: %1." msgstr "Status gegen Revision: %1." -#: kiosvn/kiolistener.cpp:222 +#: kiosvn/tdeiolistener.cpp:222 msgid "Performing status on external item at %1." msgstr "Führe Status auf externem Eintrag %1 aus." -#: kiosvn/kiolistener.cpp:225 +#: kiosvn/tdeiolistener.cpp:225 msgid "Sending %1." msgstr "Sende %1." -#: kiosvn/kiolistener.cpp:229 +#: kiosvn/tdeiolistener.cpp:229 msgid "Adding (bin) %1." msgstr "Füge %1 hinzu (bin)." -#: kiosvn/kiolistener.cpp:231 +#: kiosvn/tdeiolistener.cpp:231 msgid "Adding %1." msgstr "Füge %1 hinzu." -#: kiosvn/kiolistener.cpp:235 +#: kiosvn/tdeiolistener.cpp:235 msgid "Deleting %1." msgstr "Lösche %1." -#: kiosvn/kiolistener.cpp:238 +#: kiosvn/tdeiolistener.cpp:238 msgid "Replacing %1." msgstr "Ersetze %1." -#: kiosvn/kiolistener.cpp:244 +#: kiosvn/tdeiolistener.cpp:244 msgid "Transmitting file data " msgstr "Übertrage Dateidaten." diff --git a/po/es/tdesvn.po b/po/es/tdesvn.po index c7a237b..4d0ffea 100644 --- a/po/es/tdesvn.po +++ b/po/es/tdesvn.po @@ -1657,40 +1657,40 @@ msgstr "Seleccionar codificación:" msgid "Default utf-8" msgstr "Por defecto utf-8" -#: kiosvn/kiosvn.cpp:725 svnfrontend/svnactions.cpp:1010 +#: kiosvn/tdeiosvn.cpp:725 svnfrontend/svnactions.cpp:1010 #: svnfrontend/svnactions.cpp:2128 msgid "Committed revision %1." msgstr "Confirmada revisión %1." -#: kiosvn/kiosvn.cpp:727 +#: kiosvn/tdeiosvn.cpp:727 msgid "Nothing to commit." msgstr "Nada que confirmar." -#: kiosvn/kiosvn.cpp:771 +#: kiosvn/tdeiosvn.cpp:771 msgid "Empty logs" msgstr "Registros vacios" -#: kiosvn/kiolistener.cpp:119 +#: kiosvn/tdeiolistener.cpp:119 msgid "A (bin) %1" msgstr "A (bin) %1" -#: kiosvn/kiolistener.cpp:121 kiosvn/kiolistener.cpp:155 +#: kiosvn/tdeiolistener.cpp:121 kiosvn/tdeiolistener.cpp:155 msgid "A %1" msgstr "A %1" -#: kiosvn/kiolistener.cpp:129 kiosvn/kiolistener.cpp:151 +#: kiosvn/tdeiolistener.cpp:129 kiosvn/tdeiolistener.cpp:151 msgid "D %1" msgstr "D %1" -#: kiosvn/kiolistener.cpp:132 +#: kiosvn/tdeiolistener.cpp:132 msgid "Restored %1." msgstr "Restaurado %1" -#: kiosvn/kiolistener.cpp:135 +#: kiosvn/tdeiolistener.cpp:135 msgid "Reverted %1." msgstr "Revertido %1" -#: kiosvn/kiolistener.cpp:138 +#: kiosvn/tdeiolistener.cpp:138 msgid "" "Failed to revert %1.\n" "Try updating instead." @@ -1698,67 +1698,67 @@ msgstr "" "Fallo al revertir %1.\n" "Intente actualizar." -#: kiosvn/kiolistener.cpp:141 +#: kiosvn/tdeiolistener.cpp:141 msgid "Resolved conflicted state of %1." msgstr "Resuelto conflicto de %1." -#: kiosvn/kiolistener.cpp:145 +#: kiosvn/tdeiolistener.cpp:145 msgid "Skipped missing target %1." msgstr "Ignorado objetivo perdido %1." -#: kiosvn/kiolistener.cpp:147 +#: kiosvn/tdeiolistener.cpp:147 msgid "Skipped %1." msgstr "Ignorado %1." -#: kiosvn/kiolistener.cpp:198 +#: kiosvn/tdeiolistener.cpp:198 msgid "Finished at revision %1." msgstr "Finalizado en revisión %1." -#: kiosvn/kiolistener.cpp:200 +#: kiosvn/tdeiolistener.cpp:200 msgid "Finished." msgstr "Finalizado." -#: kiosvn/kiolistener.cpp:204 +#: kiosvn/tdeiolistener.cpp:204 msgid "Finished external at revision %1." msgstr "Finalizada definición externa en revisión %1." -#: kiosvn/kiolistener.cpp:206 +#: kiosvn/tdeiolistener.cpp:206 msgid "Finished external." msgstr "Finalizada definición externa." -#: kiosvn/kiolistener.cpp:215 +#: kiosvn/tdeiolistener.cpp:215 msgid "Fetching external item into %1." msgstr "Obteniendo elemento externo hacia %1." -#: kiosvn/kiolistener.cpp:219 +#: kiosvn/tdeiolistener.cpp:219 msgid "Status against revision: %1." msgstr "Estado frente a revisión: %1." -#: kiosvn/kiolistener.cpp:222 +#: kiosvn/tdeiolistener.cpp:222 msgid "Performing status on external item at %1." msgstr "Estableciendo estado en elemento externo en %1." -#: kiosvn/kiolistener.cpp:225 +#: kiosvn/tdeiolistener.cpp:225 msgid "Sending %1." msgstr "Enviando %1." -#: kiosvn/kiolistener.cpp:229 +#: kiosvn/tdeiolistener.cpp:229 msgid "Adding (bin) %1." msgstr "Añadiendo (bin) %1." -#: kiosvn/kiolistener.cpp:231 +#: kiosvn/tdeiolistener.cpp:231 msgid "Adding %1." msgstr "Añadiendo %1." -#: kiosvn/kiolistener.cpp:235 +#: kiosvn/tdeiolistener.cpp:235 msgid "Deleting %1." msgstr "Eliminando %1." -#: kiosvn/kiolistener.cpp:238 +#: kiosvn/tdeiolistener.cpp:238 msgid "Replacing %1." msgstr "Reemplazando %1." -#: kiosvn/kiolistener.cpp:244 +#: kiosvn/tdeiolistener.cpp:244 msgid "Transmitting file data " msgstr "Transmitiendo fichero de datos" diff --git a/po/fr/tdesvn.po b/po/fr/tdesvn.po index dd48557..af653e0 100644 --- a/po/fr/tdesvn.po +++ b/po/fr/tdesvn.po @@ -1697,40 +1697,40 @@ msgstr "Choisissez un encodage :" msgid "Default utf-8" msgstr "Par défaut utf-8" -#: kiosvn/kiosvn.cpp:725 svnfrontend/svnactions.cpp:1010 +#: kiosvn/tdeiosvn.cpp:725 svnfrontend/svnactions.cpp:1010 #: svnfrontend/svnactions.cpp:2128 msgid "Committed revision %1." msgstr "Propagation de la révision %1." -#: kiosvn/kiosvn.cpp:727 +#: kiosvn/tdeiosvn.cpp:727 msgid "Nothing to commit." msgstr "Rien à propager." -#: kiosvn/kiosvn.cpp:771 +#: kiosvn/tdeiosvn.cpp:771 msgid "Empty logs" msgstr "Journal vide" -#: kiosvn/kiolistener.cpp:119 +#: kiosvn/tdeiolistener.cpp:119 msgid "A (bin) %1" msgstr "A (bin) %1" -#: kiosvn/kiolistener.cpp:121 kiosvn/kiolistener.cpp:155 +#: kiosvn/tdeiolistener.cpp:121 kiosvn/tdeiolistener.cpp:155 msgid "A %1" msgstr "A %1" -#: kiosvn/kiolistener.cpp:129 kiosvn/kiolistener.cpp:151 +#: kiosvn/tdeiolistener.cpp:129 kiosvn/tdeiolistener.cpp:151 msgid "D %1" msgstr "D %1" -#: kiosvn/kiolistener.cpp:132 +#: kiosvn/tdeiolistener.cpp:132 msgid "Restored %1." msgstr "%1 restauré." -#: kiosvn/kiolistener.cpp:135 +#: kiosvn/tdeiolistener.cpp:135 msgid "Reverted %1." msgstr "%1 restauré à son état initial." -#: kiosvn/kiolistener.cpp:138 +#: kiosvn/tdeiolistener.cpp:138 msgid "" "Failed to revert %1.\n" "Try updating instead." @@ -1738,67 +1738,67 @@ msgstr "" "Échec de la restauration de %1 à son état initial.\n" "Essayer à la place une mise à jour." -#: kiosvn/kiolistener.cpp:141 +#: kiosvn/tdeiolistener.cpp:141 msgid "Resolved conflicted state of %1." msgstr "Conflit de %1 résolu." -#: kiosvn/kiolistener.cpp:145 +#: kiosvn/tdeiolistener.cpp:145 msgid "Skipped missing target %1." msgstr "Cible manquante %1 omise." -#: kiosvn/kiolistener.cpp:147 +#: kiosvn/tdeiolistener.cpp:147 msgid "Skipped %1." msgstr "%1 omis." -#: kiosvn/kiolistener.cpp:198 +#: kiosvn/tdeiolistener.cpp:198 msgid "Finished at revision %1." msgstr "Terminé à la révision %1." -#: kiosvn/kiolistener.cpp:200 +#: kiosvn/tdeiolistener.cpp:200 msgid "Finished." msgstr "Terminé." -#: kiosvn/kiolistener.cpp:204 +#: kiosvn/tdeiolistener.cpp:204 msgid "Finished external at revision %1." msgstr "Référence externe terminée à la révision %1." -#: kiosvn/kiolistener.cpp:206 +#: kiosvn/tdeiolistener.cpp:206 msgid "Finished external." msgstr "Référence externe terminée." -#: kiosvn/kiolistener.cpp:215 +#: kiosvn/tdeiolistener.cpp:215 msgid "Fetching external item into %1." msgstr "Récupère l'élément externe dans %1." -#: kiosvn/kiolistener.cpp:219 +#: kiosvn/tdeiolistener.cpp:219 msgid "Status against revision: %1." msgstr "Statut pour la révision : %1." -#: kiosvn/kiolistener.cpp:222 +#: kiosvn/tdeiolistener.cpp:222 msgid "Performing status on external item at %1." msgstr "Récupération du statut de l'élément externe %1." -#: kiosvn/kiolistener.cpp:225 +#: kiosvn/tdeiolistener.cpp:225 msgid "Sending %1." msgstr "Envoi de %1." -#: kiosvn/kiolistener.cpp:229 +#: kiosvn/tdeiolistener.cpp:229 msgid "Adding (bin) %1." msgstr "Ajout de (bin) %1." -#: kiosvn/kiolistener.cpp:231 +#: kiosvn/tdeiolistener.cpp:231 msgid "Adding %1." msgstr "Ajout de %1." -#: kiosvn/kiolistener.cpp:235 +#: kiosvn/tdeiolistener.cpp:235 msgid "Deleting %1." msgstr "Suppression de %1." -#: kiosvn/kiolistener.cpp:238 +#: kiosvn/tdeiolistener.cpp:238 msgid "Replacing %1." msgstr "Remplacement de %1." -#: kiosvn/kiolistener.cpp:244 +#: kiosvn/tdeiolistener.cpp:244 msgid "Transmitting file data " msgstr "Transmission des donnés du fichier" diff --git a/po/gl/tdesvn.po b/po/gl/tdesvn.po index 005e906..b92b11d 100644 --- a/po/gl/tdesvn.po +++ b/po/gl/tdesvn.po @@ -1599,40 +1599,40 @@ msgstr "Seleccionar revisión" msgid "Default utf-8" msgstr "" -#: kiosvn/kiosvn.cpp:725 svnfrontend/svnactions.cpp:1010 +#: kiosvn/tdeiosvn.cpp:725 svnfrontend/svnactions.cpp:1010 #: svnfrontend/svnactions.cpp:2128 msgid "Committed revision %1." msgstr "Enviada a revisión %1." -#: kiosvn/kiosvn.cpp:727 +#: kiosvn/tdeiosvn.cpp:727 msgid "Nothing to commit." msgstr "Nada para enviar." -#: kiosvn/kiosvn.cpp:771 +#: kiosvn/tdeiosvn.cpp:771 msgid "Empty logs" msgstr "Rexistos valeiros" -#: kiosvn/kiolistener.cpp:119 +#: kiosvn/tdeiolistener.cpp:119 msgid "A (bin) %1" msgstr "A (binario) %1" -#: kiosvn/kiolistener.cpp:121 kiosvn/kiolistener.cpp:155 +#: kiosvn/tdeiolistener.cpp:121 kiosvn/tdeiolistener.cpp:155 msgid "A %1" msgstr "A%1" -#: kiosvn/kiolistener.cpp:129 kiosvn/kiolistener.cpp:151 +#: kiosvn/tdeiolistener.cpp:129 kiosvn/tdeiolistener.cpp:151 msgid "D %1" msgstr "D %1" -#: kiosvn/kiolistener.cpp:132 +#: kiosvn/tdeiolistener.cpp:132 msgid "Restored %1." msgstr "%1 restaurado." -#: kiosvn/kiolistener.cpp:135 +#: kiosvn/tdeiolistener.cpp:135 msgid "Reverted %1." msgstr "%1 revertido." -#: kiosvn/kiolistener.cpp:138 +#: kiosvn/tdeiolistener.cpp:138 msgid "" "Failed to revert %1.\n" "Try updating instead." @@ -1640,67 +1640,67 @@ msgstr "" "Non foi posíbel reverter %1.\n" "Probe a actualizar no seu canto." -#: kiosvn/kiolistener.cpp:141 +#: kiosvn/tdeiolistener.cpp:141 msgid "Resolved conflicted state of %1." msgstr "Estado dos conflitos resoltos de %1." -#: kiosvn/kiolistener.cpp:145 +#: kiosvn/tdeiolistener.cpp:145 msgid "Skipped missing target %1." msgstr "Saltouse o obxectivo perdido %1." -#: kiosvn/kiolistener.cpp:147 +#: kiosvn/tdeiolistener.cpp:147 msgid "Skipped %1." msgstr "Saltouse %1." -#: kiosvn/kiolistener.cpp:198 +#: kiosvn/tdeiolistener.cpp:198 msgid "Finished at revision %1." msgstr "Terminouse na revisión %1." -#: kiosvn/kiolistener.cpp:200 +#: kiosvn/tdeiolistener.cpp:200 msgid "Finished." msgstr "Terminado." -#: kiosvn/kiolistener.cpp:204 +#: kiosvn/tdeiolistener.cpp:204 msgid "Finished external at revision %1." msgstr "Terminouse externamente na revisión %1." -#: kiosvn/kiolistener.cpp:206 +#: kiosvn/tdeiolistener.cpp:206 msgid "Finished external." msgstr "Terminouse externamente." -#: kiosvn/kiolistener.cpp:215 +#: kiosvn/tdeiolistener.cpp:215 msgid "Fetching external item into %1." msgstr "A obter o ítem externo para %1." -#: kiosvn/kiolistener.cpp:219 +#: kiosvn/tdeiolistener.cpp:219 msgid "Status against revision: %1." msgstr "Estado contra a revisión: %1." -#: kiosvn/kiolistener.cpp:222 +#: kiosvn/tdeiolistener.cpp:222 msgid "Performing status on external item at %1." msgstr "A obter o estado no ítem externo en %1." -#: kiosvn/kiolistener.cpp:225 +#: kiosvn/tdeiolistener.cpp:225 msgid "Sending %1." msgstr "A enviar %1." -#: kiosvn/kiolistener.cpp:229 +#: kiosvn/tdeiolistener.cpp:229 msgid "Adding (bin) %1." msgstr "A engadir (binario) %1." -#: kiosvn/kiolistener.cpp:231 +#: kiosvn/tdeiolistener.cpp:231 msgid "Adding %1." msgstr "A engadir %1." -#: kiosvn/kiolistener.cpp:235 +#: kiosvn/tdeiolistener.cpp:235 msgid "Deleting %1." msgstr "A eliminar %1." -#: kiosvn/kiolistener.cpp:238 +#: kiosvn/tdeiolistener.cpp:238 msgid "Replacing %1." msgstr "A substituír %1." -#: kiosvn/kiolistener.cpp:244 +#: kiosvn/tdeiolistener.cpp:244 msgid "Transmitting file data " msgstr "A transmitir ficheiro de dados" diff --git a/po/it/tdesvn.po b/po/it/tdesvn.po index fd76621..cf2bc4d 100644 --- a/po/it/tdesvn.po +++ b/po/it/tdesvn.po @@ -1641,41 +1641,41 @@ msgstr "Seleziona la revisione" msgid "Default utf-8" msgstr "" -#: kiosvn/kiosvn.cpp:725 svnfrontend/svnactions.cpp:1010 +#: kiosvn/tdeiosvn.cpp:725 svnfrontend/svnactions.cpp:1010 #: svnfrontend/svnactions.cpp:2128 msgid "Committed revision %1." msgstr "Depositata revisione %1." -#: kiosvn/kiosvn.cpp:727 +#: kiosvn/tdeiosvn.cpp:727 msgid "Nothing to commit." msgstr "Niente da depositare." -#: kiosvn/kiosvn.cpp:771 +#: kiosvn/tdeiosvn.cpp:771 msgid "Empty logs" msgstr "Registri vuoti" -#: kiosvn/kiolistener.cpp:119 +#: kiosvn/tdeiolistener.cpp:119 msgid "A (bin) %1" msgstr "A (bin) %1" -#: kiosvn/kiolistener.cpp:121 kiosvn/kiolistener.cpp:155 +#: kiosvn/tdeiolistener.cpp:121 kiosvn/tdeiolistener.cpp:155 msgid "A %1" msgstr "A %1" -#: kiosvn/kiolistener.cpp:129 kiosvn/kiolistener.cpp:151 +#: kiosvn/tdeiolistener.cpp:129 kiosvn/tdeiolistener.cpp:151 msgid "D %1" msgstr "D %1" # Differenza tra restore e revert: quali parole uso? Revert DEVE essere ripristinare (manuale di SVN) -#: kiosvn/kiolistener.cpp:132 +#: kiosvn/tdeiolistener.cpp:132 msgid "Restored %1." msgstr "%1 ripristinato." -#: kiosvn/kiolistener.cpp:135 +#: kiosvn/tdeiolistener.cpp:135 msgid "Reverted %1." msgstr "Modifiche di %1 annullate." -#: kiosvn/kiolistener.cpp:138 +#: kiosvn/tdeiolistener.cpp:138 msgid "" "Failed to revert %1.\n" "Try updating instead." @@ -1683,67 +1683,67 @@ msgstr "" "Annullamento delle modifiche di %1 non riuscito.\n" "Prova ad aggiornare." -#: kiosvn/kiolistener.cpp:141 +#: kiosvn/tdeiolistener.cpp:141 msgid "Resolved conflicted state of %1." msgstr "Stato di conflitto di %1 risolto." -#: kiosvn/kiolistener.cpp:145 +#: kiosvn/tdeiolistener.cpp:145 msgid "Skipped missing target %1." msgstr "Saltata destinazione mancante %1." -#: kiosvn/kiolistener.cpp:147 +#: kiosvn/tdeiolistener.cpp:147 msgid "Skipped %1." msgstr "Saltato %1." -#: kiosvn/kiolistener.cpp:198 +#: kiosvn/tdeiolistener.cpp:198 msgid "Finished at revision %1." msgstr "Completato alla revisione %1." -#: kiosvn/kiolistener.cpp:200 +#: kiosvn/tdeiolistener.cpp:200 msgid "Finished." msgstr "Completato." -#: kiosvn/kiolistener.cpp:204 +#: kiosvn/tdeiolistener.cpp:204 msgid "Finished external at revision %1." msgstr "Completato modulo esterno alla revisione %1." -#: kiosvn/kiolistener.cpp:206 +#: kiosvn/tdeiolistener.cpp:206 msgid "Finished external." msgstr "Completato modulo esterno." -#: kiosvn/kiolistener.cpp:215 +#: kiosvn/tdeiolistener.cpp:215 msgid "Fetching external item into %1." msgstr "Inserimento del modulo esterno in %1." -#: kiosvn/kiolistener.cpp:219 +#: kiosvn/tdeiolistener.cpp:219 msgid "Status against revision: %1." msgstr "Stato rispetto alla revisione: %1." -#: kiosvn/kiolistener.cpp:222 +#: kiosvn/tdeiolistener.cpp:222 msgid "Performing status on external item at %1." msgstr "Controllo di stato dell'elemento esterno %1." -#: kiosvn/kiolistener.cpp:225 +#: kiosvn/tdeiolistener.cpp:225 msgid "Sending %1." msgstr "Invio di %1." -#: kiosvn/kiolistener.cpp:229 +#: kiosvn/tdeiolistener.cpp:229 msgid "Adding (bin) %1." msgstr "Aggiunta di %1 (binario)." -#: kiosvn/kiolistener.cpp:231 +#: kiosvn/tdeiolistener.cpp:231 msgid "Adding %1." msgstr "Aggiunta di %1." -#: kiosvn/kiolistener.cpp:235 +#: kiosvn/tdeiolistener.cpp:235 msgid "Deleting %1." msgstr "Eliminazione di %1." -#: kiosvn/kiolistener.cpp:238 +#: kiosvn/tdeiolistener.cpp:238 msgid "Replacing %1." msgstr "Sostituzione di %1." -#: kiosvn/kiolistener.cpp:244 +#: kiosvn/tdeiolistener.cpp:244 msgid "Transmitting file data " msgstr "Invio dei dati del file " diff --git a/po/ja/tdesvn.po b/po/ja/tdesvn.po index b4fd100..e11920f 100644 --- a/po/ja/tdesvn.po +++ b/po/ja/tdesvn.po @@ -1606,40 +1606,40 @@ msgstr "エンコーディングを選択:" msgid "Default utf-8" msgstr "標準 utf-8" -#: kiosvn/kiosvn.cpp:725 svnfrontend/svnactions.cpp:1010 +#: kiosvn/tdeiosvn.cpp:725 svnfrontend/svnactions.cpp:1010 #: svnfrontend/svnactions.cpp:2128 msgid "Committed revision %1." msgstr "リビジョン %1 をコミットしました。" -#: kiosvn/kiosvn.cpp:727 +#: kiosvn/tdeiosvn.cpp:727 msgid "Nothing to commit." msgstr "コミットするものがありません。" -#: kiosvn/kiosvn.cpp:771 +#: kiosvn/tdeiosvn.cpp:771 msgid "Empty logs" msgstr "空のログ" -#: kiosvn/kiolistener.cpp:119 +#: kiosvn/tdeiolistener.cpp:119 msgid "A (bin) %1" msgstr "A（バイナリ）%1" -#: kiosvn/kiolistener.cpp:121 kiosvn/kiolistener.cpp:155 +#: kiosvn/tdeiolistener.cpp:121 kiosvn/tdeiolistener.cpp:155 msgid "A %1" msgstr "A %1" -#: kiosvn/kiolistener.cpp:129 kiosvn/kiolistener.cpp:151 +#: kiosvn/tdeiolistener.cpp:129 kiosvn/tdeiolistener.cpp:151 msgid "D %1" msgstr "D %1" -#: kiosvn/kiolistener.cpp:132 +#: kiosvn/tdeiolistener.cpp:132 msgid "Restored %1." msgstr "%1 を復元しました。" -#: kiosvn/kiolistener.cpp:135 +#: kiosvn/tdeiolistener.cpp:135 msgid "Reverted %1." msgstr "%1 を元に戻しました。" -#: kiosvn/kiolistener.cpp:138 +#: kiosvn/tdeiolistener.cpp:138 msgid "" "Failed to revert %1.\n" "Try updating instead." @@ -1647,67 +1647,67 @@ msgstr "" "%1 の復元に失敗しました。\n" "代わりに、アップデートを試してください。" -#: kiosvn/kiolistener.cpp:141 +#: kiosvn/tdeiolistener.cpp:141 msgid "Resolved conflicted state of %1." msgstr "%1 の衝突を解消しました。" -#: kiosvn/kiolistener.cpp:145 +#: kiosvn/tdeiolistener.cpp:145 msgid "Skipped missing target %1." msgstr "紛失したターゲット %1 をスキップしました。" -#: kiosvn/kiolistener.cpp:147 +#: kiosvn/tdeiolistener.cpp:147 msgid "Skipped %1." msgstr "%1 をスキップしました。" -#: kiosvn/kiolistener.cpp:198 +#: kiosvn/tdeiolistener.cpp:198 msgid "Finished at revision %1." msgstr "リビジョン %1 で完了しました。" -#: kiosvn/kiolistener.cpp:200 +#: kiosvn/tdeiolistener.cpp:200 msgid "Finished." msgstr "完了しました。" -#: kiosvn/kiolistener.cpp:204 +#: kiosvn/tdeiolistener.cpp:204 msgid "Finished external at revision %1." msgstr "リビジョン %1 で外部が完了しました。" -#: kiosvn/kiolistener.cpp:206 +#: kiosvn/tdeiolistener.cpp:206 msgid "Finished external." msgstr "外部が完了しました。" -#: kiosvn/kiolistener.cpp:215 +#: kiosvn/tdeiolistener.cpp:215 msgid "Fetching external item into %1." msgstr "%1 に外部の項目を取得しています。" -#: kiosvn/kiolistener.cpp:219 +#: kiosvn/tdeiolistener.cpp:219 msgid "Status against revision: %1." msgstr "リビジョン %1 に対するステータス。" -#: kiosvn/kiolistener.cpp:222 +#: kiosvn/tdeiolistener.cpp:222 msgid "Performing status on external item at %1." msgstr "%1 の外部の項目のステータスを実行しています。" -#: kiosvn/kiolistener.cpp:225 +#: kiosvn/tdeiolistener.cpp:225 msgid "Sending %1." msgstr "%1 を送信しています。" -#: kiosvn/kiolistener.cpp:229 +#: kiosvn/tdeiolistener.cpp:229 msgid "Adding (bin) %1." msgstr "%1（バイナリ）を追加しています。" -#: kiosvn/kiolistener.cpp:231 +#: kiosvn/tdeiolistener.cpp:231 msgid "Adding %1." msgstr "%1 を追加しています。" -#: kiosvn/kiolistener.cpp:235 +#: kiosvn/tdeiolistener.cpp:235 msgid "Deleting %1." msgstr "%1 を削除しています。" -#: kiosvn/kiolistener.cpp:238 +#: kiosvn/tdeiolistener.cpp:238 msgid "Replacing %1." msgstr "%1 を置換しています。" -#: kiosvn/kiolistener.cpp:244 +#: kiosvn/tdeiolistener.cpp:244 msgid "Transmitting file data " msgstr "ファイルデータを転送しています" diff --git a/po/lt/tdesvn.po b/po/lt/tdesvn.po index d51fcae..3dd292a 100644 --- a/po/lt/tdesvn.po +++ b/po/lt/tdesvn.po @@ -1490,108 +1490,108 @@ msgstr "Pasirinkite koduotę:" msgid "Default utf-8" msgstr "Numatyta utf-8" -#: kiosvn/kiosvn.cpp:725 svnfrontend/svnactions.cpp:1010 +#: kiosvn/tdeiosvn.cpp:725 svnfrontend/svnactions.cpp:1010 #: svnfrontend/svnactions.cpp:2128 msgid "Committed revision %1." msgstr "" -#: kiosvn/kiosvn.cpp:727 +#: kiosvn/tdeiosvn.cpp:727 msgid "Nothing to commit." msgstr "" -#: kiosvn/kiosvn.cpp:771 +#: kiosvn/tdeiosvn.cpp:771 msgid "Empty logs" msgstr "Tuščias žurnalas" -#: kiosvn/kiolistener.cpp:119 +#: kiosvn/tdeiolistener.cpp:119 msgid "A (bin) %1" msgstr "" -#: kiosvn/kiolistener.cpp:121 kiosvn/kiolistener.cpp:155 +#: kiosvn/tdeiolistener.cpp:121 kiosvn/tdeiolistener.cpp:155 msgid "A %1" msgstr "" -#: kiosvn/kiolistener.cpp:129 kiosvn/kiolistener.cpp:151 +#: kiosvn/tdeiolistener.cpp:129 kiosvn/tdeiolistener.cpp:151 msgid "D %1" msgstr "" -#: kiosvn/kiolistener.cpp:132 +#: kiosvn/tdeiolistener.cpp:132 msgid "Restored %1." msgstr "Atstatyta %1." -#: kiosvn/kiolistener.cpp:135 +#: kiosvn/tdeiolistener.cpp:135 msgid "Reverted %1." msgstr "" -#: kiosvn/kiolistener.cpp:138 +#: kiosvn/tdeiolistener.cpp:138 msgid "" "Failed to revert %1.\n" "Try updating instead." msgstr "" -#: kiosvn/kiolistener.cpp:141 +#: kiosvn/tdeiolistener.cpp:141 msgid "Resolved conflicted state of %1." msgstr "" -#: kiosvn/kiolistener.cpp:145 +#: kiosvn/tdeiolistener.cpp:145 msgid "Skipped missing target %1." msgstr "" -#: kiosvn/kiolistener.cpp:147 +#: kiosvn/tdeiolistener.cpp:147 msgid "Skipped %1." msgstr "" -#: kiosvn/kiolistener.cpp:198 +#: kiosvn/tdeiolistener.cpp:198 #, fuzzy msgid "Finished at revision %1." msgstr "Atnaujinti į reviziją %1." -#: kiosvn/kiolistener.cpp:200 +#: kiosvn/tdeiolistener.cpp:200 msgid "Finished." msgstr "Baigta." -#: kiosvn/kiolistener.cpp:204 +#: kiosvn/tdeiolistener.cpp:204 #, fuzzy msgid "Finished external at revision %1." msgstr "Atnaujinti į reviziją %1." -#: kiosvn/kiolistener.cpp:206 +#: kiosvn/tdeiolistener.cpp:206 msgid "Finished external." msgstr "" -#: kiosvn/kiolistener.cpp:215 +#: kiosvn/tdeiolistener.cpp:215 msgid "Fetching external item into %1." msgstr "" -#: kiosvn/kiolistener.cpp:219 +#: kiosvn/tdeiolistener.cpp:219 msgid "Status against revision: %1." msgstr "" -#: kiosvn/kiolistener.cpp:222 +#: kiosvn/tdeiolistener.cpp:222 msgid "Performing status on external item at %1." msgstr "" -#: kiosvn/kiolistener.cpp:225 +#: kiosvn/tdeiolistener.cpp:225 msgid "Sending %1." msgstr "Siunčiama %1." -#: kiosvn/kiolistener.cpp:229 +#: kiosvn/tdeiolistener.cpp:229 msgid "Adding (bin) %1." msgstr "Pridedama (bin) %1." -#: kiosvn/kiolistener.cpp:231 +#: kiosvn/tdeiolistener.cpp:231 msgid "Adding %1." msgstr "Pridedama %1." -#: kiosvn/kiolistener.cpp:235 +#: kiosvn/tdeiolistener.cpp:235 msgid "Deleting %1." msgstr "Šalinama %1." -#: kiosvn/kiolistener.cpp:238 +#: kiosvn/tdeiolistener.cpp:238 msgid "Replacing %1." msgstr "Pakeičiama %1." -#: kiosvn/kiolistener.cpp:244 +#: kiosvn/tdeiolistener.cpp:244 msgid "Transmitting file data " msgstr "Siunčiami failo duomenys" diff --git a/po/nl/tdesvn.po b/po/nl/tdesvn.po index 9e4cd12..adce7c2 100644 --- a/po/nl/tdesvn.po +++ b/po/nl/tdesvn.po @@ -1631,40 +1631,40 @@ msgstr "Codering instellen:" msgid "Default utf-8" msgstr "Standaard utf-8" -#: kiosvn/kiosvn.cpp:725 svnfrontend/svnactions.cpp:1010 +#: kiosvn/tdeiosvn.cpp:725 svnfrontend/svnactions.cpp:1010 #: svnfrontend/svnactions.cpp:2128 msgid "Committed revision %1." msgstr "Revisie %1 is vastgelegd." -#: kiosvn/kiosvn.cpp:727 +#: kiosvn/tdeiosvn.cpp:727 msgid "Nothing to commit." msgstr "Niets om vast te leggen." -#: kiosvn/kiosvn.cpp:771 +#: kiosvn/tdeiosvn.cpp:771 msgid "Empty logs" msgstr "Log legen" -#: kiosvn/kiolistener.cpp:119 +#: kiosvn/tdeiolistener.cpp:119 msgid "A (bin) %1" msgstr "A (bin) %1" -#: kiosvn/kiolistener.cpp:121 kiosvn/kiolistener.cpp:155 +#: kiosvn/tdeiolistener.cpp:121 kiosvn/tdeiolistener.cpp:155 msgid "A %1" msgstr "A %1" -#: kiosvn/kiolistener.cpp:129 kiosvn/kiolistener.cpp:151 +#: kiosvn/tdeiolistener.cpp:129 kiosvn/tdeiolistener.cpp:151 msgid "D %1" msgstr "D %1" -#: kiosvn/kiolistener.cpp:132 +#: kiosvn/tdeiolistener.cpp:132 msgid "Restored %1." msgstr "%1 hersteld." -#: kiosvn/kiolistener.cpp:135 +#: kiosvn/tdeiolistener.cpp:135 msgid "Reverted %1." msgstr "%1 ongedaan gemaakt." -#: kiosvn/kiolistener.cpp:138 +#: kiosvn/tdeiolistener.cpp:138 msgid "" "Failed to revert %1.\n" "Try updating instead." @@ -1672,67 +1672,67 @@ msgstr "" "Kon %1 niet ongedaan maken.\n" "Probeer het bij te werken." -#: kiosvn/kiolistener.cpp:141 +#: kiosvn/tdeiolistener.cpp:141 msgid "Resolved conflicted state of %1." msgstr "Conflictstatus van %1 opgelost." -#: kiosvn/kiolistener.cpp:145 +#: kiosvn/tdeiolistener.cpp:145 msgid "Skipped missing target %1." msgstr "Ontbrekend doel %1 overgeslagen." -#: kiosvn/kiolistener.cpp:147 +#: kiosvn/tdeiolistener.cpp:147 msgid "Skipped %1." msgstr "%1 overgeslagen." -#: kiosvn/kiolistener.cpp:198 +#: kiosvn/tdeiolistener.cpp:198 msgid "Finished at revision %1." msgstr "Voltooid op revisie %1." -#: kiosvn/kiolistener.cpp:200 +#: kiosvn/tdeiolistener.cpp:200 msgid "Finished." msgstr "Voltooid." -#: kiosvn/kiolistener.cpp:204 +#: kiosvn/tdeiolistener.cpp:204 msgid "Finished external at revision %1." msgstr "Voltooid op externe revisie %1." -#: kiosvn/kiolistener.cpp:206 +#: kiosvn/tdeiolistener.cpp:206 msgid "Finished external." msgstr "Voltooid (extern)." -#: kiosvn/kiolistener.cpp:215 +#: kiosvn/tdeiolistener.cpp:215 msgid "Fetching external item into %1." msgstr "Extern item ophalen in %1." -#: kiosvn/kiolistener.cpp:219 +#: kiosvn/tdeiolistener.cpp:219 msgid "Status against revision: %1." msgstr "Status ten opzichte van revisie %1." -#: kiosvn/kiolistener.cpp:222 +#: kiosvn/tdeiolistener.cpp:222 msgid "Performing status on external item at %1." msgstr "Status van extern item op %1." -#: kiosvn/kiolistener.cpp:225 +#: kiosvn/tdeiolistener.cpp:225 msgid "Sending %1." msgstr "%1 wordt verzonden." -#: kiosvn/kiolistener.cpp:229 +#: kiosvn/tdeiolistener.cpp:229 msgid "Adding (bin) %1." msgstr "%1 (bin) wordt toegevoegd." -#: kiosvn/kiolistener.cpp:231 +#: kiosvn/tdeiolistener.cpp:231 msgid "Adding %1." msgstr "%1 wordt toegevoegd." -#: kiosvn/kiolistener.cpp:235 +#: kiosvn/tdeiolistener.cpp:235 msgid "Deleting %1." msgstr "%1 wordt verwijderd." -#: kiosvn/kiolistener.cpp:238 +#: kiosvn/tdeiolistener.cpp:238 msgid "Replacing %1." msgstr "%1 wordt vervangen." -#: kiosvn/kiolistener.cpp:244 +#: kiosvn/tdeiolistener.cpp:244 msgid "Transmitting file data " msgstr "Bestandsgegevens worden verzonden" diff --git a/po/pa/tdesvn.po b/po/pa/tdesvn.po index f16e72f..436d084 100644 --- a/po/pa/tdesvn.po +++ b/po/pa/tdesvn.po @@ -1490,40 +1490,40 @@ msgstr "ਰੀਵਿਜ਼ਨ ਚੁਣੋ" msgid "Default utf-8" msgstr "" -#: kiosvn/kiosvn.cpp:725 svnfrontend/svnactions.cpp:1010 +#: kiosvn/tdeiosvn.cpp:725 svnfrontend/svnactions.cpp:1010 #: svnfrontend/svnactions.cpp:2128 msgid "Committed revision %1." msgstr "%1 ਰੀਵਿਜ਼ਨ ਕਮਿਟ ਕੀਤਾ ਹੈ।" -#: kiosvn/kiosvn.cpp:727 +#: kiosvn/tdeiosvn.cpp:727 msgid "Nothing to commit." msgstr "ਕਮਿਟ ਕਰਨ ਲਈ ਕੁਝ ਵੀ ਨਹੀਂ ਹੈ।" -#: kiosvn/kiosvn.cpp:771 +#: kiosvn/tdeiosvn.cpp:771 msgid "Empty logs" msgstr "ਖਾਲੀ ਲਾਗ" -#: kiosvn/kiolistener.cpp:119 +#: kiosvn/tdeiolistener.cpp:119 msgid "A (bin) %1" msgstr "A (bin) %1" -#: kiosvn/kiolistener.cpp:121 kiosvn/kiolistener.cpp:155 +#: kiosvn/tdeiolistener.cpp:121 kiosvn/tdeiolistener.cpp:155 msgid "A %1" msgstr "A %1" -#: kiosvn/kiolistener.cpp:129 kiosvn/kiolistener.cpp:151 +#: kiosvn/tdeiolistener.cpp:129 kiosvn/tdeiolistener.cpp:151 msgid "D %1" msgstr "D %1" -#: kiosvn/kiolistener.cpp:132 +#: kiosvn/tdeiolistener.cpp:132 msgid "Restored %1." msgstr "%1 ਮੁੜ-ਪਰਾਪਤ ਕੀਤੀ ਹੈ।" -#: kiosvn/kiolistener.cpp:135 +#: kiosvn/tdeiolistener.cpp:135 msgid "Reverted %1." msgstr "%1 ਮੁੜ-ਵਾਪਿਸ ਲਿਆ ਹੈ।" -#: kiosvn/kiolistener.cpp:138 +#: kiosvn/tdeiolistener.cpp:138 msgid "" "Failed to revert %1.\n" "Try updating instead." @@ -1531,67 +1531,67 @@ msgstr "" "%1 ਮੁੜ-ਵਾਪਸ ਲੈਣ ਲਈ ਅਸਫ਼ਲ ਹੈ\n" "ਇਸ ਦੀ ਬਜਾਏ ਅੱਪਡੇਟ ਦੀ ਕੋਸ਼ਿਸ਼ ਹੈ।" -#: kiosvn/kiolistener.cpp:141 +#: kiosvn/tdeiolistener.cpp:141 msgid "Resolved conflicted state of %1." msgstr "%1 ਦੀ ਅਪਵਾਦ ਹਾਲਤ ਠੀਕ ਕੀਤੀ ਗਈ ਹੈ।" -#: kiosvn/kiolistener.cpp:145 +#: kiosvn/tdeiolistener.cpp:145 msgid "Skipped missing target %1." msgstr "" -#: kiosvn/kiolistener.cpp:147 +#: kiosvn/tdeiolistener.cpp:147 msgid "Skipped %1." msgstr "%1 ਛੱਡੀ ਗਈ ਹੈ।" -#: kiosvn/kiolistener.cpp:198 +#: kiosvn/tdeiolistener.cpp:198 msgid "Finished at revision %1." msgstr "ਰੀਵਿਜ਼ਨ %1 ਲਈ ਮੁਕੰਮਲ ਕੀਤਾ।" -#: kiosvn/kiolistener.cpp:200 +#: kiosvn/tdeiolistener.cpp:200 msgid "Finished." msgstr "ਮੁਕੰਮਲ ਹੋਇਆ।" -#: kiosvn/kiolistener.cpp:204 +#: kiosvn/tdeiolistener.cpp:204 msgid "Finished external at revision %1." msgstr "ਰੀਵਿਜ਼ਨ %1 ਲਈ ਬਾਹਰੀ ਮੁਕੰਮਲ ਕੀਤਾ।" -#: kiosvn/kiolistener.cpp:206 +#: kiosvn/tdeiolistener.cpp:206 msgid "Finished external." msgstr "ਬਾਹਰੀ ਮੁਕੰਮਲ ਹੋਇਆ ਹੈ।" -#: kiosvn/kiolistener.cpp:215 +#: kiosvn/tdeiolistener.cpp:215 msgid "Fetching external item into %1." msgstr "" -#: kiosvn/kiolistener.cpp:219 +#: kiosvn/tdeiolistener.cpp:219 msgid "Status against revision: %1." msgstr "ਰੀਵਿਜ਼ਨ ਲਈ ਹਾਲਤ: %1" -#: kiosvn/kiolistener.cpp:222 +#: kiosvn/tdeiolistener.cpp:222 msgid "Performing status on external item at %1." msgstr "" -#: kiosvn/kiolistener.cpp:225 +#: kiosvn/tdeiolistener.cpp:225 msgid "Sending %1." msgstr "%1 ਭੇਜੀ ਜਾ ਰਹੀ ਹੈ।" -#: kiosvn/kiolistener.cpp:229 +#: kiosvn/tdeiolistener.cpp:229 msgid "Adding (bin) %1." msgstr "%1 ਜੋੜੀ ਜਾ ਰਹੀ ਹੈ (bin)।" -#: kiosvn/kiolistener.cpp:231 +#: kiosvn/tdeiolistener.cpp:231 msgid "Adding %1." msgstr "%1 ਜੋੜੀ ਜਾ ਰਹੀ ਹੈ।" -#: kiosvn/kiolistener.cpp:235 +#: kiosvn/tdeiolistener.cpp:235 msgid "Deleting %1." msgstr "%1 ਹਟਾਈ ਜਾ ਰਹੀ ਹੈ।" -#: kiosvn/kiolistener.cpp:238 +#: kiosvn/tdeiolistener.cpp:238 msgid "Replacing %1." msgstr "%1 ਤਬਦੀਲ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ।" -#: kiosvn/kiolistener.cpp:244 +#: kiosvn/tdeiolistener.cpp:244 msgid "Transmitting file data " msgstr "ਫਾਇਲ ਡਾਟਾ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ " diff --git a/po/ru/tdesvn.po b/po/ru/tdesvn.po index 5eec4c7..885c9f3 100644 --- a/po/ru/tdesvn.po +++ b/po/ru/tdesvn.po @@ -1488,108 +1488,108 @@ msgstr "Выберите кодировку" msgid "Default utf-8" msgstr "По умолчанию UTF-8" -#: kiosvn/kiosvn.cpp:725 svnfrontend/svnactions.cpp:1010 +#: kiosvn/tdeiosvn.cpp:725 svnfrontend/svnactions.cpp:1010 #: svnfrontend/svnactions.cpp:2128 msgid "Committed revision %1." msgstr "Изменения зафиксированы в %1-й правке." -#: kiosvn/kiosvn.cpp:727 +#: kiosvn/tdeiosvn.cpp:727 msgid "Nothing to commit." msgstr "Нет целей для публикации." -#: kiosvn/kiosvn.cpp:771 +#: kiosvn/tdeiosvn.cpp:771 msgid "Empty logs" msgstr "" -#: kiosvn/kiolistener.cpp:119 +#: kiosvn/tdeiolistener.cpp:119 msgid "A (bin) %1" msgstr "" -#: kiosvn/kiolistener.cpp:121 kiosvn/kiolistener.cpp:155 +#: kiosvn/tdeiolistener.cpp:121 kiosvn/tdeiolistener.cpp:155 msgid "A %1" msgstr "" -#: kiosvn/kiolistener.cpp:129 kiosvn/kiolistener.cpp:151 +#: kiosvn/tdeiolistener.cpp:129 kiosvn/tdeiolistener.cpp:151 msgid "D %1" msgstr "" -#: kiosvn/kiolistener.cpp:132 +#: kiosvn/tdeiolistener.cpp:132 msgid "Restored %1." msgstr "Восстановлен %1." -#: kiosvn/kiolistener.cpp:135 +#: kiosvn/tdeiolistener.cpp:135 msgid "Reverted %1." msgstr "Восстановлен %1." -#: kiosvn/kiolistener.cpp:138 +#: kiosvn/tdeiolistener.cpp:138 msgid "" "Failed to revert %1.\n" "Try updating instead." msgstr "" -#: kiosvn/kiolistener.cpp:141 +#: kiosvn/tdeiolistener.cpp:141 msgid "Resolved conflicted state of %1." msgstr "Разрешен конфликт %1." -#: kiosvn/kiolistener.cpp:145 +#: kiosvn/tdeiolistener.cpp:145 msgid "Skipped missing target %1." msgstr "" -#: kiosvn/kiolistener.cpp:147 +#: kiosvn/tdeiolistener.cpp:147 msgid "Skipped %1." msgstr "Пропущен %1." -#: kiosvn/kiolistener.cpp:198 +#: kiosvn/tdeiolistener.cpp:198 #, fuzzy msgid "Finished at revision %1." msgstr "Получена %1-я правка." -#: kiosvn/kiolistener.cpp:200 +#: kiosvn/tdeiolistener.cpp:200 msgid "Finished." msgstr "Готово." -#: kiosvn/kiolistener.cpp:204 +#: kiosvn/tdeiolistener.cpp:204 #, fuzzy msgid "Finished external at revision %1." msgstr "Удален в %1-й правке." -#: kiosvn/kiolistener.cpp:206 +#: kiosvn/tdeiolistener.cpp:206 msgid "Finished external." msgstr "" -#: kiosvn/kiolistener.cpp:215 +#: kiosvn/tdeiolistener.cpp:215 msgid "Fetching external item into %1." msgstr "" -#: kiosvn/kiolistener.cpp:219 +#: kiosvn/tdeiolistener.cpp:219 msgid "Status against revision: %1." msgstr "" -#: kiosvn/kiolistener.cpp:222 +#: kiosvn/tdeiolistener.cpp:222 msgid "Performing status on external item at %1." msgstr "" -#: kiosvn/kiolistener.cpp:225 +#: kiosvn/tdeiolistener.cpp:225 msgid "Sending %1." msgstr "Отправляем %1." -#: kiosvn/kiolistener.cpp:229 +#: kiosvn/tdeiolistener.cpp:229 msgid "Adding (bin) %1." msgstr "Добавляем (бин.) %1." -#: kiosvn/kiolistener.cpp:231 +#: kiosvn/tdeiolistener.cpp:231 msgid "Adding %1." msgstr "Добавляем %1." -#: kiosvn/kiolistener.cpp:235 +#: kiosvn/tdeiolistener.cpp:235 msgid "Deleting %1." msgstr "Удаляем %1." -#: kiosvn/kiolistener.cpp:238 +#: kiosvn/tdeiolistener.cpp:238 msgid "Replacing %1." msgstr "Заменяем %1." -#: kiosvn/kiolistener.cpp:244 +#: kiosvn/tdeiolistener.cpp:244 msgid "Transmitting file data " msgstr "Пересылка данных файла" diff --git a/po/sv/tdesvn.po b/po/sv/tdesvn.po index 9dfaec1..d3159e4 100644 --- a/po/sv/tdesvn.po +++ b/po/sv/tdesvn.po @@ -1534,40 +1534,40 @@ msgstr "Välj revision" msgid "Default utf-8" msgstr "" -#: kiosvn/kiosvn.cpp:725 svnfrontend/svnactions.cpp:1010 +#: kiosvn/tdeiosvn.cpp:725 svnfrontend/svnactions.cpp:1010 #: svnfrontend/svnactions.cpp:2128 msgid "Committed revision %1." msgstr "Tillförd revision %1." -#: kiosvn/kiosvn.cpp:727 +#: kiosvn/tdeiosvn.cpp:727 msgid "Nothing to commit." msgstr "Inget att tillföra." -#: kiosvn/kiosvn.cpp:771 +#: kiosvn/tdeiosvn.cpp:771 msgid "Empty logs" msgstr "Tomma loggar" -#: kiosvn/kiolistener.cpp:119 +#: kiosvn/tdeiolistener.cpp:119 msgid "A (bin) %1" msgstr "En (hög) %1" -#: kiosvn/kiolistener.cpp:121 kiosvn/kiolistener.cpp:155 +#: kiosvn/tdeiolistener.cpp:121 kiosvn/tdeiolistener.cpp:155 msgid "A %1" msgstr "A %1" -#: kiosvn/kiolistener.cpp:129 kiosvn/kiolistener.cpp:151 +#: kiosvn/tdeiolistener.cpp:129 kiosvn/tdeiolistener.cpp:151 msgid "D %1" msgstr "D %1" -#: kiosvn/kiolistener.cpp:132 +#: kiosvn/tdeiolistener.cpp:132 msgid "Restored %1." msgstr "Återställd %1." -#: kiosvn/kiolistener.cpp:135 +#: kiosvn/tdeiolistener.cpp:135 msgid "Reverted %1." msgstr "Omvänd %1." -#: kiosvn/kiolistener.cpp:138 +#: kiosvn/tdeiolistener.cpp:138 msgid "" "Failed to revert %1.\n" "Try updating instead." @@ -1575,71 +1575,71 @@ msgstr "" "Misslyckades med att gå tillbaka %1.\n" "Försök uppdatera i stället." -#: kiosvn/kiolistener.cpp:141 +#: kiosvn/tdeiolistener.cpp:141 msgid "Resolved conflicted state of %1." msgstr "Upplöst konflikttillstånd av %1." -#: kiosvn/kiolistener.cpp:145 +#: kiosvn/tdeiolistener.cpp:145 msgid "Skipped missing target %1." msgstr "Hoppar över missande mål %1." -#: kiosvn/kiolistener.cpp:147 +#: kiosvn/tdeiolistener.cpp:147 #, fuzzy msgid "Skipped %1." msgstr "Överhoppad %1." -#: kiosvn/kiolistener.cpp:198 +#: kiosvn/tdeiolistener.cpp:198 #, fuzzy msgid "Finished at revision %1." msgstr "Avslut vid revision %1" -#: kiosvn/kiolistener.cpp:200 +#: kiosvn/tdeiolistener.cpp:200 msgid "Finished." msgstr "Avslutat." -#: kiosvn/kiolistener.cpp:204 +#: kiosvn/tdeiolistener.cpp:204 #, fuzzy msgid "Finished external at revision %1." msgstr "Extern avslutning vid revision %1" -#: kiosvn/kiolistener.cpp:206 +#: kiosvn/tdeiolistener.cpp:206 msgid "Finished external." msgstr "Extern avslutat." -#: kiosvn/kiolistener.cpp:215 +#: kiosvn/tdeiolistener.cpp:215 msgid "Fetching external item into %1." msgstr "Hämtar externa poster in till %1." -#: kiosvn/kiolistener.cpp:219 +#: kiosvn/tdeiolistener.cpp:219 msgid "Status against revision: %1." msgstr "Status gentemot revision: %1." -#: kiosvn/kiolistener.cpp:222 +#: kiosvn/tdeiolistener.cpp:222 msgid "Performing status on external item at %1." msgstr "Genomför status hos extern post vid %1." -#: kiosvn/kiolistener.cpp:225 +#: kiosvn/tdeiolistener.cpp:225 #, fuzzy msgid "Sending %1." msgstr "Sänder %1" -#: kiosvn/kiolistener.cpp:229 +#: kiosvn/tdeiolistener.cpp:229 msgid "Adding (bin) %1." msgstr "Lägger till (hög) %1." -#: kiosvn/kiolistener.cpp:231 +#: kiosvn/tdeiolistener.cpp:231 msgid "Adding %1." msgstr "Lägger till %1." -#: kiosvn/kiolistener.cpp:235 +#: kiosvn/tdeiolistener.cpp:235 msgid "Deleting %1." msgstr "Tar bort %1." -#: kiosvn/kiolistener.cpp:238 +#: kiosvn/tdeiolistener.cpp:238 msgid "Replacing %1." msgstr "Byter ut %1." -#: kiosvn/kiolistener.cpp:244 +#: kiosvn/tdeiolistener.cpp:244 msgid "Transmitting file data " msgstr "Sänder fildata" diff --git a/po/tdesvn.pot b/po/tdesvn.pot index 3587f5c..ecf93e8 100644 --- a/po/tdesvn.pot +++ b/po/tdesvn.pot @@ -1487,106 +1487,106 @@ msgstr "" msgid "Default utf-8" msgstr "" -#: kiosvn/kiosvn.cpp:725 svnfrontend/svnactions.cpp:1010 +#: kiosvn/tdeiosvn.cpp:725 svnfrontend/svnactions.cpp:1010 #: svnfrontend/svnactions.cpp:2128 msgid "Committed revision %1." msgstr "" -#: kiosvn/kiosvn.cpp:727 +#: kiosvn/tdeiosvn.cpp:727 msgid "Nothing to commit." msgstr "" -#: kiosvn/kiosvn.cpp:771 +#: kiosvn/tdeiosvn.cpp:771 msgid "Empty logs" msgstr "" -#: kiosvn/kiolistener.cpp:119 +#: kiosvn/tdeiolistener.cpp:119 msgid "A (bin) %1" msgstr "" -#: kiosvn/kiolistener.cpp:121 kiosvn/kiolistener.cpp:155 +#: kiosvn/tdeiolistener.cpp:121 kiosvn/tdeiolistener.cpp:155 msgid "A %1" msgstr "" -#: kiosvn/kiolistener.cpp:129 kiosvn/kiolistener.cpp:151 +#: kiosvn/tdeiolistener.cpp:129 kiosvn/tdeiolistener.cpp:151 msgid "D %1" msgstr "" -#: kiosvn/kiolistener.cpp:132 +#: kiosvn/tdeiolistener.cpp:132 msgid "Restored %1." msgstr "" -#: kiosvn/kiolistener.cpp:135 +#: kiosvn/tdeiolistener.cpp:135 msgid "Reverted %1." msgstr "" -#: kiosvn/kiolistener.cpp:138 +#: kiosvn/tdeiolistener.cpp:138 msgid "" "Failed to revert %1.\n" "Try updating instead." msgstr "" -#: kiosvn/kiolistener.cpp:141 +#: kiosvn/tdeiolistener.cpp:141 msgid "Resolved conflicted state of %1." msgstr "" -#: kiosvn/kiolistener.cpp:145 +#: kiosvn/tdeiolistener.cpp:145 msgid "Skipped missing target %1." msgstr "" -#: kiosvn/kiolistener.cpp:147 +#: kiosvn/tdeiolistener.cpp:147 msgid "Skipped %1." msgstr "" -#: kiosvn/kiolistener.cpp:198 +#: kiosvn/tdeiolistener.cpp:198 msgid "Finished at revision %1." msgstr "" -#: kiosvn/kiolistener.cpp:200 +#: kiosvn/tdeiolistener.cpp:200 msgid "Finished." msgstr "" -#: kiosvn/kiolistener.cpp:204 +#: kiosvn/tdeiolistener.cpp:204 msgid "Finished external at revision %1." msgstr "" -#: kiosvn/kiolistener.cpp:206 +#: kiosvn/tdeiolistener.cpp:206 msgid "Finished external." msgstr "" -#: kiosvn/kiolistener.cpp:215 +#: kiosvn/tdeiolistener.cpp:215 msgid "Fetching external item into %1." msgstr "" -#: kiosvn/kiolistener.cpp:219 +#: kiosvn/tdeiolistener.cpp:219 msgid "Status against revision: %1." msgstr "" -#: kiosvn/kiolistener.cpp:222 +#: kiosvn/tdeiolistener.cpp:222 msgid "Performing status on external item at %1." msgstr "" -#: kiosvn/kiolistener.cpp:225 +#: kiosvn/tdeiolistener.cpp:225 msgid "Sending %1." msgstr "" -#: kiosvn/kiolistener.cpp:229 +#: kiosvn/tdeiolistener.cpp:229 msgid "Adding (bin) %1." msgstr "" -#: kiosvn/kiolistener.cpp:231 +#: kiosvn/tdeiolistener.cpp:231 msgid "Adding %1." msgstr "" -#: kiosvn/kiolistener.cpp:235 +#: kiosvn/tdeiolistener.cpp:235 msgid "Deleting %1." msgstr "" -#: kiosvn/kiolistener.cpp:238 +#: kiosvn/tdeiolistener.cpp:238 msgid "Replacing %1." msgstr "" -#: kiosvn/kiolistener.cpp:244 +#: kiosvn/tdeiolistener.cpp:244 msgid "Transmitting file data " msgstr "" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9587a94..3a949b4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -54,7 +54,7 @@ tde_add_executable( tdesvnaskpass AUTOMOC tde_add_executable( tdesvn AUTOMOC SOURCES main.cpp tdesvn.cpp urldlg.cpp commandline.cpp - LINK tdecore-shared tdeui-shared tdeparts-shared DCOP-shared kio-shared + LINK tdecore-shared tdeui-shared tdeparts-shared DCOP-shared tdeio-shared DESTINATION ${BIN_INSTALL_DIR} ) @@ -84,7 +84,7 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK tdecore-shared kio-shared tdeparts-shared tdeui-shared svnqt tdesvnhelpers tdesvnevents tdesvncfgreader ksvnwidgets svnfrontend + LINK tdecore-shared tdeio-shared tdeparts-shared tdeui-shared svnqt tdesvnhelpers tdesvnevents tdesvncfgreader ksvnwidgets svnfrontend DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -96,7 +96,7 @@ ADD_DEPENDENCIES(tdesvnpart-module svnfrontend-shared) tde_add_kpart( kded_tdesvnd AUTOMOC SOURCES tdesvnd/tdesvnd_dcop.cpp tdesvnd/tdesvnd_dcop.skel tdesvnd/tdesvnd_dcop.h - LINK svnqt ksvnwidgets tdesvnhelpers tdesvncfgreader tdecore-shared tdeui-shared DCOP-shared kio-shared tdeinit_kded-shared + LINK svnqt ksvnwidgets tdesvnhelpers tdesvncfgreader tdecore-shared tdeui-shared DCOP-shared tdeio-shared tdeinit_kded-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -180,7 +180,7 @@ tde_add_library( svnfrontend SHARED AUTOMOC commandline_part.cpp tdesvnview.cpp tdesvn_part.cpp - LINK svnqt tdecore-shared tdesvnhelpers tdesvnevents tdesvncfgreader tdeui-shared ksvnwidgets kio-shared tdeparts-shared + LINK svnqt tdecore-shared tdesvnhelpers tdesvnevents tdesvncfgreader tdeui-shared ksvnwidgets tdeio-shared tdeparts-shared DESTINATION ${LIB_INSTALL_DIR} ) @@ -197,7 +197,7 @@ tde_add_library( ksvnwidgets SHARED AUTOMOC ksvnwidgets/depthselector.cpp ksvnwidgets/revertform_impl.cpp ksvnwidgets/logmessage.ui ksvnwidgets/ssltrustprompt.ui ksvnwidgets/authdlg.ui ksvnwidgets/encodingselector.ui ksvnwidgets/depthform.ui ksvnwidgets/revertform.ui - LINK tdesvnhelpers tdesvncfgreader svnqt tdecore-shared tdeui-shared kio-shared + LINK tdesvnhelpers tdesvncfgreader svnqt tdecore-shared tdeui-shared tdeio-shared DESTINATION ${LIB_INSTALL_DIR} ) @@ -208,8 +208,8 @@ ADD_DEPENDENCIES(ksvnwidgets-shared tdesvnhelpers-shared) ##### kio_ksvn ################################## tde_add_kpart( kio_ksvn AUTOMOC - SOURCES kiosvn/kiosvn.cpp kiosvn/kiolistener.cpp kiosvn/kiobytestream.cpp ksvnwidgets/pwstorage.cpp - LINK svnqt tdesvnhelpers tdesvncfgreader tdecore-shared tdeui-shared DCOP-shared kio-shared + SOURCES kiosvn/tdeiosvn.cpp kiosvn/tdeiolistener.cpp kiosvn/tdeiobytestream.cpp ksvnwidgets/pwstorage.cpp + LINK svnqt tdesvnhelpers tdesvncfgreader tdecore-shared tdeui-shared DCOP-shared tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -46,7 +46,7 @@ http://developer.kde.org/documentation/tutorials/xmlui/preface.html them more maintainable. For more details, consult : -http://developer.kde.org/documentation/tutorials/kconfigxt/kconfigxt.html +http://developer.kde.org/documentation/tutorials/tdeconfigxt/tdeconfigxt.html * With KParts, you can embed other kde components in your program, or make your program embeddable in other apps. For example, the kmplayer kpart can be called to play videos diff --git a/src/helpers/ktranslateurl.cpp b/src/helpers/ktranslateurl.cpp index 037de88..35fd314 100644 --- a/src/helpers/ktranslateurl.cpp +++ b/src/helpers/ktranslateurl.cpp @@ -22,7 +22,7 @@ #include <kglobal.h> #include <kstandarddirs.h> #include <kdebug.h> -#include <kfileitem.h> +#include <tdefileitem.h> #include <kdesktopfile.h> #include <tqstringlist.h> diff --git a/src/kiosvn/kiobytestream.h b/src/kiosvn/kiobytestream.h index ce22af5..48addfe 100644 --- a/src/kiosvn/kiobytestream.h +++ b/src/kiosvn/kiobytestream.h @@ -22,7 +22,7 @@ #include "svnstream.hpp" -#include <kio/global.h> +#include <tdeio/global.h> #include <kmimetype.h> #include <kmimemagic.h> #include <tqbuffer.h> diff --git a/src/kiosvn/kiosvn.h b/src/kiosvn/kiosvn.h index 413a6a5..4766c60 100644 --- a/src/kiosvn/kiosvn.h +++ b/src/kiosvn/kiosvn.h @@ -26,8 +26,8 @@ #include <tqcstring.h> #include <kurl.h> -#include <kio/global.h> -#include <kio/slavebase.h> +#include <tdeio/global.h> +#include <tdeio/slavebase.h> #include <sys/stat.h> diff --git a/src/ksvnwidgets/diffbrowser.cpp b/src/ksvnwidgets/diffbrowser.cpp index 0c6c9a5..068165d 100644 --- a/src/ksvnwidgets/diffbrowser.cpp +++ b/src/ksvnwidgets/diffbrowser.cpp @@ -25,7 +25,7 @@ #include <kglobalsettings.h> #include <kglobal.h> #include <kdebug.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kmessagebox.h> #include <kapplication.h> #include <klocale.h> diff --git a/src/ksvnwidgets/logmsg_impl.cpp b/src/ksvnwidgets/logmsg_impl.cpp index f93cbec..41a197b 100644 --- a/src/ksvnwidgets/logmsg_impl.cpp +++ b/src/ksvnwidgets/logmsg_impl.cpp @@ -28,12 +28,12 @@ #include <kdebug.h> #include <kglobal.h> #include <kapp.h> -#include <kconfigbase.h> -#include <kconfig.h> +#include <tdeconfigbase.h> +#include <tdeconfig.h> #include <kurlrequesterdlg.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kmessagebox.h> -#include <kfile.h> +#include <tdefile.h> #include <kurlrequester.h> #include <tqvbox.h> diff --git a/src/ksvnwidgets/ssltrustprompt_impl.cpp b/src/ksvnwidgets/ssltrustprompt_impl.cpp index 2aca6b9..d55080b 100644 --- a/src/ksvnwidgets/ssltrustprompt_impl.cpp +++ b/src/ksvnwidgets/ssltrustprompt_impl.cpp @@ -27,8 +27,8 @@ #include <kdebug.h> #include <kglobal.h> #include <kapp.h> -#include <kconfigbase.h> -#include <kconfig.h> +#include <tdeconfigbase.h> +#include <tdeconfig.h> #include <kdialogbase.h> #include <ktextbrowser.h> diff --git a/src/settings/CMakeLists.txt b/src/settings/CMakeLists.txt index 8eb48e7..17a8899 100644 --- a/src/settings/CMakeLists.txt +++ b/src/settings/CMakeLists.txt @@ -27,8 +27,8 @@ link_directories( ##### data files ################################ install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/tdesvn_part.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) -install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/tdesvnpartrc-use-external.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update ) +install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/tdesvnpartrc-use-external.upd DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update ) install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/tdesvn-use-external-update.sh - DESTINATION ${DATA_INSTALL_DIR}/kconf_update + DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ ) diff --git a/src/settings/tdesvnsettings.kcfgc b/src/settings/tdesvnsettings.kcfgc index 4c60cf0..9eef7fb 100644 --- a/src/settings/tdesvnsettings.kcfgc +++ b/src/settings/tdesvnsettings.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=tdesvn_part.kcfg ClassName=Kdesvnsettings Singleton=true diff --git a/src/svnfrontend/ccontextlistener.cpp b/src/svnfrontend/ccontextlistener.cpp index 296a3bf..ab0090c 100644 --- a/src/svnfrontend/ccontextlistener.cpp +++ b/src/svnfrontend/ccontextlistener.cpp @@ -29,7 +29,7 @@ #include <kinputdialog.h> #include <kpassdlg.h> #include <kdebug.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <tqmap.h> #include <tqtextstream.h> diff --git a/src/svnfrontend/filelistviewitem.cpp b/src/svnfrontend/filelistviewitem.cpp index ba13f27..a7b3cf0 100644 --- a/src/svnfrontend/filelistviewitem.cpp +++ b/src/svnfrontend/filelistviewitem.cpp @@ -29,9 +29,9 @@ #include <klocale.h> #include <kiconloader.h> -#include <kfileitem.h> +#include <tdefileitem.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqfileinfo.h> #include <tqpainter.h> diff --git a/src/svnfrontend/fronthelpers/revisionbuttonimpl.cpp b/src/svnfrontend/fronthelpers/revisionbuttonimpl.cpp index e157153..534d0b9 100644 --- a/src/svnfrontend/fronthelpers/revisionbuttonimpl.cpp +++ b/src/svnfrontend/fronthelpers/revisionbuttonimpl.cpp @@ -23,7 +23,7 @@ #include <kpushbutton.h> #include <kdialog.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kapplication.h> #include <klocale.h> diff --git a/src/svnfrontend/graphtree/drawparams.cpp b/src/svnfrontend/graphtree/drawparams.cpp index 7a43dd5..afa9cb3 100644 --- a/src/svnfrontend/graphtree/drawparams.cpp +++ b/src/svnfrontend/graphtree/drawparams.cpp @@ -31,7 +31,7 @@ #include <tqpopupmenu.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include "drawparams.h" diff --git a/src/svnfrontend/graphtree/revgraphview.cpp b/src/svnfrontend/graphtree/revgraphview.cpp index fec18ba..a9fb8f5 100644 --- a/src/svnfrontend/graphtree/revgraphview.cpp +++ b/src/svnfrontend/graphtree/revgraphview.cpp @@ -31,7 +31,7 @@ #include <ktempdir.h> #include <kprocess.h> #include <klocale.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kmessagebox.h> #include <tqtooltip.h> diff --git a/src/svnfrontend/svnactions.cpp b/src/svnfrontend/svnactions.cpp index a36b9ef..ab64aa2 100644 --- a/src/svnfrontend/svnactions.cpp +++ b/src/svnfrontend/svnactions.cpp @@ -64,12 +64,12 @@ #include <ktempfile.h> #include <kdialogbase.h> #include <kapplication.h> -#include <kio/jobclasses.h> -#include <kio/job.h> +#include <tdeio/jobclasses.h> +#include <tdeio/job.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klistview.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kstandarddirs.h> #include <ktrader.h> #include <krun.h> diff --git a/src/svnfrontend/svnfiletip.cpp b/src/svnfrontend/svnfiletip.cpp index cc99182..acf7121 100644 --- a/src/svnfrontend/svnfiletip.cpp +++ b/src/svnfrontend/svnfiletip.cpp @@ -20,7 +20,7 @@ #include "svnfiletip.h" #include "svnitem.h" -#include <kfileitem.h> +#include <tdefileitem.h> #include <kglobalsettings.h> #include <kstandarddirs.h> #include <kapplication.h> diff --git a/src/svnfrontend/svnfiletip.h b/src/svnfrontend/svnfiletip.h index 2c20dcd..2b71b2d 100644 --- a/src/svnfrontend/svnfiletip.h +++ b/src/svnfrontend/svnfiletip.h @@ -26,7 +26,7 @@ #define SVNFILETIP_H #include <tqframe.h> #include <tqpixmap.h> -#include <kio/previewjob.h> +#include <tdeio/previewjob.h> class KFileItem; class TQLabel; diff --git a/src/svnfrontend/svnitem.cpp b/src/svnfrontend/svnitem.cpp index dee0435..b207ca1 100644 --- a/src/svnfrontend/svnitem.cpp +++ b/src/svnfrontend/svnitem.cpp @@ -33,7 +33,7 @@ #include <kiconloader.h> #include <kdebug.h> #include <kiconeffect.h> -#include <kfileitem.h> +#include <tdefileitem.h> #include <kdebug.h> #include <tqstring.h> diff --git a/src/svnfrontend/svnlogdlgimp.cpp b/src/svnfrontend/svnlogdlgimp.cpp index d3a7910..5bbf229 100644 --- a/src/svnfrontend/svnlogdlgimp.cpp +++ b/src/svnfrontend/svnlogdlgimp.cpp @@ -30,8 +30,8 @@ #include <kglobal.h> #include <klocale.h> #include <kapp.h> -#include <kconfigbase.h> -#include <kconfig.h> +#include <tdeconfigbase.h> +#include <tdeconfig.h> #include <ktabwidget.h> #include <kdebug.h> diff --git a/src/svnfrontend/tdesvnfilelist.cpp b/src/svnfrontend/tdesvnfilelist.cpp index 17deee8..4d6a301 100644 --- a/src/svnfrontend/tdesvnfilelist.cpp +++ b/src/svnfrontend/tdesvnfilelist.cpp @@ -50,13 +50,13 @@ #include <kmessagebox.h> #include <kdirselectdialog.h> #include <klineedit.h> -#include <kfileitem.h> +#include <tdefileitem.h> #include <kdialog.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kdebug.h> #include <kurldrag.h> #include <ktempfile.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <krun.h> #include <kurldrag.h> #include <ktrader.h> diff --git a/src/tdesvn.cpp b/src/tdesvn.cpp index 0b2a6cd..3bbb7fa 100644 --- a/src/tdesvn.cpp +++ b/src/tdesvn.cpp @@ -35,9 +35,9 @@ #include <tdeversion.h> #include <kstatusbar.h> #include <kaccel.h> -#include <kio/netaccess.h> -#include <kfiledialog.h> -#include <kconfig.h> +#include <tdeio/netaccess.h> +#include <tdefiledialog.h> +#include <tdeconfig.h> #include <kurl.h> #include <kurldrag.h> #include <kurlrequesterdlg.h> diff --git a/src/tdesvn_part.cpp b/src/tdesvn_part.cpp index ded660f..c8f1e11 100644 --- a/src/tdesvn_part.cpp +++ b/src/tdesvn_part.cpp @@ -36,13 +36,13 @@ #include <kinstance.h> #include <kaction.h> #include <kstdaction.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kdebug.h> #include <kbugreport.h> #include <kxmlguifactory.h> #include <kaboutapplication.h> #include <kapp.h> -#include <kconfigdialog.h> +#include <tdeconfigdialog.h> #include <kaboutdata.h> #include <klocale.h> diff --git a/src/tdesvnd/tdesvnd_dcop.cpp b/src/tdesvnd/tdesvnd_dcop.cpp index 9b4d598..13a852e 100644 --- a/src/tdesvnd/tdesvnd_dcop.cpp +++ b/src/tdesvnd/tdesvnd_dcop.cpp @@ -37,7 +37,7 @@ #include <kmessagebox.h> #include <klocale.h> #include <kglobal.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kpassdlg.h> #include <tqdir.h> diff --git a/src/urldlg.cpp b/src/urldlg.cpp index e7cc60d..537a634 100644 --- a/src/urldlg.cpp +++ b/src/urldlg.cpp @@ -21,7 +21,7 @@ #include <kcombobox.h> #include <kurlrequester.h> #include <tqlayout.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kglobal.h> #include <klineedit.h> diff --git a/tdesvn.spec b/tdesvn.spec index d13a4f8..3db7f9f 100644 --- a/tdesvn.spec +++ b/tdesvn.spec @@ -73,7 +73,7 @@ rm -rf $RPM_BUILD_DIR/tdesvn %{_datadir}/applications/* %{_datadir}/apps/tdesvn/* %{_datadir}/apps/tdesvnpart/* -%{_datadir}/apps/kconf_update/* +%{_datadir}/apps/tdeconf_update/* %{_datadir}/config.kcfg/* %{_datadir}/doc/* %{_datadir}/icons/* @@ -81,7 +81,7 @@ rm -rf $RPM_BUILD_DIR/tdesvn %{_libdir}/*/kded_tdesvnd.* %{_datadir}/services/kded/tdesvnd.desktop %{_datadir}/apps/konqueror/servicemenus/tdesvn* -%{_libdir}/*/kio_ksvn* +%{_libdir}/*/tdeio_ksvn* %{_datadir}/services/ksvn*.protocol %{_datadir}/man/man1/* %{_libdir}/libsvnqt*.so* diff --git a/tdesvn.spec.in b/tdesvn.spec.in index 01df37e..f20fbff 100644 --- a/tdesvn.spec.in +++ b/tdesvn.spec.in @@ -73,7 +73,7 @@ rm -rf $RPM_BUILD_DIR/tdesvn %{_datadir}/applications/* %{_datadir}/apps/tdesvn/* %{_datadir}/apps/tdesvnpart/* -%{_datadir}/apps/kconf_update/* +%{_datadir}/apps/tdeconf_update/* %{_datadir}/config.kcfg/* %{_datadir}/doc/* %{_datadir}/icons/* @@ -81,7 +81,7 @@ rm -rf $RPM_BUILD_DIR/tdesvn %{_libdir}/*/kded_tdesvnd.* %{_datadir}/services/kded/tdesvnd.desktop %{_datadir}/apps/konqueror/servicemenus/tdesvn* -%{_libdir}/*/kio_ksvn* +%{_libdir}/*/tdeio_ksvn* %{_datadir}/services/ksvn*.protocol %{_datadir}/man/man1/* %{_libdir}/libsvnqt*.so* |