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:
parent
be30441da5
commit
322fcd47a5
3 changed files with 12 additions and 0 deletions
|
@ -1,6 +1,9 @@
|
|||
[Desktop Entry]
|
||||
Name=KDE Connect Indicator
|
||||
Name[ca]=Indicador del KDE Connect
|
||||
Name[fr]=Indicateur de KDE Connect
|
||||
Name[nl]=KDE-Connect-indicator
|
||||
Name[pl]=Wskaźnik KDE Connect
|
||||
Name[pt]=Indicador do KDE Connect
|
||||
Name[sv]=KDE-anslut indikator
|
||||
Name[tr]=KDE Connect Göstergesi
|
||||
|
|
|
@ -15,6 +15,9 @@
|
|||
],
|
||||
"Description": "Use your keyboard to send key-events to your paired device",
|
||||
"Description[ca]": "Useu el vostre teclat per enviar esdeveniments de tecla al dispositiu enllaçat",
|
||||
"Description[fr]": "Utiliser votre clavier pour envoyer des évènements de touche au périphérique associé",
|
||||
"Description[nl]": "Uw toetsenbord gebruiken om toetsgebeurtenissen naar uw gepaarde apparaat te verzenden",
|
||||
"Description[pl]": "Użyj swojej klawiatury do wysyłania naciśnięć klawiszy do swojego sparowanego urządzenia",
|
||||
"Description[pt]": "Use o seu teclado para enviar eventos de teclado para o seu dispositivo emparelhado",
|
||||
"Description[sv]": "Använd tangentbordet för att skicka tangenthändelser till den parade enheten",
|
||||
"Description[tr]": "Eşleşmiş cihazınıza önemli etkinlikler göndermek için klavyenizi kullanın",
|
||||
|
@ -26,6 +29,9 @@
|
|||
"License": "GPL",
|
||||
"Name": "Remote keyboard from the desktop",
|
||||
"Name[ca]": "Teclat remot des de l'escriptori",
|
||||
"Name[fr]": "Clavier distant depuis le bureau",
|
||||
"Name[nl]": "Toetsenbord op afstand vanaf het bureaublad",
|
||||
"Name[pl]": "Zdalna klawiatura z pulpitu",
|
||||
"Name[pt]": "Teclado remoto no ecrã",
|
||||
"Name[sv]": "Externt tangentbord från skrivbordet",
|
||||
"Name[tr]": "Masaüstünden uzak klavye",
|
||||
|
|
|
@ -1,6 +1,9 @@
|
|||
[Desktop Entry]
|
||||
Name=KDE Connect Phone URL Handler
|
||||
Name[ca]=Gestor d'URL de telèfons del KDE Connect
|
||||
Name[fr]=Gestionnaire d'URL téléphoniques de KDE Connect
|
||||
Name[nl]=KDE-Connect behandelaar van telefoon-URL
|
||||
Name[pl]=KDE Connect - obsługa URL telefonu
|
||||
Name[pt]=Tratamento de URL's no Telefone do KDE Connect
|
||||
Name[sv]=KDE-anslut hanterare av telefonwebbadress
|
||||
Name[tr]=KDE Connect Telefon URL İşleyici
|
||||
|
|
Loading…
Reference in a new issue