1
mirror of https://invent.kde.org/network/falkon.git synced 2024-09-21 17:52:10 +02:00

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"
This commit is contained in:
l10n daemon script 2018-03-05 05:17:05 +01:00
parent 1acade4133
commit d04e0091a7
8 changed files with 60 additions and 0 deletions

View File

@ -1,5 +1,10 @@
[Desktop Entry]
Name=Dictionary
Name[en_GB]=Dictionary
Name[pt]=Dicionário
Name[sv]=Ordlista
Name[uk]=Словник
Name[x-test]=xxDictionaryxx
Type=Service

View File

@ -1,6 +1,16 @@
[Desktop Entry]
Name=Google
Name[en_GB]=Google
Name[pt]=Google
Name[sv]=Google
Name[uk]=Google
Name[x-test]=xxGooglexx
Comment=Search with...
Comment[en_GB]=Search with...
Comment[pt]=Procurar com...
Comment[sv]=Sök med...
Comment[uk]=Шукати за допомогою
Comment[x-test]=xxSearch with...xx
Icon=google.png
Type=Service

View File

@ -1,5 +1,10 @@
[Desktop Entry]
Name=Open with mpv
Name[en_GB]=Open with mpv
Name[pt]=Abrir com o 'mpv'
Name[sv]=Öppna med mpv
Name[uk]=Відкрити за допомогою mpv
Name[x-test]=xxOpen with mpvxx
Icon=mpv
TryExec=mpv

View File

@ -1,6 +1,16 @@
[Desktop Entry]
Name=TinEye
Name[en_GB]=TinEye
Name[pt]=TinEye
Name[sv]=TinEye
Name[uk]=TinEye
Name[x-test]=xxTinEyexx
Comment=Search with...
Comment[en_GB]=Search with...
Comment[pt]=Procurar com...
Comment[sv]=Sök med...
Comment[uk]=Шукати за допомогою
Comment[x-test]=xxSearch with...xx
Icon=tineye.png
Type=Service

View File

@ -1,5 +1,10 @@
[Desktop Entry]
Name=Translate page
Name[en_GB]=Translate page
Name[pt]=Traduzir a página
Name[sv]=Översätt sida
Name[uk]=Перекласти сторінку
Name[x-test]=xxTranslate pagexx
Icon=translate.png
Type=Service

View File

@ -1,5 +1,10 @@
[Desktop Entry]
Name=Validate page
Name[en_GB]=Validate page
Name[pt]=Validar a página
Name[sv]=Validera sida
Name[uk]=Перевірити достовірність сторінки
Name[x-test]=xxValidate pagexx
Icon=w3.png
Type=Service

View File

@ -1,6 +1,16 @@
[Desktop Entry]
Name=Yandex
Name[en_GB]=Yandex
Name[pt]=Yandex
Name[sv]=Yandex
Name[uk]=Яндекс
Name[x-test]=xxYandexxx
Comment=Search with...
Comment[en_GB]=Search with...
Comment[pt]=Procurar com...
Comment[sv]=Sök med...
Comment[uk]=Шукати за допомогою
Comment[x-test]=xxSearch with...xx
Icon=yandex.png
Type=Service

View File

@ -1,6 +1,16 @@
[Desktop Entry]
Name=Run Action
Name[en_GB]=Run Action
Name[pt]=Executar uma Acção
Name[sv]=Utför åtgärd
Name[uk]=Виконати дію
Name[x-test]=xxRun Actionxx
Comment=Run various actions on sites
Comment[en_GB]=Run various actions on sites
Comment[pt]=Executar várias acções sobre as páginas
Comment[sv]=Utför diverse åtgärder på webbplatser
Comment[uk]=Виконання різноманітних дій на сайтах
Comment[x-test]=xxRun various actions on sitesxx
Icon=icon.svg
Type=Service