merge opera.desktop translations into opera-desktop.patch

diff --git a/opera-desktop.patch b/opera-desktop.patch
index 2f38f05784048d506ed80253bdfe2948fe782edf..cc22f00cafc9c9b5052efa6b263e1b669ee0b5cb 100644 (file)
--- a/opera-desktop.patch
+++ b/opera-desktop.patch
@@ -1,13 +1,33 @@
---- opera-31.0.1889.174/opera.desktop  2015-09-06 10:00:09.174694303 +0300
-+++ opera-31.0.1889.174/opera.desktop  2015-09-06 10:01:59.496777742 +0300
-@@ -1,15 +1,19 @@
+--- opera-31.0.1889.174/opera.desktop  2015-09-06 10:01:59.496777742 +0300
++++ opera-31.0.1889.174/opera.desktop  2015-09-06 11:25:23.712512805 +0300
+@@ -1,15 +1,38 @@

  [Desktop Entry]
  Version=1.0
  Name=Opera
  [Desktop Entry]
  Version=1.0
  Name=Opera

+-GenericName=Web browser

 +Name[eo]=Opero
 +Name[zu]=I Opera
 +Name[eo]=Opero
 +Name[zu]=I Opera

- GenericName=Web browser
++GenericName=Web Browser
++GenericName[bs]=Web preglednik
++GenericName[de]=Web-Browser
++GenericName[eo]=TTT-rigardilo
++GenericName[es]=Navegador web
++GenericName[et]=Veebibrauser
++GenericName[eu]=Web arakatzailea
++GenericName[fi]=WWW-selain
++GenericName[fr]=Un navigateur web
++GenericName[is]=Vafri
++GenericName[it]=Browser Web
++GenericName[nl]=webbrowser
++GenericName[nn]=Nettlesar

 +GenericName[pl]=Przeglądarka WWW
 +GenericName[pl]=Przeglądarka WWW

++GenericName[pt]=Navegador Web
++GenericName[pt_BR]=Navegador
++GenericName[ro]=Navigator de web
++GenericName[sl]=Spletni brskalnik
++GenericName[ven]=Buronza ya Webu
++GenericName[xh]=Umkhangeli Zincwadi Zokubhaliweyo
++GenericName[zu]=Umkhangeli zincwadi we Web

  Comment=Fast and secure web browser
 +Comment[pl]=Najszybsza przeglądarka WWW na świecie
  TryExec=opera
  Comment=Fast and secure web browser
 +Comment[pl]=Najszybsza przeglądarka WWW na świecie
  TryExec=opera

diff --git a/opera.desktop b/opera.desktop
deleted file mode 100644 (file)
index e9de137..0000000
--- a/opera.desktop
+++ /dev/null
@@ -1,35 +0,0 @@
-[Desktop Entry]
-Name=Opera
-Name[af]=opera
-Name[eo]=Opero
-Name[pl]=Opera
-Name[zu]=I Opera
-GenericName=Web Browser
-GenericName[bs]=Web preglednik
-GenericName[de]=Web-Browser
-GenericName[eo]=TTT-rigardilo
-GenericName[es]=Navegador web
-GenericName[et]=Veebibrauser
-GenericName[eu]=Web arakatzailea
-GenericName[fi]=WWW-selain
-GenericName[fr]=Un navigateur web
-GenericName[is]=Vafri
-GenericName[it]=Browser Web
-GenericName[nl]=webbrowser
-GenericName[nn]=Nettlesar
-GenericName[pl]=Przeglądarka WWW
-GenericName[pt]=Navegador Web
-GenericName[pt_BR]=Navegador
-GenericName[ro]=Navigator de web
-GenericName[sl]=Spletni brskalnik
-GenericName[ven]=Buronza ya Webu
-GenericName[xh]=Umkhangeli Zincwadi Zokubhaliweyo
-GenericName[zu]=Umkhangeli zincwadi we Web
-Comment=World fastest web browser
-Comment[pl]=Najszybsza przeglądarka WWW na świecie
-Icon=opera
-Exec=opera
-Terminal=false
-Categories=Network;WebBrowser;
-Type=Application
-# vi: encoding=utf-8

diff --git a/opera.spec b/opera.spec
index b31f68893bb02b28f38e78acce018a171f40ed13..647941fd7e4192a1bb8a85d9194475017f913179 100644 (file)
--- a/opera.spec
+++ b/opera.spec
@@ -20,7 +20,6 @@ License:      Distributable
 Group:         X11/Applications/Networking
 Source10:      ftp://ftp.opera.com/pub/opera/desktop/%{version}/linux/%{name}-stable_%{version}_amd64.deb
 # Source10-md5:        71d13017ca60bbf4619dc3faf58fd94e
 Group:         X11/Applications/Networking
 Source10:      ftp://ftp.opera.com/pub/opera/desktop/%{version}/linux/%{name}-stable_%{version}_amd64.deb
 # Source10-md5:        71d13017ca60bbf4619dc3faf58fd94e

-Source0:       %{name}.desktop

 Source1:       %{name}.sh
 Patch1:                %{name}-desktop.patch
 Patch2:                pepper_flash_config.patch
 Source1:       %{name}.sh
 Patch1:                %{name}-desktop.patch
 Patch2:                pepper_flash_config.patch