Hello community, here is the log from the commit of package kompare for openSUSE:Factory checked in at 2017-05-22 10:41:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kompare (Old) and /work/SRC/openSUSE:Factory/.kompare.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kompare" Mon May 22 10:41:36 2017 rev:51 rq:495982 version:17.04.1 Changes: -------- --- /work/SRC/openSUSE:Factory/kompare/kompare.changes 2017-05-08 18:53:51.689719758 +0200 +++ /work/SRC/openSUSE:Factory/.kompare.new/kompare.changes 2017-05-22 10:41:37.618451559 +0200 @@ -1,0 +2,10 @@ +Wed May 17 20:36:40 CEST 2017 - [email protected] + +- Update to 17.04.1 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.04.1.php +- Changes since 17.04.0: + * None + +------------------------------------------------------------------- Old: ---- kompare-17.04.0.tar.xz New: ---- kompare-17.04.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kompare.spec ++++++ --- /var/tmp/diff_new_pack.H4D3xD/_old 2017-05-22 10:41:38.258361332 +0200 +++ /var/tmp/diff_new_pack.H4D3xD/_new 2017-05-22 10:41:38.262360769 +0200 @@ -18,7 +18,7 @@ %bcond_without lang Name: kompare -Version: 17.04.0 +Version: 17.04.1 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA) ++++++ kompare-17.04.0.tar.xz -> kompare-17.04.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-17.04.0/po/nb/kompare.po new/kompare-17.04.1/po/nb/kompare.po --- old/kompare-17.04.0/po/nb/kompare.po 2017-04-14 02:18:26.000000000 +0200 +++ new/kompare-17.04.1/po/nb/kompare.po 2017-05-09 02:23:55.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-01-30 03:56+0100\n" +"POT-Creation-Date: 2017-03-19 02:42+0100\n" "PO-Revision-Date: 2013-04-08 21:44+0200\n" "Last-Translator: Bjørn Steensrud <[email protected]>\n" "Language-Team: Norwegian Bokmål <[email protected]>\n" @@ -264,7 +264,7 @@ msgstr[1] "Slettet %1 linjer" #: komparenavtreepart/komparenavtreepart.cpp:629 -#: komparepart/kompare_part.cpp:869 +#: komparepart/kompare_part.cpp:870 #, kde-format msgid "Unknown" msgstr "Ukjent" @@ -275,137 +275,137 @@ msgstr "KompareNavTreePart" #: komparenavtreepart/komparenavtreepart.cpp:770 -#: komparepart/kompare_part.cpp:649 main.cpp:78 +#: komparepart/kompare_part.cpp:650 main.cpp:78 #, kde-format msgid "John Firebaugh" msgstr "John Firebaugh" #: komparenavtreepart/komparenavtreepart.cpp:770 #: komparenavtreepart/komparenavtreepart.cpp:771 -#: komparepart/kompare_part.cpp:649 komparepart/kompare_part.cpp:650 -#: komparepart/kompare_part.cpp:651 main.cpp:78 main.cpp:79 +#: komparepart/kompare_part.cpp:650 komparepart/kompare_part.cpp:651 +#: komparepart/kompare_part.cpp:652 main.cpp:78 main.cpp:79 #, kde-format msgid "Author" msgstr "Forfatter" #: komparenavtreepart/komparenavtreepart.cpp:771 -#: komparepart/kompare_part.cpp:650 main.cpp:79 +#: komparepart/kompare_part.cpp:651 main.cpp:79 #, kde-format msgid "Otto Bruggeman" msgstr "Otto Bruggeman" -#: komparepart/kompare_part.cpp:175 +#: komparepart/kompare_part.cpp:176 #, kde-format msgid "Save &All" msgstr "L&agre alt" -#: komparepart/kompare_part.cpp:177 +#: komparepart/kompare_part.cpp:178 #, kde-format msgid "Save &Diff..." msgstr "Lagre &diff …" -#: komparepart/kompare_part.cpp:179 +#: komparepart/kompare_part.cpp:180 #, kde-format msgid "Swap Source with Destination" msgstr "Bytt om kilde og mål" -#: komparepart/kompare_part.cpp:181 +#: komparepart/kompare_part.cpp:182 #, kde-format msgid "Show Statistics" msgstr "Vis statistikk" -#: komparepart/kompare_part.cpp:184 +#: komparepart/kompare_part.cpp:185 #, kde-format msgid "Refresh Diff" msgstr "Oppdater diff" -#: komparepart/kompare_part.cpp:302 komparepart/kompare_part.cpp:315 +#: komparepart/kompare_part.cpp:303 komparepart/kompare_part.cpp:316 #, kde-format msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>" msgstr "<qt>URL-en <b>%1</b> kan ikke lastes ned.</qt>" -#: komparepart/kompare_part.cpp:354 +#: komparepart/kompare_part.cpp:355 #, kde-format msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>" msgstr "<qt>URL-en <b>%1</b> finnes ikke på systemet ditt.</qt>" -#: komparepart/kompare_part.cpp:542 +#: komparepart/kompare_part.cpp:543 #, kde-format msgid "Diff Options" msgstr "Diff-valg" -#: komparepart/kompare_part.cpp:563 +#: komparepart/kompare_part.cpp:564 #, kde-format msgid "Save .diff" msgstr "Lagre .diff" -#: komparepart/kompare_part.cpp:565 +#: komparepart/kompare_part.cpp:566 #, kde-format msgid "Patch Files (*.diff *.dif *.patch)" msgstr "" -#: komparepart/kompare_part.cpp:568 +#: komparepart/kompare_part.cpp:569 #, kde-format msgid "The file exists or is write-protected; do you want to overwrite it?" msgstr "Fila finnes eller er skrivebeskyttet. Vil du skrive over den?" -#: komparepart/kompare_part.cpp:568 +#: komparepart/kompare_part.cpp:569 #, kde-format msgid "File Exists" msgstr "Fila finnes" -#: komparepart/kompare_part.cpp:568 +#: komparepart/kompare_part.cpp:569 #, kde-format msgid "Do Not Overwrite" msgstr "Ikke skriv over" -#: komparepart/kompare_part.cpp:648 +#: komparepart/kompare_part.cpp:649 #, kde-format msgid "KomparePart" msgstr "KomparePart" -#: komparepart/kompare_part.cpp:651 main.cpp:81 +#: komparepart/kompare_part.cpp:652 main.cpp:81 #, kde-format msgid "Kevin Kofler" msgstr "Kevin Kofler" -#: komparepart/kompare_part.cpp:661 +#: komparepart/kompare_part.cpp:662 #, kde-format msgid "Running diff..." msgstr "Kjører diff …" -#: komparepart/kompare_part.cpp:664 +#: komparepart/kompare_part.cpp:665 #, kde-format msgid "Parsing diff output..." msgstr "Tolker utdata fra diff …" -#: komparepart/kompare_part.cpp:713 +#: komparepart/kompare_part.cpp:714 #, kde-format msgid "Comparing file %1 with file %2" msgstr "Sammenlikner fil %1 med fil %2" -#: komparepart/kompare_part.cpp:718 +#: komparepart/kompare_part.cpp:719 #, kde-format msgid "Comparing files in %1 with files in %2" msgstr "Sammenlikner filer i %1 med filer i %2" -#: komparepart/kompare_part.cpp:723 +#: komparepart/kompare_part.cpp:724 #, kde-format msgid "Viewing diff output from %1" msgstr "Viser diffs utdata fra %1" -#: komparepart/kompare_part.cpp:726 +#: komparepart/kompare_part.cpp:727 #, kde-format msgid "Blending diff output from %1 into file %2" msgstr "Fletter diffs utdata fra %1 inn i fil %2" -#: komparepart/kompare_part.cpp:731 +#: komparepart/kompare_part.cpp:732 #, kde-format msgid "Blending diff output from %1 into folder %2" msgstr "Fletter diffs utdata fra %1 inn i mappe %2" -#: komparepart/kompare_part.cpp:782 komparepart/kompare_part.cpp:813 -#: komparepart/kompare_part.cpp:928 +#: komparepart/kompare_part.cpp:783 komparepart/kompare_part.cpp:814 +#: komparepart/kompare_part.cpp:929 #, kde-format msgid "" "You have made changes to the destination file(s).\n" @@ -414,46 +414,46 @@ "Du har gjort endringer i målfilen(e).\n" "Vil du lagre dem?" -#: komparepart/kompare_part.cpp:784 komparepart/kompare_part.cpp:815 -#: komparepart/kompare_part.cpp:930 +#: komparepart/kompare_part.cpp:785 komparepart/kompare_part.cpp:816 +#: komparepart/kompare_part.cpp:931 #, kde-format msgid "Save Changes?" msgstr "Lagre endringer?" #. i18n: ectx: property (text), widget (QRadioButton, m_UnifiedRB) -#: komparepart/kompare_part.cpp:853 komparepart/komparesaveoptionsbase.ui:229 +#: komparepart/kompare_part.cpp:854 komparepart/komparesaveoptionsbase.ui:229 #: libdialogpages/diffpage.cpp:246 #, kde-format msgid "Unified" msgstr "Forent" #. i18n: ectx: property (text), widget (QRadioButton, m_ContextRB) -#: komparepart/kompare_part.cpp:856 komparepart/komparesaveoptionsbase.ui:201 +#: komparepart/kompare_part.cpp:857 komparepart/komparesaveoptionsbase.ui:201 #: libdialogpages/diffpage.cpp:240 #, kde-format msgid "Context" msgstr "Kontekst" #. i18n: ectx: property (text), widget (QRadioButton, m_RCSRB) -#: komparepart/kompare_part.cpp:859 komparepart/komparesaveoptionsbase.ui:222 +#: komparepart/kompare_part.cpp:860 komparepart/komparesaveoptionsbase.ui:222 #, kde-format msgid "RCS" msgstr "RCS" #. i18n: ectx: property (text), widget (QRadioButton, m_EdRB) -#: komparepart/kompare_part.cpp:862 komparepart/komparesaveoptionsbase.ui:208 +#: komparepart/kompare_part.cpp:863 komparepart/komparesaveoptionsbase.ui:208 #, kde-format msgid "Ed" msgstr "Ed" #. i18n: ectx: property (text), widget (QRadioButton, m_NormalRB) -#: komparepart/kompare_part.cpp:865 komparepart/komparesaveoptionsbase.ui:215 +#: komparepart/kompare_part.cpp:866 komparepart/komparesaveoptionsbase.ui:215 #: libdialogpages/diffpage.cpp:243 #, kde-format msgid "Normal" msgstr "Normal" -#: komparepart/kompare_part.cpp:885 +#: komparepart/kompare_part.cpp:886 #, kde-format msgid "" "No diff file, or no 2 files have been diffed. Therefore no stats are " @@ -462,13 +462,13 @@ "Ingen diff-fil, eller ikke noe filpar har blitt kjørt diff på. Derfor er det " "ingen statistikk tilgjengelig." -#: komparepart/kompare_part.cpp:887 komparepart/kompare_part.cpp:901 -#: komparepart/kompare_part.cpp:917 +#: komparepart/kompare_part.cpp:888 komparepart/kompare_part.cpp:902 +#: komparepart/kompare_part.cpp:918 #, kde-format msgid "Diff Statistics" msgstr "Diff-statistikk" -#: komparepart/kompare_part.cpp:891 +#: komparepart/kompare_part.cpp:892 #, kde-format msgid "" "Statistics:\n" @@ -489,7 +489,7 @@ "Number of hunks: %4\n" "Number of differences: %5" -#: komparepart/kompare_part.cpp:904 +#: komparepart/kompare_part.cpp:905 #, kde-format msgid "" "Statistics:\n" @@ -547,7 +547,7 @@ msgid "View Settings" msgstr "Vis innstillinger" -#: komparepart/kompareprefdlg.cpp:52 kompareurldialog.cpp:53 +#: komparepart/kompareprefdlg.cpp:52 kompareurldialog.cpp:54 #: libdialogpages/diffpage.cpp:224 #, kde-format msgid "Diff" @@ -660,32 +660,32 @@ msgid "Main Toolbar" msgstr "Hovedverktøylinje" -#: kompareurldialog.cpp:45 +#: kompareurldialog.cpp:46 #, kde-format msgid "Files" msgstr "&Fil" -#: kompareurldialog.cpp:47 +#: kompareurldialog.cpp:48 #, kde-format msgid "Here you can enter the files you want to compare." msgstr "Her kan du legge til filer du vil sammenligne" -#: kompareurldialog.cpp:55 +#: kompareurldialog.cpp:56 #, kde-format msgid "Here you can change the options for comparing the files." msgstr "Her kan du endre valgene for sammenligning av filer" -#: kompareurldialog.cpp:61 libdialogpages/viewpage.cpp:119 +#: kompareurldialog.cpp:62 libdialogpages/viewpage.cpp:119 #, kde-format msgid "Appearance" msgstr "U&seende" -#: kompareurldialog.cpp:63 +#: kompareurldialog.cpp:64 #, kde-format msgid "Here you can change the options for the view." msgstr "Her kan du endre valgene for visningen." -#: kompareurldialog.cpp:104 +#: kompareurldialog.cpp:109 #, kde-format msgid "" "File used for excluding files cannot be found, please specify another file." @@ -1031,12 +1031,24 @@ msgid "Exclude" msgstr "Utelat" -#: libdialogpages/filespage.cpp:56 +#: libdialogpages/filespage.cpp:51 libdialogpages/filespage.cpp:80 +#: libdialogpages/filespage.cpp:142 +#, kde-format +msgid "Select File" +msgstr "Velg fil" + +#: libdialogpages/filespage.cpp:63 libdialogpages/filespage.cpp:92 +#: libdialogpages/filespage.cpp:138 +#, kde-format +msgid "Select Folder" +msgstr "Velg mappe" + +#: libdialogpages/filespage.cpp:99 #, kde-format msgid "Encoding" msgstr "Koding" -#: libdialogpages/filespage.cpp:61 +#: libdialogpages/filespage.cpp:104 #, kde-format msgid "Default" msgstr "Standard" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-17.04.0/po/nn/kompare.po new/kompare-17.04.1/po/nn/kompare.po --- old/kompare-17.04.0/po/nn/kompare.po 2017-04-14 02:18:26.000000000 +0200 +++ new/kompare-17.04.1/po/nn/kompare.po 2017-05-09 02:23:55.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-01-30 03:56+0100\n" +"POT-Creation-Date: 2017-03-19 02:42+0100\n" "PO-Revision-Date: 2016-12-11 14:01+0100\n" "Last-Translator: Karl Ove Hufthammer <[email protected]>\n" "Language-Team: Norwegian Nynorsk <[email protected]>\n" @@ -262,7 +262,7 @@ msgstr[1] "Sletta %1 linjer" #: komparenavtreepart/komparenavtreepart.cpp:629 -#: komparepart/kompare_part.cpp:869 +#: komparepart/kompare_part.cpp:870 #, kde-format msgid "Unknown" msgstr "Ukjent" @@ -273,137 +273,137 @@ msgstr "KompareNavTreePart" #: komparenavtreepart/komparenavtreepart.cpp:770 -#: komparepart/kompare_part.cpp:649 main.cpp:78 +#: komparepart/kompare_part.cpp:650 main.cpp:78 #, kde-format msgid "John Firebaugh" msgstr "John Firebaugh" #: komparenavtreepart/komparenavtreepart.cpp:770 #: komparenavtreepart/komparenavtreepart.cpp:771 -#: komparepart/kompare_part.cpp:649 komparepart/kompare_part.cpp:650 -#: komparepart/kompare_part.cpp:651 main.cpp:78 main.cpp:79 +#: komparepart/kompare_part.cpp:650 komparepart/kompare_part.cpp:651 +#: komparepart/kompare_part.cpp:652 main.cpp:78 main.cpp:79 #, kde-format msgid "Author" msgstr "Opphavsperson" #: komparenavtreepart/komparenavtreepart.cpp:771 -#: komparepart/kompare_part.cpp:650 main.cpp:79 +#: komparepart/kompare_part.cpp:651 main.cpp:79 #, kde-format msgid "Otto Bruggeman" msgstr "Otto Bruggeman" -#: komparepart/kompare_part.cpp:175 +#: komparepart/kompare_part.cpp:176 #, kde-format msgid "Save &All" msgstr "L&agra alt" -#: komparepart/kompare_part.cpp:177 +#: komparepart/kompare_part.cpp:178 #, kde-format msgid "Save &Diff..." msgstr "Lagra &diff-fil …" -#: komparepart/kompare_part.cpp:179 +#: komparepart/kompare_part.cpp:180 #, kde-format msgid "Swap Source with Destination" msgstr "Byt om kjelde og mål" -#: komparepart/kompare_part.cpp:181 +#: komparepart/kompare_part.cpp:182 #, kde-format msgid "Show Statistics" msgstr "Vis statistikk" -#: komparepart/kompare_part.cpp:184 +#: komparepart/kompare_part.cpp:185 #, kde-format msgid "Refresh Diff" msgstr "Oppdater diff" -#: komparepart/kompare_part.cpp:302 komparepart/kompare_part.cpp:315 +#: komparepart/kompare_part.cpp:303 komparepart/kompare_part.cpp:316 #, kde-format msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>" msgstr "<qt>URL-en <b>%1</b> kan ikkje lastast ned.</qt>" -#: komparepart/kompare_part.cpp:354 +#: komparepart/kompare_part.cpp:355 #, kde-format msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>" msgstr "<qt>URL-en <b>%1</b> finst ikkje på systemet ditt.</qt>" -#: komparepart/kompare_part.cpp:542 +#: komparepart/kompare_part.cpp:543 #, kde-format msgid "Diff Options" msgstr "Innstillingar for diff" -#: komparepart/kompare_part.cpp:563 +#: komparepart/kompare_part.cpp:564 #, kde-format msgid "Save .diff" msgstr "Lagra .diff-fil" -#: komparepart/kompare_part.cpp:565 +#: komparepart/kompare_part.cpp:566 #, kde-format msgid "Patch Files (*.diff *.dif *.patch)" msgstr "Rettefiler (*.diff *.dif *.patch)" -#: komparepart/kompare_part.cpp:568 +#: komparepart/kompare_part.cpp:569 #, kde-format msgid "The file exists or is write-protected; do you want to overwrite it?" msgstr "Fila finst eller er skriveverna. Vil du skriva over henne?" -#: komparepart/kompare_part.cpp:568 +#: komparepart/kompare_part.cpp:569 #, kde-format msgid "File Exists" msgstr "Fila finst" -#: komparepart/kompare_part.cpp:568 +#: komparepart/kompare_part.cpp:569 #, kde-format msgid "Do Not Overwrite" msgstr "Ikkje skriv over" -#: komparepart/kompare_part.cpp:648 +#: komparepart/kompare_part.cpp:649 #, kde-format msgid "KomparePart" msgstr "KomparePart" -#: komparepart/kompare_part.cpp:651 main.cpp:81 +#: komparepart/kompare_part.cpp:652 main.cpp:81 #, kde-format msgid "Kevin Kofler" msgstr "Kevin Kofler" -#: komparepart/kompare_part.cpp:661 +#: komparepart/kompare_part.cpp:662 #, kde-format msgid "Running diff..." msgstr "Køyrer diff …" -#: komparepart/kompare_part.cpp:664 +#: komparepart/kompare_part.cpp:665 #, kde-format msgid "Parsing diff output..." msgstr "Tolkar utdata frå diff …" -#: komparepart/kompare_part.cpp:713 +#: komparepart/kompare_part.cpp:714 #, kde-format msgid "Comparing file %1 with file %2" msgstr "Samanliknar fila %1 med fila %2" -#: komparepart/kompare_part.cpp:718 +#: komparepart/kompare_part.cpp:719 #, kde-format msgid "Comparing files in %1 with files in %2" msgstr "Samanliknar filene i %1 med filene i %2" -#: komparepart/kompare_part.cpp:723 +#: komparepart/kompare_part.cpp:724 #, kde-format msgid "Viewing diff output from %1" msgstr "Viser utdataa til diff frå %1" -#: komparepart/kompare_part.cpp:726 +#: komparepart/kompare_part.cpp:727 #, kde-format msgid "Blending diff output from %1 into file %2" msgstr "Flettar utdataa til diff frå %1 inn i fila %2" -#: komparepart/kompare_part.cpp:731 +#: komparepart/kompare_part.cpp:732 #, kde-format msgid "Blending diff output from %1 into folder %2" msgstr "Flettar utdataa til diff frå %1 inn i mappa %2" -#: komparepart/kompare_part.cpp:782 komparepart/kompare_part.cpp:813 -#: komparepart/kompare_part.cpp:928 +#: komparepart/kompare_part.cpp:783 komparepart/kompare_part.cpp:814 +#: komparepart/kompare_part.cpp:929 #, kde-format msgid "" "You have made changes to the destination file(s).\n" @@ -412,46 +412,46 @@ "Du har gjort endringar i målfila/målfilene.\n" "Vil du lagra dei?" -#: komparepart/kompare_part.cpp:784 komparepart/kompare_part.cpp:815 -#: komparepart/kompare_part.cpp:930 +#: komparepart/kompare_part.cpp:785 komparepart/kompare_part.cpp:816 +#: komparepart/kompare_part.cpp:931 #, kde-format msgid "Save Changes?" msgstr "Vil du lagra endringane?" #. i18n: ectx: property (text), widget (QRadioButton, m_UnifiedRB) -#: komparepart/kompare_part.cpp:853 komparepart/komparesaveoptionsbase.ui:229 +#: komparepart/kompare_part.cpp:854 komparepart/komparesaveoptionsbase.ui:229 #: libdialogpages/diffpage.cpp:246 #, kde-format msgid "Unified" msgstr "Sameint" #. i18n: ectx: property (text), widget (QRadioButton, m_ContextRB) -#: komparepart/kompare_part.cpp:856 komparepart/komparesaveoptionsbase.ui:201 +#: komparepart/kompare_part.cpp:857 komparepart/komparesaveoptionsbase.ui:201 #: libdialogpages/diffpage.cpp:240 #, kde-format msgid "Context" msgstr "Kontekst" #. i18n: ectx: property (text), widget (QRadioButton, m_RCSRB) -#: komparepart/kompare_part.cpp:859 komparepart/komparesaveoptionsbase.ui:222 +#: komparepart/kompare_part.cpp:860 komparepart/komparesaveoptionsbase.ui:222 #, kde-format msgid "RCS" msgstr "RCS" #. i18n: ectx: property (text), widget (QRadioButton, m_EdRB) -#: komparepart/kompare_part.cpp:862 komparepart/komparesaveoptionsbase.ui:208 +#: komparepart/kompare_part.cpp:863 komparepart/komparesaveoptionsbase.ui:208 #, kde-format msgid "Ed" msgstr "Ed" #. i18n: ectx: property (text), widget (QRadioButton, m_NormalRB) -#: komparepart/kompare_part.cpp:865 komparepart/komparesaveoptionsbase.ui:215 +#: komparepart/kompare_part.cpp:866 komparepart/komparesaveoptionsbase.ui:215 #: libdialogpages/diffpage.cpp:243 #, kde-format msgid "Normal" msgstr "Normal" -#: komparepart/kompare_part.cpp:885 +#: komparepart/kompare_part.cpp:886 #, kde-format msgid "" "No diff file, or no 2 files have been diffed. Therefore no stats are " @@ -460,13 +460,13 @@ "Inga diff-fil, eller ikkje noko filpar det har vorte køyrt diff på. Derfor " "er ikkje statistikken tilgjengeleg." -#: komparepart/kompare_part.cpp:887 komparepart/kompare_part.cpp:901 -#: komparepart/kompare_part.cpp:917 +#: komparepart/kompare_part.cpp:888 komparepart/kompare_part.cpp:902 +#: komparepart/kompare_part.cpp:918 #, kde-format msgid "Diff Statistics" msgstr "Diff-statistikk" -#: komparepart/kompare_part.cpp:891 +#: komparepart/kompare_part.cpp:892 #, kde-format msgid "" "Statistics:\n" @@ -487,7 +487,7 @@ "Talet på klumpar: %4\n" "Talet på skilnadar: %5" -#: komparepart/kompare_part.cpp:904 +#: komparepart/kompare_part.cpp:905 #, kde-format msgid "" "Statistics:\n" @@ -545,7 +545,7 @@ msgid "View Settings" msgstr "Vis innstillingar" -#: komparepart/kompareprefdlg.cpp:52 kompareurldialog.cpp:53 +#: komparepart/kompareprefdlg.cpp:52 kompareurldialog.cpp:54 #: libdialogpages/diffpage.cpp:224 #, kde-format msgid "Diff" @@ -658,32 +658,32 @@ msgid "Main Toolbar" msgstr "Hovudverktøylinje" -#: kompareurldialog.cpp:45 +#: kompareurldialog.cpp:46 #, kde-format msgid "Files" msgstr "Filer" -#: kompareurldialog.cpp:47 +#: kompareurldialog.cpp:48 #, kde-format msgid "Here you can enter the files you want to compare." msgstr "Her vel du kva filer som skal samanliknast." -#: kompareurldialog.cpp:55 +#: kompareurldialog.cpp:56 #, kde-format msgid "Here you can change the options for comparing the files." msgstr "Her kan du endra på innstillingane for samanlikning av filer." -#: kompareurldialog.cpp:61 libdialogpages/viewpage.cpp:119 +#: kompareurldialog.cpp:62 libdialogpages/viewpage.cpp:119 #, kde-format msgid "Appearance" msgstr "Utsjånad" -#: kompareurldialog.cpp:63 +#: kompareurldialog.cpp:64 #, kde-format msgid "Here you can change the options for the view." msgstr "Her kan du endra på innstillingane for utsjånad." -#: kompareurldialog.cpp:104 +#: kompareurldialog.cpp:109 #, kde-format msgid "" "File used for excluding files cannot be found, please specify another file." @@ -1027,12 +1027,24 @@ msgid "Exclude" msgstr "Utelat" -#: libdialogpages/filespage.cpp:56 +#: libdialogpages/filespage.cpp:51 libdialogpages/filespage.cpp:80 +#: libdialogpages/filespage.cpp:142 +#, kde-format +msgid "Select File" +msgstr "Vel fil" + +#: libdialogpages/filespage.cpp:63 libdialogpages/filespage.cpp:92 +#: libdialogpages/filespage.cpp:138 +#, kde-format +msgid "Select Folder" +msgstr "Vel mappe" + +#: libdialogpages/filespage.cpp:99 #, kde-format msgid "Encoding" msgstr "Teiknkoding" -#: libdialogpages/filespage.cpp:61 +#: libdialogpages/filespage.cpp:104 #, kde-format msgid "Default" msgstr "Standard" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-17.04.0/po/pl/kompare.po new/kompare-17.04.1/po/pl/kompare.po --- old/kompare-17.04.0/po/pl/kompare.po 2017-04-14 02:18:26.000000000 +0200 +++ new/kompare-17.04.1/po/pl/kompare.po 2017-05-09 02:23:55.000000000 +0200 @@ -1,6 +1,6 @@ # translation of kompare.po to Polish # translation of kompare.po to -# Version: $Revision: 1485087 $ +# Version: $Revision: 1487466 $ # Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010 Free Software Foundation, Inc. # # Marta Rybczynska <[email protected]>, 2002, 2004, 2005. @@ -9,13 +9,13 @@ # Marta Rybczyńska <[email protected]>, 2003. # Marta Rybczyńska <[email protected]>, 2007, 2008, 2009. # Michał Smoczyk <[email protected]>, 2010. -# Łukasz Wojniłowicz <[email protected]>, 2011, 2012, 2013, 2014, 2016. +# Łukasz Wojniłowicz <[email protected]>, 2011, 2012, 2013, 2014, 2016, 2017. msgid "" msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-03-19 02:42+0100\n" -"PO-Revision-Date: 2016-04-23 07:40+0100\n" +"PO-Revision-Date: 2017-04-15 08:43+0100\n" "Last-Translator: Łukasz Wojniłowicz <[email protected]>\n" "Language-Team: Polish <[email protected]>\n" "Language: pl\n" @@ -1046,17 +1046,15 @@ #: libdialogpages/filespage.cpp:51 libdialogpages/filespage.cpp:80 #: libdialogpages/filespage.cpp:142 -#, fuzzy, kde-format -#| msgid "N&ext File" +#, kde-format msgid "Select File" -msgstr "&Następny plik" +msgstr "Wybierz plik" #: libdialogpages/filespage.cpp:63 libdialogpages/filespage.cpp:92 #: libdialogpages/filespage.cpp:138 -#, fuzzy, kde-format -#| msgid "Source Folder" +#, kde-format msgid "Select Folder" -msgstr "Katalog źródłowy" +msgstr "Wybierz katalog" #: libdialogpages/filespage.cpp:99 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-17.04.0/po/sk/kompare.po new/kompare-17.04.1/po/sk/kompare.po --- old/kompare-17.04.0/po/sk/kompare.po 2017-04-14 02:18:26.000000000 +0200 +++ new/kompare-17.04.1/po/sk/kompare.po 2017-05-09 02:23:56.000000000 +0200 @@ -2,13 +2,13 @@ # Stanislav Visnovsky <[email protected]>, 2001,2002. # Stanislav Visnovsky <[email protected]>, 2004. # Jozef Říha <[email protected]>, 2006. -# Roman Paholík <[email protected]>, 2012, 2013, 2014, 2016. +# Roman Paholík <[email protected]>, 2012, 2013, 2014, 2016, 2017. msgid "" msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-03-19 02:42+0100\n" -"PO-Revision-Date: 2016-04-26 18:19+0100\n" +"PO-Revision-Date: 2017-04-16 20:11+0100\n" "Last-Translator: Roman Paholik <[email protected]>\n" "Language-Team: Slovak <[email protected]>\n" "Language: sk\n" @@ -1036,17 +1036,15 @@ #: libdialogpages/filespage.cpp:51 libdialogpages/filespage.cpp:80 #: libdialogpages/filespage.cpp:142 -#, fuzzy, kde-format -#| msgid "Source File" +#, kde-format msgid "Select File" -msgstr "Zdrojový súbor" +msgstr "Vyberte súbor" #: libdialogpages/filespage.cpp:63 libdialogpages/filespage.cpp:92 #: libdialogpages/filespage.cpp:138 -#, fuzzy, kde-format -#| msgid "Source Folder" +#, kde-format msgid "Select Folder" -msgstr "Zdrojový priečinok" +msgstr "Vybrať priečinok" #: libdialogpages/filespage.cpp:99 #, kde-format
