Hello community, here is the log from the commit of package dolphin-plugins for openSUSE:Factory checked in at 2018-07-19 22:50:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dolphin-plugins (Old) and /work/SRC/openSUSE:Factory/.dolphin-plugins.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dolphin-plugins" Thu Jul 19 22:50:24 2018 rev:60 rq:622602 version:18.04.3 Changes: -------- --- /work/SRC/openSUSE:Factory/dolphin-plugins/dolphin-plugins.changes 2018-06-15 14:38:47.512766141 +0200 +++ /work/SRC/openSUSE:Factory/.dolphin-plugins.new/dolphin-plugins.changes 2018-07-19 22:50:26.806866036 +0200 @@ -1,0 +2,10 @@ +Fri Jul 13 04:49:47 UTC 2018 - [email protected] + +- Update to 18.04.3 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.04.3.php +- Changes since 18.04.2: + * None + +------------------------------------------------------------------- Old: ---- dolphin-plugins-18.04.2.tar.xz New: ---- dolphin-plugins-18.04.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dolphin-plugins.spec ++++++ --- /var/tmp/diff_new_pack.HtTLKG/_old 2018-07-19 22:50:27.410864064 +0200 +++ /var/tmp/diff_new_pack.HtTLKG/_new 2018-07-19 22:50:27.414864050 +0200 @@ -19,7 +19,7 @@ %bcond_without lang Name: dolphin-plugins -Version: 18.04.2 +Version: 18.04.3 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) ++++++ dolphin-plugins-18.04.2.tar.xz -> dolphin-plugins-18.04.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-plugins-18.04.2/po/nn/fileviewbazaarplugin.po new/dolphin-plugins-18.04.3/po/nn/fileviewbazaarplugin.po --- old/dolphin-plugins-18.04.2/po/nn/fileviewbazaarplugin.po 1970-01-01 01:00:00.000000000 +0100 +++ new/dolphin-plugins-18.04.3/po/nn/fileviewbazaarplugin.po 2018-07-10 02:11:32.000000000 +0200 @@ -0,0 +1,209 @@ +# Translation of fileviewbazaarplugin to Norwegian Nynorsk +# +# Karl Ove Hufthammer <[email protected]>, 2018. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n"; +"POT-Creation-Date: 2016-11-19 20:16+0100\n" +"PO-Revision-Date: 2018-06-19 18:21+0100\n" +"Last-Translator: Karl Ove Hufthammer <[email protected]>\n" +"Language-Team: Norwegian Nynorsk <[email protected]>\n" +"Language: nn\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 2.0\n" + +#: fileviewbazaarplugin.cpp:63 +#, kde-format +msgctxt "@item:inmenu" +msgid "Bazaar Update" +msgstr "Bazaar oppdater" + +#: fileviewbazaarplugin.cpp:69 +#, kde-format +msgctxt "@item:inmenu" +msgid "Bazaar Pull" +msgstr "Bazaar hent" + +#: fileviewbazaarplugin.cpp:75 +#, kde-format +msgctxt "@item:inmenu" +msgid "Bazaar Push" +msgstr "Bazaar send inn" + +#: fileviewbazaarplugin.cpp:81 +#, kde-format +msgctxt "@item:inmenu" +msgid "Show Local Bazaar Changes" +msgstr "Vis lokale Bazaar-endringar" + +#: fileviewbazaarplugin.cpp:87 +#, kde-format +msgctxt "@item:inmenu" +msgid "Bazaar Commit..." +msgstr "Bazaar meld inn …" + +#: fileviewbazaarplugin.cpp:93 +#, kde-format +msgctxt "@item:inmenu" +msgid "Bazaar Add..." +msgstr "Bazaar legg til …" + +#: fileviewbazaarplugin.cpp:99 +#, kde-format +msgctxt "@item:inmenu" +msgid "Bazaar Delete" +msgstr "Bazaar slett" + +#: fileviewbazaarplugin.cpp:105 +#, kde-format +msgctxt "@item:inmenu" +msgid "Bazaar Log" +msgstr "Bazaar logg" + +#: fileviewbazaarplugin.cpp:362 +#, kde-format +msgctxt "@info:status" +msgid "Updating Bazaar repository..." +msgstr "Oppdaterer Bazaar-depot …" + +#: fileviewbazaarplugin.cpp:363 +#, kde-format +msgctxt "@info:status" +msgid "Update of Bazaar repository failed." +msgstr "Feil ved oppdatering av Bazaar-depot." + +#: fileviewbazaarplugin.cpp:364 +#, kde-format +msgctxt "@info:status" +msgid "Updated Bazaar repository." +msgstr "Oppdaterte Bazaar-depotet." + +#: fileviewbazaarplugin.cpp:372 +#, kde-format +msgctxt "@info:status" +msgid "Pulling Bazaar repository..." +msgstr "Hentar Bazaar-depot …" + +#: fileviewbazaarplugin.cpp:373 +#, kde-format +msgctxt "@info:status" +msgid "Pull of Bazaar repository failed." +msgstr "Feil ved henting av Bazaar-depot." + +#: fileviewbazaarplugin.cpp:374 +#, kde-format +msgctxt "@info:status" +msgid "Pulled Bazaar repository." +msgstr "Henta Bazaar-depot." + +#: fileviewbazaarplugin.cpp:382 +#, kde-format +msgctxt "@info:status" +msgid "Pushing Bazaar repository..." +msgstr "Sender inn til Bazaar-depot …" + +#: fileviewbazaarplugin.cpp:383 +#, kde-format +msgctxt "@info:status" +msgid "Push of Bazaar repository failed." +msgstr "Feil ved innsending til Bazaar-depot." + +#: fileviewbazaarplugin.cpp:384 +#, kde-format +msgctxt "@info:status" +msgid "Pushed Bazaar repository." +msgstr "Sende inn til Bazaar-depot." + +#: fileviewbazaarplugin.cpp:390 +#, kde-format +msgctxt "@info:status" +msgid "Reviewing Changes..." +msgstr "Gjennomgår endringar …" + +#: fileviewbazaarplugin.cpp:391 +#, kde-format +msgctxt "@info:status" +msgid "Review Changes failed." +msgstr "Feil ved gjennomgang av endringar." + +#: fileviewbazaarplugin.cpp:392 +#, kde-format +msgctxt "@info:status" +msgid "Reviewed Changes." +msgstr "Gjennomgjekk endringar." + +#: fileviewbazaarplugin.cpp:398 +#, kde-format +msgctxt "@info:status" +msgid "Committing Bazaar changes..." +msgstr "Melder inn Bazaar-endringar …" + +#: fileviewbazaarplugin.cpp:399 +#, kde-format +msgctxt "@info:status" +msgid "Commit of Bazaar changes failed." +msgstr "Feil ved Bazaar-innmelding." + +#: fileviewbazaarplugin.cpp:400 +#, kde-format +msgctxt "@info:status" +msgid "Committed Bazaar changes." +msgstr "Melde inn Bazaar-endringar." + +#: fileviewbazaarplugin.cpp:406 +#, kde-format +msgctxt "@info:status" +msgid "Adding files to Bazaar repository..." +msgstr "Legg filer til Bazaar-depot …" + +#: fileviewbazaarplugin.cpp:407 +#, kde-format +msgctxt "@info:status" +msgid "Adding of files to Bazaar repository failed." +msgstr "Feil ved forsøk på å leggja filer til i Bazaar-depot." + +#: fileviewbazaarplugin.cpp:408 +#, kde-format +msgctxt "@info:status" +msgid "Added files to Bazaar repository." +msgstr "Legg filer til Bazaar-depot." + +#: fileviewbazaarplugin.cpp:414 +#, kde-format +msgctxt "@info:status" +msgid "Removing files from Bazaar repository..." +msgstr "Fjerner filer frå Bazaar-depot …" + +#: fileviewbazaarplugin.cpp:415 +#, kde-format +msgctxt "@info:status" +msgid "Removing of files from Bazaar repository failed." +msgstr "Feil ved fjerning av filer frå Bazaar-depot." + +#: fileviewbazaarplugin.cpp:416 +#, kde-format +msgctxt "@info:status" +msgid "Removed files from Bazaar repository." +msgstr "Fjerna filer frå Bazaar-depot." + +#: fileviewbazaarplugin.cpp:422 +#, kde-format +msgctxt "@info:status" +msgid "Running Bazaar Log..." +msgstr "Hentar ut Bazaar-logg …" + +#: fileviewbazaarplugin.cpp:423 +#, kde-format +msgctxt "@info:status" +msgid "Running Bazaar Log failed." +msgstr "Feil ved uthenting av Bazaar-logg." + +#: fileviewbazaarplugin.cpp:424 +#, kde-format +msgctxt "@info:status" +msgid "Bazaar Log closed." +msgstr "Bazaar-logg lukka." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-plugins-18.04.2/po/nn/fileviewgitplugin.po new/dolphin-plugins-18.04.3/po/nn/fileviewgitplugin.po --- old/dolphin-plugins-18.04.2/po/nn/fileviewgitplugin.po 1970-01-01 01:00:00.000000000 +0100 +++ new/dolphin-plugins-18.04.3/po/nn/fileviewgitplugin.po 2018-07-10 02:11:32.000000000 +0200 @@ -0,0 +1,533 @@ +# Translation of fileviewgitplugin to Norwegian Nynorsk +# +# Karl Ove Hufthammer <[email protected]>, 2018. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n"; +"POT-Creation-Date: 2018-02-10 03:18+0100\n" +"PO-Revision-Date: 2018-06-19 18:37+0100\n" +"Last-Translator: Karl Ove Hufthammer <[email protected]>\n" +"Language-Team: Norwegian Nynorsk <[email protected]>\n" +"Language: nn\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 2.0\n" + +#: checkoutdialog.cpp:40 +#, kde-kuit-format +msgctxt "@title:window" +msgid "<application>Git</application> Checkout" +msgstr "<application>Git</application> sjekk ut" + +#: checkoutdialog.cpp:43 +#, kde-format +msgctxt "@action:button" +msgid "Checkout" +msgstr "Sjekk ut" + +#: checkoutdialog.cpp:55 +#, kde-format +msgctxt "@option:radio Git Checkout" +msgid "Branch:" +msgstr "Grein:" + +#: checkoutdialog.cpp:62 +#, kde-format +msgctxt "@option:radio Git Checkout" +msgid "Tag:" +msgstr "Merkelapp:" + +#: checkoutdialog.cpp:71 pushdialog.cpp:78 +#, kde-format +msgctxt "@title:group" +msgid "Options" +msgstr "Val" + +#: checkoutdialog.cpp:76 +#, kde-format +msgctxt "@option:check" +msgid "Create New Branch: " +msgstr "Lag ny grein:" + +#: checkoutdialog.cpp:77 +#, kde-format +msgctxt "@info:tooltip" +msgid "Create a new branch based on a selected branch or tag." +msgstr "Lag ei ny grein basert på vald grein eller merkelapp." + +#: checkoutdialog.cpp:90 pushdialog.cpp:81 +#, kde-format +msgctxt "@option:check" +msgid "Force" +msgstr "Tving" + +#: checkoutdialog.cpp:91 +#, kde-format +msgctxt "@info:tooltip" +msgid "Discard local changes." +msgstr "Forkast lokale endringar." + +#: checkoutdialog.cpp:123 +#, kde-format +msgctxt "@info:tooltip" +msgid "There are no tags in this repository." +msgstr "Det finst ingen merkelappar i dette depotet." + +#: checkoutdialog.cpp:183 +#, kde-format +msgctxt "@title:group" +msgid "Branch Base" +msgstr "Greinbase" + +#: checkoutdialog.cpp:184 +#, kde-format +msgctxt "@title:group" +msgid "Checkout" +msgstr "Sjekk ut" + +#: checkoutdialog.cpp:203 +#, kde-format +msgctxt "@info:tooltip" +msgid "You must enter a valid name for the new branch first." +msgstr "Du må skriva inn eit gyldig namn den nye greina først." + +#: checkoutdialog.cpp:210 +#, kde-format +msgctxt "@info:tooltip" +msgid "A branch with the name '%1' already exists." +msgstr "Det finst alt ei grein som heiter «%1»." + +#: checkoutdialog.cpp:217 +#, kde-format +msgctxt "@info:tooltip" +msgid "Branch names may not contain any whitespace." +msgstr "Namn på greiner kan ikkje innehalda blankteikn." + +#: checkoutdialog.cpp:224 +#, kde-format +msgctxt "@info:tooltip" +msgid "You must select a valid branch first." +msgstr "Du må velja ei gyldig grein først." + +#: checkoutdialog.cpp:245 +#, kde-format +msgctxt "" +"@item:intext Prepended to the current branch name to get the default name " +"for a newly created branch" +msgid "branch" +msgstr "grein" + +#: commitdialog.cpp:37 +#, kde-kuit-format +msgctxt "@title:window" +msgid "<application>Git</application> Commit" +msgstr "<application>Git</application> meld inn" + +#: commitdialog.cpp:40 +#, kde-format +msgctxt "@action:button" +msgid "Commit" +msgstr "Meld inn" + +#: commitdialog.cpp:48 +#, kde-format +msgctxt "@title:group" +msgid "Commit message" +msgstr "Innmeldingsmelding" + +#: commitdialog.cpp:63 +#, kde-format +msgctxt "@option:check" +msgid "Amend last commit" +msgstr "Endra siste innmelding" + +#: commitdialog.cpp:69 +#, kde-format +msgctxt "@info:tooltip" +msgid "There is nothing to amend." +msgstr "Det finst ingenting å endra." + +#: commitdialog.cpp:76 +#, kde-format +msgctxt "@action:button Add Signed-Off line to the message widget" +msgid "Sign off" +msgstr "Signer" + +#: commitdialog.cpp:77 +#, kde-format +msgctxt "@info:tooltip" +msgid "Add Signed-off-by line at the end of the commit message." +msgstr "Legg til «Signed-off-by»-linje på slutten av innmeldingsmeldinga." + +#: commitdialog.cpp:133 +#, kde-format +msgctxt "@info:tooltip" +msgid "You must enter a commit message first." +msgstr "Du må skriva inn ei innmeldingsmelding først." + +#: fileviewgitplugin.cpp:61 +#, kde-kuit-format +msgid "<application>Git</application> Revert" +msgstr "<application>Git</application> tilbakestill" + +#: fileviewgitplugin.cpp:67 +#, kde-kuit-format +msgid "<application>Git</application> Add" +msgstr "<application>Git</application> legg til" + +#: fileviewgitplugin.cpp:73 +#, kde-kuit-format +msgid "Show Local <application>Git</application> Changes" +msgstr "Vis lokale <application>Git</application>-endringar" + +#: fileviewgitplugin.cpp:79 +#, kde-kuit-format +msgid "<application>Git</application> Remove" +msgstr "<application>Git</application> fjern" + +#: fileviewgitplugin.cpp:85 +#, kde-kuit-format +msgid "<application>Git</application> Checkout..." +msgstr "<application>Git</application> sjekk ut …" + +#: fileviewgitplugin.cpp:91 +#, kde-kuit-format +msgid "<application>Git</application> Commit..." +msgstr "<application>Git</application> meld inn …" + +#: fileviewgitplugin.cpp:97 +#, kde-kuit-format +msgid "<application>Git</application> Create Tag..." +msgstr "<application>Git</application> lag merkelapp …" + +#: fileviewgitplugin.cpp:102 +#, kde-kuit-format +msgid "<application>Git</application> Push..." +msgstr "<application>Git</application> send inn …" + +#: fileviewgitplugin.cpp:106 +#, kde-kuit-format +msgid "<application>Git</application> Pull..." +msgstr "<application>Git</application> hent …" + +#: fileviewgitplugin.cpp:111 +#, kde-kuit-format +msgid "<application>Git</application> Merge..." +msgstr "<application>Git</application> flett saman …" + +#: fileviewgitplugin.cpp:115 +#, kde-kuit-format +msgid "<application>Git</application> Log..." +msgstr "<application>Git</application> logg …" + +#: fileviewgitplugin.cpp:398 +#, kde-kuit-format +msgid "Adding files to <application>Git</application> repository..." +msgstr "Legg til filer i <application>Git</application>-depot …" + +#: fileviewgitplugin.cpp:399 +#, kde-kuit-format +msgid "Adding files to <application>Git</application> repository failed." +msgstr "Klarte ikkje leggja filer til <application>Git</application>-depot." + +#: fileviewgitplugin.cpp:400 +#, kde-kuit-format +msgid "Added files to <application>Git</application> repository." +msgstr "La til filer i <application>Git</application>-depot." + +#: fileviewgitplugin.cpp:409 +#, kde-kuit-format +msgid "Removing files from <application>Git</application> repository..." +msgstr "Fjernar filer frå <application>Git</application>-depot …" + +#: fileviewgitplugin.cpp:410 +#, kde-kuit-format +msgid "Removing files from <application>Git</application> repository failed." +msgstr "Feil ved fjerning av filer frå <application>Git</application>-depot." + +#: fileviewgitplugin.cpp:411 +#, kde-kuit-format +msgid "Removed files from <application>Git</application> repository." +msgstr "Fjerna filer frå <application>Git</application>-depot." + +#: fileviewgitplugin.cpp:417 +#, kde-kuit-format +msgid "Reverting files from <application>Git</application> repository..." +msgstr "Tilbakestiller filer frå <application>Git</application>-depot …" + +#: fileviewgitplugin.cpp:418 +#, kde-kuit-format +msgid "Reverting files from <application>Git</application> repository failed." +msgstr "" +"Feil ved tilbakestilling av filer frå <application>Git</application>-depot." + +#: fileviewgitplugin.cpp:419 +#, kde-kuit-format +msgid "Reverted files from <application>Git</application> repository." +msgstr "Tilbakestilte filer frå <application>Git</application>-depot." + +#: fileviewgitplugin.cpp:453 +#, kde-kuit-format +msgid "<application>Git</application> Log failed." +msgstr "Feil ved <application>Git</application>-logg." + +#: fileviewgitplugin.cpp:472 +#, kde-kuit-format +msgid "<application>Git</application> Log" +msgstr "<application>Git</application> logg" + +#: fileviewgitplugin.cpp:488 +#, kde-format +msgctxt "Git commit hash" +msgid "Commit" +msgstr "Innmelding" + +#: fileviewgitplugin.cpp:489 +#, kde-format +msgctxt "Git commit date" +msgid "Date" +msgstr "Dato" + +#: fileviewgitplugin.cpp:490 +#, kde-format +msgctxt "Git commit message" +msgid "Message" +msgstr "Melding" + +#: fileviewgitplugin.cpp:491 +#, kde-format +msgctxt "Git commit author" +msgid "Author" +msgstr "Opphavsperson" + +#: fileviewgitplugin.cpp:535 +#, kde-kuit-format +msgid "Switched to branch '%1'" +msgstr "Bytte til greina «%1»" + +#: fileviewgitplugin.cpp:541 +#, kde-kuit-format +msgid "HEAD is now at %1" +msgstr "HEAD er no ved %1" + +#: fileviewgitplugin.cpp:545 +#, kde-kuit-format +msgid "Switched to a new branch '%1'" +msgstr "Bytte til ny grein «%1»" + +#: fileviewgitplugin.cpp:556 +#, kde-kuit-format +msgid "" +"<application>Git</application> Checkout failed. Maybe your working directory " +"is dirty." +msgstr "" +"Feil ved <application>Git</application>-utsjekking. Det kan vera fordi " +"arbeidsmappa di ikkje er tom frå før." + +#: fileviewgitplugin.cpp:615 +#, kde-kuit-format +msgid "Successfully created tag '%1'" +msgstr "Lagde merkelappen «%1»" + +#: fileviewgitplugin.cpp:620 +#, kde-kuit-format +msgid "" +"<application>Git</application> tag creation failed. A tag with the name '%1' " +"already exists." +msgstr "" +"Feil ved laging av <application>Git</application>-merkelapp. Det finat alt " +"ein merkelapp med namn «%1»." + +#: fileviewgitplugin.cpp:622 +#, kde-kuit-format +msgid "<application>Git</application> tag creation failed." +msgstr "Feil ved laging av <application>Git</application>-merkelapp." + +#: fileviewgitplugin.cpp:634 +#, kde-kuit-format +msgid "Pushing branch %1 to %2:%3 failed." +msgstr "Feil ved innsending av grein %1 til %2:%3." + +#: fileviewgitplugin.cpp:636 +#, kde-kuit-format +msgid "Pushed branch %1 to %2:%3." +msgstr "Sende inn grein %1 til %2:%3." + +#: fileviewgitplugin.cpp:638 +#, kde-kuit-format +msgid "Pushing branch %1 to %2:%3..." +msgstr "Sender inn grein %1 til %2:%3 …" + +#: fileviewgitplugin.cpp:655 +#, kde-kuit-format +msgid "Pulling branch %1 from %2 failed." +msgstr "Feil ved henting av grein %1 frå %2." + +#: fileviewgitplugin.cpp:657 +#, kde-kuit-format +msgid "Pulled branch %1 from %2 successfully." +msgstr "Henta grein %1 frå %2." + +#: fileviewgitplugin.cpp:659 +#, kde-kuit-format +msgid "Pulling branch %1 from %2..." +msgstr "Hentar grein %1 frå %2 …" + +#: fileviewgitplugin.cpp:712 fileviewgitplugin.cpp:724 +#, kde-kuit-format +msgid "Branch is already up-to-date." +msgstr "Greina er alt oppdatert." + +#: fileviewgitplugin.cpp:728 +#, kde-kuit-format +msgid "Merge conflicts occurred. Fix them and commit the result." +msgstr "Det finst flettekonfliktar. Fiks dei og meld inn resultatet." + +#. i18n: ectx: label, entry (commitDialogHeight), group (CommitDialogSettings) +#: fileviewgitpluginsettings.kcfg:7 +#, kde-format +msgid "Dialog height" +msgstr "Vindaugshøgd" + +#. i18n: ectx: label, entry (commitDialogWidth), group (CommitDialogSettings) +#: fileviewgitpluginsettings.kcfg:12 +#, kde-format +msgid "Dialog width" +msgstr "Vindaugsbreidd" + +#: pulldialog.cpp:34 +#, kde-kuit-format +msgctxt "@title:window" +msgid "<application>Git</application> Pull" +msgstr "<application>Git</application> hent" + +#: pulldialog.cpp:37 +#, kde-format +msgctxt "@action:button" +msgid "Pull" +msgstr "Hent" + +#: pulldialog.cpp:45 +#, kde-format +msgctxt "@title:group The source to pull from" +msgid "Source" +msgstr "Kjelde" + +#: pulldialog.cpp:49 pushdialog.cpp:51 +#, kde-format +msgctxt "@label:listbox a git remote" +msgid "Remote:" +msgstr "Fjern:" + +#: pulldialog.cpp:54 +#, kde-format +msgctxt "@label:listbox" +msgid "Remote branch:" +msgstr "Fjerngrein:" + +#: pushdialog.cpp:35 +#, kde-kuit-format +msgctxt "@title:window" +msgid "<application>Git</application> Push" +msgstr "<application>Git</application> send inn" + +#: pushdialog.cpp:38 +#, kde-format +msgctxt "@action:button" +msgid "Push" +msgstr "Send inn" + +#: pushdialog.cpp:47 +#, kde-format +msgctxt "@title:group The remote host" +msgid "Destination" +msgstr "Mål" + +#: pushdialog.cpp:60 +#, kde-format +msgctxt "@title:group" +msgid "Branches" +msgstr "Greiner" + +#: pushdialog.cpp:64 +#, kde-format +msgctxt "@label:listbox" +msgid "Local Branch:" +msgstr "Lokal grein:" + +#: pushdialog.cpp:71 +#, kde-format +msgctxt "@label:listbox" +msgid "Remote Branch:" +msgstr "Fjerngrein:" + +#: pushdialog.cpp:82 +#, kde-format +msgctxt "@info:tooltip" +msgid "" +"Proceed even if the remote branch is not an ancestor of the local branch." +msgstr "" +"Hald fram sjølv om fjerngreina ikkje er ein forgjengar til den lokale greina." + +#: tagdialog.cpp:41 +#, kde-kuit-format +msgctxt "@title:window" +msgid "<application>Git</application> Create Tag" +msgstr "<application>Git</application> lag merkelapp" + +#: tagdialog.cpp:44 +#, kde-format +msgctxt "@action:button" +msgid "Create Tag" +msgstr "Lag merkelapp" + +#: tagdialog.cpp:52 +#, kde-format +msgctxt "@title:group" +msgid "Tag Information" +msgstr "Informasjon om merkelapp" + +#: tagdialog.cpp:56 +#, kde-format +msgctxt "@label:textbox" +msgid "Tag Name:" +msgstr "Merkelappnamn:" + +#: tagdialog.cpp:64 +#, kde-format +msgctxt "@label:textbox" +msgid "Tag Message:" +msgstr "Merkelappmelding:" + +#: tagdialog.cpp:74 +#, kde-format +msgctxt "@title:group" +msgid "Attach to" +msgstr "Legg ved" + +#: tagdialog.cpp:79 +#, kde-format +msgctxt "@label:listbox" +msgid "Branch:" +msgstr "Grein:" + +#: tagdialog.cpp:125 +#, kde-format +msgctxt "@info:tooltip" +msgid "You must enter a tag name first." +msgstr "Du må skriv inn eit merkelappnamn først." + +#: tagdialog.cpp:128 +#, kde-format +msgctxt "@info:tooltip" +msgid "Tag names may not contain any whitespace." +msgstr "Namn på merkelappar kan ikkje innehalda blankteikn." + +#: tagdialog.cpp:131 +#, kde-format +msgctxt "@info:tooltip" +msgid "A tag named '%1' already exists." +msgstr "Det finst alt ein merkelapp med namn «%1»." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-plugins-18.04.2/po/nn/fileviewsvnplugin.po new/dolphin-plugins-18.04.3/po/nn/fileviewsvnplugin.po --- old/dolphin-plugins-18.04.2/po/nn/fileviewsvnplugin.po 1970-01-01 01:00:00.000000000 +0100 +++ new/dolphin-plugins-18.04.3/po/nn/fileviewsvnplugin.po 2018-07-10 02:11:32.000000000 +0200 @@ -0,0 +1,179 @@ +# Translation of fileviewsvnplugin to Norwegian Nynorsk +# +# Karl Ove Hufthammer <[email protected]>, 2018. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n"; +"POT-Creation-Date: 2016-11-19 20:16+0100\n" +"PO-Revision-Date: 2018-06-19 18:15+0100\n" +"Last-Translator: Karl Ove Hufthammer <[email protected]>\n" +"Language-Team: Norwegian Nynorsk <[email protected]>\n" +"Language: nn\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 2.0\n" + +#: fileviewsvnplugin.cpp:64 +#, kde-format +msgctxt "@item:inmenu" +msgid "SVN Update" +msgstr "SVN oppdater" + +#: fileviewsvnplugin.cpp:70 +#, kde-format +msgctxt "@item:inmenu" +msgid "Show Local SVN Changes" +msgstr "Vis lokale SVN-endringar" + +#: fileviewsvnplugin.cpp:76 +#, kde-format +msgctxt "@item:inmenu" +msgid "SVN Commit..." +msgstr "SVN meld inn …" + +#: fileviewsvnplugin.cpp:82 +#, kde-format +msgctxt "@item:inmenu" +msgid "SVN Add" +msgstr "SVN legg til …" + +#: fileviewsvnplugin.cpp:88 +#, kde-format +msgctxt "@item:inmenu" +msgid "SVN Delete" +msgstr "SVN slett …" + +#: fileviewsvnplugin.cpp:94 +#, kde-format +msgctxt "@item:inmenu" +msgid "SVN Revert" +msgstr "SVN tilbakestill …" + +#: fileviewsvnplugin.cpp:100 +#, kde-format +msgctxt "@item:inmenu" +msgid "Show SVN Updates" +msgstr "Vis SVN-oppdateringar" + +#: fileviewsvnplugin.cpp:184 +#, kde-format +msgctxt "@info:status" +msgid "SVN status update failed. Disabling Option \"Show SVN Updates\"." +msgstr "Feil ved SVN-statusoppdatering. Slår av valet «Vis SVN-oppdateringar»." + +#: fileviewsvnplugin.cpp:294 +#, kde-format +msgctxt "@info:status" +msgid "Updating SVN repository..." +msgstr "Oppdaterer SVN-depot …" + +#: fileviewsvnplugin.cpp:295 +#, kde-format +msgctxt "@info:status" +msgid "Update of SVN repository failed." +msgstr "Feil ved oppdatering av SVN-depot." + +#: fileviewsvnplugin.cpp:296 +#, kde-format +msgctxt "@info:status" +msgid "Updated SVN repository." +msgstr "Oppdaterte SVN-depotet." + +#: fileviewsvnplugin.cpp:317 +#, kde-format +msgctxt "@label" +msgid "Description:" +msgstr "Skildring:" + +#: fileviewsvnplugin.cpp:323 +#, kde-format +msgctxt "@title:window" +msgid "SVN Commit" +msgstr "SVN meld inn" + +#: fileviewsvnplugin.cpp:326 +#, kde-format +msgctxt "@action:button" +msgid "Commit" +msgstr "Meld inn" + +#: fileviewsvnplugin.cpp:338 fileviewsvnplugin.cpp:351 +#, kde-format +msgctxt "@info:status" +msgid "Commit of SVN changes failed." +msgstr "Feil ved SVN-innmelding." + +#: fileviewsvnplugin.cpp:350 +#, kde-format +msgctxt "@info:status" +msgid "Committing SVN changes..." +msgstr "Melder inn SVN-endringar …" + +#: fileviewsvnplugin.cpp:352 +#, kde-format +msgctxt "@info:status" +msgid "Committed SVN changes." +msgstr "Melde inn SVN-endringar." + +#: fileviewsvnplugin.cpp:361 +#, kde-format +msgctxt "@info:status" +msgid "Adding files to SVN repository..." +msgstr "Legg filer til SVN-depot …" + +#: fileviewsvnplugin.cpp:362 +#, kde-format +msgctxt "@info:status" +msgid "Adding of files to SVN repository failed." +msgstr "Feil ved forsøk på å leggja filer til i SVN-depot." + +#: fileviewsvnplugin.cpp:363 +#, kde-format +msgctxt "@info:status" +msgid "Added files to SVN repository." +msgstr "Lagde filer til SVN-depot." + +#: fileviewsvnplugin.cpp:369 +#, kde-format +msgctxt "@info:status" +msgid "Removing files from SVN repository..." +msgstr "Fjernar filer frå SVN-depot …" + +#: fileviewsvnplugin.cpp:370 +#, kde-format +msgctxt "@info:status" +msgid "Removing of files from SVN repository failed." +msgstr "Feil ved fjerning av filer frå SVN-depot." + +#: fileviewsvnplugin.cpp:371 +#, kde-format +msgctxt "@info:status" +msgid "Removed files from SVN repository." +msgstr "Fjerna filer frå SVN-depot." + +#: fileviewsvnplugin.cpp:377 +#, kde-format +msgctxt "@info:status" +msgid "Reverting files from SVN repository..." +msgstr "Tilbakestiller filer frå SVN-depot …" + +#: fileviewsvnplugin.cpp:378 +#, kde-format +msgctxt "@info:status" +msgid "Reverting of files from SVN repository failed." +msgstr "Feil ved tilbakestilling av filer frå SVN-depot." + +#: fileviewsvnplugin.cpp:379 +#, kde-format +msgctxt "@info:status" +msgid "Reverted files from SVN repository." +msgstr "Tilbakestilte filer frå SVN-depot." + +#. i18n: ectx: label, entry (showUpdates), group (General) +#: fileviewsvnpluginsettings.kcfg:7 +#, kde-format +msgid "Show updates" +msgstr "Vis oppdateringar" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-plugins-18.04.2/po/zh_CN/fileviewbazaarplugin.po new/dolphin-plugins-18.04.3/po/zh_CN/fileviewbazaarplugin.po --- old/dolphin-plugins-18.04.2/po/zh_CN/fileviewbazaarplugin.po 2018-06-05 02:59:04.000000000 +0200 +++ new/dolphin-plugins-18.04.3/po/zh_CN/fileviewbazaarplugin.po 2018-07-10 02:11:33.000000000 +0200 @@ -7,7 +7,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2016-11-19 20:16+0100\n" -"PO-Revision-Date: 2018-05-18 06:33-0400\n" +"PO-Revision-Date: 2018-07-03 17:42\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-plugins-18.04.2/po/zh_CN/fileviewgitplugin.po new/dolphin-plugins-18.04.3/po/zh_CN/fileviewgitplugin.po --- old/dolphin-plugins-18.04.2/po/zh_CN/fileviewgitplugin.po 2018-06-05 02:59:04.000000000 +0200 +++ new/dolphin-plugins-18.04.3/po/zh_CN/fileviewgitplugin.po 2018-07-10 02:11:33.000000000 +0200 @@ -9,7 +9,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-02-10 03:18+0100\n" -"PO-Revision-Date: 2018-05-18 06:33-0400\n" +"PO-Revision-Date: 2018-07-03 17:42\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" @@ -222,12 +222,12 @@ #: fileviewgitplugin.cpp:111 #, kde-kuit-format msgid "<application>Git</application> Merge..." -msgstr "" +msgstr "<application>Git</application> 合并..." #: fileviewgitplugin.cpp:115 #, kde-kuit-format msgid "<application>Git</application> Log..." -msgstr "" +msgstr "<application>Git</application> 日志..." #: fileviewgitplugin.cpp:398 #, kde-kuit-format @@ -277,12 +277,12 @@ #: fileviewgitplugin.cpp:453 #, kde-kuit-format msgid "<application>Git</application> Log failed." -msgstr "" +msgstr "<application>Git</application> 获取日志失败。" #: fileviewgitplugin.cpp:472 #, kde-kuit-format msgid "<application>Git</application> Log" -msgstr "" +msgstr "<application>Git</application> 日志" #: fileviewgitplugin.cpp:488 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-plugins-18.04.2/po/zh_CN/fileviewhgplugin.po new/dolphin-plugins-18.04.3/po/zh_CN/fileviewhgplugin.po --- old/dolphin-plugins-18.04.2/po/zh_CN/fileviewhgplugin.po 2018-06-05 02:59:03.000000000 +0200 +++ new/dolphin-plugins-18.04.3/po/zh_CN/fileviewhgplugin.po 2018-07-10 02:11:33.000000000 +0200 @@ -9,7 +9,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-05-01 02:48+0200\n" -"PO-Revision-Date: 2018-05-18 06:33-0400\n" +"PO-Revision-Date: 2018-07-03 17:42\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dolphin-plugins-18.04.2/po/zh_CN/fileviewsvnplugin.po new/dolphin-plugins-18.04.3/po/zh_CN/fileviewsvnplugin.po --- old/dolphin-plugins-18.04.2/po/zh_CN/fileviewsvnplugin.po 2018-06-05 02:59:04.000000000 +0200 +++ new/dolphin-plugins-18.04.3/po/zh_CN/fileviewsvnplugin.po 2018-07-10 02:11:33.000000000 +0200 @@ -8,7 +8,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2016-11-19 20:16+0100\n" -"PO-Revision-Date: 2018-05-18 06:33-0400\n" +"PO-Revision-Date: 2018-07-03 17:42\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n"
