Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 01:22:10 +01:00
Code Releases Activity

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

Browse Source 
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 2019-02-13 05:51:49 +01:00
parent 29486c2f62
commit 8ffd2f20df
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/GnomeKeyringPasswords/metadata.desktop
View File

@ -16,7 +16,7 @@ Name[nl]=GNOME-sleutelbos wachtwoorden
Name[nn]=Passord for Gnome-nøkkelring Name[nn]=Passord for Gnome-nøkkelring
Name[pl]=Hasła pęku kluczy Gnome Name[pl]=Hasła pęku kluczy Gnome
Name[pt]=Senhas no Porta-Chaves do Gnome Name[pt]=Senhas no Porta-Chaves do Gnome
Name[pt_BR]=Senhas do chaveiro do Gnome Name[pt_BR]=Senhas do chaveiro do GNOME
Name[sv]=Gnome-nyckelring lösenord Name[sv]=Gnome-nyckelring lösenord
Name[uk]=Паролі сховища ключів Gnome Name[uk]=Паролі сховища ключів Gnome
Name[x-test]=xxGnome Keyring Passwordsxx Name[x-test]=xxGnome Keyring Passwordsxx