1
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-24 12:46:35 +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-15 05:21:21 +01:00
parent d58029363b
commit ee026bd40e
8 changed files with 12 additions and 0 deletions

View File

@ -1,5 +1,6 @@
[Desktop Entry]
Name=Dictionary
Name[ca]=Diccionari
Name[en_GB]=Dictionary
Name[fr]=Dictionnaire
Name[nl]=Woordenboek

View File

@ -1,5 +1,6 @@
[Desktop Entry]
Name=Google
Name[ca]=Google
Name[en_GB]=Google
Name[fr]=Google
Name[nl]=Google
@ -9,6 +10,7 @@ Name[uk]=Google
Name[x-test]=xxGooglexx
Name[zh_CN]=Google
Comment=Search with...
Comment[ca]=Cerca amb...
Comment[en_GB]=Search with...
Comment[nl]=Zoeken met...
Comment[pt]=Procurar com...

View File

@ -1,5 +1,6 @@
[Desktop Entry]
Name=Open with mpv
Name[ca]=Obre amb el «mpv»
Name[en_GB]=Open with mpv
Name[nl]=Met mpv openen
Name[pt]=Abrir com o 'mpv'

View File

@ -1,5 +1,6 @@
[Desktop Entry]
Name=TinEye
Name[ca]=TinEye
Name[en_GB]=TinEye
Name[nl]=TinEye
Name[pt]=TinEye
@ -7,6 +8,7 @@ Name[sv]=TinEye
Name[uk]=TinEye
Name[x-test]=xxTinEyexx
Comment=Search with...
Comment[ca]=Cerca amb...
Comment[en_GB]=Search with...
Comment[nl]=Zoeken met...
Comment[pt]=Procurar com...

View File

@ -1,5 +1,6 @@
[Desktop Entry]
Name=Translate page
Name[ca]=Tradueix la pàgina
Name[en_GB]=Translate page
Name[nl]=Pagina vertalen
Name[pt]=Traduzir a página

View File

@ -1,5 +1,6 @@
[Desktop Entry]
Name=Validate page
Name[ca]=Valida la pàgina
Name[en_GB]=Validate page
Name[nl]=Pagina valideren
Name[pt]=Validar a página

View File

@ -1,5 +1,6 @@
[Desktop Entry]
Name=Yandex
Name[ca]=Yandex
Name[en_GB]=Yandex
Name[nl]=Yandex
Name[pt]=Yandex
@ -7,6 +8,7 @@ Name[sv]=Yandex
Name[uk]=Яндекс
Name[x-test]=xxYandexxx
Comment=Search with...
Comment[ca]=Cerca amb...
Comment[en_GB]=Search with...
Comment[nl]=Zoeken met...
Comment[pt]=Procurar com...

View File

@ -1,5 +1,6 @@
[Desktop Entry]
Name=Run Action
Name[ca]=Executa una acció
Name[en_GB]=Run Action
Name[nl]=Uitvoeractie
Name[pt]=Executar uma Acção
@ -7,6 +8,7 @@ Name[sv]=Utför åtgärd
Name[uk]=Виконати дію
Name[x-test]=xxRun Actionxx
Comment=Run various actions on sites
Comment[ca]=Executa diverses accions als llocs
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