From 451c91eaba86dbe45f24af6c3e743632adad9b215428e2b27d8af7ac0ee7d8cd Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 21 Nov 2017 15:32:01 +0000 Subject: [PATCH] Accepting request 543995 from home:Zaitor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Add gnome-terminal-nb-translation.patch: Add updated Norwegian bokmål translation. - Run spec-cleaner, modernize spec, use autosetup and make_build macros. - Stop handling glib2_gsettings_schema_post(un) and desktop_database_post(un) in post(un), we have file-triggers taking care of this for us now. - Stop passing no longer needed suse_update_desktop_file macro. OBS-URL: https://build.opensuse.org/request/show/543995 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-terminal?expand=0&rev=192 --- gnome-terminal-nb-translation.patch | 930 ++++++++++++++++++++++++++++ gnome-terminal.changes | 12 + gnome-terminal.spec | 26 +- 3 files changed, 952 insertions(+), 16 deletions(-) create mode 100644 gnome-terminal-nb-translation.patch diff --git a/gnome-terminal-nb-translation.patch b/gnome-terminal-nb-translation.patch new file mode 100644 index 0000000..5eff4d0 --- /dev/null +++ b/gnome-terminal-nb-translation.patch @@ -0,0 +1,930 @@ +From 4f08d782496839e73194feac56e7763f0bca720f Mon Sep 17 00:00:00 2001 +From: Kjartan Maraas +Date: Wed, 8 Nov 2017 20:09:28 +0100 +Subject: =?UTF-8?q?Updated=20Norwegian=20bokm=C3=A5l=20translation.?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- + po/nb.po | 351 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 192 insertions(+), 159 deletions(-) + +diff --git a/po/nb.po b/po/nb.po +index 7d7b8fd..0c65845 100644 +--- a/po/nb.po ++++ b/po/nb.po +@@ -6,11 +6,10 @@ + # Torstein Adolf Winterseth , 2010. + msgid "" + msgstr "" +-"Project-Id-Version: gnome-terminal 3.23.x\n" +-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" +-"terminal&keywords=I18N+L10N&component=general\n" +-"POT-Creation-Date: 2016-11-29 04:28+0000\n" +-"PO-Revision-Date: 2017-02-18 11:16+0100\n" ++"Project-Id-Version: gnome-terminal 3.26.x\n" ++"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-terminal&keywords=I18N+L10N&component=general\n" ++"POT-Creation-Date: 2017-09-11 19:16+0000\n" ++"PO-Revision-Date: 2017-11-08 20:09+0100\n" + "Last-Translator: Kjartan Maraas \n" + "Language-Team: Norwegian bokmål \n" + "Language: nb\n" +@@ -22,9 +21,9 @@ msgstr "" + + #: ../org.gnome.Terminal.appdata.xml.in.h:1 + #: ../org.gnome.Terminal.desktop.in.in.h:1 ../src/server.c:161 +-#: ../src/terminal-accels.c:234 ../src/terminal.c:384 ++#: ../src/terminal-accels.c:237 ../src/terminal.c:384 + #: ../src/terminal-tab-label.c:81 ../src/terminal-tabs-menu.c:180 +-#: ../src/terminal-window.c:2655 ../src/terminal-window.c:3014 ++#: ../src/terminal-window.c:2734 ../src/terminal-window.c:3093 + msgid "Terminal" + msgstr "Terminal" + +@@ -384,7 +383,11 @@ msgid "" + "Custom color for the foreground of the text character at the terminal’s " + "cursor position, as a color specification (can be HTML-style hex digits, or " + "a color name such as “red”). This is ignored if cursor-colors-set is false." +-msgstr "Egendefinert farge for forgrunn for tekstkarakteren ved markøren i terminalen som en fargespesifikasjon (kan være HTML-type heksadesimale tall eller et fargenavn som «red»). Dette ignoreres hvis «bold_color_same_as_fg» har positiv verdi («true»)." ++msgstr "" ++"Egendefinert farge for forgrunn for tekstkarakteren ved markøren i " ++"terminalen som en fargespesifikasjon (kan være HTML-type heksadesimale tall " ++"eller et fargenavn som «red»). Dette ignoreres hvis «bold_color_same_as_fg» " ++"har positiv verdi («true»)." + + #: ../src/org.gnome.Terminal.gschema.xml.h:19 + msgid "Whether to use custom highlight colors" +@@ -664,102 +667,106 @@ msgid "Keyboard shortcut to copy text" + msgstr "Tastatursnarvei som kopierer tekst" + + #: ../src/org.gnome.Terminal.gschema.xml.h:71 ++msgid "Keyboard shortcut to copy text as HTML" ++msgstr "Tastatursnarvei som kopierer tekst som HTML" ++ ++#: ../src/org.gnome.Terminal.gschema.xml.h:72 + msgid "Keyboard shortcut to paste text" + msgstr "Tastatursnarvei som limer inn tekst" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:72 ++#: ../src/org.gnome.Terminal.gschema.xml.h:73 + msgid "Keyboard shortcut to select all text" + msgstr "Tastatursnarvei som velger all tekst" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:73 ++#: ../src/org.gnome.Terminal.gschema.xml.h:74 + msgid "Keyboard shortcut to open the Preferences dialog" + msgstr "Tastatursnarvei som åpner brukervalgdialogen" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:74 ++#: ../src/org.gnome.Terminal.gschema.xml.h:75 + msgid "Keyboard shortcut to open the current profile’s Preferences dialog" + msgstr "Tastatursnarvei som åpner brukervalgdialog for aktiv profil" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:75 ++#: ../src/org.gnome.Terminal.gschema.xml.h:76 + msgid "Keyboard shortcut to toggle full screen mode" + msgstr "Tastatursnarvei som slår av/på fullskjermmodus" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:76 ++#: ../src/org.gnome.Terminal.gschema.xml.h:77 + msgid "Keyboard shortcut to toggle the visibility of the menubar" + msgstr "Tastatursnarvei som slår av/på visning av menylinjen" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:77 ++#: ../src/org.gnome.Terminal.gschema.xml.h:78 + msgid "Keyboard shortcut to toggle the read-only state" + msgstr "Tastatursnarvei som slår av/på skrivebeskyttet modus" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:78 ++#: ../src/org.gnome.Terminal.gschema.xml.h:79 + msgid "Keyboard shortcut to reset the terminal" + msgstr "Tastatursnarvei som nullstiller terminalen" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:79 ++#: ../src/org.gnome.Terminal.gschema.xml.h:80 + msgid "Keyboard shortcut to reset and clear the terminal" + msgstr "Tastatursnarvei som nullstiller og tømmer terminalen" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:80 ++#: ../src/org.gnome.Terminal.gschema.xml.h:81 + msgid "Keyboard shortcut to open the search dialog" + msgstr "Tastatursnarvei som åpner søkedialogen" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:81 ++#: ../src/org.gnome.Terminal.gschema.xml.h:82 + msgid "Keyboard shortcut to find the next occurrence of the search term" + msgstr "Tastatursnarvei som finner neste oppføring av søkebegrepet" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:82 ++#: ../src/org.gnome.Terminal.gschema.xml.h:83 + msgid "Keyboard shortcut to find the previous occurrence of the search term" + msgstr "Tastatursnarvei som finner forrige oppføring av søkebegrepet" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:83 ++#: ../src/org.gnome.Terminal.gschema.xml.h:84 + msgid "Keyboard shortcut to clear the find highlighting" + msgstr "Tastatursnarvei som fjerner utheving av søk" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:84 ++#: ../src/org.gnome.Terminal.gschema.xml.h:85 + msgid "Keyboard shortcut to switch to the previous tab" + msgstr "Tastatursnarvei som bytter til forrige fane" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:85 ++#: ../src/org.gnome.Terminal.gschema.xml.h:86 + msgid "Keyboard shortcut to switch to the next tab" + msgstr "Tastatursnarvei som bytter til neste fane" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:86 ++#: ../src/org.gnome.Terminal.gschema.xml.h:87 + msgid "Keyboard shortcut to move the current tab to the left" + msgstr "Tastatursnarvei som flytter aktiv fane til venstre" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:87 ++#: ../src/org.gnome.Terminal.gschema.xml.h:88 + msgid "Keyboard shortcut to move the current tab to the right" + msgstr "Tastatursnarvei som flytter aktiv fane til høyre" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:88 ++#: ../src/org.gnome.Terminal.gschema.xml.h:89 + msgid "Keyboard shortcut to detach current tab" + msgstr "Tastatursnarvei som løsriver aktiv fane" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:89 ++#: ../src/org.gnome.Terminal.gschema.xml.h:90 + msgid "Keyboard shortcut to switch to the numbered tab" + msgstr "Tastatursnarvei som bytter til nummerert fane" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:90 ++#: ../src/org.gnome.Terminal.gschema.xml.h:91 + msgid "Keyboard shortcut to launch help" + msgstr "Tastatursnarvei som åpner hjelp" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:91 ++#: ../src/org.gnome.Terminal.gschema.xml.h:92 + msgid "Keyboard shortcut to make font larger" + msgstr "Tastatursnarvei som gjør skriften større" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:92 ++#: ../src/org.gnome.Terminal.gschema.xml.h:93 + msgid "Keyboard shortcut to make font smaller" + msgstr "Tastatursnarvei som gjør skriften mindre" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:93 ++#: ../src/org.gnome.Terminal.gschema.xml.h:94 + msgid "Keyboard shortcut to make font normal-size" + msgstr "Tastatursnarvei som setter skriften til normal størrelse" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:94 ++#: ../src/org.gnome.Terminal.gschema.xml.h:95 + msgid "Whether the menubar has access keys" + msgstr "Om menylinjen har snarveitaster" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:95 ++#: ../src/org.gnome.Terminal.gschema.xml.h:96 + msgid "" + "Whether to have Alt+letter access keys for the menubar. They may interfere " + "with some applications run inside the terminal so it’s possible to turn them " +@@ -769,11 +776,11 @@ msgstr "" + "den kan kræsje med programmer som blir kjørt inni terminalen så det er mulig " + "å skru dem av." + +-#: ../src/org.gnome.Terminal.gschema.xml.h:96 ++#: ../src/org.gnome.Terminal.gschema.xml.h:97 + msgid "Whether shortcuts are enabled" + msgstr "Hvorvidt snarveier er slått på" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:97 ++#: ../src/org.gnome.Terminal.gschema.xml.h:98 + msgid "" + "Whether shortcuts are enabled. They may interfere with some applications run " + "inside the terminal so it’s possible to turn them off." +@@ -781,11 +788,11 @@ msgstr "" + "Hvorvidt snarveier er slått på. Det er mulig at disse kan forstyrre " + "programmer som blir kjørt i terminalen så det er mulig å skru dem av." + +-#: ../src/org.gnome.Terminal.gschema.xml.h:98 ++#: ../src/org.gnome.Terminal.gschema.xml.h:99 + msgid "Whether the standard GTK shortcut for menubar access is enabled" + msgstr "Om forvalgt GTK-snarvei for tilgang til menylinjen er aktivert" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:99 ++#: ../src/org.gnome.Terminal.gschema.xml.h:100 + msgid "" + "Normally you can access the menubar with F10. This can also be customized " + "via gtkrc (gtk-menu-bar-accel = \"whatever\"). This option allows the " +@@ -795,15 +802,15 @@ msgstr "" + "gtkrc (gtk-menu-bar-accel = «whatever»). Dette valget lar den forvalgte " + "hurtigtasten til menylinjen bli slått av." + +-#: ../src/org.gnome.Terminal.gschema.xml.h:100 ++#: ../src/org.gnome.Terminal.gschema.xml.h:101 + msgid "Whether the shell integration is enabled" + msgstr "Hvorvidt shell-integrasjonen er slått på" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:101 ++#: ../src/org.gnome.Terminal.gschema.xml.h:102 + msgid "List of available encodings" + msgstr "Liste med tilgjengelige kodinger" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:102 ++#: ../src/org.gnome.Terminal.gschema.xml.h:103 + msgid "" + "A subset of possible encodings are presented in the Encoding submenu. This " + "is a list of encodings to appear there." +@@ -811,27 +818,27 @@ msgstr "" + "Du finner en oversikt over mulige kodinger i undermenyen «Koding». Dette er " + "listen med kodinger som vises der." + +-#: ../src/org.gnome.Terminal.gschema.xml.h:103 ++#: ../src/org.gnome.Terminal.gschema.xml.h:104 + msgid "Whether to ask for confirmation before closing a terminal" + msgstr "Om det skal spørres om bekreftelse når terminaler blir lukket" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:104 ++#: ../src/org.gnome.Terminal.gschema.xml.h:105 + msgid "Whether to show the menubar in new windows" + msgstr "Om menylinjen skal vises i nye vinduer" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:105 ++#: ../src/org.gnome.Terminal.gschema.xml.h:106 + msgid "Whether to open new terminals as windows or tabs" + msgstr "Hvorvidt nye terminaler skal åpnes som vinduer eller faner" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:106 ++#: ../src/org.gnome.Terminal.gschema.xml.h:107 + msgid "When to show the tabs bar" + msgstr "Når fanelinjen skal vises" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:107 ++#: ../src/org.gnome.Terminal.gschema.xml.h:108 + msgid "The position of the tab bar" + msgstr "Fanenlinjens posisjon" + +-#: ../src/org.gnome.Terminal.gschema.xml.h:108 ++#: ../src/org.gnome.Terminal.gschema.xml.h:109 + msgid "Which theme variant to use" + msgstr "Temavariant som skal brukes" + +@@ -860,7 +867,7 @@ msgctxt "theme variant" + msgid "Dark" + msgstr "Mørk" + +-#: ../src/preferences.ui.h:8 ../src/terminal-accels.c:170 ++#: ../src/preferences.ui.h:8 ../src/terminal-accels.c:173 + msgid "Preferences" + msgstr "Brukervalg" + +@@ -1332,152 +1339,153 @@ msgstr "Søk som i _regulære uttrykk" + msgid "_Wrap around" + msgstr "Br_ytningsmodus" + +-#: ../src/terminal-accels.c:156 ++#: ../src/terminal-accels.c:158 + msgid "New Terminal in New Tab" + msgstr "Ny terminal i ny fane" + +-#: ../src/terminal-accels.c:157 ++#: ../src/terminal-accels.c:159 + msgid "New Terminal in New Window" + msgstr "Ny terminal i nytt vindu" + +-#: ../src/terminal-accels.c:158 ++#: ../src/terminal-accels.c:160 + msgid "New Profile" + msgstr "Ny profil" + +-#: ../src/terminal-accels.c:160 ++#: ../src/terminal-accels.c:162 + msgid "Save Contents" + msgstr "Lagre innhold" + +-#: ../src/terminal-accels.c:162 ++#: ../src/terminal-accels.c:164 + msgid "Close Terminal" + msgstr "Lukk terminal" + +-#: ../src/terminal-accels.c:163 ++#: ../src/terminal-accels.c:165 + msgid "Close All Terminals" + msgstr "Lukk alle terminaler" + +-#. Edit menu +-#: ../src/terminal-accels.c:167 ../src/terminal-window.c:2469 +-#: ../src/terminal-window.c:2587 ++#: ../src/terminal-accels.c:169 + msgid "Copy" + msgstr "Kopier" + +-#: ../src/terminal-accels.c:168 ../src/terminal-window.c:2472 +-#: ../src/terminal-window.c:2590 ++#: ../src/terminal-accels.c:170 ++msgid "Copy as HTML" ++msgstr "Kopier som HTML" ++ ++#: ../src/terminal-accels.c:171 + msgid "Paste" + msgstr "Lim inn" + +-#: ../src/terminal-accels.c:169 ../src/terminal-window.c:2478 ++#: ../src/terminal-accels.c:172 ../src/terminal-window.c:2548 + msgid "Select All" + msgstr "Velg alt" + +-#: ../src/terminal-accels.c:171 ++#: ../src/terminal-accels.c:174 + msgid "Profile Preferences" + msgstr "Brukervalg for profil" + +-#: ../src/terminal-accels.c:175 ../src/terminal-accels.c:233 ++#: ../src/terminal-accels.c:178 ../src/terminal-accels.c:236 + msgid "Find" + msgstr "Finn" + +-#: ../src/terminal-accels.c:176 ++#: ../src/terminal-accels.c:179 + msgid "Find Next" + msgstr "Finn neste" + +-#: ../src/terminal-accels.c:177 ++#: ../src/terminal-accels.c:180 + msgid "Find Previous" + msgstr "Finn forrige" + +-#: ../src/terminal-accels.c:178 ++#: ../src/terminal-accels.c:181 + msgid "Clear Find Highlight" + msgstr "Tøm utheving av søk" + +-#: ../src/terminal-accels.c:182 ++#: ../src/terminal-accels.c:185 + msgid "Hide and Show toolbar" + msgstr "Skjul eller vis menylinjen" + +-#: ../src/terminal-accels.c:183 ++#: ../src/terminal-accels.c:186 + msgid "Full Screen" + msgstr "Full skjerm" + + #. View menu +-#: ../src/terminal-accels.c:184 ../src/terminal-window.c:2489 ++#: ../src/terminal-accels.c:187 ../src/terminal-window.c:2559 + msgid "Zoom In" + msgstr "Zoom inn" + +-#: ../src/terminal-accels.c:185 ../src/terminal-window.c:2492 ++#: ../src/terminal-accels.c:188 ../src/terminal-window.c:2562 + msgid "Zoom Out" + msgstr "Zoom ut" + +-#: ../src/terminal-accels.c:186 ../src/terminal-window.c:2495 ++#: ../src/terminal-accels.c:189 ../src/terminal-window.c:2565 + msgid "Normal Size" + msgstr "Normal størrelse" + +-#: ../src/terminal-accels.c:190 ++#: ../src/terminal-accels.c:193 + msgid "Read-Only" + msgstr "Skrivebeskyttet" + +-#: ../src/terminal-accels.c:191 ++#: ../src/terminal-accels.c:194 + msgid "Reset" + msgstr "Nullstill" + +-#: ../src/terminal-accels.c:192 ++#: ../src/terminal-accels.c:195 + msgid "Reset and Clear" + msgstr "Nullstill og tøm" + +-#: ../src/terminal-accels.c:196 ++#: ../src/terminal-accels.c:199 + msgid "Switch to Previous Terminal" + msgstr "Bytt til forrige terminal" + +-#: ../src/terminal-accels.c:197 ++#: ../src/terminal-accels.c:200 + msgid "Switch to Next Terminal" + msgstr "Bytt til neste terminal" + +-#: ../src/terminal-accels.c:198 ++#: ../src/terminal-accels.c:201 + msgid "Move Terminal to the Left" + msgstr "Flytt terminal til venstre" + +-#: ../src/terminal-accels.c:199 ++#: ../src/terminal-accels.c:202 + msgid "Move Terminal to the Right" + msgstr "Flytt terminal til høyre" + +-#: ../src/terminal-accels.c:200 ++#: ../src/terminal-accels.c:203 + msgid "Detach Terminal" + msgstr "Riv løs terminal" + +-#: ../src/terminal-accels.c:223 ++#: ../src/terminal-accels.c:226 + msgid "Contents" + msgstr "Innhold" + +-#: ../src/terminal-accels.c:230 ++#: ../src/terminal-accels.c:233 + msgid "File" + msgstr "Fil" + +-#: ../src/terminal-accels.c:231 ++#: ../src/terminal-accels.c:234 + msgid "Edit" + msgstr "Rediger" + +-#: ../src/terminal-accels.c:232 ++#: ../src/terminal-accels.c:235 + msgid "View" + msgstr "Vis" + +-#: ../src/terminal-accels.c:235 ++#: ../src/terminal-accels.c:238 + msgid "Tabs" + msgstr "Faner" + +-#: ../src/terminal-accels.c:236 ++#: ../src/terminal-accels.c:239 + msgid "Help" + msgstr "Hjelp" + +-#: ../src/terminal-accels.c:333 ++#: ../src/terminal-accels.c:336 + #, c-format + msgid "Switch to Tab %u" + msgstr "Bytt til fane %u" + +-#: ../src/terminal-accels.c:541 ++#: ../src/terminal-accels.c:544 + msgid "_Action" + msgstr "H_andling" + +-#: ../src/terminal-accels.c:560 ++#: ../src/terminal-accels.c:563 + msgid "Shortcut _Key" + msgstr "_Hurtigtast" + +@@ -1639,11 +1647,11 @@ msgstr "_Ny terminal" + msgid "_Preferences" + msgstr "_Brukervalg" + +-#: ../src/terminal-menus.ui.h:3 ../src/terminal-window.c:2440 ++#: ../src/terminal-menus.ui.h:3 ../src/terminal-window.c:2507 + msgid "_Help" + msgstr "_Hjelp" + +-#: ../src/terminal-menus.ui.h:4 ../src/terminal-window.c:2557 ++#: ../src/terminal-menus.ui.h:4 ../src/terminal-window.c:2627 + msgid "_About" + msgstr "_Om" + +@@ -1731,11 +1739,11 @@ msgid "Option “%s” is no longer supported in this version of gnome-terminal. + msgstr "" + "Alternativet «%s» er ikke støttet lenger i denne versjonen av gnome-terminal." + +-#: ../src/terminal-options.c:269 ../src/terminal-util.c:230 ++#: ../src/terminal-options.c:269 ../src/terminal-util.c:239 + msgid "GNOME Terminal" + msgstr "GNOME-terminal" + +-#: ../src/terminal-options.c:270 ../src/terminal-util.c:219 ++#: ../src/terminal-options.c:270 ../src/terminal-util.c:226 + #, c-format + msgid "Using VTE version %u.%u.%u" + msgstr "Bruker VTE versjon %u.%u.%u" +@@ -1898,7 +1906,7 @@ msgstr "Profilliste" + msgid "Delete profile “%s”?" + msgstr "Vil du slette profilen «%s»?" + +-#: ../src/terminal-prefs.c:374 ../src/terminal-window.c:547 ++#: ../src/terminal-prefs.c:374 ../src/terminal-window.c:549 + msgid "_Cancel" + msgstr "A_vbryt" + +@@ -1918,34 +1926,34 @@ msgstr "Vis" + msgid "_Encoding" + msgstr "_Koding" + +-#: ../src/terminal-screen.c:1157 ++#: ../src/terminal-screen.c:1161 + msgid "No command supplied nor shell requested" + msgstr "Ingen kommando eller skall oppgitt" + +-#: ../src/terminal-screen.c:1374 ../src/terminal-window.c:2484 ++#: ../src/terminal-screen.c:1378 ../src/terminal-window.c:2554 + msgid "_Profile Preferences" + msgstr "Brukervalg for _profil" + +-#: ../src/terminal-screen.c:1375 ../src/terminal-screen.c:1702 ++#: ../src/terminal-screen.c:1379 ../src/terminal-screen.c:1728 + msgid "_Relaunch" + msgstr "Sta_rt på nytt" + +-#: ../src/terminal-screen.c:1378 ++#: ../src/terminal-screen.c:1382 + msgid "There was an error creating the child process for this terminal" + msgstr "" + "Det oppsto en feil under oppretting av underprosess for denne terminalen" + +-#: ../src/terminal-screen.c:1706 ++#: ../src/terminal-screen.c:1732 + #, c-format + msgid "The child process exited normally with status %d." + msgstr "Underprosess avsluttet normalt med status %d." + +-#: ../src/terminal-screen.c:1709 ++#: ../src/terminal-screen.c:1735 + #, c-format + msgid "The child process was aborted by signal %d." + msgstr "Underprosess ble terminert med signal %d." + +-#: ../src/terminal-screen.c:1712 ++#: ../src/terminal-screen.c:1738 + msgid "The child process was aborted." + msgstr "Underprosess ble terminert." + +@@ -1957,30 +1965,30 @@ msgstr "Lukk fane" + msgid "Switch to this tab" + msgstr "Bytt til denne fanen" + +-#: ../src/terminal-util.c:148 ++#: ../src/terminal-util.c:154 + msgid "There was an error displaying help" + msgstr "Det oppsto en feil under visning av hjelp" + +-#: ../src/terminal-util.c:203 ++#: ../src/terminal-util.c:210 + msgid "Contributors:" + msgstr "Bidragsytere:" + +-#: ../src/terminal-util.c:225 ++#: ../src/terminal-util.c:232 + msgid "A terminal emulator for the GNOME desktop" + msgstr "En terminalemulator for GNOME" + +-#: ../src/terminal-util.c:240 ++#: ../src/terminal-util.c:249 + msgid "translator-credits" + msgstr "" + "Kjartan Maraas \n" + "Torstein Adolf Winterseth " + +-#: ../src/terminal-util.c:313 ++#: ../src/terminal-util.c:325 + #, c-format + msgid "Could not open the address “%s”" + msgstr "Klarte ikke å åpne adressen «%s»" + +-#: ../src/terminal-util.c:382 ++#: ../src/terminal-util.c:394 + msgid "" + "GNOME Terminal is free software: you can redistribute it and/or modify it " + "under the terms of the GNU General Public License as published by the Free " +@@ -1992,7 +2000,7 @@ msgstr "" + "av Free Software Foundation; enten versjon 3 av lisensen, eller (hvis du " + "ønsker det) enhver senere versjon." + +-#: ../src/terminal-util.c:386 ++#: ../src/terminal-util.c:398 + msgid "" + "GNOME Terminal is distributed in the hope that it will be useful, but " + "WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY " +@@ -2003,7 +2011,7 @@ msgstr "" + "GARANTI, ikke engang implisitt garanti om at det er SALGBART eller PASSER ET " + "BESTEMT FORMÅL. Se GNU General Public License for detaljer." + +-#: ../src/terminal-util.c:390 ++#: ../src/terminal-util.c:402 + msgid "" + "You should have received a copy of the GNU General Public License along with " + "GNOME Terminal. If not, see ." +@@ -2011,15 +2019,19 @@ msgstr "" + "Du skal ha mottatt en kopi av GNU General Public License sammen med GNOME " + "Terminal. Hvis ikke, se ." + +-#: ../src/terminal-window.c:522 ++#: ../src/terminal-util.c:1181 ++msgid "“file” scheme with remote hostname not supported" ++msgstr "«file» schema med eksternt vertsnavn er ikke støttet" ++ ++#: ../src/terminal-window.c:524 + msgid "Could not save contents" + msgstr "Klarte ikke å lagre innhold" + +-#: ../src/terminal-window.c:544 ++#: ../src/terminal-window.c:546 + msgid "Save as…" + msgstr "Lagre som …" + +-#: ../src/terminal-window.c:548 ++#: ../src/terminal-window.c:550 + msgid "_Save" + msgstr "_Lagre" + +@@ -2027,7 +2039,7 @@ msgstr "_Lagre" + #. * _%u is used as the accelerator (with u between 1 and 9), and + #. * the %s is the name of the terminal profile. + #. +-#: ../src/terminal-window.c:1265 ++#: ../src/terminal-window.c:1286 + #, c-format + msgid "_%u. %s" + msgstr "_%u. %s" +@@ -2036,203 +2048,224 @@ msgstr "_%u. %s" + #. * _%c is used as the accelerator (it will be a character between A and Z), + #. * and the %s is the name of the terminal profile. + #. +-#: ../src/terminal-window.c:1271 ++#: ../src/terminal-window.c:1292 + #, c-format + msgid "_%c. %s" + msgstr "_%c. %s" + + #. Toplevel +-#: ../src/terminal-window.c:2433 ++#: ../src/terminal-window.c:2500 + msgid "_File" + msgstr "_Fil" + + #. File menu +-#: ../src/terminal-window.c:2434 ../src/terminal-window.c:2446 +-#: ../src/terminal-window.c:2452 ../src/terminal-window.c:2596 ++#: ../src/terminal-window.c:2501 ../src/terminal-window.c:2513 ++#: ../src/terminal-window.c:2519 ../src/terminal-window.c:2675 + msgid "Open _Terminal" + msgstr "Åpne _terminal" + +-#: ../src/terminal-window.c:2435 ++#: ../src/terminal-window.c:2502 + msgid "_Edit" + msgstr "R_ediger" + +-#: ../src/terminal-window.c:2436 ++#: ../src/terminal-window.c:2503 + msgid "_View" + msgstr "_Vis" + +-#: ../src/terminal-window.c:2437 ++#: ../src/terminal-window.c:2504 + msgid "_Search" + msgstr "_Søk" + +-#: ../src/terminal-window.c:2438 ++#: ../src/terminal-window.c:2505 + msgid "_Terminal" + msgstr "_Terminal" + +-#: ../src/terminal-window.c:2439 ++#: ../src/terminal-window.c:2506 + msgid "Ta_bs" + msgstr "_Faner" + +-#: ../src/terminal-window.c:2449 ++#: ../src/terminal-window.c:2516 + msgid "Open Ta_b" + msgstr "Åpne _fane" + +-#: ../src/terminal-window.c:2455 ++#: ../src/terminal-window.c:2522 + msgid "New _Profile" + msgstr "Ny _profil" + +-#: ../src/terminal-window.c:2458 ++#: ../src/terminal-window.c:2525 + msgid "_Save Contents" + msgstr "_Lagre innhold" + +-#: ../src/terminal-window.c:2461 ../src/terminal-window.c:3852 ++#: ../src/terminal-window.c:2528 ../src/terminal-window.c:3953 + msgid "C_lose Terminal" + msgstr "_Lukk terminal" + +-#: ../src/terminal-window.c:2464 ++#: ../src/terminal-window.c:2531 + msgid "_Close All Terminals" + msgstr "_Lukk alle terminaler" + +-#: ../src/terminal-window.c:2475 ../src/terminal-window.c:2593 ++#. Edit menu ++#: ../src/terminal-window.c:2536 ../src/terminal-window.c:2663 ++msgid "_Copy" ++msgstr "_Kopier" ++ ++#: ../src/terminal-window.c:2539 ../src/terminal-window.c:2666 ++msgid "Copy as _HTML" ++msgstr "Kopier som _HTML" ++ ++#: ../src/terminal-window.c:2542 ../src/terminal-window.c:2669 ++msgid "_Paste" ++msgstr "_Lim inn" ++ ++#: ../src/terminal-window.c:2545 ../src/terminal-window.c:2672 + msgid "Paste _Filenames" + msgstr "Lim inn _filnavn" + +-#: ../src/terminal-window.c:2481 ++#: ../src/terminal-window.c:2551 + msgid "Pre_ferences" + msgstr "_Brukervalg" + + #. Search menu +-#: ../src/terminal-window.c:2500 ++#: ../src/terminal-window.c:2570 + msgid "_Find…" + msgstr "_Finn …" + +-#: ../src/terminal-window.c:2503 ++#: ../src/terminal-window.c:2573 + msgid "Find Ne_xt" + msgstr "Finn ne_ste" + +-#: ../src/terminal-window.c:2506 ++#: ../src/terminal-window.c:2576 + msgid "Find Pre_vious" + msgstr "Finn forri_ge" + +-#: ../src/terminal-window.c:2509 ++#: ../src/terminal-window.c:2579 + msgid "_Clear Highlight" + msgstr "_Tøm utheving" + +-#: ../src/terminal-window.c:2513 ++#: ../src/terminal-window.c:2583 + msgid "Go to _Line…" + msgstr "Gå til _linje …" + +-#: ../src/terminal-window.c:2516 ++#: ../src/terminal-window.c:2586 + msgid "_Incremental Search…" + msgstr "_Inkrementelt søk …" + + #. Terminal menu +-#: ../src/terminal-window.c:2522 ++#: ../src/terminal-window.c:2592 + msgid "Change _Profile" + msgstr "Bytt _profil" + +-#: ../src/terminal-window.c:2523 ++#: ../src/terminal-window.c:2593 + msgid "Set _Character Encoding" + msgstr "Sett _tegnkoding" + +-#: ../src/terminal-window.c:2524 ++#: ../src/terminal-window.c:2594 + msgid "_Reset" + msgstr "_Nullstill" + +-#: ../src/terminal-window.c:2527 ++#: ../src/terminal-window.c:2597 + msgid "Reset and C_lear" + msgstr "Nu_llstill og tøm" + + #. Terminal/Encodings menu +-#: ../src/terminal-window.c:2532 ++#: ../src/terminal-window.c:2602 + msgid "_Add or Remove…" + msgstr "_Legg til eller fjern …" + + #. Tabs menu +-#: ../src/terminal-window.c:2537 ++#: ../src/terminal-window.c:2607 + msgid "_Previous Terminal" + msgstr "_Forrige terminal" + +-#: ../src/terminal-window.c:2540 ++#: ../src/terminal-window.c:2610 + msgid "_Next Terminal" + msgstr "_Neste terminal" + +-#: ../src/terminal-window.c:2543 ++#: ../src/terminal-window.c:2613 + msgid "Move Terminal _Left" + msgstr "Flytt terminal til _venstre" + +-#: ../src/terminal-window.c:2546 ++#: ../src/terminal-window.c:2616 + msgid "Move Terminal _Right" + msgstr "Flytt terminal til høy_re" + +-#: ../src/terminal-window.c:2549 ++#: ../src/terminal-window.c:2619 + msgid "_Detach Terminal" + msgstr "_Koble fra terminal" + + #. Help menu +-#: ../src/terminal-window.c:2554 ++#: ../src/terminal-window.c:2624 + msgid "_Contents" + msgstr "_Innhold" + +-#: ../src/terminal-window.c:2560 ++#: ../src/terminal-window.c:2630 + msgid "_Inspector" + msgstr "_Inspektør" + + #. Popup menu +-#: ../src/terminal-window.c:2565 ++#: ../src/terminal-window.c:2635 ++msgid "_Open Hyperlink" ++msgstr "_Åpne hyperlenke" ++ ++#: ../src/terminal-window.c:2638 ++msgid "_Copy Hyperlink Address" ++msgstr "_Kopier hyperlenkens adresse" ++ ++#: ../src/terminal-window.c:2641 + msgid "_Send Mail To…" + msgstr "_Send e-post til …" + +-#: ../src/terminal-window.c:2568 ++#: ../src/terminal-window.c:2644 + msgid "_Copy E-mail Address" + msgstr "_Kopier e-postadresse" + +-#: ../src/terminal-window.c:2571 ++#: ../src/terminal-window.c:2647 + msgid "C_all To…" + msgstr "_Ring til …" + +-#: ../src/terminal-window.c:2574 ++#: ../src/terminal-window.c:2650 + msgid "_Copy Call Address" + msgstr "_Kopier samtaleadresse" + +-#: ../src/terminal-window.c:2577 ++#: ../src/terminal-window.c:2653 + msgid "_Open Link" + msgstr "_Åpne lenke" + +-#: ../src/terminal-window.c:2580 ++#: ../src/terminal-window.c:2656 + msgid "_Copy Link Address" + msgstr "_Kopier lenkens adresse" + +-#: ../src/terminal-window.c:2586 ++#: ../src/terminal-window.c:2662 + msgid "P_rofiles" + msgstr "P_rofiler" + +-#: ../src/terminal-window.c:2599 ++#: ../src/terminal-window.c:2678 + msgid "L_eave Full Screen" + msgstr "For_lat full skjerm" + + #. View Menu +-#: ../src/terminal-window.c:2607 ++#: ../src/terminal-window.c:2686 + msgid "Show _Menubar" + msgstr "Vis _menylinjen" + +-#: ../src/terminal-window.c:2611 ++#: ../src/terminal-window.c:2690 + msgid "_Full Screen" + msgstr "_Full skjerm" + + #. Terminal menu +-#: ../src/terminal-window.c:2616 ++#: ../src/terminal-window.c:2695 + msgid "Read-_Only" + msgstr "Skrive_beskyttet" + +-#: ../src/terminal-window.c:3839 ++#: ../src/terminal-window.c:3940 + msgid "Close this window?" + msgstr "Vil du lukke dette vinduet?" + +-#: ../src/terminal-window.c:3839 ++#: ../src/terminal-window.c:3940 + msgid "Close this terminal?" + msgstr "Vil du lukke denne terminalen?" + +-#: ../src/terminal-window.c:3843 ++#: ../src/terminal-window.c:3944 + msgid "" + "There are still processes running in some terminals in this window. Closing " + "the window will kill all of them." +@@ -2240,7 +2273,7 @@ msgstr "" + "Det kjører fremdeles prosesser i noen terminaler i dette vinduet. Hvis du " + "lukker vinduet, avbrytes alle prosessene." + +-#: ../src/terminal-window.c:3847 ++#: ../src/terminal-window.c:3948 + msgid "" + "There is still a process running in this terminal. Closing the terminal will " + "kill it." +@@ -2248,6 +2281,6 @@ msgstr "" + "En prosess kjører fremdeles i denne terminalen. Hvis du lukker terminalen, " + "blir prosessen avbrutt." + +-#: ../src/terminal-window.c:3852 ++#: ../src/terminal-window.c:3953 + msgid "C_lose Window" + msgstr "_Lukk vindu" +-- +cgit v0.12 + diff --git a/gnome-terminal.changes b/gnome-terminal.changes index 46d6086..d5cc306 100644 --- a/gnome-terminal.changes +++ b/gnome-terminal.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon Nov 20 21:42:53 UTC 2017 - zaitor@opensuse.org + +- Add gnome-terminal-nb-translation.patch: Add updated Norwegian + bokmål translation. +- Run spec-cleaner, modernize spec, use autosetup and make_build + macros. +- Stop handling glib2_gsettings_schema_post(un) and + desktop_database_post(un) in post(un), we have file-triggers + taking care of this for us now. +- Stop passing no longer needed suse_update_desktop_file macro. + ------------------------------------------------------------------- Wed Nov 1 10:56:52 UTC 2017 - badshah400@gmail.com diff --git a/gnome-terminal.spec b/gnome-terminal.spec index 3c6bfd7..2cd8c1a 100644 --- a/gnome-terminal.spec +++ b/gnome-terminal.spec @@ -23,7 +23,9 @@ Summary: GNOME Terminal License: GPL-3.0+ and LGPL-2.1+ Group: System/X11/Terminals Url: http://www.gnome.org -Source: http://download.gnome.org/sources/gnome-terminal/3.26/%{name}-%{version}.tar.xz +Source0: http://download.gnome.org/sources/gnome-terminal/3.26/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM gnome-terminal-nb-translation.patch zaitor@opensuse.org -- Add updated Norwegian bokmål translation +Patch0: gnome-terminal-nb-translation.patch BuildRequires: fdupes # Needed for search provider. It should not be needed in my opionion, we have to take this up with upstream, or just provide search provider interface definition file as source. BuildRequires: gnome-shell @@ -48,7 +50,6 @@ BuildRequires: pkgconfig(uuid) BuildRequires: pkgconfig(vte-2.91) >= 0.50.2 BuildRequires: pkgconfig(x11) Recommends: %{name}-lang -BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(pre): filesystem %if 0%{?sle_version} Requires(pre): gconf2 @@ -80,8 +81,10 @@ This is a nautilus extension that allows you to open a terminal in arbitrary folders. %lang_package + %prep -%setup -q +%autosetup -p1 + %if !0%{?is_opensuse} translation-update-upstream %endif @@ -94,25 +97,16 @@ translation-update-upstream %endif --with-gtk=3.0 \ --with-nautilus-extension -make %{?_smp_mflags} +%make_build %install %make_install + find %{buildroot}%{_libdir} -type f -name '*.la' -delete -print -%suse_update_desktop_file org.gnome.Terminal %find_lang %{name} %{?no_lang_C} %fdupes %{buildroot} -%post -%glib2_gsettings_schema_post -%desktop_database_post - -%postun -%glib2_gsettings_schema_postun -%desktop_database_postun - %files -%defattr (-, root, root) %doc AUTHORS COPYING ChangeLog NEWS %doc %{_datadir}/help/C/%{name}/ %{_bindir}/gnome-terminal @@ -128,11 +122,11 @@ find %{buildroot}%{_libdir} -type f -name '*.la' -delete -print %{_userunitdir}/gnome-terminal-server.service %files -n gnome-shell-search-provider-gnome-terminal -%defattr (-, root, root) +%dir %{_datadir}/gnome-shell +%dir %{_datadir}/gnome-shell/search-providers %{_datadir}/gnome-shell/search-providers/gnome-terminal-search-provider.ini %files -n nautilus-extension-terminal -%defattr(-,root,root) %{_libdir}/nautilus/extensions-3.0/libterminal-nautilus.so %{_datadir}/metainfo/org.gnome.Terminal.Nautilus.metainfo.xml