Commit 16731790 authored by Script Kiddy's avatar Script Kiddy
Browse files

SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
parent 1c4e78de
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
"Description[ca]": "Dorsal de so pel GStreamer.", "Description[ca]": "Dorsal de so pel GStreamer.",
"Description[cs]": "Podpůrná vrstva zvuku pro GStreamer.", "Description[cs]": "Podpůrná vrstva zvuku pro GStreamer.",
"Description[de]": "Sound-Backend für GStreamer.", "Description[de]": "Sound-Backend für GStreamer.",
"Description[en_GB]": "Sound backend for GStreamer.",
"Description[es]": "Motor de sonido para GStreamer.", "Description[es]": "Motor de sonido para GStreamer.",
"Description[et]": "GStreameri heli-taustaprogramm",
"Description[fi]": "GStreamer-äänitaustajärjestelmä", "Description[fi]": "GStreamer-äänitaustajärjestelmä",
"Description[gl]": "Infraestrutura de son para GStreamer.", "Description[gl]": "Infraestrutura de son para GStreamer.",
"Description[nl]": "Geluidsbackend voor GStreamer.", "Description[nl]": "Geluidsbackend voor GStreamer.",
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
"Description[uk]": "Звуковий модуль для GStreamer.", "Description[uk]": "Звуковий модуль для GStreamer.",
"Description[x-test]": "xxSound backend for GStreamer.xx", "Description[x-test]": "xxSound backend for GStreamer.xx",
"Description[zh_CN]": "GStreamer 声音后端", "Description[zh_CN]": "GStreamer 声音后端",
"Description[zh_TW]": "GStreamer 音效後端介面。",
"Id": "artikulate_gstreamer_backend", "Id": "artikulate_gstreamer_backend",
"License": "GPL", "License": "GPL",
"Name": "GStreamer Backend", "Name": "GStreamer Backend",
...@@ -32,8 +31,8 @@ ...@@ -32,8 +31,8 @@
"Name[ca]": "Dorsal GStreamer", "Name[ca]": "Dorsal GStreamer",
"Name[cs]": "Podpůrná vrstva GStreamer", "Name[cs]": "Podpůrná vrstva GStreamer",
"Name[de]": "Backend für GStreamer", "Name[de]": "Backend für GStreamer",
"Name[en_GB]": "GStreamer Backend",
"Name[es]": "Motor GStreamer", "Name[es]": "Motor GStreamer",
"Name[et]": "GStreameri taustaprogramm",
"Name[fi]": "GStreamer-taustajärjestelmä", "Name[fi]": "GStreamer-taustajärjestelmä",
"Name[gl]": "Infraestrutura de GStreamer", "Name[gl]": "Infraestrutura de GStreamer",
"Name[nl]": "GStreamer-backend", "Name[nl]": "GStreamer-backend",
...@@ -41,13 +40,11 @@ ...@@ -41,13 +40,11 @@
"Name[pl]": "Silnik GStreamer", "Name[pl]": "Silnik GStreamer",
"Name[pt]": "Infra-Estrutura para o GStreamer", "Name[pt]": "Infra-Estrutura para o GStreamer",
"Name[pt_BR]": "Infraestrutura do GStreamer", "Name[pt_BR]": "Infraestrutura do GStreamer",
"Name[sk]": "GStreamer Backend",
"Name[sl]": "Zaledje GStreamer", "Name[sl]": "Zaledje GStreamer",
"Name[sv]": "Gstreamer-gränssnitt", "Name[sv]": "Gstreamer-gränssnitt",
"Name[uk]": "Модуль GStreamer", "Name[uk]": "Модуль GStreamer",
"Name[x-test]": "xxGStreamer Backendxx", "Name[x-test]": "xxGStreamer Backendxx",
"Name[zh_CN]": "GStreamer 后端", "Name[zh_CN]": "GStreamer 后端",
"Name[zh_TW]": "GStreamer 後端介面",
"ServiceTypes": [ "ServiceTypes": [
"artikulate/libsound/backend" "artikulate/libsound/backend"
], ],
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
"Description[ca]": "Dorsal de so pel QtMultimedia.", "Description[ca]": "Dorsal de so pel QtMultimedia.",
"Description[cs]": "Podpůrná vrstva zvuku pro QtMultimedia.", "Description[cs]": "Podpůrná vrstva zvuku pro QtMultimedia.",
"Description[de]": "Sound-Backend für QtMultimedia.", "Description[de]": "Sound-Backend für QtMultimedia.",
"Description[en_GB]": "Sound backend for QtMultimedia.",
"Description[es]": "Motor de sonido para QtMultimedia.", "Description[es]": "Motor de sonido para QtMultimedia.",
"Description[et]": "QtMultimedia heli-taustaprogramm",
"Description[fi]": "QtMultimedia-äänitaustajärjestelmä", "Description[fi]": "QtMultimedia-äänitaustajärjestelmä",
"Description[gl]": "Infraestrutura de son para QtMultimedia.", "Description[gl]": "Infraestrutura de son para QtMultimedia.",
"Description[nl]": "Geluidsbackend voor QtMultimedia.", "Description[nl]": "Geluidsbackend voor QtMultimedia.",
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
"Description[uk]": "Звуковий модуль для QtMultimedia.", "Description[uk]": "Звуковий модуль для QtMultimedia.",
"Description[x-test]": "xxSound backend for QtMultimedia.xx", "Description[x-test]": "xxSound backend for QtMultimedia.xx",
"Description[zh_CN]": "QtMultimedia 声音后端", "Description[zh_CN]": "QtMultimedia 声音后端",
"Description[zh_TW]": "QtMultimedia 音效後端介面。",
"Id": "artikulate_qtmultimedia_backend", "Id": "artikulate_qtmultimedia_backend",
"License": "GPL", "License": "GPL",
"Name": "QtMultimedia Backend", "Name": "QtMultimedia Backend",
...@@ -32,8 +31,8 @@ ...@@ -32,8 +31,8 @@
"Name[ca]": "Dorsal QtMultimedia", "Name[ca]": "Dorsal QtMultimedia",
"Name[cs]": "Podpůrná vrstva QtMultimedia", "Name[cs]": "Podpůrná vrstva QtMultimedia",
"Name[de]": "Backend für QtMultimedia", "Name[de]": "Backend für QtMultimedia",
"Name[en_GB]": "QtMultimedia Backend",
"Name[es]": "Motor QtMultimedia", "Name[es]": "Motor QtMultimedia",
"Name[et]": "QtMultimedia taustaprogramm",
"Name[fi]": "QtMultimedia-taustajärjestelmä", "Name[fi]": "QtMultimedia-taustajärjestelmä",
"Name[gl]": "Infraestrutura de QtMultimedia", "Name[gl]": "Infraestrutura de QtMultimedia",
"Name[nl]": "QtMultimedia-backend", "Name[nl]": "QtMultimedia-backend",
...@@ -41,13 +40,11 @@ ...@@ -41,13 +40,11 @@
"Name[pl]": "Silnik QtMultimedia", "Name[pl]": "Silnik QtMultimedia",
"Name[pt]": "Infra-Estrutura para o QtMultimedia", "Name[pt]": "Infra-Estrutura para o QtMultimedia",
"Name[pt_BR]": "Infraestrutura QtMultimedia", "Name[pt_BR]": "Infraestrutura QtMultimedia",
"Name[sk]": "QtMultimedia Backend",
"Name[sl]": "Zaledje QtMultimedia", "Name[sl]": "Zaledje QtMultimedia",
"Name[sv]": "QtMultimedia-gränssnitt", "Name[sv]": "QtMultimedia-gränssnitt",
"Name[uk]": "Модуль QtMultimedia", "Name[uk]": "Модуль QtMultimedia",
"Name[x-test]": "xxQtMultimedia Backendxx", "Name[x-test]": "xxQtMultimedia Backendxx",
"Name[zh_CN]": "QtMultimedia 后端", "Name[zh_CN]": "QtMultimedia 后端",
"Name[zh_TW]": "QtMultimedia 後端介面",
"ServiceTypes": [ "ServiceTypes": [
"artikulate/libsound/backend" "artikulate/libsound/backend"
], ],
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment