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
6eae1b55d9
commit
d0f4389608
9 changed files with 11 additions and 11 deletions
|
@ -17,7 +17,7 @@ Name[es]=KDE Connect
|
|||
Name[et]=KDE Connect
|
||||
Name[eu]=KDE Connect
|
||||
Name[fi]=KDE Connect
|
||||
Name[fr]=KDE Connect
|
||||
Name[fr]=KDEConnect
|
||||
Name[gl]=KDE Connect
|
||||
Name[he]=KDE Connect
|
||||
Name[hu]=KDE Connect
|
||||
|
|
|
@ -25,7 +25,7 @@ Name[es]=KDE Connect
|
|||
Name[et]=KDE Connect
|
||||
Name[eu]=KDE Connect
|
||||
Name[fi]=KDE Connect
|
||||
Name[fr]=KDE Connect
|
||||
Name[fr]=KDEConnect
|
||||
Name[gl]=KDE Connect
|
||||
Name[he]=KDE Connect
|
||||
Name[hu]=KDE Connect
|
||||
|
|
|
@ -20,7 +20,7 @@ Name[es]=Enviar via KDE Connect
|
|||
Name[et]=Saatmine KDE Connecti kaudu
|
||||
Name[eu]=Bidali KDE Connect bidez
|
||||
Name[fi]=Lähetä tiedosto KDE Connectilla
|
||||
Name[fr]=Envoyer via KDE Connect
|
||||
Name[fr]=Envoyer via KDEConnect
|
||||
Name[gl]=Enviar por KDE Connect
|
||||
Name[he]=שליחה דרך KDE Connect
|
||||
Name[hu]=Küldés a KDE Connecttel
|
||||
|
|
|
@ -20,7 +20,7 @@ Name[es]=Enviar via KDE Connect
|
|||
Name[et]=Saatmine KDE Connecti kaudu
|
||||
Name[eu]=Bidali KDE Connect bidez
|
||||
Name[fi]=Lähetä tiedosto KDE Connectilla
|
||||
Name[fr]=Envoyer via KDE Connect
|
||||
Name[fr]=Envoyer via KDEConnect
|
||||
Name[gl]=Enviar por KDE Connect
|
||||
Name[he]=שליחה דרך KDE Connect
|
||||
Name[hu]=Küldés a KDE Connecttel
|
||||
|
|
|
@ -15,7 +15,7 @@ Name[es]=Indicador de KDE Connect
|
|||
Name[et]=KDE Connecti indikaator
|
||||
Name[eu]=KDE Connect adierazlea
|
||||
Name[fi]=KDE Connect -osoitin
|
||||
Name[fr]=Indicateur de KDE Connect
|
||||
Name[fr]=Indicateur de KDEConnect
|
||||
Name[gl]=Indicador de KDE Connect
|
||||
Name[he]=מחוון KDE Connect
|
||||
Name[hu]=KDE Connect jelző
|
||||
|
|
|
@ -18,7 +18,7 @@ Name[es]=KDE Connect
|
|||
Name[et]=KDE Connect
|
||||
Name[eu]=KDE Connect
|
||||
Name[fi]=KDE Connect
|
||||
Name[fr]=KDE Connect
|
||||
Name[fr]=KDEConnect
|
||||
Name[gl]=KDE Connect
|
||||
Name[he]=KDE Connect
|
||||
Name[hu]=KDE Connect
|
||||
|
@ -546,7 +546,7 @@ Name[es]=Ping recibido
|
|||
Name[et]=Pingi saamine
|
||||
Name[eu]=Ping jaso da
|
||||
Name[fi]=Saatiin tiedustelupaketti
|
||||
Name[fr]=Ping reçu
|
||||
Name[fr]=Réception du ping
|
||||
Name[gl]=Recibiuse un ping
|
||||
Name[he]=התקבל פינג
|
||||
Name[hu]=Ping érkezett
|
||||
|
@ -597,7 +597,7 @@ Comment[es]=Ping recibido
|
|||
Comment[et]=Pingi saamine
|
||||
Comment[eu]=Ping jaso da
|
||||
Comment[fi]=Saatiin tiedustelupaketti
|
||||
Comment[fr]=Ping reçu
|
||||
Comment[fr]=Réception du ping
|
||||
Comment[gl]=Recibiuse un “ping”.
|
||||
Comment[he]=התקבל פינג
|
||||
Comment[hu]=Ping érkezett
|
||||
|
|
|
@ -19,7 +19,7 @@ Name[es]=Ajustes de KDE Connect
|
|||
Name[et]=KDE Connecti seadistused
|
||||
Name[eu]=KDE Connect ezarpenak
|
||||
Name[fi]=KDE Connectin asetukset
|
||||
Name[fr]=Paramètres de KDE Connect
|
||||
Name[fr]=Paramètres de KDEConnect
|
||||
Name[gl]=Configuración de KDE Connect
|
||||
Name[he]=הגדרות KDE Connect
|
||||
Name[hu]=A KDE Connect beállításai
|
||||
|
|
|
@ -15,7 +15,7 @@ Name[es]=SMS de KDE Connect
|
|||
Name[et]=KDE Connecti SMS
|
||||
Name[eu]=KDE Connect SMS
|
||||
Name[fi]=KDE Connectin tekstiviestit
|
||||
Name[fr]=KDE Connect SMS
|
||||
Name[fr]=SMS par KDEConnect
|
||||
Name[gl]=SMS de KDE Connect
|
||||
Name[he]=מסרונים עם KDE Connect
|
||||
Name[hu]=KDE Connect SMS
|
||||
|
|
|
@ -17,7 +17,7 @@ Name[es]=KDE Connect
|
|||
Name[et]=KDE Connect
|
||||
Name[eu]=KDE Connect
|
||||
Name[fi]=KDE Connect
|
||||
Name[fr]=KDE Connect
|
||||
Name[fr]=KDEConnect
|
||||
Name[gl]=KDE Connect
|
||||
Name[he]=KDE Connect
|
||||
Name[hu]=KDE Connect
|
||||
|
|
Loading…
Reference in a new issue