1
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 09:32:12 +01: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-07 05:17:30 +01:00
parent 5feefc80c4
commit e83caaf467
8 changed files with 14 additions and 0 deletions

View File

@ -2,10 +2,12 @@
Name=Dictionary
Name[en_GB]=Dictionary
Name[fr]=Dictionnaire
Name[nl]=Woordenboek
Name[pt]=Dicionário
Name[sv]=Ordlista
Name[uk]=Словник
Name[x-test]=xxDictionaryxx
Name[zh_CN]=
Type=Service

View File

@ -2,12 +2,15 @@
Name=Google
Name[en_GB]=Google
Name[fr]=Google
Name[nl]=Google
Name[pt]=Google
Name[sv]=Google
Name[uk]=Google
Name[x-test]=xxGooglexx
Name[zh_CN]=Google
Comment=Search with...
Comment[en_GB]=Search with...
Comment[nl]=Zoeken met...
Comment[pt]=Procurar com...
Comment[sv]=Sök med...
Comment[uk]=Шукати за допомогою

View File

@ -1,6 +1,7 @@
[Desktop Entry]
Name=Open with mpv
Name[en_GB]=Open with mpv
Name[nl]=Met mpv openen
Name[pt]=Abrir com o 'mpv'
Name[sv]=Öppna med mpv
Name[uk]=Відкрити за допомогою mpv

View File

@ -1,12 +1,14 @@
[Desktop Entry]
Name=TinEye
Name[en_GB]=TinEye
Name[nl]=TinEye
Name[pt]=TinEye
Name[sv]=TinEye
Name[uk]=TinEye
Name[x-test]=xxTinEyexx
Comment=Search with...
Comment[en_GB]=Search with...
Comment[nl]=Zoeken met...
Comment[pt]=Procurar com...
Comment[sv]=Sök med...
Comment[uk]=Шукати за допомогою

View File

@ -1,6 +1,7 @@
[Desktop Entry]
Name=Translate page
Name[en_GB]=Translate page
Name[nl]=Pagina vertalen
Name[pt]=Traduzir a página
Name[sv]=Översätt sida
Name[uk]=Перекласти сторінку

View File

@ -1,6 +1,7 @@
[Desktop Entry]
Name=Validate page
Name[en_GB]=Validate page
Name[nl]=Pagina valideren
Name[pt]=Validar a página
Name[sv]=Validera sida
Name[uk]=Перевірити достовірність сторінки

View File

@ -1,12 +1,14 @@
[Desktop Entry]
Name=Yandex
Name[en_GB]=Yandex
Name[nl]=Yandex
Name[pt]=Yandex
Name[sv]=Yandex
Name[uk]=Яндекс
Name[x-test]=xxYandexxx
Comment=Search with...
Comment[en_GB]=Search with...
Comment[nl]=Zoeken met...
Comment[pt]=Procurar com...
Comment[sv]=Sök med...
Comment[uk]=Шукати за допомогою

View File

@ -1,12 +1,14 @@
[Desktop Entry]
Name=Run Action
Name[en_GB]=Run Action
Name[nl]=Uitvoeractie
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[nl]=Verschillende acties op sites uitvoeren
Comment[pt]=Executar várias acções sobre as páginas
Comment[sv]=Utför diverse åtgärder på webbplatser
Comment[uk]=Виконання різноманітних дій на сайтах